diff options
author | joerg <joerg> | 2008-06-16 14:39:35 +0000 |
---|---|---|
committer | joerg <joerg> | 2008-06-16 14:39:35 +0000 |
commit | 55c965806a9c139545d10a5e8833079736f5dc43 (patch) | |
tree | 5af2094c444468a98b69f4580249e49d733dd493 | |
parent | bcae42b35b0792b87c883455ba3d0322daef174e (diff) | |
download | pkgsrc-55c965806a9c139545d10a5e8833079736f5dc43.tar.gz |
Welcome to the pkginstall user/group framework. Bump revision.
-rw-r--r-- | misc/jitterbug/DEINSTALL | 25 | ||||
-rw-r--r-- | misc/jitterbug/INSTALL | 53 | ||||
-rw-r--r-- | misc/jitterbug/Makefile | 24 | ||||
-rw-r--r-- | misc/jitterbug/PLIST | 3 |
4 files changed, 8 insertions, 97 deletions
diff --git a/misc/jitterbug/DEINSTALL b/misc/jitterbug/DEINSTALL deleted file mode 100644 index 90c0f8546a2..00000000000 --- a/misc/jitterbug/DEINSTALL +++ /dev/null @@ -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 --git a/misc/jitterbug/INSTALL b/misc/jitterbug/INSTALL deleted file mode 100644 index 440a6383d1d..00000000000 --- a/misc/jitterbug/INSTALL +++ /dev/null @@ -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 --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index 8fe0868380e..90c098651ff 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -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 @@ MAINTAINER= wennmach@NetBSD.org 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 @@ JB_FQHOSTNAME= ${JB_LONGNAME} .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 @@ do-install: ${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 --git a/misc/jitterbug/PLIST b/misc/jitterbug/PLIST index de9a9bd8b1f..532d39cec34 100644 --- a/misc/jitterbug/PLIST +++ b/misc/jitterbug/PLIST @@ -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 @@ etc/jitterbug/httpd.conf.add ${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 |