diff options
-rw-r--r-- | mail/spamassassin/Makefile | 17 | ||||
-rw-r--r-- | mail/spamassassin/distinfo | 6 |
2 files changed, 14 insertions, 9 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 1ceb573b4cb..58d2547f9e4 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.46 2004/06/06 04:29:17 schmonz Exp $ +# $NetBSD: Makefile,v 1.47 2004/08/10 20:40:01 heinz Exp $ DISTNAME= Mail-SpamAssassin-${SPAMASSASSIN_VERSION} PKGNAME= spamassassin-${SPAMASSASSIN_VERSION} -PKGREVISION= 2 +PKGREVISION= # SVR4_PKGNAME= sa CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} \ - http://www.spamassassin.org/released/ \ - http://eu.spamassassin.org/released/ + http://old.spamassassin.org/released/ MAINTAINER= heinz@NetBSD.org HOMEPAGE= http://www.spamassassin.org/ @@ -15,7 +14,7 @@ COMMENT= Mail filter to identify spam CONFLICTS= p5-Mail-SpamAssassin-[1-9]* -SPAMASSASSIN_VERSION= 2.63 +SPAMASSASSIN_VERSION= 2.64 PKG_INSTALLATION_TYPES= overwrite pkgviews @@ -85,9 +84,11 @@ RCD_SCRIPTS= spamd RCD_SCRIPT_SRC.spamd= ${WRKSRC}/spamd/netbsd-rc-script.sh EGDIR= ${PREFIX}/share/examples/spamassassin +EG_SUBDIR= ${EGDIR:S,^${PREFIX}/,,} DOCDIR= ${PREFIX}/share/doc/spamassassin DOC_SUBDIR= ${DOCDIR:S,^${PREFIX}/,,} HTMLDIR= ${PREFIX}/share/doc/html/spamassassin +HTML_SUBDIR= ${HTMLDIR:S,^${PREFIX}/,,} RULESDIR= ${PREFIX}/share/spamassassin RULE_SUBDIR= ${RULESDIR:S,^${PREFIX}/,,} @@ -98,7 +99,8 @@ SUPPORT_FILES_PERMS+= ${EGDIR}/netbsd_lists.cf \ ${PKG_SYSCONFDIR}/netbsd_lists.cf ${SHAREOWN} \ ${SHAREGRP} ${SHAREMODE} -OWN_DIRS+= ${EGDIR} ${DOCDIR} ${DOCDIR}/spamd ${HTMLDIR} +INSTALLATION_DIRS+= ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/spamd \ + ${HTML_SUBDIR} DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL @@ -202,6 +204,9 @@ post-install: @${CHOWN} ${SHAREOWN} ${RULESDIR}/* @${CHGRP} ${SHAREGRP} ${RULESDIR}/* @${CHMOD} a=r ${RULESDIR}/* + @{ for d in ${INSTALLATION_DIRS}; do \ + ${ECHO} "@dirrm $$d"; \ + done; } | ${SORT} -r >> ${PLIST_ADD}; .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index 84252b4be72..d307234a7be 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.22 2004/05/31 12:43:06 heinz Exp $ +$NetBSD: distinfo,v 1.23 2004/08/10 20:40:01 heinz Exp $ -SHA1 (Mail-SpamAssassin-2.63.tar.gz) = 6bab68dfd6a5238fc84360ce08249657bed4bab3 -Size (Mail-SpamAssassin-2.63.tar.gz) = 828596 bytes +SHA1 (Mail-SpamAssassin-2.64.tar.gz) = 7d5776a7c462c849bc48f12a48ed82dc929ac06f +Size (Mail-SpamAssassin-2.64.tar.gz) = 826989 bytes SHA1 (patch-ab) = 655f860a71fd6a1b7adb2cb5194fc9563ead9529 SHA1 (patch-ae) = 681f777fb9967d61b9886e10046258657f4f492a SHA1 (patch-ak) = 815602ef71c8e01e4cfc2b51a7ac3f2676bc0ecc |