diff options
| author | fhajny <fhajny> | 2013-09-13 14:32:19 +0000 |
|---|---|---|
| committer | fhajny <fhajny> | 2013-09-13 14:32:19 +0000 |
| commit | a4a4640b8d1853a4fd340929fa798a131554384a (patch) | |
| tree | d0faa30d7fa13b534c01c90c3d61b8132e36553e | |
| parent | 08681b24420c325b6c83b0dcb67b2e42625a7dbc (diff) | |
| download | pkgsrc-a4a4640b8d1853a4fd340929fa798a131554384a.tar.gz | |
Fix build on SunOS. Define LUA_COMPAT_MODULE to make this work on lua-5.2.
| -rw-r--r-- | security/lua-sec/distinfo | 6 | ||||
| -rw-r--r-- | security/lua-sec/patches/patch-aa | 12 | ||||
| -rw-r--r-- | security/lua-sec/patches/patch-ab | 18 |
3 files changed, 25 insertions, 11 deletions
diff --git a/security/lua-sec/distinfo b/security/lua-sec/distinfo index 99fa9f4513d..00ae2fca5e9 100644 --- a/security/lua-sec/distinfo +++ b/security/lua-sec/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2013/09/13 12:17:19 fhajny Exp $ +$NetBSD: distinfo,v 1.3 2013/09/13 14:32:19 fhajny Exp $ SHA1 (luasec-0.4.1.tar.gz) = fe4588676e15eab7b34b84dbbfda6e68f6692f9a RMD160 (luasec-0.4.1.tar.gz) = 6a7084441352240acb2f0b8b599a6dc59e7e2e81 Size (luasec-0.4.1.tar.gz) = 28695 bytes -SHA1 (patch-aa) = 1bedbbce8f107523b0fb785efc596a0a341063b3 -SHA1 (patch-ab) = bfdee03b3d2c98ef64a9e72506be722314d01678 +SHA1 (patch-aa) = f21b7212ee9650044bc1f56ea8dbdc71bcf525fc +SHA1 (patch-ab) = 1944a859495b2494d37cfd524895c9a2bd8001ac diff --git a/security/lua-sec/patches/patch-aa b/security/lua-sec/patches/patch-aa index 3f3b01414f9..026cee64004 100644 --- a/security/lua-sec/patches/patch-aa +++ b/security/lua-sec/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/09/21 10:45:56 fhajny Exp $ +$NetBSD: patch-aa,v 1.2 2013/09/13 14:32:19 fhajny Exp $ Pass installation dirs properly, fix search paths, add Solaris support ---- Makefile.orig 2009-10-15 12:59:54.000000000 +0000 +--- Makefile.orig 2012-09-02 14:40:59.000000000 +0000 +++ Makefile -@@ -1,11 +1,11 @@ +@@ -1,16 +1,16 @@ # Inform the location to intall the modules -LUAPATH=/usr/local/share/lua/5.1 -LUACPATH=/usr/local/lib/lua/5.1 @@ -20,6 +20,12 @@ Pass installation dirs properly, fix search paths, add Solaris support # For Mac OS X: set the system version MACOSX_VERSION=10.4 + +-DEFS=-DBUFFER_DEBUG ++DEFS=-DBUFFER_DEBUG -DLUA_COMPAT_MODULE + + #---------------------- + # Do not edit this part @@ -24,6 +24,7 @@ none: @echo " * linux" @echo " * bsd" diff --git a/security/lua-sec/patches/patch-ab b/security/lua-sec/patches/patch-ab index eced418f500..ea611476051 100644 --- a/security/lua-sec/patches/patch-ab +++ b/security/lua-sec/patches/patch-ab @@ -1,9 +1,17 @@ -$NetBSD: patch-ab,v 1.1.1.1 2010/09/21 10:45:56 fhajny Exp $ +$NetBSD: patch-ab,v 1.2 2013/09/13 14:32:19 fhajny Exp $ -Add Solaris support - ---- src/Makefile.orig 2009-10-15 12:59:54.000000000 +0000 +Pass proper libs for SunOS. +--- src/Makefile.orig 2012-09-02 14:40:59.000000000 +0000 +++ src/Makefile +@@ -9,7 +9,7 @@ OBJS= \ + context.o \ + ssl.o + +-LIBS=-lssl -lcrypto ++LIBS=-lssl -lcrypto $(MYLIBS) + + WARN=-Wall -pedantic + @@ -23,8 +23,11 @@ MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$( MAC_CFLAGS=-O2 -fno-common $(WARN) $(INCDIR) $(DEFS) MAC_LDFLAGS=-bundle -undefined dynamic_lookup $(LIBDIR) @@ -34,7 +42,7 @@ Add Solaris support @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" +solaris: -+ @$(MAKE) $(CMOD) MYCFLAGS="$(SOL_CFLAGS)" MYLDFLAGS="$(SOL_LDFLAGS)" ++ @$(MAKE) $(CMOD) MYCFLAGS="$(SOL_CFLAGS)" MYLDFLAGS="$(SOL_LDFLAGS)" MYLIBS="-lsocket -lresolv -lnsl" $(CMOD): $(OBJS) $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) |