Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Mar 2014 02:12:35 +0000 (UTC)
From:      "Timur I. Bakeyev" <timur@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r348022 - in head/databases: ldb ntdb tdb
Message-ID:  <201403130212.s2D2CZPp026533@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: timur
Date: Thu Mar 13 02:12:35 2014
New Revision: 348022
URL: http://svnweb.freebsd.org/changeset/ports/348022
QAT: https://qat.redports.org/buildarchive/r348022/

Log:
  Usage of .pre.mk requires corresponding .post.mk

Modified:
  head/databases/ldb/Makefile
  head/databases/ntdb/Makefile
  head/databases/tdb/Makefile

Modified: head/databases/ldb/Makefile
==============================================================================
--- head/databases/ldb/Makefile	Thu Mar 13 02:11:21 2014	(r348021)
+++ head/databases/ldb/Makefile	Thu Mar 13 02:12:35 2014	(r348022)
@@ -15,7 +15,7 @@ LICENSE=		GPLv3
 
 CONFLICTS=		*samba3[0-4]-3.*
 
-USES=			pkgconfig
+USES=			compiler pkgconfig
 USE_PYTHON_BUILD=	2
 USE_LDCONFIG=		yes
 WAF_TOOL=		buildtools/bin/waf
@@ -29,10 +29,13 @@ PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--mandir=${MANPREFIX}/man \
 			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}
+# Support staging
+DESTDIRNAME=		--destdir
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
+.include <bsd.port.pre.mk>
+
 BUILD_DEPENDS+=		talloc>=2.0.8:${PORTSDIR}/devel/talloc \
 			tevent>=0.9.17:${PORTSDIR}/devel/tevent \
 			tdb>=1.2.11:${PORTSDIR}/databases/tdb \
@@ -43,14 +46,12 @@ CONFIGURE_ARGS+=	--bundled-libraries=!ta
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb
 
-MAN1=			ldbadd.1 \
-			ldbdel.1 \
-			ldbedit.1 \
-			ldbmodify.1 \
-			ldbrename.1 \
-			ldbsearch.1
-
-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 \
@@ -81,16 +82,20 @@ PLIST_FILES=		bin/ldbedit \
 			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
 
 .if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
 CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS=		--jobs=${MAKE_JOBS_NUMBER}
+_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
 .endif
 
 USE_PYTHON_RUN=		yes
+
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util.so \
 			lib/libpyldb-util.so.1 \
@@ -99,6 +104,17 @@ PLIST_FILES+=		include/pyldb.h \
 PLIST_DIRSTRY+=		%%PYTHON_SITELIBDIR%% \
 			%%PYTHON_LIBDIR%%
 
+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
+
+LDB_MAN3=		man/man3/ldb.3.gz
+
+PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
+
 CONFIGURE_TARGET=	configure
 ALL_TARGET=		build
 INSTALL_TARGET=		install
@@ -136,10 +152,12 @@ do-configure:
 				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}; \
@@ -154,4 +172,4 @@ do-build:
 do-install:
 			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/databases/ntdb/Makefile
==============================================================================
--- head/databases/ntdb/Makefile	Thu Mar 13 02:11:21 2014	(r348021)
+++ head/databases/ntdb/Makefile	Thu Mar 13 02:12:35 2014	(r348022)
@@ -131,4 +131,4 @@ do-build:
 do-install:
 			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/databases/tdb/Makefile
==============================================================================
--- head/databases/tdb/Makefile	Thu Mar 13 02:11:21 2014	(r348021)
+++ head/databases/tdb/Makefile	Thu Mar 13 02:12:35 2014	(r348022)
@@ -131,4 +131,4 @@ do-build:
 do-install:
 			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403130212.s2D2CZPp026533>