diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile index d1e7e4ca6e34..7f660b24d5e4 100644 --- a/databases/lmdb/Makefile +++ b/databases/lmdb/Makefile @@ -1,38 +1,37 @@ PORTNAME= lmdb -PORTVERSION= 0.9.35 +PORTVERSION= 1.0.0 DISTVERSIONPREFIX= ${PORTNAME:tu}_ PORTEPOCH= 1 CATEGORIES= databases MAINTAINER= delphij@FreeBSD.org COMMENT= OpenLDAP Lightning Memory-Mapped Database WWW= https://symas.com/lmdb/ LICENSE= OPENLDAP LICENSE_NAME= OpenLDAP Public License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept WRKSRC_SUBDIR= libraries/liblmdb MAKE_ARGS+= CC="${CC}" MAKE_ARGS+= prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" MAKE_ARGS+= INSTALL_LIB="${INSTALL_LIB}" INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}" USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= openldap GH_PROJECT= openldap SUB_FILES+= lmdb.pc SUB_LIST+= PORTVERSION=${PORTVERSION} post-install: - ${LN} -sf liblmdb.so.0 ${STAGEDIR}${PREFIX}/lib/liblmdb.so ${INSTALL_DATA} ${WRKDIR}/lmdb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig do-test: ${MKDIR} ${WRKSRC}/testdb cd ${WRKSRC} && ./mtest* .include diff --git a/databases/lmdb/distinfo b/databases/lmdb/distinfo index 7ee2306c3883..7c4213d2fbe5 100644 --- a/databases/lmdb/distinfo +++ b/databases/lmdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1770161944 -SHA256 (openldap-openldap-LMDB_0.9.35_GH0.tar.gz) = 0d090c6a7c85a4f31a2ab0d734554c21097f24752393a190b0e51996b08f48c4 -SIZE (openldap-openldap-LMDB_0.9.35_GH0.tar.gz) = 149788 +TIMESTAMP = 1782971586 +SHA256 (openldap-openldap-LMDB_1.0.0_GH0.tar.gz) = a61ded12bd9c670038b77483dda13b50684a93a111e53421dfb979624ae9f72e +SIZE (openldap-openldap-LMDB_1.0.0_GH0.tar.gz) = 178085 diff --git a/databases/lmdb/files/patch-Makefile b/databases/lmdb/files/patch-Makefile index 28211b028dd2..66c3002a3444 100644 --- a/databases/lmdb/files/patch-Makefile +++ b/databases/lmdb/files/patch-Makefile @@ -1,80 +1,68 @@ ---- Makefile.orig 2024-01-29 18:20:26 UTC +--- Makefile.orig 2026-06-30 15:26:32 UTC +++ Makefile -@@ -23,22 +23,24 @@ OPT = -O2 -g +@@ -23,7 +23,7 @@ OPT = -O2 -g W = -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized THREADS = -pthread OPT = -O2 -g -CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS) +CFLAGS += $(THREADS) $(W) - LDLIBS = - SOLIBS = --SOEXT = .so + LDFLAGS = $(THREADS) + LDLIBS = + SOLIBS = +@@ -36,13 +36,13 @@ SOFULL = $(SOEXT).$(VEREXT) + LMDB_VERSION = 1.0.0 + SOFULL = $(SOEXT).$(VEREXT) + -prefix = /usr/local -+SOEXT = .so.0 +prefix ?= /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib includedir = $(prefix)/include datarootdir = $(prefix)/share -mandir = $(datarootdir)/man +mandir = $(prefix)/share/man ######################################################################## - IHDRS = lmdb.h --ILIBS = liblmdb.a liblmdb$(SOEXT) -+LIBS = liblmdb.a -+SHLIBS = liblmdb$(SOEXT) -+ILIBS = $(LIBS) $(SHLIBS) - 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 +51,11 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) +@@ -67,15 +67,15 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) mkdir -p $(DESTDIR)$(libdir) mkdir -p $(DESTDIR)$(includedir) mkdir -p $(DESTDIR)$(mandir)/man1 - for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done - for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done +- for f in $(ILIBS2); do cp $$f $(DESTDIR)$(libdir); \ ++ for f in $(IPROGS); do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir); done ++ for f in $(ILIBS); do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir); done ++ for f in $(ILIBS2); do $(INSTALL_LIB) $$f $(DESTDIR)$(libdir); \ + i=`basename -s .$(ABIVER) $$f`; rm -f $(DESTDIR)$(libdir)/$$i; \ + ln -s $$f $(DESTDIR)$(libdir)/$$i; \ + i=`basename -s .$(LIBVER) $$i`; rm -f $(DESTDIR)$(libdir)/$$i; \ + ln -s $$f $(DESTDIR)$(libdir)/$$i; done - 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 $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir); done -+ for f in $(LIBS); do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir); done -+ for f in $(SHLIBS); do $(INSTALL_LIB) $$f $(DESTDIR)$(libdir); done + for f in $(IHDRS); do $(INSTALL_DATA) $$f $(DESTDIR)$(includedir); done + for f in $(IDOCS); do $(INSTALL_MAN) $$f $(DESTDIR)$(mandir)/man1; done clean: - rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb -@@ -66,19 +69,30 @@ liblmdb$(SOEXT): mdb.lo midl.lo - - 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 -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS) - - mdb_stat: mdb_stat.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - mdb_copy: mdb_copy.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - mdb_dump: mdb_dump.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - mdb_load: mdb_load.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} + rm -rf $(PROGS) $(RPROGS) *.[ao] *.[ls]o *.so.* *~ testdb +@@ -104,12 +104,19 @@ mtest: mtest.o liblmdb.a + mdb_drop: mdb_drop.o liblmdb.a + $(CC) $(LDFLAGS) -o $@ $^ $(LDL) mtest: mtest.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest.o liblmdb.a mtest2: mtest2.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest2.o liblmdb.a mtest3: mtest3.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest3.o liblmdb.a mtest4: mtest4.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest4.o liblmdb.a mtest5: mtest5.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest5.o liblmdb.a mtest6: mtest6.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - mplay: mplay.o liblmdb.a -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - - mdb.o: mdb.c lmdb.h midl.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest6.o liblmdb.a + mtest_remap: mtest_remap.o liblmdb.a ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest_remap.o liblmdb.a + mtest_enc: mtest_enc.o chacha8.o liblmdb.a + mtest_enc2: mtest_enc2.o liblmdb.a crypto.lm + $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL) diff --git a/databases/lmdb/pkg-plist b/databases/lmdb/pkg-plist index fd7e46b5d58d..b7a7cb57bb23 100644 --- a/databases/lmdb/pkg-plist +++ b/databases/lmdb/pkg-plist @@ -1,13 +1,16 @@ bin/mdb_copy +bin/mdb_drop bin/mdb_dump bin/mdb_load bin/mdb_stat include/lmdb.h lib/liblmdb.a lib/liblmdb.so -lib/liblmdb.so.0 +lib/liblmdb.so.1 +lib/liblmdb.so.1.0 libdata/pkgconfig/lmdb.pc share/man/man1/mdb_copy.1.gz +share/man/man1/mdb_drop.1.gz share/man/man1/mdb_dump.1.gz share/man/man1/mdb_load.1.gz share/man/man1/mdb_stat.1.gz