[Midnightbsd-cvs] mports [21131] trunk/databases/ldb: ldb 1.1.24

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 12 17:23:52 EST 2016 

Revision: 21131
          http://svnweb.midnightbsd.org/mports/?rev=21131
Author:   laffer1
Date:     2016-03-12 17:23:52 -0500 (Sat, 12 Mar 2016)
Log Message:
-----------
ldb 1.1.24

Modified Paths:
--------------
    trunk/databases/ldb/Makefile
    trunk/databases/ldb/distinfo
    trunk/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py

Modified: trunk/databases/ldb/Makefile
===================================================================
--- trunk/databases/ldb/Makefile	2016-03-12 22:21:19 UTC (rev 21130)
+++ trunk/databases/ldb/Makefile	2016-03-12 22:23:52 UTC (rev 21131)
@@ -1,11 +1,10 @@
 # $MidnightBSD$
 
 PORTNAME=		ldb
-PORTVERSION=		1.1.15
-PORTREVISION=		1
+PORTVERSION=		1.1.24
+PORTREVISION=		0
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SAMBA
 
 MAINTAINER=		ports at MidnightBSD.org
 COMMENT=		LDAP-like embedded database
@@ -14,11 +13,10 @@
 
 CONFLICTS=		*samba3[0-4]-3.*
 
-USES=			compiler pkgconfig ldap python:2,build,run
+USES=			compiler pkgconfig python:2 waf
 USE_LDCONFIG=		yes
-HAS_CONFIGURE=		yes
-WAF_TOOL=		buildtools/bin/waf
-CONFIGURE_SCRIPT=	${WAF_TOOL} configure
+WAF_CMD=		buildtools/bin/waf
+CONFIGURE_LOG=		bin/config.log
 
 USE_OPENLDAP=		yes
 
@@ -25,11 +23,17 @@
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
-.include <bsd.mport.options.mk>
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
+			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
+			--disable-rpath \
+			--without-gettext
 
-BUILD_DEPENDS+=		talloc>=2.0.8:${PORTSDIR}/devel/talloc \
-			tevent>=0.9.17:${PORTSDIR}/devel/tevent \
-			tdb>=1.2.11:${PORTSDIR}/databases/tdb \
+OPTIONS_DEFINE=		MANPAGES
+MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
+
+BUILD_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc \
+			tevent>=0.9.26:${PORTSDIR}/devel/tevent \
+			tdb>=1.3.8,1:${PORTSDIR}/databases/tdb \
 			popt>=0:${PORTSDIR}/devel/popt
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
@@ -37,19 +41,15 @@
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb
 
-MAN1=			ldbadd.1 \
-			ldbdel.1 \
-			ldbedit.1 \
-			ldbmodify.1 \
-			ldbrename.1 \
-			ldbsearch.1
+.include <bsd.port.pre.mk>
 
-MAN3=			ldb.3
+.if ! ${PORT_OPTIONS:MMANPAGES}
+CONFIGURE_ENV+=		XSLTPROC="true"
+.else
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+			xsltproc:${PORTSDIR}/textproc/libxslt
+.endif
 
-PLIST_DIRSTRY=		lib/ldb \
-			lib/shared-modules/ldb \
-			lib/shared-modules
-
 PLIST_FILES=		bin/ldbedit \
 			bin/ldbmodify \
 			bin/ldbadd \
@@ -75,32 +75,31 @@
 			lib/shared-modules/ldb/tdb.so \
 			%%PKGCONFIGDIR%%/ldb.pc
 
-CONFIGURE_ENV+=		XSLTPROC="/usr/bin/true"
+# No fancy color error messages
+.if ${COMPILER_TYPE} == "clang"
+CFLAGS+=		-fno-color-diagnostics
+.endif
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
-
-.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
-.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
-CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS=		--jobs=${MAKE_JOBS_NUMBER}
-.endif
-.endif
-
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util.so \
 			lib/libpyldb-util.so.1 \
 			%%PYTHON_SITELIBDIR%%/ldb.so \
