Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171369852572050"
MIME-Version: 1.0
Date: Sun, 21 Apr 2024 11:22:05 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/databases/lmdb
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20240421112206.01264FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171369852572050
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun Apr 21 11:22:05 UTC 2024

Modified Files:
	pkgsrc/databases/lmdb: Makefile PLIST distinfo
	pkgsrc/databases/lmdb/patches: patch-libraries_liblmdb_Makefile

Log Message:
lmdb: Libtoolize. Fix building on Mac OS X < 10.6.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/lmdb/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/lmdb/PLIST
cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/lmdb/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile

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


--_----------=_171369852572050
Content-Disposition: inline
Content-Length: 5938
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/databases/lmdb/Makefile
diff -u pkgsrc/databases/lmdb/Makefile:1.24 pkgsrc/databases/lmdb/Makefile:1.25
--- pkgsrc/databases/lmdb/Makefile:1.24	Wed Jan 31 18:17:22 2024
+++ pkgsrc/databases/lmdb/Makefile	Sun Apr 21 11:22:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2024/01/31 18:17:22 adam Exp $
+# $NetBSD: Makefile,v 1.25 2024/04/21 11:22:05 nia Exp $
 
 .include "../../databases/openldap/Makefile.version"
 
@@ -11,6 +11,7 @@ COMMENT=	Symas Lightning Memory-Mapped D
 
 USE_GCC_RUNTIME=	yes
 USE_TOOLS+=		gmake
+USE_LIBTOOL=		yes
 
 BUILD_DIRS=		libraries/liblmdb
 MAKE_FLAGS+=		CC=${CC:Q}
@@ -27,13 +28,20 @@ TEST_TARGET=		test
 
 .include "../../mk/bsd.prefs.mk"
 
+LDFLAGS+=	-lpthread
+
 .if ${OPSYS} == "SunOS" && (${OS_VERSION} == "5.9" || ${OS_VERSION} == "5.10")
 LDFLAGS+=	-lrt
 .endif
 
-.if ${OPSYS} == "Darwin"
-MAKE_FLAGS+=	SOEXT=.dylib
-MAKE_FLAGS+=	SOLIBS=-install_name\ ${PREFIX}/lib/liblmdb.dylib
+.if ${OPSYS} == "NetBSD"
+LDFLAGS+=	-lrt
+.endif
+
+.if ${OPSYS} == "Darwin" && ${OPSYS_VERSION} < 100600
+.  include "../../devel/macports-legacy-support/buildlink3.mk"
+# posix_memalign is missing before 10.6
+LDFLAGS+=	-lMacportsLegacySupport
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/databases/lmdb/PLIST
diff -u pkgsrc/databases/lmdb/PLIST:1.2 pkgsrc/databases/lmdb/PLIST:1.3
--- pkgsrc/databases/lmdb/PLIST:1.2	Sun Mar  1 21:19:29 2015
+++ pkgsrc/databases/lmdb/PLIST	Sun Apr 21 11:22:05 2024
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2015/03/01 21:19:29 mspo Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/04/21 11:22:05 nia Exp $
 bin/mdb_copy
 bin/mdb_dump
 bin/mdb_load
 bin/mdb_stat
 include/lmdb.h
-lib/liblmdb.a
-lib/liblmdb.so
+lib/liblmdb.la
 man/man1/mdb_copy.1
 man/man1/mdb_dump.1
 man/man1/mdb_load.1

Index: pkgsrc/databases/lmdb/distinfo
diff -u pkgsrc/databases/lmdb/distinfo:1.32 pkgsrc/databases/lmdb/distinfo:1.33
--- pkgsrc/databases/lmdb/distinfo:1.32	Wed Jan 31 18:17:22 2024
+++ pkgsrc/databases/lmdb/distinfo	Sun Apr 21 11:22:05 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.32 2024/01/31 18:17:22 adam Exp $
+$NetBSD: distinfo,v 1.33 2024/04/21 11:22:05 nia Exp $
 
 BLAKE2s (openldap-2.6.7.tgz) = a7090113159ce6ae7eefba54d04e0f3b68384e76e6f3b7efcc86352bb11bfc81
 SHA512 (openldap-2.6.7.tgz) = ea207b84fdb7bc6cdff2bc1201fcdde6a907f5766f9637589d956ca86ecf61d4e732ab7d80f33b18b691644e1f5fa39b00ff2c7f4084c9b85760ee693a7c451e
 Size (openldap-2.6.7.tgz) = 6484944 bytes
