diff options
70 files changed, 302 insertions, 795 deletions
diff --git a/audio/gqmpeg/DEINSTALL b/audio/gqmpeg/DEINSTALL index 757ac795d37..6265e6e219e 100644 --- a/audio/gqmpeg/DEINSTALL +++ b/audio/gqmpeg/DEINSTALL @@ -1,27 +1,12 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:16:43 zuntum Exp $ -# - -PKGNAME=$1 -STAGE=$2 +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:49 jlam Exp $ case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - cat << EOF + ${CAT} << EOF ============================================================================= If you won't be using ${PKGNAME} any longer, you may want to remove any skins that were installed in ${PKG_PREFIX}/share/gqmpeg/skins. ============================================================================= EOF ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac -exit 0 diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index 82e702022df..28c189c1772 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2003/07/17 21:22:20 grant Exp $ +# $NetBSD: Makefile,v 1.74 2003/08/30 20:22:50 jlam Exp $ DISTNAME= gqmpeg-0.20.0 PKGREVISION= 2 @@ -16,6 +16,7 @@ DEPENDS+= vorbis-tools>=1.0.0.6:../../audio/vorbis-tools DEPENDS+= xmp>=2.0.2:../../audio/xmp USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES USE_X11= YES GNU_CONFIGURE= YES diff --git a/comms/mgetty+sendfax/DEINSTALL b/comms/mgetty+sendfax/DEINSTALL index 5c99803b1ba..0b86b3699ee 100644 --- a/comms/mgetty+sendfax/DEINSTALL +++ b/comms/mgetty+sendfax/DEINSTALL @@ -1,10 +1,15 @@ #!/bin/sh # +# $NetBSD: DEINSTALL,v 1.4 2003/08/30 20:22:50 jlam Exp $ -if [ -d /var/spool/fax ]; then - filecount="`find /var/spool/fax -type f 2>/dev/null | wc -l`" - if [ $filecount -eq 0 ]; then - echo "Removing empty fax spool directories..." - rm -r /var/spool/fax +case ${STAGE} in +DEINSTALL) + if [ -d /var/spool/fax ]; then + filecount="`${FIND} /var/spool/fax -type f 2>/dev/null | wc -l`" + if [ $filecount -eq 0 ]; then + ${ECHO} "Removing empty fax spool directories..." + ${RM} -r /var/spool/fax + fi fi -fi + ;; +esac diff --git a/comms/mgetty+sendfax/INSTALL b/comms/mgetty+sendfax/INSTALL index 46b7b1387ba..c549a1bbfc1 100755 --- a/comms/mgetty+sendfax/INSTALL +++ b/comms/mgetty+sendfax/INSTALL @@ -1,27 +1,25 @@ #!/bin/sh # +# $NetBSD: INSTALL,v 1.4 2003/08/30 20:22:50 jlam Exp $ -if [ x"$2" = xPOST-INSTALL ] -then - if [ ! -d /var/spool/fax ] - then - echo "Creating fax spool directories..." +case ${STAGE} in +POST-INSTALL) + if [ ! -d /var/spool/fax ]; then + ${ECHO} "Creating fax spool directories..." ${MKDIR} /var/spool/fax ${CHMOD} 755 /var/spool/fax fi - if [ ! -d /var/spool/fax/incoming ] - then + if [ ! -d /var/spool/fax/incoming ]; then ${MKDIR} /var/spool/fax/incoming ${CHMOD} 755 /var/spool/fax/incoming fi - if [ ! -d /var/spool/fax/outgoing ] - then + if [ ! -d /var/spool/fax/outgoing ]; then ${MKDIR} /var/spool/fax/outgoing ${CHMOD} 1777 /var/spool/fax/outgoing fi - if [ ! -d /var/spool/fax/outgoing/locks ] - then + if [ ! -d /var/spool/fax/outgoing/locks ]; then ${MKDIR} /var/spool/fax/outgoing/locks ${CHMOD} 777 /var/spool/fax/outgoing/locks fi -fi + ;; +esac diff --git a/databases/mysql-server/DEINSTALL b/databases/mysql-server/DEINSTALL new file mode 100644 index 00000000000..13231db58b9 --- /dev/null +++ b/databases/mysql-server/DEINSTALL @@ -0,0 +1,16 @@ +# $NetBSD: DEINSTALL,v 1.4 2003/08/30 20:22:51 jlam Exp $ + +MYSQL_DATADIR="@MYSQL_DATADIR@" + +case ${STAGE} in +POST-DEINSTALL) + ${CAT} << EOF +=========================================================================== +If you won't be using ${PKGNAME} any longer, you may want +to remove the following directories: + + ${MYSQL_DATADIR} +=========================================================================== +EOF + ;; +esac diff --git a/databases/mysql-server/INSTALL b/databases/mysql-server/INSTALL index d1cdecf482c..1991dcb0f2e 100644 --- a/databases/mysql-server/INSTALL +++ b/databases/mysql-server/INSTALL @@ -1,12 +1,10 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.3 2003/08/30 20:05:13 seb Exp $ +# $NetBSD: INSTALL,v 1.4 2003/08/30 20:22:51 jlam Exp $ case ${STAGE} in POST-INSTALL) - echo "-------------------------------" - echo "Initializing MySQL databases..." - echo "-------------------------------" + ${ECHO} "-------------------------------" + ${ECHO} "Initializing MySQL databases..." + ${ECHO} "-------------------------------" ${PKG_PREFIX}/bin/mysql_install_db --force ;; esac diff --git a/emulators/vmware-module/INSTALL b/emulators/vmware-module/INSTALL index 0ce6e629bb1..46df29df750 100644 --- a/emulators/vmware-module/INSTALL +++ b/emulators/vmware-module/INSTALL @@ -1,10 +1,8 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2002/11/06 00:14:26 wiz Exp $ +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:22:51 jlam Exp $ case $2 in -PRE-INSTALL) - ;; POST-INSTALL) /bin/cat << EOF =========================================================================== @@ -29,9 +27,4 @@ Then, reboot your system. =========================================================================== EOF ;; -*) - echo "Unexpected argument: $2" - exit 1 - ;; esac -exit 0 diff --git a/emulators/vmware-module3/INSTALL b/emulators/vmware-module3/INSTALL index 75ecd3ef18d..73929740cce 100644 --- a/emulators/vmware-module3/INSTALL +++ b/emulators/vmware-module3/INSTALL @@ -1,10 +1,8 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1.1.1 2003/02/16 19:43:36 bad Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:52 jlam Exp $ case $2 in -PRE-INSTALL) - ;; POST-INSTALL) /bin/cat << EOF =========================================================================== @@ -29,9 +27,4 @@ Then, reboot your system. =========================================================================== EOF ;; -*) - echo "Unexpected argument: $2" - exit 1 - ;; esac -exit 0 diff --git a/fonts/ja-kappa20/DEINSTALL b/fonts/ja-kappa20/DEINSTALL index 339e3b641a8..ad12ec6f6f0 100644 --- a/fonts/ja-kappa20/DEINSTALL +++ b/fonts/ja-kappa20/DEINSTALL @@ -1,26 +1,12 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2003/03/15 20:40:56 kei Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:52 jlam Exp $ ALIAS=@FONTDIR@/fonts.alias case ${STAGE} in -PRE-DEINSTALL) - ;; - -DEINSTALL) - ;; - POST-DEINSTALL) ${SED} -e '/^-- BEGIN Kappa20 --/,/^-- END Kappa20 --/d' \ < ${ALIAS} > ${ALIAS}.new ${MV} ${ALIAS}.new ${ALIAS} mkfontdir @FONTDIR@ ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/fonts/ja-kappa20/INSTALL b/fonts/ja-kappa20/INSTALL index e1dcebcb77f..9ee012ec24d 100644 --- a/fonts/ja-kappa20/INSTALL +++ b/fonts/ja-kappa20/INSTALL @@ -1,19 +1,14 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2003/03/15 20:40:56 kei Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:52 jlam Exp $ ALIAS=@FONTDIR@/fonts.alias case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) ${ECHO} '-- BEGIN Kappa20 --' >> ${ALIAS} ${CAT} @ALIAS_KAPPA@ >> ${ALIAS} ${ECHO} >> ${ALIAS} ${ECHO} '!! kappa20 generic aliases' >> ${ALIAS} - $CAT @ALIAS_KAPPA@ | \ + ${CAT} @ALIAS_KAPPA@ | \ ${GREP} 'kappa-.*-kappa-' | \ ${SED} -e 's,kappa-,misc-,' >> ${ALIAS} ${CAT} @ALIAS_KAPPA@ | \ @@ -23,10 +18,4 @@ POST-INSTALL) ${ECHO} '-- END Kappa20 --' >> ${ALIAS} mkfontdir @FONTDIR@ ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/fonts/ja-shinonome/DEINSTALL b/fonts/ja-shinonome/DEINSTALL index 23fdbfed83b..773c03ba0ec 100644 --- a/fonts/ja-shinonome/DEINSTALL +++ b/fonts/ja-shinonome/DEINSTALL @@ -1,26 +1,12 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2003/03/15 20:57:50 kei Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:52 jlam Exp $ ALIAS=@FONTDIR@/fonts.alias case ${STAGE} in -PRE-DEINSTALL) - ;; - -DEINSTALL) - ;; - POST-DEINSTALL) ${SED} -e '/^-- BEGIN shinonome --/,/^-- END shinonome --/d' \ < ${ALIAS} > ${ALIAS}.new ${MV} ${ALIAS}.new ${ALIAS} mkfontdir @FONTDIR@ ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/fonts/ja-shinonome/INSTALL b/fonts/ja-shinonome/INSTALL index 6df2d980784..fbc8479dc7a 100644 --- a/fonts/ja-shinonome/INSTALL +++ b/fonts/ja-shinonome/INSTALL @@ -1,13 +1,8 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2003/03/15 20:57:50 kei Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:52 jlam Exp $ ALIAS=@FONTDIR@/fonts.alias case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) ${ECHO} '-- BEGIN shinonome --' >> ${ALIAS} ${CAT} @ALIAS_SHINONOME@ >> ${ALIAS} @@ -19,10 +14,4 @@ POST-INSTALL) ${ECHO} '-- END shinonome --' >> ${ALIAS} mkfontdir @FONTDIR@ ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/fonts/vfontcap-kochi/DEINSTALL b/fonts/vfontcap-kochi/DEINSTALL index 9b23d95b238..e227dee158a 100644 --- a/fonts/vfontcap-kochi/DEINSTALL +++ b/fonts/vfontcap-kochi/DEINSTALL @@ -1,21 +1,7 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2003/03/15 20:28:01 kei Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:53 jlam Exp $ case ${STAGE} in -PRE-DEINSTALL) - ;; - -DEINSTALL) - ;; - POST-DEINSTALL) ${MV} @VFONTCAPDIR@/vfontcap.orig @VFONTCAPDIR@/vfontcap ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/fonts/vfontcap-kochi/INSTALL b/fonts/vfontcap-kochi/INSTALL index 3978532d9e6..371900662a0 100644 --- a/fonts/vfontcap-kochi/INSTALL +++ b/fonts/vfontcap-kochi/INSTALL @@ -1,18 +1,7 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2003/03/15 20:28:01 kei Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:53 jlam Exp $ case ${STAGE} in PRE-INSTALL) ${MV} @VFONTCAPDIR@/vfontcap @VFONTCAPDIR@/vfontcap.orig ;; - -POST-INSTALL) - ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/games/gnome2-games/INSTALL b/games/gnome2-games/INSTALL index ec97b5df5a2..45e385327b7 100644 --- a/games/gnome2-games/INSTALL +++ b/games/gnome2-games/INSTALL @@ -1,58 +1,56 @@ -#!/bin/sh -if [ "$2" != POST-INSTALL ] -then - exit 0 -fi +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:22:53 jlam Exp $ -cd /var/games -cat <<. | -glines.scores -gnibbles.1.0.scores -gnibbles.1.1.scores -gnibbles.2.0.scores -gnibbles.2.1.scores -gnibbles.3.0.scores -gnibbles.3.1.scores -gnibbles.4.0.scores -gnibbles.4.1.scores -gnobots2.classic_robots-safe.scores -gnobots2.classic_robots.scores -gnobots2.nightmare-safe.scores -gnobots2.nightmare.scores -gnobots2.robots2-safe.scores -gnobots2.robots2.scores -gnobots2.robots2_easy-safe.scores -gnobots2.robots2_easy.scores -gnobots2.robots_with_safe_teleport-safe.scores -gnobots2.robots_with_safe_teleport.scores -gnome-stones.scores -gnome-xbill.scores -gnometris.scores -gnomine.Biiiig.scores -gnomine.Custom.scores -gnomine.Medium.scores -gnomine.Tiny.scores -gnotravex.2x2.scores -gnotravex.3x3.scores -gnotravex.4x4.scores -gnotravex.5x5.scores -gnotravex.6x6.scores -gtali.scores -iagno.b1.scores -iagno.b2.scores -iagno.b3.scores -iagno.w1.scores -iagno.w2.scores -iagno.w3.scores -mahjongg.{easy,difficult}.scores -same-gnome.scores -. -(while read FILE - do - if [ ! -f $FILE ] - then - @INSTALL@ -c -o games -g games -m 664 /dev/null $FILE - fi - done) - -exit 0 +case ${STAGE} in +POST-INSTALL) + cd /var/games + cat <<. | + glines.scores + gnibbles.1.0.scores + gnibbles.1.1.scores + gnibbles.2.0.scores + gnibbles.2.1.scores + gnibbles.3.0.scores + gnibbles.3.1.scores + gnibbles.4.0.scores + gnibbles.4.1.scores + gnobots2.classic_robots-safe.scores + gnobots2.classic_robots.scores + gnobots2.nightmare-safe.scores + gnobots2.nightmare.scores + gnobots2.robots2-safe.scores + gnobots2.robots2.scores + gnobots2.robots2_easy-safe.scores + gnobots2.robots2_easy.scores + gnobots2.robots_with_safe_teleport-safe.scores + gnobots2.robots_with_safe_teleport.scores + gnome-stones.scores + gnome-xbill.scores + gnometris.scores + gnomine.Biiiig.scores + gnomine.Custom.scores + gnomine.Medium.scores + gnomine.Tiny.scores + gnotravex.2x2.scores + gnotravex.3x3.scores + gnotravex.4x4.scores + gnotravex.5x5.scores + gnotravex.6x6.scores + gtali.scores + iagno.b1.scores + iagno.b2.scores + iagno.b3.scores + iagno.w1.scores + iagno.w2.scores + iagno.w3.scores + mahjongg.{easy,difficult}.scores + same-gnome.scores + . + (while read FILE + do + if [ ! -f $FILE ] + then + @INSTALL@ -c -o games -g games -m 664 /dev/null $FILE + fi + done) + ;; +esac diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index e3baf8bb540..53ded648d12 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 21:38:32 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/30 20:22:53 jlam Exp $ DISTNAME= gnome-games-2.2.1 PKGREVISION= 4 @@ -43,7 +43,6 @@ CONF_FILES+= ${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile} .undef conffile FILES_SUBST+= INSTALL="${INSTALL}" -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL post-patch: cd ${WRKSRC} && \ diff --git a/games/gtkballs/DEINSTALL b/games/gtkballs/DEINSTALL index cd76cb8583f..afaa179eda7 100644 --- a/games/gtkballs/DEINSTALL +++ b/games/gtkballs/DEINSTALL @@ -1,13 +1,8 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2002/08/30 23:28:49 wiz Exp $ -# +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:54 jlam Exp $ PKGNAME=$1 case $2 in -DEINSTALL) - ;; POST-DEINSTALL) cat << EOF ============================================================================= @@ -16,9 +11,5 @@ score file ${PKG_PREFIX}/var/gtkballs-scores. ============================================================================= EOF ;; -*) - echo "Unexpected argument: $2" - exit 1 - ;; esac exit 0 diff --git a/games/xscavenger/DEINSTALL b/games/xscavenger/DEINSTALL index cd8b4ce2211..1f8bf360997 100644 --- a/games/xscavenger/DEINSTALL +++ b/games/xscavenger/DEINSTALL @@ -1,13 +1,11 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:57:45 zuntum Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:54 jlam Exp $ # PKGNAME=$1 case $2 in -DEINSTALL) - ;; POST-DEINSTALL) cat << EOF ============================================================================= @@ -17,9 +15,5 @@ user playing it. ============================================================================= EOF ;; -*) - echo "Unexpected argument: $2" - exit 1 - ;; esac exit 0 diff --git a/inputmethod/canna-server-bin/INSTALL b/inputmethod/canna-server-bin/INSTALL index 1219a0a90cf..2156c4bd109 100644 --- a/inputmethod/canna-server-bin/INSTALL +++ b/inputmethod/canna-server-bin/INSTALL @@ -1,7 +1,11 @@ -#!/bin/sh -if [ "$2" != "POST-INSTALL" ]; then exit 0; fi -(grep -v ^# /etc/services | grep 'canna.*5680' >/dev/null) || \ - (echo "" >> /etc/services; \ - echo "# canna package" >> /etc/services; \ - echo "canna 5680/tcp" >> /etc/services; \ - ) +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:54 jlam Exp $ + +case ${STAGE} in +POST-INSTALL) + (${GREP} -v ^# /etc/services | ${GREP} 'canna.*5680' >/dev/null) || \ + (${ECHO} "" >> /etc/services; \ + ${ECHO} "# canna package" >> /etc/services; \ + ${ECHO} "canna 5680/tcp" >> /etc/services; \ + ) + ;; +esac diff --git a/inputmethod/canna-server-bin/Makefile b/inputmethod/canna-server-bin/Makefile index 2fa0840e195..7bd3924aeab 100644 --- a/inputmethod/canna-server-bin/Makefile +++ b/inputmethod/canna-server-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/29 19:53:20 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/30 20:22:54 jlam Exp $ # .include "../canna/Makefile.common" @@ -36,7 +36,6 @@ do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF} post-install: - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL @${INSTALL_SCRIPT} ${WRKDIR}/canna ${PREFIX}/etc/rc.d/canna .include "../../devel/nbitools/buildlink2.mk" diff --git a/inputmethod/skkserv/INSTALL b/inputmethod/skkserv/INSTALL index 5adf8d61b41..04074bfa87c 100644 --- a/inputmethod/skkserv/INSTALL +++ b/inputmethod/skkserv/INSTALL @@ -1,5 +1,4 @@ -#! /bin/sh -# $NetBSD: INSTALL,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:55 jlam Exp $ case "$2" in POST-INSTALL) diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile index eb3a8a2cdc8..c6120ab2d9f 100644 --- a/inputmethod/skkserv/Makefile +++ b/inputmethod/skkserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/29 22:08:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2003/08/30 20:22:55 jlam Exp $ DISTNAME= skk9.6 PKGNAME= skkserv-3.9.4 @@ -23,7 +23,6 @@ BUILD_DEFS+= USE_INET6 DIST_SUBDIR= skk GNU_CONFIGURE= YES -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL .include "../../mk/bsd.prefs.mk" 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 diff --git a/misc/staroffice/INSTALL b/misc/staroffice/INSTALL index 9ff9f43f600..4bd05f80eae 100755 --- a/misc/staroffice/INSTALL +++ b/misc/staroffice/INSTALL @@ -1,20 +1,14 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1 2001/11/01 01:29:39 zuntum Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:58 jlam Exp $ # case $2 in - PRE-INSTALL) - ;; POST-INSTALL) for i in backup store store/trash download work ; do mkdir -p ${PKG_PREFIX}/Office51/$i done ;; - *) - echo "Unexpected Argument $2!!" - exit 1 - ;; esac exit 0 diff --git a/net/ddclient/DEINSTALL b/net/ddclient/DEINSTALL index 6f7cb8747b2..b94bed202ab 100644 --- a/net/ddclient/DEINSTALL +++ b/net/ddclient/DEINSTALL @@ -1,11 +1,7 @@ -# $NetBSD: DEINSTALL,v 1.1 2001/12/09 19:55:35 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:58 jlam Exp $ case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) ${RM} -f @PKG_SYSCONFDIR@/ddclient.cache ;; - esac diff --git a/net/netatalk-umich/DEINSTALL b/net/netatalk-umich/DEINSTALL index 067921dcb04..e60c53dd5c0 100644 --- a/net/netatalk-umich/DEINSTALL +++ b/net/netatalk-umich/DEINSTALL @@ -1,13 +1,11 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1.1.1 2002/05/25 12:25:50 markd Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:59 jlam Exp $ PKGNAME=$1 STAGE=$2 case ${STAGE} in -DEINSTALL) - ;; POST-DEINSTALL) ETCDIR=/etc/netatalk @@ -20,9 +18,5 @@ remove the netatalk configuration file directory: =========================================================================== EOF ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/net/netatalk-umich/INSTALL b/net/netatalk-umich/INSTALL index b13e93ff99d..17c3458a394 100644 --- a/net/netatalk-umich/INSTALL +++ b/net/netatalk-umich/INSTALL @@ -1,13 +1,11 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.3 2003/01/14 01:55:55 markd Exp $ +# $NetBSD: INSTALL,v 1.4 2003/08/30 20:22:59 jlam Exp $ PKGNAME=$1 STAGE=$2 case ${STAGE} in -PRE-INSTALL) - ;; POST-INSTALL) ETCDIR=/etc/netatalk @@ -61,9 +59,5 @@ EOF echo "done." fi ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/net/netatalk/INSTALL b/net/netatalk/INSTALL index d8f2894ac17..f53e11a3020 100644 --- a/net/netatalk/INSTALL +++ b/net/netatalk/INSTALL @@ -1,35 +1,25 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.4 2003/05/06 17:42:13 jmmv Exp $ +# $NetBSD: INSTALL,v 1.5 2003/08/30 20:22:59 jlam Exp $ case ${STAGE} in -PRE-INSTALL) - ;; POST-INSTALL) ETCDIR=@PKG_SYSCONFDIR@/netatalk - mkdir -p ${ETCDIR} + ${MKDIR} -p ${ETCDIR} - echo "Installing configuration files:" + ${ECHO} "Installing configuration files:" for file in \ AppleVolumes.default AppleVolumes.system afpd.conf \ atalkd.conf netatalk.conf papd.conf do - if [ -f ${ETCDIR}/${file} ] - then - echo " ${ETCDIR}/${file} already exists" + if [ -f ${ETCDIR}/${file} ]; then + ${ECHO} " ${ETCDIR}/${file} already exists" else - echo " ${ETCDIR}/${file}" - cp ${PKG_PREFIX}/share/examples/netatalk/${file} \ + ${ECHO} " ${ETCDIR}/${file}" + ${CP} ${PKG_PREFIX}/share/examples/netatalk/${file} \ ${ETCDIR}/${file} - chmod 644 ${ETCDIR}/${file} + ${CHMOD} 644 ${ETCDIR}/${file} fi done - echo "done." - ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${ECHO} "done." ;; esac -exit 0 diff --git a/net/vtun/DEINSTALL b/net/vtun/DEINSTALL index 57b857a3fa3..26deee31cbe 100644 --- a/net/vtun/DEINSTALL +++ b/net/vtun/DEINSTALL @@ -1,12 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.3 2002/10/06 04:08:10 taca Exp $ - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" -RMDIR="@RMDIR@" -TRUE="@TRUE@" +# $NetBSD: DEINSTALL,v 1.4 2003/08/30 20:23:00 jlam Exp $ CONFDIR="@PKG_SYSCONFDIR@" SAMPLECONFDIR=${PKG_PREFIX}/share/examples/vtun @@ -88,10 +82,4 @@ EOF EOF fi ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac -exit 0 diff --git a/net/vtun/INSTALL b/net/vtun/INSTALL index 73833df38e3..fbdf95986b4 100644 --- a/net/vtun/INSTALL +++ b/net/vtun/INSTALL @@ -1,11 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.3 2002/10/06 04:08:11 taca Exp $ - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" -MKDIR="@MKDIR@" +# $NetBSD: INSTALL,v 1.4 2003/08/30 20:23:00 jlam Exp $ CONFDIR="@PKG_SYSCONFDIR@" SAMPLECONFDIR=${PKG_PREFIX}/share/examples/vtun @@ -14,9 +9,6 @@ LOCKDIR=/var/lock/vtund LOGDIR=/var/log/vtund case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) ${MKDIR} ${LOCKDIR} ${MKDIR} ${LOGDIR} @@ -50,10 +42,4 @@ EOF =========================================================================== EOF ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac -exit 0 diff --git a/pkgtools/pkgdepgraph/INSTALL b/pkgtools/pkgdepgraph/INSTALL index fb13ad41acb..d7db9b0b225 100644 --- a/pkgtools/pkgdepgraph/INSTALL +++ b/pkgtools/pkgdepgraph/INSTALL @@ -1,14 +1,11 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2003/03/06 21:13:13 atatat Exp $ +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:23:00 jlam Exp $ PKGNAME=$1 STAGE=$2 case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) echo "============================================================" echo "Note that in order to facilitate the use of this package on" @@ -20,11 +17,6 @@ POST-INSTALL) echo "you to look at the graphs." echo "============================================================" ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/print/LPRng-core/DEINSTALL b/print/LPRng-core/DEINSTALL index 4c78d14eb31..c70ddb7a6a7 100644 --- a/print/LPRng-core/DEINSTALL +++ b/print/LPRng-core/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2001/10/31 23:27:25 zuntum Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:23:01 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -58,10 +58,5 @@ EOF =========================================================================== EOF ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/print/LPRng-core/INSTALL b/print/LPRng-core/INSTALL index ad534279044..1ffae193614 100644 --- a/print/LPRng-core/INSTALL +++ b/print/LPRng-core/INSTALL @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: INSTALL,v 1.1 2001/10/31 23:27:25 zuntum Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:23:01 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -15,9 +15,6 @@ CONFFILES="lpd.conf lpd.perms" NONCONFFILES="printcap" case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) echo "Installing configuration files:" for file in ${CONFFILES} ${NONCONFFILES} @@ -48,10 +45,5 @@ EOF =========================================================================== EOF ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile index c9ceda2548b..d27fcac8817 100644 --- a/print/apsfilter/Makefile +++ b/print/apsfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/07/17 22:52:23 grant Exp $ +# $NetBSD: Makefile,v 1.14 2003/08/30 20:23:01 jlam Exp $ # DISTNAME= apsfilter-7.2.5 @@ -33,8 +33,6 @@ CONF_FILES= ${PREFIX}/share/apsfilter/template/apsfilterrc \ DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -FILES_SUBST+= PREFIX="${PREFIX}" - post-patch: for i in bin/apsfilter.in SETUP.in tools/prtmgmt; do \ ${SED} "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/$$i \ @@ -42,8 +40,5 @@ post-patch: ${MV} ${WRKSRC}/$$i.done ${WRKSRC}/$$i; \ done -# ${SED} "s,@LOCALBASE@,${LOCALBASE},g" ${PKGDIR}/DEINSTALL \ -# > ${DEINSTALL_FILE} - .include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/dvipdfmx/DEINSTALL b/print/dvipdfmx/DEINSTALL index 874fd95ac94..0d1c49bd78e 100644 --- a/print/dvipdfmx/DEINSTALL +++ b/print/dvipdfmx/DEINSTALL @@ -1,23 +1,9 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/15 08:26:35 kei Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:02 jlam Exp $ TEXMF=@PREFIX@/share/texmf case ${STAGE} in -PRE-DEINSTALL) - ;; - -DEINSTALL) - ;; - POST-DEINSTALL) @PREFIX@/bin/mktexlsr ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/print/dvipdfmx/INSTALL b/print/dvipdfmx/INSTALL index 21a1566f2fc..404b0a2d3c3 100644 --- a/print/dvipdfmx/INSTALL +++ b/print/dvipdfmx/INSTALL @@ -1,13 +1,8 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.2 2003/03/15 08:26:36 kei Exp $ +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:23:02 jlam Exp $ TEXMF=@PREFIX@/share/texmf case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) cd $TEXMF/dvipdfm/CMap # @PREFIX@/share/Adobe/Resource/CMap/* @@ -16,10 +11,4 @@ POST-INSTALL) done @PREFIX@/bin/mktexlsr ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/print/ja-jsclasses/DEINSTALL b/print/ja-jsclasses/DEINSTALL index e1df2b43b83..52a38a2e67f 100644 --- a/print/ja-jsclasses/DEINSTALL +++ b/print/ja-jsclasses/DEINSTALL @@ -1,21 +1,7 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2003/03/15 20:05:56 kei Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:23:02 jlam Exp $ case ${STAGE} in -PRE-DEINSTALL) - ;; - -DEINSTALL) - ;; - POST-DEINSTALL) @PREFIX@/bin/mktexlsr ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/print/ja-jsclasses/INSTALL b/print/ja-jsclasses/INSTALL index 1f36bc62385..1d195cf8de2 100644 --- a/print/ja-jsclasses/INSTALL +++ b/print/ja-jsclasses/INSTALL @@ -1,18 +1,7 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2003/03/15 20:05:55 kei Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:23:02 jlam Exp $ case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) @PREFIX@/bin/mktexlsr ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; - esac diff --git a/print/ja-ptex-bin/DEINSTALL b/print/ja-ptex-bin/DEINSTALL index 0d7b1781296..11ff3e7f83c 100644 --- a/print/ja-ptex-bin/DEINSTALL +++ b/print/ja-ptex-bin/DEINSTALL @@ -1,26 +1,12 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:23:03 jlam Exp $ TEXMF=@PREFIX@/share/texmf PSTRICKS=$TEXMF/dvips/pstricks case $STAGE in -PRE-DEINSTALL) - ;; - -DEINSTALL) - ;; - POST-DEINSTALL) $MV $TEXMF/web2c/texmf.cnf.orig $TEXMF/web2c/texmf.cnf $MV $PSTRICKS/pst-text.pro.orig $PSTRICKS/pst-text.pro @PREFIX@/bin/mktexlsr ;; - -*) - $ECHO "Unexpected argument: $STAGE" - exit 1 - ;; - esac diff --git a/print/ja-ptex-bin/INSTALL b/print/ja-ptex-bin/INSTALL index 7615694178c..9f786795e8d 100644 --- a/print/ja-ptex-bin/INSTALL +++ b/print/ja-ptex-bin/INSTALL @@ -1,25 +1,14 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:23:03 jlam Exp $ TEXMF=@PREFIX@/share/texmf TEXMFLOCAL=@PREFIX@/share/texmf.local PSTRICKS=$TEXMF/dvips/pstricks case $STAGE in -PRE-INSTALL) - ;; - POST-INSTALL) $MV $TEXMF/web2c/texmf.cnf $TEXMF/web2c/texmf.cnf.orig $LN -s $TEXMFLOCAL/web2c/texmf.cnf $TEXMF/web2c/texmf.cnf @PATCH@ -d $PSTRICKS < $PSTRICKS/PSTricks.patch @PREFIX@/bin/mktexlsr ;; - -*) - $ECHO "Unexpected argument: $STAGE" - exit 1 - ;; - esac diff --git a/print/xpdf-arabic/DEINSTALL b/print/xpdf-arabic/DEINSTALL index f9fa5fb37c4..c734610c804 100644 --- a/print/xpdf-arabic/DEINSTALL +++ b/print/xpdf-arabic/DEINSTALL @@ -1,24 +1,10 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2003/03/25 14:04:00 salo Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:23:03 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/rabic/d" ${XPDFRC} > ${XPDFRC}.tmp - @MV@ -f ${XPDFRC}.tmp ${XPDFRC} - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/rabic/d" ${XPDFRC} > ${XPDFRC}.tmp + ${MV} -f ${XPDFRC}.tmp ${XPDFRC} ;; esac -exit 0 diff --git a/print/xpdf-chinese-simplified/DEINSTALL b/print/xpdf-chinese-simplified/DEINSTALL index 68b1310cc73..7c16b5a5d73 100644 --- a/print/xpdf-chinese-simplified/DEINSTALL +++ b/print/xpdf-chinese-simplified/DEINSTALL @@ -1,25 +1,11 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:06:48 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:03 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/implified/d" ${XPDFRC} > ${XPDFRC}.tmp - @SED@ -e "/gb2312/d" ${XPDFRC}.tmp > ${XPDFRC} - @RM@ -f ${XPDFRC}.tmp - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/implified/d" ${XPDFRC} > ${XPDFRC}.tmp + ${SED} -e "/gb2312/d" ${XPDFRC}.tmp > ${XPDFRC} + ${RM} -f ${XPDFRC}.tmp ;; esac -exit 0 diff --git a/print/xpdf-chinese-traditional/DEINSTALL b/print/xpdf-chinese-traditional/DEINSTALL index a8d5f19c518..08605a32a52 100644 --- a/print/xpdf-chinese-traditional/DEINSTALL +++ b/print/xpdf-chinese-traditional/DEINSTALL @@ -1,25 +1,11 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:06:50 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:04 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/raditional/d" ${XPDFRC} > ${XPDFRC}.tmp - @SED@ -e "/big5/d" -e "/Ar[ph][ph]ic fonts, you may/d" ${XPDFRC}.tmp > ${XPDFRC} - @RM@ -f ${XPDFRC}.tmp - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/raditional/d" ${XPDFRC} > ${XPDFRC}.tmp + ${SED} -e "/big5/d" -e "/Ar[ph][ph]ic fonts, you may/d" ${XPDFRC}.tmp > ${XPDFRC} + ${RM} -f ${XPDFRC}.tmp ;; esac -exit 0 diff --git a/print/xpdf-cyrillic/DEINSTALL b/print/xpdf-cyrillic/DEINSTALL index e96be09cf0f..0491f5eff82 100644 --- a/print/xpdf-cyrillic/DEINSTALL +++ b/print/xpdf-cyrillic/DEINSTALL @@ -1,24 +1,10 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:06:51 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:04 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/yrillic/d" ${XPDFRC} > ${XPDFRC}.tmp - @MV@ -f ${XPDFRC}.tmp ${XPDFRC} - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/yrillic/d" ${XPDFRC} > ${XPDFRC}.tmp + ${MV} -f ${XPDFRC}.tmp ${XPDFRC} ;; esac -exit 0 diff --git a/print/xpdf-greek/DEINSTALL b/print/xpdf-greek/DEINSTALL index eb30b87a931..d4def9c840b 100644 --- a/print/xpdf-greek/DEINSTALL +++ b/print/xpdf-greek/DEINSTALL @@ -1,24 +1,10 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:06:53 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:04 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/reek/d" ${XPDFRC} > ${XPDFRC}.tmp - @MV@ -f ${XPDFRC}.tmp ${XPDFRC} - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/reek/d" ${XPDFRC} > ${XPDFRC}.tmp + ${MV} -f ${XPDFRC}.tmp ${XPDFRC} ;; esac -exit 0 diff --git a/print/xpdf-hebrew/DEINSTALL b/print/xpdf-hebrew/DEINSTALL index 083139646d0..4d4967d4775 100644 --- a/print/xpdf-hebrew/DEINSTALL +++ b/print/xpdf-hebrew/DEINSTALL @@ -1,24 +1,10 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:06:55 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:05 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/ebrew/d" ${XPDFRC} > ${XPDFRC}.tmp - @MV@ -f ${XPDFRC}.tmp ${XPDFRC} - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/ebrew/d" ${XPDFRC} > ${XPDFRC}.tmp + ${MV} -f ${XPDFRC}.tmp ${XPDFRC} ;; esac -exit 0 diff --git a/print/xpdf-japanese/DEINSTALL b/print/xpdf-japanese/DEINSTALL index 9fa5f7d2109..26d2e65b2bc 100644 --- a/print/xpdf-japanese/DEINSTALL +++ b/print/xpdf-japanese/DEINSTALL @@ -1,25 +1,11 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:06:56 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:05 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/apanese/d" ${XPDFRC} > ${XPDFRC}.tmp - @SED@ -e "/jisx0208/d" ${XPDFRC}.tmp > ${XPDFRC} - @RM@ -f ${XPDFRC}.tmp - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/apanese/d" ${XPDFRC} > ${XPDFRC}.tmp + ${SED} -e "/jisx0208/d" ${XPDFRC}.tmp > ${XPDFRC} + ${RM} -f ${XPDFRC}.tmp ;; esac -exit 0 diff --git a/print/xpdf-korean/DEINSTALL b/print/xpdf-korean/DEINSTALL index 130b9fdfa0a..797821547a4 100644 --- a/print/xpdf-korean/DEINSTALL +++ b/print/xpdf-korean/DEINSTALL @@ -1,25 +1,11 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:06:58 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:05 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/orean/d" ${XPDFRC} > ${XPDFRC}.tmp - @SED@ -e "/ksc5601/d" ${XPDFRC}.tmp > ${XPDFRC} - @RM@ -f ${XPDFRC}.tmp - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/orean/d" ${XPDFRC} > ${XPDFRC}.tmp + ${SED} -e "/ksc5601/d" ${XPDFRC}.tmp > ${XPDFRC} + ${RM} -f ${XPDFRC}.tmp ;; esac -exit 0 diff --git a/print/xpdf-latin2/DEINSTALL b/print/xpdf-latin2/DEINSTALL index 79a06675366..3bf65e086fe 100644 --- a/print/xpdf-latin2/DEINSTALL +++ b/print/xpdf-latin2/DEINSTALL @@ -1,24 +1,10 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:07:00 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:05 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/atin2/d" ${XPDFRC} > ${XPDFRC}.tmp - @MV@ -f ${XPDFRC}.tmp ${XPDFRC} - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/atin2/d" ${XPDFRC} > ${XPDFRC}.tmp + ${MV} -f ${XPDFRC}.tmp ${XPDFRC} ;; esac -exit 0 diff --git a/print/xpdf-thai/DEINSTALL b/print/xpdf-thai/DEINSTALL index bb27ad9d7b1..22549baac22 100644 --- a/print/xpdf-thai/DEINSTALL +++ b/print/xpdf-thai/DEINSTALL @@ -1,24 +1,10 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:07:01 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:06 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/hai/d" ${XPDFRC} > ${XPDFRC}.tmp - @MV@ -f ${XPDFRC}.tmp ${XPDFRC} - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/hai/d" ${XPDFRC} > ${XPDFRC}.tmp + ${MV} -f ${XPDFRC}.tmp ${XPDFRC} ;; esac -exit 0 diff --git a/print/xpdf-turkish/DEINSTALL b/print/xpdf-turkish/DEINSTALL index 82590027115..09ed3006328 100644 --- a/print/xpdf-turkish/DEINSTALL +++ b/print/xpdf-turkish/DEINSTALL @@ -1,24 +1,10 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:07:03 salo Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:06 jlam Exp $ -PKGNAME=$1 -STAGE=$2 - -XPDFRC=@PKG_SYSCONFDIR@/xpdfrc +XPDFRC=${PKG_SYSCONFDIR}/xpdfrc case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) - @SED@ -e "/urkish/d" ${XPDFRC} > ${XPDFRC}.tmp - @MV@ -f ${XPDFRC}.tmp ${XPDFRC} - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ${SED} -e "/urkish/d" ${XPDFRC} > ${XPDFRC}.tmp + ${MV} -f ${XPDFRC}.tmp ${XPDFRC} ;; esac -exit 0 diff --git a/security/openssh+gssapi/INSTALL b/security/openssh+gssapi/INSTALL index f930e443924..d6becd802c0 100644 --- a/security/openssh+gssapi/INSTALL +++ b/security/openssh+gssapi/INSTALL @@ -1,18 +1,16 @@ -# $NetBSD: INSTALL,v 1.1.1.1 2003/07/24 21:01:23 jwise Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:23:07 jlam Exp $ DIRS="/etc /etc/ssh ${PKG_PREFIX}/etc ${PKG_PREFIX}/etc/ssh" FILES="sshd.conf sshd_config" -if [ "${STAGE}" != "POST-INSTALL" ]; then - exit 0 -fi - -for dir in $DIRS; do - if [ "@PKG_SYSCONFDIR@" != "$dir" ]; then - for file in $FILES; do - path=$dir/$file - if [ -f $path ]; then - ${CAT} <<EOF +case ${STAGE} in +POST-INSTALL) + for dir in $DIRS; do + if [ "@PKG_SYSCONFDIR@" != "$dir" ]; then + for file in $FILES; do + path=$dir/$file + if [ -f $path ]; then + ${CAT} <<EOF =========================================================================== *===* NOTICE *===* @@ -29,8 +27,10 @@ placed in the correct directory before using ${PKGNAME}. =========================================================================== EOF - exit - fi - done - fi -done + exit + fi + done + fi + done + ;; +esac diff --git a/security/openssh/INSTALL b/security/openssh/INSTALL index 626a921fa18..8b8d1d310e2 100644 --- a/security/openssh/INSTALL +++ b/security/openssh/INSTALL @@ -1,18 +1,16 @@ -# $NetBSD: INSTALL,v 1.9 2003/03/28 21:24:25 wiz Exp $ +# $NetBSD: INSTALL,v 1.10 2003/08/30 20:23:06 jlam Exp $ DIRS="/etc /etc/ssh ${PKG_PREFIX}/etc ${PKG_PREFIX}/etc/ssh" FILES="sshd.conf sshd_config" -if [ "${STAGE}" != "POST-INSTALL" ]; then - exit 0 -fi - -for dir in $DIRS; do - if [ "@PKG_SYSCONFDIR@" != "$dir" ]; then - for file in $FILES; do - path=$dir/$file - if [ -f $path ]; then - ${CAT} <<EOF +case ${STAGE} in +POST-INSTALL) + for dir in $DIRS; do + if [ "@PKG_SYSCONFDIR@" != "$dir" ]; then + for file in $FILES; do + path=$dir/$file + if [ -f $path ]; then + ${CAT} <<EOF =========================================================================== *===* NOTICE *===* @@ -29,8 +27,10 @@ placed in the correct directory before using ${PKGNAME}. =========================================================================== EOF - exit - fi - done - fi -done + exit + fi + done + fi + done + ;; +esac diff --git a/textproc/namazu1/INSTALL b/textproc/namazu1/INSTALL index 644e305eac7..61dc8c9ea1f 100644 --- a/textproc/namazu1/INSTALL +++ b/textproc/namazu1/INSTALL @@ -1,13 +1,11 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1.1.1 2002/05/31 13:01:39 seb Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:23:07 jlam Exp $ PKGNAME=$1 STAGE=$2 case ${STAGE} in -PRE-INSTALL) - ;; POST-INSTALL) cat <<EOF @@ -19,9 +17,5 @@ If you customize namazu configuration, copy EOF ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/textproc/namazu2/INSTALL b/textproc/namazu2/INSTALL index ee7d6b75e74..57accedc0e2 100644 --- a/textproc/namazu2/INSTALL +++ b/textproc/namazu2/INSTALL @@ -1,13 +1,11 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2003/05/06 17:42:50 jmmv Exp $ +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:23:07 jlam Exp $ PKGNAME=$1 STAGE=$2 case ${STAGE} in -PRE-INSTALL) - ;; POST-INSTALL) cat <<EOF @@ -56,9 +54,5 @@ POST-INSTALL) EOF ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/x11/gdm/DEINSTALL b/x11/gdm/DEINSTALL index c565b92880d..e4a77770f60 100644 --- a/x11/gdm/DEINSTALL +++ b/x11/gdm/DEINSTALL @@ -1,6 +1,6 @@ -# $NetBSD: DEINSTALL,v 1.2 2003/01/10 17:26:55 jmmv Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:07 jlam Exp $ -if [ "$2" != POST-DEINSTALL ] +if [ "$2" = DEINSTALL ] then cd @GDMCFGDIR@ @RM@ -f Sessions/Default diff --git a/x11/lesstif/DEINSTALL b/x11/lesstif/DEINSTALL index bc6da8aeb0c..5b20beca0b2 100644 --- a/x11/lesstif/DEINSTALL +++ b/x11/lesstif/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:11:11 zuntum Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:23:08 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -21,9 +21,6 @@ X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) ${ECHO} -n "Updating ${HOSTDEF}..." ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak @@ -45,10 +42,5 @@ POST-DEINSTALL) ${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE} ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/x11/lesstif/INSTALL b/x11/lesstif/INSTALL index 3f1b416791e..61ab91ea8c6 100644 --- a/x11/lesstif/INSTALL +++ b/x11/lesstif/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2003/05/06 17:43:10 jmmv Exp $ +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:23:08 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -20,9 +20,6 @@ X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) if [ ${PKG_PREFIX} = ${X11BASE} -o -f ${HOSTDEF} ] then @@ -49,10 +46,5 @@ POST-INSTALL) ${LOCALBASE}/share/aclocal/ac_find_motif.m4 fi ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/x11/openmotif/DEINSTALL b/x11/openmotif/DEINSTALL index eede819f09f..581235a003e 100644 --- a/x11/openmotif/DEINSTALL +++ b/x11/openmotif/DEINSTALL @@ -1,4 +1,4 @@ -# $NetBSD: DEINSTALL,v 1.3 2003/05/19 19:43:16 jschauma Exp $ +# $NetBSD: DEINSTALL,v 1.4 2003/08/30 20:23:08 jlam Exp $ X11BASE=@X11BASE@ MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules @@ -7,9 +7,6 @@ X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) ${ECHO} -n "Updating ${HOSTDEF}..." ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak @@ -32,9 +29,4 @@ POST-DEINSTALL) ${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE} ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; esac diff --git a/x11/openmotif/INSTALL b/x11/openmotif/INSTALL index 8aed73c210f..8b580cef0a0 100644 --- a/x11/openmotif/INSTALL +++ b/x11/openmotif/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.4 2003/05/19 19:43:17 jschauma Exp $ +# $NetBSD: INSTALL,v 1.5 2003/08/30 20:23:08 jlam Exp $ X11BASE=@X11BASE@ MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules @@ -7,9 +7,6 @@ X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) if [ ${PKG_PREFIX} = ${X11BASE} ] then @@ -38,9 +35,4 @@ POST-INSTALL) ${RM} -f ${HOSTDEF}.bak ${ECHO} "done." ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; esac diff --git a/x11/xterm/INSTALL b/x11/xterm/INSTALL index 36c63f64133..fad096a3545 100644 --- a/x11/xterm/INSTALL +++ b/x11/xterm/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2001/12/17 14:47:02 tron Exp $ +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:23:08 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -9,7 +9,7 @@ CONFLICTS="bin/resize bin/xterm lib/app-defaults/XTerm share/man/man1/resize.1 s case ${STAGE} in PRE-INSTALL) - cd @PREFIX@ + cd ${PKG_PREFIX} for FILE in $CONFLICTS do if [ -f $FILE ] @@ -20,7 +20,7 @@ PRE-INSTALL) ;; POST-INSTALL) - cd @PREFIX@/lib/X11/etc + cd ${PKG_PREFIX}/lib/X11/etc TERMINFO=@LOCALBASE@/share/lib/terminfo export TERMINFO /usr/5bin/tic xterm.terminfo @@ -30,7 +30,7 @@ DEINSTALL) ;; POST-DEINSTALL) - cd @PREFIX@ + cd ${PKG_PREFIX} for FILE in $CONFLICTS do if [ -f ${FILE}.openwin ] @@ -39,10 +39,5 @@ POST-DEINSTALL) fi done ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 |