diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile index cd4525d9f28f..66511700e680 100644 --- a/databases/lmdb/Makefile +++ b/databases/lmdb/Makefile @@ -1,39 +1,39 @@ PORTNAME= lmdb -PORTVERSION= 0.9.31 -PORTREVISION= 1 +PORTVERSION= 0.9.32 +PORTREVISION= 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 e38af203b552..59c26f270c61 100644 --- a/databases/lmdb/distinfo +++ b/databases/lmdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689122322 -SHA256 (openldap-openldap-LMDB_0.9.31_GH0.tar.gz) = f7aecdd1bcc69fb32bb33d8544cfe50f8e9e916f366d598a268e1f43ee9c7603 -SIZE (openldap-openldap-LMDB_0.9.31_GH0.tar.gz) = 145218 +TIMESTAMP = 1706850650 +SHA256 (openldap-openldap-LMDB_0.9.32_GH0.tar.gz) = c0937223bba3c37c896809883a3c9b43049354578b239d6ed2476236a87f40c9 +SIZE (openldap-openldap-LMDB_0.9.32_GH0.tar.gz) = 149188 diff --git a/databases/lmdb/files/patch-Makefile b/databases/lmdb/files/patch-Makefile index f3ee1c5b41f8..28211b028dd2 100644 --- a/databases/lmdb/files/patch-Makefile +++ b/databases/lmdb/files/patch-Makefile @@ -1,78 +1,80 @@ ---- Makefile.orig 2021-03-16 16:41:19 UTC +--- Makefile.orig 2024-01-29 18:20:26 UTC +++ Makefile @@ -23,22 +23,24 @@ 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 -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) 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 $(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,18 +69,28 @@ liblmdb$(SOEXT): mdb.lo midl.lo +@@ -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} mtest: mtest.o liblmdb.a + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} mtest2: mtest2.o liblmdb.a + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} mtest3: mtest3.o liblmdb.a + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} mtest4: mtest4.o liblmdb.a + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} mtest5: mtest5.o liblmdb.a + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} 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