Import of pkgsrc-2015Q1

devel/lua-posix/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2014/01/28 11:53:07 obache Exp $
+# $NetBSD: Makefile,v 1.11 2015/03/18 10:24:49 joerg Exp $
 
 DISTNAME=	luaposix-release-v31
 PKGNAME=	${DISTNAME:S/lua/${LUA_PKGPREFIX}-/:S/release-v//}
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	-https://github.com/luaposix/luaposix/archive/release-v31.tar.gz
 
@@ -10,22 +11,29 @@ HOMEPAGE=	https://github.com/luaposix/luaposix
 COMMENT=	POSIX library (including curses) for lua
 LICENSE=	mit
 
+LUA_VERSIONS_INCOMPATIBLE=	53
+
 GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c99
 USE_TOOLS+=	perl:build
 USE_LIBTOOL=	yes
 
 GNU_CONFIGURE_LIBDIR=	${PREFIX}/${LUA_CDIR}
-CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PKGNAME_NOREV}
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/${PKGNAME_NOREV}
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/${LUA_DOCDIR}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/${LUA_LDIR}
+
+INSTALLATION_DIRS+=	${LUA_LDIR} ${LUA_CDIR}
+
+.include "../../lang/lua/luaversion.mk"
+
+.if ${LUA_PKGPREFIX} == "lua51"
+DEPENDS+=	lua51-BitOp-[0-9]*:../../devel/lua-BitOp
+.endif
 
 post-patch:
 	${TOUCH} ${WRKSRC}/configure ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in
 
-post-install:
-	cd ${DESTDIR}${PREFIX}/${LUA_CDIR} && \
-	${LN} -fs ../../../share/${PKGNAME}/posix.lua && \
-	${LN} -fs ../../../share/${PKGNAME}/curses.lua
-
 .include "../../lang/lua/module.mk"
+.include "../../lang/lua/tool.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

devel/lua-posix/PLIST

@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2013/10/30 06:04:16 dholland Exp $
-${LUA_CDIR}/curses.lua
+@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $
+${LUA_LDIR}/curses.lua
+${LUA_LDIR}/posix.lua
 ${LUA_CDIR}/curses_c.la
-${LUA_CDIR}/posix.lua
 ${LUA_CDIR}/posix_c.la
-share/doc/${PKGNAME}/curses.html
-share/doc/${PKGNAME}/curses_c.html
-share/doc/${PKGNAME}/index.html
-share/doc/${PKGNAME}/ldoc.css
-share/${PKGNAME}/curses.lua
-share/${PKGNAME}/posix.lua
+${LUA_DOCDIR}/curses.html
+${LUA_DOCDIR}/curses_c.html
+${LUA_DOCDIR}/index.html
+${LUA_DOCDIR}/ldoc.css

devel/lua-posix/distinfo

@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2013/09/17 16:23:54 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2014/04/23 14:47:43 fhajny Exp $
 
 SHA1 (luaposix-release-v31.tar.gz) = 8cce36b34f7b1742b14e989f26f021e14053a6dd
 RMD160 (luaposix-release-v31.tar.gz) = 4a3f893f34a96570627a3840ac99a8088e230b82
 Size (luaposix-release-v31.tar.gz) = 528979 bytes
 SHA1 (patch-config.h.in) = 37315685228cddfd6972c2d65684fdcfcf7407eb
-SHA1 (patch-configure) = 82e396c05fc2973181eb49b68ebdc0caf2c36d74
+SHA1 (patch-configure) = 4aa876d026793424eaf1d700012ae366cbc6d111
 SHA1 (patch-configure.ac) = ef891429af91c5e220bcd04e8b9a94e12a538cc3
 SHA1 (patch-ext_curses_curses.c) = fd06c59d4d4f8f69eed4233a995841496e786d32
 SHA1 (patch-ext_posix_posix.c) = f2ec88b0be842af327c13c0898de1bfe0d165477

devel/lua-posix/patches/patch-configure

@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2013/09/14 09:06:48 ryoon Exp $
+$NetBSD: patch-configure,v 1.2 2014/04/23 14:47:43 fhajny Exp $
 
 --- configure.orig	2013-09-09 07:15:14.000000000 +0000
 +++ configure
@@ -93,3 +93,41 @@ $NetBSD: patch-configure,v 1.1 2013/09/14 09:06:48 ryoon Exp $
  if test Darwin != `uname`; then
    # FIXME: Make -lrt conditional on _XOPEN_REALTIME
    POSIX_EXTRA_CFLAGS=-D_XOPEN_SOURCE=700
+@@ -13690,7 +13758,7 @@ fi
+ $as_echo_n "checking $_ax_check_text... " >&6; }
+ 
+   _ax_test_ver=`$LUA -e "print(_VERSION)" 2>/dev/null | \
+-    sed "s|^Lua \(.*\)|\1|" | grep -o "^[0-9]\+\\.[0-9]\+"`
++    sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"`
+   if test "x$_ax_test_ver" = 'x'; then :
+   _ax_test_ver='0'
+ fi
+@@ -13796,7 +13864,7 @@ fi
+ 
+ 
+   _ax_test_ver=`$ax_cv_pathless_LUA -e "print(_VERSION)" 2>/dev/null | \
+-    sed "s|^Lua \(.*\)|\1|" | grep -o "^[0-9]\+\\.[0-9]\+"`
++    sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"`
+   if test "x$_ax_test_ver" = 'x'; then :
+   _ax_test_ver='0'
+ fi
+@@ -13941,8 +14009,7 @@ if ${ax_cv_lua_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+    ax_cv_lua_version=`$LUA -e "print(_VERSION)" | \
+-          sed "s|^Lua \(.*\)|\1|" | \
+-          grep -o "^[0-9]\+\\.[0-9]\+"`
++          sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"`
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lua_version" >&5
+@@ -14181,8 +14248,7 @@ int main(int argc, char ** argv)
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+    ax_cv_lua_header_version=`./conftest$EXEEXT p | \
+-                sed "s|^Lua \(.*\)|\1|" | \
+-                grep -o "^[0-9]\+\\.[0-9]\+"`
++                sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"`
+ 
+ else
+   ax_cv_lua_header_version='unknown'