aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2015-05-14 10:15:04 +0000
committerMathieu Arnold <mat@FreeBSD.org>2015-05-14 10:15:04 +0000
commit60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree627649ff7699a289d5d78c11bf8d105881402ca8 /mail
parenta50428b01c275f058b067787701d333a9d45cbcb (diff)
downloadports-60d1a83c2a113150cedbc43ff12a7375144f741a.tar.gz
ports-60d1a83c2a113150cedbc43ff12a7375144f741a.zip
Notes
Diffstat (limited to 'mail')
-rw-r--r--mail/antivirus-milter/Makefile3
-rw-r--r--mail/bsfilter/Makefile3
-rw-r--r--mail/bsmtp/Makefile3
-rw-r--r--mail/c-sig/Makefile3
-rw-r--r--mail/coolmail/Makefile5
-rw-r--r--mail/cucipop/Makefile3
-rw-r--r--mail/cyrus-imapd24/Makefile3
-rw-r--r--mail/dspam/Makefile3
-rw-r--r--mail/exim-doc-html/Makefile3
-rw-r--r--mail/exim/Makefile4
-rw-r--r--mail/exmh2/Makefile4
-rw-r--r--mail/greylite/Makefile3
-rw-r--r--mail/hbiff/Makefile3
-rw-r--r--mail/imaptools/Makefile3
-rw-r--r--mail/james/Makefile3
-rw-r--r--mail/lens/Makefile2
-rw-r--r--mail/libesmtp/Makefile2
-rw-r--r--mail/libsrs2/Makefile3
-rw-r--r--mail/lmtp2nntp/Makefile3
-rw-r--r--mail/mail-notification/Makefile3
-rw-r--r--mail/mailman/Makefile3
-rw-r--r--mail/mailtray/Makefile2
-rw-r--r--mail/mailx/Makefile4
-rw-r--r--mail/missey/Makefile2
-rw-r--r--mail/mlmmj/Makefile3
-rw-r--r--mail/nmh/Makefile3
-rw-r--r--mail/nullmailer/Makefile1
-rw-r--r--mail/opendkim/Makefile5
-rw-r--r--mail/opendmarc/Makefile5
-rw-r--r--mail/openwebmail/Makefile5
-rw-r--r--mail/p5-Email-Abstract/Makefile1
-rw-r--r--mail/p5-Email-FolderType-Net/Makefile1
-rw-r--r--mail/p5-Mail-LMLM/Makefile1
-rw-r--r--mail/p5-Net-SMTP-Server/Makefile3
-rw-r--r--mail/pm-lib/Makefile3
-rw-r--r--mail/postfix-current/Makefile3
-rw-r--r--mail/postfix/Makefile3
-rw-r--r--mail/postfixadmin/Makefile3
-rw-r--r--mail/qmail-contrib/Makefile3
-rw-r--r--mail/qmail-dk/Makefile4
-rw-r--r--mail/qmail-spamcontrol/Makefile3
-rw-r--r--mail/qmail/Makefile46
-rw-r--r--mail/queue-fix/Makefile3
-rw-r--r--mail/raysfilter/Makefile3
-rw-r--r--mail/ripmime/Makefile3
-rw-r--r--mail/sigrot/Makefile3
-rw-r--r--mail/sma/Makefile3
-rw-r--r--mail/smtpmail/Makefile3
-rw-r--r--mail/spamass-milter/Makefile3
-rw-r--r--mail/spamassassin/Makefile4
-rw-r--r--mail/spamd/Makefile3
-rw-r--r--mail/spamilter/Makefile1
-rw-r--r--mail/spamstats/Makefile3
-rw-r--r--mail/squirrelmail-translations/Makefile3
-rw-r--r--mail/ssmtp/Makefile2
-rw-r--r--mail/thunderbird-dictionaries/Makefile3
-rw-r--r--mail/tmda/Makefile6
-rw-r--r--mail/tpop3d/Makefile3
-rw-r--r--mail/vacation/Makefile3
-rw-r--r--mail/vexim/Makefile3
-rw-r--r--mail/xmail/Makefile3
-rw-r--r--mail/xpbiff/Makefile3
62 files changed, 79 insertions, 151 deletions
diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile
index ebd92ba4714d..87da622031a5 100644
--- a/mail/antivirus-milter/Makefile
+++ b/mail/antivirus-milter/Makefile
@@ -4,8 +4,7 @@ PORTNAME= antivirus
PORTVERSION= 3.30
PORTREVISION= 7
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Sendmail milter wich uses McAfee Virus Scan or clamav
diff --git a/mail/bsfilter/Makefile b/mail/bsfilter/Makefile
index 7a53dc19a2b6..387c6570ac19 100644
--- a/mail/bsfilter/Makefile
+++ b/mail/bsfilter/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bsfilter
PORTVERSION= 1.0.19
PORTREVISION= 1
CATEGORIES= mail ruby
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= bsfilter/59804
+MASTER_SITES= SFJP/bsfilter/59804
MAINTAINER= yasu@utahime.org
COMMENT= Bayesian spam filter written in Ruby
diff --git a/mail/bsmtp/Makefile b/mail/bsmtp/Makefile
index c6bc6360de1d..4a52412cab2b 100644
--- a/mail/bsmtp/Makefile
+++ b/mail/bsmtp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bsmtp
PORTVERSION= 1.02
PORTREVISION= 5
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= naddy
+MASTER_SITES= LOCAL/naddy
MAINTAINER= naddy@FreeBSD.org
COMMENT= Batch SMTP support for sendmail, incoming and outgoing
diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile
index 8b0cb55bb9c7..607c9f59242e 100644
--- a/mail/c-sig/Makefile
+++ b/mail/c-sig/Makefile
@@ -5,8 +5,7 @@ PORTNAME= c-sig
PORTVERSION= 3.8
PORTREVISION= 16
CATEGORIES= mail elisp
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+MASTER_SITES= LOCAL/tota/${PORTNAME}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= ${PORTNAME}.${PORTVERSION}
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index ddb17501584f..238476525cba 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -5,9 +5,7 @@ PORTNAME= coolmail
PORTVERSION= 1.3
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=system/mail/biffs
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SUNSITE/system/mail/biffs
MAINTAINER= udo.schweigert@siemens.com
COMMENT= Xbiff like mail tool with animated 3D graphics
@@ -15,6 +13,7 @@ COMMENT= Xbiff like mail tool with animated 3D graphics
PLIST_FILES= bin/coolmail \
man/man1/coolmail.1.gz
+USES= tar:tgz
USE_XORG= x11 xext xmu xi
PATCH_STRIP= -p1
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 3961e87b7a00..ecacd62f790b 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/ \
http://ftp.riken.go.jp/archives/net/mail/pop/cucipop/ \
http://horms.net/projects/cucipop/download/
-PATCH_SITES= ${MASTER_SITE_RINGSERVER}
-PATCH_SITE_SUBDIR= net/kame/misc
+PATCH_SITES= RINGSERVER/net/kame/misc
PATCHFILES= cucipop-1.31-v6-20010223.diff.gz
PATCH_DIST_STRIP= -p1
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 5373cf2900be..97f359f4313a 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -109,8 +109,7 @@ GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
.if ${PORT_OPTIONS:MAUTOCREATE} || ${PORT_OPTIONS:MAUTOSIEVE}
PATCH_DIST_STRIP= -p1
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= mm
+PATCH_SITES+= LOCAL/mm
.endif
.if ${PORT_OPTIONS:MAUTOCREATE}
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 11ada16d040d..74c744c16698 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dspam
PORTVERSION= 3.10.2
CATEGORIES= mail
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= danny@dannywarren.com
COMMENT= Bayesian spam filter
diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index 4a4122b1dc8d..b0e2d92b4eed 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -4,8 +4,7 @@
PORTNAME= exim
PORTVERSION= 4.85
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/}
-MASTER_SITE_SUBDIR= exim4/:exim
+MASTER_SITES= EXIM/exim4/:exim
PKGNAMESUFFIX= -doc-${DOCFORMAT}
DISTNAME= exim-${DISTDOCFORMAT}-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index c74fd912d1c1..49d6829de1be 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -5,8 +5,7 @@ PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
PORTREVISION?= 1
CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/}
-MASTER_SITE_SUBDIR= exim4/:exim
+MASTER_SITES= EXIM/exim4/:exim
DISTNAME= ${PORTNAME}-${EXIM_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim
DIST_SUBDIR= exim
@@ -95,7 +94,6 @@ WITH_OPENSSL_PORT= yes
.if ${PORT_OPTIONS:MSA_EXIM} || defined(FETCH_ALL)
MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \
SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim
-MASTER_SITE_SUBDIR+= sa-exim/:sa_exim
DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
.endif
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 28c9519af864..0712ec315a1f 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -7,9 +7,7 @@ PORTNAME= exmh
PORTVERSION= 2.8.0
PORTREVISION= 1
CATEGORIES+= mail tk
-MASTER_SITES= ${MASTER_SITE_TCLTK} \
- SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= TCLTK/${PORTNAME} SF/${PORTNAME}
MAINTAINER?= cy@FreeBSD.org
COMMENT?= X11/TK based mail reader front end to MH
diff --git a/mail/greylite/Makefile b/mail/greylite/Makefile
index 84f54e2bb88b..f998b93e107e 100644
--- a/mail/greylite/Makefile
+++ b/mail/greylite/Makefile
@@ -5,8 +5,7 @@ PORTNAME= greylite
PORTVERSION= 2.3
PORTREVISION= 4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= oliver
+MASTER_SITES= LOCAL/oliver
MAINTAINER= oliver@FreeBSD.org
COMMENT= Modified greylisting for qmail and for any other MDA
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index 8d8c07155d11..4626ba4e4dee 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.2
PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \
- LOCAL
-MASTER_SITE_SUBDIR= obrien
+ LOCAL/obrien
MAINTAINER= obrien@FreeBSD.org
COMMENT= Replacement for xbiff that handles popup window with mail headers
diff --git a/mail/imaptools/Makefile b/mail/imaptools/Makefile
index db94d2644982..853c0073a512 100644
--- a/mail/imaptools/Makefile
+++ b/mail/imaptools/Makefile
@@ -4,8 +4,7 @@
PORTNAME= imaptools
PORTVERSION= 1.135
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= bsam
+MASTER_SITES= LOCAL/bsam
DISTNAME= imap_tools_V${PORTVERSION}
MAINTAINER= bsam@FreeBSD.org
diff --git a/mail/james/Makefile b/mail/james/Makefile
index a422294df59b..5a48731b3e48 100644
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@@ -5,8 +5,7 @@ PORTNAME= james
PORTVERSION= 2.3.1
PORTREVISION= 1
CATEGORIES= mail java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/server/binaries
+MASTER_SITES= APACHE/${PORTNAME}/server/binaries
DISTNAME= ${PORTNAME}-binary-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/lens/Makefile b/mail/lens/Makefile
index efc198e7c062..b4a0f0b740b1 100644
--- a/mail/lens/Makefile
+++ b/mail/lens/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= mail ruby
MASTER_SITES= http://www.pitecan.com/Lens/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/lens|}
+ LOCAL/tota/lens
MAINTAINER= tota@FreeBSD.org
COMMENT= Mail filter written in Ruby
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 4a3e2d3a54a8..d9d7f582e0d4 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -8,7 +8,7 @@ PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://www.stafford.uklinux.net/libesmtp/ \
http://ftp.osuosl.org/pub/blfs/svn/l/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for posting electronic mail
diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile
index 3a4a79cf4dab..a3d2af5747ea 100644
--- a/mail/libsrs2/Makefile
+++ b/mail/libsrs2/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libsrs2
PORTVERSION= 1.0.18
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= http://www.libsrs2.org/%SUBDIR%/
-MASTER_SITE_SUBDIR= srs
+MASTER_SITES= http://www.libsrs2.org/srs/
MAINTAINER= pi@FreeBSD.org
COMMENT= Sender Rewriting Scheme 2 C Implementation
diff --git a/mail/lmtp2nntp/Makefile b/mail/lmtp2nntp/Makefile
index f5ae48091e22..a76601edbd7a 100644
--- a/mail/lmtp2nntp/Makefile
+++ b/mail/lmtp2nntp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= lmtp2nntp
PORTVERSION= 1.4.1
CATEGORIES= mail news
-MASTER_SITES= ${MASTER_SITE_OSSP}
-MASTER_SITE_SUBDIR= tool/${PORTNAME}
+MASTER_SITES= OSSP/tool/${PORTNAME}
MAINTAINER= vd@FreeBSD.org
COMMENT= OSSP mail to news gateway
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 84624d2bc026..cea2c44f06a2 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mail-notification
DISTVERSION= 5.4
PORTREVISION= 15
CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= mailnotify-orig
+MASTER_SITES= SAVANNAH/mailnotify-orig
MAINTAINER= ports@FreeBSD.org
COMMENT= Mail notification for freedesktop.org-compliant system trays
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 461cf795676b..c219d2f1c89e 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -4,10 +4,9 @@
PORTNAME= mailman
DISTVERSION= 2.1.20
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_GNU} \
+MASTER_SITES= GNU \
SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
https://launchpad.net/mailman/${DISTVERSION:R}/${DISTVERSION}/+download/
-MASTER_SITE_SUBDIR= ${PORTNAME}
DIST_SUBDIR= mailman
PATCH_DIST_STRIP= -p1
diff --git a/mail/mailtray/Makefile b/mail/mailtray/Makefile
index ef2ec586704c..72c8299b3145 100644
--- a/mail/mailtray/Makefile
+++ b/mail/mailtray/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mailtray
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= mail python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Display email status in tray
diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile
index 750ea3c22969..7a7760e1dbcf 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -5,10 +5,10 @@ PORTNAME= mailx
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
DISTFILES= mail-2.2.8.tar.gz mailx-memo-2.2.8R
-PATCH_SITES= ${MASTER_SITE_PORTS_JP}
+PATCH_SITES= PORTS_JP
PATCHFILES= mailx.v05.patch.gz
PATCH_DIST_STRIP= -p1
diff --git a/mail/missey/Makefile b/mail/missey/Makefile
index 9b8023764a1a..a4a8b62db0cb 100644
--- a/mail/missey/Makefile
+++ b/mail/missey/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dengh.com/missey/
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/%SUBDIR%/delphij/}
+MASTER_SITES+= LOCAL/delphij
DISTNAME= mps.${PORTVERSION}
MAINTAINER= delphij@FreeBSD.org
diff --git a/mail/mlmmj/Makefile b/mail/mlmmj/Makefile
index 8b5717878f79..fc82a85bc2e5 100644
--- a/mail/mlmmj/Makefile
+++ b/mail/mlmmj/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mlmmj
PORTVERSION= 1.2.17.1
CATEGORIES= mail
MASTER_SITES= http://mlmmj.org/releases/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brix
+ LOCAL/brix
MAINTAINER= xi@borderworlds.dk
COMMENT= Mailing list managing made joyful
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 03a6483f9123..e0c92e633eeb 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -4,8 +4,7 @@
PORTNAME= nmh
PORTVERSION= 1.6
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= nmh
+MASTER_SITES= SAVANNAH
MAINTAINER= cy@FreeBSD.org
COMMENT= Cleaned up MH mailer suite
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index ad901399d2b6..292556be8178 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -8,7 +8,6 @@ PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://untroubled.org/nullmailer/ \
http://untroubled.org/nullmailer/archive/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
MAINTAINER= uffe@uffe.org
COMMENT= MTA for hosts which relay to a fixed set of smart relays
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 450e0bcbb178..9b54aa141a3b 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -5,9 +5,8 @@ PORTNAME= opendkim
PORTVERSION= 2.9.2
PORTREVISION= 6
CATEGORIES= mail security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME} \
- ${PORTNAME}/Previous%20Releases
+MASTER_SITES= SF/${PORTNAME} \
+ SF/${PORTNAME}/Previous%20Releases
MAINTAINER= umq@ueo.co.jp
COMMENT= DKIM library and milter implementation
diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
index 28c6ee753a23..8e255081cfe5 100644
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@@ -4,9 +4,8 @@
PORTNAME= opendmarc
PORTVERSION= 1.3.1
CATEGORIES= mail security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME} \
- ${PORTNAME}/Previous%20Releases
+MASTER_SITES= SF/${PORTNAME} \
+ SF/${PORTNAME}/Previous%20Releases
MAINTAINER= freebsd@gushi.org
COMMENT= DMARC library and milter implementation
diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile
index db1c1ca75fa5..4427df878c32 100644
--- a/mail/openwebmail/Makefile
+++ b/mail/openwebmail/Makefile
@@ -5,9 +5,8 @@ PORTNAME= openwebmail
PORTVERSION= 2.53
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= http://openwebmail.acatysmoof.com/download/%SUBDIR%/ \
- http://openwebmail.org/openwebmail/download/%SUBDIR%/
-MASTER_SITE_SUBDIR?= release
+MASTER_SITES= http://openwebmail.acatysmoof.com/download/release/ \
+ http://openwebmail.org/openwebmail/download/release/
MAINTAINER= crees@FreeBSD.org
COMMENT= Webmail system designed to manage big mail folder files efficiently
diff --git a/mail/p5-Email-Abstract/Makefile b/mail/p5-Email-Abstract/Makefile
index 6b7ef5e1eb0b..50c1ef59d460 100644
--- a/mail/p5-Email-Abstract/Makefile
+++ b/mail/p5-Email-Abstract/Makefile
@@ -4,7 +4,6 @@ PORTNAME= Email-Abstract
PORTVERSION= 3.008
CATEGORIES= mail perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Email
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index 35c1002ca800..6dd18dbb645b 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.04.1
PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Email
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
diff --git a/mail/p5-Mail-LMLM/Makefile b/mail/p5-Mail-LMLM/Makefile
index b732b662877c..a0d220cc2168 100644
--- a/mail/p5-Mail-LMLM/Makefile
+++ b/mail/p5-Mail-LMLM/Makefile
@@ -5,7 +5,6 @@ PORTNAME= Mail-LMLM
PORTVERSION= 0.6804
CATEGORIES= mail perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index ccd3f6e42392..f6abc8c475f7 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -5,7 +5,7 @@ PORTNAME= Net-SMTP-Server
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= mail perl5
-MASTER_SITES= CPAN
+MASTER_SITES= CPAN http://www.macgyver.org/software/perl/
PKGNAMEPREFIX= p5-
DISTNAME= SMTP-Server-${PORTVERSION}
@@ -18,7 +18,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
RUN_DEPENDS:= ${BUILD_DEPENDS}
-MASTER_SITE_BACKUP+= http://www.macgyver.org/software/perl/
USES= perl5
USE_PERL5= configure
diff --git a/mail/pm-lib/Makefile b/mail/pm-lib/Makefile
index 943cc4617454..4c8da526006f 100644
--- a/mail/pm-lib/Makefile
+++ b/mail/pm-lib/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pm-lib
PORTVERSION= 20091202
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= procmail-lib
+MASTER_SITES= SAVANNAH/procmail-lib
DISTNAME= procmail-lib-2009.1202
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 31a3cecb4043..3aaccd01abd5 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -200,8 +200,7 @@ POSTFIX_CCARGS+= -DNO_TLS
.if ${PORT_OPTIONS:MSPF}
BROKEN= At the moment, SPF support is unavailable for ${PORTNAME}-${DISTVERSION}
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= mm
+PATCH_SITES+= LOCAL/mm
PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz
PATCH_DIST_STRIP= -p1
POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 1c64cd2bb78e..53b4c1fe2fd5 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -182,8 +182,7 @@ POSTFIX_CCARGS+= -DNO_TLS
.endif
.if ${PORT_OPTIONS:MSPF}
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= mm
+PATCH_SITES+= LOCAL/mm
PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz
PATCH_DIST_STRIP= -p1
POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include
diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index a673e91bc5c5..9235bf2964ac 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= postfixadmin
PORTVERSION= 2.3.7
PORTREVISION= 1
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports.maintainer@evilphi.com
COMMENT= PHP web-based management tool for Postfix virtual domains and users
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index 0eb9b2846c57..1a6e0f456f1f 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.1
PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://cr.yp.to/software/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
DISTFILES= dot-forward-${DF_VER}.tar.gz \
fastforward-${FF_VER}.tar.gz
diff --git a/mail/qmail-dk/Makefile b/mail/qmail-dk/Makefile
index f86fd4f267ff..f05107161598 100644
--- a/mail/qmail-dk/Makefile
+++ b/mail/qmail-dk/Makefile
@@ -4,7 +4,7 @@ PORTNAME= dk
PORTVERSION= 0.54
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_QMAIL}
+MASTER_SITES= QMAIL
PKGNAMEPREFIX= qmail-
DISTFILES= qmail-1.03.tar.gz
DIST_SUBDIR= qmail
@@ -14,7 +14,7 @@ COMMENT= DomainKeys implementation for qmail
LIB_DEPENDS+= libdomainkeys.so:${PORTSDIR}/mail/libdomainkeys
-PATCH_SITES= ${MASTER_SITE_QMAIL}
+PATCH_SITES= QMAIL
PATCHFILES= qmail-1.03-dk-0.54.patch
USES= qmail
diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile
index 798179fd6280..b99541f3716f 100644
--- a/mail/qmail-spamcontrol/Makefile
+++ b/mail/qmail-spamcontrol/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= ${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES+= http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \
- ${MASTER_SITE_LOCAL:S/$/:spamcontrol/}
-MASTER_SITE_SUBDIR= bdrewery/qmail/:spamcontrol
+ LOCAL/bdrewery/qmail/:spamcontrol
PKGNAMESUFFIX= -spamcontrol
DISTFILES= ${QMAIL_DIST} ${SPAMCONTROL_DIST}:spamcontrol
EXTRACT_ONLY= ${QMAIL_DIST}
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index ad37188c2fa4..82cd77085c2f 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ${QMAIL_PORTNAME}
PORTVERSION?= ${QMAIL_VERSION}
PORTREVISION?= 1
CATEGORIES= mail
-MASTER_SITES+= ${MASTER_SITE_QMAIL}
+MASTER_SITES+= QMAIL
DISTNAME= ${PORTNAME}-${QMAIL_VERSION}
DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY?= ${DISTNAME}${EXTRACT_SUFX}
@@ -175,8 +175,7 @@ TLS_PATCH_NAME= ${QMAIL_PORTNAME}-${QMAIL_VERSION}-tls-${TLS_PATCH_DATE}.patch
PATCHFILES+= ${TLS_PATCH_NAME}:tls
.endif
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
+PATCH_SITES+= LOCAL/bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
PATCH_SITES+= http://mirror.shatow.net/freebsd/qmail/:DEFAULT,dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
OPTIONS_DEFINE+=DOCS
@@ -438,8 +437,7 @@ DISTFILES+= ${SRS_LDAP_PATCH}:srs_ldap
.if ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
MASTER_SITES+= http://tomclegg.net/qmail/:smtp_auth \
- ${MASTER_SITE_LOCAL:S/$/:smtp_auth/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:smtp_auth
+ LOCAL/bdrewery/qmail/:smtp_auth
DISTFILES+= qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz:smtp_auth
EXTRACT_ONLY+= qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz
MASTER_SITES+= http://tomclegg.net/qmail/:close3
@@ -475,8 +473,7 @@ PATCHFILES+= qmail-discard-double-bounces.patch:doublebounce
. if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
. if defined(SLAVE_SPAMCONTROL)
SPF_SPAMCONTROL_PATCH= qmail-spf-rc5.patch-spamcontrol-27_2
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:spf_spamcontrol
+PATCH_SITES+= LOCAL/bdrewery/qmail/:spf_spamcontrol
PATCHFILES+= ${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
. else
# XXX - Move change out of conflicting Makefile hunk
@@ -486,8 +483,7 @@ SPF_TLS_PATCH= qmail-spf-rc5.patch-auth-tls-20110119
SPF_TLS_PATCH= qmail-spf-rc5.patch-tls-20110119
. endif
#MASTER_SITES+= http://manuel.mausz.at/programming/patches/qmail/:spf_tls
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:spf_tls/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:spf_tls
+MASTER_SITES+= LOCAL/bdrewery/qmail/:spf_tls
DISTFILES+= ${SPF_TLS_PATCH}:spf_tls
. endif
. else
@@ -501,8 +497,7 @@ PLIST_SUB+= EXTTODO=""
DOCFILES_WRKSRC+= EXTTODO
. if !empty(PORT_OPTIONS:MBIG_TODO_PATCH) || !empty(PORT_OPTIONS:MBIGTODO)
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:ext_big_todo/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:ext_big_todo
+MASTER_SITES+= LOCAL/bdrewery/qmail/:ext_big_todo
EXT_BIG_TODO_PATCH= ext_todo-20030105+big-todo.103.patch
DISTFILES+= ${EXT_BIG_TODO_PATCH}:ext_big_todo
. endif
@@ -511,22 +506,18 @@ DISTFILES+= ${EXT_BIG_TODO_PATCH}:ext_big_todo
. if defined(SLAVE_TLS)
# XXX - Move qmail-todo out of conflicting Makefile hunk
EXTTODO_PATCH= ext_todo-20030105_spf_tls.patch
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:exttodo
+MASTER_SITES+= LOCAL/bdrewery/qmail/:exttodo
DISTFILES+= ${EXTTODO_PATCH}:exttodo
. else
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:exttodo
+PATCH_SITES+= LOCAL/bdrewery/qmail/:exttodo
PATCHFILES+= ext_todo-20030105_spf.patch:exttodo
. endif
. elif defined(SLAVE_MYSQL)
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
+PATCH_SITES+= LOCAL/bdrewery/qmail/:exttodo
PATCHFILES+= ext_todo-20030105_mysql.patch:exttodo
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:exttodo
. elif defined(SLAVE_TLS)
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
+PATCH_SITES+= LOCAL/bdrewery/qmail/:exttodo
PATCHFILES+= ext_todo-20030105_tls.patch:exttodo
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:exttodo
. else
PATCH_SITES+= http://www.nrg4u.com/qmail/:exttodo
PATCHFILES+= ext_todo-20030105.patch:exttodo
@@ -545,7 +536,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dns-cname
|| !empty(PORT_OPTIONS:MBIG_CONCURRENCY_PATCH) \
|| !empty(PORT_OPTIONS:MOUTGOINGIP_PATCH) \
|| !empty(PORT_OPTIONS:MQMTPC_PATCH)
-PATCH_SITES+= ${MASTER_SITE_QMAIL}
+PATCH_SITES+= QMAIL
.endif
.if ${PORT_OPTIONS:MQMAILQUEUE_PATCH}
@@ -588,38 +579,33 @@ SMTPEXTFORK_PATCH= smtpextfork-ldap-20060201_4.patch
. endif
MASTER_SITES+= http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail-smtpextfork/patches/:extfork \
- ${MASTER_SITE_LOCAL:S/$/:extfork/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:extfork
+ LOCAL/bdrewery/qmail/:extfork
DISTFILES+= ${SMTPEXTFORK_PATCH:S/$/:extfork/} \
README.smtpextfork:extfork
.endif
.if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MSENDERCHECK4}
PATCH_SITES+= http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:sendercheck4 \
- ${MASTER_SITE_LOCAL:S/$/:sendercheck4/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:sendercheck4
+ LOCAL/bdrewery/qmail/:sendercheck4
PATCHFILES+= qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch:sendercheck4
.endif
.if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MGRTDELAY}
PATCH_SITES+= http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:grtdelay \
- ${MASTER_SITE_LOCAL:S/$/:grtdelay/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:grtdelay
+ LOCAL/bdrewery/qmail/:grtdelay
PATCHFILES+= qmail-ldap-20060201-grtdelay.patch:grtdelay
DOCFILES_WRKSRC+= README.GREETDELAY
.endif
.if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MENHACELOGS}
PATCH_SITES+= http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:ldapenhacelog \
- ${MASTER_SITE_LOCAL:S/$/:ldapenhacelog/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:ldapenhacelog
+ LOCAL/bdrewery/qmail/:ldapenhacelog
PATCHFILES+= enhacelogging-ldap-20120221.patch:ldapenhacelog
.endif
.if defined(SLAVE_SPAMCONTROL)
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:ucspi_ssl/} \
+MASTER_SITES+= LOCAL/bdrewery/ucspi-ssl/:ucspi_ssl \
http://www.fehcom.de/ipnet/ucspi-ssl/:ucspi_ssl
-MASTER_SITE_SUBDIR+= bdrewery/ucspi-ssl/:ucspi_ssl
UCSPI_SSL_VER= 0.94
UCSPI_SSL_DIST= ucspi-ssl-${UCSPI_SSL_VER}.tgz
DISTFILES+= ${UCSPI_SSL_DIST}:ucspi_ssl
diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
index 72ecf0efa9aa..d2f41a2865c4 100644
--- a/mail/queue-fix/Makefile
+++ b/mail/queue-fix/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.netmeridian.com/e-huss/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER= bdrewery@FreeBSD.org
COMMENT= Repairs or generates a qmail queue structure
diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile
index 0d4d53f80aa6..2c7bd506f1e6 100644
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@@ -3,8 +3,7 @@
PORTNAME= raysfilter
PORTVERSION= 1.14
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= rays-filter-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index 7bff0a29ba4b..d4b01dac84dd 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ripmime
PORTVERSION= 1.4.0.10
CATEGORIES= mail
MASTER_SITES= http://www.pldaniels.com/ripmime/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Extracts attached files out of a MIME encoded email package
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index a23705014814..227b342c3c35 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sigrot
PORTVERSION= 1.0
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/mail/misc
+MASTER_SITES= SUNSITE/system/mail/misc
DISTNAME= ${PORTNAME}_v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index 1f593b57f7d4..14957ad7984d 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -3,9 +3,8 @@
PORTNAME= sma
PORTVERSION= 1.4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/dinoex \
ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Program that analyses Sendmail log entries
diff --git a/mail/smtpmail/Makefile b/mail/smtpmail/Makefile
index 1d11c23bb380..51352e726f79 100644
--- a/mail/smtpmail/Makefile
+++ b/mail/smtpmail/Makefile
@@ -4,8 +4,7 @@
PORTNAME= smtpmail
PORTVERSION= 0.4.5
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to send e-mail via a remote smtp server
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index ec341b0465d6..7298bf17342e 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -4,8 +4,7 @@
PORTNAME= spamass-milter
PORTVERSION= 0.4.0
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= spamass-milt
+MASTER_SITES= SAVANNAH/spamass-milt
MAINTAINER= bmah@FreeBSD.org
COMMENT= Sendmail Milter (mail filter) plugin for SpamAssassin
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 4210b47a039a..5b8ee16200ea 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -5,10 +5,8 @@ PORTNAME= spamassassin
PORTVERSION= 3.4.1
PORTREVISION?= 1 # 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
+MASTER_SITES= APACHE/spamassassin/source CPAN/Mail
DISTNAME= Mail-SpamAssassin-${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:apache,cpan
MAINTAINER?= adamw@FreeBSD.org
COMMENT?= Highly efficient mail filter for identifying spam
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index d8b243baba1f..8227eecc3a84 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= spamd
PORTVERSION= 4.9.1
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=freebsdspamd/spamd
+MASTER_SITES= SF/freebsdspamd/spamd
MAINTAINER= ohauer@FreeBSD.org
COMMENT= Traps spammers with a very slow smtp-login and return 4xx error
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 7f20b3938d76..223125c86152 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.60
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.wanlink.com/spamilter/download/
-MASTER_SITE_SUBDIR= dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Sendmail LibMilter filter to block spam
diff --git a/mail/spamstats/Makefile b/mail/spamstats/Makefile
index 7b33865259bd..bba8d326e0f4 100644
--- a/mail/spamstats/Makefile
+++ b/mail/spamstats/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.6c
PORTREVISION= 2
CATEGORIES= mail
#MASTER_SITES= http://www.inl.fr/download/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= leeym
+MASTER_SITES= LOCAL/leeym
MAINTAINER= leeym@FreeBSD.org
COMMENT= Tool to generate statistics for spamd of Mail::SpamAssassin
diff --git a/mail/squirrelmail-translations/Makefile b/mail/squirrelmail-translations/Makefile
index d630bfd55868..2fa3d324bfd4 100644
--- a/mail/squirrelmail-translations/Makefile
+++ b/mail/squirrelmail-translations/Makefile
@@ -4,8 +4,7 @@
PORTNAME= squirrelmail-translations
PORTVERSION= 20150324
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= adamw/squirrelmail
+MASTER_SITES= LOCAL/adamw/squirrelmail
DISTNAME= squirrelmail-${PORTVERSION}_0200-SVN.locales
DIST_SUBDIR= squirrelmail
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 68264016cf71..826eb8c05517 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ssmtp
PORTVERSION= 2.64
PORTREVISION= 1
CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}
MAINTAINER= aragon@phat.za.net
diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
index 443d26c4a174..f4935a1a06d2 100644
--- a/mail/thunderbird-dictionaries/Makefile
+++ b/mail/thunderbird-dictionaries/Makefile
@@ -5,8 +5,7 @@ PORTNAME= thunderbird-dictionaries
PORTVERSION= 20060220
PORTREVISION= 11
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_MOZDEV}
-MASTER_SITE_SUBDIR= dictionaries
+MASTER_SITES= MOZDEV/dictionaries
DISTFILES= # filled in later after options
DIST_SUBDIR= thunderbird
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index f406f12e4db1..d9d65f3268bf 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -6,9 +6,7 @@ PORTVERSION= 1.1.12
PORTREVISION= 1
CATEGORIES= mail python
MASTER_SITES= ftp://tmda.net/pub/tmda/releases/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sergei
-EXTRACT_SUFX= .tgz
+ LOCAL/sergei
MAINTAINER= ports@FreeBSD.org
COMMENT= Python-based SPAM reduction system
@@ -16,7 +14,7 @@ COMMENT= Python-based SPAM reduction system
OPTIONS_DEFINE= CDB DOCS EXAMPLES
CDB_RUN_DEPENDS=${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
-USES= python
+USES= python tar:tgz
SUB_FILES= pkg-message
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index ca69212ba6c1..9d3aa7e2f91d 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tpop3d
PORTVERSION= 1.5.5
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= tpop3d
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Virtual-domain capable POP3 server supporting MySQL, PgSQL etc auth
diff --git a/mail/vacation/Makefile b/mail/vacation/Makefile
index 463356fdd9b3..1ec69d89177e 100644
--- a/mail/vacation/Makefile
+++ b/mail/vacation/Makefile
@@ -5,8 +5,7 @@ PORTNAME= vacation
PORTVERSION= 3.3.0
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/v/vacation/
+MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}-0.4
MAINTAINER= mcdouga9@egr.msu.edu
diff --git a/mail/vexim/Makefile b/mail/vexim/Makefile
index 6faaa5a7f566..7d973e54208e 100644
--- a/mail/vexim/Makefile
+++ b/mail/vexim/Makefile
@@ -4,8 +4,7 @@
PORTNAME= vexim
DISTVERSION= 2.2.2_rc1
CATEGORIES= mail www
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= feld
+MASTER_SITES= LOCAL/feld
DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= feld@FreeBSD.org
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 41ca85223060..19d5c88d20fb 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmail
PORTVERSION= 1.6
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= XCONTRIB/applications
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= sjroz@verizon.net
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 14851df6fbdc..6c7a5d4060de 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= xpbiff
PORTVERSION?= 1.27
PORTREVISION= 4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sanpei
+MASTER_SITES= LOCAL/sanpei
DISTNAME= xpbiff
DISTFILES= xpbiff-1.27-with-YOUBIN.tar.gz.uu