summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--hebrew/he2/Makefile2
-rw-r--r--hungarian/hunspell/Makefile4
-rw-r--r--hungarian/ispell/Makefile3
-rw-r--r--hungarian/jdictionary-eng-hun-expr/Makefile1
-rw-r--r--hungarian/jdictionary-eng-hun/Makefile1
-rw-r--r--irc/anope/Makefile2
-rw-r--r--irc/bitchx/Makefile2
-rw-r--r--irc/dancer/Makefile3
-rw-r--r--irc/gruftistats/Makefile3
-rw-r--r--irc/hybserv/Makefile3
-rw-r--r--irc/ircd-hybrid-ru/Makefile4
-rw-r--r--irc/ircproxy/Makefile2
-rw-r--r--irc/iroffer-lamm/Makefile3
-rw-r--r--irc/kmyirc/Makefile3
-rw-r--r--irc/kwirc/Makefile3
-rw-r--r--irc/lostirc/Makefile2
-rw-r--r--irc/muh/Makefile3
-rw-r--r--irc/nefarious/Makefile3
-rw-r--r--irc/py-irclib/Makefile3
-rw-r--r--irc/py-supybot-plugins/Makefile3
-rw-r--r--irc/py-supybot/Makefile2
-rw-r--r--irc/solid-ircd/Makefile3
-rw-r--r--irc/talksoup/Makefile3
-rw-r--r--irc/tr-ircd/Makefile3
-rw-r--r--irc/undernet-ircu/Makefile3
-rw-r--r--irc/xchat-ruby/Makefile3
-rw-r--r--irc/xchat/Makefile4
-rw-r--r--irc/znc-extra/Makefile2
-rw-r--r--japanese/aterm/Makefile3
-rw-r--r--japanese/ebview/Makefile3
-rw-r--r--japanese/ical/Makefile2
-rw-r--r--japanese/jadetex-ptex/Makefile3
-rw-r--r--japanese/lambdamoo/Makefile1
-rw-r--r--japanese/libtomoe-gtk/Makefile3
-rw-r--r--japanese/mecab-ipadic/Makefile3
-rw-r--r--japanese/monafonts-ttf/Makefile3
-rw-r--r--japanese/monafonts/Makefile2
-rw-r--r--japanese/navi2ch/Makefile2
-rw-r--r--japanese/nethack34/Makefile3
-rw-r--r--japanese/p5-MeCab/Makefile3
-rw-r--r--japanese/py-mecab/Makefile3
-rw-r--r--japanese/ruby-mecab/Makefile3
-rw-r--r--japanese/scim-tables/Makefile3
-rw-r--r--japanese/scim-tomoe/Makefile3
-rw-r--r--japanese/scim-uim/Makefile4
-rw-r--r--japanese/stardict-dict-ja/Makefile3
-rw-r--r--japanese/stardict2-dict-ja/Makefile3
-rw-r--r--japanese/tomoe/Makefile3
-rw-r--r--japanese/uim-tomoe-gtk/Makefile3
-rw-r--r--japanese/xdvik/Makefile2
-rw-r--r--java/avis/Makefile3
-rw-r--r--java/commonclipse/Makefile3
-rw-r--r--java/eclipse-EPIC/Makefile3
-rw-r--r--java/eclipse-RDT/Makefile3
-rw-r--r--java/eclipse-checkstyle/Makefile3
-rw-r--r--java/eclipse-drjava/Makefile3
-rw-r--r--java/eclipse-findbugs/Makefile2
-rw-r--r--java/eclipse-hibernatetools/Makefile3
-rw-r--r--java/eclipse-jad/Makefile3
-rw-r--r--java/eclipse-pmd/Makefile3
-rw-r--r--java/eclipse-pydev/Makefile2
-rw-r--r--java/eclipse-quantum/Makefile3
-rw-r--r--java/eclipse-shelled/Makefile3
-rw-r--r--java/eclipse-sqlexplorer/Makefile3
-rw-r--r--java/eclipse-v4all/Makefile3
-rw-r--r--java/eclipseme/Makefile2
-rw-r--r--java/jamvm/Makefile2
-rw-r--r--java/jasmin/Makefile3
-rw-r--r--java/jaxen/Makefile3
-rw-r--r--java/jboss2/Makefile3
-rw-r--r--java/jboss3/Makefile3
-rw-r--r--java/jboss4/Makefile3
-rw-r--r--java/jboss5/Makefile3
-rw-r--r--java/jc/Makefile3
-rw-r--r--java/jcckit/Makefile3
-rw-r--r--java/jcommon/Makefile3
-rw-r--r--java/jfreechart/Makefile2
-rw-r--r--java/jgrapht/Makefile3
-rw-r--r--java/jikes/Makefile3
-rw-r--r--java/jlint/Makefile3
-rw-r--r--java/jode/Makefile3
-rw-r--r--java/jump/Makefile3
-rw-r--r--java/mx4j/Makefile2
-rw-r--r--java/phpeclipse/Makefile2
-rw-r--r--java/sablevm-classpath/Makefile3
-rw-r--r--java/springframework/Makefile2
-rw-r--r--java/veditor/Makefile2
-rw-r--r--java/xdoclet/Makefile3
-rw-r--r--korean/gdick/Makefile3
-rw-r--r--korean/scim-hangul/Makefile3
-rw-r--r--korean/scim-tables/Makefile3
-rw-r--r--korean/stardict2-dict-kr/Makefile3
-rw-r--r--lang/asn1c/Makefile4
-rw-r--r--lang/bf2c/Makefile3
-rw-r--r--lang/ecl/Makefile3
-rw-r--r--lang/expect-devel/Makefile3
-rw-r--r--lang/ferite/Makefile3
-rw-r--r--lang/ficl-devel/Makefile3
-rw-r--r--lang/ficl/Makefile3
-rw-r--r--lang/gambas2-examples/Makefile3
-rw-r--r--lang/gauche/Makefile2
-rw-r--r--lang/gdc/Makefile2
-rw-r--r--lang/harbour/Makefile3
-rw-r--r--lang/itcl/Makefile3
-rw-r--r--lang/jython/Makefile3
-rw-r--r--lang/libhx/Makefile3
-rw-r--r--lang/librep/Makefile1
-rw-r--r--lang/mdk/Makefile8
-rw-r--r--lang/nbc/Makefile3
-rw-r--r--lang/nwcc/Makefile3
-rw-r--r--lang/oo2c/Makefile3
-rw-r--r--lang/osb-jscore/Makefile3
-rw-r--r--lang/otcl/Makefile2
-rw-r--r--lang/php-mode.el/Makefile3
-rw-r--r--lang/polyml/Makefile3
-rw-r--r--lang/py-prolog/Makefile3
-rw-r--r--lang/python-mode.el/Makefile3
-rw-r--r--lang/q/Makefile2
-rw-r--r--lang/rexx-regina/Makefile3
-rw-r--r--lang/rexx-wrapper/Makefile3
-rw-r--r--lang/seed7/Makefile2
-rw-r--r--lang/sml-nj/Makefile5
-rw-r--r--lang/squirrel/Makefile2
-rw-r--r--lang/tcl-manual/Makefile3
-rw-r--r--lang/tcl83/Makefile3
-rw-r--r--lang/tcl84/Makefile3
-rw-r--r--lang/tcl85/Makefile3
-rw-r--r--lang/tcl86/Makefile3
-rw-r--r--lang/tclX/Makefile3
-rw-r--r--lang/ucc/Makefile2
-rw-r--r--lang/xsb/Makefile2
-rw-r--r--lang/yorick/Makefile3
-rw-r--r--russian/ircd-hybrid-ru/Makefile4
-rw-r--r--russian/ircd-hybrid/Makefile4
-rw-r--r--textproc/hunspell/Makefile4
135 files changed, 144 insertions, 240 deletions
diff --git a/hebrew/he2/Makefile b/hebrew/he2/Makefile
index 4ffaa0c10e24..b59848b3ed74 100644
--- a/hebrew/he2/Makefile
+++ b/hebrew/he2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= he2
PORTVERSION= 0.61
PORTREVISION= 2
CATEGORIES= hebrew editors
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/HebrewEditor/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An editor for editing (primarily LaTeX) Hebrew files
diff --git a/hungarian/hunspell/Makefile b/hungarian/hunspell/Makefile
index dc57e1e674a5..0609fb2a328f 100644
--- a/hungarian/hunspell/Makefile
+++ b/hungarian/hunspell/Makefile
@@ -8,8 +8,8 @@
PORTNAME= hunspell
PORTVERSION= 1.2.8
CATEGORIES= hungarian textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S@$@:code@:S@%SUBDIR%@${PORTNAME}@} \
- ${MASTER_SITE_SOURCEFORGE:S@$@:data@:S@%SUBDIR%@magyarispell@}
+MASTER_SITES= SF/${PORTNAME}/Hunspell/${PORTVERSION}:code \
+ SF/magyarispell/Magyar%20Ispell/${DICTVERSION}:data
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:code \
hu_HU-${DICTVERSION}${EXTRACT_SUFX}:data
diff --git a/hungarian/ispell/Makefile b/hungarian/ispell/Makefile
index 9eb1e6489105..aff7c42e4561 100644
--- a/hungarian/ispell/Makefile
+++ b/hungarian/ispell/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ispell
PORTVERSION= 1.4
CATEGORIES= hungarian textproc
#MASTER_SITES= http://www.szofi.hu/gnu/magyarispell/
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= magyarispell
+MASTER_SITES= SF/magyar${PORTNAME}/Magyar%20Ispell/${PORTVERSION}
DISTNAME= magyarispell-${PORTVERSION:S/.R.1/-RC1/}
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/hungarian/jdictionary-eng-hun-expr/Makefile b/hungarian/jdictionary-eng-hun-expr/Makefile
index d38bc8b2769b..a8eece5253df 100644
--- a/hungarian/jdictionary-eng-hun-expr/Makefile
+++ b/hungarian/jdictionary-eng-hun-expr/Makefile
@@ -9,6 +9,7 @@ PORTNAME= jdictionary-eng-hun-expr
PORTVERSION= 1.4
PORTREVISION= 4
CATEGORIES= hungarian textproc
+MASTER_SITES= SF/jdictionary/Plugins%20for%20jDictionary/Smart%20English-Hungarian%20expression
DISTNAME= SmartEngHunExp-1_4.jar
COMMENT= JDictionary plugin: English-Hungarian expression dictionary
diff --git a/hungarian/jdictionary-eng-hun/Makefile b/hungarian/jdictionary-eng-hun/Makefile
index d5f42a72b581..6611b4e0500c 100644
--- a/hungarian/jdictionary-eng-hun/Makefile
+++ b/hungarian/jdictionary-eng-hun/Makefile
@@ -9,6 +9,7 @@ PORTNAME= jdictionary-eng-hun
PORTVERSION= 1.4
PORTREVISION= 4
CATEGORIES= hungarian textproc
+MASTER_SITES= SF/jdictionary/Plugins%20for%20jDictionary/Smart%20English-Hungarian
DISTNAME= SmartEngHun-1_4.jar
COMMENT= JDictionary plugin: Hungarian-English dictionary
diff --git a/irc/anope/Makefile b/irc/anope/Makefile
index df027b00f02f..8264ebd94c26 100644
--- a/irc/anope/Makefile
+++ b/irc/anope/Makefile
@@ -8,7 +8,7 @@
PORTNAME= anope
PORTVERSION= 1.8.2
CATEGORIES= irc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/Anope%20${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= A set of IRC services for IRC networks
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 9c473fe4278c..43f7d36ec806 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -9,7 +9,7 @@ PORTNAME= BitchX
PORTVERSION= 1.1.0.1
PORTREVISION= 4
CATEGORIES+= irc
-MASTER_SITES= SF
+MASTER_SITES= SF/bitchx/ircii-pana/ircii-pana-1.1
DISTNAME= ircii-pana-1.1-final
MAINTAINER?= beech@FreeBSD.org
diff --git a/irc/dancer/Makefile b/irc/dancer/Makefile
index 0dafbde72768..48e1d9702fc9 100644
--- a/irc/dancer/Makefile
+++ b/irc/dancer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dancer
PORTVERSION= 4.16
PORTREVISION= 1
CATEGORIES= irc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An IRC bot written in C for UNIX, Windows, and AmigaOS
diff --git a/irc/gruftistats/Makefile b/irc/gruftistats/Makefile
index 5c914e43176e..ddf718d2359d 100644
--- a/irc/gruftistats/Makefile
+++ b/irc/gruftistats/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gruftistats
PORTVERSION= 0.2.4
PORTREVISION= 1
CATEGORIES= irc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gruftistats
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Produces a web page of statistics and quotes from IRC channel logs
diff --git a/irc/hybserv/Makefile b/irc/hybserv/Makefile
index c2da60312b81..988222ced723 100644
--- a/irc/hybserv/Makefile
+++ b/irc/hybserv/Makefile
@@ -8,8 +8,7 @@
PORTNAME= hybserv
PORTVERSION= 1.9.3
CATEGORIES= irc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= hybserv2
+MASTER_SITES= SF/${PORTNAME}2/${PORTNAME}2/Hybserv%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= HybServ2 IRCD Services
diff --git a/irc/ircd-hybrid-ru/Makefile b/irc/ircd-hybrid-ru/Makefile
index d10f851b9e78..c12bd694a7d7 100644
--- a/irc/ircd-hybrid-ru/Makefile
+++ b/irc/ircd-hybrid-ru/Makefile
@@ -8,9 +8,9 @@
PORTNAME= ircd
PORTVERSION= 7.2.2
CATEGORIES= irc russian
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru-${PORTVERSION} \
ftp://rusunix.org/pub/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= ircd-hybrid-ru
+
PKGNAMESUFFIX= -hybrid-ru
DISTNAME= ircd-hybrid-ru-${PORTVERSION}
diff --git a/irc/ircproxy/Makefile b/irc/ircproxy/Makefile
index 9269db8590be..ac905634a4fa 100644
--- a/irc/ircproxy/Makefile
+++ b/irc/ircproxy/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ircproxy
PORTVERSION= 1.3.3c
PORTREVISION= 1
CATEGORIES= irc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= jonas@night-light.net
COMMENT= An IRC proxy/bouncer daemon
diff --git a/irc/iroffer-lamm/Makefile b/irc/iroffer-lamm/Makefile
index dd1ac81f6fce..cf1e4342f39b 100644
--- a/irc/iroffer-lamm/Makefile
+++ b/irc/iroffer-lamm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= iroffer
PORTVERSION= 1.4.3.2
CATEGORIES= irc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= iroffer-lamm
+MASTER_SITES= SF/${PORTNAME}-lamm/${PORTNAME}1.4-lamm/${PORTNAME}1.4.b03-lamm.b02
PKGNAMESUFFIX= -lamm${PKGNAMESUFFIX2}
DISTNAME= iroffer1.4.b03-lamm.b02
EXTRACT_SUFX= .tgz
diff --git a/irc/kmyirc/Makefile b/irc/kmyirc/Makefile
index 8d495abd3d04..5316b8f07e38 100644
--- a/irc/kmyirc/Makefile
+++ b/irc/kmyirc/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kmyirc
PORTVERSION= 0.2.9
PORTREVISION= 8
CATEGORIES= irc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-alpha/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Easy to use IRC client for KDE
diff --git a/irc/kwirc/Makefile b/irc/kwirc/Makefile
index dc158c67f8f0..afaafc549b7d 100644
--- a/irc/kwirc/Makefile
+++ b/irc/kwirc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kwirc
PORTVERSION= 0.1.0
PORTREVISION= 7
CATEGORIES= irc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20_sexybaby_
MAINTAINER= markus@FreeBSD.org
COMMENT= IRC client for KDE
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index 383a7e4b2015..7767b8eabdef 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 6
CATEGORIES= irc
MASTER_SITES= SF \
http://demian.dyndns.org/src/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple and minimal IRC client for X
diff --git a/irc/muh/Makefile b/irc/muh/Makefile
index e4d168ad7bf1..9dffb98a5fc8 100644
--- a/irc/muh/Makefile
+++ b/irc/muh/Makefile
@@ -8,8 +8,7 @@
PORTNAME= muh
PORTVERSION= 2.2a
CATEGORIES= irc ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=muh
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A smart irc-bouncing-tool that remains on IRC all the time
diff --git a/irc/nefarious/Makefile b/irc/nefarious/Makefile
index 3725e4c563c6..bbf39737ed40 100644
--- a/irc/nefarious/Makefile
+++ b/irc/nefarious/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Nefarious
PORTVERSION= 1.2.0
CATEGORIES= irc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= evilnet
+MASTER_SITES= SF/evilnet/${PORTNAME}%20IRCu/${PORTVERSION}
MAINTAINER= scjamorim@bsd.com.br
COMMENT= IRC server used by evilnet based off of Undernet\'s ircu
diff --git a/irc/py-irclib/Makefile b/irc/py-irclib/Makefile
index 0e2c18491a65..63b5a8a8dc60 100644
--- a/irc/py-irclib/Makefile
+++ b/irc/py-irclib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= irclib
PORTVERSION= 0.4.8
CATEGORIES= irc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= python-irclib
+MASTER_SITES= SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= python-irclib-${PORTVERSION}
diff --git a/irc/py-supybot-plugins/Makefile b/irc/py-supybot-plugins/Makefile
index 35160a64e478..a8d6d86f8d4d 100644
--- a/irc/py-supybot-plugins/Makefile
+++ b/irc/py-supybot-plugins/Makefile
@@ -9,8 +9,7 @@ PORTNAME= supybot-plugins
PORTVERSION= 20060723
PORTREVISION= 1
CATEGORIES= irc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= supybot
+MASTER_SITES= SF/supybot/OldFiles
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Supybot-plugins-${PORTVERSION}
diff --git a/irc/py-supybot/Makefile b/irc/py-supybot/Makefile
index adcbda069da1..73e3ba9acc45 100644
--- a/irc/py-supybot/Makefile
+++ b/irc/py-supybot/Makefile
@@ -8,7 +8,7 @@
PORTNAME= supybot
PORTVERSION= 0.83.4.1
CATEGORIES= irc python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Supybot-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Supybot-${PORTVERSION}
diff --git a/irc/solid-ircd/Makefile b/irc/solid-ircd/Makefile
index 33da87adb61e..653cd4656e52 100644
--- a/irc/solid-ircd/Makefile
+++ b/irc/solid-ircd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= solid-ircd
PORTVERSION= 3.4.8
CATEGORIES= irc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=solidircd
+MASTER_SITES= SF/solidircd/Solid-Stable/solidircd-stable.${PORTVERSION}
DISTNAME= solidircd-stable3.4.8
MAINTAINER= systemoperator@gmail.com
diff --git a/irc/talksoup/Makefile b/irc/talksoup/Makefile
index 43ba127cc09a..7061797e3c18 100644
--- a/irc/talksoup/Makefile
+++ b/irc/talksoup/Makefile
@@ -9,8 +9,7 @@ PORTNAME= talksoup
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= irc gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}alpha
DISTNAME= TalkSoup-${PORTVERSION}alpha
MAINTAINER= dinoex@FreeBSD.org
diff --git a/irc/tr-ircd/Makefile b/irc/tr-ircd/Makefile
index fa1ce07d11ce..76e27e1e19f1 100644
--- a/irc/tr-ircd/Makefile
+++ b/irc/tr-ircd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tr-ircd
PORTVERSION= 5.7.3
PORTREVISION= 1
CATEGORIES= irc ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ircd/trircd-${PORTVERSION}-release
DISTNAME= ${PORTNAME:S/-//}-release-${PORTVERSION}-r
MAINTAINER= mm@FreeBSD.org
diff --git a/irc/undernet-ircu/Makefile b/irc/undernet-ircu/Makefile
index 1e3072a86c7f..6122e7ec4a5d 100644
--- a/irc/undernet-ircu/Makefile
+++ b/irc/undernet-ircu/Makefile
@@ -7,8 +7,7 @@
PORTNAME= undernet-ircu
PORTVERSION= 2.10.12.12
CATEGORIES= irc net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= undernet-ircu
+MASTER_SITES= SF/${PORTNAME}/ircu/ircu${PORTVERSION}
DISTNAME= ircu${PORTVERSION}
MAINTAINER= weaseal@users.sourceforge.net
diff --git a/irc/xchat-ruby/Makefile b/irc/xchat-ruby/Makefile
index d071217e6071..c1227ff0a912 100644
--- a/irc/xchat-ruby/Makefile
+++ b/irc/xchat-ruby/Makefile
@@ -7,8 +7,7 @@
PORTNAME= ruby
PORTVERSION= 1.2
CATEGORIES= irc ruby
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
+MASTER_SITES= SF/xchat-${PORTNAME}/xchat-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= xchat-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}-src
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 0ff435bf436c..6a961b28d74a 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -10,9 +10,9 @@ PORTNAME= xchat
PORTVERSION= 2.8.6
PORTREVISION= 3
CATEGORIES= irc gnome ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= gnome@FreeBSD.org
COMMENT= An X11 IRC client using the GTK+ 2 toolkit
diff --git a/irc/znc-extra/Makefile b/irc/znc-extra/Makefile
index d8bbdfbf2521..23be2e94418b 100644
--- a/irc/znc-extra/Makefile
+++ b/irc/znc-extra/Makefile
@@ -8,7 +8,7 @@
PORTNAME= znc-extra
PORTVERSION= 0.070
CATEGORIES= irc
-MASTER_SITES= SF/znc
+MASTER_SITES= SF/znc/${PORTNAME}/${PORTVERSION}
MAINTAINER= terry@sucked-in.com
COMMENT= ZNC-Extra package for ZNC Bouner
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index f7124cf1b311..646bb2c22f47 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= aterm
PORTVERSION= 0.4.2
PORTREVISION= 5
CATEGORIES+= japanese x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PATCH_SITES= http://www.jaist.ac.jp/~amatsus/linux/src/xfree86/aterm/
PATCHFILES= ${DISTNAME}-xim.patch.gz \
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index 124e5cf1a63f..e527883a4629 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ebview
PORTVERSION= 0.2.1
PORTREVISION= 9
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Electronic Book Viewer
diff --git a/japanese/ical/Makefile b/japanese/ical/Makefile
index ff601066ac65..7ccef100b98e 100644
--- a/japanese/ical/Makefile
+++ b/japanese/ical/Makefile
@@ -12,9 +12,7 @@ CATEGORIES= japanese deskutils tk
MASTER_SITES= ftp://ftp.sco.com/skunkware/src/shellutil/ \
ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/ \
ftp://ftp.netsw.org/netsw/X11/Tools/Desktop/ \
- ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.sunsite.org.uk/Mirrors/ftp.sco.com/skunkware/src/shellutil/
-MASTER_SITE_SUBDIR= ical
PATCH_SITES= http://www-jlc.kek.jp/~fujiik/mklinux/Packages/dr3/JRPMS/ical/SOURCES/
PATCHFILES= ical-2.2-jp1.patch
diff --git a/japanese/jadetex-ptex/Makefile b/japanese/jadetex-ptex/Makefile
index 7cb9784c1070..41144a9d0878 100644
--- a/japanese/jadetex-ptex/Makefile
+++ b/japanese/jadetex-ptex/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jadetex
PORTVERSION= 3.13
PORTREVISION= 6
CATEGORIES= japanese print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMESUFFIX= -ptex
DISTNAME= jadetex-${PORTVERSION}
diff --git a/japanese/lambdamoo/Makefile b/japanese/lambdamoo/Makefile
index c22951413651..714e2636089c 100644
--- a/japanese/lambdamoo/Makefile
+++ b/japanese/lambdamoo/Makefile
@@ -11,6 +11,7 @@ PORTREVISION= 1
CATEGORIES= japanese net
MASTER_SITES= SF\
ftp://ftp.leo.chubu.ac.jp/pub/network/mnews/:MN
+
DISTNAME= LambdaMOO-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
mnews122.tar.gz:MN
diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index 0272bc3b553b..5e391031775a 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libtomoe-gtk
PORTVERSION= 0.6.0
PORTREVISION= 3
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tomoe
+MASTER_SITES= SF/tomoe/tomoe-gtk/tomoe-gtk-${PORTVERSION}
DISTNAME= tomoe-gtk-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= ume@FreeBSD.org
diff --git a/japanese/mecab-ipadic/Makefile b/japanese/mecab-ipadic/Makefile
index 95eb5f2254d6..f6ddd9caccf1 100644
--- a/japanese/mecab-ipadic/Makefile
+++ b/japanese/mecab-ipadic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mecab
DISTVERSION= 2.7.0-20070801
CATEGORIES= japanese textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ipadic/2.7.0-20070801
PKGNAMESUFFIX= -ipadic
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}
diff --git a/japanese/monafonts-ttf/Makefile b/japanese/monafonts-ttf/Makefile
index 67f04cad56f3..bce839b2ec48 100644
--- a/japanese/monafonts-ttf/Makefile
+++ b/japanese/monafonts-ttf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= monafonts-ttf
PORTVERSION= 2.90
PORTREVISION= 2
CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= monafont
+MASTER_SITES= SF/monafont/monafont/monafont-${PORTVERSION}
DISTNAME= monafont-ttf-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile
index 103dbe93840c..c30f4e9617ec 100644
--- a/japanese/monafonts/Makefile
+++ b/japanese/monafonts/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.90
PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= japanese x11-fonts
-MASTER_SITES= SF/monafont
+MASTER_SITES= SF/monafont/monafont/monafont-${PORTVERSION}
DISTNAME= monafont-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index 4fb33a8da9fa..f2a2134d5789 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.8.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= japanese www elisp
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= hrs@FreeBSD.org
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 4b2bb35228e2..e1cffb8720d5 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nethack
PORTVERSION= 3.4.3
PORTREVISION= 5
CATEGORIES= japanese games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-src
EXTRACT_SUFX= .tgz
diff --git a/japanese/p5-MeCab/Makefile b/japanese/p5-MeCab/Makefile
index 27ba77de68d3..a81094480144 100644
--- a/japanese/p5-MeCab/Makefile
+++ b/japanese/p5-MeCab/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MeCab
PORTVERSION= 0.97
CATEGORIES= japanese textproc perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}-perl/${PORTVERSION}
DISTNAME= ${PORTNAME:L}-perl-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
diff --git a/japanese/py-mecab/Makefile b/japanese/py-mecab/Makefile
index 83c529a550d0..7ce67538bee5 100644
--- a/japanese/py-mecab/Makefile
+++ b/japanese/py-mecab/Makefile
@@ -7,8 +7,7 @@
PORTNAME= mecab
PORTVERSION= 0.97
CATEGORIES= japanese python textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-python/${PORTVERSION}
DISTNAME= ${PORTNAME}-python-${PORTVERSION}
MAINTAINER= jun-g@daemonfreaks.com
diff --git a/japanese/ruby-mecab/Makefile b/japanese/ruby-mecab/Makefile
index 56a99b8ce0d6..ce451b10da8a 100644
--- a/japanese/ruby-mecab/Makefile
+++ b/japanese/ruby-mecab/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mecab
PORTVERSION= 0.97
CATEGORIES= japanese textproc ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ruby/${PORTVERSION}
DISTNAME= ${PORTNAME}-ruby-${PORTVERSION}
MAINTAINER= ruby@FreeBSD.org
diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile
index 0f457394b415..70ab15778fa4 100644
--- a/japanese/scim-tables/Makefile
+++ b/japanese/scim-tables/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scim-tables
PORTVERSION= 0.5.7
PORTREVISION= 3
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=scim
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
MAINTAINER= lx@FreeBSD.org
COMMENT= SCIM table based Japanese input methods
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index e18194810639..c371bef5c898 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scim-tomoe
PORTVERSION= 0.6.0
PORTREVISION= 4
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tomoe
+MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ume@FreeBSD.org
COMMENT= SCIM IMEngine module using Tomoe
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index f8066d3b8e99..da093c3ee7c2 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -9,9 +9,9 @@ PORTNAME= scim-uim
PORTVERSION= 0.2.0
PORTREVISION= 2
CATEGORIES= japanese
-MASTER_SITES= SF \
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \
http://freedesktop.org/~suzhe/sources/
-MASTER_SITE_SUBDIR=scim
+
MAINTAINER= s_yanagita@ybb.ne.jp
COMMENT= SCIM IMEngine module using UIM input method library
diff --git a/japanese/stardict-dict-ja/Makefile b/japanese/stardict-dict-ja/Makefile
index efcd3e36d4de..167d9bb6ac9f 100644
--- a/japanese/stardict-dict-ja/Makefile
+++ b/japanese/stardict-dict-ja/Makefile
@@ -8,8 +8,7 @@ PORTNAME= stardict2-dict-ja
PORTVERSION= 2.4.2
PORTREVISION= 7
CATEGORIES= japanese textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= stardict
+MASTER_SITES= SF/stardict/stardict-dictionaries-ja/${PORTVERSION}
DISTFILES= stardict-jmdict-en-ja-${PORTVERSION}.tar.bz2 \
stardict-jmdict-ja-en-${PORTVERSION}.tar.bz2
DIST_SUBDIR= stardict
diff --git a/japanese/stardict2-dict-ja/Makefile b/japanese/stardict2-dict-ja/Makefile
index efcd3e36d4de..167d9bb6ac9f 100644
--- a/japanese/stardict2-dict-ja/Makefile
+++ b/japanese/stardict2-dict-ja/Makefile
@@ -8,8 +8,7 @@ PORTNAME= stardict2-dict-ja
PORTVERSION= 2.4.2
PORTREVISION= 7
CATEGORIES= japanese textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= stardict
+MASTER_SITES= SF/stardict/stardict-dictionaries-ja/${PORTVERSION}
DISTFILES= stardict-jmdict-en-ja-${PORTVERSION}.tar.bz2 \
stardict-jmdict-ja-en-${PORTVERSION}.tar.bz2
DIST_SUBDIR= stardict
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index aed40d1826bd..f7c97bfa54e9 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tomoe
PORTVERSION= 0.6.0
PORTREVISION= 3
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tomoe
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index 419ca4d1d475..0872f4e89c1f 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= uim-tomoe-gtk
PORTVERSION= 0.6.0
PORTREVISION= 5
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tomoe
+MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ume@FreeBSD.org
COMMENT= UIM helper program for Tomoe
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 6e3cad95ac17..1ea5c31e1ca4 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xdvik
PORTVERSION= ${VERSION_XDVIK}.${VERSION_JPATCH}
PORTREVISION= 11
CATEGORIES= japanese print
-MASTER_SITES= SF/xdvi
+MASTER_SITES= SF/xdvi/OldFiles
PKGNAMEPREFIX= ja-
PKGNAMESUFFIX= -tetex
DISTNAME= xdvik-${VERSION_XDVIK}
diff --git a/java/avis/Makefile b/java/avis/Makefile
index d089329277e9..34066dd5fd7c 100644
--- a/java/avis/Makefile
+++ b/java/avis/Makefile
@@ -9,8 +9,7 @@ PORTNAME= avis
PORTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= java net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= avis
+MASTER_SITES= SF/${PORTNAME}/Avis%20router/Release%20${PORTVERSION}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= benjsc@FreeBSD.org
diff --git a/java/commonclipse/Makefile b/java/commonclipse/Makefile
index 155fa16fba8a..5438e1b3dc27 100644
--- a/java/commonclipse/Makefile
+++ b/java/commonclipse/Makefile
@@ -9,8 +9,7 @@ PORTNAME= commonclipse
PORTVERSION= 1.3.0
PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= commonclipse
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}%20for%20eclipse%203.1M6%20and%20up
DISTNAME= net.sf.commonclipse_${PORTVERSION}
DIST_SUBDIR= eclipse
diff --git a/java/eclipse-EPIC/Makefile b/java/eclipse-EPIC/Makefile
index a36041fe99f9..ee5ef495e8f1 100644
--- a/java/eclipse-EPIC/Makefile
+++ b/java/eclipse-EPIC/Makefile
@@ -9,8 +9,7 @@ PORTNAME= EPIC
PORTVERSION= 0.6.13
PORTREVISION= 1
CATEGORIES= java editors devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= e-p-i-c
+MASTER_SITES= SF/e-p-i-c/e-p-i-c/${PORTNAME}%20${PORTVERSION}
PKGNAMEPREFIX= eclipse-
DISTNAME= ${EPIC}_${PORTVERSION}_20070808
diff --git a/java/eclipse-RDT/Makefile b/java/eclipse-RDT/Makefile
index 3b503765ec12..0890e9590e6a 100644
--- a/java/eclipse-RDT/Makefile
+++ b/java/eclipse-RDT/Makefile
@@ -9,8 +9,7 @@ PORTNAME= RDT
PORTVERSION= 0.9.1
PORTREVISION= 1
CATEGORIES= java editors devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= rubyeclipse
+MASTER_SITES= SF/rubyeclipse/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
PKGNAMEPREFIX= eclipse-
DISTNAME= ${RDT}-${RDTVERSION}
diff --git a/java/eclipse-checkstyle/Makefile b/java/eclipse-checkstyle/Makefile
index bb4e71f8250c..f21a6d3f3de1 100644
--- a/java/eclipse-checkstyle/Makefile
+++ b/java/eclipse-checkstyle/Makefile
@@ -9,8 +9,7 @@ PORTNAME= checkstyle
PORTVERSION= 3.4.1.0
PORTREVISION= 4
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= eclipse-cs
+MASTER_SITES= SF/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/v3.4.1
PKGNAMEPREFIX= eclipse-
DISTNAME= com.atlassw.tools.eclipse.checkstyle_${PORTVERSION}
DIST_SUBDIR= eclipse
diff --git a/java/eclipse-drjava/Makefile b/java/eclipse-drjava/Makefile
index 2726c5ce69d3..7e62ed956ec7 100644
--- a/java/eclipse-drjava/Makefile
+++ b/java/eclipse-drjava/Makefile
@@ -9,8 +9,7 @@ PORTNAME= drjava
PORTVERSION= 0.9.8
PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= drjava
+MASTER_SITES= SF/${PORTNAME}/3.%20DrJava%20Eclipse%20Plug-in/${PORTNAME}-eclipse-${PORTVERSION}
PKGNAMEPREFIX= eclipse-
DISTNAME= drjava-eclipse-${PORTVERSION}
diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile
index 03dfdc7e86df..a283ac7beebd 100644
--- a/java/eclipse-findbugs/Makefile
+++ b/java/eclipse-findbugs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= findbugs
DISTVERSION= 1.3.2.20080222
PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20eclipse%20plugin/1.3.2
PKGNAMEPREFIX= eclipse-
DISTNAME= edu.umd.cs.findbugs.plugin.eclipse_${DISTVERSION}
DIST_SUBDIR= eclipse
diff --git a/java/eclipse-hibernatetools/Makefile b/java/eclipse-hibernatetools/Makefile
index 675d6d2b8f91..5f5d10d6131f 100644
--- a/java/eclipse-hibernatetools/Makefile
+++ b/java/eclipse-hibernatetools/Makefile
@@ -8,8 +8,7 @@
PORTNAME= hibernatetools
DISTVERSION= 3.2.3.GA
CATEGORIES= java devel databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jboss
+MASTER_SITES= SF/jboss/JBossTools/JBossTools%202.1.2.GA
PKGNAMEPREFIX= eclipse-
DISTNAME= HibernateTools-${DISTVERSION}
DIST_SUBDIR= eclipse
diff --git a/java/eclipse-jad/Makefile b/java/eclipse-jad/Makefile
index b7d6404dd96e..3d53ed6b86e5 100644
--- a/java/eclipse-jad/Makefile
+++ b/java/eclipse-jad/Makefile
@@ -8,8 +8,7 @@
PORTNAME= jad
PORTVERSION= 3.3.0
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jadclipse
+MASTER_SITES= SF/${PORTNAME}clipse/${PORTNAME}clipse3.3/${PORTVERSION}%20%28for%20Eclipse%20_%3D3.3M6%29
PKGNAMEPREFIX= eclipse-
DISTNAME= net.sf.jadclipse_${PORTVERSION}
EXTRACT_SUFX= .jar
diff --git a/java/eclipse-pmd/Makefile b/java/eclipse-pmd/Makefile
index 5d1360ad673b..70ee5fcc6507 100644
--- a/java/eclipse-pmd/Makefile
+++ b/java/eclipse-pmd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pmd
PORTVERSION= 2.0.5.v3
PORTREVISION= 4
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pmd
+MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMEPREFIX= eclipse-
DISTNAME= pmd-eclipse3-site-2.0.5
DIST_SUBDIR= eclipse
diff --git a/java/eclipse-pydev/Makefile b/java/eclipse-pydev/Makefile
index 681a8966e69c..d4f1f8018d2f 100644
--- a/java/eclipse-pydev/Makefile
+++ b/java/eclipse-pydev/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pydev
PORTVERSION= 1.4.7.2843
PORTREVISION= 0
CATEGORIES= java devel python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Pydev%201.4.7
PKGNAMEPREFIX= eclipse-
DISTFILES= org.python.pydev.feature-${PORTVERSION}.zip
diff --git a/java/eclipse-quantum/Makefile b/java/eclipse-quantum/Makefile
index ff3bb95fe9aa..b7a8ea1e7013 100644
--- a/java/eclipse-quantum/Makefile
+++ b/java/eclipse-quantum/Makefile
@@ -9,8 +9,7 @@ PORTNAME= quantum
PORTVERSION= 3.0.1
PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= quantum
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-plugin/${PORTVERSION}
PKGNAMEPREFIX= eclipse-
DISTNAME= com.quantum.feature_${PORTVERSION}.bin.dist
DIST_SUBDIR= eclipse
diff --git a/java/eclipse-shelled/Makefile b/java/eclipse-shelled/Makefile
index 16cb9feb19ba..b12e857d7b77 100644
--- a/java/eclipse-shelled/Makefile
+++ b/java/eclipse-shelled/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ShellEd
PORTVERSION= 1.0.2a
PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= shelled
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/1.0.2
PKGNAMEPREFIX= eclipse-
DISTNAME= shelled_${PORTVERSION}
DIST_SUBDIR= eclipse
diff --git a/java/eclipse-sqlexplorer/Makefile b/java/eclipse-sqlexplorer/Makefile
index 8e10c8a3491b..e3a8d9fdd1c1 100644
--- a/java/eclipse-sqlexplorer/Makefile
+++ b/java/eclipse-sqlexplorer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sqlexplorer
PORTVERSION= 2.2.4
PORTREVISION= 3
CATEGORIES= java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= eclipsesql
+MASTER_SITES= SF/eclipsesql/SQL%20Explorer%20Plugin/${PORTVERSION}
PKGNAMEPREFIX= eclipse-
DISTNAME= net.sourceforge.${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .zip
diff --git a/java/eclipse-v4all/Makefile b/java/eclipse-v4all/Makefile
index cc9f78ad2e56..24a743bbff4c 100644
--- a/java/eclipse-v4all/Makefile
+++ b/java/eclipse-v4all/Makefile
@@ -9,8 +9,7 @@ PORTNAME= v4all
PORTVERSION= 2.1.1.9
PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= v4all
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_2_1_1_9
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
MAINTAINER= wes@freebsd.org
diff --git a/java/eclipseme/Makefile b/java/eclipseme/Makefile
index 685c7d5a74e4..18cef4102f18 100644
--- a/java/eclipseme/Makefile
+++ b/java/eclipseme/Makefile
@@ -9,7 +9,7 @@ PORTNAME= eclipseme
PORTVERSION= 0.4.6
PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= eclipse
diff --git a/java/jamvm/Makefile b/java/jamvm/Makefile
index 21916f43f181..14fd57b5b2d9 100644
--- a/java/jamvm/Makefile
+++ b/java/jamvm/Makefile
@@ -8,7 +8,7 @@ PORTNAME= jamvm
PORTVERSION= 1.5.1
PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION}
MAINTAINER= bkoenig@alpha-tierchen.de
COMMENT= A compact Java virtual machine
diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile
index baf90d3f98e7..6fd85c9b3b84 100644
--- a/java/jasmin/Makefile
+++ b/java/jasmin/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 2.3
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= java lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Java Assembler Interface
diff --git a/java/jaxen/Makefile b/java/jaxen/Makefile
index c5889e2047b2..b7cc0c25cbc1 100644
--- a/java/jaxen/Makefile
+++ b/java/jaxen/Makefile
@@ -8,8 +8,7 @@ PORTNAME= jaxen
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= java textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1-0-FCS
DISTNAME= ${PORTNAME}-${PORTVERSION}-FCS
MAINTAINER= hq@FreeBSD.org
diff --git a/java/jboss2/Makefile b/java/jboss2/Makefile
index 4ccf88f02858..0bc32631f3c4 100644
--- a/java/jboss2/Makefile
+++ b/java/jboss2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ${APP_TITLE:L}
PORTVERSION= 2.4.11
PORTREVISION= 3
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${APP_TITLE}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/java/jboss3/Makefile b/java/jboss3/Makefile
index 776d8fa31268..4355c4948987 100644
--- a/java/jboss3/Makefile
+++ b/java/jboss3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ${APP_TITLE:L}
PORTVERSION= 3.2.8.SP1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/JBoss/JBoss-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= jonc@chen.org.nz
diff --git a/java/jboss4/Makefile b/java/jboss4/Makefile
index 727d77d5b64b..4fd1e78ee3df 100644
--- a/java/jboss4/Makefile
+++ b/java/jboss4/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ${APP_TITLE:L}
PORTVERSION= 4.2.3.GA
PORTEPOCH= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/JBoss/JBoss-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile
index 7b63181a7e03..f4e9e2ae4fc8 100644
--- a/java/jboss5/Makefile
+++ b/java/jboss5/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 5.0.0.GA
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/JBoss/JBoss-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/java/jc/Makefile b/java/jc/Makefile
index 0b5f4833791b..4bd8df45e4b3 100644
--- a/java/jc/Makefile
+++ b/java/jc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jc
PORTVERSION= 1.4.7
PORTREVISION= 4
CATEGORIES= java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=jcvm/
+MASTER_SITES= SF/${PORTNAME}vm/JC%20source%20distribution/Release%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= JVM that converts class files to C source and compiles them with GCC
diff --git a/java/jcckit/Makefile b/java/jcckit/Makefile
index 4a0f4bcd29ee..1e32de6db699 100644
--- a/java/jcckit/Makefile
+++ b/java/jcckit/Makefile
@@ -10,8 +10,7 @@ PORTNAME= jcckit
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= java graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JCCKit%20${PORTVERSION}
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile
index bde8b956ee6a..04f20e767173 100644
--- a/java/jcommon/Makefile
+++ b/java/jcommon/Makefile
@@ -9,8 +9,7 @@
PORTNAME= jcommon
PORTVERSION= 1.0.16
CATEGORIES= java devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= jfreechart
+MASTER_SITES= SF/jfreechart/3.%20JCommon/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A collection of useful classes used by JFreeChart and JFreeReport
diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile
index a36cb89c1ada..82930e476d68 100644
--- a/java/jfreechart/Makefile
+++ b/java/jfreechart/Makefile
@@ -9,7 +9,7 @@
PORTNAME= jfreechart
PORTVERSION= 1.0.10
CATEGORIES= java graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/1.%20JFreeChart/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A free Java class library for generating charts
diff --git a/java/jgrapht/Makefile b/java/jgrapht/Makefile
index 5ac366cc6293..50d9640f4cc1 100644
--- a/java/jgrapht/Makefile
+++ b/java/jgrapht/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jgrapht
PORTVERSION= 0.7.3
PORTREVISION= 1
CATEGORIES= java math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/JGraphT/Version%20${PORTVERSION}
MAINTAINER= hq@FreeBSD.org
COMMENT= Java package for mathematical graph-theory objects and algorithms
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index 58fdee628199..1077e5d6e819 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jikes
PORTVERSION= 1.22
PORTREVISION= 1
CATEGORIES= java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=jikes/
+MASTER_SITES= SF/${PORTNAME}/Jikes/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A very fast Java source to byte-code compiler made available by IBM
diff --git a/java/jlint/Makefile b/java/jlint/Makefile
index f7718eda2c2a..184662b814c0 100644
--- a/java/jlint/Makefile
+++ b/java/jlint/Makefile
@@ -8,8 +8,7 @@
PORTNAME= jlint
PORTVERSION= 3.1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Java program analyzer and checker
diff --git a/java/jode/Makefile b/java/jode/Makefile
index 4d5c30dc0f43..e385f4f97e22 100644
--- a/java/jode/Makefile
+++ b/java/jode/Makefile
@@ -8,8 +8,7 @@ PORTNAME= jode
PORTVERSION= 1.1.1.1
PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1.2-pre1
DISTNAME= ${PORTNAME}-${VENDOR_VERSION}
MAINTAINER= mi@aldan.algebra.com
diff --git a/java/jump/Makefile b/java/jump/Makefile
index 0b3690e4800c..965695a489f1 100644
--- a/java/jump/Makefile
+++ b/java/jump/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jump
PORTVERSION= 0.5
PORTREVISION= 2
CATEGORIES= java math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jump-math
+MASTER_SITES= SF/${PORTNAME}-math/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Java library for arbitrary precision computations
diff --git a/java/mx4j/Makefile b/java/mx4j/Makefile
index 909ae16c9e4c..4d9fa32b7f03 100644
--- a/java/mx4j/Makefile
+++ b/java/mx4j/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mx4j
PORTVERSION= 3.0.2
PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/MX4J%20Binary/${PORTVERSION}
MAINTAINER= simon@olofsson.de
COMMENT= Open Source implementation of the Java Management Extensions (JMX)
diff --git a/java/phpeclipse/Makefile b/java/phpeclipse/Makefile
index 3fd0af312e4b..eb48582ece93 100644
--- a/java/phpeclipse/Makefile
+++ b/java/phpeclipse/Makefile
@@ -8,7 +8,7 @@
PORTNAME= phpeclipse
PORTVERSION= 1.2.1
CATEGORIES= java editors devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/a%29%20Eclipse%203.3.x/PHPEclipse-${PORTVERSION}
DISTNAME= PHPEclipse_${PORTVERSION}_src
MAINTAINER= kamikaze@bsdforen.de
diff --git a/java/sablevm-classpath/Makefile b/java/sablevm-classpath/Makefile
index 9c04c161650a..2dcd9e7dc123 100644
--- a/java/sablevm-classpath/Makefile
+++ b/java/sablevm-classpath/Makefile
@@ -10,8 +10,7 @@ PORTNAME= sablevm-classpath
PORTVERSION= 1.13
PORTREVISION= 6
CATEGORIES= java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sablevm
+MASTER_SITES= SF/sablevm/sablevm/${PORTVERSION}
MAINTAINER= bkoenig@alpha-tierchen.de
COMMENT= Classpath of SableVM
diff --git a/java/springframework/Makefile b/java/springframework/Makefile
index 58d906d6b8c0..9a90fe9e8b5a 100644
--- a/java/springframework/Makefile
+++ b/java/springframework/Makefile
@@ -7,7 +7,7 @@
PORTNAME= springframework
PORTVERSION= 2.5.5
CATEGORIES= java devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-2/${PORTVERSION}
DISTNAME= spring-framework-${PORTVERSION}-with-dependencies
MAINTAINER= gerrit.beine@gmx.de
diff --git a/java/veditor/Makefile b/java/veditor/Makefile
index ddc7b7ff2d34..992344f42357 100644
--- a/java/veditor/Makefile
+++ b/java/veditor/Makefile
@@ -8,7 +8,7 @@
PORTNAME= veditor
PORTVERSION= 0.6.3
CATEGORIES= java cad
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20runtime/VEditor%20${PORTVERSION}
DISTNAME= net.sourceforge.${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/java/xdoclet/Makefile b/java/xdoclet/Makefile
index 86bd70de8242..d68e508d45f3 100644
--- a/java/xdoclet/Makefile
+++ b/java/xdoclet/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.2.3
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-bin-${PORTVERSION}
DISTFILES= ${DISTNAME}.zip xjavadoc-${XJAVADOC_VER}.zip
diff --git a/korean/gdick/Makefile b/korean/gdick/Makefile
index 9d10ebd856cb..133e4eb37803 100644
--- a/korean/gdick/Makefile
+++ b/korean/gdick/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gdick
PORTVERSION= 0.9.1
PORTREVISION= 12
CATEGORIES= korean python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gdick
+MASTER_SITES= SF
MAINTAINER= perky@FreeBSD.org
COMMENT= English-Korean Dictionary Client for GNOME2
diff --git a/korean/scim-hangul/Makefile b/korean/scim-hangul/Makefile
index 5b4672263ff7..e9a4919b7a35 100644
--- a/korean/scim-hangul/Makefile
+++ b/korean/scim-hangul/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scim-hangul
PORTVERSION= 0.3.1
PORTREVISION= 3
CATEGORIES= korean
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=scim
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
MAINTAINER= cjh@FreeBSD.org
COMMENT= SCIM IMEngine module for Korean(Hangul) input
diff --git a/korean/scim-tables/Makefile b/korean/scim-tables/Makefile
index 9c2f72996f28..d1835eb4ce21 100644
--- a/korean/scim-tables/Makefile
+++ b/korean/scim-tables/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scim-tables
PORTVERSION= 0.5.7
PORTREVISION= 3
CATEGORIES= korean
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=scim
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
MAINTAINER= lx@FreeBSD.org
COMMENT= SCIM table based Korean input methods
diff --git a/korean/stardict2-dict-kr/Makefile b/korean/stardict2-dict-kr/Makefile
index e2bbb4f4b1cc..bb5c5e341318 100644
--- a/korean/stardict2-dict-kr/Makefile
+++ b/korean/stardict2-dict-kr/Makefile
@@ -9,8 +9,7 @@ PORTNAME= stardict2-dict-kr
PORTVERSION= 2.4.2
PORTREVISION= 2
CATEGORIES= korean textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= stardict
+MASTER_SITES= SF/stardict/stardict-dictionaries-ko/${PORTVERSION}
DIST_SUBDIR= stardict
MAINTAINER= ports@FreeBSD.org
diff --git a/lang/asn1c/Makefile b/lang/asn1c/Makefile
index b36b88b51cc6..f28b8aa4572c 100644
--- a/lang/asn1c/Makefile
+++ b/lang/asn1c/Makefile
@@ -8,9 +8,9 @@
PORTNAME= asn1c
PORTVERSION= 0.9.21
CATEGORIES= lang converters security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://lionet.info/soft/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= vlm@lionet.info
COMMENT= Modern ASN.1 to C compiler
diff --git a/lang/bf2c/Makefile b/lang/bf2c/Makefile
index 61f1c39da440..6fa679decf38 100644
--- a/lang/bf2c/Makefile
+++ b/lang/bf2c/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bf2c
PORTVERSION= 1.2.3
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=bf2c
+MASTER_SITES= SF
MAINTAINER= rene@FreeBSD.org
COMMENT= Optimizing BrainF*ck to C compiler
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 525ee949ef8a..4274ed576427 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ecl
PORTVERSION= 0.9l
PORTREVISION= 1
CATEGORIES= lang lisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ecls
+MASTER_SITES= SF/${PORTNAME}s/${PORTNAME}s/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/lang/expect-devel/Makefile b/lang/expect-devel/Makefile
index 2b6fd726e43e..5d138aea2298 100644
--- a/lang/expect-devel/Makefile
+++ b/lang/expect-devel/Makefile
@@ -8,8 +8,7 @@ PORTNAME= expect
PORTVERSION= 5.44.1.11
PORTREVISION= 1
CATEGORIES= lang tcl tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wintcltk
+MASTER_SITES= SF/wintcltk/Sources/Package%20Sources
DISTNAME= expect-cvs-20081121
MAINTAINER= mm@FreeBSD.org
diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile
index 11d55ba74989..cd66bd37dca4 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ferite
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An embeddable scripting language
diff --git a/lang/ficl-devel/Makefile b/lang/ficl-devel/Makefile
index 7b942974c9fe..3081b78c37fd 100644
--- a/lang/ficl-devel/Makefile
+++ b/lang/ficl-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ficl
PORTVERSION= 4.0.31
PORTREVISION= 1
CATEGORIES= lang devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-all/${PORTNAME}${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= bms@FreeBSD.org
diff --git a/lang/ficl/Makefile b/lang/ficl/Makefile
index 7b942974c9fe..3081b78c37fd 100644
--- a/lang/ficl/Makefile
+++ b/lang/ficl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ficl
PORTVERSION= 4.0.31
PORTREVISION= 1
CATEGORIES= lang devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-all/${PORTNAME}${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= bms@FreeBSD.org
diff --git a/lang/gambas2-examples/Makefile b/lang/gambas2-examples/Makefile
index d094f0aa0244..6f9b9810f6c9 100644
--- a/lang/gambas2-examples/Makefile
+++ b/lang/gambas2-examples/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gambas2
PORTVERSION= 2.15.2
CATEGORIES= lang
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME:S/2//g}
+MASTER_SITES= SF/gambas/${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -examples
DISTNAME= ${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ${PORTNAME:S/2//g}
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index c18959359f87..28d59f9c2030 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gauche
PORTVERSION= 0.8.13 # Keep databases/gauche-gdbm in sync with this
PORTREVISION= 2
CATEGORIES= lang scheme
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Gauche/${PORTVERSION}
DISTNAME= Gauche-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/lang/gdc/Makefile b/lang/gdc/Makefile
index cf2478b0e3a5..3d1b6be9cdd5 100644
--- a/lang/gdc/Makefile
+++ b/lang/gdc/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.24
PORTREVISION= 6
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GCC} \
- ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/dgcc/g:S/$/:gdc/g}
+ SF/dgcc/${PORTNAME}/${PORTVERSION}:gdc
MASTER_SITE_SUBDIR= ${GCC_MASTER_SITE_SUBDIR}
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}:gdc \
gcc-core-${GCC_VERSIONSTRING}${EXTRACT_SUFX} \
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index ab0ce3ed494f..e63fdf487319 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -8,8 +8,7 @@
PORTNAME= harbour
PORTVERSION= 1.0.1
CATEGORIES= lang
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}-project
+MASTER_SITES= SF/${PORTNAME}-project/source/${PORTVERSION}
MAINTAINER= pgollucci@FreeBSD.org
COMMENT= An open source Clipper-compatible compiler
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 08519fd6e294..440b0f31aaa5 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= itcl
PORTVERSION= 3.3
PORTREVISION= 2
CATEGORIES= lang tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=incrtcl
+MASTER_SITES= SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/${PORTVERSION}-RC
DISTNAME= itcl${PORTVERSION}
MAINTAINER= erik@smluc.org
diff --git a/lang/jython/Makefile b/lang/jython/Makefile
index 4768f312a688..58e6c573c5d1 100644
--- a/lang/jython/Makefile
+++ b/lang/jython/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jython
PORTVERSION= 2.2
PORTREVISION= 1
CATEGORIES= lang python java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= jython_installer-${PORTVERSION}
EXTRACT_SUFX= .jar
EXTRACT_ONLY= # none
diff --git a/lang/libhx/Makefile b/lang/libhx/Makefile
index 299da1684521..9f0a1c042297 100644
--- a/lang/libhx/Makefile
+++ b/lang/libhx/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libHX
PORTVERSION= 2.8
CATEGORIES= lang
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= libhx
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= scjamorim@bsd.com.br
COMMENT= Library C with some additional C++ bindings available
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 172fabdb83bf..3c35a6513f2c 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -10,7 +10,6 @@ PORTVERSION= 0.90.0
PORTREVISION= 1
CATEGORIES= lang elisp gnome
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= librep
MAINTAINER= anray@FreeBSD.org
COMMENT= An Emacs Lisp like runtime library
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 10028eaa4902..42350ff91278 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -10,12 +10,8 @@ PORTNAME= mdk
PORTVERSION= 1.2.1
PORTREVISION= 8
CATEGORIES= lang gnome
-MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gnu/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/v${PORTVERSION}/:gnu \
- ${PORTNAME}/:sf
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:gnu \
- ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf
+MASTER_SITES= ${MASTER_SITE_GNU:S/%SUBDIR%/${PORTNAME}\/v${PORTVERSION}/} \
+ SF
MAINTAINER= stas@FreeBSD.org
COMMENT= A set of utilities for developing programs using MIX and MIXAL
diff --git a/lang/nbc/Makefile b/lang/nbc/Makefile
index 5008346596ed..959938a08a7f 100644
--- a/lang/nbc/Makefile
+++ b/lang/nbc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nbc
PORTVERSION= 1.0.1.b32
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bricxcc
+MASTER_SITES= SF/bricxcc/NBC_NXC/NBC%20beta%2032
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
EXTRACT_SUFX= .tgz
diff --git a/lang/nwcc/Makefile b/lang/nwcc/Makefile
index 70bb25f03e2a..0d2538fa293d 100644
--- a/lang/nwcc/Makefile
+++ b/lang/nwcc/Makefile
@@ -10,8 +10,7 @@ PORTNAME= nwcc
PORTVERSION= 0.7.5
PORTREVISION?= 0
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index 5dac07fe06a8..429e144c6f76 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -8,8 +8,7 @@ PORTNAME= oo2c
PORTVERSION= 2.1.10
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ooc
+MASTER_SITES= SF/ooc/ooc2/${PORTVERSION}
DISTNAME= ${PORTNAME}_32-${PORTVERSION}
MAINTAINER= ob@breuninger.org
diff --git a/lang/osb-jscore/Makefile b/lang/osb-jscore/Makefile
index 164c5da51643..ea83ea274a76 100644
--- a/lang/osb-jscore/Makefile
+++ b/lang/osb-jscore/Makefile
@@ -9,8 +9,7 @@ PORTNAME= osb-jscore
PORTVERSION= 0.5.2
PORTREVISION= 3
CATEGORIES= lang www java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtk-webcore
+MASTER_SITES= SF/gtk-webcore/gtk-webcore/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gtk+ WebCore JavaScript interpreter
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 28c9cbf8dbde..8e30e08fcfd7 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.13
PORTREVISION= 3
DISTVERSIONPREFIX= src-
CATEGORIES= lang tcl tk
-MASTER_SITES= SF/otcl-tclcl
+MASTER_SITES= SF/${PORTNAME}-tclcl/OTcl/${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= MIT Object Tcl
diff --git a/lang/php-mode.el/Makefile b/lang/php-mode.el/Makefile
index b703fbd7ae79..0f9e3ddeed45 100644
--- a/lang/php-mode.el/Makefile
+++ b/lang/php-mode.el/Makefile
@@ -8,8 +8,7 @@
PORTNAME= php-mode.el
PORTVERSION= 1.5.0
CATEGORIES= lang elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=php-mode
+MASTER_SITES= SF/php-mode/php-mode/${PORTVERSION}
DISTNAME= ${PORTNAME:S/.el$//}-${PORTVERSION}
MAINTAINER= knu@FreeBSD.org
diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile
index a35e9712b249..68d110136c8e 100644
--- a/lang/polyml/Makefile
+++ b/lang/polyml/Makefile
@@ -8,8 +8,7 @@
PORTNAME= polyml
PORTVERSION= 5.2
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}.${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
diff --git a/lang/py-prolog/Makefile b/lang/py-prolog/Makefile
index b509a93f82d9..694dc2614e77 100644
--- a/lang/py-prolog/Makefile
+++ b/lang/py-prolog/Makefile
@@ -9,8 +9,7 @@ PORTVERSION= 0.1
PORTREVISION= 1
PORTREVSION= 1
CATEGORIES= lang python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyprolog
+MASTER_SITES= SF/py${PORTNAME}/PyProlog/PyProlog-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyProlog-${PORTVERSION}
diff --git a/lang/python-mode.el/Makefile b/lang/python-mode.el/Makefile
index e0250afe52ec..6c750f7aea92 100644
--- a/lang/python-mode.el/Makefile
+++ b/lang/python-mode.el/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= lang elisp python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=python-mode
+MASTER_SITES= SF/python-mode/OldFiles
DISTNAME= python-mode-${PORTVERSION}
MAINTAINER= saturnero@gufi.org
diff --git a/lang/q/Makefile b/lang/q/Makefile
index 81ca500551c3..428e78b9f964 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -9,7 +9,7 @@ PORTNAME= q
PORTVERSION= 7.11
PORTREVISION= 2
CATEGORIES= lang
-MASTER_SITES= SF/q-lang
+MASTER_SITES= SF/${PORTNAME}-lang/${PORTNAME}/${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= Q -- equational programming language
diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile
index 343c9397168b..6bb9f34418b8 100644
--- a/lang/rexx-regina/Makefile
+++ b/lang/rexx-regina/Makefile
@@ -10,8 +10,7 @@ PORTNAME= regina
PORTVERSION= 3.3
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}-rexx
+MASTER_SITES= SF/${PORTNAME}-rexx/${PORTNAME}-rexx/${PORTVERSION}
PKGNAMEPREFIX= rexx-
DISTNAME= Regina-REXX-${PORTVERSION}
diff --git a/lang/rexx-wrapper/Makefile b/lang/rexx-wrapper/Makefile
index 5c110a506517..e080a276f5fe 100644
--- a/lang/rexx-wrapper/Makefile
+++ b/lang/rexx-wrapper/Makefile
@@ -9,8 +9,7 @@
PORTNAME= wrapper
PORTVERSION= 2.4
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rexx${PORTNAME}
+MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= rexx-
DISTNAME= RexxWrapper-${PORTVERSION}
diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile
index 58e214d9f810..9fefae27cf3d 100644
--- a/lang/seed7/Makefile
+++ b/lang/seed7/Makefile
@@ -8,7 +8,7 @@
PORTNAME= seed7
DISTVERSION= 05_20090705
CATEGORIES= lang
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_05_20090705.tgz
DISTNAME= ${PORTNAME}_${DISTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index a46fc785f4d7..b548b6a0e22d 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -11,8 +11,9 @@ PORTREVISION= 3
CATEGORIES= lang
MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/release/110.0.7/ \
ftp://flint.cs.yale.edu/pub/smlnj/release/110.0.7/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
+ SF/${PORTNAME}/${PORTNAME}-release/${PORTVERSION}
+
DISTFILES= bin.x86-unix.tar.Z cm.tar.Z cml.tar.Z \
config.tar.Z eXene.tar.Z \
ml-burg.tar.Z ml-lex.tar.Z \
diff --git a/lang/squirrel/Makefile b/lang/squirrel/Makefile
index 5c6af82dc845..1238fd8c2165 100644
--- a/lang/squirrel/Makefile
+++ b/lang/squirrel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= squirrel
PORTVERSION= 2.2.3
CATEGORIES= lang
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTNAME}%20${PORTVERSION}%20stable
DISTNAME= ${PORTNAME}_${DISTVERSION}_stable
MAINTAINER= ports@FreeBSD.org
diff --git a/lang/tcl-manual/Makefile b/lang/tcl-manual/Makefile
index d26a8e5f1112..9e42ba47fe96 100644
--- a/lang/tcl-manual/Makefile
+++ b/lang/tcl-manual/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tcl-manual
PORTVERSION= 20041118
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/tcl/Tcl/8.3.5
DISTFILES= tcl8.3.5-html.tar.gz tcl8.4.7-html.tar.gz tcl8.5a1-html.tar.gz
MAINTAINER= edwin@mavetju.org
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 5df404581019..a337243db424 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tcl
PORTVERSION= 8.3.5
PORTREVISION= 8
CATEGORIES= lang tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/${PORTNAME}/Tcl/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
MAINTAINER= dinoex@FreeBSD.org
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 5f53a0e37ae1..18ac7ebfd040 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 8.4.19
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= lang tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index 5ef9cc38deda..10f39585c208 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -9,8 +9,7 @@ PORTNAME?= tcl
PORTVERSION= 8.5.7
PORTREVISION?= 1
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
DISTNAME= tcl${PORTVERSION}-src
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 35155995a23e..982ec18312be 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tcl
PORTVERSION= 8.6.b.1
PORTREVISION= 4
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/tcl/Tcl/8.6b1
PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.b.1/b1/}-src
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index bd3a2ed2ea47..d0a98186c5cb 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tclX
PORTVERSION= 8.4
PORTREVISION= 2
CATEGORIES= lang tcl devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tclx
+MASTER_SITES= SF/${PORTNAME:L}/TclX/${PORTVERSION}.0
DISTNAME= tclx${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
diff --git a/lang/ucc/Makefile b/lang/ucc/Makefile
index 559c27bdbb99..667c6dd02b02 100644
--- a/lang/ucc/Makefile
+++ b/lang/ucc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ucc
PORTVERSION= 1.6.0
CATEGORIES= lang
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ucc160
MAINTAINER= wenheping@gmail.com
diff --git a/lang/xsb/Makefile b/lang/xsb/Makefile
index fa1b276edf8f..696cd7ff6af1 100644
--- a/lang/xsb/Makefile
+++ b/lang/xsb/Makefile
@@ -9,7 +9,7 @@ PORTNAME= XSB
PORTVERSION= 2.6
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= SF/${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}%20%28Duff%29
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g}
MAINTAINER= c.rued@xsb.com
diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index 213e38d22229..e894e8ccd02f 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -9,8 +9,7 @@ PORTNAME= yorick
PORTVERSION= 2.1.05
PORTREVISION= 1
CATEGORIES= lang math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= johans@stack.nl
diff --git a/russian/ircd-hybrid-ru/Makefile b/russian/ircd-hybrid-ru/Makefile
index d10f851b9e78..c12bd694a7d7 100644
--- a/russian/ircd-hybrid-ru/Makefile
+++ b/russian/ircd-hybrid-ru/Makefile
@@ -8,9 +8,9 @@
PORTNAME= ircd
PORTVERSION= 7.2.2
CATEGORIES= irc russian
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru-${PORTVERSION} \
ftp://rusunix.org/pub/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= ircd-hybrid-ru
+
PKGNAMESUFFIX= -hybrid-ru
DISTNAME= ircd-hybrid-ru-${PORTVERSION}
diff --git a/russian/ircd-hybrid/Makefile b/russian/ircd-hybrid/Makefile
index d10f851b9e78..c12bd694a7d7 100644
--- a/russian/ircd-hybrid/Makefile
+++ b/russian/ircd-hybrid/Makefile
@@ -8,9 +8,9 @@
PORTNAME= ircd
PORTVERSION= 7.2.2
CATEGORIES= irc russian
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru-${PORTVERSION} \
ftp://rusunix.org/pub/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= ircd-hybrid-ru
+
PKGNAMESUFFIX= -hybrid-ru
DISTNAME= ircd-hybrid-ru-${PORTVERSION}
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index dc57e1e674a5..0609fb2a328f 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -8,8 +8,8 @@
PORTNAME= hunspell
PORTVERSION= 1.2.8
CATEGORIES= hungarian textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S@$@:code@:S@%SUBDIR%@${PORTNAME}@} \
- ${MASTER_SITE_SOURCEFORGE:S@$@:data@:S@%SUBDIR%@magyarispell@}
+MASTER_SITES= SF/${PORTNAME}/Hunspell/${PORTVERSION}:code \
+ SF/magyarispell/Magyar%20Ispell/${DICTVERSION}:data
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:code \
hu_HU-${DICTVERSION}${EXTRACT_SUFX}:data