Use bsd.pkg.install.mk infrastructure to create the `gnats' user and

some directories. In the process kill PLIST @exec -except for those related
to install-info.
While here substitute some leftover `/usr/pkg' in MESSAGE.

XXX Marking this package as USE_BUILDLINK2 will make my life easier
for forthcoming changes but as it is not really necessary for the build
it self I guess it is not a good option?

5 files changed, 18 insertions, 128 deletions

diff --git a/databases/gnats/DEINSTALL b/databases/gnats/DEINSTALL
deleted file mode 100644
index 322e9ccf4de..00000000000
--- a/databases/gnats/DEINSTALL
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:11:41 zuntum Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-PREFIX="@PREFIX@"
-USER="@USER@"
-GROUP="@GROUP@"
-CAT="@CAT@"
-RMDIR="@RMDIR@"
-
-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
-EOF
-
-	${RMDIR} ${PREFIX}/share/gnats/gnats-db 2> /dev/null
-	if [ -e ${PREFIX}/share/gnats/gnats-db ]; then
-		${CAT} << EOF
-
-  * the databases in ${PREFIX}/share/gnats/gnats-db/
-EOF
-	fi
-
-	${RMDIR} ${PREFIX}/share/gnats 2> /dev/null
-	${CAT} << EOF
-===========================================================================
-EOF
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/databases/gnats/INSTALL b/databases/gnats/INSTALL
deleted file mode 100644
index 23145633ddc..00000000000
--- a/databases/gnats/INSTALL
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/11/01 00:11:41 zuntum Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-USER="@USER@"
-GROUP="@GROUP@"
-
-PREFIX="@PREFIX@"
-ADDUSER="@ADDUSER@"
-ADDGROUP="@ADDGROUP@"
-ID="@ID@"
-MKDIR="@MKDIR@"
-
-case ${STAGE} in
-PRE-INSTALL)
-	${ID} ${USER} >/dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		echo "User '${USER}' already exists...proceeding."
-	else
-		echo "Creating '${USER}' user..."
-		${MKDIR} ${PREFIX}/share/gnats/gnats-db
-		${ADDUSER} -c "GNATS database owner" -g ${GROUP} -s /bin/sh \
-			-d ${PREFIX}/share/gnats/gnats-db ${USER}
-		echo "Done."
-	fi
-	;;
-
-POST-INSTALL)
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/databases/gnats/MESSAGE b/databases/gnats/MESSAGE
index 05c8f49e473..d69030fd5de 100644
--- a/databases/gnats/MESSAGE
+++ b/databases/gnats/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/05/06 17:40:43 jmmv Exp $
+$NetBSD: MESSAGE,v 1.5 2003/05/30 22:14:29 seb Exp $
 
 See http://sourceware.cygnus.com/gnats/ for the official web page
 and don't forget to run ${PREFIX}/libexec/gnats/mkcat as gnats.
@@ -12,7 +12,7 @@ Add something like this into the crontab to process incoming bug reports:
 
 To accept PRs by mail you'll need some new mail aliases too, e.g.
 	gnats-admin:    postmaster
-	bugs:           "| /usr/pkg/libexec/gnats/queue-pr -q"
-	query-pr:       "| /usr/pkg/libexec/gnats/mail-query"
+	bugs:           "| ${PREFIX}/libexec/gnats/queue-pr -q"
+	query-pr:       "| ${PREFIX}/libexec/gnats/mail-query"
 
 ===========================================================================
diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index e4f4f8cc876..1b2fb5a6184 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/05 14:39:41 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/30 22:14:29 seb Exp $
 
 DISTNAME=	gnats-3.113.1
 CATEGORIES=	devel
@@ -12,36 +12,24 @@ COMMENT=	Cygnus GNATS bug tracking system
 
 BUILD_DEPENDS+=	m4-*:../../devel/m4
 
