Update to 0.9.14.

4 files changed, 28 insertions, 18 deletions

diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile
index c4f8be2..432cb88 100644
--- a/databases/lmdb/Makefile
+++ b/databases/lmdb/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	lmdb
-PORTVERSION=	0.9.13
+PORTVERSION=	0.9.14
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/delphij
-# https://gitorious.org/${GO_ACCOUNT}/${GO_PROJECT}/archive/${GO_TAGNAME}.tar.gz?dummy= \
+#		https://gitorious.org/${GO_ACCOUNT}/${GO_PROJECT}/archive/${GO_TAGNAME}.tar.gz?dummy=
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	OpenLDAP Lightning Memory-Mapped Database
@@ -14,7 +14,7 @@ COMMENT=	OpenLDAP Lightning Memory-Mapped Database
 CFLAGS+=	-DMDB_DSYNC=O_SYNC -Dfdatasync=fsync
 WRKSRC=		${WRKDIR}/mdb-mdb/libraries/liblmdb
 MAKE_ENV+=	CC="${CC}"
-MAKE_ENV+=	XCFLAGS="${CFLAGS} -lpthread" prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAKE_ENV+=	XCFLAGS="${CFLAGS} -pthread" prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 MAKE_ENV+=	INSTALL_LIB="${INSTALL_LIB}" INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
 
 USE_LDCONFIG=	yes
@@ -24,16 +24,18 @@ GO_PROJECT=	mdb
 GO_TAGNAME=	${PORTNAME:tu}_${PORTVERSION}
 FETCH_ARGS?=	-o ${DISTDIR}/${DISTFILES}
 
+MDB_APPS=	copy dump load stat
+
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/liblmdb.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_LIB} ${WRKSRC}/liblmdb.so ${STAGEDIR}${PREFIX}/lib/liblmdb.so.0
 	${LN} -sf liblmdb.so.0 ${STAGEDIR}${PREFIX}/lib/liblmdb.so
-.for f in mdb_stat mdb_copy
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
+.for f in ${MDB_APPS}
+	${INSTALL_PROGRAM} ${WRKSRC}/mdb_${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/lmdb.h ${STAGEDIR}${PREFIX}/include
-.for f in mdb_stat.1 mdb_copy.1
-	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/man/man1
+.for f in ${MDB_APPS}
+	${INSTALL_MAN} ${WRKSRC}/mdb_${f}.1 ${STAGEDIR}${PREFIX}/man/man1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/lmdb/distinfo b/databases/lmdb/distinfo
index 0f3f08c..389cff4 100644
--- a/databases/lmdb/distinfo
+++ b/databases/lmdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lmdb-0.9.13.tar.gz) = 2b8188de53fa75a5b1fd348bd819ab84921b665686be70e98291f63ec4746421
-SIZE (lmdb-0.9.13.tar.gz) = 116425
+SHA256 (lmdb-0.9.14.tar.gz) = 31a4d80f351c7940c7ffa73e753366e937c0c8ae1320ec5492fe74a4fee66121
+SIZE (lmdb-0.9.14.tar.gz) = 128170
diff --git a/databases/lmdb/files/patch-Makefile b/databases/lmdb/files/patch-Makefile
index ca624d4..6ec4850 100644
--- a/databases/lmdb/files/patch-Makefile
+++ b/databases/lmdb/files/patch-Makefile
@@ -1,11 +1,11 @@
---- ./Makefile.orig	2013-08-14 09:57:25.000000000 -0700
-+++ ./Makefile	2013-08-16 11:35:51.697680677 -0700
+--- Makefile.orig	2014-09-20 06:24:32 UTC
++++ Makefile
 @@ -16,14 +16,12 @@
  # There may be other macros in mdb.c of interest. You should
  # read mdb.c before changing any of them.
  #
 -CC	= gcc
- W	= -W -Wall -Wno-unused-parameter -Wbad-function-cast
+ W	= -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized
  THREADS = -pthread
  OPT = -O2 -g
 -CFLAGS	= $(THREADS) $(OPT) $(W) $(XCFLAGS)
@@ -16,9 +16,9 @@
  
  ########################################################################
  
-@@ -32,13 +30,13 @@
- IPROGS	= mdb_stat mdb_copy
- IDOCS	= mdb_stat.1 mdb_copy.1
+@@ -32,13 +30,13 @@ ILIBS	= liblmdb.a liblmdb.so
+ 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
 -all:	$(ILIBS) $(PROGS)
 +all:	$(ILIBS) $(IPROGS)
@@ -35,13 +35,17 @@
  
  clean:
  	rm -rf $(PROGS) *.[ao] *.so *~ testdb
-@@ -54,7 +52,9 @@
+@@ -55,9 +53,13 @@ liblmdb.so:	mdb.o midl.o
  	$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.o midl.o $(SOLIBS)
  
  mdb_stat: mdb_stat.o liblmdb.a
-+	${CC} ${LDFLAGS} -o ${.TARGET} mdb_stat.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
  mdb_copy: mdb_copy.o liblmdb.a
-+	${CC} ${LDFLAGS} -o ${.TARGET} 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
  mtest2:	mtest2.o liblmdb.a
  mtest3:	mtest3.o liblmdb.a
diff --git a/databases/lmdb/pkg-plist b/databases/lmdb/pkg-plist
index 005831f..ebd864d 100644
--- a/databases/lmdb/pkg-plist
+++ b/databases/lmdb/pkg-plist
@@ -1,8 +1,12 @@
 bin/mdb_copy
+bin/mdb_dump
+bin/mdb_load
 bin/mdb_stat
 include/lmdb.h
 lib/liblmdb.a
 lib/liblmdb.so
 lib/liblmdb.so.0
 man/man1/mdb_copy.1.gz
+man/man1/mdb_dump.1.gz
+man/man1/mdb_load.1.gz
 man/man1/mdb_stat.1.gz