Move user adding into pkg-install

svn path=/head/; revision=48938

mail/popper/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	qpopper
 PORTVERSION=	2.53
-PORTREVISION=   3
+PORTREVISION=   4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/old/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -54,6 +54,9 @@ post-patch:
 	$(RM) ${WRKSRC}/md5.h
 	$(CP) ${FILESDIR}/sendto.c ${WRKSRC}
 
+pre-install:
+	PKG_PREFIX=${PREFIX} ./pkg-install ${PKGNAME} PRE-INSTALL
+
 do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} -o pop -m 4111 popauth ${PREFIX}/bin

mail/popper/pkg-install

@@ -1,10 +1,17 @@
 #!/bin/sh
+# $FreeBSD$
+#
+
+if [ "$2" != "PRE-INSTALL" ]; then
+    exit 0
+fi
+
 USER=pop
 UID=68
 GID=6
 GROUP=mail
 
-if ! pw group show "${GROUP}" 2>/dev/null 1>&2; then
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
 	if pw groupadd ${GROUP} -g ${GID}; then
 		echo "Added group \"${GROUP}\"."
 	else
@@ -13,7 +20,7 @@ if ! pw group show "${GROUP}" 2>/dev/null 1>&2; then
 	fi
 fi
 
-if ! pw user show "${USER}" 2>/dev/null 1>&2; then
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
 	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
 		-s "/sbin/nologin" -d "/nonexistent" -c "Post Office Owner"
 	then
@@ -24,9 +31,9 @@ if ! pw user show "${USER}" 2>/dev/null 1>&2; then
 	fi
 fi
 
-usrdir=${PREFIX}/etc/popper
+usrdir=${PKG_PREFIX}/etc/popper
 if [ ! -d $usrdir ]; then
   mkdir -p $usrdir
 fi
-chown pop:daemon $usrdir
+chown ${USER}:daemon $usrdir
 chmod 700 $usrdir

mail/popper/pkg-req

@@ -1,13 +0,0 @@
-if [ "$2" != "INSTALL" ]; then
-  exit 0
-fi
-if ! id -u pop > /dev/null 2>&1; then
-  echo "You need an account \"pop\" to install this package."
-  echo "Please add it by hand (try \"man vipw\") and try again."
-  echo ""
-  echo "An example passwd entry is:"
-  echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
-  echo ""
-  exit 1
-fi
-exit 0