diff options
author | schmonz <schmonz> | 2006-04-29 04:53:17 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2006-04-29 04:53:17 +0000 |
commit | a0cdc108fbe73b3d010b0d2fdb0787c6f88ba24a (patch) | |
tree | b6292a3264c9027b66fb0e60828e64c264ec5f9b /mail/qmail | |
parent | 7bc56a9fe8e1e89347210111470807188b3984c7 (diff) | |
download | pkgsrc-a0cdc108fbe73b3d010b0d2fdb0787c6f88ba24a.tar.gz |
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 (limited to 'mail/qmail')
-rw-r--r-- | mail/qmail/DEINSTALL | 10 | ||||
-rw-r--r-- | mail/qmail/MESSAGE | 7 | ||||
-rw-r--r-- | mail/qmail/Makefile | 17 |
3 files changed, 15 insertions, 19 deletions
diff --git a/mail/qmail/DEINSTALL b/mail/qmail/DEINSTALL index 60ec34c9034..a83d7e244cb 100644 --- a/mail/qmail/DEINSTALL +++ b/mail/qmail/DEINSTALL @@ -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 @@ POST-DEINSTALL) ${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 --git a/mail/qmail/MESSAGE b/mail/qmail/MESSAGE index 21d646a103b..f037e799913 100644 --- a/mail/qmail/MESSAGE +++ b/mail/qmail/MESSAGE @@ -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 @@ choice is to follow the directions in Dave Sill's "Life with qmail": 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 --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 72726ec65e9..3dd34621f63 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -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 @@ COMMENT= Secure, reliable, efficient, simple, and fast MTA 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 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 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,@PKG_INFO@,${PKG_INFO},g' 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} \ |