aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/2bsd-vi/Makefile3
-rw-r--r--editors/aewan/Makefile3
-rw-r--r--editors/bvi/Makefile3
-rw-r--r--editors/codelite/Makefile2
-rw-r--r--editors/conglomerate/Makefile2
-rw-r--r--editors/cream/Makefile2
-rw-r--r--editors/doxymacs/Makefile4
-rw-r--r--editors/drjava/Makefile3
-rw-r--r--editors/emacs.app/Makefile3
-rw-r--r--editors/f4l/Makefile3
-rw-r--r--editors/fte/Makefile3
-rw-r--r--editors/glimmer/Makefile2
-rw-r--r--editors/gmanedit/Makefile2
-rw-r--r--editors/gnotepad+/Makefile2
-rw-r--r--editors/hte/Makefile2
-rw-r--r--editors/jedit-devel/Makefile2
-rw-r--r--editors/jext/Makefile2
-rw-r--r--editors/joe/Makefile3
-rw-r--r--editors/joe2/Makefile3
-rw-r--r--editors/lazarus/Makefile2
-rw-r--r--editors/led/Makefile3
-rw-r--r--editors/leo/Makefile2
-rw-r--r--editors/madedit/Makefile2
-rw-r--r--editors/omegaT/Makefile3
-rw-r--r--editors/psgml/Makefile3
-rw-r--r--editors/rospell/Makefile2
-rw-r--r--editors/rox-edit/Makefile2
-rw-r--r--editors/scribes/Makefile3
-rw-r--r--editors/setedit/Makefile2
-rw-r--r--editors/speedbar/Makefile4
-rw-r--r--editors/tea/Makefile3
-rw-r--r--editors/tetradraw/Makefile3
-rw-r--r--editors/texmakerx/Makefile3
-rw-r--r--editors/the/Makefile2
-rw-r--r--editors/tpad/Makefile6
-rw-r--r--editors/tree-widget/Makefile4
-rw-r--r--editors/treeform/Makefile2
-rw-r--r--editors/vigor/Makefile3
-rw-r--r--editors/wily/Makefile2
-rw-r--r--editors/xmlcopyeditor/Makefile3
-rw-r--r--editors/xmleditor/Makefile3
-rw-r--r--emulators/advancemenu/Makefile3
-rw-r--r--emulators/advancemess/Makefile3
-rw-r--r--emulators/bfe/Makefile3
-rw-r--r--emulators/catapult/Makefile3
-rw-r--r--emulators/cinc/Makefile3
-rw-r--r--emulators/cingb/Makefile2
-rw-r--r--emulators/dosbox/Makefile3
-rw-r--r--emulators/dynagen-devel/Makefile3
-rw-r--r--emulators/dynagen/Makefile3
-rw-r--r--emulators/dynagui/Makefile2
-rw-r--r--emulators/extract-xiso/Makefile3
-rw-r--r--emulators/fceu-server/Makefile3
-rw-r--r--emulators/fceu/Makefile2
-rw-r--r--emulators/fceux/Makefile2
-rw-r--r--emulators/fuse-utils/Makefile3
-rw-r--r--emulators/fuse/Makefile3
-rw-r--r--emulators/gens/Makefile3
-rw-r--r--emulators/gns3/Makefile2
-rw-r--r--emulators/gsnes9x/Makefile2
-rw-r--r--emulators/gxmame/Makefile2
-rw-r--r--emulators/hatari/Makefile2
-rw-r--r--emulators/libspectrum/Makefile3
-rw-r--r--emulators/mednafen/Makefile2
-rw-r--r--emulators/o2em/Makefile2
-rw-r--r--emulators/open-vm-tools/Makefile2
-rw-r--r--emulators/openmsx/Makefile3
-rw-r--r--emulators/pearpc/Makefile3
-rw-r--r--emulators/pyxmame/Makefile3
-rw-r--r--emulators/tiemu3/Makefile3
-rw-r--r--emulators/tilem/Makefile2
-rw-r--r--emulators/tuxnes/Makefile2
-rw-r--r--emulators/vba/Makefile3
-rw-r--r--emulators/visualos/Makefile3
-rw-r--r--emulators/vmips/Makefile4
-rw-r--r--emulators/xcpc/Makefile2
-rw-r--r--emulators/zsnes/Makefile2
-rw-r--r--finance/aqmoney/Makefile3
-rw-r--r--finance/cbb/Makefile3
-rw-r--r--finance/eqonomize-kde3/Makefile2
-rw-r--r--finance/eqonomize-kde4/Makefile2
-rw-r--r--finance/gnofin/Makefile3
-rw-r--r--finance/gnucash-docs/Makefile6
-rw-r--r--finance/gnucash/Makefile4
-rw-r--r--finance/grisbi/Makefile3
-rw-r--r--finance/kexchange/Makefile3
-rw-r--r--finance/khacc/Makefile3
-rw-r--r--finance/kmymoney-kde4/Makefile2
-rw-r--r--finance/kmymoney2/Makefile2
-rw-r--r--finance/ledgersmb/Makefile3
-rw-r--r--finance/ledgersmb12/Makefile2
-rw-r--r--finance/libstocks/Makefile3
-rw-r--r--finance/myphpmoney/Makefile3
-rw-r--r--finance/openhbci/Makefile3
-rw-r--r--finance/opentaxsolver/Makefile2
-rw-r--r--finance/qhacc/Makefile2
-rw-r--r--finance/qtstalker/Makefile2
-rw-r--r--finance/quantlib/Makefile3
-rw-r--r--finance/sabernetdcs-client/Makefile3
-rw-r--r--finance/venice/Makefile3
-rw-r--r--finance/weberp/Makefile3
-rw-r--r--finance/xtrader/Makefile3
-rw-r--r--french/alphabet_sounds_fr/Makefile3
-rw-r--r--french/jdictionary-fre-hun/Makefile1
-rw-r--r--french/mozilla-flp/Makefile4
-rw-r--r--ftp/bftpd/Makefile2
-rw-r--r--ftp/curl/Makefile1
-rw-r--r--ftp/dmachine/Makefile3
-rw-r--r--ftp/filezilla/Makefile2
-rw-r--r--ftp/frox/Makefile5
-rw-r--r--ftp/jftp/Makefile3
-rw-r--r--ftp/kbear/Makefile3
-rw-r--r--ftp/multiget/Makefile2
-rw-r--r--ftp/paraget/Makefile3
-rw-r--r--ftp/pavuk/Makefile3
-rw-r--r--ftp/phpwebftp/Makefile3
-rw-r--r--ftp/pure-ftpd/Makefile12
-rw-r--r--ftp/pureadmin/Makefile3
-rw-r--r--ftp/quftp/Makefile3
-rw-r--r--ftp/rexx-curl/Makefile3
-rw-r--r--ftp/smbftpd/Makefile4
-rw-r--r--ftp/urlgfe/Makefile3
-rw-r--r--ftp/wgetpro/Makefile3
-rw-r--r--ftp/wxdfast/Makefile2
-rw-r--r--ftp/wzdftpd/Makefile3
-rw-r--r--ftp/yafc/Makefile3
126 files changed, 149 insertions, 204 deletions
diff --git a/editors/2bsd-vi/Makefile b/editors/2bsd-vi/Makefile
index 58bcc6d9605f..9a972337ca12 100644
--- a/editors/2bsd-vi/Makefile
+++ b/editors/2bsd-vi/Makefile
@@ -8,8 +8,7 @@
PORTNAME= vi
PORTVERSION= 050325
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ex-vi
+MASTER_SITES= SF/ex-${PORTNAME}/ex-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= 2bsd-
DISTNAME= ex-${PORTVERSION}
diff --git a/editors/aewan/Makefile b/editors/aewan/Makefile
index 8380e0ea2c13..1f8a8e019876 100644
--- a/editors/aewan/Makefile
+++ b/editors/aewan/Makefile
@@ -8,8 +8,7 @@
PORTNAME= aewan
PORTVERSION= 1.0.01
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Curses-based program for the creation and editing of ascii art
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index 80c3690aea17..cefc228a8af3 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bvi
PORTVERSION= 1.3.2
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bvi
+MASTER_SITES= SF
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= vd@FreeBSD.org
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index da185f08e53b..e940c91e36d1 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -9,7 +9,7 @@ PORTNAME= codelite
DISTVERSION= 1.0.${SVN_REVISION}
PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Releases/PreviousReleases/${PORTNAME}%20${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= An Open Source IDE for C/C++
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 577f66046458..f5875c165362 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -8,7 +8,7 @@ PORTNAME= conglomerate
PORTVERSION= 0.9.1
PORTREVISION= 8
CATEGORIES= editors
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Conglomerate%20XML%20Editor/${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= GNOME2 visual XML editor with emphasis on DocBook editing
diff --git a/editors/cream/Makefile b/editors/cream/Makefile
index fc5c185cb3a9..f0b304b461f0 100644
--- a/editors/cream/Makefile
+++ b/editors/cream/Makefile
@@ -9,7 +9,7 @@ PORTNAME= cream
PORTVERSION= 0.41
PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Cream/${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Gvim extension with many features
diff --git a/editors/doxymacs/Makefile b/editors/doxymacs/Makefile
index 36f2ca3bc56f..83048e74a6ad 100644
--- a/editors/doxymacs/Makefile
+++ b/editors/doxymacs/Makefile
@@ -9,9 +9,9 @@ PORTNAME= doxymacs
PORTVERSION= 1.8.0
PORTREVISION= 1
CATEGORIES= editors elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= dryice@dryice.name
COMMENT= Doxymacs is Doxygen + {X}Emacs
diff --git a/editors/drjava/Makefile b/editors/drjava/Makefile
index dd6f7f4999d3..7a65b4b67fc9 100644
--- a/editors/drjava/Makefile
+++ b/editors/drjava/Makefile
@@ -9,8 +9,7 @@ PORTNAME= drjava
DISTVERSION= 20080904-r4668
#PORTREVISION= 0
CATEGORIES= editors java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/1.%20DrJava%20Stable%20Releases/${PORTNAME}-stable-20080904-r4668
DISTNAME= ${PORTNAME}-stable-${PORTVERSION:S|.|-|g}
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/editors/emacs.app/Makefile b/editors/emacs.app/Makefile
index 01d790682ac5..5be26faad133 100644
--- a/editors/emacs.app/Makefile
+++ b/editors/emacs.app/Makefile
@@ -9,8 +9,7 @@ PORTNAME= emacs.app
PORTVERSION= 9.0
PORTREVISION= 3
CATEGORIES= editors gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= emacs-app
+MASTER_SITES= SF/emacs-app/emacs-app/${PORTVERSION}-pre3
DISTNAME= emacs-23.0.0_NS-${PORTVERSION}pre3b
MAINTAINER= dinoex@FreeBSD.org
diff --git a/editors/f4l/Makefile b/editors/f4l/Makefile
index feaecec9ef9e..7361986fc935 100644
--- a/editors/f4l/Makefile
+++ b/editors/f4l/Makefile
@@ -9,8 +9,7 @@ PORTNAME= f4l
PORTVERSION= 0.2.1
PORTREVISION= 3
CATEGORIES= editors multimedia www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_beta_swfExport/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An open source development environment for Macromedia Flash
diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index 8448c7d5bcc3..c89ceb79287c 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fte
PORTVERSION= 20051115
PORTREVISION= 2
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION:S/./b/}-src.zip \
${PORTNAME}-${PORTVERSION:S/./b/}-common.zip
DIST_SUBDIR= ${PORTNAME}
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index 4a921c96b601..53fbbb6e162d 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= glimmer
PORTVERSION= 1.2.1
PORTREVISION= 9
CATEGORIES= editors gnome python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= A full featured code editor for GNOME with many advanced features
diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index 84a23936e618..fd1c109a9f3e 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gmanedit
PORTVERSION= 0.4.2
PORTREVISION= 1
CATEGORIES= editors gnome
-MASTER_SITES= SF/gmanedit2
+MASTER_SITES= SF/${PORTNAME}2/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= A GNOME manpages editor
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 2a24fd8a5576..20172c7ab86e 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnotepad+
PORTVERSION= 1.3.3
PORTREVISION= 7
CATEGORIES= editors www gnome
-MASTER_SITES= SF/gnotepad
+MASTER_SITES= SF/gnotepad/gnotepad-stable/${PORTVERSION}
.if !defined(NOPORTDOCS)
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index 70ca4ed98e32..2857d887e8e9 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -9,7 +9,7 @@
PORTNAME= hte
PORTVERSION= 2.0.17
CATEGORIES= editors
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ht-source/${PORTVERSION}
DISTNAME= ht-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
diff --git a/editors/jedit-devel/Makefile b/editors/jedit-devel/Makefile
index 0623a92b6059..5f77dcfc0480 100644
--- a/editors/jedit-devel/Makefile
+++ b/editors/jedit-devel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= jedit
DISTVERSION= 4.3.p17
CATEGORIES= editors java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/4.3pre17
DISTNAME= ${PORTNAME}${PORTVERSION:S/.p/pre/}install
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/editors/jext/Makefile b/editors/jext/Makefile
index 532f446d4149..971a9a001f81 100644
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@@ -9,7 +9,7 @@ PORTNAME= jext
PORTVERSION= 3.0.2
PORTREVISION= 6
CATEGORIES= editors java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= vd@FreeBSD.org
COMMENT= Powerful 100% pure Java text editor
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 7dbd87243412..e8d26a78c011 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -9,8 +9,7 @@ PORTNAME= joe
PORTVERSION= 3.7
PORTEPOCH= 1
CATEGORIES+= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}-editor
+MASTER_SITES= SF/joe-editor/JOE%20sources/joe-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER?= chinsan@FreeBSD.org
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index 96967add1493..f2655395e469 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= joe
PORTVERSION= 2.9.8
CATEGORIES+= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}-editor
+MASTER_SITES= SF/joe-editor/JOE%20sources/joe-${PORTVERSION}
MAINTAINER?= toasty@dragondata.com
COMMENT?= Joe's Own Editor
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 550851f1c693..7b12e515831a 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -9,7 +9,7 @@ PORTNAME= lazarus
PORTVERSION= 0.9.26.2
PORTREVISION= 2
CATEGORIES= editors devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/$/-0/}
EXTRACT_SUFX= .tgz
DIST_SUBDIR= freepascal
diff --git a/editors/led/Makefile b/editors/led/Makefile
index 919a1ae78eb9..6407552133e0 100644
--- a/editors/led/Makefile
+++ b/editors/led/Makefile
@@ -8,8 +8,7 @@
PORTNAME= led
PORTVERSION= 2.0
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}-editor
+MASTER_SITES= SF/${PORTNAME}-editor/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A tiny text editor, with a number of useful programming features
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index bef003e33fcc..7b66a495d22d 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= leo
PORTVERSION= 4.4.8
CATEGORIES= editors python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Leo/${PORTVERSION}%20final
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}-final
DIST_SUBDIR= leo
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index dfc61e99e456..91db9a6d1819 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -9,7 +9,7 @@ PORTNAME= madedit
PORTVERSION= 0.2.9
PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/MadEdit/MadEdit-${PORTVERSION}
MAINTAINER= delphij@FreeBSD.org
COMMENT= An open-source and cross-platform text/hex editor
diff --git a/editors/omegaT/Makefile b/editors/omegaT/Makefile
index d207f9221ae9..39ddc8f38d77 100644
--- a/editors/omegaT/Makefile
+++ b/editors/omegaT/Makefile
@@ -7,8 +7,7 @@
PORTNAME= omegaT
PORTVERSION= 1.8.1.5
CATEGORIES= editors java x11
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= omegat
+MASTER_SITES= SF/${PORTNAME:L}/OmegaT%201.8%20%28Current%29/OmegaT%201.8.1%20update%205
DISTNAME= OmegaT_1.8.1_05_Source
MAINTAINER= rodrigo@bebik.net
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 5072adc294be..8f7e06e4c7c7 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -9,8 +9,7 @@ PORTNAME= psgml
PORTVERSION= 1.3.2
PORTREVISION= 7
CATEGORIES= editors elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= psgml
+MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
PATCH_SITES= ${MASTER_SITE_LOCAL}
diff --git a/editors/rospell/Makefile b/editors/rospell/Makefile
index 03e1593e6735..1278c2438ae2 100644
--- a/editors/rospell/Makefile
+++ b/editors/rospell/Makefile
@@ -8,7 +8,7 @@ PORTNAME= rospell
DISTVERSION= 2007.02.rc1
PORTREVISION= 2
CATEGORIES= editors textproc # this should/will be romanian ;)
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= itetcu@FreeBSD.org
COMMENT= QT-based editor with support for romanian charsets and spell checking
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index 6322e59c5f3a..228274c429ae 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rox-edit
PORTVERSION= 2.1
CATEGORIES= editors
-MASTER_SITES= SF/rox
+MASTER_SITES= SF/rox/Edit/${PORTVERSION}
DISTNAME= edit-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index 87adbe9a29be..2b54c78197d6 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scribes
PORTVERSION= 0.3.3.3
PORTREVISION= 3
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Stable%20Branch/${PORTNAME}-${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= Slick yet powerful text editor for GNOME
diff --git a/editors/setedit/Makefile b/editors/setedit/Makefile
index 77a18334ac62..604d38d2e21c 100644
--- a/editors/setedit/Makefile
+++ b/editors/setedit/Makefile
@@ -8,7 +8,7 @@ PORTNAME= setedit
PORTVERSION= 0.5.4
PORTREVISION= 2
CATEGORIES= editors
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= exile@chamber.ee
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index e4b02d7e0bb9..ebdc931038b0 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -9,9 +9,9 @@ PORTNAME= speedbar
PORTVERSION= 0.14.b4
PORTREVISION= 5
CATEGORIES= editors elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/cedet/${PORTNAME}/1.4beta4 \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= cedet
+
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/beta/}
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index 9872a156823f..edddf43619d3 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tea
DISTVERSION= 17.6.0
PORTREVISION= 3
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tea-editor
+MASTER_SITES= SF/${PORTNAME}-editor/${PORTNAME}-editor/${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= A simple and powerful GTK+ text editor
diff --git a/editors/tetradraw/Makefile b/editors/tetradraw/Makefile
index 5b9e9db6cc58..b8b02c231ac3 100644
--- a/editors/tetradraw/Makefile
+++ b/editors/tetradraw/Makefile
@@ -10,8 +10,7 @@ PORTNAME= tetradraw
PORTVERSION= 2.0.2
PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fully featured ANSI art editor/viewer with TCP/IP multidraw support
diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile
index b3ed5f29b8e9..7b96587c78e0 100644
--- a/editors/texmakerx/Makefile
+++ b/editors/texmakerx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= texmakerx
PORTVERSION= 1.8.1
PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= lx@FreeBSD.org
diff --git a/editors/the/Makefile b/editors/the/Makefile
index 832f83ddc627..9a98e7563428 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -9,7 +9,7 @@ PORTNAME= the
PORTVERSION= 3.2
PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= SF/hessling-editor
+MASTER_SITES= SF/hessling-editor/hessling-editor/${PORTVERSION}
DISTNAME= THE-${PORTVERSION}
PATCH_SITES= http://users.comlab.ox.ac.uk/ian.collier/distribution/
diff --git a/editors/tpad/Makefile b/editors/tpad/Makefile
index c5c451ea7595..8ce416e4301f 100644
--- a/editors/tpad/Makefile
+++ b/editors/tpad/Makefile
@@ -9,11 +9,13 @@ PORTNAME= tpad
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= editors tcl tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/tclpad/tclpad/${PORTVERSION} \
http://monitor.deis.unical.it/ant/tpad/ \
+
http://queen.rett.polimi.it/~ant/tcl/script/ \
+
http://sarovar.org/download.php/382/
-MASTER_SITE_SUBDIR= tclpad
+
MAINTAINER= ant@monitor.deis.unical.it
COMMENT= Windows XP (TM) enhanced Notepad clone written in Tcl/Tk
diff --git a/editors/tree-widget/Makefile b/editors/tree-widget/Makefile
index 4b5b60362992..91fd7548a12e 100644
--- a/editors/tree-widget/Makefile
+++ b/editors/tree-widget/Makefile
@@ -9,9 +9,9 @@ PORTNAME= tree-widget
PORTVERSION= 2.0
PORTREVISION= 3
CATEGORIES= editors elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/emhacks/${PORTNAME}/${PORTVERSION} \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= emhacks
+
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/editors/treeform/Makefile b/editors/treeform/Makefile
index 61c52c3677ce..374b4f8c6da4 100644
--- a/editors/treeform/Makefile
+++ b/editors/treeform/Makefile
@@ -8,7 +8,7 @@
PORTNAME= treeform
PORTVERSION= 1.0.3
CATEGORIES= editors java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TreeForm%20Unified/TreeForm%20${PORTVERSION}
DISTNAME= TreeForm_1_0_3
MAINTAINER= buganini@gmail.com
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index eae0637e8488..02d4738d287f 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vigor
PORTVERSION= 0.016
PORTREVISION= 4
CATEGORIES= editors tcl tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A vi clone inspired by the userfriendly comic strip
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 2131dd173d0c..5c6908d3ee4d 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wily
PORTVERSION= 0.13.42
PORTREVISION= 2
CATEGORIES= editors plan9
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/baseline/${PORTVERSION}
MAINTAINER= serge.gagnon.1@ulaval.ca
COMMENT= A clone of the Plan9 editor `acme'
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 60d3ac667104..1daa68c9230e 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmlcopyeditor
PORTVERSION= 1.2.0.4
PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=xml-copy-editor
+MASTER_SITES= SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}
MAINTAINER= jjuanino@gmail.com
COMMENT= Fast validating XML editor
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index 281076ab7da9..05b6de77938a 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -10,8 +10,7 @@ PORTNAME= xmleditor
PORTVERSION= 0.5.3
PORTREVISION= 8
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= XML editor
diff --git a/emulators/advancemenu/Makefile b/emulators/advancemenu/Makefile
index 4a9355cce325..42223c6bb511 100644
--- a/emulators/advancemenu/Makefile
+++ b/emulators/advancemenu/Makefile
@@ -8,8 +8,7 @@
PORTNAME= advancemenu
PORTVERSION= 2.4.14
CATEGORIES= emulators
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= advancemame
+MASTER_SITES= SF/advancemame/${PORTNAME}/${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= AdvanceMENU is a frontend for AdvanceMAME, MAME, MESS, RAINE
diff --git a/emulators/advancemess/Makefile b/emulators/advancemess/Makefile
index b89e59c75dd5..c51ed92e9ffb 100644
--- a/emulators/advancemess/Makefile
+++ b/emulators/advancemess/Makefile
@@ -9,8 +9,7 @@ PORTNAME= advancemess
PORTVERSION= 0.102.0.1
PORTREVISION= 2
CATEGORIES= emulators
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= advancemame
+MASTER_SITES= SF/advancemame/${PORTNAME}/${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= SDL MESS port with advanced TV and monitor video support
diff --git a/emulators/bfe/Makefile b/emulators/bfe/Makefile
index 2a0a7d5fa99c..6b8a33c3793e 100644
--- a/emulators/bfe/Makefile
+++ b/emulators/bfe/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bfe2
PORTVERSION= 20030723
PORTREVISION= 6
CATEGORIES= emulators
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= bfe
+MASTER_SITES= SF/bfe/source/23jul2003
DISTNAME= ${PORTNAME}-23jul2003
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 7c8cc84372f5..05724369a3be 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -10,8 +10,7 @@ PORTNAME= catapult
PORTVERSION= 0.6.3R1
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= openmsx
+MASTER_SITES= SF/openmsx/openmsx/0.6.3
DISTNAME= openmsx-${PORTNAME}-${PORTVERSION:S/R1/-R1/}
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/cinc/Makefile b/emulators/cinc/Makefile
index 5d4b3805e8a0..e1ea061e4f7f 100644
--- a/emulators/cinc/Makefile
+++ b/emulators/cinc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cinc
PORTVERSION= 2.1.3
PORTREVISION= 1
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cinc
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Bell Laboratories cardiac computer emulator
diff --git a/emulators/cingb/Makefile b/emulators/cingb/Makefile
index c56073a98975..b1d386764d19 100644
--- a/emulators/cingb/Makefile
+++ b/emulators/cingb/Makefile
@@ -9,7 +9,7 @@ PORTNAME= cingb
PORTVERSION= 0.29
PORTREVISION= 2
CATEGORIES= emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V029A
MAINTAINER= ports@FreeBSD.org
COMMENT= Yet another Nintendo GameBoy(tm) emulator
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index d52a07c1bb57..4deef7509d40 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dosbox
PORTVERSION= 0.73
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= knyght@gmail.com
COMMENT= An emulator of a PC with DOS
diff --git a/emulators/dynagen-devel/Makefile b/emulators/dynagen-devel/Makefile
index 0af303bf5c03..94d5b191e492 100644
--- a/emulators/dynagen-devel/Makefile
+++ b/emulators/dynagen-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dynagen
PORTVERSION= 0.10.1
PORTREVISION= 2
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dyna-gen
+MASTER_SITES= SF/dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION}
PKGNAMESUFFIX= -devel
MAINTAINER= pol@opk.ru
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index 46908cf1a684..20ef462573ab 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dynagen
PORTVERSION= 0.11.0
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dyna-gen
+MASTER_SITES= SF/dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION}
MAINTAINER= pol@opk.ru
COMMENT= Text-based front end for Dynamips development version
diff --git a/emulators/dynagui/Makefile b/emulators/dynagui/Makefile
index 4ab53d14e77c..d837be63a3c1 100644
--- a/emulators/dynagui/Makefile
+++ b/emulators/dynagui/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dynagui
PORTVERSION= 0.4
CATEGORIES= emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= dynagui
MAINTAINER= greenwood.andy@gmail.com
diff --git a/emulators/extract-xiso/Makefile b/emulators/extract-xiso/Makefile
index bb45fae18803..c37896b80a93 100644
--- a/emulators/extract-xiso/Makefile
+++ b/emulators/extract-xiso/Makefile
@@ -8,8 +8,7 @@
PORTNAME= extract-xiso
DISTVERSION= 2.5
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTNAME}%20v${PORTVERSION}%20source%20code
DISTNAME= ${PORTNAME}_v${DISTVERSION}_src
EXTRACT_SUFX= .tgz
diff --git a/emulators/fceu-server/Makefile b/emulators/fceu-server/Makefile
index debfb2c7925a..342e4ff6a194 100644
--- a/emulators/fceu-server/Makefile
+++ b/emulators/fceu-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fceu-server
PORTVERSION= 0.0.5
PORTREVISION= 2
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fceultra
+MASTER_SITES= SF/fceultra/OldFiles
MAINTAINER= ninjin@kth.se
COMMENT= The network play server for the NES/Famicom emulator fceu
diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index aa56f201d49f..0374700b7be9 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fceu
PORTVERSION= 0.98.13
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= SF/fceultra
+MASTER_SITES= SF/${PORTNAME}ltra/Source%20Code/${PORTVERSION}-pre
DISTNAME= ${PORTNAME}-${PORTVERSION}-pre.src
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index aa56f201d49f..0374700b7be9 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fceu
PORTVERSION= 0.98.13
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= SF/fceultra
+MASTER_SITES= SF/${PORTNAME}ltra/Source%20Code/${PORTVERSION}-pre
DISTNAME= ${PORTNAME}-${PORTVERSION}-pre.src
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index a88fe33d2548..14a399d990e3 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -8,8 +8,7 @@
PORTNAME= fuse-utils
PORTVERSION= 0.10.0.1
CATEGORIES= emulators
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= fuse-emulator
+MASTER_SITES= SF/fuse-emulator/${PORTNAME}/${PORTVERSION}
MAINTAINER= rene@FreeBSD.org
COMMENT= Utilities from the Free Unix Spectrum Emulator
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 10aebfc83853..2ad369873d49 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fuse
PORTVERSION= 0.10.0.2
PORTREVISION= 1
CATEGORIES= emulators
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= fuse-emulator
+MASTER_SITES= SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION}
MAINTAINER= yuri.pankov@gmail.com
COMMENT= Free Unix (Sinclair ZX-)Spectrum Emulator
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index d327247cb94c..4fce32e29cd6 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gens
PORTVERSION= 2.12a
PORTREVISION= 6
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Gens%20Source%20Code/Gens%20WIP%20linux
DISTNAME= Gens212a1SrcL
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index 516010bf8d04..47fbb170214c 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gns3
PORTVERSION= 0.6.1
CATEGORIES= emulators
-MASTER_SITES= SF/gns-3
+MASTER_SITES= SF/gns-3/GNS3/${PORTVERSION}
DISTNAME= GNS3-${PORTVERSION}-src
MAINTAINER= olivier@cochard.me
diff --git a/emulators/gsnes9x/Makefile b/emulators/gsnes9x/Makefile
index 2705977c9b8e..692cb0aae202 100644
--- a/emulators/gsnes9x/Makefile
+++ b/emulators/gsnes9x/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gsnes9x
PORTVERSION= 3.12
PORTREVISION= 7
CATEGORIES= emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/GSnes9x/${PORTVERSION}
DISTNAME= GSnes9x-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index ff0c5d6cdae6..139447fb3ec2 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -10,7 +10,7 @@ DISTVERSION= 0.35beta2
PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.35beta2
DISTNAME= ${PORTNAME}-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index e4cce30b4bed..f15dd931b6d0 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hatari
PORTVERSION= 1.0.1
CATEGORIES= emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Hatari%20v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An Atari ST emulator
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index a318b123daec..c45dbe162212 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libspectrum
PORTVERSION= 0.5.0.1
CATEGORIES= emulators devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= fuse-emulator
+MASTER_SITES= SF/fuse-emulator/${PORTNAME}/${PORTVERSION}
MAINTAINER= yuri.pankov@gmail.com
COMMENT= Handling of ZX-Spectrum emulator files formats
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index f632e28d1c2e..3f706fc4f1ae 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.8.B
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= emulators games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Mednafen/${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= Portable multi-system emulator
diff --git a/emulators/o2em/Makefile b/emulators/o2em/Makefile
index 57c1a2efd4a8..ed459c5ce6eb 100644
--- a/emulators/o2em/Makefile
+++ b/emulators/o2em/Makefile
@@ -9,7 +9,7 @@ PORTNAME= o2em
PORTVERSION= 1.17
PORTREVISION= 2
CATEGORIES= emulators games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/o2em/:S/$/:1/} \
+MASTER_SITES= SF/${PORTNAME}/OldFiles:1 \
http://o2em.sourceforge.net/files/:2
DISTFILES= o2em117src.zip:1 \
o2mainsamp.zip:2
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 4290588ca25f..8a974a2fface 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -9,7 +9,7 @@ PORTNAME= open-vm-tools
PORTVERSION= ${BUILD_VER}
PORTREVISION= 1
CATEGORIES= emulators kld
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
MAINTAINER= mbr@freebsd.org
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index c05048887a44..9441045ebd41 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openmsx
DISTVERSION= 0.7.2
PORTREVISION= 1
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= johans@stack.nl
COMMENT= Open source MSX emulator
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index b6573c37016d..217c5c0df222 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pearpc
PORTVERSION= 0.4
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
MAINTAINER= novel@FreeBSD.org
COMMENT= PowerPC emulator
diff --git a/emulators/pyxmame/Makefile b/emulators/pyxmame/Makefile
index f44572be9be3..9c4862b2fbf3 100644
--- a/emulators/pyxmame/Makefile
+++ b/emulators/pyxmame/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pyxmame
PORTVERSION= 0.4.0
PORTREVISION= 3
CATEGORIES= emulators python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/tgz%20source/${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= Simple frontend for the xmame
diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile
index c58c3b0a586a..a3a25278dc11 100644
--- a/emulators/tiemu3/Makefile
+++ b/emulators/tiemu3/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tiemu3
PORTVERSION= 3.02
PORTREVISION= 3
CATEGORIES= emulators
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gtktiemu
+MASTER_SITES= SF/gtktiemu/tiemu-linux/TiEmu%20${PORTVERSION}
DISTNAME= tiemu-${PORTVERSION}
MAINTAINER= cyberbotx@cyberbotx.com
diff --git a/emulators/tilem/Makefile b/emulators/tilem/Makefile
index e834b22cf7eb..7fa0986c4a87 100644
--- a/emulators/tilem/Makefile
+++ b/emulators/tilem/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tilem
PORTVERSION= 0.973
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= An emulator for the Z80 series of Texas Instruments calculators
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 675608e07bdf..8eaafd48c0a8 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tuxnes
PORTVERSION= 0.75
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TuxNES/TuxNES%20v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Nintendo Entertainment System 8-bit emulator
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index 3b2d20e43fc6..bd32036dcb7a 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -8,8 +8,7 @@ PORTNAME= vba
PORTVERSION= 1.7.2
PORTREVISION= 7
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/VisualBoyAdvance/${PORTVERSION}
DISTNAME= VisualBoyAdvance-src-${PORTVERSION}
MAINTAINER= arundel@h3c.de
diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile
index 2fe6b189506a..a59f275edb1d 100644
--- a/emulators/visualos/Makefile
+++ b/emulators/visualos/Makefile
@@ -9,8 +9,7 @@ PORTNAME= VisualOS
PORTVERSION= 1.0.5
PORTREVISION= 6
CATEGORIES= emulators gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A visual simulator of an operating system to help understand how OSes work
diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index 9640509abb52..d494f65441eb 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -9,9 +9,9 @@ PORTNAME= vmips
PORTVERSION= 1.3.2
PORTREVISION= 2
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://www.dgate.org/vmips/releases/vmips-${PORTVERSION}/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= brg@dgate.org
COMMENT= MIPS R3000 simulator
diff --git a/emulators/xcpc/Makefile b/emulators/xcpc/Makefile
index b932cd5bfc2f..1c4b7942e8c3 100644
--- a/emulators/xcpc/Makefile
+++ b/emulators/xcpc/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xcpc
PORTVERSION= 20070122
PORTREVISION= 1
CATEGORIES= emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= pixel@hugbox.org
COMMENT= A portable Amstrad 464&/664/6128 emulator
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 366d5a58c657..fd7fa4fc09fe 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.51
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ZSNES%20v${PORTVERSION}
DISTNAME= zsnes${PORTVERSION:S/.//}src
MAINTAINER= cyberbotx@cyberbotx.com
diff --git a/finance/aqmoney/Makefile b/finance/aqmoney/Makefile
index b813ad426fef..3abf5acf2c76 100644
--- a/finance/aqmoney/Makefile
+++ b/finance/aqmoney/Makefile
@@ -7,8 +7,7 @@
PORTNAME= aqmoney
PORTVERSION= 0.6.3
CATEGORIES= finance
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Manage your credit institute accounts using openhbci
diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile
index abd330b2d043..d0f1c4fce807 100644
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cbb
PORTVERSION= 0.8.1
PORTREVISION= 1
CATEGORIES= finance deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-0.8%20%28stable%29/${PORTVERSION}
MAINTAINER= kline@thought.org
COMMENT= Checkbook balancing tool
diff --git a/finance/eqonomize-kde3/Makefile b/finance/eqonomize-kde3/Makefile
index 5940600d35f7..811a091f38f5 100644
--- a/finance/eqonomize-kde3/Makefile
+++ b/finance/eqonomize-kde3/Makefile
@@ -9,7 +9,7 @@ PORTNAME= eqonomize
PORTVERSION= 0.5.1
PORTREVISION= 1
CATEGORIES= finance
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Eqonomize%21/${PORTVERSION}
PKGNAMESUFFIX= -kde3
MAINTAINER= cm@therek.net
diff --git a/finance/eqonomize-kde4/Makefile b/finance/eqonomize-kde4/Makefile
index 9c0a1339d9b0..a17b4aa89ada 100644
--- a/finance/eqonomize-kde4/Makefile
+++ b/finance/eqonomize-kde4/Makefile
@@ -9,7 +9,7 @@ PORTNAME= eqonomize
PORTVERSION= 0.6
PORTREVISION= 2
CATEGORIES= finance
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Eqonomize%21/${PORTVERSION}
PKGNAMESUFFIX= -kde4
MAINTAINER= cm@therek.net
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index 45c1fca9277d..a4622f7729a4 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnofin
PORTVERSION= 0.8.4
PORTREVISION= 6
CATEGORIES= finance deskutils gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= gahr@FreeBSD.org
COMMENT= Light-weight GNOME based financial management program
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index bb295d1399c3..2da8ec4ce4e2 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -10,11 +10,13 @@ PORTNAME= gnucash-docs
PORTVERSION= 2.2.0
PORTREVISION= 3
CATEGORIES= finance gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/gnucash/${PORTNAME}/${PORTVERSION} \
http://www.gnucash.org/pub/gnucash/sources/stable/ \
+
ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
+
http://www.linas.org/pub/
-MASTER_SITE_SUBDIR= gnucash
+
MAINTAINER= ahze@FreeBSD.org
COMMENT= Documentation for gnucash
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index b4574fa0b5c6..0850092e7bfb 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -10,9 +10,9 @@ PORTNAME= gnucash
PORTVERSION= 2.2.9
PORTREVISION= 3
CATEGORIES= finance gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} \
http://www.gnucash.org/pub/gnucash/sources/stable/
-MASTER_SITE_SUBDIR= gnucash
+
MAINTAINER= ahze@FreeBSD.org
COMMENT= Quicken-like money and finance manager
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 1879a90e9fb4..481e25402f85 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= grisbi
PORTVERSION= 0.5.9
PORTREVISION= 4
CATEGORIES= finance
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= thierry@FreeBSD.org
COMMENT= A personnal accounting application
diff --git a/finance/kexchange/Makefile b/finance/kexchange/Makefile
index 9700bcc66452..90a1cb715288 100644
--- a/finance/kexchange/Makefile
+++ b/finance/kexchange/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kexchange
PORTVERSION= 1.0
PORTREVISION= 7
CATEGORIES= finance kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE currency converter
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index 3361c483cea4..f3e26c24955e 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -8,8 +8,7 @@ PORTNAME= khacc
PORTVERSION= 3.3
PORTREVISION= 7
CATEGORIES= finance
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= qhacc
+MASTER_SITES= SF/qhacc/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple KDE-based financial manager
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 5aade9a7658e..a66b9b49fb36 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kmymoney2
PORTVERSION= 0.8.9
PORTREVISION= 3
CATEGORIES= finance
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/KMyMoney/${PORTVERSION}
MAINTAINER= alecn2002@yandex.ru
COMMENT= KDE-based personal finance assistant
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 5aade9a7658e..a66b9b49fb36 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kmymoney2
PORTVERSION= 0.8.9
PORTREVISION= 3
CATEGORIES= finance
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/KMyMoney/${PORTVERSION}
MAINTAINER= alecn2002@yandex.ru
COMMENT= KDE-based personal finance assistant
diff --git a/finance/ledgersmb/Makefile b/finance/ledgersmb/Makefile
index dcd75a28ab72..c3161decc328 100644
--- a/finance/ledgersmb/Makefile
+++ b/finance/ledgersmb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ledger-smb
PORTVERSION= 1.1.12
PORTREVISION= 1
CATEGORIES= finance perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/ledgersmb/${PORTVERSION}
MAINTAINER= anarcat@anarcat.ath.cx
COMMENT= A double entry accounting system
diff --git a/finance/ledgersmb12/Makefile b/finance/ledgersmb12/Makefile
index edced41ab0bd..bf478664d7aa 100644
--- a/finance/ledgersmb12/Makefile
+++ b/finance/ledgersmb12/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ledgersmb
PORTVERSION= 1.2.17
CATEGORIES= finance perl5
-MASTER_SITES= SF/ledger-smb
+MASTER_SITES= SF/ledger-smb/${PORTNAME}/${PORTVERSION}
MAINTAINER= anarcat@anarcat.ath.cx
COMMENT= A double entry accounting system
diff --git a/finance/libstocks/Makefile b/finance/libstocks/Makefile
index fa44bb8f6916..ed1160ed2b32 100644
--- a/finance/libstocks/Makefile
+++ b/finance/libstocks/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libstocks
PORTVERSION= 0.5.0
CATEGORIES= finance devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mi@aldan.algebra.com
COMMENT= A C library which can be used to fetch stocks quotes
diff --git a/finance/myphpmoney/Makefile b/finance/myphpmoney/Makefile
index d8600321e6b4..ac2c9c42e65e 100644
--- a/finance/myphpmoney/Makefile
+++ b/finance/myphpmoney/Makefile
@@ -8,8 +8,7 @@ PORTNAME= myphpmoney
PORTVERSION= 1.3.r3
PORTEPOCH= 1
CATEGORIES= finance www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= myphpmoney
+MASTER_SITES= SF/${PORTNAME}/MyPhpMoney/1.3RC3
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/RC/}
MAINTAINER= courou@users.sourceforge.net
diff --git a/finance/openhbci/Makefile b/finance/openhbci/Makefile
index 313bc2ec5e65..2409b382d950 100644
--- a/finance/openhbci/Makefile
+++ b/finance/openhbci/Makefile
@@ -7,8 +7,7 @@
PORTNAME= openhbci
PORTVERSION= 0.9.17.2
CATEGORIES= finance
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.9.17
DISTNAME= openhbci-0.9.17-2
MAINTAINER= ports@FreeBSD.org
diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index d84396afcc00..f06f9bcedef2 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ${UPPORTNAME:L}
PORTVERSION= 6.03
CATEGORIES= finance
-MASTER_SITES= SF/opentaxsolver
+MASTER_SITES= SF/${PORTNAME}/OTS_2008/v${PORTVERSION}
DISTNAME= ${UPPORTNAME}2008_${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index e095c1d7ece2..82858df3e892 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -9,7 +9,7 @@ PORTNAME= qhacc
PORTVERSION= 3.5
PORTREVISION= 5
CATEGORIES= finance
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple QT-based financial manager
diff --git a/finance/qtstalker/Makefile b/finance/qtstalker/Makefile
index e398f231d492..029f2dc4c099 100644
--- a/finance/qtstalker/Makefile
+++ b/finance/qtstalker/Makefile
@@ -9,7 +9,7 @@ PORTNAME= qtstalker
PORTVERSION= 0.36
PORTREVISION= 1
CATEGORIES= finance kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= corky1951@comcast.net
COMMENT= Commodity and stock market charting and technical analysis
diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile
index abce7e0c1683..64797eb5bde5 100644
--- a/finance/quantlib/Makefile
+++ b/finance/quantlib/Makefile
@@ -9,8 +9,7 @@
PORTNAME= quantlib
PORTVERSION= 0.8.1
CATEGORIES= finance
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/QuantLib/older%20releases/${PORTVERSION}
DISTNAME= QuantLib-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/finance/sabernetdcs-client/Makefile b/finance/sabernetdcs-client/Makefile
index 6db9173a0e58..b9ba052d85fd 100644
--- a/finance/sabernetdcs-client/Makefile
+++ b/finance/sabernetdcs-client/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sabernetdcs
PORTVERSION= 2.0.3
PORTREVISION= 3
CATEGORIES= finance www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sabernetdcs
+MASTER_SITES= SF/${PORTNAME}/SaberNet%20DCS/${PORTVERSION}
PKGNAMESUFFIX= -client
DISTNAME= sndcs-${PORTVERSION}
diff --git a/finance/venice/Makefile b/finance/venice/Makefile
index b6f01ef938f2..f44a1d7fa35b 100644
--- a/finance/venice/Makefile
+++ b/finance/venice/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.5.1.a
PORTREVISION= 3
DISTVERSION= 0.51alpha
CATEGORIES= finance java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mov
+MASTER_SITES= SF/mov/${PORTNAME}/0.51%20alpha
DISTNAME= ${PORTNAME}-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/finance/weberp/Makefile b/finance/weberp/Makefile
index 5a42b17362e6..17e6420ee755 100644
--- a/finance/weberp/Makefile
+++ b/finance/weberp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= weberp
PORTVERSION= 3.10
CATEGORIES= finance www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= web-erp
+MASTER_SITES= SF/web-erp/webERP/${PORTVERSION}
DISTNAME= webERP_${PORTVERSION}
MAINTAINER= wenheping@gmail.com
diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile
index 83a8b54104bc..b315e6fb71e2 100644
--- a/finance/xtrader/Makefile
+++ b/finance/xtrader/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xtrader
PORTVERSION= 0.99.9
PORTREVISION= 4
CATEGORIES= finance
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Technical analysis program for financial instruments
diff --git a/french/alphabet_sounds_fr/Makefile b/french/alphabet_sounds_fr/Makefile
index cb323f12d07d..5cc895ba4912 100644
--- a/french/alphabet_sounds_fr/Makefile
+++ b/french/alphabet_sounds_fr/Makefile
@@ -7,8 +7,7 @@ PORTNAME= alphabet_sounds_fr
PORTVERSION= 0.3
PORTREVISION= 7
CATEGORIES= french games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= childsplay
+MASTER_SITES= SF/childsplay/OldFiles
DISTNAME= alphabet_sounds_fr
MAINTAINER= bruno@tinkerbox.org
diff --git a/french/jdictionary-fre-hun/Makefile b/french/jdictionary-fre-hun/Makefile
index 9cdf81584236..d67e5e7e805d 100644
--- a/french/jdictionary-fre-hun/Makefile
+++ b/french/jdictionary-fre-hun/Makefile
@@ -9,6 +9,7 @@ PORTNAME= jdictionary-fre-hun
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= french hungarian textproc
+MASTER_SITES= SF/jdictionary/Plugins%20for%20jDictionary/Smart%20French-Hungarian
DISTNAME= Smart_French_Hungarian-1_0.jar
COMMENT= JDictionary plugin: French-Hungarian dictionary
diff --git a/french/mozilla-flp/Makefile b/french/mozilla-flp/Makefile
index b67d08f90938..3f301697ff6a 100644
--- a/french/mozilla-flp/Makefile
+++ b/french/mozilla-flp/Makefile
@@ -10,9 +10,9 @@ PORTVERSION= ${MOZVERSION}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= french www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/frenchmozilla/French%20SeaMonkey/${PORTVERSION} \
http://frenchmozilla.sourceforge.net/FTP/${PORTVERSION}${DISTURL}/
-MASTER_SITE_SUBDIR= frenchmozilla
+
DISTNAME= ${GECKO}-${PORTVERSION}.fr-FR.langpack
MAINTAINER= thierry@FreeBSD.org
diff --git a/ftp/bftpd/Makefile b/ftp/bftpd/Makefile
index fd985baaee3a..ce40ba6771a3 100644
--- a/ftp/bftpd/Makefile
+++ b/ftp/bftpd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bftpd
PORTVERSION= 2.3
CATEGORIES= ftp
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= beech@FreeBSD.org
COMMENT= Very configurable FTP server that can do chroot easily
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index b325a9e771be..a0434af31c0c 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -10,7 +10,6 @@ PORTVERSION= 7.19.6
PORTREVISION= 1
CATEGORIES= ftp ipv6 www
MASTER_SITES= http://curl.haxx.se/download/ \
- ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.sunet.se/pub/www/utilities/curl/ \
ftp://ftp.fu-berlin.de/pub/unix/network/curl/ \
ftp://crydee.sai.msu.ru/zeus/unix/WWW/tools/mirror/
diff --git a/ftp/dmachine/Makefile b/ftp/dmachine/Makefile
index 9bdf9139cca9..1daf444f6406 100644
--- a/ftp/dmachine/Makefile
+++ b/ftp/dmachine/Makefile
@@ -10,8 +10,7 @@ PORTNAME= dmachine
PORTVERSION= 0.22
PORTREVISION= 2
CATEGORIES= ftp java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//}
MAINTAINER= beech@FreeBSD.org
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 59343d3f8987..d8eca9e892ac 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -9,7 +9,7 @@ PORTNAME= filezilla
PORTVERSION= 3.2.6.1
PORTREVISION= 2
CATEGORIES= ftp
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
DISTNAME= FileZilla_${PORTVERSION}_src
MAINTAINER= jsa@wickedmachine.net
diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile
index cfe2ab16a457..01d62aba6ddc 100644
--- a/ftp/frox/Makefile
+++ b/ftp/frox/Makefile
@@ -11,8 +11,9 @@ PORTREVISION= 2
CATEGORIES= ftp
MASTER_SITES= http://www.hollo.org/frox/download/ \
http://frox.sourceforge.net/download/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
+ SF
+
MAINTAINER= sem@FreeBSD.org
COMMENT= Transparent FTP proxy with caching support
diff --git a/ftp/jftp/Makefile b/ftp/jftp/Makefile
index cb5ca0a0d634..40877575d88f 100644
--- a/ftp/jftp/Makefile
+++ b/ftp/jftp/Makefile
@@ -9,8 +9,7 @@
PORTNAME= jftp
PORTVERSION= 1.51
CATEGORIES= ftp java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= j-ftp
+MASTER_SITES= SF/j-ftp/${PORTNAME}/${PORTVERSION}
DISTNAME= j-ftp-${PORTVERSION}
MAINTAINER= beech@FreeBSD.org
diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 7ffa93d9604f..c27f6af5cf0f 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kbear
PORTVERSION= 3.0.a.1
PORTREVISION= 9
CATEGORIES= ftp kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3.0alpha1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a.1/alpha1b/}-1.src
PATCH_SITES= http://www.brueffer.de/distfiles/
diff --git a/ftp/multiget/Makefile b/ftp/multiget/Makefile
index a4b06e99c9ee..267839bb792a 100644
--- a/ftp/multiget/Makefile
+++ b/ftp/multiget/Makefile
@@ -9,7 +9,7 @@ PORTNAME= multiget
PORTVERSION= 1.1.3
PORTREVISION= 3
CATEGORIES= ftp www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= alepulver@FreeBSD.org
COMMENT= An http/ftp downloader with a nice GUI
diff --git a/ftp/paraget/Makefile b/ftp/paraget/Makefile
index 2472a08d2781..49a3935697a0 100644
--- a/ftp/paraget/Makefile
+++ b/ftp/paraget/Makefile
@@ -10,8 +10,7 @@ PORTNAME= paraget
PORTVERSION= 0.3.0
PORTREVISION= 1
CATEGORIES= ftp perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ijliao@FreeBSD.org
COMMENT= Parallel ftp-fetching program
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 03324a165056..c71d5ace1e60 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pavuk
PORTVERSION= 0.9.35
PORTREVISION= 2
CATEGORIES= ftp www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= HTTP, FTP and Gopher mirroring tool
diff --git a/ftp/phpwebftp/Makefile b/ftp/phpwebftp/Makefile
index ea4c18ab1c21..33e0b8fcbbdb 100644
--- a/ftp/phpwebftp/Makefile
+++ b/ftp/phpwebftp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpwebftp
PORTVERSION= 3.3
PORTREVISION= 1
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= acm@FreeBSD.org
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index d9fdc136bcb5..f0a67bf8a364 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -10,15 +10,23 @@ PORTVERSION= 1.0.22
CATEGORIES= ftp ipv6
MASTER_SITES= http://download.pureftpd.org/pub/pure-ftpd/releases/ \
ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
+
ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
+
ftp://ftp3.fr.pureftpd.org/pure-ftpd/releases/ \
+
ftp://ftp.dk.pureftpd.org/mirrors/pure-ftpd/releases/ \
+
ftp://ftp.es.pureftpd.org/mirror/pureftpd/latest/releases/ \
+
ftp://ftp.nl.pureftpd.org/pub/pure-ftpd/releases/ \
+
ftp://ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
+
ftp://ftp.cn.pureftpd.org/pub/pureftpd/pure-ftpd/releases/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pureftpd
+
+ SF/pureftpd/Pure-FTPd/${PORTVERSION}
+
MAINTAINER= garga@FreeBSD.org
COMMENT= A small, easy to set up, fast and very secure FTP server
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index c35f0cc5447a..ff9a451733a3 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -10,8 +10,7 @@ PORTNAME= pureadmin
PORTVERSION= 0.4
PORTREVISION= 2
CATEGORIES= ftp
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= purify
+MASTER_SITES= SF/purify/Default/${PORTVERSION}
MAINTAINER= beech@FreeBSD.org
COMMENT= Management utility for the PureFTPd
diff --git a/ftp/quftp/Makefile b/ftp/quftp/Makefile
index 3495ec6d422f..3efcfa01ecd4 100644
--- a/ftp/quftp/Makefile
+++ b/ftp/quftp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= quftp
PORTVERSION= 1.0.7
PORTREVISION= 3
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= quftp
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A scriptable FTP client
diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile
index 23af800e8da6..dac4ff872b39 100644
--- a/ftp/rexx-curl/Makefile
+++ b/ftp/rexx-curl/Makefile
@@ -10,8 +10,7 @@ PORTNAME= curl
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rexx${PORTNAME}
+MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= rexx-
DISTNAME= RexxCURL-${PORTVERSION}
diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile
index fb1ddda3e6b3..a8eae665c299 100644
--- a/ftp/smbftpd/Makefile
+++ b/ftp/smbftpd/Makefile
@@ -8,9 +8,9 @@
PORTNAME= smbftpd
PORTVERSION= 2.2
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/SmbFTPD/${PORTVERSION} \
http://www.twbsd.org/download/download.php?file=smbftpd/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= jnlin@csie.nctu.edu.tw
COMMENT= FTP daemon using Samba-like share management mechanism
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index ccfe19d6e6cd..d6547aa4356f 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -9,8 +9,7 @@ PORTNAME= urlgfe
PORTVERSION= 0.7.1
PORTREVISION?= 10
CATEGORIES= ftp www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= urlget
+MASTER_SITES= SF/urlget/Urlgfe%20%28legacy%29/${PORTVERSION}
MAINTAINER= chip-set@mail.ru
COMMENT= A download manager
diff --git a/ftp/wgetpro/Makefile b/ftp/wgetpro/Makefile
index 5eeb02a444f8..0a9d9ec98394 100644
--- a/ftp/wgetpro/Makefile
+++ b/ftp/wgetpro/Makefile
@@ -10,8 +10,7 @@ PORTNAME= wgetpro
PORTVERSION= 0.1.3
PORTREVISION= 2
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= stas@FreeBSD.org
diff --git a/ftp/wxdfast/Makefile b/ftp/wxdfast/Makefile
index 946dd188bcd5..a9cf2031aeb7 100644
--- a/ftp/wxdfast/Makefile
+++ b/ftp/wxdfast/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wxdfast
PORTVERSION= 0.6.0
PORTREVISION= 2
CATEGORIES= ftp www
-MASTER_SITES= SF/dfast
+MASTER_SITES= SF/dfast/wxDownload%20Fast/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 03031972ec0b..39ec0d05331b 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wzdftpd
PORTVERSION= 0.8.1
PORTREVISION= 6
CATEGORIES= ftp ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-0.8
MAINTAINER= novel@FreeBSD.org
COMMENT= Modular FTP server configurable online using SITE commands
diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile
index c383c528a15c..9d5d889fff07 100644
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= yafc
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Yet another ftp client. Similar to ftp(1)