Use `user' instead of `addnerd'. Move de-installation instructions

from PLIST to DEINSTALL.

4 files changed, 57 insertions, 13 deletions

diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index a34987e47cb..8e486979ef4 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/09/06 08:08:17 sakamoto Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 15:57:47 wiz Exp $
 
 DISTNAME=		majordomo-1.94.4
 CATEGORIES=		mail
@@ -9,7 +9,14 @@ EXTRACT_SUFX=   	.tgz
 MAINTAINER=		packages@biology.nmsu.edu
 HOMEPAGE=		http://www.greatcircle.com/majordomo/
 
-DEPENDS+=		addnerd-1.6:../../sysutils/addnerd
+.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
 
 USE_PERL5=		yes
 
@@ -20,6 +27,7 @@ INSTALL_TARGET=		install install-wrapper
 
 MESSAGE_FILE=		${WRKDIR}/MESSAGE
 REQ_FILE=		${WRKDIR}/REQ
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 MAKEFILE=		Makefile.netbsd
 
 MAJORDOMO_TMPDIR?=	/var/tmp
@@ -81,8 +89,14 @@ do-configure:
 		-e 's|@MAJORDOMO_USER@|${MAJORDOMO_USER}|g' \
 		-e 's|@MAJORDOMO_GROUP@|${MAJORDOMO_GROUP}|g' \
 		-e 's|@HOME@|${MAJORDOMO_HOMEDIR}|g' \
-		-e 's|@LOCALBASE@|${LOCALBASE}|g' \
+		-e 's|@ADDUSER@|${ADDUSER}|g' \
+		-e 's|@ADDGROUP@|${ADDGROUP}|g' \
 		< ${PKGDIR}/REQ > ${REQ_FILE}
+	@${SED} \
+		-e 's|@MAJORDOMO_USER@|${MAJORDOMO_USER}|g' \
+		-e 's|@MAJORDOMO_GROUP@|${MAJORDOMO_GROUP}|g' \
+		-e 's|@HOME@|${MAJORDOMO_HOMEDIR}|g' \
+		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 	@${MAKE} ${.MAKEFLAGS} require-uid
 	@${SED} \
 		-e 's:@PREFIX@:${PREFIX}:g' \
diff --git a/mail/majordomo/pkg/DEINSTALL b/mail/majordomo/pkg/DEINSTALL
new file mode 100644
index 00000000000..32ca6f86951
--- /dev/null
+++ b/mail/majordomo/pkg/DEINSTALL
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2000/08/18 15:57:48 wiz Exp $
+#
+
+PKGNAME=$1
+STAGE=$2
+
+USER=@MAJORDOMO_USER@
+GROUP=@MAJORDOMO_GROUP@
+HOME=@HOME@
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	cat << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to
+	- remove the \`${USER}' user.
+	- remove his home directory \`${HOME}/${USER}'
+	- remove the \`${GROUP}' group from /etc/group
+	- remove majordomo aliases from /etc/sendmail.cf and run newaliases
+===========================================================================
+EOF
+	;;
+*)
+	echo "Unexpected argument: $2"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/mail/majordomo/pkg/PLIST b/mail/majordomo/pkg/PLIST
index 33f3fbf9843..d7704996987 100644
--- a/mail/majordomo/pkg/PLIST
+++ b/mail/majordomo/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/11/27 16:50:03 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/08/18 15:57:48 wiz Exp $
 bin/approve
 bin/bounce
 bin/medit
@@ -61,7 +61,3 @@ share/examples/majordomo/majordomo.cf
 @dirrm share/doc/majordomo
 @dirrm libexec/majordomo/Tools
 @dirrm libexec/majordomo
-@unexec echo "If you are removing majordomo permanently, you may wish to"
-@unexec echo "  - remove @HOME@/@MAJORDOMO_USER@"
-@unexec echo "  - remove majordomo aliases from /etc/sendmail.cf and run newaliases"
-@unexec echo "  - remove group majordom from /etc/group"
diff --git a/mail/majordomo/pkg/REQ b/mail/majordomo/pkg/REQ
index 959f3f28ff7..55be193c587 100644
--- a/mail/majordomo/pkg/REQ
+++ b/mail/majordomo/pkg/REQ
@@ -3,8 +3,8 @@
 HOME=@HOME@
 MAJORDOMO_USER=@MAJORDOMO_USER@
 MAJORDOMO_GROUP=@MAJORDOMO_GROUP@
-ADDNERD=@LOCALBASE@/sbin/addnerd
-
+ADDUSER=@ADDUSER@
+ADDGROUP=@ADDGROUP@
 
 PKG=$1
 STAGE=$2
@@ -21,8 +21,9 @@ if grep "^${MAJORDOMO_GROUP}:" /etc/group 2>&1 >/dev/null
 then
 	echo "Group '$MAJORDOMO_GROUP' already exists, proceeding."
 else
-	echo "Please add group '$MAJORDOMO_GROUP' to /etc/group, then restart."
-	exit 1
+	echo "Creating '${MAJORDOMO_GROUP}' group..."
+	${ADDGROUP} ${MAJORDOMO_GROUP}
+	echo "Done."
 fi
 
 
@@ -30,7 +31,8 @@ fi
 if finger ${MAJORDOMO_USER} 2>&1 | grep >/dev/null "no such user"
 then
 	echo "Creating '$MAJORDOMO_USER' user ..."
-	${ADDNERD} -h ${HOME} -g ${MAJORDOMO_GROUP} ${MAJORDOMO_USER}
+	${ADDUSER} -d ${HOME}/${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
+		${MAJORDOMO_USER}
 	echo Done.
 else
 	echo "User '$MAJORDOMO_USER' already exists, proceeding."