From owner-svn-ports-all@FreeBSD.ORG Wed May 7 23:49:47 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F962347; Wed, 7 May 2014 23:49:47 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53383E2C; Wed, 7 May 2014 23:49:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47Nnlb2057150; Wed, 7 May 2014 23:49:47 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47NnkmK057148; Wed, 7 May 2014 23:49:46 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405072349.s47NnkmK057148@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 7 May 2014 23:49:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353230 - head/databases/dbtool X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2014 23:49:47 -0000 Author: bapt Date: Wed May 7 23:49:46 2014 New Revision: 353230 URL: http://svnweb.freebsd.org/changeset/ports/353230 QAT: https://qat.redports.org/buildarchive/r353230/ Log: Support stage Use option framework Convert to USES=gmake Modified: head/databases/dbtool/Makefile head/databases/dbtool/pkg-plist Modified: head/databases/dbtool/Makefile ============================================================================== --- head/databases/dbtool/Makefile Wed May 7 23:45:37 2014 (r353229) +++ head/databases/dbtool/Makefile Wed May 7 23:49:46 2014 (r353230) @@ -12,40 +12,27 @@ COMMENT= Store and retrieve data in a ke LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -.if defined(WITH_BERKELEY_DB) -LIB_DEPENDS+= libdb3.so:${PORTSDIR}/databases/db3 -DB_INC= -I${LOCALBASE}/include/db3 -CONFIGURE_ARGS= --with-berkeley -.else -LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm -.endif -.if !defined(NOPORTDOCS) -RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash -.endif +OPTIONS_DEFINE= BDB EXAMPLES + +BDB_LIB_DEPENDS= libdb3.so:${PORTSDIR}/databases/db3 +BDB_CPPFLAGS= -I${LOCALBASE}/include/db3 +BDB_CONFIGURE_ON= --with-berkeley +BDB_LIB_DEPENDS_OFF= libgdbm.so:${PORTSDIR}/databases/gdbm + +EXAMPLES_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash LICENSE= GPLv2 GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" -CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include ${DB_INC} +CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include -USE_GMAKE= yes +USES= gmake REINPLACE_ARGS= -i "" -MAN1= dbtool.1 - SH2BASH= samples/account-db/accdb UB2PFX= samples/locate/locate samples/locate/updatedb -NO_STAGE= yes -post-extract: -.if !defined(WITH_BERKELEY_DB) - @${ECHO_MSG} - @${ECHO_MSG} " Build with gdbm by default. " - @${ECHO_MSG} " If you want to use BerkeleyDB, you can build with WITH_BERKELEY_DB=yes" - @${ECHO_MSG} -.endif - post-patch: .for file in dbtool.cc engine.cc engine.h @${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/${file} @@ -63,11 +50,7 @@ post-patch: .endif post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${EXAMPLESDIR} - @${CP} -Rp ${WRKSRC}/samples/* ${EXAMPLESDIR} - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} - @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." -.endif + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${CP} -Rp ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/databases/dbtool/pkg-plist ============================================================================== --- head/databases/dbtool/pkg-plist Wed May 7 23:45:37 2014 (r353229) +++ head/databases/dbtool/pkg-plist Wed May 7 23:49:46 2014 (r353230) @@ -1,4 +1,5 @@ bin/dbtool +man/man1/dbtool.1.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/account-db/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/account-db/accdb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/README