diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile index 96f3cec62160..a830e21b668d 100644 --- a/databases/lmdb/Makefile +++ b/databases/lmdb/Makefile @@ -1,39 +1,42 @@ PORTNAME= lmdb -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 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 -CONFLICTS_INSTALL= lmdb0 # include/lmdb.h bin/mdb_stat - -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 +USE_LDCONFIG= yes + +MAKE_ARGS+= CC="${CC}" +MAKE_ARGS+= INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_LIB="${INSTALL_LIB}" \ + INSTALL_MAN="${INSTALL_MAN}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + prefix="${PREFIX}" + +CONFLICTS_INSTALL= lmdb0 # include/lmdb.h bin/mdb_stat SUB_FILES+= lmdb.pc SUB_LIST+= PORTVERSION=${PORTVERSION} +WRKSRC_SUBDIR= libraries/liblmdb + post-install: ${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 7c4213d2fbe5..ab825c7c2fbb 100644 --- a/databases/lmdb/distinfo +++ b/databases/lmdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1782971586 -SHA256 (openldap-openldap-LMDB_1.0.0_GH0.tar.gz) = a61ded12bd9c670038b77483dda13b50684a93a111e53421dfb979624ae9f72e -SIZE (openldap-openldap-LMDB_1.0.0_GH0.tar.gz) = 178085 +TIMESTAMP = 1786246233 +SHA256 (openldap-openldap-LMDB_1.0.1_GH0.tar.gz) = 63a3cdcca69f4fd403b61fd5c5a51a119f1549d7b375b33f624e64df2933d336 +SIZE (openldap-openldap-LMDB_1.0.1_GH0.tar.gz) = 178645 diff --git a/databases/lmdb/files/patch-Makefile b/databases/lmdb/files/patch-Makefile index 66c3002a3444..19970b63e005 100644 --- a/databases/lmdb/files/patch-Makefile +++ b/databases/lmdb/files/patch-Makefile @@ -1,68 +1,68 @@ ---- Makefile.orig 2026-06-30 15:26:32 UTC +--- Makefile.orig 2026-08-06 17:11:09 UTC +++ Makefile @@ -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) LDFLAGS = $(THREADS) LDLIBS = SOLIBS = @@ -36,13 +36,13 @@ SOFULL = $(SOEXT).$(VEREXT) LMDB_VERSION = 1.0.0 SOFULL = $(SOEXT).$(VEREXT) -prefix = /usr/local +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 ######################################################################## @@ -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 $(IHDRS); do $(INSTALL_DATA) $$f $(DESTDIR)$(includedir); done + for f in $(IDOCS); do $(INSTALL_MAN) $$f $(DESTDIR)$(mandir)/man1; done clean: 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 $@ mtest.o liblmdb.a mtest2: mtest2.o liblmdb.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest2.o liblmdb.a mtest3: mtest3.o liblmdb.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest3.o liblmdb.a mtest4: mtest4.o liblmdb.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest4.o liblmdb.a mtest5: mtest5.o liblmdb.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mtest5.o liblmdb.a mtest6: mtest6.o liblmdb.a + $(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)