diff --git a/net/ipfm/pkg/DEINSTALL b/net/ipfm/pkg/DEINSTALL
index 66031aa988c..8f1fae553b7 100644
--- a/net/ipfm/pkg/DEINSTALL
+++ b/net/ipfm/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2003/04/26 14:55:32 sturm Exp $
+# $OpenBSD: DEINSTALL,v 1.4 2003/09/28 17:00:11 naddy Exp $
 #
 # ipfm de-installation
 
@@ -9,7 +9,8 @@ PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/ipfm.conf
 LOG_DIR=/var/log/ipfm
 
-if [ -f ${CONFIG_FILE} -o -d ${LOG_DIR} ]; then
+if [ "$PKG_DELETE_EXTRA" != Yes ] &&
+   [ -f ${CONFIG_FILE} -o -d ${LOG_DIR} ]; then
 	echo
 	echo "+---------------"
 	echo "| To completely deinstall the $1 package you need to perform"
diff --git a/net/ipfm/pkg/PLIST b/net/ipfm/pkg/PLIST
index 6b02f101331..08cfb0af703 100644
--- a/net/ipfm/pkg/PLIST
+++ b/net/ipfm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/03/01 09:52:16 form Exp $
+@comment $OpenBSD: PLIST,v 1.3 2003/09/28 17:00:11 naddy Exp $
 man/man5/ipfm.conf.5
 man/man8/ipfm.8
 sbin/ipfm
@@ -8,3 +8,6 @@ share/doc/ipfm/TODO
 share/examples/ipfm/ipfm.conf.sample
 @dirrm share/examples/ipfm
 @dirrm share/doc/ipfm
+@cwd ${SYSCONFDIR}
+@extra ipfm.conf
+@extraunexec rm -rf /var/log/ipfm
diff --git a/net/trafd/pkg/DEINSTALL b/net/trafd/pkg/DEINSTALL
index a1e86b7a195..ebf656d11e6 100644
--- a/net/trafd/pkg/DEINSTALL
+++ b/net/trafd/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2000/09/15 05:17:41 form Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 17:00:11 naddy Exp $
 #
 # trafd de-installation
 
@@ -10,18 +10,20 @@ CONFIG_FILE=${SYSCONFDIR}/traflog.format
 LOG_FILE=/var/log/traffic.log
 STAT_DIR=/var/trafd
 
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you need to perform"
-echo "| this step as root:"
-echo "|"
-echo "|		rm -f ${CONFIG_FILE}"
-echo "|		rm -f ${LOG_FILE}"
-echo "|		rm -rf ${STAT_DIR}"
-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 ]; then
+	echo
+	echo "+---------------"
+	echo "| To completely deinstall the $1 package you need to perform"
+	echo "| this step as root:"
+	echo "|"
+	echo "|		rm -f ${CONFIG_FILE}"
+	echo "|		rm -f ${LOG_FILE}"
+	echo "|		rm -rf ${STAT_DIR}"
+	echo "|"
+	echo "| Do not do this if you plan on re-installing $1"
+	echo "| at some future time."
+	echo "+---------------"
+	echo
+fi
 
 exit 0
diff --git a/net/trafd/pkg/PLIST b/net/trafd/pkg/PLIST
index 4f222d0c9ad..4f6f150a00a 100644
--- a/net/trafd/pkg/PLIST
+++ b/net/trafd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2000/09/15 05:17:41 form Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/09/28 17:00:11 naddy Exp $
 sbin/trafd
 sbin/trafdump
 sbin/traflog
@@ -10,3 +10,8 @@ share/doc/trafd/README
 share/doc/trafd/traflog.format.sample
 share/doc/trafd/trafstart
 @dirrm share/doc/trafd
+@cwd ${SYSCONFDIR}
+@extra traflog.format
+@cwd /var/log
+@extra traffic.log
+@extraunexec rm -rf /var/trafd
diff --git a/print/enscript/pkg/DEINSTALL b/print/enscript/pkg/DEINSTALL
index eeb14d39859..e9a2dedd864 100644
--- a/print/enscript/pkg/DEINSTALL
+++ b/print/enscript/pkg/DEINSTALL
@@ -1,15 +1,22 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2003/04/26 14:55:32 sturm Exp $
+# $OpenBSD: DEINSTALL,v 1.4 2003/09/28 17:00:11 naddy Exp $
 #
 # Pre/post-uninstallation setup of enscript
 
