From 477f4ba7c264e828b005d71581ee9cba7b1e6fb4 Mon Sep 17 00:00:00 2001
From: xsa <xsa@openbsd.org>
Date: Wed, 14 Apr 2004 14:24:34 +0000
Subject: [PATCH] should I say this is more @extra support?

---
 mail/cucipop/pkg/DEINSTALL     | 4 ++--
 mail/cucipop/pkg/PLIST         | 3 ++-
 mail/exim/pkg/DEINSTALL        | 6 ++++--
 mail/exim/pkg/PLIST            | 3 ++-
 mail/nail/pkg/DEINSTALL        | 4 ++--
 mail/nail/pkg/PLIST            | 4 +++-
 mail/openwebmail/pkg/DEINSTALL | 4 ++--
 mail/openwebmail/pkg/PLIST     | 4 +++-
 mail/sma/pkg/DEINSTALL         | 4 ++--
 mail/sma/pkg/PLIST             | 4 +++-
 mail/solid-pop3d/pkg/DEINSTALL | 7 ++++---
 mail/solid-pop3d/pkg/PLIST     | 5 ++++-
 mail/teapop/pkg/DEINSTALL      | 4 ++--
 mail/teapop/pkg/PLIST          | 4 +++-
 14 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/mail/cucipop/pkg/DEINSTALL b/mail/cucipop/pkg/DEINSTALL
index 2e819a31ad4..7ab0497ab3b 100644
--- a/mail/cucipop/pkg/DEINSTALL
+++ b/mail/cucipop/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2001/02/23 00:15:34 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.4 2004/04/14 14:24:34 xsa Exp $
 #
 # cucipop de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 SPOOL_DIR=/var/spool/cucipop
 
-if [ -d $SPOOL_DIR ]; then
+if [ ${PKG_DELETE_EXTRA} != Yes -a -d $SPOOL_DIR ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/mail/cucipop/pkg/PLIST b/mail/cucipop/pkg/PLIST
index 0d3cc3f112a..bea36cda97e 100644
--- a/mail/cucipop/pkg/PLIST
+++ b/mail/cucipop/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.5 2001/02/19 15:01:03 danh Exp $
+@comment $OpenBSD: PLIST,v 1.6 2004/04/14 14:24:34 xsa Exp $
 libexec/cucipop
 libexec/makevpopdb
 man/man8/cucipop.8
 man/man8/makevpopdb.8
+@extraunexec rm -rf /var/spool/cucipop
diff --git a/mail/exim/pkg/DEINSTALL b/mail/exim/pkg/DEINSTALL
index d2e4b333c49..a33d5e910c8 100644
--- a/mail/exim/pkg/DEINSTALL
+++ b/mail/exim/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2000/08/12 23:57:46 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/04/14 14:24:35 xsa Exp $
 #
 # De-installation setup of exim
 
@@ -38,7 +38,9 @@ fi
 #
 case $2 in
     DEINSTALL)
-	do_notice "$1"
+	if [ ${PKG_DELETE_EXTRA} != Yes -a -d ${CONFIG_DIR} ]; then
+		do_notice "$1"
+	fi
 	;;
     *)
 	echo "usage: $0 distname DEINSTALL" >&2
diff --git a/mail/exim/pkg/PLIST b/mail/exim/pkg/PLIST
index 94eaecef839..ca4334b48a0 100644
--- a/mail/exim/pkg/PLIST
+++ b/mail/exim/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2000/08/12 23:57:46 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.8 2004/04/14 14:24:35 xsa Exp $
 info/exim.info
 info/exim_filter.info
 info/exim_overview.info
@@ -25,3 +25,4 @@ share/doc/exim/spec.txt
 @dirrm share/doc/exim
 share/examples/exim/configure
 @dirrm share/examples/exim
+@extraunexec rm -rf ${SYSCONFDIR}/exim
diff --git a/mail/nail/pkg/DEINSTALL b/mail/nail/pkg/DEINSTALL
index 64cebbfb817..11e781b6ec7 100644
--- a/mail/nail/pkg/DEINSTALL
+++ b/mail/nail/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/07/23 19:13:09 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/04/14 14:24:35 xsa Exp $
 #
 # nail de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/nail.rc
 
-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/mail/nail/pkg/PLIST b/mail/nail/pkg/PLIST
index f2994a1dae6..13b61666281 100644
--- a/mail/nail/pkg/PLIST
+++ b/mail/nail/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/07/23 19:13:09 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/14 14:24:35 xsa Exp $
 bin/nail
 man/man1/nail.1
 share/examples/nail/nail.rc
 @dirrm share/examples/nail
+@cwd ${SYSCONFDIR}
+@extra nail.rc
diff --git a/mail/openwebmail/pkg/DEINSTALL b/mail/openwebmail/pkg/DEINSTALL
index 9772ef3b366..b1b1aff5e3d 100644
--- a/mail/openwebmail/pkg/DEINSTALL
+++ b/mail/openwebmail/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.4 2003/11/03 06:15:20 kevlo Exp $
+# $OpenBSD: DEINSTALL,v 1.5 2004/04/14 14:24:35 xsa Exp $
 #
 # De-installation setup of openwebmail
 
