aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2004-01-19 23:44:37 +0800
committermat <mat@FreeBSD.org>2004-01-19 23:44:37 +0800
commit3f2efb21007cfb6416becd2450c34b5b68f0d0ee (patch)
tree287eff12d5f6d73761308f7a594d958650b55877
parentd7b74ac641536c86e208ea2af031783c325b8017 (diff)
downloadfreebsd-ports-gnome-3f2efb21007cfb6416becd2450c34b5b68f0d0ee.tar.gz
freebsd-ports-gnome-3f2efb21007cfb6416becd2450c34b5b68f0d0ee.tar.zst
freebsd-ports-gnome-3f2efb21007cfb6416becd2450c34b5b68f0d0ee.zip
Update to 2.62
Have the least thing possible between bsd.port.pre.mk and post.mk
-rw-r--r--mail/p5-Mail-SpamAssassin/Makefile26
-rw-r--r--mail/p5-Mail-SpamAssassin/distinfo2
-rw-r--r--mail/p5-Mail-SpamAssassin/pkg-plist4
3 files changed, 15 insertions, 17 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index c29b8b31b311..55ccdaa0cca7 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= Mail-SpamAssassin
-PORTVERSION= 2.61
-PORTREVISION= 1
+PORTVERSION= 2.62
CATEGORIES= mail perl5
MASTER_SITES= http://spamassassin.org/released/ \
${MASTER_SITE_PERL_CPAN}
@@ -23,18 +22,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
RUN_DEPENDS= ${BUILD_DEPENDS} \
razor-client:${PORTSDIR}/mail/razor-agents
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
-BUILD_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
-.endif
-
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
-.endif
-
PERL_CONFIGURE= yes
CONFIGURE_ARGS+= SYSCONFDIR="${PREFIX}/etc" \
RUN_RAZOR_TESTS="no" RUN_RAZOR2_TESTS="no" \
@@ -88,4 +75,15 @@ post-install:
@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+BUILD_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+.endif
+
+.if ${PERL_LEVEL} < 500800
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+.endif
+
.include <bsd.port.post.mk>
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index d2dbdf197900..e491e6311127 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1 +1 @@
-MD5 (Mail-SpamAssassin-2.61.tar.gz) = 6521ad3e6ed5a2eba35476c43c1697b7
+MD5 (Mail-SpamAssassin-2.62.tar.gz) = e0cf85b038d85bb83083ee474763ed3c
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index f34298b09c02..44feac06e10c 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -52,7 +52,6 @@ etc/rc.d/spamd%%RC_SUFX%%
%%PORTDOCS%%%%DOCSDIR%%/sample-nonspam.txt
%%PORTDOCS%%%%DOCSDIR%%/sample-spam.txt
%%PORTDOCS%%%%DOCSDIR%%/spamassassin.sql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
share/spamassassin/10_misc.cf
share/spamassassin/20_anti_ratware.cf
share/spamassassin/20_body_tests.cf
@@ -82,10 +81,11 @@ share/spamassassin/60_whitelist.cf
share/spamassassin/languages
share/spamassassin/triplets.txt
share/spamassassin/user_prefs.template
+@dirrm share/spamassassin
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
@dirrm %%SITE_PERL%%/Mail/SpamAssassin
@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
@unexec rmdir %D/etc/mail/spamassassin 2>/dev/null || true
@unexec rmdir %D/etc/mail 2>/dev/null || true
-@dirrm share/spamassassin