53 files changed, 55 insertions, 89 deletions

diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile
index dcda7ceab560..ec9a530ff1be 100644
--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	adesklets
 PORTVERSION=	0.6.1
 PORTREVISION=	6
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28core%29/${PORTVERSION}
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	An interactive Imlib2 console for the X Window system
diff --git a/deskutils/appwrapper/Makefile b/deskutils/appwrapper/Makefile
index aba6edbbacc8..4177062af50a 100644
--- a/deskutils/appwrapper/Makefile
+++ b/deskutils/appwrapper/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	appwrapper
 PORTVERSION=	0.1
 PORTREVISION=	2
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/AppWrapper%20${PORTVERSION}
 DISTNAME=	AppWrapper.${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/deskutils/bitcollider/Makefile b/deskutils/bitcollider/Makefile
index 711627c70d07..dd92b575706e 100644
--- a/deskutils/bitcollider/Makefile
+++ b/deskutils/bitcollider/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	bitcollider
 PORTVERSION=	0.6.0
 CATEGORIES=	deskutils multimedia
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Bitcollider/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Bitzi metadata generator
diff --git a/deskutils/blogtk/Makefile b/deskutils/blogtk/Makefile
index 57fe8f1caacb..3fdc34453eb7 100644
--- a/deskutils/blogtk/Makefile
+++ b/deskutils/blogtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	blogtk
 PORTVERSION=	1.1
 PORTREVISION=	4
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/BloGTK-${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	jbq@caraldi.com
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index ee687d6e9146..0f724dbbf43f 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	cdcat
 PORTVERSION=	1.01b	# >1.01 as b doesn't stay for 'beta'
 PORTREVISION=	3
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://cdcat.sourceforge.net/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 DISTNAME=	CdCat-${PORTVERSION}
 
 MAINTAINER=	aren.tyr@gawab.com
diff --git a/deskutils/checkrdf/Makefile b/deskutils/checkrdf/Makefile
index e4a1ffc9961b..fc46517d8ad4 100644
--- a/deskutils/checkrdf/Makefile
+++ b/deskutils/checkrdf/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	checkrdf
 PORTVERSION=	39.4444
 PORTREVISION=	2
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	checkrdf
+MASTER_SITES=	SF
 
 MAINTAINER=	obraun@FreeBSD.org
 COMMENT=	A tool for RDF site summaries based news-check
diff --git a/deskutils/cycle/Makefile b/deskutils/cycle/Makefile
index 9d8a275cac81..aae935428ef2 100644
--- a/deskutils/cycle/Makefile
+++ b/deskutils/cycle/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cycle
 PORTVERSION=	0.3.1
 PORTREVISION=	3
 CATEGORIES=	deskutils biology python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A calendar program for women
diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile
index 54204ee3bb57..72fce3368a6c 100644
--- a/deskutils/dragstack/Makefile
+++ b/deskutils/dragstack/Makefile
@@ -8,8 +8,7 @@ PORTNAME=		dragstack
 PORTVERSION=		1.4
 PORTREVISION=	6
 CATEGORIES=		deskutils kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF
 
 MAINTAINER=		markus@FreeBSD.org
 COMMENT=		Drop stack applet for KDE
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 69154a08d9c7..c2b14e3ed58a 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	drivel
 PORTVERSION=	2.0.2
 PORTREVISION=	10
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Drivel%20%28stable%29/${PORTVERSION}
 
 MAINTAINER=	jbq@caraldi.com
 COMMENT=	Blog editor for GNOME
diff --git a/deskutils/egroupware/Makefile b/deskutils/egroupware/Makefile
index 501e347845e2..d217e9f71709 100644
--- a/deskutils/egroupware/Makefile
+++ b/deskutils/egroupware/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	eGroupware
 PORTVERSION=	1.6.002
 CATEGORIES=	deskutils
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2 \
 		${PORTNAME}-egw-pear-${PORTVERSION}.tar.bz2
 
diff --git a/deskutils/everygui/Makefile b/deskutils/everygui/Makefile
index e198270089e9..f6b4100414f6 100644
--- a/deskutils/everygui/Makefile
+++ b/deskutils/everygui/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	everygui
 PORTVERSION=	0.99.b
 PORTREVISION=	4
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	everygui
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamic GUI for an OS command
diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile
index 88e2461e2ea2..3c0576089f4d 100644
--- a/deskutils/ganttproject/Makefile
+++ b/deskutils/ganttproject/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ganttproject
 DISTVERSION=	2.1-m3
 CATEGORIES=	deskutils java
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-development/Loire%20M3
 EXTRACT_SUFX=	-src.zip
 
 MAINTAINER=	gahr@FreeBSD.org
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index 50c01865cdd2..9be905d10ff6 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ganyremote
 PORTVERSION=	5.10
 PORTREVISION=	1
 CATEGORIES=	deskutils comms gnome
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	anyremote
+MASTER_SITES=	SF/anyremote/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	GNOME frontend for anyRemote
diff --git a/deskutils/glipper/Makefile b/deskutils/glipper/Makefile
index 42432483a6ef..35e9e0bf3972 100644
--- a/deskutils/glipper/Makefile
+++ b/deskutils/glipper/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	glipper
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 
 MAINTAINER=	yuri.pankov@gmail.com
 COMMENT=	Clipboard manager for the GNOME panel
diff --git a/deskutils/gmcal/Makefile b/deskutils/gmcal/Makefile
index d807577ff3a9..5b8360b86894 100644
--- a/deskutils/gmcal/Makefile
+++ b/deskutils/gmcal/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gmcal
 PORTVERSION=	0.0.1
 PORTREVISION=	4
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	libmcal
+MASTER_SITES=	SF/libmcal/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	thierry@pompo.net
 COMMENT=	GMCAL is a GTK+ frontend for the libmcal package
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index b55064c60041..c550b2c24a9e 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gnotime
 PORTVERSION=	2.3.0
 PORTREVISION=	2
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	SF/gttr:gttr SF/qof:qof
+MASTER_SITES=	SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION}:gttr SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION}:qof
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gttr \
 		${QOF_DISTNAME}${EXTRACT_SUFX}:qof
 
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index 2d1b709ff7ae..0fcfacd9a0b5 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gourmet
 PORTVERSION=	0.13.4
 PORTREVISION=	1
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	SF/grecipe-manager
+MASTER_SITES=	SF/grecipe-manager/grecipe-manager/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	ahze@FreeBSD.org
diff --git a/deskutils/gtweakui/Makefile b/deskutils/gtweakui/Makefile
index 85839f248aa0..192c27bde492 100644
--- a/deskutils/gtweakui/Makefile
+++ b/deskutils/gtweakui/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gTweakUI
 PORTVERSION=	0.4.0
 PORTREVISION=	8
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	SF/gtweakui
+MASTER_SITES=	SF
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/deskutils/ithought/Makefile b/deskutils/ithought/Makefile
index f7e6c84e9d7f..aed3985e5106 100644
--- a/deskutils/ithought/Makefile
+++ b/deskutils/ithought/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ithought
 PORTVERSION=	a5
 PORTREVISION=	4
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-alpha
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extensible text management system
diff --git a/deskutils/jjclient/Makefile b/deskutils/jjclient/Makefile
index cc846f1fb99e..d0bafd1cad57 100644
--- a/deskutils/jjclient/Makefile
+++ b/deskutils/jjclient/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	jjclient
 PORTVERSION=	1.0.2
 CATEGORIES=	deskutils
