From owner-svn-ports-all@FreeBSD.ORG Fri May 29 20:01:48 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 9DA33541; Fri, 29 May 2015 20:01:48 +0000 (UTC) (envelope-from matthew@FreeBSD.org) 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 8BCE11195; Fri, 29 May 2015 20:01:48 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4TK1mFt064040; Fri, 29 May 2015 20:01:48 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4TK1mFW064038; Fri, 29 May 2015 20:01:48 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201505292001.t4TK1mFW064038@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Fri, 29 May 2015 20:01:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387886 - in head/ports-mgmt/p5-FreeBSD-Portindex: . files 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: Fri, 29 May 2015 20:01:48 -0000 Author: matthew Date: Fri May 29 20:01:47 2015 New Revision: 387886 URL: https://svnweb.freebsd.org/changeset/ports/387886 Log: - Use @sample - Manager cache directory owner/group/permissions from plist instaead of scripts, unbreak build from plain user - Simplify installation - Use canonical statement order - Fix option description PR: 200520 Submitted by: amdmi3 Deleted: head/ports-mgmt/p5-FreeBSD-Portindex/files/ Modified: head/ports-mgmt/p5-FreeBSD-Portindex/Makefile head/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist Modified: head/ports-mgmt/p5-FreeBSD-Portindex/Makefile ============================================================================== --- head/ports-mgmt/p5-FreeBSD-Portindex/Makefile Fri May 29 20:00:12 2015 (r387885) +++ head/ports-mgmt/p5-FreeBSD-Portindex/Makefile Fri May 29 20:01:47 2015 (r387886) @@ -3,7 +3,7 @@ PORTNAME= FreeBSD-Portindex PORTVERSION= 3.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ports-mgmt perl5 MASTER_SITES= http://www.infracaninophile.co.uk/portindex/ PKGNAMEPREFIX= p5- @@ -16,20 +16,9 @@ LICENSE= BSD2CLAUSE BUILD_DEPENDS= p5-BerkeleyDB>0:${PORTSDIR}/databases/p5-BerkeleyDB RUN_DEPENDS:= ${BUILD_DEPENDS} -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 -GRAPHVIS_DESCR= Add GraphViz run-time dependency - -.include - -GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz - -USES+= perl5 tar:xz +USES= perl5 tar:xz USE_PERL5= configure +NO_ARCH= yes CACHE_DIR?= /var/db/portindex CACHE_OWNER?= root @@ -38,16 +27,20 @@ CACHE_MODE?= 0775 CFG_FILE= portindex.cfg -SUB_FILES+= pkg-install pkg-deinstall -SUB_LIST+= CACHE_DIR=${CACHE_DIR} \ +PLIST_SUB+= CACHE_DIR=${CACHE_DIR} \ CACHE_OWNER=${CACHE_OWNER} \ CACHE_GROUP=${CACHE_GROUP} \ CACHE_MODE=${CACHE_MODE} -post-install: install-conf +# 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 +GRAPHVIZ_DESC= Add GraphViz run-time dependency +GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz -install-conf: - cd ${WRKSRC} ; \ - ${INSTALL_DATA} ${CFG_FILE}.sample ${STAGEDIR}${PREFIX}/etc/${CFG_FILE}.sample +post-install: + ${MKDIR} ${STAGEDIR}${CACHE_DIR} + ${INSTALL_DATA} ${WRKSRC}/${CFG_FILE}.sample ${STAGEDIR}${PREFIX}/etc/${CFG_FILE}.sample .include Modified: head/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist ============================================================================== --- head/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist Fri May 29 20:00:12 2015 (r387885) +++ head/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist Fri May 29 20:01:47 2015 (r387886) @@ -10,9 +10,7 @@ man/man1/find-updated.1.gz man/man1/make-readmes.1.gz man/man1/portdepends.1.gz man/man1/portindex.1.gz -@unexec if cmp -s %D/etc/portindex.cfg.sample %D/etc/portindex.cfg ; then rm -f %D/etc/portindex.cfg ; fi -etc/portindex.cfg.sample -@exec [ ! -f %B/portindex.cfg ] && cp -p %B/%f %B/portindex.cfg || true +@sample etc/portindex.cfg.sample %%SITE_PERL%%/FreeBSD/Portindex/Category.pm %%SITE_PERL%%/FreeBSD/Portindex/Config.pm %%SITE_PERL%%/FreeBSD/Portindex/FileObject.pm @@ -23,3 +21,4 @@ etc/portindex.cfg.sample %%SITE_PERL%%/FreeBSD/Portindex/PortsTreeObject.pm %%SITE_PERL%%/FreeBSD/Portindex/Tree.pm %%SITE_PERL%%/FreeBSD/Portindex/TreeObject.pm +@dir(%%CACHE_OWNER%%,%%CACHE_GROUP%%,%%CACHE_MODE%%) %%CACHE_DIR%%