[pkgsrc/trunk]: pkgsrc/mail/qmail Set USERGROUP_PHASE=configure, causing qmai...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b61556d2fee
branches:  trunk
changeset: 512036:5b61556d2fee
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sat Apr 29 04:53:17 2006 +0000

description:
Set USERGROUP_PHASE=configure, causing qmail's users and groups to
be created just before its "configure" phase, obviating the need
for the hackish dependency on a qmail-users package. Since the new
functionality in bsd.pkginstall.mk also records and enforces numeric
UIDs and GIDs in binary packages, remove the note on that matter
from MESSAGE.

Bump PKGREVISION.

diffstat:

 mail/qmail/DEINSTALL |  10 +---------
 mail/qmail/MESSAGE   |   7 +------
 mail/qmail/Makefile  |  17 +++++++++++++----
 3 files changed, 15 insertions(+), 19 deletions(-)

diffs (92 lines):

diff -r 3e2ae641bc8d -r 5b61556d2fee mail/qmail/DEINSTALL
--- a/mail/qmail/DEINSTALL      Sat Apr 29 04:36:13 2006 +0000
+++ b/mail/qmail/DEINSTALL      Sat Apr 29 04:53:17 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.4 2004/07/21 22:35:59 schmonz Exp $
+# $NetBSD: DEINSTALL,v 1.5 2006/04/29 04:53:17 schmonz Exp $
 
 QMAILDIR=@QMAILDIR@
 
@@ -13,13 +13,5 @@
                        ${RM} -f ${QMAILDIR}/$dir
                fi
        done
-
-       ${CAT} <<EOF
-===========================================================================
-
-You may remove the qmail-users package now, as it is no longer needed.
-
-===========================================================================
-EOF
        ;;
 esac
diff -r 3e2ae641bc8d -r 5b61556d2fee mail/qmail/MESSAGE
--- a/mail/qmail/MESSAGE        Sat Apr 29 04:36:13 2006 +0000
+++ b/mail/qmail/MESSAGE        Sat Apr 29 04:53:17 2006 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.12 2006/01/09 17:49:47 schmonz Exp $
+$NetBSD: MESSAGE,v 1.13 2006/04/29 04:53:17 schmonz Exp $
 
 Please read ${DOCDIR}/README.pkgsrc.
 
@@ -11,9 +11,4 @@
 Alternatively, you can let pkgsrc do the work by installing the
 qmail-run package.
 
-NB: qmail hard-codes numeric UIDs and GIDs into several binaries.
-When installing a binary package, you'll need to ensure that the
-qmail users and groups on your system match those with which the
-package was compiled.
-
 ===========================================================================
diff -r 3e2ae641bc8d -r 5b61556d2fee mail/qmail/Makefile
--- a/mail/qmail/Makefile       Sat Apr 29 04:36:13 2006 +0000
+++ b/mail/qmail/Makefile       Sat Apr 29 04:53:17 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/29 04:53:17 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.05
 PKGNAME=               qmail-1.03
-PKGREVISION=           10
+PKGREVISION=           11
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 
@@ -13,7 +13,6 @@
 
 DEPENDS+=              checkpassword-[0-9]*:../../sysutils/checkpassword
 DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
-DEPENDS+=              qmail-users>=1.0:../../mail/qmail-users
 DEPENDS+=              ucspi-tcp-[0-9]*:../../net/ucspi-tcp
 
 CONFLICTS+=            courier-maildirmake-[0-9]*
@@ -27,7 +26,7 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 USE_TOOLS+=            expr nroff
 
-DJB_BUILD_TARGETS=     man
+DJB_BUILD_TARGETS=     man
 
 DJB_RESTRICTED=                YES
 
@@ -88,6 +87,16 @@
 SUBST_SED.paths+=      -e 's,@GREP@,${GREP},g'
 SUBST_STAGE.paths=     post-patch
 
+USERGROUP_PHASE=       configure
+PKG_GROUPS=            qmail nofiles
+PKG_USERS+=            alias:nofiles
+PKG_USERS+=            qmaill:nofiles qmaild:nofiles qmailp:nofiles
+PKG_USERS+=            qmailq:qmail qmailr:qmail qmails:qmail
+.for user in ${PKG_USERS:C/\:.*//}
+PKG_HOME.${user}=      ${QMAILDIR}
+.endfor
+PKG_HOME.alias=                ${QMAILDIR}/alias
+
 # extract the qmail tarball that was inside the netqmail distfile
 post-extract:
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \