Attachment #235787 for bug #263166




PORTNAME=	mdbx
PORTVERSION=	0.11.9
DISTVERSIONPREFIX=	v
CATEGORIES=	databases
MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
MASTER_SITES=   https://libmdbx.dqdkfa.ru/release/
DISTNAME=	libmdbx-amalgamated-${DISTVERSION}

MAINTAINER=	mahlon@martini.nu
COMMENT=	Lightning Memory-Mapped Database (Extended)

LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES=		gmake
# No USE_GITHUB, we want the amalgamated build.
GH_ACCOUNT=	erthink
GH_PROJECT=	libmdbx
USE_LDCONFIG=	yes

MAKEFILE=	GNUmakefile

Lines 1-3 Link Here

(-)mdbx/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1639163729	1	TIMESTAMP = 1660003184
2	SHA256 (libmdbx-amalgamated-0.11.2.tar.gz) = efe64856e934621adf104385fad788e679c41e2df3eae96ab35caf19403c75e2	2	SHA256 (libmdbx-amalgamated-0.11.9.tar.gz) = 8feb391155de28b0ec8d6f93817b3f6ed3318a7bd7047d212fd24ba59e287a81
3	SIZE (libmdbx-amalgamated-0.11.2.tar.gz) = 664883	3	SIZE (libmdbx-amalgamated-0.11.9.tar.gz) = 689520




--- GNUmakefile.orig	2022-08-02 03:17:33.000000000 -0700
+++ GNUmakefile	2022-08-08 17:05:14.612729000 -0700
@@ -9,7 +9,7 @@
 # Basic internal definitios. For a customizable variables and options see below.
 #
 $(info // The GNU Make $(MAKE_VERSION))
-SHELL         := $(shell env bash -c 'echo $$BASH')
+SHELL         := sh
 MAKE_VERx3    := $(shell printf "%3s%3s%3s" $(subst ., ,$(MAKE_VERSION)))
 make_lt_3_81  := $(shell expr "$(MAKE_VERx3)" "<" "  3 81")
 ifneq ($(make_lt_3_81),0)
@@ -117,7 +117,7 @@
     *) echo so;;
   esac
 endef
 
-SO_SUFFIX  := $(shell $(uname2sosuffix))
+SO_SUFFIX  := so.0.11.9
 HEADERS    := mdbx.h mdbx.h++
 LIBRARIES  := libmdbx.a libmdbx.$(SO_SUFFIX)
 TOOLS      := mdbx_stat mdbx_copy mdbx_dump mdbx_load mdbx_chk mdbx_drop
@@ -284,16 +284,11 @@
 
 install: $(LIBRARIES) $(TOOLS) $(HEADERS)
 	@echo '  INSTALLING...'

Line 0 Link Here

(-)mdbx/files/patch-mdbx.h (+11 lines)
	1	--- mdbx.h++.orig 2022-08-08 17:08:47.381225000 -0700
	2	+++ mdbx.h++ 2022-08-08 17:09:09.421254000 -0700
	3	@@ -23,6 +23,8 @@
	4
	5	#pragma once
	6
	7	+#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
	8	+
	9	/* Workaround for modern libstdc++ with CLANG < 4.x */
	10	#if defined(__SIZEOF_INT128__) && !defined(__GLIBCXX_TYPE_INT_N_0) && \
	11	defined(__clang__) && __clang_major__ < 4

Return to bug 263166

Lines 1-9 Link Here

(-)mdbx/Makefile (-6 / +3 lines)
1	PORTNAME= mdbx	1	PORTNAME= mdbx
2	PORTVERSION= 0.11.2	2	PORTVERSION= 0.11.9
3	DISTVERSIONPREFIX= v
4	CATEGORIES= databases	3	CATEGORIES= databases
5	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/	4	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
6	DISTNAME= ${GH_PROJECT}-amalgamated-${DISTVERSION}	5	MASTER_SITES= https://libmdbx.dqdkfa.ru/release/
		6	DISTNAME= libmdbx-amalgamated-${DISTVERSION}
7		7
8	MAINTAINER= mahlon@martini.nu	8	MAINTAINER= mahlon@martini.nu
9	COMMENT= Lightning Memory-Mapped Database (Extended)	9	COMMENT= Lightning Memory-Mapped Database (Extended)
Lines 14-22 Link Here
14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
15		15
16	USES= gmake	16	USES= gmake
17	# No USE_GITHUB, we want the amalgamated build.
18	GH_ACCOUNT= erthink
19	GH_PROJECT= libmdbx
20	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
21		18
22	MAKEFILE= GNUmakefile	19	MAKEFILE= GNUmakefile

Lines 1-24 Link Here

(-)mdbx/files/patch-GNUmakefile (-14 / +14 lines)
1	--- GNUmakefile.orig 2021-10-13 09:17:02.000000000 -0700	1	--- GNUmakefile.orig 2022-08-02 03:17:33.000000000 -0700
2	+++ GNUmakefile 2021-10-21 14:35:08.340353000 -0700	2	+++ GNUmakefile 2022-08-08 17:05:14.612729000 -0700
3	@@ -13,7 +13,7 @@	3	@@ -9,7 +9,7 @@
4	# in README and source code (see src/options.h) if you do.	4	# Basic internal definitios. For a customizable variables and options see below.
5	#	5	#
6		6	$(info // The GNU Make $(MAKE_VERSION))
7	-SHELL := env bash	7	-SHELL := $(shell env bash -c 'echo $$BASH')
8	+SHELL := env sh	8	+SHELL := sh
9		9	MAKE_VERx3 := $(shell printf "%3s%3s%3s" $(subst ., ,$(MAKE_VERSION)))
10	# install sandbox	10	make_lt_3_81 := $(shell expr "$(MAKE_VERx3)" "<" " 3 81")
11	DESTDIR ?=	11	ifneq ($(make_lt_3_81),0)
12	@@ -54,7 +54,7 @@	12	@@ -117,7 +117,7 @@
13	*) echo so;;
14	esac	13	esac
15	endef	14	endef
		15
16	-SO_SUFFIX := $(shell $(uname2sosuffix))	16	-SO_SUFFIX := $(shell $(uname2sosuffix))
17	+SO_SUFFIX := so.0.11.2	17	+SO_SUFFIX := so.0.11.9
18	HEADERS := mdbx.h mdbx.h++	18	HEADERS := mdbx.h mdbx.h++
19	LIBRARIES := libmdbx.a libmdbx.$(SO_SUFFIX)	19	LIBRARIES := libmdbx.a libmdbx.$(SO_SUFFIX)
20	TOOLS := mdbx_stat mdbx_copy mdbx_dump mdbx_load mdbx_chk mdbx_drop	20	TOOLS := mdbx_stat mdbx_copy mdbx_dump mdbx_load mdbx_chk mdbx_drop
21	@@ -209,16 +209,11 @@	21	@@ -284,16 +284,11 @@
22		22
23	install: $(LIBRARIES) $(TOOLS) $(HEADERS)	23	install: $(LIBRARIES) $(TOOLS) $(HEADERS)
24	@echo ' INSTALLING...'	24	@echo ' INSTALLING...'