Tue Oct 22 01:11:15 PDT 2013

2 files changed, 31 insertions, 65 deletions

diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD
index d659a6086..684566c28 100644
--- a/community/luasocket/PKGBUILD
+++ b/community/luasocket/PKGBUILD
@@ -1,50 +1,49 @@
-# $Id: PKGBUILD 81274 2012-12-15 15:00:36Z seblu $
+# $Id: PKGBUILD 98942 2013-10-21 14:19:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
 pkgbase=luasocket
-pkgname=(lua51-socket)
-pkgver=2.0.2
-pkgrel=5
+pkgname=(lua-socket lua51-socket)
+pkgver=3.0rc1
+pkgrel=2
 pkgdesc='Networking support library for the Lua language'
 arch=('i686' 'x86_64')
-url='http://www.cs.princeton.edu/~diego/professional/luasocket/'
+url='https://github.com/diegonehab/luasocket'
 license=('MIT')
-replaces=('luasocket')
-conflicts=('luasocket')
 makedepends=('lua' 'lua51')
-source=("http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz"
-        'luasocket-unixsocket.patch')
-md5sums=('41445b138deb7bcfe97bff957503da8e'
-         '8d116bb70bd7a2fa15cbe949d4cfc35e')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/diegonehab/luasocket/archive/v${pkgver/rc/-rc}.tar.gz")
+md5sums=('08bd2f265b244eb4bf5c2c36bf89b759')
 
 build() {
-#  cp -a luasocket-$pkgver luasocket-$pkgver-52
-#  msg2 'Building with lua 5.2'
-#  pushd luasocket-$pkgver-52
-#  patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
-#  make
-#  popd
+  cp -a luasocket-${pkgver/rc/-rc} luasocket-${pkgver/rc/-rc}-52
+  msg2 'Building with lua 5.2'
+  pushd luasocket-${pkgver/rc/-rc}-52
+  make LUAV=5.2
+  popd
   msg2 'Building with lua 5.1'
-  cd luasocket-$pkgver
-  patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
-  make LUAINC=-I/usr/include/lua5.1
+  cd luasocket-${pkgver/rc/-rc}
+  find . -type f -name \*.[ch] -exec sed -i \
+    -e 's|include "lua.h|include "lua5.1/lua.h|g' \
+    -e 's|include "lualib.h|include "lua5.1/lualib.h|g' \
+    -e 's|include "luaconf.h|include "lua5.1/luaconf.h|g' \
+    -e 's|include "lauxlib.h|include "lua5.1/lauxlib.h|g' \
+    {} \;
+  make LUAV=5.1
 }
 
-#package_lua-socket() {
-#  depends=('lua')
-#  cd luasocket-$pkgver-52
-#  make DESTDIR="$pkgdir/" \
-#    INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.2' \
-#    INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.2' install
-#  install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-#}
+package_lua-socket() {
+  depends=('lua')
+  cd luasocket-${pkgver/rc/-rc}-52
+  make DESTDIR="$pkgdir/" LUAV=5.2 prefix=/usr install
+  install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
 
 package_lua51-socket() {
   depends=('lua51')
-  cd luasocket-$pkgver
-  make DESTDIR="$pkgdir/" \
-    INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.1' \
-    INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.1' install
+  replaces=('luasocket')
+  conflicts=('luasocket')
+
+  cd luasocket-${pkgver/rc/-rc}
+  make DESTDIR="$pkgdir/" LUAV=5.1 prefix=/usr install
   install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/luasocket/luasocket-unixsocket.patch b/community/luasocket/luasocket-unixsocket.patch
deleted file mode 100644
index 07c9401fa..000000000
--- a/community/luasocket/luasocket-unixsocket.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -wbBur luasocket-2.0.2/makefile luasocket-2.0.2.my/makefile
---- luasocket-2.0.2/makefile	2007-10-15 04:21:05.000000000 +0000
-+++ luasocket-2.0.2.my/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; mkdir -p $(INSTALL_UNIX_LIB)
-+	cd src; $(INSTALL_EXEC) $(UNIX_SO) $(INSTALL_UNIX_LIB)/$(UNIX_SO)
- 
- #------
- # End of makefile
-diff -wbBur luasocket-2.0.2/src/makefile luasocket-2.0.2.my/src/makefile
---- luasocket-2.0.2/src/makefile	2007-10-15 04:21:05.000000000 +0000
-+++ luasocket-2.0.2.my/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)