aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/abook/Makefile3
-rw-r--r--mail/althea/Makefile3
-rw-r--r--mail/annoyance-filter/Makefile4
-rw-r--r--mail/ask/Makefile3
-rw-r--r--mail/assp/Makefile2
-rw-r--r--mail/bbmail/Makefile2
-rw-r--r--mail/bmf/Makefile3
-rw-r--r--mail/bogofilter/Makefile2
-rw-r--r--mail/claws-mail/Makefile2
-rw-r--r--mail/cone/Makefile3
-rw-r--r--mail/courier-imap/Makefile3
-rw-r--r--mail/courier/Makefile3
-rw-r--r--mail/dk-milter/Makefile2
-rw-r--r--mail/dkim-milter/Makefile2
-rw-r--r--mail/elmo-devel/Makefile2
-rw-r--r--mail/elmo/Makefile3
-rw-r--r--mail/enma/Makefile2
-rw-r--r--mail/eps/Makefile3
-rw-r--r--mail/exmh2/Makefile5
-rw-r--r--mail/getlive/Makefile2
-rw-r--r--mail/gmail-notify/Makefile2
-rw-r--r--mail/grepmail/Makefile3
-rw-r--r--mail/gubby/Makefile3
-rw-r--r--mail/heirloom-mailx/Makefile3
-rw-r--r--mail/hotwayd/Makefile3
-rw-r--r--mail/ilohamail-devel/Makefile3
-rw-r--r--mail/ilohamail/Makefile3
-rw-r--r--mail/isync/Makefile3
-rw-r--r--mail/itraxp/Makefile3
-rw-r--r--mail/jamlib/Makefile3
-rw-r--r--mail/junkfilter/Makefile4
-rw-r--r--mail/kiltdown/Makefile2
-rw-r--r--mail/kshowmail/Makefile2
-rw-r--r--mail/libdomainkeys/Makefile3
-rw-r--r--mail/libsieve/Makefile3
-rw-r--r--mail/libvmime/Makefile3
-rw-r--r--mail/lmtpd/Makefile2
-rw-r--r--mail/mahogany/Makefile2
-rw-r--r--mail/mailcrypt/Makefile3
-rw-r--r--mail/maildrop/Makefile3
-rw-r--r--mail/mailman/Makefile3
-rw-r--r--mail/mailscanner-mrtg/Makefile3
-rw-r--r--mail/mairix/Makefile3
-rw-r--r--mail/mboxgrep/Makefile3
-rw-r--r--mail/mbx2mbox/Makefile3
-rw-r--r--mail/msmtp/Makefile3
-rw-r--r--mail/msmtpqueue/Makefile3
-rw-r--r--mail/mutt_vc_query/Makefile3
-rw-r--r--mail/muttzilla/Makefile3
-rw-r--r--mail/nocc/Makefile3
-rw-r--r--mail/p3scan/Makefile3
-rw-r--r--mail/pfqueue/Makefile3
-rw-r--r--mail/phpmailer/Makefile2
-rw-r--r--mail/phpmailer2/Makefile3
-rw-r--r--mail/pm-lib/Makefile3
-rw-r--r--mail/policyd2/Makefile3
-rw-r--r--mail/pop-before-smtp/Makefile3
-rw-r--r--mail/pop3lite/Makefile3
-rw-r--r--mail/pop3vscan/Makefile3
-rw-r--r--mail/popfile/Makefile3
-rw-r--r--mail/postfix-gps/Makefile3
-rw-r--r--mail/postfix-policyd-sf/Makefile3
-rw-r--r--mail/postfixadmin/Makefile3
-rw-r--r--mail/py-milter/Makefile4
-rw-r--r--mail/py-spambayes/Makefile3
-rw-r--r--mail/py-spf/Makefile3
-rw-r--r--mail/qmail-auditor/Makefile2
-rw-r--r--mail/qmail-scanner1/Makefile3
-rw-r--r--mail/qmailadmin-devel/Makefile3
-rw-r--r--mail/qmailadmin/Makefile3
-rw-r--r--mail/qmhandle/Makefile2
-rw-r--r--mail/qsheff/Makefile3
-rw-r--r--mail/razor-agents/Makefile3
-rw-r--r--mail/rblcheck/Makefile3
-rw-r--r--mail/roundcube/Makefile2
-rw-r--r--mail/sentinel/Makefile3
-rw-r--r--mail/sid-milter/Makefile3
-rw-r--r--mail/simscan/Makefile2
-rw-r--r--mail/smtprc/Makefile3
-rw-r--r--mail/spamcup/Makefile3
-rw-r--r--mail/sqlgrey/Makefile2
-rw-r--r--mail/squirrelmail-devel/Makefile3
-rw-r--r--mail/squirrelmail/Makefile3
-rw-r--r--mail/squirreloutlook/Makefile3
-rw-r--r--mail/sqwebmail/Makefile3
-rw-r--r--mail/vchkuser/Makefile2
-rw-r--r--mail/vpopmail/Makefile3
-rw-r--r--mail/vqadmin/Makefile3
-rw-r--r--mail/whoson/Makefile3
89 files changed, 96 insertions, 155 deletions
diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index 501475dc96a7..2842d9e5977d 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -9,8 +9,7 @@ PORTNAME= abook
PORTVERSION= 0.5.6
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= stas@FreeBSD.org
COMMENT= An addressbook program with mutt mail client support
diff --git a/mail/althea/Makefile b/mail/althea/Makefile
index 323e6a4a31b4..ca0ea911bf68 100644
--- a/mail/althea/Makefile
+++ b/mail/althea/Makefile
@@ -9,8 +9,7 @@ PORTNAME= althea
PORTVERSION= 0.5.7
PORTREVISION= 4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/annoyance-filter/Makefile b/mail/annoyance-filter/Makefile
index a8c253c962c7..cfa23ab56454 100644
--- a/mail/annoyance-filter/Makefile
+++ b/mail/annoyance-filter/Makefile
@@ -8,9 +8,9 @@
PORTNAME= annoyance-filter
PORTVERSION= 1.0d
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/annoyancefilter/annoyancefilter/${PORTVERSION} \
http://www.fourmilab.ch/annoyance-filter/
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-//}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= Adaptive Bayesian Junk Mail Filter
diff --git a/mail/ask/Makefile b/mail/ask/Makefile
index 9ee9408faa25..c61a59181ef9 100644
--- a/mail/ask/Makefile
+++ b/mail/ask/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ask
PORTVERSION= 2.5.3
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= a-s-k
+MASTER_SITES= SF/a-s-k/${PORTNAME}-beta/${PORTVERSION}
MAINTAINER= araujo@FreeBSD.org
COMMENT= Anti Spam Killer content filtering
diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index c01d837a8cd5..165ef90795b2 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -9,7 +9,7 @@ PORTNAME= assp
PORTVERSION= 1.5.1.2
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME:U}_${PORTVERSION}-Install
MAINTAINER= fbsd@opal.com
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index 73d06141e65b..a5e00d4a77e9 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bbmail
PORTVERSION= 0.9.3
CATEGORIES= mail
-MASTER_SITES= SF/bbtools
+MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool intended for Blackbox that checks for new mail
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index dc021c59708b..dd59e981babe 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bmf
PORTVERSION= 0.9.4
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A fast Bayesian Mail Filter compatible with maildrop and procmail
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 63418af6a6fc..a0a817b3e606 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bogofilter
PORTVERSION= 1.2.0
PORTREVISION?= 2
CATEGORIES?= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/bogofilter/bogofilter-stable/bogofilter-${PORTVERSION}
MAINTAINER?= matthias.andree@gmx.de
COMMENT= Fast, teachable, learning spam detector
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 1a99e2878df0..36373a9e32f3 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -9,7 +9,7 @@ PORTNAME= claws-mail
PORTVERSION= 3.7.2
PORTREVISION= 2
CATEGORIES= mail news ipv6
-MASTER_SITES= SF/sylpheed-claws
+MASTER_SITES= SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
MAINTAINER= netchild@FreeBSD.org
COMMENT= A lightweight and very featureful GTK+ based e-mail and news client
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 55d036509e07..ea21647cf300 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -12,8 +12,7 @@ CATEGORIES= mail
#MASTER_SITES= http://www.courier-mta.org/beta/${PORTNAME}/ \
# http://www.lerctr.org/~ler/
# This is for release versions, leave it in please:
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= courier
+MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION}
MAINTAINER= ler@lerctr.org
COMMENT= Console based mail client with POP3/IMAP/SMAP support
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index f6c10a548222..27865214b016 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= courier-imap
PORTVERSION= 4.5.1
PORTEPOCH= 2
CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= courier
+MASTER_SITES= SF/courier/imap/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 5b58caf80cf4..16909c9d4685 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -8,8 +8,7 @@
PORTNAME= courier
PORTVERSION= 0.62.0
CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= courier
+MASTER_SITES= SF
MAINTAINER= bsd@dino.sk
COMMENT= Courier SMTP IMAP POP3 HTTP mail server suite
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index cb6c683bc7e9..31d872e4c2b6 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dk-milter
PORTVERSION= 1.0.2
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Domainkeys milter for Sendmail
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 492acc9b657c..f7eb582d859c 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -15,7 +15,7 @@
PORTNAME= dkim-milter
PORTVERSION= 2.8.3
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/DKIM%20Milter/${PORTVERSION}
MAINTAINER= umq@ueo.co.jp
COMMENT= Domainkeys Identified Mail (DKIM) milter
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index 7ff8173e0f1c..5f9ebd5ba642 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -9,7 +9,7 @@ PORTNAME= elmo
PORTVERSION= 1.3.2
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20devel/${PORTVERSION}
PKGNAMESUFFIX= -devel
MAINTAINER= dhn@FreeBSD.org
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 44f14ff9872d..fd84e5b560da 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= elmo
PORTVERSION= 1.3.0
CATEGORIES= mail
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20devel/${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= Receive, filter, read, compose and send mail at the text console
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index 58d6f82771ed..4f16f85fc08d 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -8,7 +8,7 @@
PORTNAME= enma
PORTVERSION= 1.1.0
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ENMA/${PORTVERSION}
MAINTAINER= umq@ueo.co.jp
COMMENT= A sender authentication milter supporting SPF and Sender ID
diff --git a/mail/eps/Makefile b/mail/eps/Makefile
index bfd3d8c60e43..647e1ee08849 100644
--- a/mail/eps/Makefile
+++ b/mail/eps/Makefile
@@ -8,8 +8,7 @@
PORTNAME= eps
PORTVERSION= 1.7
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= epsinter7
+MASTER_SITES= SF/${PORTNAME}inter7/${PORTNAME}inter7/${PORTVERSION}
MAINTAINER= ismail@EnderUNIX.org
COMMENT= EPS is a Email Parsing System
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 9550b959ce99..15e50b40a0d8 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -11,9 +11,8 @@ PORTNAME= exmh
PORTVERSION= 2.7.2
PORTREVISION= 1
CATEGORIES+= mail tk
-MASTER_SITES= ${MASTER_SITE_TCLTK}
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= ${MASTER_SITE_TCLTK} \
+ SF
MAINTAINER?= ports@FreeBSD.org
COMMENT?= X11/TK based mail reader front end to MH
diff --git a/mail/getlive/Makefile b/mail/getlive/Makefile
index 35eab8192138..acb6424cd16f 100644
--- a/mail/getlive/Makefile
+++ b/mail/getlive/Makefile
@@ -8,7 +8,7 @@
PORTNAME= getlive
DISTVERSION= 0_57
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/GetLive/${PORTVERSION}%20%28Beta%29
DISTNAME= GetLive_${DISTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/mail/gmail-notify/Makefile b/mail/gmail-notify/Makefile
index 79ba5ef6ed67..d6dbba0b6f16 100644
--- a/mail/gmail-notify/Makefile
+++ b/mail/gmail-notify/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gmail-notify
PORTVERSION= 1.6.1.1
PORTREVISION= 2
CATEGORIES= mail python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= GMail Notifier
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index de1128b4b448..13f1f35604fb 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= grepmail
PORTVERSION= 5.3033
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Search mailboxes for a given regexp and display matching emails
diff --git a/mail/gubby/Makefile b/mail/gubby/Makefile
index 110169facace..393129f6dee5 100644
--- a/mail/gubby/Makefile
+++ b/mail/gubby/Makefile
@@ -9,8 +9,7 @@
PORTNAME= gubby
PORTVERSION= 0.5.5
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mich@FreeBSD.org
COMMENT= A program showing where new mail has been placed
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 4b4fc6377b62..9d0f471bee2e 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mailx
PORTVERSION= 12.4
PORTREVISION= 1
CATEGORIES= mail ipv6
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= heirloom
+MASTER_SITES= SF/heirloom/heirloom-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${MASTER_SITE_SUBDIR}-
MAINTAINER= avl@FreeBSD.org
diff --git a/mail/hotwayd/Makefile b/mail/hotwayd/Makefile
index d34f1a161072..b7536553e3c9 100644
--- a/mail/hotwayd/Makefile
+++ b/mail/hotwayd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hotwayd
PORTVERSION= 0.8.4
PORTEPOCH= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= hotwayd
+MASTER_SITES= SF
MAINTAINER= john@jnielsen.net
COMMENT= A Hotmail -> POP3 gateway
diff --git a/mail/ilohamail-devel/Makefile b/mail/ilohamail-devel/Makefile
index 252584fd7e44..2e2858345fea 100644
--- a/mail/ilohamail-devel/Makefile
+++ b/mail/ilohamail-devel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ilohamail-devel
PORTVERSION= 0.9.20050415
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ilohamail
+MASTER_SITES= SF/ilohamail/IlohaMail-devel/0.9-20050415
DISTNAME= IlohaMail-0.9-20050415
MAINTAINER= craig001@lerwick.hopto.org
diff --git a/mail/ilohamail/Makefile b/mail/ilohamail/Makefile
index 42e3ab4394ba..3130668260ce 100644
--- a/mail/ilohamail/Makefile
+++ b/mail/ilohamail/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ilohamail
PORTVERSION= 0.8.13
PORTREVISION= 1
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ilohamail
+MASTER_SITES= SF/${PORTNAME}/IlohaMail-stable/${PORTVERSION}
DISTNAME= IlohaMail-${PORTVERSION}
MAINTAINER= tota@rtfm.jp
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 9ba9f9dfaaf1..b23b6e56e59b 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -8,8 +8,7 @@
PORTNAME= isync
PORTVERSION= 1.0.4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Maintain local copies of remote IMAP folders w/synchronized flags
diff --git a/mail/itraxp/Makefile b/mail/itraxp/Makefile
index 8bc1918176d4..bea960bc592c 100644
--- a/mail/itraxp/Makefile
+++ b/mail/itraxp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= itraxp
PORTVERSION= 1.03.20050513
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= itraxpl
+MASTER_SITES= SF/${PORTNAME}l/${PORTNAME}%201.03/Itraxp%201.03%2020050513
MAINTAINER= anray@FreeBSD.org
COMMENT= Advanced Perl supporting FTN messages tracker
diff --git a/mail/jamlib/Makefile b/mail/jamlib/Makefile
index f26193ad7420..cfe18852d52b 100644
--- a/mail/jamlib/Makefile
+++ b/mail/jamlib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jamlib
PORTVERSION= 1.4.7
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jamlib
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A JAM subroutine library
diff --git a/mail/junkfilter/Makefile b/mail/junkfilter/Makefile
index 1347276e5783..56adb7d9f0aa 100644
--- a/mail/junkfilter/Makefile
+++ b/mail/junkfilter/Makefile
@@ -9,9 +9,9 @@
PORTNAME= junkfilter
PORTVERSION= 20030115
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://junkfilter.zer0.org/pkg/${PORTVERSION}/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
DISTNAME= ${PORTNAME}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile
index 2403c28f4c40..c111a75ff3ba 100644
--- a/mail/kiltdown/Makefile
+++ b/mail/kiltdown/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kiltdown
PORTVERSION= 0.8.045
PORTREVISION= 12
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Kiltdown is an UI independant Email Client for UNIX
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index 1572d55f4fb5..e7a4b2c28f35 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -8,7 +8,7 @@ PORTNAME= kshowmail
PORTVERSION= 3.3.1
PORTREVISION= 1
CATEGORIES= mail kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20for%20KDE3/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= POP3 mail checker for KDE
diff --git a/mail/libdomainkeys/Makefile b/mail/libdomainkeys/Makefile
index c2a108c23cd1..1861149d2149 100644
--- a/mail/libdomainkeys/Makefile
+++ b/mail/libdomainkeys/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libdomainkeys
PORTVERSION= 0.69
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= domainkeys
+MASTER_SITES= SF/domainkeys/${PORTNAME}/${PORTVERSION}
MAINTAINER= skv@FreeBSD.org
COMMENT= DomainKeys library
diff --git a/mail/libsieve/Makefile b/mail/libsieve/Makefile
index bbbfbc766f3f..4675d26cbf1b 100644
--- a/mail/libsieve/Makefile
+++ b/mail/libsieve/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libsieve
PORTVERSION= 2.2.6
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libsieve
+MASTER_SITES= SF
MAINTAINER= mark_sf@kikg.ifmo.ru
COMMENT= A library for parsing, sorting and filtering mail
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index e2b39930d15a..75391ad29669 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libvmime
PORTVERSION= 0.9.0
PORTREVISION= 4
CATEGORIES= mail
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= vmime
+MASTER_SITES= SF/vmime/vmime/0.9
MAINTAINER= delphij@FreeBSD.org
COMMENT= An all-in-one Internet mail library
diff --git a/mail/lmtpd/Makefile b/mail/lmtpd/Makefile
index 055e78638768..55dd2ddb0175 100644
--- a/mail/lmtpd/Makefile
+++ b/mail/lmtpd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lmtpd
PORTVERSION= 0.10.6
CATEGORIES= mail
-MASTER_SITES= ftp://ftp.oav.net/pll/ SF/pll
+MASTER_SITES= ftp://ftp.oav.net/pll/ SF/pll/${PORTNAME}/${PORTVERSION}
MAINTAINER= kiwi@oav.net
COMMENT= LMTP server compliant with RFC 2033 and Maildir++
diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile
index fd7041b8d1ed..db6494a95b1d 100644
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mahogany
PORTVERSION= 0.67
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Mahogany/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An X11 mail and news client
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 70cce73a9487..16cbcc66cf8a 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mailcrypt
PORTVERSION= 3.5.8
PORTREVISION= 4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An Emacs/PGP interface
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 7ef5f184c35a..5bdfd3539932 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -20,8 +20,7 @@
PORTNAME= maildrop
PORTVERSION= 2.2.0
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= courier
+MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= Mail delivery agent (MDA) with filtering abilities
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 26d9310dec12..4238200331dc 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -8,8 +8,9 @@
PORTNAME= mailman
DISTVERSION= 2.1.12
CATEGORIES?= mail
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
http://www.list.org/
+
EXTRACT_SUFX= .tgz
DIST_SUBDIR= mailman
diff --git a/mail/mailscanner-mrtg/Makefile b/mail/mailscanner-mrtg/Makefile
index 8bd483443075..75872b00ea60 100644
--- a/mail/mailscanner-mrtg/Makefile
+++ b/mail/mailscanner-mrtg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mailscanner-mrtg
PORTVERSION= 0.11.00
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-//}
+MASTER_SITES= SF/mailscannermrtg/${PORTNAME}-UNSTABLE/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= j.koopmann@seceidos.de
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 7ec49abcdf45..dc3f9d3ccdc8 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mairix
PORTVERSION= 0.21
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mairix
+MASTER_SITES= SF
MAINTAINER= jjuanino@gmail.com
COMMENT= Indexing and searching in Maildir, MH or mbox folders
diff --git a/mail/mboxgrep/Makefile b/mail/mboxgrep/Makefile
index f88e9c48f1e5..fe1ac3cceb36 100644
--- a/mail/mboxgrep/Makefile
+++ b/mail/mboxgrep/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mboxgrep
PORTVERSION= 0.7.9
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= anders@FreeBSD.org
COMMENT= Utility to scan mailboxes for messages matching a regular expression
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index 563c42de4a7e..50b8fb6d8400 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mbx2mbox
PORTVERSION= 0.34
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= MS Outlook Express .mbx to mbox file converter
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 0d1b54004639..491175d63b6d 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= msmtp
PORTVERSION= 1.4.17
PORTREVISION= 2
CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= msmtp
+MASTER_SITES= SF
MAINTAINER= novel@FreeBSD.org
COMMENT= SMTP plugin for MUAs
diff --git a/mail/msmtpqueue/Makefile b/mail/msmtpqueue/Makefile
index 57f8a40d683b..30c32f065dfa 100644
--- a/mail/msmtpqueue/Makefile
+++ b/mail/msmtpqueue/Makefile
@@ -9,8 +9,7 @@ PORTNAME= msmtpqueue
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= msmtp
+MASTER_SITES= SF/msmtp/${PORTNAME}/${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= Scripts to queue mails with msmtp
diff --git a/mail/mutt_vc_query/Makefile b/mail/mutt_vc_query/Makefile
index 86136a408160..6cd9d0faf595 100644
--- a/mail/mutt_vc_query/Makefile
+++ b/mail/mutt_vc_query/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mutt_vc_query
PORTVERSION= 002
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rolo
+MASTER_SITES= SF/rolo/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A vCard query utility for mutt
diff --git a/mail/muttzilla/Makefile b/mail/muttzilla/Makefile
index 6f0b45eca31f..22e90ffc5e0b 100644
--- a/mail/muttzilla/Makefile
+++ b/mail/muttzilla/Makefile
@@ -9,8 +9,7 @@
PORTNAME= muttzilla
PORTVERSION= 0.40
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Mutt MUA plugin for Netscape for use on "mailto:" URLs
diff --git a/mail/nocc/Makefile b/mail/nocc/Makefile
index fa15c8de0445..fb94ade5f17c 100644
--- a/mail/nocc/Makefile
+++ b/mail/nocc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= nocc
PORTVERSION= 1.8.1
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/NOCC/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= A web-based e-mail system which access POP3 and IMAP mail servers
diff --git a/mail/p3scan/Makefile b/mail/p3scan/Makefile
index a2b2fb9882ee..d39eb72d5857 100644
--- a/mail/p3scan/Makefile
+++ b/mail/p3scan/Makefile
@@ -9,8 +9,7 @@ PORTNAME= p3scan
PORTVERSION= 2.3.2
PORTREVISION= 4
CATEGORIES= mail net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTNAME}-${PORTVERSION}
MAINTAINER= edwin@mavetju.org
COMMENT= A transparent POP3-Proxy with virus-scanning capabilities
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 8df7849a31ec..d24a7dc60322 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pfqueue
PORTVERSION= 0.5.6
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mnag@FreeBSD.org
COMMENT= A console-based tool for handling Postfix 1, Postfix 2 and Exim queues
diff --git a/mail/phpmailer/Makefile b/mail/phpmailer/Makefile
index 34f3bb3f00fe..77e0b0a14060 100644
--- a/mail/phpmailer/Makefile
+++ b/mail/phpmailer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= phpmailer
PORTVERSION= 5.0.2
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20for%20php5_6/PHPMailer%20v${PORTVERSION}
DISTNAME= PHPMailer_v${DISTVERSION}
MAINTAINER= bg1tpt@gmail.com
diff --git a/mail/phpmailer2/Makefile b/mail/phpmailer2/Makefile
index d52eaaa775e3..7aa9c5ac3b7f 100644
--- a/mail/phpmailer2/Makefile
+++ b/mail/phpmailer2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= phpmailer2
PORTVERSION= 2.0.4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpmailer
+MASTER_SITES= SF/phpmailer/phpmailer%20for%20php4/PHPMailer%20v${PORTVERSION}%20for%20PHP4
DISTNAME= PHPMailer_v${DISTVERSION}
MAINTAINER= joehorn@gmail.com
diff --git a/mail/pm-lib/Makefile b/mail/pm-lib/Makefile
index a40e68c90f73..f882141099fd 100644
--- a/mail/pm-lib/Makefile
+++ b/mail/pm-lib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pm-lib
PORTVERSION= 20041216
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2004.1216
DISTNAME= procmail-lib-2004.1216
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index f92cc1db8fa3..0cd77de3d8fb 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= policyd2
PORTVERSION= 2.0.7
CATEGORIES= mail
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= policyd
+MASTER_SITES= SF/policyd/2.0.x%20%28Stable%29/v${PORTVERSION}
DISTNAME= cluebringer-${PORTVERSION}
MAINTAINER?= chifeng@gmail.com
diff --git a/mail/pop-before-smtp/Makefile b/mail/pop-before-smtp/Makefile
index 8035cdb9afda..6a54e574e325 100644
--- a/mail/pop-before-smtp/Makefile
+++ b/mail/pop-before-smtp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pop-before-smtp
PORTVERSION= 1.42
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= popbsmtp
+MASTER_SITES= SF/popbsmtp/Source%20tar/${PORTVERSION}
MAINTAINER= jadawin@FreeBSD.org
COMMENT= A log parser to identify valid POP/IMAP logins for later smtp
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 9eca8273735e..b7ae2445e7b8 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pop3lite
PORTVERSION= 0.2.4a
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A flexible, modular RFC-compliant POP3 daemon
diff --git a/mail/pop3vscan/Makefile b/mail/pop3vscan/Makefile
index 0dee91a8a5e3..5cdaf89e618b 100644
--- a/mail/pop3vscan/Makefile
+++ b/mail/pop3vscan/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pop3vscan
PORTVERSION= 0.4
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= leeym@FreeBSD.org
COMMENT= A transparent POP3-Proxy with virus-scanning capabilities
diff --git a/mail/popfile/Makefile b/mail/popfile/Makefile
index 5db01894ed4e..d01ae3dbed2e 100644
--- a/mail/popfile/Makefile
+++ b/mail/popfile/Makefile
@@ -9,8 +9,7 @@ PORTNAME= popfile
PORTVERSION= 1.0.1
#PORTREVISION= 0
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/2.%20POPFile%20Cross%20Platform/v${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= matusita@FreeBSD.org
diff --git a/mail/postfix-gps/Makefile b/mail/postfix-gps/Makefile
index 1f85ce59ff2f..264bae373ec2 100644
--- a/mail/postfix-gps/Makefile
+++ b/mail/postfix-gps/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gps
PORTVERSION= 1.005
PORTREVISION= 2
CATEGORIES= mail security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=greylist
+MASTER_SITES= SF/greylist/greylist/${PORTVERSION}-bugfix
PKGNAMEPREFIX= postfix-
DISTNAME= gps-${PORTVERSION}-bugfix
diff --git a/mail/postfix-policyd-sf/Makefile b/mail/postfix-policyd-sf/Makefile
index f4895537d30c..533ef089f366 100644
--- a/mail/postfix-policyd-sf/Makefile
+++ b/mail/postfix-policyd-sf/Makefile
@@ -9,8 +9,9 @@ PORTNAME= policyd
PORTVERSION= 1.82
PORTEPOCH= 1
CATEGORIES= mail
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/1.x%20%28Old%20Stable%29/v${PORTVERSION} \
ftp://ftp.oav.net/pkg_freebsd/distfiles/
+
PKGNAMEPREFIX= postfix-
PKGNAMESUFFIX= -sf
diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index 04399ace4293..76d17a64ff64 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= postfixadmin
PORTVERSION= 2.2.1.1
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= postfixadmin
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= terry@sucked-in.com
COMMENT= PHP web-based management tool for Postfix virtual domains and users
diff --git a/mail/py-milter/Makefile b/mail/py-milter/Makefile
index 6d549a916e50..cd8514422a39 100644
--- a/mail/py-milter/Makefile
+++ b/mail/py-milter/Makefile
@@ -8,9 +8,9 @@
PORTNAME= milter
PORTVERSION= 0.8.7
CATEGORIES= mail python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/py${PORTNAME}/OldFiles \
http://www.bmsi.com/python/
-MASTER_SITE_SUBDIR= pymilter
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= georg@graf.priv.at
diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index d05ca7d943de..4b783806beec 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -9,8 +9,7 @@ PORTNAME= spambayes
PORTVERSION= 1.0.4
PORTREVISION= 4
CATEGORIES= mail python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/py-spf/Makefile b/mail/py-spf/Makefile
index 197f472a1034..9f9c4e2c03b0 100644
--- a/mail/py-spf/Makefile
+++ b/mail/py-spf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= spf
PORTVERSION= 2.0.5
CATEGORIES= mail python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pymilter
+MASTER_SITES= SF/pymilter/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
diff --git a/mail/qmail-auditor/Makefile b/mail/qmail-auditor/Makefile
index a050107dcaef..26d464178f1c 100644
--- a/mail/qmail-auditor/Makefile
+++ b/mail/qmail-auditor/Makefile
@@ -9,7 +9,7 @@ PORTNAME= qmail-auditor
PORTVERSION= 0.47
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= SF http://www6.freebsdbrasil.com.br/~eksffa/l/qmail-auditor/
+MASTER_SITES= http://www6.freebsdbrasil.com.br/~eksffa/l/qmail-auditor/
MAINTAINER= eksffa@freebsdbrasil.com.br
COMMENT= Selective e-mail auditing for qmail by means of qmail-queue wrapping
diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile
index ac183f70b72c..5e5cd3ba346e 100644
--- a/mail/qmail-scanner1/Makefile
+++ b/mail/qmail-scanner1/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qmail-scanner
PORTVERSION= 1.25
PORTREVISION= 2
CATEGORIES= mail security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
EXTRACT_SUFX= .tgz
diff --git a/mail/qmailadmin-devel/Makefile b/mail/qmailadmin-devel/Makefile
index b79bfbf2ec73..509994aefc0e 100644
--- a/mail/qmailadmin-devel/Makefile
+++ b/mail/qmailadmin-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qmailadmin
PORTVERSION= 1.2.13
PORTEPOCH= 1
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= ismail.yenigul@endersys.com.tr
COMMENT= CGI program for administering Qmail with vchkpw/vpopmail
diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index 52f240097b7a..f0112c240e0a 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qmailadmin
PORTVERSION= 1.2.12
PORTEPOCH= 2
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= roam@FreeBSD.org
COMMENT= CGI program for administering Qmail with vchkpw/vpopmail
diff --git a/mail/qmhandle/Makefile b/mail/qmhandle/Makefile
index 8f63f45f64b8..1c614cf38ed6 100644
--- a/mail/qmhandle/Makefile
+++ b/mail/qmhandle/Makefile
@@ -9,7 +9,7 @@ PORTNAME= qmhandle
PORTVERSION= 1.3.2
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1.3/${PORTNAME}-${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= Tool to view and manage a qmail queue
diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 2d73896fae7c..23a8fb5bef9e 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -10,7 +10,8 @@ PORTVERSION= 2.1.r3
PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://www.enderunix.org/qsheff/ \
- SF/qsheff
+ SF/qsheff/qsheff/II-2.1-r3
+
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-r/}
MAINTAINER= ozkan@enderunix.org
diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index 3924c33b1048..09374ed421a6 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -8,8 +8,7 @@
PORTNAME= razor-agents
PORTVERSION= 2.84
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= razor
+MASTER_SITES= SF/razor/${PORTNAME}/${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= A distributed, collaborative, spam detection and filtering network
diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile
index d95f0e205210..50784594af55 100644
--- a/mail/rblcheck/Makefile
+++ b/mail/rblcheck/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rblcheck
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= moro@remus.dti.ne.jp
COMMENT= Command-line interface to Paul Vixie's RBL filter
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 9938f9c5cf52..2c980b2fa715 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -9,7 +9,7 @@ PORTNAME= roundcube
DISTVERSION= 0.2.2
PORTEPOCH= 1
CATEGORIES= mail www
-MASTER_SITES= SF/${PORTNAME}mail
+MASTER_SITES= SF/${PORTNAME}mail/${PORTNAME}mail/${PORTVERSION}
DISTNAME= ${PORTNAME}mail-${DISTVERSION}
MAINTAINER= ale@FreeBSD.org
diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile
index c56084c8fe0d..86ae0e8447ce 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sentinel
PORTVERSION= 1.7b
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= smfilter
+MASTER_SITES= SF/smfilter/${PORTNAME}/Sentinel%20${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A sendmail milter API implementation
diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index ebd2e10c555a..1db4c02a8518 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sid-milter
PORTVERSION= 1.0.0
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_PROJECT}
-MASTER_SITE_SUBDIR= ${PORTNAME}/SenderID%20Milter/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/SenderID%20Milter/${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= An sid and spf milter for Sendmail
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index 18e83854a59f..c2982911cd54 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -9,7 +9,7 @@ PORTNAME= simscan
PORTVERSION= 1.4.0
PORTREVISION= 4
CATEGORIES= mail security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
MAINTAINER= lippe@FreeBSD.org
diff --git a/mail/smtprc/Makefile b/mail/smtprc/Makefile
index 599218382b0a..59715ee34300 100644
--- a/mail/smtprc/Makefile
+++ b/mail/smtprc/Makefile
@@ -9,8 +9,7 @@
PORTNAME= smtprc
PORTVERSION= 2.0.3
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= mich@FreeBSD.org
diff --git a/mail/spamcup/Makefile b/mail/spamcup/Makefile
index c1f1741b9fcc..cdb2e5e97fca 100644
--- a/mail/spamcup/Makefile
+++ b/mail/spamcup/Makefile
@@ -9,8 +9,7 @@ PORTNAME= spamcup
PORTVERSION= 1.09
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool for automatic spam reporting via Spamcop.net
diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index 84dbf82b2e72..b778cdb5d5af 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sqlgrey
PORTVERSION= 1.7.6
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1.7%20%28devel%29/${PORTVERSION}
MAINTAINER= chifeng@gmail.com
COMMENT= Greylisting policy server for Postfix using an SQL backend
diff --git a/mail/squirrelmail-devel/Makefile b/mail/squirrelmail-devel/Makefile
index 02231f893a41..3e3b28f271b4 100644
--- a/mail/squirrelmail-devel/Makefile
+++ b/mail/squirrelmail-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= squirrelmail
PORTVERSION= 1.5.1
PORTREVISION= 2
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMESUFFIX= -devel
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
all_locales-${PORTVERSION}-20060219${EXTRACT_SUFX}
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index f72a3e03df93..ea5740510b1f 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -9,8 +9,7 @@ PORTNAME= squirrelmail
PORTVERSION= 1.4.19
PORTREVISION= 1
CATEGORIES= mail www
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= tabthorpe
+MASTER_SITES= SF/${PORTNAME}/stable/${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
all_locales-1.4.13-20071220${EXTRACT_SUFX}
DIST_SUBDIR= ${PORTNAME}
diff --git a/mail/squirreloutlook/Makefile b/mail/squirreloutlook/Makefile
index c0be88f05ec7..e4c8c1cf034a 100644
--- a/mail/squirreloutlook/Makefile
+++ b/mail/squirreloutlook/Makefile
@@ -9,8 +9,7 @@ PORTNAME= squirreloutlook
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTVERSION}
squirrelmail
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
all_locales-1.5.1-20060409${EXTRACT_SUFX}
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 9bce2d5ddaca..1f0fe4fa25f8 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sqwebmail
PORTVERSION= 5.3.2
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= courier
+MASTER_SITES= SF/courier/webmail/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= CGI Webmail client for Maildirs
diff --git a/mail/vchkuser/Makefile b/mail/vchkuser/Makefile
index c17cc62a75bf..f0b2b1084ff4 100644
--- a/mail/vchkuser/Makefile
+++ b/mail/vchkuser/Makefile
@@ -9,7 +9,7 @@ PORTNAME= vchkuser
PORTVERSION= 0.2
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= loos.br@gmail.com
COMMENT= Qmail-smtpd+vpopmail check rcpt to on the fly
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 4015b7925716..0065b2e07686 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= vpopmail
PORTVERSION= 5.4.27
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
MAINTAINER= roam@FreeBSD.org
COMMENT= Easy virtual domain and authentication package for use with qmail
diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile
index 493d3f535cbc..d838657f9778 100644
--- a/mail/vqadmin/Makefile
+++ b/mail/vqadmin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vqadmin
PORTVERSION= 2.3.6
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= vqadmin
+MASTER_SITES= SF
MAINTAINER= oliver@FreeBSD.org
COMMENT= A cgi-based Virtual Qmail Domains Administrator
diff --git a/mail/whoson/Makefile b/mail/whoson/Makefile
index 32100897a2a3..e3048fa587dd 100644
--- a/mail/whoson/Makefile
+++ b/mail/whoson/Makefile
@@ -8,8 +8,7 @@
PORTNAME= whoson
PORTVERSION= 2.05
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= sem@FreeBSD.org
COMMENT= Implementation of `WHO iS ONline' protocol