Date: Thu, 26 Dec 2013 22:41:03 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337628 - in head/ports-mgmt/p5-FreeBSD-Portindex: . files Message-ID: <201312262241.rBQMf36m010895@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: matthew Date: Thu Dec 26 22:41:02 2013 New Revision: 337628 URL: http://svnweb.freebsd.org/changeset/ports/337628 Log: Update to 3.3 - BSD2CLAUSE license - OPTIONS helpers - remove code from pkg-install.in that was duplicating functionality already performed from pkg-plist. This version drops support for the old-style OPTIONS variable, and looks for both OPTIONSFILE and OPTIONS_FILE if OPTIONS_DEFINE is not empty. Modified: head/ports-mgmt/p5-FreeBSD-Portindex/Makefile head/ports-mgmt/p5-FreeBSD-Portindex/distinfo head/ports-mgmt/p5-FreeBSD-Portindex/files/pkg-install.in Modified: head/ports-mgmt/p5-FreeBSD-Portindex/Makefile ============================================================================== --- head/ports-mgmt/p5-FreeBSD-Portindex/Makefile Thu Dec 26 22:28:10 2013 (r337627) +++ head/ports-mgmt/p5-FreeBSD-Portindex/Makefile Thu Dec 26 22:41:02 2013 (r337628) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= FreeBSD-Portindex -PORTVERSION= 3.2 -PORTREVISION= 1 +PORTVERSION= 3.3 CATEGORIES= ports-mgmt perl5 MASTER_SITES= http://www.infracaninophile.co.uk/portindex/ PKGNAMEPREFIX= p5- @@ -11,7 +10,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= matthew@FreeBSD.org COMMENT= Incremental FreeBSD ports INDEX file generation -LICENSE= BSD +LICENSE= BSD2CLAUSE BUILD_DEPENDS= p5-BerkeleyDB>0:${PORTSDIR}/databases/p5-BerkeleyDB RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -21,14 +20,12 @@ NO_ARCH= yes # GraphViz not required for portindex to run or generate GraphViz # format output: this is only needed to render the output on the same # machine. -OPTIONS_DEFINE= GRAPHVIZ +OPTIONS_DEFINE= GRAPHVIZ GRAPHVIS_DESCR= Add GraphViz run-time dependency .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MGRAPHVIZ} -RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz -.endif +GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz USES+= perl5 USE_XZ= yes @@ -45,8 +42,7 @@ SUB_FILES+= pkg-install SUB_LIST+= CACHE_DIR=${CACHE_DIR} \ CACHE_OWNER=${CACHE_OWNER} \ CACHE_GROUP=${CACHE_GROUP} \ - CACHE_MODE=${CACHE_MODE} \ - CFG_FILE=${PREFIX}/etc/portindex.cfg + CACHE_MODE=${CACHE_MODE} post-install: install-conf Modified: head/ports-mgmt/p5-FreeBSD-Portindex/distinfo ============================================================================== --- head/ports-mgmt/p5-FreeBSD-Portindex/distinfo Thu Dec 26 22:28:10 2013 (r337627) +++ head/ports-mgmt/p5-FreeBSD-Portindex/distinfo Thu Dec 26 22:41:02 2013 (r337628) @@ -1,2 +1,2 @@ -SHA256 (FreeBSD-Portindex-3.2.tar.xz) = e459a9be1294b9881b86a83d4fe4abb59a898130cc69e5e2d8ae68bf0560d9b1 -SIZE (FreeBSD-Portindex-3.2.tar.xz) = 56036 +SHA256 (FreeBSD-Portindex-3.3.tar.xz) = cd047f92efdc0a54be567287b2f09e095f9a9aa4b66f5674610284a4f3cce04e +SIZE (FreeBSD-Portindex-3.3.tar.xz) = 56192 Modified: head/ports-mgmt/p5-FreeBSD-Portindex/files/pkg-install.in ============================================================================== --- head/ports-mgmt/p5-FreeBSD-Portindex/files/pkg-install.in Thu Dec 26 22:28:10 2013 (r337627) +++ head/ports-mgmt/p5-FreeBSD-Portindex/files/pkg-install.in Thu Dec 26 22:41:02 2013 (r337628) @@ -9,7 +9,6 @@ CACHE_DIR=%%CACHE_DIR%% CACHE_OWNER=%%CACHE_OWNER%% CACHE_GROUP=%%CACHE_GROUP%% CACHE_MODE=%%CACHE_MODE%% -CFG_FILE=%%CFG_FILE%% case $2 in @@ -26,9 +25,6 @@ case $2 in chown ${CACHE_OWNER}:${CACHE_GROUP} ${CACHE_GROUP} chmod ${CACHE_MODE} ${CACHE_DIR} fi - if [ ! -f ${CFG_FILE} ] ; then - cp -p ${CFG_FILE}.sample ${CFG_FILE} - fi ;; esac
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312262241.rBQMf36m010895>