aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MOVED2
-rw-r--r--japanese/Makefile2
-rw-r--r--japanese/spamassassin/Makefile (renamed from japanese/p5-Mail-SpamAssassin/Makefile)8
-rw-r--r--japanese/spamassassin/files/spamassassin-ja.patch (renamed from japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.patch)0
-rw-r--r--japanese/spamassassin/files/spamassassin-ja.plist (renamed from japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.plist)0
-rw-r--r--japanese/spamassassin/files/tokenizer.pre (renamed from japanese/p5-Mail-SpamAssassin/files/tokenizer.pre)0
-rw-r--r--japanese/spamassassin/pkg-message (renamed from japanese/p5-Mail-SpamAssassin/pkg-message)0
-rw-r--r--mail/Makefile2
-rw-r--r--mail/claws-mail-spamassassin/Makefile2
-rw-r--r--mail/evolution/Makefile2
-rw-r--r--mail/exim/Makefile2
-rw-r--r--mail/isbg/Makefile2
-rw-r--r--mail/mailscanner/Makefile2
-rw-r--r--mail/mimedefang/Makefile2
-rw-r--r--mail/openwebmail/Makefile2
-rw-r--r--mail/p5-FuzzyOcr-devel/Makefile2
-rw-r--r--mail/p5-FuzzyOcr/Makefile2
-rw-r--r--mail/p5-qpsmtpd/Makefile2
-rw-r--r--mail/sa-utils/Makefile2
-rw-r--r--mail/simscan/Makefile2
-rw-r--r--mail/spamass-ixhash/Makefile2
-rw-r--r--mail/spamass-milter/Makefile2
-rw-r--r--mail/spamass-rules/Makefile2
-rw-r--r--mail/spamassassin/Makefile (renamed from mail/p5-Mail-SpamAssassin/Makefile)8
-rw-r--r--mail/spamassassin/distinfo (renamed from mail/p5-Mail-SpamAssassin/distinfo)0
-rw-r--r--mail/spamassassin/files/patch-sa-learn.raw (renamed from mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw)0
-rw-r--r--mail/spamassassin/files/pkg-message.in (renamed from mail/p5-Mail-SpamAssassin/files/pkg-message.in)0
-rw-r--r--mail/spamassassin/files/sa-spamd.in (renamed from mail/p5-Mail-SpamAssassin/files/sa-spamd.in)0
-rw-r--r--mail/spamassassin/pkg-descr (renamed from mail/p5-Mail-SpamAssassin/pkg-descr)0
-rw-r--r--mail/spamassassin/pkg-plist (renamed from mail/p5-Mail-SpamAssassin/pkg-plist)0
-rw-r--r--mail/spampd/Makefile2
-rw-r--r--mail/vpopmail/Makefile4
-rw-r--r--security/amavisd-new/Makefile4
-rw-r--r--security/maia/Makefile2
-rw-r--r--sysutils/dtc/Makefile2
-rw-r--r--textproc/p5-Plagger/Makefile2
36 files changed, 35 insertions, 33 deletions
diff --git a/MOVED b/MOVED
index 10a45832740f..850410d445c9 100644
--- a/MOVED
+++ b/MOVED
@@ -5703,3 +5703,5 @@ security/amavis-stats||2014-03-10|Has expired: No more public distfiles
multimedia/smile||2014-03-10|Has expired: No more public distfiles
x11-fm/dfm||2014-03-10|Has expired: No more public distfiles
security/xyssl|security/polarssl|2014-03-10|Has expired: No more public distfiles
+japanese/p5-Mail-SpamAssassin|japanese/spamassassin|2014-03-10|Moved to japanese/spamassassin
+mail/p5-Mail-SpamAssassin|mail/spamassassin|2014-03-10|Moved to mail/spamassassin
diff --git a/japanese/Makefile b/japanese/Makefile
index 209982cb4c7b..2ad5d93ce30c 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -220,7 +220,6 @@
SUBDIR += p5-Lingua-JA-Numbers
SUBDIR += p5-Lingua-JA-Regular-Unicode
SUBDIR += p5-Lingua-JA-Summarize-Extract
- SUBDIR += p5-Mail-SpamAssassin
SUBDIR += p5-MeCab
SUBDIR += p5-Number-Phone-JP
SUBDIR += p5-PDFJ
@@ -293,6 +292,7 @@
SUBDIR += skkserv
SUBDIR += slimeforest
SUBDIR += slrn
+ SUBDIR += spamassassin
SUBDIR += srd-fpw
SUBDIR += srd-fpw-package
SUBDIR += suicavalue
diff --git a/japanese/p5-Mail-SpamAssassin/Makefile b/japanese/spamassassin/Makefile
index 5c00e75e17ea..cc026734b6e9 100644
--- a/japanese/p5-Mail-SpamAssassin/Makefile
+++ b/japanese/spamassassin/Makefile
@@ -1,20 +1,20 @@
# Created by: TAOKA Fumiyoshi
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese mail perl5
-PKGNAMEPREFIX= ja-p5-
+PKGNAMEPREFIX= ja-
MAINTAINER= masaki@club.kyutech.ac.jp
COMMENT= SpamAssassin with patches to handle multibyte character
LICENSE= APACHE20
-MASTERDIR= ${.CURDIR}/../../mail/p5-Mail-SpamAssassin
+MASTERDIR= ${.CURDIR}/../../mail/spamassassin
BUILD_DEPENDS= ja-p5-MeCab>=0.98:${PORTSDIR}/japanese/p5-MeCab
-CONFLICTS= p5-Mail-SpamAssassin-[0-9]*
+CONFLICTS= spamassassin-[0-9]*
EXTRA_PATCHES= ${.CURDIR}/files/spamassassin-ja.patch
diff --git a/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.patch b/japanese/spamassassin/files/spamassassin-ja.patch
index 3544abe3555d..3544abe3555d 100644
--- a/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.patch
+++ b/japanese/spamassassin/files/spamassassin-ja.patch
diff --git a/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.plist b/japanese/spamassassin/files/spamassassin-ja.plist
index 1292bbb2d733..1292bbb2d733 100644
--- a/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.plist
+++ b/japanese/spamassassin/files/spamassassin-ja.plist
diff --git a/japanese/p5-Mail-SpamAssassin/files/tokenizer.pre b/japanese/spamassassin/files/tokenizer.pre
index d21410bbadc9..d21410bbadc9 100644
--- a/japanese/p5-Mail-SpamAssassin/files/tokenizer.pre
+++ b/japanese/spamassassin/files/tokenizer.pre
diff --git a/japanese/p5-Mail-SpamAssassin/pkg-message b/japanese/spamassassin/pkg-message
index 49cea24cb5a8..49cea24cb5a8 100644
--- a/japanese/p5-Mail-SpamAssassin/pkg-message
+++ b/japanese/spamassassin/pkg-message
diff --git a/mail/Makefile b/mail/Makefile
index 3a283e3c93d5..f1dd81d426a9 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -415,7 +415,6 @@
SUBDIR += p5-Mail-SendEasy
SUBDIR += p5-Mail-Sender
SUBDIR += p5-Mail-Sendmail
- SUBDIR += p5-Mail-SpamAssassin
SUBDIR += p5-Mail-Spool
SUBDIR += p5-Mail-Tools
SUBDIR += p5-Mail-Transport-Dbx
@@ -648,6 +647,7 @@
SUBDIR += spamass-ixhash
SUBDIR += spamass-milter
SUBDIR += spamass-rules
+ SUBDIR += spamassassin
SUBDIR += spambnc
SUBDIR += spamcup
SUBDIR += spamd
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index 1146e52bf34c..431adec835a7 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -6,7 +6,7 @@ PORTREVISION= 0
COMMENT= SpamAssassin plugin for Claws Mail
-RUN_DEPENDS= spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS= spamd:${PORTSDIR}/mail/spamassassin
CLAWS_PLUGINS_BUILD= spamassassin
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index ad7a0812ea39..0f1811169044 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+=--with-openldap=no
.endif
.if ${PORT_OPTIONS:MSPAMASSASSIN}
-RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/spamassassin
.endif
.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9cfd9c711502..7ac2a4ac25a3 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -449,7 +449,7 @@ SEDLIST+= -e 's,XX_SRS_FLAGS_XX,,' \
.endif
.if ${PORT_OPTIONS:MSA_EXIM}
-RUN_DEPENDS+= ${LOCALBASE}/bin/spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS+= ${LOCALBASE}/bin/spamc:${PORTSDIR}/mail/spamassassin
PLIST_SUB+= SA_EXIM=""
.else
PLIST_SUB+= SA_EXIM="@comment "
diff --git a/mail/isbg/Makefile b/mail/isbg/Makefile
index 1fba3bb9a220..6e466325a497 100644
--- a/mail/isbg/Makefile
+++ b/mail/isbg/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= decke@FreeBSD.org
COMMENT= Scan an IMAP inbox for spam using SpamAssassin
-RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/spamassassin
DISTDATE= 20100303
NO_BUILD= yes
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index d43ebf4f8bca..6c44571eb639 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -65,7 +65,7 @@ OPTIONS_DEFAULT= SPAMASSASSIN CLAMAV
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSPAMASSASSIN}
-RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/spamassassin
PLIST_SUB+= SPAMASSASSIN=""
.else
PLIST_SUB+= SPAMASSASSIN="@comment "
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index e7b66c7f0110..ef96f29924e8 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS= \
p5-MIME-Tools>=5.417:${PORTSDIR}/mail/p5-MIME-Tools \
p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
- p5-Mail-SpamAssassin>=3.0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+ spamassassin>=3.0:${PORTSDIR}/mail/spamassassin
RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= CLAMAV EXAMPLES DOCS
diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile
index 64e0a7f64a86..27c3adef5d79 100644
--- a/mail/openwebmail/Makefile
+++ b/mail/openwebmail/Makefile
@@ -101,7 +101,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
.endif
.if ${PORT_OPTIONS:MSPAMCHECK}
-RUN_DEPENDS+= p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS+= spamassassin>=0:${PORTSDIR}/mail/spamassassin
.endif
.if ${PORT_OPTIONS:MSPEEDYCGI}
diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index 11eb7a9966d6..515eb5c2735a 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm \
gocr:${PORTSDIR}/graphics/gocr \
ocrad:${PORTSDIR}/graphics/ocrad \
gifasm:${PORTSDIR}/graphics/giflib \
- spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
+ spamassassin:${PORTSDIR}/mail/spamassassin \
p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM \
p5-MLDBM-Sync>=0:${PORTSDIR}/databases/p5-MLDBM-Sync \
p5-String-Approx>=0:${PORTSDIR}/devel/p5-String-Approx
diff --git a/mail/p5-FuzzyOcr/Makefile b/mail/p5-FuzzyOcr/Makefile
index 7e2b935558e4..db6199707e0a 100644
--- a/mail/p5-FuzzyOcr/Makefile
+++ b/mail/p5-FuzzyOcr/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm \
import:${PORTSDIR}/graphics/ImageMagick \
gocr:${PORTSDIR}/graphics/gocr \
gifasm:${PORTSDIR}/graphics/giflib \
- spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
+ spamassassin:${PORTSDIR}/mail/spamassassin \
p5-String-Approx>=0:${PORTSDIR}/devel/p5-String-Approx
CONFLICTS= p5-FuzzyOcr-devel-[0-9]*
diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index ccadf5c4886d..8dd4a36b4ada 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Flexible SMTP daemon written in Perl and featuring a plugin API
-BUILD_DEPENDS= spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
+BUILD_DEPENDS= spamd:${PORTSDIR}/mail/spamassassin \
p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp \
p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
diff --git a/mail/sa-utils/Makefile b/mail/sa-utils/Makefile
index eaad41ce2311..f69bedcc3aea 100644
--- a/mail/sa-utils/Makefile
+++ b/mail/sa-utils/Makefile
@@ -11,7 +11,7 @@ DISTFILES= # none
MAINTAINER= matthew@FreeBSD.org
COMMENT= SpamAssassin nightly periodic maintenance
-RUN_DEPENDS= sa-update:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS= sa-update:${PORTSDIR}/mail/spamassassin
OPTIONS_DEFINE= SACOMPILE
SACOMPILE_DESC= Enable sa-compile support
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index 3eaf9fce26ad..e44f8513ec8a 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -63,7 +63,7 @@ BUILD_DEPENDS+= ripmime:${PORTSDIR}/mail/ripmime
.endif
.if ${PORT_OPTIONS:MSPAMD}
-BUILD_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+BUILD_DEPENDS+= spamassassin:${PORTSDIR}/mail/spamassassin
CONFIGURE_ARGS+=--enable-spam=y
CONFIGURE_ARGS+=--enable-spamassassin-path=${LOCALBASE}/bin/spamassassin
.endif
diff --git a/mail/spamass-ixhash/Makefile b/mail/spamass-ixhash/Makefile
index e03b5ca272a1..3acfc4f1097e 100644
--- a/mail/spamass-ixhash/Makefile
+++ b/mail/spamass-ixhash/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= michael@ranner.eu
COMMENT= The iXhash plugin for SpamAssassin
-RUN_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
+RUN_DEPENDS= spamc:${PORTSDIR}/mail/spamassassin \
p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index 715cef3be05f..1240aa3bd6c3 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= spamass-milt
MAINTAINER= m.tsatsenko@gmail.com
COMMENT= Sendmail Milter (mail filter) plugin for SpamAssassin
-BUILD_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+BUILD_DEPENDS= spamc:${PORTSDIR}/mail/spamassassin
RUN_DEPENDS:= ${BUILD_DEPENDS}
LICENSE= GPLv2
diff --git a/mail/spamass-rules/Makefile b/mail/spamass-rules/Makefile
index 415eb83b44ae..35597a75c0f8 100644
--- a/mail/spamass-rules/Makefile
+++ b/mail/spamass-rules/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.ranner.eu/stuff/
MAINTAINER= michael@ranner.eu
COMMENT= Custom rulesets for SpamAssassin
-RUN_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS= spamc:${PORTSDIR}/mail/spamassassin
NO_OPTIONS_SORT= yes
OPTIONS_DEFINE= \
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/spamassassin/Makefile
index ae080d30be50..0a3aeab4b497 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,13 +1,13 @@
# Created by: Anthony Kim
# $FreeBSD$
-PORTNAME= Mail-SpamAssassin
+PORTNAME= spamassassin
PORTVERSION= 3.4.0
-PORTREVISION?= 2 # committer: please bump PORTREVISION on Slaves
+PORTREVISION?= 3 # also bump japanese/spamassassin
CATEGORIES?= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan
-PKGNAMEPREFIX?= p5-
+DISTNAME= Mail-SpamAssassin-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:apache,cpan
MAINTAINER?= adamw@FreeBSD.org
@@ -24,7 +24,7 @@ BUILD_DEPENDS= p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
RUN_DEPENDS= ${BUILD_DEPENDS} \
re2c>=.12.0:${PORTSDIR}/devel/re2c
-CONFLICTS?= ja-p5-Mail-SpamAssassin-[0-9]*
+CONFLICTS?= ja-spamassassin-[0-9]*
USES= perl5
USE_PERL5= configure
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/spamassassin/distinfo
index 5d280e9635bb..5d280e9635bb 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/spamassassin/distinfo
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw b/mail/spamassassin/files/patch-sa-learn.raw
index 635cc317adc9..635cc317adc9 100644
--- a/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
+++ b/mail/spamassassin/files/patch-sa-learn.raw
diff --git a/mail/p5-Mail-SpamAssassin/files/pkg-message.in b/mail/spamassassin/files/pkg-message.in
index 511f6688edf2..511f6688edf2 100644
--- a/mail/p5-Mail-SpamAssassin/files/pkg-message.in
+++ b/mail/spamassassin/files/pkg-message.in
diff --git a/mail/p5-Mail-SpamAssassin/files/sa-spamd.in b/mail/spamassassin/files/sa-spamd.in
index fb2301c3a1da..fb2301c3a1da 100644
--- a/mail/p5-Mail-SpamAssassin/files/sa-spamd.in
+++ b/mail/spamassassin/files/sa-spamd.in
diff --git a/mail/p5-Mail-SpamAssassin/pkg-descr b/mail/spamassassin/pkg-descr
index 0c4b2e0f6d1a..0c4b2e0f6d1a 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-descr
+++ b/mail/spamassassin/pkg-descr
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/spamassassin/pkg-plist
index 1113431d752b..1113431d752b 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/spamassassin/pkg-plist
diff --git a/mail/spampd/Makefile b/mail/spampd/Makefile
index db307ad87bd0..50b35f7b2be0 100644
--- a/mail/spampd/Makefile
+++ b/mail/spampd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.worlddesign.com/Content/rd/mta/spampd/
MAINTAINER= ports@FreeBSD.org
COMMENT= Spamassassin SMTP Proxy
-RUN_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
+RUN_DEPENDS= spamc:${PORTSDIR}/mail/spamassassin \
p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server
NO_BUILD= yes
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index e937944ce03e..faa78d8368e0 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -173,8 +173,8 @@ MAILDROP_BUILD_DEPENDS= maildrop:${PORTSDIR}/${MAILDROP_PORT}
SPAMASSASSIN_CONFIGURE_ON= --enable-spamassassin \
--enable-spamc-prog=${LOCALBASE}/bin/spamc \
--enable-spam-threshold=${SPAM_THRESHOLD}
-SPAMASSASSIN_BUILD_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
-SPAMASSASSIN_RUN_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+SPAMASSASSIN_BUILD_DEPENDS= spamc:${PORTSDIR}/mail/spamassassin
+SPAMASSASSIN_RUN_DEPENDS= spamc:${PORTSDIR}/mail/spamassassin
SPAMFOLDER_CONFIGURE_ON= --enable-spam-junkfolder
.include <bsd.port.options.mk>
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index f6d2b97e7b74..92b0b227d9f2 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -49,7 +49,7 @@ MYSQL_DESC= Use MySQL for lookups/logging/quarantine
PGSQL_DESC= Use PgSQL for lookups/logging/quarantine
LDAP_DESC= Use LDAP for lookups
SASL_DESC= Use SASL authentication
-SPAMASSASSIN_DESC= Use mail/p5-Mail-SpamAssassin
+SPAMASSASSIN_DESC= Use mail/spamassassin
P0F_DESC= Passive operating system fingerprinting
ALTERMIME_DESC= Use AlterMime for defanging/disclaimers
FILE_DESC= Use newer file(1) utility from ports
@@ -120,7 +120,7 @@ RUN_DEPENDS+= p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
.endif
.if ${PORT_OPTIONS:MSPAMASSASSIN}
-RUN_DEPENDS+= p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS+= spamassassin>=0:${PORTSDIR}/mail/spamassassin
.endif
.if ${PORT_OPTIONS:MP0F}
diff --git a/security/maia/Makefile b/security/maia/Makefile
index c870311ab30b..1b7f16769442 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -170,7 +170,7 @@ RUN_DEPENDS+= clamd:${PORTSDIR}/security/clamav
.endif
.if ${PORT_OPTIONS:MSPAMASSASSIN}
-RUN_DEPENDS+= p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS+= spamassassin>=0:${PORTSDIR}/mail/spamassassin
.endif
.if ${PORT_OPTIONS:MGRAPHICS}
diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile
index f3f0be91d5cf..b8279be6c040 100644
--- a/sysutils/dtc/Makefile
+++ b/sysutils/dtc/Makefile
@@ -98,7 +98,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/sasl2/libcrammd5.so:${PORTSDIR}/security/cyrus-sa
.endif
.if defined(WITH_SPAMASSASSIN)
-RUN_DEPENDS+= ${LOCALBASE}/bin/spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+RUN_DEPENDS+= ${LOCALBASE}/bin/spamd:${PORTSDIR}/mail/spamassassin
.endif
.if defined(WITH_CLAMAV)
diff --git a/textproc/p5-Plagger/Makefile b/textproc/p5-Plagger/Makefile
index 13abb87fbf35..ae48e2a550b9 100644
--- a/textproc/p5-Plagger/Makefile
+++ b/textproc/p5-Plagger/Makefile
@@ -295,7 +295,7 @@ BUILD_DEPENDS+= p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
.endif
.if ${PORT_OPTIONS:MFILSPAMASSN}
-BUILD_DEPENDS+= p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+BUILD_DEPENDS+= spamassassin>=0:${PORTSDIR}/mail/spamassassin
.endif
.if ${PORT_OPTIONS:MPROFANITY}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 12:28:17 +0000