Index: head/databases/dbtool/pkg-plist =================================================================== --- head/databases/dbtool/pkg-plist (revision 399504) +++ head/databases/dbtool/pkg-plist (nonexistent) @@ -1,9 +0,0 @@ -bin/dbtool -man/man1/dbtool.1.gz -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/account-db/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/account-db/accdb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/locate -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/updatedb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uback/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README Property changes on: head/databases/dbtool/pkg-plist ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/dbtool/files/patch-samples_locate_updatedb =================================================================== --- head/databases/dbtool/files/patch-samples_locate_updatedb (revision 399504) +++ head/databases/dbtool/files/patch-samples_locate_updatedb (nonexistent) @@ -1,16 +0,0 @@ ---- samples/locate/updatedb.orig Sat Apr 20 17:14:18 2002 -+++ samples/locate/updatedb Sun Mar 23 12:24:47 2003 -@@ -11,10 +11,10 @@ - # $Id: updatedb,v 1.2 2001/06/26 23:00:02 scip Exp $ - # - --dbtool="/usr/bin/dbtool"; -+dbtool="%%PREFIX%%/bin/dbtool"; - find="/usr/bin/find"; --db="/var/local/locate.db"; --egrep="/bin/egrep"; -+db="/var/db/locate.db"; -+egrep="/usr/bin/egrep"; - cp="/bin/cp" - - $cp /dev/null $db; Property changes on: head/databases/dbtool/files/patch-samples_locate_updatedb ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/dbtool/files/patch-samples_locate_locate =================================================================== --- head/databases/dbtool/files/patch-samples_locate_locate (revision 399504) +++ head/databases/dbtool/files/patch-samples_locate_locate (nonexistent) @@ -1,16 +0,0 @@ ---- samples/locate/locate.orig Sat Apr 20 17:14:18 2002 -+++ samples/locate/locate Sun Mar 23 12:25:01 2003 -@@ -12,10 +12,10 @@ - # - # $Id: locate,v 1.3 2001/06/26 23:00:02 scip Exp $ - --dbtool="/usr/bin/dbtool"; -+dbtool="%%PREFIX%%/bin/dbtool"; - find="/usr/bin/find"; --db="/var/local/locate.db"; --sort="/bin/sort"; -+db="/var/db/locate.db"; -+sort="/usr/bin/sort"; - regex=$1; - - if [ "x$regex" != "x" ]; then Property changes on: head/databases/dbtool/files/patch-samples_locate_locate ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/dbtool/Makefile =================================================================== --- head/databases/dbtool/Makefile (revision 399504) +++ head/databases/dbtool/Makefile (revision 399505) @@ -1,55 +1,52 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= dbtool -PORTVERSION= 1.8 +PORTVERSION= 1.9.1 CATEGORIES= databases MASTER_SITES= http://www.daemon.de/idisk/Apps/dbtool/ MAINTAINER= ports@FreeBSD.org COMMENT= Store and retrieve data in a key/value format in a hash database LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -OPTIONS_DEFINE= BDB EXAMPLES - -EXAMPLES_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash - +USES= gmake shebangfix +SHEBANG_FILES= samples/account-db/accdb +bash_OLD_CMD= /bin/sh GNU_CONFIGURE= yes -CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -USES= gmake -REINPLACE_ARGS= -i "" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -SH2BASH= samples/account-db/accdb -UB2PFX= samples/locate/locate samples/locate/updatedb -EXTRACT_AFTER_ARGS+= --no-same-permissions --no-same-owner --exclude '*~' +PORTEXAMPLES= * +PLIST_FILES= bin/dbtool man/man1/dbtool.1.gz -.include +OPTIONS_DEFINE= EXAMPLES +OPTIONS_SINGLE= BACKEND +OPTIONS_SINGLE_BACKEND= BDB GDBM +OPTIONS_DEFAULT= GDBM -.if ${PORT_OPTIONS:MBDB} -USE_BDB= 48+ -CPPFLAGS+= -I${BDB_INCLUDE_DIR} -LIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} -CONFIGURE_ARGS+= --with-berkeley -.else -LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm -CONFIGURE_ARGS+= --without-berkeley -.endif +BACKEND_DESC= Database backend +BDB_USE= bdb=yes +BDB_CONFIGURE_ON= --with-berkeley \ + --with-bdb-include-dir=${BDB_INCLUDE_DIR} \ + --with-bdb-lib-dir=${BDB_LIB_DIR} +EXAMPLES_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash +GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm +GDBM_CONFIGURE_ON= --with-gdbm \ + --with-gdbm-dir=${LOCALBASE} post-patch: - ${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/dbtool.cc ${WRKSRC}/engine.cc ${WRKSRC}/engine.h -.if ${PORT_OPTIONS:MEXAMPLES} - ${REINPLACE_CMD} -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ${SH2BASH:S|^|${WRKSRC}/|} - ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${UB2PFX:S|^|${WRKSRC}/|} - ${RM} ${UB2PFX:C|.*|${WRKSRC}/&.orig|} + @${REINPLACE_CMD} -e \ + '/try_libs=/s|"-ldb_cxx.*"|"-ldb_cxx"| ; \ + /try_headers=/s|"db.*"|"db_cxx.h"|' ${WRKSRC}/configure -post-install: - #@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.endif .include Index: head/databases/dbtool/distinfo =================================================================== --- head/databases/dbtool/distinfo (revision 399504) +++ head/databases/dbtool/distinfo (revision 399505) @@ -1,2 +1,2 @@ -SHA256 (dbtool-1.8.tar.gz) = a66e1150cce006daecedd9a592efe75fa19c642addad97ec117f1a2219c4f079 -SIZE (dbtool-1.8.tar.gz) = 133262 +SHA256 (dbtool-1.9.1.tar.gz) = afd3fa03d4b69f25c689817dc1b6ac452eb16ed4b9712c20695b3b4d13a5e647 +SIZE (dbtool-1.9.1.tar.gz) = 965751