summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--x11-clocks/bbdate/Makefile3
-rw-r--r--x11-drivers/input-wacom/Makefile9
-rw-r--r--x11-fm/pcmanfm/Makefile2
-rw-r--r--x11-fm/rox-filer/Makefile2
-rw-r--r--x11-fm/rox-mime-editor/Makefile3
-rw-r--r--x11-fm/rox-session/Makefile3
-rw-r--r--x11-fm/tkdesk/Makefile3
-rw-r--r--x11-fm/xcruise/Makefile2
-rw-r--r--x11-fonts/artwiz-aleczapka-de/Makefile3
-rw-r--r--x11-fonts/artwiz-aleczapka-se/Makefile3
-rw-r--r--x11-fonts/artwiz-aleczapka/Makefile3
-rw-r--r--x11-fonts/fntsample/Makefile3
-rw-r--r--x11-fonts/junicode/Makefile3
-rw-r--r--x11-fonts/lfpfonts-fix/Makefile3
-rw-r--r--x11-fonts/lfpfonts-var/Makefile3
-rw-r--r--x11-fonts/nucleus/Makefile3
-rw-r--r--x11-fonts/wqy/Makefile4
-rw-r--r--x11-themes/baghira/Makefile3
-rw-r--r--x11-themes/clearlooks/Makefile2
-rw-r--r--x11-themes/e16-themes/Makefile2
-rw-r--r--x11-themes/fvwm-themes/Makefile3
-rw-r--r--x11-themes/gnome-icons-crystal/Makefile3
-rw-r--r--x11-themes/gnome-look/Makefile3
-rw-r--r--x11-themes/gtk-cleanice-engine/Makefile2
-rw-r--r--x11-themes/kde-icons-graphite-rade8/Makefile3
-rw-r--r--x11-themes/kde-icons-lime-rade8/Makefile3
-rw-r--r--x11-themes/lxappearance/Makefile3
-rw-r--r--x11-themes/xmms-eq-skins/Makefile3
-rw-r--r--x11-toolkits/blt/Makefile4
-rw-r--r--x11-toolkits/bwidget/Makefile3
-rw-r--r--x11-toolkits/efltk/Makefile2
-rw-r--r--x11-toolkits/flvw/Makefile3
-rw-r--r--x11-toolkits/gai/Makefile2
-rw-r--r--x11-toolkits/gauche-gtk/Makefile3
-rw-r--r--x11-toolkits/gnocl/Makefile2
-rw-r--r--x11-toolkits/gtkada-gcc/Makefile3
-rw-r--r--x11-toolkits/gtkextra/Makefile4
-rw-r--r--x11-toolkits/gtkextra2/Makefile3
-rw-r--r--x11-toolkits/gtkglext/Makefile3
-rw-r--r--x11-toolkits/gtkglextmm/Makefile3
-rw-r--r--x11-toolkits/gtkmm20/Makefile5
-rw-r--r--x11-toolkits/gtkmm30/Makefile5
-rw-r--r--x11-toolkits/gtkscintilla/Makefile3
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile3
-rw-r--r--x11-toolkits/irrlicht/Makefile3
-rw-r--r--x11-toolkits/itk/Makefile3
-rw-r--r--x11-toolkits/iwidgets/Makefile3
-rw-r--r--x11-toolkits/lesstif/Makefile3
-rw-r--r--x11-toolkits/libgnomeuimm/Makefile2
-rw-r--r--x11-toolkits/libgtkeditor/Makefile3
-rw-r--r--x11-toolkits/mesgui/Makefile2
-rw-r--r--x11-toolkits/movingmotif/Makefile3
-rw-r--r--x11-toolkits/otk/Makefile2
-rw-r--r--x11-toolkits/p5-Gnome2-Canvas/Makefile8
-rw-r--r--x11-toolkits/p5-Gnome2/Makefile3
-rw-r--r--x11-toolkits/p5-Gtk2/Makefile2
-rw-r--r--x11-toolkits/pangoxsl/Makefile3
-rw-r--r--x11-toolkits/py-Pmw/Makefile2
-rw-r--r--x11-toolkits/py-gtkextra/Makefile3
-rw-r--r--x11-toolkits/py-gtkglext/Makefile3
-rw-r--r--x11-toolkits/py-gtkscintilla/Makefile3
-rw-r--r--x11-toolkits/py-pyqwt/Makefile2
-rw-r--r--x11-toolkits/py-wax/Makefile3
-rw-r--r--x11-toolkits/py-wmdockapps/Makefile3
-rw-r--r--x11-toolkits/py-wxPython24/Makefile3
-rw-r--r--x11-toolkits/py-wxPython26/Makefile3
-rw-r--r--x11-toolkits/py-wxPython28/Makefile3
-rw-r--r--x11-toolkits/py-xlib/Makefile3
-rw-r--r--x11-toolkits/qwt4/Makefile1
-rw-r--r--x11-toolkits/rep-gtk2/Makefile3
-rw-r--r--x11-toolkits/ruby-gtk/Makefile4
-rw-r--r--x11-toolkits/sdl_pango/Makefile3
-rw-r--r--x11-toolkits/tile/Makefile2
-rw-r--r--x11-toolkits/tix/Makefile3
-rw-r--r--x11-toolkits/tk83/Makefile3
-rw-r--r--x11-toolkits/tk84/Makefile3
-rw-r--r--x11-toolkits/tk85/Makefile3
-rw-r--r--x11-toolkits/tk86/Makefile3
-rw-r--r--x11-toolkits/tktable/Makefile3
-rw-r--r--x11-toolkits/tktreectrl/Makefile2
-rw-r--r--x11-toolkits/v/Makefile3
-rw-r--r--x11-toolkits/vdk/Makefile3
-rw-r--r--x11-toolkits/vdkbuilder/Makefile2
-rw-r--r--x11-toolkits/viewklass/Makefile2
-rw-r--r--x11-toolkits/wxd/Makefile2
-rw-r--r--x11-toolkits/wxgtk24-docs/Makefile3
-rw-r--r--x11-toolkits/wxgtk24/Makefile2
-rw-r--r--x11-toolkits/wxgtk26-docs/Makefile2
-rw-r--r--x11-toolkits/wxgtk26/Makefile2
-rw-r--r--x11-toolkits/wxgtk28/Makefile2
-rw-r--r--x11-toolkits/wxgtk29/Makefile2
-rw-r--r--x11-toolkits/xbae/Makefile3
-rw-r--r--x11-toolkits/xclasses/Makefile2
-rw-r--r--x11-wm/afterstep-stable/Makefile4
-rw-r--r--x11-wm/antiwm/Makefile2
-rw-r--r--x11-wm/badwm/Makefile2
-rw-r--r--x11-wm/bbkeys/Makefile3
-rw-r--r--x11-wm/bbpager/Makefile3
-rw-r--r--x11-wm/blackbox/Makefile3
-rw-r--r--x11-wm/boxtools/Makefile3
-rw-r--r--x11-wm/clementine/Makefile2
-rw-r--r--x11-wm/e16/Makefile2
-rw-r--r--x11-wm/e16utils/Makefile4
-rw-r--r--x11-wm/enlightenment-docs/Makefile2
-rw-r--r--x11-wm/epplets/Makefile3
-rw-r--r--x11-wm/fvwm95-i18n/Makefile3
-rw-r--r--x11-wm/gcompmgr/Makefile3
-rw-r--r--x11-wm/icewm/Makefile2
-rw-r--r--x11-wm/jwm/Makefile2
-rw-r--r--x11-wm/lxsession-lite/Makefile3
-rw-r--r--x11-wm/lxsession/Makefile3
-rw-r--r--x11-wm/obpager/Makefile2
-rw-r--r--x11-wm/phluid/Makefile2
-rw-r--r--x11-wm/plwm/Makefile3
-rw-r--r--x11-wm/sapphire/Makefile2
-rw-r--r--x11-wm/sawfish/Makefile3
-rw-r--r--x11-wm/waimea/Makefile2
-rw-r--r--x11-wm/xfce/Makefile2
-rw-r--r--x11/3ddesktop/Makefile3
-rw-r--r--x11/bbappconf/Makefile3
-rw-r--r--x11/eterm/Makefile2
-rw-r--r--x11/fluxbg/Makefile2
-rw-r--r--x11/gdkxft/Makefile3
-rw-r--r--x11/ggiterm/Makefile3
-rw-r--r--x11/gmrun/Makefile3
-rw-r--r--x11/idesk/Makefile3
-rw-r--r--x11/imwheel/Makefile4
-rw-r--r--x11/libgnomemm/Makefile2
-rw-r--r--x11/libxklavier/Makefile3
-rw-r--r--x11/lxpanel/Makefile3
-rw-r--r--x11/mlterm/Makefile3
-rw-r--r--x11/mrxvt-devel/Makefile3
-rw-r--r--x11/mrxvt/Makefile3
-rw-r--r--x11/p5-X11-GUITest/Makefile7
-rw-r--r--x11/powershell/Makefile3
-rw-r--r--x11/qimageblitz/Makefile2
-rw-r--r--x11/rox-wallpaper/Makefile3
-rw-r--r--x11/ruby-gtktrayicon/Makefile3
-rw-r--r--x11/rxvt-devel/Makefile2
-rw-r--r--x11/stalonetray/Makefile2
-rw-r--r--x11/tilda/Makefile2
-rw-r--r--x11/wmappl/Makefile3
-rw-r--r--x11/wterm/Makefile2
-rw-r--r--x11/x3270/Makefile2
-rw-r--r--x11/xcut/Makefile4
-rw-r--r--x11/xfree86_xkb_xml/Makefile3
-rw-r--r--x11/xrsi/Makefile2
-rw-r--r--x11/xscreensaver.app/Makefile2
-rw-r--r--x11/xtermset/Makefile3
-rw-r--r--x11/xxkb/Makefile2
150 files changed, 162 insertions, 263 deletions
diff --git a/x11-clocks/bbdate/Makefile b/x11-clocks/bbdate/Makefile
index d9454ddb2e74..45e63830b634 100644
--- a/x11-clocks/bbdate/Makefile
+++ b/x11-clocks/bbdate/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bbdate
PORTVERSION= 0.2.4
PORTREVISION= 2
CATEGORIES= x11-clocks
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= bbtools
+MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool made for Blackbox that displays the date in a decorated window
diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
index a95c7e5d723a..2232153b633c 100644
--- a/x11-drivers/input-wacom/Makefile
+++ b/x11-drivers/input-wacom/Makefile
@@ -9,11 +9,10 @@ PORTNAME= input-wacom
PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
PORTREVISION= 3
CATEGORIES= x11-drivers kld
-MASTER_SITES= http://www.chillt.de/bsdwacom/ \
- SF
-MASTER_SITE_SUBDIR= linuxwacom
-DISTFILES= ${BSDWACOM}.tbz \
- ${LINUXWACOM}.tar.bz2
+MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \
+ SF/linuxwacom/linuxwacom/${WACOM_VERSION}:linuxwacom
+DISTFILES= ${BSDWACOM}.tbz:bsdwacom \
+ ${LINUXWACOM}.tar.bz2:linuxwacom
EXTRACT_ONLY= ${BSDWACOM}.tbz
MAINTAINER= kamikaze@bsdforen.de
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 7a9fdebdb922..0fd9bdaabb05 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -9,7 +9,7 @@
PORTNAME= pcmanfm
PORTVERSION= 0.5.1
CATEGORIES= x11-fm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/PCManFM%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= PCMan File Manager
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 0aa3129dee29..49bfabc19061 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rox-filer
PORTVERSION= 2.10
CATEGORIES= x11-fm gnome
-MASTER_SITES= SF/rox
+MASTER_SITES= SF/rox/rox/${PORTVERSION}
DISTNAME= rox-filer-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/x11-fm/rox-mime-editor/Makefile b/x11-fm/rox-mime-editor/Makefile
index 3b356dbe97e4..e5ba90a39495 100644
--- a/x11-fm/rox-mime-editor/Makefile
+++ b/x11-fm/rox-mime-editor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rox-mime-editor
PORTVERSION= 0.5
PORTREVISION= 2
CATEGORIES= x11-fm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rox
+MASTER_SITES= SF/rox/MIME-Editor/${PORTVERSION}
DISTNAME= mime-editor-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 540a11af6b77..8ac0f4c0ef53 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -8,8 +8,7 @@ PORTNAME= rox-session
PORTVERSION= 0.30
PORTREVISION= 1
CATEGORIES= x11-fm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rox
+MASTER_SITES= SF/rox/ROX-Session/${PORTVERSION}
DISTNAME= rox-session-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index b407d10635bb..c0fb6216e8bf 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tkdesk
PORTVERSION= 2.0.2
PORTREVISION= 1
CATEGORIES= x11-fm tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/TkDesk/2.0
DISTNAME= ${PORTNAME}-${PORTVERSION:R}
PATCHFILES= ${DISTNAME}p1.patch ${DISTNAME}p2.patch
PATCH_SITES= http://tkdesk.sourceforge.net/patches/
diff --git a/x11-fm/xcruise/Makefile b/x11-fm/xcruise/Makefile
index c0bd98e4fe1e..af3605b17145 100644
--- a/x11-fm/xcruise/Makefile
+++ b/x11-fm/xcruise/Makefile
@@ -10,7 +10,7 @@ PORTNAME= xcruiser
PORTVERSION= 0.30
PORTREVISION= 2
CATEGORIES= x11-fm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= sanpei@FreeBSD.org
COMMENT= Navigate through a three-dimensional view of a file system
diff --git a/x11-fonts/artwiz-aleczapka-de/Makefile b/x11-fonts/artwiz-aleczapka-de/Makefile
index 21431acaf89b..44ead6b0e5af 100644
--- a/x11-fonts/artwiz-aleczapka-de/Makefile
+++ b/x11-fonts/artwiz-aleczapka-de/Makefile
@@ -8,8 +8,7 @@ PORTNAME= artwiz-aleczapka-de
PORTVERSION= 1.3
PORTREVISION= 2
CATEGORIES= x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= artwizaleczapka
+MASTER_SITES= SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
MAINTAINER= herbert.skuhra@gmx.at
COMMENT= A set of (improved) artwiz fonts
diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile
index cdec317b8962..beb6c927b19e 100644
--- a/x11-fonts/artwiz-aleczapka-se/Makefile
+++ b/x11-fonts/artwiz-aleczapka-se/Makefile
@@ -8,8 +8,7 @@ PORTNAME= artwiz-aleczapka-se
PORTVERSION= 1.3
PORTREVISION= 2
CATEGORIES= x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= artwizaleczapka
+MASTER_SITES= SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
MAINTAINER= herbert.skuhra@gmx.at
COMMENT= A set of (improved) artwiz fonts
diff --git a/x11-fonts/artwiz-aleczapka/Makefile b/x11-fonts/artwiz-aleczapka/Makefile
index e66bf659f1b4..acc79bca5376 100644
--- a/x11-fonts/artwiz-aleczapka/Makefile
+++ b/x11-fonts/artwiz-aleczapka/Makefile
@@ -9,8 +9,7 @@ PORTNAME= artwiz-aleczapka-en
PORTVERSION= 1.3
PORTREVISION= 2
CATEGORIES= x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= artwizaleczapka
+MASTER_SITES= SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A set of (improved) artwiz fonts
diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
index 3d8b715ac9a2..82b6ec133644 100644
--- a/x11-fonts/fntsample/Makefile
+++ b/x11-fonts/fntsample/Makefile
@@ -9,8 +9,7 @@ PORTNAME?= fntsample
PORTVERSION= 3.0
PORTREVISION?= 0
CATEGORIES?= x11-fonts
-MASTER_SITES= SF http://unicode.org/Public/5.1.0/ucd/:unidata
-MASTER_SITE_SUBDIR= fntsample
+MASTER_SITES= SF/fntsample/fntsample/${PORTVERSION} http://unicode.org/Public/5.1.0/ucd/:unidata
DISTNAME= fntsample-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Blocks.txt:unidata
EXTRACT_ONLY= ${DISTFILES:M*gz}
diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile
index dfbfc5789edf..caadfa08f8e1 100644
--- a/x11-fonts/junicode/Makefile
+++ b/x11-fonts/junicode/Makefile
@@ -8,8 +8,9 @@
PORTNAME= junicode
PORTVERSION= 0.6.17
CATEGORIES= x11-fonts
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0-6-17 \
http://anthesphoria.net/FreeBSD/ports/distfiles/
+
DISTNAME= ${PORTNAME}-${PORTVERSION:S|.|-|g}
MAINTAINER= nikola.lecic@anthesphoria.net
diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile
index 880675c9efea..69fb555da53b 100644
--- a/x11-fonts/lfpfonts-fix/Makefile
+++ b/x11-fonts/lfpfonts-fix/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lfpfonts-fix
PORTVERSION= 0.82
PORTREVISION= 2
CATEGORIES= x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= xfonts
+MASTER_SITES= SF/xfonts/${PORTNAME}/${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Fixed width fonts from the Linux Font Project
diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile
index 359d5e01502c..9d6003d7ca54 100644
--- a/x11-fonts/lfpfonts-var/Makefile
+++ b/x11-fonts/lfpfonts-var/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lfpfonts-var
PORTVERSION= 0.83
PORTREVISION= 2
CATEGORIES= x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= xfonts
+MASTER_SITES= SF/xfonts/${PORTNAME}/${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Variable width fonts from the Linux Font Project
diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index 209c3e0a8aac..10f3bb466333 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nucleus
PORTVERSION= 0.77
PORTREVISION= 4
CATEGORIES= x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= xfonts
+MASTER_SITES= SF/xfonts/OldFiles
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Another font package for X
diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index c651b0806fe5..0b3b5535dddb 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -9,9 +9,9 @@ PORTNAME= wqy-fonts
PORTVERSION= 20081102
PORTEPOCH= 1
CATEGORIES= x11-fonts
-MASTER_SITES= SF \
+MASTER_SITES= SF/wqy/wqy-bitmapfont/0.9.9 \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= wqy
+
DISTFILES= wqy-bitmapfont-pcf-0.9.9-0.tar.gz \
wqy-unibit-bdf-1.1.0-1.tar.gz \
wqy-zenhei-0.8.34-cvs20081027.tar.gz
diff --git a/x11-themes/baghira/Makefile b/x11-themes/baghira/Makefile
index e53ab5117c65..a6721c76a957 100644
--- a/x11-themes/baghira/Makefile
+++ b/x11-themes/baghira/Makefile
@@ -9,8 +9,7 @@ PORTNAME= baghira
PORTVERSION= 0.8
PORTREVISION= 4
CATEGORIES= x11-themes kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An Aqua like window decoration and widget style for KDE
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index e9016264ebeb..9ad54b7a3d4e 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -10,7 +10,7 @@ PORTNAME?= clearlooks
PORTVERSION= 0.6.2
PORTREVISION= 8
CATEGORIES= x11-themes
-MASTER_SITES= SF
+MASTER_SITES= SF/clearlooks/clearlooks/clearlooks%20${PORTVERSION}
MAINTAINER= ahze@FreeBSD.org
COMMENT?= GTK+ 2.x engine based on Bluecurve
diff --git a/x11-themes/e16-themes/Makefile b/x11-themes/e16-themes/Makefile
index d45cb74b1a3e..b6f6b47cea33 100644
--- a/x11-themes/e16-themes/Makefile
+++ b/x11-themes/e16-themes/Makefile
@@ -8,7 +8,7 @@
PORTNAME= e16-themes
PORTVERSION= 1.0.0
CATEGORIES= x11-themes
-MASTER_SITES= SF/enlightenment
+MASTER_SITES= SF/enlightenment/${PORTNAME}/${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A set of themes for the e16 window manager
diff --git a/x11-themes/fvwm-themes/Makefile b/x11-themes/fvwm-themes/Makefile
index 7a25cfbdc7f8..a16b69fb516a 100644
--- a/x11-themes/fvwm-themes/Makefile
+++ b/x11-themes/fvwm-themes/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fvwm-themes
PORTVERSION= 0.7.0
PORTREVISION= 2
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-extra-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/x11-themes/gnome-icons-crystal/Makefile b/x11-themes/gnome-icons-crystal/Makefile
index 07e6de01d5a8..5deadb9944fb 100644
--- a/x11-themes/gnome-icons-crystal/Makefile
+++ b/x11-themes/gnome-icons-crystal/Makefile
@@ -13,8 +13,7 @@ PORTNAME= crystal
PORTVERSION= 1.2.0
PORTREVISION= 4
CATEGORIES= x11-themes gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= crystalforgnome
+MASTER_SITES= SF/${PORTNAME}forgnome/Crystal%20SVG%20Icons/v${PORTVERSION}
DISTNAME= CrystalSVG-${PORTVERSION}
EXTRACT_SUFX= .bz2
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index 8b5ffb5ff6a0..af3ba7f1a571 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnome-look
PORTVERSION= 0.1.3
PORTREVISION= 5
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A GTK theme engine designed to look nice with the GNOME desktop
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index e55d82eaf084..0c8be79c85a7 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gtk-cleanice-engine
PORTVERSION= 2.4.1
PORTREVISION= 2
CATEGORIES= x11-themes gnome
-MASTER_SITES= SF/elysium-project
+MASTER_SITES= SF/elysium-project/gtk-engines-cleanice/${PORTVERSION}
DISTNAME= gtk-engines-cleanice-${PORTVERSION}
DISTFILES= ${DISTNAME}.tar.gz \
${THEME}.tar.gz
diff --git a/x11-themes/kde-icons-graphite-rade8/Makefile b/x11-themes/kde-icons-graphite-rade8/Makefile
index 4d437ac36d76..512a94ecee43 100644
--- a/x11-themes/kde-icons-graphite-rade8/Makefile
+++ b/x11-themes/kde-icons-graphite-rade8/Makefile
@@ -7,8 +7,7 @@
PORTNAME= graphite-rade8
PORTVERSION= 1.03
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= graphitekde
+MASTER_SITES= SF/graphitekde/OldFiles
DISTNAME= Graphite-Rade8-${PORTVERSION}
COMMENT= KDE Mac OS X like iconset, most from rad-e8 design
diff --git a/x11-themes/kde-icons-lime-rade8/Makefile b/x11-themes/kde-icons-lime-rade8/Makefile
index 1ff56e247c39..fc4147d2dd2b 100644
--- a/x11-themes/kde-icons-lime-rade8/Makefile
+++ b/x11-themes/kde-icons-lime-rade8/Makefile
@@ -7,8 +7,7 @@
PORTNAME= lime-rade8
PORTVERSION= 1.01
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= graphitekde
+MASTER_SITES= SF/graphitekde/OldFiles
DISTNAME= Lime-Rade8-${PORTVERSION}
COMMENT= KDE Mac OS X like iconset, most from rad-e8 design
diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index d98c6abaf640..c7dd246b3987 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lxappearance
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= x11-themes gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= lxde
+MASTER_SITES= SF/lxde/LXAppearance/LXAppearance%20${PORTVERSION}.0
MAINTAINER= chinsan@FreeBSD.org
COMMENT= A desktop-independent theme switcher for GTK+
diff --git a/x11-themes/xmms-eq-skins/Makefile b/x11-themes/xmms-eq-skins/Makefile
index 4050f6c3912d..d4041265389a 100644
--- a/x11-themes/xmms-eq-skins/Makefile
+++ b/x11-themes/xmms-eq-skins/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-eq-skins
PORTVERSION= 0.2
PORTREVISION= 4
CATEGORIES= x11-themes
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= equ
+MASTER_SITES= SF/equ/eq-xmms-skins/${PORTVERSION}
DISTNAME= eq-xmms-skins-${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 1907c950fcae..896a88c93a22 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -9,9 +9,9 @@ PORTNAME= blt
PORTVERSION= 2.4z
PORTREVISION= 2
CATEGORIES= x11-toolkits tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/BLT/BLT%20${PORTVERSION} \
ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
DISTNAME= BLT${PORTVERSION}
PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} \
diff --git a/x11-toolkits/bwidget/Makefile b/x11-toolkits/bwidget/Makefile
index bdf79cd9e6f7..2bfc49162dab 100644
--- a/x11-toolkits/bwidget/Makefile
+++ b/x11-toolkits/bwidget/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bwidget
PORTVERSION= 1.8.0
PORTREVISION= 2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcllib
+MASTER_SITES= SF/tcllib/BWidget/${PORTVERSION}
DISTNAME= BWidget-${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 7f492046f65c..0816ee8752c5 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= efltk
PORTVERSION= 2.0.7
PORTREVISION= 3
CATEGORIES= x11-toolkits
-MASTER_SITES= SF/ede
+MASTER_SITES= SF/ede/${PORTNAME}/${PORTVERSION}
MAINTAINER= sem@FreeBSD.org
COMMENT= Extended Fast Light Toolkit
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index 1ffe76a794e9..9ce87a90301c 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -9,8 +9,7 @@ PORTNAME= flvw
PORTVERSION= 20000224
PORTREVISION= 7
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Febrary%20beta
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index 5dee4ea32d71..c066018b42a5 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gai
PORTVERSION= 0.5.10
PORTREVISION= 8
CATEGORIES= x11-toolkits gnome
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/GAI%20-%20Library/${PORTNAME}-${PORTVERSION}
MAINTAINER= lx@redundancy.redundancy.org
COMMENT= General Applet Interface Library
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index 462058cc9caa..93d3f628c9e4 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gauche
PORTVERSION= 0.4.1
PORTREVISION= 9
CATEGORIES= x11-toolkits scheme
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gauche
+MASTER_SITES= SF/${PORTNAME}/Gauche-gtk/${PORTVERSION}
PKGNAMESUFFIX= -gtk
DISTNAME= Gauche${PKGNAMESUFFIX}-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index 6c64dd76385b..c3fd7d75a39d 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnocl
PORTVERSION= 0.9.94
PORTREVISION= 1
CATEGORIES= x11-toolkits devel
-MASTER_SITES= SF/gnocl
+MASTER_SITES= SF/${PORTNAME}/Gnocl-Nightly-Build/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
diff --git a/x11-toolkits/gtkada-gcc/Makefile b/x11-toolkits/gtkada-gcc/Makefile
index 47ff9baeb728..3eb291124176 100644
--- a/x11-toolkits/gtkada-gcc/Makefile
+++ b/x11-toolkits/gtkada-gcc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkada
PORTVERSION= 2.8.1
PORTREVISION= 4
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnuada
+MASTER_SITES= SF/gnuada/GNAT_GCC%20Source/4.1.1%20R6
PKGNAMESUFFIX= -gcc
DISTNAME= gnat-gcc-gtkada-4.1.1_2.8.1-r6.src
EXTRACT_SUFX= .rpm
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index d84343a26c9b..da22adc84e2b 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 0.99.17
PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= http://gtkextra.sourceforge.net/src/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= scigraphica
+ SF/scigraphica/scigraphica-0.x/0.8.0-source
+
DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 9191ac9d34bc..a1945f0dbaf1 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkextra
PORTVERSION= 2.1.1
PORTREVISION= 5
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= scigraphica
+MASTER_SITES= SF/scigraphica/GtkExtra/${PORTVERSION}%20Sources
DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 20b574815d4a..c9ab0e910389 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkglext
PORTVERSION= 1.2.0
PORTREVISION= 4
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DIST_SUBDIR= gnome2
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index c276ce7c010e..c741a4944a33 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkglextmm
PORTVERSION= 1.2.0
PORTREVISION= 3
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtkglext
+MASTER_SITES= SF/gtkglext/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ wrapper for GtkGLExt
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 00403e7d3e13..e7bd4c5fcec6 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -9,10 +9,7 @@ PORTNAME= gtkmm
PORTVERSION= 2.2.12
PORTREVISION?= 10
CATEGORIES= x11-toolkits
-MASTER_SITES= GNOME \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 \
- gtkmm
+MASTER_SITES= GNOME/sources/${PORTNAME}/2.2 \
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 00403e7d3e13..e7bd4c5fcec6 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -9,10 +9,7 @@ PORTNAME= gtkmm
PORTVERSION= 2.2.12
PORTREVISION?= 10
CATEGORIES= x11-toolkits
-MASTER_SITES= GNOME \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 \
- gtkmm
+MASTER_SITES= GNOME/sources/${PORTNAME}/2.2 \
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index 15fcfdf8ecf5..8aceddc16f15 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkscintilla
PORTVERSION= 0.8.2
PORTREVISION= 6
CATEGORIES= x11-toolkits
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= moleskine
+MASTER_SITES= SF/moleskine/GtkScintilla/${PORTVERSION}
DISTNAME= GtkScintilla-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 61d694e6285f..4dfd5146ebc1 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.10.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= hs-
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index fd0e55c49276..ae4433eb9ca2 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -9,8 +9,7 @@ PORTNAME= irrlicht
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= x11-toolkits graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= High performance realtime 3D engine
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index 15557e653240..7acd462715cb 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= itk
PORTVERSION= 3.3
PORTREVISION= 2
CATEGORIES= x11-toolkits tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=incrtcl
+MASTER_SITES= SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/${PORTVERSION}-RC
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= erik@smluc.org
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 53e9a42ae33c..3045331fd2bb 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -9,8 +9,7 @@ PORTNAME= iwidgets
PORTVERSION= 4.0.1
PORTREVISION= 1
CATEGORIES= x11-toolkits tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=incrtcl
+MASTER_SITES= SF/incrtcl/%5BIncr%20Widgets%5D/${PORTVERSION}
DISTNAME= iwidgets${PORTVERSION}
MAINTAINER= pauls@utdallas.edu
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index a14fe3616d42..04601b80c83b 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.95.2
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lesstif
+MASTER_SITES= SF
MAINTAINER= dinoex@FreeBSD.org
COMMENT= API compatible clone of the Motif toolkit
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index fd939f0846b2..b0419d84f154 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomeuimm
PORTVERSION= 2.0.0
PORTREVISION= 10
CATEGORIES= x11-toolkits gnome
-MASTER_SITES= SF/gtkmm
+MASTER_SITES= SF/gtkmm/OldFiles
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index d1d1d2c23217..1e939b340b4f 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libgtkeditor
PORTVERSION= 0.1.8
PORTREVISION= 5
CATEGORIES= x11-toolkits editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/lib//}
+MASTER_SITES= SF/gtkeditor/gtkeditor/${PORTVERSION}
DISTNAME= ${PORTNAME:S/lib//}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile
index e6de52a891a6..03ed677a7e31 100644
--- a/x11-toolkits/mesgui/Makefile
+++ b/x11-toolkits/mesgui/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mesgui
PORTVERSION= 1.0
PORTREVISION= 6
CATEGORIES= x11-toolkits
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Make a simple GUI under OpenGL
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index 60f8f02029d2..fc18dbf97e4b 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -8,8 +8,7 @@
PORTNAME= movingmotif
PORTVERSION= 2.3.0
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_2_1/movingmotiv-2.3.1
MAINTAINER= gahr@FreeBSD.org
COMMENT= Display scientific data as dynamic plot
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 63a0c5a59521..35390d317678 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= otk
PORTVERSION= 0.85
CATEGORIES= x11-toolkits graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
DISTNAME= ${PORTNAME}_lib_${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/p5-Gnome2-Canvas/Makefile b/x11-toolkits/p5-Gnome2-Canvas/Makefile
index 8bcfc9930703..34e423a41614 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/Makefile
+++ b/x11-toolkits/p5-Gnome2-Canvas/Makefile
@@ -10,13 +10,9 @@ PORTNAME= Gnome2-Canvas
PORTVERSION= 1.002
PORTREVISION= 4
CATEGORIES= x11-toolkits gnome perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= Gnome2/:cpan \
- gtk2-perl/:sf
+MASTER_SITES= CPAN/Gnome2 \
+ SF/gtk2-perl/Gnome2_Canvas/${PORTVERSION}
PKGNAMEPREFIX= p5-
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan \
- ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf
MAINTAINER= wxs@FreeBSD.org
COMMENT= Allows a perl developer to use the GnomeCanvas widget with Gtk2-Perl
diff --git a/x11-toolkits/p5-Gnome2/Makefile b/x11-toolkits/p5-Gnome2/Makefile
index ab56946de304..d6e64952f049 100644
--- a/x11-toolkits/p5-Gnome2/Makefile
+++ b/x11-toolkits/p5-Gnome2/Makefile
@@ -10,8 +10,7 @@ PORTNAME= Gnome2
PORTVERSION= 1.042
PORTREVISION= 2
CATEGORIES= x11-toolkits gnome perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtk2-perl
+MASTER_SITES= SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
MAINTAINER= wxs@FreeBSD.org
diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile
index bb4e9cb4681d..cf92b15a66bb 100644
--- a/x11-toolkits/p5-Gtk2/Makefile
+++ b/x11-toolkits/p5-Gtk2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gtk2
PORTVERSION= 1.203
CATEGORIES= x11-toolkits lang perl5
-MASTER_SITES= CPAN SF/gtk2-perl
+MASTER_SITES= CPAN SF/${PORTNAME:L}-perl/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 34cb4f3c870b..d9e132dc74d2 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pangoxsl
PORTVERSION= 1.6.0.3
PORTREVISION= 2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pangopdf
+MASTER_SITES= SF/pangopdf/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Implements Pango library with a PDF backend for PDF output
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index c9091174fc6a..9645ee8254a2 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Pmw
PORTVERSION= 1.3.2
CATEGORIES= x11-toolkits python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}.${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}.${PORTVERSION}
diff --git a/x11-toolkits/py-gtkextra/Makefile b/x11-toolkits/py-gtkextra/Makefile
index ddf90a464680..a056c0667943 100644
--- a/x11-toolkits/py-gtkextra/Makefile
+++ b/x11-toolkits/py-gtkextra/Makefile
@@ -10,8 +10,7 @@ PORTNAME= gtkextra
PORTVERSION= 0.22
PORTREVISION= 5
CATEGORIES= x11-toolkits python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= python-${PORTNAME}
+MASTER_SITES= SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= python-${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index cf82d3fde13c..ea0da32fe805 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkglext
PORTVERSION= 1.1.0
PORTREVISION= 3
CATEGORIES= x11-toolkits python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtkglext
+MASTER_SITES= SF/${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygtkglext-${PORTVERSION}
diff --git a/x11-toolkits/py-gtkscintilla/Makefile b/x11-toolkits/py-gtkscintilla/Makefile
index b9cbe3ecd8e6..1b32a7dc5ed5 100644
--- a/x11-toolkits/py-gtkscintilla/Makefile
+++ b/x11-toolkits/py-gtkscintilla/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkscintilla
PORTVERSION= 0.8.2
PORTREVISION= 6
CATEGORIES= x11-toolkits python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= moleskine
+MASTER_SITES= SF/moleskine/PyGtkScintilla/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyGtkScintilla-${PORTVERSION}
diff --git a/x11-toolkits/py-pyqwt/Makefile b/x11-toolkits/py-pyqwt/Makefile
index 7c8b508cfed0..55a9f2d00b89 100644
--- a/x11-toolkits/py-pyqwt/Makefile
+++ b/x11-toolkits/py-pyqwt/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pyqwt
PORTVERSION= 5.1.0
PORTREVISION= 1
CATEGORIES= x11-toolkits python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/PyQwt-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyQwt-${PORTVERSION}
diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile
index da49ab66295d..c618849d0382 100644
--- a/x11-toolkits/py-wax/Makefile
+++ b/x11-toolkits/py-wax/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wax
PORTVERSION= 0.3.33
PORTREVISION= 2
CATEGORIES= x11-toolkits devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}gui
+MASTER_SITES= SF/${PORTNAME}gui/${PORTNAME}gui/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile
index bfe8db0f3e83..bda139f7f02c 100644
--- a/x11-toolkits/py-wmdockapps/Makefile
+++ b/x11-toolkits/py-wmdockapps/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wmdockapps
PORTVERSION= 1.21
PORTREVISION= 1
CATEGORIES= x11-toolkits python windowmaker
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pywmdockapps
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 212cf99064d8..88c6c37729de 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wxPython
PORTVERSION= 2.4.2.4
PORTREVISION= 9
CATEGORIES= x11-toolkits python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wxpython
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}Src-${PORTVERSION}
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index eada8e36f471..5233386d4abf 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wxPython
PORTVERSION= 2.6.3.3
PORTREVISION?= 2
CATEGORIES= x11-toolkits python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wxpython
+MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 3c7ac3d28c94..671d4f561566 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wxPython
PORTVERSION= 2.8.7.1
PORTREVISION?= 3
CATEGORIES= x11-toolkits python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wxpython
+MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/x11-toolkits/py-xlib/Makefile b/x11-toolkits/py-xlib/Makefile
index 89a4137561c2..855dd77393e1 100644
--- a/x11-toolkits/py-xlib/Makefile
+++ b/x11-toolkits/py-xlib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xlib
PORTVERSION= 0.14
CATEGORIES= x11-toolkits python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= python-xlib
+MASTER_SITES= SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= python-xlib-${PORTVERSION}
diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile
index 74cf6f35afc9..52c77f24e418 100644
--- a/x11-toolkits/qwt4/Makefile
+++ b/x11-toolkits/qwt4/Makefile
@@ -10,7 +10,6 @@ PORTVERSION= 4.2.0
PORTREVISION= 6
CATEGORIES= x11-toolkits
MASTER_SITES= SF
-MASTER_SITE_SUBDIR=qwt
MAINTAINER= makc@FreeBSD.org
COMMENT= Qwt widget library for technical purposes (old version)
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 87847188dc92..4b5c76c1e2c7 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.18.6
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//}
+MASTER_SITES= SF/rep-gtk/rep-gtk/${PORTVERSION}
DISTNAME= rep-gtk-${PORTVERSION}
MAINTAINER= anray@FreeBSD.org
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 07f183424b2a..a137610f8c7e 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -10,7 +10,6 @@ PORTVERSION= ${RUBY_GNOME_PORTVERSION}
PORTREVISION= 4
CATEGORIES= x11-toolkits ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
-MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${RUBY_GNOME_DISTNAME}
DIST_SUBDIR= ruby
@@ -30,8 +29,7 @@ RUBY_GNOME_PORTVERSION= ${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
.else
RUBY_GNOME_PORTVERSION= ${RUBY_GNOME_VERSION}
.endif
-RUBY_GNOME_MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-RUBY_GNOME_MASTER_SITE_SUBDIR= ruby-gnome
+RUBY_GNOME_MASTER_SITES= SF/ruby-gnome/ruby-gnome/${PORTVERSION}
RUBY_GNOME_DISTNAME= ruby-gnome-all-${RUBY_GNOME_VERSION}
.if defined(RUBY_GNOME_SNAPSHOTDATE)
diff --git a/x11-toolkits/sdl_pango/Makefile b/x11-toolkits/sdl_pango/Makefile
index 540e34cdde79..0ba91b682f8b 100644
--- a/x11-toolkits/sdl_pango/Makefile
+++ b/x11-toolkits/sdl_pango/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sdl_pango
PORTVERSION= 0.1.2
PORTREVISION= 4
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sdlpango
+MASTER_SITES= SF/sdlpango/SDL_Pango/${PORTVERSION}
DISTNAME= SDL_Pango-${PORTVERSION}
PATCH_SITES= http://zarb.org/~gc/t/
diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index 769e1ecedc46..38d34ce5fc34 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tile
PORTVERSION= 0.8.2
PORTREVISION= 1
CATEGORIES= x11-toolkits tk
-MASTER_SITES= SF/tktable
+MASTER_SITES= SF/tktable/${PORTNAME}/${PORTNAME}-0-8-2
MAINTAINER= mm@FreeBSD.org
COMMENT= Themed widget set for Tk
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 9dca2daee4e0..9995036468c8 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tix
PORTVERSION= 8.1.4
PORTREVISION= 5
CATEGORIES= x11-toolkits tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tix
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An extension to the Tk toolkit
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index f998b36f4906..d43a0f370b92 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tk
PORTVERSION= 8.3.5
PORTREVISION= 9
CATEGORIES= x11-toolkits tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
MAINTAINER= dinoex@FreeBSD.org
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 0e5caa8b9c02..0812a309276c 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 8.4.19
PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= x11-toolkits tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index ceb9672c7d53..c84ecd945b55 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tk
PORTVERSION= 8.5.7
#PORTREVISION= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 0da8cb54fffc..71b11bdf1d6b 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tk
PORTVERSION= 8.6.b.1
PORTREVISION= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/tcl/Tcl/8.6b1
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.b.1/b1/}-src
diff --git a/x11-toolkits/tktable/Makefile b/x11-toolkits/tktable/Makefile
index fccd7019574d..1f216af251d3 100644
--- a/x11-toolkits/tktable/Makefile
+++ b/x11-toolkits/tktable/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tktable
PORTVERSION= 2.10
PORTREVISION= 1
CATEGORIES= x11-toolkits tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME:S/tk/Tk/}${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile
index 47a990c3277a..03cb8529fe06 100644
--- a/x11-toolkits/tktreectrl/Makefile
+++ b/x11-toolkits/tktreectrl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tktreectrl
PORTVERSION= 2.2.9
CATEGORIES= x11-toolkits tk
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= scjamorim@bsd.com.br
COMMENT= Multi-column hierarchical listbox widget
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 988636d2826c..6f6483062f6e 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -9,8 +9,7 @@ PORTNAME= v
PORTVERSION= 1.90
PORTREVISION= 3
CATEGORIES= x11-toolkits devel graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= vgui
+MASTER_SITES= SF/${PORTNAME}gui/V%20GUI/${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}-${PORTVERSION}a-patch${EXTRACT_SUFX}
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 17f632038b3e..6c49f933eb9f 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vdk
PORTVERSION= 2.4.1
PORTREVISION= 5
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= vdklib
+MASTER_SITES= SF/${PORTNAME}lib/VDK%20for%20Linux/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ wrapper for GTK+ toolkit
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 37ee8979742e..6f5f40355bb5 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -9,7 +9,7 @@ PORTNAME= vdkbuilder
PORTVERSION= 2.4.1
PORTREVISION= 2
CATEGORIES= x11-toolkits
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}2-${PORTVERSION}
DISTNAME= ${PORTNAME}2-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index f15c683e39ef..def86ec1cff7 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -9,7 +9,7 @@
PORTNAME= viewklass
PORTVERSION= 0.7.2
CATEGORIES= x11-toolkits
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ViewKlass-${PORTVERSION}
DISTNAME= ViewKlass-${PORTVERSION}
MAINTAINER= araujo@FreeBSD.org
diff --git a/x11-toolkits/wxd/Makefile b/x11-toolkits/wxd/Makefile
index 6f7c052195fb..3c8ec4fb1aad 100644
--- a/x11-toolkits/wxd/Makefile
+++ b/x11-toolkits/wxd/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wxd
PORTVERSION= 0.14
PORTREVISION= 1
CATEGORIES= x11-toolkits devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/wxD/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= jochen@daten-chaos.de
diff --git a/x11-toolkits/wxgtk24-docs/Makefile b/x11-toolkits/wxgtk24-docs/Makefile
index e8849bbec861..42d3cb60d1f9 100644
--- a/x11-toolkits/wxgtk24-docs/Makefile
+++ b/x11-toolkits/wxgtk24-docs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= wxgtk_doc
PORTVERSION= 2.4.2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wxwindows
+MASTER_SITES= SF/wxwindows/Documents/${PORTVERSION}
DISTNAME= wxWindows-${PORTVERSION}-HTML
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 9a643bb35c8d..90a7ae6a1c1c 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.4.2
PORTREVISION?= 17
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
CATEGORIES= x11-toolkits
-MASTER_SITES= SF/wxwindows
+MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
diff --git a/x11-toolkits/wxgtk26-docs/Makefile b/x11-toolkits/wxgtk26-docs/Makefile
index 1a02c98e4ff9..7341b9159385 100644
--- a/x11-toolkits/wxgtk26-docs/Makefile
+++ b/x11-toolkits/wxgtk26-docs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wxgtk_doc
PORTVERSION= 2.6.4
CATEGORIES= x11-toolkits
-MASTER_SITES= SF/wxwindows
+MASTER_SITES= SF/wxwindows/Documents/${PORTVERSION}
DISTNAME= wxWidgets-${PORTVERSION}-HTML
MAINTAINER= m.sund@arcor.de
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index bfa5b7d34be7..8dd258fa30a3 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wx
PORTVERSION= 2.6.4
PORTREVISION?= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= SF/wxwindows
+MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
DISTNAME= wxGTK-${PORTVERSION}
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index ac5936977525..321c75cc900a 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wx
PORTVERSION= 2.8.10
PORTREVISION?= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= SF/wxwindows
+MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
DISTNAME= wxGTK-${PORTVERSION:rc1=-rc1}
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index ac5936977525..321c75cc900a 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wx
PORTVERSION= 2.8.10
PORTREVISION?= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= SF/wxwindows
+MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
DISTNAME= wxGTK-${PORTVERSION:rc1=-rc1}
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index d7e3b20e7fdb..d02102e7514b 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -10,8 +10,7 @@
PORTNAME= Xbae
PORTVERSION= 4.60.4
CATEGORIES= x11-toolkits math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xbae
+MASTER_SITES= SF
DISTNAME= xbae-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile
index 8ea1b34ce0e1..6d26c620b128 100644
--- a/x11-toolkits/xclasses/Makefile
+++ b/x11-toolkits/xclasses/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xclasses
PORTVERSION= 1.4.0
PORTREVISION= 2
CATEGORIES= x11-toolkits
-MASTER_SITES= SF/xcmail
+MASTER_SITES= SF/xcmail/Xclasses%20lib/${PORTVERSION}
DISTNAME= Xclasses-public-${PORTVERSION}.src
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 3ed9750ac35c..7808906ff7d6 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 2.2.8
PORTREVISION= 6
CATEGORIES= x11-wm afterstep
MASTER_SITES= ftp://ftp.afterstep.org/stable/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF/${PORTNAME}/AfterStep/${PORTVERSION}
+
DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= glewis@FreeBSD.org
diff --git a/x11-wm/antiwm/Makefile b/x11-wm/antiwm/Makefile
index 8e2eb80f40e9..6df7532dcf33 100644
--- a/x11-wm/antiwm/Makefile
+++ b/x11-wm/antiwm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= antiwm
PORTVERSION= 0.0.5
CATEGORIES= x11-wm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= A minimalist window manager inspired by Ratpoison
diff --git a/x11-wm/badwm/Makefile b/x11-wm/badwm/Makefile
index 72bfdd80790f..b96fd6e9695a 100644
--- a/x11-wm/badwm/Makefile
+++ b/x11-wm/badwm/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.1.1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-wm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/BadWM/BadWM-${PORTVERSION}
DISTNAME= BadWM-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 563fd7473705..1586e3634384 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bbkeys
PORTVERSION= 0.9.1
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= A.J.Caines@halplant.com
COMMENT= A keygrabber for the Blackbox window manager
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index 24656b98aeb2..c4441d8146be 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bbpager
DISTVERSION= 0.4.7
PORTREVISION= 1
CATEGORIES= x11-wm
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= bbtools
+MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= A.J.Caines@halplant.com
COMMENT= A pager for the Blackbox window manager
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index fe1984868ac1..e9065f1c0151 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -9,8 +9,7 @@ PORTNAME= blackbox
PORTVERSION= 0.70.1
PORTREVISION= 2
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= blackboxwm
+MASTER_SITES= SF/${PORTNAME}wm/${PORTNAME}wm/Blackbox%20${PORTVERSION}
MAINTAINER= A.J.Caines@halplant.com
COMMENT= A small and fast window manager for X11R6
diff --git a/x11-wm/boxtools/Makefile b/x11-wm/boxtools/Makefile
index 680f5b74f6bd..e2a28d1cec56 100644
--- a/x11-wm/boxtools/Makefile
+++ b/x11-wm/boxtools/Makefile
@@ -9,8 +9,7 @@ PORTNAME= boxtools
PORTVERSION= 0.70.1
PORTREVISION= 2
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= blackboxwm
+MASTER_SITES= SF/blackboxwm/blackboxwm/Blackbox%20${PORTVERSION}
DISTNAME= blackbox-${PORTVERSION}
MAINTAINER= A.J.Caines@halplant.com
diff --git a/x11-wm/clementine/Makefile b/x11-wm/clementine/Makefile
index 4ca7577cf460..6bbb0cc9e2da 100644
--- a/x11-wm/clementine/Makefile
+++ b/x11-wm/clementine/Makefile
@@ -9,7 +9,7 @@ PORTNAME= clementine
PORTVERSION= 0.0.7
PORTREVISION= 3
CATEGORIES= x11-wm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Source/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Has title bars, iconizing, and styles (unstable)
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index d50880c01208..c9b414f1f666 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -9,7 +9,7 @@ PORTNAME= e16
DISTVERSION= 1.0.0.001
PORTREVISION= 1
CATEGORIES= x11-wm
-MASTER_SITES= SF/enlightenment
+MASTER_SITES= SF/enlightenment/${PORTNAME}/Snapshots
MAINTAINER= gahr@FreeBSD.org
COMMENT= A very artistic X window manager
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index d32531e7ccc7..a82596065df3 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -9,9 +9,9 @@ PORTNAME= e16utils
PORTVERSION= 0.16
PORTREVISION= 7
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/enlightenment/e16menuedit/e16menuedit \
http://public.planetmirror.com/pub/enlightenment/e16utils/
-MASTER_SITE_SUBDIR= enlightenment
+
DISTFILES= e16menuedit-0.1.tar.gz e16keyedit-0.2.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-wm/enlightenment-docs/Makefile b/x11-wm/enlightenment-docs/Makefile
index c7e0bc825968..529919e9c7b3 100644
--- a/x11-wm/enlightenment-docs/Makefile
+++ b/x11-wm/enlightenment-docs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= enlightenment-docs
PORTVERSION= 0.16.8.0.2
PORTREVISION= 1
CATEGORIES= x11-wm
-MASTER_SITES= SF/enlightenment
+MASTER_SITES= SF/enlightenment/e16-docs/${PORTVERSION}
DISTNAME= e16-docs-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 5d674c60b316..e71f1a75a610 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -9,8 +9,7 @@ PORTNAME= epplets
PORTVERSION= 0.12
PORTREVISION= 2
CATEGORIES= x11-wm
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= enlightenment
+MASTER_SITES= SF/enlightenment/${PORTNAME}/${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A collection of Enlightenment dock applications
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index 2a8ab57a8df6..7ae3b15df975 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fvwm95-i18n
PORTVERSION= 2.0.43a
PORTREVISION= 3
CATEGORIES= x11-wm
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= fvwm95
+MASTER_SITES= SF/fvwm95/fvwm95/${PORTVERSION}
DISTNAME= fvwm95-2.0.43a-Autoconf
DISTFILES= ${EXTRACT_ONLY} fvwm95-2.0.43a-FreeBSD.apmpatch.tar.gz
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index ee332a376528..ba47c757c521 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gcompmgr
PORTVERSION= 0.21
PORTREVISION= 4
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gcompmgr
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= umeno@rr.iij4u.or.jp
COMMENT= A GNOME interface to xcompmgr
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index cca0648d3e15..4b9c37fd1eca 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= icewm
PORTVERSION= 1.2.37
PORTREVISION= 1
CATEGORIES= x11-wm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= eitanadlerlist@gmail.com
COMMENT= Window Manager designed for speed, usability and consistency
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 9356f26dc7c8..2fe89e343af4 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= SF \
http://joewing.net/programs/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= Joe's Window Manager
diff --git a/x11-wm/lxsession-lite/Makefile b/x11-wm/lxsession-lite/Makefile
index 14dddc38fccc..aaebdbb9f8db 100644
--- a/x11-wm/lxsession-lite/Makefile
+++ b/x11-wm/lxsession-lite/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lxsession-lite
PORTVERSION= 0.3.6
PORTREVISION= 1
CATEGORIES= x11-wm gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= lxde
+MASTER_SITES= SF/lxde/LXSession%20%28session%20manager%29/LXSession%20Lite%20${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= LXDE Lite Session Manager
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index 8a56c2a53dd8..e88df5593622 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lxsession
PORTVERSION= 0.3.2
PORTREVISION= 1
CATEGORIES= x11-wm gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= lxde
+MASTER_SITES= SF/lxde/LXSession%20%28deprecated%20old%20ver%29/LXSession%20${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= LXDE Session Manager
diff --git a/x11-wm/obpager/Makefile b/x11-wm/obpager/Makefile
index 419eeb0617d9..5ad93238d620 100644
--- a/x11-wm/obpager/Makefile
+++ b/x11-wm/obpager/Makefile
@@ -8,7 +8,7 @@
PORTNAME= obpager
PORTVERSION= 1.8
CATEGORIES= x11-wm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A lightweight pager for netwm compatible window managers
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index f5c5b8a56924..d77488876c0f 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -9,7 +9,7 @@ PORTNAME= phluid
PORTVERSION= 0.0.3
PORTREVISION= 9
CATEGORIES= x11-wm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A window manager that emphasizes efficiency, speed, and beauty
diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile
index e53996a2dbc1..edf6a71f7b57 100644
--- a/x11-wm/plwm/Makefile
+++ b/x11-wm/plwm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= plwm
PORTVERSION= 2.5
PORTREVISION= 1
CATEGORIES= x11-wm python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mwm@mired.org
COMMENT= A window manager construction kit
diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index da6f74b1e698..4abd05fede53 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sapphire
PORTVERSION= 0.15.8
PORTREVISION= 1
CATEGORIES= x11-wm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Small window manager
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 1c2619e00499..8b4a228972cd 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -11,8 +11,7 @@ PORTVERSION= 1.3.5.3
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= x11-wm
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sawmill
+MASTER_SITES= SF/sawmill/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= anray@FreeBSD.org
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index 75d86d36ffde..08ecf4e68c49 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -9,7 +9,7 @@ PORTNAME= waimea
PORTVERSION= 0.4.0
PORTREVISION= 7
CATEGORIES= x11-wm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= An X11 window manager designed for maximum efficiency
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 8734cab74092..a2ab7dc45040 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xfce
PORTVERSION= 3.8.18
PORTREVISION= 9
CATEGORIES= x11-wm xfce
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3%20%28old%29/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= CDE like desktop with GTK
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index 393687cf0a18..b3b56c8021e2 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -9,8 +9,7 @@ PORTNAME= 3ddesktop
PORTVERSION= 0.2.9
PORTREVISION= 6
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= desk3d
+MASTER_SITES= SF/desk3d/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D Virtual Desktop Switcher
diff --git a/x11/bbappconf/Makefile b/x11/bbappconf/Makefile
index cd7c760b11c2..e7f2355d2493 100644
--- a/x11/bbappconf/Makefile
+++ b/x11/bbappconf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bbappconf
PORTVERSION= 0.0.2
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bbtools
+MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gerrit.beine@gmx.de
COMMENT= Application configuring tool for the blackbox window manager
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index fae71f217b95..335fc46c71eb 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= eterm
PORTVERSION= 0.9.5
PORTREVISION= 1
CATEGORIES+= x11
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Eterm-${PORTVERSION}
DISTNAME= Eterm-${PORTVERSION}
MAINTAINER?= olgeni@FreeBSD.org
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index d37f61106d29..c654e03a938d 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fluxbg
PORTVERSION= 0.7
PORTREVISION= 9
CATEGORIES= x11
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Background changer for fluxbox/blackbox
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 35cdcfb0ece9..cea6941a7f59 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gdkxft
PORTVERSION= 1.5
PORTREVISION= 6
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An anti-aliased font support for gtk+
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 800f269c2517..82aeb8851d01 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ggiterm
PORTVERSION= 0.7.1
PORTREVISION= 3
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ggiterm
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= antoine.brodin@laposte.net
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index 3507b68e0178..0aeb7b5b6c55 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gmrun
PORTVERSION= 0.9.2
PORTREVISION= 6
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= garga@FreeBSD.org
COMMENT= A customizable program to run programs, with tab-completion
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 650aed68a5fa..01bd95c17543 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= idesk
PORTVERSION= 0.7.5
PORTREVISION= 6
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= Place launch icons and background directly on your desktop
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index 66e7e149222d..0cc55478310c 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 1.0.0.p12
PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://jcatki.no-ip.org/pub/imwheel/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF/${PORTNAME}/${PORTNAME}-source/1.0.0pre12
+
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p12/pre12/}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 54fb81d32e5c..6e0b48a433a8 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomemm
PORTVERSION= 2.0.1
PORTREVISION= 10
CATEGORIES= x11 gnome
-MASTER_SITES= SF/gtkmm
+MASTER_SITES= SF/gtkmm/OldFiles
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 39f476385a79..c09671f32c05 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libxklavier
PORTVERSION= 3.9
PORTEPOCH= 1
CATEGORIES= x11 gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gswitchit
+MASTER_SITES= SF/gswitchit/${PORTNAME}/${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= An utility library to make XKB stuff easier
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index b50d9f26fa4a..c6ba7dfb2f44 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lxpanel
PORTVERSION= 0.3.7
PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= lxde
+MASTER_SITES= SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION}
MAINTAINER= b89605222@ntu.edu.tw
COMMENT= LXPanel is a lightweight X11 desktop panel
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 501bdafc12a3..739f0a798aa9 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mlterm
PORTVERSION= 2.9.4
PORTREVISION= 4
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/01%20release/${PORTNAME}-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Multilingual X11 terminal emulator
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index fe06dc570f0c..d7a8ba1dc1ed 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mrxvt-devel
PORTVERSION= 0.5.4
PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= materm
+MASTER_SITES= SF/materm/mrxvt%20source/${PORTVERSION}
DISTNAME= mrxvt-${PORTVERSION}
MAINTAINER= lme@FreeBSD.org
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 36c614c00cec..56ae041ac06e 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mrxvt
PORTVERSION= 0.4.2
PORTREVISION= 3
CATEGORIES= x11
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= materm
+MASTER_SITES= SF/materm/${PORTNAME}%20source/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/p5-X11-GUITest/Makefile b/x11/p5-X11-GUITest/Makefile
index 3ea01d572f12..c494af14331b 100644
--- a/x11/p5-X11-GUITest/Makefile
+++ b/x11/p5-X11-GUITest/Makefile
@@ -10,12 +10,9 @@ PORTNAME= X11-GUITest
PORTVERSION= 0.21
PORTREVISION= 2
CATEGORIES= x11 perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= X11/:cpan \
- x11guitest/:sf
+MASTER_SITES= CPAN/X11 \
+ SF/x11guitest/x11guitest/${PORTVERSION}
PKGNAMEPREFIX= p5-
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan,sf
MAINTAINER= ports@FreeBSD.org
COMMENT= Provides GUI testing/interaction facilities
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index 5f75cf863a3c..38d8fc3d1dbf 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -9,8 +9,7 @@ PORTNAME= powershell
PORTVERSION= 0.8
PORTREVISION= 7
CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A terminal emulator for the X11
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index 8644a9e4621f..2be96d6eeb62 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -9,7 +9,7 @@ PORTNAME= qimageblitz
PORTVERSION= 0.0.4
PORTREVISION= 3
CATEGORIES= x11
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QImageBlitz%20${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Graphical effects and filters library for KDE4
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index 0cba659b546f..7d463b128565 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rox-wallpaper
PORTVERSION= 2.1
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rox
+MASTER_SITES= SF/rox/Wallpaper/${PORTVERSION}
DISTNAME= wallpaper-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/x11/ruby-gtktrayicon/Makefile b/x11/ruby-gtktrayicon/Makefile
index e5b218d37a55..4c7d64b2bb31 100644
--- a/x11/ruby-gtktrayicon/Makefile
+++ b/x11/ruby-gtktrayicon/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtktrayicon
PORTVERSION= 0.1.0
PORTREVISION= 6
CATEGORIES= x11 gnome ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ruby-gnome2
+MASTER_SITES= SF/ruby-gnome2/OldFiles
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ruby-gtktrayicon-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index e9830c055a55..abd9da67ce3b 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -11,7 +11,7 @@ PORTNAME= rxvt
PORTVERSION= 2.7.10
PORTREVISION= 5
CATEGORIES+= x11
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dev/${PORTVERSION}
PKGNAMESUFFIX= -devel
MAINTAINER= akosela@andykosela.com
diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile
index 2badf10301e9..dcc31438c594 100644
--- a/x11/stalonetray/Makefile
+++ b/x11/stalonetray/Makefile
@@ -8,7 +8,7 @@
PORTNAME= stalonetray
PORTVERSION= 0.7.6
CATEGORIES= x11
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= STAnd-aLONE system tray
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 35144a9635bb..1180817f3d0f 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tilda
PORTVERSION= 0.9.6
PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= vlad@vlad.uz.ua
COMMENT= Drop down x11 terminal with transparency support
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 6ae7a9e61ed1..a5d3f1a985f5 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -8,9 +8,8 @@
PORTNAME= wmappl
PORTVERSION= 0.71
CATEGORIES= x11 windowmaker
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:main/} \
+MASTER_SITES= SF/wmappl/wmappl/wmappl-${PORTVERSION}:main \
http://www.upl.cs.wisc.edu/~charkins/wmappl/:icons
-MASTER_SITE_SUBDIR=${PORTNAME}/:main
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main \
16x16xpms.tar.gz:icons icons_16x16.tar.gz:icons smallicons.tar.gz:icons
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 99da6bc15452..7ac064f6b20d 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wterm
PORTVERSION= 6.2.9
PORTREVISION= 4
CATEGORIES= x11
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= adam-ports@blacktabby.org
COMMENT= A color vt102 terminal emulator with transparency support
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index c18fbc0b6104..13b8ba6c427c 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -9,7 +9,7 @@ PORTNAME= x3270
PORTVERSION= 3.3.7
PORTREVISION= 2
CATEGORIES= x11 net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index 8879cd65ddde..629c750a6326 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -9,9 +9,9 @@ PORTNAME= xcut
PORTVERSION= 0.2
PORTREVISION= 3
CATEGORIES= x11
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
http://acsys.anu.edu.au/~tpot/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= cy@FreeBSD.org
COMMENT= Manipulate X cut buffers from the commandline
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 56ac5d454bc6..4984f6943f35 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xfree86_xkb_xml
PORTVERSION= 0.4
PORTREVISION= 4
CATEGORIES= x11
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gswitchit
+MASTER_SITES= SF/gswitchit/OldFiles
MAINTAINER= gnome@FreeBSD.org
COMMENT= A little set of XML files useful for dealing with XKB rules
diff --git a/x11/xrsi/Makefile b/x11/xrsi/Makefile
index a1cdc5bacd1b..de013e7897ce 100644
--- a/x11/xrsi/Makefile
+++ b/x11/xrsi/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xrsi
PORTVERSION= 0.9
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A minimalist break enforcer for linux/unix for the prevention of RSI
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index adafe25c0968..3c40f9dc374e 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -9,7 +9,7 @@ PORTNAME= XScreenSaver.App
PORTVERSION= 2.3
PORTREVISION= 3
CATEGORIES= x11 windowmaker
-MASTER_SITES= SF/xscreensaverapp
+MASTER_SITES= SF/xscreensaverapp/${PORTNAME}/${PORTVERSION}
MAINTAINER= hemi@puresimplicity.net
COMMENT= WindowMaker dockapp to control XScreenSaver
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index b22443d03c48..6e2a74df68ed 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xtermset
PORTVERSION= 0.5.2
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= clts
+MASTER_SITES= SF/clts/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Dynamically change some settings of an xterm
diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile
index f5b2d6e3ba76..b5b7ce99ddf8 100644
--- a/x11/xxkb/Makefile
+++ b/x11/xxkb/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xxkb
PORTVERSION= 1.11
CATEGORIES= x11
-MASTER_SITES= SF/xxkb
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= alexander.pohoyda@gmx.net