Fri Sep 13 14:24:29 2013 UTC ()
Fix on (at least) SunOS by passing proper LDFLAGS. Bump PKGREVISION.


(fhajny)
diff -r1.4 -r1.5 pkgsrc/net/lua-socket/Makefile
diff -r1.2 -r1.3 pkgsrc/net/lua-socket/distinfo
diff -r0 -r1.1 pkgsrc/net/lua-socket/patches/patch-makefile
diff -r0 -r1.1 pkgsrc/net/lua-socket/patches/patch-src_makefile
cvs diff -r1.4 -r1.5 pkgsrc/net/lua-socket/Makefile (expand / switch to unified diff)

--- pkgsrc/net/lua-socket/Makefile 2013/09/01 04:45:58 1.4
+++ pkgsrc/net/lua-socket/Makefile 2013/09/13 14:24:28 1.5
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.4 2013/09/01 04:45:58 ryoon Exp $ 1# $NetBSD: Makefile,v 1.5 2013/09/13 14:24:28 fhajny Exp $
2# 2#
3 3
4DISTNAME= luasocket-3.0-rc1 4DISTNAME= luasocket-3.0-rc1
5PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//:S/-rc/rc/} 5PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//:S/-rc/rc/}
 6PKGREVISION= 1
6CATEGORIES= net 7CATEGORIES= net
7MASTER_SITES= -https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz 8MASTER_SITES= -https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://w3.impa.br/~diego/software/luasocket/ 11HOMEPAGE= http://w3.impa.br/~diego/software/luasocket/
11COMMENT= Network support for the Lua language 12COMMENT= Network support for the Lua language
12LICENSE= mit 13LICENSE= mit
13 14
14FETCH_USING= curl 15FETCH_USING= curl
15 16
16MAKE_FILE= makefile 17MAKE_FILE= makefile
17 18
18LDFLAGS.SunOS= -lrt -lresolv 19LDFLAGS.SunOS= -lrt -lresolv
cvs diff -r1.2 -r1.3 pkgsrc/net/lua-socket/distinfo (expand / switch to unified diff)

--- pkgsrc/net/lua-socket/distinfo 2013/09/01 04:45:58 1.2
+++ pkgsrc/net/lua-socket/distinfo 2013/09/13 14:24:28 1.3
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
1$NetBSD: distinfo,v 1.2 2013/09/01 04:45:58 ryoon Exp $ 1$NetBSD: distinfo,v 1.3 2013/09/13 14:24:28 fhajny Exp $
2 2
3SHA1 (luasocket-3.0-rc1.tar.gz) = aff9122b26c01487c06a32133df78c1506af350f 3SHA1 (luasocket-3.0-rc1.tar.gz) = aff9122b26c01487c06a32133df78c1506af350f
4RMD160 (luasocket-3.0-rc1.tar.gz) = 27357eee7e52f091609f45a0b0fb7e04e9ea2bd8 4RMD160 (luasocket-3.0-rc1.tar.gz) = 27357eee7e52f091609f45a0b0fb7e04e9ea2bd8
5Size (luasocket-3.0-rc1.tar.gz) = 328598 bytes 5Size (luasocket-3.0-rc1.tar.gz) = 328598 bytes
 6SHA1 (patch-makefile) = 2a6380adfa8f7ef63e70e0de9ef4eb4e76eff334
 7SHA1 (patch-src_makefile) = e62f5f133a5c17e6563aefe8de335b93899b2f64
File Added: pkgsrc/net/lua-socket/patches/patch-makefile
$NetBSD: patch-makefile,v 1.1 2013/09/13 14:24:28 fhajny Exp $

Pass our LDFLAGS.
--- makefile.orig	2013-06-14 11:27:32.000000000 +0000
+++ makefile
@@ -15,7 +15,7 @@ PLATS= macosx linux win32 mingw
 all: $(PLAT)
 
 $(PLATS) none install install-unix local clean:
-	$(MAKE) -C src $@
+	$(MAKE) -C src $@ MYLDFLAGS="$(LDFLAGS)"
 
 print:
 	$(MAKE) -C src $@
File Added: pkgsrc/net/lua-socket/patches/patch-src_makefile
$NetBSD: patch-src_makefile,v 1.1 2013/09/13 14:24:28 fhajny Exp $

Pass our LDFLAGS.
--- src/makefile.orig	2013-06-14 11:27:32.000000000 +0000
+++ src/makefile
@@ -151,7 +151,7 @@ DEF_linux=-DLUASOCKET_$(DEBUG) -DLUA_$(C
 	-DMIME_API='__attribute__((visibility("default")))'
 CFLAGS_linux= -I$(LUAINC) $(DEF) -pedantic -Wall -Wshadow -Wextra \
 	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
-LDFLAGS_linux=-O -shared -fpic -o 
+LDFLAGS_linux=-O -shared -fpic $(MYLDFLAGS) -o  
 LD_linux=gcc
 SOCKET_linux=usocket.o