-echo
-echo "+---------------"
-echo "| To completely deinstall the enscript package you need to perform"
-echo "| this steps as root:"
-echo "|"
-echo "|           rm -f ${SYSCONFDIR}/enscript.cfg"
-echo "+---------------"
-echo
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=${SYSCONFDIR}/enscript.cfg
+
+if [ "$PKG_DELETE_EXTRA" != Yes -a -f ${CONFIG_FILE} ]; then
+	echo
+	echo "+---------------"
+	echo "| To completely deinstall the enscript package you need to perform"
+	echo "| this step as root:"
+	echo "|"
+	echo "|           rm -f ${CONFIG_FILE}"
+	echo "+---------------"
+	echo
+fi
 
 exit 0
diff --git a/print/enscript/pkg/PLIST b/print/enscript/pkg/PLIST
index a8249aac1da..7e47057eac3 100644
--- a/print/enscript/pkg/PLIST
+++ b/print/enscript/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2002/05/11 22:31:24 matt Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/09/28 17:00:11 naddy Exp $
 @unexec install-info --delete --info-dir=%D/info %D/info/enscript.info
 bin/diffpp
 bin/enscript
@@ -164,3 +164,5 @@ share/locale/sl/LC_MESSAGES/enscript.mo
 @dirrm share/enscript/afm
 @dirrm share/enscript
 @exec install-info --info-dir=%D/info %D/info/enscript.info
+@cwd ${SYSCONFDIR}
+@extra enscript.cfg
diff --git a/sysutils/idled/pkg/DEINSTALL b/sysutils/idled/pkg/DEINSTALL
index 7e46e241873..18dae1932b6 100644
--- a/sysutils/idled/pkg/DEINSTALL
+++ b/sysutils/idled/pkg/DEINSTALL
@@ -1,4 +1,4 @@
-# $OpenBSD: DEINSTALL,v 1.1 2001/06/14 03:18:29 pvalchev Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 17:00:11 naddy Exp $
 #
 # idled de-installation
 
@@ -7,7 +7,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/idled.cf
 
-if [ -f $CONFIG_FILE ]; then
+if [ "$PKG_DELETE_EXTRA" != Yes -a -f $CONFIG_FILE ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/sysutils/idled/pkg/PLIST b/sysutils/idled/pkg/PLIST
index a1500ac41e8..cba4a6b5b6a 100644
--- a/sysutils/idled/pkg/PLIST
+++ b/sysutils/idled/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.5 2001/06/14 03:18:30 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/09/28 17:00:11 naddy Exp $
 libexec/idled
 man/man5/idled.cf.5
 man/man8/idled.8
 share/examples/idled/idled.cf.template
 @dirrm share/examples/idled
+@cwd ${SYSCONFDIR}
+@extra idled.cf
diff --git a/www/surfraw/pkg/DEINSTALL b/www/surfraw/pkg/DEINSTALL
index f3886808f0d..fa9f6abe653 100644
--- a/www/surfraw/pkg/DEINSTALL
+++ b/www/surfraw/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2000/08/21 15:09:32 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 17:00:11 naddy Exp $
 #
 # De-installation setup of surfraw
 
@@ -38,7 +38,7 @@ fi
 #
 case $2 in
     DEINSTALL)
-	if [ -f ${CONFIG_FILE} ]; then
+	if [ "$PKG_DELETE_EXTRA" != Yes -a -f ${CONFIG_FILE} ]; then
 	    do_notice "$1"
 	fi
 	;;
diff --git a/www/surfraw/pkg/PLIST b/www/surfraw/pkg/PLIST
index a0b95378844..ab9791eb8c6 100644
--- a/www/surfraw/pkg/PLIST
+++ b/www/surfraw/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2001/12/25 17:26:50 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.7 2003/09/28 17:00:11 naddy Exp $
 bin/W
 bin/altavista
 bin/amazon
@@ -50,3 +50,5 @@ share/surfraw/surfraw_elvi.list
 @dirrm share/surfraw
 @dirrm share/examples/surfraw
 @dirrm share/doc/surfraw
+@cwd ${SYSCONFDIR}
+@extra surfraw.conf