CVS commit: pkgsrc/databases/lmdb

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Aug 14 14:10:54 UTC 2026

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

Log Message:
lmdb: restore usage of LDFLAGS from pkgsrc

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/lmdb/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/lmdb/distinfo
cvs rdiff -u -r1.10 -r1.11 \
    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.

Modified files:

Index: pkgsrc/databases/lmdb/Makefile
diff -u pkgsrc/databases/lmdb/Makefile:1.29 pkgsrc/databases/lmdb/Makefile:1.30
--- pkgsrc/databases/lmdb/Makefile:1.29 Fri Aug 14 12:14:46 2026
+++ pkgsrc/databases/lmdb/Makefile      Fri Aug 14 14:10:54 2026
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2026/08/14 12:14:46 adam Exp $
+# $NetBSD: Makefile,v 1.30 2026/08/14 14:10:54 wiz Exp $
 
 .include "../../databases/openldap/Makefile.version"
 
 # get the version from libraries/liblmdb/lmdb.h
 PKGNAME=       lmdb-1.0.1
+PKGREVISION=   1
 CATEGORIES=    databases
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/databases/lmdb/distinfo
diff -u pkgsrc/databases/lmdb/distinfo:1.42 pkgsrc/databases/lmdb/distinfo:1.43
--- pkgsrc/databases/lmdb/distinfo:1.42 Fri Aug 14 12:14:46 2026
+++ pkgsrc/databases/lmdb/distinfo      Fri Aug 14 14:10:54 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.42 2026/08/14 12:14:46 adam Exp $
+$NetBSD: distinfo,v 1.43 2026/08/14 14:10:54 wiz Exp $
 
 BLAKE2s (openldap-2.7.0.tgz) = 177e508e7d0558a7f85a71e016d482e5c3ec182e5bda0abdb2fc3d98ac3ba198
 SHA512 (openldap-2.7.0.tgz) = a266f8a9a24f18174595c699d0da51bbfde15068160740193d21fe6fdf585c45a6ff7ab9e7829dfe8bbd7bf87494b7996c1470a0d84bf79b557b377e800aa551
 Size (openldap-2.7.0.tgz) = 6505512 bytes
-SHA1 (patch-libraries_liblmdb_Makefile) = 2b8cc60a1bb062fae19e3ccc9097b80c81309a8a
+SHA1 (patch-libraries_liblmdb_Makefile) = 259eec0a50a7339a8e0c5a2baa3f5e6926ef2ca4

Index: pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile
diff -u pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.10 pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.11
--- pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.10 Fri Aug 14 12:14:46 2026
+++ pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile      Fri Aug 14 14:10:54 2026
@@ -1,18 +1,19 @@
-$NetBSD: patch-libraries_liblmdb_Makefile,v 1.10 2026/08/14 12:14:46 adam Exp $
+$NetBSD: patch-libraries_liblmdb_Makefile,v 1.11 2026/08/14 14:10:54 wiz Exp $
 
+Do not override optimizations and LDFLAGS from environment.
 Libtoolize.
 Use proper install commands.
 
 --- libraries/liblmdb/Makefile.orig    2026-08-06 17:17:48.000000000 +0000
 +++ libraries/liblmdb/Makefile
-@@ -22,12 +22,12 @@ CC = gcc
+@@ -22,12 +22,11 @@ THREADS = -pthread
  AR    = ar
  W     = -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized
  THREADS = -pthread
 -OPT = -O2 -g
 +OPT =
  CFLAGS        = $(THREADS) $(OPT) $(W) $(XCFLAGS)
- LDFLAGS = $(THREADS)
+-LDFLAGS = $(THREADS)
  LDLIBS        = 
  SOLIBS        = 
 -SOEXT = .so
@@ -20,7 +21,7 @@ Use proper install commands.
  LDL           = -ldl
  
  LIBVER        = 1
-@@ -42,12 +42,12 @@ bindir = $(exec_prefix)/bin
+@@ -42,12 +41,12 @@ datarootdir = $(prefix)/share
  libdir = $(exec_prefix)/lib
  includedir = $(prefix)/include
  datarootdir = $(prefix)/share
@@ -35,7 +36,7 @@ Use proper install commands.
  ILIBS2        = liblmdb$(SOFULL)
  IPROGS        = mdb_stat mdb_copy mdb_dump mdb_load mdb_drop
  IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1 mdb_drop.1
-@@ -58,7 +58,7 @@ VERSION_OPT  = -Wl,-soname,$(SOVER)
+@@ -58,7 +57,7 @@ VERSION_OPT  = -Wl,-soname,$(SOVER)
  # For MacOSX:
  #VERSION_OPT  = -Wl,-current_version,$(VEREXT)
  
@@ -44,7 +45,7 @@ Use proper install commands.
  # Requires CPPFLAGS=-DMDB_VL32 and/or -DMDB_RPAGE_CACHE
  rall: all $(RPROGS)
  
-@@ -67,15 +67,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
+@@ -67,15 +66,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
        mkdir -p $(DESTDIR)$(libdir)
        mkdir -p $(DESTDIR)$(includedir)
        mkdir -p $(DESTDIR)$(mandir)/man1
@@ -64,7 +65,7 @@ Use proper install commands.
  
  clean:
        rm -rf $(PROGS) $(RPROGS) *.[ao] *.[ls]o *.so.* *~ testdb
-@@ -87,22 +82,19 @@ test:      all
+@@ -87,22 +81,19 @@ liblmdb.a: mdb.o midl.o module.o
  liblmdb.a:    mdb.o midl.o module.o
        $(AR) rs $@ mdb.o midl.o module.o
  
@@ -73,7 +74,9 @@ Use proper install commands.
 -      $(CC) $(LDFLAGS) -shared $(VERSION_OPT) -o $@ mdb.lo midl.lo module.lo $(SOLIBS) $(LDL)
 -      rm -f liblmdb$(SOEXT); ln -s $@ liblmdb$(SOEXT)
 -      rm -f $(SOVER); ln -s $@ $(SOVER)
--
++liblmdb$(SOEXT):      mdb.lo midl.lo module.lo
++      $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -pthread -rpath $(PREFIX)/lib -o $@ mdb.lo midl.lo module.lo $(SOLIBS)
+ 
 -mdb_stat: mdb_stat.o liblmdb.a
 -      $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
 -mdb_copy: mdb_copy.o liblmdb.a
@@ -84,9 +87,6 @@ Use proper install commands.
 -      $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
 -mdb_drop: mdb_drop.o liblmdb.a
 -      $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
-+liblmdb$(SOEXT):      mdb.lo midl.lo module.lo
-+      $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -pthread -rpath $(PREFIX)/lib -o $@ mdb.lo midl.lo module.lo $(SOLIBS)
-+
 +mdb_stat: mdb_stat.o liblmdb$(SOEXT)
 +      $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $< -L. -llmdb -o $@
 +mdb_copy: mdb_copy.o liblmdb$(SOEXT)
@@ -100,7 +100,7 @@ Use proper install commands.
  mtest:    mtest.o    liblmdb.a
  mtest2:       mtest2.o liblmdb.a
  mtest3:       mtest3.o liblmdb.a
-@@ -130,13 +122,13 @@ midl.o: midl.c midl.h
+@@ -130,13 +121,13 @@ mdb.lo: mdb.c lmdb.h midl.h
        $(CC) $(CFLAGS) $(CPPFLAGS) -c midl.c
  
  mdb.lo: mdb.c lmdb.h midl.h