CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jul 11 14:48:58 UTC 2020

Modified Files:
        pkgsrc/databases/lua-lsqlite3: Makefile
        pkgsrc/devel/lua-bit32: Makefile
        pkgsrc/devel/lua-compat53: Makefile
        pkgsrc/devel/lua-event: Makefile
        pkgsrc/devel/lua-filesystem: Makefile
        pkgsrc/devel/lua-posix: Makefile
        pkgsrc/devel/lua-term: Makefile
        pkgsrc/textproc/lua-lyaml: Makefile
        pkgsrc/textproc/lua-utf8: Makefile

Log Message:
also use -bundle


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/lua-lsqlite3/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/lua-bit32/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/lua-compat53/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/lua-event/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/lua-filesystem/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/lua-posix/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/lua-term/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/lua-lyaml/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/lua-utf8/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/lua-lsqlite3/Makefile
diff -u pkgsrc/databases/lua-lsqlite3/Makefile:1.2 pkgsrc/databases/lua-lsqlite3/Makefile:1.3
--- pkgsrc/databases/lua-lsqlite3/Makefile:1.2  Sat Jul 11 14:20:05 2020
+++ pkgsrc/databases/lua-lsqlite3/Makefile      Sat Jul 11 14:48:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/07/11 14:20:05 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $
 
 DISTNAME=      lsqlite3_fsl09y
 PKGNAME=       ${LUA_PKGPREFIX}-lsqlite3-0.9.5
@@ -11,7 +11,7 @@ HOMEPAGE=     http://lua.sqlite.org/index.cg
 COMMENT=       Binding for Lua to the SQLite3 database library
 LICENSE=       mit
 
-LDFLAGS.Darwin+=       -undefined dynamic_lookup
+LDFLAGS.Darwin+=       -bundle -undefined dynamic_lookup
 
 INSTALLATION_DIRS+=    ${LUA_CDIR} ${LUA_LDIR}
 INSTALLATION_DIRS+=    ${LUA_DOCDIR}/examples

Index: pkgsrc/devel/lua-bit32/Makefile
diff -u pkgsrc/devel/lua-bit32/Makefile:1.2 pkgsrc/devel/lua-bit32/Makefile:1.3
--- pkgsrc/devel/lua-bit32/Makefile:1.2 Sat Jul 11 14:20:05 2020
+++ pkgsrc/devel/lua-bit32/Makefile     Sat Jul 11 14:48:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/07/11 14:20:05 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $
 
 # Keep versioning in sync with the luarocks rockspec.
 DISTNAME=      lua-compat53-0.9
@@ -16,7 +16,7 @@ LICENSE=      mit
 CONFLICTS+=    ${LUA_PKGPREFIX}-bitlib-[0-9]*
 SUPERSEDES+=   ${LUA_PKGPREFIX}-bitlib-[0-9]*
 
-LDFLAGS.Darwin+=       -undefined dynamic_lookup
+LDFLAGS.Darwin+=       -bundle -undefined dynamic_lookup
 
 INSTALLATION_DIRS+=    ${LUA_CDIR}
 

Index: pkgsrc/devel/lua-compat53/Makefile
diff -u pkgsrc/devel/lua-compat53/Makefile:1.3 pkgsrc/devel/lua-compat53/Makefile:1.4
--- pkgsrc/devel/lua-compat53/Makefile:1.3      Sat Jul 11 14:20:06 2020
+++ pkgsrc/devel/lua-compat53/Makefile  Sat Jul 11 14:48:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/07/11 14:20:06 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/07/11 14:48:57 nia Exp $
 
 DISTNAME=      lua-compat53-0.9
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME:S/^lua-//1}
@@ -14,7 +14,7 @@ LICENSE=      mit
 
 PLIST_SUBST+=  LUA_INCDIR=${LUA_INCDIR}
 
-LDFLAGS.Darwin+=       -undefined dynamic_lookup
+LDFLAGS.Darwin+=       -bundle -undefined dynamic_lookup
 
 PRINT_PLIST_AWK+=      /^${LUA_INCDIR:S|/|\\/|g}/ \
                        { gsub(/${LUA_INCDIR:S|/|\\/|g}/, "$${LUA_INCDIR}") }

Index: pkgsrc/devel/lua-event/Makefile
diff -u pkgsrc/devel/lua-event/Makefile:1.2 pkgsrc/devel/lua-event/Makefile:1.3
--- pkgsrc/devel/lua-event/Makefile:1.2 Sat Jul 11 14:20:06 2020
+++ pkgsrc/devel/lua-event/Makefile     Sat Jul 11 14:48:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/07/11 14:20:06 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $
 
 DISTNAME=      luaevent-0.4.6
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME:S/^lua//1}
@@ -14,7 +14,7 @@ LICENSE=      mit
 
 BUILD_DIRS+=   src
 
-LDFLAGS.Darwin+=       -undefined dynamic_lookup
+LDFLAGS.Darwin+=       -bundle -undefined dynamic_lookup
 
 INSTALLATION_DIRS+=    ${LUA_DOCDIR}
 INSTALLATION_DIRS+=    ${LUA_DOCDIR}/modules

