[pkgsrc/trunk]: pkgsrc/www/privoxy Split out deinstall portion of INSTALL scr...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a07dc6d1bafe
branches:  trunk
changeset: 514651:a07dc6d1bafe
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jun 15 20:36:08 2006 +0000

description:
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.

diffstat:

 www/privoxy/DEINSTALL |   9 +++++++++
 www/privoxy/INSTALL   |  14 ++++----------
 www/privoxy/Makefile  |   6 ++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diffs (61 lines):

diff -r 8130b48986c2 -r a07dc6d1bafe www/privoxy/DEINSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/privoxy/DEINSTALL     Thu Jun 15 20:36:08 2006 +0000
@@ -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 -r 8130b48986c2 -r a07dc6d1bafe www/privoxy/INSTALL
--- a/www/privoxy/INSTALL       Thu Jun 15 20:16:41 2006 +0000
+++ b/www/privoxy/INSTALL       Thu Jun 15 20:36:08 2006 +0000
@@ -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 -r 8130b48986c2 -r a07dc6d1bafe www/privoxy/Makefile
--- a/www/privoxy/Makefile      Thu Jun 15 20:16:41 2006 +0000
+++ b/www/privoxy/Makefile      Thu Jun 15 20:36:08 2006 +0000
@@ -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 @@
 
 OWN_DIRS_PERMS+=       /var/log/privoxy ${USER_GROUP} 0775
 
-DEINSTALL_TEMPLATE+=   ${PKGDIR}/INSTALL
-
 FILES_SUBST+=          PRIVOXY_USER=${PRIVOXY_USER:Q}
 
 SUBST_CLASSES+=                paths