-MASTER_SITES=	SF \
+MASTER_SITES=	SF/justjournal/JustJournal%20UNIX%20Client/${PORTVERSION} \
 		http://www.justjournal.com/software/unix/
-MASTER_SITE_SUBDIR=	justjournal
+
 
 MAINTAINER=	luke@justjournal.com
 COMMENT=	A command line client for posting JustJournal entries
diff --git a/deskutils/kblticker/Makefile b/deskutils/kblticker/Makefile
index d117defebdcd..2988bcf816db 100644
--- a/deskutils/kblticker/Makefile
+++ b/deskutils/kblticker/Makefile
@@ -10,8 +10,7 @@ PORTNAME=		kblticker
 PORTVERSION=		0.2.1
 PORTREVISION=	5
 CATEGORIES=		deskutils kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF
 
 MAINTAINER=		mich@FreeBSD.org
 COMMENT=		KDE bloglines notifier
diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile
index 1d47b82a6dc7..3be20fff7027 100644
--- a/deskutils/kchm/Makefile
+++ b/deskutils/kchm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kchm
 PORTVERSION=	0.6.5
 PORTREVISION=	8
 CATEGORIES=	deskutils kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kchmnew
+MASTER_SITES=	SF/${PORTNAME}new/${PORTNAME}new/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	shirshegsm@gmail.com
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index bcb5e0a2d9c2..77b5727f17ca 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kchmviewer
 PORTVERSION=	3.1
 PORTREVISION=	2
 CATEGORIES=	deskutils kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2
 DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	markus@FreeBSD.org