+			%%PYTHON_SITELIBDIR%%/_ldb_text.py \
 			%%PKGCONFIGDIR%%/pyldb-util.pc
-PLIST_DIRSTRY+=		%%PYTHON_SITELIBDIR%% \
-			%%PYTHON_LIBDIR%%
 
-ALL_TARGET=		build
-INSTALL_TARGET=		install
+LDB_MAN1=		man/man1/ldbadd.1.gz \
+			man/man1/ldbdel.1.gz \
+			man/man1/ldbedit.1.gz \
+			man/man1/ldbmodify.1.gz \
+			man/man1/ldbrename.1.gz \
+			man/man1/ldbsearch.1.gz
 
-.include <bsd.port.pre.mk>
+LDB_MAN3=		man/man3/ldb.3.gz
 
+PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
+
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-patch:
@@ -117,22 +116,11 @@
 			fi
 
 pre-build:
+.if ! ${PORT_OPTIONS:MMANPAGES}
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
-.for man in ${MAN1} ${MAN3}
-			${INSTALL_MAN} ${FILESDIR}/${man} ${BUILD_WRKSRC}/bin/default/man
-.endfor
+.	for man in ${LDB_MAN1} ${LDB_MAN3}
+			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
+.	endfor
+.endif
 
-do-build:
-			@(cd ${BUILD_WRKSRC}; \
-			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
-				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
-					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
-					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-				fi; \
-			${FALSE}; \
-			fi)
-
-do-install:
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
-
 .include <bsd.port.post.mk>

Modified: trunk/databases/ldb/distinfo
===================================================================
--- trunk/databases/ldb/distinfo	2016-03-12 22:21:19 UTC (rev 21130)
+++ trunk/databases/ldb/distinfo	2016-03-12 22:23:52 UTC (rev 21131)
@@ -1,2 +1,2 @@
-SHA256 (ldb-1.1.15.tar.gz) = 6bd8317e82747461394ab8ad1ee5873589d9a46d12f021571aca9fac45de8997
-SIZE (ldb-1.1.15.tar.gz) = 1121684
+SHA256 (ldb-1.1.24.tar.gz) = 45e9f52473f0d013f0ea090cce35d6836a6e67e8d4dcdd7077dabdf8b1314b21
+SIZE (ldb-1.1.24.tar.gz) = 1258405

Modified: trunk/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
===================================================================
--- trunk/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py	2016-03-12 22:21:19 UTC (rev 21130)
+++ trunk/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py	2016-03-12 22:23:52 UTC (rev 21131)
@@ -1,11 +1,11 @@
---- ./buildtools/wafsamba/samba_install.py.orig	2013-01-27 11:51:43.000000000 +0000
-+++ ./buildtools/wafsamba/samba_install.py	2013-01-29 22:49:14.139878631 +0000
-@@ -111,7 +111,7 @@
+--- ./buildtools/wafsamba/samba_install.py.orig	2015-08-09 19:55:47.819170736 +0000
++++ ./buildtools/wafsamba/samba_install.py	2015-08-09 19:56:18.727356203 +0000
+@@ -116,7 +116,7 @@
+                 inst_name    = bld.make_libname(t.target)
+         elif self.vnum:
+             vnum_base    = self.vnum.split('.')[0]
+-            install_name = bld.make_libname(target_name, version=self.vnum)
++            install_name = bld.make_libname(target_name, version=vnum_base)
+             install_link = bld.make_libname(target_name, version=vnum_base)
              inst_name    = bld.make_libname(t.target)
-     elif self.vnum:
-         vnum_base    = self.vnum.split('.')[0]
--        install_name = bld.make_libname(target_name, version=self.vnum)
-+        install_name = bld.make_libname(target_name, version=vnum_base)
-         install_link = bld.make_libname(target_name, version=vnum_base)
-         inst_name    = bld.make_libname(t.target)
-         if not self.private_library:
+             if not self.private_library:

More information about the Midnightbsd-cvs mailing list