summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authortron <tron>2009-09-22 14:02:56 +0000
committertron <tron>2009-09-22 14:02:56 +0000
commitb69f52ca959a6a68ed60ac394903831e26362f40 (patch)
tree461091ea5bec422309029b06cf212125dd4c9a08 /mail
parentb045bc43724b13cb913700263d596bc7a3b621a7 (diff)
downloadpkgsrc-b69f52ca959a6a68ed60ac394903831e26362f40.tar.gz
Fix user destination directory build if the database directory
doesn't exist yet. Based on a patch supplied by Petar Bogdanovi in private e-mail.
Diffstat (limited to 'mail')
-rw-r--r--mail/milter-greylist/Makefile6
-rw-r--r--mail/milter-greylist/distinfo4
-rw-r--r--mail/milter-greylist/files/milter-greylist.sh4
-rw-r--r--mail/milter-greylist/options.mk4
-rw-r--r--mail/milter-greylist/patches/patch-aa4
5 files changed, 14 insertions, 8 deletions
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index c8285d0ffe0..f633f990a53 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2009/09/01 22:03:30 tron Exp $
+# $NetBSD: Makefile,v 1.46 2009/09/22 14:02:56 tron Exp $
DISTNAME= milter-greylist-4.2.3
CATEGORIES= mail
@@ -24,11 +24,15 @@ RCD_SCRIPTS= milter-greylist
CONFIGURE_ARGS+= --with-user=${MILTER_USER}
BUILD_DEFS+= MILTER_USER
+BUILD_DEFS+= MILTER_GROUP
FILES_SUBST+= MILTER_USER=${MILTER_USER:Q}
+FILES_SUBST+= MILTER_GROUP=${MILTER_GROUP:Q}
INSTALLATION_DIRS+= share/doc/milter-greylist
INSTALLATION_DIRS+= share/examples/milter-greylist
+OWN_DIRS_PERMS+= ${VARBASE}/milter-greylist ${MILTER_USER} ${MILTER_GROUP} 0755
+
post-install:
${INSTALL_DATA} ${WRKSRC}/README \
${DESTDIR}${PREFIX}/share/doc/milter-greylist
diff --git a/mail/milter-greylist/distinfo b/mail/milter-greylist/distinfo
index df319d8390b..d104e5b814c 100644
--- a/mail/milter-greylist/distinfo
+++ b/mail/milter-greylist/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2009/09/01 22:03:30 tron Exp $
+$NetBSD: distinfo,v 1.26 2009/09/22 14:02:56 tron Exp $
SHA1 (milter-greylist-4.2.3.tgz) = 195270c4ea01331d3ffb18af7466828d2d52eba3
RMD160 (milter-greylist-4.2.3.tgz) = 2cbf0022ade79ab89475e798e010ecb64c370af9
Size (milter-greylist-4.2.3.tgz) = 210106 bytes
-SHA1 (patch-aa) = b90849d16aa541ee70df67bb25dd53ce3df63e70
+SHA1 (patch-aa) = f884ba7efce512f51b6e5593255c4f7fdd468333
diff --git a/mail/milter-greylist/files/milter-greylist.sh b/mail/milter-greylist/files/milter-greylist.sh
index c5ed93e8065..d9c5702561b 100644
--- a/mail/milter-greylist/files/milter-greylist.sh
+++ b/mail/milter-greylist/files/milter-greylist.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: milter-greylist.sh,v 1.4 2009/03/08 15:54:26 tron Exp $
+# $NetBSD: milter-greylist.sh,v 1.5 2009/09/22 14:02:56 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 @MILTER_USER@"
+command_args="-p /var/milter-greylist/milter-greylist.sock -u @MTG_USER@"
if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
. /etc/rc.subr
diff --git a/mail/milter-greylist/options.mk b/mail/milter-greylist/options.mk
index 46e210dbafc..b5131ba9782 100644
--- a/mail/milter-greylist/options.mk
+++ b/mail/milter-greylist/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2009/03/16 10:15:23 tron Exp $
+# $NetBSD: options.mk,v 1.8 2009/09/22 14:02:56 tron Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.milter-greylist
PKG_OPTIONS_REQUIRED_GROUPS= mta
@@ -66,6 +66,7 @@ PKG_GECOS.postfix= Postfix User
PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR}
MILTER_USER= postfix
+MILTER_GROUP= postfix
.endif
###
@@ -77,6 +78,7 @@ PKG_USERS= smmsp:smmsp
PKG_GECOS.smmsp= Sendmail Message Submission Program
MILTER_USER= smmsp
+MILTER_GROUP= smmsp
.endif
###
diff --git a/mail/milter-greylist/patches/patch-aa b/mail/milter-greylist/patches/patch-aa
index b276018154a..c76b93041b6 100644
--- a/mail/milter-greylist/patches/patch-aa
+++ b/mail/milter-greylist/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2009/03/16 10:15:23 tron Exp $
+$NetBSD: patch-aa,v 1.3 2009/09/22 14:02:56 tron Exp $
--- Makefile.in.orig 2008-09-27 00:35:44.000000000 +0100
+++ Makefile.in 2009-03-15 20:41:49.000000000 +0000
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2009/03/16 10:15:23 tron Exp $
) || ${TRUE}
-install: install-daemon-to-bin install-man install-conf install-db
-+install: install-daemon-to-bin install-man install-db
++install: install-daemon-to-bin install-man
depend:
${MKDEP} ${CPPFLAGS} ${CFLAGS} ${SRC}