Prepare for pkgviews by making sure that passing VIEW-INSTALL or

VIEW-DEINSTALL to the INSTALL/DEINSTALL scripts don't cause errors.

6 files changed, 14 insertions, 66 deletions

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