aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/love/Makefile2
-rw-r--r--devel/love07/Makefile2
-rw-r--r--devel/love5/Makefile2
-rw-r--r--games/4stattack/Makefile3
-rw-r--r--games/8kingdoms/Makefile3
-rw-r--r--games/BillardGL/Makefile3
-rw-r--r--games/abe/Makefile3
-rw-r--r--games/alephone/Makefile2
-rw-r--r--games/allacrost/Makefile2
-rw-r--r--games/armagetron/Makefile2
-rw-r--r--games/asc/Makefile3
-rw-r--r--games/assaultcube/Makefile2
-rw-r--r--games/avanor/Makefile3
-rw-r--r--games/barrage/Makefile2
-rw-r--r--games/bass/Makefile3
-rw-r--r--games/battletanks/Makefile2
-rw-r--r--games/bfm/Makefile2
-rw-r--r--games/biloba/Makefile2
-rw-r--r--games/blinkensisters/Makefile2
-rw-r--r--games/blobby/Makefile2
-rw-r--r--games/blokish/Makefile2
-rw-r--r--games/bloodfrontier/Makefile2
-rw-r--r--games/bomberinstinct/Makefile3
-rw-r--r--games/bomns/Makefile3
-rw-r--r--games/brainworkshop/Makefile2
-rw-r--r--games/brutalchess/Makefile3
-rw-r--r--games/bubbros/Makefile3
-rw-r--r--games/bygfoot/Makefile2
-rw-r--r--games/bzflag/Makefile2
-rw-r--r--games/cgoban/Makefile3
-rw-r--r--games/childsplay/Makefile3
-rw-r--r--games/childsplay_plugins/Makefile3
-rw-r--r--games/chromium-bsu/Makefile2
-rw-r--r--games/connectfive/Makefile2
-rw-r--r--games/conquest/Makefile2
-rw-r--r--games/corewars/Makefile3
-rw-r--r--games/cre/Makefile2
-rw-r--r--games/criticalmass/Makefile2
-rw-r--r--games/crossfire-client/Makefile5
-rw-r--r--games/crossfire-server/Makefile3
-rw-r--r--games/cryptoslam/Makefile3
-rw-r--r--games/csmash/Makefile3
-rw-r--r--games/cube/Makefile3
-rw-r--r--games/cultivation/Makefile2
-rw-r--r--games/daimonin-client/Makefile2
-rw-r--r--games/daimonin/Makefile2
-rw-r--r--games/dangerdeep-data/Makefile3
-rw-r--r--games/dangerdeep/Makefile3
-rw-r--r--games/deng/Makefile2
-rw-r--r--games/diameter/Makefile3
-rw-r--r--games/doom-freedoom/Makefile2
-rw-r--r--games/doom/Makefile2
-rw-r--r--games/doomlegacy/Makefile2
-rw-r--r--games/easysok/Makefile3
-rw-r--r--games/eboard/Makefile3
-rw-r--r--games/edge/Makefile2
-rw-r--r--games/egoboo/Makefile2
-rw-r--r--games/ember/Makefile4
-rw-r--r--games/etracer/Makefile2
-rw-r--r--games/etuxracer/Makefile2
-rw-r--r--games/euchre/Makefile2
-rw-r--r--games/exult/Makefile2
-rw-r--r--games/ezquake/Makefile3
-rw-r--r--games/falconseye/Makefile2
-rw-r--r--games/fargoal/Makefile3
-rw-r--r--games/fillets-ng/Makefile2
-rw-r--r--games/fotaq/Makefile3
-rw-r--r--games/freeciv/Makefile2
-rw-r--r--games/freecol/Makefile3
-rw-r--r--games/freedoko/Makefile2
-rw-r--r--games/freedroid/Makefile3
-rw-r--r--games/freedroidrpg/Makefile2
-rw-r--r--games/freera/Makefile2
-rw-r--r--games/freesynd/Makefile3
-rw-r--r--games/freetennis/Makefile3
-rw-r--r--games/fretsonfire-data/Makefile3
-rw-r--r--games/fteqw/Makefile2
-rw-r--r--games/funnyboat/Makefile1
-rw-r--r--games/gcompris/Makefile2
-rw-r--r--games/gdado/Makefile2
-rw-r--r--games/gemrb/Makefile3
-rw-r--r--games/gillo/Makefile2
-rw-r--r--games/gl-117/Makefile2
-rw-r--r--games/glchess/Makefile3
-rw-r--r--games/glest-data/Makefile3
-rw-r--r--games/glest/Makefile3
-rw-r--r--games/glmaze/Makefile3
-rw-r--r--games/gltron/Makefile2
-rw-r--r--games/gnomememoryblocks/Makefile3
-rw-r--r--games/gnomermind/Makefile2
-rw-r--r--games/gnomesudoku/Makefile2
-rw-r--r--games/gnurobbo/Makefile2
-rw-r--r--games/grhino/Makefile3
-rw-r--r--games/hattrickorganizer/Makefile3
-rw-r--r--games/hlstats/Makefile2
-rw-r--r--games/interlogic/Makefile2
-rw-r--r--games/ivan/Makefile2
-rw-r--r--games/jchessboard/Makefile3
-rw-r--r--games/jin/Makefile2
-rw-r--r--games/jtans/Makefile3
-rw-r--r--games/kevedit/Makefile3
-rw-r--r--games/kfreerings/Makefile3
-rw-r--r--games/kiki/Makefile2
-rw-r--r--games/kimboot/Makefile2
-rw-r--r--games/klavaro/Makefile2
-rw-r--r--games/knights-kde4/Makefile3
-rw-r--r--games/knights/Makefile3
-rw-r--r--games/kpictorial/Makefile3
-rw-r--r--games/kpuzzle/Makefile3
-rw-r--r--games/lbreakout/Makefile3
-rw-r--r--games/lbreakout2/Makefile3
-rw-r--r--games/lgeneral-data/Makefile3
-rw-r--r--games/lgeneral/Makefile3
-rw-r--r--games/lianliankan/Makefile3
-rw-r--r--games/libdungeonmaker/Makefile3
-rw-r--r--games/lincity/Makefile3
-rw-r--r--games/lmarbles/Makefile3
-rw-r--r--games/lmpc/Makefile3
-rw-r--r--games/love/Makefile2
-rw-r--r--games/lpairs/Makefile2
-rw-r--r--games/ltris/Makefile2
-rw-r--r--games/marsnomercy/Makefile3
-rw-r--r--games/masterserver/Makefile3
-rw-r--r--games/nInvaders/Makefile3
-rw-r--r--games/nazghul/Makefile2
-rw-r--r--games/nethack32/Makefile3
-rw-r--r--games/nethack33/Makefile3
-rw-r--r--games/nethack34/Makefile3
-rw-r--r--games/nettoe/Makefile3
-rw-r--r--games/nexuiz/Makefile2
-rw-r--r--games/nil/Makefile3
-rw-r--r--games/nimuh/Makefile2
-rw-r--r--games/njam/Makefile2
-rw-r--r--games/noegnud-littlehack/Makefile3
-rw-r--r--games/noegnud-nethack-deet/Makefile3
-rw-r--r--games/noegnud-nethack/Makefile3
-rw-r--r--games/noegnud-slashem/Makefile3
-rw-r--r--games/nonsense/Makefile3
-rw-r--r--games/odamex/Makefile2
-rw-r--r--games/openalchemist/Makefile2
-rw-r--r--games/opencity/Makefile2
-rw-r--r--games/openglad/Makefile2
-rw-r--r--games/openlierox/Makefile2
-rw-r--r--games/openttd/Makefile2
-rw-r--r--games/openyahtzee/Makefile2
-rw-r--r--games/outerspace/Makefile3
-rw-r--r--games/pachi/Makefile2
-rw-r--r--games/palomino/Makefile3
-rw-r--r--games/passage/Makefile2
-rw-r--r--games/pcgen/Makefile3
-rw-r--r--games/pengpong/Makefile3
-rw-r--r--games/phpua-bf/Makefile3
-rw-r--r--games/phpua-cod/Makefile3
-rw-r--r--games/phpua-engine/Makefile3
-rw-r--r--games/phpua-hl/Makefile3
-rw-r--r--games/phpua-q3/Makefile3
-rw-r--r--games/phpua-ut/Makefile3
-rw-r--r--games/phpua-ut2003/Makefile3
-rw-r--r--games/pinball/Makefile2
-rw-r--r--games/plee-the-bear/Makefile2
-rw-r--r--games/pmars/Makefile2
-rw-r--r--games/pokerth/Makefile2
-rw-r--r--games/pouetchess/Makefile2
-rw-r--r--games/prboom/Makefile2
-rw-r--r--games/pushover/Makefile2
-rw-r--r--games/py-mnemosyne/Makefile3
-rw-r--r--games/pyching/Makefile3
-rw-r--r--games/pykawari/Makefile3
-rw-r--r--games/pysolfc/Makefile2
-rw-r--r--games/qgo/Makefile2
-rw-r--r--games/qonk/Makefile2
-rw-r--r--games/qstat/Makefile3
-rw-r--r--games/quakeforge/Makefile3
-rw-r--r--games/quaqut/Makefile2
-rw-r--r--games/redeclipse/Makefile2
-rw-r--r--games/ri-li/Makefile3
-rw-r--r--games/robocode/Makefile2
-rw-r--r--games/rockdodger/Makefile3
-rw-r--r--games/rottdc/Makefile3
-rw-r--r--games/sauerbraten/Makefile2
-rw-r--r--games/scid/Makefile2
-rw-r--r--games/scorched3d/Makefile3
-rw-r--r--games/scourge-data/Makefile3
-rw-r--r--games/scummvm-tools/Makefile3
-rw-r--r--games/sdlroids/Makefile3
-rw-r--r--games/sdlsand/Makefile2
-rw-r--r--games/seahaven/Makefile4
-rw-r--r--games/secretmaryochronicles-music/Makefile3
-rw-r--r--games/secretmaryochronicles/Makefile3
-rw-r--r--games/shaaft/Makefile2
-rw-r--r--games/simutrans/Makefile2
-rw-r--r--games/slashem-tty/Makefile3
-rw-r--r--games/sopwith/Makefile3
-rw-r--r--games/spicetrade/Makefile3
-rw-r--r--games/stepmania-devel/Makefile2
-rw-r--r--games/stonesoup/Makefile2
-rw-r--r--games/stroq/Makefile2
-rw-r--r--games/super_methane_brothers/Makefile3
-rw-r--r--games/taxipilot/Makefile3
-rw-r--r--games/tmw/Makefile2
-rw-r--r--games/torcs/Makefile2
-rw-r--r--games/tremulous/Makefile4
-rw-r--r--games/trigger/Makefile3
-rw-r--r--games/tsito/Makefile3
-rw-r--r--games/tuxpaint-config/Makefile3
-rw-r--r--games/tuxpaint-fonts/Makefile3
-rw-r--r--games/tuxpaint-stamps/Makefile2
-rw-r--r--games/tuxracer/Makefile2
-rw-r--r--games/twitch/Makefile3
-rw-r--r--games/typespeed/Makefile1
-rw-r--r--games/ufoai-data/Makefile3
-rw-r--r--games/ufoai/Makefile2
-rw-r--r--games/uhexen2-extras/Makefile2
-rw-r--r--games/uhexen2/Makefile2
-rw-r--r--games/ultimatestunts/Makefile2
-rw-r--r--games/umark/Makefile3
-rw-r--r--games/unnethack/Makefile3
-rw-r--r--games/uqm/Makefile3
-rw-r--r--games/vavoom-extras/Makefile3
-rw-r--r--games/vavoom/Makefile2
-rw-r--r--games/vdrift-data/Makefile3
-rw-r--r--games/vdrift/Makefile3
-rw-r--r--games/vegastrike/Makefile2
-rw-r--r--games/wargus/Makefile2
-rw-r--r--games/warzone2100/Makefile3
-rw-r--r--games/wesnoth-devel/Makefile4
-rw-r--r--games/wesnoth/Makefile4
-rw-r--r--games/wmqstat/Makefile2
-rw-r--r--games/wolfpack/Makefile3
-rw-r--r--games/wrogue/Makefile2
-rw-r--r--games/xblast/Makefile2
-rw-r--r--games/xinvaders3d/Makefile2
-rw-r--r--games/xonotic/Makefile2
-rw-r--r--games/xpilot-ng-server/Makefile2
-rw-r--r--games/xpilot/Makefile2
-rw-r--r--games/xpired/Makefile3
-rw-r--r--games/xqf/Makefile2
-rw-r--r--games/xrally/Makefile2
-rw-r--r--games/xtux/Makefile2
-rw-r--r--games/xword/Makefile3
-rw-r--r--games/xye/Makefile3
-rw-r--r--german/BBBike/Makefile3
-rw-r--r--german/jdictionary-eng-ger/Makefile1
-rw-r--r--german/jdictionary-ger-hun/Makefile1
-rw-r--r--german/steak/Makefile4
-rw-r--r--german/unix-connect/Makefile4
-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
430 files changed, 468 insertions, 652 deletions
diff --git a/devel/love/Makefile b/devel/love/Makefile
index be09ac2033b2..edf875b282cd 100644
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@@ -9,7 +9,7 @@ PORTNAME= love
DISTVERSION= 0.5-0
PORTREVISION= 4
CATEGORIES= games devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.5-0
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Open-source 2D game engine
diff --git a/devel/love07/Makefile b/devel/love07/Makefile
index be09ac2033b2..edf875b282cd 100644
--- a/devel/love07/Makefile
+++ b/devel/love07/Makefile
@@ -9,7 +9,7 @@ PORTNAME= love
DISTVERSION= 0.5-0
PORTREVISION= 4
CATEGORIES= games devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.5-0
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Open-source 2D game engine
diff --git a/devel/love5/Makefile b/devel/love5/Makefile
index be09ac2033b2..edf875b282cd 100644
--- a/devel/love5/Makefile
+++ b/devel/love5/Makefile
@@ -9,7 +9,7 @@ PORTNAME= love
DISTVERSION= 0.5-0
PORTREVISION= 4
CATEGORIES= games devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.5-0
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Open-source 2D game engine
diff --git a/games/4stattack/Makefile b/games/4stattack/Makefile
index 63cadc2def79..3b4c6268071c 100644
--- a/games/4stattack/Makefile
+++ b/games/4stattack/Makefile
@@ -9,8 +9,7 @@ PORTNAME= 4stattack
PORTVERSION= 2.1.4
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= forcedattack
+MASTER_SITES= SF/forcedattack/4stAttack/${PORTVERSION}
DISTNAME= 4stAttack-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/8kingdoms/Makefile b/games/8kingdoms/Makefile
index 0cdeb80d0e97..7fc49c031412 100644
--- a/games/8kingdoms/Makefile
+++ b/games/8kingdoms/Makefile
@@ -9,8 +9,7 @@ PORTNAME= 8kingdoms
PORTVERSION= 1.1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kralovstvi
+MASTER_SITES= SF/kralovstvi/8%20Kingdoms/8%20Kingdoms%20${PORTVERSION}
DISTNAME= ${PORTNAME:S/k/K/}-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
diff --git a/games/BillardGL/Makefile b/games/BillardGL/Makefile
index 1433f32c980e..67ff25c38236 100644
--- a/games/BillardGL/Makefile
+++ b/games/BillardGL/Makefile
@@ -9,8 +9,7 @@ PORTNAME= BillardGL
PORTVERSION= 1.75
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= billardgl
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An OpenGL billiard simulator
diff --git a/games/abe/Makefile b/games/abe/Makefile
index 60f31d958fd8..1e53c06cde2a 100644
--- a/games/abe/Makefile
+++ b/games/abe/Makefile
@@ -9,8 +9,7 @@ PORTNAME= abe
PORTVERSION= 1.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Abe's Amazing Adventure
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index bd2639a9ece8..c5ac69f1dedc 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -9,7 +9,7 @@ PORTNAME= alephone
PORTVERSION= 20080913
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF/marathon
+MASTER_SITES= SF/marathon/Aleph%20One/2008-09-13
DISTNAME= AlephOne-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index 0a791ac1a78e..1196997a4860 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -9,7 +9,7 @@ PORTNAME= allacrost
PORTVERSION= 0.2.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION}
DISTNAME= allacrost_demo_source_${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile
index 14595fb0e732..ad43697568fd 100644
--- a/games/armagetron/Makefile
+++ b/games/armagetron/Makefile
@@ -10,7 +10,7 @@ PORTNAME= armagetron
PORTVERSION= 0.2.8.2.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF/armagetronad
+MASTER_SITES= SF/${PORTNAME}ad/${PORTNAME}ad-src/${PORTVERSION}
DISTNAME= armagetronad-${PORTVERSION}
EXTRACT_SUFX= .src.tar.gz
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 2f02c5c2c79c..2bbbe22167ce 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= asc
PORTVERSION= 1.16.4.0
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= asc-hq
+MASTER_SITES= SF/${PORTNAME}-hq/ASC%20Source/1.16.4
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile
index a8952ecc1074..0ab90fbfed2c 100644
--- a/games/assaultcube/Makefile
+++ b/games/assaultcube/Makefile
@@ -9,7 +9,7 @@ PORTNAME= assaultcube
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF/actiongame
+MASTER_SITES= SF/actiongame/AssaultCube/1.0
DISTNAME= AssaultCube_v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/avanor/Makefile b/games/avanor/Makefile
index beff7698fb0f..f83df649175a 100644
--- a/games/avanor/Makefile
+++ b/games/avanor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= avanor
PORTVERSION= 0.5.8
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= avanor
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= steinex@nognu.de
diff --git a/games/barrage/Makefile b/games/barrage/Makefile
index 7b0813114ba9..3e6e7732af4b 100644
--- a/games/barrage/Makefile
+++ b/games/barrage/Makefile
@@ -9,7 +9,7 @@ PORTNAME= barrage
PORTVERSION= 1.0.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF/lgames
+MASTER_SITES= SF/lgames/${PORTNAME}/1.0
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/bass/Makefile b/games/bass/Makefile
index b49165e7dd9a..6083fba5f01a 100644
--- a/games/bass/Makefile
+++ b/games/bass/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bass
PORTVERSION= 1.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= scummvm
+MASTER_SITES= SF/scummvm/extras/Beneath%20a%20Steel%20Sky
DISTNAME= bass-cd-1.2
MAINTAINER= lme@FreeBSD.org
diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile
index b20b97d8a28b..0586d3c6a320 100644
--- a/games/battletanks/Makefile
+++ b/games/battletanks/Makefile
@@ -9,7 +9,7 @@ PORTNAME= btanks
PORTVERSION= 0.7.5800
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTNAME}-source-${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= Fast 2D tank arcade game with multiplayer and split-screen modes
diff --git a/games/bfm/Makefile b/games/bfm/Makefile
index c815cb269f7e..a4c8c3002cd4 100644
--- a/games/bfm/Makefile
+++ b/games/bfm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bfm
PORTVERSION= 0.0.6.2
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= SF/battle4mandicor
+MASTER_SITES= SF/battle4mandicor/Battle%20for%20Mandicor/${PORTVERSION}.1
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= alepulver@FreeBSD.org
diff --git a/games/biloba/Makefile b/games/biloba/Makefile
index 13769216feff..6682560bb152 100644
--- a/games/biloba/Makefile
+++ b/games/biloba/Makefile
@@ -9,7 +9,7 @@ PORTNAME= biloba
PORTVERSION= 0.6
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Biloba/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A strategy board game for 2 to 4 players
diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile
index b0ae817e51e8..f7f639fc1c66 100644
--- a/games/blinkensisters/Makefile
+++ b/games/blinkensisters/Makefile
@@ -9,7 +9,7 @@ PORTNAME= blinkensisters
PORTVERSION= 0.5.3
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Blinkensisters%20-%20Lost%20Pixels/LostPixels%20${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Parallax-style 2D scrolling platform game
diff --git a/games/blobby/Makefile b/games/blobby/Makefile
index eeef952abf8f..527fe6ce1fcb 100644
--- a/games/blobby/Makefile
+++ b/games/blobby/Makefile
@@ -9,7 +9,7 @@ PORTNAME= blobby
PORTVERSION= 0.6a
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Blobby%20Volley%202%20%28Linux%29/Alpha%206
DISTNAME= blobby2-linux-${PORTVERSION}
MAINTAINER= ganael.laplanche@martymac.com
diff --git a/games/blokish/Makefile b/games/blokish/Makefile
index b3aa4716daa5..366d9c1735b5 100644
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@@ -9,7 +9,7 @@ PORTNAME= blokish
PORTVERSION= 0.9.4
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
DISTNAME= ${PORTNAME}_v${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/games/bloodfrontier/Makefile b/games/bloodfrontier/Makefile
index c47d8cda2415..68eb3d4f2d4f 100644
--- a/games/bloodfrontier/Makefile
+++ b/games/bloodfrontier/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sauerbraten
PORTVERSION= 20090504
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2009_05_04
DISTNAME= ${PORTNAME}_2009_05_04_trooper_edition_linux
MAINTAINER= acm@FreeBSD.org
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index bc5c17709e5a..66246fb08e03 100644
--- a/games/bomberinstinct/Makefile
+++ b/games/bomberinstinct/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bomberinstinct
PORTVERSION= 0.8.9
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Bomber%20Instinct/BomberInstinct-${PORTVERSION}
DISTNAME= BomberInstinct-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/bomns/Makefile b/games/bomns/Makefile
index 431a36cc647b..1295226f4a76 100644
--- a/games/bomns/Makefile
+++ b/games/bomns/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bomns
PORTVERSION= 0.99.1
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= greenridge
+MASTER_SITES= SF/greenridge/Bomns%20for%20Linux/Bomns%20for%20Linux%20${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= The best old-school deathmatch game EVER (only for two players)
diff --git a/games/brainworkshop/Makefile b/games/brainworkshop/Makefile
index f8c56efee196..b764e92619f2 100644
--- a/games/brainworkshop/Makefile
+++ b/games/brainworkshop/Makefile
@@ -8,7 +8,7 @@
PORTNAME= brainworkshop
PORTVERSION= 4.4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Brain%20Workshop%20${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Free open-source version of the Dual N-Back mental exercise
diff --git a/games/brutalchess/Makefile b/games/brutalchess/Makefile
index b7f5ce8e6e8d..66e12ded19ef 100644
--- a/games/brutalchess/Makefile
+++ b/games/brutalchess/Makefile
@@ -9,8 +9,7 @@ PORTNAME= brutalchess
PORTVERSION= 0.5.2
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-alpha/${PORTNAME}-alpha-${PORTVERSION}
DISTNAME= ${PORTNAME}-alpha-${PORTVERSION}-src
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile
index 99dcf1c69ea8..0cf91c1e5dad 100644
--- a/games/bubbros/Makefile
+++ b/games/bubbros/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bubbros
PORTVERSION= 1.6
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bub-n-bros
+MASTER_SITES= SF/bub-n-bros/bub-n-bros/${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Multiplayer clone of the famous Bubble Bobble game
diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index 6797bdabec1f..95df1b4143d8 100644
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bygfoot
PORTVERSION= 2.2.1
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= pav@FreeBSD.org
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 2edc68a06179..f4aa986978c3 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bzflag
PORTVERSION= 2.0.12
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION}
MAINTAINER= chuck@pkix.net
COMMENT= A multiplayer 3D tank battle game
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index a59dfd20e810..8f0a08a352f6 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cgoban
PORTVERSION= 1.9.14
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= cgoban1
+MASTER_SITES= SF/${PORTNAME}1/${PORTNAME}1/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Internet Go Server client and game editor
diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile
index cf5a0c8a6e0e..b6c4f561811b 100644
--- a/games/childsplay/Makefile
+++ b/games/childsplay/Makefile
@@ -9,8 +9,7 @@ PORTNAME= childsplay
PORTVERSION= 0.80.2
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= childsplay
+MASTER_SITES= SF/${PORTNAME}/OldFiles
EXTRACT_SUFX= .tgz
MAINTAINER= bruno@tinkerbox.org
diff --git a/games/childsplay_plugins/Makefile b/games/childsplay_plugins/Makefile
index fe8916884609..a24a88cd07bc 100644
--- a/games/childsplay_plugins/Makefile
+++ b/games/childsplay_plugins/Makefile
@@ -9,8 +9,7 @@ PORTNAME= childsplay_plugins
PORTVERSION= 0.80.1.1
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= childsplay
+MASTER_SITES= SF/childsplay/OldFiles
EXTRACT_SUFX= .tgz
MAINTAINER= bruno@tinkerbox.org
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index 50e427898b43..5b866ce19cf3 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -9,7 +9,7 @@ PORTNAME= chromium-bsu
PORTVERSION= 0.9.14
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Chromium%20B.S.U.%20source%20code/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= An arcade-style, top-scrolling space shooter
diff --git a/games/connectfive/Makefile b/games/connectfive/Makefile
index 742366e05621..ee8ce0e0f04d 100644
--- a/games/connectfive/Makefile
+++ b/games/connectfive/Makefile
@@ -9,7 +9,7 @@ PORTNAME= connectfive
PORTVERSION= 1.0.2
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF/connectfive
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-linux/${PORTNAME}-${PORTVERSION}
DISTNAME= connectFive
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/conquest/Makefile b/games/conquest/Makefile
index ce2264818fce..405fded59e7b 100644
--- a/games/conquest/Makefile
+++ b/games/conquest/Makefile
@@ -8,7 +8,7 @@
PORTNAME= conquest
PORTVERSION= 7.2
CATEGORIES= games
-MASTER_SITES= SF/conq
+MASTER_SITES= SF/conq/Conquest/Conquest%20${PORTVERSION}
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index edc4df3ef229..55fe4caa1ff2 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -9,8 +9,7 @@ PORTNAME= corewars
PORTVERSION= 0.9.13
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%2C%20tar.gz%29/${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= A simulation game where the goal is to crash each other's programs
diff --git a/games/cre/Makefile b/games/cre/Makefile
index 2e28bb70cd50..4b019d95b755 100644
--- a/games/cre/Makefile
+++ b/games/cre/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cre
DISTVERSION= 1.2beta_r2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dev/1.2%20BETA%2C%20Release%202
DISTNAME= ${PORTNAME}_${DISTVERSION}_src
MAINTAINER= alepulver@FreeBSD.org
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index 42caf09e83cc..b2899469a5b2 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.0
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Critical%20Mass/${PORTVERSION}
DISTNAME= CriticalMass-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 26dfbcbb3a2a..d6eeecf901f9 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -9,10 +9,11 @@ PORTNAME= crossfire-client
PORTVERSION= 1.8.0
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF \
+MASTER_SITES= SF/crossfire/${PORTNAME}/${PORTVERSION} \
ftp://ftp.ifi.uio.no/pub/crossfire/ \
+
ftp://ftp.real-time.com/pub/games/crossfire/
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-client//}
+
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-images-1.7.1${EXTRACT_SUFX} \
${PORTNAME}-sounds-1.4.0${EXTRACT_SUFX}
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index fb112f82107f..05847690b1db 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -9,8 +9,9 @@ PORTNAME= crossfire
PORTVERSION= 1.11.0
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-server/${PORTVERSION} \
ftp://ftp.real-time.com/pub/games/crossfire/
+
PKGNAMESUFFIX= -server
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${DISTNAME}.maps${EXTRACT_SUFX}
diff --git a/games/cryptoslam/Makefile b/games/cryptoslam/Makefile
index de0d433ddae6..86b3df5ee449 100644
--- a/games/cryptoslam/Makefile
+++ b/games/cryptoslam/Makefile
@@ -9,8 +9,7 @@
PORTNAME= cryptoslam
PORTVERSION= 1.2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/games/csmash/Makefile b/games/csmash/Makefile
index 7443acb2032c..44e114ca99c0 100644
--- a/games/csmash/Makefile
+++ b/games/csmash/Makefile
@@ -10,8 +10,7 @@ PORTNAME= csmash
PORTVERSION= 0.6.6
PORTREVISION= 11
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cannonsmash
+MASTER_SITES= SF/cannonsmash/CannonSmash/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A 3D tabletennis game
diff --git a/games/cube/Makefile b/games/cube/Makefile
index ba550db1941a..429939818aaa 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cube
PORTVERSION= 2005.08.29
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2005_08_29
DISTFILES= ${CUBE_DATA} ${CUBE_SRC}
EXTRACT_ONLY= ${CUBE_SRC}
diff --git a/games/cultivation/Makefile b/games/cultivation/Makefile
index 097a3da05b8f..ccbe21c8d915 100644
--- a/games/cultivation/Makefile
+++ b/games/cultivation/Makefile
@@ -9,7 +9,7 @@ PORTNAME= cultivation
PORTVERSION= 8
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
DISTNAME= Cultivation_${PORTVERSION}_UnixSource
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/daimonin-client/Makefile b/games/daimonin-client/Makefile
index 9b696e168ca6..9c707eab34c8 100644
--- a/games/daimonin-client/Makefile
+++ b/games/daimonin-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME= daimonin_client
PORTVERSION= 0.9.7.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF/daimonin
+MASTER_SITES= SF/daimonin/Client%20Sources/Client%20Source%20${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= Free open source Massively Multiplayer On-line Role-playing Game (MMORPG)
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index 9b696e168ca6..9c707eab34c8 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -9,7 +9,7 @@ PORTNAME= daimonin_client
PORTVERSION= 0.9.7.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF/daimonin
+MASTER_SITES= SF/daimonin/Client%20Sources/Client%20Source%20${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= Free open source Massively Multiplayer On-line Role-playing Game (MMORPG)
diff --git a/games/dangerdeep-data/Makefile b/games/dangerdeep-data/Makefile
index b2751ae16dcd..02279b608440 100644
--- a/games/dangerdeep-data/Makefile
+++ b/games/dangerdeep-data/Makefile
@@ -8,8 +8,7 @@
PORTNAME= data
PORTVERSION= 0.3.0
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dangerdeep
+MASTER_SITES= SF/dangerdeep/danger_from_the_deep-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= dangerdeep-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}
diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile
index 749aee4c6dcc..88b4919a9ed2 100644
--- a/games/dangerdeep/Makefile
+++ b/games/dangerdeep/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dangerdeep
PORTVERSION= 0.3.0
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/danger_from_the_deep-src/${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= acm@FreeBSD.org
diff --git a/games/deng/Makefile b/games/deng/Makefile
index 08c6ea6c23c8..91bb34298965 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -9,7 +9,7 @@ PORTNAME= deng
PORTVERSION= 1.9.0b4
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta4
DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/-beta/}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/diameter/Makefile b/games/diameter/Makefile
index 49187f0460fb..6e45f8e98ff9 100644
--- a/games/diameter/Makefile
+++ b/games/diameter/Makefile
@@ -9,8 +9,7 @@ PORTNAME= diameter
PORTVERSION= 0.4.0.3
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gamediameter
+MASTER_SITES= SF/game${PORTNAME}/game${PORTNAME}/${PORTNAME}-0.4.0
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Arcade-style game with elements of economy and adventure
diff --git a/games/doom-freedoom/Makefile b/games/doom-freedoom/Makefile
index 1745808829d6..524a735f8f03 100644
--- a/games/doom-freedoom/Makefile
+++ b/games/doom-freedoom/Makefile
@@ -8,7 +8,7 @@
PORTNAME= freedoom
PORTVERSION= 0.6.2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMEPREFIX= ${DMPKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-iwad-${PORTVERSION}
diff --git a/games/doom/Makefile b/games/doom/Makefile
index cc03f0cb9a6d..c95bc754b5fc 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -9,7 +9,7 @@ PORTNAME= doom
PORTVERSION= 1.10
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF/source
+MASTER_SITES= # none known, please fix
DISTNAME= doomsrc
MAINTAINER= ports@FreeBSD.org
diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile
index 7d07fae2d7f4..ced7dfdb3d00 100644
--- a/games/doomlegacy/Makefile
+++ b/games/doomlegacy/Makefile
@@ -8,7 +8,7 @@ PORTNAME= doomlegacy
PORTVERSION= 142
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/DooM%20Legacy%20source%20code/1.42
DISTNAME= legacy_${PORTVERSION}_src
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${WADFILE}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/easysok/Makefile b/games/easysok/Makefile
index c49552a31364..88403fe81d46 100644
--- a/games/easysok/Makefile
+++ b/games/easysok/Makefile
@@ -8,8 +8,7 @@ PORTNAME= easysok
PORTVERSION= 0.3.5
PORTREVISION= 5
CATEGORIES= games kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-kde3
MAINTAINER= ports@FreeBSD.org
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 5094f0fc3699..37360a769660 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -9,8 +9,7 @@ PORTNAME= eboard
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} eboard-extras-1pl2.tar.gz eboard-extras-2.tar.gz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/edge/Makefile b/games/edge/Makefile
index d1111a1e9890..e5d3bef76a44 100644
--- a/games/edge/Makefile
+++ b/games/edge/Makefile
@@ -9,7 +9,7 @@ PORTNAME= edge
PORTVERSION= 1.29
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-${PORTVERSION}-linux${EXTRACT_SUFX}
diff --git a/games/egoboo/Makefile b/games/egoboo/Makefile
index 0184c7a16831..533437a3fa24 100644
--- a/games/egoboo/Makefile
+++ b/games/egoboo/Makefile
@@ -9,7 +9,7 @@ PORTVERSION= 2.7.5
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Linux%20Source%20Distro/${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${DISTNAME:S/-/-data-/}${EXTRACT_SUFX}
diff --git a/games/ember/Makefile b/games/ember/Makefile
index d114ee2b562b..e8a6bdaccacf 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -9,9 +9,9 @@ PORTNAME= ember
PORTVERSION= 0.5.6
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF \
+MASTER_SITES= SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \
http://amber.worldforge.org/ember/releases/stable/
-MASTER_SITE_SUBDIR=worldforge
+
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-media-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/games/etracer/Makefile b/games/etracer/Makefile
index 5a779b238025..685cee031e8a 100644
--- a/games/etracer/Makefile
+++ b/games/etracer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= etracer
PORTVERSION= 0.4
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF/extremetuxracer
+MASTER_SITES= SF/extremetuxracer/extreme-tuxracer/${PORTVERSION}
DISTNAME= extremetuxracer-${PORTVERSION}
MAINTAINER= peter_dunning@dsl.pipex.com
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 4ea99ae7a5c5..b8b26f839bf1 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tuxracer
PORTVERSION= 0.61
PORTREVISION= 8
CATEGORIES= games
-MASTER_SITES= SF/tuxracer
+MASTER_SITES= SF
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
${PORTNAME}-data-${PORTVERSION}.tar.gz
diff --git a/games/euchre/Makefile b/games/euchre/Makefile
index 48d88ef74e7d..1ea0c174c171 100644
--- a/games/euchre/Makefile
+++ b/games/euchre/Makefile
@@ -9,7 +9,7 @@ PORTNAME= euchre
PORTVERSION= 0.7
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Very popular card game with variable skill levels
diff --git a/games/exult/Makefile b/games/exult/Makefile
index cbf4da1f7e23..41cbf6081852 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -9,7 +9,7 @@ PORTNAME= exult
PORTVERSION= 1.2
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-all-versions/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Ultima VII engine
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index 571ab510dd51..d8551ce10b54 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -10,8 +10,9 @@ PORTVERSION= 1.9
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= games
-MASTER_SITES= SF:ezquake \
+MASTER_SITES= SF/${PORTNAME}/A%29%20Official%20releases/ezQuake%20${PORTVERSION}:ezquake \
http://www.winimage.com/zLibDll/:minizip
+
DISTFILES= ${PORTNAME}_source_${PORTVERSION}.7z:ezquake \
${PORTNAME}_linux-x86_${PORTVERSION}${EXTRACT_SUFX}:ezquake \
unzip101e.zip:minizip
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index 0432ea8e563a..35cb3cb5f621 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -9,7 +9,7 @@ PORTNAME= falconseye
PORTVERSION= 1.9.3
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= SF/falconseye
+MASTER_SITES= SF/${PORTNAME}/NetHack-Falcon_s%20Eye%20%28source%29/${PORTVERSION}
DISTNAME= nethack_source_331_jtp_${PORTVERSION:S/.//g}
MAINTAINER= kris@FreeBSD.org
diff --git a/games/fargoal/Makefile b/games/fargoal/Makefile
index 18ff5a385d67..d0353b346a38 100644
--- a/games/fargoal/Makefile
+++ b/games/fargoal/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fargoal
PORTVERSION= 20040629
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= squidfighter
+MASTER_SITES= SF/squidfighter/${PORTNAME}/20040630
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index cc880581d3a0..7c8ca703976b 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fillets-ng
PORTVERSION= 0.9.1
CATEGORIES= games
-MASTER_SITES= SF/fillets
+MASTER_SITES= SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}-data-${DATAVERSION}${EXTRACT_SUFX}
diff --git a/games/fotaq/Makefile b/games/fotaq/Makefile
index bcb007cf515d..80ad4a4afc36 100644
--- a/games/fotaq/Makefile
+++ b/games/fotaq/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fotaq
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= scummvm
+MASTER_SITES= SF/scummvm/extras/Flight%20of%20the%20Amazon%20Queen
DISTNAME= FOTAQ_Talkie
MAINTAINER= lme@FreeBSD.org
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index a84da2a4d21d..8c6fa75375d6 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -9,7 +9,7 @@ PORTNAME= freeciv
PORTVERSION= 2.1.9
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/freeciv/Freeciv%202.1/${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Free turn-based multiplayer strategy
diff --git a/games/freecol/Makefile b/games/freecol/Makefile
index 66a4d383ef5b..2eebe7f2e7f8 100644
--- a/games/freecol/Makefile
+++ b/games/freecol/Makefile
@@ -8,8 +8,7 @@
PORTNAME= freecol
PORTVERSION= 0.8.3
CATEGORIES= games java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= An open source version of Colonization
diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile
index f55465cb5921..aca40206cbb8 100644
--- a/games/freedoko/Makefile
+++ b/games/freedoko/Makefile
@@ -9,7 +9,7 @@ PORTNAME= freedoko
PORTVERSION= 0.7.5
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF/free-doko
+MASTER_SITES= SF/free-doko/FreeDoko%20source/${PORTVERSION}
DISTNAME= FreeDoko_${PORTVERSION}.src
MAINTAINER= ports@FreeBSD.org
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index 0a43e5abc699..d729a04a19f8 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -9,8 +9,7 @@ PORTNAME= freedroid
PORTVERSION= 1.0.2
PORTREVISION= 8
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= freedroid
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}Classic/FreedroidClassic-${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Freedroid is a clone of the classic game "Paradroid"
diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile
index 0419b5fe50eb..4b36c8178d10 100644
--- a/games/freedroidrpg/Makefile
+++ b/games/freedroidrpg/Makefile
@@ -9,7 +9,7 @@ PORTNAME= freedroidrpg
PORTVERSION= 0.12.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF/freedroid
+MASTER_SITES= SF/freedroid/freedroidRPG/freedroidRPG-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Modification of the classical Freedroid engine into an RPG
diff --git a/games/freera/Makefile b/games/freera/Makefile
index 9da29bb93e69..a0fd8a021907 100644
--- a/games/freera/Makefile
+++ b/games/freera/Makefile
@@ -9,7 +9,7 @@ PORTNAME= freera
PORTVERSION= 080203
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}%20${PORTNAME}%2B%2B/0.47%20beta
DISTNAME= ${PORTVERSION}_freera++_src
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/freesynd/Makefile b/games/freesynd/Makefile
index e2a2fa8c7e56..ae1a7dbd4f48 100644
--- a/games/freesynd/Makefile
+++ b/games/freesynd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= freesynd
PORTVERSION= 0.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= freesynd
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= lme@FreeBSD.org
COMMENT= FreeSynd GPLed reimplementation of the classic Bullfrog game Syndicate
diff --git a/games/freetennis/Makefile b/games/freetennis/Makefile
index 38da051a67ad..ab468eae99ba 100644
--- a/games/freetennis/Makefile
+++ b/games/freetennis/Makefile
@@ -9,8 +9,7 @@ PORTNAME= freetennis
PORTVERSION= 0.4.8
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= freetennis
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A tennis simulation
diff --git a/games/fretsonfire-data/Makefile b/games/fretsonfire-data/Makefile
index c353926085c8..5020c57e0114 100644
--- a/games/fretsonfire-data/Makefile
+++ b/games/fretsonfire-data/Makefile
@@ -8,8 +8,7 @@
PORTNAME= data
PORTVERSION= 1.3.110
CATEGORIES= games python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX:S/-//}
+MASTER_SITES= SF/fretsonfire/fretsonfire/${PORTVERSION}
PKGNAMEPREFIX= fretsonfire-
DISTNAME= ${PKGNAMEPREFIX:S/f/F/g:S/o/O/}${PORTVERSION}
DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}
diff --git a/games/fteqw/Makefile b/games/fteqw/Makefile
index 1440adc5d5ac..c53470dcf68f 100644
--- a/games/fteqw/Makefile
+++ b/games/fteqw/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fteqw
PORTVERSION= 3343
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Source/${PORTVERSION}
DISTNAME= ftesrc${PORTVERSION}-all
MAINTAINER= alepulver@FreeBSD.org
diff --git a/games/funnyboat/Makefile b/games/funnyboat/Makefile
index 3320dd8f401a..be092a0271c9 100644
--- a/games/funnyboat/Makefile
+++ b/games/funnyboat/Makefile
@@ -9,7 +9,6 @@ PORTNAME= funnyboat
PORTVERSION= 1.5
CATEGORIES= games
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index fd95be73de17..c4b8d990a928 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gcompris
DISTVERSION= 8.4.12
PORTREVISION= 1
CATEGORIES= games gnome
-MASTER_SITES= SF/gcompris
+MASTER_SITES= SF
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome2 educational games and activities for kids ages 2 to 10
diff --git a/games/gdado/Makefile b/games/gdado/Makefile
index 035832a6fb5c..94261f6cd12c 100644
--- a/games/gdado/Makefile
+++ b/games/gdado/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gdado
PORTVERSION= 2.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/souce%20code/${PORTNAME}-${PORTVERSION}
MAINTAINER= amistry@am-productions.biz
COMMENT= GTK2 dice roller
diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile
index 7129587ac312..72717b434b4f 100644
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gemrb
PORTVERSION= 0.5.0
CATEGORIES= games emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION}%20Sources
MAINTAINER= beyert@cs.ucr.edu
COMMENT= GemRB (Game engine made with preRendered Background)
diff --git a/games/gillo/Makefile b/games/gillo/Makefile
index ff48624607a5..5765e4d1e4d8 100644
--- a/games/gillo/Makefile
+++ b/games/gillo/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gillo
DISTVERSION= 1.0beta1
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0beta1
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index 7d3b46de05d3..0a73fa6f64da 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gl-117
PORTVERSION= 1.3.2
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/GL-117%20Source
DISTVERSIONSUFFIX= -src
MAINTAINER= erik@smluc.org
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index c7197fd1493e..0e208aa3d757 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -9,8 +9,7 @@ PORTNAME= glchess
PORTVERSION= 1.0.6
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= scjamorim@bsd.com.br
COMMENT= A 3D OpenGL based chess game
diff --git a/games/glest-data/Makefile b/games/glest-data/Makefile
index d6b30b0b2cbe..34d995fadbaf 100644
--- a/games/glest-data/Makefile
+++ b/games/glest-data/Makefile
@@ -8,8 +8,7 @@
PORTNAME= data
PORTVERSION= 3.2.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= glest
+MASTER_SITES= SF/glest/glest%20${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= glest-
DISTNAME= glest_${PORTNAME}_${PORTVERSION}
DIST_SUBDIR= glest
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 694a030c50e4..e63e033a5553 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -9,8 +9,7 @@ PORTNAME= glest
PORTVERSION= 3.2.2
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION}
DISTNAME= ${PORTNAME}_source_${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
diff --git a/games/glmaze/Makefile b/games/glmaze/Makefile
index c813e4cb434c..5c4e35b648de 100644
--- a/games/glmaze/Makefile
+++ b/games/glmaze/Makefile
@@ -8,8 +8,7 @@ PORTNAME= glmaze
PORTVERSION= 1.1a
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiplayer OpenGL Maze Game
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 07af1002bc64..f2ac920084fc 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gltron
PORTVERSION= 0.70
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
EXTRACT_SUFX= -source.tar.gz
MAINTAINER= lx@FreeBSD.org
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index 8da4070782b9..936327370732 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnomememoryblocks
PORTVERSION= 0.2
PORTREVISION= 6
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnome-memblocks
+MASTER_SITES= SF/gnome-memblocks/gnome-memblocks/${PORTVERSION}
DISTNAME= gnome-memblocks-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile
index a6ae7000bee7..da5b375170b7 100644
--- a/games/gnomermind/Makefile
+++ b/games/gnomermind/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomermind
PORTVERSION= 1.0.1
PORTREVISION= 7
CATEGORIES= games gnome
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/GnomerMind/${PORTVERSION}%20_Dreaming%20clovers_
MAINTAINER= ports@FreeBSD.org
COMMENT= A puzzle game for Gnome, loosely based on the classic MasterMind game
diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile
index 8b565e807858..1d413e128390 100644
--- a/games/gnomesudoku/Makefile
+++ b/games/gnomesudoku/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomesudoku
PORTVERSION= 0.6.0
PORTREVISION= 2
CATEGORIES= games gnome
-MASTER_SITES= SF/gnome-sudoku
+MASTER_SITES= SF/gnome-sudoku/gnome-sudoku/${PORTVERSION}
DISTNAME= gnome-sudoku-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/gnurobbo/Makefile b/games/gnurobbo/Makefile
index 211c99282e9f..e2e6a0c62640 100644
--- a/games/gnurobbo/Makefile
+++ b/games/gnurobbo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnurobbo
PORTVERSION= 0.61
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Reimplementation of LK Avalon's Robbo for the Atari XE/XL
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index 746c548cd52a..7955d99f0d87 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -9,8 +9,7 @@ PORTNAME= grhino
PORTVERSION= 0.16.0
PORTREVISION= 4
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rhino
+MASTER_SITES= SF/rhino/GRhino/${PORTVERSION}
MAINTAINER= umeno@rr.iij4u.or.jp
COMMENT= GRhino Othello/Reversi Program
diff --git a/games/hattrickorganizer/Makefile b/games/hattrickorganizer/Makefile
index 5f1622dbfaca..d7d0adf30927 100644
--- a/games/hattrickorganizer/Makefile
+++ b/games/hattrickorganizer/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.397
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ho1
+MASTER_SITES= SF/ho1/OldFiles
DISTNAME= HO_${PORTVERSION:S/.//g}
MAINTAINER= lme@FreeBSD.org
diff --git a/games/hlstats/Makefile b/games/hlstats/Makefile
index 8fd72dee326d..c3874c0e1374 100644
--- a/games/hlstats/Makefile
+++ b/games/hlstats/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hlstats
PORTVERSION= 1.38
CATEGORIES= games www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/HLstats/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A real-time stats parser for Half Life & its mods
diff --git a/games/interlogic/Makefile b/games/interlogic/Makefile
index be7c3c6aac67..f112b25165f4 100644
--- a/games/interlogic/Makefile
+++ b/games/interlogic/Makefile
@@ -9,7 +9,7 @@ PORTNAME= interlogic
PORTVERSION= 0.30
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.0
DISTNAME= interLOGIC-src-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/ivan/Makefile b/games/ivan/Makefile
index 77a6360f1cfe..ae585dc33d12 100644
--- a/games/ivan/Makefile
+++ b/games/ivan/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ivan
PORTVERSION= 0.50
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/IVAN/IVAN%20${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A graphical roguelike game
diff --git a/games/jchessboard/Makefile b/games/jchessboard/Makefile
index 9af1a17a65a7..eb1f2b930291 100644
--- a/games/jchessboard/Makefile
+++ b/games/jchessboard/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jchessboard
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= games java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= JChessBoard-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/games/jin/Makefile b/games/jin/Makefile
index ce0762a56546..137feb734a31 100644
--- a/games/jin/Makefile
+++ b/games/jin/Makefile
@@ -9,7 +9,7 @@ PORTNAME= jin
PORTVERSION= 2.14.1
PORTREVISION= 2
CATEGORIES= games java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-unix
MAINTAINER= nivit@FreeBSD.org
diff --git a/games/jtans/Makefile b/games/jtans/Makefile
index 837c94b09fbd..2091275d9542 100644
--- a/games/jtans/Makefile
+++ b/games/jtans/Makefile
@@ -10,8 +10,7 @@ PORTNAME= jtans
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= games java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}_appli-${PORTVERSION}
EXTRACT_SUFX= .jar
diff --git a/games/kevedit/Makefile b/games/kevedit/Makefile
index 2fda382b6151..2aeb106d2ea3 100644
--- a/games/kevedit/Makefile
+++ b/games/kevedit/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kevedit
PORTVERSION= 0.5.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kevedit
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Modern ZZT editor with necessary features
diff --git a/games/kfreerings/Makefile b/games/kfreerings/Makefile
index ae2b289cdf54..7d7fcbf57aff 100644
--- a/games/kfreerings/Makefile
+++ b/games/kfreerings/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kfreerings
PORTVERSION= 1.0
PORTREVISION= 6
CATEGORIES= games kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kfreerings
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b./beta/}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/kiki/Makefile b/games/kiki/Makefile
index 9a6d472d2028..4976fbed438b 100644
--- a/games/kiki/Makefile
+++ b/games/kiki/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kiki
PORTVERSION= 1.0.2
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/games/kimboot/Makefile b/games/kimboot/Makefile
index 92737fca05cc..558e4b6957dc 100644
--- a/games/kimboot/Makefile
+++ b/games/kimboot/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kimboot
PORTVERSION= 0.74
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index 5521428691be..894e731c3e82 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -9,7 +9,7 @@ PORTNAME= klavaro
PORTVERSION= 1.1.8
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= h.skuhra@gmail.com
COMMENT= Touchtyping trainer
diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index 449788421bb5..5d366a690900 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -9,8 +9,7 @@ PORTNAME= knights
PORTVERSION= 0.6
PORTREVISION= 7
CATEGORIES= games kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= knights
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A KDE chess interface (gnuchess/crafty)
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 449788421bb5..5d366a690900 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -9,8 +9,7 @@ PORTNAME= knights
PORTVERSION= 0.6
PORTREVISION= 7
CATEGORIES= games kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= knights
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A KDE chess interface (gnuchess/crafty)
diff --git a/games/kpictorial/Makefile b/games/kpictorial/Makefile
index 4e9eef315b7b..5e96e5ce64b1 100644
--- a/games/kpictorial/Makefile
+++ b/games/kpictorial/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kpictorial
PORTVERSION= 0.9.1
PORTREVISION= 7
CATEGORIES= games kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kpictorial
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= arved@FreeBSD.org
COMMENT= Little logical game for KDE
diff --git a/games/kpuzzle/Makefile b/games/kpuzzle/Makefile
index 5ca28a1f144f..9d55692c6fa6 100644
--- a/games/kpuzzle/Makefile
+++ b/games/kpuzzle/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kpuzzle
PORTVERSION= 0.4
PORTREVISION= 6
CATEGORIES= games kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kpuzzle
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-final
MAINTAINER= ports@FreeBSD.org
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index ce4236ae4c43..29db07cc80b8 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lbreakout
PORTVERSION= 010315
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lgames
+MASTER_SITES= SF/lgames/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A nice clone of classical Breakout game
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 9b440ac697d7..37614b9dd969 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lbreakout2
DISTVERSION= 2.6beta-3
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lgames
+MASTER_SITES= SF/lgames/${PORTNAME}/2.6
MAINTAINER= mmendez@gmail.com
COMMENT= The polished successor to LBreakout
diff --git a/games/lgeneral-data/Makefile b/games/lgeneral-data/Makefile
index dc0d51d70fd5..13e88fd42963 100644
--- a/games/lgeneral-data/Makefile
+++ b/games/lgeneral-data/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lgeneral-data
PORTVERSION= 1.1.3
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lgeneral
+MASTER_SITES= SF/lgeneral/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= A turn-based strategy engine inspired by Panzer General
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index c3e20617f4c1..d2188fa51fe5 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lgeneral
PORTVERSION= 1.1.1
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lgeneral
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-engine/1.1
MAINTAINER= ports@FreeBSD.org
COMMENT= A turn-based strategy engine inspired by Panzer General
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index e0536cee0f3e..4bca4de0bf4b 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lianliankan
DISTVERSION= 2.3beta1
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= llk-linux
+MASTER_SITES= SF/llk-linux/llk-linux-source/2.3beta1
DISTNAME= llk_linux-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/libdungeonmaker/Makefile b/games/libdungeonmaker/Makefile
index afe2800bd656..2c753a852605 100644
--- a/games/libdungeonmaker/Makefile
+++ b/games/libdungeonmaker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libdungeonmaker
PORTVERSION= 2.05
CATEGORIES= games devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= dungeonmaker
+MASTER_SITES= SF/dungeonmaker/dungeonmaker/${PORTVERSION}
DISTNAME= dungeonmaker-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index bbd192b278aa..d7bee49d7052 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lincity
PORTVERSION= 1.13.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Lincity%20Development%20Source/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Rich city simulation game for X
diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index 60bd822849f4..a64e79be76d1 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lmarbles
PORTVERSION= 1.0.7
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lgames
+MASTER_SITES= SF/lgames/marbles/1.0
MAINTAINER= ports@FreeBSD.org
COMMENT= A challenging puzzle game similar to Atomix
diff --git a/games/lmpc/Makefile b/games/lmpc/Makefile
index 7888a01f5652..26d530f42590 100644
--- a/games/lmpc/Makefile
+++ b/games/lmpc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= lmpc
PORTVERSION= 3.4.2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= A tool to manipulate games demo recordings
diff --git a/games/love/Makefile b/games/love/Makefile
index be09ac2033b2..edf875b282cd 100644
--- a/games/love/Makefile
+++ b/games/love/Makefile
@@ -9,7 +9,7 @@ PORTNAME= love
DISTVERSION= 0.5-0
PORTREVISION= 4
CATEGORIES= games devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.5-0
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Open-source 2D game engine
diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile
index f656d78439f2..e189ac539f19 100644
--- a/games/lpairs/Makefile
+++ b/games/lpairs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lpairs
PORTVERSION= 1.0.4
CATEGORIES= games
-MASTER_SITES= SF/lgames
+MASTER_SITES= SF/lgames/${PORTNAME}/1.0
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Classical memory game
diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index d778bc4a1b99..7a0cc7bff445 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.12
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games
-MASTER_SITES= SF/lgames
+MASTER_SITES= SF/lgames/${PORTNAME}/1.0
MAINTAINER= ports@FreeBSD.org
COMMENT= An another tetris clone but a good one with bunch of cool features
diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile
index 3f97b578a351..adcd7a17f7a3 100644
--- a/games/marsnomercy/Makefile
+++ b/games/marsnomercy/Makefile
@@ -9,8 +9,7 @@ PORTNAME= marsnomercy
PORTVERSION= 0.2.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mars
+MASTER_SITES= SF/mars/mars/${PORTVERSION}
DISTNAME= mars-${PORTVERSION}-src
MAINTAINER= acm@FreeBSD.org
diff --git a/games/masterserver/Makefile b/games/masterserver/Makefile
index df991eb0e565..84fcac29307b 100644
--- a/games/masterserver/Makefile
+++ b/games/masterserver/Makefile
@@ -8,8 +8,7 @@
PORTNAME= masterserver
PORTVERSION= 0.4.1
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= lasange-system
+MASTER_SITES= SF/lasange-system/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Masterserver for IdSoftware games (D3, EF, H2, Q2, Q3, QW)
diff --git a/games/nInvaders/Makefile b/games/nInvaders/Makefile
index 6446798075a2..33f568c2ca6d 100644
--- a/games/nInvaders/Makefile
+++ b/games/nInvaders/Makefile
@@ -9,8 +9,7 @@
PORTNAME= nInvaders
PORTVERSION= 0.1.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ninvaders
+MASTER_SITES= SF
DISTNAME= ninvaders-${PORTVERSION}
MAINTAINER= mich@FreeBSD.org
diff --git a/games/nazghul/Makefile b/games/nazghul/Makefile
index c83d9d25a2d4..8ac45bd9c2d6 100644
--- a/games/nazghul/Makefile
+++ b/games/nazghul/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nazghul
PORTVERSION= 0.6.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= A computer role-playing game engine
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index 90b7c35e06bb..e7bc5462d477 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nethack
PORTVERSION= 3.2.3
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3.2.2
DISTNAME= nethack-322
EXTRACT_SUFX= .tgz
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 4327999fb49e..0db7476308a6 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nethack
PORTVERSION= 3.3.1
PORTREVISION= 9
CATEGORIES?= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nethack
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index be991152c5ef..1fdd7dcc162e 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nethack
PORTVERSION= 3.4.3
PORTREVISION= 7
CATEGORIES?= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-src
EXTRACT_SUFX= .tgz
diff --git a/games/nettoe/Makefile b/games/nettoe/Makefile
index ff1e00c24558..222e9f7055b5 100644
--- a/games/nettoe/Makefile
+++ b/games/nettoe/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nettoe
PORTVERSION= 1.1.0
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A tic-tac-toe game playable over the network
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 3e2139e89a02..3baed43f7bac 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nexuiz
PORTVERSION= 2.5.1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/nil/Makefile b/games/nil/Makefile
index d180b7f537c3..e608e1c94ec9 100644
--- a/games/nil/Makefile
+++ b/games/nil/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nil
DISTVERSION= 20050603-1400
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/NiL%20%28old%29/${PORTNAME}-20050603
DISTNAME= ${PORTNAME}-cvs-backup-${DISTVERSION}
MAINTAINER= gahr@FreeBSD.org
diff --git a/games/nimuh/Makefile b/games/nimuh/Makefile
index 0387041e99bc..9ed9057282a7 100644
--- a/games/nimuh/Makefile
+++ b/games/nimuh/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nimuh
PORTVERSION= 1.02
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/Nimuh%20SRC%20%28Source%20Code%29
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} ${PORTNAME}-data-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/njam/Makefile b/games/njam/Makefile
index 94b2ae9238b5..e1890685423a 100644
--- a/games/njam/Makefile
+++ b/games/njam/Makefile
@@ -9,7 +9,7 @@ PORTNAME= njam
PORTVERSION= 1.25
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/noegnud-littlehack/Makefile b/games/noegnud-littlehack/Makefile
index 5fbf460c4405..02f801604bfc 100644
--- a/games/noegnud-littlehack/Makefile
+++ b/games/noegnud-littlehack/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.8.3
PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \
- ${MASTER_SITE_SOURCEFORGE:S/$/:nethack/}
-MASTER_SITE_SUBDIR= nethack/:nethack
+ SF/nethack/nethack/3.4.2:nethack
PKGNAMESUFFIX= -littlehack
DISTFILES= ${DISTNAME}_linux_src-minimal${EXTRACT_SUFX}:noegnud \
nethack-342.tgz:nethack
diff --git a/games/noegnud-nethack-deet/Makefile b/games/noegnud-nethack-deet/Makefile
index 561e3c6d059a..d55fa03e1757 100644
--- a/games/noegnud-nethack-deet/Makefile
+++ b/games/noegnud-nethack-deet/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.8.3
PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \
- ${MASTER_SITE_SOURCEFORGE:S/$/:nethack/}
-MASTER_SITE_SUBDIR= nethack/:nethack
+ SF/nethack/nethack/3.4.2:nethack
PKGNAMESUFFIX= -nethack-deet
DISTFILES= ${DISTNAME}_linux_src-minimal${EXTRACT_SUFX}:noegnud \
nethack-342.tgz:nethack
diff --git a/games/noegnud-nethack/Makefile b/games/noegnud-nethack/Makefile
index 9f87cc91d2d8..b96905a3b095 100644
--- a/games/noegnud-nethack/Makefile
+++ b/games/noegnud-nethack/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.8.3
PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \
- ${MASTER_SITE_SOURCEFORGE:S/$/:nethack/}
-MASTER_SITE_SUBDIR= nethack/:nethack
+ SF/nethack/nethack/3.4.3:nethack
PKGNAMESUFFIX= -nethack
DISTFILES= ${DISTNAME}_linux_src-minimal${EXTRACT_SUFX}:noegnud \
nethack-343-src.tgz:nethack
diff --git a/games/noegnud-slashem/Makefile b/games/noegnud-slashem/Makefile
index b339cf4b9e47..76f5e7a90b1c 100644
--- a/games/noegnud-slashem/Makefile
+++ b/games/noegnud-slashem/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.8.3
PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \
- ${MASTER_SITE_SOURCEFORGE:S/$/:slashem/}
-MASTER_SITE_SUBDIR= slashem/:slashem
+ SF/slashem/slashem-source/0.0.6E4F8:slashem
PKGNAMESUFFIX= -slashem
DISTFILES= ${DISTNAME}_linux_src-minimal${EXTRACT_SUFX}:noegnud \
se006e4f8.tar.gz:slashem
diff --git a/games/nonsense/Makefile b/games/nonsense/Makefile
index e32e9dcb8cdb..8b2ddd9927e9 100644
--- a/games/nonsense/Makefile
+++ b/games/nonsense/Makefile
@@ -8,8 +8,7 @@
PORTNAME= nonsense
PORTVERSION= 0.6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= roam@FreeBSD.org
COMMENT= A nonsense text generator
diff --git a/games/odamex/Makefile b/games/odamex/Makefile
index 8e18660da1f8..20a24ac87fbb 100644
--- a/games/odamex/Makefile
+++ b/games/odamex/Makefile
@@ -8,7 +8,7 @@
PORTNAME= odamex
PORTVERSION= 0.4.3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION}
DISTNAME= odamex-src-${PORTVERSION}
MAINTAINER= joshua_rickmar@eumx.net
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 8cb2e831735d..cb5a8fbe5e61 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -9,7 +9,7 @@ PORTNAME= openalchemist
PORTVERSION= 0.3
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ganael.laplanche@martymac.com
diff --git a/games/opencity/Makefile b/games/opencity/Makefile
index e1ee29a8164a..f7ceb573c835 100644
--- a/games/opencity/Makefile
+++ b/games/opencity/Makefile
@@ -9,7 +9,7 @@ PORTNAME= opencity
PORTVERSION= 0.0.6.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Stable/0.0.6
DISTNAME= ${PORTNAME}-${PORTVERSION}stable
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/openglad/Makefile b/games/openglad/Makefile
index 8a5beb87533d..2cb370580a9f 100644
--- a/games/openglad/Makefile
+++ b/games/openglad/Makefile
@@ -9,7 +9,7 @@ PORTNAME= openglad
PORTVERSION= 0.98
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= SF/snowstorm
+MASTER_SITES= SF/snowstorm/OpenGlad/Openglad-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= SDL port of an old DOS game called Gladiator
diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile
index 3bbac36990c3..4c7051ba06a2 100644
--- a/games/openlierox/Makefile
+++ b/games/openlierox/Makefile
@@ -9,7 +9,7 @@ PORTNAME= openlierox
DISTVERSION= 0.57_beta8
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenLieroX%200.57%20Beta8
DISTNAME= OpenLieroX_${DISTVERSION}.src
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 7e0ecd9e9f25..3dedc590b1ed 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= openttd
PORTVERSION= 0.7.2
CATEGORIES= games
-MASTER_SITES= SF http://binaries.openttd.org/releases/${PORTVERSION}/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} http://binaries.openttd.org/releases/${PORTVERSION}/
MAINTAINER= danfe@FreeBSD.org
COMMENT= An open source clone of Microprose Transport Tycoon Deluxe
diff --git a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile
index 76e40bccf40d..a83fe2e5b1d9 100644
--- a/games/openyahtzee/Makefile
+++ b/games/openyahtzee/Makefile
@@ -9,7 +9,7 @@ PORTNAME= openyahtzee
PORTVERSION= 1.8.1
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Open%20Yahtzee/Open%20Yahtzee%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Full-featured classic dice game Yahtzee
diff --git a/games/outerspace/Makefile b/games/outerspace/Makefile
index b2f79bac80a5..32e46ba967a3 100644
--- a/games/outerspace/Makefile
+++ b/games/outerspace/Makefile
@@ -8,8 +8,7 @@
PORTNAME= outerspace
PORTVERSION= 0.2.2
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ospace
+MASTER_SITES= SF/ospace/OSLauncher/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= On-line strategy game
diff --git a/games/pachi/Makefile b/games/pachi/Makefile
index 7b9eafa7dde3..2106a5401e54 100644
--- a/games/pachi/Makefile
+++ b/games/pachi/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pachi
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF/dragontech
+MASTER_SITES= SF/dragontech/Pachi%20el%20marciano/Pachi%20el%20marciano%20${PORTVERSION}
DISTNAME= pachi_source
EXTRACT_SUFX= .tgz
diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index a808751be18f..a7961c67e7c6 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -9,8 +9,9 @@ PORTNAME= palomino
PORTVERSION= 20090615
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF/${PORTNAME}-sim \
+MASTER_SITES= SF/${PORTNAME}-sim/release_src/${PORTVERSION} \
ftp://ftp.palomino3d.org/sim/
+
DISTFILES= ${PORTNAME}_src_${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}_data_misc_${MISC_VER}${EXTRACT_SUFX} \
${PORTNAME}_data_models_${MODELS_VER}${EXTRACT_SUFX} \
diff --git a/games/passage/Makefile b/games/passage/Makefile
index 3e8d53774e4e..db01dfd285ad 100644
--- a/games/passage/Makefile
+++ b/games/passage/Makefile
@@ -8,7 +8,7 @@
PORTNAME= passage
PORTVERSION= 3
CATEGORIES= games
-MASTER_SITES= SF/hcsoftware
+MASTER_SITES= SF/hcsoftware/Passage/v${PORTVERSION}
DISTNAME= Passage_v${PORTVERSION}_UnixSource
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/pcgen/Makefile b/games/pcgen/Makefile
index 7afcbdc22130..70f667068a55 100644
--- a/games/pcgen/Makefile
+++ b/games/pcgen/Makefile
@@ -8,8 +8,7 @@ PORTNAME= pcgen
PORTVERSION= 5.12.0
PORTREVISION= 1
CATEGORIES= games java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pcgen
+MASTER_SITES= SF/${PORTNAME}/PCGen%20Stable/${PORTVERSION}
DISTNAME= pcgen${PORTVERSION:S/.//g}_partial
MAINTAINER= hq@FreeBSD.org
diff --git a/games/pengpong/Makefile b/games/pengpong/Makefile
index 975fcbdc36b9..77ca3a9cb381 100644
--- a/games/pengpong/Makefile
+++ b/games/pengpong/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pengpong
PORTVERSION= 0.3
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}-linux
MAINTAINER= ports@FreeBSD.org
COMMENT= A cross-platform pong game written in SDL
diff --git a/games/phpua-bf/Makefile b/games/phpua-bf/Makefile
index 5e106a9d392f..3370fb71add6 100644
--- a/games/phpua-bf/Makefile
+++ b/games/phpua-bf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpua-plugin_bf
PORTVERSION= 1.1.0b
PORTREVISION= 1
CATEGORIES= games www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpua
+MASTER_SITES= SF/phpua/Plug-in_%20Battlefield%201942/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Battlefield 1942 plugin for phpUA
diff --git a/games/phpua-cod/Makefile b/games/phpua-cod/Makefile
index 4781a0071946..0b2d1f58408c 100644
--- a/games/phpua-cod/Makefile
+++ b/games/phpua-cod/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpua-plugin_cod
PORTVERSION= 1.1.0b
PORTREVISION= 1
CATEGORIES= games www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpua
+MASTER_SITES= SF/phpua/Plug-in_%20Call%20of%20Duty/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Call of Duty plugin for phpUA
diff --git a/games/phpua-engine/Makefile b/games/phpua-engine/Makefile
index 7063bf92aa5b..d047e8431f22 100644
--- a/games/phpua-engine/Makefile
+++ b/games/phpua-engine/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpua-engine
PORTVERSION= 1.1.0b
PORTREVISION= 4
CATEGORIES= games www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-.*//}
+MASTER_SITES= SF/phpua/phpUA%20Engine/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Game server monitor & admin tool
diff --git a/games/phpua-hl/Makefile b/games/phpua-hl/Makefile
index 9fb3bcc6152a..f24df1d57e33 100644
--- a/games/phpua-hl/Makefile
+++ b/games/phpua-hl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpua-plugin_hl
PORTVERSION= 1.1.0b
PORTREVISION= 1
CATEGORIES= games www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpua
+MASTER_SITES= SF/phpua/Plug-in_%20Half-Life/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Half-Life plugin for phpUA
diff --git a/games/phpua-q3/Makefile b/games/phpua-q3/Makefile
index d7e0d54593f5..8f6ffa115be0 100644
--- a/games/phpua-q3/Makefile
+++ b/games/phpua-q3/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpua-plugin_q3
PORTVERSION= 1.1.0b
PORTREVISION= 1
CATEGORIES= games www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpua
+MASTER_SITES= SF/phpua/Plug-in_%20Quake%20III%20Arena/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Quake 3 plugin for phpUA
diff --git a/games/phpua-ut/Makefile b/games/phpua-ut/Makefile
index 549e6e7f6d6d..45d96408f287 100644
--- a/games/phpua-ut/Makefile
+++ b/games/phpua-ut/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpua-plugin_ut
PORTVERSION= 1.1.0b
PORTREVISION= 1
CATEGORIES= games www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpua
+MASTER_SITES= SF/phpua/Plug-in_%20Unreal%20Tournament/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An Unreal Tournament plugin for phpUA
diff --git a/games/phpua-ut2003/Makefile b/games/phpua-ut2003/Makefile
index 68f5dc55a665..906d70372012 100644
--- a/games/phpua-ut2003/Makefile
+++ b/games/phpua-ut2003/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpua-plugin_ut2003
PORTVERSION= 1.1.0b
PORTREVISION= 1
CATEGORIES= games www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpua
+MASTER_SITES= SF/phpua/Plug-in_%20Unreal%20Tournament%202k3/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An Unreal Tournament 2003 plugin for phpUA
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index 3137e041d802..35f08fa9a46b 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pinball
PORTVERSION= 0.3.1
PORTREVISION= 9
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= thierry@FreeBSD.org
COMMENT= Emilia Pinball is a free pinball game
diff --git a/games/plee-the-bear/Makefile b/games/plee-the-bear/Makefile
index 2e7f48391c9a..32fdec643fd2 100644
--- a/games/plee-the-bear/Makefile
+++ b/games/plee-the-bear/Makefile
@@ -9,7 +9,7 @@ PORTNAME= plee-the-bear
PORTVERSION= 0.3.1
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Plee%20the%20Bear/0.3
DISTNAME= ${PORTNAME}-${PORTVERSION}-light
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/pmars/Makefile b/games/pmars/Makefile
index d50ed9df075b..675c4b5c6445 100644
--- a/games/pmars/Makefile
+++ b/games/pmars/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pmars
PORTVERSION= 0.9.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF/corewar
+MASTER_SITES= SF/corewar/pMARS/${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= A portable corewar system with ICWS'94 extensions
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 5e7d64e3ae20..b700de5c4260 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pokerth
PORTVERSION= 0.7.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.7
DISTNAME= PokerTH-${PORTVERSION}-src
MAINTAINER= mad@madpilot.net
diff --git a/games/pouetchess/Makefile b/games/pouetchess/Makefile
index 8bf552d214ae..916378098562 100644
--- a/games/pouetchess/Makefile
+++ b/games/pouetchess/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pouetchess
PORTVERSION= 0.1.1
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.11
DISTNAME= pouetChess_0.11_src
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 01e6d9423e03..847338d507b9 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -8,7 +8,7 @@
PORTNAME= prboom
PORTVERSION= 2.5.0
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A multiplayer-capable and modified version of ID's classic DOOM game
diff --git a/games/pushover/Makefile b/games/pushover/Makefile
index 5df03080dc82..efb9f43cafca 100644
--- a/games/pushover/Makefile
+++ b/games/pushover/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pushover
PORTVERSION= 0.0.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Pushover/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Pushover Screenshot Pushover a lot of dominos
diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
index 07115af2a031..49e83c077094 100644
--- a/games/py-mnemosyne/Makefile
+++ b/games/py-mnemosyne/Makefile
@@ -9,8 +9,7 @@
PORTNAME= mnemosyne
PORTVERSION= 1.1.1
CATEGORIES= games python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}-proj
+MASTER_SITES= SF/${PORTNAME}-proj/OldFiles
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= mnemosyne-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/games/pyching/Makefile b/games/pyching/Makefile
index eb2600eefef5..6885bf176f02 100644
--- a/games/pyching/Makefile
+++ b/games/pyching/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pyching
PORTVERSION= 1.2.1
PORTREVISION= 2
CATEGORIES= games python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/pyChing/${PORTVERSION}
MAINTAINER= perky@FreeBSD.org
COMMENT= Consult a I Ching, an ancient Chinese book of wisdom
diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index f9ab574dc200..75803b727c44 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pykawari
PORTVERSION= 8.2.8
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kawari
+MASTER_SITES= SF/kawari/kawari/${PORTVERSION}
DISTNAME= kawari-${PORTVERSION:S/.//g}
MAINTAINER= umeno@rr.iij4u.or.jp
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index 68ee351cc134..98c423c30e87 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pysolfc
PORTVERSION= 1.1
CATEGORIES= games
-MASTER_SITES= SF/pysolfc
+MASTER_SITES= SF/${PORTNAME}/PySolFC/PySolFC-${PORTVERSION}
DISTNAME= PySolFC-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index c7ca6fc1d48d..1f716e68e5c4 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -10,7 +10,7 @@ PORTNAME= qgo
PORTVERSION= 1.5.4.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/qonk/Makefile b/games/qonk/Makefile
index cc813fac0a25..33895300bfec 100644
--- a/games/qonk/Makefile
+++ b/games/qonk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= qonk
PORTVERSION= 0.3.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Small space build and conquer strategy game
diff --git a/games/qstat/Makefile b/games/qstat/Makefile
index 94cb36c8fedd..789c4449942f 100644
--- a/games/qstat/Makefile
+++ b/games/qstat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= qstat
PORTVERSION= 2.11
CATEGORIES= games net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= A command line program to query game servers on the net
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index caac5c32043e..07727b47375f 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -9,8 +9,7 @@ PORTNAME= quakeforge
PORTVERSION= 0.5.5
PORTREVISION= 10
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= quake/:sf
+MASTER_SITES= SF/quake/quake/${PORTVERSION}:sf
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/quaqut/Makefile b/games/quaqut/Makefile
index 406da542cc46..308b96484e10 100644
--- a/games/quaqut/Makefile
+++ b/games/quaqut/Makefile
@@ -8,7 +8,7 @@
PORTNAME= quaqut
PORTVERSION= 0.2.0
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20C%20sources/${PORTNAME}-${PORTVERSION}
MAINTAINER= avl@FreeBSD.org
COMMENT= Queries information from Unreal Tournament 2004 game servers
diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile
index c47d8cda2415..68eb3d4f2d4f 100644
--- a/games/redeclipse/Makefile
+++ b/games/redeclipse/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sauerbraten
PORTVERSION= 20090504
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2009_05_04
DISTNAME= ${PORTNAME}_2009_05_04_trooper_edition_linux
MAINTAINER= acm@FreeBSD.org
diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile
index 0a4858ac0fb9..154b16ef22e4 100644
--- a/games/ri-li/Makefile
+++ b/games/ri-li/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Ri-li
PORTVERSION= 2.0.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ri-li
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}%20Linux_Unix/${PORTNAME}%20V${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Drive a toy wood train in many levels - snake-like arcade game
diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index 6082a46a656e..af5cb1228717 100644
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@@ -9,7 +9,7 @@ PORTNAME= robocode
PORTVERSION= 1.6.0.1
PORTREVISION= 2
CATEGORIES= games java
-MASTER_SITES= SF/robocode
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-setup-${PORTVERSION}
EXTRACT_SUFX= .jar
diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index 67486010716d..3d1d8e00e872 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rockdodger
PORTVERSION= 0.6.0a
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= spacerocks
+MASTER_SITES= SF/spacerocks/spacerocks/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Addictive rock-dodging greeblie-killing platform game
diff --git a/games/rottdc/Makefile b/games/rottdc/Makefile
index 8b15bf57107e..445353a26b08 100644
--- a/games/rottdc/Makefile
+++ b/games/rottdc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rottdc
DISTVERSION= 1.0-2
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sdl-dc
+MASTER_SITES= SF/sdl-dc/${PORTNAME}/1.0-2
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Apogee's Rise Of The Triad source port
diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile
index c47d8cda2415..68eb3d4f2d4f 100644
--- a/games/sauerbraten/Makefile
+++ b/games/sauerbraten/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sauerbraten
PORTVERSION= 20090504
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2009_05_04
DISTNAME= ${PORTNAME}_2009_05_04_trooper_edition_linux
MAINTAINER= acm@FreeBSD.org
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 573a1df8cc6f..38c3fa1b512b 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -10,7 +10,7 @@ PORTNAME= scid
PORTVERSION= 3.6.26
PORTREVISION= 2
CATEGORIES= games databases
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Scid/Scid%20${PORTVERSION}
MAINTAINER= bsd@volki.at
COMMENT= A free chess database application
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 886292f4cce9..3efdce71361c 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scorched3d
PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION}
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= scorched3d
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Build%2041.3
DISTNAME= Scorched3D-${SCORCH_VERSION}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/games/scourge-data/Makefile b/games/scourge-data/Makefile
index 5edfdd1e9a3c..2f82d37c32da 100644
--- a/games/scourge-data/Makefile
+++ b/games/scourge-data/Makefile
@@ -8,8 +8,7 @@
PORTNAME= data
PORTVERSION= 0.21.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= scourge
+MASTER_SITES= SF/scourge/scourge/${PORTVERSION}
PKGNAMEPREFIX= scourge-
DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}${PORTNAME:S/^/./}
DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 1497c921b868..7239eb4ccf68 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scummvm-tools
PORTVERSION= 0.13.0
PORTREVISION= 2
CATEGORIES= games emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= scummvm
+MASTER_SITES= SF/scummvm/${PORTNAME}/${PORTVERSION}
MAINTAINER= lme@FreeBSD.org
COMMENT= Tools for use with the SCUMMVM game emulator
diff --git a/games/sdlroids/Makefile b/games/sdlroids/Makefile
index b9b17ae14111..6be29dff71d5 100644
--- a/games/sdlroids/Makefile
+++ b/games/sdlroids/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sdlroids
PORTVERSION= 1.3.4
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An enhanced shoot-the-asteroids game
diff --git a/games/sdlsand/Makefile b/games/sdlsand/Makefile
index 7f740c542ebf..f06bba160221 100644
--- a/games/sdlsand/Makefile
+++ b/games/sdlsand/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sdlsand
PORTVERSION= 20061017
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Simulation of falling sand and other materials
diff --git a/games/seahaven/Makefile b/games/seahaven/Makefile
index 3e837b2e11e2..745b852480ff 100644
--- a/games/seahaven/Makefile
+++ b/games/seahaven/Makefile
@@ -9,9 +9,7 @@ PORTNAME= seahaven
PORTVERSION= 1.44
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= http://seahaven.sourceforge.net/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= http://seahaven.sourceforge.net/
EXTRACT_SUFX= .tgz
MAINTAINER= imp@FreeBSD.org
diff --git a/games/secretmaryochronicles-music/Makefile b/games/secretmaryochronicles-music/Makefile
index 55b26bb1f416..779aca742508 100644
--- a/games/secretmaryochronicles-music/Makefile
+++ b/games/secretmaryochronicles-music/Makefile
@@ -8,8 +8,7 @@
PORTNAME= secretmaryochronicles-music
PORTVERSION= 4.0
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= smclone
+MASTER_SITES= SF/smclone/Addon%20-%20Music/${PORTVERSION}
DISTNAME= SMC_music_${PORTVERSION}_high
MAINTAINER= adamw@FreeBSD.org
diff --git a/games/secretmaryochronicles/Makefile b/games/secretmaryochronicles/Makefile
index 3a28894b14cc..61fbebe3c811 100644
--- a/games/secretmaryochronicles/Makefile
+++ b/games/secretmaryochronicles/Makefile
@@ -9,8 +9,7 @@ PORTNAME= secretmaryochronicles
PORTVERSION= 1.8
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= smclone
+MASTER_SITES= SF/smclone/Secret%20Maryo%20Chronicles/${PORTVERSION}
DISTNAME= smc-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile
index 24847b7e4ecb..e6cd9b40ccee 100644
--- a/games/shaaft/Makefile
+++ b/games/shaaft/Makefile
@@ -9,7 +9,7 @@ PORTNAME= shaaft
PORTVERSION= 0.5.0
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= SF/criticalmass
+MASTER_SITES= SF/criticalmass/OldFiles
DISTNAME= Shaaft-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile
index f6e77af89c56..e042a9aeb5bf 100644
--- a/games/simutrans/Makefile
+++ b/games/simutrans/Makefile
@@ -8,7 +8,7 @@
PORTNAME= simutrans
PORTVERSION= 102.0
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/102-0
DISTFILES= simutrans-src-102-0.zip \
simulinux-102-0.zip \
pak64-102-0.zip
diff --git a/games/slashem-tty/Makefile b/games/slashem-tty/Makefile
index 664a84cdd5b0..dc74827d517b 100644
--- a/games/slashem-tty/Makefile
+++ b/games/slashem-tty/Makefile
@@ -8,8 +8,7 @@
PORTNAME= slashem
PORTVERSION= 0.0.7E.7F.3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/0.0.7E7F3
PKGNAMESUFFIX= -tty
DISTNAME= se${PORTVERSION:S/.//g:L}
diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile
index e6c8bc44e5fc..d32196174f09 100644
--- a/games/sopwith/Makefile
+++ b/games/sopwith/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sopwith
PORTVERSION= 1.7.1
PORTREVISION= 12
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sdl-sopwith
+MASTER_SITES= SF/sdl-${PORTNAME}/sdl_${PORTNAME}/${PORTVERSION}
DISTNAME= sdl_${PORTNAME}-${PORTVERSION}
MAINTAINER= edwin@mavetju.org
diff --git a/games/spicetrade/Makefile b/games/spicetrade/Makefile
index 3acb06681ee7..121978435aaa 100644
--- a/games/spicetrade/Makefile
+++ b/games/spicetrade/Makefile
@@ -9,8 +9,7 @@ PORTNAME= spicetrade
PORTVERSION= 1.2
PORTREVISION= 3
CATEGORIES= games java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Spice%20Trade%20v${PORTVERSION}
DISTNAME= Spicetrade-${PORTVERSION}
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile
index d16723d919e2..e86d82d9c569 100644
--- a/games/stepmania-devel/Makefile
+++ b/games/stepmania-devel/Makefile
@@ -9,7 +9,7 @@ PORTNAME= stepmania
PORTVERSION= 20071121
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMESUFFIX= -devel
DISTNAME= StepMania-CVS-20071121-src
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 1889cfe01292..6ef942239c1f 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -8,7 +8,7 @@
PORTNAME= stonesoup
PORTVERSION= 0.5.1
CATEGORIES= games
-MASTER_SITES= SF/crawl-ref
+MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}
DISTNAME= stone_soup-${PORTVERSION}-src
EXTRACT_SUFX= .tbz2
diff --git a/games/stroq/Makefile b/games/stroq/Makefile
index d44dc77b6e7f..f4787d980d05 100644
--- a/games/stroq/Makefile
+++ b/games/stroq/Makefile
@@ -8,7 +8,7 @@ PORTNAME= stroq
PORTVERSION= 0.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20sources
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Flip tiles to make rows of the same color
diff --git a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile
index 6fb43aed2de1..fd7ce7eb3964 100644
--- a/games/super_methane_brothers/Makefile
+++ b/games/super_methane_brothers/Makefile
@@ -10,8 +10,7 @@ PORTNAME= super_methane_brothers
PORTVERSION= 1.4.8
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= methane
+MASTER_SITES= SF/methane/Methane%20Stable/Methane%20V${PORTVERSION}
DISTNAME= methane-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index 41ae427ddb43..9c446e691331 100644
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@@ -9,8 +9,7 @@ PORTVERSION= 0.9.2
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= games kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= taxipilot
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A Spacetaxi clone
diff --git a/games/tmw/Makefile b/games/tmw/Makefile
index 8a5fbe658eae..4f27a6215349 100644
--- a/games/tmw/Makefile
+++ b/games/tmw/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tmw
PORTVERSION= 0.0.29.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF/themanaworld
+MASTER_SITES= SF/themanaworld/The%20Mana%20World/${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= mva@FreeBSD.org
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index 58c7733c4ae2..2f78019cc906 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= torcs
DISTVERSION= 1.3.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/all-in-one/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= The Open Racing Car Simulator
diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile
index f7cd8f31f713..1e445e03ca75 100644
--- a/games/tremulous/Makefile
+++ b/games/tremulous/Makefile
@@ -9,10 +9,12 @@ PORTNAME= tremulous
PORTVERSION= 1.1.0
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= SF http://0day.icculus.org/mirrors/tremulous/ \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1 http://0day.icculus.org/mirrors/tremulous/ \
ftp://ftp.wireplay.co.uk/pub/quake3arena/mods/tremulous/ \
+
http://www.planetgloom.com/trem/
+
MAINTAINER= danfe@FreeBSD.org
COMMENT= Free FPS game featuring two opposing teams, humans and aliens
diff --git a/games/trigger/Makefile b/games/trigger/Makefile
index 0cb82280ac1c..fc4ffff924fb 100644
--- a/games/trigger/Makefile
+++ b/games/trigger/Makefile
@@ -9,8 +9,7 @@ PORTNAME= trigger
PORTVERSION= 0.5.2.1
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}-rally
+MASTER_SITES= SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTVERSION}
DISTFILES= trigger-${PORTVERSION}-src${EXTRACT_SUFX} \
trigger-${DATAVERSION}-data${EXTRACT_SUFX}
diff --git a/games/tsito/Makefile b/games/tsito/Makefile
index ced3cffef20f..e3c8ef720465 100644
--- a/games/tsito/Makefile
+++ b/games/tsito/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tsito
PORTVERSION= 0.8.4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xiangqi-engine
+MASTER_SITES= SF/xiangqi-engine/xiangqi-engine/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Chinese chess (Xiangqi) program
diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index 54bfe61de0fb..c22734cbd1a9 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tuxpaint-config
PORTVERSION= 0.0.11
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tuxpaint
+MASTER_SITES= SF/tuxpaint/${PORTNAME}/${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Graphical tool to change TuxPaint settings
diff --git a/games/tuxpaint-fonts/Makefile b/games/tuxpaint-fonts/Makefile
index ab91365dc0b8..1a4ca9ed1e9e 100644
--- a/games/tuxpaint-fonts/Makefile
+++ b/games/tuxpaint-fonts/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tuxpaint
PORTVERSION= 1
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-fonts/chinese-2003.0${PORTVERSION}.05
PKGNAMESUFFIX= -fonts
DISTFILES= #
diff --git a/games/tuxpaint-stamps/Makefile b/games/tuxpaint-stamps/Makefile
index 767e20bef29d..aa177d4bd915 100644
--- a/games/tuxpaint-stamps/Makefile
+++ b/games/tuxpaint-stamps/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tuxpaint
PORTVERSION= 2008.06.30
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stamps/${PORTVERSION}
PKGNAMESUFFIX= -stamps
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 4ea99ae7a5c5..b8b26f839bf1 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tuxracer
PORTVERSION= 0.61
PORTREVISION= 8
CATEGORIES= games
-MASTER_SITES= SF/tuxracer
+MASTER_SITES= SF
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
${PORTNAME}-data-${PORTVERSION}.tar.gz
diff --git a/games/twitch/Makefile b/games/twitch/Makefile
index 247631859bd6..c0225b48a873 100644
--- a/games/twitch/Makefile
+++ b/games/twitch/Makefile
@@ -9,8 +9,7 @@ PORTNAME= twitch
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Twitch/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An overhead 2-d shooter, reminiscent of games like Robotron
diff --git a/games/typespeed/Makefile b/games/typespeed/Makefile
index 986fb6f45999..96267c440618 100644
--- a/games/typespeed/Makefile
+++ b/games/typespeed/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= SF \
http://tobias.eyedacor.org/typespeed/
+
MAINTAINER= ports@FreeBSD.org
COMMENT= Test your typing speed, and get your fingers\' CPS
diff --git a/games/ufoai-data/Makefile b/games/ufoai-data/Makefile
index 2f23d025bb17..bdbb05a7d279 100644
--- a/games/ufoai-data/Makefile
+++ b/games/ufoai-data/Makefile
@@ -8,8 +8,7 @@
PORTNAME= data
PORTVERSION= 2.2.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX:S/-//}
+MASTER_SITES= SF/ufoai/UFO_AI%202.x/${PORTVERSION}
PKGNAMEPREFIX= ufoai-
DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}-${PORTNAME}
EXTRACT_SUFX= .tar
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index dc898824e559..405cf7f10c4d 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ufoai
PORTVERSION= 2.2.1
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION}
DISTNAME= ${PORTNAME:S/$/-/}${PORTVERSION}-source
DIST_SUBDIR= ${PORTNAME}
diff --git a/games/uhexen2-extras/Makefile b/games/uhexen2-extras/Makefile
index 61d7850e1865..e9e2285d5b1a 100644
--- a/games/uhexen2-extras/Makefile
+++ b/games/uhexen2-extras/Makefile
@@ -9,7 +9,7 @@ PORTNAME= uhexen2
PORTVERSION= 1.4.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/HoT%20-%20Other%20content/extra%20data
PKGNAMESUFFIX= -extras
EXTRACT_SUFX= .tgz
DISTFILES= #
diff --git a/games/uhexen2/Makefile b/games/uhexen2/Makefile
index f8a31328e65a..c6af02bf6b3a 100644
--- a/games/uhexen2/Makefile
+++ b/games/uhexen2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= uhexen2
PORTVERSION= 1.4.3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Hammer%20of%20Thyrion/${PORTVERSION}
DISTNAME= hexen2source-${PORTVERSION}
EXTRACT_SUFX= .tgz
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index de8804dedd05..2893de2b72a5 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 1
DISTVERSIONPREFIX= srcdata-
DISTVERSION= ${PORTVERSION:S/.//g}
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/sourcecode/0.7.5%20release%201
MAINTAINER= ports@FreeBSD.org
COMMENT= Racing game with elaborate stunts
diff --git a/games/umark/Makefile b/games/umark/Makefile
index 2609d99fe539..9386eef30e6e 100644
--- a/games/umark/Makefile
+++ b/games/umark/Makefile
@@ -9,8 +9,7 @@ PORTNAME= umark
DISTVERSION= 2.0.0-Beta3
PORTREVISION= 4
CATEGORIES= games benchmarks
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ut2k3botbench
+MASTER_SITES= SF/ut2k3botbench/UMark%20for%20Linux/2.0.0%20Beta%203
DISTNAME= UMark-for-Linux-v${DISTVERSION:S/.//g}
MAINTAINER= danfe@FreeBSD.org
diff --git a/games/unnethack/Makefile b/games/unnethack/Makefile
index 664a84cdd5b0..dc74827d517b 100644
--- a/games/unnethack/Makefile
+++ b/games/unnethack/Makefile
@@ -8,8 +8,7 @@
PORTNAME= slashem
PORTVERSION= 0.0.7E.7F.3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/0.0.7E7F3
PKGNAMESUFFIX= -tty
DISTNAME= se${PORTVERSION:S/.//g:L}
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index d70d014a170a..c5b728fcaaff 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -16,8 +16,7 @@ PORTNAME= uqm
PORTVERSION= 0.6.2
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sc2
+MASTER_SITES= SF/sc2/UQM/${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-source.tgz
diff --git a/games/vavoom-extras/Makefile b/games/vavoom-extras/Makefile
index d1e865236d00..6eed4bbe115a 100644
--- a/games/vavoom-extras/Makefile
+++ b/games/vavoom-extras/Makefile
@@ -9,8 +9,9 @@ PORTNAME= vavoom
PORTVERSION= 1.25
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF:sf \
+MASTER_SITES= SF/${PORTNAME}/vmodels-doom/1.4.2:sf \
http://doomtextures.freelanzer.com/:dt
+
PKGNAMESUFFIX= -extras
DISTFILES= #
diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index b7f6de42aeab..23c6711820fc 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -9,7 +9,7 @@ PORTNAME= vavoom
PORTVERSION= 1.28
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Vavoom-source/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Doom, Doom II, Heretic, Hexen and Strife source port
diff --git a/games/vdrift-data/Makefile b/games/vdrift-data/Makefile
index 0dc333854940..89c24fbd1742 100644
--- a/games/vdrift-data/Makefile
+++ b/games/vdrift-data/Makefile
@@ -8,8 +8,7 @@
PORTNAME= data
PORTVERSION= 20090215
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= vdrift
+MASTER_SITES= SF/vdrift/vdrift/vdrift-2009-02-15
PKGNAMEPREFIX= vdrift-
DISTNAME= ${PKGNAMEPREFIX}2009-02-15-src
DIST_SUBDIR= vdrift
diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile
index a0bdcbc93a06..db70eaa68116 100644
--- a/games/vdrift/Makefile
+++ b/games/vdrift/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vdrift
PORTVERSION= 20090215
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-2009-02-15
DISTNAME= ${PORTNAME}-2009-02-15
DIST_SUBDIR= ${PORTNAME}
diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile
index 73a1aed03a20..09a84ede1513 100644
--- a/games/vegastrike/Makefile
+++ b/games/vegastrike/Makefile
@@ -9,7 +9,7 @@ PORTNAME= vegastrike
PORTVERSION= 0.5.0
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= vegastrike-source-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index 64eb240df947..3066d5b60fa2 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wargus
PORTVERSION= 2.2.4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/for%20Stratagus%20${PORTVERSION}
EXTRACT_SUFX= -src.zip
MAINTAINER= ports@FreeBSD.org
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index d0e1872c96eb..7c3ac20b8766 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -8,9 +8,10 @@
PORTNAME= warzone2100
PORTVERSION= 2.2.0
CATEGORIES= games
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Warzone%202100%20${PORTVERSION} \
http://download.gna.org/warzone/releases/${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*$/\1/}/
+
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Innovative 3D real-time strategy game
diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index 0cafb55c9268..1f4a612ca237 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -10,9 +10,9 @@ PORTVERSION= 1.5.14
PORTREVISION= 1
CATEGORIES= games
PKGNAMESUFFIX= -devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://www.wesnoth.org/files/
-MASTER_SITE_SUBDIR= wesnoth
+
MAINTAINER= philip@FreeBSD.org
COMMENT= A fantasy turn-based strategy game
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 0cda6e54f8f9..6c6798e2c84f 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -8,9 +8,9 @@
PORTNAME= wesnoth
PORTVERSION= 1.6.4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1.6/${PORTNAME}-${PORTVERSION} \
http://www.wesnoth.org/files/
-MASTER_SITE_SUBDIR= wesnoth
+
MAINTAINER= philip@FreeBSD.org
COMMENT= A fantasy turn-based strategy game
diff --git a/games/wmqstat/Makefile b/games/wmqstat/Makefile
index 8214f2b36783..33d06d5461da 100644
--- a/games/wmqstat/Makefile
+++ b/games/wmqstat/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wmqstat
PORTVERSION= 0.0.4
PORTREVISION= 2
CATEGORIES= games windowmaker
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/wmQStat%20${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= A dockapp for monitoring of various Internet game servers
diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile
index 3dbdd90ac198..26243d2ffb50 100644
--- a/games/wolfpack/Makefile
+++ b/games/wolfpack/Makefile
@@ -8,8 +8,7 @@
PORTNAME= wolfpack
PORTVERSION= 4.3.22
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= empserver
+MASTER_SITES= SF/empserver/empserver/Empire%20Server%20v${PORTVERSION}
DISTNAME= empire-${PORTVERSION}
MAINTAINER= johans@stack.nl
diff --git a/games/wrogue/Makefile b/games/wrogue/Makefile
index 537ffe778e28..16a902f5e43e 100644
--- a/games/wrogue/Makefile
+++ b/games/wrogue/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wrogue
PORTVERSION= 0.8.0
CATEGORIES= games
-MASTER_SITES= SF/todoom
+MASTER_SITES= SF/todoom/${PORTNAME}/${PORTVERSION}
MAINTAINER= steinex@nognu.de
COMMENT= A gothic science fantasy roguelike game
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 5fba3dac419f..f86c48c4fdb5 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xblast
PORTVERSION= 2.10.4
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= ${IMAGES_DISTNAME}${EXTRACT_SUFX}
DISTFILES+= ${LEVELS_DISTNAME}${EXTRACT_SUFX}
diff --git a/games/xinvaders3d/Makefile b/games/xinvaders3d/Makefile
index 28d688b78427..2ecd00c54ff5 100644
--- a/games/xinvaders3d/Makefile
+++ b/games/xinvaders3d/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xinvaders3d
PORTVERSION= 1.3.6
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/XInvaders%203d/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 3e2139e89a02..3baed43f7bac 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nexuiz
PORTVERSION= 2.5.1
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index 4c6f4b336c97..83dcd04621a3 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xpilot-ng
PORTVERSION= 4.7.2
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF/xpilot
+MASTER_SITES= SF/xpilot/xpilot_ng/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX?= -server
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile
index 7fd0f716abea..2a00ebcbfd55 100644
--- a/games/xpilot/Makefile
+++ b/games/xpilot/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xpilot
PORTVERSION= 4.5.4
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SF/xpilotgame
+MASTER_SITES= SF/${PORTNAME}game/${PORTNAME}-4/${PORTNAME}-${PORTVERSION}
MAINTAINER= lme@FreeBSD.org
COMMENT= Xpilot(client) and xpilots(server)
diff --git a/games/xpired/Makefile b/games/xpired/Makefile
index 3549c8f51d2c..491f0d95765c 100644
--- a/games/xpired/Makefile
+++ b/games/xpired/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xpired
PORTVERSION= 1.22
PORTREVISION= 11
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xpired
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-linux/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-linux_source
MAINTAINER= edwin@mavetju.org
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 8b7e6586b2a4..6fa42b239122 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xqf
PORTVERSION= 1.0.5
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A server browser for many popular 3D action games
diff --git a/games/xrally/Makefile b/games/xrally/Makefile
index 7914706ca32c..84b7da7cc6b1 100644
--- a/games/xrally/Makefile
+++ b/games/xrally/Makefile
@@ -10,7 +10,7 @@ PORTNAME= xrally
PORTVERSION= 1.1.1
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= SF/xrally
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1
DISTNAME= ${PORTNAME}-1.1
MAINTAINER= edwin@mavetju.org
diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index a5eede81fc6e..edc4faaecfe1 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xtux
PORTVERSION= 2003.03.06
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/20030306
DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xword/Makefile b/games/xword/Makefile
index f64322b379ad..0b391a499e6d 100644
--- a/games/xword/Makefile
+++ b/games/xword/Makefile
@@ -10,8 +10,7 @@ PORTNAME= xword
PORTVERSION= 0.07
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A crossword puzzle application
diff --git a/games/xye/Makefile b/games/xye/Makefile
index 9dd00777f8ce..13821dc36a8c 100644
--- a/games/xye/Makefile
+++ b/games/xye/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xye
PORTVERSION= 0.8.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= gogo@cs.uni-sb.de
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index 11550f674934..37c10e63e57c 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -9,8 +9,7 @@ PORTNAME= BBBike
PORTVERSION= 3.16
PORTREVISION= 1
CATEGORIES= german
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bbbike
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= slaven@rezic.de
COMMENT= A route-finder for cyclists in Berlin and Brandenburg
diff --git a/german/jdictionary-eng-ger/Makefile b/german/jdictionary-eng-ger/Makefile
index 25252fd833ad..4ff4dcf80db1 100644
--- a/german/jdictionary-eng-ger/Makefile
+++ b/german/jdictionary-eng-ger/Makefile
@@ -9,6 +9,7 @@ PORTNAME= jdictionary-eng-ger
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= german textproc
+MASTER_SITES= SF/jdictionary/Plugins%20for%20jDictionary/Smart%20English-German
DISTNAME= SmartEngGer-1_4.jar
COMMENT= JDictionary plugin: English-German dictionary
diff --git a/german/jdictionary-ger-hun/Makefile b/german/jdictionary-ger-hun/Makefile
index 3d4b5f66518b..5e83a842ea64 100644
--- a/german/jdictionary-ger-hun/Makefile
+++ b/german/jdictionary-ger-hun/Makefile
@@ -9,6 +9,7 @@ PORTNAME= jdictionary-ger-hun
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= german hungarian textproc
+MASTER_SITES= SF/jdictionary/Plugins%20for%20jDictionary/Smart%20German-Hungarian
DISTNAME= SmartGerHun-1_4.jar
COMMENT= JDictionary plugin: German-Hungarian dictionary
diff --git a/german/steak/Makefile b/german/steak/Makefile
index e2635cebff23..402386061262 100644
--- a/german/steak/Makefile
+++ b/german/steak/Makefile
@@ -9,9 +9,9 @@ PORTNAME= steak
PORTVERSION= 1.7.3
PORTREVISION= 6
CATEGORIES= german
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Steak%20${PORTVERSION} \
http://www.tm.informatik.uni-frankfurt.de/%7Erazi/steak/program/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
DISTNAME= Steak.${PORTVERSION}
MAINTAINER= h.eichmann@gmx.de
diff --git a/german/unix-connect/Makefile b/german/unix-connect/Makefile
index 7dc26ae7015c..533df9c8c3ce 100644
--- a/german/unix-connect/Makefile
+++ b/german/unix-connect/Makefile
@@ -9,8 +9,8 @@ PORTNAME= unix-connect
PORTVERSION= 0.95
CATEGORIES= german comms news mail
MASTER_SITES= ftp://ftp.dinoex.org/pub/unix-connect/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF
+
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Unix-Connect - mail+news-gateway for Zconnect (tm)
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