From 575015faecfbfb878d5bf3915e6aeab6d69ba799 Mon Sep 17 00:00:00 2001
From: xsa <xsa@openbsd.org>
Date: Thu, 15 Apr 2004 07:34:11 +0000
Subject: [PATCH] @extraaaaaaaaaaaaaaaaa ... ok dhartmei@ jolan@ brad@ for
 their respective port;

---
 mail/milter-regex/pkg/DEINSTALL | 24 +++++++++---------
 mail/milter-regex/pkg/PLIST     |  5 +++-
 www/ffproxy/pkg/DEINSTALL       | 44 ++++++++++++++++-----------------
 www/ffproxy/pkg/PLIST           |  7 +++++-
 www/squid/pkg/DEINSTALL         | 34 ++++++++++++-------------
 www/squid/pkg/PLIST             |  9 ++++++-
 6 files changed, 70 insertions(+), 53 deletions(-)

diff --git a/mail/milter-regex/pkg/DEINSTALL b/mail/milter-regex/pkg/DEINSTALL
index ce086c8a691..3b02e997754 100644
--- a/mail/milter-regex/pkg/DEINSTALL
+++ b/mail/milter-regex/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2004/01/07 14:57:34 dhartmei Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/04/15 07:34:11 xsa Exp $
 #
 # milter-regex de-installation
 
@@ -8,15 +8,17 @@ DIR=/var/spool/milter-regex
 USER=_milter-regex
 GROUP=_milter-regex
 
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you need to perform"
-echo "| these steps as root:"
-echo "|"
-echo "|	      userdel $USER"
-echo "|	      groupdel $GROUP"
-echo "|	      rm -rf $DIR"
-echo "+---------------"
-echo
+if [ ${PKG_DELETE_EXTRA} != Yes -a -d $DIR ]; then
+	echo
+	echo "+---------------"
+	echo "| To completely deinstall the $1 package you need to perform"
+	echo "| these steps as root:"
+	echo "|"
+	echo "|	      userdel $USER"
+	echo "|	      groupdel $GROUP"
+	echo "|	      rm -rf $DIR"
+	echo "+---------------"
+	echo
+fi
 
 exit 0
diff --git a/mail/milter-regex/pkg/PLIST b/mail/milter-regex/pkg/PLIST
index c3ff5e4137d..f9a8618e8c8 100644
--- a/mail/milter-regex/pkg/PLIST
+++ b/mail/milter-regex/pkg/PLIST
@@ -1,3 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1 2003/10/19 17:54:06 dhartmei Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/15 07:34:11 xsa Exp $
 libexec/milter-regex
 man/man8/milter-regex.8
+@extraunexec rm -rf /var/spool/milter-regex
+@extraunexec userdel _milter-regex
+@extraunexec groupdel _milter-regex
diff --git a/www/ffproxy/pkg/DEINSTALL b/www/ffproxy/pkg/DEINSTALL
index c301a540c7a..f9a2682caba 100644
--- a/www/ffproxy/pkg/DEINSTALL
+++ b/www/ffproxy/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2003/08/08 04:27:09 jolan Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2004/04/15 07:34:11 xsa Exp $
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 SYSCONFDIR=${SYSCONFDIR:-/etc}
@@ -8,27 +8,27 @@ FFPROXYDIR=/var/ffproxy
 FFPROXYUSER=_ffproxy
 FFPROXYGROUP=_ffproxy
 
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you need to perform"
-echo "| these steps as root:"
-echo "|"
-if userinfo -e $FFPROXYUSER; then
-echo "| userdel $FFPROXYUSER"
+if [ ${PKG_DELETE_EXTRA} != Yes -a -f $CONFIG_FILE ]; then
+	echo
+	echo "+---------------"
+	echo "| To completely deinstall the $1 package you need to perform"
+	echo "| these steps as root:"
+	echo "|"
+	if userinfo -e $FFPROXYUSER; then
+	echo "|	userdel $FFPROXYUSER"
+	fi
+	if groupinfo -e $FFPROXYGROUP; then
+	echo "|	groupdel $FFPROXYGROUP"
+	fi
+	echo "|	rm -f $CONFIG_FILE"
+	if [ -d $FFPROXYDIR ]; then
+	echo "|	rm -rf $FFPROXYDIR"
+	fi
+	echo "|"
+	echo "| Do not do this if you plan on re-installing $1"
+	echo "| at some future time."
+	echo "+---------------"
+	echo
 fi
