aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/WWWdb/Makefile3
-rw-r--r--databases/adminer/Makefile2
-rw-r--r--databases/adodb/Makefile3
-rw-r--r--databases/adodb5/Makefile3
-rw-r--r--databases/aolserver-nsmysql/Makefile3
-rw-r--r--databases/aolserver-nspostgres/Makefile3
-rw-r--r--databases/bbdb/Makefile3
-rw-r--r--databases/buzhug/Makefile2
-rw-r--r--databases/clip/Makefile2
-rw-r--r--databases/dbXML/Makefile3
-rw-r--r--databases/dbconnect/Makefile3
-rw-r--r--databases/dbh10/Makefile3
-rw-r--r--databases/exist/Makefile2
-rw-r--r--databases/firebird-server/Makefile3
-rw-r--r--databases/firebird20-server/Makefile3
-rw-r--r--databases/flamerobin/Makefile2
-rw-r--r--databases/fortytwo-bdb/Makefile3
-rw-r--r--databases/geoserver-mysql-plugin/Makefile2
-rw-r--r--databases/gigabase/Makefile2
-rw-r--r--databases/gqlplus/Makefile3
-rw-r--r--databases/hk_classes/Makefile3
-rw-r--r--databases/hsqldb/Makefile2
-rw-r--r--databases/isql-viewer/Makefile2
-rw-r--r--databases/jasperreports/Makefile3
-rw-r--r--databases/jrrd/Makefile2
-rw-r--r--databases/kinterbasdb/Makefile3
-rw-r--r--databases/knoda/Makefile3
-rw-r--r--databases/libdbi-drivers/Makefile2
-rw-r--r--databases/libdbi/Makefile3
-rw-r--r--databases/libiodbc/Makefile3
-rw-r--r--databases/libodbc++/Makefile3
-rw-r--r--databases/mantis/Makefile2
-rw-r--r--databases/mtop/Makefile3
-rw-r--r--databases/mysql-navigator/Makefile3
-rw-r--r--databases/mysql-udf/Makefile2
-rw-r--r--databases/mysqlcppapi/Makefile3
-rw-r--r--databases/p5-DBIWrapper/Makefile3
-rw-r--r--databases/pgaccess/Makefile3
-rw-r--r--databases/php-sqlite3/Makefile3
-rw-r--r--databases/phpminiadmin/Makefile3
-rw-r--r--databases/phpmyadmin211/Makefile2
-rw-r--r--databases/pxlib/Makefile3
-rw-r--r--databases/py-MySQLdb-devel/Makefile3
-rw-r--r--databases/py-MySQLdb/Makefile3
-rw-r--r--databases/py-PySQLite10/Makefile3
-rw-r--r--databases/py-forgetsql/Makefile3
-rw-r--r--databases/py-mssql/Makefile2
-rw-r--r--databases/py-oops/Makefile3
-rw-r--r--databases/py-pyPgSQL/Makefile3
-rw-r--r--databases/py-rrdtool_lgpl/Makefile3
-rw-r--r--databases/py-sqlalchemy/Makefile4
-rw-r--r--databases/py-sqlalchemy06/Makefile4
-rw-r--r--databases/pydbdesigner/Makefile3
-rw-r--r--databases/qdbm/Makefile4
-rw-r--r--databases/rrdman/Makefile3
-rw-r--r--databases/sqlcached/Makefile2
-rw-r--r--databases/sqlitemanager/Makefile3
-rw-r--r--databases/sqlrelay/Makefile1
-rw-r--r--databases/sqsh/Makefile2
-rw-r--r--databases/squirrel-sql/Makefile3
-rw-r--r--databases/sybtcl/Makefile3
-rw-r--r--databases/tcl-Mysql/Makefile3
-rw-r--r--databases/tokyotyrant/Makefile3
-rw-r--r--databases/virtuoso/Makefile3
-rw-r--r--databases/wfb2sql/Makefile3
-rw-r--r--databases/yasql/Makefile3
-rw-r--r--deskutils/adesklets/Makefile3
-rw-r--r--deskutils/appwrapper/Makefile3
-rw-r--r--deskutils/bitcollider/Makefile2
-rw-r--r--deskutils/blogtk/Makefile3
-rw-r--r--deskutils/cdcat/Makefile4
-rw-r--r--deskutils/checkrdf/Makefile3
-rw-r--r--deskutils/cycle/Makefile3
-rw-r--r--deskutils/dragstack/Makefile3
-rw-r--r--deskutils/drivel/Makefile3
-rw-r--r--deskutils/egroupware/Makefile2
-rw-r--r--deskutils/everygui/Makefile3
-rw-r--r--deskutils/ganttproject/Makefile2
-rw-r--r--deskutils/ganyremote/Makefile3
-rw-r--r--deskutils/glipper/Makefile2
-rw-r--r--deskutils/gmcal/Makefile3
-rw-r--r--deskutils/gnotime/Makefile2
-rw-r--r--deskutils/gourmet/Makefile2
-rw-r--r--deskutils/gtweakui/Makefile2
-rw-r--r--deskutils/ithought/Makefile3
-rw-r--r--deskutils/jjclient/Makefile4
-rw-r--r--deskutils/kblticker/Makefile3
-rw-r--r--deskutils/kchm/Makefile3
-rw-r--r--deskutils/kchmviewer/Makefile3
-rw-r--r--deskutils/kickpim/Makefile3
-rw-r--r--deskutils/kluje/Makefile3
-rw-r--r--deskutils/kmatrix3d/Makefile3
-rw-r--r--deskutils/kooldock/Makefile3
-rw-r--r--deskutils/krss/Makefile3
-rw-r--r--deskutils/launchy/Makefile2
-rw-r--r--deskutils/ljcharm/Makefile3
-rw-r--r--deskutils/mcal/Makefile3
-rw-r--r--deskutils/menumaker/Makefile2
-rw-r--r--deskutils/moregroupware/Makefile3
-rw-r--r--deskutils/multisync/Makefile3
-rw-r--r--deskutils/openproj/Makefile2
-rw-r--r--deskutils/pal/Makefile3
-rw-r--r--deskutils/parcellite/Makefile2
-rw-r--r--deskutils/phpgroupware/Makefile3
-rw-r--r--deskutils/phpicalendar/Makefile3
-rw-r--r--deskutils/preferences.app/Makefile3
-rw-r--r--deskutils/pybookreader/Makefile3
-rw-r--r--deskutils/q4wine/Makefile2
-rw-r--r--deskutils/qorganizer/Makefile2
-rw-r--r--deskutils/qtm/Makefile2
-rw-r--r--deskutils/rolo/Makefile3
-rw-r--r--deskutils/rox-memo/Makefile3
-rw-r--r--deskutils/snotes/Makefile3
-rw-r--r--deskutils/strigi/Makefile2
-rw-r--r--deskutils/sugarcrm/Makefile2
-rw-r--r--deskutils/superswitcher/Makefile3
-rw-r--r--deskutils/thinkingrock/Makefile2
-rw-r--r--deskutils/vym/Makefile3
-rw-r--r--deskutils/xchm/Makefile3
-rw-r--r--devel/SpecTcl/Makefile3
-rw-r--r--devel/aap/Makefile3
-rw-r--r--devel/adasdl/Makefile2
-rw-r--r--devel/adime/Makefile3
-rw-r--r--devel/adocman/Makefile3
-rw-r--r--devel/agide/Makefile3
-rw-r--r--devel/ald/Makefile3
-rw-r--r--devel/alf/Makefile3
-rw-r--r--devel/allegro-devel/Makefile3
-rw-r--r--devel/allegro/Makefile3
-rw-r--r--devel/argtable/Makefile2
-rw-r--r--devel/aros-sdk/Makefile3
-rw-r--r--devel/astyle/Makefile3
-rw-r--r--devel/atlas-devel/Makefile3
-rw-r--r--devel/atlas/Makefile3
-rw-r--r--devel/autogen/Makefile4
-rw-r--r--devel/avarice/Makefile3
-rw-r--r--devel/avra/Makefile3
-rw-r--r--devel/beautifyphp/Makefile3
-rw-r--r--devel/bicyclerepair/Makefile3
-rw-r--r--devel/bisoncpp/Makefile2
-rw-r--r--devel/boaconstructor/Makefile3
-rw-r--r--devel/boost-all/sites.mk3
-rw-r--r--devel/boost_build/Makefile3
-rw-r--r--devel/bouml-doc/Makefile4
-rw-r--r--devel/bouml/Makefile4
-rw-r--r--devel/buildtool-doc/Makefile3
-rw-r--r--devel/buildtool/Makefile3
-rw-r--r--devel/byaccj/Makefile3
-rw-r--r--devel/cccc/Makefile3
-rw-r--r--devel/cedet/Makefile4
-rw-r--r--devel/cflow2vcg/Makefile3
-rw-r--r--devel/cgdb/Makefile3
-rw-r--r--devel/cil/Makefile3
-rw-r--r--devel/colorer/Makefile3
-rw-r--r--devel/crow/Makefile2
-rw-r--r--devel/cssc/Makefile3
-rw-r--r--devel/cunit/Makefile3
-rw-r--r--devel/cvs-syncmail/Makefile3
-rw-r--r--devel/cvschangelogbuilder/Makefile3
-rw-r--r--devel/cvsdelta/Makefile4
-rw-r--r--devel/cvslines/Makefile3
-rw-r--r--devel/cvsmonitor/Makefile3
-rw-r--r--devel/cvsplot/Makefile3
-rw-r--r--devel/cx_Freeze/Makefile3
-rw-r--r--devel/cxxtest/Makefile3
-rw-r--r--devel/datadesigner/Makefile3
-rw-r--r--devel/datadraw/Makefile2
-rw-r--r--devel/dia2code/Makefile3
-rw-r--r--devel/dklibs/Makefile3
-rw-r--r--devel/dmucs/Makefile2
-rw-r--r--devel/doctorj/Makefile3
-rw-r--r--devel/dotconf++/Makefile4
-rw-r--r--devel/dparser/Makefile2
-rw-r--r--devel/drpython/Makefile2
-rw-r--r--devel/duplo/Makefile2
-rw-r--r--devel/e4graph/Makefile2
-rw-r--r--devel/ebnf2yacc/Makefile3
-rw-r--r--devel/eboxy/Makefile3
-rw-r--r--devel/ecb/Makefile4
-rw-r--r--devel/eieio/Makefile4
-rw-r--r--devel/elfio/Makefile3
-rw-r--r--devel/eric/Makefile3
-rw-r--r--devel/esdl/Makefile2
-rw-r--r--devel/esvn/Makefile3
-rw-r--r--devel/etl/Makefile2
-rw-r--r--devel/fampp/Makefile3
-rw-r--r--devel/fga/Makefile3
-rw-r--r--devel/flexjson/Makefile3
-rw-r--r--devel/flowdesigner/Makefile2
-rw-r--r--devel/fnccheck/Makefile3
-rw-r--r--devel/fortytwo-encore/Makefile3
-rw-r--r--devel/fsmgenerator/Makefile3
-rw-r--r--devel/ftjam/Makefile3
-rw-r--r--devel/g2c/Makefile3
-rw-r--r--devel/gaa/Makefile3
-rw-r--r--devel/gaphor/Makefile3
-rw-r--r--devel/gaul/Makefile2
-rw-r--r--devel/gcvs/Makefile3
-rw-r--r--devel/gettext-lint/Makefile3
-rw-r--r--devel/gonzui/Makefile3
-rw-r--r--devel/gpsim/Makefile3
-rw-r--r--devel/gsoap/Makefile3
-rw-r--r--devel/guiloader-c++/Makefile2
-rw-r--r--devel/guiloader/Makefile2
-rw-r--r--devel/happydoc/Makefile3
-rw-r--r--devel/hapy/Makefile3
-rw-r--r--devel/hp48xgcc/Makefile3
-rw-r--r--devel/icu/Makefile2
-rw-r--r--devel/icu4/Makefile2
-rw-r--r--devel/inilib/Makefile3
-rw-r--r--devel/ireport/Makefile3
-rw-r--r--devel/ixlib/Makefile3
-rw-r--r--devel/jclassinfo/Makefile3
-rw-r--r--devel/jcmdline/Makefile3
-rw-r--r--devel/jep/Makefile2
-rw-r--r--devel/jline/Makefile3
-rw-r--r--devel/jsap/Makefile3
-rw-r--r--devel/jtag/Makefile3
-rw-r--r--devel/judy/Makefile3
-rw-r--r--devel/kcachegrind/Makefile3
-rw-r--r--devel/kdbg/Makefile2
-rw-r--r--devel/kodos/Makefile4
-rw-r--r--devel/kprof/Makefile3
-rw-r--r--devel/kscope/Makefile3
-rw-r--r--devel/kyra/Makefile2
-rw-r--r--devel/lasi/Makefile2
-rw-r--r--devel/lbpp/Makefile3
-rw-r--r--devel/libYGP/Makefile2
-rw-r--r--devel/libafterbase/Makefile2
-rw-r--r--devel/libassa/Makefile3
-rw-r--r--devel/libassetml/Makefile3
-rw-r--r--devel/libbobcat/Makefile2
-rw-r--r--devel/libcheck/Makefile2
-rw-r--r--devel/libchipcard-kde/Makefile3
-rw-r--r--devel/libchipcard/Makefile3
-rw-r--r--devel/libdisasm/Makefile3
-rw-r--r--devel/libds/Makefile3
-rw-r--r--devel/libdsp/Makefile3
-rw-r--r--devel/libgii/Makefile4
-rw-r--r--devel/libgiigic/Makefile4
-rw-r--r--devel/libglademm/Makefile3
-rw-r--r--devel/libgutenfetch/Makefile3
-rw-r--r--devel/libical/Makefile3
-rw-r--r--devel/libmaa/Makefile3
-rw-r--r--devel/libmimedir/Makefile2
-rw-r--r--devel/libmpcbdm/Makefile4
-rw-r--r--devel/libmsocket/Makefile2
-rw-r--r--devel/libpeak/Makefile3
-rw-r--r--devel/librcc/Makefile3
-rw-r--r--devel/librcd/Makefile3
-rw-r--r--devel/libreadline-java/Makefile3
-rw-r--r--devel/libredblack/Makefile3
-rw-r--r--devel/libshbuf/Makefile3
-rw-r--r--devel/libsigc++/Makefile5
-rw-r--r--devel/libsigc++12/Makefile7
-rw-r--r--devel/libstrfunc/Makefile4
-rw-r--r--devel/libticalcs/Makefile3
-rw-r--r--devel/libtifiles/Makefile3
-rw-r--r--devel/libtifiles2/Makefile3
-rw-r--r--devel/libusb/Makefile3
-rw-r--r--devel/libvc/Makefile3
-rw-r--r--devel/libytnef/Makefile3
-rw-r--r--devel/libzvbi/Makefile3
-rw-r--r--devel/log4cpp/Makefile2
-rw-r--r--devel/log4sh/Makefile3
-rw-r--r--devel/lrmi/Makefile3
-rw-r--r--devel/luabind/Makefile2
-rw-r--r--devel/lxr/Makefile2
-rw-r--r--devel/make++/Makefile3
-rw-r--r--devel/mcpp/Makefile2
-rw-r--r--devel/mercator/Makefile3
-rw-r--r--devel/mingw32-bin-msvcrt/Makefile3
-rw-r--r--devel/nant/Makefile3
-rw-r--r--devel/naturaldocs/Makefile2
-rw-r--r--devel/ncnf/Makefile3
-rw-r--r--devel/newfile/Makefile3
-rw-r--r--devel/objectivelib/Makefile3
-rw-r--r--devel/ocaml-camomile-examples/Makefile3
-rw-r--r--devel/ocaml-camomile/Makefile3
-rw-r--r--devel/ocaml-sdl/Makefile3
-rw-r--r--devel/ocaml-sem/Makefile4
-rw-r--r--devel/ode/Makefile3
-rw-r--r--devel/ois/Makefile2
-rw-r--r--devel/omniNotify/Makefile3
-rw-r--r--devel/omniORB/Makefile3
-rw-r--r--devel/open-beagle/Makefile2
-rw-r--r--devel/openwince-include/Makefile3
-rw-r--r--devel/openzz/Makefile3
-rw-r--r--devel/p4.el/Makefile3
-rw-r--r--devel/p4delta/Makefile3
-rw-r--r--devel/p5-Config-Model/Makefile2
-rw-r--r--devel/p5-Glib2/Makefile2
-rw-r--r--devel/p5-Gtk2-Spell/Makefile3
-rw-r--r--devel/p5-doxygenfilter/Makefile2
-rw-r--r--devel/paexec/Makefile2
-rw-r--r--devel/pas2dox/Makefile3
-rw-r--r--devel/perltidy/Makefile4
-rw-r--r--devel/php-dbg2/Makefile2
-rw-r--r--devel/php-java-bridge/Makefile2
-rw-r--r--devel/php-libawl/Makefile2
-rw-r--r--devel/php5-geshi/Makefile2
-rw-r--r--devel/phpbt/Makefile3
-rw-r--r--devel/phptags/Makefile3
-rw-r--r--devel/piklab/Makefile3
-rw-r--r--devel/pipestatus/Makefile2
-rw-r--r--devel/pmd/Makefile3
-rw-r--r--devel/pmk/Makefile2
-rw-r--r--devel/poco-ssl/Makefile3
-rw-r--r--devel/poco/Makefile3
-rw-r--r--devel/poslib/Makefile3
-rw-r--r--devel/premake/Makefile2
-rw-r--r--devel/pstreams/Makefile2
-rw-r--r--devel/ptypes/Makefile3
-rw-r--r--devel/py-RPyC/Makefile2
-rw-r--r--devel/py-asn1/Makefile3
-rw-r--r--devel/py-aspyct/Makefile3
-rw-r--r--devel/py-cclib/Makefile2
-rw-r--r--devel/py-cfgparse/Makefile3
-rw-r--r--devel/py-cheetah/Makefile3
-rw-r--r--devel/py-ciphon/Makefile3
-rw-r--r--devel/py-configobj/Makefile4
-rw-r--r--devel/py-ctypes/Makefile2
-rw-r--r--devel/py-cxx/Makefile3
-rw-r--r--devel/py-dialog/Makefile3
-rw-r--r--devel/py-fam/Makefile3
-rw-r--r--devel/py-fortran/Makefile3
-rw-r--r--devel/py-fusefs/Makefile2
-rw-r--r--devel/py-instant/Makefile3
-rw-r--r--devel/py-json-py/Makefile3
-rw-r--r--devel/py-kjbuckets/Makefile3
-rw-r--r--devel/py-log4py/Makefile3
-rw-r--r--devel/py-ncurses/Makefile3
-rw-r--r--devel/py-ocempgui/Makefile3
-rw-r--r--devel/py-ode/Makefile3
-rw-r--r--devel/py-omniorb/Makefile3
-rw-r--r--devel/py-optik/Makefile3
-rw-r--r--devel/py-parsing/Makefile2
-rw-r--r--devel/py-pmock/Makefile3
-rw-r--r--devel/py-psyco/Makefile3
-rw-r--r--devel/py-pyro/Makefile2
-rw-r--r--devel/py-resourcepackage/Makefile3
-rw-r--r--devel/py-ro/Makefile3
-rw-r--r--devel/py-simpleparse/Makefile3
-rw-r--r--devel/py-simpy/Makefile3
-rw-r--r--devel/py-testoob/Makefile3
-rw-r--r--devel/py-unit/Makefile3
-rw-r--r--devel/py-usb/Makefile1
-rw-r--r--devel/py-xoltar-toolkit/Makefile3
-rw-r--r--devel/pychecker/Makefile3
-rw-r--r--devel/qgit/Makefile2
-rw-r--r--devel/qssl/Makefile3
-rw-r--r--devel/radrails/Makefile3
-rw-r--r--devel/raknet/Makefile4
-rw-r--r--devel/regexx/Makefile3
-rw-r--r--devel/regexxer/Makefile3
-rw-r--r--devel/rhtvision/Makefile3
-rw-r--r--devel/rote/Makefile2
-rw-r--r--devel/rsvndump/Makefile2
-rw-r--r--devel/rth/Makefile2
-rw-r--r--devel/ruby-aspectr/Makefile3
-rw-r--r--devel/ruby-rbbr/Makefile2
-rw-r--r--devel/ruby-rbprof/Makefile3
-rw-r--r--devel/ruby-rjudy/Makefile3
-rw-r--r--devel/ruby-robjectteam/Makefile3
-rw-r--r--devel/ruby-rudl/Makefile3
-rw-r--r--devel/scandoc/Makefile3
-rw-r--r--devel/scons/Makefile2
-rw-r--r--devel/sdl_console/Makefile3
-rw-r--r--devel/sdlmm/Makefile3
-rw-r--r--devel/semantic/Makefile4
-rw-r--r--devel/shmap/Makefile3
-rw-r--r--devel/sigslot/Makefile3
-rw-r--r--devel/silentbob/Makefile2
-rw-r--r--devel/simpletest/Makefile2
-rw-r--r--devel/smc/Makefile3
-rw-r--r--devel/soapui/Makefile3
-rw-r--r--devel/st/Makefile2
-rw-r--r--devel/statcvs/Makefile2
-rw-r--r--devel/stlport/Makefile2
-rw-r--r--devel/swig13/Makefile3
-rw-r--r--devel/swig20/Makefile3
-rw-r--r--devel/sysconftool/Makefile3
-rw-r--r--devel/sysfsutils/Makefile3
-rw-r--r--devel/tcl-memchan/Makefile3
-rw-r--r--devel/tcl-neo/Makefile3
-rw-r--r--devel/tclcl/Makefile2
-rw-r--r--devel/tcllib/Makefile3
-rw-r--r--devel/tclreadline/Makefile2
-rw-r--r--devel/tclthread/Makefile3
-rw-r--r--devel/tcltls/Makefile3
-rw-r--r--devel/tclxml/Makefile3
-rw-r--r--devel/titano/Makefile3
-rw-r--r--devel/tkinspect/Makefile3
-rw-r--r--devel/tokamak/Makefile3
-rw-r--r--devel/trio/Makefile2
-rw-r--r--devel/truc/Makefile2
-rw-r--r--devel/udis86/Makefile3
-rw-r--r--devel/upnp/Makefile2
-rw-r--r--devel/upslug/Makefile3
-rw-r--r--devel/ustl/Makefile3
-rw-r--r--devel/varconf/Makefile3
-rw-r--r--devel/vtcl/Makefile3
-rw-r--r--devel/xlslib/Makefile3
-rw-r--r--devel/xparam/Makefile3
-rw-r--r--devel/xtl/Makefile3
-rw-r--r--devel/zeroinstall-injector/Makefile3
-rw-r--r--devel/zthread/Makefile2
-rw-r--r--devel/zziplib/Makefile3
-rw-r--r--dns/crossip/Makefile3
-rw-r--r--dns/ddclient/Makefile2
-rw-r--r--dns/dnsjava/Makefile3
-rw-r--r--dns/dnsmax-perl/Makefile3
-rw-r--r--dns/dnsutl/Makefile3
-rw-r--r--dns/dualserver/Makefile3
-rw-r--r--dns/ghtool/Makefile3
-rw-r--r--dns/mydns-ng/Makefile3
-rw-r--r--dns/posadis/Makefile3
-rw-r--r--dns/py-dns/Makefile3
-rw-r--r--dns/rbllookup/Makefile3
-rw-r--r--dns/zkt/Makefile2
420 files changed, 448 insertions, 731 deletions
diff --git a/databases/WWWdb/Makefile b/databases/WWWdb/Makefile
index 0a5cbf639cc3..254679306c43 100644
--- a/databases/WWWdb/Makefile
+++ b/databases/WWWdb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= WWWdb
PORTVERSION= 0.8.3
CATEGORIES= databases perl5 www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wwwdb
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Perl based generic WWW DB interface / frontend
diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index 55c43016dbcb..fbac00de9639 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= adminer
PORTVERSION= 1.11.1
CATEGORIES= databases www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Adminer/Adminer%20${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= A full-featured MySQL management tool written in PHP
diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index 113e239400bf..0cea7e2c4ee8 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= adodb
PORTVERSION= 4.99.1
CATEGORIES= databases www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= adodb
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php-4-and-5/${PORTNAME}-4991-for-php
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index 7088dc943a7b..b109cbb6d64f 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= adodb
DISTVERSION= 5.09a
CATEGORIES= databases www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= adodb
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5-only/${PORTNAME}-509a-for-php5
DISTNAME= ${PORTNAME:S/5//}${DISTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
diff --git a/databases/aolserver-nsmysql/Makefile b/databases/aolserver-nsmysql/Makefile
index a883c09998e5..b188ff46f2f3 100644
--- a/databases/aolserver-nsmysql/Makefile
+++ b/databases/aolserver-nsmysql/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nsmysql
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= databases www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aolserver
+MASTER_SITES= SF/aolserver/${PORTNAME}/${PORTNAME}_v1
PKGNAMEPREFIX= aolserver-
DISTNAME= nsmysql_v1
DIST_SUBDIR= aolserver
diff --git a/databases/aolserver-nspostgres/Makefile b/databases/aolserver-nspostgres/Makefile
index ff3efa0e2688..c86f8f121e7c 100644
--- a/databases/aolserver-nspostgres/Makefile
+++ b/databases/aolserver-nspostgres/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 4.1
PORTREVISION= 3
DISTVERSIONSUFFIX= -src
CATEGORIES= databases www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aolserver
+MASTER_SITES= SF/aolserver/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= aolserver-
DIST_SUBDIR= aolserver
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 1fe0ea4ee3be..c5987b1bd599 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bbdb
PORTVERSION= 2.34
PORTREVISION= 2
CATEGORIES= databases elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
diff --git a/databases/buzhug/Makefile b/databases/buzhug/Makefile
index 226ded95e10f..a5a6dea6626b 100644
--- a/databases/buzhug/Makefile
+++ b/databases/buzhug/Makefile
@@ -8,7 +8,7 @@
PORTNAME= buzhug
PORTVERSION= 1.5
CATEGORIES= databases python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= A pure-Python database engine
diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 03eea64ddc68..acaccdd637b0 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -9,7 +9,7 @@ PORTNAME= clip
DISTVERSION= 1.2.0-0
PORTREVISION= 1
CATEGORIES= databases lang
-MASTER_SITES= SF/x-clip
+MASTER_SITES= SF/x-${PORTNAME}/${PORTNAME}%201.2/1.2.0
DISTNAME= ${PORTNAME}-prg-${DISTVERSION}
EXTRACT_SUFX= .tgz
DIST_SUBDIR= clip
diff --git a/databases/dbXML/Makefile b/databases/dbXML/Makefile
index 29af11a1b975..72ebc006d06a 100644
--- a/databases/dbXML/Makefile
+++ b/databases/dbXML/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dbXML
PORTVERSION= 1.0b2
PORTREVISION= 3
CATEGORIES= databases java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}-core
+MASTER_SITES= SF/${PORTNAME:L}-core/OldFiles
DISTNAME= dbXML-Core-${PORTVERSION}
MAINTAINER= rws@procopia.com
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index 1339e0725ec1..3276ea9534dd 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -10,8 +10,7 @@ PORTNAME= dbconnect
PORTVERSION= 0.3.5
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/DBConnect%20API%200.3%20Source%20Code/DBConnect%20API%20${PORTVERSION}
MAINTAINER= sem@FreeBSD.org
COMMENT= Use C++ object API to allow applications to connect to databases
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index 2ba73b0865e6..775273d8f816 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -10,8 +10,7 @@ PORTNAME= dbh
PORTVERSION= 1.0.24
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Disk Based Hashtables
diff --git a/databases/exist/Makefile b/databases/exist/Makefile
index 34d758f7e023..f97a17a91d14 100644
--- a/databases/exist/Makefile
+++ b/databases/exist/Makefile
@@ -9,7 +9,7 @@ PORTNAME= exist
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= databases java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= eXist-${PORTVERSION}-newcore-build4311
EXTRACT_SUFX= .jar
EXTRACT_ONLY= #
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index 205a8c7c6788..b8b97ade388b 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -8,8 +8,7 @@
PORTNAME?= firebird
PORTVERSION= 1.5.5
CATEGORIES?= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=firebird
+MASTER_SITES= SF/firebird/firebird/${PORTVERSION}-Release%20%28Source%29
PKGNAMESUFFIX?= -server
DISTNAME= firebird-1.5.5.4926
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 7e03ccabda91..0d7e4364de4a 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME?= firebird
PORTVERSION= 2.0.3
PORTREVISION= 2
CATEGORIES?= databases
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=firebird
+MASTER_SITES= SF/firebird/OldFiles
PKGNAMESUFFIX?= -server
DISTNAME= Firebird-2.0.3.12981-1
diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
index 5b7245eaf3d1..0ba988e414fb 100644
--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@@ -9,7 +9,7 @@ PORTNAME= flamerobin
PORTVERSION= 0.7.6
PORTREVISION= 4
CATEGORIES= databases
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= dindin@FreeBSD.org.ua
diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile
index 1dcd5148197e..01605a3b77c6 100644
--- a/databases/fortytwo-bdb/Makefile
+++ b/databases/fortytwo-bdb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bdb
PORTVERSION= 0.2.1
PORTREVISION= 2
CATEGORIES= databases gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fortytwo
+MASTER_SITES= SF/fortytwo/Berkeley%20DB%20Wrapper%20%28BDB%29/${PORTVERSION}
PKGNAMEPREFIX= fortytwo-
DISTFILES= BDB-${PORTVERSION}-src.tgz \
BDB-${PORTVERSION}-api-ref.tgz
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index a96132fe602c..ce5fd5ce971a 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= geoserver
PORTVERSION= 1.7.4
CATEGORIES= databases geography java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/GeoServer%20Extensions/${PORTVERSION}
PKGNAMESUFFIX= -mysql-plugin
DISTNAME= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index bac4e330452e..1667094d628f 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gigabase
PORTVERSION= 3.70
CATEGORIES= databases
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Object-Relational Database Management System
diff --git a/databases/gqlplus/Makefile b/databases/gqlplus/Makefile
index 98c9101d9cc8..26fe9063c377 100644
--- a/databases/gqlplus/Makefile
+++ b/databases/gqlplus/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gqlplus
PORTVERSION= 1.12
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= leeym@FreeBSD.org
COMMENT= SQL*PLUS with commandline editing, history, and name completion
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index c19be63e372b..02994cc28e57 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -8,8 +8,7 @@ PORTNAME= hk_classes
PORTVERSION= 0.8.1
PORTREVISION= 3
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= hk-classes
+MASTER_SITES= SF/hk-classes/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ Library for rapid development of database applications
diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile
index 8a063aab5fe1..210f739d3ab0 100644
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hsqldb
PORTVERSION= 1.8.0.10
CATEGORIES= databases java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_1_8_0
DISTNAME= hsqldb_${PORTVERSION:S/./_/g}
#EXTRACT_SUFX= .zip
diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile
index 8d472166ac5f..807277835f0f 100644
--- a/databases/isql-viewer/Makefile
+++ b/databases/isql-viewer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= isql-viewer
PORTVERSION= 2.1.8
PORTREVISION= 3
CATEGORIES= databases java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:isql/} \
+MASTER_SITES= SF/isql/Stand%20Alone%20Jars/Version%20${PORTVERSION}:isql \
${MASTER_SITE_APACHE:S/$/:bsf/}
MASTER_SITE_SUBDIR= isql/:isql \
ws/soap/version-2.2/:bsf
diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile
index 90e509f7a4ae..42fd449d8d98 100644
--- a/databases/jasperreports/Makefile
+++ b/databases/jasperreports/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jasperreports
PORTVERSION= 3.0.0
PORTREVISION= 1
CATEGORIES= databases print java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/1.${PORTNAME}/JasperReports%20${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-${PORTVERSION}-applet.jar
MAINTAINER= thierry@FreeBSD.org
diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile
index 5cde605a5931..1870a9512a84 100644
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= jrrd
PORTVERSION= 1.0.3
CATEGORIES= databases java
-MASTER_SITES= SF/opennms
+MASTER_SITES= SF/opennms/JRRD/stable-1.0
MAINTAINER= rtdean@cytherianage.net
COMMENT= A Java native interface (JNI) to RRDtool
diff --git a/databases/kinterbasdb/Makefile b/databases/kinterbasdb/Makefile
index 548efec00809..3062f1a12767 100644
--- a/databases/kinterbasdb/Makefile
+++ b/databases/kinterbasdb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= kinterbasdb
PORTVERSION= 3.1.3
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kinterbasdb
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index e2677b32a836..d4553a786941 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -8,8 +8,7 @@ PORTNAME= knoda
PORTVERSION= 0.8.1
PORTREVISION= 3
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Database frontend for KDE
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index b4285be86b46..444ca3da0eef 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libdbi-drivers
DISTVERSION= 0.8.3-1
PORTREVISION= 2
CATEGORIES= databases devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.8.3-1
MAINTAINER= delphij@FreeBSD.org
COMMENT= Drivers for libdbi
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 974f34de1e15..da0c3e27666a 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -9,8 +9,7 @@
PORTNAME= libdbi
PORTVERSION= 0.8.3
CATEGORIES= databases devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
COMMENT= Database Independent Abstraction Layer for C
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index d77941a58200..b0709226727d 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -12,7 +12,8 @@ PORTNAME= libiodbc
PORTVERSION= 3.52.6
CATEGORIES= databases
MASTER_SITES= http://www.iodbc.org/downloads/iODBC/ \
- SF/iodbc
+ SF/iodbc/iodbc/${PORTVERSION}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= An ODBC 3.x driver manager, for universal data source access
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index d5c274bc2569..43b3921b601f 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libodbc++
PORTVERSION= 0.2.3
PORTREVISION= 7
CATEGORIES= databases devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libodbcxx
+MASTER_SITES= SF/libodbcxx/libodbc%2B%2B/${PORTVERSION}
MAINTAINER= fjoe@FreeBSD.org
COMMENT= A C++ class library and toolset for ODBC access to data sources
diff --git a/databases/mantis/Makefile b/databases/mantis/Makefile
index 4917e9666e63..615c04ba26da 100644
--- a/databases/mantis/Makefile
+++ b/databases/mantis/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mantis
PORTVERSION= 1.1.8
CATEGORIES= databases www
-MASTER_SITES= SF/mantisbt
+MASTER_SITES= SF/${PORTNAME}bt/${PORTNAME}-stable/${PORTVERSION}
DISTNAME= mantisbt-${PORTVERSION}
MAINTAINER= dan@langille.org
diff --git a/databases/mtop/Makefile b/databases/mtop/Makefile
index 41d5177befd7..7d84cbf4946f 100644
--- a/databases/mtop/Makefile
+++ b/databases/mtop/Makefile
@@ -10,8 +10,7 @@ PORTNAME= mtop
PORTVERSION= 0.6.6
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= MySQL Monitoring Tool
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index d716576267b4..5895d91782d9 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mysql-navigator
PORTVERSION= 1.4.2
PORTREVISION= 7
CATEGORIES= databases kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-//}
+MASTER_SITES= SF/mysqlnavigator/mysqlnavigator/${PORTVERSION}
DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}
MAINTAINER= demon@FreeBSD.org
diff --git a/databases/mysql-udf/Makefile b/databases/mysql-udf/Makefile
index 486442429579..462c0731f672 100644
--- a/databases/mysql-udf/Makefile
+++ b/databases/mysql-udf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mysql-udf
PORTVERSION= 0.3
CATEGORIES= databases
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= Set of user-defined functions for the MySQL server
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index 856995029c9e..c1b867475ec6 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mysqlcppapi
PORTVERSION= 1.9.3
PORTREVISION= 2
CATEGORIES= databases devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=mysqlcppapi
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%202/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A fork of mysql++ C++ API for MySQL
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index f457523ac84b..211d2b4c5b94 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -8,8 +8,7 @@
PORTNAME= DBIWrapper
PORTVERSION= 0.24
CATEGORIES= databases perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dbiwrapper
+MASTER_SITES= SF
PKGNAMEPREFIX= p5-
DISTNAME= libdbiwrapper-perl-${PORTVERSION}
diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index db5a079bb77b..dd9148fed89a 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pgaccess
PORTVERSION= 0.99.0.20040219
PORTREVISION= 2
CATEGORIES= databases tcl tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pgaccess
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g}
EXTRACT_SUFX= .tgz
diff --git a/databases/php-sqlite3/Makefile b/databases/php-sqlite3/Makefile
index e853981d72b4..314e2406b3c6 100644
--- a/databases/php-sqlite3/Makefile
+++ b/databases/php-sqlite3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sqlite3
PORTVERSION= 0.4
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= php-sqlite3
+MASTER_SITES= SF/php-${PORTNAME}/source%20code/release%20${PORTVERSION}
PKGNAMEPREFIX= php-
EXTRACT_SUFX= .tgz
#DISTFILES= sqlite3-0.4.tgz
diff --git a/databases/phpminiadmin/Makefile b/databases/phpminiadmin/Makefile
index c13983c269e8..e03c5b01da75 100644
--- a/databases/phpminiadmin/Makefile
+++ b/databases/phpminiadmin/Makefile
@@ -8,8 +8,7 @@
PORTNAME= phpminiadmin
DISTVERSION= 1.4.080217
CATEGORIES= databases www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpminiadmin
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= spam@rm-rf.kiev.ua
COMMENT= Lightweight alternative to phpMyAdmin
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index 3fc2831e2964..f1eff323b15c 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -8,7 +8,7 @@
PORTNAME= phpMyAdmin211
DISTVERSION= 2.11.9.5
CATEGORIES= databases www
-MASTER_SITES= SF/phpmyadmin
+MASTER_SITES= SF/phpmyadmin/phpMyAdmin/${PORTVERSION}
DISTNAME= ${PORTNAME:S/211//}-${DISTVERSION}-all-languages
MAINTAINER= m.seaman@infracaninophile.co.uk
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index de16808eb8fe..3958c44c39ec 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pxlib
PORTVERSION= 0.6.3
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= sem@FreeBSD.org
COMMENT= C library to read various Paradox files
diff --git a/databases/py-MySQLdb-devel/Makefile b/databases/py-MySQLdb-devel/Makefile
index 9956bfb62565..479d38867118 100644
--- a/databases/py-MySQLdb-devel/Makefile
+++ b/databases/py-MySQLdb-devel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MySQLdb
DISTVERSION= 1.2.3c1
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mysql-python
+MASTER_SITES= SF/mysql-python/mysql-python-test/1.2.3c1
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= -devel
DISTNAME= MySQL-python-${DISTVERSION}
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 4387929f326e..0432c4f69807 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= MySQLdb
DISTVERSION= 1.2.2
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mysql-python
+MASTER_SITES= SF/mysql-python/mysql-python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= MySQL-python-${DISTVERSION}
diff --git a/databases/py-PySQLite10/Makefile b/databases/py-PySQLite10/Makefile
index fa8301b989ea..953b16577959 100644
--- a/databases/py-PySQLite10/Makefile
+++ b/databases/py-PySQLite10/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PySQLite
PORTVERSION= 1.0.1
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pysqlite
+MASTER_SITES= SF/${PORTNAME:L}/OldFiles
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pysqlite-${PORTVERSION}
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index 8e2a4d9b6486..d46ac70fb772 100644
--- a/databases/py-forgetsql/Makefile
+++ b/databases/py-forgetsql/Makefile
@@ -8,8 +8,7 @@
PORTNAME= forgetsql
PORTVERSION= 0.5.1
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= forgetSQL-${PORTVERSION}
diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile
index 7ddd3c09a355..7ef136f4420a 100644
--- a/databases/py-mssql/Makefile
+++ b/databases/py-mssql/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mssql
PORTVERSION= 1.0.1
CATEGORIES= databases python
-MASTER_SITES= SF/pymssql
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pymssql-${PORTVERSION}
diff --git a/databases/py-oops/Makefile b/databases/py-oops/Makefile
index 71f1cc109501..b509dabd04f0 100644
--- a/databases/py-oops/Makefile
+++ b/databases/py-oops/Makefile
@@ -9,8 +9,7 @@
PORTNAME= oops
PORTVERSION= 0.9.1
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyobjfs
+MASTER_SITES= SF/pyobjfs/OOPS-Python%20Datastore/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile
index f481b4c36e72..dc7895604a77 100644
--- a/databases/py-pyPgSQL/Makefile
+++ b/databases/py-pyPgSQL/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pyPgSQL
PORTVERSION= 2.5.1
PORTREVISION= 3
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pypgsql
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= python@FreeBSD.org
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 08d7b109b81d..8a36bdd32efc 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -8,8 +8,7 @@ PORTNAME= rrdtool_lgpl
PORTVERSION= 0.2.1
PORTREVISION= 2
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= py-rrdtool
+MASTER_SITES= SF/py-rrdtool/py-rrdtool/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py-rrdtool-${PORTVERSION}
diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 902d89eb9feb..9931ea319460 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -8,9 +8,9 @@
PORTNAME= sqlalchemy
PORTVERSION= 0.5.5
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
CHEESESHOP
-MASTER_SITE_SUBDIR= sqlalchemy
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= SQLAlchemy-${DISTVERSION}
diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile
index 902d89eb9feb..9931ea319460 100644
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@@ -8,9 +8,9 @@
PORTNAME= sqlalchemy
PORTVERSION= 0.5.5
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
CHEESESHOP
-MASTER_SITE_SUBDIR= sqlalchemy
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= SQLAlchemy-${DISTVERSION}
diff --git a/databases/pydbdesigner/Makefile b/databases/pydbdesigner/Makefile
index a39e2ba4ebf9..ca76cd0e1574 100644
--- a/databases/pydbdesigner/Makefile
+++ b/databases/pydbdesigner/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pydbdesigner
PORTVERSION= 0.1.4.1
PORTREVISION= 2
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= xride@FreeBSD.org
COMMENT= Graphical designer for relational databases
diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index 5085d57cfa7d..3bdc2df1e978 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -9,9 +9,9 @@ PORTNAME= qdbm
PORTVERSION= 1.8.77
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/qdbm/qdbm/${PORTVERSION} \
http://qdbm.sourceforge.net/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ahze@FreeBSD.org
COMMENT?= Quick Database Manager
diff --git a/databases/rrdman/Makefile b/databases/rrdman/Makefile
index 81c42836e45d..42a4654955b4 100644
--- a/databases/rrdman/Makefile
+++ b/databases/rrdman/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rrdman
PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rrfw
+MASTER_SITES= SF/rrfw/${PORTNAME}/${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Apply Holt-Winters prediction parameters to RRD data
diff --git a/databases/sqlcached/Makefile b/databases/sqlcached/Makefile
index af874668f463..a41e8f8c7768 100644
--- a/databases/sqlcached/Makefile
+++ b/databases/sqlcached/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sqlcached
PORTVERSION= r4
CATEGORIES= databases net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ivoras@FreeBSD.org
diff --git a/databases/sqlitemanager/Makefile b/databases/sqlitemanager/Makefile
index 45f79fc82262..5d6b57535d9c 100644
--- a/databases/sqlitemanager/Makefile
+++ b/databases/sqlitemanager/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sqlitemanager
PORTVERSION= 1.2.0
CATEGORIES= databases www
-MASTER_SITES= SOURCEFORGE
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= SQLiteManager-${PORTVERSION}
MAINTAINER= gslin@gslin.org
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 21a4fbd9fa5f..3ffc741cc450 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -10,7 +10,6 @@ PORTVERSION= ${SQLRELAY_PORTVERSION}
PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sqlrelay
MAINTAINER= skv@FreeBSD.org
COMMENT= A persistent DB connection pooling/proxying/load balancing system
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 11c4470da0ce..2004b580ffe1 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -8,7 +8,7 @@ PORTNAME= sqsh
PORTVERSION= 2.1.5
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index 0b4d5647da5c..25e593a89c6f 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -9,8 +9,7 @@ PORTNAME= squirrel
PORTVERSION= 2.6.4
PORTREVISION= 1
CATEGORIES= databases java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}${PKGNAMESUFFIX}
+MASTER_SITES= SF/${PORTNAME}-sql/1-stable/2.6%20plain%20zip
PKGNAMESUFFIX= -sql
DISTNAME= squirrel-sql-2.6-standard
diff --git a/databases/sybtcl/Makefile b/databases/sybtcl/Makefile
index 9f3071d116cd..f31b428576be 100644
--- a/databases/sybtcl/Makefile
+++ b/databases/sybtcl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sybtcl
PORTVERSION= 3.0rc2
PORTREVISION= 2
CATEGORIES= databases devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mi@aldan.algebra.com
COMMENT= TCL extension to connect to Sybase servers
diff --git a/databases/tcl-Mysql/Makefile b/databases/tcl-Mysql/Makefile
index a5f47db4c938..0ae7558a5344 100644
--- a/databases/tcl-Mysql/Makefile
+++ b/databases/tcl-Mysql/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ${TCL_NODOT}-sql
PORTVERSION= 20000114
PORTREVISION= 6
CATEGORIES= databases tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl-sql
+MASTER_SITES= SF/tcl-sql/tcl-sql/${PORTVERSION}
DISTNAME= tcl-sql-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index eced2e15ce29..87544306c93a 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tokyotyrant
PORTVERSION= 1.1.33
CATEGORIES= databases
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tokyocabinet
+MASTER_SITES= SF/tokyocabinet/${PORTNAME}/${PORTVERSION}
MAINTAINER= gslin@gslin.org
COMMENT= Network interface of Tokyo Cabinet
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index aba72ce77f04..5ed4aec3e20a 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -9,8 +9,7 @@ PORTNAME= virtuoso
PORTVERSION= 5.0.1
PORTREVISION= 2
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-opensource-${PORTVERSION}
MAINTAINER= fjoe@FreeBSD.org
diff --git a/databases/wfb2sql/Makefile b/databases/wfb2sql/Makefile
index 21f86109bfab..a6037479803a 100644
--- a/databases/wfb2sql/Makefile
+++ b/databases/wfb2sql/Makefile
@@ -8,8 +8,7 @@
PORTNAME= wfb2sql
PORTVERSION= 0.6
CATEGORIES= databases perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= CIA World Fact Book to SQL Conversion Utility
diff --git a/databases/yasql/Makefile b/databases/yasql/Makefile
index 904a09c054bc..528ad4d99cd9 100644
--- a/databases/yasql/Makefile
+++ b/databases/yasql/Makefile
@@ -8,8 +8,7 @@
PORTNAME= yasql
PORTVERSION= 1.83
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= thierry@FreeBSD.org
COMMENT= Yet Another SQL*Plus Replacement
diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile
index dcda7ceab560..ec9a530ff1be 100644
--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@@ -9,8 +9,7 @@ PORTNAME= adesklets
PORTVERSION= 0.6.1
PORTREVISION= 6
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28core%29/${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= An interactive Imlib2 console for the X Window system
diff --git a/deskutils/appwrapper/Makefile b/deskutils/appwrapper/Makefile
index aba6edbbacc8..4177062af50a 100644
--- a/deskutils/appwrapper/Makefile
+++ b/deskutils/appwrapper/Makefile
@@ -9,8 +9,7 @@ PORTNAME= appwrapper
PORTVERSION= 0.1
PORTREVISION= 2
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AppWrapper%20${PORTVERSION}
DISTNAME= AppWrapper.${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/deskutils/bitcollider/Makefile b/deskutils/bitcollider/Makefile
index 711627c70d07..dd92b575706e 100644
--- a/deskutils/bitcollider/Makefile
+++ b/deskutils/bitcollider/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bitcollider
PORTVERSION= 0.6.0
CATEGORIES= deskutils multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Bitcollider/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Bitzi metadata generator
diff --git a/deskutils/blogtk/Makefile b/deskutils/blogtk/Makefile
index 57fe8f1caacb..3fdc34453eb7 100644
--- a/deskutils/blogtk/Makefile
+++ b/deskutils/blogtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= blogtk
PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BloGTK-${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= jbq@caraldi.com
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index ee687d6e9146..0f724dbbf43f 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -9,9 +9,9 @@ PORTNAME= cdcat
PORTVERSION= 1.01b # >1.01 as b doesn't stay for 'beta'
PORTREVISION= 3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://cdcat.sourceforge.net/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
DISTNAME= CdCat-${PORTVERSION}
MAINTAINER= aren.tyr@gawab.com
diff --git a/deskutils/checkrdf/Makefile b/deskutils/checkrdf/Makefile
index e4a1ffc9961b..fc46517d8ad4 100644
--- a/deskutils/checkrdf/Makefile
+++ b/deskutils/checkrdf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= checkrdf
PORTVERSION= 39.4444
PORTREVISION= 2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= checkrdf
+MASTER_SITES= SF
MAINTAINER= obraun@FreeBSD.org
COMMENT= A tool for RDF site summaries based news-check
diff --git a/deskutils/cycle/Makefile b/deskutils/cycle/Makefile
index 9d8a275cac81..aae935428ef2 100644
--- a/deskutils/cycle/Makefile
+++ b/deskutils/cycle/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cycle
PORTVERSION= 0.3.1
PORTREVISION= 3
CATEGORIES= deskutils biology python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= danfe@FreeBSD.org
COMMENT= A calendar program for women
diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile
index 54204ee3bb57..72fce3368a6c 100644
--- a/deskutils/dragstack/Makefile
+++ b/deskutils/dragstack/Makefile
@@ -8,8 +8,7 @@ PORTNAME= dragstack
PORTVERSION= 1.4
PORTREVISION= 6
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= markus@FreeBSD.org
COMMENT= Drop stack applet for KDE
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 69154a08d9c7..c2b14e3ed58a 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= drivel
PORTVERSION= 2.0.2
PORTREVISION= 10
CATEGORIES= deskutils gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Drivel%20%28stable%29/${PORTVERSION}
MAINTAINER= jbq@caraldi.com
COMMENT= Blog editor for GNOME
diff --git a/deskutils/egroupware/Makefile b/deskutils/egroupware/Makefile
index 501e347845e2..d217e9f71709 100644
--- a/deskutils/egroupware/Makefile
+++ b/deskutils/egroupware/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eGroupware
PORTVERSION= 1.6.002
CATEGORIES= deskutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 \
${PORTNAME}-egw-pear-${PORTVERSION}.tar.bz2
diff --git a/deskutils/everygui/Makefile b/deskutils/everygui/Makefile
index e198270089e9..f6b4100414f6 100644
--- a/deskutils/everygui/Makefile
+++ b/deskutils/everygui/Makefile
@@ -8,8 +8,7 @@ PORTNAME= everygui
PORTVERSION= 0.99.b
PORTREVISION= 4
CATEGORIES= deskutils gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= everygui
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Dynamic GUI for an OS command
diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile
index 88e2461e2ea2..3c0576089f4d 100644
--- a/deskutils/ganttproject/Makefile
+++ b/deskutils/ganttproject/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ganttproject
DISTVERSION= 2.1-m3
CATEGORIES= deskutils java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-development/Loire%20M3
EXTRACT_SUFX= -src.zip
MAINTAINER= gahr@FreeBSD.org
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index 50c01865cdd2..9be905d10ff6 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ganyremote
PORTVERSION= 5.10
PORTREVISION= 1
CATEGORIES= deskutils comms gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= anyremote
+MASTER_SITES= SF/anyremote/${PORTNAME}/${PORTVERSION}
MAINTAINER= avl@FreeBSD.org
COMMENT= GNOME frontend for anyRemote
diff --git a/deskutils/glipper/Makefile b/deskutils/glipper/Makefile
index 42432483a6ef..35e9e0bf3972 100644
--- a/deskutils/glipper/Makefile
+++ b/deskutils/glipper/Makefile
@@ -9,7 +9,7 @@ PORTNAME= glipper
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= deskutils gnome
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= yuri.pankov@gmail.com
COMMENT= Clipboard manager for the GNOME panel
diff --git a/deskutils/gmcal/Makefile b/deskutils/gmcal/Makefile
index d807577ff3a9..5b8360b86894 100644
--- a/deskutils/gmcal/Makefile
+++ b/deskutils/gmcal/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gmcal
PORTVERSION= 0.0.1
PORTREVISION= 4
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libmcal
+MASTER_SITES= SF/libmcal/${PORTNAME}/${PORTVERSION}
MAINTAINER= thierry@pompo.net
COMMENT= GMCAL is a GTK+ frontend for the libmcal package
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index b55064c60041..c550b2c24a9e 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gnotime
PORTVERSION= 2.3.0
PORTREVISION= 2
CATEGORIES= deskutils gnome
-MASTER_SITES= SF/gttr:gttr SF/qof:qof
+MASTER_SITES= SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION}:gttr SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION}:qof
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gttr \
${QOF_DISTNAME}${EXTRACT_SUFX}:qof
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index 2d1b709ff7ae..0fcfacd9a0b5 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gourmet
PORTVERSION= 0.13.4
PORTREVISION= 1
CATEGORIES= deskutils gnome
-MASTER_SITES= SF/grecipe-manager
+MASTER_SITES= SF/grecipe-manager/grecipe-manager/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= ahze@FreeBSD.org
diff --git a/deskutils/gtweakui/Makefile b/deskutils/gtweakui/Makefile
index 85839f248aa0..192c27bde492 100644
--- a/deskutils/gtweakui/Makefile
+++ b/deskutils/gtweakui/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gTweakUI
PORTVERSION= 0.4.0
PORTREVISION= 8
CATEGORIES= deskutils gnome
-MASTER_SITES= SF/gtweakui
+MASTER_SITES= SF
DIST_SUBDIR= gnome2
MAINTAINER= ports@FreeBSD.org
diff --git a/deskutils/ithought/Makefile b/deskutils/ithought/Makefile
index f7e6c84e9d7f..aed3985e5106 100644
--- a/deskutils/ithought/Makefile
+++ b/deskutils/ithought/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ithought
PORTVERSION= a5
PORTREVISION= 4
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-alpha
MAINTAINER= ports@FreeBSD.org
COMMENT= An extensible text management system
diff --git a/deskutils/jjclient/Makefile b/deskutils/jjclient/Makefile
index cc846f1fb99e..d0bafd1cad57 100644
--- a/deskutils/jjclient/Makefile
+++ b/deskutils/jjclient/Makefile
@@ -8,9 +8,9 @@
PORTNAME= jjclient
PORTVERSION= 1.0.2
CATEGORIES= deskutils
-MASTER_SITES= SF \
+MASTER_SITES= SF/justjournal/JustJournal%20UNIX%20Client/${PORTVERSION} \
http://www.justjournal.com/software/unix/
-MASTER_SITE_SUBDIR= justjournal
+
MAINTAINER= luke@justjournal.com
COMMENT= A command line client for posting JustJournal entries
diff --git a/deskutils/kblticker/Makefile b/deskutils/kblticker/Makefile
index d117defebdcd..2988bcf816db 100644
--- a/deskutils/kblticker/Makefile
+++ b/deskutils/kblticker/Makefile
@@ -10,8 +10,7 @@ PORTNAME= kblticker
PORTVERSION= 0.2.1
PORTREVISION= 5
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mich@FreeBSD.org
COMMENT= KDE bloglines notifier
diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile
index 1d47b82a6dc7..3be20fff7027 100644
--- a/deskutils/kchm/Makefile
+++ b/deskutils/kchm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kchm
PORTVERSION= 0.6.5
PORTREVISION= 8
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kchmnew
+MASTER_SITES= SF/${PORTNAME}new/${PORTNAME}new/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= shirshegsm@gmail.com
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index bcb5e0a2d9c2..77b5727f17ca 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kchmviewer
PORTVERSION= 3.1
PORTREVISION= 2
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2
DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= markus@FreeBSD.org
diff --git a/deskutils/kickpim/Makefile b/deskutils/kickpim/Makefile
index 67112010512a..4da5eb40129b 100644
--- a/deskutils/kickpim/Makefile
+++ b/deskutils/kickpim/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kickpim
PORTVERSION= 0.5.3
PORTREVISION= 8
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20_Society_
MAINTAINER= ports@FreeBSD.org
COMMENT= Panel applet for editing and accessing the KDE addressbook
diff --git a/deskutils/kluje/Makefile b/deskutils/kluje/Makefile
index 7a3a7c953fe2..eb9a1f093d67 100644
--- a/deskutils/kluje/Makefile
+++ b/deskutils/kluje/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kluje
PORTVERSION= 0.8
PORTREVISION= 3
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A KDE client for the popular online journal site LiveJournal
diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index fe6b48116f40..d0e4220d30a4 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kmatrix3d
PORTVERSION= 0.1
PORTREVISION= 5
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= gustau.perez@gmail.com
COMMENT= Eye candy for KDE, a new Matrix screensaver
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index ca17aacabe6e..522ac0504a1d 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kooldock
PORTVERSION= 0.4.7
PORTREVISION= 2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/${PORTNAME}-${PORTVERSION}.tar.bz2
MAINTAINER= gustau.perez@gmail.com
COMMENT= OS-X dock-like for KDE
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index a5daaf697865..19a6822a89fe 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -10,8 +10,7 @@ PORTNAME= krss
PORTVERSION= 2.6
PORTREVISION= 9
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE Rich Site Summary viewer
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index 51759fd38ffa..f84660f04384 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -9,7 +9,7 @@ PORTNAME= launchy
PORTVERSION= 2.1.2
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Launchy%20on%20Linux/${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= Access applications, files, and bookmarks with just a few keystrokes
diff --git a/deskutils/ljcharm/Makefile b/deskutils/ljcharm/Makefile
index d6b4b2f47f42..5535823ba663 100644
--- a/deskutils/ljcharm/Makefile
+++ b/deskutils/ljcharm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= charm
PORTVERSION= 1.9.1
CATEGORIES= deskutils net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ljcharm
+MASTER_SITES= SF/lj${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= seawolf@marinewolf.net
COMMENT= A menu-driven python-based livejournal client
diff --git a/deskutils/mcal/Makefile b/deskutils/mcal/Makefile
index 55dc7d608a30..95603e3da34f 100644
--- a/deskutils/mcal/Makefile
+++ b/deskutils/mcal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mcal
PORTVERSION= 0.3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libmcal
+MASTER_SITES= SF/lib${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= thierry@pompo.net
COMMENT= A libmcal powered cal replacement
diff --git a/deskutils/menumaker/Makefile b/deskutils/menumaker/Makefile
index e2d541fd4054..cdf70b0457cd 100644
--- a/deskutils/menumaker/Makefile
+++ b/deskutils/menumaker/Makefile
@@ -8,7 +8,7 @@
PORTNAME= menumaker
PORTVERSION= 0.99.7
CATEGORIES= deskutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/MenuMaker/${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Menu generator for X Window Managers and desktop environments
diff --git a/deskutils/moregroupware/Makefile b/deskutils/moregroupware/Makefile
index 94e29000f405..7c3166f2edea 100644
--- a/deskutils/moregroupware/Makefile
+++ b/deskutils/moregroupware/Makefile
@@ -9,8 +9,7 @@ PORTNAME= moregroupware
PORTVERSION= 0.7.4
PORTREVISION= 2
CATEGORIES= deskutils www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= moregroupware
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-core-${PORTVERSION}
MAINTAINER= eksffa@freebsdbrasil.com.br
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 6337ce02f804..30cec23117c8 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -8,8 +8,7 @@ PORTNAME?= multisync
PORTVERSION= 0.82
PORTREVISION= 8
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= multisync
+MASTER_SITES= SF/multisync/OldFiles
DISTNAME= multisync-${PORTVERSION}
MAINTAINER?= pav@FreeBSD.org
diff --git a/deskutils/openproj/Makefile b/deskutils/openproj/Makefile
index 13a3160beac4..d58d9e2680ed 100644
--- a/deskutils/openproj/Makefile
+++ b/deskutils/openproj/Makefile
@@ -8,7 +8,7 @@
PORTNAME= openproj
PORTVERSION= 1.4
CATEGORIES= deskutils editors java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OpenProj%20Binaries/${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A free, open source Project Manager
diff --git a/deskutils/pal/Makefile b/deskutils/pal/Makefile
index e53ff638f059..760f605c77f2 100644
--- a/deskutils/pal/Makefile
+++ b/deskutils/pal/Makefile
@@ -8,8 +8,7 @@ PORTNAME= pal
PORTVERSION= 0.3.4
PORTREVISION= 5
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= palcal
+MASTER_SITES= SF/${PORTNAME}cal/${PORTNAME}/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= h.skuhra@gmail.com
diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile
index d97edba543e0..041c07e418de 100644
--- a/deskutils/parcellite/Makefile
+++ b/deskutils/parcellite/Makefile
@@ -9,7 +9,7 @@ PORTNAME= parcellite
PORTVERSION= 0.9.1
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= joey@mingrone.org
COMMENT= A lightweight GTK+ clipboard manager
diff --git a/deskutils/phpgroupware/Makefile b/deskutils/phpgroupware/Makefile
index 593230d3ca63..a0b27a235fc6 100644
--- a/deskutils/phpgroupware/Makefile
+++ b/deskutils/phpgroupware/Makefile
@@ -7,8 +7,7 @@
PORTNAME= phpgroupware
PORTVERSION= 0.9.16.012
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpgroupware
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/deskutils/phpicalendar/Makefile b/deskutils/phpicalendar/Makefile
index 7a4881962891..32f381d89a26 100644
--- a/deskutils/phpicalendar/Makefile
+++ b/deskutils/phpicalendar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= phpicalendar
PORTVERSION= 2.24
CATEGORIES= deskutils www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
EXTRACT_SUFX= .tgz
MAINTAINER= edwin@mavetju.org
diff --git a/deskutils/preferences.app/Makefile b/deskutils/preferences.app/Makefile
index 4f9081c4756c..951b3375a735 100644
--- a/deskutils/preferences.app/Makefile
+++ b/deskutils/preferences.app/Makefile
@@ -9,8 +9,7 @@ PORTNAME= preferences
PORTVERSION= 1.2.0
PORTREVISION= 4
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= prefsapp
+MASTER_SITES= SF/prefsapp/prefsapp/${PORTVERSION}
DISTNAME= Preferences-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index 95acb47ba16e..8a8d8b5dd38b 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pybookreader
PORTVERSION= 0.5.0
PORTREVISION= 3
CATEGORIES= deskutils python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/PyBookReader/PyBookReader%2BOrnamentBook-${PORTVERSION}
DISTNAME= PyBookReader-${PORTVERSION}
MAINTAINER= ufo@februality.com
diff --git a/deskutils/q4wine/Makefile b/deskutils/q4wine/Makefile
index 4fdc0bbe7ec2..e9d937b77a89 100644
--- a/deskutils/q4wine/Makefile
+++ b/deskutils/q4wine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= q4wine
DISTVERSION= 0.112-r1
CATEGORIES= deskutils emulators
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.112-r1
MAINTAINER= sergey.dyatko@gmail.com
COMMENT= QT4 front-end for WINE
diff --git a/deskutils/qorganizer/Makefile b/deskutils/qorganizer/Makefile
index 9b1785e7b79b..4f6750ce27d9 100644
--- a/deskutils/qorganizer/Makefile
+++ b/deskutils/qorganizer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= qorganizer
PORTVERSION= 3.1
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= qOrganizer-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile
index 7e2f9b7b6e5a..0b5bb7314db6 100644
--- a/deskutils/qtm/Makefile
+++ b/deskutils/qtm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qtm
PORTVERSION= 1.1.1
CATEGORIES= deskutils
-MASTER_SITES= SF/catkin
+MASTER_SITES= SF/catkin/${PORTNAME}-1.1/${PORTNAME}-1.1
MAINTAINER= ports@FreeBSD.org
COMMENT= Blog management application based on Qt 4
diff --git a/deskutils/rolo/Makefile b/deskutils/rolo/Makefile
index b8822b532b1a..d03d7e802e5d 100644
--- a/deskutils/rolo/Makefile
+++ b/deskutils/rolo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= rolo
PORTVERSION= 011
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Text-based contact management software
diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile
index fe4d6c3c7ab9..f03cf190d5c0 100644
--- a/deskutils/rox-memo/Makefile
+++ b/deskutils/rox-memo/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rox-memo
PORTVERSION= 2.0
PORTREVISION= 2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rox
+MASTER_SITES= SF/rox/Memo/${PORTVERSION}
DISTNAME= memo-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/deskutils/snotes/Makefile b/deskutils/snotes/Makefile
index 882d16456f85..2525d379170b 100644
--- a/deskutils/snotes/Makefile
+++ b/deskutils/snotes/Makefile
@@ -9,8 +9,7 @@ PORTNAME= snotes
PORTVERSION= 1.1.5
PORTREVISION= 3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= s-notes
+MASTER_SITES= SF/s-notes/s-notes/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A lightweight, configurable sticky notes utility
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index 13714ef35b44..a4955ae77028 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= strigi
PORTVERSION= 0.6.4
CATEGORIES= deskutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Desktop searching program
diff --git a/deskutils/sugarcrm/Makefile b/deskutils/sugarcrm/Makefile
index cc584c4b6d8f..9c84b2e3760d 100644
--- a/deskutils/sugarcrm/Makefile
+++ b/deskutils/sugarcrm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sugarcrm
PORTVERSION= 5.2.0d
CATEGORIES= deskutils www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= SugarCE-${PORTVERSION}
MAINTAINER= nick@foobar.org
diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
index dff2d86cf137..6dd6811274c2 100644
--- a/deskutils/superswitcher/Makefile
+++ b/deskutils/superswitcher/Makefile
@@ -9,8 +9,7 @@ PORTNAME= superswitcher
PORTVERSION= 0.3
PORTREVISION= 3
CATEGORIES= deskutils gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= browserbookapp
+MASTER_SITES= SF/browserbookapp/${PORTNAME}/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/deskutils/thinkingrock/Makefile b/deskutils/thinkingrock/Makefile
index b579d98be121..d6e3da9ca69e 100644
--- a/deskutils/thinkingrock/Makefile
+++ b/deskutils/thinkingrock/Makefile
@@ -8,7 +8,7 @@
PORTNAME= thinkingrock
PORTVERSION= 2.2.1
CATEGORIES= deskutils java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ThinkingRock/TR%20${PORTVERSION}
DISTNAME= tr-${PORTVERSION}
MAINTAINER= beat@FreeBSD.org
diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile
index f5d865091ffb..afd3a60abb61 100644
--- a/deskutils/vym/Makefile
+++ b/deskutils/vym/Makefile
@@ -8,8 +8,7 @@
PORTNAME= vym
PORTVERSION= 1.12.2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= gerrit.beine@gmx.de
COMMENT= VYM (View Your Mind) is a tool to generate and manipulate maps
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 8d55d2d0ea0b..510628ebeeab 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xchm
PORTVERSION= 1.15
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/xCHM/${PORTNAME}-${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= Windows HTML Help (.chm) viewer for UNIX
diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index 714f4b9d01f8..2f0a9cd05151 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= SpecTcl
PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= devel tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/aap/Makefile b/devel/aap/Makefile
index 4028e654c3e7..865c726d9cd7 100644
--- a/devel/aap/Makefile
+++ b/devel/aap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= aap
PORTVERSION= 1.090
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= a-a-p
+MASTER_SITES= SF/a-a-p/Aap/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A build tool alternative to make with internet access and CVS support
diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile
index 080386e8f8bb..2ab58e617271 100644
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= adasdl
PORTVERSION= 20010504
PORTREVISION= 6
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/AdaSDL_${PORTVERSION}/AdaSDL_${PORTVERSION}
DISTNAME= AdaSDL_${PORTVERSION}
MAINTAINER= david@realityrift.com
diff --git a/devel/adime/Makefile b/devel/adime/Makefile
index e918cf9c61a0..2a450cd3f166 100644
--- a/devel/adime/Makefile
+++ b/devel/adime/Makefile
@@ -9,8 +9,7 @@ PORTNAME= adime
PORTVERSION= 2.2.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= EitanAdlerList@gmail.com
COMMENT= Generate Allegro dialogs in a very simple way
diff --git a/devel/adocman/Makefile b/devel/adocman/Makefile
index 6196336784ef..62c90119bd2a 100644
--- a/devel/adocman/Makefile
+++ b/devel/adocman/Makefile
@@ -8,8 +8,7 @@
PORTNAME= adocman
PORTVERSION= 0.13
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sitedocs
+MASTER_SITES= SF/sitedocs/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Automated sourceforge administration tool
diff --git a/devel/agide/Makefile b/devel/agide/Makefile
index e54b74547117..f15786788bd5 100644
--- a/devel/agide/Makefile
+++ b/devel/agide/Makefile
@@ -9,8 +9,7 @@ PORTNAME= agide
PORTVERSION= 0.124
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= a-a-p
+MASTER_SITES= SF/a-a-p/Agide/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A-A-P GUI IDE: a framework for software development
diff --git a/devel/ald/Makefile b/devel/ald/Makefile
index 7e64302b1480..a6de672243e8 100644
--- a/devel/ald/Makefile
+++ b/devel/ald/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ald
PORTVERSION= 0.1.7
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= alken@colorado.edu
COMMENT= Debugger for assembly level programs
diff --git a/devel/alf/Makefile b/devel/alf/Makefile
index e28881dc287c..0dea0bcaaa25 100644
--- a/devel/alf/Makefile
+++ b/devel/alf/Makefile
@@ -10,8 +10,7 @@ PORTNAME= alf
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= largefiles
+MASTER_SITES= SF/largefiles/largefiles/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstract Large File
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 8ad2ad32bbaf..5b3494dc4dd4 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= allegro
DISTVERSION= 4.3.1
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= alleg
+MASTER_SITES= SF/alleg/${PORTNAME}-unstable/${PORTVERSION}
PKGNAMESUFFIX= -devel
MAINTAINER= EitanAdlerList@gmail.com
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 42777362ec1f..656cae668ab2 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -9,8 +9,7 @@ PORTNAME= allegro
DISTVERSION= 4.2.2
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= alleg
+MASTER_SITES= SF/alleg/${PORTNAME}/${PORTVERSION}
MAINTAINER= EitanAdlerList@gmail.com
COMMENT= A cross-platform library for games and multimedia programming
diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 72a53736278c..bf2852d3a4f0 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -9,7 +9,7 @@
PORTNAME= argtable
PORTVERSION= 2.11
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/./-/}
MAINTAINER= corky1951@comcast.net
diff --git a/devel/aros-sdk/Makefile b/devel/aros-sdk/Makefile
index 7bb08887a2b3..7eeec89f3e54 100644
--- a/devel/aros-sdk/Makefile
+++ b/devel/aros-sdk/Makefile
@@ -8,8 +8,7 @@
PORTNAME= aros-sdk
PORTVERSION= 0.20060207
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aros
+MASTER_SITES= SF/aros/OldFiles
DISTNAME= AROS-20060207-i386-all-sdk
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index ce55b4a4b69d..989e921b0f9a 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= astyle
PORTVERSION= 1.23
CATEGORIES= devel textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_linux
MAINTAINER= lme@FreeBSD.org
diff --git a/devel/atlas-devel/Makefile b/devel/atlas-devel/Makefile
index 335dfa84b3da..808dbdc9fa60 100644
--- a/devel/atlas-devel/Makefile
+++ b/devel/atlas-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Atlas
PORTVERSION= 0.6.1
PORTREVISION= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=worldforge
+MASTER_SITES= SF/worldforge/${PORTNAME}-C%2B%2B%20%28protocol%20lib%29/${PORTVERSION}
DISTNAME= ${PORTNAME}-C++-${PORTVERSION:S/.r/rc/}
MAINTAINER= oliver@FreeBSD.org
diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile
index 9c1880146158..2bb55f1517f5 100644
--- a/devel/atlas/Makefile
+++ b/devel/atlas/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Atlas
PORTVERSION= 0.5.2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=worldforge
+MASTER_SITES= SF/worldforge/OldFiles
DISTNAME= ${PORTNAME}-C++-${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 89db964e7bef..aea250f9ab5f 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -9,9 +9,9 @@
PORTNAME= autogen
PORTVERSION= 5.9.7
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/AutoGen/AutoGen%20${PORTVERSION} \
${MASTER_SITE_GNU:S/$/:gnu/}
-MASTER_SITE_SUBDIR= ${PORTNAME} ${PORTNAME}/rel${PORTVERSION}/:gnu
+
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT,gnu
MAINTAINER= clsung@FreeBSD.org
diff --git a/devel/avarice/Makefile b/devel/avarice/Makefile
index 4eeccf0b2f14..52cd049c0309 100644
--- a/devel/avarice/Makefile
+++ b/devel/avarice/Makefile
@@ -8,8 +8,7 @@
PORTNAME= avarice
PORTVERSION= 2.10
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= avarice
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
COMMENT= Atmel AVR JTAG programmer and debugging interface for avr-gdb
diff --git a/devel/avra/Makefile b/devel/avra/Makefile
index 40844469f83c..deb96e424b52 100644
--- a/devel/avra/Makefile
+++ b/devel/avra/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.0.1
PORTREVISION= 1
DISTVERSIONSUFFIX= -src
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= wes@FreeBSD.org
COMMENT= Macro Assembler for Atmel AVR microcontrollers
diff --git a/devel/beautifyphp/Makefile b/devel/beautifyphp/Makefile
index dff68bdc0645..67009f650d93 100644
--- a/devel/beautifyphp/Makefile
+++ b/devel/beautifyphp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= beautifyphp
PORTVERSION= 0.5.0
CATEGORIES= devel www pear
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= beautify_php_${PORTVERSION}
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/bicyclerepair/Makefile b/devel/bicyclerepair/Makefile
index 61a434b2736d..13975b7d66ef 100644
--- a/devel/bicyclerepair/Makefile
+++ b/devel/bicyclerepair/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bicyclerepair
PORTVERSION= 0.9
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
MAINTAINER= mwm@mired.org
diff --git a/devel/bisoncpp/Makefile b/devel/bisoncpp/Makefile
index f049d523a521..c0c65703976a 100644
--- a/devel/bisoncpp/Makefile
+++ b/devel/bisoncpp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bisoncpp
PORTVERSION= 2.4.5
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/bisonc%2B%2B/${PORTVERSION}
DISTNAME= bisonc++_${PORTVERSION}
EXTRACT_SUFX= .orig.tar.gz
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index 3f261f7ffa46..ba08da3c3935 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= boaconstructor
PORTVERSION= 0.4.4
PORTREVISION= 4
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= boa-constructor
+MASTER_SITES= SF/boa-constructor/Boa-Constructor/${PORTVERSION}-alpha
DISTNAME= boa-constructor-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/boost-all/sites.mk b/devel/boost-all/sites.mk
index 6a05072c69f7..7b1b02fe878d 100644
--- a/devel/boost-all/sites.mk
+++ b/devel/boost-all/sites.mk
@@ -1,5 +1,4 @@
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=boost
+MASTER_SITES= SF/boost/boost/${PORTVERSION}
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/devel/boost_build/Makefile b/devel/boost_build/Makefile
index b6c7470b2d25..a8e82de54f0e 100644
--- a/devel/boost_build/Makefile
+++ b/devel/boost_build/Makefile
@@ -7,8 +7,7 @@
PORTNAME= boost_build
PORTVERSION= 2.0.m12
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=boost
+MASTER_SITES= SF/boost/boost-build/2.0-m12
DISTNAME= ${PORTNAME:S/_/-/g}-${PORTVERSION:S/.m/-m/}
MAINTAINER= bms@FreeBSD.org
diff --git a/devel/bouml-doc/Makefile b/devel/bouml-doc/Makefile
index 46f071054bdc..83ce91346a8e 100644
--- a/devel/bouml-doc/Makefile
+++ b/devel/bouml-doc/Makefile
@@ -8,9 +8,9 @@
PORTNAME= bouml-doc
PORTVERSION= 4.12.4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/bouml/bouml%20documentation/reference%20manual%20${PORTVERSION} \
http://bouml.free.fr/
-MASTER_SITE_SUBDIR= bouml
+
DISTNAME= doc${PORTVERSION}
MAINTAINER= thierry@FreeBSD.org
diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile
index 6ccef529b60e..a1e00eab9a93 100644
--- a/devel/bouml/Makefile
+++ b/devel/bouml/Makefile
@@ -9,9 +9,9 @@ PORTNAME= bouml
PORTVERSION= 4.13.1
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://bouml.free.fr/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= thierry@FreeBSD.org
diff --git a/devel/buildtool-doc/Makefile b/devel/buildtool-doc/Makefile
index d9854a9a84fd..f2c3f42a3016 100644
--- a/devel/buildtool-doc/Makefile
+++ b/devel/buildtool-doc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= buildtool-doc
PORTVERSION= 0.16
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= buildtool
+MASTER_SITES= SF/buildtool/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Buildtool User's and Developer's manuals
diff --git a/devel/buildtool/Makefile b/devel/buildtool/Makefile
index c0cc4701fe85..5bcece8b5754 100644
--- a/devel/buildtool/Makefile
+++ b/devel/buildtool/Makefile
@@ -8,8 +8,7 @@
PORTNAME= buildtool
PORTVERSION= 0.16
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A set of portable software build utilities
diff --git a/devel/byaccj/Makefile b/devel/byaccj/Makefile
index 9c4b64295669..7bc76bd136dd 100644
--- a/devel/byaccj/Makefile
+++ b/devel/byaccj/Makefile
@@ -8,8 +8,7 @@
PORTNAME= byaccj
PORTVERSION= 1.14
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}${PORTVERSION}_src
MAINTAINER= pauls@utdallas.edu
diff --git a/devel/cccc/Makefile b/devel/cccc/Makefile
index 63be780906d4..c5c8a3b7c8cf 100644
--- a/devel/cccc/Makefile
+++ b/devel/cccc/Makefile
@@ -9,8 +9,7 @@
PORTNAME= cccc
PORTVERSION= 3.1.4
CATEGORIES= devel textproc www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cccc
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= C and C++ Code Counter
diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile
index dd53a1deb28d..d02ccc5e15a4 100644
--- a/devel/cedet/Makefile
+++ b/devel/cedet/Makefile
@@ -9,9 +9,9 @@ PORTNAME= cedet
PORTVERSION= 1.0.p4
PORTREVISION= 2
CATEGORIES= devel elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0pre4 \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= cedet
+
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= ${PORTNAME}-1.0pre4
diff --git a/devel/cflow2vcg/Makefile b/devel/cflow2vcg/Makefile
index 286fca494167..9bfdd8baafb0 100644
--- a/devel/cflow2vcg/Makefile
+++ b/devel/cflow2vcg/Makefile
@@ -10,8 +10,7 @@ PORTNAME= cflow2vcg
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert the result of the cflow utility in a VCG format
diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index 9157a5f1565f..ab89e533a46f 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cgdb
PORTVERSION= 0.6.4
CATEGORIES= devel
-MASTER_SITES= SOURCEFORGE
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
COMMENT= A curses-based interface to the GNU Debugger
diff --git a/devel/cil/Makefile b/devel/cil/Makefile
index 5987a106b1d6..3a8dc9336445 100644
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@@ -8,9 +8,10 @@
PORTNAME= cil
PORTVERSION= 1.3.7
CATEGORIES= devel lang
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://hal.cs.berkeley.edu/cil/distrib/
+
MAINTAINER= ports@FreeBSD.org
COMMENT= Infrastructure for C Program Analysis and Transformation
diff --git a/devel/colorer/Makefile b/devel/colorer/Makefile
index 895d183d4a2b..90185f40bc3b 100644
--- a/devel/colorer/Makefile
+++ b/devel/colorer/Makefile
@@ -10,8 +10,7 @@ PORTNAME= colorer
PORTVERSION= 0.b2
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Library%20sources/Colorer-take5.beta2
DISTNAME= Colorer-take5.beta2
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/crow/Makefile b/devel/crow/Makefile
index b0bd32c44e61..ebcd92f079e1 100644
--- a/devel/crow/Makefile
+++ b/devel/crow/Makefile
@@ -9,7 +9,7 @@ PORTNAME= crow
PORTVERSION= 2.15.0
PORTREVISION= 1
CATEGORIES= devel gnome
-MASTER_SITES= SF/crow-designer
+MASTER_SITES= SF/${PORTNAME}-designer/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A modern GUI builder for the GTK+ toolkit
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile
index e4e8b3c86c8e..64daf28dfa11 100644
--- a/devel/cssc/Makefile
+++ b/devel/cssc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cssc
PORTVERSION= 0.15a.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.15alpha.pl0
DISTNAME= CSSC-0.15alpha.pl0
MAINTAINER= olli@fromme.com
diff --git a/devel/cunit/Makefile b/devel/cunit/Makefile
index 67c1f4e64e5d..b117353438b8 100644
--- a/devel/cunit/Makefile
+++ b/devel/cunit/Makefile
@@ -8,8 +8,7 @@ PORTNAME= cunit
DISTVERSION= 2.1-0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/CUnit/2.1-0
DISTNAME= ${PORTNAME:S/^cu/CU/}-${DISTVERSION}-src
MAINTAINER= stefan@fh-mainz.de
diff --git a/devel/cvs-syncmail/Makefile b/devel/cvs-syncmail/Makefile
index 6264be8e16e1..693388a9c851 100644
--- a/devel/cvs-syncmail/Makefile
+++ b/devel/cvs-syncmail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cvs-syncmail
PORTVERSION= 2.1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= syncmail
EXTRACT_SUFX=
diff --git a/devel/cvschangelogbuilder/Makefile b/devel/cvschangelogbuilder/Makefile
index c2bf6df37212..b632ef4bca50 100644
--- a/devel/cvschangelogbuilder/Makefile
+++ b/devel/cvschangelogbuilder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cvschangelogbuilder
PORTVERSION= 2.4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cvschangelogb
+MASTER_SITES= SF/cvschangelogb/CVSChangelogBuilder/${PORTVERSION}
MAINTAINER= glarkin@FreeBSD.org
COMMENT= Utility to generate changelogs and reports from a CVS repository
diff --git a/devel/cvsdelta/Makefile b/devel/cvsdelta/Makefile
index 033bdaaff148..3f7fa9a75e84 100644
--- a/devel/cvsdelta/Makefile
+++ b/devel/cvsdelta/Makefile
@@ -10,8 +10,8 @@ PORTNAME= cvsdelta
PORTVERSION= 1.7.0
CATEGORIES= devel
MASTER_SITES= http://belnet.dl.sourceforge.net/sourceforge/cvsdelta/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF
+
MAINTAINER= mich@FreeBSD.org
COMMENT= Cvsdelta summarizes differences between local and in-cvs files
diff --git a/devel/cvslines/Makefile b/devel/cvslines/Makefile
index d3ab8f914156..b3c54a1b8941 100644
--- a/devel/cvslines/Makefile
+++ b/devel/cvslines/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cvslines
PORTVERSION= 1.6.9
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Wrapper to ease merging of changes between CVS branches
diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
index 4b2aa0e1da26..449ddad36fb6 100644
--- a/devel/cvsmonitor/Makefile
+++ b/devel/cvsmonitor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cvsmonitor
PORTVERSION= 0.6.3
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Stable
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}
MAINTAINER= skv@FreeBSD.org
diff --git a/devel/cvsplot/Makefile b/devel/cvsplot/Makefile
index 57976ec0518c..50fc4dbd1fb9 100644
--- a/devel/cvsplot/Makefile
+++ b/devel/cvsplot/Makefile
@@ -10,8 +10,7 @@ PORTNAME= cvsplot
PORTVERSION= 1.7.4
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= erik@smluc.org
COMMENT= A perl script which analyses the history of a CVS-managed project
diff --git a/devel/cx_Freeze/Makefile b/devel/cx_Freeze/Makefile
index 210f2ab882ae..cbaa42b12056 100644
--- a/devel/cx_Freeze/Makefile
+++ b/devel/cx_Freeze/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cx_Freeze
PORTVERSION= 4.0.1
CATEGORIES= devel python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= cx-freeze
+MASTER_SITES= SF/cx-freeze/${PORTNAME}/${PORTVERSION}
MAINTAINER= araujo@FreeBSD.org
COMMENT= The cx_Freeze is a set of utilities for freezing Python scripts
diff --git a/devel/cxxtest/Makefile b/devel/cxxtest/Makefile
index 01bcbd52aa96..dbd8b83f8e24 100644
--- a/devel/cxxtest/Makefile
+++ b/devel/cxxtest/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cxxtest
PORTVERSION= 3.10.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= drewish@katherinehouse.com
COMMENT= Simple and powerful JUnit/CppUnit/xUnit-like framework for C++
diff --git a/devel/datadesigner/Makefile b/devel/datadesigner/Makefile
index 13cc8e3e5f5b..54428a9e39ae 100644
--- a/devel/datadesigner/Makefile
+++ b/devel/datadesigner/Makefile
@@ -10,8 +10,7 @@ PORTNAME= datadesigner
PORTVERSION= 0.5
PORTREVISION= 7
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dbdesign
+MASTER_SITES= SF/dbdesign/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Database Schema Designer
diff --git a/devel/datadraw/Makefile b/devel/datadraw/Makefile
index aee66652525d..9a6d938ed7ae 100644
--- a/devel/datadraw/Makefile
+++ b/devel/datadraw/Makefile
@@ -9,7 +9,7 @@
PORTNAME= datadraw
PORTVERSION= 3.1.0
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ijliao@FreeBSD.org
diff --git a/devel/dia2code/Makefile b/devel/dia2code/Makefile
index 6b1e1973f0ac..a52ccf8512a7 100644
--- a/devel/dia2code/Makefile
+++ b/devel/dia2code/Makefile
@@ -9,8 +9,7 @@
PORTNAME= dia2code
PORTVERSION= 0.8.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A small utility used to generate code from a Dia diagram
diff --git a/devel/dklibs/Makefile b/devel/dklibs/Makefile
index 40acc6fc530d..de4ec1931a0b 100644
--- a/devel/dklibs/Makefile
+++ b/devel/dklibs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dklibs
PORTVERSION= 1.23.1
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= corky1951@comcast.net
COMMENT= A set of libraries by Dirk Krause
diff --git a/devel/dmucs/Makefile b/devel/dmucs/Makefile
index 17a44d264f86..06792dc906c7 100644
--- a/devel/dmucs/Makefile
+++ b/devel/dmucs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= dmucs
PORTVERSION= 0.6.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= fjoe@FreeBSD.org
COMMENT= Distributed Multi-User Compilation System (for use with distcc)
diff --git a/devel/doctorj/Makefile b/devel/doctorj/Makefile
index 3c9aed9d41c2..0efb5756b029 100644
--- a/devel/doctorj/Makefile
+++ b/devel/doctorj/Makefile
@@ -10,8 +10,7 @@ PORTNAME= doctorj
PORTVERSION= 5.1.2
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool for analyzing Java code and documentation
diff --git a/devel/dotconf++/Makefile b/devel/dotconf++/Makefile
index d00132affad5..f4fa15bf8f5d 100644
--- a/devel/dotconf++/Makefile
+++ b/devel/dotconf++/Makefile
@@ -8,9 +8,9 @@
PORTNAME= dotconfpp
PORTVERSION= 0.0.5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://voodoo.com.ua/dotconfpp/
-MASTER_SITE_SUBDIR= dotconfpp
+
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= mark_sf@kikg.ifmo.ru
diff --git a/devel/dparser/Makefile b/devel/dparser/Makefile
index c23541c36f47..94daae2e0c6f 100644
--- a/devel/dparser/Makefile
+++ b/devel/dparser/Makefile
@@ -9,7 +9,7 @@
PORTNAME= dparser
PORTVERSION= 1.19
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= d-${PORTVERSION}-src
MAINTAINER= gahr@FreeBSD.org
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index 1818633a259d..428e392ff196 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -8,7 +8,7 @@
PORTNAME= drpython
PORTVERSION= 3.11.0
CATEGORIES= devel python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/DrPython%20Current/${PORTVERSION}
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/duplo/Makefile b/devel/duplo/Makefile
index c0864703a81d..6ac91200fa4e 100644
--- a/devel/duplo/Makefile
+++ b/devel/duplo/Makefile
@@ -9,7 +9,7 @@
PORTNAME= duplo
PORTVERSION= 0.2.0
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
MAINTAINER= ijliao@FreeBSD.org
diff --git a/devel/e4graph/Makefile b/devel/e4graph/Makefile
index f461214a1d9a..a16316eefad0 100644
--- a/devel/e4graph/Makefile
+++ b/devel/e4graph/Makefile
@@ -10,7 +10,7 @@ PORTNAME= e4graph
PORTVERSION= 1.0a11
PORTREVISION= 3
CATEGORIES= devel tcl
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= dan@rucci.org
diff --git a/devel/ebnf2yacc/Makefile b/devel/ebnf2yacc/Makefile
index ef7fc51dd727..8fbfa9b9ba81 100644
--- a/devel/ebnf2yacc/Makefile
+++ b/devel/ebnf2yacc/Makefile
@@ -9,8 +9,7 @@
PORTNAME= ebnf2yacc
PORTVERSION= 0.1.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= EBNF to YACC
diff --git a/devel/eboxy/Makefile b/devel/eboxy/Makefile
index 9cd3ab7fca0f..91bb90aa1083 100644
--- a/devel/eboxy/Makefile
+++ b/devel/eboxy/Makefile
@@ -10,8 +10,7 @@ PORTNAME= eboxy
PORTVERSION= 0.4.1
PORTREVISION= 6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Create simple GUI interfaces for entertainment PC
diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile
index 7c82212505e9..40e58eda418c 100644
--- a/devel/ecb/Makefile
+++ b/devel/ecb/Makefile
@@ -9,9 +9,9 @@ PORTNAME= ecb
PORTVERSION= 2.32
PORTREVISION= 5
CATEGORIES= devel elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= ecb
+
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/eieio/Makefile b/devel/eieio/Makefile
index 38859ae12aad..7e0782061796 100644
--- a/devel/eieio/Makefile
+++ b/devel/eieio/Makefile
@@ -9,9 +9,9 @@ PORTNAME= eieio
PORTVERSION= 0.17
PORTREVISION= 3
CATEGORIES= devel elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/cedet/${PORTNAME}/${PORTVERSION} \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= cedet
+
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
#DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/beta/}
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index 01c69399a82f..de839ae85074 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -10,8 +10,7 @@ PORTNAME= elfio
PORTVERSION= 1.0.3
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/ELFIO-sources/ELFIO-${PORTVERSION}
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
diff --git a/devel/eric/Makefile b/devel/eric/Makefile
index 6782eac5b388..f546a4da7103 100644
--- a/devel/eric/Makefile
+++ b/devel/eric/Makefile
@@ -8,8 +8,7 @@
PORTNAME= eric
PORTVERSION= 3.9.5
CATEGORIES= devel python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= eric-ide
+MASTER_SITES= SF/${PORTNAME}-ide/${PORTNAME}3/${PORTVERSION}
MAINTAINER= leafy7382@gmail.com
COMMENT= A Python IDE implemented using PyQt and QScintilla
diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile
index 1d420efdd379..c5ee3ef4ff4b 100644
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= esdl
PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
DIST_SUBDIR= erlang
diff --git a/devel/esvn/Makefile b/devel/esvn/Makefile
index 563fe73a9a39..7b914084f919 100644
--- a/devel/esvn/Makefile
+++ b/devel/esvn/Makefile
@@ -9,8 +9,7 @@ PORTNAME= esvn
PORTVERSION= 0.6.12
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/eSvn/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= az@FreeBSD.org
diff --git a/devel/etl/Makefile b/devel/etl/Makefile
index df93c3ce3f20..341573223a6b 100644
--- a/devel/etl/Makefile
+++ b/devel/etl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= etl
PORTVERSION= 0.04.12
CATEGORIES= devel lang
-MASTER_SITES= SF/synfig
+MASTER_SITES= SF/synfig/ETL/${PORTVERSION}
DISTNAME= ETL-0.04.12
MAINTAINER= dhn@FreeBSD.org
diff --git a/devel/fampp/Makefile b/devel/fampp/Makefile
index b0985b9958ed..471ea5d7ff37 100644
--- a/devel/fampp/Makefile
+++ b/devel/fampp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= fampp
PORTVERSION= 1.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ wrapper for fam from SGI
diff --git a/devel/fga/Makefile b/devel/fga/Makefile
index f918fa6a9b26..df87bb1e81e7 100644
--- a/devel/fga/Makefile
+++ b/devel/fga/Makefile
@@ -9,8 +9,7 @@
PORTNAME= fga
PORTVERSION= 1.4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= stas@FreeBSD.org
COMMENT= Fast Genetic Algorithm library
diff --git a/devel/flexjson/Makefile b/devel/flexjson/Makefile
index b9050574474d..c8abf27ac32d 100644
--- a/devel/flexjson/Makefile
+++ b/devel/flexjson/Makefile
@@ -9,8 +9,7 @@ PORTNAME= flexjson
PORTVERSION= 1.6
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Flexjson%201.0
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/flowdesigner/Makefile b/devel/flowdesigner/Makefile
index c1f186078b9d..b8beb6816d36 100644
--- a/devel/flowdesigner/Makefile
+++ b/devel/flowdesigner/Makefile
@@ -10,7 +10,7 @@ PORTNAME= flowdesigner
PORTVERSION= 0.9.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/FlowDesigner/${PORTVERSION}
DISTNAME= FlowDesigner-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile
index 23323b9eab8e..7970a24baf55 100644
--- a/devel/fnccheck/Makefile
+++ b/devel/fnccheck/Makefile
@@ -8,8 +8,7 @@
PORTNAME= fnccheck
PORTVERSION= 1.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A profiling library/utilities for C/C++ programs
diff --git a/devel/fortytwo-encore/Makefile b/devel/fortytwo-encore/Makefile
index 27b349f34cfc..3b8a3cb934c1 100644
--- a/devel/fortytwo-encore/Makefile
+++ b/devel/fortytwo-encore/Makefile
@@ -9,8 +9,7 @@ PORTNAME= encore
PORTVERSION= 0.3.1
PORTREVISION= 1
CATEGORIES= devel gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fortytwo
+MASTER_SITES= SF/fortytwo/Encore/${PORTVERSION}
PKGNAMEPREFIX= fortytwo-
DISTFILES= Encore-${PORTVERSION}-src.tgz \
Encore-${PORTVERSION}-api-ref.tgz
diff --git a/devel/fsmgenerator/Makefile b/devel/fsmgenerator/Makefile
index bb00eeac53f3..5c64d3bcdfca 100644
--- a/devel/fsmgenerator/Makefile
+++ b/devel/fsmgenerator/Makefile
@@ -10,8 +10,7 @@ PORTNAME= fsmgenerator
PORTVERSION= 1.0.b.7
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-cpp/FSMGenerator%201.0b7
DISTNAME= FSMGenerator${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/ftjam/Makefile b/devel/ftjam/Makefile
index 31e3d842cc9f..8bee635d1a71 100644
--- a/devel/ftjam/Makefile
+++ b/devel/ftjam/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ftjam
PORTVERSION= 2.5.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= freetype
+MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Small build tool that can be used as a replacement for make(1)
diff --git a/devel/g2c/Makefile b/devel/g2c/Makefile
index 73e5587d7783..e964dbabe0d0 100644
--- a/devel/g2c/Makefile
+++ b/devel/g2c/Makefile
@@ -10,8 +10,7 @@ PORTNAME= g2c
PORTVERSION= 0.4
PORTREVISION= 4
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Glade to C translator
diff --git a/devel/gaa/Makefile b/devel/gaa/Makefile
index bb06171b30ff..2712dd63a9c2 100644
--- a/devel/gaa/Makefile
+++ b/devel/gaa/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gaa
PORTVERSION= 1.6.6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= demon@FreeBSD.org
COMMENT= GPL Argument Analyser
diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index ec3bfb53240d..793ba2203c05 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gaphor
PORTVERSION= 0.9.2
PORTREVISION= 4
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DIST_SUBDIR= gnome2
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index 8ffe4aed7f29..23a859200e87 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gaul
PORTVERSION= 0.1849.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/0.1849
DISTNAME= ${PORTNAME}-devel-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= pgollucci@FreeBSD.org
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 54656abe83c6..6017d43336bf 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.0
PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= devel tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cvsgui
+MASTER_SITES= SF/cvsgui/gCvs/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= High-end interface client for CVS
diff --git a/devel/gettext-lint/Makefile b/devel/gettext-lint/Makefile
index 33d636343900..6192c3f4a9fb 100644
--- a/devel/gettext-lint/Makefile
+++ b/devel/gettext-lint/Makefile
@@ -10,8 +10,7 @@ PORTNAME= gettext-lint
PORTVERSION= 0.4
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
MAINTAINER= ports@FreeBSD.org
COMMENT= Check the validity and consistency of PO and POT files
diff --git a/devel/gonzui/Makefile b/devel/gonzui/Makefile
index 4a3bd564dcaf..22380c3913f4 100644
--- a/devel/gonzui/Makefile
+++ b/devel/gonzui/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gonzui
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gonzui
+MASTER_SITES= SF
MAINTAINER= sumikawa@FreeBSD.org
COMMENT= A source code search engine
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index 54389530a5a3..2489037e2a8b 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gpsim
PORTVERSION= 0.22.0
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= acm@FreeBSD.org
COMMENT= A software simulator for Microchip PIC microcontrollers
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index d30a0d5ee690..a0e4da664e93 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gsoap
PORTVERSION= 2.7.13
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gsoap2
+MASTER_SITES= SF/${PORTNAME}2/gSOAP/${PORTVERSION}%20stable
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= sem@FreeBSD.org
diff --git a/devel/guiloader-c++/Makefile b/devel/guiloader-c++/Makefile
index 14bd578a0af8..462f3888f1fb 100644
--- a/devel/guiloader-c++/Makefile
+++ b/devel/guiloader-c++/Makefile
@@ -9,7 +9,7 @@ PORTNAME= guiloader-c++
PORTVERSION= 2.15.0
PORTREVISION= 1
CATEGORIES= devel gnome
-MASTER_SITES= SF/crow-designer
+MASTER_SITES= SF/crow-designer/guiloader-c%2B%2B/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ binding to the GuiLoader library
diff --git a/devel/guiloader/Makefile b/devel/guiloader/Makefile
index 5ac791106326..09983dc2d835 100644
--- a/devel/guiloader/Makefile
+++ b/devel/guiloader/Makefile
@@ -9,7 +9,7 @@ PORTNAME= guiloader
PORTVERSION= 2.15.0
PORTREVISION= 1
CATEGORIES= devel gnome
-MASTER_SITES= SF/crow-designer
+MASTER_SITES= SF/crow-designer/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A high-performance and compact GuiXml loader library
diff --git a/devel/happydoc/Makefile b/devel/happydoc/Makefile
index 26ceb21da7bb..f0c45adeb8a6 100644
--- a/devel/happydoc/Makefile
+++ b/devel/happydoc/Makefile
@@ -9,8 +9,7 @@
PORTNAME= happydoc
PORTVERSION= 3.0.a1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/HappyDoc/3.0
DISTNAME= HappyDoc_r${PORTVERSION:S/./_/g}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/hapy/Makefile b/devel/hapy/Makefile
index ab17b6dac7ba..74a87008226d 100644
--- a/devel/hapy/Makefile
+++ b/devel/hapy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= hapy
PORTVERSION= 0.0.8
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= Hapy-${PORTVERSION}
MAINTAINER= rousskov@measurement-factory.com
diff --git a/devel/hp48xgcc/Makefile b/devel/hp48xgcc/Makefile
index a287c0f86cc9..985373b42dfa 100644
--- a/devel/hp48xgcc/Makefile
+++ b/devel/hp48xgcc/Makefile
@@ -9,9 +9,8 @@ PORTNAME= hp48xgcc
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:hp/} \
+MASTER_SITES= SF/${PORTNAME}/source/${PORTVERSION}:hp \
ftp://ftp.gnu.org/old-gnu/gcc/:gcc
-MASTER_SITE_SUBDIR= ${PORTNAME}/:hp
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:hp \
gcc-${GCC_VER}.tar.gz:gcc
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 434a972f0416..0175b3900a6d 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -9,7 +9,7 @@ PORTNAME= icu
PORTVERSION= 3.8.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ICU4C/${PORTVERSION}
DISTNAME= icu4c-${PORTVERSION:S/./_/g}
EXTRACT_SUFX= -src.tgz
diff --git a/devel/icu4/Makefile b/devel/icu4/Makefile
index 434a972f0416..0175b3900a6d 100644
--- a/devel/icu4/Makefile
+++ b/devel/icu4/Makefile
@@ -9,7 +9,7 @@ PORTNAME= icu
PORTVERSION= 3.8.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ICU4C/${PORTVERSION}
DISTNAME= icu4c-${PORTVERSION:S/./_/g}
EXTRACT_SUFX= -src.tgz
diff --git a/devel/inilib/Makefile b/devel/inilib/Makefile
index d6c054247ce5..aa2a752e55ec 100644
--- a/devel/inilib/Makefile
+++ b/devel/inilib/Makefile
@@ -9,8 +9,7 @@
PORTNAME= inilib
PORTVERSION= 1.0.7b3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0.7
MAINTAINER= araujo@FreeBSD.org
COMMENT= A C++ lib which provides a method of saving the "state" of a program
diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index d46c2fbcc162..e65dcf857739 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ireport
PORTVERSION= 3.0.0
PORTREVISION= 2
CATEGORIES= devel databases java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/iReport%20%28classic%29/iReport-${PORTVERSION}
DISTNAME= iReport-${PORTVERSION}
MAINTAINER= thierry@FreeBSD.org
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index 63ce32312250..7dc72abe8018 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -10,8 +10,7 @@ PORTNAME= ixlib
PORTVERSION= 0.96.2
PORTREVISION= 5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A small C++ tools library based on STL
diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile
index 213655586512..cac2b94eda14 100644
--- a/devel/jclassinfo/Makefile
+++ b/devel/jclassinfo/Makefile
@@ -9,8 +9,7 @@
PORTNAME= jclassinfo
PORTVERSION= 0.19.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Shows information about Java class, dependencies and more
diff --git a/devel/jcmdline/Makefile b/devel/jcmdline/Makefile
index 90bb22b3d5bb..366a95cbafc7 100644
--- a/devel/jcmdline/Makefile
+++ b/devel/jcmdline/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jcmdline
PORTVERSION= 1.0.3
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= thierry@FreeBSD.org
COMMENT= A Java command line processor
diff --git a/devel/jep/Makefile b/devel/jep/Makefile
index 8aa3d883b9fc..468bf40cc0b1 100644
--- a/devel/jep/Makefile
+++ b/devel/jep/Makefile
@@ -9,7 +9,7 @@ PORTNAME= jep
PORTVERSION= 2.3
PORTREVISION= 1
CATEGORIES= devel java python
-MASTER_SITES= SF/jepp
+MASTER_SITES= SF/${PORTNAME}p/${PORTNAME}/${PORTVERSION}
MAINTAINER= lippe@FreeBSD.org
COMMENT= Java Embedded Python
diff --git a/devel/jline/Makefile b/devel/jline/Makefile
index 88641c6ebd3d..c4b958cc6965 100644
--- a/devel/jline/Makefile
+++ b/devel/jline/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jline
PORTVERSION= 0.9.91
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mkamm@gmx.net
COMMENT= JLine is a Java library for handling console input
diff --git a/devel/jsap/Makefile b/devel/jsap/Makefile
index 6b8f11112263..4c94862924ad 100644
--- a/devel/jsap/Makefile
+++ b/devel/jsap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jsap
DISTVERSION= 2.1
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME:U}-${DISTVERSION}
MAINTAINER= hq@FreeBSD.org
diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile
index b3aa69780c6d..391ba84a3a3a 100644
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@@ -10,8 +10,7 @@ PORTNAME= jtag
PORTVERSION= 0.5.1
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=openwince
+MASTER_SITES= SF/openwince/${PORTNAME}/${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Utility to work with JTAG-aware boards
diff --git a/devel/judy/Makefile b/devel/judy/Makefile
index a87e0d489de3..002ad17daebf 100644
--- a/devel/judy/Makefile
+++ b/devel/judy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Judy
PORTVERSION= 1.0.5
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= judy
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}
MAINTAINER= skv@FreeBSD.org
COMMENT= General purpose dynamic array
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index 92870700ea26..15b91906f10e 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kcachegrind
PORTVERSION= 0.4.6
PORTREVISION= 1
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kcachegrind
+MASTER_SITES= SF/${PORTNAME}/KCachegrind/KCachegrind%20${PORTVERSION}
MAINTAINER= beat@FreeBSD.org
COMMENT= Profiling Visualization Tool
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 780fe897de57..6fad40a49b28 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kdbg
PORTVERSION= 2.1.1
PORTREVISION= 1
CATEGORIES= devel kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Source%20Code/${PORTVERSION}
MAINTAINER= thomas.sander@gmx.de
COMMENT= A graphical user interface around gdb using KDE
diff --git a/devel/kodos/Makefile b/devel/kodos/Makefile
index 1a55f456a15f..5a078cbec4b0 100644
--- a/devel/kodos/Makefile
+++ b/devel/kodos/Makefile
@@ -11,9 +11,9 @@ PORTNAME= kodos
PORTVERSION= 2.4.9
PORTREVISION= 2
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= dryice@dryice.name
COMMENT= The Python Regular Expression Debugger
diff --git a/devel/kprof/Makefile b/devel/kprof/Makefile
index 79e98a6cf5b9..ff0c69843049 100644
--- a/devel/kprof/Makefile
+++ b/devel/kprof/Makefile
@@ -10,8 +10,7 @@ PORTNAME= kprof
PORTVERSION= 1.3.1
PORTREVISION= 9
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= pmarquis@pobox.com
COMMENT= A profiling tool for KDE
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index 442ced87884b..b556bf048ee5 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kscope
PORTVERSION= 1.6.1
PORTREVISION= 3
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}/
+MASTER_SITES= SF
MAINTAINER= frank@exit.com
COMMENT= KDE front-end to Cscope
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 09c61eb11f07..c39380bcd81f 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kyra
PORTVERSION= 2.0.7
PORTREVISION= 7
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index 4b73a11bbb44..e3ce6a2006b5 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -9,7 +9,7 @@ PORTNAME= lasi
PORTVERSION= 1.1.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
DISTNAME= libLASi-${PORTVERSION}
MAINTAINER= lme@FreeBSD.org
diff --git a/devel/lbpp/Makefile b/devel/lbpp/Makefile
index d9bcc4a8a325..48d4196efe01 100644
--- a/devel/lbpp/Makefile
+++ b/devel/lbpp/Makefile
@@ -10,8 +10,7 @@ PORTNAME= lbpp
PORTVERSION= 0.0.6b
PORTREVISION= 5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A front end to GCC from Liberty Basic source code
diff --git a/devel/libYGP/Makefile b/devel/libYGP/Makefile
index 27702d2a40f3..9fd1eb23243f 100644
--- a/devel/libYGP/Makefile
+++ b/devel/libYGP/Makefile
@@ -8,7 +8,7 @@
PORTNAME?= libYGP
PORTVERSION= 0.9.12
CATEGORIES= devel
-MASTER_SITES= SF/libymp
+MASTER_SITES= SF/libymp/libymp/libYGP-${PORTVERSION}
DISTNAME= libYGP-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/libafterbase/Makefile b/devel/libafterbase/Makefile
index dac566c688c3..04b80b188f08 100644
--- a/devel/libafterbase/Makefile
+++ b/devel/libafterbase/Makefile
@@ -10,7 +10,7 @@ PORTNAME= libafterbase
PORTVERSION= 0.92
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= SF/afterstep
+MASTER_SITES= SF/afterstep/libAfterBase/${PORTVERSION}
DISTNAME= libAfterBase-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile
index 3e5e89bfc519..2c34da800529 100644
--- a/devel/libassa/Makefile
+++ b/devel/libassa/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libassa
PORTVERSION= 3.4.2.2
PORTREVISION= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3.4.2
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.([[:digit:]])$/-\1/}
MAINTAINER= stas@FreeBSD.org
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index a3d1a22805ce..0708c8ae6a37 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libassetml
PORTVERSION= 1.2.1
PORTREVISION= 9
CATEGORIES= devel gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ofset
+MASTER_SITES= SF/ofset/${PORTNAME}/${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Devel Library to share image and audio files between projects
diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile
index baeab1e38481..c6c7785e87d3 100644
--- a/devel/libbobcat/Makefile
+++ b/devel/libbobcat/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libbobcat
PORTVERSION= 2.02.02
CATEGORIES= devel
-MASTER_SITES= SF/bobcat
+MASTER_SITES= SF/bobcat/bobcat/${PORTVERSION}
DISTNAME= bobcat_${PORTVERSION}
EXTRACT_SUFX= .orig.tar.gz
diff --git a/devel/libcheck/Makefile b/devel/libcheck/Makefile
index 44e9ce34d2f3..cd1d42826c72 100644
--- a/devel/libcheck/Makefile
+++ b/devel/libcheck/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libcheck
PORTVERSION= 0.9.6
CATEGORIES= devel
-MASTER_SITES= SF/check
+MASTER_SITES= SF/check/check/${PORTVERSION}
DISTNAME= check-${PORTVERSION}
MAINTAINER= sunpoet@sunpoet.net
diff --git a/devel/libchipcard-kde/Makefile b/devel/libchipcard-kde/Makefile
index 528d764c9f4b..1ac6e9c84dbd 100644
--- a/devel/libchipcard-kde/Makefile
+++ b/devel/libchipcard-kde/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libchipcard-kde
PORTVERSION= 0.9
PORTREVISION= 4
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libchipcard
+MASTER_SITES= SF/libchipcard/libchipcard/${PORTVERSION}
MAINTAINER= martin@libchipcard.de
COMMENT= KDE tools for LibChipCard
diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile
index 8002ad9d86b8..018e992ddab0 100644
--- a/devel/libchipcard/Makefile
+++ b/devel/libchipcard/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libchipcard
PORTVERSION= 0.9.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libchipcard
+MASTER_SITES= SF
MAINTAINER= martin@libchipcard.de
COMMENT= A library for easy access to chipcards
diff --git a/devel/libdisasm/Makefile b/devel/libdisasm/Makefile
index 2d0e79dbab8d..f4f73899ed78 100644
--- a/devel/libdisasm/Makefile
+++ b/devel/libdisasm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libdisasm
PORTVERSION= 0.23
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bastard
+MASTER_SITES= SF/bastard/${PORTNAME}/${PORTVERSION}
MAINTAINER= bf1783@gmail.com
COMMENT= The Bastard Disassembly Environment x86 disassembler library and CLI
diff --git a/devel/libds/Makefile b/devel/libds/Makefile
index 438a4e810b1e..8e6dee9a3d34 100644
--- a/devel/libds/Makefile
+++ b/devel/libds/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libds
PORTVERSION= 1.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libds
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-2.1
DISTNAME= libds-2.1
MAINTAINER= kingofgib@users.sourceforge.net
diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index cec92bd8f5f9..c4d0fe87f10d 100644
--- a/devel/libdsp/Makefile
+++ b/devel/libdsp/Makefile
@@ -8,8 +8,9 @@
PORTNAME= libdsp
PORTVERSION= 5.0.2
CATEGORIES= devel audio
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable-src/${PORTVERSION} \
http://mirror.mcx2.org/
+
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile
index 68d3daaa3e81..90a817774a36 100644
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 1.0.2
PORTREVISION= 2
CATEGORIES= 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/devel/libgiigic/Makefile b/devel/libgiigic/Makefile
index 1feb57ba3f7f..bf0eceab67a2 100644
--- a/devel/libgiigic/Makefile
+++ b/devel/libgiigic/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ggi
+ SF/ggi/ggi-libs/${PORTNAME}-${PORTVERSION}
+
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= antoine.brodin@laposte.net
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 7c394a344af5..e473523b94aa 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libglademm
PORTVERSION= 2.1.3
PORTREVISION= 7
CATEGORIES= devel gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gtkmm
+MASTER_SITES= SF/gtkmm/OldFiles
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile
index 3f1c785a575a..e7ca65de17f9 100644
--- a/devel/libgutenfetch/Makefile
+++ b/devel/libgutenfetch/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libgutenfetch
PORTVERSION= 1.2
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libgutenfetch
+MASTER_SITES= SF
MAINTAINER= johntabularasa@users.sf.net
COMMENT= A library that allows application developers to connect to PG
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index e993d8d57927..cc07631d6103 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libical
PORTVERSION= 0.43
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= freeassociation
+MASTER_SITES= SF/freeassociation/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@freebsd.org
COMMENT= An implementation of the IETF's Calendaring and Scheduling protocols
diff --git a/devel/libmaa/Makefile b/devel/libmaa/Makefile
index 07da469dc612..d5e0cae7f04c 100644
--- a/devel/libmaa/Makefile
+++ b/devel/libmaa/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libmaa
PORTVERSION= 1.1.1
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= dict
+MASTER_SITES= SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= Provides a few data structures and helpful functions
diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index 7b48168d5855..ffaea726eee5 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libmimedir
PORTVERSION= 0.5.1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for parsing RFC2425 MIME Directory Profile information
diff --git a/devel/libmpcbdm/Makefile b/devel/libmpcbdm/Makefile
index fce840ea52d8..e85abb900e16 100644
--- a/devel/libmpcbdm/Makefile
+++ b/devel/libmpcbdm/Makefile
@@ -8,9 +8,9 @@
PORTNAME= libmpcbdm
PORTVERSION= 0.0.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/libmpc8xx/libmpc8xx/${PORTVERSION} \
http://mbsd.msk.ru/dist/
-MASTER_SITE_SUBDIR= libmpc8xx
+
DISTNAME= mpc8xx-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
diff --git a/devel/libmsocket/Makefile b/devel/libmsocket/Makefile
index e1a9b2c25a8a..ba8ab4ce8f52 100644
--- a/devel/libmsocket/Makefile
+++ b/devel/libmsocket/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libmsocket
PORTVERSION= 0.4
CATEGORIES= devel net
-MASTER_SITES= SF/kageki
+MASTER_SITES= SF/kageki/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A socket abstraction library for C programmers
diff --git a/devel/libpeak/Makefile b/devel/libpeak/Makefile
index 40832acc7f92..754fa5e295a3 100644
--- a/devel/libpeak/Makefile
+++ b/devel/libpeak/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libpeak
PORTVERSION= 0.1.2
PORTREVISION= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= peak
+MASTER_SITES= SF/peak/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Parallel Events and Asynchronous tasKing Library
diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 593d12c1ab16..0c34a127e942 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= librcc
PORTVERSION= 0.2.6
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rusxmms
+MASTER_SITES= SF/rusxmms/Charset%20Conversion%20Library/${PORTVERSION}
MAINTAINER= uspoerlein@gmail.com
COMMENT= Library used by rusxmms for language autodetection
diff --git a/devel/librcd/Makefile b/devel/librcd/Makefile
index f2f43268c35e..118ed63e0223 100644
--- a/devel/librcd/Makefile
+++ b/devel/librcd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= librcd
PORTVERSION= 0.1.11
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rusxmms
+MASTER_SITES= SF/rusxmms/Charset%20Detection%20Library/${PORTVERSION}
MAINTAINER= uspoerlein@gmail.com
COMMENT= Library used by rusxmms for autodetection of russian charset
diff --git a/devel/libreadline-java/Makefile b/devel/libreadline-java/Makefile
index 655f4d9a08fe..0b253b4aa33e 100644
--- a/devel/libreadline-java/Makefile
+++ b/devel/libreadline-java/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.8.0
DISTVERSIONSUFFIX= -src
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= java-readline
+MASTER_SITES= SF/java-readline/java-readline/${PORTVERSION}
MAINTAINER= mkamm@gmx.net
COMMENT= JNI wrapper around GNU Readline / libedit / libgetline
diff --git a/devel/libredblack/Makefile b/devel/libredblack/Makefile
index bb626ccee9ea..f5427e4f82f3 100644
--- a/devel/libredblack/Makefile
+++ b/devel/libredblack/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libredblack
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Library that provides the red-black balanced tree algorithm
diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile
index 71daa8997df2..5c2b42f76a5f 100644
--- a/devel/libshbuf/Makefile
+++ b/devel/libshbuf/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libshbuf
PORTVERSION= 0.0.2
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for Shared Buffer IPC
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 4037059b6021..6fdc992bc55d 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -10,9 +10,8 @@ PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S/$/:gnome/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0/:gnome \
- libsigc/:sf
+ SFP/libsigc/OldFiles:sf
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0/:gnome
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf,gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index 0d1bd33d80b1..a09268c78fde 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -9,11 +9,8 @@ PORTNAME= libsigc++
PORTVERSION= 1.2.7
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S/$/:gnome/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2/:gnome \
- libsigc/:sf
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf,gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libstrfunc/Makefile b/devel/libstrfunc/Makefile
index c3e54c109b8b..45242cb1c0c9 100644
--- a/devel/libstrfunc/Makefile
+++ b/devel/libstrfunc/Makefile
@@ -8,9 +8,9 @@
PORTNAME= libstrfunc
PORTVERSION= 8.3
CATEGORIES= devel www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://lionet.info/soft/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= vlm@lionet.info
COMMENT= Handles CGI forms, MIME, templates, date conversions, etc
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index 9d0289434941..f14eb563e85c 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libticalcs
PORTVERSION= 4.6.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tilp
+MASTER_SITES= SF/tilp/OldFiles
MAINTAINER= tijl@ulyssis.org
COMMENT= TI calculator library
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index c92b27728b39..57bdb995943f 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libtifiles
PORTVERSION= 0.6.5
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tilp
+MASTER_SITES= SF/tilp/OldFiles
MAINTAINER= tijl@ulyssis.org
COMMENT= TI calculator file types library
diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile
index 8526d43bd93b..58fbc2963ab1 100644
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libtifiles2
PORTVERSION= 1.1.1
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tilp
+MASTER_SITES= SF/tilp/tilp2-linux/tilp2-1.11
DISTNAME= tilibs2-20080328
MAINTAINER= tijl@ulyssis.org
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index b458d2e55256..de25bc65a461 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libusb
PORTVERSION= 0.1.12
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-0.1%20%28LEGACY%29/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library giving userland programs access to USB devices
diff --git a/devel/libvc/Makefile b/devel/libvc/Makefile
index 444dd84ee7fb..f6999a5eac89 100644
--- a/devel/libvc/Makefile
+++ b/devel/libvc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libvc
PORTVERSION= 003
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rolo
+MASTER_SITES= SF/rolo/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A vCard library
diff --git a/devel/libytnef/Makefile b/devel/libytnef/Makefile
index 0a39e5c1d459..1c48064f2963 100644
--- a/devel/libytnef/Makefile
+++ b/devel/libytnef/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libytnef
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= devel mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ytnef
+MASTER_SITES= SF/ytnef/${PORTNAME}/${PORTVERSION}
MAINTAINER= delphus@gmail.com
COMMENT= Unpack data in MS Outlook TNEF format
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index c96fd1358abd..06a4ece70cd8 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libzvbi
PORTVERSION= 0.2.33
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= zapping
+MASTER_SITES= SF/zapping/zvbi/${PORTVERSION}
DISTNAME= ${PORTNAME:S/lib//}-${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index 9a8e220d1f52..1b8ab00aeb58 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -9,7 +9,7 @@
PORTNAME= log4cpp
DISTVERSION= 1.0
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}.x%20%28current%29/${PORTNAME}-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
COMMENT= A library of C++ classes for flexible logging
diff --git a/devel/log4sh/Makefile b/devel/log4sh/Makefile
index 6e2036abb35c..42e97c6c60b6 100644
--- a/devel/log4sh/Makefile
+++ b/devel/log4sh/Makefile
@@ -8,8 +8,7 @@
PORTNAME= log4sh
PORTVERSION= 1.4.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%201.4.X%20%28stable%29/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= lx@FreeBSD.org
diff --git a/devel/lrmi/Makefile b/devel/lrmi/Makefile
index b90b0da38beb..ebcfab37244b 100644
--- a/devel/lrmi/Makefile
+++ b/devel/lrmi/Makefile
@@ -8,8 +8,7 @@
PORTNAME= lrmi
PORTVERSION= 0.10
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lrmi
+MASTER_SITES= SF
MAINTAINER= amistry@am-productions.biz
COMMENT= LRMI is a library for calling real mode BIOS routines
diff --git a/devel/luabind/Makefile b/devel/luabind/Makefile
index 1294e457a70e..0ab4e467c8fc 100644
--- a/devel/luabind/Makefile
+++ b/devel/luabind/Makefile
@@ -8,7 +8,7 @@
PORTNAME= luabind
PORTVERSION= 0.7
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Library that helps you create bindings between C++ and Lua
diff --git a/devel/lxr/Makefile b/devel/lxr/Makefile
index 06b3912fcb2f..63e6608b2a67 100644
--- a/devel/lxr/Makefile
+++ b/devel/lxr/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lxr
PORTVERSION= 0.9.6
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/development/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= rea-fbsd@codelabs.ru
diff --git a/devel/make++/Makefile b/devel/make++/Makefile
index da67887c723d..6b2f3b3bdbb6 100644
--- a/devel/make++/Makefile
+++ b/devel/make++/Makefile
@@ -9,8 +9,7 @@
PORTNAME= make++
PORTVERSION= 1.19
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/+/p/g}
+MASTER_SITES= SF/makepp/makepp/${PORTVERSION}
DISTNAME= ${PORTNAME:S/+/p/g}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/mcpp/Makefile b/devel/mcpp/Makefile
index 2d46436310c6..ea25fb3ed1a0 100644
--- a/devel/mcpp/Makefile
+++ b/devel/mcpp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mcpp
PORTVERSION= 2.7.2
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V.${PORTVERSION}
MAINTAINER= kmatsui@t3.rim.or.jp
COMMENT= Alternative C/C++ preprocessor
diff --git a/devel/mercator/Makefile b/devel/mercator/Makefile
index 93b0a0ebf646..50f55f32036b 100644
--- a/devel/mercator/Makefile
+++ b/devel/mercator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mercator
PORTVERSION= 0.2.7
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= worldforge
+MASTER_SITES= SF/worldforge/Mercator%20%28terrain%20lib%29/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A procedural terrain library
diff --git a/devel/mingw32-bin-msvcrt/Makefile b/devel/mingw32-bin-msvcrt/Makefile
index 85bae9e4bbc2..14846b3df1bc 100644
--- a/devel/mingw32-bin-msvcrt/Makefile
+++ b/devel/mingw32-bin-msvcrt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bin-msvcrt
PORTVERSION= r${RUNTIMEVERSION}.a${APIVERSION}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mingw
+MASTER_SITES= SF/mingw/MinGW%20Runtime/Current%20Release_%20mingwrt-3.15.2
PKGNAMEPREFIX= mingw32-
DISTFILES= mingwrt-${RUNTIMEVERSION}-mingw32-dev${EXTRACT_SUFX} \
mingwrt-${RUNTIMEVERSION}-mingw32-dll${EXTRACT_SUFX} \
diff --git a/devel/nant/Makefile b/devel/nant/Makefile
index 89f03b20501c..7c5985954064 100644
--- a/devel/nant/Makefile
+++ b/devel/nant/Makefile
@@ -10,8 +10,7 @@ PORTNAME= nant
DISTVERSION= 0.85
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-0.85-src
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/naturaldocs/Makefile b/devel/naturaldocs/Makefile
index ffaf6826f6b6..ce9461054f9c 100644
--- a/devel/naturaldocs/Makefile
+++ b/devel/naturaldocs/Makefile
@@ -10,7 +10,7 @@ PORTNAME= naturaldocs
PORTVERSION= 1.4
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Stable%20Releases/${PORTVERSION}
DISTNAME= NaturalDocs-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile
index 0bacca44bc67..7c0994baf57b 100644
--- a/devel/ncnf/Makefile
+++ b/devel/ncnf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ncnf
PORTVERSION= 3.0.1
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= skv@FreeBSD.org
COMMENT= Generic configuration management library
diff --git a/devel/newfile/Makefile b/devel/newfile/Makefile
index 448bdf22b5cf..ca840a4a1990 100644
--- a/devel/newfile/Makefile
+++ b/devel/newfile/Makefile
@@ -9,8 +9,7 @@ PORTNAME= newfile
PORTVERSION= 1.0.14
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= sergei@FreeBSD.org
COMMENT= A tool for creating starter files in various languages
diff --git a/devel/objectivelib/Makefile b/devel/objectivelib/Makefile
index df28e88a9133..7841077a11d3 100644
--- a/devel/objectivelib/Makefile
+++ b/devel/objectivelib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= objectivelib
PORTVERSION= 1.0.0
CATEGORIES= devel gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Object containers and generic algorithms for Objective-C
diff --git a/devel/ocaml-camomile-examples/Makefile b/devel/ocaml-camomile-examples/Makefile
index c74de8c3639d..d34f35a5de87 100644
--- a/devel/ocaml-camomile-examples/Makefile
+++ b/devel/ocaml-camomile-examples/Makefile
@@ -9,8 +9,7 @@
PORTNAME= camomile
PORTVERSION= 0.4.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMEPREFIX= ocaml-
PKGNAMESUFFIX= -examples
DISTNAME= examples-${PORTVERSION}
diff --git a/devel/ocaml-camomile/Makefile b/devel/ocaml-camomile/Makefile
index c534807415fd..c6e544a8ebcd 100644
--- a/devel/ocaml-camomile/Makefile
+++ b/devel/ocaml-camomile/Makefile
@@ -10,8 +10,7 @@ PORTNAME= camomile
PORTVERSION= 0.7.2
PORTREVISION= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ocaml-
MAINTAINER= stas@FreeBSD.org
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index ae8bf533ccc0..679b4b9f5987 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -10,8 +10,7 @@ PORTNAME= sdl
PORTVERSION= 0.7.2
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ocamlsdl
+MASTER_SITES= SF/ocaml${PORTNAME}/OCamlSDL/ocaml${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ocaml-
DISTNAME= ocamlsdl-${PORTVERSION}
diff --git a/devel/ocaml-sem/Makefile b/devel/ocaml-sem/Makefile
index ada02044e4f2..5af256684d3e 100644
--- a/devel/ocaml-sem/Makefile
+++ b/devel/ocaml-sem/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 0.0.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://ocaml-sem.sourceforge.net/files/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
+ SF/ocaml-${PORTNAME}/${PORTNAME}/${PORTVERSION}
+
PKGNAMEPREFIX= ocaml-
MAINTAINER= argentoff@gmail.com
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index 58344cbcd4d2..8a85a12ec438 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ode
PORTVERSION= 0.11
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= opende
+MASTER_SITES= SF/opende/ODE/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
diff --git a/devel/ois/Makefile b/devel/ois/Makefile
index f69d5ed7f1ce..13f5b7508b67 100644
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ois
PORTVERSION= 1.2.0
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= SF/whois
+MASTER_SITES= SF/wgois/Source%20Release/1.2
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile
index fc0bc24cf3a8..831a5fc28c5c 100644
--- a/devel/omniNotify/Makefile
+++ b/devel/omniNotify/Makefile
@@ -8,8 +8,7 @@
PORTNAME= omniNotify
PORTVERSION= 2.1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= sem@FreeBSD.org
COMMENT= CORBA Notification Service (CosNotification) for omniORB
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 1457f3549298..3ef30925f175 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= omniORB
PORTVERSION= 4.1.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= sem@FreeBSD.org
COMMENT= A robust high performance CORBA ORB for C++ and Python
diff --git a/devel/open-beagle/Makefile b/devel/open-beagle/Makefile
index b74a75a96b53..55a0769e0d55 100644
--- a/devel/open-beagle/Makefile
+++ b/devel/open-beagle/Makefile
@@ -9,7 +9,7 @@
PORTNAME= open-beagle
PORTVERSION= 3.0.3
CATEGORIES= devel
-MASTER_SITES= SF/beagle
+MASTER_SITES= SF/beagle/beagle/${PORTVERSION}
DISTNAME= beagle-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/openwince-include/Makefile b/devel/openwince-include/Makefile
index cc3c6009a292..8a7e1de8305c 100644
--- a/devel/openwince-include/Makefile
+++ b/devel/openwince-include/Makefile
@@ -9,8 +9,7 @@
PORTNAME= include
PORTVERSION= 0.4.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=openwince
+MASTER_SITES= SF/openwince/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= openwince-
MAINTAINER= stas@FreeBSD.org
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index 618f40fee90f..1854912b9339 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -10,8 +10,7 @@ PORTNAME= openzz
PORTVERSION= 1.0.4.4
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0.4-4
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p4.el/Makefile b/devel/p4.el/Makefile
index ab2ef0f303ac..6f95ffe24176 100644
--- a/devel/p4.el/Makefile
+++ b/devel/p4.el/Makefile
@@ -8,8 +8,7 @@
PORTNAME= p4.el
PORTVERSION= 10.6
CATEGORIES= devel elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= p4el
+MASTER_SITES= SF/p4el/p4el/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/p4delta/Makefile b/devel/p4delta/Makefile
index 394e3f876f56..c06d27e11b54 100644
--- a/devel/p4delta/Makefile
+++ b/devel/p4delta/Makefile
@@ -9,8 +9,7 @@
PORTNAME= p4delta
PORTVERSION= 1.3.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mich@FreeBSD.org
COMMENT= Summarizes and manages differences between local files and Perforce
diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index 29385134b21a..24c06fff82b5 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -9,7 +9,7 @@
PORTNAME= Config-Model
PORTVERSION= 0.638
CATEGORIES= devel perl5
-MASTER_SITES= CPAN SF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile
index 302575dfedb5..3d3d343d1042 100644
--- a/devel/p5-Glib2/Makefile
+++ b/devel/p5-Glib2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Glib2
PORTVERSION= 1.222
CATEGORIES= devel perl5
-MASTER_SITES= CPAN/Glib SF/gtk2-perl
+MASTER_SITES= CPAN/Glib SF/gtk2-perl/Glib/${PORTVERSION}
PKGNAMEPREFIX= p5-
DISTNAME= Glib-${PORTVERSION}
diff --git a/devel/p5-Gtk2-Spell/Makefile b/devel/p5-Gtk2-Spell/Makefile
index 68717e2dee35..47d3c8eab4cd 100644
--- a/devel/p5-Gtk2-Spell/Makefile
+++ b/devel/p5-Gtk2-Spell/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Gtk2-Spell
PORTVERSION= 1.03
PORTREVISION= 3
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtk2-perl
+MASTER_SITES= SF/gtk2-perl/Gtk2_Spell/${PORTVERSION}
PKGNAMEPREFIX= p5-
MAINTAINER= acm@FreeBSD.org
diff --git a/devel/p5-doxygenfilter/Makefile b/devel/p5-doxygenfilter/Makefile
index 21140106fcd2..c7b7f4a91dda 100644
--- a/devel/p5-doxygenfilter/Makefile
+++ b/devel/p5-doxygenfilter/Makefile
@@ -8,7 +8,7 @@
PORTNAME= doxygenfilter
PORTVERSION= 1.01
CATEGORIES= devel
-MASTER_SITES= SF/bigsister
+MASTER_SITES= SF/bigsister/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
MAINTAINER= svvord@spline-studio.ru
diff --git a/devel/paexec/Makefile b/devel/paexec/Makefile
index 1d4720968783..4da5c9ca2ffc 100644
--- a/devel/paexec/Makefile
+++ b/devel/paexec/Makefile
@@ -8,7 +8,7 @@
PORTNAME= paexec
PORTVERSION= 0.13.0
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= Parallel executor, distributes tasks over network
diff --git a/devel/pas2dox/Makefile b/devel/pas2dox/Makefile
index 9872a455ad9b..42853739b7ab 100644
--- a/devel/pas2dox/Makefile
+++ b/devel/pas2dox/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pas2dox
DISTVERSION= 0.50rc1
CATEGORIES= devel converters
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.50rc1
MAINTAINER= ports@FreeBSD.org
COMMENT= Preprocessor to use doxygen with Pascal sources
diff --git a/devel/perltidy/Makefile b/devel/perltidy/Makefile
index e8a1d201ebce..6afdbf383aa2 100644
--- a/devel/perltidy/Makefile
+++ b/devel/perltidy/Makefile
@@ -10,8 +10,8 @@ PORTNAME= perltidy
PORTVERSION= 20090616
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/%SUBDIR%/Perl/} \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+
DISTNAME= Perl-Tidy-${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/php-dbg2/Makefile b/devel/php-dbg2/Makefile
index f4e7c6d015df..7fe467d4e7fa 100644
--- a/devel/php-dbg2/Makefile
+++ b/devel/php-dbg2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dbg2
PORTVERSION= 2.15.5
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/dbg/${PORTVERSION}
PKGNAMEPREFIX= php-
DISTNAME= dbg-${PORTVERSION}
diff --git a/devel/php-java-bridge/Makefile b/devel/php-java-bridge/Makefile
index 6802c8a8736b..63ef8a9e1b00 100644
--- a/devel/php-java-bridge/Makefile
+++ b/devel/php-java-bridge/Makefile
@@ -8,7 +8,7 @@
PORTNAME= php-java-bridge
PORTVERSION= 5.4.3
CATEGORIES= devel java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
diff --git a/devel/php-libawl/Makefile b/devel/php-libawl/Makefile
index 76fe8dfbabc9..e7508090ff71 100644
--- a/devel/php-libawl/Makefile
+++ b/devel/php-libawl/Makefile
@@ -6,7 +6,7 @@
PORTNAME= php-libawl
PORTVERSION= 0.37
CATEGORIES= devel
-MASTER_SITES= SF/rscds
+MASTER_SITES= SF/rscds/awl/${PORTVERSION}
DISTNAME= awl_${PORTVERSION}
MAINTAINER= cristianorolim@hotmail.com
diff --git a/devel/php5-geshi/Makefile b/devel/php5-geshi/Makefile
index dba32fcaa3e3..42c88c02f076 100644
--- a/devel/php5-geshi/Makefile
+++ b/devel/php5-geshi/Makefile
@@ -8,7 +8,7 @@
PORTNAME= geshi
PORTVERSION= 1.0.8.2
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/GeSHi%20${PORTVERSION}
PKGNAMEPREFIX= php5-
DISTNAME= GeSHi-${PORTVERSION}
diff --git a/devel/phpbt/Makefile b/devel/phpbt/Makefile
index 9f88a9bba5b4..bfde89e68555 100644
--- a/devel/phpbt/Makefile
+++ b/devel/phpbt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= phpbt
PORTVERSION= 1.0.1
CATEGORIES?= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= wes@FreeBSD.org
COMMENT= Bug-tracking system developed in PHP
diff --git a/devel/phptags/Makefile b/devel/phptags/Makefile
index 4cd74302b2f6..e6c329a58af0 100644
--- a/devel/phptags/Makefile
+++ b/devel/phptags/Makefile
@@ -8,8 +8,7 @@
PORTNAME= phptags
PORTVERSION= 0.3.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= Create a tags file from PHP sources
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile
index 3f6dbbe09e0c..ce71e17fb3f5 100644
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@@ -9,8 +9,7 @@ PORTNAME= piklab
PORTVERSION= 0.15.2
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=piklab
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE IDE for microcontroller development
diff --git a/devel/pipestatus/Makefile b/devel/pipestatus/Makefile
index 7f4b9ef37572..fa3afd1a2181 100644
--- a/devel/pipestatus/Makefile
+++ b/devel/pipestatus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pipestatus
PORTVERSION= 0.5.0
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= UNIX/POSIX shell helper for running pipes safely
diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index 47966984c9fc..31dac68130c2 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pmd
PORTVERSION= 3.7
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pmd
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= freebsd-ports@varju.ca
diff --git a/devel/pmk/Makefile b/devel/pmk/Makefile
index d50c9e0f9123..55fa56ebf032 100644
--- a/devel/pmk/Makefile
+++ b/devel/pmk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pmk
PORTVERSION= 0.10.4
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= araujo@FreeBSD.org
COMMENT= Pre Make Kit, a sane replacement for autoconf
diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile
index 480f70d9a00c..c1170dc93950 100644
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@@ -9,8 +9,7 @@
PORTNAME= poco
PORTVERSION= 1.3.2
CATEGORIES= devel net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/sources/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= -ssl
DISTNAME= poco-${PORTVERSION}-ssl
diff --git a/devel/poco/Makefile b/devel/poco/Makefile
index b418de8bbd33..036f82756097 100644
--- a/devel/poco/Makefile
+++ b/devel/poco/Makefile
@@ -9,8 +9,7 @@
PORTNAME= poco
PORTVERSION= 1.3.3p1
CATEGORIES= devel net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/sources/${PORTNAME}-${PORTVERSION}
MAINTAINER= wes@FreeBSD.org
COMMENT= C++ Portable Components library
diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile
index a0c22fea415b..9ed230796770 100644
--- a/devel/poslib/Makefile
+++ b/devel/poslib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= poslib
PORTVERSION= 1.0.6
PORTREVISION= 1
CATEGORIES= devel dns
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= posadis
+MASTER_SITES= SF/posadis/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Posadis C++ DNS library
diff --git a/devel/premake/Makefile b/devel/premake/Makefile
index f533dcfaa484..c58a3219f04b 100644
--- a/devel/premake/Makefile
+++ b/devel/premake/Makefile
@@ -9,7 +9,7 @@ PORTNAME= premake
PORTVERSION= 3.7
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Premake/${PORTVERSION}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= lippe@FreeBSD.org
diff --git a/devel/pstreams/Makefile b/devel/pstreams/Makefile
index a757162ccea0..631b0875ae16 100644
--- a/devel/pstreams/Makefile
+++ b/devel/pstreams/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pstreams
PORTVERSION= 0.6.0
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Release%200.6.x
MAINTAINER= eg@fbsd.lt
COMMENT= C++ utility for simple IOStream-based IPC
diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index 5a2e8cfb84e9..4c23e41a8780 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -9,8 +9,7 @@
PORTNAME= ptypes
PORTVERSION= 2.1.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= sem@FreeBSD.org
COMMENT= C++ Portable Types Library
diff --git a/devel/py-RPyC/Makefile b/devel/py-RPyC/Makefile
index 5978c274ab76..172eaf66c692 100644
--- a/devel/py-RPyC/Makefile
+++ b/devel/py-RPyC/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rpyc
PORTVERSION= 3.0.6
CATEGORIES= devel python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/main/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wenheping@gmail.com
diff --git a/devel/py-asn1/Makefile b/devel/py-asn1/Makefile
index 0b129f49b7fb..ac8a95e3614e 100644
--- a/devel/py-asn1/Makefile
+++ b/devel/py-asn1/Makefile
@@ -8,8 +8,7 @@
PORTNAME= asn1
PORTVERSION= 0.0.8a
CATEGORIES= devel python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= py${PORTNAME}
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}-devel/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
diff --git a/devel/py-aspyct/Makefile b/devel/py-aspyct/Makefile
index 38f7c78bce8b..db72a9b56d1c 100644
--- a/devel/py-aspyct/Makefile
+++ b/devel/py-aspyct/Makefile
@@ -8,8 +8,7 @@
PORTNAME= aspyct
PORTVERSION= 3.0
CATEGORIES= devel python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20beta%204
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:C/a/A/}-${PORTVERSION}_beta_4
diff --git a/devel/py-cclib/Makefile b/devel/py-cclib/Makefile
index b9d11e4f70fa..c67f8dcae621 100644
--- a/devel/py-cclib/Makefile
+++ b/devel/py-cclib/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cclib
PORTVERSION= 0.91
CATEGORIES= devel python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wenheping@gmail.com
diff --git a/devel/py-cfgparse/Makefile b/devel/py-cfgparse/Makefile
index 91130ff83b89..d00dbfec3605 100644
--- a/devel/py-cfgparse/Makefile
+++ b/devel/py-cfgparse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cfgparse
PORTVERSION= 1.2
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cfgparse
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v01_02
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= cfgparse-v01_02
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index 7343644601e3..ccd2428f8e69 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -8,8 +8,7 @@ PORTNAME= cheetah
PORTVERSION= 2.2.1
PORTREVISION= 0
CATEGORIES= devel textproc www python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cheetahtemplate
+MASTER_SITES= SF/${PORTNAME}template/Cheetah/v${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Cheetah-${DISTVERSION}
diff --git a/devel/py-ciphon/Makefile b/devel/py-ciphon/Makefile
index 058c13cfb299..7e98bc3bd4be 100644
--- a/devel/py-ciphon/Makefile
+++ b/devel/py-ciphon/Makefile
@@ -9,8 +9,7 @@
PORTNAME= ciphon
PORTVERSION= 0.4.0
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pythonsiphon
+MASTER_SITES= SF/pythonsiphon/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= xride@FreeBSD.org
diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile
index de6f17c305c0..4252fd9bece7 100644
--- a/devel/py-configobj/Makefile
+++ b/devel/py-configobj/Makefile
@@ -8,9 +8,9 @@
PORTNAME= configobj
PORTVERSION= 4.6.0
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
diff --git a/devel/py-ctypes/Makefile b/devel/py-ctypes/Makefile
index 4583dfa121b1..2fb01f6486d2 100644
--- a/devel/py-ctypes/Makefile
+++ b/devel/py-ctypes/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ctypes
PORTVERSION= 1.0.1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,ctypes/,g}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= perky@FreeBSD.org
diff --git a/devel/py-cxx/Makefile b/devel/py-cxx/Makefile
index fc87b2d661fe..dac75601e759 100644
--- a/devel/py-cxx/Makefile
+++ b/devel/py-cxx/Makefile
@@ -9,8 +9,7 @@
PORTNAME= cxx
PORTVERSION= 6.0.0
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/CXX/PyCXX%20V${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pycxx-${PORTVERSION}
diff --git a/devel/py-dialog/Makefile b/devel/py-dialog/Makefile
index 44db511833fb..cdd74e47ddda 100644
--- a/devel/py-dialog/Makefile
+++ b/devel/py-dialog/Makefile
@@ -10,8 +10,7 @@ PORTNAME= dialog
PORTVERSION= 2.7
PORTREVISION= 3
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pythondialog
+MASTER_SITES= SF/python${PORTNAME}/python${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pythondialog-${PORTVERSION}
diff --git a/devel/py-fam/Makefile b/devel/py-fam/Makefile
index edb5be17c565..e7c22331dbfc 100644
--- a/devel/py-fam/Makefile
+++ b/devel/py-fam/Makefile
@@ -8,8 +8,7 @@ PORTNAME= fam
PORTVERSION= 1.1.1
PORTREVISION= 2
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= python-fam
+MASTER_SITES= SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= python-fam-${PORTVERSION}
diff --git a/devel/py-fortran/Makefile b/devel/py-fortran/Makefile
index 5518e5c4581f..489d62435368 100644
--- a/devel/py-fortran/Makefile
+++ b/devel/py-fortran/Makefile
@@ -9,8 +9,7 @@
PORTNAME= fortran
PORTVERSION= 8.5.3
CATEGORIES= devel python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=pyfortran
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/8.5
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Pyfort-${PORTVERSION}
diff --git a/devel/py-fusefs/Makefile b/devel/py-fusefs/Makefile
index 50807e0a7df2..bde7b62786dd 100644
--- a/devel/py-fusefs/Makefile
+++ b/devel/py-fusefs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fusefs
DISTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= SF/fuse
+MASTER_SITES= SF/fuse/fuse-python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= fuse-python-${DISTVERSION}
diff --git a/devel/py-instant/Makefile b/devel/py-instant/Makefile
index 7182d3dab397..79768e47e690 100644
--- a/devel/py-instant/Makefile
+++ b/devel/py-instant/Makefile
@@ -8,8 +8,7 @@
PORTNAME= instant
PORTVERSION= 0.9
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyinstant
+MASTER_SITES= SF/py${PORTNAME}/Instant-${PORTVERSION}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Instant-${PORTVERSION}
diff --git a/devel/py-json-py/Makefile b/devel/py-json-py/Makefile
index d153cf80b6b3..cd508ceb18a5 100644
--- a/devel/py-json-py/Makefile
+++ b/devel/py-json-py/Makefile
@@ -8,8 +8,7 @@
PORTNAME= json-py
PORTVERSION= 3.4
CATEGORIES= devel lang www python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3_4
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/}
EXTRACT_SUFX= .zip
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index c903e8770ae8..7c4ed5c21db7 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kjbuckets
PORTVERSION= 1.0.0
PORTEPOCH= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gadfly
+MASTER_SITES= SF/gadfly/gadfly/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= gadfly-${PORTVERSION}
diff --git a/devel/py-log4py/Makefile b/devel/py-log4py/Makefile
index be707ee83667..398cbecf4d05 100644
--- a/devel/py-log4py/Makefile
+++ b/devel/py-log4py/Makefile
@@ -9,8 +9,7 @@
PORTNAME= log4py
PORTVERSION= 1.3
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= xride@FreeBSD.org
diff --git a/devel/py-ncurses/Makefile b/devel/py-ncurses/Makefile
index ac317282ed2e..9966eccb6139 100644
--- a/devel/py-ncurses/Makefile
+++ b/devel/py-ncurses/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ncurses
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyncurses
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyncurses-${PORTVERSION}
diff --git a/devel/py-ocempgui/Makefile b/devel/py-ocempgui/Makefile
index 58ccbdf05b45..f21dacedbc60 100644
--- a/devel/py-ocempgui/Makefile
+++ b/devel/py-ocempgui/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ocempgui
PORTVERSION= 0.2.9
PORTREVISION= 2
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ocemp
+MASTER_SITES= SF/ocemp/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= OcempGUI-${PORTVERSION}
diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile
index b0b04c6e860e..a855a5af06f7 100644
--- a/devel/py-ode/Makefile
+++ b/devel/py-ode/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ode
PORTVERSION= 1.2.0
PORTREVISION= 2
CATEGORIES= devel python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pyode
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyODE-${PORTVERSION}
DIST_SUBDIR= python
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index 101cb463c617..bfe6e4bb7e38 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= omniorb
PORTVERSION= 3.3
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME}/omniORBpy/omniORBpy%20${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= omniORBpy-${PORTVERSION}
diff --git a/devel/py-optik/Makefile b/devel/py-optik/Makefile
index 762e98496336..9ca232661276 100644
--- a/devel/py-optik/Makefile
+++ b/devel/py-optik/Makefile
@@ -9,8 +9,7 @@
PORTNAME= optik
PORTVERSION= 1.5.3
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= perky@FreeBSD.org
diff --git a/devel/py-parsing/Makefile b/devel/py-parsing/Makefile
index d785cc208f3d..fda9d6cce408 100644
--- a/devel/py-parsing/Makefile
+++ b/devel/py-parsing/Makefile
@@ -9,7 +9,7 @@ PORTNAME= parsing
PORTVERSION= 1.5.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= SF/pyparsing
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyparsing-${PORTVERSION}
diff --git a/devel/py-pmock/Makefile b/devel/py-pmock/Makefile
index 88346b3aed61..3247e372597f 100644
--- a/devel/py-pmock/Makefile
+++ b/devel/py-pmock/Makefile
@@ -8,8 +8,7 @@ PORTNAME= pmock
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pmock
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/py-psyco/Makefile b/devel/py-psyco/Makefile
index c59dbb15f800..18dc1cfcc21d 100644
--- a/devel/py-psyco/Makefile
+++ b/devel/py-psyco/Makefile
@@ -8,8 +8,7 @@
PORTNAME= psyco
PORTVERSION= 1.6
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= psyco
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/devel/py-pyro/Makefile b/devel/py-pyro/Makefile
index e04945a26e02..3731a102fc5b 100644
--- a/devel/py-pyro/Makefile
+++ b/devel/py-pyro/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pyro
PORTVERSION= 3.9
CATEGORIES= devel python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Pyro-${PORTVERSION}
diff --git a/devel/py-resourcepackage/Makefile b/devel/py-resourcepackage/Makefile
index 017cb04c77d9..2843dca65d34 100644
--- a/devel/py-resourcepackage/Makefile
+++ b/devel/py-resourcepackage/Makefile
@@ -9,8 +9,7 @@
PORTNAME= resourcepackage
PORTVERSION= 1.0.0
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20%28final%29
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ResourcePackage-${PORTVERSION}
diff --git a/devel/py-ro/Makefile b/devel/py-ro/Makefile
index 6c1e38c9e446..20c1d5227018 100644
--- a/devel/py-ro/Makefile
+++ b/devel/py-ro/Makefile
@@ -9,8 +9,7 @@
PORTNAME= ro
PORTVERSION= 3.9
CATEGORIES= devel python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pyro
+MASTER_SITES= SF/py${PORTNAME}/OldFiles
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Pyro-${PORTVERSION}
diff --git a/devel/py-simpleparse/Makefile b/devel/py-simpleparse/Makefile
index 8d12073e963e..0823a4b4b25c 100644
--- a/devel/py-simpleparse/Makefile
+++ b/devel/py-simpleparse/Makefile
@@ -10,8 +10,7 @@ PORTNAME= simpleparse
PORTVERSION= 2.1.0.a1
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.1.0a1
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= SimpleParse-${PORTVERSION:R}${PORTVERSION:E}
diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile
index ca0de60a60a7..f8d3835a0886 100644
--- a/devel/py-simpy/Makefile
+++ b/devel/py-simpy/Makefile
@@ -9,7 +9,8 @@ PORTNAME= simpy
PORTVERSION= 2.0.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP \
- SF
+ SF/${PORTNAME}/${PORTNAME}/SimPy-${PORTVERSION}
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= SimPy-${PORTVERSION}
diff --git a/devel/py-testoob/Makefile b/devel/py-testoob/Makefile
index b585189bb88d..1a94ebd41511 100644
--- a/devel/py-testoob/Makefile
+++ b/devel/py-testoob/Makefile
@@ -8,8 +8,7 @@
PORTNAME= testoob
PORTVERSION= 1.13
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@fsck.ch
diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile
index 47945811e4b2..cb393dea2e42 100644
--- a/devel/py-unit/Makefile
+++ b/devel/py-unit/Makefile
@@ -9,8 +9,7 @@ PORTNAME= unit
PORTVERSION= 1.4.1
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyunit
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyunit-${PORTVERSION}
diff --git a/devel/py-usb/Makefile b/devel/py-usb/Makefile
index b04a220b4b1e..1e400a5c7a69 100644
--- a/devel/py-usb/Makefile
+++ b/devel/py-usb/Makefile
@@ -10,6 +10,7 @@ PORTVERSION= 0.4.2
CATEGORIES= devel python
MASTER_SITES= SF \
${MASTER_SITE_BERLIOS}
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/py-xoltar-toolkit/Makefile b/devel/py-xoltar-toolkit/Makefile
index 62eb9cafdae2..199ea6faeaaf 100644
--- a/devel/py-xoltar-toolkit/Makefile
+++ b/devel/py-xoltar-toolkit/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xoltar-toolkit
PORTVERSION= 2001.06.01
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/xoltar%20toolkit/June%202001
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-01jun01
diff --git a/devel/pychecker/Makefile b/devel/pychecker/Makefile
index 1b19c29398e1..d772d634eda2 100644
--- a/devel/pychecker/Makefile
+++ b/devel/pychecker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pychecker
PORTVERSION= 0.8.18
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mva@FreeBSD.org
COMMENT= Python source code checking tool to help hunting common bugs
diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile
index f86fb3e1c72e..881fc5c8c41f 100644
--- a/devel/qgit/Makefile
+++ b/devel/qgit/Makefile
@@ -8,7 +8,7 @@ PORTNAME= qgit
PORTVERSION= 2.2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}4/${PORTVERSION}
PKGNAMESUFFIX= -qt4
MAINTAINER= itetcu@FreeBSD.org
diff --git a/devel/qssl/Makefile b/devel/qssl/Makefile
index e0d15c95b24b..a6100b091eb8 100644
--- a/devel/qssl/Makefile
+++ b/devel/qssl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qssl
PORTVERSION= 2.0
PORTREVISION= 4
CATEGORIES= devel security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= psi
+MASTER_SITES= SF/psi/Common/Common
MAINTAINER= gahr@FreeBSD.org
COMMENT= QSSL is a Qt plugin that helps applications use OpenSSL
diff --git a/devel/radrails/Makefile b/devel/radrails/Makefile
index 8158d1d32868..5bfab435db20 100644
--- a/devel/radrails/Makefile
+++ b/devel/radrails/Makefile
@@ -8,8 +8,7 @@
PORTNAME= radrails
PORTVERSION= 0.7.2
CATEGORIES= devel ruby java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/RadRails%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-linux-gtk
MAINTAINER= alecn2002@yandex.ru
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index d0d36f758079..c90aa86e27cc 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 3.5.2
PORTEPOCH= 1
CATEGORIES= devel net
MASTER_SITES= http://www.jenkinssoftware.com/raknet/downloads/ \
- SF
-MASTER_SITE_SUBDIR= raknetjenkinsso
+ SF/${PORTNAME}jenkinsso/${PORTNAME}jenkinsso/3.52
+
DISTNAME= RakNet-3.52
MAINTAINER= ganael.laplanche@martymac.com
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index f899f4d0f9cb..3469815c12db 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -10,8 +10,7 @@ PORTNAME= regexx
PORTVERSION= 0.98.1
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A complete regular expressions C++ solution
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 2185d347655e..22958c00ac94 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= regexxer
PORTVERSION= 0.9
PORTREVISION= 4
CATEGORIES= devel textproc gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= bg1tpt@gmail.com
COMMENT= An interactive tool for performing search and replace operations
diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile
index 6cf82e5a1133..0abf771a1e26 100644
--- a/devel/rhtvision/Makefile
+++ b/devel/rhtvision/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rhtvision
PORTVERSION= 2.0.3
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tvision
+MASTER_SITES= SF/tvision/UNIX/${PORTVERSION}
DISTNAME= rhtvision-${PORTVERSION}.src
MAINTAINER= perky@FreeBSD.org
diff --git a/devel/rote/Makefile b/devel/rote/Makefile
index 252caac73219..4afeff0d812d 100644
--- a/devel/rote/Makefile
+++ b/devel/rote/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rote
PORTVERSION= 0.2.8
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple library for VT102 terminal emulation
diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile
index a1cb567bfdd6..cee51d36d678 100644
--- a/devel/rsvndump/Makefile
+++ b/devel/rsvndump/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rsvndump
PORTVERSION= 0.5.2
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= glarkin@FreeBSD.org
COMMENT= Remote Subversion repository dumpfile generator
diff --git a/devel/rth/Makefile b/devel/rth/Makefile
index a397b63d7030..8803c6312d1a 100644
--- a/devel/rth/Makefile
+++ b/devel/rth/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rth
PORTVERSION= 1.7.0
CATEGORIES= devel www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Release%20${PORTVERSION}/Release%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= jsi@jules.de
diff --git a/devel/ruby-aspectr/Makefile b/devel/ruby-aspectr/Makefile
index 57682e474ccc..cadc580edcc9 100644
--- a/devel/ruby-aspectr/Makefile
+++ b/devel/ruby-aspectr/Makefile
@@ -8,8 +8,7 @@
PORTNAME= aspectr
PORTVERSION= 0.3.5
CATEGORIES= devel ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}
DIST_SUBDIR= ruby
diff --git a/devel/ruby-rbbr/Makefile b/devel/ruby-rbbr/Makefile
index 9f9f3b477da2..8c386fe0bdc7 100644
--- a/devel/ruby-rbbr/Makefile
+++ b/devel/ruby-rbbr/Makefile
@@ -9,7 +9,7 @@ PORTNAME= rbbr
PORTVERSION= 0.6.0
PORTREVISION= 4
CATEGORIES= devel ruby
-MASTER_SITES= SF/ruby-gnome2
+MASTER_SITES= SF/ruby-gnome2/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/r/rev/}
DIST_SUBDIR= ruby
diff --git a/devel/ruby-rbprof/Makefile b/devel/ruby-rbprof/Makefile
index 8dbe376b3fbc..1faf5a2face9 100644
--- a/devel/ruby-rbprof/Makefile
+++ b/devel/ruby-rbprof/Makefile
@@ -8,8 +8,7 @@
PORTNAME= rbprof
PORTVERSION= 0.2.1
CATEGORIES= devel ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aspectr
+MASTER_SITES= SF/aspectr/aspectr/0.3.5
DISTNAME= aspectr-0-3-5
DIST_SUBDIR= ruby
diff --git a/devel/ruby-rjudy/Makefile b/devel/ruby-rjudy/Makefile
index dd96f351ea70..4c48e9583ad0 100644
--- a/devel/ruby-rjudy/Makefile
+++ b/devel/ruby-rjudy/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rjudy
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= devel ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
#DISTNAME= ${RUBY_DBI_DISTNAME}
diff --git a/devel/ruby-robjectteam/Makefile b/devel/ruby-robjectteam/Makefile
index 954bc7bed8e5..57cf49f3707d 100644
--- a/devel/ruby-robjectteam/Makefile
+++ b/devel/ruby-robjectteam/Makefile
@@ -8,8 +8,7 @@
PORTNAME= robjectteam
PORTVERSION= 1.0
CATEGORIES= devel ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
EXTRACT_SUFX= .tgz
DIST_SUBDIR= ruby
diff --git a/devel/ruby-rudl/Makefile b/devel/ruby-rudl/Makefile
index 51fc3ab135e5..9ca20b3e4d74 100644
--- a/devel/ruby-rudl/Makefile
+++ b/devel/ruby-rudl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rudl
PORTVERSION= 0.8
PORTREVISION= 5
CATEGORIES= devel ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTFILES= ${DISTNAME}-source${EXTRACT_SUFX}
DIST_SUBDIR= ruby
diff --git a/devel/scandoc/Makefile b/devel/scandoc/Makefile
index c63c904a3a97..fd7f151305fd 100644
--- a/devel/scandoc/Makefile
+++ b/devel/scandoc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= scandoc
PORTVERSION= 0.14
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C/C++ documentation generator
diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index 7431c2552546..96330a7fa621 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -9,7 +9,7 @@ PORTNAME= scons
PORTVERSION= 1.2.0
PORTREVISION= 20090223
CATEGORIES= devel python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.d20090223
DISTNAME= ${PORTNAME}-${PORTVERSION}.d${PORTREVISION}
MAINTAINER= pgollucci@FreeBSD.org
diff --git a/devel/sdl_console/Makefile b/devel/sdl_console/Makefile
index ff976df439a4..cd8030800cf6 100644
--- a/devel/sdl_console/Makefile
+++ b/devel/sdl_console/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sdl_console
PORTVERSION= 2.1
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sdlconsole
+MASTER_SITES= SF/sdlconsole/sdlconsole-source/sdlconsole-${PORTVERSION}
DISTNAME= sdlconsole-${PORTVERSION}
MAINTAINER= leeym@FreeBSD.org
diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile
index 8c94c7677693..58490ea0b46c 100644
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@@ -10,8 +10,7 @@ PORTNAME= sdlmm
PORTVERSION= 0.1.8
PORTREVISION= 5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/SDLmm/${PORTVERSION}
DISTNAME= SDLmm-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index 425ebc8b74a1..253c3e4b369b 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -9,9 +9,9 @@ PORTNAME= semantic
PORTVERSION= 1.4.4
PORTREVISION= 5
CATEGORIES= devel elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/cedet/${PORTNAME}/${PORTVERSION} \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= cedet
+
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
#DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/beta/}
diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile
index d6ef7906d19a..458f7925f65f 100644
--- a/devel/shmap/Makefile
+++ b/devel/shmap/Makefile
@@ -10,8 +10,7 @@ PORTNAME= shmap
PORTVERSION= 0.3.2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Shared-memory-based hashmaps
diff --git a/devel/sigslot/Makefile b/devel/sigslot/Makefile
index 0207812b82b1..f94b01e281e2 100644
--- a/devel/sigslot/Makefile
+++ b/devel/sigslot/Makefile
@@ -9,8 +9,7 @@
PORTNAME= sigslot
PORTVERSION= 1.0.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/silentbob/Makefile b/devel/silentbob/Makefile
index f4ae4a1ca4ed..8c56862d64b3 100644
--- a/devel/silentbob/Makefile
+++ b/devel/silentbob/Makefile
@@ -8,7 +8,7 @@
PORTNAME= silentbob
PORTVERSION= 1.7.6
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
COMMENT= Yet another sourcecode indexing tool
diff --git a/devel/simpletest/Makefile b/devel/simpletest/Makefile
index e11d5d3c8a26..0f2291636f53 100644
--- a/devel/simpletest/Makefile
+++ b/devel/simpletest/Makefile
@@ -8,7 +8,7 @@
PORTNAME= simpletest
PORTVERSION= 1.0.1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME:L}_${PORTVERSION}
MAINTAINER= gerrit.beine@gmx.de
diff --git a/devel/smc/Makefile b/devel/smc/Makefile
index be3ae5f73527..b45cb93e7e94 100644
--- a/devel/smc/Makefile
+++ b/devel/smc/Makefile
@@ -10,8 +10,7 @@ PORTNAME= smc
PORTVERSION= 4.3.0
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
EXTRACT_SUFX= .tgz
diff --git a/devel/soapui/Makefile b/devel/soapui/Makefile
index e975fd3ec77e..8e8b6cb2dcbf 100644
--- a/devel/soapui/Makefile
+++ b/devel/soapui/Makefile
@@ -8,8 +8,7 @@ PORTNAME= soapui
PORTVERSION= 2.0.2
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= soapui
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/st/Makefile b/devel/st/Makefile
index 3ba6f104cc6d..a884cf96b6fe 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -8,7 +8,7 @@
PORTNAME= st
PORTVERSION= 1.8
CATEGORIES= devel
-MASTER_SITES= SF/state-threads
+MASTER_SITES= SF/${PORTNAME}ate-threads/${PORTNAME}ate-threads/${PORTVERSION}
MAINTAINER= lippe@FreeBSD.org
COMMENT= State Threads Library for Internet Applications
diff --git a/devel/statcvs/Makefile b/devel/statcvs/Makefile
index 0e54bc0529b2..319319dfd431 100644
--- a/devel/statcvs/Makefile
+++ b/devel/statcvs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= statcvs
PORTVERSION= 0.5.0
CATEGORIES= devel java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Source%20Code/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= glarkin@FreeBSD.org
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 5536824e18f2..f431bffdd30c 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -10,7 +10,7 @@ PORTNAME= stlport
PORTVERSION= 5.1.5
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/STLport/STLport%20${PORTVERSION}
PKGNAMESUFFIX= -${COMPILER}
DISTNAME= STLport-${PORTVERSION:S/.b/-b/}
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 73604f90e64d..1c06752ad96c 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -8,8 +8,7 @@
PORTNAME= swig
PORTVERSION= 1.3.39
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= rafan@FreeBSD.org
COMMENT= Simplified Wrapper and Interface Generator
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 73604f90e64d..1c06752ad96c 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -8,8 +8,7 @@
PORTNAME= swig
PORTVERSION= 1.3.39
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= rafan@FreeBSD.org
COMMENT= Simplified Wrapper and Interface Generator
diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile
index 098c20c2a5d0..797f1aac3350 100644
--- a/devel/sysconftool/Makefile
+++ b/devel/sysconftool/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sysconftool
PORTVERSION= 0.15
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= courier
+MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= Helps to install application configuration files
diff --git a/devel/sysfsutils/Makefile b/devel/sysfsutils/Makefile
index 522032157f1e..835137445bf2 100644
--- a/devel/sysfsutils/Makefile
+++ b/devel/sysfsutils/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sysfsutils
PORTVERSION= 2.1.0
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= linux-diag
+MASTER_SITES= SF/linux-diag/${PORTNAME}/${PORTVERSION}
MAINTAINER= gslin@gslin.org
COMMENT= System Utilities Based on Sysfs
diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile
index 5dbdb9bdda1e..f2b507572c91 100644
--- a/devel/tcl-memchan/Makefile
+++ b/devel/tcl-memchan/Makefile
@@ -9,9 +9,8 @@ PORTNAME= memchan
PORTVERSION= 2.2.1
PORTREVISION= 1
CATEGORIES= devel tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
PKGNAMEPREFIX= tcl-
-MASTER_SITE_SUBDIR=${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
COMMENT= Two new channel types for in-memory channels in TCL8
diff --git a/devel/tcl-neo/Makefile b/devel/tcl-neo/Makefile
index 9759f83cd0d8..4a8e8cde326a 100644
--- a/devel/tcl-neo/Makefile
+++ b/devel/tcl-neo/Makefile
@@ -9,8 +9,7 @@ PORTNAME= neotcl
PORTVERSION= 8.2.2
PORTREVISION= 3
CATEGORIES= devel tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=nws
+MASTER_SITES= SF/nws/nws/3.3
DISTNAME= neowebscript-3.3
MAINTAINER= mi@aldan.algebra.com
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 6cf721464ff3..f6aef057d8f4 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.19
PORTREVISION= 3
DISTVERSIONPREFIX= src-
CATEGORIES= devel tcl tk
-MASTER_SITES= SF/otcl-tclcl
+MASTER_SITES= SF/otcl-${PORTNAME}/TclCL/${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= Tcl/C++ interface used by ns and nam
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index c02e1c46c27d..375de43ad026 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tcllib
PORTVERSION= 1.11
CATEGORIES= devel tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcllib
+MASTER_SITES= SF
MAINTAINER= mi@aldan.algebra.com
COMMENT= A collection of utility modules for Tcl
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index f81ab3026f55..07253d6a75fb 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tclreadline
PORTVERSION= 2.1.0
PORTREVISION= 3
CATEGORIES= devel tcl
-MASTER_SITES= SF/tclreadline
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU readline for TCL
diff --git a/devel/tclthread/Makefile b/devel/tclthread/Makefile
index bdb90a63a959..71bd6ee921ff 100644
--- a/devel/tclthread/Makefile
+++ b/devel/tclthread/Makefile
@@ -9,8 +9,7 @@ PORTNAME= thread
PORTVERSION= 2.6.5
PORTREVISION= 1
CATEGORIES= devel tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tcl
+MASTER_SITES= SF/tcl/Thread%20Extension/${PORTVERSION}
PKGNAMEPREFIX= tcl
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index 7ff26c7dd5aa..bdf16dee70d9 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tcltls
PORTVERSION= 1.6
PORTREVISION= 1
CATEGORIES= devel tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tls
+MASTER_SITES= SF/tls/tls/${PORTVERSION}
DISTNAME= tls${PORTVERSION}-src
MAINTAINER= mi@aldan.algebra.com
diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile
index 1f1f023622ba..4573585396a8 100644
--- a/devel/tclxml/Makefile
+++ b/devel/tclxml/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tclxml
PORTVERSION= 3.1
PORTREVISION= 1
CATEGORIES= devel tcl
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tclxml
+MASTER_SITES= SF/tclxml/TclXML/${PORTVERSION}
MAINTAINER?= ports@FreeBSD.org
COMMENT= API for parsing XML documents using Tcl
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index 35e9b79aaeff..256f6e4a277d 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -9,8 +9,7 @@ PORTNAME= titano
PORTVERSION= 0.0.7
PORTREVISION= 6
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= danfe@FreeBSD.org
COMMENT= An IDE for GNOME desktop
diff --git a/devel/tkinspect/Makefile b/devel/tkinspect/Makefile
index 8effa648de48..fe6582e1bcea 100644
--- a/devel/tkinspect/Makefile
+++ b/devel/tkinspect/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tkinspect
PORTVERSION= 5.1.6p10
PORTREVISION= 1
CATEGORIES= devel tcl tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tkcon
+MASTER_SITES= SF/tkcon/${PORTNAME}/${PORTVERSION}
MAINTAINER= nox@FreeBSD.org
COMMENT= A Tk program browser
diff --git a/devel/tokamak/Makefile b/devel/tokamak/Makefile
index 9a5db6b40bd9..5fa583321d70 100644
--- a/devel/tokamak/Makefile
+++ b/devel/tokamak/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tokamak
PORTVERSION= 1.0.5a
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tokamakp
+MASTER_SITES= SF/${PORTNAME}p/Tokamak%20Physics%20Engine/Tokamak%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/devel/trio/Makefile b/devel/trio/Makefile
index 61710dd28c23..394ce73fbc03 100644
--- a/devel/trio/Makefile
+++ b/devel/trio/Makefile
@@ -9,7 +9,7 @@
PORTNAME= trio
PORTVERSION= 1.13
CATEGORIES= devel
-MASTER_SITES= SF/ctrio
+MASTER_SITES= SF/c${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= A fully matured and stable set of printf and string functions
diff --git a/devel/truc/Makefile b/devel/truc/Makefile
index a0922bca313c..fda9dc1bc097 100644
--- a/devel/truc/Makefile
+++ b/devel/truc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= truc
PORTVERSION= 0.12.0
CATEGORIES= devel www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TRUC%20Testing%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= jsi@jules.de
diff --git a/devel/udis86/Makefile b/devel/udis86/Makefile
index 3f4efcd0f9bf..6d6d45e4852d 100644
--- a/devel/udis86/Makefile
+++ b/devel/udis86/Makefile
@@ -8,8 +8,7 @@
PORTNAME= udis86
PORTVERSION= 1.7
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= bf1783@gmail.com
COMMENT= Minimalistic x86 and x86-64 disassembler library
diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile
index 287ba5a2cc2a..1a3bb1944edc 100644
--- a/devel/upnp/Makefile
+++ b/devel/upnp/Makefile
@@ -9,7 +9,7 @@ PORTNAME= upnp
PORTVERSION= 1.6.6
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= SF/pupnp
+MASTER_SITES= SF/p${PORTNAME}/p${PORTNAME}/LibUPnP%20${PORTVERSION}
DISTNAME= lib${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/upslug/Makefile b/devel/upslug/Makefile
index e68860fee6ed..6d8b1be986d5 100644
--- a/devel/upslug/Makefile
+++ b/devel/upslug/Makefile
@@ -8,8 +8,7 @@
PORTNAME= upslug
PORTVERSION= 2.11
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nslu
+MASTER_SITES= SF/nslu/UpSlug2/${PORTNAME}2-11
DISTNAME= upslug2-11
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/ustl/Makefile b/devel/ustl/Makefile
index c92ea2fd36c1..3c291cb79e46 100644
--- a/devel/ustl/Makefile
+++ b/devel/ustl/Makefile
@@ -9,8 +9,7 @@
PORTNAME= ustl
PORTVERSION= 1.0.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= az@FreeBSD.org
diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile
index c88a0fb3bdd3..2b4168e8e614 100644
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= varconf
PORTVERSION= 0.6.6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=worldforge
+MASTER_SITES= SF/worldforge/${PORTNAME}%20%28config%20lib%29/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A Configuration System for the STAGE Server
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index e01a6c3a7051..7ef24a5e363a 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vtcl
PORTVERSION= 1.6.1a1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.6.1.a1
MAINTAINER= ports@FreeBSD.org
COMMENT= An Application Development Environment For the TCL/TK language
diff --git a/devel/xlslib/Makefile b/devel/xlslib/Makefile
index 98ec820b5d8b..bbfee0e7cd29 100644
--- a/devel/xlslib/Makefile
+++ b/devel/xlslib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xlslib
PORTVERSION= 0.2.5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= sergey@network-asp.biz
COMMENT= A C++ library for generation of Excel(TM) files
diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile
index a4eae62e0916..42e14f092092 100644
--- a/devel/xparam/Makefile
+++ b/devel/xparam/Makefile
@@ -10,8 +10,7 @@ PORTNAME= xparam
PORTVERSION= 1.22
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A general-purpose tool for parameter handling in C++
diff --git a/devel/xtl/Makefile b/devel/xtl/Makefile
index 020daca86098..0d803f6a26df 100644
--- a/devel/xtl/Makefile
+++ b/devel/xtl/Makefile
@@ -9,8 +9,7 @@
PORTNAME= xtl
PORTVERSION= 1.4.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A library for R/W structured data to/from an external representation
diff --git a/devel/zeroinstall-injector/Makefile b/devel/zeroinstall-injector/Makefile
index c568f91c98c8..60834671bc49 100644
--- a/devel/zeroinstall-injector/Makefile
+++ b/devel/zeroinstall-injector/Makefile
@@ -8,8 +8,7 @@
PORTNAME= zeroinstall-injector
PORTVERSION= 0.41
CATEGORIES= devel python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=zero-install
+MASTER_SITES= SF/zero-install/injector/${PORTVERSION}
MAINTAINER= a134qaed@gmail.com
COMMENT= 0install injector
diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile
index 67a02c561ae4..10a844bba052 100644
--- a/devel/zthread/Makefile
+++ b/devel/zthread/Makefile
@@ -9,7 +9,7 @@ PORTNAME= zthread
PORTVERSION= 2.3.2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ZThread/${PORTVERSION}
DISTNAME= ZThread-${PORTVERSION}
MAINTAINER= glarkin@FreeBSD.org
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 145eac46f50b..6cc11c0e2553 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= zziplib
PORTVERSION= 0.13.50
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}13/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= A library to provide transparent read access to zipped files
diff --git a/dns/crossip/Makefile b/dns/crossip/Makefile
index 61469796d650..2ff001265322 100644
--- a/dns/crossip/Makefile
+++ b/dns/crossip/Makefile
@@ -9,8 +9,7 @@ PORTNAME= crossip
DISTVERSION= 1.2
PORTREVISION= 4
CATEGORIES= dns java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CrossIP%20${PORTVERSION}
MAINTAINER= dan@algenta.com
COMMENT= Java DNS update client for the ThatIP protocol
diff --git a/dns/ddclient/Makefile b/dns/ddclient/Makefile
index ae3c580038a7..45a28f63adcd 100644
--- a/dns/ddclient/Makefile
+++ b/dns/ddclient/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ddclient
PORTVERSION= 3.7.3
CATEGORIES= dns
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= radek@raadradd.com
COMMENT= Update dynamic DNS entries
diff --git a/dns/dnsjava/Makefile b/dns/dnsjava/Makefile
index 4a6534c6693e..a3490ed8bfbf 100644
--- a/dns/dnsjava/Makefile
+++ b/dns/dnsjava/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dnsjava
PORTVERSION= 2.0.6
PORTREVISION= 1
CATEGORIES= dns java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Implementation of DNS in Java
diff --git a/dns/dnsmax-perl/Makefile b/dns/dnsmax-perl/Makefile
index eb69465c477a..1494715c32bd 100644
--- a/dns/dnsmax-perl/Makefile
+++ b/dns/dnsmax-perl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dnsmax-perl
PORTVERSION= 1.0.1
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dynamicdns
+MASTER_SITES= SF/dynamicdns/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
MAINTAINER= dan@algenta.com
diff --git a/dns/dnsutl/Makefile b/dns/dnsutl/Makefile
index 51794024b06e..872b8471ad3d 100644
--- a/dns/dnsutl/Makefile
+++ b/dns/dnsutl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dnsutl
PORTVERSION= 1.11
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= stefan@fh-mainz.de
COMMENT= Programs to make using DNS easier
diff --git a/dns/dualserver/Makefile b/dns/dualserver/Makefile
index 68c25bf9453b..2391995f85be 100644
--- a/dns/dualserver/Makefile
+++ b/dns/dualserver/Makefile
@@ -6,8 +6,7 @@
PORTNAME= dualserver
PORTVERSION= 3.0
CATEGORIES= dns net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dhcp-dns-server
+MASTER_SITES= SF/dhcp-dns-server/OldFiles
DISTNAME= ${PORTNAME}V${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/dns/ghtool/Makefile b/dns/ghtool/Makefile
index dc9a189af84b..76ec355dbce0 100644
--- a/dns/ghtool/Makefile
+++ b/dns/ghtool/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ghtool
PORTVERSION= 1.0
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=gh-tool
+MASTER_SITES= SF/gh-tool/gh-tool/1
DISTNAME= ghmain.c
EXTRACT_SUFX=
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index c0cced8fd60a..335260d97ef8 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mydns-ng
PORTREVISION= 1
PORTVERSION= 1.2.8.27
CATEGORIES= dns databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mydns-ng
+MASTER_SITES= SF/${PORTNAME}/mydns/${PORTVERSION}
DISTNAME= mydns-${PORTVERSION}
MAINTAINER= gaod@hychen.org
diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile
index 8f433730b9a2..eef909c97707 100644
--- a/dns/posadis/Makefile
+++ b/dns/posadis/Makefile
@@ -9,8 +9,7 @@ PORTNAME= posadis
PORTVERSION= 0.60.5
PORTREVISION= 4
CATEGORIES= dns ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Domain Name Server (DNS) implementation
diff --git a/dns/py-dns/Makefile b/dns/py-dns/Makefile
index fdc268769290..9ec6f31a8ef0 100644
--- a/dns/py-dns/Makefile
+++ b/dns/py-dns/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dns
PORTVERSION= 2.3.3
CATEGORIES= dns python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pydns
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pydns-${PORTVERSION}
diff --git a/dns/rbllookup/Makefile b/dns/rbllookup/Makefile
index c366ec5d8ebd..01d7732f789c 100644
--- a/dns/rbllookup/Makefile
+++ b/dns/rbllookup/Makefile
@@ -8,8 +8,7 @@
PORTNAME= rbllookup
PORTVERSION= 0.0.1.1
CATEGORIES= dns mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= drixter@e-utp.net
COMMENT= Check given IP/Host presence in 106 RBLs
diff --git a/dns/zkt/Makefile b/dns/zkt/Makefile
index f33e9f8a4c86..a835b9dbca44 100644
--- a/dns/zkt/Makefile
+++ b/dns/zkt/Makefile
@@ -8,7 +8,7 @@
PORTNAME= zkt
DISTVERSION= 0.99c
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-v${DISTVERSION} \
http://www.hznet.de/dns/zkt/
MASTER_SITE_SUBDIR= ${PORTNAME}