Converted to respect PKG_SYSCONFDIR

3 files changed, 32 insertions, 75 deletions

diff --git a/mail/popa3d/DEINSTALL b/mail/popa3d/DEINSTALL
index dfefdeac0f9..c8f63d5e744 100644
--- a/mail/popa3d/DEINSTALL
+++ b/mail/popa3d/DEINSTALL
@@ -1,19 +1,11 @@
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:01:01 zuntum Exp $
-#
+# $NetBSD: DEINSTALL,v 1.2 2001/11/25 23:55:35 zuntum Exp $
 
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
-fi
-
-if ! user del popa3d
-then
-    echo Removing user \'popa3d\' failed, please remove him manually.
-fi
-if ! group del popa3d
-then
-    echo Removing group  \'popa3d\' failed, please remove it manually.
-fi
-
-echo
-echo Remember to remove popa3d from /etc/inetd.conf and restart inetd.
-echo
+case "${STAGE}" in
+POST-DEINSTALL)
+	${ECHO} ===========================================================================
+	${ECHO}
+	${ECHO} Remember to remove popa3d from /etc/inetd.conf and restart inetd.
+	${ECHO}
+	${ECHO} ===========================================================================
+	;;
+esac
diff --git a/mail/popa3d/INSTALL b/mail/popa3d/INSTALL
index 4b72658941e..dbbb29e450e 100644
--- a/mail/popa3d/INSTALL
+++ b/mail/popa3d/INSTALL
@@ -1,36 +1,7 @@
-# $NetBSD: INSTALL,v 1.1 2001/11/01 01:01:01 zuntum Exp $
-#
+# $NetBSD: INSTALL,v 1.2 2001/11/25 23:55:35 zuntum Exp $
 
-if [ "$2" != "PRE-INSTALL" ]; then
-    chown popa3d:popa3d ${PKG_PREFIX}/libexec/popa3d
-    exit 0
-fi
-
-if [ -f /usr/sbin/user ]
-then
-    USER_CMD=/usr/sbin/user
-    GROUP_CMD=/usr/sbin/group
-else
-    if [ -f ${PKG_PREFIX}/sbin/user ]
-    then
-	USER_CMD=${PKG_PREFIX}/sbin/user
-	GROUP_CMD=${PKG_PREFIX}/sbin/group
-    else
-	echo
-	echo Please install the sysutils/user first!
-	echo
-	exit 0
-    fi
-fi
-
-if `${GROUP_CMD} info -e popa3d` ; then \
-	${ECHO} Group \'popa3d\' already exists.; \
-else \
-	${GROUP_CMD} add popa3d; \
-fi
-if `${USER_CMD} info -e popa3d` ; then \
-	${ECHO} User \'popa3d\' already exists.; \
-else \
-	${USER_CMD} add -g popa3d -d /nonexistent -s /sbin/nologin \
-		popa3d; \
-fi
+case "${STAGE}" in
+POST-INSTALL)
+	${CHOWN} ${PKG_USER}:${PKG_GROUP} ${PKG_PREFIX}/libexec/popa3d
+	;;
+esac
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index fa1b9645e0a..17ad1185ef4 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/09/22 11:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/11/25 23:55:35 zuntum Exp $
 #
 
 DISTNAME=	popa3d-0.4.9.4
@@ -12,14 +12,13 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.openwall.com/popa3d/
 COMMENT=	secure, reliable, performant, and small pop3 server
 
-.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_GROUP=	popa3d
+PKG_USER=	popa3d
+PKG_USER_HOME=	/nonexistent
+PKG_USER_SHELL=	/sbin/nologin
+
+INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 
 post-patch:
 	cd ${WRKSRC} && \
@@ -28,22 +27,17 @@ post-patch:
 		${MV} params.h.new params.h
 
 do-install:
-	@if `${GROUP_CMD} info -e popa3d`; then \
-		${ECHO} Group \'popa3d\' already exists.; \
-	else \
-		${GROUP_CMD} add popa3d; \
-	fi
-	@if `${USER_CMD} info -e popa3d`; then \
-		${ECHO} User \'popa3d\' already exists.; \
-	else \
-		${USER_CMD} add -g popa3d -d /nonexistent -s /sbin/nologin \
-			popa3d; \
-	fi
-	${INSTALL_PROGRAM} -o popa3d -g popa3d -m 700 ${WRKSRC}/popa3d \
-		${PREFIX}/libexec
+	${INSTALL_PROGRAM} -m 700 ${WRKSRC}/popa3d ${PREFIX}/libexec
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/popa3d
 	cd ${WRKSRC} && ${INSTALL_DATA} DESIGN INSTALL LICENSE \
 		${PREFIX}/share/doc/popa3d
 	${INSTALL_DATA_DIR} ${PREFIX}/share/empty
 
+pre-install:
+	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"