diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-15 20:36:08 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-15 20:36:08 +0000 |
| commit | 16435dbba43f2f98501e2daefad890a6542aab31 (patch) | |
| tree | ef231c2179d7607554ba0c04b952ae8f1a484723 | |
| parent | 44a5577f79e631209e188744de6b1a7380f34c31 (diff) | |
| download | pkgsrc-16435dbba43f2f98501e2daefad890a6542aab31.tar.gz | |
Split out deinstall portion of INSTALL script into a DEINSTALL script
to avoid the confusing DEINSTALL_TEMPLATE+=.../INSTALL line in the
Makefile. Also, fix the INSTALL script so that we actually link a
real target into ${PKG_SYSCONFDIR}. Bump the PKGREVISION.
| -rw-r--r-- | www/privoxy/DEINSTALL | 9 | ||||
| -rw-r--r-- | www/privoxy/INSTALL | 14 | ||||
| -rw-r--r-- | www/privoxy/Makefile | 6 |
3 files changed, 15 insertions, 14 deletions
diff --git a/www/privoxy/DEINSTALL b/www/privoxy/DEINSTALL new file mode 100644 index 00000000000..f23a1b54fb0 --- /dev/null +++ b/www/privoxy/DEINSTALL @@ -0,0 +1,9 @@ +#!@SH@ +# +# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:36:08 jlam Exp $ + +case "${STAGE}" in +DEINSTALL) + ${RM} -f ${PKG_SYSCONFDIR}/templates + ;; +esac diff --git a/www/privoxy/INSTALL b/www/privoxy/INSTALL index 5ca5a7d8cdb..fc23a103bda 100644 --- a/www/privoxy/INSTALL +++ b/www/privoxy/INSTALL @@ -1,16 +1,10 @@ #!@SH@ # -# $NetBSD: INSTALL,v 1.2 2003/11/05 10:45:29 agc Exp $ - -EGDIR="@EGDIR@" +# $NetBSD: INSTALL,v 1.3 2006/06/15 20:36:08 jlam Exp $ case "${STAGE}" in POST-INSTALL) - (cd ${PKG_SYSCONFDIR} && - ${LN} -s ${EGDIR}/templates) - ;; -DEINSTALL) - (cd ${PKG_SYSCONFDIR} && - ${RM} -f templates) - ;; + ${LN} -s ${PKG_PREFIX}/share/examples/privoxy/templates \ + ${PKG_SYSCONFDIR}/. + ;; esac diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 927f9fb01b0..855712d74c3 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.26 2006/04/23 00:12:42 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2006/06/15 20:36:08 jlam Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src PKGNAME= privoxy-3.0.3 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ijbswa/} @@ -52,8 +52,6 @@ CONF_FILES_PERMS+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} ${USER_GROUP} 0660 OWN_DIRS_PERMS+= /var/log/privoxy ${USER_GROUP} 0775 -DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL - FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER:Q} SUBST_CLASSES+= paths |