Use the general INSTALL/DEINSTALL scripts instead of the homegrown ones.

Also mark as USE_BUILDLINK_ONLY.

3 files changed, 9 insertions, 157 deletions

diff --git a/sysutils/amanda-common/DEINSTALL b/sysutils/amanda-common/DEINSTALL
deleted file mode 100644
index aa5a1f648a9..00000000000
--- a/sysutils/amanda-common/DEINSTALL
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:52:48 zuntum Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-USER=@AMUSER@
-AMVAR=@AMVAR@
-
-CAT="@CAT@"
-RMDIR="@RMDIR@"
-TRUE="@TRUE@"
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-
-POST-DEINSTALL)
-	${RMDIR} ${AMVAR}/gnutar-lists 2>/dev/null || ${TRUE}
-	${RMDIR} ${AMVAR} 2>/dev/null || ${TRUE}
-
-	existing_dirs=''
-	for dir in ${AMVAR}/gnutar-lists ${AMVAR}
-	do
-		if [ -d ${dir} ]
-		then
-			existing_dirs="${existing_dirs} ${dir}"
-		fi
-	done
-
-	${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove:
-
-  * the \`${USER}' user
-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
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/sysutils/amanda-common/INSTALL b/sysutils/amanda-common/INSTALL
deleted file mode 100644
index f009fa45836..00000000000
--- a/sysutils/amanda-common/INSTALL
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/10/31 22:52:48 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-AMUSER=@AMUSER@
-AMGROUP=@AMGROUP@
-AMVAR=@AMVAR@
-ADDUSER=@ADDUSER@
-ADDGROUP=@ADDGROUP@
-CHGRP="@CHGRP@"
-CHMOD="@CHMOD@"
-CHOWN="@CHOWN@"
-ID="@ID@"
-MKDIR="@MKDIR@"
-RM="@RM@"
-TOUCH="@TOUCH@"
-
-case ${STAGE} in
-PRE-INSTALL)
-	# Group... the default's shipped with NetBSD
-	# We need to check that ${AMGROUP} exists before adding the user.
-	#
-	${TOUCH} "/tmp/grouptestamanda.$$"
-	${CHGRP} ${AMGROUP} "/tmp/grouptestamanda.$$" >/dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		echo "Group '${AMGROUP}' already exists...proceeding."
-	else
-		echo "Creating '${AMGROUP}' group..."
-		${ADDGROUP} ${AMGROUP}
-		echo "Done."
-	fi
-	${RM} -f "/tmp/grouptestamanda.$$"
-
-	${ID} ${AMUSER} >/dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		echo "User '${AMUSER}' already exists...proceeding."
-	else
-		echo "Creating '${AMUSER}' user..."
-		${ADDUSER} -c "Amanda User" -g ${AMGROUP} -s /bin/sh ${AMUSER}
-		echo "Done."
-	fi
-	;;
-
-POST-INSTALL)
-	${MKDIR} ${AMVAR}
-	${CHMOD} 700 ${AMVAR}
-	${CHOWN} ${AMUSER}:${AMGROUP} ${AMVAR}
-
-	${MKDIR} ${AMVAR}/gnutar-lists
-	${CHMOD} 700 ${AMVAR}/gnutar-lists
-	${CHOWN} ${AMUSER}:${AMGROUP} ${AMVAR}/gnutar-lists
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 5f2422a8fd1..b06203e0346 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/18 15:20:39 veego Exp $
+# $NetBSD: Makefile,v 1.19 2001/11/20 07:00:13 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -12,26 +12,15 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.amanda.org/
 COMMENT=		Libraries and binaries used by both the client and server parts of amanda
 
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
+USE_BUILDLINK_ONLY=	YES
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
 
 .if ${OPSYS} == "NetBSD"
 CPPFLAGS=		# empty
-.if exists(/usr/sbin/user)
-ADDUSER=		/usr/sbin/useradd
-ADDGROUP=		/usr/sbin/groupadd
-.else
-DEPENDS+=		user>=20000313:../../sysutils/user
-ADDUSER=		${LOCALBASE}/sbin/useradd
-ADDGROUP=		${LOCALBASE}/sbin/groupadd
-.endif
 .elif ${OPSYS} == "SunOS"
 CPPFLAGS+=		-D_LARGEFILE64_SOURCE
-ADDUSER=		useradd
-ADDGROUP=		groupadd
 .endif
 
 CONFIGURE_ARGS+=	--without-server --without-restore --without-client
@@ -45,31 +34,19 @@ CONFIGURE_ENV+=		ac_cv_lib_ncurses_tgetent=no
 CONFIGURE_ENV+=		ac_cv_lib_ncurses_tgetent=no
 CONFIGURE_ENV+=		ac_cv_lib_readline_readline=no
 
-INSTALL_SUBST+=		AMUSER=${AMANDA_USER}
-INSTALL_SUBST+=		AMGROUP=${AMANDA_GROUP}
-INSTALL_SUBST+=		AMVAR=${AMANDA_VAR}
-
-INSTALL_SUBST+=		ADDUSER=${ADDUSER:Q}
-INSTALL_SUBST+=		ADDGROUP=${ADDGROUP:Q}
-INSTALL_SUBST+=		CAT=${CAT:Q}
-INSTALL_SUBST+=		CHGRP=${CHGRP:Q}
-INSTALL_SUBST+=		CHMOD=${CHMOD:Q}
-INSTALL_SUBST+=		CHOWN=${CHOWN:Q}
-INSTALL_SUBST+=		ID=${ID:Q}
-INSTALL_SUBST+=		MKDIR=${MKDIR:Q}
-INSTALL_SUBST+=		RM=${RM:Q}
-INSTALL_SUBST+=		RMDIR=${RMDIR:Q}
-INSTALL_SUBST+=		TOUCH=${TOUCH:Q}
-INSTALL_SUBST+=		TRUE=${TRUE:Q}
+PKG_USER=		${AMANDA_USER}
+PKG_USER_DESCR=		Amanda user
+PKG_USER_SHELL=		${SH}
+PKG_GROUP=		${AMANDA_GROUP}
 
-INSTALL_SUBST_SED=	${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+OWN_DIRS_PERMS=		${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
+OWN_DIRS_PERMS+=	${AMANDA_VAR}/gnutar-lists  ${AMANDA_USER} ${AMANDA_GROUP} 0700
 
 pre-install:
-	${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"