Qpoper package update. There is no functional change.

- Utilize bsd.pkg.install.mk.
- Honor PKG_SYSCONFDIR.

5 files changed, 17 insertions, 99 deletions

diff --git a/mail/qpopper/DEINSTALL b/mail/qpopper/DEINSTALL
deleted file mode 100644
index 8a586e5ede9..00000000000
--- a/mail/qpopper/DEINSTALL
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:01:14 zuntum Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-DB_SUFFIX=@DB_SUFFIX@
-QPOPPER_APOP_AUTH=@QPOPPER_APOP_AUTH@.${DB_SUFFIX}
-QPOPPER_USER=@QPOPPER_USER@
-
-case "${STAGE}" in
-DEINSTALL)
-	cat <<EOF
-===========================================================================
-
-If you won't be using ${PKGNAME} any longer, you may want to remove
-user "${QPOPPER_USER}" and delete a file "${QPOPPER_APOP_AUTH}".
-
-===========================================================================
-EOF
-	;;
-esac
diff --git a/mail/qpopper/INSTALL b/mail/qpopper/INSTALL
deleted file mode 100644
index c4d5d1b6ec7..00000000000
--- a/mail/qpopper/INSTALL
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/11/01 01:01:14 zuntum Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-BINGRP=@BINGRP@
-CHGRP=@CHGRP@
-CHOWN=@CHOWN@
-DB_SUFFIX=@DB_SUFFIX@
-PKG_PREFIX=@PKG_PREFIX@
-QPOPPER_APOP_AUTH=@QPOPPER_APOP_AUTH@.${DB_SUFFIX}
-QPOPPER_USER=@QPOPPER_USER@
-USER_CMD="@USER_CMD@"
-
-case "${STAGE}" in
-PRE-INSTALL)
-	${USER_CMD} info -e ${QPOPPER_USER} ||
-		${USER_CMD} add -g ${BINGRP} \
-		    -d /nonexistent -s /sbin/nologin ${QPOPPER_USER}
-	;;
-POST-INSTALL)
-	if [ -f ${QPOPPER_APOP_AUTH} ]; then \
-		${CHOWN} ${QPOPPER_USER} ${QPOPPER_APOP_AUTH}; \
-		${CHGRP} ${BINGRP} ${QPOPPER_APOP_AUTH}; \
-	fi
-	cat <<EOF
-===========================================================================
-
-In order to enable POP service, you should add the following line
-to your /etc/inetd.conf:
-
-    pop3 stream tcp nowait root ${PKG_PREFIX}/libexec/qpopper qpopper -s
-
-===========================================================================
-EOF
-	;;
-esac
diff --git a/mail/qpopper/MESSAGE b/mail/qpopper/MESSAGE
new file mode 100644
index 00000000000..98a2bcad725
--- /dev/null
+++ b/mail/qpopper/MESSAGE
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2002/05/03 15:09:50 taca Exp $
+
+In order to enable POP service, you should add the following line
+to your /etc/inetd.conf:
+
+    pop3 stream tcp nowait root ${LOCALBASE}/libexec/qpopper qpopper -s
+
+===========================================================================
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 3b43e95e232..a0d06400f1e 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/05/02 16:16:50 martti Exp $
+# $NetBSD: Makefile,v 1.32 2002/05/03 15:09:51 taca Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -14,49 +14,22 @@ MAINTAINER=		mellon@fugue.com
 HOMEPAGE=		http://www.eudora.com/qpopper/
 COMMENT=		Qualcomm's POP server for Eudora
 
-VERSION=		4.0.4
 USE_BUILDLINK_ONLY=	# defined
 
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
-
 .include "Makefile.common"
 
-.if exists(/usr/sbin/user)
-USER_CMD=		/usr/sbin/user
-GROUP_CMD=		/usr/sbin/group
-.else
-DEPENDS+=		user>=20000313:../../sysutils/user
-USER_CMD=		${LOCALBASE}/sbin/user
-GROUP_CMD=		${LOCALBASE}/sbin/group
-.endif
+PKG_USERS?=		${QPOPPER_USER}
 
 pre-build:
 	${SED} 's"/usr/local/lib"${LOCALBASE}/libexec"' \
 		${WRKSRC}/man/popper.8 > ${WRKSRC}/man/popper.8.$$ && \
 	${MV} -f ${WRKSRC}/man/popper.8.$$ ${WRKSRC}/man/popper.8
 
-post-build:
-	for FILE in DEINSTALL INSTALL; do \
-		${SED}	-e 's|@BINGRP@|${BINGRP}|g' \
-			-e 's|@CHGRP@|${CHGRP}|g' \
-			-e 's|@CHOWN@|${CHOWN}|g' \
-			-e 's|@DB_SUFFIX@|${DB_SUFFIX}|g' \
-			-e 's|@USER_CMD@|${USER_CMD}|g' \
-			-e 's|@QPOPPER_USER@|${QPOPPER_USER}|g' \
-			-e 's|@PKG_PREFIX@|${PREFIX}|g' \
-			-e 's|@QPOPPER_APOP_AUTH@|${QPOPPER_APOP_AUTH}|g' \
-			-e 's|@INSTALL_DATA@|${INSTALL_DATA}|g' \
-			< ${PKGDIR}/$${FILE} > ${WRKDIR}/$${FILE}; \
-	done
-
-pre-install:
-	PKG_PREFIX=${LOCALBASE} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/License.txt ${LOCALBASE}/share/doc/qpopper.License
 	${INSTALL_DATA} ${WRKSRC}/samples/qpopper.config \
 		 ${LOCALBASE}/share/examples
-	PKG_PREFIX=${LOCALBASE} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../security/openssl/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index 934448667c5..05c67f31f7b 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2001/09/09 03:37:02 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/05/03 15:09:51 taca Exp $
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libexecdir=${LOCALBASE}/libexec \
@@ -10,9 +10,11 @@ CONFIGURE_ARGS+=	--libexecdir=${LOCALBASE}/libexec \
 
 QPOPPER_USER?=		pop
 QPOPPER_FAC?=		LOCAL1
-QPOPPER_APOP_AUTH?=	/etc/apop.auth
+QPOPPER_APOP_AUTH?=	${PKG_SYSCONFDIR}/apop.auth
 DB_SUFFIX?=		db
 
+VERSION=		4.0.4
+
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
@@ -30,5 +32,3 @@ CONFIGURE_ARGS+=	--enable-servermode
 .if defined(USE_INET6) && ${USE_INET6} == YES
 CONFIGURE_ENV+=		O_DEFS="${O_DEFS}" CFLAGS="-DINET6"
 .endif
-
-.include "../../security/openssl/buildlink.mk"