aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--benchmarks/iperf/Makefile3
-rw-r--r--benchmarks/lmbench/Makefile2
-rw-r--r--benchmarks/sysbench/Makefile3
-rw-r--r--biology/avida/Makefile2
-rw-r--r--biology/libsbml/Makefile3
-rw-r--r--biology/mopac/Makefile3
-rw-r--r--biology/protomol/Makefile3
-rw-r--r--biology/pycogent/Makefile2
-rw-r--r--cad/adms/Makefile3
-rw-r--r--cad/atlc/Makefile3
-rw-r--r--cad/brlcad/Makefile2
-rw-r--r--cad/cascade/Makefile3
-rw-r--r--cad/fandango/Makefile3
-rw-r--r--cad/gdt/Makefile3
-rw-r--r--cad/gerbv/Makefile2
-rw-r--r--cad/gspiceui/Makefile3
-rw-r--r--cad/impact/Makefile3
-rw-r--r--cad/kicad-devel/Makefile2
-rw-r--r--cad/kicad/Makefile2
-rw-r--r--cad/ngspice_rework/Makefile3
-rw-r--r--cad/pcb/Makefile2
-rw-r--r--cad/pdnmesh/Makefile5
-rw-r--r--cad/qfsm/Makefile2
-rw-r--r--cad/qmls/Makefile3
-rw-r--r--cad/slffea/Makefile2
-rw-r--r--cad/tclspice/Makefile3
-rw-r--r--cad/tochnog/Makefile3
-rw-r--r--cad/varkon/Makefile3
-rw-r--r--cad/vipec/Makefile3
-rw-r--r--chinese/aterm/Makefile3
-rw-r--r--chinese/big5con/Makefile3
-rw-r--r--chinese/cce/Makefile3
-rw-r--r--chinese/miniChinput/Makefile2
-rw-r--r--chinese/oicq/Makefile3
-rw-r--r--chinese/oto/Makefile3
-rw-r--r--chinese/qterm/Makefile4
-rw-r--r--chinese/scim-fcitx/Makefile2
-rw-r--r--chinese/scim-pinyin/Makefile3
-rw-r--r--chinese/scim-tables/Makefile3
-rw-r--r--chinese/srecite/Makefile2
-rw-r--r--chinese/stardict-dict-zh_CN/Makefile3
-rw-r--r--chinese/stardict2-dict-zh_CN/Makefile3
-rw-r--r--chinese/ttf2pt1/Makefile3
-rw-r--r--chinese/xsim/Makefile2
-rw-r--r--chinese/zhcon/Makefile2
-rw-r--r--comms/aprsd/Makefile3
-rw-r--r--comms/bforce-kst/Makefile3
-rw-r--r--comms/echolinux/Makefile3
-rw-r--r--comms/efax-gtk/Makefile3
-rw-r--r--comms/gpredict/Makefile3
-rw-r--r--comms/grig/Makefile3
-rw-r--r--comms/gscmxx/Makefile3
-rw-r--r--comms/hamfax/Makefile2
-rw-r--r--comms/hamlib/Makefile3
-rw-r--r--comms/hf/Makefile3
-rw-r--r--comms/kpsk/Makefile3
-rw-r--r--comms/ktrack/Makefile3
-rw-r--r--comms/libticables/Makefile3
-rw-r--r--comms/libticables2/Makefile3
-rw-r--r--comms/libticalcs2/Makefile3
-rw-r--r--comms/linpsk/Makefile2
-rw-r--r--comms/lirc/Makefile3
-rw-r--r--comms/py-lirc/Makefile3
-rw-r--r--comms/py-serial/Makefile3
-rw-r--r--comms/qfaxreader/Makefile3
-rw-r--r--comms/qico/Makefile3
-rw-r--r--comms/scmxx/Makefile3
-rw-r--r--comms/syncterm/Makefile3
-rw-r--r--comms/thebridge/Makefile3
-rw-r--r--comms/tilp2/Makefile3
-rw-r--r--comms/trustedqsl/Makefile3
-rw-r--r--comms/uticom/Makefile3
-rw-r--r--comms/xastir/Makefile3
-rw-r--r--comms/zssh/Makefile3
-rw-r--r--converters/chmview/Makefile3
-rw-r--r--converters/fix-mime-charset/Makefile3
-rw-r--r--converters/libticonv/Makefile3
-rw-r--r--converters/mimelib/Makefile3
-rw-r--r--converters/tnef/Makefile3
-rw-r--r--converters/ytnef/Makefile3
80 files changed, 81 insertions, 145 deletions
diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
index 11f8d591ab47..72919a10e651 100644
--- a/benchmarks/iperf/Makefile
+++ b/benchmarks/iperf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= iperf
PORTVERSION= 2.0.4
CATEGORIES= benchmarks ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20source
MAINTAINER= mnag@FreeBSD.org
COMMENT= A tool to measure maximum TCP and UDP bandwidth
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index dfb7c87c2174..4a657f1b9810 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 3.0.a9
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= benchmarks
-MASTER_SITES= SF http://thegaul.org/src/
+MASTER_SITES= SF/${PORTNAME}/development/${PORTNAME}-3.0-a9 http://thegaul.org/src/
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.a9/-a9/}
EXTRACT_SUFX= .tgz
diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index 9b0fadef8827..e650d433a5f7 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sysbench
PORTVERSION= 0.4.12
CATEGORIES= benchmarks databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= kris@FreeBSD.org
COMMENT= A modular, cross-platform and multi-threaded benchmark tool
diff --git a/biology/avida/Makefile b/biology/avida/Makefile
index a3b395bfc2fe..637e8a3af5c5 100644
--- a/biology/avida/Makefile
+++ b/biology/avida/Makefile
@@ -9,7 +9,7 @@ PORTNAME= avida
PORTVERSION= 2.8.1
PORTREVISION= 1
CATEGORIES= biology
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/biology/libsbml/Makefile b/biology/libsbml/Makefile
index fa61cf8294e4..eb43da5ee376 100644
--- a/biology/libsbml/Makefile
+++ b/biology/libsbml/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libsbml
PORTVERSION= 3.3.2
CATEGORIES= biology devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sbml
+MASTER_SITES= SF/sbml/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= wenheping@gmail.com
diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index 693b8d5e0dad..fb34a039b7d1 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 7.${MOPAC_SUBVERSION}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= biology
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mopac7
+MASTER_SITES= SF/${PORTNAME}7/${PORTNAME}7/${PORTNAME}7-1.10
DISTNAME= mopac7-${MOPAC_SUBVERSION}
EXTRACT_SUFX= .tgz
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index 59447ad872e6..0936097f3ed9 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -8,8 +8,7 @@ PORTNAME= protomol
PORTVERSION= 2.0.3
PORTREVISION= 4
CATEGORIES= biology
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/ProtoMol/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-tar.gz
EXTRACT_SUFX= # nada
diff --git a/biology/pycogent/Makefile b/biology/pycogent/Makefile
index 4b8348554b0d..f02ab903b8ff 100644
--- a/biology/pycogent/Makefile
+++ b/biology/pycogent/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pycogent
PORTVERSION= 1.3.1
CATEGORIES= biology python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/PyCogent/${PORTVERSION}
DISTNAME= PyCogent-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/cad/adms/Makefile b/cad/adms/Makefile
index 858f89112572..8dc92789e808 100644
--- a/cad/adms/Makefile
+++ b/cad/adms/Makefile
@@ -10,8 +10,7 @@ PORTNAME= adms
PORTVERSION= 2.2.9
PORTREVISION= 0
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=mot-adms
+MASTER_SITES= SF/mot-${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= A model generator for SPICE simulators
diff --git a/cad/atlc/Makefile b/cad/atlc/Makefile
index aed2a1a6ebef..4ab658888173 100644
--- a/cad/atlc/Makefile
+++ b/cad/atlc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= atlc
PORTVERSION= 4.6.0
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/atlc/}
-DISTNAME= ${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool to calculate the impedance of transmission lines
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index d2f260fe9602..bcf1874937ab 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -9,7 +9,7 @@ PORTNAME= brlcad
PORTVERSION= 7.12.6
PORTREVISION= 1
CATEGORIES= cad
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION}
MAINTAINER= erik@smluc.org
COMMENT= CSG modelling system from the US Ballistic Research Laboratory
diff --git a/cad/cascade/Makefile b/cad/cascade/Makefile
index fe32674cd641..0a5d71bec05b 100644
--- a/cad/cascade/Makefile
+++ b/cad/cascade/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cascade
PORTVERSION= 1.4
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/rfcascade/}
-DISTNAME= ${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/rfcascade/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple tool to analyze noise and distortion of a RF system
diff --git a/cad/fandango/Makefile b/cad/fandango/Makefile
index c0a5b84bc706..b14510261e97 100644
--- a/cad/fandango/Makefile
+++ b/cad/fandango/Makefile
@@ -10,8 +10,7 @@ PORTNAME= fandango
PORTVERSION= 0.2.6.1
PORTREVISION= 3
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= elcad
+MASTER_SITES= SF/elcad/${PORTNAME}/${PORTVERSION}%20%28builds-in-Gutsy%29
DISTNAME= k${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/gdt/Makefile b/cad/gdt/Makefile
index 160eaff05fe7..3806959b86f4 100644
--- a/cad/gdt/Makefile
+++ b/cad/gdt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gdt
PORTVERSION= 3.0.2
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gds2
+MASTER_SITES= SF/gds2/gds2/GDT-${PORTVERSION}
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 4e8dcc14beb2..7e32e950d5e2 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gerbv
PORTVERSION= 2.2.0
PORTREVISION= 1
CATEGORIES= cad
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Free Gerber Viewer
diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index a51f78b2695d..cc9338f50664 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gspiceui
PORTVERSION= 0.9.65
PORTREVISION= 2
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${PORTVERSION}
DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
diff --git a/cad/impact/Makefile b/cad/impact/Makefile
index eb5df32e02e5..cc6bba60a26a 100644
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@@ -10,8 +10,7 @@ PORTNAME= impact
PORTVERSION= 0.7.5
PORTREVISION= 1
CATEGORIES= cad java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
DISTNAME= Impact-${PORTVERSION}
MAINTAINER= araujo@FreeBSD.org
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 241978f558c9..5498375fb987 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -15,7 +15,7 @@ CATEGORIES= cad
# ftp://iut-tice.ujf-grenoble.fr/cao/:src \
# ftp://ftp.lis.inpg.fr/uploads/kicad/:src \
# http://iut-tice.ujf-grenoble.fr/cao/:src
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20src/${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}-library-${LIBVERSION}${EXTRACT_SUFX} \
${PORTNAME}-doc-${LIBVERSION}${EXTRACT_SUFX}
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 241978f558c9..5498375fb987 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -15,7 +15,7 @@ CATEGORIES= cad
# ftp://iut-tice.ujf-grenoble.fr/cao/:src \
# ftp://ftp.lis.inpg.fr/uploads/kicad/:src \
# http://iut-tice.ujf-grenoble.fr/cao/:src
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20src/${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}-library-${LIBVERSION}${EXTRACT_SUFX} \
${PORTNAME}-doc-${LIBVERSION}${EXTRACT_SUFX}
diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
index 32482e3c59b0..228b72258001 100644
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ngspice_rework
PORTVERSION= 18
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ngspice
+MASTER_SITES= SF/ngspice/ng-spice-rework/${PORTVERSION}
DISTNAME= ng-spice-rework-${PORTVERSION}
MAINTAINER= amakawa@jp.FreeBSD.org
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 456fdd7fbe48..25e4f19f6dae 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pcb
PORTVERSION= 20081128
PORTREVISION= 1
CATEGORIES= cad
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= X11 interactive printed circuit board layout system
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index b85e62c12edb..b7173da9fe97 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -9,10 +9,7 @@ PORTNAME= pdnmesh
PORTVERSION= 0.2.1
PORTREVISION= 7
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
- ${MASTER_SITE_SUNSITE:S/$/:sun/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:sf science/visualization/:sun
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf,sun
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
MAINTAINER= sarod@users.sf.net
COMMENT= A finite element program
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index a89fe30d2bb8..47d9fc998849 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -10,7 +10,7 @@ PORTNAME= qfsm
PORTVERSION= 0.51.0
PORTREVISION= 1
CATEGORIES= cad
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.51
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/qmls/Makefile b/cad/qmls/Makefile
index aa37152858a3..a7c512606383 100644
--- a/cad/qmls/Makefile
+++ b/cad/qmls/Makefile
@@ -9,8 +9,7 @@
PORTNAME= qmls
PORTVERSION= 0.2
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Quine-McCluskey Logic Simplifier
diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile
index 554ed1cc6225..ea896c25debe 100644
--- a/cad/slffea/Makefile
+++ b/cad/slffea/Makefile
@@ -10,7 +10,7 @@ PORTNAME= slffea
PORTVERSION= 1.3
PORTREVISION= 5
CATEGORIES= cad
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/SLFFEA/${PORTVERSION}
DISTNAME= ${PORTNAME}13
EXTRACT_SUFX= .tgz
diff --git a/cad/tclspice/Makefile b/cad/tclspice/Makefile
index 22a322a7b35b..cc97ffb4a571 100644
--- a/cad/tclspice/Makefile
+++ b/cad/tclspice/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tclspice
PORTVERSION= 0.2.18
PORTREVISION= 4
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tclspice
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ssedov@mbsd.msk.ru
COMMENT= Improved version on SPICE3 suite with TCL scripting features
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index 39c868c66849..3fc7c76b7a2a 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tochnog
PORTVERSION= 20010211
PORTREVISION= 5
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tochnog
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/feb11_2001
DISTNAME= ${PORTNAME}_feb11_2001
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/varkon/Makefile b/cad/varkon/Makefile
index 45a5d610a732..622869b00316 100644
--- a/cad/varkon/Makefile
+++ b/cad/varkon/Makefile
@@ -9,8 +9,7 @@ PORTNAME= varkon
PORTVERSION= 1.19D
PORTREVISION= 1
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Varkon_${PORTVERSION}
DISTNAME= Varkon_sources_${PORTVERSION}
DIST_SUBDIR= varkon
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 21542cf07be5..a650f412df18 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -10,8 +10,7 @@ PORTNAME= vipec
PORTVERSION= 3.2.0
PORTREVISION= 5
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/ViPEC/${PORTVERSION}
DISTNAME= ViPEC-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile
index 2f8ce0ccd598..caacf3b9fa88 100644
--- a/chinese/aterm/Makefile
+++ b/chinese/aterm/Makefile
@@ -8,8 +8,7 @@ PORTNAME= aterm
PORTVERSION= 0.4.2
PORTREVISION= 2
CATEGORIES= chinese x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= gugod@gugod.org
COMMENT= A color vt102 terminal emulator with transparency support
diff --git a/chinese/big5con/Makefile b/chinese/big5con/Makefile
index 068ae59c2ea3..c07351449ef8 100644
--- a/chinese/big5con/Makefile
+++ b/chinese/big5con/Makefile
@@ -8,8 +8,7 @@
PORTNAME= big5con
PORTVERSION= 0.92i
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Big5 Chinese console
diff --git a/chinese/cce/Makefile b/chinese/cce/Makefile
index cfd8f17426f6..44e674fd0104 100644
--- a/chinese/cce/Makefile
+++ b/chinese/cce/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cce
PORTVERSION= 0.51
PORTREVISION= 1
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cce2k
+MASTER_SITES= SF/${PORTNAME}2k/${PORTNAME}/Ver_${PORTVERSION}_02132004
DISTNAME= ${PORTNAME}-${PORTVERSION}-02132004-dist
EXTRACT_SUFX= .tgz
PATCH_SITES= http://www.chinatinco.com/freebsd/cce/ \
diff --git a/chinese/miniChinput/Makefile b/chinese/miniChinput/Makefile
index 5f1442a9aabf..ac8bc606728d 100644
--- a/chinese/miniChinput/Makefile
+++ b/chinese/miniChinput/Makefile
@@ -9,7 +9,7 @@ PORTNAME= miniChinput
PORTVERSION= 0.1.9
PORTREVISION= 3
CATEGORIES= chinese
-MASTER_SITES= SF/minichinput
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/0-1-9
MAINTAINER= ports@FreeBSD.org
COMMENT= A tiny version of Chinput
diff --git a/chinese/oicq/Makefile b/chinese/oicq/Makefile
index 3df31241f0ba..36b5f7ed8798 100644
--- a/chinese/oicq/Makefile
+++ b/chinese/oicq/Makefile
@@ -8,8 +8,7 @@
PORTNAME= oicq
PORTVERSION= 1.6
CATEGORIES= chinese net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= perl-oicq
+MASTER_SITES= SF/perl-${PORTNAME}/perl-${PORTNAME}/Net-OICQ-${PORTVERSION}
DISTNAME= Net-OICQ-${PORTVERSION}
MAINTAINER= bg1tpt@gmail.com
diff --git a/chinese/oto/Makefile b/chinese/oto/Makefile
index 63958e08dab3..fb37fcdfb7b4 100644
--- a/chinese/oto/Makefile
+++ b/chinese/oto/Makefile
@@ -8,8 +8,7 @@
PORTNAME= oto
PORTVERSION= 0.5
CATEGORIES= chinese print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Show you font info and add new 'name' and 'cmap' tables
diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
index 46ee00a1e7ba..24bcae24b451 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -9,9 +9,9 @@ PORTNAME= qterm
PORTVERSION= 0.4.1
PORTREVISION= 4
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://www.yuanjue.net/download/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
PKGNAMEPREFIX= zh-
MAINTAINER= ports@FreeBSD.org
diff --git a/chinese/scim-fcitx/Makefile b/chinese/scim-fcitx/Makefile
index c3197b1ffa11..3e831f9b774f 100644
--- a/chinese/scim-fcitx/Makefile
+++ b/chinese/scim-fcitx/Makefile
@@ -9,7 +9,7 @@ PORTNAME= scim
PORTVERSION= 3.1.1
PORTREVISION= 2
CATEGORIES= chinese
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-fcitx/${PORTVERSION}
PKGNAMESUFFIX= -fcitx
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index 70bee3c8485a..10e12820ab9c 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scim-pinyin
PORTVERSION= 0.5.91
PORTREVISION= 6
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=scim
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= SCIM Chinese Smart Pinyin input method
diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index f5f95c82c057..b5a68665eb09 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scim-tables
PORTVERSION= 0.5.7
PORTREVISION= 3
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=scim
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
MAINTAINER= lx@FreeBSD.org
COMMENT= SCIM table based Chinese input methods
diff --git a/chinese/srecite/Makefile b/chinese/srecite/Makefile
index 6cea4b9bce72..e9c2416419c6 100644
--- a/chinese/srecite/Makefile
+++ b/chinese/srecite/Makefile
@@ -9,7 +9,7 @@ PORTNAME= srecite
PORTVERSION= 0.6.2
PORTREVISION= 8
CATEGORIES= chinese textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SRecite-${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
wordbooks-utf8.tar.gz
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/chinese/stardict-dict-zh_CN/Makefile b/chinese/stardict-dict-zh_CN/Makefile
index 8130836a5c03..3e2c9c2d1e81 100644
--- a/chinese/stardict-dict-zh_CN/Makefile
+++ b/chinese/stardict-dict-zh_CN/Makefile
@@ -8,8 +8,7 @@ PORTNAME= stardict2-dict-zh_CN
PORTVERSION= 2.4.2
PORTREVISION= 8
CATEGORIES= chinese textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= stardict
+MASTER_SITES= SF/stardict/stardict-dictionaries-zh_CN/${PORTVERSION}
DISTFILES= stardict-cdict-gb-${PORTVERSION}.tar.bz2 \
stardict-cedict-gb-${PORTVERSION}.tar.bz2 \
stardict-oxford-gb-${PORTVERSION}.tar.bz2 \
diff --git a/chinese/stardict2-dict-zh_CN/Makefile b/chinese/stardict2-dict-zh_CN/Makefile
index 8130836a5c03..3e2c9c2d1e81 100644
--- a/chinese/stardict2-dict-zh_CN/Makefile
+++ b/chinese/stardict2-dict-zh_CN/Makefile
@@ -8,8 +8,7 @@ PORTNAME= stardict2-dict-zh_CN
PORTVERSION= 2.4.2
PORTREVISION= 8
CATEGORIES= chinese textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= stardict
+MASTER_SITES= SF/stardict/stardict-dictionaries-zh_CN/${PORTVERSION}
DISTFILES= stardict-cdict-gb-${PORTVERSION}.tar.bz2 \
stardict-cedict-gb-${PORTVERSION}.tar.bz2 \
stardict-oxford-gb-${PORTVERSION}.tar.bz2 \
diff --git a/chinese/ttf2pt1/Makefile b/chinese/ttf2pt1/Makefile
index 030ff89cc093..67fcadba7129 100644
--- a/chinese/ttf2pt1/Makefile
+++ b/chinese/ttf2pt1/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ttf2pt1
PORTVERSION= 3.4.0
CATEGORIES= chinese print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-chinese/${PORTVERSION}
DISTNAME= ${PORTNAME}-chinese-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/chinese/xsim/Makefile b/chinese/xsim/Makefile
index e229a33c88cb..8e08bc8119f8 100644
--- a/chinese/xsim/Makefile
+++ b/chinese/xsim/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xsim
PORTVERSION= 0.3.9.4
PORTREVISION= 3
CATEGORIES= chinese
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
${PORTNAME}-data-freebsd-gb2312.tar.gz
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index 84c10e6de68f..8b6dd40d02ca 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= zhcon
PORTVERSION= 0.2.6
CATEGORIES= chinese
-MASTER_SITES= LOCAL/chinsan/chinese SF
+MASTER_SITES= LOCAL/chinsan/chinese
MAINTAINER= chinsan@FreeBSD.org
COMMENT= A fast Console Chinese System which supports framebuffer device
diff --git a/comms/aprsd/Makefile b/comms/aprsd/Makefile
index 33c72694ad60..ab4ebb07f2e8 100644
--- a/comms/aprsd/Makefile
+++ b/comms/aprsd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= aprsd
PORTVERSION= 2.2.515
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aprsd
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.2.5-15
DISTNAME= aprsd-2.2.5-15
MAINTAINER= db@FreeBSD.org
diff --git a/comms/bforce-kst/Makefile b/comms/bforce-kst/Makefile
index b1c7cac97c2c..728626e3d7ba 100644
--- a/comms/bforce-kst/Makefile
+++ b/comms/bforce-kst/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bforce
PORTVERSION= 0.22.8.7
PORTREVISION= 3
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= binkleyforce
+MASTER_SITES= SF/binkleyforce/${PORTNAME}/0.22.8.kst7
PKGNAMESUFFIX= -kst
DISTNAME= ${PORTNAME}-0.22.8.kst7
diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile
index 0e3fdb0f3d8a..0b65d892b7bf 100644
--- a/comms/echolinux/Makefile
+++ b/comms/echolinux/Makefile
@@ -9,8 +9,7 @@ PORTNAME= echolinux
PORTVERSION= 0.17a
PORTREVISION= 2
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cqinet
+MASTER_SITES= SF/cqinet/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= db@FreeBSD.org
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index bc2c7739f049..4a21f1603dfe 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= efax-gtk
PORTVERSION= 3.0.12
PORTREVISION= 3
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .src.tgz
MAINTAINER= jbq@caraldi.com
diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index ec0d3ed9b181..863a3190f625 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -8,8 +8,7 @@ PORTNAME= gpredict
PORTVERSION= 0.9.0
PORTREVISION= 4
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= groundstation
+MASTER_SITES= SF/groundstation/Gpredict/${PORTVERSION}
MAINTAINER= matt@chronos.org.uk
COMMENT= Amateur Radio satellite tracking and prediction
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index eb87bcd307b4..64d3789de091 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -9,8 +9,7 @@ PORTNAME= grig
PORTVERSION= 0.7.2
PORTREVISION= 3
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= groundstation
+MASTER_SITES= SF/groundstation/Grig/${PORTVERSION}
MAINTAINER= matt@chronos.org.uk
COMMENT= Amateur Radio control front-end
diff --git a/comms/gscmxx/Makefile b/comms/gscmxx/Makefile
index 7ef10e201d09..0cbd5da7cf49 100644
--- a/comms/gscmxx/Makefile
+++ b/comms/gscmxx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gscmxx
PORTVERSION= 0.4.1
PORTREVISION= 5
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= svmohr@rm6.net
COMMENT= A graphical frontend for scmxx
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile
index 7a336d3b0e9a..01a54706ec3b 100644
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@@ -8,7 +8,7 @@ PORTNAME= hamfax
PORTVERSION= 0.6.4
PORTREVISION= 4
CATEGORIES= comms audio hamradio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/HamFax%20${PORTVERSION}
DISTNAME= HamFax-${PORTVERSION}
MAINTAINER= carl@stagecraft.cx
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 0336c0847914..46742dfab8b7 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= hamlib
PORTVERSION= 1.2.9
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= db@FreeBSD.org
diff --git a/comms/hf/Makefile b/comms/hf/Makefile
index d6bede1e7b91..a63095c3306d 100644
--- a/comms/hf/Makefile
+++ b/comms/hf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hf
PORTVERSION= 0.8
PORTREVISION= 5
CATEGORIES= comms hamradio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= hfterm
+MASTER_SITES= SF/${PORTNAME}term/${PORTNAME}/${PORTVERSION}
MAINTAINER= db@FreeBSD.org
COMMENT= Amateur Radio soundcard fsk, pactor 1, amtor, gtor, mt63
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index 7ce848cf853b..9771a622173f 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kpsk
PORTVERSION= 1.0
PORTREVISION= 7
CATEGORIES= comms kde hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kpsk
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/_.tar.bz2%20files
MAINTAINER= hamradio@FreeBSD.org
COMMENT= A PSK31 digital radio communications application for the KDE
diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile
index dace400550bb..178ffcbffe4c 100644
--- a/comms/ktrack/Makefile
+++ b/comms/ktrack/Makefile
@@ -8,8 +8,7 @@ PORTNAME= ktrack
PORTVERSION= 0.3.0r1
PORTREVISION= 4
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ktrack
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.0-rc1
DISTNAME= ${PORTNAME}-0.3.0-rc1
MAINTAINER= db@FreeBSD.org
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index 0b1622f16360..87d675b72ebc 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libticables
PORTVERSION= 3.9.7
PORTREVISION= 2
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tilp
+MASTER_SITES= SF/tilp/OldFiles
MAINTAINER= tijl@ulyssis.org
COMMENT= TI calculator link cables library
diff --git a/comms/libticables2/Makefile b/comms/libticables2/Makefile
index 7fae9e2f53ee..aafef9f2921b 100644
--- a/comms/libticables2/Makefile
+++ b/comms/libticables2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libticables2
PORTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tilp
+MASTER_SITES= SF/tilp/tilp2-linux/tilp2-1.10
DISTNAME= tilibs2-20080110
MAINTAINER= tijl@ulyssis.org
diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile
index f4aa3d804cf5..0d6d5fc95cd7 100644
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libticalcs2
PORTVERSION= 1.1.2
CATEGORIES= comms
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tilp
+MASTER_SITES= SF/tilp/tilp2-linux/tilp2-1.11
DISTNAME= tilibs2-20080328
MAINTAINER= tijl@ulyssis.org
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index 96f952727da9..6155a4cb15d6 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= linpsk
PORTVERSION= 0.8.1
PORTREVISION= 6
CATEGORIES= comms hamradio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= xride@FreeBSD.org
COMMENT= A qt psk31 client
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 98ba142d266e..325b8377a58c 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lirc
PORTVERSION= 0.8.0
PORTREVISION= 2
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lirc
+MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION}
MAINTAINER= doconnor@gsoft.com.au
COMMENT= Linux Infared Remote Control
diff --git a/comms/py-lirc/Makefile b/comms/py-lirc/Makefile
index 57d2169d1034..04282757edbd 100644
--- a/comms/py-lirc/Makefile
+++ b/comms/py-lirc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lirc
PORTVERSION= 0.0.5
PORTREVISION= 2
CATEGORIES= comms python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pylirc
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pylirc-${PORTVERSION}
diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile
index 85b87003cb54..979cb4c183d5 100644
--- a/comms/py-serial/Makefile
+++ b/comms/py-serial/Makefile
@@ -8,8 +8,7 @@
PORTNAME= serial
PORTVERSION= 2.4
CATEGORIES= comms python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pyserial
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyserial-${PORTVERSION}
diff --git a/comms/qfaxreader/Makefile b/comms/qfaxreader/Makefile
index f4fa12ffe3e8..8e949fec7c13 100644
--- a/comms/qfaxreader/Makefile
+++ b/comms/qfaxreader/Makefile
@@ -11,8 +11,7 @@ PORTNAME= qfaxreader
DISTVERSION= 0.3.1
PORTREVISION= 3
CATEGORIES= comms graphics print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= itetcu@FreeBSD.org
COMMENT= Mono/color multipage tiff/fax files visualisation/printing utility
diff --git a/comms/qico/Makefile b/comms/qico/Makefile
index 3851028bb296..3ec025c7b34b 100644
--- a/comms/qico/Makefile
+++ b/comms/qico/Makefile
@@ -8,8 +8,7 @@
PORTNAME= qico
PORTVERSION= 0.49.10.3
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.49.10-p3
DISTNAME= ${PORTNAME}-0.49.10-p3
MAINTAINER= dsh@vlink.ru
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index ab762e64432e..094603a091b3 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scmxx
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Data exchange utility for Siemens mobile phones
diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile
index a237f1102511..6ea7e6b25542 100644
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= syncterm
PORTVERSION= 0.9.${PORTVER}
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.9
DISTNAME= syncterm-src-${PORTVER}
EXTRACT_SUFX= .tgz
diff --git a/comms/thebridge/Makefile b/comms/thebridge/Makefile
index b2764a627209..99653f92ca01 100644
--- a/comms/thebridge/Makefile
+++ b/comms/thebridge/Makefile
@@ -8,8 +8,7 @@
PORTNAME= thebridge
PORTVERSION= 1.06
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cqinet
+MASTER_SITES= SF/cqinet/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= db@FreeBSD.org
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index e4b8fac35e02..2bf5685ab7a4 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tilp2
PORTVERSION= 1.11
PORTREVISION= 1
CATEGORIES= comms
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tilp
+MASTER_SITES= SF/tilp/${PORTNAME}-linux/${PORTNAME}-${PORTVERSION}
MAINTAINER= tijl@ulyssis.org
COMMENT= TI Linking Program
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index 77751e567452..47308c57f52f 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= trustedqsl
PORTVERSION= 1.11
PORTREVISION= 6
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= trustedqsl
+MASTER_SITES= SF/${PORTNAME}/tqsllib/V2.0
DISTFILES= tqsllib-2.0.tar.gz TrustedQSL-1.11.tar.gz
MAINTAINER= db@FreeBSD.org
diff --git a/comms/uticom/Makefile b/comms/uticom/Makefile
index b069fc6a6b51..2d75352f6a3f 100644
--- a/comms/uticom/Makefile
+++ b/comms/uticom/Makefile
@@ -8,8 +8,7 @@
PORTNAME= uticom
PORTVERSION= 0.3
CATEGORIES= comms kld
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= dxi@mail.ru
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 93ec4d6f832e..de456445f20b 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xastir
PORTVERSION= 1.9.4
PORTREVISION= 4
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xastir
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
MAINTAINER= carl@stagecraft.cx
COMMENT= X Amateur Station Tracking and Information Reporting
diff --git a/comms/zssh/Makefile b/comms/zssh/Makefile
index 1c36ae071524..6e8c78c6ff9a 100644
--- a/comms/zssh/Makefile
+++ b/comms/zssh/Makefile
@@ -9,8 +9,7 @@ PORTNAME= zssh
PORTVERSION= 1.5c
PORTREVISION= 0
CATEGORIES= comms security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= zssh
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.5
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/chmview/Makefile b/converters/chmview/Makefile
index 71be7663f684..e2722e22bf0b 100644
--- a/converters/chmview/Makefile
+++ b/converters/chmview/Makefile
@@ -8,8 +8,7 @@
PORTNAME= chmview
DISTVERSION= 2.0b3
CATEGORIES= converters textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= trexinc
+MASTER_SITES= SF/trexinc/CHMView/2.0%20beta%203
DISTNAME= CHMView_${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/fix-mime-charset/Makefile b/converters/fix-mime-charset/Makefile
index e0da2a7b743c..ebf2ce660d0f 100644
--- a/converters/fix-mime-charset/Makefile
+++ b/converters/fix-mime-charset/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fix-mime-charset
PORTVERSION= 0.5.3
PORTREVISION= 1
CATEGORIES= converters textproc russian ukrainian
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fix-mime-chr
+MASTER_SITES= SF/fix-mime-chr/${PORTNAME}/${PORTVERSION}
MAINTAINER= chip-set@mail.ru
COMMENT= Fix incorrect Content-Type MIME headers of e-mail messages
diff --git a/converters/libticonv/Makefile b/converters/libticonv/Makefile
index 7f06e9b0ed36..1da4cb3dd0db 100644
--- a/converters/libticonv/Makefile
+++ b/converters/libticonv/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libticonv
PORTVERSION= 1.1.0
PORTREVISION= 1
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tilp
+MASTER_SITES= SF/tilp/tilp2-linux/tilp2-1.10
DISTNAME= tilibs2-20080110
MAINTAINER= tijl@ulyssis.org
diff --git a/converters/mimelib/Makefile b/converters/mimelib/Makefile
index 8d59982b1c3c..e8ea8f327a83 100644
--- a/converters/mimelib/Makefile
+++ b/converters/mimelib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mimelib
PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= icqmail
+MASTER_SITES= SF/icqmail/libs/${PORTVERSION}
MAINTAINER= never@nevermind.kiev.ua
COMMENT= C++ class library for manipulating messages in MIME format
diff --git a/converters/tnef/Makefile b/converters/tnef/Makefile
index 22cf3b764329..d8a4dfa4c605 100644
--- a/converters/tnef/Makefile
+++ b/converters/tnef/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tnef
PORTVERSION= 1.4.5
CATEGORIES= converters mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= Unpack data in MS Outlook TNEF format
diff --git a/converters/ytnef/Makefile b/converters/ytnef/Makefile
index 48ed5b2ace43..12e8005e0634 100644
--- a/converters/ytnef/Makefile
+++ b/converters/ytnef/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ytnef
PORTVERSION= 2.6
PORTREVISION= 1
CATEGORIES= converters mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= delphus@gmail.com
COMMENT= Unpack data in MS Outlook TNEF format