CVS commit: pkgsrc/devel/lua-lpeg

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 22 18:16:58 UTC 2025

Modified Files:
        pkgsrc/devel/lua-lpeg: Makefile distinfo
        pkgsrc/devel/lua-lpeg/patches: patch-makefile
Added Files:
        pkgsrc/devel/lua-lpeg: PLIST.Darwin

Log Message:
lua-lpeg: on Darwin, build and install lpeg.dylib, which is required for neovim; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/lua-lpeg/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/lua-lpeg/PLIST.Darwin
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/lua-lpeg/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/lua-lpeg/patches/patch-makefile

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

Modified files:

Index: pkgsrc/devel/lua-lpeg/Makefile
diff -u pkgsrc/devel/lua-lpeg/Makefile:1.19 pkgsrc/devel/lua-lpeg/Makefile:1.20
--- pkgsrc/devel/lua-lpeg/Makefile:1.19 Sat Dec 30 21:05:26 2023
+++ pkgsrc/devel/lua-lpeg/Makefile      Wed Jan 22 18:16:58 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2023/12/30 21:05:26 zafer Exp $
+# $NetBSD: Makefile,v 1.20 2025/01/22 18:16:58 adam Exp $
 
 DISTNAME=      lpeg-1.1.0
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/lpeg/${LUA_PKGPREFIX}-lpeg/}
 CATEGORIES=    devel lua
 MASTER_SITES=  https://www.inf.puc-rio.br/~roberto/lpeg/
@@ -12,6 +13,8 @@ LICENSE=      mit
 
 NO_CONFIGURE=  yes
 USE_TOOLS+=    gmake
+# For Darwin
+MAKE_ENV+=     LUA_CDIR=${LUA_CDIR}
 MAKE_FILE=     makefile
 TEST_TARGET=   test
 
@@ -26,17 +29,23 @@ SUBST_SED.test=             -e 's,/usr/bin/env *lua
 
 INSTALLATION_DIRS+=    ${LUA_CDIR} ${LUA_LDIR} ${LUA_DOCDIR}
 
+.include "../../mk/bsd.prefs.mk"
+
 do-install:
+.if ${OPSYS} == "Darwin"
+       ${INSTALL_LIB} ${WRKSRC}/lpeg.dylib \
+               ${DESTDIR}${PREFIX}/${LUA_CDIR}
+.endif
        ${INSTALL_LIB} ${WRKSRC}/lpeg.so \
-                       ${DESTDIR}${PREFIX}/${LUA_CDIR}
+               ${DESTDIR}${PREFIX}/${LUA_CDIR}
        ${INSTALL_DATA} ${WRKSRC}/re.lua \
-                       ${DESTDIR}${PREFIX}/${LUA_LDIR}
+               ${DESTDIR}${PREFIX}/${LUA_LDIR}
        ${INSTALL_DATA} ${WRKSRC}/*.html \
-                       ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
+               ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/lpeg-128.gif \
-                       ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
+               ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/HISTORY \
-                       ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
+               ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
 
 .include "../../lang/lua/module.mk"
 .include "../../lang/lua/application.mk"

Index: pkgsrc/devel/lua-lpeg/distinfo
diff -u pkgsrc/devel/lua-lpeg/distinfo:1.12 pkgsrc/devel/lua-lpeg/distinfo:1.13
--- pkgsrc/devel/lua-lpeg/distinfo:1.12 Wed Jul  5 22:03:44 2023
+++ pkgsrc/devel/lua-lpeg/distinfo      Wed Jan 22 18:16:58 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2023/07/05 22:03:44 wiz Exp $
+$NetBSD: distinfo,v 1.13 2025/01/22 18:16:58 adam Exp $
 
 BLAKE2s (lpeg-1.1.0.tar.gz) = d3681bbc523cb81bc921bb22ce5a4ccaae8ce593916ba17b573b788b05651e75
 SHA512 (lpeg-1.1.0.tar.gz) = 01b2a4ceb2d110e143603bc63c84a59736ea735dd0ed9866286ba115d41be48d09c9ff21c8e2327974d2296944f6508d50a5c3a18f26ac1d81b8b2fc41f61222
 Size (lpeg-1.1.0.tar.gz) = 78042 bytes
-SHA1 (patch-makefile) = e229f3278a5dde00a4ef6736459caca4deeacea6
+SHA1 (patch-makefile) = fc723ba72934aa34e1a0febb2dc21cd7b77eb731

Index: pkgsrc/devel/lua-lpeg/patches/patch-makefile
diff -u pkgsrc/devel/lua-lpeg/patches/patch-makefile:1.2 pkgsrc/devel/lua-lpeg/patches/patch-makefile:1.3
--- pkgsrc/devel/lua-lpeg/patches/patch-makefile:1.2    Mon Mar 25 22:55:18 2019
+++ pkgsrc/devel/lua-lpeg/patches/patch-makefile        Wed Jan 22 18:16:58 2025
@@ -1,11 +1,15 @@
-$NetBSD: patch-makefile,v 1.2 2019/03/25 22:55:18 wiz Exp $
+$NetBSD: patch-makefile,v 1.3 2025/01/22 18:16:58 adam Exp $
 
 Honor LDFLAGS for RELRO builds.
+On Darwin, build dylib for neovim.
 
---- makefile.orig      2019-03-11 14:08:29.000000000 +0000
+--- makefile.orig      2023-06-26 16:30:55.000000000 +0000
 +++ makefile
-@@ -36,7 +36,7 @@ macosx:
+@@ -37,9 +37,10 @@ linux:
+ # For Mac OS
+ macosx:
        $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
++      env $(CC) -dynamiclib -Wl,-undefined,dynamic_lookup,-install_name,${PREFIX}/${LUA_CDIR}/lpeg.dylib $(FILES) -o lpeg.dylib
  
  lpeg.so: $(FILES)
 -      env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so

Added files:

Index: pkgsrc/devel/lua-lpeg/PLIST.Darwin
diff -u /dev/null pkgsrc/devel/lua-lpeg/PLIST.Darwin:1.1
--- /dev/null   Wed Jan 22 18:16:58 2025
+++ pkgsrc/devel/lua-lpeg/PLIST.Darwin  Wed Jan 22 18:16:58 2025
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2025/01/22 18:16:58 adam Exp $
+${LUA_CDIR}/lpeg.dylib