[pkgsrc/trunk]: pkgsrc/mail/milter-greylist Add two new options "postfix-milt...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/957f689800fc
branches:  trunk
changeset: 555759:957f689800fc
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Mar 08 15:54:26 2009 +0000

description:
Add two new options "postfix-milter" and "sendmail-milter". One of the
two must be used to determine whether this package is built for use
with Sendmail (the default) or Postfix. Use an appropriate user (either
"smmsp" or "postfix") in the two cases. This avoid permission problems
between Postfix and milter-greylist.

Bump package revision because of these changes.

diffstat:

 mail/milter-greylist/Makefile                 |  24 +++++++++---------
 mail/milter-greylist/files/milter-greylist.sh |   4 +-
 mail/milter-greylist/options.mk               |  34 +++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 16 deletions(-)

diffs (117 lines):

diff -r 420dd371e305 -r 957f689800fc mail/milter-greylist/Makefile
--- a/mail/milter-greylist/Makefile     Sun Mar 08 15:29:44 2009 +0000
+++ b/mail/milter-greylist/Makefile     Sun Mar 08 15:54:26 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2009/01/19 06:16:38 obache Exp $
+# $NetBSD: Makefile,v 1.40 2009/03/08 15:54:26 tron Exp $
 
 DISTNAME=      milter-greylist-4.0.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.espci.fr/pub/milter-greylist/
 EXTRACT_SUFX=  .tgz
@@ -16,22 +16,22 @@
 MAKE_JOBS_SAFE=                no
 
 GNU_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --with-user=smmsp
-
 BUILD_TARGET=          milter-greylist
 
-PKG_GROUPS=            smmsp
-PKG_USERS=             smmsp:smmsp
-PKG_GECOS.smmsp=       Sendmail Message Submission Program
-
-RCD_SCRIPTS=   milter-greylist
+RCD_SCRIPTS=           milter-greylist
 
 .include "options.mk"
 
+CONFIGURE_ARGS+=       --with-user=${MILTER_USER}
+BUILD_DEFS+=           MILTER_USER
+FILES_SUBST+=          MILTER_USER=${MILTER_USER:Q}
+
+INSTALLATION_DIRS+=    share/doc/milter-greylist
+INSTALLATION_DIRS+=    share/examples/milter-greylist
+
 post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/milter-greylist
-       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/milter-greylist
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/milter-greylist
+       ${INSTALL_DATA} ${WRKSRC}/README \
+         ${DESTDIR}${PREFIX}/share/doc/milter-greylist
        ${INSTALL_DATA} ${WRKSRC}/greylist.conf \
          ${DESTDIR}${PREFIX}/share/examples/milter-greylist
 
diff -r 420dd371e305 -r 957f689800fc mail/milter-greylist/files/milter-greylist.sh
--- a/mail/milter-greylist/files/milter-greylist.sh     Sun Mar 08 15:29:44 2009 +0000
+++ b/mail/milter-greylist/files/milter-greylist.sh     Sun Mar 08 15:54:26 2009 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: milter-greylist.sh,v 1.3 2006/02/11 23:14:15 seb Exp $
+# $NetBSD: milter-greylist.sh,v 1.4 2009/03/08 15:54:26 tron Exp $
 #
 
 # PROVIDE: milter-greylist
@@ -10,7 +10,7 @@
 name="miltergreylist"
 rcvar="miltergreylist"
 command="@PREFIX@/bin/milter-greylist"
-command_args="-p /var/milter-greylist/milter-greylist.sock -u smmsp"
+command_args="-p /var/milter-greylist/milter-greylist.sock -u @MILTER_USER@"
 
 if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
        . /etc/rc.subr
diff -r 420dd371e305 -r 957f689800fc mail/milter-greylist/options.mk
--- a/mail/milter-greylist/options.mk   Sun Mar 08 15:29:44 2009 +0000
+++ b/mail/milter-greylist/options.mk   Sun Mar 08 15:54:26 2009 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2008/10/27 19:40:11 tron Exp $
+# $NetBSD: options.mk,v 1.6 2009/03/08 15:54:26 tron Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.milter-greylist
+PKG_OPTIONS_REQUIRED_GROUPS=   mta
+PKG_OPTIONS_GROUP.mta=         postfix-milter sendmail-milter
 PKG_SUPPORTED_OPTIONS=         dnsrbl drac spf
-PKG_SUGGESTED_OPTIONS=         dnsrbl spf
+PKG_SUGGESTED_OPTIONS=         dnsrbl sendmail-milter spf
 
 .include "../../mk/bsd.options.mk"
 
@@ -25,6 +27,34 @@
 .endif
 
 ###
+### Postfix support
+###
+.if !empty(PKG_OPTIONS:Mpostfix-milter)
+CONFIGURE_ARGS+=       --enable-postfix
+
+POSTFIX_QUEUE_DIR?=    ${VARBASE}/spool/postfix
+BUILD_DEFS+=           VARBASE
+
+PKG_GROUPS?=           postfix
+PKG_USERS?=            postfix:postfix
+PKG_GECOS.postfix=     Postfix User
+PKG_HOME.postfix=      ${POSTFIX_QUEUE_DIR}
+
+MILTER_USER=           postfix
+.endif
+
+###
+### Sendmail support
+###
+.if !empty(PKG_OPTIONS:Msendmail-milter)
+PKG_GROUPS=            smmsp
+PKG_USERS=             smmsp:smmsp
+PKG_GECOS.smmsp=       Sendmail Message Submission Program
+
+MILTER_USER=           smmsp
+.endif
+
+###
 ### Sender Policy Framework
 ###
 .if empty(PKG_OPTIONS:Mspf)