aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/speak_freely/Makefile3
-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
-rw-r--r--math/PDL/Makefile6
-rw-r--r--math/R-cran-igraph/Makefile2
-rw-r--r--math/algae/Makefile3
-rw-r--r--math/asymptote/Makefile2
-rw-r--r--math/atlas-devel/Makefile3
-rw-r--r--math/atlas/Makefile3
-rw-r--r--math/blitz++/Makefile3
-rw-r--r--math/calc/Makefile2
-rw-r--r--math/calcoo/Makefile3
-rw-r--r--math/chryzodus/Makefile3
-rw-r--r--math/digitizer/Makefile3
-rw-r--r--math/drgeo/Makefile3
-rw-r--r--math/elmer-umfpack/Makefile2
-rw-r--r--math/fann/Makefile3
-rw-r--r--math/freefem/Makefile2
-rw-r--r--math/freemat/Makefile3
-rw-r--r--math/fung-calc/Makefile3
-rw-r--r--math/galculator/Makefile3
-rw-r--r--math/gambit/Makefile2
-rw-r--r--math/gnuplot+/Makefile5
-rw-r--r--math/gnuplot/Makefile3
-rw-r--r--math/goblin/Makefile2
-rw-r--r--math/gracetmpl/Makefile3
-rw-r--r--math/gri/Makefile3
-rw-r--r--math/it++/Makefile3
-rw-r--r--math/jts/Makefile3
-rw-r--r--math/k3dsurf/Makefile3
-rw-r--r--math/labplot/Makefile3
-rw-r--r--math/lapack++/Makefile4
-rw-r--r--math/liborigin/Makefile2
-rw-r--r--math/libqalculate/Makefile2
-rw-r--r--math/lp_solve/Makefile2
-rw-r--r--math/lybniz/Makefile2
-rw-r--r--math/mpexpr/Makefile3
-rw-r--r--math/muparser/Makefile2
-rw-r--r--math/open-axiom/Makefile2
-rw-r--r--math/ploticus-nox11/Makefile2
-rw-r--r--math/plplot/Makefile2
-rw-r--r--math/py-basemap-data/Makefile3
-rw-r--r--math/py-basemap/Makefile3
-rw-r--r--math/py-gnuplot/Makefile2
-rw-r--r--math/py-gsl/Makefile3
-rw-r--r--math/py-mathdom/Makefile3
-rw-r--r--math/py-matplotlib/Makefile2
-rw-r--r--math/py-numarray/Makefile3
-rw-r--r--math/py-numeric/Makefile3
-rw-r--r--math/py-numpy/Makefile3
-rw-r--r--math/py-plastex/Makefile2
-rw-r--r--math/py-probstat/Makefile3
-rw-r--r--math/py-symeig/Makefile3
-rw-r--r--math/qalculate/Makefile2
-rw-r--r--math/qwtplot3d/Makefile3
-rw-r--r--math/rascal/Makefile3
-rw-r--r--math/rkward-kde4/Makefile3
-rw-r--r--math/rkward/Makefile3
-rw-r--r--math/ruby-gnuplot/Makefile3
-rw-r--r--math/scigraphica/Makefile5
-rw-r--r--math/scilab-toolbox-sivp/Makefile2
-rw-r--r--math/scilab-toolbox-swt/Makefile3
-rw-r--r--math/spar/Makefile3
-rw-r--r--math/stp/Makefile3
-rw-r--r--math/surf/Makefile2
-rw-r--r--math/tvmet/Makefile2
-rw-r--r--math/ump/Makefile2
-rw-r--r--math/wcalc/Makefile3
-rw-r--r--math/wfmath/Makefile3
-rw-r--r--math/wxMaxima/Makefile2
-rw-r--r--mbone/speak_freely/Makefile3
-rw-r--r--misc/amanda-server/Makefile3
-rw-r--r--misc/amanda25-server/Makefile3
-rw-r--r--misc/amanda26-server/Makefile3
-rw-r--r--misc/amanda32-server/Makefile3
-rw-r--r--misc/bb/Makefile3
-rw-r--r--misc/bdelta/Makefile3
-rw-r--r--misc/bibletime-kde3/Makefile2
-rw-r--r--misc/bibletime-kde4/Makefile2
-rw-r--r--misc/bidwatcher/Makefile3
-rw-r--r--misc/bottlerocket/Makefile3
-rw-r--r--misc/cdcollect/Makefile2
-rw-r--r--misc/cloc/Makefile2
-rw-r--r--misc/clpbar/Makefile3
-rw-r--r--misc/cmatrix/Makefile3
-rw-r--r--misc/deco/Makefile3
-rw-r--r--misc/diary-hercules/Makefile2
-rw-r--r--misc/fortune-mod-bible/Makefile3
-rw-r--r--misc/freeguide/Makefile3
-rw-r--r--misc/geekcode/Makefile3
-rw-r--r--misc/gkrellmlaunch/Makefile3
-rw-r--r--misc/gkrellshoot/Makefile3
-rw-r--r--misc/gkrellshoot2/Makefile3
-rw-r--r--misc/gwenview-i18n/Makefile3
-rw-r--r--misc/jbidwatcher/Makefile3
-rw-r--r--misc/k3b-i18n/Makefile3
-rw-r--r--misc/kbfx/Makefile3
-rw-r--r--misc/kcd-devel/Makefile3
-rw-r--r--misc/lesspipe/Makefile3
-rw-r--r--misc/libhome/Makefile2
-rw-r--r--misc/libmcal/Makefile3
-rw-r--r--misc/lifelines/Makefile2
-rw-r--r--misc/lingoteach/Makefile3
-rw-r--r--misc/lr/Makefile3
-rw-r--r--misc/lxde-common/Makefile3
-rw-r--r--misc/metalink-checker/Makefile3
-rw-r--r--misc/metalink-editor/Makefile2
-rw-r--r--misc/metalink-tools/Makefile3
-rw-r--r--misc/mtx/Makefile3
-rw-r--r--misc/nagios-base-logos/Makefile3
-rw-r--r--misc/opencyc/Makefile2
-rw-r--r--misc/pauker/Makefile2
-rw-r--r--misc/pdfmap/Makefile2
-rw-r--r--misc/pipe/Makefile3
-rw-r--r--misc/posixtestsuite/Makefile2
-rw-r--r--misc/py-pexpect/Makefile2
-rw-r--r--misc/salias/Makefile3
-rw-r--r--misc/shuffle-db/Makefile3
-rw-r--r--misc/table.el/Makefile3
-rw-r--r--misc/tkman/Makefile3
-rw-r--r--misc/tmux/Makefile2
-rw-r--r--misc/tvbrowser/Makefile2
-rw-r--r--misc/upclient/Makefile4
-rw-r--r--misc/wmcalendar/Makefile3
-rw-r--r--misc/wmweather+/Makefile3
-rw-r--r--misc/xbiso/Makefile3
-rw-r--r--multimedia/atomicparsley/Makefile2
-rw-r--r--multimedia/avidemux2/Makefile4
-rw-r--r--multimedia/avifile/Makefile3
-rw-r--r--multimedia/beep-media-player/Makefile2
-rw-r--r--multimedia/camserv/Makefile3
-rw-r--r--multimedia/clive1/Makefile3
-rw-r--r--multimedia/dirac/Makefile3
-rw-r--r--multimedia/dumpmpeg/Makefile3
-rw-r--r--multimedia/dv2jpg/Makefile3
-rw-r--r--multimedia/dvbsnoop/Makefile2
-rw-r--r--multimedia/dvd-slideshow/Makefile2
-rw-r--r--multimedia/dvdauthor/Makefile3
-rw-r--r--multimedia/dvdstyler/Makefile3
-rw-r--r--multimedia/emovix/Makefile3
-rw-r--r--multimedia/freevo/Makefile3
-rw-r--r--multimedia/gavl/Makefile2
-rw-r--r--multimedia/gdialog/Makefile3
-rw-r--r--multimedia/gdvrecv/Makefile3
-rw-r--r--multimedia/gmencoder/Makefile3
-rw-r--r--multimedia/gmerlin-avdecoder/Makefile2
-rw-r--r--multimedia/gmimms/Makefile3
-rw-r--r--multimedia/gnome-subtitles/Makefile3
-rw-r--r--multimedia/gopchop/Makefile4
-rw-r--r--multimedia/gpac-libgpac/Makefile3
-rw-r--r--multimedia/gpac-mp4box/Makefile3
-rw-r--r--multimedia/grpplaylist/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-buzztard/Makefile2
-rw-r--r--multimedia/gsubedit/Makefile2
-rw-r--r--multimedia/gxine/Makefile3
-rw-r--r--multimedia/iriverter/Makefile2
-rw-r--r--multimedia/jahshaka/Makefile2
-rw-r--r--multimedia/k9copy-kde4/Makefile3
-rw-r--r--multimedia/k9copy/Makefile3
-rw-r--r--multimedia/kaffeine-mozilla/Makefile2
-rw-r--r--multimedia/kaffeine/Makefile3
-rw-r--r--multimedia/kbtv/Makefile4
-rw-r--r--multimedia/kino/Makefile3
-rw-r--r--multimedia/kmenc15/Makefile3
-rw-r--r--multimedia/ksubeditor/Makefile3
-rw-r--r--multimedia/libdc1394/Makefile2
-rw-r--r--multimedia/libdvdnav/Makefile3
-rw-r--r--multimedia/libfame/Makefile3
-rw-r--r--multimedia/libmovtar/Makefile3
-rw-r--r--multimedia/libmpeg3/Makefile2
-rw-r--r--multimedia/libxine/Makefile2
-rw-r--r--multimedia/libxspf/Makefile3
-rw-r--r--multimedia/linux-xmovie/Makefile2
-rw-r--r--multimedia/lsdvd/Makefile2
-rw-r--r--multimedia/mediainfo/Makefile2
-rw-r--r--multimedia/mjpegtools/Makefile2
-rw-r--r--multimedia/mkxvcd/Makefile3
-rw-r--r--multimedia/mmpython/Makefile2
-rw-r--r--multimedia/motion/Makefile2
-rw-r--r--multimedia/mpgtx/Makefile3
-rw-r--r--multimedia/msdl/Makefile2
-rw-r--r--multimedia/nxtvepg/Makefile2
-rw-r--r--multimedia/openquicktime/Makefile3
-rw-r--r--multimedia/oqtencoder/Makefile3
-rw-r--r--multimedia/oqtplayer/Makefile3
-rw-r--r--multimedia/p5-GStreamer/Makefile3
-rw-r--r--multimedia/projectx/Makefile3
-rw-r--r--multimedia/py-kaa-base/Makefile3
-rw-r--r--multimedia/py-kaa-imlib2/Makefile3
-rw-r--r--multimedia/py-kaa-metadata/Makefile3
-rw-r--r--multimedia/recmpeg/Makefile3
-rw-r--r--multimedia/sabbu/Makefile3
-rw-r--r--multimedia/smplayer-themes/Makefile2
-rw-r--r--multimedia/smplayer/Makefile2
-rw-r--r--multimedia/subtitlecomposer-kde4/Makefile3
-rw-r--r--multimedia/subtitlecomposer/Makefile3
-rw-r--r--multimedia/subtitleripper/Makefile3
-rw-r--r--multimedia/tivodecode/Makefile2
-rw-r--r--multimedia/tovid/Makefile3
-rw-r--r--multimedia/transkode/Makefile2
-rw-r--r--multimedia/tunapie/Makefile2
-rw-r--r--multimedia/xine/Makefile3
-rw-r--r--multimedia/xmms/Makefile2
-rw-r--r--multimedia/xtheater/Makefile2
-rw-r--r--sysutils/tmux/Makefile2
292 files changed, 308 insertions, 495 deletions
diff --git a/audio/speak_freely/Makefile b/audio/speak_freely/Makefile
index f15998a2ff13..9215744498df 100644
--- a/audio/speak_freely/Makefile
+++ b/audio/speak_freely/Makefile
@@ -8,8 +8,7 @@
PORTNAME= speak_freely
PORTVERSION= 7.6a
CATEGORIES= mbone audio security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/speak-freely/speak-freely/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Voice communication over data networks
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
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index d7ab89e26b1c..adfd312d786c 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -10,10 +10,8 @@ PORTNAME= PDL
PORTVERSION= 2.4.4
PORTREVISION= 1
CATEGORIES= math perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:cpan \
- ${PORTNAME:L}/:sf
+MASTER_SITES= CPAN/${PORTNAME}:cpan \
+ SF/pdl/PDL/${PORTVERSION}:sf
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan,sf
MAINTAINER= perl@FreeBSD.org
diff --git a/math/R-cran-igraph/Makefile b/math/R-cran-igraph/Makefile
index 3279e5df27cd..c911db69c393 100644
--- a/math/R-cran-igraph/Makefile
+++ b/math/R-cran-igraph/Makefile
@@ -9,7 +9,7 @@ PORTNAME= igraph
PORTVERSION= 0.5.2
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/R%20source%20package/${PORTVERSION}
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/math/algae/Makefile b/math/algae/Makefile
index 0bd6fd1d43a3..8f4db4976ba1 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -9,8 +9,7 @@ PORTNAME= algae
PORTVERSION= 4.3.6
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A programming language for numerical analysis
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index 1d7eaef9c58d..3d55395672ff 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -9,7 +9,7 @@ PORTNAME= asymptote
PORTVERSION= 1.75
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/old/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
EXTRACT_SUFX= .tgz
diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index 5a09a0e42498..c306267bcc96 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= atlas
PORTVERSION= 3.9.11
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= math-atlas
+MASTER_SITES= SF/math-${PORTNAME}/Developer%20%28unstable%29/${PORTVERSION}
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 71c3c4b9528a..a24f7c4f327c 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -9,8 +9,7 @@ PORTNAME= atlas
PORTVERSION= 3.8.3
PORTEPOCH= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= math-atlas
+MASTER_SITES= SF/math-${PORTNAME}/Stable/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= maho@FreeBSD.org
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index c005be3a6896..87f3bb90b0bc 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -10,8 +10,7 @@ PORTNAME= blitz++
PORTVERSION= 0.9
PORTREVISION= 3
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= blitz
+MASTER_SITES= SF/blitz/blitz/Blitz%2B%2B%20${PORTVERSION}
DISTNAME= blitz-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/calc/Makefile b/math/calc/Makefile
index a3f9e6837a2f..8c124da29c41 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= calc
PORTVERSION= 2.12.4.0
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.12.4
MAINTAINER= johans@stack.nl
COMMENT= Arbitrary precision calculator
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 78e25f330a9c..0f915b8e6963 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -8,8 +8,7 @@ PORTNAME= calcoo
PORTVERSION= 1.3.18
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= calcoo
+MASTER_SITES= SF
MAINTAINER= naddy@FreeBSD.org
COMMENT= RPN and algebraic scientific calculator
diff --git a/math/chryzodus/Makefile b/math/chryzodus/Makefile
index f8c135e77905..2637efb301f6 100644
--- a/math/chryzodus/Makefile
+++ b/math/chryzodus/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.32
DISTVERSIONSUFFIX= -src
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= nivit@FreeBSD.org
COMMENT= A chryzode (http//www.chryzode.org) explorer
diff --git a/math/digitizer/Makefile b/math/digitizer/Makefile
index 356152227c40..bbc4fd20c68e 100644
--- a/math/digitizer/Makefile
+++ b/math/digitizer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= digitizer
PORTVERSION= 4.1
PORTREVISION= 4
CATEGORIES= math graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Engauge%20Digitizer/${PORTNAME}-${PORTVERSION}
DISTNAME= digit-src-${PORTVERSION:S/./_/}
MAINTAINER= thierry@FreeBSD.org
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 097597992b26..fe9c672418ff 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -9,8 +9,7 @@ PORTNAME= drgeo
PORTVERSION= 1.1.0
PORTREVISION= 9
CATEGORIES= math
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ofset
+MASTER_SITES= SF/ofset/${PORTNAME}/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A GTK interactive geometry sofware
diff --git a/math/elmer-umfpack/Makefile b/math/elmer-umfpack/Makefile
index 0656b5451fe8..c9f2474e91a6 100644
--- a/math/elmer-umfpack/Makefile
+++ b/math/elmer-umfpack/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 4.4
PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= math
-MASTER_SITES= SF/elmerfem
+MASTER_SITES= # none know, please fix
PKGNAMEPREFIX= elmer-
MAINTAINER= scjamorim@bsd.com.br
diff --git a/math/fann/Makefile b/math/fann/Makefile
index 414ca9e77e7b..cf8dda3afd24 100644
--- a/math/fann/Makefile
+++ b/math/fann/Makefile
@@ -8,8 +8,7 @@
PORTNAME= fann
PORTVERSION= 2.1.0b
CATEGORIES= math science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fann
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}eta
DISTNAME= fann-2.1.0beta
MAINTAINER= tzhuan@csie.org
diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index 48d0607296a9..ecb48d4b078e 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -9,7 +9,7 @@ PORTNAME= freefem
PORTVERSION= 3.5.8
PORTREVISION= 1
CATEGORIES= math science
-MASTER_SITES= SF/kfem
+MASTER_SITES= SF/kfem/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A language for the Finite Element Method
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 81d6a4eba376..805b358ceffe 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -9,8 +9,7 @@ PORTNAME= FreeMat
PORTVERSION= 3.6
PORTREVISION= 4
CATEGORIES= math science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF
.ifdef WITH_MPI
PKGNAMESUFFIX= -mpi
.endif
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index 82b73161ade9..ae337d620257 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -8,8 +8,7 @@ PORTNAME= fung-calc
PORTVERSION= 1.3.2b
PORTREVISION= 11
CATEGORIES= math kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= Advanced graphic calculator
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index ee03b3f9a3b4..86dcf695d55b 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -9,8 +9,7 @@ PORTNAME= galculator
PORTVERSION= 1.3.4
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= naddy@FreeBSD.org
COMMENT= GTK2-based scientific calculator
diff --git a/math/gambit/Makefile b/math/gambit/Makefile
index 613a62e129ec..42075dfde63e 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gambit
PORTVERSION= 0.2007.12.04
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A library of tools for doing computation in game theory
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 42bdbfd2eb89..eb0e66943511 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -9,10 +9,11 @@ PORTNAME= gnuplot371+
PORTVERSION= 1.2.0
PORTREVISION= 6
CATEGORIES= math japanese graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/gnuplot/gnuplot/3.7.1 \
http://www.yama-ga.com/gnuplot/:patch \
+
http://www.h2.dion.ne.jp/~yamaga/gnuplot/:patch
-MASTER_SITE_SUBDIR= gnuplot
+
DISTFILES= gnuplot-3.7.1.tar.gz \
gnuplot3.7.1+${PORTVERSION}.patch.tar.gz:patch
EXTRACT_ONLY= gnuplot-3.7.1.tar.gz
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 999e6e078eef..483a1570cacb 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnuplot
PORTVERSION= 4.2.5
PORTREVISION= 1
CATEGORIES= math graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= glewis@FreeBSD.org
COMMENT= A command-driven interactive function plotting program
diff --git a/math/goblin/Makefile b/math/goblin/Makefile
index 3d42e9bc45e0..856cfbc76203 100644
--- a/math/goblin/Makefile
+++ b/math/goblin/Makefile
@@ -9,7 +9,7 @@
PORTNAME= goblin
DISTVERSION= 2.8b28
CATEGORIES= math
-MASTER_SITES= SF/goblin2
+MASTER_SITES= SF/${PORTNAME}2/${PORTNAME}2/${PORTNAME}.2.8b28
DISTNAME= ${PORTNAME}.${DISTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/math/gracetmpl/Makefile b/math/gracetmpl/Makefile
index 13c4c41881b6..77b000be3da8 100644
--- a/math/gracetmpl/Makefile
+++ b/math/gracetmpl/Makefile
@@ -9,8 +9,7 @@
PORTNAME= gracetmpl
PORTVERSION= 0.3.2
CATEGORIES= math print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Provide an easy way to use existing grace-files as a template
diff --git a/math/gri/Makefile b/math/gri/Makefile
index 1db9edc7d2c5..04a9427df96a 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gri
PORTVERSION= 2.12.18
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= christopher.illies@ki.se
COMMENT= An extensible plotting language for producing scientific graphs
diff --git a/math/it++/Makefile b/math/it++/Makefile
index 92d4e663df51..f95dd8f21ed4 100644
--- a/math/it++/Makefile
+++ b/math/it++/Makefile
@@ -10,8 +10,7 @@ PORTNAME= it++
PORTVERSION= 4.0.6
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= itpp
+MASTER_SITES= SF/itpp/itpp/${PORTVERSION}
DISTNAME= itpp-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/jts/Makefile b/math/jts/Makefile
index 7f2faf086b2b..e10a66def1b0 100644
--- a/math/jts/Makefile
+++ b/math/jts/Makefile
@@ -8,8 +8,7 @@
PORTNAME= jts
PORTVERSION= 1.10
CATEGORIES= math databases
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= jts-topo-suite
+MASTER_SITES= SF/${PORTNAME}-topo-suite/${PORTNAME}/${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= JTS Topology Suite
diff --git a/math/k3dsurf/Makefile b/math/k3dsurf/Makefile
index f2378073078a..6eb6f530bfa7 100644
--- a/math/k3dsurf/Makefile
+++ b/math/k3dsurf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= k3dsurf
PORTVERSION= 0.6.2
PORTREVISION= 2
CATEGORIES= math graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_Linux/${PORTVERSION}
MAINTAINER= thierry@FreeBSD.org
COMMENT= Visualize and manipulate Mathematical surfaces or curves
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 2d57b91fe681..bf3b04dd025d 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -9,8 +9,7 @@ PORTNAME= LabPlot
PORTVERSION= 1.6.0.2
PORTREVISION= 4
CATEGORIES= math kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=labplot
+MASTER_SITES= SF
MAINTAINER= makc@FreeBSD.org
COMMENT= LabPlot : Data analysis and visualisation
diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile
index d5c4ad97ee31..994d51ea149f 100644
--- a/math/lapack++/Makefile
+++ b/math/lapack++/Makefile
@@ -8,9 +8,9 @@
PORTNAME= lapack++
PORTVERSION= 2.5.3
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/lapackpp/lapackpp/${PORTVERSION} \
http://math.nist.gov/lapack++/:doc
-MASTER_SITE_SUBDIR= lapackpp
+
DISTNAME= lapackpp-${PORTVERSION}
.if !defined(NOPORTDOCS)
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} lapack++.ps.gz:doc lapackpp1_1.ps.gz:doc \
diff --git a/math/liborigin/Makefile b/math/liborigin/Makefile
index 45d92bd719e2..55a8ba90f94d 100644
--- a/math/liborigin/Makefile
+++ b/math/liborigin/Makefile
@@ -9,7 +9,7 @@ PORTNAME= liborigin
PORTVERSION= 20070926
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2007
MAINTAINER= makc@FreeBSD.org
COMMENT= Tools for importing OriginLab .OPJ files
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index cf98220e672a..04098441733b 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libqalculate
PORTVERSION= 0.9.6
PORTREVISION= 5
CATEGORIES= math
-MASTER_SITES= SF/qalculate
+MASTER_SITES= SF/qalculate/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= scjamorim@bsd.com.br
COMMENT= A a multi-purpose desktop calculator (backend library)
diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile
index 3e444da3c914..e2779b287e45 100644
--- a/math/lp_solve/Makefile
+++ b/math/lp_solve/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lp_solve
PORTVERSION= 5.5.0.14
CATEGORIES= math
-MASTER_SITES= SF/lpsolve
+MASTER_SITES= SF/lpsolve/lpsolve/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_source
MAINTAINER= ports@FreeBSD.org
diff --git a/math/lybniz/Makefile b/math/lybniz/Makefile
index 7e4173f9fd98..75204f877ef6 100644
--- a/math/lybniz/Makefile
+++ b/math/lybniz/Makefile
@@ -9,7 +9,7 @@ PORTNAME= lybniz
PORTVERSION= 1.3.2
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= SF/${PORTNAME}2
+MASTER_SITES= SF/${PORTNAME}2/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Mathematical function graph plotter
diff --git a/math/mpexpr/Makefile b/math/mpexpr/Makefile
index aaa723191fcb..64a325a26a6e 100644
--- a/math/mpexpr/Makefile
+++ b/math/mpexpr/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mpexpr
PORTVERSION= 1.1
CATEGORIES= math tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mpexpr
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiple precision math for Tcl
diff --git a/math/muparser/Makefile b/math/muparser/Makefile
index a5c5ccc423ad..57327f3d7e8b 100644
--- a/math/muparser/Makefile
+++ b/math/muparser/Makefile
@@ -9,7 +9,7 @@ PORTNAME= muparser
PORTVERSION= 1.30
PORTREVISION= 1
CATEGORIES= math devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
DISTNAME= ${PORTNAME}_v130
MAINTAINER= nivit@FreeBSD.org
diff --git a/math/open-axiom/Makefile b/math/open-axiom/Makefile
index 6ae165829213..25c32a0ffa47 100644
--- a/math/open-axiom/Makefile
+++ b/math/open-axiom/Makefile
@@ -8,7 +8,7 @@
PORTNAME= open-axiom
PORTVERSION= 1.3.0
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= stephen@missouri.edu
COMMENT= A computer algebra system
diff --git a/math/ploticus-nox11/Makefile b/math/ploticus-nox11/Makefile
index 1906c4d56f9d..a236e7308f3d 100644
--- a/math/ploticus-nox11/Makefile
+++ b/math/ploticus-nox11/Makefile
@@ -5,8 +5,6 @@
# $FreeBSD$
#
-PORTNAME= ploticus
-
MAINTAINER= ports@FreeBSD.org
COMMENT= Generates plots and graphs from data (no X11 required)
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 7689634c5775..88359d5cae68 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -9,7 +9,7 @@ PORTNAME= plplot
PORTVERSION= 5.8.0
PORTREVISION= 3
CATEGORIES= math science
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
MAINTAINER= ports@FreeBSD.org
COMMENT= A scientific plotting package
diff --git a/math/py-basemap-data/Makefile b/math/py-basemap-data/Makefile
index 15e9bb9dcd2b..849616e4daef 100644
--- a/math/py-basemap-data/Makefile
+++ b/math/py-basemap-data/Makefile
@@ -9,8 +9,7 @@
PORTNAME= basemap-data
PORTVERSION= 0.9
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= matplotlib
+MASTER_SITES= SF/matplotlib/matplotlib-toolkits/basemap-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mainland@apeiron.net
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
index 93a8f40e6d86..4da9e605d8cc 100644
--- a/math/py-basemap/Makefile
+++ b/math/py-basemap/Makefile
@@ -10,8 +10,7 @@ PORTNAME= basemap
PORTVERSION= 0.9.2
PORTREVISION= 2
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= matplotlib
+MASTER_SITES= SF/matplotlib/matplotlib-toolkits/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mainland@apeiron.net
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index 5181bb41cfdb..422d45b4e52d 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnuplot
PORTVERSION= 1.8
CATEGORIES= math python
-MASTER_SITES= SF/gnuplot-py
+MASTER_SITES= SF/${PORTNAME}-py/Gnuplot-py/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= gnuplot-py-${PORTVERSION}
diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index af6aae4506f1..98cb50868b96 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gsl
PORTVERSION= 0.9.4
PORTREVISION= 1
CATEGORIES= math python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pygsl
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygsl-${PORTVERSION}
DIST_SUBDIR= python
diff --git a/math/py-mathdom/Makefile b/math/py-mathdom/Makefile
index 63ac560f5831..c99d8ca7e102 100644
--- a/math/py-mathdom/Makefile
+++ b/math/py-mathdom/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mathdom
PORTVERSION= 0.8
CATEGORIES= math python
-MASTER_SITES= SF \
- ${MASTER_SITE_CHEESESHOP}source/m/${PORTNAME}/
+MASTER_SITES= CHEESESHOP/source/m/${PORTNAME}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wenheping@gmail.com
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index 3dafcd00b81c..e4436f69cf03 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -10,7 +10,7 @@ PORTNAME= matplotlib
PORTVERSION= 0.98.5.2
PORTREVISION= 1
CATEGORIES= math python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mainland@apeiron.net
diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile
index 49270b277382..52635700314f 100644
--- a/math/py-numarray/Makefile
+++ b/math/py-numarray/Makefile
@@ -8,8 +8,7 @@
PORTNAME= numarray
PORTVERSION= 1.5.2
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= numpy
+MASTER_SITES= SF/numpy/Old%20Numarray/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= perky@FreeBSD.org
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 450cab16831b..b1c8b36afff4 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 24.2
PORTREVISION= 3
CATEGORIES= math python
MASTER_SITES= http://numpy.scipy.org/:doc \
- ${MASTER_SITE_SOURCEFORGE:S/$/:source/}
-MASTER_SITE_SUBDIR= numpy/:source
+ SF/numpy/Old%20Numeric/${PORTVERSION}:source
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= Numeric-${PORTVERSION}${EXTRACT_SUFX}:source \
numpy.pdf:doc
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 520d3979234e..3472b18feccd 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -11,8 +11,7 @@ PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= math python
MASTER_SITES= http://numpy.scipy.org/:doc \
- ${MASTER_SITE_SOURCEFORGE:S/$/:source/}
-MASTER_SITE_SUBDIR= numpy/:source
+ SF/${PORTNAME}/NumPy/${PORTVERSION}:source
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \
numpybook.pdf:doc
diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile
index acd200667639..8da3e3acdb8d 100644
--- a/math/py-plastex/Makefile
+++ b/math/py-plastex/Makefile
@@ -8,7 +8,7 @@
PORTNAME= plastex
PORTVERSION= 0.9.1
CATEGORIES= math python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/rel-0-9-1
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
EXTRACT_SUFX= .tgz
diff --git a/math/py-probstat/Makefile b/math/py-probstat/Makefile
index 753f6c3b0e40..fd4a3ba6e508 100644
--- a/math/py-probstat/Makefile
+++ b/math/py-probstat/Makefile
@@ -9,8 +9,7 @@
PORTNAME= probstat
PORTVERSION= 0.912
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile
index 94626a0c131d..7e1813d14e51 100644
--- a/math/py-symeig/Makefile
+++ b/math/py-symeig/Makefile
@@ -9,8 +9,7 @@ PORTNAME= symeig
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mdp-toolkit
+MASTER_SITES= SF/mdp-toolkit/mdp-toolkit/2.3
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= llwang@infor.org
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 8b80cf7752cb..5f61d1834ad2 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -9,7 +9,7 @@ PORTNAME= qalculate
PORTVERSION= 0.9.6
PORTREVISION= 3
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-gtk/${PORTNAME}-gtk-${PORTVERSION}
DISTNAME= ${PORTNAME}-gtk-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/qwtplot3d/Makefile b/math/qwtplot3d/Makefile
index 9ce8e813dbd9..d99497451049 100644
--- a/math/qwtplot3d/Makefile
+++ b/math/qwtplot3d/Makefile
@@ -10,8 +10,7 @@ PORTNAME= qwtplot3d
PORTVERSION= 0.2.7
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= makc@FreeBSD.org
diff --git a/math/rascal/Makefile b/math/rascal/Makefile
index 4ca356dfa63f..3f76b1e7aabd 100644
--- a/math/rascal/Makefile
+++ b/math/rascal/Makefile
@@ -10,8 +10,7 @@ PORTNAME= rascal
PORTVERSION= 0.3.2
PORTREVISION= 4
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Rascal/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= The Advanced Scientific CALculator
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index 9d44dc222806..95e79293c037 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -8,8 +8,7 @@
PORTNAME= rkward
PORTVERSION= 0.5.1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ../project/${PORTNAME}/Current_Stable_Releases
+MASTER_SITES= SF/${PORTNAME}/Current_Stable_Releases
PKGNAMESUFFIX= -kde4
MAINTAINER= thierry@FreeBSD.org
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 8cc52671adcf..c55e2dd46d21 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -10,8 +10,7 @@ DISTVERSION= 0.4.9a
PORTREVISION= 4
PORTEPOCH= 3
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Historical_Releases/0.4.x_and_earlier/0.4.9a%20%28KDE3%29
MAINTAINER= thierry@FreeBSD.org
COMMENT= IDE/GUI for the R-project
diff --git a/math/ruby-gnuplot/Makefile b/math/ruby-gnuplot/Makefile
index 45305577ddbb..7ed01aeea7c8 100644
--- a/math/ruby-gnuplot/Makefile
+++ b/math/ruby-gnuplot/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnuplot
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= math ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= r${PORTNAME}
+MASTER_SITES= SF/r${PORTNAME}/OldFiles
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= r${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile
index 46cfd7c19bdb..33dd628c1eb9 100644
--- a/math/scigraphica/Makefile
+++ b/math/scigraphica/Makefile
@@ -10,9 +10,10 @@ PORTVERSION= 0.8.0
PORTREVISION= 8
CATEGORIES= math gnome
MASTER_SITES= http://scigraphica.sourceforge.net/src/ \
- SF \
+ SF/${PORTNAME}/${PORTNAME}-0.x/${PORTVERSION}-source \
+
http://magnet.fsu.edu/~feiguin/scigraphica/src/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= A scientific application for data analysis and technical graphics
diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index e2889b8fef47..afaaa465fea4 100644
--- a/math/scilab-toolbox-sivp/Makefile
+++ b/math/scilab-toolbox-sivp/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sivp
DISTVERSION= 0.4.3
PORTREVISION= 2
CATEGORIES= math graphics multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
PKGNAMEPREFIX= scilab-toolbox-
MAINTAINER= makc@FreeBSD.org
diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile
index 3f1b69c1ee77..b7257c4638ea 100644
--- a/math/scilab-toolbox-swt/Makefile
+++ b/math/scilab-toolbox-swt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= swt
DISTVERSION= 0.1.0rc4
PORTREVISION= 3
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= scwt
+MASTER_SITES= SF/scwt/${PORTNAME}/0.1.0rc4Linux
PKGNAMEPREFIX= scilab-toolbox-
DISTNAME= ${PORTNAME}${DISTVERSION}
diff --git a/math/spar/Makefile b/math/spar/Makefile
index cd56780879a1..fdf0fbb9dd96 100644
--- a/math/spar/Makefile
+++ b/math/spar/Makefile
@@ -10,8 +10,7 @@ PORTNAME= spar
PORTVERSION= 0.5.10
PORTREVISION= 1
CATEGORIES= math devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Spar/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A modular math parser
diff --git a/math/stp/Makefile b/math/stp/Makefile
index dbddd764cca0..86bda221c686 100644
--- a/math/stp/Makefile
+++ b/math/stp/Makefile
@@ -11,8 +11,7 @@ DISTVERSION= 0.1
DISTVERSIONSUFFIX= -11-18-2008
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= stp-fast-prover
+MASTER_SITES= SF/${PORTNAME}-fast-prover/${PORTNAME}-fast-prover/${PORTNAME}-ver-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= lwhsu@FreeBSD.org
diff --git a/math/surf/Makefile b/math/surf/Makefile
index 3ec9dd89dc18..cf6e38d6e1d0 100644
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@@ -10,7 +10,7 @@ PORTNAME= surf
PORTVERSION= 1.0.5
PORTREVISION= 5
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
USE_XORG= x11 xmu
MAINTAINER= ports@FreeBSD.org
diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile
index 2e02c92a3b55..350daa8eb688 100644
--- a/math/tvmet/Makefile
+++ b/math/tvmet/Makefile
@@ -9,7 +9,7 @@
PORTNAME= tvmet
PORTVERSION= 1.7.2
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Tar.Gz_Bz2%20Archive/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tiny Vector and Matrix template library
diff --git a/math/ump/Makefile b/math/ump/Makefile
index 891d941575a8..176c7e8bdbad 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ump
PORTVERSION= 0.8.6
PORTREVISION= 4
CATEGORIES= math
-MASTER_SITES= SF/u-m-p
+MASTER_SITES= SF/u-m-p/u-m-p/${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= A graphical, easy to use math program
diff --git a/math/wcalc/Makefile b/math/wcalc/Makefile
index 2cbc125b1ab9..d374f3ca7144 100644
--- a/math/wcalc/Makefile
+++ b/math/wcalc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wcalc
PORTVERSION= 2.4
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= w-calc
+MASTER_SITES= SF/w-calc/Wcalc/${PORTVERSION}
DISTNAME= wcalc-${PORTVERSION}
MAINTAINER= amarendra.godbole@gmail.com
diff --git a/math/wfmath/Makefile b/math/wfmath/Makefile
index 7f8d01dd46ac..ed32d5a58304 100644
--- a/math/wfmath/Makefile
+++ b/math/wfmath/Makefile
@@ -8,8 +8,7 @@
PORTNAME= wfmath
PORTVERSION= 0.3.9
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= worldforge
+MASTER_SITES= SF/worldforge/${PORTNAME}%20%28math%20lib%29/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Worldforge math library
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 4e56372b417f..15261d9e3dcd 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wxMaxima
PORTVERSION= 0.8.2
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= A wxWidgets GUI for the computer algebra system maxima
diff --git a/mbone/speak_freely/Makefile b/mbone/speak_freely/Makefile
index f15998a2ff13..9215744498df 100644
--- a/mbone/speak_freely/Makefile
+++ b/mbone/speak_freely/Makefile
@@ -8,8 +8,7 @@
PORTNAME= speak_freely
PORTVERSION= 7.6a
CATEGORIES= mbone audio security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/speak-freely/speak-freely/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Voice communication over data networks
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 5eb57b9c1f44..62ad23ab47e1 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= amanda
PORTVERSION= 2.6.1p1
PORTEPOCH= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= amanda
+MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 29457d3729a9..aac49e02ed5a 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -11,8 +11,7 @@ PORTREVISION?= 5
PKGNAMESUFFIX?= -server
PORTEPOCH= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= amanda
+MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server)
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 5eb57b9c1f44..62ad23ab47e1 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= amanda
PORTVERSION= 2.6.1p1
PORTEPOCH= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= amanda
+MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 5eb57b9c1f44..62ad23ab47e1 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= amanda
PORTVERSION= 2.6.1p1
PORTEPOCH= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= amanda
+MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/misc/bb/Makefile b/misc/bb/Makefile
index 0fbd5b6686bf..82406aa3c7a4 100644
--- a/misc/bb/Makefile
+++ b/misc/bb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bb
PORTVERSION= 1.3.r1
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=aa-project
+MASTER_SITES= SF/aa-project/${PORTNAME}/1.3rc1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/bdelta/Makefile b/misc/bdelta/Makefile
index 2d62d0533f5a..d4b7250e8054 100644
--- a/misc/bdelta/Makefile
+++ b/misc/bdelta/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bdelta
PORTVERSION= 0.1.0
CATEGORIES= misc devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= deltup
+MASTER_SITES= SF/deltup/${PORTNAME}/${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= An advanced delta creator, patcher, and library
diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile
index 5f55aeb458d4..6453fc34fd22 100644
--- a/misc/bibletime-kde3/Makefile
+++ b/misc/bibletime-kde3/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bibletime
PORTVERSION= 1.6.5.1
PORTREVISION= 4
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/BibleTime%20for%20KDE%203.x/BibleTime%201.6.x%20-%20source%20code
PKGNAMESUFFIX= -kde3
MAINTAINER= tabthorpe@FreeBSD.org
diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile
index 971b83f44142..2aad9d1a9694 100644
--- a/misc/bibletime-kde4/Makefile
+++ b/misc/bibletime-kde4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bibletime
PORTVERSION= 2.1
CATEGORIES= misc kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code
PKGNAMESUFFIX= -kde4
MAINTAINER= tabthorpe@FreeBSD.org
diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index 75038d44552b..b4bf3fe56b6b 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -10,8 +10,7 @@ PORTNAME= bidwatcher
PORTVERSION= 1.3.17
PORTREVISION?= 8
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
#PATCH_SITES= http://sourceforge.net/tracker/download.php?group_id=2973&atid=302973&file_id=112451&aid=1085302
#PATCHFILES= bidwatcher-1.3.16-SSL_with_libcurl.02.patch
diff --git a/misc/bottlerocket/Makefile b/misc/bottlerocket/Makefile
index 37073d8c9a46..60504b98f8df 100644
--- a/misc/bottlerocket/Makefile
+++ b/misc/bottlerocket/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bottlerocket
PORTVERSION= 0.04c
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= futurebsd
+MASTER_SITES= SF/futurebsd/futurebsd/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Home Automation Software for the X10 FireCracker kit
diff --git a/misc/cdcollect/Makefile b/misc/cdcollect/Makefile
index e8078b84f4cf..127f0d486775 100644
--- a/misc/cdcollect/Makefile
+++ b/misc/cdcollect/Makefile
@@ -9,7 +9,7 @@ PORTNAME= cdcollect
PORTVERSION= 0.6.0
PORTREVISION= 2
CATEGORIES= misc gnome
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}_source
MAINTAINER= avl@FreeBSD.org
COMMENT= A simple CD catalog for GNOME
diff --git a/misc/cloc/Makefile b/misc/cloc/Makefile
index 5ccc5badfa37..ae4384b2e1a9 100644
--- a/misc/cloc/Makefile
+++ b/misc/cloc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cloc
PORTVERSION= 1.08
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
EXTRACT_SUFX= .pl
MAINTAINER= miwi@FreeBSD.org
diff --git a/misc/clpbar/Makefile b/misc/clpbar/Makefile
index df960682594f..654dc6b4eace 100644
--- a/misc/clpbar/Makefile
+++ b/misc/clpbar/Makefile
@@ -9,8 +9,7 @@
PORTNAME= clpbar
PORTVERSION= 1.10.9
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/bar-${PORTVERSION}
DISTNAME= bar_${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
diff --git a/misc/cmatrix/Makefile b/misc/cmatrix/Makefile
index 96de864ebb65..c084a993f351 100644
--- a/misc/cmatrix/Makefile
+++ b/misc/cmatrix/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cmatrix
PORTVERSION= 1.2a
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= leeym@FreeBSD.org
COMMENT= Show a scrolling 'Matrix' like screen
diff --git a/misc/deco/Makefile b/misc/deco/Makefile
index 281f039ffdeb..807a173dfd1a 100644
--- a/misc/deco/Makefile
+++ b/misc/deco/Makefile
@@ -9,8 +9,7 @@ PORTNAME= deco
PORTVERSION= 3.9
PORTREVISION= 4
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Deco%20Sources/${PORTVERSION}
DISTNAME= deco39
EXTRACT_SUFX= .tgz
diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index 704d2990e0e6..d9f2c27b87b0 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -9,7 +9,7 @@ PORTNAME= hercules
PORTVERSION= 0.0.3.2
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/stable%20branch/${PORTVERSION}
PKGNAMEPREFIX= diary-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/fortune-mod-bible/Makefile b/misc/fortune-mod-bible/Makefile
index 81303a8cc984..5343975a85f1 100644
--- a/misc/fortune-mod-bible/Makefile
+++ b/misc/fortune-mod-bible/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fortune-mod-bible
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fortunebible
+MASTER_SITES= SF/fortunebible/fortunebible/Genesis
DISTNAME= bible
MAINTAINER= doug@polands.org
diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index a31a5d162877..1868293dc8af 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -10,8 +10,7 @@ PORTNAME= freeguide
PORTVERSION= 0.10.5
PORTREVISION= 1
CATEGORIES= misc java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= freeguide-tv
+MASTER_SITES= SF/${PORTNAME}-tv/${PORTNAME}-source/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive TV guide which will create personalized TV listings
diff --git a/misc/geekcode/Makefile b/misc/geekcode/Makefile
index e1dbb0847b5d..878d841055a6 100644
--- a/misc/geekcode/Makefile
+++ b/misc/geekcode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= geekcode
PORTVERSION= 1.7.3
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= geekcode
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A Geek Code Generator
diff --git a/misc/gkrellmlaunch/Makefile b/misc/gkrellmlaunch/Makefile
index 4606aa4da108..71d237d1d72b 100644
--- a/misc/gkrellmlaunch/Makefile
+++ b/misc/gkrellmlaunch/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gkrellmlaunch
PORTVERSION= 0.4
PORTREVISION= 5
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An application launcher plugin for GKrellM
diff --git a/misc/gkrellshoot/Makefile b/misc/gkrellshoot/Makefile
index 2218f2655259..b2f45a8ff70d 100644
--- a/misc/gkrellshoot/Makefile
+++ b/misc/gkrellshoot/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gkrellshoot
PORTVERSION= 0.3.2
PORTREVISION= 6
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= elitetek@tekrealm.net
COMMENT= A screen locking and screen capture plugin for GKrellM
diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile
index 582e4cb456e5..aec55e406012 100644
--- a/misc/gkrellshoot2/Makefile
+++ b/misc/gkrellshoot2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gkrellshoot
PORTVERSION= 0.4.4
PORTREVISION= 5
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/GkrellM2.0%20Port/${PORTVERSION}
PKGNAMESUFFIX= 2
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/gwenview-i18n/Makefile b/misc/gwenview-i18n/Makefile
index 2671a120bbbc..0579bab0aff7 100644
--- a/misc/gwenview-i18n/Makefile
+++ b/misc/gwenview-i18n/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gwenview-i18n
PORTVERSION= 1.4.2
PORTREVISION= 2
CATEGORIES= misc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-i18n//}
+MASTER_SITES= SF/gwenview/gwenview/${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= Localized messages and documentation for Gwenview
diff --git a/misc/jbidwatcher/Makefile b/misc/jbidwatcher/Makefile
index 70a20a6ac48a..d7fc1b0bbd84 100644
--- a/misc/jbidwatcher/Makefile
+++ b/misc/jbidwatcher/Makefile
@@ -8,8 +8,7 @@
PORTNAME= jbidwatcher
DISTVERSION= 2.0.1
CATEGORIES= misc java
-MASTER_SITES= http://www.jbidwatcher.com/rdl/ \
- SF
+MASTER_SITES= http://www.jbidwatcher.com/rdl/
DISTNAME= JBidwatcher-${DISTVERSION}
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/misc/k3b-i18n/Makefile b/misc/k3b-i18n/Makefile
index 109ca1814464..f84dca1e06d2 100644
--- a/misc/k3b-i18n/Makefile
+++ b/misc/k3b-i18n/Makefile
@@ -9,8 +9,7 @@ PORTNAME= k3b-i18n
PORTVERSION= 1.0.5
PORTREVISION= 1
CATEGORIES?= misc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-i18n//}
+MASTER_SITES= SF/k3b/${PORTNAME}/${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= Localized messages and documentation for K3b
diff --git a/misc/kbfx/Makefile b/misc/kbfx/Makefile
index 32190abef324..23f5d61d3e14 100644
--- a/misc/kbfx/Makefile
+++ b/misc/kbfx/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.4.9.3.1
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= misc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kbfx
+MASTER_SITES= SF/${PORTNAME}/Source%20Packages/${PORTNAME}-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= A new K-menu for KDE
diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile
index 2ce9142f8e83..93e3d3a96643 100644
--- a/misc/kcd-devel/Makefile
+++ b/misc/kcd-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kcd-devel
PORTVERSION= 7.13.1
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kcd
+MASTER_SITES= SF/kcd/kcd/${PORTVERSION}
DISTNAME= kcd-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/lesspipe/Makefile b/misc/lesspipe/Makefile
index bd7ec83d2bd9..bcc80a2d9624 100644
--- a/misc/lesspipe/Makefile
+++ b/misc/lesspipe/Makefile
@@ -8,8 +8,7 @@
PORTNAME= lesspipe
PORTVERSION= 1.55
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lesspipe
+MASTER_SITES= SF
MAINTAINER= slaven@rezic.de
COMMENT= A preprocessor for less
diff --git a/misc/libhome/Makefile b/misc/libhome/Makefile
index ca750cafa30c..771ead472615 100644
--- a/misc/libhome/Makefile
+++ b/misc/libhome/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libhome
PORTVERSION= 0.10.2
CATEGORIES= misc
-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= Library providing a getpwname() emulation
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index af85538fac66..87faeea98045 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libmcal
PORTVERSION= 0.7
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
MAINTAINER= thierry@FreeBSD.org
diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 28ffef72333d..4a2adf43bdee 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -9,7 +9,7 @@ PORTNAME= lifelines
PORTVERSION= 3.0.50
PORTREVISION= 3
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20beta%20versions/${PORTVERSION}
MAINTAINER= matt@gsicomp.on.ca
COMMENT= An advanced genealogical system
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index dbda2e3f0cfc..b52ec35d7bf6 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lingoteach
PORTVERSION= 0.3.9
PORTREVISION= 10
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTFILES= ${PORTNAME}-ui-${PORTVERSION}.tar.gz
.if defined(WITH_SOUND)
DISTFILES+= ${PORTNAME}-sound-${SOUNDV}.tar.gz
diff --git a/misc/lr/Makefile b/misc/lr/Makefile
index a2b0511297d5..b92228781e7c 100644
--- a/misc/lr/Makefile
+++ b/misc/lr/Makefile
@@ -9,8 +9,7 @@
PORTNAME= lr
PORTVERSION= 2.0
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lazyread
+MASTER_SITES= SF/lazyread/lazyread/lazyread%20${PORTVERSION}
DISTNAME= lazyread-${PORTVERSION}
MAINTAINER= mich@FreeBSD.org
diff --git a/misc/lxde-common/Makefile b/misc/lxde-common/Makefile
index 5614b88b2fbb..6fb2e13d9a6d 100644
--- a/misc/lxde-common/Makefile
+++ b/misc/lxde-common/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lxde-common
PORTVERSION= 0.3.2.1
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= lxde
+MASTER_SITES= SF/lxde/${PORTNAME}%20%28default%20config%29/LXDE%20Common%20${PORTVERSION}
MAINTAINER= sahne@0x90.at
COMMENT= LXDE Common files
diff --git a/misc/metalink-checker/Makefile b/misc/metalink-checker/Makefile
index 31cce246964b..ff31982f2436 100644
--- a/misc/metalink-checker/Makefile
+++ b/misc/metalink-checker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= metalink
PORTVERSION= 1.3
CATEGORIES= misc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= metalinks
+MASTER_SITES= SF/${PORTNAME}s/Metalink%20Checker/2007
PKGNAMESUFFIX?= -checker
DISTNAME= checker-${PORTVERSION}
diff --git a/misc/metalink-editor/Makefile b/misc/metalink-editor/Makefile
index e64939c4c8fc..7f0056db31c6 100644
--- a/misc/metalink-editor/Makefile
+++ b/misc/metalink-editor/Makefile
@@ -8,7 +8,7 @@
PORTNAME= metalink
PORTVERSION= 1.2.0
CATEGORIES= misc
-MASTER_SITES= SF/metalinks
+MASTER_SITES= SF/${PORTNAME}s/Metalink%20Editor/${PORTVERSION}
PKGNAMESUFFIX?= -editor
DISTNAME= ${PORTNAME}editor-${PORTVERSION}
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index 412fc2c8f09c..43dda2b95f4c 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -9,8 +9,7 @@ PORTNAME= metalink
PORTVERSION= 0.3.3
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= metalinks
+MASTER_SITES= SF/${PORTNAME}s/Metalink%20commandline/${PORTVERSION}
PKGNAMESUFFIX?= -tools
MAINTAINER= lioux@FreeBSD.org
diff --git a/misc/mtx/Makefile b/misc/mtx/Makefile
index 1d3d2236f6b4..d5ea28a4d883 100644
--- a/misc/mtx/Makefile
+++ b/misc/mtx/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mtx
PORTVERSION= 1.3.11
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mtx
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= mbr@FreeBSD.org
COMMENT= Control SCSI media changer devices
diff --git a/misc/nagios-base-logos/Makefile b/misc/nagios-base-logos/Makefile
index 9c241cd62977..2b9396fc0b8a 100644
--- a/misc/nagios-base-logos/Makefile
+++ b/misc/nagios-base-logos/Makefile
@@ -8,8 +8,7 @@
PORTNAME= nagios-base-logos
PORTVERSION= 1.0
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=nagios
+MASTER_SITES= SF/nagios/OldFiles
DISTNAME= imagepak-base
MAINTAINER= demon@FreeBSD.org
diff --git a/misc/opencyc/Makefile b/misc/opencyc/Makefile
index f7b423b172bf..e67277773926 100644
--- a/misc/opencyc/Makefile
+++ b/misc/opencyc/Makefile
@@ -9,7 +9,7 @@ PORTNAME= opencyc
PORTVERSION= 0.7.0
PORTREVISION= 3
CATEGORIES= misc linux
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/pauker/Makefile b/misc/pauker/Makefile
index 0be42ce8bd41..44e00bafa5eb 100644
--- a/misc/pauker/Makefile
+++ b/misc/pauker/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pauker
DISTVERSION= 1.8RC2
PORTREVISION= 1
CATEGORIES= misc java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/misc/pdfmap/Makefile b/misc/pdfmap/Makefile
index 3d45fbfef6de..17df67c68088 100644
--- a/misc/pdfmap/Makefile
+++ b/misc/pdfmap/Makefile
@@ -10,7 +10,7 @@ PORTNAME= pdfmap
PORTVERSION= 2.00
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Generate maps in PDF format and place clickable objects on them
diff --git a/misc/pipe/Makefile b/misc/pipe/Makefile
index ad3f4b140236..334278667f1a 100644
--- a/misc/pipe/Makefile
+++ b/misc/pipe/Makefile
@@ -10,8 +10,7 @@ PORTNAME= pipe
PORTVERSION= 2.5
PORTREVISION= 1
CATEGORIES= misc java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pipe2
+MASTER_SITES= SF/${PORTNAME}2/Pipe%202/PIPE2%20V${PORTVERSION}
DISTNAME= pipe25_rc5
MAINTAINER= stefan@fh-mainz.de
diff --git a/misc/posixtestsuite/Makefile b/misc/posixtestsuite/Makefile
index 6c1a3cb1b84a..b398b2be79a6 100644
--- a/misc/posixtestsuite/Makefile
+++ b/misc/posixtestsuite/Makefile
@@ -8,7 +8,7 @@
PORTNAME= posixtestsuite
PORTVERSION= 1.5.2
CATEGORIES= misc
-MASTER_SITES= SF/posixtest
+MASTER_SITES= SF/posixtest/posixtest/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Open POSIX Test Suite
diff --git a/misc/py-pexpect/Makefile b/misc/py-pexpect/Makefile
index 741815630ce7..41ecb6c8cc7f 100644
--- a/misc/py-pexpect/Makefile
+++ b/misc/py-pexpect/Makefile
@@ -10,9 +10,7 @@ PORTNAME= pexpect
PORTVERSION= 2.4
CATEGORIES= misc python
MASTER_SITES= CHEESESHOP \
- ${MASTER_SITE_SOURCEFORGE} \
http://dryice.name/computer/FreeBSD/distfiles/
-#MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/salias/Makefile b/misc/salias/Makefile
index 21610382efa2..ea95ccec8207 100644
--- a/misc/salias/Makefile
+++ b/misc/salias/Makefile
@@ -10,8 +10,7 @@ PORTNAME= salias
PORTVERSION= 0.3.1
PORTREVISION= 5
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/C%20${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A command-line tool to alias arguments of other programs
diff --git a/misc/shuffle-db/Makefile b/misc/shuffle-db/Makefile
index 87f5df71a050..f24ed8b061ba 100644
--- a/misc/shuffle-db/Makefile
+++ b/misc/shuffle-db/Makefile
@@ -8,8 +8,7 @@
PORTNAME= shuffle-db
DISTVERSION= 1.0-rc1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/rebuild_db/1.0-rc1
DISTNAME= rebuild_db-${DISTVERSION}
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/misc/table.el/Makefile b/misc/table.el/Makefile
index 13fe2c789479..744ffb3ed5a2 100644
--- a/misc/table.el/Makefile
+++ b/misc/table.el/Makefile
@@ -8,8 +8,7 @@
PORTNAME= table.el
PORTVERSION= 1.5.54
CATEGORIES= misc elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= table
+MASTER_SITES= SF/table/table/${PORTVERSION}
DISTNAME= table-${PORTVERSION}.el.gz
EXTRACT_SUFX= # empty
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 6407d9a3d4b3..262bc5f09231 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tkman
PORTVERSION= 2.2
PORTREVISION= 2
CATEGORIES= misc tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A Tcl/Tk based manual browser
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index dca4f96b7219..8dbdecba5a12 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tmux
DISTVERSION= 0.9
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= A Terminal Multiplexer
diff --git a/misc/tvbrowser/Makefile b/misc/tvbrowser/Makefile
index 0001d224cd2c..676c1e0b1a13 100644
--- a/misc/tvbrowser/Makefile
+++ b/misc/tvbrowser/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tvbrowser
PORTVERSION= 2.7.3
CATEGORIES= misc java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles/${PORTVERSION}
MAINTAINER= lme@FreeBSD.org
COMMENT= A digital TV guide
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index d5d392432c22..8b9defd6393c 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 5.0.b8
PORTREVISION= 5
CATEGORIES= misc
MASTER_SITES= http://uptimes.hostingwired.com/files/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF/${PORTNAME}/UpClient%205%20beta/5.0b8%20Security%20Update
+
DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index e884d1a1ea64..3599d28cc5f6 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wmcalendar
PORTVERSION= 0.5.2
PORTREVISION= 8
CATEGORIES= misc windowmaker
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= xride@FreeBSD.org
COMMENT= A dockable calendar with interface to iCalendar based calendars
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 11b8e074def6..c7f97dc74b9f 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -8,8 +8,7 @@ PORTNAME= wmweather+
PORTVERSION= 2.11
PORTREVISION= 2
CATEGORIES= misc windowmaker geography
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= wmweatherplus
+MASTER_SITES= SF/wmweatherplus/wmweather%2B/wmweather%2B-${PORTVERSION}
MAINTAINER= dougb@FreeBSD.org
COMMENT= Displays current conditions and forecasts with icons and text
diff --git a/misc/xbiso/Makefile b/misc/xbiso/Makefile
index 9a1f6d420259..03649e5984ff 100644
--- a/misc/xbiso/Makefile
+++ b/misc/xbiso/Makefile
@@ -9,8 +9,7 @@
PORTNAME= xbiso
PORTVERSION= 0.6.1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= XBox xdvdfs iso extraction utility
diff --git a/multimedia/atomicparsley/Makefile b/multimedia/atomicparsley/Makefile
index 9082e9852447..9f7c14d80abd 100644
--- a/multimedia/atomicparsley/Makefile
+++ b/multimedia/atomicparsley/Makefile
@@ -9,7 +9,7 @@ PORTNAME= AtomicParsley
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20v${PORTVERSION}
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= baptiste.daroussin@gmail.com
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 08c6dfeb7fe6..125fee9817bf 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 2.4.4
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_BERLIOS} \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= avidemux
+ SF/avidemux/avidemux/${PORTVERSION}
+
DISTNAME= avidemux_${PORTVERSION}
MAINTAINER= amistry@am-productions.biz
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index ed201df2dc51..45096b38aa89 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.7.43
PORTREVISION= 11
PORTEPOCH= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-20050224
DISTNAME= ${PORTNAME}-0.7-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index dd6fd93c95e6..60a8ad9cc1ad 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.9.7.1
PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6
-MASTER_SITES= SF/beepmp
+MASTER_SITES= SF/beepmp/bmp/${PORTVERSION}
DISTNAME= bmp-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index c4c114cf5b7e..8ba0d0be27fd 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.5.1
PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cserv
+MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION}
MAINTAINER= uspoerlein@gmail.com
COMMENT= Camserv is a free program to do streaming video via the web
diff --git a/multimedia/clive1/Makefile b/multimedia/clive1/Makefile
index 38a4a06add9b..90569c577ea8 100644
--- a/multimedia/clive1/Makefile
+++ b/multimedia/clive1/Makefile
@@ -11,7 +11,8 @@ PORTVERSION= 1.0.2
#PORTEPOCH= 0
CATEGORIES= multimedia
MASTER_SITES= http://download.gna.org/clive/1.0.x/ \
- SF
+ SF/${PORTNAME}/${PORTNAME}-1.x/${PORTVERSION}
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= ${PORTNAME}
diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile
index d318b0d98ee3..a4c58747eaca 100644
--- a/multimedia/dirac/Makefile
+++ b/multimedia/dirac/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dirac
PORTVERSION= 1.0.2
PORTREVISION?= 0
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-codec/Dirac-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT?= Open source video codec from the BBC
diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
index 40c84a3a40e5..36db527c04b1 100644
--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -10,8 +10,7 @@ PORTNAME= dumpmpeg
PORTVERSION= 0.6
PORTREVISION= 5
CATEGORIES= multimedia graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Dump frames from mpeg movies
diff --git a/multimedia/dv2jpg/Makefile b/multimedia/dv2jpg/Makefile
index 1e6837c33226..a7ddd0031651 100644
--- a/multimedia/dv2jpg/Makefile
+++ b/multimedia/dv2jpg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dv2jpg
PORTVERSION= 1.1
PORTREVISION= 7
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert Type-2 DV codec-encoded AVI streams to mjpeg-encoded AVI
diff --git a/multimedia/dvbsnoop/Makefile b/multimedia/dvbsnoop/Makefile
index 7de689fc8462..cef7d66d2a4c 100644
--- a/multimedia/dvbsnoop/Makefile
+++ b/multimedia/dvbsnoop/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dvbsnoop
PORTVERSION= 1.4.50
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= fbsd@opal.com
COMMENT= DVB stream analyzer / MPEG analyzer
diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index cfc1ab161a5d..5f0afc3b12cf 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dvd-slideshow
PORTVERSION= 0.8.2
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2
DISTFILES= ${PORTNAME}-${PORTVERSION}-2${EXTRACT_SUFX}
THEMEVERSION= 0.8.0
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 81b86617dfa5..21a512cd84dc 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dvdauthor
PORTVERSION= 0.6.14
PORTREVISION= 3
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pb@FreeBSD.org
COMMENT= Makes a DVD file structure from one or more MPEG2 streams
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 239f5a966140..82abd808e7ce 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -10,8 +10,7 @@ DISTVERSION= 1.5.1_2
PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dvdstyler
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.5.1
DISTNAME= DVDStyler-${DISTVERSION}
MAINTAINER= multimedia@FreeBSD.org
diff --git a/multimedia/emovix/Makefile b/multimedia/emovix/Makefile
index 2be265249fed..5d64d73c61b1 100644
--- a/multimedia/emovix/Makefile
+++ b/multimedia/emovix/Makefile
@@ -8,8 +8,7 @@
PORTNAME= emovix
PORTVERSION= 0.9.0
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= movix
+MASTER_SITES= SF/movix/eMoviX/0.9
MAINTAINER= h.eichmann@gmx.de
COMMENT= A mini linux distro to create bootable video CDs
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index ec49630e240e..2c58ab11b400 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= freevo
PORTVERSION= 1.9.0
CATEGORIES= multimedia
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= freevo
+MASTER_SITES= SF/${PORTNAME}/Freevo%20releases/${PORTVERSION}
MAINTAINER= fbsd@opal.com
COMMENT= Open source digital jukebox
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index ebcb78233a79..646f20623fb2 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gavl
PORTVERSION= 1.1.1
CATEGORIES= multimedia
-MASTER_SITES= SF/gmerlin
+MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= A library for handling uncompressed video and audio data
diff --git a/multimedia/gdialog/Makefile b/multimedia/gdialog/Makefile
index f1f50e481036..0c34ad7a551b 100644
--- a/multimedia/gdialog/Makefile
+++ b/multimedia/gdialog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gdialog
PORTVERSION= 2.5
CATEGORIES= multimedia java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}-x
+MASTER_SITES= SF/${PORTNAME}-x/${PORTNAME}-090400/${PORTVERSION}
DISTNAME= GDialog-090400-25
MAINTAINER= h.eichmann@gmx.de
diff --git a/multimedia/gdvrecv/Makefile b/multimedia/gdvrecv/Makefile
index 6063fb99768b..417b8cc42bd1 100644
--- a/multimedia/gdvrecv/Makefile
+++ b/multimedia/gdvrecv/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gdvrecv
PORTVERSION= 1.2
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=gdvrecv
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= DV Tools for FreeBSD
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 8f020e0c895c..331b3bf3f954 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gmencoder
PORTVERSION= 0.1.0
PORTREVISION= 11
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= gahr@FreeBSD.org
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 84be7e47cab5..ab064dcf19b4 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gmerlin-avdecoder
PORTVERSION= 1.0.1
CATEGORIES= multimedia
-MASTER_SITES= SF/gmerlin
+MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= General purpose media decoding library
diff --git a/multimedia/gmimms/Makefile b/multimedia/gmimms/Makefile
index f817c277faca..3dc53fe088ea 100644
--- a/multimedia/gmimms/Makefile
+++ b/multimedia/gmimms/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gmimms
DISTVERSION= 0.0.9
PORTREVISION= 2
CATEGORIES= multimedia net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= liu_yinghong@yahoo.com.cn
COMMENT= A frontend to MiMMS (Multimedia Stream ripper)
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index bf243515ce51..23684b10b339 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnome-subtitles
PORTVERSION= 0.8
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Subtitle editor with video preview
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 4fdad0668d75..eaf1066edb52 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -10,9 +10,9 @@ PORTNAME= gopchop
PORTVERSION= 1.0.0
PORTREVISION= 6
CATEGORIES= multimedia
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/GOPchop%20-%20Stable/${PORTVERSION} \
http://outflux.net/unix/software/GOPchop/download/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
DISTNAME= GOPchop-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index 362ce8f98792..19c6931f06c3 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.4.5
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION}
PKGNAMESUFFIX= -libgpac
MAINTAINER= multimedia@FreeBSD.org
diff --git a/multimedia/gpac-mp4box/Makefile b/multimedia/gpac-mp4box/Makefile
index f73169a256d3..f2c30e143573 100644
--- a/multimedia/gpac-mp4box/Makefile
+++ b/multimedia/gpac-mp4box/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mp4box
DISTVERSION= 0.4.5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gpac
+MASTER_SITES= SF/gpac/GPAC/GPAC%20${PORTVERSION}
PKGNAMEPREFIX= gpac-
DISTNAME= gpac-${DISTVERSION}
diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile
index 760ccdc9fdc6..213de5c20a0d 100644
--- a/multimedia/grpplaylist/Makefile
+++ b/multimedia/grpplaylist/Makefile
@@ -8,8 +8,7 @@ PORTNAME= grpplaylist
PORTVERSION= 0.1
PORTREVISION= 6
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= groupplaylist-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/gstreamer-plugins-buzztard/Makefile b/multimedia/gstreamer-plugins-buzztard/Makefile
index d3343662e57e..1524f95a04d3 100644
--- a/multimedia/gstreamer-plugins-buzztard/Makefile
+++ b/multimedia/gstreamer-plugins-buzztard/Makefile
@@ -9,7 +9,7 @@ PORTNAME= buzztard
PORTVERSION= 0.2.0
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20gstreamer%20extensions/${PORTVERSION}
PKGNAMEPREFIX= gstreamer-plugins-
DISTNAME= gst-${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile
index 41b51d7ed951..189ae7ee8949 100644
--- a/multimedia/gsubedit/Makefile
+++ b/multimedia/gsubedit/Makefile
@@ -10,7 +10,7 @@ PORTNAME= GSubEdit
PORTVERSION= 0.4.p1
PORTREVISION= 7
CATEGORIES= multimedia gnome
-MASTER_SITES= SF/${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/0.4pre1
DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/pre/}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 5d3fe5d3393d..bb301d90ea72 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gxine
PORTVERSION= 0.5.904
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= xine
+MASTER_SITES= SF/xine/${PORTNAME}%20%28GTK%20front%20end%29/${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= An alternative GUI for the Xine media player
diff --git a/multimedia/iriverter/Makefile b/multimedia/iriverter/Makefile
index 239c744be9fa..fe103012aee8 100644
--- a/multimedia/iriverter/Makefile
+++ b/multimedia/iriverter/Makefile
@@ -9,7 +9,7 @@ PORTNAME= iriverter
PORTVERSION= 0.16
PORTREVISION= 5
CATEGORIES= multimedia java
-MASTER_SITES= SOURCEFORGE
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Cross-platform frontend to mencoder
diff --git a/multimedia/jahshaka/Makefile b/multimedia/jahshaka/Makefile
index c07fe818408a..6a1b9e320e22 100644
--- a/multimedia/jahshaka/Makefile
+++ b/multimedia/jahshaka/Makefile
@@ -9,7 +9,7 @@ PORTNAME= jahshaka
PORTVERSION= 1.9a9
PORTREVISION= 6
CATEGORIES= multimedia
-MASTER_SITES= SF/${PORTNAME}fx
+MASTER_SITES= SF/${PORTNAME}fx/Jahshaka-source/1.9alpha
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index a960cc4172ca..807ae142eb1b 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -8,8 +8,7 @@ PORTNAME= k9copy
PORTVERSION= 1.0.4
PORTREVISION= 5
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= triosoft@triosoft.com.ua
COMMENT= A DVD-9 to DVD-5 shrinking application for KDE
diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index a960cc4172ca..807ae142eb1b 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -8,8 +8,7 @@ PORTNAME= k9copy
PORTVERSION= 1.0.4
PORTREVISION= 5
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= triosoft@triosoft.com.ua
COMMENT= A DVD-9 to DVD-5 shrinking application for KDE
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index 5ac2f902b262..0fb903817383 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -10,7 +10,7 @@ PORTNAME= kaffeine-mozilla
PORTVERSION= 0.2
PORTREVISION= 10
CATEGORIES= multimedia
-MASTER_SITES= SF/kaffeine
+MASTER_SITES= SF/kaffeine/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Kaffeine Mozilla plugin
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 4f788bfc40e6..12526b115812 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kaffeine
PORTVERSION= 0.8.7
PORTREVISION= 4
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kaffeine
+MASTER_SITES= SF
MAINTAINER= arved@FreeBSD.org
COMMENT= A xine-base multimedia player
diff --git a/multimedia/kbtv/Makefile b/multimedia/kbtv/Makefile
index 1332012376c3..f2d60a6708ba 100644
--- a/multimedia/kbtv/Makefile
+++ b/multimedia/kbtv/Makefile
@@ -9,9 +9,9 @@ PORTNAME= kbtv
DISTVERSION= 1.2.4
PORTREVISION= 5
CATEGORIES= multimedia python kde kld
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://freebsd.ricin.com/ports/distfiles/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
EXTRACT_SUFX= .tbz
MAINTAINER= danny@ricin.com
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 2a09aefc08f9..9c5cc6d2c286 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kino
PORTVERSION= 1.3.3
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pb@FreeBSD.org
COMMENT= A DV non-linear video editor
diff --git a/multimedia/kmenc15/Makefile b/multimedia/kmenc15/Makefile
index a8ed83415009..49490c243e11 100644
--- a/multimedia/kmenc15/Makefile
+++ b/multimedia/kmenc15/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kmenc15
PORTVERSION= 0.04
PORTREVISION= 4
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kmenc15
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE advanced MEncoder frontend, ala, VirtualDub
diff --git a/multimedia/ksubeditor/Makefile b/multimedia/ksubeditor/Makefile
index 168868c27f1d..9b4d46be1b50 100644
--- a/multimedia/ksubeditor/Makefile
+++ b/multimedia/ksubeditor/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.2
PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME:L}-${PORTVERSION}
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/libdc1394/Makefile b/multimedia/libdc1394/Makefile
index 0191305bcf76..57d4b7d98c2d 100644
--- a/multimedia/libdc1394/Makefile
+++ b/multimedia/libdc1394/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libdc1394
PORTVERSION= 2.1.1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= gslin@gslin.org
COMMENT= 1394-based DC Control Library
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 9e907987945e..6ad7493ad3c6 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libdvdnav
PORTVERSION= 0.1.10
PORTREVISION= 4
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dvd
+MASTER_SITES= SF/dvd/${PORTNAME}/${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= The library for the xine-dvdnav plugin
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index 0e8aa3069d83..caefe24ce86f 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libfame
PORTVERSION= 0.9.1
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fame
+MASTER_SITES= SF/fame/${PORTNAME}/${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= A video encoding library
diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile
index 154d8473f648..0844aa175c3f 100644
--- a/multimedia/libmovtar/Makefile
+++ b/multimedia/libmovtar/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libmovtar
PORTVERSION= 0.1.3
PORTREVISION= 7
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mjpeg
+MASTER_SITES= SF/mjpeg/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Supports reading/writing of MJPEG video in YUV 4:2:2 JPEG
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 423050630cc2..f38f4016d3bb 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libmpeg3
PORTVERSION= 1.8
DISTVERSIONSUFFIX= -src
CATEGORIES= multimedia
-MASTER_SITES= SF/heroines
+MASTER_SITES= SF/heroines/releases/081108
MAINTAINER= ports@FreeBSD.org
COMMENT= Advanced editing and manipulation of MPEG streams
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index e2d5d3d7c8b8..c39ebf17e20f 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xine
PORTVERSION= 1.1.16.3
PORTREVISION= 1
CATEGORIES= multimedia ipv6
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib%20%28${PORTNAME}%20core%29/${PORTVERSION}
PKGNAMEPREFIX= lib
DISTNAME= ${PORTNAME}-lib-${PORTVERSION}
diff --git a/multimedia/libxspf/Makefile b/multimedia/libxspf/Makefile
index d978bfc08d1d..f1f9ae051321 100644
--- a/multimedia/libxspf/Makefile
+++ b/multimedia/libxspf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libxspf
PORTVERSION= 1.2.0
CATEGORIES= multimedia
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=libspiff
+MASTER_SITES= SF/libspiff/Sources/${PORTVERSION}
MAINTAINER= ed@FreeBSD.org
COMMENT= An XSPF parsing library
diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index 8ccba8761c7e..f38c4ea2c3d5 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xmovie
PORTVERSION= 1.9.8.1
PORTREVISION= 3
CATEGORIES= multimedia linux
-MASTER_SITES= SF/heroines
+MASTER_SITES= SF/heroines/releases/021003
PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm
EXTRACT_SUFX=
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 57664eff781c..c370f9cf5942 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -9,7 +9,7 @@ PORTNAME= lsdvd
PORTVERSION= 0.16
PORTREVISION= 4
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20-%20I%20hate%20James%20Blunt
MAINTAINER= pav@FreeBSD.org
COMMENT= Print information about the contents and structure of a DVD
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index dd1dd4046487..f488870c6ccb 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mediainfo
PORTVERSION= 0.7.7.8
DISTVERSIONSUFFIX= _CLI_GNU_FromSource
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/MediaInfo%20-%20Command%20line/${PORTVERSION}
DISTNAME= MediaInfo_${PORTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= freebsd-ports@evilcode.net
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 1ed405f47e36..e962185af495 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mjpegtools
DISTVERSION= 1.9.0rc3
PORTREVISION= 3
CATEGORIES= multimedia
-MASTER_SITES= SF/mjpeg
+MASTER_SITES= SF/mjpeg/OldFiles
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Set of tools to record/playback/edit videos in MPEG format
diff --git a/multimedia/mkxvcd/Makefile b/multimedia/mkxvcd/Makefile
index 94088f060cf3..00e2d83ce6cb 100644
--- a/multimedia/mkxvcd/Makefile
+++ b/multimedia/mkxvcd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mkxvcd
PORTVERSION= 2.0.2
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kvcd4nix
+MASTER_SITES= SF/kvcd4nix/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Makes high quality X/K/S/VCD movies from many formats
diff --git a/multimedia/mmpython/Makefile b/multimedia/mmpython/Makefile
index 59643d8d2e2f..72f953ed9e13 100644
--- a/multimedia/mmpython/Makefile
+++ b/multimedia/mmpython/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mmpython
PORTVERSION= 0.4.10
PORTREVISION= 2
CATEGORIES= multimedia python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 9472d7da3781..149023b9274e 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -8,7 +8,7 @@
PORTNAME= motion
PORTVERSION= 3.2.11.1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%203.2/${PORTVERSION}
PATCH_SITES= http://www.lavrsen.dk/twiki/pub/Motion/FreeBSDPatch/
PATCHFILES= motion-3.2.11.1.port-freebsd.diff.gz
diff --git a/multimedia/mpgtx/Makefile b/multimedia/mpgtx/Makefile
index 6c68e00133ba..09a0c82c5afc 100644
--- a/multimedia/mpgtx/Makefile
+++ b/multimedia/mpgtx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mpgtx
PORTVERSION= 1.3.1
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= A command line MPEG audio/video/system file toolbox
diff --git a/multimedia/msdl/Makefile b/multimedia/msdl/Makefile
index 3ca5a96bc2d8..04afee52eb48 100644
--- a/multimedia/msdl/Makefile
+++ b/multimedia/msdl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= msdl
PORTVERSION= 1.2.4.1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.2.4-r1
DISTNAME= ${PORTNAME}-1.2.4-r1
MAINTAINER= wahjava@gmail.com
diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile
index f5419bbb4de7..7fdc9608dd0b 100644
--- a/multimedia/nxtvepg/Makefile
+++ b/multimedia/nxtvepg/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nxtvepg
PORTVERSION= 2.7.6
PORTREVISION= 2
CATEGORIES= multimedia tcl tk
-MASTER_SITES= SF/${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Viewer for Nextview Electronic TV Programme Guide (needs bktr driver)
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index 485d73a7c944..cb746f2e8502 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openquicktime
PORTVERSION= 1.0
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openquicktime
+MASTER_SITES= SF/${PORTNAME}/OpenQuicktime%20v1/${PORTVERSION}b
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/multimedia/oqtencoder/Makefile b/multimedia/oqtencoder/Makefile
index 78e7123d578c..715c8da183a4 100644
--- a/multimedia/oqtencoder/Makefile
+++ b/multimedia/oqtencoder/Makefile
@@ -9,8 +9,7 @@ PORTNAME= OQTEncoder
PORTVERSION= 0.1
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openquicktime
+MASTER_SITES= SF/openquicktime/OpenQuicktime%20v1/1.0b
DISTNAME= ${PORTNAME:L}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile
index a1c8c8d6b8ca..6f861846148c 100644
--- a/multimedia/oqtplayer/Makefile
+++ b/multimedia/oqtplayer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= OQTPlayer
PORTVERSION= 0.5
PORTREVISION= 8
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openquicktime
+MASTER_SITES= SF/openquicktime/OpenQuicktime%20v1/1.0b
DISTNAME= ${PORTNAME:L}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/multimedia/p5-GStreamer/Makefile b/multimedia/p5-GStreamer/Makefile
index a615fd008af7..43cbf0445169 100644
--- a/multimedia/p5-GStreamer/Makefile
+++ b/multimedia/p5-GStreamer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GStreamer
PORTVERSION= 0.09
PORTREVISION= 2
CATEGORIES= multimedia perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtk2-perl
+MASTER_SITES= SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
MAINTAINER= multimedia@FreeBSD.org
diff --git a/multimedia/projectx/Makefile b/multimedia/projectx/Makefile
index 7cdc47fd4d55..6eb7e351eda4 100644
--- a/multimedia/projectx/Makefile
+++ b/multimedia/projectx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= projectx
PORTVERSION= 0.90.4.00
PORTREVISION= 2
CATEGORIES= multimedia java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= project-x
+MASTER_SITES= SF/project-x/project-x/ProjectX_Source_${PORTVERSION}
DISTNAME= ProjectX_Source_${PORTVERSION}
DISTFILES= ProjectX_Source_eng_${PORTVERSION}${EXTRACT_SUFX} \
ProjectX_LanguagePack_${PORTVERSION}${EXTRACT_SUFX}
diff --git a/multimedia/py-kaa-base/Makefile b/multimedia/py-kaa-base/Makefile
index 196ae03cec00..4e0f5cf3ef69 100644
--- a/multimedia/py-kaa-base/Makefile
+++ b/multimedia/py-kaa-base/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kaa-base
PORTVERSION= 0.6.0
PORTREVISION= 1
CATEGORIES= multimedia python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= freevo
+MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= fbsd@opal.com
diff --git a/multimedia/py-kaa-imlib2/Makefile b/multimedia/py-kaa-imlib2/Makefile
index 0d35705ba03f..4edcc00f1718 100644
--- a/multimedia/py-kaa-imlib2/Makefile
+++ b/multimedia/py-kaa-imlib2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kaa-imlib2
PORTVERSION= 0.2.3
PORTREVISION= 2
CATEGORIES= multimedia python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= freevo
+MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= fbsd@opal.com
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile
index bc4aec092a14..745867f93fca 100644
--- a/multimedia/py-kaa-metadata/Makefile
+++ b/multimedia/py-kaa-metadata/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kaa-metadata
PORTVERSION= 0.7.6
PORTREVISION= 1
CATEGORIES= multimedia python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= freevo
+MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= fbsd@opal.com
diff --git a/multimedia/recmpeg/Makefile b/multimedia/recmpeg/Makefile
index 5e8ee45786e3..1a98add52c29 100644
--- a/multimedia/recmpeg/Makefile
+++ b/multimedia/recmpeg/Makefile
@@ -10,8 +10,7 @@ PORTNAME= recmpeg
PORTVERSION= 1.0.5
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fame
+MASTER_SITES= SF/fame/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple video encoder
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index b7936a69fe04..f473b0dfde3b 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sabbu
PORTVERSION= 0.3.0
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Sabbu%20${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Program used to time subtitles
diff --git a/multimedia/smplayer-themes/Makefile b/multimedia/smplayer-themes/Makefile
index 2b22768cd903..11687628a46b 100644
--- a/multimedia/smplayer-themes/Makefile
+++ b/multimedia/smplayer-themes/Makefile
@@ -8,7 +8,7 @@
PORTNAME= smplayer-themes
PORTVERSION= 0.1.19
CATEGORIES= multimedia audio kde
-MASTER_SITES= SF/smplayer
+MASTER_SITES= SF/smplayer/SMPlayer-themes/${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= Themes for smplayer
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index eadc7b1e9d27..49cf2b9b9299 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= smplayer
DISTVERSION= 0.6.8
CATEGORIES= multimedia audio kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/SMPlayer/${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= A complete front-end based on QT4 for mplayer
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index 96335272249a..3e1985a92a73 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -8,8 +8,7 @@
PORTNAME= subtitlecomposer
PORTVERSION= 0.5.3
CATEGORIES= multimedia kde
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=subcomposer
+MASTER_SITES= SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= Subtitle editor for KDE
diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
index b188651a5cc5..b16bb9dbe801 100644
--- a/multimedia/subtitlecomposer/Makefile
+++ b/multimedia/subtitlecomposer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= subtitlecomposer
PORTVERSION= 0.4.3
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=subcomposer
+MASTER_SITES= SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= Subtitle editor for KDE
diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile
index 52cdbe03897c..13a2c3bad640 100644
--- a/multimedia/subtitleripper/Makefile
+++ b/multimedia/subtitleripper/Makefile
@@ -9,8 +9,7 @@ PORTNAME= subtitleripper
DISTVERSION= 0.3-4
PORTREVISION= 3
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.3-4
EXTRACT_SUFX= .tgz
MAINTAINER= multimedia@FreeBSD.org
diff --git a/multimedia/tivodecode/Makefile b/multimedia/tivodecode/Makefile
index 45524c15b2e2..5b20036f163f 100644
--- a/multimedia/tivodecode/Makefile
+++ b/multimedia/tivodecode/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tivodecode
DISTVERSION= 0.2pre4
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.2pre4
MAINTAINER= mhsin@mhsin.org
COMMENT= Converts .TiVo files to normal MPEG files
diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index 7b9656c3abc4..a78d9253657e 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tovid
PORTVERSION= 0.30
PORTREVISION= 6
CATEGORIES= multimedia python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tovid
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
PATCH_SITES= http://tovid.sourceforge.net/download/patches/
PATCHFILES= tovid-0.30.2.patch.gz
diff --git a/multimedia/transkode/Makefile b/multimedia/transkode/Makefile
index fc0ac17f0422..ac310ec4d64c 100644
--- a/multimedia/transkode/Makefile
+++ b/multimedia/transkode/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.7
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= multimedia audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A KDE/Qt based frontend for various audio transcoding tools
diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile
index 9736fdaaf9e4..7dc7335a252a 100644
--- a/multimedia/tunapie/Makefile
+++ b/multimedia/tunapie/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tunapie
PORTVERSION= 2.1.17
PORTREVISION= 1
CATEGORIES= multimedia audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.1
DISTNAME= ${PORTNAME}-${PORTVERSION:S,.r,rc,}
MAINTAINER= nivit@FreeBSD.org
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 112aaa555f72..a3931c9235fa 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xine
PORTVERSION= 0.99.5
PORTREVISION= 4
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui%20%28skinned%20front%20end%29/${PORTVERSION}
DISTNAME= ${PORTNAME}-ui-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index e0d1748c9b0d..a50144d48edb 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.if defined(WITH_RUSXMMS_PATCHES)
ENC_PATCHLEVEL= 41
DISTFILES+= RusXMMS2-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
+MASTER_SITES+= SF/rusxmms/rusxmms2/csa41%20%28${PORTVERSION}%29:enc
MASTER_SITE_SUBDIR+= rusxmms/:enc
LIB_DEPENDS+= rcc.2:${PORTSDIR}/devel/librcc
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index e34e24ad5ad2..2c56054a0361 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -11,7 +11,7 @@ PORTVERSION= 1.0.0.p1
PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Xtheater/1.0.0-pre1
DISTNAME= Xtheater-${PORTVERSION:S/.p/-pre/}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index dca4f96b7219..8dbdecba5a12 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tmux
DISTVERSION= 0.9
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= A Terminal Multiplexer