-if groupinfo -e $FFPROXYGROUP; then
-echo "| groupdel $FFPROXYGROUP"
-fi
-if [ -f $CONFIG_FILE ]; then
-echo "| rm $CONFIG_FILE"
-fi
-if [ -d $FFPROXYDIR ]; then
-echo "| rm -rf $FFPROXYDIR"
-fi
-echo "|"
-echo "| Do not do this if you plan on re-installing $1"
-echo "| at some future time."
-echo "+---------------"
-echo
 
 exit 0
diff --git a/www/ffproxy/pkg/PLIST b/www/ffproxy/pkg/PLIST
index ad5bb6d7a94..5c5fe21f508 100644
--- a/www/ffproxy/pkg/PLIST
+++ b/www/ffproxy/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2003/08/15 14:44:05 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/04/15 07:34:11 xsa Exp $
 bin/ffproxy
 man/man5/ffproxy.conf.5
 man/man7/ffproxy.quick.7
@@ -26,3 +26,8 @@ share/examples/ffproxy/html/resolve
 @dirrm share/examples/ffproxy/db
 @dirrm share/examples/ffproxy
 @dirrm share/doc/ffproxy
+@cwd ${SYSCONFDIR}
+@extra ffproxy.conf
+@extraunexec rm -rf /var/ffproxy
+@extraunexec userdel _ffproxy
+@extraunexec groupdel _ffproxy
diff --git a/www/squid/pkg/DEINSTALL b/www/squid/pkg/DEINSTALL
index b4c0cdb8253..3b238cc0254 100644
--- a/www/squid/pkg/DEINSTALL
+++ b/www/squid/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.8 2003/07/08 20:43:21 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.9 2004/04/15 07:34:11 xsa Exp $
 #
 # Squid de-installation
 
@@ -10,21 +10,21 @@ SQUIDDIR=${SQUIDDIR}
 SQUIDUSER=_squid
 SQUIDGROUP=_squid
 
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you need to perform"
-echo "| these steps as root:"
-echo "|"
-echo "|           userdel $SQUIDUSER"
-echo "|           groupdel $SQUIDGROUP"
-echo "|           rm -rf $CONFIG_DIR"
-echo "|           rm -rf $PREFIX/share/squid"
-echo "|           rm -rf $SQUIDDIR"
-echo "|           rm -f /var/run/squid.pid"
-echo "|"
-echo "| Do not do this if you plan on re-installing $1"
-echo "| at some future time."
-echo "+---------------"
-echo
+if [ ${PKG_DELETE_EXTRA} != Yes -a -d $CONFIG_DIR ]; then
+	echo "+---------------"
+	echo "| To completely deinstall the $1 package you need to perform"
+	echo "| these steps as root:"
+	echo "|"
+	echo "|           userdel $SQUIDUSER"
+	echo "|           groupdel $SQUIDGROUP"
+	echo "|           rm -rf $CONFIG_DIR"
+	echo "|           rm -rf $PREFIX/share/squid"
+	echo "|           rm -rf $SQUIDDIR"
+	echo "|           rm -f /var/run/squid.pid"
+	echo "|"
+	echo "| Do not do this if you plan on re-installing $1"
+	echo "| at some future time."
+	echo "+---------------"
+fi
 
 exit 0
diff --git a/www/squid/pkg/PLIST b/www/squid/pkg/PLIST
index 54de6d9b4f2..aa685343560 100644
--- a/www/squid/pkg/PLIST
+++ b/www/squid/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2004/03/03 01:20:42 brad Exp $
+@comment $OpenBSD: PLIST,v 1.14 2004/04/15 07:34:11 xsa Exp $
 bin/RunAccel
 bin/RunCache
 bin/squidclient
@@ -882,3 +882,10 @@ share/examples/squid/squid.conf
 @dirrm share/examples/squid/errors/Bulgarian
 @dirrm share/examples/squid/errors
 @dirrm share/examples/squid
+@extraunexec rm -rf ${SYSCONFDIR}/squid
+@extraunexec rm -rf ${PREFIX}/share/squid
+@extraunexec rm -rf /var/squid
+@cwd /var/run
+@extra squid.pid
+@extraunexec userdel _squid
+@extraunexec groupdel _squid