On Mon, May 10 2021, Aisha Tammy <[email protected]> wrote:
> Hi,
Hi,
> I've reattached the patch for lmdb update.
Note that it still doesn't apply. ;)
> This time I've also added a patch from debian which adds a pkgconfig file.
I'll leave that out unless I get a good reason to diverge from upstream.
> There has been addition of a symbol (MAP_NOSYNC) so I've bumped the minor.
MAP_NOSYNC is already here on -current, I see no symbol addition so I'll
just leave the shlib version alone.
Since upstream says that development primarily happens at
git.openldap.org it makes sense to track that instead. I just hope that
gitlab tarballs will prove reliable...
Here's the updated diff I intend to commit.
(You'll need make clean=packages and make clean=plist because of your
tentative shlib version bump.)
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/lmdb/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 14 Apr 2020 09:06:42 -0000 1.9
+++ Makefile 10 May 2021 21:19:51 -0000
@@ -2,13 +2,10 @@
COMMENT = Symas Lightning Memory-Mapped Database
-VERSION = 0.9.24
+VERSION = 0.9.29
-GH_ACCOUNT = LMDB
-GH_PROJECT = lmdb
-GH_TAGNAME = LMDB_${VERSION}
-
-DISTNAME = ${GH_PROJECT}-${VERSION}
+DISTNAME = openldap-LMDB_${VERSION}
+PKGNAME = lmdb-${VERSION}
SHARED_LIBS += lmdb 0.0 # 0.0
@@ -23,6 +20,8 @@ PERMIT_PACKAGE = Yes
WANTLIB += c pthread
+MASTER_SITES =
https://git.openldap.org/openldap/openldap/-/archive/LMDB_${VERSION}/
+
DEBUG_PACKAGES = ${BUILD_PACKAGES}
USE_GMAKE = Yes
@@ -31,6 +30,6 @@ MAKE_FLAGS = CC="${CC}" XCFLAGS="${CFLA
SHARED_VERSION_MAJOR=${LIBlmdb_VERSION:R} \
SHARED_VERSION_MINOR=${LIBlmdb_VERSION:E}
-WRKDIST = ${WRKDIR}/lmdb-${GH_TAGNAME}/libraries/liblmdb
+WRKDIST = ${WRKDIR}/openldap-LMDB_${VERSION}/libraries/liblmdb
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/lmdb/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 14 Apr 2020 09:06:42 -0000 1.3
+++ distinfo 10 May 2021 21:19:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (lmdb-0.9.24.tar.gz) = RGAkNsUsKdTzAfVfb9gRX5RUabhoNI483a+RqyRz6iY=
-SIZE (lmdb-0.9.24.tar.gz) = 143916
+SHA256 (openldap-LMDB_0.9.29.tar.gz) =
1MZoFnotcD75HbcztAabi3Tbw3RAWFW+Zia0Xip+LdM=
+SIZE (openldap-LMDB_0.9.29.tar.gz) = 144545
Index: patches/patch-mdb_c
===================================================================
RCS file: /cvs/ports/databases/lmdb/patches/patch-mdb_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-mdb_c
--- patches/patch-mdb_c 14 Apr 2020 09:06:42 -0000 1.6
+++ patches/patch-mdb_c 10 May 2021 21:19:51 -0000
@@ -5,7 +5,7 @@ enforce MDB_WRITEMAP, because we have no
Index: mdb.c
--- mdb.c.orig
+++ mdb.c
-@@ -4968,6 +4967,7 @@ mdb_env_open(MDB_env *env, const char *path, unsigned
+@@ -4976,6 +4976,7 @@ mdb_env_open(MDB_env *env, const char *path, unsigned
/* silently ignore WRITEMAP when we're only getting read access
*/
flags &= ~MDB_WRITEMAP;
} else {
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
