aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2009-08-22 08:23:13 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2009-08-22 08:23:13 +0800
commiteae996a9f9641652ba078469e9a0eeeeb8e87d9f (patch)
treecb7886a130d1273c2e478291667596356f0f524d /graphics
parent572372b987ed91229b78c6f9c5ba00891dadcd77 (diff)
downloadfreebsd-ports-gnome-eae996a9f9641652ba078469e9a0eeeeb8e87d9f.tar.gz
freebsd-ports-gnome-eae996a9f9641652ba078469e9a0eeeeb8e87d9f.tar.zst
freebsd-ports-gnome-eae996a9f9641652ba078469e9a0eeeeb8e87d9f.zip
- Switch SourceForge ports to the new File Release System: categories starting with G
Diffstat (limited to 'graphics')
-rw-r--r--graphics/GraphicsMagick/Makefile2
-rw-r--r--graphics/GraphicsMagick12/Makefile2
-rw-r--r--graphics/ImageMagick/Makefile6
-rw-r--r--graphics/aalib/Makefile2
-rw-r--r--graphics/allegrogl/Makefile2
-rw-r--r--graphics/ampasCTL/Makefile3
-rw-r--r--graphics/animorph/Makefile3
-rw-r--r--graphics/aoi/Makefile2
-rw-r--r--graphics/aqsis/Makefile2
-rw-r--r--graphics/autopano-sift-c/Makefile2
-rw-r--r--graphics/autoq3d/Makefile2
-rw-r--r--graphics/autotrace/Makefile2
-rw-r--r--graphics/aview/Makefile3
-rw-r--r--graphics/ayam/Makefile2
-rw-r--r--graphics/barbecue/Makefile3
-rw-r--r--graphics/bmeps/Makefile3
-rw-r--r--graphics/c-a-i-r/Makefile2
-rw-r--r--graphics/cbrpager/Makefile2
-rw-r--r--graphics/cegui/Makefile3
-rw-r--r--graphics/cimg/Makefile2
-rw-r--r--graphics/cinepaint/Makefile2
-rw-r--r--graphics/comical/Makefile3
-rw-r--r--graphics/comix/Makefile2
-rw-r--r--graphics/corona/Makefile3
-rw-r--r--graphics/crystalentitylayer/Makefile3
-rw-r--r--graphics/crystalspace/Makefile3
-rw-r--r--graphics/cthumb/Makefile3
-rw-r--r--graphics/danpei/Makefile3
-rw-r--r--graphics/darknock/Makefile2
-rw-r--r--graphics/devil/Makefile2
-rw-r--r--graphics/diacanvas2/Makefile2
-rw-r--r--graphics/djview4/Makefile2
-rw-r--r--graphics/dynamechs/Makefile2
-rw-r--r--graphics/exif/Makefile3
-rw-r--r--graphics/figurine/Makefile3
-rw-r--r--graphics/flashplayer/Makefile2
-rw-r--r--graphics/flphoto/Makefile3
-rw-r--r--graphics/fnlib/Makefile2
-rw-r--r--graphics/fortytwo/Makefile3
-rw-r--r--graphics/freeimage/Makefile2
-rw-r--r--graphics/frontline/Makefile2
-rw-r--r--graphics/ftgl/Makefile2
-rw-r--r--graphics/fusefs-gphotofs/Makefile3
-rw-r--r--graphics/gauche-gl/Makefile2
-rw-r--r--graphics/gcolor2/Makefile3
-rw-r--r--graphics/geeqie/Makefile2
-rw-r--r--graphics/geoserver/Makefile2
-rw-r--r--graphics/gimageview/Makefile3
-rw-r--r--graphics/gimpfx-foundry/Makefile2
-rw-r--r--graphics/gkrellkam2/Makefile2
-rw-r--r--graphics/gle-graphics/Makefile3
-rw-r--r--graphics/gle/Makefile6
-rw-r--r--graphics/gnomeiconedit/Makefile2
-rw-r--r--graphics/goom/Makefile3
-rw-r--r--graphics/gphoto2/Makefile3
-rw-r--r--graphics/gpicview/Makefile3
-rw-r--r--graphics/graphopt/Makefile3
-rw-r--r--graphics/gsculpt/Makefile2
-rw-r--r--graphics/gsnapshot/Makefile3
-rw-r--r--graphics/gtkam/Makefile2
-rw-r--r--graphics/gwenview-kde4/Makefile3
-rw-r--r--graphics/gwenview/Makefile3
-rw-r--r--graphics/hugin/Makefile2
-rw-r--r--graphics/imgtops/Makefile3
-rw-r--r--graphics/imgv/Makefile3
-rw-r--r--graphics/jdraw/Makefile3
-rw-r--r--graphics/jpatch/Makefile3
-rw-r--r--graphics/k3d/Makefile2
-rw-r--r--graphics/kbarcode/Makefile2
-rw-r--r--graphics/kdc2tiff/Makefile3
-rw-r--r--graphics/kipi-plugins-kde4/Makefile2
-rw-r--r--graphics/kipi-plugins/Makefile3
-rw-r--r--graphics/kludge3d/Makefile2
-rw-r--r--graphics/kudu/Makefile2
-rw-r--r--graphics/lcms/Makefile4
-rw-r--r--graphics/libGL/bsd.mesalib.mk12
-rw-r--r--graphics/libafterimage/Makefile2
-rw-r--r--graphics/libboard/Makefile2
-rw-r--r--graphics/libemf/Makefile2
-rw-r--r--graphics/libexif-gtk/Makefile3
-rw-r--r--graphics/libflash/Makefile2
-rw-r--r--graphics/libggi/Makefile4
-rw-r--r--graphics/libggigcp/Makefile4
-rw-r--r--graphics/libggimisc/Makefile4
-rw-r--r--graphics/libggiwmh/Makefile4
-rw-r--r--graphics/libgltext/Makefile2
-rw-r--r--graphics/libgnomecanvasmm/Makefile2
-rw-r--r--graphics/libgphoto2/Makefile3
-rw-r--r--graphics/libimg/Makefile2
-rw-r--r--graphics/libiptcdata/Makefile3
-rw-r--r--graphics/libkdcraw-kde4/Makefile3
-rw-r--r--graphics/libkdcraw/Makefile3
-rw-r--r--graphics/libkexif/Makefile3
-rw-r--r--graphics/libkexiv2-kde4/Makefile3
-rw-r--r--graphics/libkexiv2/Makefile3
-rw-r--r--graphics/libkipi-kde4/Makefile3
-rw-r--r--graphics/libkipi/Makefile3
-rw-r--r--graphics/libmng/Makefile4
-rw-r--r--graphics/libpano12/Makefile3
-rw-r--r--graphics/libpano13/Makefile3
-rw-r--r--graphics/libvisual-plugins/Makefile2
-rw-r--r--graphics/libvisual/Makefile2
-rw-r--r--graphics/libvisual04-plugins/Makefile3
-rw-r--r--graphics/libvisual04/Makefile2
-rw-r--r--graphics/libwmf/Makefile3
-rw-r--r--graphics/libwpg/Makefile2
-rw-r--r--graphics/libwpg01/Makefile2
-rw-r--r--graphics/makehuman/Makefile2
-rw-r--r--graphics/mapyrus/Makefile3
-rw-r--r--graphics/mesagl/Makefile4
-rw-r--r--graphics/meshviewer/Makefile2
-rw-r--r--graphics/mhgui/Makefile3
-rw-r--r--graphics/ming/Makefile3
-rw-r--r--graphics/netpbm/Makefile5
-rw-r--r--graphics/nurbs++/Makefile3
-rw-r--r--graphics/ogre3d/Makefile2
-rw-r--r--graphics/opencv/Makefile2
-rw-r--r--graphics/opendis/Makefile4
-rw-r--r--graphics/openjump/Makefile2
-rw-r--r--graphics/openrm/Makefile2
-rw-r--r--graphics/optipng/Makefile2
-rw-r--r--graphics/p5-Cairo/Makefile2
-rw-r--r--graphics/p5-ming/Makefile3
-rw-r--r--graphics/panoglview/Makefile2
-rw-r--r--graphics/pencil/Makefile2
-rw-r--r--graphics/pfscalibration/Makefile3
-rw-r--r--graphics/pfstmo/Makefile3
-rw-r--r--graphics/photopc/Makefile3
-rw-r--r--graphics/php4-ffmpeg/Makefile3
-rw-r--r--graphics/php5-ffmpeg/Makefile3
-rw-r--r--graphics/piddle/Makefile3
-rw-r--r--graphics/pixie/Makefile2
-rw-r--r--graphics/plasma-kmod/Makefile2
-rw-r--r--graphics/png/Makefile3
-rw-r--r--graphics/pngcheck/Makefile3
-rw-r--r--graphics/pngcrush/Makefile2
-rw-r--r--graphics/pngquant/Makefile3
-rw-r--r--graphics/pngwriter/Makefile2
-rw-r--r--graphics/pornview/Makefile3
-rw-r--r--graphics/price/Makefile3
-rw-r--r--graphics/pvmpov/Makefile3
-rw-r--r--graphics/py-PyX/Makefile3
-rw-r--r--graphics/py-cgkit/Makefile3
-rw-r--r--graphics/py-exif/Makefile3
-rw-r--r--graphics/py-freeimagepy/Makefile2
-rw-r--r--graphics/py-glewpy/Makefile2
-rw-r--r--graphics/py-ming/Makefile3
-rw-r--r--graphics/py-opengl/Makefile3
-rw-r--r--graphics/py-paint/Makefile3
-rw-r--r--graphics/py-visual/Makefile3
-rw-r--r--graphics/q-graph/Makefile2
-rw-r--r--graphics/qcamview/Makefile3
-rw-r--r--graphics/quesoglc/Makefile2
-rw-r--r--graphics/ray++/Makefile3
-rw-r--r--graphics/reallyslick/Makefile2
-rw-r--r--graphics/rgbpaint/Makefile2
-rw-r--r--graphics/ruby-graph/Makefile3
-rw-r--r--graphics/sage/Makefile3
-rw-r--r--graphics/scale2x/Makefile3
-rw-r--r--graphics/scwm-icons/Makefile2
-rw-r--r--graphics/sharpconstruct/Makefile3
-rw-r--r--graphics/skencil/Makefile3
-rw-r--r--graphics/stamp/Makefile3
-rw-r--r--graphics/structuresynth/Makefile2
-rw-r--r--graphics/synfigstudio/Makefile2
-rw-r--r--graphics/tgif/Makefile2
-rw-r--r--graphics/tiff2png/Makefile3
-rw-r--r--graphics/tintfu/Makefile3
-rw-r--r--graphics/togl/Makefile2
-rw-r--r--graphics/truevision/Makefile2
-rw-r--r--graphics/ufraw/Makefile2
-rw-r--r--graphics/vid/Makefile3
-rw-r--r--graphics/wxsvg/Makefile3
-rw-r--r--graphics/xaos/Makefile2
-rw-r--r--graphics/xmedcon/Makefile2
-rw-r--r--graphics/xmms-finespectrum/Makefile3
-rw-r--r--graphics/xmms-goom/Makefile2
-rw-r--r--graphics/xmms-paranormal/Makefile3
-rw-r--r--graphics/xmms-scivi/Makefile3
-rw-r--r--graphics/xmms-vumeter/Makefile3
-rw-r--r--graphics/xmorph/Makefile2
-rw-r--r--graphics/xpaint/Makefile4
-rw-r--r--graphics/xv/Makefile4
-rw-r--r--graphics/zimg/Makefile3
184 files changed, 209 insertions, 288 deletions
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 97c6568586d2..312843988e1d 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -12,7 +12,7 @@ PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.1/
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+
MAINTAINER= glarkin@FreeBSD.org
COMMENT= Fast image processing tools based on ImageMagick
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 3a3cdc039f2c..b610fca92ac2 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.2/
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+
MAINTAINER= glarkin@FreeBSD.org
COMMENT= Fast image processing tools based on ImageMagick
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 3781626c899b..a0ecc83ea872 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -10,10 +10,12 @@ DISTVERSION= 6.5.4-10
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \
- ${MASTER_SITE_SOURCEFORGE} \
+ SF/${PORTNAME:L}/${PORTNAME}/00-6.5.4 \
+
ftp://ftp.nluug.nl/pub/ImageMagick/ \
+
ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/
-MASTER_SITE_SUBDIR= imagemagick
+
MAINTAINER= mm@FreeBSD.org
COMMENT= Image processing tools
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 50433a5c2d02..d4afd4c99405 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aalib
PORTVERSION= 1.4.r5
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= SF/aa-project
+MASTER_SITES= SF/aa-project/aa-lib/1.4rc5
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile
index d476ec343870..79e2034c93e1 100644
--- a/graphics/allegrogl/Makefile
+++ b/graphics/allegrogl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= allegrogl
PORTVERSION= 0.4.3
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/AllegroGL%20source/${PORTVERSION}
DISTNAME= alleggl-${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
diff --git a/graphics/ampasCTL/Makefile b/graphics/ampasCTL/Makefile
index 623aebf302d4..a8d7c2f8761f 100644
--- a/graphics/ampasCTL/Makefile
+++ b/graphics/ampasCTL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ampasCTL
PORTVERSION= 1.4.0
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ampasctl
+MASTER_SITES= SF/${PORTNAME:L}/ctl/${PORTVERSION}
DISTNAME= ctl-${PORTVERSION}
MAINTAINER= nork@FreeBSD.org
diff --git a/graphics/animorph/Makefile b/graphics/animorph/Makefile
index b0d5a5ebb77f..d033bdf59a75 100644
--- a/graphics/animorph/Makefile
+++ b/graphics/animorph/Makefile
@@ -8,8 +8,7 @@
PORTNAME= animorph
PORTVERSION= 0.3
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= makehuman
+MASTER_SITES= SF/makehuman/MakeHuman%20Source/MakeHuman_091
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Morphing engine for MakeHuman
diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index ed041812dddf..2344d3cb845d 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aoi
PORTVERSION= 2.5.1
PORTREVISION= 2
CATEGORIES= graphics java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ArtOfIllusion/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 9b772978ec83..3ac1de64e0e7 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -10,7 +10,7 @@ PORTNAME= aqsis
PORTVERSION= 1.4.2
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A photorealistic rendering system
diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile
index f7c2b0ab90c5..920af5152b0d 100644
--- a/graphics/autopano-sift-c/Makefile
+++ b/graphics/autopano-sift-c/Makefile
@@ -9,7 +9,7 @@ PORTNAME= autopano-sift-C
PORTVERSION= 2.5.0
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF/hugin
+MASTER_SITES= SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Automatic panorama control point generation tool, C port
diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile
index 369b15553c82..f33df82ac7e2 100644
--- a/graphics/autoq3d/Makefile
+++ b/graphics/autoq3d/Makefile
@@ -9,7 +9,7 @@ PORTNAME= autoq3d
DISTVERSION= 1.36
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION}
DISTNAME= AutoQ3DGPL${PORTVERSION:C/\./-/}qt4source
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 6041eb48eda5..3dca36f70d72 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -9,7 +9,7 @@ PORTNAME= autotrace
PORTVERSION= 0.31.1
PORTREVISION= 15
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/AutoTrace/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert bitmap to vector graphics
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index cc5fbf0ba5b0..c4d724b417fb 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -9,8 +9,7 @@ PORTNAME= aview
PORTVERSION= 1.3.0.r1
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aa-project
+MASTER_SITES= SF/aa-project/${PORTNAME}/1.3.0rc1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile
index 082f4f423377..1cb419211154 100644
--- a/graphics/ayam/Makefile
+++ b/graphics/ayam/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ayam
PORTVERSION= 1.15.1
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Ayam/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}.src
MAINTAINER= gahr@FreeBSD.org
diff --git a/graphics/barbecue/Makefile b/graphics/barbecue/Makefile
index f2e3eeae0513..64b58cf337a8 100644
--- a/graphics/barbecue/Makefile
+++ b/graphics/barbecue/Makefile
@@ -9,8 +9,7 @@ PORTNAME= barbecue
PORTVERSION= 1.0.6d
PORTREVISION= 3
CATEGORIES= graphics print java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= thierry@FreeBSD.org
COMMENT= A Java barcode generator
diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile
index 341ae268ca44..2c43296331ed 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bmeps
PORTVERSION= 2.1.2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= corky1951@comcast.net
COMMENT= Convert bitmap images (PNG/JPEG/NetPBM) to EPS
diff --git a/graphics/c-a-i-r/Makefile b/graphics/c-a-i-r/Makefile
index f6e629aa6d3a..6c8925b661f0 100644
--- a/graphics/c-a-i-r/Makefile
+++ b/graphics/c-a-i-r/Makefile
@@ -8,7 +8,7 @@
PORTNAME= c-a-i-r
PORTVERSION= 2.17
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CAIR%20v${PORTVERSION}
DISTNAME= CAIR_MT_v2.17
MAINTAINER= buganini@gmail.com
diff --git a/graphics/cbrpager/Makefile b/graphics/cbrpager/Makefile
index 6bbb4e04ae16..68c6e89dd15f 100644
--- a/graphics/cbrpager/Makefile
+++ b/graphics/cbrpager/Makefile
@@ -10,7 +10,7 @@ PORTNAME= cbrpager
PORTVERSION= 0.9.19
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A viewer for cbr (comic book archive) files
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 8c18c5306fa6..2aa80a56f135 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cegui
PORTVERSION= 0.6.2b
CATEGORIES= graphics devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=crayzedsgui
+MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.6.2
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index f12eb96df782..5cf487e937cf 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.3.1
PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= graphics devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= CImg_${DISTVERSION}
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION},${PORTEPOCH}
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 768423b4a595..76f16b2f6e6b 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -9,7 +9,7 @@ PORTNAME= cinepaint
PORTVERSION= 0.22
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/CinePaint/CinePaint-${PORTVERSION}-1
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index bb7d075fd86e..e8039c830a7f 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -9,8 +9,7 @@ PORTNAME= comical
PORTVERSION= 0.8
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A sequential image viewer
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index c3fc6a562598..e9eb85a8be1e 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -10,7 +10,7 @@ PORTNAME= comix
PORTVERSION= 4.0.4
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mezz@FreeBSD.org
COMMENT= A GTK2 comic book viewer for .cbz, .cbr and .cbt files
diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile
index aafe38970697..12940f5f471d 100644
--- a/graphics/corona/Makefile
+++ b/graphics/corona/Makefile
@@ -8,8 +8,7 @@ PORTNAME= corona
PORTVERSION= 1.0.2
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A graphics library that supports most image formats
diff --git a/graphics/crystalentitylayer/Makefile b/graphics/crystalentitylayer/Makefile
index 7161921afb7f..8c6918eddd50 100644
--- a/graphics/crystalentitylayer/Makefile
+++ b/graphics/crystalentitylayer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= crystalentitylayer
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cel
+MASTER_SITES= SF/cel/cel/${PORTVERSION}
DISTNAME= cel-src-${PORTVERSION}
DIST_SUBDIR= crystalspace
diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile
index 8f63aecb61f6..4604c287963f 100644
--- a/graphics/crystalspace/Makefile
+++ b/graphics/crystalspace/Makefile
@@ -9,8 +9,7 @@ PORTNAME= crystalspace
PORTVERSION= 1.0.2
PORTREVISION= 9
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= crystal
+MASTER_SITES= SF/crystal/crystal/${PORTVERSION}
DISTNAME= ${PORTNAME:S/$/-src/}-${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
diff --git a/graphics/cthumb/Makefile b/graphics/cthumb/Makefile
index 68f814023f7c..9cdfa318d847 100644
--- a/graphics/cthumb/Makefile
+++ b/graphics/cthumb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cthumb
PORTVERSION= 4.2
PORTREVISION= 1
CATEGORIES= graphics www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cthumb
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A themable web picture album generator
diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile
index e780f2654181..862caf971664 100644
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@@ -9,8 +9,7 @@ PORTNAME= danpei
PORTVERSION= 2.9.7
PORTREVISION= 6
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= danpei
+MASTER_SITES= SF
MAINTAINER= bu7cher@yandex.ru
COMMENT= Image Viewer for X Window System with thumbnail preview feature
diff --git a/graphics/darknock/Makefile b/graphics/darknock/Makefile
index fb990eb83cd0..22199e5014f1 100644
--- a/graphics/darknock/Makefile
+++ b/graphics/darknock/Makefile
@@ -9,7 +9,7 @@ PORTNAME= darknock
DISTVERSION= 0.3.0
PORTREVISION= 1
CATEGORIES= graphics kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A program that can detect edges in images
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 62834ecbbc90..4e5c9bfa7237 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.7.8
PORTEPOCH= 1
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= SF/openil
+MASTER_SITES= SF/openil/DevIL/${PORTVERSION}
DISTNAME= DevIL-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 4efd082af426..8ae0ae48013d 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -10,7 +10,7 @@ PORTNAME= diacanvas2
PORTVERSION= 0.14.4
PORTREVISION= 3
CATEGORIES= graphics gnome
-MASTER_SITES= SF
+MASTER_SITES= SF/diacanvas/DiaCanvas2/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A general drawing canvas from dia dialog editor
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 364eebd75b78..ab1b88a719b0 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -9,7 +9,7 @@ PORTNAME= djview
PORTVERSION= 4.5
PORTREVISION= 0
CATEGORIES= graphics
-MASTER_SITES= SF/djvu
+MASTER_SITES= SF/djvu/DjView/${PORTVERSION}
DISTNAME= ${PORTNAME}4-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile
index bd3e16e3d741..e1e83b02a503 100644
--- a/graphics/dynamechs/Makefile
+++ b/graphics/dynamechs/Makefile
@@ -11,7 +11,7 @@ PORTVERSION= 4.0.p1
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/4.0pre1
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.p/pre/}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index b64066d17f03..0903fbb04671 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -8,8 +8,7 @@
PORTNAME= exif
PORTVERSION= 0.6.17
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libexif
+MASTER_SITES= SF/lib${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= Command line utility to read and manipulate EXIF data
diff --git a/graphics/figurine/Makefile b/graphics/figurine/Makefile
index eb8a99413ea6..91c704c20bef 100644
--- a/graphics/figurine/Makefile
+++ b/graphics/figurine/Makefile
@@ -9,8 +9,7 @@ PORTNAME= figurine
PORTVERSION= 1.0.5
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A drawing program for X11
diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile
index 854e9c0d4615..f59db136aba2 100644
--- a/graphics/flashplayer/Makefile
+++ b/graphics/flashplayer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= flashplayer
PORTVERSION= 0.4.13
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= SF/gplflash
+MASTER_SITES= SF/gplflash/gplflash/${PORTVERSION}
DISTNAME= gplflash-${PORTVERSION}
MAINTAINER= llwang@infor.org
diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index 157e6c467db8..799f7458e209 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -9,8 +9,7 @@ PORTNAME= flphoto
PORTVERSION= 1.3.1
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fltk
+MASTER_SITES= SF/fltk/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 8aeb983c20b4..63684199031c 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fnlib
PORTVERSION= 0.5
PORTREVISION= 7
CATEGORIES= graphics
-MASTER_SITES= SF/enlightenment
+MASTER_SITES= SF/enlightenment/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Fonts and font libraries necessary for Enlightenment
diff --git a/graphics/fortytwo/Makefile b/graphics/fortytwo/Makefile
index cbb8e3445bf2..6dfb5b346f43 100644
--- a/graphics/fortytwo/Makefile
+++ b/graphics/fortytwo/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fortytwo
PORTVERSION= 0.2.0
PORTREVISION= 2
CATEGORIES= graphics gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fortytwo
+MASTER_SITES= SF/${PORTNAME}/FT%20%2842%29/${PORTVERSION}
DISTFILES= FT-${PORTVERSION}-src.tgz \
FT-${PORTVERSION}-api-ref.tgz
diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index adb925600c0b..367bf11283f7 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -8,7 +8,7 @@
PORTNAME= freeimage
PORTVERSION= 3.12.0
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Source%20Distribution/${PORTVERSION}
DISTNAME= FreeImage${PORTVERSION:S/.//g}
MAINTAINER= gahr@FreeBSD.org
diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile
index 5252c116b584..f540ab95467d 100644
--- a/graphics/frontline/Makefile
+++ b/graphics/frontline/Makefile
@@ -9,7 +9,7 @@ PORTNAME= frontline
PORTVERSION= 0.5.4
PORTREVISION= 8
CATEGORIES= graphics gnome
-MASTER_SITES= SF/autotrace
+MASTER_SITES= SF/autotrace/FrontLine/${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= An autotrace GUI FRONTend like streamLINE(TM)
diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile
index dc5219918ce3..8504ef269058 100644
--- a/graphics/ftgl/Makefile
+++ b/graphics/ftgl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ftgl
DISTVERSION= 2.1.3-rc5
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/FTGL%20Source/2.1.3%7Erc5
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= An OpenGL FreeType fonts rendering library
diff --git a/graphics/fusefs-gphotofs/Makefile b/graphics/fusefs-gphotofs/Makefile
index ba32ba973f7b..0bc1f974cbd2 100644
--- a/graphics/fusefs-gphotofs/Makefile
+++ b/graphics/fusefs-gphotofs/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gphotofs
PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= graphics sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gphoto
+MASTER_SITES= SF/gphoto/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= fusefs-
MAINTAINER= pav@FreeBSD.org
diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile
index 20e9b4c4f706..fd2bd9de09c1 100644
--- a/graphics/gauche-gl/Makefile
+++ b/graphics/gauche-gl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gl
PORTVERSION= 0.4.4
PORTREVISION= 1
CATEGORIES= graphics scheme
-MASTER_SITES= SF
+MASTER_SITES= SF/gauche/Gauche-gl/${PORTVERSION}
PKGNAMEPREFIX= gauche-
DISTNAME= Gauche-${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile
index b8ffc9dd6ff2..50d688654130 100644
--- a/graphics/gcolor2/Makefile
+++ b/graphics/gcolor2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gcolor2
PORTVERSION= 0.4
PORTREVISION= 5
CATEGORIES= graphics gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= smyru@heron.pl
COMMENT= A simple GTK+ 2.0 color selector
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 335441fa5aed..71449d1b4e19 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -8,7 +8,7 @@
PORTNAME= geeqie
DISTVERSION= 1.0beta2
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0beta2
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Lightweight image viewer forked from GQview
diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 831a9065a9b9..cf631e32f3ea 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -8,7 +8,7 @@
PORTNAME= geoserver
PORTVERSION= 1.7.4
CATEGORIES= graphics geography java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/GeoServer/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
MAINTAINER= wenheping@gmail.com
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 35f25c1b09af..675702023bed 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gimageview
PORTVERSION= 0.2.27
PORTREVISION= 7
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtkmmviewer
+MASTER_SITES= SF/gtkmmviewer/${PORTNAME}/${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Yet another GTK+ based image viewer
diff --git a/graphics/gimpfx-foundry/Makefile b/graphics/gimpfx-foundry/Makefile
index 87f5a562768b..d9cbfea1964c 100644
--- a/graphics/gimpfx-foundry/Makefile
+++ b/graphics/gimpfx-foundry/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gimpfx-foundry
PORTVERSION= 20080323
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-scriptpack/scriptpack-${PORTVERSION}
DISTNAME= ${PORTNAME}-scriptpack-${PORTVERSION}
MAINTAINER= cmt@burggraben.net
diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile
index 083fdbd9fd08..cc088907398c 100644
--- a/graphics/gkrellkam2/Makefile
+++ b/graphics/gkrellkam2/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gkrellkam
PORTVERSION= 2.0.0
PORTREVISION= 9
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile
index 64dc26f38a74..b319aa1e55b5 100644
--- a/graphics/gle-graphics/Makefile
+++ b/graphics/gle-graphics/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gle-graphics
PORTVERSION= 4.0.12
PORTREVISION= 3
CATEGORIES= graphics print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= glx
+MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${PORTVERSION}
DISTNAME= GLE-${PORTVERSION}-src
MAINTAINER= nivit@FreeBSD.org
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 66460abe09b8..ca62d234bb7c 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -9,11 +9,13 @@ PORTNAME= gle
PORTVERSION= 3.1.0
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF\
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}\
http://linas.org/gle/pub/ \
+
http://metalab.unc.edu/pub/Linux/libs/X/ \
+
ftp://tsx-11.mit.edu/pub/linux/sources/libs/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ports@dclg.ca
COMMENT= A GL Tubing and Extrusion Library
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index c454e23f8b01..5a82bbfa423c 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomeiconedit
PORTVERSION= 1.2.0
PORTREVISION= 7
CATEGORIES= graphics gnome
-MASTER_SITES= SF/giconedit
+MASTER_SITES= SF/giconedit/giconedit-${PORTVERSION}/tar.gz
DISTNAME= gnome-iconedit-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/goom/Makefile b/graphics/goom/Makefile
index 927e2828cd93..d6f50edf05e7 100644
--- a/graphics/goom/Makefile
+++ b/graphics/goom/Makefile
@@ -9,8 +9,7 @@ PORTNAME= goom
PORTVERSION= 2k4.0
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2k4/0
DISTNAME= ${PORTNAME}-${PORTVERSION:S|.|-|}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 9d63dcaa1826..135d55a4ee78 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gphoto2
PORTVERSION= 2.4.5
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gphoto
+MASTER_SITES= SF/gphoto/gphoto/${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= A command-line frontend to libgphoto2
diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile
index 65bf3d171848..5b9a68b70923 100644
--- a/graphics/gpicview/Makefile
+++ b/graphics/gpicview/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gpicview
PORTVERSION= 0.1.11
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= lxde
+MASTER_SITES= SF/lxde/GPicView%20%28image%20Viewer%29/GPicView%20${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= A Simple and Fast Image Viewer for X
diff --git a/graphics/graphopt/Makefile b/graphics/graphopt/Makefile
index e083ae9137ec..32597b3c1767 100644
--- a/graphics/graphopt/Makefile
+++ b/graphics/graphopt/Makefile
@@ -10,8 +10,7 @@ PORTNAME= graphopt
PORTVERSION= 0.4.1
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index 2b424ff261ee..aaae84f1dbdc 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gsculpt
PORTVERSION= 0.99.46.2
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/gSculpt-${PORTVERSION}-alpha
DISTNAME= gSculpt-${PORTVERSION}-alpha-src
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile
index 6d0e9fa5af58..6958c64194a1 100644
--- a/graphics/gsnapshot/Makefile
+++ b/graphics/gsnapshot/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gsnapshot
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gould
+MASTER_SITES= SF/gould/${PORTNAME}/release%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A gtk+ based screen capture
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index b2c6239238ca..cf7d3ef19f1b 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gtkam
PORTVERSION= 0.1.16.1
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF/gphoto
+MASTER_SITES= SF/gphoto/${PORTNAME}/${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= Download and view files from various digital cameras
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index dcce55d3cc1b..107f3d79b165 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gwenview
PORTVERSION= 1.4.2
PORTREVISION= 5
CATEGORIES= graphics kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= markus@FreeBSD.org
COMMENT= An image viewer and browser for the KDE environment
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index dcce55d3cc1b..107f3d79b165 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gwenview
PORTVERSION= 1.4.2
PORTREVISION= 5
CATEGORIES= graphics kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= markus@FreeBSD.org
COMMENT= An image viewer and browser for the KDE environment
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index a7eab4e0475f..1623dbe98cf6 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -9,7 +9,7 @@ PORTNAME= hugin
PORTVERSION= 0.7.0
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= vd@FreeBSD.org
COMMENT= A GUI for Panorama Tools, to stitch panoramic images
diff --git a/graphics/imgtops/Makefile b/graphics/imgtops/Makefile
index 29f8dc85f3da..b272588e6fb7 100644
--- a/graphics/imgtops/Makefile
+++ b/graphics/imgtops/Makefile
@@ -8,8 +8,7 @@
PORTNAME= imgtops
PORTVERSION= 1.0
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= timbob@bigpond.com
COMMENT= Create efficient Encapsulated Postscript files from images
diff --git a/graphics/imgv/Makefile b/graphics/imgv/Makefile
index 1dd2879cd84b..f64f6a0b1f1e 100644
--- a/graphics/imgv/Makefile
+++ b/graphics/imgv/Makefile
@@ -9,8 +9,7 @@ PORTNAME= imgv
PORTVERSION= 3.1.5
PORTREVISION= 1
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= simon@olofsson.de
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile
index 1bf3e44d8161..2cd230b8ec56 100644
--- a/graphics/jdraw/Makefile
+++ b/graphics/jdraw/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jdraw
PORTVERSION= 1.1.5
PORTREVISION= 2
CATEGORIES= graphics java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}_v${PORTVERSION}
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/graphics/jpatch/Makefile b/graphics/jpatch/Makefile
index 15b070fec7ea..5b4b415a8ec5 100644
--- a/graphics/jpatch/Makefile
+++ b/graphics/jpatch/Makefile
@@ -10,8 +10,7 @@ PORTNAME= jpatch
DISTVERSION= 0.4p1
PORTREVISION= 2
CATEGORIES= graphics java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JPatch%200.4%20PREVIEW%201
DISTNAME= ${PORTNAME}0_4preview1
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index c53c977567f7..ed5fd05dc83e 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -11,7 +11,7 @@ PORTVERSION= 0.6.7.0
DISTVERSIONSUFFIX=-src
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/K-3D%20Source/K-3D%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D modeling, animation, and rendering system
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 9b7a5798144b..8fd07f4c6b10 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kbarcode
PORTVERSION= 2.0.7
PORTREVISION= 2
CATEGORIES= graphics kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Stable/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A barcode and label printing application for KDE
diff --git a/graphics/kdc2tiff/Makefile b/graphics/kdc2tiff/Makefile
index dfd093a9e027..ba1417806c6c 100644
--- a/graphics/kdc2tiff/Makefile
+++ b/graphics/kdc2tiff/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kdc2tiff
PORTVERSION= 0.35
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts Kodak .kdc to TIFF or JPEG formats
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index e3dd0af4cfaf..271d7c8eed75 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.2.0
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= graphics kde
-MASTER_SITES= SF/kipi
+MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -kde4
MAINTAINER= kris@pcbsd.org
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 5e4f7ecc94fa..abf2bd4b9c48 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.1.7
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kipi
+MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= KDE Image Plugin Interface plugins
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index 42d5410e0bc3..1f6f2a6a27c8 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -10,7 +10,7 @@ PORTNAME= kludge3d
PORTVERSION= 20040822
PORTREVISION= 8
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/source/2004-08-22
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple 3d editor
diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile
index 12eeb8a0aa52..d20b9a9943a6 100644
--- a/graphics/kudu/Makefile
+++ b/graphics/kudu/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kudu
PORTVERSION= 0.1.2
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A 3D skeletal animation tool, powered by GTK+ and OpenGL
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index ed5c60ee2d21..29ec184693be 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -10,9 +10,9 @@ PORTVERSION= 1.18a
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.18 \
http://www.littlecms.com/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= stas@FreeBSD.org
COMMENT= Light Color Management System -- a color management library
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 35369c0e025b..a3e95cde64d9 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -18,10 +18,10 @@
#
MESAVERSION= 7.4.4
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
+MASTER_SITES?= SF/mesa3d/MesaLib/${PORTVERSION}:mesa \
+ ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/:mesa,glut,demos
MASTER_SITE_SUBDIR= mesa3d
-DISTFILES= MesaLib-${MESAVERSION}${EXTRACT_SUFX}
+DISTFILES= MesaLib-${MESAVERSION}${EXTRACT_SUFX}:mesa
MAINTAINER?= x11@FreeBSD.org
USE_BZIP2= yes
@@ -60,7 +60,8 @@ CONFIGURE_ARGS+= --disable-glu --disable-glut
CONFIGURE_ARGS+= --disable-glut
. endif
.else
-DISTFILES+= MesaGLUT-${MESAVERSION}${EXTRACT_SUFX}
+MASTER_SITES+= SF/mesa3d/MesaGLUT/${MESAVERSION}:glut
+DISTFILES+= MesaGLUT-${MESAVERSION}${EXTRACT_SUFX}:glut
.endif
.if ${COMPONENT:Mglw} == ""
@@ -72,7 +73,8 @@ CONFIGURE_ARGS+= --enable-motif
.if ${COMPONENT:Mdemos} == ""
CONFIGURE_ARGS+= --with-demos=no
.else
-DISTFILES+= MesaDemos-${MESAVERSION}${EXTRACT_SUFX}
+MASTER_SITES+= SF/mesa3d/MesaDemos/${MESAVERSION}:demos
+DISTFILES+= MesaDemos-${MESAVERSION}${EXTRACT_SUFX}:demos
CONFIGURE_ARGS+= --with-demos=demos,xdemos
.endif
diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index c6ac9d62025f..692d3e523df7 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -10,7 +10,7 @@ PORTNAME= libafterimage
PORTVERSION= 1.18
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF/afterstep
+MASTER_SITES= SF/afterstep/libAfterImage/${PORTVERSION}
DISTNAME= libAfterImage-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile
index 847a38b629f2..c1ba565474bd 100644
--- a/graphics/libboard/Makefile
+++ b/graphics/libboard/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libboard
DISTVERSION= 0.8.6b-2
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.8.6b
MAINTAINER= thierry@FreeBSD.org
COMMENT= A vector graphics C++ library
diff --git a/graphics/libemf/Makefile b/graphics/libemf/Makefile
index 5853621deb39..5f88d1ecad4c 100644
--- a/graphics/libemf/Makefile
+++ b/graphics/libemf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libEMF
PORTVERSION= 1.0
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/libemf/g}
+MASTER_SITES= SF
MAINTAINER= maho@FreeBSD.org
COMMENT= Enhanced Metafile Library
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index f03a4a35a81e..0cf73a2a59fe 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libexif-gtk
PORTVERSION= 0.3.5
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libexif
+MASTER_SITES= SF/libexif/${PORTNAME}/${PORTVERSION}
MAINTAINER= marius@nuenneri.ch
COMMENT= GTK+ widgets to display/edit EXIF tags
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index acfe14dd9795..20bf7feb36cd 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libflash
PORTVERSION= 0.4.13
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= SF/gplflash
+MASTER_SITES= SF/gplflash/gplflash/${PORTVERSION}
DISTNAME= gplflash-${PORTVERSION}
MAINTAINER= llwang@infor.org
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index cfb9b0c84923..c948ffb28da1 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -11,8 +11,8 @@ PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= graphics devel
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ggi
+ SF/ggi/ggi-core/${PORTNAME}-${PORTVERSION}
+
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= antoine.brodin@laposte.net
diff --git a/graphics/libggigcp/Makefile b/graphics/libggigcp/Makefile
index 6531d54da395..97213bc9067c 100644
--- a/graphics/libggigcp/Makefile
+++ b/graphics/libggigcp/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ggi
+ SF/ggi/misc/${PORTNAME}-${PORTVERSION}
+
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= antoine.brodin@laposte.net
diff --git a/graphics/libggimisc/Makefile b/graphics/libggimisc/Makefile
index 61e05a8e8c7d..d0b8a50ffe55 100644
--- a/graphics/libggimisc/Makefile
+++ b/graphics/libggimisc/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ggi
+ SF/ggi/lowlevel/${PORTNAME}-${PORTVERSION}
+
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= antoine.brodin@laposte.net
diff --git a/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile
index fe8338622d5f..ecaec478a5b1 100644
--- a/graphics/libggiwmh/Makefile
+++ b/graphics/libggiwmh/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 0.3.2
PORTREVISION= 2
CATEGORIES= graphics devel
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ggi
+ SF/ggi/misc/${PORTNAME}-${PORTVERSION}
+
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= antoine.brodin@laposte.net
diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile
index 2989fa99d7fa..cdf02f9a598b 100644
--- a/graphics/libgltext/Makefile
+++ b/graphics/libgltext/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgltext
PORTVERSION= 0.3.1
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= SF/gltext
+MASTER_SITES= SF/gltext/gltext/${PORTVERSION}
DISTNAME= gltext-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index cd6b1690a754..b1f045169569 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomecanvasmm
PORTVERSION= 2.0.1
PORTREVISION= 9
CATEGORIES= graphics gnome
-MASTER_SITES= SF/gtkmm
+MASTER_SITES= SF/gtkmm/OldFiles
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index 49c3f2b264da..330796d9766d 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libgphoto2
PORTVERSION= 2.4.6
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gphoto
+MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= A universal digital camera picture control tool
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index e41a826d22de..69f0559d90a3 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libimg
PORTVERSION= 1.2.4
PORTREVISION= 5
CATEGORIES?= graphics tk
-MASTER_SITES= SF/tkimg
+MASTER_SITES= SF/tkimg/tkimg/${PORTVERSION}
DISTNAME= img${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/libiptcdata/Makefile b/graphics/libiptcdata/Makefile
index 4be366be1701..2505f519951d 100644
--- a/graphics/libiptcdata/Makefile
+++ b/graphics/libiptcdata/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libiptcdata
PORTVERSION= 1.0.3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pav@FreeBSD.org
COMMENT= Library for manipulating IPTC metadata stored in image files
diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile
index d4a4e6192873..79292e533b57 100644
--- a/graphics/libkdcraw-kde4/Makefile
+++ b/graphics/libkdcraw-kde4/Makefile
@@ -8,8 +8,7 @@ PORTNAME= libkdcraw
PORTVERSION= 0.1.9
PORTREVISION= 1
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kipi
+MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= A C++ interface around the LibRaw library
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index d4a4e6192873..79292e533b57 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -8,8 +8,7 @@ PORTNAME= libkdcraw
PORTVERSION= 0.1.9
PORTREVISION= 1
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kipi
+MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= A C++ interface around the LibRaw library
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index f1152b87e471..e840b050903c 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -8,8 +8,7 @@ PORTNAME= libkexif
PORTVERSION= 0.2.5
PORTREVISION= 5
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kipi
+MASTER_SITES= SF/kipi/OldFiles
MAINTAINER= ale@FreeBSD.org
COMMENT= Library for manipulating EXIF information embedded in images
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index 673e401d2dc9..6a6aa80af42e 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -8,8 +8,7 @@ PORTNAME= libkexiv2
PORTVERSION= 0.1.9
PORTREVISION= 2
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kipi
+MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= A wrapper library to manipulate pictures metadata
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 673e401d2dc9..6a6aa80af42e 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -8,8 +8,7 @@ PORTNAME= libkexiv2
PORTVERSION= 0.1.9
PORTREVISION= 2
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kipi
+MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= A wrapper library to manipulate pictures metadata
diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index f30cb1f8f511..23a5ad3c6e84 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -8,8 +8,7 @@ PORTNAME= libkipi
PORTVERSION= 0.1.6
PORTREVISION= 2
CATEGORIES= graphics kde devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kipi
+MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= KDE Image Plugin Interface
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index f30cb1f8f511..23a5ad3c6e84 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -8,8 +8,7 @@ PORTNAME= libkipi
PORTVERSION= 0.1.6
PORTREVISION= 2
CATEGORIES= graphics kde devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kipi
+MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= KDE Image Plugin Interface
diff --git a/graphics/libmng/Makefile b/graphics/libmng/Makefile
index 12f6424cf9a5..18c9408c1578 100644
--- a/graphics/libmng/Makefile
+++ b/graphics/libmng/Makefile
@@ -9,9 +9,9 @@ PORTNAME= libmng
PORTVERSION= 1.0.10
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION} \
http://www.libmng.com/download/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= mi@aldan.algebra.com
COMMENT= Multiple-image Network Graphics (MNG) reference library
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index c2b21f219215..136d82ae8462 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -12,8 +12,7 @@ PORTNAME= libpano12
PORTVERSION= 2.8.6
PORTREVISION= 3
CATEGORIES= graphics java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= panotools
+MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= vd@FreeBSD.org
COMMENT= Panorama Tools to make panorama pictures
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 7d018db815e3..554c3cce3aa3 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libpano13
PORTVERSION= 2.9.14
PORTREVISION= 2
CATEGORIES= graphics java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= panotools
+MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= vd@FreeBSD.org
COMMENT= Cross-platform library behind Panorama Tools and other photo stitchers
diff --git a/graphics/libvisual-plugins/Makefile b/graphics/libvisual-plugins/Makefile
index 4a521512702f..66f7c182e2c2 100644
--- a/graphics/libvisual-plugins/Makefile
+++ b/graphics/libvisual-plugins/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libvisual-plugins
PORTVERSION= 0.2.0
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= SF/libvisual
+MASTER_SITES= SF/libvisual/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Set of plugins for the libvisual framework
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index 836e8444eb96..5c6972941e69 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -12,7 +12,7 @@ PORTNAME= libvisual
PORTVERSION= 0.2.0
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstraction library that sits between apps and visual plugin
diff --git a/graphics/libvisual04-plugins/Makefile b/graphics/libvisual04-plugins/Makefile
index f902025a876f..4cac230b412d 100644
--- a/graphics/libvisual04-plugins/Makefile
+++ b/graphics/libvisual04-plugins/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libvisual
PORTVERSION= 0.4.0
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= libvisual
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-plugins/${PORTNAME}-plugins-${PORTVERSION}
PKGNAMESUFFIX= 04-plugins
DISTNAME= ${PORTNAME}-${PKGNAMESUFFIX:C/.*-//}-${PORTVERSION}
diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index 32838c2a70d9..ea4efae81b69 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libvisual
PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= 04
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 84eef02da910..6230606098f8 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libwmf
PORTVERSION= 0.2.8.4
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wvware
+MASTER_SITES= SF/wvware/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tools and library for converting Microsoft WMF (windows metafile)
diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile
index b066db4b5d5b..4eb2a2ece1ff 100644
--- a/graphics/libwpg/Makefile
+++ b/graphics/libwpg/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libwpg
PORTVERSION= 0.1.3
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= fluffy@FreeBSD.org
COMMENT= Library for importing and converting Corel WordPerfect(tm) Graphics images
diff --git a/graphics/libwpg01/Makefile b/graphics/libwpg01/Makefile
index b066db4b5d5b..4eb2a2ece1ff 100644
--- a/graphics/libwpg01/Makefile
+++ b/graphics/libwpg01/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libwpg
PORTVERSION= 0.1.3
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= fluffy@FreeBSD.org
COMMENT= Library for importing and converting Corel WordPerfect(tm) Graphics images
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index 0b24d16e3d87..4206b40b78ba 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -9,7 +9,7 @@ PORTNAME= makehuman
DISTVERSION= 0.9.1-rc1a
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/MakeHuman%20Source/MakeHuman_091
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Application for parametrical modeling of 3D humanoid characters
diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index 556b1887eb35..1d79d6034ac2 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mapyrus
PORTVERSION= 0.807
#PORTREVISION= 0
CATEGORIES= graphics print java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= nivit@FreeBSD.org
COMMENT= A software for creating plots of points, lines, etc
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index 11c11d2e3b66..5142d6b3adaf 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -8,9 +8,9 @@
PORTNAME= mesagl
PORTVERSION= 5.0.2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/mesa3d/MesaLib/${PORTVERSION} \
ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
-MASTER_SITE_SUBDIR= mesa3d
+
PKGNAMESUFFIX= -mangled
DISTNAME= MesaLib-${PORTVERSION}
diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index 1ca2628e0b85..3dd0449e8ec5 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= meshviewer
PORTVERSION= 0.3.2
CATEGORIES= graphics
-MASTER_SITES= SF/mview
+MASTER_SITES= SF/mview/mview/${PORTVERSION}
DISTNAME= mview-src-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index 482d93314e11..fac11104bb0b 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mhgui
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= makehuman
+MASTER_SITES= SF/makehuman/MakeHuman%20Source/MakeHuman_091
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= GUI widget library for MakeHuman
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index d67e370f31d8..e19f4f425c16 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ming
PORTVERSION= 0.3.0
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= LGPL'ed Flash 4/5 movie output library with many languages support
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 6a7db4a30c1d..8b28d9f098d0 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= netpbm
PORTVERSION= ${NETPBM_PORTVERSION}
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= # defined later
PKGNAMESUFFIX= ${NETPBM_SUFFIX}${PKGNAMESUFFIX2}
EXTRACT_SUFX= .tgz
.if make(makesum) || defined(FETCH_ALL)
@@ -42,6 +41,7 @@ MAN1= netpbm.1
STABLE_PORTVERSION= 10.26.63
DEVEL_PORTVERSION= 10.31
.if defined(WITH_NETPBM_DEVEL)
+MASTER_SITES= SF/netpbm/archive_of_old_release_system/${PORTVERSION}
NETPBM_PORTVERSION= ${DEVEL_PORTVERSION}
NETPBM_SUFFIX= -devel
CONFLICTS+= netpbm-10.26.*
@@ -49,6 +49,7 @@ PATCHDIR?= ${MASTERDIR}/../netpbm-devel/files
CFLAGS+= -Iutil
PLIST_SUB+= DEVEL=""
.else
+MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION}
NETPBM_PORTVERSION= ${STABLE_PORTVERSION}
CONFLICTS+= netpbm-devel-10.26.*
PORTSCOUT= limit:^10\.26\.
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index 9e1a9238a199..db637f28e560 100644
--- a/graphics/nurbs++/Makefile
+++ b/graphics/nurbs++/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nurbs++
PORTVERSION= 3.0.11
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libnurbs
+MASTER_SITES= SF/libnurbs/nurbs%2B%2B/nurbs%2B%2B-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A C++ library for representing curves or surfaces
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index d850a151d55f..9284126b773b 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ogre3d
PORTVERSION= 1.6.2
PORTREVISION= 1
CATEGORIES= graphics devel
-MASTER_SITES= SF/ogre
+MASTER_SITES= SF/ogre/ogre/${PORTVERSION}
DISTNAME= ogre-v${PORTVERSION:S/./-/g:S/-r1/RC1/g}
MAINTAINER= oliver@FreeBSD.org
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 7cb6b8c430d7..310ea5d89e1a 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -10,7 +10,7 @@ PORTNAME= opencv
PORTVERSION= 1.0.0
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= SF/opencvlibrary
+MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-linux/1.0
MAINTAINER= villa.alberto@gmail.com
COMMENT= Open Source Computer Vision library from Intel
diff --git a/graphics/opendis/Makefile b/graphics/opendis/Makefile
index d4d7457e9a6a..34bf20cddf61 100644
--- a/graphics/opendis/Makefile
+++ b/graphics/opendis/Makefile
@@ -9,9 +9,9 @@ PORTNAME= opendis
PORTVERSION= 0.0.3
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/ods/ods/${PORTVERSION} \
http://ods.sourceforge.net/dl/
-MASTER_SITE_SUBDIR= ods
+
MAINTAINER= ports@FreeBSD.org
COMMENT= Access Flashpoint Digita-based cameras, download images and more
diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile
index 29e92b9f95c8..0e3b9ae4a325 100644
--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@@ -8,7 +8,7 @@
PORTNAME= openjump
PORTVERSION= 1.3
CATEGORIES= graphics java geography
-MASTER_SITES= SF/jump-pilot
+MASTER_SITES= SF/jump-pilot/OldFiles
MAINTAINER= wenheping@gmail.com
COMMENT= An open source GIS software written in Java
diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile
index 116f63fbcecb..4177e73bdb83 100644
--- a/graphics/openrm/Makefile
+++ b/graphics/openrm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= openrm
PORTVERSION= 1.6.0
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
DISTNAME= ${PORTNAME}-devel-${PORTVERSION}-1
.ifdef (WITH_DEMOS)
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index edc51da0ec3b..e55a8c1eef17 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -8,7 +8,7 @@
PORTNAME= optipng
PORTVERSION= 0.6.2
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OptiPNG/${PORTNAME}-${PORTVERSION}
MAINTAINER= tom@hur.st
COMMENT= An optimizer for PNG files
diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile
index 6b9f3521bbbd..011473c8cad9 100644
--- a/graphics/p5-Cairo/Makefile
+++ b/graphics/p5-Cairo/Makefile
@@ -9,7 +9,7 @@
PORTNAME= Cairo
PORTVERSION= 1.061
CATEGORIES= graphics perl5
-MASTER_SITES= SF/gtk2-perl
+MASTER_SITES= SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
MAINTAINER= ahze@FreeBSD.org
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index c4dc5d9a4510..083b3203c8dc 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ming
PORTVERSION= 0.3.0
PORTREVISION= 1
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-perl-${PORTVERSION}
diff --git a/graphics/panoglview/Makefile b/graphics/panoglview/Makefile
index 899ddce3eaa1..7ddb816c4c9f 100644
--- a/graphics/panoglview/Makefile
+++ b/graphics/panoglview/Makefile
@@ -9,7 +9,7 @@ PORTNAME= panoglview
PORTVERSION= 0.2.1
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF/hugin
+MASTER_SITES= SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ii@any.com.ru
COMMENT= Panorama viewer using OpenGL
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 55444df7b6c2..d94d30982a25 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pencil
PORTVERSION= 0.4.4b
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF/pencil-planner
+MASTER_SITES= SF/${PORTNAME}-planner/Pencil/${PORTVERSION}eta
DISTNAME= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFFIX}
MAINTAINER= ganael.laplanche@martymac.com
diff --git a/graphics/pfscalibration/Makefile b/graphics/pfscalibration/Makefile
index d03baa2e0b84..7c10ab94ccd4 100644
--- a/graphics/pfscalibration/Makefile
+++ b/graphics/pfscalibration/Makefile
@@ -8,8 +8,7 @@ PORTNAME= pfscalibration
PORTVERSION= 1.3
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pfstools
+MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}
MAINTAINER= ii@any.com.ru
COMMENT= Photometric calibration of cameras and recovery HDR images from the set of LDR exposures
diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile
index 12105df9f349..bf4e2e70a347 100644
--- a/graphics/pfstmo/Makefile
+++ b/graphics/pfstmo/Makefile
@@ -8,8 +8,7 @@ PORTNAME= pfstmo
PORTVERSION= 1.2
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pfstools
+MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}
MAINTAINER= ii@any.com.ru
COMMENT= Tone mapping operators
diff --git a/graphics/photopc/Makefile b/graphics/photopc/Makefile
index 1c9eebeffffb..9484b532361c 100644
--- a/graphics/photopc/Makefile
+++ b/graphics/photopc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= photopc
PORTVERSION= 3.05
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility to manage an Epson PhotoPC 500 digital camera
diff --git a/graphics/php4-ffmpeg/Makefile b/graphics/php4-ffmpeg/Makefile
index 849badf805db..80f78bcf317e 100644
--- a/graphics/php4-ffmpeg/Makefile
+++ b/graphics/php4-ffmpeg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ffmpeg
PORTVERSION= 0.5.1
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}-php
+MASTER_SITES= SF/${PORTNAME}-php/${PORTNAME}-php/${PORTVERSION}
PKGNAMEPREFIX= php4-
DISTNAME= ${PORTNAME}-php-${PORTVERSION}
EXTRACT_SUFX= .tbz2
diff --git a/graphics/php5-ffmpeg/Makefile b/graphics/php5-ffmpeg/Makefile
index a8e8df41c956..5b2adce4fc4e 100644
--- a/graphics/php5-ffmpeg/Makefile
+++ b/graphics/php5-ffmpeg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ffmpeg
PORTVERSION= 0.6.0
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}-php
+MASTER_SITES= SF/${PORTNAME}-php/${PORTNAME}-php/${PORTVERSION}
PKGNAMEPREFIX= php5-
DISTNAME= ${PORTNAME}-php-${PORTVERSION}
EXTRACT_SUFX= .tbz2
diff --git a/graphics/piddle/Makefile b/graphics/piddle/Makefile
index 59e079d81c2f..9bc7791cdd35 100644
--- a/graphics/piddle/Makefile
+++ b/graphics/piddle/Makefile
@@ -9,8 +9,7 @@ PORTNAME= piddle
PORTVERSION= 1.0.15
PORTEPOCH= 1
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index ddc832937901..74e10d8b81b5 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pixie
PORTVERSION= 2.2.6
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION}
DISTNAME= Pixie-src-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/graphics/plasma-kmod/Makefile b/graphics/plasma-kmod/Makefile
index d4f612d65335..a11c9caf03aa 100644
--- a/graphics/plasma-kmod/Makefile
+++ b/graphics/plasma-kmod/Makefile
@@ -9,7 +9,7 @@ PORTNAME= plasma
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= graphics kld
-MASTER_SITES= SF/futurebsd
+MASTER_SITES= SF/futurebsd/futurebsd/${PORTNAME}
PKGNAMESUFFIX= -kmod
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 82253848f8b3..1d14b34b320f 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -8,8 +8,7 @@
PORTNAME= png
PORTVERSION= 1.2.38
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lib${PORTNAME}
+MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}-stable/${PORTVERSION}
DISTNAME= lib${PORTNAME}-${PORTVERSION}
#PATCH_SITES= ${MASTER_SITES}
#PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
diff --git a/graphics/pngcheck/Makefile b/graphics/pngcheck/Makefile
index c7a373a5445f..c97d82346733 100644
--- a/graphics/pngcheck/Makefile
+++ b/graphics/pngcheck/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pngcheck
PORTVERSION= 2.3.0
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= png-mng
+MASTER_SITES= SF/png-mng/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Checks the integrity of PNG images
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index fc9f2084ab9e..fd52de723b32 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pngcrush
PORTVERSION= 1.7.0
CATEGORIES= graphics
-MASTER_SITES= SF/pmt
+MASTER_SITES= SF/pmt/${PORTNAME}/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= An optimizer for PNG files
diff --git a/graphics/pngquant/Makefile b/graphics/pngquant/Makefile
index 51f0388eab1d..3d2ab0575f1e 100644
--- a/graphics/pngquant/Makefile
+++ b/graphics/pngquant/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pngquant
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= png-mng
+MASTER_SITES= SF/png-mng/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile
index c52d7bad99e6..ce0bea5e1d1e 100644
--- a/graphics/pngwriter/Makefile
+++ b/graphics/pngwriter/Makefile
@@ -9,7 +9,7 @@
PORTNAME= pngwriter
PORTVERSION= 0.5.4
CATEGORIES= graphics devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ library for creating PNG images
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index 962bb7bca877..774ba3d3d7c9 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pornview
PORTVERSION= 0.2.0.p.1
PORTREVISION= 21
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/graphics/price/Makefile b/graphics/price/Makefile
index 3752adbf477b..36b10f4d4522 100644
--- a/graphics/price/Makefile
+++ b/graphics/price/Makefile
@@ -8,8 +8,7 @@
PORTNAME= price
PORTVERSION= 0.8.3
CATEGORIES= graphics gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/PRICE%20source/${PORTVERSION}
DISTNAME= PRICE-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile
index bc10450b13ec..2333ff5f3943 100644
--- a/graphics/pvmpov/Makefile
+++ b/graphics/pvmpov/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pvmpov
PORTVERSION= 3.1g.2
PORTREVISION= 1
CATEGORIES= graphics parallel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-3.1g2.tgz
DISTNAME= ${PORTNAME}-3.1g2
EXTRACT_SUFX= .tgz
diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile
index fd2c2003f46b..97bef6e1cc34 100644
--- a/graphics/py-PyX/Makefile
+++ b/graphics/py-PyX/Makefile
@@ -10,8 +10,7 @@ PORTNAME= PyX
PORTVERSION= 0.10
PORTREVISION= 1
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mva@FreeBSD.org
diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile
index f500ed9c1b77..b88a461b139d 100644
--- a/graphics/py-cgkit/Makefile
+++ b/graphics/py-cgkit/Makefile
@@ -10,8 +10,7 @@ PORTNAME= cgkit
PORTVERSION= 2.0.0a7
PORTREVISION= 4
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-2.0.0alpha7
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION:C/a/alpha/}
diff --git a/graphics/py-exif/Makefile b/graphics/py-exif/Makefile
index e15e35272ffc..3053fb29a7a0 100644
--- a/graphics/py-exif/Makefile
+++ b/graphics/py-exif/Makefile
@@ -9,8 +9,7 @@ PORTNAME= exif
PORTVERSION= 0.9
PORTREVISION= 1
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyexif
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyexif-${PORTVERSION}
diff --git a/graphics/py-freeimagepy/Makefile b/graphics/py-freeimagepy/Makefile
index f9cc519c5426..8f5e55af743b 100644
--- a/graphics/py-freeimagepy/Makefile
+++ b/graphics/py-freeimagepy/Makefile
@@ -9,7 +9,7 @@ PORTNAME= freeimagepy
PORTVERSION= 1.5.0
PORTREVISION= 1
CATEGORIES= graphics python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/FreeImagePy/V${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= FreeImagePy_w_dll
diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile
index 3db790725742..549df259c962 100644
--- a/graphics/py-glewpy/Makefile
+++ b/graphics/py-glewpy/Makefile
@@ -9,7 +9,7 @@ PORTNAME= glewpy
PORTVERSION= 0.7.4
PORTREVISION= 2
CATEGORIES= graphics python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= python
PATCH_SITES= http://mirror.amdmi3.ru/distfiles/ \
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index 8bb4be4b55e7..d2e897e37757 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ming
PORTVERSION= 0.3.0
PORTREVISION= 1
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-py-${PORTVERSION}
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 3081f2d8e752..19180160ea87 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= opengl
PORTVERSION= 3.0.0
PORTREVISION= 1
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= py${PORTNAME}
+MASTER_SITES= SF/py${PORTNAME}/PyOpenGL/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyOpenGL-${PORTVERSION}
diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile
index b9104ef9e3f8..ebc90625af19 100644
--- a/graphics/py-paint/Makefile
+++ b/graphics/py-paint/Makefile
@@ -8,8 +8,7 @@
PORTNAME= paint
PORTVERSION= 0.3
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pypaint
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}%20${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pypaint-${PORTVERSION}
diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index c0c6e31a4bdb..a8b44404d04b 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -9,8 +9,7 @@ PORTNAME= visual
PORTVERSION= 4.b26
PORTREVISION= 2
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= visualpython
+MASTER_SITES= SF/${PORTNAME}python/${PORTNAME}-module/VPython%204.beta26
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/}
diff --git a/graphics/q-graph/Makefile b/graphics/q-graph/Makefile
index 5eb3eb2244a0..ed9b656869e7 100644
--- a/graphics/q-graph/Makefile
+++ b/graphics/q-graph/Makefile
@@ -9,7 +9,7 @@ PORTNAME= graph
PORTVERSION= 1.8
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF/q-lang
+MASTER_SITES= SF/q-lang/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= q-
MAINTAINER= gahr@FreeBSD.org
diff --git a/graphics/qcamview/Makefile b/graphics/qcamview/Makefile
index 9df77c3be586..a4c54c4f7541 100644
--- a/graphics/qcamview/Makefile
+++ b/graphics/qcamview/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qcamview
PORTVERSION= 0.40d
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${REALNAME}
+MASTER_SITES= SF/qce-ga/OldFiles
DISTNAME= ${REALNAME}-${PORTVERSION}
PATCH_SITES= http://www.medias.ne.jp/~takam/bsd/
diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile
index d607caa3a6ad..03706f23aafa 100644
--- a/graphics/quesoglc/Makefile
+++ b/graphics/quesoglc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= quesoglc
PORTVERSION= 0.7.2
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/QuesoGLC/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Free implementation of the OpenGL Character Renderer
diff --git a/graphics/ray++/Makefile b/graphics/ray++/Makefile
index 36a731cb00d9..a8fa8a6934f5 100644
--- a/graphics/ray++/Makefile
+++ b/graphics/ray++/Makefile
@@ -10,8 +10,7 @@ PORTNAME= ray++
PORTVERSION= 0.4
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= raypp
+MASTER_SITES= SF/raypp/raypp/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A collection of C++ classes needed for ray tracing
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index f2c03cf43678..6d6b96e6ac79 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -9,7 +9,7 @@ PORTNAME= reallyslick
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF/rss-glx
+MASTER_SITES= SF/rss-glx/rss-glx/${PORTVERSION}
DISTNAME= rss-glx_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/rgbpaint/Makefile b/graphics/rgbpaint/Makefile
index e24aeee09b36..5d3ded44d29f 100644
--- a/graphics/rgbpaint/Makefile
+++ b/graphics/rgbpaint/Makefile
@@ -9,7 +9,7 @@ PORTNAME= rgbpaint
PORTVERSION= 0.8.7
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF/mtpaint
+MASTER_SITES= SF/mtpaint/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Very basic painting program
diff --git a/graphics/ruby-graph/Makefile b/graphics/ruby-graph/Makefile
index dfa4117d726a..56d2f13a9c3b 100644
--- a/graphics/ruby-graph/Makefile
+++ b/graphics/ruby-graph/Makefile
@@ -9,8 +9,7 @@ PORTNAME= graph
PORTVERSION= 0.1.9
PORTREVISION= 2
CATEGORIES= graphics ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rockit
+MASTER_SITES= SF/rockit/${PORTNAME}r/${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}r-${PORTVERSION:S/./-/g}
DIST_SUBDIR= ruby
diff --git a/graphics/sage/Makefile b/graphics/sage/Makefile
index 999ab50f2092..1825d6477f20 100644
--- a/graphics/sage/Makefile
+++ b/graphics/sage/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sage
PORTVERSION= 0.2.0
PORTREVISION= 2
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= worldforge
+MASTER_SITES= SF/worldforge/${PORTNAME}%20%28OpenGL%20helper%20lib%29/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= OpenGL extension library
diff --git a/graphics/scale2x/Makefile b/graphics/scale2x/Makefile
index 11dea8fd8d6d..35aab6c487a5 100644
--- a/graphics/scale2x/Makefile
+++ b/graphics/scale2x/Makefile
@@ -8,8 +8,7 @@
PORTNAME= scale2x
PORTVERSION= 2.2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= chinsan@FreeBSD.org
COMMENT= Real-time graphics effect able to increase the size of small bitmaps
diff --git a/graphics/scwm-icons/Makefile b/graphics/scwm-icons/Makefile
index 32d8c87bc890..5c0a616d119c 100644
--- a/graphics/scwm-icons/Makefile
+++ b/graphics/scwm-icons/Makefile
@@ -9,7 +9,7 @@ PORTNAME= scwm-icons
PORTVERSION= 0.99.2
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF/scwm
+MASTER_SITES= SF/scwm/scwm/0.99.6.2
MAINTAINER= ports@FreeBSD.org
COMMENT= An icon collection for the scwm window manager
diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile
index b011c7a5ea92..1f58803b8128 100644
--- a/graphics/sharpconstruct/Makefile
+++ b/graphics/sharpconstruct/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sharpconstruct
PORTVERSION= 0.11
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sharp3d
+MASTER_SITES= SF/sharp3d/SharpConstruct/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= 3D modeller for organic shapes
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 03539fd0eab6..50174d839dd0 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -9,8 +9,7 @@ PORTNAME= skencil
PORTVERSION= 0.6.17
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sketch
+MASTER_SITES= SF/sketch/sketch/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive drawing program
diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index 71f391cbdaf9..243129e9f9b6 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= stamp
PORTVERSION= 2.0.8
PORTREVISION= 7
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= stamp
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Adds a graphical, configurable timestamp to a grayscale image
diff --git a/graphics/structuresynth/Makefile b/graphics/structuresynth/Makefile
index eaf64576671d..4ac9ea1fd842 100644
--- a/graphics/structuresynth/Makefile
+++ b/graphics/structuresynth/Makefile
@@ -8,7 +8,7 @@
PORTNAME= structuresynth
PORTVERSION= 1.0.0
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Structure%20Synth/Version%201.0%20%28Potemkin%29
DISTNAME= StructureSynth-Source-v${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index a16010329568..d09317dbe6a9 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -9,7 +9,7 @@ PORTNAME= synfigstudio
DISTVERSION= 0.61.09
PORTREVISION= 1
CATEGORIES= graphics multimedia
-MASTER_SITES= SF/synfig
+MASTER_SITES= SF/synfig/${PORTNAME}/${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= Vector-based 2D animation software package
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 0428716f3c97..91c2ec9db952 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -11,7 +11,9 @@ PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ftp://bourbon.usc.edu/pub/tgif/ \
http://groups.yahoo.com/group/tgif4-announce/files/ \
+
SF
+
DISTNAME= ${PORTNAME}-QPL-${PORTVERSION}
MAINTAINER= bmc@clapper.org
diff --git a/graphics/tiff2png/Makefile b/graphics/tiff2png/Makefile
index 4fd6af745c38..98e3d35b96ba 100644
--- a/graphics/tiff2png/Makefile
+++ b/graphics/tiff2png/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.91
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= png-mng
+MASTER_SITES= SF/png-mng/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts TIFF images to PNG format
diff --git a/graphics/tintfu/Makefile b/graphics/tintfu/Makefile
index 3ab2d0277caf..c31c0cf0c99b 100644
--- a/graphics/tintfu/Makefile
+++ b/graphics/tintfu/Makefile
@@ -10,8 +10,7 @@ PORTNAME= tintfu
PORTVERSION= 0.0.4
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
EXTRACT_SUFX= .jar
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index 9020da0b5cfe..5544daa33139 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= togl
PORTVERSION= 1.7
PORTREVISION= 1
CATEGORIES= graphics tk
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Togl/${PORTVERSION}
DISTNAME= Togl-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index 1b6a5bbee1b8..cda0092052cd 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -10,7 +10,7 @@ PORTNAME= truevision
PORTVERSION= 0.5.5.2
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/0.5.5
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index 2e5ff73f78d7..1e28a387d9f9 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ufraw
PORTVERSION= 0.15
PORTREVISION= 3
CATEGORIES= graphics gnome
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Read and manipulate raw images from digital cameras
diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile
index c3d90057a074..0bcaad97f4d5 100644
--- a/graphics/vid/Makefile
+++ b/graphics/vid/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vid
PORTVERSION= 1.0.1
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ovtvid-bsd
+MASTER_SITES= SF/ovt${PORTNAME}-bsd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= olivier@gid0.org
COMMENT= Grab images from USB Cameras using the OV511 and OV511+ chipset
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 3adee9db4347..9b8270a71608 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wxsvg
DISTVERSION= 1.0b7_2
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ahze@FreeBSD.org
COMMENT= C++ library to create, manipulate, and render SVG files
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index 438d1d9ea91d..13c37b3a3e09 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xaos
PORTVERSION= 3.4
PORTREVISION= 1
CATEGORIES= graphics math
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/XaoS/${PORTVERSION}
DISTNAME= XaoS-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index 17d735312f4e..66ea33aca58c 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xmedcon
PORTVERSION= 0.10.4
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/XMedCon-Source/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A medical image conversion utility and library
diff --git a/graphics/xmms-finespectrum/Makefile b/graphics/xmms-finespectrum/Makefile
index a4874038cb43..e37c963a3ba5 100644
--- a/graphics/xmms-finespectrum/Makefile
+++ b/graphics/xmms-finespectrum/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-finespectrum
PORTVERSION= 1.0.1.a
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= finespectrum
+MASTER_SITES= SF/finespectrum/finespectrum/1.0.1alpha
DISTNAME= finespectrum-1.0.1alpha
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xmms-goom/Makefile b/graphics/xmms-goom/Makefile
index b5c0aac2a34d..d63d8a24ebbb 100644
--- a/graphics/xmms-goom/Makefile
+++ b/graphics/xmms-goom/Makefile
@@ -9,7 +9,7 @@ PORTNAME= goom
PORTVERSION= 2.4.0
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2k4/0
PKGNAMEPREFIX= xmms-
DISTNAME= ${PORTNAME}-2k4-0-src
diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile
index 844fbd190ce0..c3fad601ddae 100644
--- a/graphics/xmms-paranormal/Makefile
+++ b/graphics/xmms-paranormal/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-paranormal
PORTVERSION= 0.2.0
PORTREVISION= 10
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= paranormal
+MASTER_SITES= SF/paranormal/old-paranormal-xmms/${PORTVERSION}
DISTNAME= paranormal-${PORTVERSION:S/.p/pre/}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xmms-scivi/Makefile b/graphics/xmms-scivi/Makefile
index f0fb200fe188..d60813efabf9 100644
--- a/graphics/xmms-scivi/Makefile
+++ b/graphics/xmms-scivi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scivi
DISTVERSION= 0.2.0-rc3
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
+MASTER_SITES= SF/xmms-${PORTNAME}/${PORTNAME}/0.2.0-rc3
PKGNAMEPREFIX= xmms-
MAINTAINER= alepulver@FreeBSD.org
diff --git a/graphics/xmms-vumeter/Makefile b/graphics/xmms-vumeter/Makefile
index 9d4a79658b7d..36c95bd783fd 100644
--- a/graphics/xmms-vumeter/Makefile
+++ b/graphics/xmms-vumeter/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vumeter
PORTVERSION= 0.9.2
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}plugin
+MASTER_SITES= SF/${PORTNAME}plugin/${PORTNAME}plugin/VU%20meter%20v${PORTVERSION}
PKGNAMEPREFIX= xmms-
MAINTAINER= alepulver@FreeBSD.org
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index b3dc8c9eb81b..619fe14b77c1 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xmorph
PORTVERSION= 2006.08.17
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/20060817
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 7c8445fa0237..5616a5aeb646 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -9,9 +9,9 @@ PORTNAME= xpaint
PORTVERSION= 2.7.8.1
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF \
+MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION} \
ftp://ftp.ac-grenoble.fr/Office/
-MASTER_SITE_SUBDIR= sf-${PORTNAME}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple paint program
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index edacaa667115..81bc7d23c996 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 3.10a
PORTREVISION= 10
CATEGORIES+= graphics
MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/:base \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= png-mng
+ SF/png-mng/XV%20jumbo%20patches/20070520
+
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:base \
${DISTNAME}-jumbo-patches-20070520.tar.gz
DIST_SUBDIR= ${PORTNAME}
diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile
index a7cf97dfb8aa..fc9b02e603e3 100644
--- a/graphics/zimg/Makefile
+++ b/graphics/zimg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= zimg
PORTVERSION= 5.0.0
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Image-generator that uses ASCII input files to create PNGs/EDFs