summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.sites.mk23
-rw-r--r--archivers/upx/Makefile2
-rw-r--r--audio/adplay/Makefile3
-rw-r--r--audio/bmp-fc/Makefile3
-rw-r--r--audio/k3bmonkeyaudioplugin/Makefile3
-rw-r--r--audio/libadplug/Makefile3
-rw-r--r--audio/pacpl/Makefile2
-rw-r--r--audio/xmms-ahx/Makefile3
-rw-r--r--audio/xmms-modplug/Makefile3
-rw-r--r--audio/xmms-xymms/Makefile3
-rw-r--r--databases/phppgadmin/Makefile3
-rw-r--r--deskutils/ljclive/Makefile3
-rw-r--r--deskutils/metabar/Makefile3
-rw-r--r--deskutils/pypanel/Makefile3
-rw-r--r--deskutils/timer-applet/Makefile2
-rw-r--r--devel/charva/Makefile3
-rw-r--r--devel/codeblocks/Makefile3
-rw-r--r--devel/entity/Makefile3
-rw-r--r--devel/fnorb/Makefile3
-rw-r--r--devel/itext/Makefile3
-rw-r--r--devel/libbinio/Makefile3
-rw-r--r--devel/libnaji/Makefile3
-rw-r--r--devel/lmdbg/Makefile3
-rw-r--r--devel/log4cplus/Makefile3
-rw-r--r--devel/loki/Makefile3
-rw-r--r--devel/mingw32-pdcurses/Makefile3
-rw-r--r--devel/nasm/Makefile4
-rw-r--r--devel/ocaml-magic/Makefile3
-rw-r--r--editors/kile-kde4/Makefile2
-rw-r--r--editors/kile/Makefile2
-rw-r--r--editors/kxmleditor/Makefile3
-rw-r--r--emulators/wine-devel/Makefile3
-rw-r--r--emulators/wine/Makefile3
-rw-r--r--finance/gfp/Makefile3
-rw-r--r--finance/ledger/Makefile2
-rw-r--r--ftp/weex/Makefile3
-rw-r--r--games/ksudoku/Makefile3
-rw-r--r--games/pioneers/Makefile3
-rw-r--r--games/widelands/Makefile2
-rw-r--r--graphics/curator/Makefile3
-rw-r--r--graphics/digikam-kde4/Makefile2
-rw-r--r--graphics/ffff/Makefile2
-rw-r--r--graphics/fig2sxd/Makefile2
-rw-r--r--graphics/giflib/Makefile3
-rw-r--r--graphics/gqview-devel/Makefile3
-rw-r--r--graphics/gqview/Makefile3
-rw-r--r--graphics/imgseek/Makefile2
-rw-r--r--graphics/libungif/Makefile3
-rw-r--r--graphics/potrace/Makefile3
-rw-r--r--graphics/potracegui/Makefile3
-rw-r--r--irc/cgiirc/Makefile3
-rw-r--r--irc/ircd-hybrid/Makefile3
-rw-r--r--java/trove4j/Makefile3
-rw-r--r--lang/scsh/Makefile3
-rw-r--r--lang/sisc/Makefile3
-rw-r--r--mail/archmbox/Makefile3
-rw-r--r--mail/exim/Makefile2
-rw-r--r--mail/fdm/Makefile2
-rw-r--r--mail/gnubiff/Makefile3
-rw-r--r--mail/mixmaster/Makefile3
-rw-r--r--mail/p5-IMAP-Sieve/Makefile3
-rw-r--r--mail/spamprobe/Makefile3
-rw-r--r--mail/vpopmail-devel/Makefile3
-rw-r--r--mail/websieve/Makefile3
-rw-r--r--math/jsmath/Makefile2
-rw-r--r--misc/latex-mk/Makefile3
-rw-r--r--misc/najitool/Makefile3
-rw-r--r--misc/vifm/Makefile2
-rw-r--r--multimedia/acidrip/Makefile2
-rw-r--r--multimedia/kdenlive/Makefile2
-rw-r--r--multimedia/libquicktime/Makefile2
-rw-r--r--multimedia/mlt/Makefile2
-rw-r--r--multimedia/subtools/Makefile2
-rw-r--r--multimedia/vamps/Makefile3
-rw-r--r--multimedia/xmms-weasel/Makefile3
-rw-r--r--net-im/bsflite/Makefile3
-rw-r--r--net-mgmt/disco/Makefile3
-rw-r--r--net-mgmt/ettercap/Makefile3
-rw-r--r--net-mgmt/jnettop/Makefile2
-rw-r--r--net-mgmt/snmp4nagios/Makefile2
-rw-r--r--net-p2p/mldonkey/Makefile4
-rw-r--r--net-p2p/museek+/Makefile3
-rw-r--r--net-p2p/museekplus/Makefile3
-rw-r--r--net-p2p/torrentflux/Makefile3
-rw-r--r--net/balance/Makefile4
-rw-r--r--net/bfilter/Makefile2
-rw-r--r--net/libtnl/Makefile3
-rw-r--r--net/nload/Makefile2
-rw-r--r--net/samba-pdbsql/Makefile3
-rw-r--r--net/tintin++-devel/Makefile2
-rw-r--r--net/traff/Makefile3
-rw-r--r--net/yptransitd/Makefile3
-rw-r--r--news/leafnode/Makefile8
-rw-r--r--science/gwyddion/Makefile3
-rw-r--r--security/bsdsfv/Makefile3
-rw-r--r--security/mac-robber/Makefile3
-rw-r--r--security/pam_krb5/Makefile3
-rw-r--r--security/pbnj/Makefile3
-rw-r--r--security/pure-sfv/Makefile3
-rw-r--r--security/snoopy/Makefile3
-rw-r--r--security/sudosh/Makefile3
-rw-r--r--security/sudosh2/Makefile3
-rw-r--r--security/sudosh3/Makefile3
-rw-r--r--security/wapiti/Makefile3
-rw-r--r--sysutils/cdrdao/Makefile3
-rw-r--r--sysutils/fatback/Makefile3
-rw-r--r--sysutils/gapcmon/Makefile2
-rw-r--r--sysutils/hilite/Makefile3
-rw-r--r--sysutils/krename-kde4/Makefile3
-rw-r--r--sysutils/krename/Makefile3
-rw-r--r--sysutils/mdcp/Makefile2
-rw-r--r--textproc/colordiff/Makefile3
-rw-r--r--textproc/dixit/Makefile3
-rw-r--r--textproc/ffe/Makefile2
-rw-r--r--textproc/jalingo/Makefile2
-rw-r--r--textproc/py-tvgrab/Makefile5
-rw-r--r--textproc/refdb/Makefile2
-rw-r--r--textproc/saxon/Makefile3
-rw-r--r--textproc/xmlstarlet/Makefile3
-rw-r--r--www/aria2/Makefile2
-rw-r--r--www/aria2fe/Makefile2
-rw-r--r--www/eyeos/Makefile2
-rw-r--r--www/hastymail/Makefile3
-rw-r--r--www/hastymail2-devel/Makefile3
-rw-r--r--www/hastymail2/Makefile3
-rw-r--r--www/mod_fcgid/Makefile3
-rw-r--r--www/netrik/Makefile2
-rw-r--r--www/pebble/Makefile3
-rw-r--r--www/rssowl/Makefile2
-rw-r--r--www/wsmake/Makefile2
-rw-r--r--www/yabb/Makefile2
-rw-r--r--x11-toolkits/p5-Gnome2-VFS/Makefile3
-rw-r--r--x11-toolkits/py-fltk/Makefile3
-rw-r--r--x11/gtkterm2/Makefile3
-rw-r--r--x11/multi-gnome-terminal/Makefile3
135 files changed, 145 insertions, 253 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 68e5fbd8aa96..c457922a1494 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1176,23 +1176,15 @@ MASTER_SITE_SAVANNAH+= \
.endif
.if !defined(IGNORE_MASTER_SITE_SOURCEFORGE)
-.for mirror in garr superb-east nchc kent easynews ufpr mesh heanet
+.for mirror in heanet sunet iweb switch surfnet kent freefr \
+ voxel jaist osdn nchc transact softlayer \
+ internode biznetnetworks upfr
+# garr dfn ovh (redirect as of 2009-Sep-02)
MASTER_SITE_SOURCEFORGE+= \
http://${mirror}.dl.sourceforge.net/project/%SUBDIR%/
.endfor
.endif
-# official sf.net mirrors that don't mirror all projects, check
-# http://prdownloads.sourceforge.net/%SUBDIR%/
-.if !defined(IGNORE_MASTER_SITE_SOURCEFORGE_EXTENDED)
-.for mirror in easynews switch puzzle belnet osdn ovh keihanna
-MASTER_SITE_SOURCEFORGE_EXTENDED+= \
- http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/
-.endfor
-#MASTER_SITE_SOURCEFORGE_EXTENDED+= \
-# ${MASTER_SITE_SOURCEFORGE}
-.endif
-
.if !defined(IGNORE_MASTER_SITE_SOURCEFORGE_JP)
.for mirror in keihanna osdn qgpop
MASTER_SITE_SOURCEFORGE_JP+= \
@@ -1497,8 +1489,10 @@ MASTER_SITE_KERNEL_ORG+= \
# Macro magic
-MASTER_SITES_ABBREVS= CPAN:PERL_CPAN SF:SOURCEFORGE SFE:SOURCEFORGE_EXTENDED \
- SFJP:SOURCEFORGE_JP RF:RUBYFORGE
+MASTER_SITES_ABBREVS= CPAN:PERL_CPAN \
+ SF:SOURCEFORGE \
+ SFJP:SOURCEFORGE_JP \
+ RF:RUBYFORGE
MASTER_SITES_SUBDIRS= \
APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
BERLIOS:${PORTNAME:L} \
@@ -1519,7 +1513,6 @@ MASTER_SITES_SUBDIRS= \
RUBY_GNOME:${RUBY_GNOME_MASTER_SITE_SUBDIR} \
SAVANNAH:${PORTNAME:L} \
SOURCEFORGE:${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION} \
- SOURCEFORGE_EXTENDED:${PORTNAME:L} \
RUBYFORGE:${PORTNAME:L}
.if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*}
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index b8217219f0e5..be0aa52f2d11 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -9,7 +9,7 @@ PORTNAME= upx
PORTVERSION= 3.03
CATEGORIES= archivers
MASTER_SITES= http://upx.sourceforge.net/download/\
- SFE/sevenzip:lzma
+ SF/sevenzip/7-Zip/4.57:lzma
DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}\
7z${LZMA_VER:S/.//g}${EXTRACT_SUFX}:lzma
diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index f0e008114194..ea0ea02bbb11 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -9,8 +9,7 @@ PORTNAME= adplay
PORTVERSION= 1.6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= adplug
+MASTER_SITES= SF/adplug/AdPlay_UNIX/${PORTVERSION}
DISTFILES= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX} \
${DBFILE}
EXTRACT_ONLY= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX}
diff --git a/audio/bmp-fc/Makefile b/audio/bmp-fc/Makefile
index 46e6af4223c7..600a27db75c6 100644
--- a/audio/bmp-fc/Makefile
+++ b/audio/bmp-fc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bmp-fc
PORTVERSION= 0.1
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= xmms-fc
+MASTER_SITES= SF/xmms-fc/${PORTNAME}/${PORTVERSION}
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= A Future Composer input plug-in for beep-media-player
diff --git a/audio/k3bmonkeyaudioplugin/Makefile b/audio/k3bmonkeyaudioplugin/Makefile
index 35350635d454..f680fde464fe 100644
--- a/audio/k3bmonkeyaudioplugin/Makefile
+++ b/audio/k3bmonkeyaudioplugin/Makefile
@@ -8,8 +8,7 @@ PORTNAME= k3bmonkeyaudioplugin
PORTVERSION= 3.1
PORTREVISION= 3
CATEGORIES= audio kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= k3b
+MASTER_SITES= SF/k3b/${PORTNAME}/${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= K3b plugin for Monkey's Audio files
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index fd7b6c6c2603..c6c71c98322f 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libadplug
PORTVERSION= 2.1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= adplug
+MASTER_SITES= SF/adplug/AdPlug%20core%20library/${PORTVERSION}
DISTNAME= adplug-${PORTVERSION}
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index 599b9819bc97..e2ff69a0d070 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pacpl
PORTVERSION= 4.0.5
CATEGORIES= audio
-MASTER_SITES= SFE
+MASTER_SITES= SF
MAINTAINER= hideo@lastamericanempire.com
COMMENT= Perl Audio Converter
diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile
index 93940b3ce48f..dfc31a216e0b 100644
--- a/audio/xmms-ahx/Makefile
+++ b/audio/xmms-ahx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-ahx
PORTVERSION= 0.6
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= XMMS plugin for playing AHX tunes
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 502f1cefcc58..d5d1ff7ea8f9 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -9,8 +9,7 @@ PORTNAME= modplug
PORTVERSION= 2.0.5
PORTREVISION= 5
CATEGORIES?= audio
-MASTER_SITES= SFE
-MASTER_SITE_SUBDIR= ${PORTNAME}-${PKGNAMEPREFIX:S/-//}
+MASTER_SITES= SF/${PORTNAME}-xmms/${PORTNAME}-xmms/2.05
PKGNAMEPREFIX= xmms-
DISTNAME= ${PORTNAME}${PKGNAMEPREFIX}2.05
diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile
index 4d39f48b196a..0c0ea610aa35 100644
--- a/audio/xmms-xymms/Makefile
+++ b/audio/xmms-xymms/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xymms
DISTVERSION= 0.9.1
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= xmms-
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index e501264dce10..14faa9f6efd7 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= phppgadmin
PORTVERSION= 4.2.2
CATEGORIES= databases www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/phpPgAdmin%20%5Bstable%5D/phpPgAdmin-${PORTVERSION}
DISTNAME= phpPgAdmin-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/deskutils/ljclive/Makefile b/deskutils/ljclive/Makefile
index 082167f75eb1..b3ed3ea141af 100644
--- a/deskutils/ljclive/Makefile
+++ b/deskutils/ljclive/Makefile
@@ -9,8 +9,7 @@ PORTNAME= clive
PORTVERSION= 0.4.5
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ljclive
+MASTER_SITES= SF/lj${PORTNAME}/lj${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= johans@stack.nl
COMMENT= A command line client for posting LiveJournal entries
diff --git a/deskutils/metabar/Makefile b/deskutils/metabar/Makefile
index 0967f38c4d3e..bc003ff7a0ba 100644
--- a/deskutils/metabar/Makefile
+++ b/deskutils/metabar/Makefile
@@ -8,8 +8,7 @@ PORTNAME= metabar
PORTVERSION= 0.8
PORTREVISION= 6
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= Sidebar plugin for Konqueror
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 140164104d02..8256f7ee1b03 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pypanel
PORTVERSION= 2.4
PORTREVISION= 6
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= pypanel
+MASTER_SITES= SF
DISTNAME= PyPanel-${PORTVERSION}
MAINTAINER= u0@rootofallevil.net
diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 32e388f84bf3..6fba10aab22b 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -9,7 +9,7 @@ PORTNAME= timer-applet
PORTVERSION= 2.1.2
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= SFE/timerapplet
+MASTER_SITES= SF/timerapplet/timerapplet/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A timer applet for the GNOME panel
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index 76b96dd19d4e..a3c7a859e254 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -9,8 +9,7 @@ PORTNAME= charva
PORTVERSION= 1.1.4
PORTREVISION= 4
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}
MAINTAINER= ale@FreeBSD.org
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 17d9ce8b1b95..ca51b1acdcab 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -9,8 +9,7 @@ PORTNAME= codeblocks
PORTVERSION= 8.02
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= dinoex@FreeBSD.org
diff --git a/devel/entity/Makefile b/devel/entity/Makefile
index 21e77ed174e9..83ee1f74642c 100644
--- a/devel/entity/Makefile
+++ b/devel/entity/Makefile
@@ -9,8 +9,7 @@ PORTNAME= entity
PORTVERSION= 0.7.2
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Old%20Entity%20Versions
MAINTAINER= ports@FreeBSD.org
COMMENT= A really rapid XML-based application development system
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index 0aad62679bab..f30a167a4845 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Fnorb
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= fnorb
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A CORBA 2.0 ORB written in Python
diff --git a/devel/itext/Makefile b/devel/itext/Makefile
index 4ec294c90258..8fdd045e6c89 100644
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@@ -10,8 +10,7 @@ PORTNAME= itext
PORTVERSION= 2.1.7
PORTEPOCH= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/iText/iText%20${PORTVERSION}
DISTNAME= iText-src-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile
index f4207403baa4..cc1cfd7e5102 100644
--- a/devel/libbinio/Makefile
+++ b/devel/libbinio/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libbinio
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Binary I/O stream class library
diff --git a/devel/libnaji/Makefile b/devel/libnaji/Makefile
index 2787d96fde53..fbb0a97d241d 100644
--- a/devel/libnaji/Makefile
+++ b/devel/libnaji/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libnaji
PORTVERSION= 0.6.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= najitool
+MASTER_SITES= SF/najitool/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A library that generates, converts, and filters files
diff --git a/devel/lmdbg/Makefile b/devel/lmdbg/Makefile
index d89a50c47367..5d2171a4ae60 100644
--- a/devel/lmdbg/Makefile
+++ b/devel/lmdbg/Makefile
@@ -8,8 +8,7 @@
PORTNAME= lmdbg
PORTVERSION= 0.9.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= to.my.trociny@gmail.com
COMMENT= Lightweight malloc debugger
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index 7a4e89f145e4..a6c36778bf6a 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -9,8 +9,7 @@ PORTNAME= log4cplus
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= log4cplus
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
DISTFILES= log4cplus-${PORTVERSION}.tar.gz log4cplus-${PORTVERSION}-docs.tar.gz
MAINTAINER= petri.totterman@hmv.fi
diff --git a/devel/loki/Makefile b/devel/loki/Makefile
index 770195d42a6a..0218e972575f 100644
--- a/devel/loki/Makefile
+++ b/devel/loki/Makefile
@@ -8,8 +8,7 @@
PORTNAME= loki
PORTVERSION= 0.1.5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= loki-lib
+MASTER_SITES= SF/${PORTNAME}-lib/Loki/Loki%20${PORTVERSION}
MAINTAINER= snnn119@gmail.com
COMMENT= A C++ library of common design patterns
diff --git a/devel/mingw32-pdcurses/Makefile b/devel/mingw32-pdcurses/Makefile
index 6c066921c233..453a7fa5b427 100644
--- a/devel/mingw32-pdcurses/Makefile
+++ b/devel/mingw32-pdcurses/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pdcurses
PORTVERSION= 3.4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= mingw32-
DISTNAME= PDCurses-${PORTVERSION}
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 4267244d85fa..fbbbc19124af 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -9,10 +9,10 @@ PORTNAME= nasm
PORTVERSION= 2.05.01
PORTEPOCH= 1
CATEGORIES= devel lang
-MASTER_SITES= SFE http://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION} \
+ http://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xdoc${EXTRACT_SUFX}
-
MAINTAINER= krion@FreeBSD.org
COMMENT= General-purpose multi-platform x86 and x86-64 assembler
diff --git a/devel/ocaml-magic/Makefile b/devel/ocaml-magic/Makefile
index 007125488eb6..565cff55d172 100644
--- a/devel/ocaml-magic/Makefile
+++ b/devel/ocaml-magic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= magic
PORTVERSION= 0.7.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
+MASTER_SITES= SF/ocaml-${PORTNAME}/ocaml-${PORTNAME}/0.7
PKGNAMEPREFIX= ocaml-
DISTNAME= ${PKGNAME}
diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index c104a95189f9..839b7c78708c 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kile
PORTVERSION= 2.0.3
PORTREVISION= 1
CATEGORIES= editors kde
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= A LaTeX source editor for KDE
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index c104a95189f9..839b7c78708c 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kile
PORTVERSION= 2.0.3
PORTREVISION= 1
CATEGORIES= editors kde
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= A LaTeX source editor for KDE
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index 46f69f18d716..8a38f5d36557 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kxmleditor
PORTVERSION= 1.1.4
PORTREVISION= 6
CATEGORIES= editors kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/KXMLEditor/${PORTVERSION}
MAINTAINER= kevlo@FreeBSD.org
COMMENT= XML editor for KDE
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 7d28338faf65..540301997c98 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -10,9 +10,8 @@ PORTNAME= wine
DISTVERSION= 1.1.28
PORTEPOCH= 1
CATEGORIES= emulators
-MASTER_SITES= SFE \
+MASTER_SITES= SF/${PORTNAME}/Source \
http://ibiblio.org/pub/linux/system/emulators/wine/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gerald@FreeBSD.org
COMMENT= Microsoft Windows compatibility layer for Unix-like systems
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 7d28338faf65..540301997c98 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -10,9 +10,8 @@ PORTNAME= wine
DISTVERSION= 1.1.28
PORTEPOCH= 1
CATEGORIES= emulators
-MASTER_SITES= SFE \
+MASTER_SITES= SF/${PORTNAME}/Source \
http://ibiblio.org/pub/linux/system/emulators/wine/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gerald@FreeBSD.org
COMMENT= Microsoft Windows compatibility layer for Unix-like systems
diff --git a/finance/gfp/Makefile b/finance/gfp/Makefile
index 21b7f5b0bf28..04eaa2ec44a2 100644
--- a/finance/gfp/Makefile
+++ b/finance/gfp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gfp
PORTVERSION= 0.7.2
PORTREVISION= 5
CATEGORIES= finance java
-MASTER_SITES= SFE
-MASTER_SITE_SUBDIR= gfd
+MASTER_SITES= SF/gfd/1%20-%20GFP%20Stable/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/finance/ledger/Makefile b/finance/ledger/Makefile
index 9dcfc2291d7f..87e9143f089f 100644
--- a/finance/ledger/Makefile
+++ b/finance/ledger/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ledger
PORTVERSION= 2.6.1
PORTREVISION= 1
CATEGORIES= finance
-MASTER_SITES= SFE
+MASTER_SITES= SF
MAINTAINER= woodycarey@hotmail.com
COMMENT= John Wiegley's command line accounting program
diff --git a/ftp/weex/Makefile b/ftp/weex/Makefile
index 8ba45647bab1..77157613c465 100644
--- a/ftp/weex/Makefile
+++ b/ftp/weex/Makefile
@@ -9,8 +9,7 @@ PORTNAME= weex
PORTVERSION= 2.6.1.5
PORTREVISION= 1
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= A non-interactive FTP client
diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile
index d9c95db2779e..88330dca015a 100644
--- a/games/ksudoku/Makefile
+++ b/games/ksudoku/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ksudoku
PORTVERSION= 0.4
PORTREVISION= 3
CATEGORIES= games kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= freebsd@chillt.de
COMMENT= A Sudoku generator and solver for KDE
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 5771485927cb..869579ff3902 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pioneers
PORTVERSION= 0.12.2
PORTREVISION= 2
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= pio
+MASTER_SITES= SF/pio/Source%20code/Pioneers%200.12
MAINTAINER= stefan@FreeBSD.org
COMMENT= An Internet playable version of the Settlers of Catan for GNOME/GTK+
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index 306e1c630905..0ef01b043861 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -9,7 +9,7 @@ PORTNAME= widelands
DISTVERSION= build13
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/build-13
DISTNAME= ${PORTNAME:C/^w/W/}-${DISTVERSION:C/^b/B/}-src
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile
index 193fad2a1fbd..f2772bd899a1 100644
--- a/graphics/curator/Makefile
+++ b/graphics/curator/Makefile
@@ -9,8 +9,7 @@ PORTNAME= curator
PORTVERSION= 2.1
PORTREVISION= 2
CATEGORIES= graphics www python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Static Image Gallery Generator for web or CD-ROM galleries
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 784561515358..9e656a1a39ba 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.10.0
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= graphics kde
-MASTER_SITES= SFE
+MASTER_SITES= SF
MAINTAINER= datahead4@gmail.com
COMMENT= An advanced digital photo management application for KDE4
diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile
index 5e57e8644767..aae9cc4cf6c0 100644
--- a/graphics/ffff/Makefile
+++ b/graphics/ffff/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ffff
PORTVERSION= 323
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/FFFF%203.2.3
DISTNAME= FFFF${PORTVERSION}-src
MAINTAINER= rossiya@gmail.com
diff --git a/graphics/fig2sxd/Makefile b/graphics/fig2sxd/Makefile
index 87831986716e..bd054392b9d7 100644
--- a/graphics/fig2sxd/Makefile
+++ b/graphics/fig2sxd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fig2sxd
PORTVERSION= 0.20
CATEGORIES= graphics converters
-MASTER_SITES= CRITICAL
+MASTER_SITES= CRITICAL SF
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 3773e9780075..6a05f0de5630 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= giflib
PORTVERSION= 4.1.6
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= giflib
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%204.x/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= ${NOX11SUFFIX}${PKGNAMESUFFIX2}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index dc4f5f762c3d..3e79b5be6c73 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gqview
PORTVERSION= 2.1.5
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/unstable/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Another gtk2-based graphic file viewer
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 656e804a778e..fa2b856f2e1b 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gqview
PORTVERSION= 2.0.4
PORTREVISION= 9
CATEGORIES= graphics
-MASTER_SITES= SFE
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= lme@FreeBSD.org
COMMENT= Another gtk2-based graphic file viewer
diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile
index 800e8d555d71..a62ea383f8c5 100644
--- a/graphics/imgseek/Makefile
+++ b/graphics/imgseek/Makefile
@@ -9,7 +9,7 @@ PORTNAME= imgSeek
PORTVERSION= 0.8.6
PORTREVISION= 6
CATEGORIES= graphics
-MASTER_SITES= SFE
+MASTER_SITES= SF
MAINTAINER= alfredoj69@gmail.com
COMMENT= A photo manager and viewer with content-based search
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 65b0599efdd5..4a4f1b637c25 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libungif
PORTVERSION= 4.1.4
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= giflib
+MASTER_SITES= SF/giflib/${PORTNAME}%204.x/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= ${NOX11SUFFIX}${PKGNAMESUFFIX2}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/graphics/potrace/Makefile b/graphics/potrace/Makefile
index abda905605d8..e45e028614c0 100644
--- a/graphics/potrace/Makefile
+++ b/graphics/potrace/Makefile
@@ -8,8 +8,7 @@
PORTNAME= potrace
PORTVERSION= 1.8
CATEGORIES= graphics
-MASTER_SITES= SFE
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= smyru@heron.pl
COMMENT= Transforms bitmaps into vector graphics
diff --git a/graphics/potracegui/Makefile b/graphics/potracegui/Makefile
index c816e28be690..3138499b9680 100644
--- a/graphics/potracegui/Makefile
+++ b/graphics/potracegui/Makefile
@@ -9,8 +9,7 @@ PORTNAME= potracegui
PORTVERSION= 1.3.4
PORTREVISION= 3
CATEGORIES= graphics kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= markus@FreeBSD.org
COMMENT= GUI for potrace, a program for tracing bitmap images
diff --git a/irc/cgiirc/Makefile b/irc/cgiirc/Makefile
index 64be40213f8a..ecd422ccc242 100644
--- a/irc/cgiirc/Makefile
+++ b/irc/cgiirc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cgiirc
PORTVERSION= 0.5.9
CATEGORIES= irc www perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= cgiirc
+MASTER_SITES= SF/${PORTNAME}/cgi-irc/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= IRC web gateway written in Perl
diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index 6e9d4c385339..342b3eb0d1d2 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ircd-hybrid
PORTVERSION= 7.2.1
CATEGORIES= irc ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ircd-hybrid
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= db@db.net
diff --git a/java/trove4j/Makefile b/java/trove4j/Makefile
index 67e42544fd52..5f490d60c4ad 100644
--- a/java/trove4j/Makefile
+++ b/java/trove4j/Makefile
@@ -8,8 +8,7 @@ PORTNAME= trove4j
PORTVERSION= 1.1b5
PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= trove4j
+MASTER_SITES= SF/${PORTNAME}/trove/trove-${PORTVERSION}
DISTNAME= trove-${PORTVERSION}
MAINTAINER= hq@FreeBSD.org
diff --git a/lang/scsh/Makefile b/lang/scsh/Makefile
index 8efb3ce1ce93..9d894f2f550f 100644
--- a/lang/scsh/Makefile
+++ b/lang/scsh/Makefile
@@ -8,9 +8,8 @@
PORTNAME= scsh
PORTVERSION= 0.6.7
CATEGORIES= lang scheme
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \
+MASTER_SITES= SF \
ftp://ftp.scsh.net/pub/scsh/0.6/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= stas@FreeBSD.org
COMMENT= A Unix shell embedded into Scheme, with access to all Posix calls
diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile
index 086bb0a91fd3..326b764cfbc2 100644
--- a/lang/sisc/Makefile
+++ b/lang/sisc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sisc
PORTVERSION= 1.16.6
PORTREVISION= 2
CATEGORIES= lang scheme java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/SISC/${PORTVERSION}
MAINTAINER= araujo@FreeBSD.org
COMMENT= An extensible Java-based Scheme interpreter
diff --git a/mail/archmbox/Makefile b/mail/archmbox/Makefile
index b752ef8f920d..a9465411be5a 100644
--- a/mail/archmbox/Makefile
+++ b/mail/archmbox/Makefile
@@ -8,8 +8,7 @@
PORTNAME= archmbox
PORTVERSION= 4.10.0
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= adc-archmbox
+MASTER_SITES= SF/adc-${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= tad@vif.com
COMMENT= Email archiver written in perl; parses mailboxes and performs actions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9c8a94d80459..c7ede9e4ec45 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -23,7 +23,7 @@ COMMENT?= High performance MTA for Unix systems on the Internet
.if defined(WITH_SA_EXIM)
MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \
- ${MASTER_SITE_SOURCEFORGE_EXTENDED:S/$/:sa_exim/}
+ SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim
MASTER_SITE_SUBDIR+= sa-exim/:sa_exim
DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
.endif
diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index 6b8b7b35088d..4b545a9ee0c1 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fdm
PORTVERSION= 1.6
CATEGORIES= mail
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= chifeng@gmail.com
COMMENT= Fetches and delivers mail
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index d6bab6a5cdcf..15024992ffd4 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gnubiff
PORTVERSION= 2.2.11
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= tdb@FreeBSD.org
COMMENT= A mail notification program for Gnome
diff --git a/mail/mixmaster/Makefile b/mail/mixmaster/Makefile
index 6dba99af6a05..0e17f5cd5482 100644
--- a/mail/mixmaster/Makefile
+++ b/mail/mixmaster/Makefile
@@ -9,9 +9,8 @@ PORTNAME= mixmaster
PORTVERSION= 2.9.1
PORTREVISION= 1
CATEGORIES= mail security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \
+MASTER_SITES= SF/${PORTNAME}/Mixmaster/${PORTVERSION} \
ftp://ftp.erisiandiscord.de/pub/misc/
-MASTER_SITE_SUBDIR= mixmaster
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
mixmaster-update.pl.gz allpingers.txt.gz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/mail/p5-IMAP-Sieve/Makefile b/mail/p5-IMAP-Sieve/Makefile
index 4b9c771c1142..ef7e88176899 100644
--- a/mail/p5-IMAP-Sieve/Makefile
+++ b/mail/p5-IMAP-Sieve/Makefile
@@ -9,8 +9,7 @@ PORTNAME= IMAP-Sieve
PORTVERSION= 0.4.9
PORTREVISION= 2
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= websieve
+MASTER_SITES= SF/websieve/websieve/063a
PKGNAMEPREFIX= p5-
DISTNAME= websieve-063a
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 78e1ab457a8a..5009d2ee55a3 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -16,8 +16,7 @@ PORTNAME= spamprobe
PORTVERSION= 1.4d
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= stefan@FreeBSD.org
COMMENT= Spam detector using Bayesian analysis of word counts
diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index fd7da041fc72..b049d4540e68 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vpopmail
PORTVERSION= 5.5.0
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMESUFFIX= -devel
MAINTAINER= ale@FreeBSD.org
diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index 84e8cb6d113f..feef583a6e3d 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -8,8 +8,7 @@
PORTNAME= websieve
PORTVERSION= 0.63.a
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/063a
DISTNAME?= ${PORTNAME}-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/jsmath/Makefile b/math/jsmath/Makefile
index 37a349865a89..bde08f096c99 100644
--- a/math/jsmath/Makefile
+++ b/math/jsmath/Makefile
@@ -8,7 +8,7 @@
PORTNAME= jsMath
DISTVERSION= 3.6b
CATEGORIES= math www
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/3.6b
MAINTAINER= nivit@FreeBSD.org
COMMENT= A Javascript tool for including mathematics in web pages
diff --git a/misc/latex-mk/Makefile b/misc/latex-mk/Makefile
index 0f4e936d40cb..a9e0a827446c 100644
--- a/misc/latex-mk/Makefile
+++ b/misc/latex-mk/Makefile
@@ -10,8 +10,7 @@ PORTNAME= latex-mk
PORTVERSION= 1.9.1
PORTREVISION= 1
CATEGORIES= misc print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= kimelto@gmail.com
COMMENT= A collection of makefile and scripts for LaTeX documents
diff --git a/misc/najitool/Makefile b/misc/najitool/Makefile
index 9e7915064e2b..206d0e1067f2 100644
--- a/misc/najitool/Makefile
+++ b/misc/najitool/Makefile
@@ -8,8 +8,7 @@
PORTNAME= najitool
PORTVERSION= 0.8.1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= najitool
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool that generates, converts, and filters files
diff --git a/misc/vifm/Makefile b/misc/vifm/Makefile
index 527050eff1e5..76e3ae6bc568 100644
--- a/misc/vifm/Makefile
+++ b/misc/vifm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vifm
PORTVERSION= 0.4
CATEGORIES= misc
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= corky1951@comcast.net
COMMENT= Ncurses based file manager with vi like keybindings
diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile
index 82a277af7382..44d95d82901b 100644
--- a/multimedia/acidrip/Makefile
+++ b/multimedia/acidrip/Makefile
@@ -9,7 +9,7 @@ PORTNAME= acidrip
PORTVERSION= 0.14
PORTREVISION= 6
CATEGORIES= multimedia
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20-%20Your%20two-wheeled%20knife
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK2::Perl wrapper for MPlayer and MEncoder for ripping DVDs
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index d5b9448f5abc..16a8cfb53c92 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdenlive
PORTVERSION= 0.7.5
CATEGORIES= multimedia kde
-MASTER_SITES= SFE
+MASTER_SITES= SF
MAINTAINER= villa.alberto@gmail.com
COMMENT= A professional quality non-linear video editing suite for KDE
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 448576282f43..812eb93a15cd 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libquicktime
PORTVERSION= 1.1.3
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= SFE
+MASTER_SITES= SF
MAINTAINER= mm@FreeBSD.org
COMMENT= A library for reading and writing quicktime files
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 81bacdf1a580..a29de39a162c 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -8,7 +8,7 @@ PORTNAME= mlt
PORTVERSION= 0.4.4
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= SFE
+MASTER_SITES= SF
MAINTAINER= villa.alberto@gmail.com
COMMENT= A multimedia framework and video playout server for TV broadcasting
diff --git a/multimedia/subtools/Makefile b/multimedia/subtools/Makefile
index ce706122b3e7..3dee58d69a27 100644
--- a/multimedia/subtools/Makefile
+++ b/multimedia/subtools/Makefile
@@ -9,7 +9,7 @@ PORTNAME= subtools
PORTVERSION= 20060508
DISTVERSIONSUFFIX= alpha
CATEGORIES= multimedia
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}alpha
MAINTAINER= ports@FreeBSD.org
COMMENT= Command-line tools for movie subtitles in SubRipper format
diff --git a/multimedia/vamps/Makefile b/multimedia/vamps/Makefile
index 709fd4f97ece..fb2d81274b4a 100644
--- a/multimedia/vamps/Makefile
+++ b/multimedia/vamps/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vamps
PORTVERSION= 0.99.2
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= vamps
+MASTER_SITES= SF/${PORTNAME}/Vamps/${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= High performance tool to transcode DVD videos to a smaller size
diff --git a/multimedia/xmms-weasel/Makefile b/multimedia/xmms-weasel/Makefile
index a93f912c6f5f..eaa1b63a5f3a 100644
--- a/multimedia/xmms-weasel/Makefile
+++ b/multimedia/xmms-weasel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-weasel
PORTVERSION= 0.0.1
PORTREVISION= 4
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/XMMS%20Weasel%20v${PORTVERSION}
MAINTAINER= narayannewton@gmail.com
COMMENT= A XMMS plugin to hide the player
diff --git a/net-im/bsflite/Makefile b/net-im/bsflite/Makefile
index e3aed4b2d2e9..cbbbe30d6059 100644
--- a/net-im/bsflite/Makefile
+++ b/net-im/bsflite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bsflite
DISTVERSION= 0.84
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=bsflite
+MASTER_SITES= SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= A lightweight command line AIM client
diff --git a/net-mgmt/disco/Makefile b/net-mgmt/disco/Makefile
index fc37851983b7..fa8285052f8c 100644
--- a/net-mgmt/disco/Makefile
+++ b/net-mgmt/disco/Makefile
@@ -9,8 +9,7 @@ PORTNAME= disco
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= discoipd
+MASTER_SITES= SF/${PORTNAME}ipd/DISCO/${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= jadawin@FreeBSD.org
COMMENT= IP discovery and fingerprinting utility
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 788a73d65f80..ae7f48fadbf9 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -11,9 +11,8 @@ DISTVERSIONPREFIX= NG-
PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= net-mgmt security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NG-${PORTVERSION} \
${MASTER_SITE_PACKETSTORM:S:%SUBDIR%:sniffers/ettercap:}
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mnag@FreeBSD.org
COMMENT= A network sniffer/interceptor/injector/logger for switched LANs
diff --git a/net-mgmt/jnettop/Makefile b/net-mgmt/jnettop/Makefile
index e0ab07b6ecc9..1f4c78c608a1 100644
--- a/net-mgmt/jnettop/Makefile
+++ b/net-mgmt/jnettop/Makefile
@@ -8,7 +8,7 @@
PORTNAME= jnettop
PORTVERSION= 0.13.0
CATEGORIES= net-mgmt
-MASTER_SITES= SFE/jnettop
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.13
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= rpsfa@rit.edu
diff --git a/net-mgmt/snmp4nagios/Makefile b/net-mgmt/snmp4nagios/Makefile
index 95f4757b11e5..7a449486be0c 100644
--- a/net-mgmt/snmp4nagios/Makefile
+++ b/net-mgmt/snmp4nagios/Makefile
@@ -8,7 +8,7 @@
PORTNAME= SNMP4Nagios
PORTVERSION= 0.4
CATEGORIES= net-mgmt
-MASTER_SITES= SFE/snmp4nagios
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= rpsfa@rit.edu
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 8d078fd7bc18..87d59f976ffc 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -9,9 +9,7 @@ PORTNAME= mldonkey
PORTVERSION= 3.0.0
PORTREVISION= 1
CATEGORIES+= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \
- ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER?= lioux@FreeBSD.org
COMMENT?= A OCAML client for multiple peer-to-peer networks
diff --git a/net-p2p/museek+/Makefile b/net-p2p/museek+/Makefile
index 8771ef86689b..01c629144c37 100644
--- a/net-p2p/museek+/Makefile
+++ b/net-p2p/museek+/Makefile
@@ -8,8 +8,7 @@ PORTNAME= museekplus
PORTVERSION= 0.1.13
PORTREVISION= 3
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= museek-plus
+MASTER_SITES= SF/museek-plus/museek-plus/${PORTVERSION}
DISTNAME= museek+-${PORTVERSION}
MAINTAINER= silver@ultrasoft.ee
diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile
index 8771ef86689b..01c629144c37 100644
--- a/net-p2p/museekplus/Makefile
+++ b/net-p2p/museekplus/Makefile
@@ -8,8 +8,7 @@ PORTNAME= museekplus
PORTVERSION= 0.1.13
PORTREVISION= 3
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= museek-plus
+MASTER_SITES= SF/museek-plus/museek-plus/${PORTVERSION}
DISTNAME= museek+-${PORTVERSION}
MAINTAINER= silver@ultrasoft.ee
diff --git a/net-p2p/torrentflux/Makefile b/net-p2p/torrentflux/Makefile
index dae8702a492c..b4c4a85be354 100644
--- a/net-p2p/torrentflux/Makefile
+++ b/net-p2p/torrentflux/Makefile
@@ -8,8 +8,7 @@
PORTNAME= torrentflux
DISTVERSION= 2.0beta1
CATEGORIES= net-p2p www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TorrentFlux%202.0%20beta1
MAINTAINER= ports@FreeBSD.org
COMMENT= A PHP based BitTorrent client that runs on a web server
diff --git a/net/balance/Makefile b/net/balance/Makefile
index 0638601bb22f..44d4c726c654 100644
--- a/net/balance/Makefile
+++ b/net/balance/Makefile
@@ -9,9 +9,7 @@ PORTNAME= balance
PORTVERSION= 3.42
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= http://www.inlab.de/ \
- ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= balance
+MASTER_SITES= http://www.inlab.de/
MAINTAINER= joseph@randomnetworks.com
COMMENT= Simple but powerful generic tcp proxy with round robin features
diff --git a/net/bfilter/Makefile b/net/bfilter/Makefile
index a0e6e268f417..34847992d7ad 100644
--- a/net/bfilter/Makefile
+++ b/net/bfilter/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bfilter
PORTVERSION= 1.1.4
CATEGORIES= net
-MASTER_SITES= SFE
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Smart filtering HTTP proxy
diff --git a/net/libtnl/Makefile b/net/libtnl/Makefile
index 6386e6ec3920..c337b723dc7e 100644
--- a/net/libtnl/Makefile
+++ b/net/libtnl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libtnl
PORTVERSION= 1.5.0
CATEGORIES= net devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= opentnl
+MASTER_SITES= SF/opentnl/TNL%20Source/${PORTVERSION}
DISTNAME= tnl-${PORTVERSION}-source
MAINTAINER= ports@FreeBSD.org
diff --git a/net/nload/Makefile b/net/nload/Makefile
index 07b6a86df24a..0411da68d9aa 100644
--- a/net/nload/Makefile
+++ b/net/nload/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nload
PORTVERSION= 0.7.2
CATEGORIES= net
-MASTER_SITES= CRITICAL
+MASTER_SITES= CRITICAL SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Console application which monitors network traffic in real time
diff --git a/net/samba-pdbsql/Makefile b/net/samba-pdbsql/Makefile
index 1796967af77b..619326d2d6a4 100644
--- a/net/samba-pdbsql/Makefile
+++ b/net/samba-pdbsql/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pdbsql
PORTVERSION= 0.3.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= pdbsql
+MASTER_SITES= SF
PKGNAMEPREFIX= samba-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/net/tintin++-devel/Makefile b/net/tintin++-devel/Makefile
index 410f950a342a..954fbb1dc726 100644
--- a/net/tintin++-devel/Makefile
+++ b/net/tintin++-devel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tintin
PORTVERSION= 1.99.6
CATEGORIES+= net games
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/TinTin%2B%2B%20Source%20Code/${PORTVERSION}
MAINTAINER= sunpoet@sunpoet.net
COMMENT= A client program to help playing MUDs (devel version)
diff --git a/net/traff/Makefile b/net/traff/Makefile
index 7e525f23d472..6fc5b243ff20 100644
--- a/net/traff/Makefile
+++ b/net/traff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= traff
PORTVERSION= 0.6.1
CATEGORIES= net net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= traff
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= daniel@freebsd.ro
diff --git a/net/yptransitd/Makefile b/net/yptransitd/Makefile
index 49df1d2d84a6..a5b138252ee7 100644
--- a/net/yptransitd/Makefile
+++ b/net/yptransitd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= yptransitd
PORTVERSION= 0.5
PORTREVISION= 4
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= yptransitd
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A replacement for nss_ldap
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 223209e60262..990ab83202fd 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -8,13 +8,9 @@
PORTNAME= leafnode
DISTVERSION= 1.11.7
CATEGORIES= news ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED:S/$/:sourceforge/} \
+MASTER_SITES= SF \
http://www.dt.e-technik.uni-dortmund.de/~ma/${PORTNAME}/ \
- ${MASTER_SITE_SUNSITE:S/$/:sunsite/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:sourceforge \
- ./:DEFAULT \
- system/news/transport/:sunsite
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sourceforge,sunsite,DEFAULT
+ SUNSITE/system/news/transport
#MASTER_SITES= http://www.dt.e-technik.uni-dortmund.de/~ma/${PORTNAME}/ \
# http://homepages.uni-paderborn.de/mandree/
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index c7c76d0aa98c..20de547f1691 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gwyddion
PORTVERSION= 2.16
CATEGORIES= science graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PATCH_SITES= ${MASTER_SITES}
PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
diff --git a/security/bsdsfv/Makefile b/security/bsdsfv/Makefile
index 8ce97d920312..3857d5537495 100644
--- a/security/bsdsfv/Makefile
+++ b/security/bsdsfv/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bsdsfv
PORTVERSION= 1.18
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= A flexible SFV checksum utility
diff --git a/security/mac-robber/Makefile b/security/mac-robber/Makefile
index 84a3e0f4fbc2..1c403d45386e 100644
--- a/security/mac-robber/Makefile
+++ b/security/mac-robber/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mac-robber
PORTVERSION= 1.00
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= onatan@gmail.com
COMMENT= A tool for listing Modify, Access, Create timestamps from files
diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile
index db3ab9395168..1b0f57862e01 100644
--- a/security/pam_krb5/Makefile
+++ b/security/pam_krb5/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pam_krb5
PORTVERSION= 1.3.r7
PORTREVISION= 3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/pam-krb5/${PORTNAME}/${PORTNAME}-1.3-rc7
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
MAINTAINER= cy@FreeBSD.org
diff --git a/security/pbnj/Makefile b/security/pbnj/Makefile
index 603e60b5a450..53256434abc2 100644
--- a/security/pbnj/Makefile
+++ b/security/pbnj/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pbnj
PORTVERSION= 2.04
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A suite of tools to monitor changes on a network
diff --git a/security/pure-sfv/Makefile b/security/pure-sfv/Makefile
index a9b0f73dd9fc..f8d27ced934b 100644
--- a/security/pure-sfv/Makefile
+++ b/security/pure-sfv/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pure-sfv
PORTVERSION= 0.3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/security/snoopy/Makefile b/security/snoopy/Makefile
index df931aaba12a..66237820b691 100644
--- a/security/snoopy/Makefile
+++ b/security/snoopy/Makefile
@@ -6,8 +6,7 @@
PORTNAME= snoopy
PORTVERSION= 1.3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= snoopylogger
+MASTER_SITES= SF/${PORTNAME}logger/${PORTNAME}logger/${PORTVERSION}
MAINTAINER= jadawin@FreeBSD.org
COMMENT= An execve() wrapper and logger
diff --git a/security/sudosh/Makefile b/security/sudosh/Makefile
index e63bfdd9f01e..4044fdf65b8b 100644
--- a/security/sudosh/Makefile
+++ b/security/sudosh/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sudosh
PORTVERSION= 1.8.2
PORTREVISION= 5
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= cy@FreeBSD.org
diff --git a/security/sudosh2/Makefile b/security/sudosh2/Makefile
index 9d6e0ee7cbf8..dbd73b981a5c 100644
--- a/security/sudosh2/Makefile
+++ b/security/sudosh2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sudosh2
PORTVERSION= 1.0.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tbz2
diff --git a/security/sudosh3/Makefile b/security/sudosh3/Makefile
index 9d6e0ee7cbf8..dbd73b981a5c 100644
--- a/security/sudosh3/Makefile
+++ b/security/sudosh3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sudosh2
PORTVERSION= 1.0.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tbz2
diff --git a/security/wapiti/Makefile b/security/wapiti/Makefile
index 17e765ad8f73..3e426590d024 100644
--- a/security/wapiti/Makefile
+++ b/security/wapiti/Makefile
@@ -6,8 +6,7 @@
PORTNAME= wapiti
PORTVERSION= 1.1.6
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= wapiti
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= jadawin@FreeBSD.org
COMMENT= Wapiti is a vulnerability scanner for web applications
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index eef6dfa0e77c..005c3082f45b 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -9,8 +9,7 @@ PORTNAME?= cdrdao
PORTVERSION= 1.2.2
PORTREVISION?= 1
CATEGORIES= sysutils audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= cdrdao
+MASTER_SITES= SF
DISTNAME= cdrdao-${PORTVERSION}
MAINTAINER= marius@FreeBSD.org
diff --git a/sysutils/fatback/Makefile b/sysutils/fatback/Makefile
index 9c0e3381f383..5d4b2ee4d5b3 100644
--- a/sysutils/fatback/Makefile
+++ b/sysutils/fatback/Makefile
@@ -8,8 +8,7 @@
PORTNAME= fatback
DISTVERSION= 1.3
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Recover deleted files from FAT filesystems
diff --git a/sysutils/gapcmon/Makefile b/sysutils/gapcmon/Makefile
index 46c2b98451ff..90ffc746658e 100644
--- a/sysutils/gapcmon/Makefile
+++ b/sysutils/gapcmon/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gapcmon
PORTVERSION= 0.8.9
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= SFE
+MASTER_SITES= SF
MAINTAINER= bsdkaffee@gmail.com
COMMENT= Monitor apcupsd with GTK+2 GUI
diff --git a/sysutils/hilite/Makefile b/sysutils/hilite/Makefile
index 5f882e726250..652e7faddd14 100644
--- a/sysutils/hilite/Makefile
+++ b/sysutils/hilite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= hilite
PORTVERSION= 1.5
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .c
diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile
index 96f5ae7cf2f6..78dd4c8789f1 100644
--- a/sysutils/krename-kde4/Makefile
+++ b/sysutils/krename-kde4/Makefile
@@ -9,8 +9,7 @@ PORTNAME= krename
PORTVERSION= 3.9.3
PORTREVISION= 1
CATEGORIES= sysutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/KDE4%20${PORTNAME}-development/${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= Very powerful batch file renamer for KDE
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index d4f7835b02ec..a4e331166e42 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -9,8 +9,7 @@ PORTNAME= krename
PORTVERSION= 3.0.14
PORTREVISION= 3
CATEGORIES= sysutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/KDE3%20${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= Very powerful batch file renamer for KDE3
diff --git a/sysutils/mdcp/Makefile b/sysutils/mdcp/Makefile
index f90dd226cdaf..d67856516572 100644
--- a/sysutils/mdcp/Makefile
+++ b/sysutils/mdcp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mdcp
PORTVERSION= 0.1.2.2
CATEGORIES= sysutils
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/shine
MAINTAINER= wamonzyne@hotmail.com
COMMENT= A fastest utility for copy from a disk device for many
diff --git a/textproc/colordiff/Makefile b/textproc/colordiff/Makefile
index 2a3b60ba632c..3d2d3122e0f8 100644
--- a/textproc/colordiff/Makefile
+++ b/textproc/colordiff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= colordiff
PORTVERSION= 1.0.8
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/version%20${PORTVERSION}
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= A tool to colorize diff output
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index 3efff35aba82..150c805900f4 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dixit
PORTVERSION= 1.0.1
PORTREVISION= 4
CATEGORIES= textproc # this should/will be romanian ;)
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= dixit
+MASTER_SITES= SF
DISTFILES= ${PORTNAME}-${PORTVERSION}.tgz ${_DB_D}
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tgz
diff --git a/textproc/ffe/Makefile b/textproc/ffe/Makefile
index f6a3896d3db7..aa9fa08e3f5b 100644
--- a/textproc/ffe/Makefile
+++ b/textproc/ffe/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ffe
PORTVERSION= 0.2.8
CATEGORIES= textproc
-MASTER_SITES= SFE/ff-extractor
+MASTER_SITES= SF/ff-extractor/ff-extractor/${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Flat file extractor
diff --git a/textproc/jalingo/Makefile b/textproc/jalingo/Makefile
index 0e947891e5d2..78c05c13810b 100644
--- a/textproc/jalingo/Makefile
+++ b/textproc/jalingo/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.6.0
PORTREVISION= 2
#PORTREVISION= 0
CATEGORIES= textproc java
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/JaLingo/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .7z
diff --git a/textproc/py-tvgrab/Makefile b/textproc/py-tvgrab/Makefile
index c1a2ba973648..afd2ffe36f9a 100644
--- a/textproc/py-tvgrab/Makefile
+++ b/textproc/py-tvgrab/Makefile
@@ -9,10 +9,9 @@ PORTNAME= TVGrab
PORTVERSION= 0.5.1
PORTREVISION= 3
CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= pytvgrab
+MASTER_SITES= SF/py${PORTNAME:L}/lib/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= ${MASTER_SITE_SUBDIR}-lib-${PORTVERSION}
+DISTNAME= pytvgrab-lib-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A xmltv python library to write grabbers of tv scheduling collections
diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
index 0dbc82ecc0a1..00b0f7581815 100644
--- a/textproc/refdb/Makefile
+++ b/textproc/refdb/Makefile
@@ -9,7 +9,7 @@ PORTNAME= refdb
PORTVERSION= 0.9.9
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index f47827e38acb..18dd91a651e5 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -9,8 +9,7 @@ PORTNAME= saxon
PORTVERSION= 6.5.4
PORTREVISION= 2
CATEGORIES= textproc java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= saxon
+MASTER_SITES= SF/${PORTNAME}/OldFiles/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/./-/g}
MAINTAINER= hq@FreeBSD.org
diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile
index 6baaeef85db4..c2edf4a114ce 100644
--- a/textproc/xmlstarlet/Makefile
+++ b/textproc/xmlstarlet/Makefile
@@ -10,8 +10,7 @@ PORTNAME= xmlstarlet
PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= xmlstar
+MASTER_SITES= SF/xmlstar/${PORTNAME}/${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Command Line XML Toolkit
diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index 23f0446acb18..5d95f7f43119 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= aria2
DISTVERSION= 1.5.0
CATEGORIES= www
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/stable/archives/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${DISTVERSION}
MAINTAINER= miwi@FreeBSD.org
diff --git a/www/aria2fe/Makefile b/www/aria2fe/Makefile
index edf7753d0216..dadb15f9f0c0 100644
--- a/www/aria2fe/Makefile
+++ b/www/aria2fe/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aria2fe
DISTVERSION= 0.0.5
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Aria2 QT front-end
diff --git a/www/eyeos/Makefile b/www/eyeos/Makefile
index dfe6c77c4a1b..00ac1e9ee65a 100644
--- a/www/eyeos/Makefile
+++ b/www/eyeos/Makefile
@@ -8,7 +8,7 @@
PORTNAME= eyeOS
DISTVERSION= 0.9.3-5
CATEGORIES= www
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/0.9.3-5
MAINTAINER= nivit@FreeBSD.org
COMMENT= Web Based Desktop System
diff --git a/www/hastymail/Makefile b/www/hastymail/Makefile
index f60965b0bbf0..41871e3b839a 100644
--- a/www/hastymail/Makefile
+++ b/www/hastymail/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hastymail
PORTVERSION= 1.5
PORTREVISION= 3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= hastymail
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Small, fast and secure yet powerful IMAP webmail
diff --git a/www/hastymail2-devel/Makefile b/www/hastymail2-devel/Makefile
index f60965b0bbf0..41871e3b839a 100644
--- a/www/hastymail2-devel/Makefile
+++ b/www/hastymail2-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hastymail
PORTVERSION= 1.5
PORTREVISION= 3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= hastymail
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Small, fast and secure yet powerful IMAP webmail
diff --git a/www/hastymail2/Makefile b/www/hastymail2/Makefile
index f60965b0bbf0..41871e3b839a 100644
--- a/www/hastymail2/Makefile
+++ b/www/hastymail2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hastymail
PORTVERSION= 1.5
PORTREVISION= 3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= hastymail
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Small, fast and secure yet powerful IMAP webmail
diff --git a/www/mod_fcgid/Makefile b/www/mod_fcgid/Makefile
index 621df1428fcd..1da1f6382bad 100644
--- a/www/mod_fcgid/Makefile
+++ b/www/mod_fcgid/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mod_fcgid
PORTVERSION= 2.2
CATEGORIES= www
-MASTER_SITES= SFE
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/mod-fcgid/OldFiles
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= hemi@puresimplicity.net
diff --git a/www/netrik/Makefile b/www/netrik/Makefile
index 8fa977f7bfdb..fd47b2862793 100644
--- a/www/netrik/Makefile
+++ b/www/netrik/Makefile
@@ -10,7 +10,7 @@
PORTNAME= netrik
PORTVERSION= 1.16.1
CATEGORIES= www
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/stable/${PORTVERSION}%20%28beta%29
MAINTAINER= ale@FreeBSD.org
COMMENT= A text web browser, very ambitious, in active development
diff --git a/www/pebble/Makefile b/www/pebble/Makefile
index c3df2ff78d37..ca00043da181 100644
--- a/www/pebble/Makefile
+++ b/www/pebble/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pebble
PORTVERSION= 2.3.2
PORTREVISION= 1
CATEGORIES= www java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= pebble
+MASTER_SITES= SF
MAINTAINER= hq@FreeBSD.org
COMMENT= Lightweight, open source, Java EE blogging tool
diff --git a/www/rssowl/Makefile b/www/rssowl/Makefile
index 1b23f7768ee6..f766e7af9425 100644
--- a/www/rssowl/Makefile
+++ b/www/rssowl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= rssowl
PORTVERSION= 1.2.3
PORTREVISION= 5
CATEGORIES= www java
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20classic%20%28dont%20use%29/${PORTVERSION}
DISTNAME= rssowl_${PORTVERSION:S|.|_|g}_src
MAINTAINER= m.sund@arcor.de
diff --git a/www/wsmake/Makefile b/www/wsmake/Makefile
index e0334a232ddb..54f70a358567 100644
--- a/www/wsmake/Makefile
+++ b/www/wsmake/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wsmake
PORTVERSION= 0.7.901
CATEGORIES= www
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= gahr@FreeBSD.org
COMMENT= Software for production and maintenance of web sites
diff --git a/www/yabb/Makefile b/www/yabb/Makefile
index 7ef195a58407..8b21beb601e8 100644
--- a/www/yabb/Makefile
+++ b/www/yabb/Makefile
@@ -9,7 +9,7 @@ PORTNAME= yabb
PORTVERSION= 2.1
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= SFE
+MASTER_SITES= SF/${PORTNAME}/YaBB%202/${PORTVERSION}
DISTNAME= YaBB_${PORTVERSION}
MAINTAINER= rodrigo@bebik.net
diff --git a/x11-toolkits/p5-Gnome2-VFS/Makefile b/x11-toolkits/p5-Gnome2-VFS/Makefile
index 0070995e89b9..a95deacbde4f 100644
--- a/x11-toolkits/p5-Gnome2-VFS/Makefile
+++ b/x11-toolkits/p5-Gnome2-VFS/Makefile
@@ -10,8 +10,7 @@ PORTNAME= Gnome2-VFS
PORTVERSION= 1.081
PORTREVISION= 1
CATEGORIES= x11-toolkits gnome perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= gtk2-perl
+MASTER_SITES= SF/gtk2-perl/Gnome2_VFS/${PORTVERSION}
PKGNAMEPREFIX= p5-
MAINTAINER= wxs@FreeBSD.org
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index 9f3cec786ef4..495d730e4526 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fltk
PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= x11-toolkits python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= pyfltk
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyFltk-${PORTVERSION:S/.b/b/}
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 8d944cb049e7..54da7a6d739b 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkterm2
PORTVERSION= 0.2.3
PORTREVISION= 8
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= gtkterm
+MASTER_SITES= SF/gtkterm/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple GTK-2 terminal with tabs
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 487c36ca8a8f..a19cd38f0c4c 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -10,8 +10,7 @@ PORTNAME= multi-gnome-terminal
PORTVERSION= 1.6.2
PORTREVISION= 8
CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= multignometerm
+MASTER_SITES= SF/multignometerm/multignometerm/mgt-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gnome tabbed terminal emulator