Attachment #225464 for bug #255741

Lines 1-7 Link Here

(-)b/databases/mdbx/Makefile (-3 / +4 lines)
1	# Created by: Mahlon E. Smith <mahlon@martini.nu>	1	# Created by: Mahlon E. Smith <mahlon@martini.nu>
2		2
3	PORTNAME= mdbx	3	PORTNAME= mdbx
4	PORTVERSION= 0.9.3	4	PORTVERSION= 0.10.0
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/	7	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
Lines 32-38 NO_WRKSUBDIR= yes Link Here
32	PLIST_SUB= VERSION=${PORTVERSION}	32	PLIST_SUB= VERSION=${PORTVERSION}
33		33
34	post-install:	34	post-install:
35	${LN} -sf libmdbx.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmdbx.so	35	${RLN} libmdbx.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmdbx.so
36	${LN} -sf libmdbx.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmdbx.so.0	36	${RLN} libmdbx.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmdbx.so.${PORTVERSION}
		37	${RLN} libmdbx.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmdbx.so.0
37		38
38	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/databases/mdbx/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1612390977	1	TIMESTAMP = 1620627599
2	SHA256 (libmdbx-amalgamated-0.9.3.tar.gz) = d12bc7189b746beaa85514fcd1fcf26b957bb8feadb11662a0e20c4e79410d3f	2	SHA256 (libmdbx-amalgamated-0.10.0.tar.gz) = 767776d961fadeb51ee895fb70ed82a03051bae855a19396f0067b03076103bb
3	SIZE (libmdbx-amalgamated-0.9.3.tar.gz) = 574341	3	SIZE (libmdbx-amalgamated-0.10.0.tar.gz) = 645315




--- GNUmakefile.orig	2021-05-09 00:11:57 UTC
+++ GNUmakefile
@@ -13,7 +13,7 @@
 # in README and source code (see src/options.h) if you do.
 #
 
-SHELL   := env bash

   esac
 endef
-SO_SUFFIX  := $(shell $(uname2sosuffix))
+SO_SUFFIX  := so.0.10.0
 
 HEADERS    := mdbx.h mdbx.h++
 LIBRARIES  := libmdbx.a libmdbx.$(SO_SUFFIX)
 TOOLS      := mdbx_stat mdbx_copy mdbx_dump mdbx_load mdbx_chk mdbx_drop
@@ -194,11 +194,11 @@ mdbx_%:	mdbx_%.c libmdbx.a
 
 install: $(LIBRARIES) $(TOOLS) $(HEADERS)
 	@echo '  INSTALLING...'
-	$(INSTALL) -D -p $(EXE_INSTALL_FLAGS) -t $(DESTDIR)$(prefix)/bin$(suffix) $(TOOLS) && \
-	$(INSTALL) -D -p $(EXE_INSTALL_FLAGS) -t $(DESTDIR)$(prefix)/lib$(suffix) $(filter-out libmdbx.a,$(LIBRARIES)) && \
-	$(INSTALL) -D -p -t $(DESTDIR)$(prefix)/lib$(suffix) libmdbx.a && \
-	$(INSTALL) -D -p -m 444 -t $(DESTDIR)$(prefix)/include $(HEADERS) && \
-	$(INSTALL) -D -p -m 444 -t $(DESTDIR)$(mandir)/man1 $(addprefix $(MAN_SRCDIR), $(MANPAGES))
+	install -p -s $(TOOLS) $(DESTDIR)$(prefix)/bin$(suffix) && \
+	install -p -s $(filter-out libmdbx.a,$(LIBRARIES)) $(DESTDIR)$(prefix)/lib$(suffix) && \
+	install -p libmdbx.a $(DESTDIR)$(prefix)/lib$(suffix) && \
+	install -p -m 444 $(HEADERS) $(DESTDIR)$(prefix)/include && \
+	install -p -m 444 $(addprefix $(MAN_SRCDIR), $(MANPAGES)) $(DESTDIR)$(mandir)/man1
 
 install-strip: EXE_INSTALL_FLAGS = -s
 install-strip: install

Lines 1-6 Link Here

(-)b/databases/mdbx/pkg-plist (+2 lines)
1	bin/mdbx_chk	1	bin/mdbx_chk
2	bin/mdbx_copy	2	bin/mdbx_copy
3	bin/mdbx_dump	3	bin/mdbx_dump
		4	bin/mdbx_drop
4	bin/mdbx_load	5	bin/mdbx_load
5	bin/mdbx_stat	6	bin/mdbx_stat
6	include/mdbx.h	7	include/mdbx.h
Lines 12-16 lib/libmdbx.so.%%VERSION%% Link Here
12	man/man1/mdbx_chk.1.gz	13	man/man1/mdbx_chk.1.gz
13	man/man1/mdbx_copy.1.gz	14	man/man1/mdbx_copy.1.gz
14	man/man1/mdbx_dump.1.gz	15	man/man1/mdbx_dump.1.gz
		16	man/man1/mdbx_drop.1.gz
