* Use buildlink.mk files to get dependencies and to prevent unintended

  linking against installed libraries or finding installed headers except
  for those that are explicitly linked into ${BUILDLINK_INCDIR} and
  ${BUILDLINK_LIBDIR}.

* Don't prototype history functions directly, but use
  <readline/history.h> to pull them in.  This allows us to use libedit's
  readline emulation.

* Add INSTALL/DEINSTALL scripts to handle coda-server and coda-client both
  installing coda-setup-ports and codaconfedit.

* Try to remove ${PREFIX}/etc/coda at post-deinstall time.

3 files changed, 105 insertions, 3 deletions

diff --git a/net/coda5_server/pkg/DEINSTALL b/net/coda5_server/pkg/DEINSTALL
new file mode 100644
index 00000000000..2dbf8658829
--- /dev/null
+++ b/net/coda5_server/pkg/DEINSTALL
@@ -0,0 +1,72 @@
+#! /bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2001/05/31 22:58:08 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CAT="@CAT@"
+LN="@LN@"
+RM="@RM@"
+RMDIR="@RMDIR@"
+TRUE="@TRUE@"
+
+CONFDIR=${PKG_PREFIX}/etc/coda
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+
+POST-DEINSTALL)
+	# If coda-server is installed, then point these links to the
+	# venus-* versions of these scripts.
+	#
+	for script in coda-setup-ports codaconfedit; do
+		${RM} -f ${PKG_PREFIX}/sbin/${script}
+		if [ -f ${PKG_PREFIX}/sbin/venus-${script} ]
+		then
+			${LN} -sf venus-${script} ${PKG_PREFIX}/sbin/${script}
+		fi
+	done
+
+	${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE}
+
+	existing_dirs=''
+	for dir in ${CONFDIR}
+	do
+		if [ -d ${dir} ]
+		then
+			existing_dirs="${existing_dirs} ${dir}"
+		fi
+	done
+
+	if [ -n "${existing_dirs}" ]
+	then
+		${CAT} << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to remove:
+EOF
+		if [ -n "${existing_dirs}" ]
+		then
+			${CAT} << EOF
+
+  * the following directories:
+
+EOF
+			for dir in ${existing_dirs}
+			do
+				echo "	${dir}"
+			done
+		fi
+		${CAT} << EOF
+===========================================================================
+EOF
+	fi
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/net/coda5_server/pkg/INSTALL b/net/coda5_server/pkg/INSTALL
new file mode 100644
index 00000000000..f1f070eb297
--- /dev/null
+++ b/net/coda5_server/pkg/INSTALL
@@ -0,0 +1,30 @@
+#! /bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2001/05/31 22:58:08 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+LN="@LN@"
+RM="@RM@"
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+
+POST-INSTALL)
+	# coda-client may have already created these links
+	for script in coda-setup-ports codaconfedit; do
+		if [ ! -f ${PKG_PREFIX}/sbin/${script} ]
+		then
+			${LN} -sf vice-${script} ${PKG_PREFIX}/sbin/${script}
+		fi
+	done
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/net/coda5_server/pkg/PLIST b/net/coda5_server/pkg/PLIST
index 8c2d6d420a1..988f540586b 100644
--- a/net/coda5_server/pkg/PLIST
+++ b/net/coda5_server/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2001/05/15 08:32:52 phil Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/05/31 22:58:08 jlam Exp $
 bin/norton
 bin/norton-reinit
 bin/reinit
@@ -7,8 +7,6 @@ sbin/auth2
 sbin/backup
 sbin/backup.sh
 sbin/bldvldb.sh
-sbin/coda-setup-ports
-sbin/codaconfedit
 sbin/codasrv
 sbin/codastart
 sbin/createvol_rep
@@ -29,6 +27,8 @@ sbin/tape.pl
 sbin/updateclnt
 sbin/updatefetch
 sbin/updatesrv
+sbin/vice-coda-setup-ports
+sbin/vice-codaconfedit
 sbin/vice-killvolumes
 sbin/vice-setup
 sbin/vice-setup-rvm