[pkgsrc/trunk]: pkgsrc/misc/jitterbug Welcome to the pkginstall user/group fr...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f492669612e3
branches:  trunk
changeset: 543399:f492669612e3
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jun 16 14:39:35 2008 +0000

description:
Welcome to the pkginstall user/group framework. Bump revision.

diffstat:

 misc/jitterbug/DEINSTALL |  25 ----------------------
 misc/jitterbug/INSTALL   |  53 ------------------------------------------------
 misc/jitterbug/Makefile  |  24 ++++++---------------
 misc/jitterbug/PLIST     |   3 +-
 4 files changed, 8 insertions(+), 97 deletions(-)

diffs (158 lines):

diff -r c0f365ffa3b9 -r f492669612e3 misc/jitterbug/DEINSTALL
--- a/misc/jitterbug/DEINSTALL  Mon Jun 16 14:28:54 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:28:24 zuntum Exp $
-
-JB_USER=@JB_USER@
-JB_GROUP=@JB_GROUP@
-JB_PACKAGE=@JB_PACKAGE@
-
-PKG=$1
-STAGE=$2
-
-if [ "$STAGE" != "DEINSTALL" ];
-then
-       exit 0
-fi
-
-echo "If you are removing jitterbug permanently, you may wish to"
-echo "  - remove user ${JB_USER}"
-echo "  - remove group ${JB_GROUP}"
-echo "  - remove entries in your httpd.conf (usually ${PKG_PREFIX}/etc/httpd/httpd.conf)"
-echo "  - remove mail alias for ${JB_PACKAGE}-bugs in your mail aliases"
-echo "           (typically /etc/aliases or /etc/mail/aliases)"
-echo "           and run \`newaliases' (if you use sendmail)"
-
-exit 0
diff -r c0f365ffa3b9 -r f492669612e3 misc/jitterbug/INSTALL
--- a/misc/jitterbug/INSTALL    Mon Jun 16 14:28:54 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/11/01 01:28:24 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-JB_USER=@JB_USER@
-JB_USERID=@JB_USERID@
-JB_GROUP=@JB_GROUP@
-JB_GROUPID=@JB_GROUPID@
-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 ${JB_GROUP} exists before adding the user.
-#
-${TOUCH} "/tmp/grouptestjitterbug.$$"
-${CHGRP} ${JB_GROUP} "/tmp/grouptestjitterbug.$$" >/dev/null 2>&1
-if [ $? -eq 0 ]; then
-       echo "Group '${JB_GROUP}' already exists...proceeding."
-else
-       echo "Creating '${JB_GROUP}' group..."
-       if ! ${ADDGROUP} -g ${JB_GROUPID} ${JB_GROUP}
-       then
-               echo "Can't add group ${JB_GROUP} with gid ${JB_GROUPID}"
-               echo "Please do it manually and restart installation."
-               ${RM} -f "/tmp/grouptestjitterbug.$$"
-               exit 1
-       fi
-       echo "Done."
-fi
-${RM} -f "/tmp/grouptestjitterbug.$$"
-
-${ID} ${JB_USER} >/dev/null 2>&1
-if [ $? -eq 0 ]; then
-       echo "User '${JB_USER}' already exists...proceeding."
-else
-       echo "Creating '${JB_USER}' user..."
-       ${ADDUSER} -c "Jitterbug Administrator" -g ${JB_GROUP}          \
-                  -b ${PKG_PREFIX} -u ${JB_USERID} ${JB_USER}
-       echo "Done."
-fi
-
-exit 0
diff -r c0f365ffa3b9 -r f492669612e3 misc/jitterbug/Makefile
--- a/misc/jitterbug/Makefile   Mon Jun 16 14:28:54 2008 +0000
+++ b/misc/jitterbug/Makefile   Mon Jun 16 14:39:35 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/07/04 20:54:48 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2008/06/16 14:39:35 joerg Exp $
 
 DISTNAME=      jitterbug-1.6.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc
 MASTER_SITES=  ftp://jitterbug.samba.org/pub/jitterbug/
 
@@ -9,20 +9,7 @@
 HOMEPAGE=      http://jitterbug.samba.org/
 COMMENT=       Web-oriented bug-tracking tool
 
-BROKEN_IN=             pkgsrc-2006Q4
-
-.if exists(/usr/sbin/user)
-ADDUSER=               /usr/sbin/useradd
-ADDGROUP=              /usr/sbin/groupadd
-.else
-DEPENDS+=              user>=20000313:../../sysutils/user
-ADDUSER=               ${LOCALBASE}/sbin/useradd
-ADDGROUP=              ${LOCALBASE}/sbin/groupadd
-.endif
-
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}/source
-DEINSTALL_SRC= ${PKGDIR}/DEINSTALL
-INSTALL_SRC=   ${PKGDIR}/INSTALL
 CONFIGDIR=     ${WRKDIR}/${PKGNAME_NOREV}/config
 DOCSDIR=       ${WRKDIR}/${PKGNAME_NOREV}/docs
 CGIBINDIR=     libexec/cgi-bin
@@ -49,6 +36,11 @@
 .endif
 JB_EMAIL?=     ${JB_LOCALMAIL}@${JB_FQHOSTNAME}
 
+PKG_GROUPS=            ${JB_GROUP}
+PKG_GID.${JB_GROUP}=   ${JB_GROUPID}
+PKG_UID.${JB_USER}=    ${JB_USERID}
+PKG_USERS=             ${JB_USER}:${JB_GROUP}
+
 PKG_GROUPS_VARS+=      JB_GROUP
 PKG_USERS_VARS+=       JB_USER
 
@@ -207,8 +199,6 @@
                ${WRKDIR}/jitterbug.auth ${PREFIX}/${JB_USER}/etc
        ${INSTALL_DATA_DIR} ${PREFIX}/${JB_USER}/doc
        ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644                     \
-               ${MESSAGE} ${PREFIX}/${JB_USER}/doc/POSTINSTALL
-       ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644                     \
                ${WRKDIR}/NEWPACKAGE ${PREFIX}/${JB_USER}/doc
        ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644                     \
                ${DOCSDIR}/CONFIG.txt ${PREFIX}/${JB_USER}/doc
diff -r c0f365ffa3b9 -r f492669612e3 misc/jitterbug/PLIST
--- a/misc/jitterbug/PLIST      Mon Jun 16 14:28:54 2008 +0000
+++ b/misc/jitterbug/PLIST      Mon Jun 16 14:39:35 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/01/10 18:50:09 rillig Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/06/16 14:39:35 joerg Exp $
 ${JB_USER}/config/footer.html
 @exec if [ ! -d %D/${JB_DATADIR} ]; then ${MKDIR} %D/${JB_DATADIR}; fi
 @exec if [ ! -f %D/${JB_DATADIR}/footer.html ]; then /bin/cp -p %D/%F %D/${JB_DATADIR}/footer.html; fi
@@ -25,7 +25,6 @@
 ${JB_USER}/bin/new_message
 ${JB_USER}/bin/jitterbug
 @dirrm ${JB_USER}/bin
-${JB_USER}/doc/POSTINSTALL
 ${JB_USER}/doc/NEWPACKAGE
 ${JB_USER}/doc/CONFIG.txt
 ${JB_USER}/doc/INSTALL