aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-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
40 files changed, 43 insertions, 75 deletions
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