@@ -38,7 +38,7 @@ fi
 #
 case $2 in
     DEINSTALL)
-	if [ -e ${CONFIG_DIR} ]; then
+	if [ ${PKG_DELETE_EXTRA} != Yes -a -e ${CONFIG_DIR} ]; then
 	    do_notice "$1"
 	fi
 	;;
diff --git a/mail/openwebmail/pkg/PLIST b/mail/openwebmail/pkg/PLIST
index f9d99c4127d..21f9f167162 100644
--- a/mail/openwebmail/pkg/PLIST
+++ b/mail/openwebmail/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2004/03/30 08:53:49 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.13 2004/04/14 14:24:35 xsa Exp $
 cgi-bin/openwebmail/auth/README
 cgi-bin/openwebmail/auth/auth_ldap.pl
 cgi-bin/openwebmail/auth/auth_mysql.pl
@@ -7043,3 +7043,5 @@ htdocs/openwebmail/sounds/silymail.wav
 @dirrm cgi-bin/openwebmail/modules
 @dirrm cgi-bin/openwebmail/auth
 @dirrm cgi-bin/openwebmail
+@extraunexec rm -rf ${CONFDIR}/openwebmail
+@extraunexec groupdel _mail
diff --git a/mail/sma/pkg/DEINSTALL b/mail/sma/pkg/DEINSTALL
index 770175a2123..8138e3be5ef 100644
--- a/mail/sma/pkg/DEINSTALL
+++ b/mail/sma/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/12/11 15:34:55 grange Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/04/14 14:24:35 xsa Exp $
 #
 # sma de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/sma.conf
 
-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/mail/sma/pkg/PLIST b/mail/sma/pkg/PLIST
index 9cfd9a25838..9c2726199e1 100644
--- a/mail/sma/pkg/PLIST
+++ b/mail/sma/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/12/11 15:34:55 grange Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/14 14:24:35 xsa Exp $
 bin/sma
 man/man8/sma.8
 share/doc/sma/README
 share/examples/sma/sma.conf
 @dirrm share/examples/sma
 @dirrm share/doc/sma
+@cwd ${SYSCONFDIR}
+@extra sma.conf
diff --git a/mail/solid-pop3d/pkg/DEINSTALL b/mail/solid-pop3d/pkg/DEINSTALL
index 491997ad53e..a176a3ab402 100644
--- a/mail/solid-pop3d/pkg/DEINSTALL
+++ b/mail/solid-pop3d/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2001/02/13 01:31:23 danh Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2004/04/14 14:24:35 xsa Exp $
 #
 # solid-pop3d de-installation
 
@@ -9,11 +9,12 @@ PREFIX="${PKG_PREFIX:-/usr/local}"
 CONFIG_FILE="${SYSCONFDIR}/spop3d.conf"
 SPOOL_DIR="/var/spool/spop3d"
 
-if [ -f ${CONFIG_FILE} -o -d ${SPOOL_DIR} ]; then
+if [ ${PKG_DELETE_EXTRA} != Yes -a \
+	\( -f ${CONFIG_FILE} -o -d ${SPOOL_DIR} \) ]; then
 	echo "+------------"
 	echo "| If you are deinstalling $1 and not planning to"
 	echo "| re-install it at a future time, it is safe to remove"
-	echo "| remove ${CONFIG_FILE} and ${SPOOL_DIR}."
+	echo "| ${CONFIG_FILE} and ${SPOOL_DIR}."
 	echo "+------------"
 fi
 
diff --git a/mail/solid-pop3d/pkg/PLIST b/mail/solid-pop3d/pkg/PLIST
index c557f1c35f1..0b11b8f5a26 100644
--- a/mail/solid-pop3d/pkg/PLIST
+++ b/mail/solid-pop3d/pkg/PLIST
@@ -1,6 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/11/20 22:31:53 danh Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/04/14 14:24:35 xsa Exp $
 %%apop%%
 man/man5/dot-spop3d.5
 man/man5/spop3d.conf.5
 man/man8/spop3d.8
 sbin/spop3d
+@cwd ${SYSCONFDIR}
+@extra spop3d.conf
+@extraunexec rm -rf /var/spool/spop3d
diff --git a/mail/teapop/pkg/DEINSTALL b/mail/teapop/pkg/DEINSTALL
index 7b7a289eb06..4af2f021baf 100644
--- a/mail/teapop/pkg/DEINSTALL
+++ b/mail/teapop/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/06/08 05:58:24 pvalchev Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/04/14 14:24:35 xsa Exp $
 #
 # teapop de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/teapop.passwd
 
-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/mail/teapop/pkg/PLIST b/mail/teapop/pkg/PLIST
index ee7f3522668..507802c3d4d 100644
--- a/mail/teapop/pkg/PLIST
+++ b/mail/teapop/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/06/08 05:58:24 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/14 14:24:35 xsa Exp $
 libexec/teapop
 man/man8/teapop.8
 sbin/cronpopauth.pl
 share/examples/teapop/teapop.passwd
 @dirrm share/examples/teapop
+@cwd ${SYSCONFDIR}
+@extra teapop.passwd