2 files changed, 51 insertions, 46 deletions
diff --git a/mail/majordomo/pkg/INSTALL b/mail/majordomo/pkg/INSTALL
new file mode 100644
index 00000000000..e9d363cba6d
--- /dev/null
+++ b/mail/majordomo/pkg/INSTALL
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2000/12/08 10:09:23 wiz Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+HOME=@HOME@
+MAJORDOMO_USER=@MAJORDOMO_USER@
+MAJORDOMO_GROUP=@MAJORDOMO_GROUP@
+ADDUSER=@ADDUSER@
+ADDGROUP=@ADDGROUP@
+CHGRP=@CHGRP@
+ID=@ID@
+TOUCH=@TOUCH@
+RM=@RM@
+
+if [ "$STAGE" != "PRE-INSTALL" ];
+then
+	exit 0
+fi
+
+# We need to check that ${MAJORDOMO_GROUP} exists before adding the user.
+#
+${TOUCH} "/tmp/grouptestmajordomo.$$"
+${CHGRP} ${MAJORDOMO_GROUP} "/tmp/grouptestmajordomo.$$" >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+	echo "Group '${MAJORDOMO_GROUP}' already exists...proceeding."
+else
+	echo "Creating '${MAJORDOMO_GROUP}' group..."
+	${ADDGROUP} ${MAJORDOMO_GROUP}
+	echo "Done."
+fi
+${RM} -f "/tmp/grouptestmajordomo.$$"
+
+${ID} ${MAJORDOMO_USER} >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+	echo "User '${MAJORDOMO_USER}' already exists...proceeding."
+else
+	echo "Creating '${MAJORDOMO_USER}' user..."
+	${ADDUSER} -c "Majordomo User" -g ${MAJORDOMO_GROUP} \
+		-b ${HOME} ${MAJORDOMO_USER}
+	echo "Done."
+fi
+
+# Home... in case the login exists but not the home directory
+#
+install -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${HOME}/${MAJORDOMO_USER}
+install -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${HOME}/${MAJORDOMO_USER}/archives
+install -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${HOME}/${MAJORDOMO_USER}/digests
+install -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${HOME}/${MAJORDOMO_USER}/lists
diff --git a/mail/majordomo/pkg/REQ b/mail/majordomo/pkg/REQ
deleted file mode 100644
index 55be193c587..00000000000
--- a/mail/majordomo/pkg/REQ
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-HOME=@HOME@
-MAJORDOMO_USER=@MAJORDOMO_USER@
-MAJORDOMO_GROUP=@MAJORDOMO_GROUP@
-ADDUSER=@ADDUSER@
-ADDGROUP=@ADDGROUP@
-
-PKG=$1
-STAGE=$2
-
-if [ "$STAGE" != "INSTALL" ];
-then
-	exit 0
-fi
-
-
-# Group... the default's shipped with NetBSD
-#
-if grep "^${MAJORDOMO_GROUP}:" /etc/group 2>&1 >/dev/null
-then
-	echo "Group '$MAJORDOMO_GROUP' already exists, proceeding."
-else
-	echo "Creating '${MAJORDOMO_GROUP}' group..."
-	${ADDGROUP} ${MAJORDOMO_GROUP}
-	echo "Done."
-fi
-
-
-# use finger to be able to use NIS, ...
-if finger ${MAJORDOMO_USER} 2>&1 | grep >/dev/null "no such user"
-then
-	echo "Creating '$MAJORDOMO_USER' user ..."
-	${ADDUSER} -d ${HOME}/${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${MAJORDOMO_USER}
-	echo Done.
-else
-	echo "User '$MAJORDOMO_USER' already exists, proceeding."
-fi
-
-# Home... in case the login exists but not the home directory
-#
-install -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${HOME}/${MAJORDOMO_USER}
-install -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${HOME}/${MAJORDOMO_USER}/archives
-install -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${HOME}/${MAJORDOMO_USER}/digests
-install -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${HOME}/${MAJORDOMO_USER}/lists