From d8e153bedb792b043ad52525ae07542781e09f7d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 10 Oct 2013 11:44:56 +0200 Subject: [PATCH] Revert "luasocket: incompatible with lua-5.2; remove it." This reverts commit f18a9e0fbdf4b61b95c5bf91a5067d372bba53c7. --- .../luasocket/patches/luasocket-arch.patch | 13 ++++++++ .../patches/luasocket-unixsocket.patch | 31 +++++++++++++++++++ srcpkgs/luasocket/template | 24 ++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 srcpkgs/luasocket/patches/luasocket-arch.patch create mode 100644 srcpkgs/luasocket/patches/luasocket-unixsocket.patch create mode 100644 srcpkgs/luasocket/template diff --git a/srcpkgs/luasocket/patches/luasocket-arch.patch b/srcpkgs/luasocket/patches/luasocket-arch.patch new file mode 100644 index 00000000000..87f029a4206 --- /dev/null +++ b/srcpkgs/luasocket/patches/luasocket-arch.patch @@ -0,0 +1,13 @@ +--- config.orig 2007-10-15 08:21:05.000000000 +0400 ++++ config 2007-10-15 12:22:16.000000000 +0400 +@@ -30,8 +30,8 @@ + # + #INSTALL_TOP_SHARE=/usr/local/share/lua/5.0 + #INSTALL_TOP_LIB=/usr/local/lib/lua/5.0 +-INSTALL_TOP_SHARE=/usr/local/share/lua/5.1 +-INSTALL_TOP_LIB=/usr/local/lib/lua/5.1 ++INSTALL_TOP_SHARE=$(DESTDIR)/usr/share/lua/5.1 ++INSTALL_TOP_LIB=$(DESTDIR)/usr/lib/lua/5.1 + + INSTALL_DATA=cp + INSTALL_EXEC=cp diff --git a/srcpkgs/luasocket/patches/luasocket-unixsocket.patch b/srcpkgs/luasocket/patches/luasocket-unixsocket.patch new file mode 100644 index 00000000000..08bf98613d3 --- /dev/null +++ b/srcpkgs/luasocket/patches/luasocket-unixsocket.patch @@ -0,0 +1,31 @@ +--- makefile 2007-10-15 04:21:05.000000000 +0000 ++++ makefile 2011-03-09 12:00:54.000000000 +0000 +@@ -10,6 +10,8 @@ + INSTALL_SOCKET_LIB=$(INSTALL_TOP_LIB)/socket + INSTALL_MIME_SHARE=$(INSTALL_TOP_SHARE)/mime + INSTALL_MIME_LIB=$(INSTALL_TOP_LIB)/mime ++# ++INSTALL_UNIX_LIB=$(INSTALL_SOCKET_LIB) + + all clean: + cd src; $(MAKE) $@ +@@ -45,6 +47,8 @@ + #cd src; $(INSTALL_DATA) $(TO_MIME_SHARE) $(INSTALL_MIME_SHARE) + cd src; mkdir -p $(INSTALL_MIME_LIB) + cd src; $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(EXT) ++ cd src; install -d $(INSTALL_UNIX_LIB) ++ cd src; $(INSTALL_EXEC) $(UNIX_SO) $(INSTALL_UNIX_LIB)/$(UNIX_SO) + + #------ + # End of makefile +--- src/makefile 2007-10-15 04:21:05.000000000 +0000 ++++ src/makefile 2011-03-09 12:02:25.000000000 +0000 +@@ -47,7 +47,7 @@ + usocket.o \ + unix.o + +-all: $(SOCKET_SO) $(MIME_SO) ++all: $(SOCKET_SO) $(MIME_SO) $(UNIX_SO) + + $(SOCKET_SO): $(SOCKET_OBJS) + $(LD) $(LDFLAGS) -o $@ $(SOCKET_OBJS) diff --git a/srcpkgs/luasocket/template b/srcpkgs/luasocket/template new file mode 100644 index 00000000000..4f5de8291a8 --- /dev/null +++ b/srcpkgs/luasocket/template @@ -0,0 +1,24 @@ +# Template file for 'luasocket' +pkgname=luasocket +version=2.0.2 +revision=1 +build_style=gnu-makefile +makedepends="lua-devel" +short_desc="Network support for the Lua language " +maintainer="davehome " +license="MIT" +homepage="http://www.cs.princeton.edu/~diego/professional/luasocket/" +distfiles="http://luaforge.net/frs/download.php/2664/luasocket-$version.tar.gz" +checksum=4fd9c775cfd98841299851e29b30176caf289370fea1ff1e00bb67c2d6842ca6 +long_desc=" + LuaSocket is a Lua extension library that is composed by two parts: a C core + that provides support for the TCP and UDP transport layers, and a set of Lua + modules that add support for functionality commonly needed by applications + that deal with the Internet." + +luasocket_package() { + depends="lua" + pkg_install() { + vmove usr + } +}