-SHA1 (patch-libraries_liblmdb_Makefile) = 4dd8ed43169e5615b416e7e0696dd3b16e784282
+SHA1 (patch-libraries_liblmdb_Makefile) = 4d4581090f9032f92c76fa6b6356113c7a4ae418

Index: pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile
diff -u pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.5 pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.6
--- pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.5	Sun Mar 15 21:01:47 2020
+++ pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile	Sun Apr 21 11:22:05 2024
@@ -1,9 +1,28 @@
-$NetBSD: patch-libraries_liblmdb_Makefile,v 1.5 2020/03/15 21:01:47 tnn Exp $
+$NetBSD: patch-libraries_liblmdb_Makefile,v 1.6 2024/04/21 11:22:05 nia Exp $
 
+Libtoolize.
 Use proper install commands.
 
---- libraries/liblmdb/Makefile.orig	2020-01-30 17:58:35.000000000 +0000
+--- libraries/liblmdb/Makefile.orig	2024-01-29 18:52:23.000000000 +0000
 +++ libraries/liblmdb/Makefile
+@@ -26,7 +26,7 @@ OPT = -O2 -g
+ CFLAGS	= $(THREADS) $(OPT) $(W) $(XCFLAGS)
+ LDLIBS	=
+ SOLIBS	=
+-SOEXT	= .so
++SOEXT	= .la
+ prefix	= /usr/local
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+@@ -38,7 +38,7 @@ mandir = $(datarootdir)/man
+ ########################################################################
+ 
+ IHDRS	= lmdb.h
+-ILIBS	= liblmdb.a liblmdb$(SOEXT)
++ILIBS	= liblmdb$(SOEXT)
+ IPROGS	= mdb_stat mdb_copy mdb_dump mdb_load
+ IDOCS	= mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
+ PROGS	= $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
 @@ -49,10 +49,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
  	mkdir -p $(DESTDIR)$(libdir)
  	mkdir -p $(DESTDIR)$(includedir)
@@ -13,15 +32,18 @@ Use proper install commands.
 -	for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
 -	for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
 +	for f in $(IPROGS); do $(BSD_INSTALL_PROGRAM) $$f $(DESTDIR)$(prefix)/bin; done
-+	for f in $(ILIBS); do $(BSD_INSTALL_LIB) $$f $(DESTDIR)$(prefix)/lib; done
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) liblmdb.la $(DESTDIR)$(prefix)/lib
 +	for f in $(IHDRS); do $(BSD_INSTALL_DATA) $$f $(DESTDIR)$(prefix)/include; done
 +	for f in $(IDOCS); do $(BSD_INSTALL_MAN) $$f $(DESTDIR)$(prefix)/$(PKGMANDIR)/man1; done
  
  clean:
  	rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
-@@ -68,10 +68,14 @@ liblmdb$(SOEXT):	mdb.lo midl.lo
+@@ -66,12 +66,16 @@ liblmdb.a:	mdb.o midl.o
+ 
+ liblmdb$(SOEXT):	mdb.lo midl.lo
  #	$(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
- 	$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
+-	$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
++	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -pthread -rpath $(PREFIX)/lib -o $@ mdb.lo midl.lo $(SOLIBS)
  
 -mdb_stat: mdb_stat.o liblmdb.a
 -mdb_copy: mdb_copy.o liblmdb.a
@@ -38,3 +60,16 @@ Use proper install commands.
  mtest:    mtest.o    liblmdb.a
  mtest2:	mtest2.o liblmdb.a
  mtest3:	mtest3.o liblmdb.a
+@@ -87,10 +91,10 @@ midl.o: midl.c midl.h
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c midl.c
+ 
+ mdb.lo: mdb.c lmdb.h midl.h
+-	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c -o $@
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c -o $@
+ 
+ midl.lo: midl.c midl.h
+-	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS)  $(CPPFLAGS) -c midl.c -o $@
+ 
+ %:	%.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@


--_----------=_171369852572050--