15	man/man1/mdbx_load.1.gz	17	man/man1/mdbx_load.1.gz
16	man/man1/mdbx_stat.1.gz	18	man/man1/mdbx_stat.1.gz

Return to bug 255741

Lines 1-7 Link Here

(-)b/databases/mdbx/files/patch-GNUmakefile (-14 / +14 lines)
1	--- GNUmakefile.orig 2020-09-30 14:33:07 UTC	1	--- GNUmakefile.orig 2021-05-09 00:11:57 UTC
2	+++ GNUmakefile	2	+++ GNUmakefile
3	@@ -14,7 +14,7 @@	3	@@ -13,7 +13,7 @@
4	# There may be other macros of interest.	4	# in README and source code (see src/options.h) if you do.
5	#	5	#
6		6
7	-SHELL := env bash	7	-SHELL := env bash
Lines 14-37 Link Here
14	esac	14	esac
15	endef	15	endef
16	-SO_SUFFIX := $(shell $(uname2sosuffix))	16	-SO_SUFFIX := $(shell $(uname2sosuffix))
17	+SO_SUFFIX := so.0.9.3	17	+SO_SUFFIX := so.0.10.0
18
19	HEADERS := mdbx.h mdbx.h++	18	HEADERS := mdbx.h mdbx.h++
20	LIBRARIES := libmdbx.a libmdbx.$(SO_SUFFIX)	19	LIBRARIES := libmdbx.a libmdbx.$(SO_SUFFIX)
21	@@ -110,11 +110,11 @@ mdbx_%: mdbx_%.c libmdbx.a	20	TOOLS := mdbx_stat mdbx_copy mdbx_dump mdbx_load mdbx_chk mdbx_drop
22	$(CC) $(CFLAGS) $(MDBX_OPTIONS) '-DMDBX_CONFIG_H="config.h"' $^ $(EXE_LDFLAGS) $(LIBS) -o $@	21	@@ -194,11 +194,11 @@ mdbx_%: mdbx_%.c libmdbx.a
23		22
24	install: $(LIBRARIES) $(TOOLS) $(HEADERS)	23	install: $(LIBRARIES) $(TOOLS) $(HEADERS)
25	- install -D -p -s -t $(DESTDIR)$(prefix)/bin$(suffix) $(TOOLS) && \	24	@echo ' INSTALLING...'
26	- install -D -p -s -t $(DESTDIR)$(prefix)/lib$(suffix) $(filter-out libmdbx.a,$(LIBRARIES)) && \	25	- $(INSTALL) -D -p $(EXE_INSTALL_FLAGS) -t $(DESTDIR)$(prefix)/bin$(suffix) $(TOOLS) && \
27	- install -D -p -t $(DESTDIR)$(prefix)/lib$(suffix) libmdbx.a && \	26	- $(INSTALL) -D -p $(EXE_INSTALL_FLAGS) -t $(DESTDIR)$(prefix)/lib$(suffix) $(filter-out libmdbx.a,$(LIBRARIES)) && \
28	- install -D -p -m 444 -t $(DESTDIR)$(prefix)/include $(HEADERS) && \	27	- $(INSTALL) -D -p -t $(DESTDIR)$(prefix)/lib$(suffix) libmdbx.a && \
29	- install -D -p -m 444 -t $(DESTDIR)$(mandir)/man1 $(addprefix $(MAN_SRCDIR), $(MANPAGES))	28	- $(INSTALL) -D -p -m 444 -t $(DESTDIR)$(prefix)/include $(HEADERS) && \
		29	- $(INSTALL) -D -p -m 444 -t $(DESTDIR)$(mandir)/man1 $(addprefix $(MAN_SRCDIR), $(MANPAGES))
30	+ install -p -s $(TOOLS) $(DESTDIR)$(prefix)/bin$(suffix) && \	30	+ install -p -s $(TOOLS) $(DESTDIR)$(prefix)/bin$(suffix) && \
31	+ install -p -s $(filter-out libmdbx.a,$(LIBRARIES)) $(DESTDIR)$(prefix)/lib$(suffix) && \	31	+ install -p -s $(filter-out libmdbx.a,$(LIBRARIES)) $(DESTDIR)$(prefix)/lib$(suffix) && \
32	+ install -p libmdbx.a $(DESTDIR)$(prefix)/lib$(suffix) && \	32	+ install -p libmdbx.a $(DESTDIR)$(prefix)/lib$(suffix) && \
33	+ install -p -m 444 $(HEADERS) $(DESTDIR)$(prefix)/include && \	33	+ install -p -m 444 $(HEADERS) $(DESTDIR)$(prefix)/include && \
34	+ install -p -m 444 $(addprefix $(MAN_SRCDIR), $(MANPAGES)) $(DESTDIR)$(mandir)/man1	34	+ install -p -m 444 $(addprefix $(MAN_SRCDIR), $(MANPAGES)) $(DESTDIR)$(mandir)/man1
35		35
36	uninstall:	36	install-strip: EXE_INSTALL_FLAGS = -s
37	rm -f $(addprefix $(DESTDIR)$(prefix)/bin$(suffix)/,$(TOOLS)) \	37	install-strip: install