Import of pkgsrc-2014Q1

security/lua-sec/Makefile

@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.3 2013/02/06 23:23:39 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.8 2014/02/12 23:18:33 tron Exp $
 
-DISTNAME=		luasec-0.4
+DISTNAME=		luasec-0.4.1
 PKGNAME=		${LUA_PKGPREFIX}-${DISTNAME:S/lua//}
 PKGREVISION=		1
 CATEGORIES=		security
-MASTER_SITES=		http://luaforge.net/frs/download.php/4255/
+MASTER_SITES=		https://github.com/brunoos/luasec/archive/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.inf.puc-rio.br/~brunoos/luasec/
+HOMEPAGE=		https://github.com/brunoos/luasec/
 COMMENT=		Lua binding for OpenSSL library
 LICENSE=		mit
 
 .include "../../mk/bsd.prefs.mk"
 
-DEPENDS+=		lua-socket>=2.0:../../net/lua-socket
+DEPENDS+=		${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
 
 USE_TOOLS+=		gmake
 
+WRKSRC=			${WRKDIR}/luasec-${DISTNAME}
 INSTALLATION_DIRS+=	${LUA_CDIR} ${LUA_LDIR}
 
 .if ${OPSYS} == "SunOS"

security/lua-sec/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/09/21 10:45:56 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2013/10/20 17:56:02 joerg Exp $
 
-SHA1 (luasec-0.4.tar.gz) = b7fe55fd2a75e0233c1d5bd858e48366422901d6
-RMD160 (luasec-0.4.tar.gz) = 61b613ac8d767545a327adc88f1dce70ceb8f64b
-Size (luasec-0.4.tar.gz) = 27829 bytes
-SHA1 (patch-aa) = 1bedbbce8f107523b0fb785efc596a0a341063b3
-SHA1 (patch-ab) = bfdee03b3d2c98ef64a9e72506be722314d01678
+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) = f0c8575451e83998dea95cd88aa251d4be0ede44
+SHA1 (patch-ab) = 1944a859495b2494d37cfd524895c9a2bd8001ac

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.3 2013/10/20 17:56:02 joerg 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
@@ -16,10 +16,16 @@ Pass installation dirs properly, fix search paths, add Solaris support
 -#INCDIR=-I/usr/local/lua-5.1/include -I/usr/local/openssl-0.9.8/include
 -#LIBDIR=-L/usr/local/openssl-0.9.8/lib -R/usr/local/openssl-0.9.8/lib
 +INCDIR=-I${PREFIX}/include
-+LIBDIR=-L${PREFIX}/lib -R${PREFIX}/lib
++LIBDIR=-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
  
  # 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"

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)