Index: pkgsrc/devel/lua-filesystem/Makefile
diff -u pkgsrc/devel/lua-filesystem/Makefile:1.16 pkgsrc/devel/lua-filesystem/Makefile:1.17
--- pkgsrc/devel/lua-filesystem/Makefile:1.16   Sat Jul 11 14:32:15 2020
+++ pkgsrc/devel/lua-filesystem/Makefile        Sat Jul 11 14:48:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/07/11 14:32:15 nia Exp $
+# $NetBSD: Makefile,v 1.17 2020/07/11 14:48:58 nia Exp $
 #
 
 DISTNAME=              luafilesystem-1.8.0
@@ -25,7 +25,7 @@ MAKE_FLAGS+=          CC=${CC}
 MAKE_FLAGS+=           CFLAGS="${CFLAGS} -fPIC"
 MAKE_FLAGS+=           LUA_VERSION=${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
 
-LDFLAGS.Darwin+=       -undefined dynamic_lookup
+LDFLAGS.Darwin+=       -bundle -undefined dynamic_lookup
 
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/lua-posix/Makefile
diff -u pkgsrc/devel/lua-posix/Makefile:1.20 pkgsrc/devel/lua-posix/Makefile:1.21
--- pkgsrc/devel/lua-posix/Makefile:1.20        Sat Jul 11 14:34:22 2020
+++ pkgsrc/devel/lua-posix/Makefile     Sat Jul 11 14:48:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/07/11 14:34:22 nia Exp $
+# $NetBSD: Makefile,v 1.21 2020/07/11 14:48:58 nia Exp $
 
 DISTNAME=      luaposix-34.1.1
 PKGNAME=       ${DISTNAME:S/lua/${LUA_PKGPREFIX}-/}
@@ -27,7 +27,7 @@ DEPENDS+=     lua51-bit32-[0-9]*:../../devel
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-LIBFLAG+=      ${LDFLAGS} -shared -fPIC -undefined dynamic_lookup
+LIBFLAG+=      ${LDFLAGS} -fPIC -bundle -undefined dynamic_lookup
 .else
 LIBFLAG+=      ${LDFLAGS} -shared -fPIC
 .endif

Index: pkgsrc/devel/lua-term/Makefile
diff -u pkgsrc/devel/lua-term/Makefile:1.3 pkgsrc/devel/lua-term/Makefile:1.4
--- pkgsrc/devel/lua-term/Makefile:1.3  Sat Jul 11 14:35:13 2020
+++ pkgsrc/devel/lua-term/Makefile      Sat Jul 11 14:48:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/07/11 14:35:13 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/07/11 14:48:58 nia Exp $
 
 DISTNAME=      lua-term-0.07
 PKGNAME=       ${DISTNAME:S/lua/${LUA_PKGPREFIX}/}
@@ -19,7 +19,7 @@ MAKE_FLAGS+=  LUA_INC=${PREFIX}/${LUA_INC
 MAKE_FLAGS+=   LUA_LIBDIR=${PREFIX}/${LUA_CDIR}/term
 MAKE_FLAGS+=   LUA_SHARE=${PREFIX}/${LUA_LDIR}/term
 
-LDFLAGS.Darwin+=       -undefined dynamic_lookup
+LDFLAGS.Darwin+=       -bundle -undefined dynamic_lookup
 
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/lua-lyaml/Makefile
diff -u pkgsrc/textproc/lua-lyaml/Makefile:1.2 pkgsrc/textproc/lua-lyaml/Makefile:1.3
--- pkgsrc/textproc/lua-lyaml/Makefile:1.2      Sat Jul 11 14:20:06 2020
+++ pkgsrc/textproc/lua-lyaml/Makefile  Sat Jul 11 14:48:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/07/11 14:20:06 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $
 
 DISTNAME=      lyaml-6.2.5
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME}
@@ -16,7 +16,7 @@ BUILD_DIRS=   ext/yaml
 
 MAKE_FLAGS+=   PKGVERSION=${PKGVERSION}
 
-LDFLAGS.Darwin+=       -undefined dynamic_lookup
+LDFLAGS.Darwin+=       -bundle -undefined dynamic_lookup
 
 INSTALLATION_DIRS+=    ${LUA_DOCDIR}
 INSTALLATION_DIRS+=    ${LUA_CDIR}

Index: pkgsrc/textproc/lua-utf8/Makefile
diff -u pkgsrc/textproc/lua-utf8/Makefile:1.2 pkgsrc/textproc/lua-utf8/Makefile:1.3
--- pkgsrc/textproc/lua-utf8/Makefile:1.2       Sat Jul 11 14:20:06 2020
+++ pkgsrc/textproc/lua-utf8/Makefile   Sat Jul 11 14:48:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/07/11 14:20:06 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/07/11 14:48:57 nia Exp $
 
 DISTNAME=      lua-utf8-0.1.2
 PKGNAME=       ${DISTNAME:S/lua-/${LUA_PKGPREFIX}-/1}
@@ -13,7 +13,7 @@ LICENSE=      mit
 
 WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
-LDFLAGS.Darwin+=       -undefined dynamic_lookup
+LDFLAGS.Darwin+=       -bundle -undefined dynamic_lookup
 
 INSTALLATION_DIRS+=    ${LUA_CDIR}