Attachment 157252 Details for Bug 200520 – Patch

[patch] Patch

p5-FreeBSD-Portindex.patch (text/plain), 4.03 KB, created by Dmitry Marakasov on 2015-05-29 16:46:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-05-29 16:46:16 UTC

Size: 4.03 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 387870)
>+++ Makefile	(working copy)
>@@ -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,21 +16,10 @@
> BUILD_DEPENDS=	p5-BerkeleyDB>0:${PORTSDIR}/databases/p5-BerkeleyDB
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>+USES=		perl5 tar:xz
>+USE_PERL5=	configure
> 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 <bsd.port.options.mk>
>-
>-GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
>-
>-USES+=		perl5 tar:xz
>-USE_PERL5=	configure
>-
> CACHE_DIR?=	/var/db/portindex
> CACHE_OWNER?=	root
> CACHE_GROUP?=	operator
>@@ -38,16 +27,20 @@
> 
> 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 <bsd.port.mk>
>Index: files/pkg-deinstall.in
>===================================================================
>--- files/pkg-deinstall.in	(revision 387870)
>+++ files/pkg-deinstall.in	(working copy)
>@@ -1,23 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD$
>-#
>-
>-PATH=/usr/sbin:/usr/bin:/bin ; export PATH
>-
>-CACHE_DIR=%%CACHE_DIR%%
>-
>-case $2 in
>-    
>-    # Remove the cache directory, but only if it is empty.
>-
>-    POST-DEINSTALL)
>-	if [ ! -d ${CACHE_DIR} ] ; then
>-	    rmdir ${CACHE_DIR} >/dev/null 2>&1 || true
>-	fi
>-	;;
>-esac
>-
>-#
>-# That's All Folks!
>-#
>Index: files/pkg-install.in
>===================================================================
>--- files/pkg-install.in	(revision 387870)
>+++ files/pkg-install.in	(working copy)
>@@ -1,33 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD$
>-#
>-
>-PATH=/usr/sbin:/usr/bin:/bin ; export PATH
>-
>-CACHE_DIR=%%CACHE_DIR%%
>-CACHE_OWNER=%%CACHE_OWNER%%
>-CACHE_GROUP=%%CACHE_GROUP%%
>-CACHE_MODE=%%CACHE_MODE%%
>-
>-case $2 in
>-    
>-    # Create the cache directory and make it writable by group
>-    # 'operator' by default.  Only if the cache directory doesn't
>-    # already exist.  Have to do this by hand if installing via pkg.
>-    #
>-    # Add default copy of config file if no previous config file
>-    # exists.
>-
>-    POST-INSTALL)
>-	if [ ! -d ${CACHE_DIR} ] ; then
>-	    mkdir -p ${CACHE_DIR}  
>-	    chown ${CACHE_OWNER}:${CACHE_GROUP} ${CACHE_GROUP}
>-	    chmod ${CACHE_MODE} ${CACHE_DIR}
>-	fi
>-	;;
>-esac
>-
>-#
>-# That's All Folks!
>-#
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 387870)
>+++ pkg-plist	(working copy)
>@@ -10,9 +10,7 @@
> 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 @@
> %%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%%

Actions: View | Diff

Attachments on bug 200520: 157252