CVS commit: pkgsrc/databases/lua-tokyocabinet

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sevan
Date:           Sat Aug 20 18:49:33 UTC 2016

Modified Files:
        pkgsrc/databases/lua-tokyocabinet: Makefile PLIST distinfo
        pkgsrc/databases/lua-tokyocabinet/patches: patch-aa

Log Message:
Unbreak build on Darwin.
Add flag for Darwin linker to resolve symbols from external libraries at
runtime.
Handle dylib file extension for module.
Add comment to describe patch-aa.

ok alnsn@


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/lua-tokyocabinet/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/lua-tokyocabinet/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/lua-tokyocabinet/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 \
    pkgsrc/databases/lua-tokyocabinet/patches/patch-aa

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-tokyocabinet/Makefile
diff -u pkgsrc/databases/lua-tokyocabinet/Makefile:1.24 pkgsrc/databases/lua-tokyocabinet/Makefile:1.25
--- pkgsrc/databases/lua-tokyocabinet/Makefile:1.24     Sun Mar 15 19:57:40 2015
+++ pkgsrc/databases/lua-tokyocabinet/Makefile  Sat Aug 20 18:49:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/03/15 19:57:40 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.25 2016/08/20 18:49:33 sevan Exp $
 #
 
 DISTNAME=      tokyocabinet-lua-1.10
@@ -25,6 +25,15 @@ INSTALLATION_DIRS+=  ${LUA_DOCDIR} ${LUA_
 
 MAKE_ENV+=     INCLUDEDIR=${BUILDLINK_PREFIX.tokyocabinet}/include
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+SOEXT=                 dylib
+.else
+SOEXT=                 so
+.endif
+PLIST_SUBST+=  SOEXT=${SOEXT}
+
 post-extract:
        ${CHMOD} -R go-w ${WRKSRC}
 

Index: pkgsrc/databases/lua-tokyocabinet/PLIST
diff -u pkgsrc/databases/lua-tokyocabinet/PLIST:1.3 pkgsrc/databases/lua-tokyocabinet/PLIST:1.4
--- pkgsrc/databases/lua-tokyocabinet/PLIST:1.3 Sat May  3 13:01:24 2014
+++ pkgsrc/databases/lua-tokyocabinet/PLIST     Sat Aug 20 18:49:33 2016
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/08/20 18:49:33 sevan Exp $
 ${LUA_EXAMPLESDIR}/tcbtest.lua
 ${LUA_EXAMPLESDIR}/tcftest.lua
 ${LUA_EXAMPLESDIR}/tchtest.lua
 ${LUA_EXAMPLESDIR}/tcutest.lua
-${LUA_CDIR}/tokyocabinet.so
+${LUA_CDIR}/tokyocabinet.${SOEXT}
 ${LUA_DOCDIR}/index.html
 ${LUA_DOCDIR}/luadoc.css
 ${LUA_DOCDIR}/modules/tokyocabinet.html

Index: pkgsrc/databases/lua-tokyocabinet/distinfo
diff -u pkgsrc/databases/lua-tokyocabinet/distinfo:1.9 pkgsrc/databases/lua-tokyocabinet/distinfo:1.10
--- pkgsrc/databases/lua-tokyocabinet/distinfo:1.9      Tue Nov  3 01:56:14 2015
+++ pkgsrc/databases/lua-tokyocabinet/distinfo  Sat Aug 20 18:49:33 2016
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 01:56:14 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/08/20 18:49:33 sevan Exp $
 
 SHA1 (tokyocabinet-lua-1.10.tar.gz) = 4f182f990b53eae3fe78f1dfba0e64cc52316bef
 RMD160 (tokyocabinet-lua-1.10.tar.gz) = b0cf1183d3e9b9dc07c2cd5c32be06adbe9a1187
 SHA512 (tokyocabinet-lua-1.10.tar.gz) = 3e7eb36e603a780ddbd91a575730bced068bb4e35b2fafa75bbadadc59999233007ffa79dcf98428c20fa3b3cd3ee48aba02e498e8c35c23c7f29b3e5f906a9c
 Size (tokyocabinet-lua-1.10.tar.gz) = 111135 bytes
-SHA1 (patch-aa) = a02449c57d232192058c5673fbd3910220db856f
+SHA1 (patch-aa) = 10542bcc063a8ff430a108f255c37d125d951c10
 SHA1 (patch-ab) = 80aadd7a2ea3caef9a6965c995f526b00b6ff64f
 SHA1 (patch-tokyocabinet.c) = 329efb1d5529136c1bafec2164ad94a26d818b58

Index: pkgsrc/databases/lua-tokyocabinet/patches/patch-aa
diff -u pkgsrc/databases/lua-tokyocabinet/patches/patch-aa:1.1.1.1 pkgsrc/databases/lua-tokyocabinet/patches/patch-aa:1.2
--- pkgsrc/databases/lua-tokyocabinet/patches/patch-aa:1.1.1.1  Sat Jan 24 03:04:54 2009
+++ pkgsrc/databases/lua-tokyocabinet/patches/patch-aa  Sat Aug 20 18:49:33 2016
@@ -1,6 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/24 03:04:54 obache Exp $
+$NetBSD: patch-aa,v 1.2 2016/08/20 18:49:33 sevan Exp $
 
---- Makefile.in.orig   2008-10-12 04:17:48.000000000 +0000
+- Add place holder for flags which can be passed in from pkgsrc.
+- Add flag for Darwin linker to resolve symbols from external libraries at
+runtime. 
+
+--- Makefile.in.orig   2009-07-19 04:35:10.000000000 +0000
 +++ Makefile.in
 @@ -32,9 +32,9 @@ DESTDIR =
  
@@ -15,3 +19,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/01/24 0
  LIBS = @LIBS@
  LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
  RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
+@@ -181,7 +181,7 @@ tokyocabinet.so : $(LIBOBJFILES)
+ 
+ 
+ tokyocabinet.dylib : $(LIBOBJFILES)
+-      $(CC) $(CFLAGS) -dynamiclib -o $@ $(LIBOBJFILES) $(LDFLAGS) $(LIBS)
++      $(CC) $(CFLAGS) -dynamiclib -undefined dynamic_lookup -o $@ $(LIBOBJFILES) $(LDFLAGS) $(LIBS)
+ 
+ 
+