From 20b85a151292d1c2495d2fba787ca26293c7a9e2 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 30 Aug 2003 20:22:49 +0000 Subject: Prepare for pkgviews by making sure that passing VIEW-INSTALL or VIEW-DEINSTALL to the INSTALL/DEINSTALL scripts don't cause errors. --- mail/cyrus-imapd/DEINSTALL | 37 ++++++++++++++++++------------------- mail/cyrus-imapd/INSTALL | 4 +--- mail/cyrus-imapd21/DEINSTALL | 37 ++++++++++++++++++------------------- mail/cyrus-imapd21/INSTALL | 4 +--- mail/fastforward/DEINSTALL | 28 ++++++++++++++++------------ mail/majordomo/DEINSTALL | 8 +------- mail/mimedefang/Makefile | 4 +--- mail/nmh/DEINSTALL | 8 +------- mail/nmh/INSTALL | 8 +------- mail/yatsvrs/INSTALL | 8 +------- 10 files changed, 59 insertions(+), 87 deletions(-) (limited to 'mail') diff --git a/mail/cyrus-imapd/DEINSTALL b/mail/cyrus-imapd/DEINSTALL index 31ba1bd4575..707b1d2532b 100644 --- a/mail/cyrus-imapd/DEINSTALL +++ b/mail/cyrus-imapd/DEINSTALL @@ -1,22 +1,21 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2001/11/24 20:49:42 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:22:55 jlam Exp $ IMAPDCONF=@IMAPDCONF@ -if [ -f ${IMAPDCONF} ] -then - imap_dirs=` \ - ${AWK} '/configdirectory:/ { print $2 }; \ - /partition-.*:/ { print $2 }; \ - /sievedir:/ { print $2 }' \ - ${IMAPDCONF} \ - ` - for dir in ${imap_dirs} - do - if [ -d ${dir} ] - then - ALL_DIRS="${ALL_DIRS} ${dir}" - fi - done -fi +case ${STAGE} in +DEINSTALL) + if [ -f ${IMAPDCONF} ]; then + imap_dirs=` \ + ${AWK} '/configdirectory:/ { print $2 }; \ + /partition-.*:/ { print $2 }; \ + /sievedir:/ { print $2 }' \ + ${IMAPDCONF} \ + ` + for dir in ${imap_dirs}; do + if [ -d ${dir} ]; then + ALL_DIRS="${ALL_DIRS} ${dir}" + fi + done + fi + ;; +esac diff --git a/mail/cyrus-imapd/INSTALL b/mail/cyrus-imapd/INSTALL index bbc8df87e43..aa40a4bfe92 100644 --- a/mail/cyrus-imapd/INSTALL +++ b/mail/cyrus-imapd/INSTALL @@ -1,6 +1,4 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.3 2002/07/31 15:50:06 jlam Exp $ +# $NetBSD: INSTALL,v 1.4 2003/08/30 20:22:55 jlam Exp $ case ${STAGE} in POST-INSTALL) diff --git a/mail/cyrus-imapd21/DEINSTALL b/mail/cyrus-imapd21/DEINSTALL index f7ba57134d4..bbbb355db05 100644 --- a/mail/cyrus-imapd21/DEINSTALL +++ b/mail/cyrus-imapd21/DEINSTALL @@ -1,22 +1,21 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2002/10/27 16:08:53 chris Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:56 jlam Exp $ IMAPDCONF=@IMAPDCONF@ -if [ -f ${IMAPDCONF} ] -then - imap_dirs=` \ - ${AWK} '/configdirectory:/ { print $2 }; \ - /partition-.*:/ { print $2 }; \ - /sievedir:/ { print $2 }' \ - ${IMAPDCONF} \ - ` - for dir in ${imap_dirs} - do - if [ -d ${dir} ] - then - ALL_DIRS="${ALL_DIRS} ${dir}" - fi - done -fi +case ${STAGE} in +DEINSTALL) + if [ -f ${IMAPDCONF} ]; then + imap_dirs=` \ + ${AWK} '/configdirectory:/ { print $2 }; \ + /partition-.*:/ { print $2 }; \ + /sievedir:/ { print $2 }' \ + ${IMAPDCONF} \ + ` + for dir in ${imap_dirs}; do + if [ -d ${dir} ]; then + ALL_DIRS="${ALL_DIRS} ${dir}" + fi + done + fi + ;; +esac diff --git a/mail/cyrus-imapd21/INSTALL b/mail/cyrus-imapd21/INSTALL index da31e548207..6edbf3067fc 100644 --- a/mail/cyrus-imapd21/INSTALL +++ b/mail/cyrus-imapd21/INSTALL @@ -1,6 +1,4 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2002/10/27 16:08:52 chris Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:56 jlam Exp $ case ${STAGE} in POST-INSTALL) diff --git a/mail/fastforward/DEINSTALL b/mail/fastforward/DEINSTALL index 9687cba2a0f..766a8e0c449 100644 --- a/mail/fastforward/DEINSTALL +++ b/mail/fastforward/DEINSTALL @@ -1,17 +1,21 @@ -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:00:03 zuntum Exp $ +#!/bin/sh +# +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:56 jlam Exp $ PKGNAME=$1 STAGE=$2 -if [ "$STAGE" != "POST-DEINSTALL" ]; then - exit 0 -fi +case ${STAGE} in +POST-DEINSTALL) + cat << EOF +=========================================================================== -echo =========================================================================== -echo -echo Please check the contents of /etc/mailer.conf and make sure there -echo is an appropriate value defined for newaliases. -echo -echo "See mailer.conf(5) and mailwrapper(8) for details." -echo -echo =========================================================================== +Please check the contents of /etc/mailer.conf and make sure there +is an appropriate value defined for newaliases. + +"See mailer.conf(5) and mailwrapper(8) for details." + +=========================================================================== +EOF + ;; +esac diff --git a/mail/majordomo/DEINSTALL b/mail/majordomo/DEINSTALL index e5ae06ef344..77d27de2991 100644 --- a/mail/majordomo/DEINSTALL +++ b/mail/majordomo/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:00:27 zuntum Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:56 jlam Exp $ # PKGNAME=$1 @@ -11,8 +11,6 @@ GROUP=@MAJORDOMO_GROUP@ HOME=@HOME@ case ${STAGE} in -DEINSTALL) - ;; POST-DEINSTALL) cat << EOF =========================================================================== @@ -25,9 +23,5 @@ If you won't be using ${PKGNAME} any longer, you may want to =========================================================================== EOF ;; -*) - echo "Unexpected argument: $2" - exit 1 - ;; esac exit 0 diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile index a1eae7be688..112cde113b8 100644 --- a/mail/mimedefang/Makefile +++ b/mail/mimedefang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/07/17 21:46:31 grant Exp $ +# $NetBSD: Makefile,v 1.10 2003/08/30 20:22:57 jlam Exp $ DISTNAME= mimedefang-2.35 CATEGORIES= mail @@ -33,8 +33,6 @@ PKG_USERS= ${DEFANG_USER}:${DEFANG_GROUP} EGDIR= ${PREFIX}/share/examples/mimedefang SHAREDIR= ${PREFIX}/share/mimedefang -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL - FILES_SUBST+= SHAREDIR=${SHAREDIR} FILES_SUBST+= DEFANG_USER=${DEFANG_USER} diff --git a/mail/nmh/DEINSTALL b/mail/nmh/DEINSTALL index 8b5f02e260d..853408ede92 100644 --- a/mail/nmh/DEINSTALL +++ b/mail/nmh/DEINSTALL @@ -1,13 +1,11 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:00:41 zuntum Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:57 jlam Exp $ PKGNAME=$1 STAGE=$2 case ${STAGE} in -DEINSTALL) - ;; POST-DEINSTALL) CONFDIR=${PKG_PREFIX}/etc/nmh @@ -20,9 +18,5 @@ following directories: =========================================================================== EOF ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/mail/nmh/INSTALL b/mail/nmh/INSTALL index b06d233899f..056826a07dc 100644 --- a/mail/nmh/INSTALL +++ b/mail/nmh/INSTALL @@ -1,14 +1,12 @@ #! /bin/sh # -# $NetBSD: INSTALL,v 1.2 2002/07/10 01:44:41 kim Exp $ +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:22:57 jlam Exp $ # PKGNAME=$1 STAGE=$2 case ${STAGE} in -PRE-INSTALL) - ;; POST-INSTALL) CONFDIR=${PKG_PREFIX}/etc/nmh @@ -40,9 +38,5 @@ server if you are not running one locally. ============================================================= EOF ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/mail/yatsvrs/INSTALL b/mail/yatsvrs/INSTALL index 300d8acf12d..a989788b76e 100644 --- a/mail/yatsvrs/INSTALL +++ b/mail/yatsvrs/INSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: INSTALL,v 1.2 2001/12/19 04:11:08 taca Exp $ +# $Id: INSTALL,v 1.3 2003/08/30 20:22:58 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -17,8 +17,6 @@ MIN="@YATSVR_MINGID@" MAX="@YATSVR_MAXGID@" case ${STAGE} in -PRE-INSTALL) - ;; POST-INSTALL) if [ ! -d ${YAT_CONF_DIR} ]; then @@ -39,9 +37,5 @@ POST-INSTALL) /etc/group > ${YAT_CONF_DIR}/.hidden-group ${CHMOD} 0600 ${YAT_CONF_DIR}/.hidden-group ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 -- cgit v1.2.3