diff options
Diffstat (limited to 'mail')
-rw-r--r-- | mail/qgreylist/Makefile | 19 | ||||
-rw-r--r-- | mail/qgreylist/PLIST | 3 | ||||
-rw-r--r-- | mail/qgreylist/distinfo | 10 | ||||
-rw-r--r-- | mail/qgreylist/patches/patch-aa | 8 |
4 files changed, 18 insertions, 22 deletions
diff --git a/mail/qgreylist/Makefile b/mail/qgreylist/Makefile index f67236c87fa..e1007779209 100644 --- a/mail/qgreylist/Makefile +++ b/mail/qgreylist/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/09/28 20:52:24 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2005/10/13 17:01:46 schmonz Exp $ # -DISTNAME= qgreylist-0.2 +DISTNAME= qgreylist-0.3 CATEGORIES= mail MASTER_SITES= ${HOMEPAGE} @@ -17,10 +17,10 @@ WRKSRC= ${WRKDIR}/qgreylist USE_TOOLS+= perl:run USE_PKGINSTALL= yes OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/greylist qmaild wheel 0755 +OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/whitelist qmaild wheel 0755 NO_BUILD= yes -QGREYLIST_SCRIPTS= greylist greylist-info -REPLACE_PERL= ${QGREYLIST_SCRIPTS} +REPLACE_PERL= greylist .include "../../mk/bsd.prefs.mk" @@ -30,25 +30,22 @@ REPLACE_PERL= ${QGREYLIST_SCRIPTS} INSTALLED_QMAIL!= ${PKG_BEST_EXISTS} ${DEPENDS_QMAIL:C/:.*$//:Q:S/\ / /g} . if empty(INSTALLED_QMAIL:M*_not_found_) . if !defined(PKG_SYSCONFDIR.qgreylist) -PKG_SYSCONFDIR.qgreylist!= \ - ${PKG_INFO} -qB ${INSTALLED_QMAIL} | \ - ${SED} -n '/^PKG_SYSCONFDIR=/s|^PKG_SYSCONFDIR=[ ]*||p' +PKG_SYSCONFDIR.qgreylist!= ${PKG_INFO} -Q PKG_SYSCONFDIR ${INSTALLED_QMAIL} . endif . endif .endif SUBST_CLASSES+= qmaildirs SUBST_STAGE.qmaildirs= do-configure -SUBST_FILES.qmaildirs= ${QGREYLIST_SCRIPTS} +SUBST_FILES.qmaildirs= greylist SUBST_SED.qmaildirs= -e 's|/var/qmail/greylist|${PKG_SYSCONFDIR}/greylist|g' +SUBST_SED.qmaildirs+= -e 's|/var/qmail/whitelist|${PKG_SYSCONFDIR}/whitelist|g' SUBST_SED.qmaildirs+= -e 's|/var/qmail|${QMAILDIR}|g' INSTALLATION_DIRS= bin share/doc/qgreylist do-install: - for i in ${QGREYLIST_SCRIPTS}; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/$${i} ${PREFIX}/bin/q$${i}; \ - done + ${INSTALL_SCRIPT} ${WRKSRC}/greylist ${PREFIX}/bin/qgreylist ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qgreylist .include "../../mk/bsd.pkg.mk" diff --git a/mail/qgreylist/PLIST b/mail/qgreylist/PLIST index 3eecea439eb..a574f9001d3 100644 --- a/mail/qgreylist/PLIST +++ b/mail/qgreylist/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/29 15:32:12 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/10/13 17:01:46 schmonz Exp $ bin/qgreylist -bin/qgreylist-info share/doc/qgreylist/README @dirrm share/doc/qgreylist diff --git a/mail/qgreylist/distinfo b/mail/qgreylist/distinfo index 98fe53afe9d..1807e27629c 100644 --- a/mail/qgreylist/distinfo +++ b/mail/qgreylist/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 09:59:28 agc Exp $ +$NetBSD: distinfo,v 1.3 2005/10/13 17:01:46 schmonz Exp $ -SHA1 (qgreylist-0.2.tar.gz) = f9cb178706a3aebe87cc632bdb18e388ddb5c61b -RMD160 (qgreylist-0.2.tar.gz) = 59194dab2477599ce98d7a5ae4f32ca7ebb6114f -Size (qgreylist-0.2.tar.gz) = 5397 bytes -SHA1 (patch-aa) = 6a9ba2369ae43f0df8b0afa9fff400148e4aa6d3 +SHA1 (qgreylist-0.3.tar.gz) = 9abaed7fd76f02a1090d1cf2eaad1e43dfa2f6d1 +RMD160 (qgreylist-0.3.tar.gz) = 8f85e1d19d7d9517f21c3b0f6fe0c38332e26fca +Size (qgreylist-0.3.tar.gz) = 5822 bytes +SHA1 (patch-aa) = afcee4cfd00481b71924ff2e0b96ad64522a8c3e diff --git a/mail/qgreylist/patches/patch-aa b/mail/qgreylist/patches/patch-aa index 953b2f542c6..5e42bd295a1 100644 --- a/mail/qgreylist/patches/patch-aa +++ b/mail/qgreylist/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/08/29 15:32:12 schmonz Exp $ +$NetBSD: patch-aa,v 1.2 2005/10/13 17:01:47 schmonz Exp $ ---- greylist.orig 2003-10-20 09:53:04.000000000 -0400 +--- greylist.orig 2005-01-17 08:38:07.000000000 -0500 +++ greylist -@@ -27,8 +27,9 @@ my $version = "0.2"; +@@ -27,8 +27,9 @@ my $version = "0.3"; # TODO: alternative logging options, instead of syslog? @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/08/29 15:32:12 schmonz Exp $ openlog "greylist", "pid", "mail"; -@@ -277,14 +278,14 @@ cleanup_maybe; +@@ -338,14 +339,14 @@ cleanup_maybe; # TODO: change to an immediate error here..? unless ( defined $ENV{TCPREMOTEIP} ) { |