-.if exists(/usr/sbin/useradd)
-ADDUSER=	/usr/sbin/useradd
-ADDGROUP=	/usr/sbin/groupadd
-.else
-DEPENDS+=	user>=20000313:../../sysutils/user
-ADDUSER=	${LOCALBASE}/sbin/useradd
-ADDGROUP=	${LOCALBASE}/sbin/groupadd
-.endif
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/share/emacs/site-lisp \
-		--with-full-gnats \
-		--with-release-based
+USE_PKGINSTALL=	YES
+GNU_CONFIGURE=	YES
 USE_GMAKE=	yes
 USE_BISON=	yes
 TEXINFO_OVERRIDE=	YES
 
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
+CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/share/emacs/site-lisp \
+		--with-full-gnats \
+		--with-release-based
 
-INSTALL_SUBST+=		PREFIX="${PREFIX}"
-INSTALL_SUBST+=		USER="gnats"
-INSTALL_SUBST+=		GROUP="daemon"
-INSTALL_SUBST+=		ADDUSER="${ADDUSER:Q}"
-INSTALL_SUBST+=		ADDGROUP="${ADDGROUP:Q}"
-INSTALL_SUBST+=		ID="${ID:Q}"
-INSTALL_SUBST+=		CAT="${CAT:Q}"
-INSTALL_SUBST+=		MKDIR="${MKDIR:Q}"
-INSTALL_SUBST+=		RMDIR="${RMDIR:Q}"
-INSTALL_SUBST_SED=	${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+GNATS_HOME=	${PREFIX}/share/gnats/gnats-db
+PKG_USERS=	gnats:daemon::GNATS\\ database\\ owner:${GNATS_HOME}:/bin/sh
+MAKE_DIRS=		${PREFIX}/share/gnats
+OWN_DIRS_PERMS=		${GNATS_HOME} gnats daemon 755
+OWN_DIRS_PERMS+=	${GNATS_HOME}/gnats-queue gnats daemon 755
+OWN_DIRS_PERMS+=	${GNATS_HOME}/pending gnats daemon 755
+OWN_DIRS_PERMS+=	${GNATS_HOME}/gnats-adm gnats daemon 755
+OWN_DIRS_PERMS+=	${GNATS_HOME}/gnats-adm/locks gnats daemon 755
 
 MESSAGE_SUBST+=		PREFIX="${PREFIX}"
 
@@ -57,11 +45,6 @@ post-build:
 	(cd ${WRKSRC}/gnats;   ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info)
 	(cd ${WRKSRC}/send-pr; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info)
 
-pre-install:
-	${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	(cd ${WRKSRC}/gnats;   ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info)
 	(cd ${WRKSRC}/send-pr; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info)
diff --git a/databases/gnats/PLIST b/databases/gnats/PLIST
index c1bd6e96865..a27e01c86de 100644
--- a/databases/gnats/PLIST
+++ b/databases/gnats/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:06 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/30 22:14:29 seb Exp $
 bin/edit-pr
 bin/getclose
 bin/install-sid
@@ -73,12 +73,5 @@ share/gnats/gnats-db/gnats-adm/gnatsd.conf
 share/gnats/gnats-db/gnats-adm/responsible
 share/gnats/gnats-db/gnats-adm/states
 share/gnats/gnats-db/gnats-adm/submitters
-@exec ${MKDIR} %D/share/gnats/gnats-db/gnats-queue
-@exec ${MKDIR} %D/share/gnats/gnats-db/pending
-@exec ${CHOWN} gnats %D/share/gnats/gnats-db %D/share/gnats/gnats-db/gnats-adm %D/share/gnats/gnats-db/gnats-adm/locks %D/share/gnats/gnats-db/pending %D/share/gnats/gnats-db/gnats-queue
 @dirrm libexec/gnats
-@dirrm share/gnats/gnats-db/gnats-adm/locks
-@dirrm share/gnats/gnats-db/gnats-adm
-@dirrm share/gnats/gnats-db/gnats-queue
-@dirrm share/gnats/gnats-db/pending
 @dirrm share/gnats/dist