From owner-svn-ports-head@FreeBSD.ORG Thu Mar 13 02:12:36 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3423181A; Thu, 13 Mar 2014 02:12:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 201E528F; Thu, 13 Mar 2014 02:12:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2D2CZIk026536; Thu, 13 Mar 2014 02:12:35 GMT (envelope-from timur@svn.freebsd.org) Received: (from timur@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2D2CZPp026533; Thu, 13 Mar 2014 02:12:35 GMT (envelope-from timur@svn.freebsd.org) Message-Id: <201403130212.s2D2CZPp026533@svn.freebsd.org> From: "Timur I. Bakeyev" Date: Thu, 13 Mar 2014 02:12:35 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Mar 2014 02:12:36 -0000 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 +.include + 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 +.include 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 +.include 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 +.include