diff --git a/deskutils/kickpim/Makefile b/deskutils/kickpim/Makefile
index 67112010512a..4da5eb40129b 100644
--- a/deskutils/kickpim/Makefile
+++ b/deskutils/kickpim/Makefile
@@ -8,8 +8,7 @@ PORTNAME=		kickpim
 PORTVERSION=		0.5.3
 PORTREVISION=	8
 CATEGORIES=		deskutils kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20_Society_
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Panel applet for editing and accessing the KDE addressbook
diff --git a/deskutils/kluje/Makefile b/deskutils/kluje/Makefile
index 7a3a7c953fe2..eb9a1f093d67 100644
--- a/deskutils/kluje/Makefile
+++ b/deskutils/kluje/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kluje
 PORTVERSION=	0.8
 PORTREVISION=	3
 CATEGORIES=	deskutils kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A KDE client for the popular online journal site LiveJournal
diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index fe6b48116f40..d0e4220d30a4 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		kmatrix3d
 PORTVERSION=		0.1
 PORTREVISION=	5
 CATEGORIES=		deskutils
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF
 
 MAINTAINER=		gustau.perez@gmail.com
 COMMENT=		Eye candy for KDE, a new Matrix screensaver
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index ca17aacabe6e..522ac0504a1d 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		kooldock
 PORTVERSION=		0.4.7
 PORTREVISION=	2
 CATEGORIES=		deskutils
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/${PORTNAME}-${PORTVERSION}.tar.bz2
 
 MAINTAINER=		gustau.perez@gmail.com
 COMMENT=		OS-X dock-like for KDE
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index a5daaf697865..19a6822a89fe 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	krss
 PORTVERSION=	2.6
 PORTREVISION=	9
 CATEGORIES=	deskutils kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE Rich Site Summary viewer
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index 51759fd38ffa..f84660f04384 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	launchy
 PORTVERSION=	2.1.2
 PORTREVISION=	1
 CATEGORIES=	deskutils
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Launchy%20on%20Linux/${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Access applications, files, and bookmarks with just a few keystrokes
diff --git a/deskutils/ljcharm/Makefile b/deskutils/ljcharm/Makefile
index d6b4b2f47f42..5535823ba663 100644
--- a/deskutils/ljcharm/Makefile
+++ b/deskutils/ljcharm/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	charm
 PORTVERSION=	1.9.1
 CATEGORIES=	deskutils net
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	ljcharm
+MASTER_SITES=	SF/lj${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	seawolf@marinewolf.net
 COMMENT=	A menu-driven python-based livejournal client
diff --git a/deskutils/mcal/Makefile b/deskutils/mcal/Makefile
index 55dc7d608a30..95603e3da34f 100644
--- a/deskutils/mcal/Makefile
+++ b/deskutils/mcal/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mcal
 PORTVERSION=	0.3
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	libmcal
+MASTER_SITES=	SF/lib${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	thierry@pompo.net
 COMMENT=	A libmcal powered cal replacement
diff --git a/deskutils/menumaker/Makefile b/deskutils/menumaker/Makefile
index e2d541fd4054..cdf70b0457cd 100644
--- a/deskutils/menumaker/Makefile
+++ b/deskutils/menumaker/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	menumaker
 PORTVERSION=	0.99.7
 CATEGORIES=	deskutils
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/MenuMaker/${PORTVERSION}
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Menu generator for X Window Managers and desktop environments
diff --git a/deskutils/moregroupware/Makefile b/deskutils/moregroupware/Makefile
index 94e29000f405..7c3166f2edea 100644
--- a/deskutils/moregroupware/Makefile
+++ b/deskutils/moregroupware/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	moregroupware
 PORTVERSION=	0.7.4
 PORTREVISION=	2
 CATEGORIES=	deskutils www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	moregroupware
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-core-${PORTVERSION}
 
 MAINTAINER=	eksffa@freebsdbrasil.com.br
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 6337ce02f804..30cec23117c8 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -8,8 +8,7 @@ PORTNAME?=	multisync
 PORTVERSION=	0.82
 PORTREVISION=	8
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	multisync
+MASTER_SITES=	SF/multisync/OldFiles
 DISTNAME=	multisync-${PORTVERSION}
 
 MAINTAINER?=	pav@FreeBSD.org
diff --git a/deskutils/openproj/Makefile b/deskutils/openproj/Makefile
index 13a3160beac4..d58d9e2680ed 100644
--- a/deskutils/openproj/Makefile
+++ b/deskutils/openproj/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	openproj
 PORTVERSION=	1.4
 CATEGORIES=	deskutils editors java
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OpenProj%20Binaries/${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A free, open source Project Manager
diff --git a/deskutils/pal/Makefile b/deskutils/pal/Makefile
index e53ff638f059..760f605c77f2 100644
--- a/deskutils/pal/Makefile
+++ b/deskutils/pal/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	pal
 PORTVERSION=	0.3.4
 PORTREVISION=	5
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	palcal
+MASTER_SITES=	SF/${PORTNAME}cal/${PORTNAME}/${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	h.skuhra@gmail.com
diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile
index d97edba543e0..041c07e418de 100644
--- a/deskutils/parcellite/Makefile
+++ b/deskutils/parcellite/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	parcellite
 PORTVERSION=	0.9.1
 PORTREVISION=	1
 CATEGORIES=	deskutils
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	joey@mingrone.org
 COMMENT=	A lightweight GTK+ clipboard manager
diff --git a/deskutils/phpgroupware/Makefile b/deskutils/phpgroupware/Makefile
index 593230d3ca63..a0b27a235fc6 100644
--- a/deskutils/phpgroupware/Makefile
+++ b/deskutils/phpgroupware/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	phpgroupware
 PORTVERSION=	0.9.16.012
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	phpgroupware
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/deskutils/phpicalendar/Makefile b/deskutils/phpicalendar/Makefile
index 7a4881962891..32f381d89a26 100644
--- a/deskutils/phpicalendar/Makefile
+++ b/deskutils/phpicalendar/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	phpicalendar
 PORTVERSION=	2.24
 CATEGORIES=	deskutils www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	edwin@mavetju.org
diff --git a/deskutils/preferences.app/Makefile b/deskutils/preferences.app/Makefile
index 4f9081c4756c..951b3375a735 100644
--- a/deskutils/preferences.app/Makefile
+++ b/deskutils/preferences.app/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	preferences
 PORTVERSION=	1.2.0
 PORTREVISION=	4
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	prefsapp
+MASTER_SITES=	SF/prefsapp/prefsapp/${PORTVERSION}
 DISTNAME=	Preferences-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index 95acb47ba16e..8a8d8b5dd38b 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pybookreader
 PORTVERSION=	0.5.0
 PORTREVISION=	3
 CATEGORIES=	deskutils python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/PyBookReader/PyBookReader%2BOrnamentBook-${PORTVERSION}
 DISTNAME=	PyBookReader-${PORTVERSION}
 
 MAINTAINER=	ufo@februality.com
diff --git a/deskutils/q4wine/Makefile b/deskutils/q4wine/Makefile
index 4fdc0bbe7ec2..e9d937b77a89 100644
--- a/deskutils/q4wine/Makefile
+++ b/deskutils/q4wine/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	q4wine
 DISTVERSION=	0.112-r1
 CATEGORIES=	deskutils emulators
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.112-r1
 
 MAINTAINER=	sergey.dyatko@gmail.com
 COMMENT=	QT4 front-end for WINE
diff --git a/deskutils/qorganizer/Makefile b/deskutils/qorganizer/Makefile
index 9b1785e7b79b..4f6750ce27d9 100644
--- a/deskutils/qorganizer/Makefile
+++ b/deskutils/qorganizer/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	qorganizer
 PORTVERSION=	3.1
 PORTREVISION=	1
 CATEGORIES=	deskutils
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	qOrganizer-${PORTVERSION}
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile
index 7e2f9b7b6e5a..0b5bb7314db6 100644
--- a/deskutils/qtm/Makefile
+++ b/deskutils/qtm/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	qtm
 PORTVERSION=	1.1.1
 CATEGORIES=	deskutils
-MASTER_SITES=	SF/catkin
+MASTER_SITES=	SF/catkin/${PORTNAME}-1.1/${PORTNAME}-1.1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Blog management application based on Qt 4
diff --git a/deskutils/rolo/Makefile b/deskutils/rolo/Makefile
index b8822b532b1a..d03d7e802e5d 100644
--- a/deskutils/rolo/Makefile
+++ b/deskutils/rolo/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	rolo
 PORTVERSION=	011
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text-based contact management software
diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile
index fe4d6c3c7ab9..f03cf190d5c0 100644
--- a/deskutils/rox-memo/Makefile
+++ b/deskutils/rox-memo/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	rox-memo
 PORTVERSION=	2.0
 PORTREVISION=	2
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	rox
+MASTER_SITES=	SF/rox/Memo/${PORTVERSION}
 DISTNAME=	memo-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/deskutils/snotes/Makefile b/deskutils/snotes/Makefile
index 882d16456f85..2525d379170b 100644
--- a/deskutils/snotes/Makefile
+++ b/deskutils/snotes/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	snotes
 PORTVERSION=	1.1.5
 PORTREVISION=	3
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	s-notes
+MASTER_SITES=	SF/s-notes/s-notes/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight, configurable sticky notes utility
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index 13714ef35b44..a4955ae77028 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	strigi
 PORTVERSION=	0.6.4
 CATEGORIES=	deskutils
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Desktop searching program
diff --git a/deskutils/sugarcrm/Makefile b/deskutils/sugarcrm/Makefile
index cc584c4b6d8f..9c84b2e3760d 100644
--- a/deskutils/sugarcrm/Makefile
+++ b/deskutils/sugarcrm/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	sugarcrm
 PORTVERSION=	5.2.0d
 CATEGORIES=	deskutils www
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	SugarCE-${PORTVERSION}
 
 MAINTAINER=	nick@foobar.org
diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
index dff2d86cf137..6dd6811274c2 100644
--- a/deskutils/superswitcher/Makefile
+++ b/deskutils/superswitcher/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	superswitcher
 PORTVERSION=	0.3
 PORTREVISION=	3
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	browserbookapp
+MASTER_SITES=	SF/browserbookapp/${PORTNAME}/${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/deskutils/thinkingrock/Makefile b/deskutils/thinkingrock/Makefile
index b579d98be121..d6e3da9ca69e 100644
--- a/deskutils/thinkingrock/Makefile
+++ b/deskutils/thinkingrock/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	thinkingrock
 PORTVERSION=	2.2.1
 CATEGORIES=	deskutils java
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/ThinkingRock/TR%20${PORTVERSION}
 DISTNAME=	tr-${PORTVERSION}
 
 MAINTAINER=	beat@FreeBSD.org
diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile
index f5d865091ffb..afd3a60abb61 100644
--- a/deskutils/vym/Makefile
+++ b/deskutils/vym/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	vym
 PORTVERSION=	1.12.2
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	VYM  (View Your Mind) is a tool to generate and manipulate maps
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 8d55d2d0ea0b..510628ebeeab 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xchm
 PORTVERSION=	1.15
 PORTREVISION=	1
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/xCHM/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Windows HTML Help (.chm) viewer for UNIX