From owner-svn-ports-all@FreeBSD.ORG Tue Apr 14 20:21:25 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 613B8671; Tue, 14 Apr 2015 20:21:25 +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 42B2BAB2; Tue, 14 Apr 2015 20:21:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EKLPkv082415; Tue, 14 Apr 2015 20:21:25 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EKLO6L082413; Tue, 14 Apr 2015 20:21:24 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201504142021.t3EKLO6L082413@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Tue, 14 Apr 2015 20:21:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384024 - 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.20 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: Tue, 14 Apr 2015 20:21:25 -0000 Author: mi Date: Tue Apr 14 20:21:24 2015 New Revision: 384024 URL: https://svnweb.freebsd.org/changeset/ports/384024 Log: Upgrade from 1.7 to 1.8. While here, please portlint and unroll some loops in Makefile. Modified: head/databases/dbtool/Makefile head/databases/dbtool/distinfo Modified: head/databases/dbtool/Makefile ============================================================================== --- head/databases/dbtool/Makefile Tue Apr 14 19:28:12 2015 (r384023) +++ head/databases/dbtool/Makefile Tue Apr 14 20:21:24 2015 (r384024) @@ -2,22 +2,21 @@ # $FreeBSD$ PORTNAME= dbtool -PORTVERSION= 1.7 -PORTREVISION= 5 +PORTVERSION= 1.8 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 + LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre OPTIONS_DEFINE= BDB EXAMPLES EXAMPLES_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -LICENSE= GPLv2 - GNU_CONFIGURE= yes CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib @@ -27,6 +26,7 @@ REINPLACE_ARGS= -i "" SH2BASH= samples/account-db/accdb UB2PFX= samples/locate/locate samples/locate/updatedb +EXTRACT_AFTER_ARGS+= --no-same-permissions --no-same-owner --exclude '*~' .include @@ -41,23 +41,15 @@ CONFIGURE_ARGS+= --without-berkeley .endif post-patch: - ${REINPLACE_CMD} -e 's,==,=,g' ${WRKSRC}/configure -.for file in dbtool.cc engine.cc engine.h - ${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/${file} -.endfor + ${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/dbtool.cc ${WRKSRC}/engine.cc ${WRKSRC}/engine.h .if ${PORT_OPTIONS:MEXAMPLES} -.for file in ${SH2BASH} - ${REINPLACE_CMD} -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ${WRKSRC}/${file} -.endfor -.for file in ${UB2PFX} - ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} - @${RM} ${WRKSRC}/${file}.orig - @${RM} ${WRKSRC}/${file}~ -.endfor -.endif + ${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|} post-install: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${CP} -Rp ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR} + #@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} +.endif .include Modified: head/databases/dbtool/distinfo ============================================================================== --- head/databases/dbtool/distinfo Tue Apr 14 19:28:12 2015 (r384023) +++ head/databases/dbtool/distinfo Tue Apr 14 20:21:24 2015 (r384024) @@ -1,2 +1,2 @@ -SHA256 (dbtool-1.7.tar.gz) = 90e813b57f4d5f3714c3c54c95982b3fc9c1f6b011cade19e101045eb3f1e7a9 -SIZE (dbtool-1.7.tar.gz) = 124794 +SHA256 (dbtool-1.8.tar.gz) = a66e1150cce006daecedd9a592efe75fa19c642addad97ec117f1a2219c4f079 +SIZE (dbtool-1.8.tar.gz) = 133262