aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2015-05-14 10:15:04 +0000
committerMathieu Arnold <mat@FreeBSD.org>2015-05-14 10:15:04 +0000
commit60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree627649ff7699a289d5d78c11bf8d105881402ca8
parenta50428b01c275f058b067787701d333a9d45cbcb (diff)
downloadports-60d1a83c2a113150cedbc43ff12a7375144f741a.tar.gz
ports-60d1a83c2a113150cedbc43ff12a7375144f741a.zip
Notes
-rw-r--r--Mk/bsd.sites.mk27
-rw-r--r--accessibility/py-atspi/Makefile3
-rw-r--r--accessibility/py3-atspi/Makefile3
-rw-r--r--archivers/dpkg/Makefile2
-rw-r--r--archivers/fastjar/Makefile3
-rw-r--r--archivers/gcpio/Makefile3
-rw-r--r--archivers/lbrate/Makefile3
-rw-r--r--archivers/lha-ac/Makefile5
-rw-r--r--archivers/macutils/Makefile3
-rw-r--r--archivers/mscompress/Makefile3
-rw-r--r--archivers/mtf/Makefile5
-rw-r--r--archivers/nomarch/Makefile3
-rw-r--r--archivers/nulib/Makefile5
-rw-r--r--archivers/p5-IO-Zlib/Makefile1
-rw-r--r--archivers/packddir/Makefile3
-rw-r--r--archivers/php5-snappy/Makefile2
-rw-r--r--archivers/ppunpack/Makefile5
-rw-r--r--archivers/pxz/Makefile3
-rw-r--r--archivers/py-liblzma/Makefile3
-rw-r--r--archivers/rzip/Makefile3
-rw-r--r--archivers/unace/Makefile3
-rw-r--r--archivers/wzip/Makefile2
-rw-r--r--archivers/xar/Makefile2
-rw-r--r--archivers/xarchiver/Makefile3
-rw-r--r--archivers/zipper/Makefile3
-rw-r--r--archivers/zopfli/Makefile2
-rw-r--r--astro/ephem/Makefile3
-rw-r--r--astro/libgal/Makefile3
-rw-r--r--astro/mymoon/Makefile3
-rw-r--r--astro/p5-Astro-ADS/Makefile1
-rw-r--r--astro/p5-Astro-DSS/Makefile1
-rw-r--r--astro/p5-Astro-SIMBAD/Makefile1
-rw-r--r--astro/p5-Astro-SunTime/Makefile1
-rw-r--r--astro/p5-Geo-METAR/Makefile1
-rw-r--r--astro/planets/Makefile2
-rw-r--r--astro/xworld/Makefile3
-rw-r--r--audio/alsa-lib/Makefile2
-rw-r--r--audio/alsa-plugins/Makefile2
-rw-r--r--audio/alsa-utils/Makefile2
-rw-r--r--audio/amarok-kde4/Makefile3
-rw-r--r--audio/beast/Makefile3
-rw-r--r--audio/cam/Makefile3
-rw-r--r--audio/ccaudio2/Makefile3
-rw-r--r--audio/cdplay/Makefile3
-rw-r--r--audio/dagrab/Makefile3
-rw-r--r--audio/dir2ogg/Makefile3
-rw-r--r--audio/dtmfdial/Makefile3
-rw-r--r--audio/eawpats/Makefile2
-rw-r--r--audio/eawplus/Makefile3
-rw-r--r--audio/etcd/Makefile3
-rw-r--r--audio/festdoc/Makefile3
-rw-r--r--audio/festival/Makefile3
-rw-r--r--audio/festlex-cmu/Makefile3
-rw-r--r--audio/festlex-oald/Makefile3
-rw-r--r--audio/festlex-poslex/Makefile3
-rw-r--r--audio/festvox-don/Makefile3
-rw-r--r--audio/festvox-el11/Makefile3
-rw-r--r--audio/festvox-kal16/Makefile3
-rw-r--r--audio/festvox-kal8/Makefile3
-rw-r--r--audio/festvox-ked16/Makefile3
-rw-r--r--audio/festvox-ked8/Makefile3
-rw-r--r--audio/festvox-rab16/Makefile3
-rw-r--r--audio/festvox-rab8/Makefile3
-rw-r--r--audio/festvox-russian/Makefile3
-rw-r--r--audio/flake/Makefile3
-rw-r--r--audio/funktrackergold/Makefile6
-rw-r--r--audio/gmixer/Makefile3
-rw-r--r--audio/gnomoradio/Makefile3
-rw-r--r--audio/gnupod/Makefile3
-rw-r--r--audio/gtkguitune/Makefile2
-rw-r--r--audio/harp/Makefile3
-rw-r--r--audio/id3ed/Makefile3
-rw-r--r--audio/julius/Makefile3
-rw-r--r--audio/libaudiofile/Makefile3
-rw-r--r--audio/libworkman/Makefile3
-rw-r--r--audio/linux-f10-pulseaudio-libs/Makefile3
-rw-r--r--audio/lollypop/Makefile3
-rw-r--r--audio/mehdiaplayer/Makefile2
-rw-r--r--audio/mixer.app/Makefile2
-rw-r--r--audio/mixmos/Makefile2
-rw-r--r--audio/mp32ogg/Makefile3
-rw-r--r--audio/mp3info/Makefile5
-rw-r--r--audio/mp3rename/Makefile2
-rw-r--r--audio/mpdcon/Makefile3
-rw-r--r--audio/nspmod/Makefile3
-rw-r--r--audio/openal/Makefile2
-rw-r--r--audio/opus-tools/Makefile3
-rw-r--r--audio/opus/Makefile3
-rw-r--r--audio/opusfile/Makefile3
-rw-r--r--audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile1
-rw-r--r--audio/play/Makefile2
-rw-r--r--audio/pm3umpdl/Makefile5
-rw-r--r--audio/pms/Makefile1
-rw-r--r--audio/puddletag/Makefile3
-rw-r--r--audio/rawrec/Makefile2
-rw-r--r--audio/rexima/Makefile3
-rw-r--r--audio/s3mod/Makefile5
-rw-r--r--audio/soundgrab/Makefile1
-rw-r--r--audio/soundtracker/Makefile3
-rw-r--r--audio/spek/Makefile2
-rw-r--r--audio/squeezeboxserver-superdatetime/Makefile2
-rw-r--r--audio/streamtuner/Makefile1
-rw-r--r--audio/tcd/Makefile3
-rw-r--r--audio/tosha/Makefile3
-rw-r--r--audio/tuxguitar/Makefile9
-rw-r--r--audio/vagalume/Makefile3
-rw-r--r--audio/vitunes/Makefile3
-rw-r--r--audio/workman/Makefile3
-rw-r--r--audio/xanalyser/Makefile3
-rw-r--r--audio/xfce4-pulseaudio-plugin/Makefile3
-rw-r--r--audio/xmix/Makefile4
-rw-r--r--audio/xmms-ladspa/Makefile3
-rw-r--r--audio/xmms-mailnotify/Makefile3
-rw-r--r--audio/xpi-musicpm/Makefile2
-rw-r--r--audio/xwave/Makefile3
-rw-r--r--benchmarks/cpipe/Makefile3
-rw-r--r--benchmarks/dbench/Makefile3
-rw-r--r--benchmarks/hpl/Makefile3
-rw-r--r--benchmarks/imb/Makefile3
-rw-r--r--benchmarks/netio/Makefile3
-rw-r--r--benchmarks/p5-Benchmark-Stopwatch/Makefile1
-rw-r--r--benchmarks/sipp/Makefile1
-rw-r--r--benchmarks/super-smack/Makefile2
-rw-r--r--benchmarks/ubench/Makefile3
-rw-r--r--benchmarks/webbench/Makefile3
-rw-r--r--biology/biococoa/Makefile3
-rw-r--r--biology/clustalw/Makefile5
-rw-r--r--biology/t_coffee/Makefile3
-rw-r--r--cad/basicdsp/Makefile3
-rw-r--r--cad/cascade/Makefile3
-rw-r--r--cad/cider/Makefile3
-rw-r--r--cad/electric-ng/Makefile3
-rw-r--r--cad/fidocadj/Makefile3
-rw-r--r--cad/geda/Makefile3
-rw-r--r--cad/kicad-devel/Makefile3
-rw-r--r--cad/layouteditor/Makefile3
-rw-r--r--cad/meshdev/Makefile3
-rw-r--r--chinese/auto-cn-l10n/Makefile2
-rw-r--r--chinese/fcitx-googlepinyin/Makefile2
-rw-r--r--chinese/ibus-pinyin/Makefile2
-rw-r--r--chinese/joe/Makefile3
-rw-r--r--chinese/kcfonts/Makefile3
-rw-r--r--chinese/libgooglepinyin/Makefile2
-rw-r--r--chinese/opencc/Makefile2
-rw-r--r--chinese/p5-Lingua-ZH-Segment/Makefile1
-rw-r--r--chinese/pyzy/Makefile2
-rw-r--r--chinese/xpdf/Makefile3
-rw-r--r--comms/aldo/Makefile3
-rw-r--r--comms/bpl+/Makefile3
-rw-r--r--comms/chirp/Makefile3
-rw-r--r--comms/chu/Makefile3
-rw-r--r--comms/cqrlog/Makefile3
-rw-r--r--comms/cwdaemon/Makefile3
-rw-r--r--comms/ebook2cw/Makefile3
-rw-r--r--comms/ebook2cwgui/Makefile3
-rw-r--r--comms/esmska/Makefile2
-rw-r--r--comms/fl_moxgen/Makefile3
-rw-r--r--comms/fllog/Makefile3
-rw-r--r--comms/flrig/Makefile3
-rw-r--r--comms/flwrap/Makefile3
-rw-r--r--comms/geoid/Makefile3
-rw-r--r--comms/gnuradio/Makefile3
-rw-r--r--comms/gtkmmorse/Makefile3
-rw-r--r--comms/ibp/Makefile3
-rw-r--r--comms/kb/Makefile3
-rw-r--r--comms/libfec/Makefile3
-rw-r--r--comms/linpsk/Makefile3
-rw-r--r--comms/locator/Makefile2
-rw-r--r--comms/morse/Makefile3
-rw-r--r--comms/nasawash/Makefile3
-rw-r--r--comms/nec2c/Makefile3
-rw-r--r--comms/o2sms/Makefile3
-rw-r--r--comms/picocom/Makefile2
-rw-r--r--comms/predict/Makefile3
-rw-r--r--comms/pyla/Makefile6
-rw-r--r--comms/qrq/Makefile3
-rw-r--r--comms/qsstv/Makefile3
-rw-r--r--comms/quisk/Makefile3
-rw-r--r--comms/soundmodem/Makefile3
-rw-r--r--comms/splat/Makefile3
-rw-r--r--comms/sredird/Makefile3
-rw-r--r--comms/usrp/Makefile3
-rw-r--r--comms/vrflash/Makefile3
-rw-r--r--comms/wsjt/Makefile3
-rw-r--r--comms/wspr/Makefile3
-rw-r--r--comms/wwl/Makefile3
-rw-r--r--comms/wy60/Makefile2
-rw-r--r--comms/xdx/Makefile3
-rw-r--r--comms/xlog/Makefile1
-rw-r--r--comms/xnec2c/Makefile3
-rw-r--r--comms/xwota/Makefile3
-rw-r--r--comms/yagiuda/Makefile3
-rw-r--r--comms/yfklog/Makefile7
-rw-r--r--converters/btoa/Makefile3
-rw-r--r--converters/cl-babel/Makefile3
-rw-r--r--converters/cocot/Makefile3
-rw-r--r--converters/fconv/Makefile3
-rw-r--r--converters/iconv-extra/Makefile3
-rw-r--r--converters/iconv-rfc1345/Makefile3
-rw-r--r--converters/iconv/Makefile3
-rw-r--r--converters/ish/Makefile2
-rw-r--r--converters/libiconv/Makefile3
-rw-r--r--converters/o3read/Makefile3
-rw-r--r--converters/p5-Cstools/Makefile3
-rw-r--r--converters/p5-Encode-Detect/Makefile1
-rw-r--r--converters/p5-Encode-DoubleEncodedUTF8/Makefile1
-rw-r--r--converters/pdf2djvu/Makefile2
-rw-r--r--converters/wkhtmltopdf/Makefile3
-rw-r--r--databases/cassandra/Makefile3
-rw-r--r--databases/cassandra2/Makefile3
-rw-r--r--databases/couchdb/Makefile3
-rw-r--r--databases/dbview/Makefile3
-rw-r--r--databases/gnats4/Makefile3
-rw-r--r--databases/isql-viewer/Makefile4
-rw-r--r--databases/jdbm2/Makefile2
-rw-r--r--databases/ldb/Makefile3
-rw-r--r--databases/luadbi/Makefile2
-rw-r--r--databases/memcached/Makefile5
-rw-r--r--databases/memcacheq/Makefile5
-rw-r--r--databases/mysql-connector-c++/Makefile3
-rw-r--r--databases/mysql-connector-java/Makefile3
-rw-r--r--databases/mysql-proxy/Makefile3
-rw-r--r--databases/mysql-workbench51/Makefile3
-rw-r--r--databases/mysql51-server/Makefile3
-rw-r--r--databases/mysql55-server/Makefile3
-rw-r--r--databases/mysql56-server/Makefile3
-rw-r--r--databases/nagios-check_postgres_replication/Makefile3
-rw-r--r--databases/ntdb/Makefile3
-rw-r--r--databases/openark-kit/Makefile2
-rw-r--r--databases/p5-Class-DBI-Pg/Makefile3
-rw-r--r--databases/p5-DBD-InterBase/Makefile1
-rw-r--r--databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile1
-rw-r--r--databases/p5-DBIx-Class-PassphraseColumn/Makefile1
-rw-r--r--databases/p5-DBIx-Class-TimeStamp/Makefile1
-rw-r--r--databases/p5-DBIx-Ease/Makefile4
-rw-r--r--databases/p5-DBIx-HA/Makefile1
-rw-r--r--databases/p5-DBIx-MySQLSequence/Makefile1
-rw-r--r--databases/p5-MongoDB/Makefile2
-rw-r--r--databases/p5-Oryx/Makefile3
-rw-r--r--databases/p5-Pg/Makefile3
-rw-r--r--databases/p5-RRD-Simple/Makefile3
-rw-r--r--databases/p5-Rose-DBx-Object-MoreHelpers/Makefile3
-rw-r--r--databases/p5-TokyoCabinet/Makefile3
-rw-r--r--databases/pgadmin3/Makefile3
-rw-r--r--databases/pgagent/Makefile3
-rw-r--r--databases/pgbadger/Makefile3
-rw-r--r--databases/pgtcl/Makefile7
-rw-r--r--databases/postgresql-libpgeasy/Makefile3
-rw-r--r--databases/postgresql84-server/Makefile3
-rw-r--r--databases/postgresql91-server/Makefile3
-rw-r--r--databases/postgresql92-server/Makefile3
-rw-r--r--databases/py-apsw/Makefile4
-rw-r--r--databases/py-bsddb/Makefile3
-rw-r--r--databases/py-gdbm/Makefile3
-rw-r--r--databases/py-mysql-connector-python/Makefile3
-rw-r--r--databases/py-mysql-connector-python2/Makefile3
-rw-r--r--databases/py-sqlalchemy-migrate/Makefile2
-rw-r--r--databases/py-sqlite3/Makefile3
-rw-r--r--databases/soci/Makefile3
-rw-r--r--databases/sqlclient/Makefile3
-rw-r--r--databases/tdb/Makefile3
-rw-r--r--deskutils/cal/Makefile3
-rw-r--r--deskutils/cartotheque/Makefile3
-rw-r--r--deskutils/charmap/Makefile3
-rw-r--r--deskutils/dlume/Makefile2
-rw-r--r--deskutils/gnustep-wrapper/Makefile3
-rw-r--r--deskutils/gworkspace-gwmetadata/Makefile3
-rw-r--r--deskutils/gworkspace/Makefile3
-rw-r--r--deskutils/hot-babe/Makefile3
-rw-r--r--deskutils/libgcal/Makefile2
-rw-r--r--deskutils/libopensync-plugin-vformat-devel/Makefile3
-rw-r--r--deskutils/mrundlg/Makefile2
-rw-r--r--deskutils/osynctool/Makefile3
-rw-r--r--deskutils/plan/Makefile1
-rw-r--r--deskutils/plasma-applet-playwolf/Makefile2
-rw-r--r--deskutils/plopfolio/Makefile3
-rw-r--r--deskutils/rednotebook/Makefile3
-rw-r--r--deskutils/sliderule/Makefile3
-rw-r--r--deskutils/sugarcrm/Makefile3
-rw-r--r--deskutils/systempreferences/Makefile3
-rw-r--r--deskutils/treeline/Makefile1
-rw-r--r--deskutils/tuxcards/Makefile3
-rw-r--r--deskutils/vboxgtk/Makefile2
-rw-r--r--deskutils/vnc2flv/Makefile1
-rw-r--r--deskutils/wmpinboard/Makefile2
-rw-r--r--deskutils/xcalendar/Makefile2
-rw-r--r--deskutils/xfce4-notifyd/Makefile3
-rw-r--r--deskutils/xfce4-volumed/Makefile3
-rw-r--r--deskutils/xmaddressbook/Makefile3
-rw-r--r--deskutils/xpostitPlus/Makefile3
-rw-r--r--devel/ElectricFence/Makefile3
-rw-r--r--devel/adabooch/Makefile3
-rw-r--r--devel/ahven/Makefile3
-rw-r--r--devel/apache-ant/Makefile2
-rw-r--r--devel/apr1/Makefile3
-rw-r--r--devel/argp-standalone/Makefile3
-rw-r--r--devel/arm-elf-binutils/Makefile3
-rw-r--r--devel/asl/Makefile3
-rw-r--r--devel/autoconf/Makefile3
-rw-r--r--devel/autoconf213/Makefile3
-rw-r--r--devel/automake14/Makefile3
-rw-r--r--devel/avalon-framework/Makefile3
-rw-r--r--devel/avr-gcc-devel/Makefile3
-rw-r--r--devel/avr-gcc/Makefile3
-rw-r--r--devel/avr-gdb/Makefile1
-rw-r--r--devel/avr-libc/Makefile1
-rw-r--r--devel/avro-c/Makefile3
-rw-r--r--devel/avro-cpp/Makefile3
-rw-r--r--devel/binutils/Makefile3
-rw-r--r--devel/bncsutil-ghost++/Makefile2
-rw-r--r--devel/bugzilla44/Makefile3
-rw-r--r--devel/c-unit/Makefile2
-rw-r--r--devel/cdecl/Makefile3
-rw-r--r--devel/cflow/Makefile3
-rw-r--r--devel/cl-alexandria/Makefile3
-rw-r--r--devel/cl-asdf/Makefile3
-rw-r--r--devel/cl-trivial-features/Makefile3
-rw-r--r--devel/cl-trivial-gray-streams/Makefile3
-rw-r--r--devel/cld/Makefile2
-rw-r--r--devel/cld2/Makefile3
-rw-r--r--devel/compiler-rt/Makefile3
-rw-r--r--devel/cook/Makefile3
-rw-r--r--devel/cvs-devel/Makefile3
-rw-r--r--devel/cvs2svn/Makefile3
-rw-r--r--devel/cvsdadm/Makefile3
-rw-r--r--devel/cvsweb/Makefile4
-rw-r--r--devel/cvsweb3/Makefile4
-rw-r--r--devel/cvswrap/Makefile3
-rw-r--r--devel/cweb/Makefile3
-rw-r--r--devel/d-feet/Makefile3
-rw-r--r--devel/ddd/Makefile3
-rw-r--r--devel/dissy/Makefile2
-rw-r--r--devel/djgpp-binutils/Makefile3
-rw-r--r--devel/dotconf/Makefile2
-rw-r--r--devel/elftoaout/Makefile3
-rw-r--r--devel/epm/Makefile1
-rw-r--r--devel/eventxx/Makefile1
-rw-r--r--devel/f77flow/Makefile3
-rw-r--r--devel/fb303/Makefile3
-rw-r--r--devel/ffcall/Makefile4
-rw-r--r--devel/fortran-utils/Makefile3
-rw-r--r--devel/freeocl/Makefile2
-rw-r--r--devel/ftnchek/Makefile3
-rw-r--r--devel/gazpacho/Makefile3
-rw-r--r--devel/gconf2/Makefile3
-rw-r--r--devel/gindent/Makefile3
-rw-r--r--devel/gmake/Makefile3
-rw-r--r--devel/gnu-efi/Makefile3
-rw-r--r--devel/gnulibiberty/Makefile3
-rw-r--r--devel/google-gdata/Makefile2
-rw-r--r--devel/google-perftools/Makefile3
-rw-r--r--devel/google-sparsehash/Makefile5
-rw-r--r--devel/gorm/Makefile3
-rw-r--r--devel/gperf/Makefile3
-rw-r--r--devel/gtkparasite/Makefile3
-rw-r--r--devel/guichan/Makefile2
-rw-r--r--devel/hadoop2/Makefile9
-rw-r--r--devel/htable/Makefile3
-rw-r--r--devel/itext/Makefile3
-rw-r--r--devel/javolution/Makefile3
-rw-r--r--devel/jiic/Makefile3
-rw-r--r--devel/kdevelop-kde4/Makefile3
-rw-r--r--devel/kdevelop-pg-qt/Makefile3
-rw-r--r--devel/kdevelop-php-docs/Makefile3
-rw-r--r--devel/kdevelop-php/Makefile3
-rw-r--r--devel/kdevplatform/Makefile3
-rw-r--r--devel/lcov/Makefile3
-rw-r--r--devel/libaura/Makefile3
-rw-r--r--devel/libavl/Makefile3
-rw-r--r--devel/libbfd/Makefile3
-rw-r--r--devel/libdict/Makefile2
-rw-r--r--devel/libelf/Makefile3
-rw-r--r--devel/libexecinfo/Makefile3
-rw-r--r--devel/libffi/Makefile3
-rw-r--r--devel/libglade2/Makefile3
-rw-r--r--devel/libhash/Makefile2
-rw-r--r--devel/libiomp5-devel/Makefile3
-rw-r--r--devel/libkgapi/Makefile3
-rw-r--r--devel/liblouisxml/Makefile2
-rw-r--r--devel/libmatheval/Makefile1
-rw-r--r--devel/libmpsse/Makefile2
-rw-r--r--devel/libnxt/Makefile2
-rw-r--r--devel/liboop/Makefile2
-rw-r--r--devel/libopensync/Makefile3
-rw-r--r--devel/libpasori/Makefile3
-rw-r--r--devel/libruin/Makefile3
-rw-r--r--devel/libsigc++12/Makefile3
-rw-r--r--devel/libublio/Makefile3
-rw-r--r--devel/libunicode/Makefile3
-rw-r--r--devel/libx86/Makefile3
-rw-r--r--devel/libzookeeper/Makefile3
-rw-r--r--devel/libzrtpcpp/Makefile3
-rw-r--r--devel/linux-c6-qt47/Makefile3
-rw-r--r--devel/linux_kdump/Makefile3
-rw-r--r--devel/llvm-devel/Makefile3
-rw-r--r--devel/m17n-db/Makefile6
-rw-r--r--devel/m17n-lib/Makefile3
-rw-r--r--devel/m6811-binutils/Makefile3
-rw-r--r--devel/maven-ant-tasks/Makefile3
-rw-r--r--devel/maven3/Makefile3
-rw-r--r--devel/maven31/Makefile3
-rw-r--r--devel/mingw32-openssl/Makefile7
-rw-r--r--devel/mingw32-zlib/Makefile3
-rw-r--r--devel/mm/Makefile3
-rw-r--r--devel/mph/Makefile3
-rw-r--r--devel/msp430-binutils/Makefile6
-rw-r--r--devel/msp430-gcc/Makefile6
-rw-r--r--devel/msp430-gdb/Makefile4
-rw-r--r--devel/msp430-libc/Makefile3
-rw-r--r--devel/msp430mcu/Makefile3
-rw-r--r--devel/ncurses/Makefile1
-rw-r--r--devel/netscape-java40/Makefile3
-rw-r--r--devel/nxt-python/Makefile2
-rw-r--r--devel/ocaml-sexplib/Makefile3
-rw-r--r--devel/ocaml-typeconv/Makefile3
-rw-r--r--devel/opencvs/Makefile5
-rw-r--r--devel/p5-AnyEvent-AIO/Makefile1
-rw-r--r--devel/p5-App-GitHub/Makefile1
-rw-r--r--devel/p5-B-Hooks-OP-PPAddr/Makefile1
-rw-r--r--devel/p5-B-OPCheck/Makefile1
-rw-r--r--devel/p5-Badger/Makefile1
-rw-r--r--devel/p5-Cache-AgainstFile/Makefile1
-rw-r--r--devel/p5-Carp-Clan-Share/Makefile1
-rw-r--r--devel/p5-Class-Accessor-Fast-Contained/Makefile1
-rw-r--r--devel/p5-Class-Accessor-Installer/Makefile1
-rw-r--r--devel/p5-Class-Delegation/Makefile2
-rw-r--r--devel/p5-Class-Measure/Makefile1
-rw-r--r--devel/p5-Class-Tom/Makefile1
-rw-r--r--devel/p5-Config-IniHash/Makefile3
-rw-r--r--devel/p5-Config-Wrest/Makefile1
-rw-r--r--devel/p5-Danga-Socket-Callback/Makefile1
-rw-r--r--devel/p5-Data-JavaScript-Anon/Makefile1
-rw-r--r--devel/p5-Data-Remember/Makefile1
-rw-r--r--devel/p5-DateConvert/Makefile3
-rw-r--r--devel/p5-DateTime-Format-DateParse/Makefile3
-rw-r--r--devel/p5-Devel-Callsite/Makefile1
-rw-r--r--devel/p5-Devel-ebug/Makefile1
-rw-r--r--devel/p5-Dist-Zilla/Makefile1
-rw-r--r--devel/p5-Event-Notify/Makefile1
-rw-r--r--devel/p5-File-Find-Rule-Perl/Makefile1
-rw-r--r--devel/p5-File-Finder/Makefile1
-rw-r--r--devel/p5-File-Tail-Dir/Makefile1
-rw-r--r--devel/p5-Ioctl/Makefile3
-rw-r--r--devel/p5-Lingua-JA-Fold/Makefile1
-rw-r--r--devel/p5-Locale-Maketext-Lexicon/Makefile3
-rw-r--r--devel/p5-Log-Dispatch-Array/Makefile1
-rw-r--r--devel/p5-Log-Dispatch-File-Stamped/Makefile1
-rw-r--r--devel/p5-Log-Dispatch-Scribe/Makefile1
-rw-r--r--devel/p5-Log-Trace/Makefile1
-rw-r--r--devel/p5-Module-CPANfile/Makefile1
-rw-r--r--devel/p5-Module-Info-File/Makefile1
-rw-r--r--devel/p5-Module-Util/Makefile1
-rw-r--r--devel/p5-MooseX-AttributeShortcuts/Makefile1
-rw-r--r--devel/p5-MooseX-Has-Options/Makefile1
-rw-r--r--devel/p5-MouseX-Getopt/Makefile1
-rw-r--r--devel/p5-Object-Realize-Later/Makefile1
-rw-r--r--devel/p5-PHP-Serialization/Makefile1
-rw-r--r--devel/p5-Perl-Tidy/Makefile1
-rw-r--r--devel/p5-Proc-Wait3/Makefile1
-rw-r--r--devel/p5-ReadLine-Gnu/Makefile3
-rw-r--r--devel/p5-ReadLine-Perl/Makefile5
-rw-r--r--devel/p5-ReadLine-TTYtter/Makefile3
-rw-r--r--devel/p5-Set-ConsistentHash/Makefile1
-rw-r--r--devel/p5-Stream-Reader/Makefile1
-rw-r--r--devel/p5-Sys-RunAlone/Makefile1
-rw-r--r--devel/p5-Sys-RunAlways/Makefile1
-rw-r--r--devel/p5-Sys-Syscall/Makefile1
-rw-r--r--devel/p5-TAP-SimpleOutput/Makefile1
-rw-r--r--devel/p5-Term-VT102-Boundless/Makefile1
-rw-r--r--devel/p5-Term-VT102/Makefile1
-rw-r--r--devel/p5-Test-Assertions/Makefile1
-rw-r--r--devel/p5-Test-FailWarnings/Makefile1
-rw-r--r--devel/p5-Test-File-ShareDir/Makefile1
-rw-r--r--devel/p5-Test-HexString/Makefile1
-rw-r--r--devel/p5-Test-InDistDir/Makefile1
-rw-r--r--devel/p5-Test-JSON/Makefile1
-rw-r--r--devel/p5-Test-Moose-More/Makefile1
-rw-r--r--devel/p5-Test-Script/Makefile1
-rw-r--r--devel/p5-Test-SubCalls/Makefile1
-rw-r--r--devel/p5-Test-Without-Module/Makefile1
-rw-r--r--devel/p5-Test-XML-Valid/Makefile1
-rw-r--r--devel/p5-Thread-Suspend/Makefile7
-rw-r--r--devel/p5-Tie-File-AsHash/Makefile1
-rw-r--r--devel/p5-Tie-Util/Makefile1
-rw-r--r--devel/p5-Time-Out/Makefile1
-rw-r--r--devel/p5-TimeDate/Makefile3
-rw-r--r--devel/p5-TraceFuncs/Makefile3
-rw-r--r--devel/p5-forks/Makefile3
-rw-r--r--devel/p5-orz/Makefile3
-rw-r--r--devel/pcre/Makefile7
-rw-r--r--devel/pear-IO_Bit/Makefile3
-rw-r--r--devel/phpsh/Makefile5
-rw-r--r--devel/powerpc64-gcc/Makefile3
-rw-r--r--devel/ppl/Makefile5
-rw-r--r--devel/protobuf25/Makefile2
-rw-r--r--devel/psptoolchain-binutils/Makefile3
-rw-r--r--devel/psptoolchain-gcc-stage1/Makefile3
-rw-r--r--devel/psptoolchain-gdb/Makefile3
-rw-r--r--devel/psptoolchain-newlib/Makefile3
-rw-r--r--devel/pth/Makefile3
-rw-r--r--devel/py-argparse/Makefile2
-rw-r--r--devel/py-avro/Makefile3
-rw-r--r--devel/py-cld/Makefile3
-rw-r--r--devel/py-cmdln/Makefile2
-rw-r--r--devel/py-country/Makefile1
-rw-r--r--devel/py-extremes/Makefile3
-rw-r--r--devel/py-freebsd/Makefile3
-rw-r--r--devel/py-fsm/Makefile2
-rw-r--r--devel/py-game_sdl2/Makefile2
-rw-r--r--devel/py-gobject/Makefile3
-rw-r--r--devel/py-icu/Makefile3
-rw-r--r--devel/py-ipaddr/Makefile2
-rw-r--r--devel/py-meliae/Makefile2
-rw-r--r--devel/py-orbit/Makefile3
-rw-r--r--devel/py-prettytable/Makefile3
-rw-r--r--devel/py-protocols/Makefile1
-rw-r--r--devel/py-pyev/Makefile1
-rw-r--r--devel/py-pygpx/Makefile3
-rw-r--r--devel/py-qpid/Makefile3
-rw-r--r--devel/py-qt4/bsd.pyqt.mk6
-rw-r--r--devel/py-sip/Makefile2
-rw-r--r--devel/py-statgrab/Makefile5
-rw-r--r--devel/py-ydbf/Makefile3
-rw-r--r--devel/py_static_check/Makefile3
-rw-r--r--devel/pygobject3-common/Makefile3
-rw-r--r--devel/pyobfuscate/Makefile3
-rw-r--r--devel/qmake/Makefile3
-rw-r--r--devel/qt4-assistant-adp/Makefile3
-rw-r--r--devel/qt4-libqtassistantclient/Makefile3
-rw-r--r--devel/qtcreator/Makefile3
-rw-r--r--devel/quickcheck++/Makefile3
-rw-r--r--devel/quilt/Makefile3
-rw-r--r--devel/rcs/Makefile3
-rw-r--r--devel/rcs57/Makefile3
-rw-r--r--devel/readline/Makefile4
-rw-r--r--devel/remake/Makefile3
-rw-r--r--devel/renpy/Makefile2
-rw-r--r--devel/ruby-langscan/Makefile3
-rw-r--r--devel/ruby-ncurses/Makefile3
-rw-r--r--devel/ruby-setup.rb/Makefile3
-rw-r--r--devel/rubygem-atoulme-antwrap/Makefile2
-rw-r--r--devel/rubygem-io-like/Makefile3
-rw-r--r--devel/sabre/Makefile3
-rw-r--r--devel/safe-iop/Makefile4
-rw-r--r--devel/sfio/Makefile2
-rw-r--r--devel/sgb/Makefile3
-rw-r--r--devel/shtool/Makefile5
-rw-r--r--devel/smake/Makefile3
-rw-r--r--devel/sourcenav/Makefile3
-rw-r--r--devel/storm/Makefile3
-rw-r--r--devel/stormlib-ghost++/Makefile2
-rw-r--r--devel/str/Makefile3
-rw-r--r--devel/streamhtmlparser/Makefile2
-rw-r--r--devel/stringencoders/Makefile4
-rw-r--r--devel/subversion-book/Makefile3
-rw-r--r--devel/subversion/Makefile.common3
-rw-r--r--devel/subversion17/Makefile.common3
-rw-r--r--devel/subversive/Makefile2
-rw-r--r--devel/talloc/Makefile3
-rw-r--r--devel/tcl-trf/Makefile3
-rw-r--r--devel/tclap/Makefile3
-rw-r--r--devel/terminality/Makefile3
-rw-r--r--devel/tevent/Makefile3
-rw-r--r--devel/thrift-c_glib/Makefile15
-rw-r--r--devel/thrift-cpp/Makefile8
-rw-r--r--devel/thrift/Makefile3
-rw-r--r--devel/tigcc/Makefile6
-rw-r--r--devel/ucommon/Makefile3
-rw-r--r--devel/udis86/Makefile3
-rw-r--r--devel/ultragetopt/Makefile2
-rw-r--r--devel/winpdb/Makefile3
-rw-r--r--devel/xwpe/Makefile3
-rw-r--r--devel/xxgdb/Makefile3
-rw-r--r--devel/yasm-devel/Makefile3
-rw-r--r--devel/zookeeper/Makefile3
-rw-r--r--devel/zpu-binutils/Makefile3
-rw-r--r--devel/zpu-gcc/Makefile3
-rw-r--r--dns/bind10/Makefile3
-rw-r--r--dns/djbdns/Makefile2
-rw-r--r--dns/doc/Makefile3
-rw-r--r--dns/inadyn/Makefile3
-rw-r--r--dns/ipcheck/Makefile1
-rw-r--r--dns/nsping/Makefile3
-rw-r--r--dns/py-adns/Makefile2
-rw-r--r--dns/samba-nsupdate/Makefile3
-rw-r--r--dns/updatedd/Makefile3
-rw-r--r--editors/abiword-docs/Makefile3
-rw-r--r--editors/abiword/Makefile3
-rw-r--r--editors/beav/Makefile2
-rw-r--r--editors/calligra-l10n/files/bsd.l10n.mk3
-rw-r--r--editors/calligra/Makefile3
-rw-r--r--editors/emacs/Makefile5
-rw-r--r--editors/gobby/Makefile2
-rw-r--r--editors/jove/Makefile3
-rw-r--r--editors/lazarus/Makefile2
-rw-r--r--editors/leafpad/Makefile1
-rw-r--r--editors/nano-devel/Makefile2
-rw-r--r--editors/nedit/Makefile3
-rw-r--r--editors/psgml/Makefile3
-rw-r--r--editors/spe/Makefile3
-rw-r--r--editors/sted/Makefile3
-rw-r--r--editors/tamago/Makefile6
-rw-r--r--editors/thoteditor/Makefile1
-rw-r--r--editors/uzap/Makefile3
-rw-r--r--editors/yasnippet/Makefile2
-rw-r--r--emulators/bsvc/Makefile3
-rw-r--r--emulators/cpmemu/Makefile6
-rw-r--r--emulators/cpmtools/Makefile3
-rw-r--r--emulators/darcnes/Makefile3
-rw-r--r--emulators/dboxfe/Makefile3
-rw-r--r--emulators/dtcyber/Makefile3
-rw-r--r--emulators/dynagen/Makefile3
-rw-r--r--emulators/hatari/Makefile3
-rw-r--r--emulators/mtools/Makefile3
-rw-r--r--emulators/mupen64plus-core/Makefile6
-rw-r--r--emulators/pcemu/Makefile3
-rw-r--r--emulators/qemu/Makefile3
-rw-r--r--emulators/raine/Makefile2
-rw-r--r--emulators/uae/Makefile3
-rw-r--r--emulators/virtio-kmod/Makefile3
-rw-r--r--emulators/vmsbackup/Makefile2
-rw-r--r--emulators/wxmupen64plus/Makefile4
-rw-r--r--finance/skrooge/Makefile3
-rw-r--r--french/aster/bsd.aster.mk3
-rw-r--r--french/tvdownloader/Makefile3
-rw-r--r--ftp/atftp/Makefile3
-rw-r--r--ftp/ftpsesame/Makefile3
-rw-r--r--ftp/gnustep-ftp/Makefile3
-rw-r--r--ftp/mirror/Makefile2
-rw-r--r--ftp/tftp-hpa/Makefile3
-rw-r--r--ftp/vsftpd/Makefile3
-rw-r--r--games/abuse_sdl/Makefile2
-rw-r--r--games/an/Makefile2
-rw-r--r--games/bugsx/Makefile3
-rw-r--r--games/cardpics/Makefile3
-rw-r--r--games/crafty-open-enormous/Makefile3
-rw-r--r--games/crafty-open-large/Makefile3
-rw-r--r--games/crafty-open-medium/Makefile3
-rw-r--r--games/dmjava/Makefile3
-rw-r--r--games/doom-freedoom/Makefile3
-rw-r--r--games/doom/Makefile2
-rw-r--r--games/ensemblist/Makefile3
-rw-r--r--games/evq3/Makefile2
-rw-r--r--games/flying/Makefile3
-rw-r--r--games/fortunate/Makefile2
-rw-r--r--games/freeciv-sounds/Makefile2
-rw-r--r--games/freedink-data/Makefile3
-rw-r--r--games/freedink-dfarc/Makefile3
-rw-r--r--games/gnugo/Makefile3
-rw-r--r--games/gnushogi/Makefile.common3
-rw-r--r--games/gtypist/Makefile3
-rw-r--r--games/ifm/Makefile3
-rw-r--r--games/ishido/Makefile3
-rw-r--r--games/katawa-shoujo/Makefile2
-rw-r--r--games/libggz/bsd.ggz.mk5
-rw-r--r--games/libmaitretarot/Makefile3
-rw-r--r--games/libmt_client/Makefile3
-rw-r--r--games/linux-doom3/Makefile5
-rw-r--r--games/linux-enemyterritory-shrub/Makefile3
-rw-r--r--games/linux-enemyterritory/Makefile4
-rw-r--r--games/linux-etqw-demo-server/Makefile2
-rw-r--r--games/linux-etqw-server/Makefile2
-rw-r--r--games/linux-quake3-demo/Makefile2
-rw-r--r--games/linux-quake3/Makefile4
-rw-r--r--games/linux-quake4-demo/Makefile2
-rw-r--r--games/linux-quake4/Makefile4
-rw-r--r--games/linux-rtcw/Makefile3
-rw-r--r--games/linux-ut2003-demo/Makefile2
-rw-r--r--games/liquidwar/Makefile3
-rw-r--r--games/maitretarot/Makefile3
-rw-r--r--games/mt_dolphin_ia/Makefile3
-rw-r--r--games/mt_gtk_client/Makefile3
-rw-r--r--games/nehquake/Makefile3
-rw-r--r--games/nethack32/Makefile2
-rw-r--r--games/nethack34/Makefile4
-rw-r--r--games/oldrunner/Makefile3
-rw-r--r--games/oonsoo/Makefile3
-rw-r--r--games/p5-Acme-GuessNumber/Makefile3
-rw-r--r--games/pycadia/Makefile2
-rw-r--r--games/quake-data/Makefile4
-rw-r--r--games/quake-source/Makefile2
-rw-r--r--games/quake2-source/Makefile2
-rw-r--r--games/quake3/Makefile2
-rw-r--r--games/scummvm/Makefile1
-rw-r--r--games/senken/Makefile2
-rw-r--r--games/sokoban/Makefile3
-rw-r--r--games/supertux-devel/Makefile2
-rw-r--r--games/supertux/Makefile2
-rw-r--r--games/timeseal/Makefile3
-rw-r--r--games/tractorgen/Makefile1
-rw-r--r--games/tycho/Makefile3
-rw-r--r--games/wmquake/Makefile3
-rw-r--r--games/wolfpack/Makefile3
-rw-r--r--games/worldofpadman/Makefile2
-rw-r--r--games/xbat/Makefile3
-rw-r--r--games/xbattle/Makefile2
-rw-r--r--games/xblackjack/Makefile3
-rw-r--r--games/xboing/Makefile3
-rw-r--r--games/xbubble/Makefile2
-rw-r--r--games/xcubes/Makefile3
-rw-r--r--games/xdemineur/Makefile3
-rw-r--r--games/xdino/Makefile3
-rw-r--r--games/xhexagons/Makefile3
-rw-r--r--games/xisola/Makefile3
-rw-r--r--games/xjig/Makefile3
-rw-r--r--games/xjump/Makefile2
-rw-r--r--games/xkoules/Makefile2
-rw-r--r--games/xlaby/Makefile3
-rw-r--r--games/xmball/Makefile3
-rw-r--r--games/xmille/Makefile3
-rw-r--r--games/xmines/Makefile3
-rw-r--r--games/xmlink/Makefile3
-rw-r--r--games/xneko/Makefile3
-rw-r--r--games/xoct/Makefile3
-rw-r--r--games/xoids/Makefile3
-rw-r--r--games/xoj/Makefile3
-rw-r--r--games/xosmulti/Makefile3
-rw-r--r--games/xpanex/Makefile3
-rw-r--r--games/xpipeman/Makefile3
-rw-r--r--games/xpyraminx/Makefile3
-rw-r--r--games/xrubik/Makefile3
-rw-r--r--games/xshisen/Makefile3
-rw-r--r--games/xshogi/Makefile3
-rw-r--r--games/xskewb/Makefile3
-rw-r--r--games/xtic/Makefile3
-rw-r--r--games/xtriangles/Makefile3
-rw-r--r--games/xtruco/Makefile3
-rw-r--r--german/alt-aspell/Makefile3
-rw-r--r--german/bugzilla44/Makefile3
-rw-r--r--graphics/4va/Makefile5
-rw-r--r--graphics/GraphicsMagick/Makefile1
-rw-r--r--graphics/Hermes/Makefile2
-rw-r--r--graphics/SciPlot/Makefile3
-rw-r--r--graphics/acidwarp/Makefile3
-rw-r--r--graphics/barcode/Makefile3
-rw-r--r--graphics/cal3d-devel/Makefile3
-rw-r--r--graphics/cegui/Makefile3
-rw-r--r--graphics/dc20pack/Makefile3
-rw-r--r--graphics/dmtx-utils/Makefile3
-rw-r--r--graphics/driconf/Makefile3
-rw-r--r--graphics/flasm/Makefile3
-rw-r--r--graphics/g2/Makefile3
-rw-r--r--graphics/gdk-pixbuf/Makefile2
-rw-r--r--graphics/gimp-app/Makefile3
-rw-r--r--graphics/gpaint/Makefile3
-rw-r--r--graphics/graphos/Makefile3
-rw-r--r--graphics/gtk-update-icon-cache/Makefile3
-rw-r--r--graphics/imlib2/Makefile3
-rw-r--r--graphics/imlib2_loaders/Makefile3
-rw-r--r--graphics/jasper/Makefile6
-rw-r--r--graphics/jpgtn/Makefile3
-rw-r--r--graphics/liblug/Makefile3
-rw-r--r--graphics/linplasma/Makefile3
-rw-r--r--graphics/netpbm/Makefile3
-rw-r--r--graphics/ocrad/Makefile1
-rw-r--r--graphics/ocropus/Makefile2
-rw-r--r--graphics/opengl-man/Makefile3
-rw-r--r--graphics/opennurbs/Makefile1
-rw-r--r--graphics/p5-Color-Calc/Makefile1
-rw-r--r--graphics/p5-Color-Palette/Makefile1
-rw-r--r--graphics/p5-Color-Scheme/Makefile1
-rw-r--r--graphics/p5-Image-PBMlib/Makefile1
-rw-r--r--graphics/p5-SpringGraph/Makefile3
-rw-r--r--graphics/p5-URI-GoogleChart/Makefile1
-rw-r--r--graphics/pear-IO_SWF/Makefile3
-rw-r--r--graphics/pecl-qrencode/Makefile3
-rw-r--r--graphics/pfscalibration/Makefile3
-rw-r--r--graphics/pfstmo/Makefile3
-rw-r--r--graphics/php5-swfed/Makefile3
-rw-r--r--graphics/pixelize/Makefile1
-rw-r--r--graphics/prison/Makefile3
-rw-r--r--graphics/py-gchartwrapper/Makefile2
-rw-r--r--graphics/py-glewpy/Makefile2
-rw-r--r--graphics/py-openexr/Makefile1
-rw-r--r--graphics/scr2png/Makefile3
-rw-r--r--graphics/sdl2_gfx/Makefile3
-rw-r--r--graphics/sdl_gfx/Makefile3
-rw-r--r--graphics/seam-carving-gui/Makefile2
-rw-r--r--graphics/seejpeg/Makefile3
-rw-r--r--graphics/separate/Makefile3
-rw-r--r--graphics/svgfig/Makefile5
-rw-r--r--graphics/tesseract-data/Makefile2
-rw-r--r--graphics/tesseract/Makefile2
-rw-r--r--graphics/timeless/Makefile3
-rw-r--r--graphics/wmicons/Makefile7
-rw-r--r--graphics/xbmbrowser/Makefile3
-rw-r--r--graphics/xfpovray/Makefile3
-rw-r--r--graphics/xli/Makefile1
-rw-r--r--graphics/xpdf/Makefile3
-rw-r--r--graphics/xwpick/Makefile3
-rw-r--r--graphics/zphoto/Makefile1
-rw-r--r--hebrew/hspell/Makefile3
-rw-r--r--irc/bitlbee/Makefile3
-rw-r--r--irc/cwirc/Makefile3
-rw-r--r--irc/keitairc2/Makefile3
-rw-r--r--irc/py-gozerbot/Makefile2
-rw-r--r--irc/quirc/Makefile3
-rw-r--r--irc/riece/Makefile1
-rw-r--r--irc/simpleirc/Makefile3
-rw-r--r--irc/thales/Makefile3
-rw-r--r--irc/weechat-devel/Makefile3
-rw-r--r--irc/weechat/Makefile3
-rw-r--r--japanese/FreeWnn-lib/Makefile6
-rw-r--r--japanese/FreeWnn-server/Makefile6
-rw-r--r--japanese/a2ps/Makefile2
-rw-r--r--japanese/ajaxzip2-data/Makefile3
-rw-r--r--japanese/anthy/Makefile3
-rw-r--r--japanese/bugzilla44/Makefile3
-rw-r--r--japanese/canna-lib/Makefile3
-rw-r--r--japanese/canna-server/Makefile3
-rw-r--r--japanese/dbskkd-cdb/Makefile3
-rw-r--r--japanese/dvi2tty/Makefile4
-rw-r--r--japanese/esecanna-module-vje25/Makefile3
-rw-r--r--japanese/esecanna-module-vje30/Makefile3
-rw-r--r--japanese/esecanna-module-wnn6/Makefile3
-rw-r--r--japanese/esecanna/Makefile3
-rw-r--r--japanese/font-migu/Makefile3
-rw-r--r--japanese/font-motoya-al/Makefile3
-rw-r--r--japanese/font-mplus-ipa/Makefile3
-rw-r--r--japanese/font-ume/Makefile3
-rw-r--r--japanese/gawk/Makefile3
-rw-r--r--japanese/hns/Makefile3
-rw-r--r--japanese/ibus-anthy/Makefile2
-rw-r--r--japanese/japaneseAFM/Makefile3
-rw-r--r--japanese/jed/Makefile3
-rw-r--r--japanese/jmode/Makefile3
-rw-r--r--japanese/k12/Makefile2
-rw-r--r--japanese/kana-no-quiz/Makefile3
-rw-r--r--japanese/kanji18/Makefile3
-rw-r--r--japanese/kappa20/Makefile2
-rw-r--r--japanese/kasumi/Makefile3
-rw-r--r--japanese/kcc/Makefile2
-rw-r--r--japanese/kon2-16dot/Makefile2
-rw-r--r--japanese/kterm/Makefile18
-rw-r--r--japanese/less/Makefile3
-rw-r--r--japanese/man-doc/Makefile3
-rw-r--r--japanese/marumoji-fonts/Makefile3
-rw-r--r--japanese/migemo/Makefile3
-rw-r--r--japanese/mime_pls/Makefile3
-rw-r--r--japanese/mtools/Makefile4
-rw-r--r--japanese/namazu/Makefile3
-rw-r--r--japanese/newosaka/Makefile2
-rw-r--r--japanese/nhocr/Makefile2
-rw-r--r--japanese/ochusha/Makefile3
-rw-r--r--japanese/plain2/Makefile4
-rw-r--r--japanese/prn/Makefile2
-rw-r--r--japanese/rogue_s/Makefile8
-rw-r--r--japanese/ruby-mecab/Makefile2
-rw-r--r--japanese/ruby-usersguide/Makefile3
-rw-r--r--japanese/scim-anthy/Makefile3
-rw-r--r--japanese/scim-canna/Makefile3
-rw-r--r--japanese/scim-skk/Makefile3
-rw-r--r--japanese/skkserv/Makefile2
-rw-r--r--japanese/slrn/Makefile2
-rw-r--r--japanese/texinfo/Makefile3
-rw-r--r--japanese/zipcodes/Makefile3
-rw-r--r--java/bootstrap-openjdk/Makefile3
-rw-r--r--java/classpath/Makefile10
-rw-r--r--java/eclipse-cdt/Makefile3
-rw-r--r--java/eclipse-windowbuilder/Makefile2
-rw-r--r--java/jakarta-bcel/Makefile3
-rw-r--r--java/jakarta-commons-httpclient/Makefile3
-rw-r--r--java/jakarta-regexp/Makefile3
-rw-r--r--java/java-zoneinfo/Makefile2
-rw-r--r--java/openjdk6/Makefile5
-rw-r--r--java/openjdk7/Makefile2
-rw-r--r--java/proguard/Makefile3
-rw-r--r--java/rubygem-rjb/Makefile2
-rw-r--r--korean/aleefonts-ttf/Makefile3
-rw-r--r--korean/man-doc/Makefile3
-rw-r--r--korean/nanumcoding-ttf/Makefile3
-rw-r--r--korean/nanumfonts-otf/Makefile3
-rw-r--r--lang/basic256/Makefile3
-rw-r--r--lang/clang-cheri/Makefile3
-rw-r--r--lang/clang-devel/Makefile3
-rw-r--r--lang/emacs-lisp-intro/Makefile3
-rw-r--r--lang/erlang/Makefile2
-rw-r--r--lang/gcc-aux/Makefile3
-rw-r--r--lang/gcc47-aux/Makefile3
-rw-r--r--lang/gcc5-aux/Makefile3
-rw-r--r--lang/ghc/Makefile3
-rw-r--r--lang/gnat_util/Makefile3
-rw-r--r--lang/gnatdroid-armv7/Makefile3
-rw-r--r--lang/gnatdroid-binutils/Makefile3
-rw-r--r--lang/guile/Makefile3
-rw-r--r--lang/libstdc++_stldoc_4.2.2/Makefile3
-rw-r--r--lang/ocaml/Makefile1
-rw-r--r--lang/p5-v6/Makefile2
-rw-r--r--lang/php5/Makefile6
-rw-r--r--lang/php55/Makefile6
-rw-r--r--lang/php56/Makefile6
-rw-r--r--lang/python-doc-html/Makefile5
-rw-r--r--lang/python-tools/Makefile3
-rw-r--r--lang/python27/Makefile3
-rw-r--r--lang/python32/Makefile3
-rw-r--r--lang/python33/Makefile3
-rw-r--r--lang/python34/Makefile3
-rw-r--r--lang/ratfor/Makefile3
-rw-r--r--lang/rhino/Makefile3
-rw-r--r--lang/ruby20/Makefile3
-rw-r--r--lang/ruby21/Makefile3
-rw-r--r--lang/ruby22/Makefile3
-rw-r--r--lang/sagittarius-scheme/Makefile5
-rw-r--r--lang/siod/Makefile3
-rw-r--r--lang/spidermonkey17/Makefile3
-rw-r--r--lang/spidermonkey170/Makefile3
-rw-r--r--lang/spidermonkey185/Makefile3
-rw-r--r--lang/spidermonkey24/Makefile3
-rw-r--r--lang/tcl84/Makefile3
-rw-r--r--lang/tcl85/Makefile3
-rw-r--r--lang/tcl86/Makefile3
-rw-r--r--lang/tinypy/Makefile2
-rw-r--r--lang/ypsilon/Makefile2
-rw-r--r--mail/antivirus-milter/Makefile3
-rw-r--r--mail/bsfilter/Makefile3
-rw-r--r--mail/bsmtp/Makefile3
-rw-r--r--mail/c-sig/Makefile3
-rw-r--r--mail/coolmail/Makefile5
-rw-r--r--mail/cucipop/Makefile3
-rw-r--r--mail/cyrus-imapd24/Makefile3
-rw-r--r--mail/dspam/Makefile3
-rw-r--r--mail/exim-doc-html/Makefile3
-rw-r--r--mail/exim/Makefile4
-rw-r--r--mail/exmh2/Makefile4
-rw-r--r--mail/greylite/Makefile3
-rw-r--r--mail/hbiff/Makefile3
-rw-r--r--mail/imaptools/Makefile3
-rw-r--r--mail/james/Makefile3
-rw-r--r--mail/lens/Makefile2
-rw-r--r--mail/libesmtp/Makefile2
-rw-r--r--mail/libsrs2/Makefile3
-rw-r--r--mail/lmtp2nntp/Makefile3
-rw-r--r--mail/mail-notification/Makefile3
-rw-r--r--mail/mailman/Makefile3
-rw-r--r--mail/mailtray/Makefile2
-rw-r--r--mail/mailx/Makefile4
-rw-r--r--mail/missey/Makefile2
-rw-r--r--mail/mlmmj/Makefile3
-rw-r--r--mail/nmh/Makefile3
-rw-r--r--mail/nullmailer/Makefile1
-rw-r--r--mail/opendkim/Makefile5
-rw-r--r--mail/opendmarc/Makefile5
-rw-r--r--mail/openwebmail/Makefile5
-rw-r--r--mail/p5-Email-Abstract/Makefile1
-rw-r--r--mail/p5-Email-FolderType-Net/Makefile1
-rw-r--r--mail/p5-Mail-LMLM/Makefile1
-rw-r--r--mail/p5-Net-SMTP-Server/Makefile3
-rw-r--r--mail/pm-lib/Makefile3
-rw-r--r--mail/postfix-current/Makefile3
-rw-r--r--mail/postfix/Makefile3
-rw-r--r--mail/postfixadmin/Makefile3
-rw-r--r--mail/qmail-contrib/Makefile3
-rw-r--r--mail/qmail-dk/Makefile4
-rw-r--r--mail/qmail-spamcontrol/Makefile3
-rw-r--r--mail/qmail/Makefile46
-rw-r--r--mail/queue-fix/Makefile3
-rw-r--r--mail/raysfilter/Makefile3
-rw-r--r--mail/ripmime/Makefile3
-rw-r--r--mail/sigrot/Makefile3
-rw-r--r--mail/sma/Makefile3
-rw-r--r--mail/smtpmail/Makefile3
-rw-r--r--mail/spamass-milter/Makefile3
-rw-r--r--mail/spamassassin/Makefile4
-rw-r--r--mail/spamd/Makefile3
-rw-r--r--mail/spamilter/Makefile1
-rw-r--r--mail/spamstats/Makefile3
-rw-r--r--mail/squirrelmail-translations/Makefile3
-rw-r--r--mail/ssmtp/Makefile2
-rw-r--r--mail/thunderbird-dictionaries/Makefile3
-rw-r--r--mail/tmda/Makefile6
-rw-r--r--mail/tpop3d/Makefile3
-rw-r--r--mail/vacation/Makefile3
-rw-r--r--mail/vexim/Makefile3
-rw-r--r--mail/xmail/Makefile3
-rw-r--r--mail/xpbiff/Makefile3
-rw-r--r--math/R-cran-SuppDists/Makefile2
-rw-r--r--math/R/Makefile3
-rw-r--r--math/apc/Makefile3
-rw-r--r--math/aspcud/Makefile3
-rw-r--r--math/blacs/Makefile3
-rw-r--r--math/carve/Makefile2
-rw-r--r--math/ccmath/Makefile3
-rw-r--r--math/clasp/Makefile3
-rw-r--r--math/clipper/Makefile3
-rw-r--r--math/foma/Makefile2
-rw-r--r--math/geg/Makefile3
-rw-r--r--math/gexpr/Makefile3
-rw-r--r--math/glm/Makefile3
-rw-r--r--math/glpk/Makefile3
-rw-r--r--math/gmp/Makefile3
-rw-r--r--math/gnubc/Makefile3
-rw-r--r--math/gotoblas/Makefile5
-rw-r--r--math/gringo/Makefile3
-rw-r--r--math/hfst/Makefile3
-rw-r--r--math/jags/Makefile9
-rw-r--r--math/jtransforms/Makefile3
-rw-r--r--math/laspack/Makefile5
-rw-r--r--math/ldouble/Makefile3
-rw-r--r--math/libjbigi/Makefile2
-rw-r--r--math/lrng/Makefile6
-rw-r--r--math/miracl/Makefile3
-rw-r--r--math/msieve/Makefile4
-rw-r--r--math/ngraph/Makefile2
-rw-r--r--math/octave/Makefile3
-rw-r--r--math/oleo/Makefile3
-rw-r--r--math/p5-Algorithm-Munkres/Makefile1
-rw-r--r--math/p5-Geo-Coordinates-UTM/Makefile1
-rw-r--r--math/p5-Math-Polynomial-Solve/Makefile1
-rw-r--r--math/p5-Set-IntSpan-Fast-XS/Makefile1
-rw-r--r--math/p5-Statistics-Basic/Makefile1
-rw-r--r--math/p5-Statistics-Forecast/Makefile1
-rw-r--r--math/p5-Statistics-LineFit/Makefile1
-rw-r--r--math/p5-Statistics-TTest/Makefile1
-rw-r--r--math/py-gato/Makefile1
-rw-r--r--math/py-gmpy/Makefile2
-rw-r--r--math/py-theano/Makefile3
-rw-r--r--math/qrupdate/Makefile3
-rw-r--r--math/sc/Makefile3
-rw-r--r--math/scalapack/Makefile3
-rw-r--r--math/slatec/Makefile3
-rw-r--r--math/slgrace/Makefile3
-rw-r--r--math/solitaire/Makefile3
-rw-r--r--math/units/Makefile3
-rw-r--r--math/wxMaxima/Makefile3
-rw-r--r--math/xldlas/Makefile3
-rw-r--r--misc/amfm/Makefile3
-rw-r--r--misc/asr-manpages/Makefile3
-rw-r--r--misc/bbjd/Makefile3
-rw-r--r--misc/buffer/Makefile5
-rw-r--r--misc/chef/Makefile5
-rw-r--r--misc/compat10x/Makefile3
-rw-r--r--misc/compat4x/Makefile7
-rw-r--r--misc/compat5x/Makefile3
-rw-r--r--misc/compat6x/Makefile5
-rw-r--r--misc/compat7x/Makefile3
-rw-r--r--misc/compat8x/Makefile3
-rw-r--r--misc/compat9x/Makefile3
-rw-r--r--misc/dahdi-kmod/Makefile3
-rw-r--r--misc/dahdi-kmod26/Makefile3
-rw-r--r--misc/dahdi/Makefile3
-rw-r--r--misc/diction/Makefile3
-rw-r--r--misc/dnetc/Makefile5
-rw-r--r--misc/dphys-config/Makefile2
-rw-r--r--misc/estic/Makefile3
-rw-r--r--misc/figlet/Makefile3
-rw-r--r--misc/findutils/Makefile3
-rw-r--r--misc/fortune-mod-bofh/Makefile7
-rw-r--r--misc/gnuit/Makefile3
-rw-r--r--misc/gnuls/Makefile3
-rw-r--r--misc/gnustep-examples/Makefile3
-rw-r--r--misc/gregexp/Makefile3
-rw-r--r--misc/hello/Makefile3
-rw-r--r--misc/histring/Makefile3
-rw-r--r--misc/imerge/Makefile3
-rw-r--r--misc/inplace/Makefile3
-rw-r--r--misc/ipbt/Makefile3
-rw-r--r--misc/iselect/Makefile3
-rw-r--r--misc/kde4-l10n/files/bsd.l10n.mk3
-rw-r--r--misc/mime-support/Makefile2
-rw-r--r--misc/mmv/Makefile2
-rw-r--r--misc/nsf/Makefile3
-rw-r--r--misc/openr2/Makefile2
-rw-r--r--misc/ossp-uuid/Makefile3
-rw-r--r--misc/p5-Locale-Msgcat/Makefile3
-rw-r--r--misc/pinfo/Makefile2
-rw-r--r--misc/py-yolk/Makefile3
-rw-r--r--misc/rtfm/Makefile3
-rw-r--r--misc/ruby-progressbar/Makefile2
-rw-r--r--misc/shuffle/Makefile3
-rw-r--r--misc/sls/Makefile3
-rw-r--r--misc/tcb/Makefile3
-rw-r--r--misc/team/Makefile3
-rw-r--r--misc/unclutter/Makefile3
-rw-r--r--misc/usbrh-libusb/Makefile3
-rw-r--r--misc/vera/Makefile3
-rw-r--r--misc/viz/Makefile3
-rw-r--r--misc/wmScoreBoard/Makefile3
-rw-r--r--misc/wmwork/Makefile3
-rw-r--r--misc/xgas/Makefile3
-rw-r--r--misc/xless/Makefile3
-rw-r--r--misc/xtar/Makefile2
-rw-r--r--multimedia/ab25/Makefile3
-rw-r--r--multimedia/assimp/Makefile3
-rw-r--r--multimedia/avbin/Makefile3
-rw-r--r--multimedia/bangarang/Makefile2
-rw-r--r--multimedia/ffmpegthumbnailer/Makefile3
-rw-r--r--multimedia/flvstreamer/Makefile3
-rw-r--r--multimedia/kdenlive/Makefile3
-rw-r--r--multimedia/libdvbpsi/Makefile3
-rw-r--r--multimedia/libdvdcss/Makefile3
-rw-r--r--multimedia/libkate/Makefile2
-rw-r--r--multimedia/mimms/Makefile3
-rw-r--r--multimedia/mjpg-streamer/Makefile3
-rw-r--r--multimedia/mpeg4ip/Makefile3
-rw-r--r--multimedia/mplayer-skins/Makefile3
-rw-r--r--multimedia/mplayer/Makefile.shared3
-rw-r--r--multimedia/mplex/Makefile3
-rw-r--r--multimedia/opencinematools/Makefile2
-rw-r--r--multimedia/pwcbsd/Makefile3
-rw-r--r--multimedia/pwcview/Makefile3
-rw-r--r--multimedia/replex/Makefile3
-rw-r--r--multimedia/smpeg/Makefile2
-rw-r--r--multimedia/spigot/Makefile5
-rw-r--r--multimedia/szap-s2/Makefile3
-rw-r--r--multimedia/tstools/Makefile3
-rw-r--r--multimedia/vcdimager/Makefile3
-rw-r--r--multimedia/vdr-plugin-control/Makefile3
-rw-r--r--multimedia/vdr-plugin-streamdev/Makefile3
-rw-r--r--multimedia/vdr-plugin-xineliboutput/Makefile6
-rw-r--r--multimedia/win32-codecs/Makefile3
-rw-r--r--multimedia/xanim/Makefile3
-rw-r--r--net-im/cicquin/Makefile3
-rw-r--r--net-im/ejabberd/Makefile5
-rw-r--r--net-im/emesene/Makefile4
-rw-r--r--net-im/jabber-pyicq/Makefile2
-rw-r--r--net-im/ktp-accounts-kcm/Makefile3
-rw-r--r--net-im/ktp-approver/Makefile3
-rw-r--r--net-im/ktp-auth-handler/Makefile3
-rw-r--r--net-im/ktp-common-internals/Makefile3
-rw-r--r--net-im/ktp-contact-list/Makefile3
-rw-r--r--net-im/ktp-contact-runner/Makefile3
-rw-r--r--net-im/ktp-desktop-applets/Makefile3
-rw-r--r--net-im/ktp-filetransfer-handler/Makefile3
-rw-r--r--net-im/ktp-kded-integration-module/Makefile3
-rw-r--r--net-im/ktp-send-file/Makefile3
-rw-r--r--net-im/ktp-text-ui/Makefile5
-rw-r--r--net-im/mikutter/Makefile3
-rw-r--r--net-im/p5-Net-XMPP2/Makefile1
-rw-r--r--net-im/plasma-applet-ktp/Makefile3
-rw-r--r--net-im/py-xmpppy-yahoo/Makefile3
-rw-r--r--net-im/qwit/Makefile2
-rw-r--r--net-im/telepathy-logger-qt4/Makefile3
-rw-r--r--net-mgmt/aggregate/Makefile3
-rw-r--r--net-mgmt/arpwatch/Makefile2
-rw-r--r--net-mgmt/clog/Makefile3
-rw-r--r--net-mgmt/flow-tools-ng/Makefile2
-rw-r--r--net-mgmt/grepip/Makefile2
-rw-r--r--net-mgmt/ipacctd/Makefile2
-rw-r--r--net-mgmt/nagvis/Makefile3
-rw-r--r--net-mgmt/nbtscan/Makefile1
-rw-r--r--net-mgmt/p5-Net-SNMP/Makefile2
-rw-r--r--net-mgmt/p5-SNMP_Session/Makefile2
-rw-r--r--net-mgmt/p5-jmx4perl/Makefile4
-rw-r--r--net-mgmt/phpipam/Makefile5
-rw-r--r--net-mgmt/pnp/Makefile3
-rw-r--r--net-mgmt/py-ipcalc/Makefile3
-rw-r--r--net-mgmt/send/Makefile3
-rw-r--r--net-mgmt/spectools/Makefile3
-rw-r--r--net-mgmt/subcalc/Makefile1
-rw-r--r--net-p2p/retroshare/Makefile3
-rw-r--r--net-p2p/rtgui/Makefile9
-rw-r--r--net-p2p/transmission-remote-gui/Makefile2
-rw-r--r--net/44bsd-rdist/Makefile3
-rw-r--r--net/aprsc/Makefile3
-rw-r--r--net/boinc_curses/Makefile4
-rw-r--r--net/bounce/Makefile3
-rw-r--r--net/cagibi/Makefile3
-rw-r--r--net/clamz/Makefile2
-rw-r--r--net/cvsup-static/Makefile3
-rw-r--r--net/dgd-lpmud/Makefile2
-rw-r--r--net/gnu-dico/Makefile3
-rw-r--r--net/gnu-radius/Makefile3
-rw-r--r--net/googlecl/Makefile2
-rw-r--r--net/grdesktop/Makefile3
-rw-r--r--net/hexinject/Makefile3
-rw-r--r--net/icmpinfo/Makefile3
-rw-r--r--net/iet/Makefile3
-rw-r--r--net/ifstat/Makefile3
-rw-r--r--net/igmpproxy/Makefile3
-rw-r--r--net/isc-dhcp41-server/Makefile3
-rw-r--r--net/isc-dhcp42-server/Makefile3
-rw-r--r--net/isc-dhcp43-server/Makefile3
-rw-r--r--net/jgroups/Makefile3
-rw-r--r--net/jwhois/Makefile3
-rw-r--r--net/kio-upnp-ms/Makefile6
-rw-r--r--net/kippo/Makefile2
-rw-r--r--net/libkfbapi/Makefile3
-rw-r--r--net/libproxy/Makefile2
-rw-r--r--net/lvwimax/Makefile3
-rw-r--r--net/mopd/Makefile3
-rw-r--r--net/msend/Makefile3
-rw-r--r--net/nc/Makefile3
-rw-r--r--net/netatalk3/Makefile1
-rw-r--r--net/netcat/Makefile3
-rw-r--r--net/netembryo/Makefile3
-rw-r--r--net/netpipes/Makefile3
-rw-r--r--net/netselect/Makefile2
-rw-r--r--net/ntraceroute/Makefile3
-rw-r--r--net/openbgpd/Makefile6
-rw-r--r--net/opendpi/Makefile2
-rw-r--r--net/openntpd/Makefile3
-rw-r--r--net/ostinato/Makefile4
-rw-r--r--net/p5-Net-CascadeCopy/Makefile1
-rw-r--r--net/p5-Net-GrowlClient/Makefile1
-rw-r--r--net/p5-Net-IRR/Makefile1
-rw-r--r--net/p5-Net-Proxy/Makefile1
-rw-r--r--net/p5-Net-Trackback/Makefile1
-rw-r--r--net/p5-POE-Component-PubSub/Makefile1
-rw-r--r--net/p5-PlRPC/Makefile3
-rw-r--r--net/p5-Samba-LDAP/Makefile1
-rw-r--r--net/p5-Socks/Makefile3
-rw-r--r--net/pload/Makefile3
-rw-r--r--net/py-amqplib/Makefile5
-rw-r--r--net/py-ndg_httpsclient/Makefile3
-rw-r--r--net/py-pypcap/Makefile2
-rw-r--r--net/py-pyvmomi/Makefile3
-rw-r--r--net/rinetd/Makefile3
-rw-r--r--net/rsync-bpc/Makefile3
-rw-r--r--net/rsync/Makefile9
-rw-r--r--net/samba36/Makefile3
-rw-r--r--net/samba4/Makefile3
-rw-r--r--net/samba41/Makefile3
-rw-r--r--net/samplicator/Makefile3
-rw-r--r--net/smb4k-kde4/Makefile3
-rw-r--r--net/sniffit/Makefile5
-rw-r--r--net/stf-6rd-kmod/Makefile3
-rw-r--r--net/suckblow/Makefile3
-rw-r--r--net/tcpcat/Makefile3
-rw-r--r--net/tcpshow/Makefile3
-rw-r--r--net/trafshow3/Makefile5
-rw-r--r--net/tramp/Makefile3
-rw-r--r--net/tridiavnc/Makefile3
-rw-r--r--net/uget/Makefile3
-rw-r--r--net/vblade/Makefile5
-rw-r--r--net/vnc/Makefile3
-rw-r--r--net/wmnd/Makefile1
-rw-r--r--net/wmnet/Makefile3
-rw-r--r--net/wmwifi/Makefile3
-rw-r--r--net/xpvm/Makefile3
-rw-r--r--net/yconalyzer/Makefile3
-rw-r--r--news/atp/Makefile3
-rw-r--r--news/husky/Makefile.local3
-rw-r--r--news/ifmail/Makefile3
-rw-r--r--news/inn/Makefile3
-rw-r--r--news/knews/Makefile3
-rw-r--r--news/lusernet/Makefile3
-rw-r--r--news/newsfetch/Makefile3
-rw-r--r--news/p5-NNTPClient/Makefile3
-rw-r--r--news/pgpmoose/Makefile3
-rw-r--r--news/plor/Makefile3
-rw-r--r--news/slrnface/Makefile3
-rw-r--r--ports-mgmt/p5-FreeBSD-Ports/Makefile3
-rw-r--r--ports-mgmt/portsearch/Makefile3
-rw-r--r--ports-mgmt/porttree/Makefile2
-rw-r--r--print/a2ps/Makefile4
-rw-r--r--print/abc2mtex/Makefile3
-rw-r--r--print/adobe-cmaps/Makefile3
-rw-r--r--print/alignmargins/Makefile3
-rw-r--r--print/asprint/Makefile3
-rw-r--r--print/auctex/Makefile3
-rw-r--r--print/bibview/Makefile3
-rw-r--r--print/cm-super/Makefile6
-rw-r--r--print/dot2tex/Makefile2
-rw-r--r--print/font-amsfonts/Makefile3
-rw-r--r--print/foo2zjs/Makefile4
-rw-r--r--print/foomatic-db/Makefile3
-rw-r--r--print/foxitreader/Makefile6
-rw-r--r--print/ghostscript7/Makefile5
-rw-r--r--print/ghostscript7/files/Makefile.bjc2503
-rw-r--r--print/ghostscript7/files/Makefile.cpca2
-rw-r--r--print/ghostscript7/files/Makefile.eplaser3
-rw-r--r--print/ghostscript7/files/Makefile.gprint3
-rw-r--r--print/ghostscript7/files/Makefile.lex70002
-rw-r--r--print/ghostscript7/files/Makefile.lx50002
-rw-r--r--print/ghostscript8/Makefile1
-rw-r--r--print/ghostscript9-agpl/Makefile1
-rw-r--r--print/ghostscript9/Makefile1
-rw-r--r--print/html2latex/Makefile3
-rw-r--r--print/kde_poster/Makefile3
-rw-r--r--print/latex-ltablex/Makefile6
-rw-r--r--print/latex-resume/Makefile3
-rw-r--r--print/latex2rtf/Makefile2
-rw-r--r--print/libotf/Makefile3
-rw-r--r--print/libpaper/Makefile3
-rw-r--r--print/openprinting/Makefile4
-rw-r--r--print/pdfbox/Makefile3
-rw-r--r--print/pic2fig/Makefile3
-rw-r--r--print/pkfonts300/Makefile3
-rw-r--r--print/pstotext/Makefile7
-rw-r--r--print/psutils/Makefile3
-rw-r--r--print/py-reportlab1/Makefile3
-rw-r--r--print/tex/Makefile6
-rw-r--r--print/trueprint/Makefile3
-rw-r--r--russian/artwiz-ru/Makefile3
-rw-r--r--russian/bugzilla44/Makefile3
-rw-r--r--science/crf++/Makefile3
-rw-r--r--science/fisicalab/Makefile3
-rw-r--r--science/gchemutils/Makefile3
-rw-r--r--science/p5-Geo-Coordinates-Converter/Makefile1
-rw-r--r--science/py-pydicom/Makefile2
-rw-r--r--science/py-scikit-learn/Makefile3
-rw-r--r--science/simsmith/Makefile3
-rw-r--r--science/xfce4-equake-plugin/Makefile3
-rw-r--r--security/ADMsmb/Makefile3
-rw-r--r--security/ADMsnmp/Makefile4
-rw-r--r--security/amap/Makefile3
-rw-r--r--security/amavis-stats/Makefile3
-rw-r--r--security/apache-xml-security-c/Makefile3
-rw-r--r--security/arirang/Makefile1
-rw-r--r--security/axTLS/Makefile3
-rw-r--r--security/blindelephant/Makefile3
-rw-r--r--security/bruteforceblocker/Makefile3
-rw-r--r--security/bsmtrace/Makefile3
-rw-r--r--security/ccsrch/Makefile5
-rw-r--r--security/checkpassword/Makefile3
-rw-r--r--security/clambc/Makefile3
-rw-r--r--security/courier-authlib/Makefile1
-rw-r--r--security/cracklib/Makefile2
-rw-r--r--security/cryptstring/Makefile2
-rw-r--r--security/dcetest/Makefile3
-rw-r--r--security/digest/Makefile3
-rw-r--r--security/dirmngr/Makefile3
-rw-r--r--security/dmitry/Makefile3
-rw-r--r--security/dradis/Makefile5
-rw-r--r--security/easypg/Makefile3
-rw-r--r--security/fakeroot/Makefile3
-rw-r--r--security/flawfinder/Makefile3
-rw-r--r--security/fprint_demo/Makefile3
-rw-r--r--security/fragroute/Makefile3
-rw-r--r--security/fuzzdb/Makefile4
-rw-r--r--security/gnupg/Makefile2
-rw-r--r--security/gnupg1/Makefile3
-rw-r--r--security/gnupg20/Makefile3
-rw-r--r--security/gwee/Makefile3
-rw-r--r--security/honggfuzz/Makefile2
-rw-r--r--security/hotssh/Makefile1
-rw-r--r--security/iaikpkcs11wrapper/Makefile3
-rw-r--r--security/isnprober/Makefile3
-rw-r--r--security/keychain/Makefile2
-rw-r--r--security/keyprint/Makefile3
-rw-r--r--security/kripp/Makefile3
-rw-r--r--security/l0pht-watch/Makefile3
-rw-r--r--security/libgcrypt/Makefile3
-rw-r--r--security/libgpg-error/Makefile3
-rw-r--r--security/libressl/Makefile3
-rw-r--r--security/libtasn1/Makefile3
-rw-r--r--security/logcheck/Makefile2
-rw-r--r--security/makepasswd/Makefile3
-rw-r--r--security/mindterm-binary/Makefile3
-rw-r--r--security/nettle/Makefile3
-rw-r--r--security/oath-toolkit/Makefile3
-rw-r--r--security/opencdk/Makefile1
-rw-r--r--security/openssh-portable/Makefile6
-rw-r--r--security/openssl/Makefile7
-rw-r--r--security/openvpn-auth-ldap/Makefile2
-rw-r--r--security/outguess/Makefile3
-rw-r--r--security/p5-Crypt-CAST5/Makefile1
-rw-r--r--security/p5-Crypt-Juniper/Makefile3
-rw-r--r--security/p5-Crypt-Rijndael/Makefile1
-rw-r--r--security/p5-CryptX/Makefile3
-rw-r--r--security/p5-GSSAPI/Makefile3
-rw-r--r--security/p5-MD5/Makefile3
-rw-r--r--security/p5-Net-Radius-Server/Makefile1
-rw-r--r--security/p5-SAVI-Perl/Makefile1
-rw-r--r--security/pam_fprint/Makefile3
-rw-r--r--security/pgpgpg/Makefile3
-rw-r--r--security/pgpin/Makefile3
-rw-r--r--security/pkcs11-dump/Makefile2
-rw-r--r--security/pkcs11-gateway/Makefile3
-rw-r--r--security/pks/Makefile5
-rw-r--r--security/pulledpork/Makefile2
-rw-r--r--security/putty/Makefile3
-rw-r--r--security/pwauth/Makefile2
-rw-r--r--security/quantis-kmod/Makefile3
-rw-r--r--security/quantis/Makefile3
-rw-r--r--security/ranpwd/Makefile9
-rw-r--r--security/sasp/Makefile3
-rw-r--r--security/seccure/Makefile2
-rw-r--r--security/signing-party/Makefile3
-rw-r--r--security/skipfish/Makefile2
-rw-r--r--security/srm/Makefile7
-rw-r--r--security/sshit/Makefile3
-rw-r--r--security/stoken/Makefile3
-rw-r--r--security/sudo/Makefile2
-rw-r--r--security/tripwire12/Makefile2
-rw-r--r--security/webscarab/Makefile3
-rw-r--r--security/xinetd/Makefile2
-rw-r--r--security/xml-security/Makefile9
-rw-r--r--shells/44bsd-csh/Makefile3
-rw-r--r--shells/esh/Makefile2
-rw-r--r--shells/scponly/Makefile3
-rw-r--r--sysutils/44bsd-more/Makefile3
-rw-r--r--sysutils/915resolution/Makefile3
-rw-r--r--sysutils/acpica-tools/Makefile3
-rw-r--r--sysutils/afbinit/Makefile7
-rw-r--r--sysutils/amrstat/Makefile3
-rw-r--r--sysutils/apcpwr/Makefile3
-rw-r--r--sysutils/apt/Makefile2
-rw-r--r--sysutils/asmon/Makefile3
-rw-r--r--sysutils/asusoled/Makefile3
-rw-r--r--sysutils/backuppc-devel/Makefile3
-rw-r--r--sysutils/batmon/Makefile3
-rw-r--r--sysutils/battray/Makefile2
-rw-r--r--sysutils/bbapm/Makefile3
-rw-r--r--sysutils/boxbackup-devel/Makefile3
-rw-r--r--sysutils/cdf/Makefile3
-rw-r--r--sysutils/cdrdao/Makefile1
-rw-r--r--sysutils/cdrtools-devel/Makefile3
-rw-r--r--sysutils/cdrtools/Makefile3
-rw-r--r--sysutils/confctl/Makefile3
-rw-r--r--sysutils/consolehm/Makefile3
-rw-r--r--sysutils/copytape/Makefile3
-rw-r--r--sysutils/crashme/Makefile3
-rw-r--r--sysutils/daemontools/Makefile3
-rw-r--r--sysutils/dvdimagecmp/Makefile3
-rw-r--r--sysutils/farbot/Makefile2
-rw-r--r--sysutils/fortunelock/Makefile3
-rw-r--r--sysutils/fsc/Makefile3
-rw-r--r--sysutils/fusefs-afuse/Makefile2
-rw-r--r--sysutils/fusefs-chironfs/Makefile2
-rw-r--r--sysutils/fusefs-rar2fs/Makefile2
-rw-r--r--sysutils/fusefs-sqlfs/Makefile3
-rw-r--r--sysutils/geomgui/Makefile3
-rw-r--r--sysutils/getdelta/Makefile3
-rw-r--r--sysutils/gigolo/Makefile3
-rw-r--r--sysutils/gkfreq/Makefile3
-rw-r--r--sysutils/gkrellfire/Makefile3
-rw-r--r--sysutils/gkrellm2/Makefile3
-rw-r--r--sysutils/gstopd/Makefile3
-rw-r--r--sysutils/hatop/Makefile2
-rw-r--r--sysutils/heartbeat/Makefile3
-rw-r--r--sysutils/isc-cron/Makefile3
-rw-r--r--sysutils/ldapenter/Makefile2
-rw-r--r--sysutils/less/Makefile3
-rw-r--r--sysutils/libcdio-paranoia/Makefile3
-rw-r--r--sysutils/libcdio/Makefile3
-rw-r--r--sysutils/libchk/Makefile3
-rw-r--r--sysutils/mgeupsd/Makefile3
-rw-r--r--sysutils/mkntpwd/Makefile3
-rw-r--r--sysutils/mksunbootcd/Makefile2
-rw-r--r--sysutils/mountsmb2/Makefile3
-rw-r--r--sysutils/msktutil/Makefile2
-rw-r--r--sysutils/no-login/Makefile3
-rw-r--r--sysutils/open/Makefile2
-rw-r--r--sysutils/p5-BackupPC-XS/Makefile3
-rw-r--r--sysutils/p5-Filesys-DfPortable/Makefile1
-rw-r--r--sysutils/p5-Samba-SIDhelper/Makefile1
-rw-r--r--sysutils/p5-Sys-Filesystem/Makefile1
-rw-r--r--sysutils/p5-arclog/Makefile3
-rw-r--r--sysutils/p5-reslog/Makefile3
-rw-r--r--sysutils/paicc/Makefile3
-rw-r--r--sysutils/pdixtract/Makefile3
-rw-r--r--sysutils/polkit-kde/Makefile3
-rw-r--r--sysutils/py-danzfs/Makefile2
-rw-r--r--sysutils/radmind/Makefile3
-rw-r--r--sysutils/rdate/Makefile5
-rw-r--r--sysutils/rdiff-backup-devel/Makefile7
-rw-r--r--sysutils/rdiff-backup/Makefile7
-rw-r--r--sysutils/rfstool/Makefile2
-rw-r--r--sysutils/rsyncbackup/Makefile2
-rw-r--r--sysutils/samesame/Makefile3
-rw-r--r--sysutils/sformat/Makefile3
-rw-r--r--sysutils/slack/Makefile2
-rw-r--r--sysutils/superiotool/Makefile3
-rw-r--r--sysutils/symlinks/Makefile3
-rw-r--r--sysutils/symon/Makefile3
-rw-r--r--sysutils/thefish/Makefile3
-rw-r--r--sysutils/timemon/Makefile3
-rw-r--r--sysutils/ucspi-ssl-tls/Makefile3
-rw-r--r--sysutils/ucspi-ssl/Makefile3
-rw-r--r--sysutils/ucspi-tcp/Makefile9
-rw-r--r--sysutils/udfclient/Makefile5
-rw-r--r--sysutils/usermin/Makefile3
-rw-r--r--sysutils/vbetool/Makefile3
-rw-r--r--sysutils/whowatch/Makefile3
-rw-r--r--sysutils/wmbluecpu/Makefile3
-rw-r--r--sysutils/wmcube/Makefile3
-rw-r--r--sysutils/wmmemfree/Makefile3
-rw-r--r--sysutils/xe-guest-utilities/Makefile3
-rw-r--r--sysutils/xfsm/Makefile3
-rw-r--r--sysutils/xin/Makefile3
-rw-r--r--sysutils/xlogmaster/Makefile3
-rw-r--r--sysutils/xsysstats/Makefile3
-rw-r--r--sysutils/zisofs-tools/Makefile3
-rw-r--r--textproc/apache-poi/Makefile3
-rw-r--r--textproc/apache-solr/Makefile3
-rw-r--r--textproc/apache-solr3/Makefile3
-rw-r--r--textproc/aspell/Makefile.inc3
-rw-r--r--textproc/bibtool/Makefile3
-rw-r--r--textproc/bsddiff/Makefile3
-rw-r--r--textproc/bsdgrep/Makefile3
-rw-r--r--textproc/bsdsort/Makefile3
-rw-r--r--textproc/c2html/Makefile3
-rw-r--r--textproc/cdif/Makefile3
-rw-r--r--textproc/chm2pdf/Makefile2
-rw-r--r--textproc/docbook-utils/Makefile3
-rw-r--r--textproc/flip/Makefile3
-rw-r--r--textproc/foiltex/Makefile3
-rw-r--r--textproc/gladtex/Makefile3
-rw-r--r--textproc/groff/Makefile3
-rw-r--r--textproc/gtkspell/Makefile3
-rw-r--r--textproc/hhm/Makefile3
-rw-r--r--textproc/htdig/Makefile3
-rw-r--r--textproc/html2text/Makefile3
-rw-r--r--textproc/ibus-m17n/Makefile2
-rw-r--r--textproc/ibus-table/Makefile2
-rw-r--r--textproc/iksemel/Makefile2
-rw-r--r--textproc/irstlm/Makefile3
-rw-r--r--textproc/iso12083/Makefile3
-rw-r--r--textproc/iso8879/Makefile3
-rw-r--r--textproc/java2html/Makefile3
-rw-r--r--textproc/latex2html/Makefile3
-rw-r--r--textproc/liblrdf/Makefile2
-rw-r--r--textproc/libtext-charwidth-perl/Makefile3
-rw-r--r--textproc/libtext-wrapi18n-perl/Makefile3
-rw-r--r--textproc/ltxml/Makefile2
-rw-r--r--textproc/lucene/Makefile5
-rw-r--r--textproc/lucene4/Makefile3
-rw-r--r--textproc/lucene5/Makefile3
-rw-r--r--textproc/mdocml/Makefile3
-rw-r--r--textproc/mgdiff/Makefile3
-rw-r--r--textproc/muse/Makefile3
-rw-r--r--textproc/p5-Google-Data-JSON/Makefile2
-rw-r--r--textproc/p5-PPI-XS/Makefile3
-rw-r--r--textproc/p5-Pod-Strip/Makefile1
-rw-r--r--textproc/p5-String-BufferStack/Makefile1
-rw-r--r--textproc/p5-Text-FixEOL/Makefile1
-rw-r--r--textproc/p5-Text-Reform/Makefile1
-rw-r--r--textproc/p5-Text-Trim/Makefile1
-rw-r--r--textproc/p5-XML-DOM2/Makefile1
-rw-r--r--textproc/p5-XML-Parser-Style-EasyTree/Makefile1
-rw-r--r--textproc/p5-podlators/Makefile3
-rw-r--r--textproc/pdfgrep/Makefile3
-rw-r--r--textproc/pecl-ctemplate/Makefile3
-rw-r--r--textproc/perl2html/Makefile3
-rw-r--r--textproc/popup-stacks/Makefile1
-rw-r--r--textproc/ppower4/Makefile3
-rw-r--r--textproc/py-wordnet/Makefile1
-rw-r--r--textproc/py2html/Makefile3
-rw-r--r--textproc/randlm/Makefile3
-rw-r--r--textproc/ruby-escape/Makefile2
-rw-r--r--textproc/ruby-rttool/Makefile2
-rw-r--r--textproc/scr2txt/Makefile6
-rw-r--r--textproc/senna/Makefile3
-rw-r--r--textproc/sgmlformat/Makefile3
-rw-r--r--textproc/sgrep/Makefile3
-rw-r--r--textproc/sgrep2/Makefile3
-rw-r--r--textproc/source-highlight/Makefile3
-rw-r--r--textproc/txt2tags/Makefile5
-rw-r--r--textproc/uim-el/Makefile2
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--textproc/unroff/Makefile6
-rw-r--r--textproc/xalan-j/Makefile3
-rw-r--r--textproc/xerces-j/Makefile3
-rw-r--r--textproc/xhtml/Makefile3
-rw-r--r--vietnamese/unicode-uhoai/Makefile3
-rw-r--r--vietnamese/vis2u/Makefile3
-rw-r--r--vietnamese/vnconvert/Makefile3
-rw-r--r--vietnamese/vnroff/Makefile3
-rw-r--r--vietnamese/x-unikey/Makefile3
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/apache24/Makefile2
-rw-r--r--www/axis/Makefile9
-rw-r--r--www/bozohttpd/Makefile2
-rw-r--r--www/cgi-lib.pl/Makefile3
-rw-r--r--www/cgi-lib/Makefile3
-rw-r--r--www/cocoon/Makefile3
-rw-r--r--www/demoroniser/Makefile3
-rw-r--r--www/diamanda/Makefile2
-rw-r--r--www/dillo2/Makefile4
-rw-r--r--www/emacs-w3m/Makefile3
-rw-r--r--www/eventum/Makefile3
-rw-r--r--www/feedonfeeds/Makefile2
-rw-r--r--www/free-sa-devel/Makefile3
-rw-r--r--www/fswiki/Makefile3
-rw-r--r--www/fusionpbx/Makefile2
-rw-r--r--www/gaeo/Makefile2
-rw-r--r--www/geronimo/Makefile3
-rw-r--r--www/grr/Makefile3
-rw-r--r--www/gtkhtml3/Makefile3
-rw-r--r--www/guile-www/Makefile3
-rw-r--r--www/gurlchecker/Makefile3
-rw-r--r--www/htdigest/Makefile2
-rw-r--r--www/html2hdml/Makefile3
-rw-r--r--www/httpasyncclient/Makefile3
-rw-r--r--www/httpclient/Makefile3
-rw-r--r--www/httpcore/Makefile3
-rw-r--r--www/httpsqs/Makefile2
-rw-r--r--www/ikiwiki/Makefile2
-rw-r--r--www/jetty/Makefile3
-rw-r--r--www/jmeter/Makefile3
-rw-r--r--www/libapreq2/Makefile3
-rw-r--r--www/lighttpd-mod_geoip/Makefile3
-rw-r--r--www/lighttpd-mod_h264_streaming/Makefile3
-rw-r--r--www/mod_amazon_proxy/Makefile3
-rw-r--r--www/mod_asn/Makefile3
-rw-r--r--www/mod_auth_tkt/Makefile3
-rw-r--r--www/mod_authn_sasl/Makefile3
-rw-r--r--www/mod_fcgid/Makefile3
-rw-r--r--www/mod_jk/Makefile3
-rw-r--r--www/mod_memcache/Makefile2
-rw-r--r--www/mod_perl2/Makefile3
-rw-r--r--www/mod_python33/Makefile3
-rw-r--r--www/mod_python35/Makefile1
-rw-r--r--www/mod_qos/Makefile3
-rw-r--r--www/mod_remoteip/Makefile2
-rw-r--r--www/mod_reproxy/Makefile3
-rw-r--r--www/mod_rivet/Makefile3
-rw-r--r--www/mod_setenvifplus/Makefile3
-rw-r--r--www/mod_spdy/Makefile2
-rw-r--r--www/mod_vhost_ldap/Makefile3
-rw-r--r--www/myfaces/Makefile3
-rw-r--r--www/nginx-devel/Makefile12
-rw-r--r--www/nginx/Makefile12
-rw-r--r--www/p5-Apache-Clean2/Makefile3
-rw-r--r--www/p5-Ark/Makefile3
-rw-r--r--www/p5-CGI-Compress-Gzip/Makefile1
-rw-r--r--www/p5-CGI-Session-ExpireSessions/Makefile1
-rw-r--r--www/p5-CSS-DOM/Makefile1
-rw-r--r--www/p5-Catalyst-View-Jemplate/Makefile1
-rw-r--r--www/p5-Catalyst-View-XML-Simple/Makefile3
-rw-r--r--www/p5-Data-Validate-URI/Makefile1
-rw-r--r--www/p5-HTML-FromANSI/Makefile1
-rw-r--r--www/p5-HTTP-Response-Encoding/Makefile1
-rw-r--r--www/p5-HTTP-Server-Simple-Static/Makefile1
-rw-r--r--www/p5-LWP-UserAgent-POE/Makefile1
-rw-r--r--www/p5-Net-Trac/Makefile1
-rw-r--r--www/p5-PodToHTML/Makefile3
-rw-r--r--www/p5-Template-Plugin-FillInForm/Makefile1
-rw-r--r--www/p5-TestGen4Web-Runner/Makefile3
-rw-r--r--www/p5-URI-Title/Makefile1
-rw-r--r--www/p5-WWW-DHL/Makefile1
-rw-r--r--www/p5-WebService-Google-Sets/Makefile1
-rw-r--r--www/p5-chklinks/Makefile3
-rw-r--r--www/p5-libapreq2/Makefile3
-rw-r--r--www/phpgroupware/Makefile3
-rw-r--r--www/py-HTMLgen/Makefile3
-rw-r--r--www/py-apachelog/Makefile2
-rw-r--r--www/py-django-app-plugins/Makefile2
-rw-r--r--www/py-django-classy-tags/Makefile3
-rw-r--r--www/py-django-livesettings/Makefile3
-rw-r--r--www/py-formalchemy/Makefile2
-rw-r--r--www/py-pywebdav/Makefile4
-rw-r--r--www/py-recaptcha/Makefile3
-rw-r--r--www/py-utidy/Makefile3
-rw-r--r--www/py-wikitools/Makefile2
-rw-r--r--www/py-wsgiauth/Makefile3
-rw-r--r--www/pylot/Makefile2
-rw-r--r--www/sahi/Makefile3
-rw-r--r--www/samidare/Makefile2
-rw-r--r--www/selenium/Makefile3
-rw-r--r--www/sitecopy/Makefile3
-rw-r--r--www/smb_auth/Makefile3
-rw-r--r--www/squid/Makefile1
-rw-r--r--www/squidstats/Makefile2
-rw-r--r--www/tclhttpd/Makefile3
-rw-r--r--www/tengine/Makefile12
-rw-r--r--www/testlink/Makefile3
-rw-r--r--www/thundercache/Makefile2
-rw-r--r--www/thundersnarf/Makefile2
-rw-r--r--www/tidy-devel/Makefile3
-rw-r--r--www/tinytinyhttpd/Makefile3
-rw-r--r--www/trac-accountmanager/Makefile3
-rw-r--r--www/trac-discussion/Makefile3
-rw-r--r--www/trac-downloads/Makefile3
-rw-r--r--www/trac-fivestarvote/Makefile3
-rw-r--r--www/trac-fullblog/Makefile3
-rw-r--r--www/trac-fullblognotification/Makefile3
-rw-r--r--www/trac-graphviz/Makefile3
-rw-r--r--www/trac-math/Makefile3
-rw-r--r--www/trac-navadd/Makefile3
-rw-r--r--www/trac-pydotorgtheme/Makefile3
-rw-r--r--www/trac-tags/Makefile3
-rw-r--r--www/trac-ticketimport/Makefile3
-rw-r--r--www/trac-vote/Makefile3
-rw-r--r--www/trac-wikitopdf/Makefile3
-rw-r--r--www/twiki-BugzillaLinkPlugin/Makefile2
-rw-r--r--www/twiki-GluePlugin/Makefile2
-rw-r--r--www/twiki-LdapContrib/Makefile2
-rw-r--r--www/twiki-LdapNgPlugin/Makefile2
-rw-r--r--www/twiki-MathModePlugin/Makefile2
-rw-r--r--www/twiki-NewUserPlugin/Makefile2
-rw-r--r--www/uwsgitop/Makefile3
-rw-r--r--www/webcopy/Makefile3
-rw-r--r--www/webcrawl/Makefile3
-rw-r--r--www/websh/Makefile3
-rw-r--r--www/wml/Makefile3
-rw-r--r--www/xpi-adblock/Makefile.xpi6
-rw-r--r--www/xpi-conkeror/Makefile5
-rw-r--r--www/xpi-delicious/Makefile3
-rw-r--r--www/xpi-downthemall/Makefile3
-rw-r--r--x11-clocks/alltraxclock/Makefile3
-rw-r--r--x11-clocks/asclock-xlib/Makefile3
-rw-r--r--x11-clocks/asclock/Makefile3
-rw-r--r--x11-clocks/bclock/Makefile3
-rw-r--r--x11-clocks/mouseclock/Makefile3
-rw-r--r--x11-clocks/osdclock/Makefile3
-rw-r--r--x11-clocks/pclock/Makefile2
-rw-r--r--x11-clocks/swisswatch/Makefile2
-rw-r--r--x11-clocks/wmblueclock/Makefile3
-rw-r--r--x11-clocks/wmtimer/Makefile3
-rw-r--r--x11-clocks/xdaliclock/Makefile1
-rw-r--r--x11-fm/asfiles/Makefile3
-rw-r--r--x11-fm/doublecmd/Makefile2
-rw-r--r--x11-fonts/charis-compact/Makefile1
-rw-r--r--x11-fonts/charis/Makefile1
-rw-r--r--x11-fonts/doulos-compact/Makefile1
-rw-r--r--x11-fonts/font-manager/Makefile2
-rw-r--r--x11-fonts/gfe/Makefile3
-rw-r--r--x11-fonts/gnu-unifont-ttf/Makefile3
-rw-r--r--x11-fonts/gnu-unifont/Makefile3
-rw-r--r--x11-fonts/hanazono-fonts-ttf/Makefile3
-rw-r--r--x11-fonts/intlfonts/Makefile3
-rw-r--r--x11-fonts/liberation-fonts-ttf/Makefile3
-rw-r--r--x11-fonts/mkbold/Makefile2
-rw-r--r--x11-fonts/mkitalic/Makefile2
-rw-r--r--x11-fonts/nexfontsel/Makefile3
-rw-r--r--x11-fonts/p5-type1inst/Makefile3
-rw-r--r--x11-fonts/paratype/Makefile1
-rw-r--r--x11-fonts/terminus-font/Makefile2
-rw-r--r--x11-fonts/tkfont/Makefile3
-rw-r--r--x11-servers/xorg-nestserver/Makefile3
-rw-r--r--x11-servers/xorg-server/Makefile3
-rw-r--r--x11-servers/xorg-vfbserver/Makefile3
-rw-r--r--x11-themes/beastie/Makefile3
-rw-r--r--x11-themes/clearlooks-metacity/Makefile3
-rw-r--r--x11-themes/gnome-icons-aqua-fusion/Makefile3
-rw-r--r--x11-themes/gnome-icons-faenza/Makefile2
-rw-r--r--x11-themes/gnome-icons-gentoo-test/Makefile3
-rw-r--r--x11-themes/gnome-icons-iris/Makefile3
-rw-r--r--x11-themes/gnome-icons-noia-warm/Makefile3
-rw-r--r--x11-themes/gnome-icons-refined/Makefile3
-rw-r--r--x11-themes/gnome-icons-slick/Makefile3
-rw-r--r--x11-themes/gnome-icons-snow-apple/Makefile3
-rw-r--r--x11-themes/gnome-icons-stylish/Makefile3
-rw-r--r--x11-themes/gnome-icons-ximian-south/Makefile3
-rw-r--r--x11-themes/gtk-aqualightblue-theme/Makefile3
-rw-r--r--x11-themes/gtk-engines2/Makefile3
-rw-r--r--x11-themes/gtk-flat-theme2/Makefile3
-rw-r--r--x11-themes/gtk-murrina-aqua/Makefile3
-rw-r--r--x11-themes/gtk-oxygen-engine/Makefile3
-rw-r--r--x11-themes/gtk-qt4-engine/Makefile2
-rw-r--r--x11-themes/gtk3-oxygen-engine/Makefile3
-rw-r--r--x11-themes/icon-naming-utils/Makefile2
-rw-r--r--x11-themes/icons-tango-extras/Makefile3
-rw-r--r--x11-themes/icons-tango/Makefile2
-rw-r--r--x11-themes/irssi-themes/Makefile1
-rw-r--r--x11-themes/kde-gtk-config/Makefile3
-rw-r--r--x11-themes/kde-icons-gartoon-blue-svg/Makefile3
-rw-r--r--x11-themes/kde-icons-gartoon-svg/Makefile3
-rw-r--r--x11-themes/kde-icons-kool-gorilla/Makefile3
-rw-r--r--x11-themes/kde-icons-noia/Makefile5
-rw-r--r--x11-themes/kde-icons-nuvola/Makefile3
-rw-r--r--x11-themes/metacity-themes/Makefile.metacity3
-rw-r--r--x11-themes/openbox-themes/Makefile3
-rw-r--r--x11-toolkits/attica/Makefile3
-rw-r--r--x11-toolkits/gal2/Makefile3
-rw-r--r--x11-toolkits/gnustep-gui/Makefile3
-rw-r--r--x11-toolkits/gtk12/Makefile3
-rw-r--r--x11-toolkits/gtk20/Makefile3
-rw-r--r--x11-toolkits/gtk30/Makefile3
-rw-r--r--x11-toolkits/gtksourceview2/Makefile3
-rw-r--r--x11-toolkits/linux-c6-qt47-x11/Makefile3
-rw-r--r--x11-toolkits/linux-f10-pango/Makefile4
-rw-r--r--x11-toolkits/py-gnome2/Makefile3
-rw-r--r--x11-toolkits/py-gtk2/Makefile3
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile3
-rw-r--r--x11-toolkits/py-tkinter/Makefile3
-rw-r--r--x11-toolkits/slingshot/Makefile3
-rw-r--r--x11-toolkits/swt-devel/Makefile3
-rw-r--r--x11-toolkits/swt/Makefile5
-rw-r--r--x11-toolkits/tk84/Makefile4
-rw-r--r--x11-toolkits/tk85/Makefile4
-rw-r--r--x11-toolkits/tk86/Makefile4
-rw-r--r--x11-toolkits/tktray/Makefile2
-rw-r--r--x11-toolkits/vte290/Makefile1
-rw-r--r--x11-toolkits/vte3/Makefile3
-rw-r--r--x11-toolkits/xforms/Makefile3
-rw-r--r--x11-toolkits/xview-clients/Makefile3
-rw-r--r--x11-toolkits/xview/Makefile3
-rw-r--r--x11-wm/afterstep-stable/Makefile3
-rw-r--r--x11-wm/afterstep/Makefile3
-rw-r--r--x11-wm/euclid-wm/Makefile2
-rw-r--r--x11-wm/fluxbox/Makefile4
-rw-r--r--x11-wm/libdockapp/Makefile3
-rw-r--r--x11-wm/libwraster/Makefile3
-rw-r--r--x11-wm/olvwm/Makefile7
-rw-r--r--x11-wm/ratpoison/Makefile4
-rw-r--r--x11-wm/tvtwm/Makefile3
-rw-r--r--x11-wm/windowmaker/Makefile3
-rw-r--r--x11-wm/wmanager/Makefile2
-rw-r--r--x11/9box/Makefile3
-rw-r--r--x11/9menu/Makefile2
-rw-r--r--x11/arandr/Makefile2
-rw-r--r--x11/blast/Makefile3
-rw-r--r--x11/erun/Makefile3
-rw-r--r--x11/fbdesk/Makefile2
-rw-r--r--x11/hotwire-shell/Makefile2
-rw-r--r--x11/kb2mb2/Makefile2
-rw-r--r--x11/keybinder-gtk3/Makefile2
-rw-r--r--x11/keybinder/Makefile2
-rw-r--r--x11/props/Makefile3
-rw-r--r--x11/qimageblitz/Makefile3
-rw-r--r--x11/sxpc/Makefile3
-rw-r--r--x11/wbar/Makefile2
-rw-r--r--x11/wdm/Makefile3
-rw-r--r--x11/wmcliphist/Makefile3
-rw-r--r--x11/xautolock/Makefile3
-rw-r--r--x11/xbanner/Makefile3
-rw-r--r--x11/xcmd/Makefile3
-rw-r--r--x11/xcolors/Makefile3
-rw-r--r--x11/xfce4-whiskermenu-plugin/Makefile3
-rw-r--r--x11/xgrab/Makefile3
-rw-r--r--x11/xidle/Makefile3
-rw-r--r--x11/xkbctrl/Makefile3
-rw-r--r--x11/xkeyboard-config/Makefile2
-rw-r--r--x11/xloadimage/Makefile2
-rw-r--r--x11/xmon/Makefile3
-rw-r--r--x11/xprompt/Makefile3
-rw-r--r--x11/xpyb/Makefile3
-rw-r--r--x11/xtacy/Makefile3
-rw-r--r--x11/xtoolwait/Makefile3
-rw-r--r--x11/xwatchwin/Makefile3
-rw-r--r--x11/xzoom/Makefile3
1814 files changed, 1845 insertions, 3433 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 8d13d9027a5c..0940b9d56295 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1345,13 +1345,16 @@ MASTER_SITES_SUBDIRS= APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \
DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
FARSIGHT:${PORTNAME} \
+ FESTIVAL:${PORTVERSION} \
GCC:releases/${DISTNAME} \
+ GENTOO:distfiles \
+ GIMP:${PORTNAME}/${PORTVERSION:R}/ \
GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/ \
GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \
GITHUB_LEGACY:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/ \
GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
- GIMP:${PORTNAME}/${PORTVERSION:R}/ \
GNU:${PORTNAME} \
+ GNUPG:${PORTNAME} \
GNU_ALPHA:${PORTNAME} \
HORDE:${PORTNAME} \
LIBREOFFICE_DEV:${PORTNAME} \
@@ -1359,6 +1362,8 @@ MASTER_SITES_SUBDIRS= APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
MOZDEV:${PORTNAME:tl} \
NETLIB:${PORTNAME} \
PERL_CPAN:${PORTNAME:C/-.*//} \
+ QT:archive/qt/${PORTVERSION:R} \
+ SAMBA:${PORTNAME} \
SAVANNAH:${PORTNAME:tl} \
SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} \
XFCE:xfce/${XFCE_MASTER_SITE_VER}/src
@@ -1385,11 +1390,13 @@ _site_group_= ${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://}
_site_url_= ${_abbrev_:C/.*://}
. endif
. endfor
-. for _subdir_ in ${MASTER_SITES_SUBDIRS}
-. if ${_site_url_} == ${_subdir_:C/:.*//} && !defined(MASTER_SITE_SUBDIR)
+. if !defined(MASTER_SITE_SUBDIR)
+. for _subdir_ in ${MASTER_SITES_SUBDIRS}
+. if ${_site_url_} == ${_subdir_:C/:.*//}
_site_subdir_?= ${_subdir_:C/.*://}
-. endif
-. endfor
+. endif
+. endfor
+. endif
. ifdef MASTER_SITE_${_site_url_}
. ifdef _site_subdir_
MASTER_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//}
@@ -1426,11 +1433,13 @@ _site_group_= ${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://}
_site_url_= ${_abbrev_:C/.*://}
. endif
. endfor
-. for _subdir_ in ${MASTER_SITES_SUBDIRS}
-. if ${_site_url_} == ${_subdir_:C/:.*//} && !defined(MASTER_SITE_SUBDIR)
+. if !defined(MASTER_SITE_SUBDIR)
+. for _subdir_ in ${MASTER_SITES_SUBDIRS}
+. if ${_site_url_} == ${_subdir_:C/:.*//}
_site_subdir_?= ${_subdir_:C/.*://}
-. endif
-. endfor
+. endif
+. endfor
+. endif
. ifdef MASTER_SITE_${_site_url_}
. ifdef _site_subdir_
PATCH_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//}
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index 5c2f8466f43a..679a637bebe7 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -6,8 +6,7 @@ PORTNAME= atspi
PORTVERSION= 2.12.0
PORTREVISION= 3
CATEGORIES= accessibility x11-toolkits python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyatspi-${PORTVERSION}
DIST_SUBDIR= gnome3
diff --git a/accessibility/py3-atspi/Makefile b/accessibility/py3-atspi/Makefile
index ab93b6a59d41..a8aeef751278 100644
--- a/accessibility/py3-atspi/Makefile
+++ b/accessibility/py3-atspi/Makefile
@@ -6,8 +6,7 @@ PORTNAME= atspi
PORTVERSION= 2.12.0
PORTREVISION= 2
CATEGORIES= accessibility x11-toolkits python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyatspi-${PORTVERSION}
DIST_SUBDIR= gnome3
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 366cffde8883..26982354af4d 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -4,7 +4,7 @@
PORTNAME= dpkg
PORTVERSION= 1.17.25
CATEGORIES= archivers sysutils
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= dpkg_${PORTVERSION}
MAINTAINER= pawel@FreeBSD.org
diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index 0f7c25175a23..699decb81259 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -4,8 +4,7 @@
PORTNAME= fastjar
PORTVERSION= 0.93.20060808
CATEGORIES= archivers java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= maho/fastjar
+MASTER_SITES= LOCAL/maho/fastjar
MAINTAINER= maho@FreeBSD.org
COMMENT= Version of JDK's `jar' command written entirely in C
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 75146f8b8fb1..6ebbf11bf39d 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -4,8 +4,7 @@ PORTNAME= cpio
PORTVERSION= 2.11
PORTREVISION= 3
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMEPREFIX= g
MAINTAINER= naddy@FreeBSD.org
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile
index c99e0baceb64..d524d4bcc6f7 100644
--- a/archivers/lbrate/Makefile
+++ b/archivers/lbrate/Makefile
@@ -5,8 +5,7 @@ PORTNAME= lbrate
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
MAINTAINER= ports@FreeBSD.org
COMMENT= Extract/decompress CP/M LBR archives
diff --git a/archivers/lha-ac/Makefile b/archivers/lha-ac/Makefile
index 7fcd589df0ec..3d6953b1eabd 100644
--- a/archivers/lha-ac/Makefile
+++ b/archivers/lha-ac/Makefile
@@ -4,9 +4,8 @@ PORTNAME= lha
PORTVERSION= 1.14i
PORTREVISION= 10
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} \
- http://osdn.dl.sourceforge.jp/%SUBDIR%/
-MASTER_SITE_SUBDIR= lha/22231
+MASTER_SITES= SFJP/lha/22231 \
+ http://osdn.dl.sourceforge.jp/lha/22231/
PKGNAMESUFFIX= -ac${PKGNAMESUFFIX2}
DISTNAME= ${PORTNAME}-${PORTVERSION}-ac20050924p1
diff --git a/archivers/macutils/Makefile b/archivers/macutils/Makefile
index 043701a20a2b..ca6342720d91 100644
--- a/archivers/macutils/Makefile
+++ b/archivers/macutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= macutils
PORTVERSION= 2.0b3
CATEGORIES= archivers emulators
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index daa240938663..c9b29c52072b 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mscompress
PORTVERSION= 0.3
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
MAINTAINER= tj@FreeBSD.org
COMMENT= Microsoft "compress.exe/expand.exe" compatible (de)compressor
diff --git a/archivers/mtf/Makefile b/archivers/mtf/Makefile
index 7727c68e5c49..1fa7df8303d6 100644
--- a/archivers/mtf/Makefile
+++ b/archivers/mtf/Makefile
@@ -5,15 +5,14 @@ PORTNAME= mtf
PORTVERSION= 0.2.1
PORTREVISION= 1
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/backup
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SUNSITE/system/backup
MAINTAINER= ports@FreeBSD.org
COMMENT= Unix reader for the Microsoft Tape Format used by NT Backup
LICENSE= GPLv2
+USES= tar:tgz
ALL_TARGET= # empty
PLIST_FILES= bin/mtf
PORTDOCS= README
diff --git a/archivers/nomarch/Makefile b/archivers/nomarch/Makefile
index 126dc359e4b7..cc3ac463f0a0 100644
--- a/archivers/nomarch/Makefile
+++ b/archivers/nomarch/Makefile
@@ -4,8 +4,7 @@
PORTNAME= nomarch
PORTVERSION= 1.4
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
MAINTAINER= gabor@FreeBSD.org
COMMENT= Extracts files from the old '.arc' archive format
diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile
index ca36aa3484cf..1c664818652c 100644
--- a/archivers/nulib/Makefile
+++ b/archivers/nulib/Makefile
@@ -4,14 +4,13 @@
PORTNAME= nulib
PORTVERSION= 3.25
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jseger
+MASTER_SITES= LOCAL/jseger
DISTNAME= nulib325
-EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
COMMENT= NuFX archive utility
+USES= tar:Z
WRKSRC= ${WRKDIR}/nulib
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/archivers/p5-IO-Zlib/Makefile b/archivers/p5-IO-Zlib/Makefile
index a005b417bdb0..684a2e0e9466 100644
--- a/archivers/p5-IO-Zlib/Makefile
+++ b/archivers/p5-IO-Zlib/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 1.10
PORTREVISION= 2
CATEGORIES= archivers perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= IO
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/archivers/packddir/Makefile b/archivers/packddir/Makefile
index d6d5dea9444d..bb62ed979578 100644
--- a/archivers/packddir/Makefile
+++ b/archivers/packddir/Makefile
@@ -4,8 +4,7 @@
PORTNAME= packddir
PORTVERSION= 0.0.6
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
DISTNAME= upackddir_${PORTVERSION}-1
MAINTAINER= ayu@commun.jp
diff --git a/archivers/php5-snappy/Makefile b/archivers/php5-snappy/Makefile
index 75bbbb3ab005..aaf0a5de4f5b 100644
--- a/archivers/php5-snappy/Makefile
+++ b/archivers/php5-snappy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= php5-snappy
PORTVERSION= 0.0.2
PORTREVISION= 1
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PROJECTHOST= php-snappy
DISTNAME= ${PROJECTHOST}-${PORTVERSION}
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 50d15401ad68..4a761db761a7 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -4,16 +4,15 @@
PORTNAME= ppunpack
PORTVERSION= 1.0
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= thierry
+MASTER_SITES= LOCAL/thierry
DISTNAME= ppsmall-${PORTVERSION}
-EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
COMMENT= Decompresses Amiga PowerPacker files
NO_CDROM= No commercial redistribution
+USES= tar:Z
WRKSRC= ${WRKDIR}/PPUnpack
MAKE_ARGS= CC="${CC}" COPTS="${CFLAGS}"
PLIST_FILES= bin/ppunpack
diff --git a/archivers/pxz/Makefile b/archivers/pxz/Makefile
index f0cb2f9728c0..56576c6acd09 100644
--- a/archivers/pxz/Makefile
+++ b/archivers/pxz/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pxz
PORTVERSION= 0.20141018
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= delphij
+MASTER_SITES= LOCAL/delphij
DISTNAME= pxz-git-${PORTVERSION:S/0.//}
MAINTAINER= ports@FreeBSD.org
diff --git a/archivers/py-liblzma/Makefile b/archivers/py-liblzma/Makefile
index 0dd30918e58a..6a601fa8997d 100644
--- a/archivers/py-liblzma/Makefile
+++ b/archivers/py-liblzma/Makefile
@@ -5,8 +5,7 @@ PORTNAME= liblzma
PORTVERSION= 0.5.3
PORTREVISION= 4
CATEGORIES= archivers python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/p/py${PORTNAME}
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
diff --git a/archivers/rzip/Makefile b/archivers/rzip/Makefile
index 0d818fa75bd3..3c187ba4bd8d 100644
--- a/archivers/rzip/Makefile
+++ b/archivers/rzip/Makefile
@@ -4,8 +4,7 @@
PORTNAME= rzip
PORTVERSION= 2.1
CATEGORIES= archivers
-MASTER_SITES= SAMBA
-MASTER_SITE_SUBDIR= rzip
+MASTER_SITES= SAMBA/rzip
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Compression program similar to gzip or bzip2
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index b7f30c88b46f..b9abc4ab9296 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -5,8 +5,7 @@ PORTNAME= unace
PORTVERSION= 1.2b
PORTREVISION= 3
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Extract, view & test ACE archives
diff --git a/archivers/wzip/Makefile b/archivers/wzip/Makefile
index 6a18db3bdb16..d0e8db394c92 100644
--- a/archivers/wzip/Makefile
+++ b/archivers/wzip/Makefile
@@ -4,7 +4,7 @@
PORTNAME= wzip
PORTVERSION= 1.1.1
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= onatan@gmail.com
diff --git a/archivers/xar/Makefile b/archivers/xar/Makefile
index 40e3fbe7abc6..15d5d0af4415 100644
--- a/archivers/xar/Makefile
+++ b/archivers/xar/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xar
PORTVERSION= 1.5.2
PORTREVISION= 2
CATEGORIES= archivers
-MASTER_SITES= GOOGLE_CODE GENTOO/distfiles
+MASTER_SITES= GOOGLE_CODE GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= OpenDarwin XML eXtensible ARchiver
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 80b507909bf3..79da256d1c64 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xarchiver
PORTVERSION= 0.5.4
CATEGORIES= archivers
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}
+MASTER_SITES= SF/${PORTNAME:tl}
MAINTAINER= danilo@FreeBSD.org
COMMENT= Desktop-agnostic GTK+2 frontend to various archiving tools
diff --git a/archivers/zipper/Makefile b/archivers/zipper/Makefile
index 6cc8b868fbfd..5a2a3b493d0b 100644
--- a/archivers/zipper/Makefile
+++ b/archivers/zipper/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zipper
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= archivers gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= Zipper-${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
diff --git a/archivers/zopfli/Makefile b/archivers/zopfli/Makefile
index dc0680ba8065..1f8a5948cfe3 100644
--- a/archivers/zopfli/Makefile
+++ b/archivers/zopfli/Makefile
@@ -4,7 +4,7 @@
PORTNAME= zopfli
PORTVERSION= 1.0.0
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= freebsd@nagilum.org
COMMENT= Zopfli Compression Algorithm
diff --git a/astro/ephem/Makefile b/astro/ephem/Makefile
index 5fe89f810bcb..2ed2f24aa5a3 100644
--- a/astro/ephem/Makefile
+++ b/astro/ephem/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ephem
PORTVERSION= 4.28
PORTREVISION= 1
CATEGORIES= astro
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= trevor
+MASTER_SITES= LOCAL/trevor
DISTNAME= ${PORTNAME}_${PORTVERSION}_unix
MAINTAINER= slaven@rezic.de
diff --git a/astro/libgal/Makefile b/astro/libgal/Makefile
index 0da2f6b41d6f..e2b9d377c10b 100644
--- a/astro/libgal/Makefile
+++ b/astro/libgal/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.5.0
PORTREVISION= 1
CATEGORIES= astro hamradio
MASTER_SITES= http://homepage.mac.com/pclwillmott/GAL/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= db@FreeBSD.org
COMMENT= General Astrodynamics Library
diff --git a/astro/mymoon/Makefile b/astro/mymoon/Makefile
index 9298a60cd2f6..d1e5152698f8 100644
--- a/astro/mymoon/Makefile
+++ b/astro/mymoon/Makefile
@@ -6,8 +6,7 @@ DISTVERSION= 1.2a
PORTREVISION= 5
CATEGORIES= astro
MASTER_SITES= http://makemebad.net/geek/codes/${PORTNAME}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= krion
+ LOCAL/krion
MAINTAINER= ports@FreeBSD.org
COMMENT= Show latitude and longitude of the moon
diff --git a/astro/p5-Astro-ADS/Makefile b/astro/p5-Astro-ADS/Makefile
index 811064323583..f769daf94d7c 100644
--- a/astro/p5-Astro-ADS/Makefile
+++ b/astro/p5-Astro-ADS/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.26
PORTREVISION= 1
CATEGORIES= astro perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Astro
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Astro-DSS/Makefile b/astro/p5-Astro-DSS/Makefile
index 8c1aab2c4548..649b8c272447 100644
--- a/astro/p5-Astro-DSS/Makefile
+++ b/astro/p5-Astro-DSS/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.6.1
PORTREVISION= 1
CATEGORIES= astro perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Astro
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Astro-SIMBAD/Makefile b/astro/p5-Astro-SIMBAD/Makefile
index 5220342b1173..53e1c425f15a 100644
--- a/astro/p5-Astro-SIMBAD/Makefile
+++ b/astro/p5-Astro-SIMBAD/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.0.0
PORTREVISION= 1
CATEGORIES= astro perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Astro
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Astro-SunTime/Makefile b/astro/p5-Astro-SunTime/Makefile
index 8bf6514dbc17..f6aac1359d58 100644
--- a/astro/p5-Astro-SunTime/Makefile
+++ b/astro/p5-Astro-SunTime/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= astro perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Astro
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Geo-METAR/Makefile b/astro/p5-Geo-METAR/Makefile
index 2b15d558e0ec..fc00b3479292 100644
--- a/astro/p5-Geo-METAR/Makefile
+++ b/astro/p5-Geo-METAR/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.15
PORTREVISION= 1
CATEGORIES= astro geography perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Geo
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/planets/Makefile b/astro/planets/Makefile
index cc3976c63644..a3b58ecc994a 100644
--- a/astro/planets/Makefile
+++ b/astro/planets/Makefile
@@ -5,7 +5,7 @@ PORTNAME= planets
PORTVERSION= 0.1.13
PORTREVISION= 1
CATEGORIES= astro
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://planets.homedns.org/dist/
MAINTAINER= ports@FreeBSD.org
diff --git a/astro/xworld/Makefile b/astro/xworld/Makefile
index d38ecd74765e..950198bd1a18 100644
--- a/astro/xworld/Makefile
+++ b/astro/xworld/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xworld
PORTVERSION= 2.0
PORTREVISION= 2
CATEGORIES= astro geography
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= naddy
+MASTER_SITES= LOCAL/naddy
MAINTAINER= naddy@FreeBSD.org
COMMENT= Earth as seen from the direction of the sun
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 0e97eaeed6ab..df97ad9e32b2 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -5,7 +5,7 @@ PORTNAME= alsa-lib
PORTVERSION= 1.0.29
CATEGORIES= audio
MASTER_SITES= ALSA/lib \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= ALSA compatibility library
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index e38153b5ec16..63be5ff70713 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -5,7 +5,7 @@ PORTNAME= alsa-plugins
PORTVERSION= 1.0.29
CATEGORIES= audio
MASTER_SITES= ALSA/plugins \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= ALSA compatibility library plugins
diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index e09a17400f33..3144452753f3 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -5,7 +5,7 @@ PORTNAME= alsa-utils
PORTVERSION= 1.0.29
CATEGORIES= audio
MASTER_SITES= ALSA/utils \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= ALSA compatibility utils
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 0860f5ad0758..319140cfadc5 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,8 +5,7 @@ PORTNAME= amarok
PORTVERSION= 2.8.0
PORTREVISION= 5
CATEGORIES= audio kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE music player
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 03452d095be6..2be9f375c9ae 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -5,8 +5,7 @@ PORTNAME= beast
PORTVERSION= 0.7.8
PORTREVISION= 8
CATEGORIES= audio
-MASTER_SITES= http://dist.testbit.eu/beast/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${PORTVERSION:R}
+MASTER_SITES= http://dist.testbit.eu/beast/v${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful music composition and modular synthesis application
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index 548e4e605efe..f404a59b8c10 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cam
PORTVERSION= 1.02
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= SUNSITE/apps/sound/mixers
MAINTAINER= ports@FreeBSD.org
COMMENT= Cpu's Audio Mixer [curses based]
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index b6cf09bc9229..4bd8dd1fc775 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ccaudio2
PORTVERSION= 2.1.3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=ccaudio
+MASTER_SITES= GNU/ccaudio
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ class framework for manipulating audio files
diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile
index 71a3e8eb378f..4f7aa634cdbc 100644
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cdplay
PORTVERSION= 0.92
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dannyboy
+MASTER_SITES= LOCAL/dannyboy
MAINTAINER= ports@FreeBSD.org
COMMENT= CD-player with text-based user interface
diff --git a/audio/dagrab/Makefile b/audio/dagrab/Makefile
index 8626b2d65e93..7950091ac75f 100644
--- a/audio/dagrab/Makefile
+++ b/audio/dagrab/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dagrab
PORTVERSION= 0.3.5
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/cdrom
+MASTER_SITES= SUNSITE/apps/sound/cdrom
MAINTAINER= clkao@CirX.ORG
COMMENT= Read audio tracks from a CD into wav sound files
diff --git a/audio/dir2ogg/Makefile b/audio/dir2ogg/Makefile
index 7e1b5e0a650c..549ea09cff5e 100644
--- a/audio/dir2ogg/Makefile
+++ b/audio/dir2ogg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dir2ogg
PORTVERSION= 0.11.8
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= http://jak-linux.org/projects/dir2ogg/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION:R}
+MASTER_SITES= http://jak-linux.org/projects/dir2ogg/${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Command-line {wav,mp3,m4a} to ogg converter
diff --git a/audio/dtmfdial/Makefile b/audio/dtmfdial/Makefile
index d795e22ffed3..2f9dd0407eeb 100644
--- a/audio/dtmfdial/Makefile
+++ b/audio/dtmfdial/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dtmfdial
PORTVERSION= 0.2
CATEGORIES= audio comms
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/misc
+MASTER_SITES= SUNSITE/apps/sound/misc
DISTNAME= dtmf-dial-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/eawpats/Makefile b/audio/eawpats/Makefile
index 1df50f89be0c..3917c902ef1d 100644
--- a/audio/eawpats/Makefile
+++ b/audio/eawpats/Makefile
@@ -5,7 +5,7 @@ PORTNAME= eawpats
PORTVERSION= 12
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
DISTNAME= eawpats12_full
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/eawplus/Makefile b/audio/eawplus/Makefile
index 934c19632346..149285072e76 100644
--- a/audio/eawplus/Makefile
+++ b/audio/eawplus/Makefile
@@ -5,8 +5,7 @@ PORTNAME= eawplus
PORTVERSION= 12.1
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nork
+MASTER_SITES= LOCAL/nork
MAINTAINER= ports@FreeBSD.org
COMMENT= E.A.W.+Izumo+Tamuki collection of Gravis Ultrasound MIDI patches
diff --git a/audio/etcd/Makefile b/audio/etcd/Makefile
index c9aab0c35f58..d82bcab65ed5 100644
--- a/audio/etcd/Makefile
+++ b/audio/etcd/Makefile
@@ -5,10 +5,9 @@ PORTNAME= etcd
PORTVERSION= 1.0.1
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/gahr \
http://people.freebsd.org/~gahr/distfiles/ \
http://www.gahr.ch/etcd/
-MASTER_SITE_SUBDIR= gahr
MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced Tiny CD, a simple ncurses-based CD player
diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index 293f1246bed4..5f86c4179c01 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= festdoc
PORTVERSION= 1.4.0.1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DIST_SUBDIR= festival
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 2894748bc6c6..2c108c8175b8 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festival
PORTVERSION= 2.1
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTFILES= ${DISTNAME}-release.tar.gz \
speech_tools-${PORTVERSION}-release.tar.gz
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index 50a913fe42b7..86ba7d5eb761 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -4,8 +4,7 @@
PORTNAME= festlex-cmu
PORTVERSION= 1.95
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festlex_CMU
DIST_SUBDIR= festival
EXTRACT_ONLY=
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index 439978bc731d..e8c165f78a26 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festlex-oald
PORTVERSION= 1.4.1
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festlex_OALD
DIST_SUBDIR= festival
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index 75df1ab1ac45..cdb864b0150d 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festlex-poslex
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festlex_POSLEX
DIST_SUBDIR= festival
EXTRACT_ONLY=
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index f648062222b3..9561491d6435 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-don
PORTVERSION= 1.4.0
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_don
DIST_SUBDIR= festival
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 9f97a5ab394c..f65d5217afb2 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-el11
PORTVERSION= 1.4.0
PORTREVISION= 2
CATEGORIES= audio accessibility spanish
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.95
+MASTER_SITES= FESTIVAL/1.95
DISTNAME= festvox_ellpc11k
DIST_SUBDIR= festival
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 6e020d806884..cef597111442 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -4,8 +4,7 @@
PORTNAME= festvox-kal16
PORTVERSION= 1.4.0
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kallpc16k
DIST_SUBDIR= festival
EXTRACT_ONLY=
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index d9b9517312c4..21307d7f9510 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-kal8
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kallpc8k
DIST_SUBDIR= festival
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index 157355703ece..a8ac324ceb8b 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-ked16
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kedlpc16k
DIST_SUBDIR= festival
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index d336a7d75419..0cd4d5c9ed62 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-ked8
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kedlpc8k
DIST_SUBDIR= festival
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 3ad716b786f1..0801dd8a6b16 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-rab16
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festvox_rablpc16k
DIST_SUBDIR= festival
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 2bfd06b83c75..16ebfc65235c 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-rab8
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festvox_rablpc8k
DIST_SUBDIR= festival
diff --git a/audio/festvox-russian/Makefile b/audio/festvox-russian/Makefile
index 79863e8b1410..606eab51e19e 100644
--- a/audio/festvox-russian/Makefile
+++ b/audio/festvox-russian/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox
PORTVERSION= 0.5
CATEGORIES= audio
MASTER_SITES= SF/festlang.berlios/ \
- ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= festlang
+ BERLIOS/festlang
PKGNAMESUFFIX= -russian
DISTNAME= msu_ru_nsh_clunits-${PORTVERSION}
DIST_SUBDIR= festival
diff --git a/audio/flake/Makefile b/audio/flake/Makefile
index 4dd36423dd69..cadc1dbbc159 100644
--- a/audio/flake/Makefile
+++ b/audio/flake/Makefile
@@ -4,8 +4,7 @@
PORTNAME= flake
PORTVERSION= 0.11
CATEGORIES= audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}-enc/${PORTNAME:tl}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME:tl}-enc/${PORTNAME:tl}/${PORTVERSION}
MAINTAINER= dbn@FreeBSD.org
COMMENT= FLAC audio encoder
diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile
index 6e4b7147ca42..de3594cf11b3 100644
--- a/audio/funktrackergold/Makefile
+++ b/audio/funktrackergold/Makefile
@@ -2,12 +2,10 @@
# $FreeBSD$
PORTNAME= funktrackergold
-PORTVERSION= 1.5.2
+DISTVERSION= 1.5-2
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
-DISTNAME= funktrackergold-1.5-2
+MASTER_SITES= SUNSITE/apps/sound/players
MAINTAINER= ports@FreeBSD.org
COMMENT= Curses MOD/FNK music tracker
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index 75298e65c4fa..8b5689e96411 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gmixer
PORTVERSION= 0.98c
PORTREVISION= 6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cpiazza
+MASTER_SITES= LOCAL/cpiazza
MAINTAINER= ports@FreeBSD.org
COMMENT= X11/gtk+ mixer control
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index c8a2c72bb12e..2d8b04a959c0 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnomoradio
PORTVERSION= 0.15.1
PORTREVISION= 18
CATEGORIES= audio net
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Program for finding and playing free music from the Internet
diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index f3655c712c9f..56b4bfeef55e 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -5,9 +5,8 @@ PORTNAME= gnupod
PORTVERSION= 0.99.8
PORTREVISION= 2
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
+MASTER_SITES= SAVANNAH \
http://www.blinkenlights.ch/gnupod-dist/stable/
-MASTER_SITE_SUBDIR= gnupod
MAINTAINER= ports@FreeBSD.org
COMMENT= Set of Perl scripts for using an Apple iPod
diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile
index 74444404bea2..7c41c225dcd9 100644
--- a/audio/gtkguitune/Makefile
+++ b/audio/gtkguitune/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.8
DISTVERSIONPREFIX= gtk2-
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://www.oocities.org/harpin_floh/mysoft/
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index fdf4cee79136..896e09c3fe9a 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= harp
PORTVERSION= 0.5.2
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= heckendorfc@gmail.com
COMMENT= Minimalist audio player
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index ee96ddbe0d3c..bb37ba2452cc 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -4,13 +4,14 @@
PORTNAME= id3ed
PORTVERSION= 1.10.4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
MAINTAINER= turutani@scphys.kyoto-u.ac.jp
COMMENT= Id3 tag editor for mp3 files
LICENSE= GPLv2
+BROKEN= Unfetchable
GNU_CONFIGURE= yes
PLIST_FILES= bin/id3ed \
diff --git a/audio/julius/Makefile b/audio/julius/Makefile
index e410d75d4750..5ace26ac95db 100644
--- a/audio/julius/Makefile
+++ b/audio/julius/Makefile
@@ -5,8 +5,7 @@ PORTNAME= julius
PORTVERSION= 4.1.2
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= julius/37582
+MASTER_SITES= SFJP/julius/37582
MAINTAINER= numisemis@yahoo.com
COMMENT= Large Vocabulary Continuous Speech Recognition Engine
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 0f3ed13e0ecd..983b780166d5 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -6,8 +6,7 @@ PORTNAME= libaudiofile
PORTVERSION= 0.3.6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/lib//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/${PORTNAME:S/lib//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= audiofile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index 2db5f374b088..5c690052e8dc 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libworkman
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jim
+MASTER_SITES= LOCAL/jim
DISTNAME= ${PORTNAME}-1999-06-20
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/linux-f10-pulseaudio-libs/Makefile b/audio/linux-f10-pulseaudio-libs/Makefile
index fc7c74f4a7b0..ca7d5a55e79c 100644
--- a/audio/linux-f10-pulseaudio-libs/Makefile
+++ b/audio/linux-f10-pulseaudio-libs/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pulseaudio-libs
PORTVERSION= 0.9.14
CATEGORIES= audio linux
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
+MASTER_SITES= LOCAL/netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for PulseAudio clients (Linux Fedora 10)
diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index 7f4ebaefeb1f..5e002d1411bb 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -4,8 +4,7 @@
PORTNAME= lollypop
PORTVERSION= 0.9.15
CATEGORIES= audio
-MASTER_SITES= https://github.com/gnumdk/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/download/${PORTVERSION}
+MASTER_SITES= https://github.com/gnumdk/${PORTNAME}/releases/download/${PORTVERSION}/
MAINTAINER= olivierd@FreeBSD.org
COMMENT= Play and organize your music collection
diff --git a/audio/mehdiaplayer/Makefile b/audio/mehdiaplayer/Makefile
index e3b32e25fa1e..13633de22282 100644
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mehdiaplayer
PORTVERSION= 0.2
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= vg@FreeBSD.org
COMMENT= Simple media player using Qt/Phonon
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 925919b9830f..2a731b1c2c1e 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mixer.app
PORTVERSION= 1.8.0
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mixmos/Makefile b/audio/mixmos/Makefile
index 956a976375f4..0a5ee125bd7c 100644
--- a/audio/mixmos/Makefile
+++ b/audio/mixmos/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mixmos
PORTVERSION= 0.2.0
PORTREVISION= 9
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_TUCOWS}
+MASTER_SITES= TUCOWS
MAINTAINER= h.skuhra@gmail.com
COMMENT= GTK2 audio mixer
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index 11173508df7a..a986ed41ced1 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.11
PORTREVISION= 2
CATEGORIES= audio perl5
MASTER_SITES= ftp://ftp.faceprint.com/pub/software/scripts/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
EXTRACT_SUFX= # empty
MAINTAINER= uqs@FreeBSD.org
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index 26592b6f9e23..3f836aec7d05 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -3,10 +3,9 @@
PORTNAME= mp3info
PORTVERSION= 0.8.5
+DISTVERSIONSUFFIX= a
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mp3-utils/mp3info
-DISTNAME= ${PORTNAME}-${PORTVERSION}a
+MASTER_SITES= SUNSITE/apps/sound/mp3-utils/mp3info
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= MP3 technical info viewer and ID3 1.x tag editor
diff --git a/audio/mp3rename/Makefile b/audio/mp3rename/Makefile
index fb17efb3c351..d47a714b3e32 100644
--- a/audio/mp3rename/Makefile
+++ b/audio/mp3rename/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mp3rename
PORTVERSION= 0.6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index bf191e25203c..8a086c7c7d1e 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -4,8 +4,7 @@ PORTNAME= mpdcon
PORTVERSION= 1.5.1
PORTREVISION= 2
CATEGORIES= audio gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= MPDCon-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index efa452da1462..d512917db4af 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -4,8 +4,7 @@
PORTNAME= nspmod
PORTVERSION= 0.1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
+MASTER_SITES= SUNSITE/apps/sound/players
MAINTAINER= ports@FreeBSD.org
COMMENT= MOD/S3M/MTM tracker that does its own DSP, uses VoxWare v2.90+
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 445615e2c978..54ff84767606 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -5,7 +5,7 @@ PORTNAME= openal
PORTVERSION= 20060211
PORTREVISION= 15
CATEGORIES= audio
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
DISTVERSION= 0.0.8
MAINTAINER= erik@bz.bzflag.bz
diff --git a/audio/opus-tools/Makefile b/audio/opus-tools/Makefile
index 4d5f01b92766..08b44cbc3216 100644
--- a/audio/opus-tools/Makefile
+++ b/audio/opus-tools/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.1.9
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
- ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= opus
+ MOZILLA_EXTENDED/opus
MAINTAINER= naddy@FreeBSD.org
COMMENT= Encode, inspect, and decode Opus files
diff --git a/audio/opus/Makefile b/audio/opus/Makefile
index 9635a02d1fcc..2dfe7f792f0c 100644
--- a/audio/opus/Makefile
+++ b/audio/opus/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
- ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= opus
+ MOZILLA_EXTENDED/opus
MAINTAINER= naddy@FreeBSD.org
COMMENT= IETF audio codec
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index 2f38900e8577..e8d7352084c8 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
- ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= opus
+ MOZILLA_EXTENDED/opus
MAINTAINER= liangtai.s16@gmail.com
COMMENT= Opus playback library
diff --git a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
index fa0315d6e685..81f3d773014f 100644
--- a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= audio perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR=Ogg
PKGNAMEPREFIX= p5-
MAINTAINER= dominique.goncalves@gmail.com
diff --git a/audio/play/Makefile b/audio/play/Makefile
index 6bcdf939de03..0be482589c24 100644
--- a/audio/play/Makefile
+++ b/audio/play/Makefile
@@ -5,7 +5,7 @@ PORTNAME= play
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple audio file player
diff --git a/audio/pm3umpdl/Makefile b/audio/pm3umpdl/Makefile
index 14fa3f8869f6..2c518d7ade00 100644
--- a/audio/pm3umpdl/Makefile
+++ b/audio/pm3umpdl/Makefile
@@ -7,7 +7,6 @@ CATEGORIES= audio deskutils
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
EXTRACT_SUFX=
-EXTRACT_ONLY=
MAINTAINER= ports@FreeBSD.org
COMMENT= Loading a M3U file into musicpd
@@ -15,11 +14,11 @@ COMMENT= Loading a M3U file into musicpd
RUN_DEPENDS= ${LOCALBASE}/bin/mpc:${PORTSDIR}/audio/musicpc
USES= perl5
-NO_WRKSUBDIR= yes
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
-post-extract:
+do-extract:
+ @${MKDIR} ${WRKSRC}
@${CP} -v ${DISTDIR}/${DISTNAME} ${WRKSRC}
do-build:
diff --git a/audio/pms/Makefile b/audio/pms/Makefile
index 70e6e7ac1b6e..f478322f52b2 100644
--- a/audio/pms/Makefile
+++ b/audio/pms/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.42
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= riggs@FreeBSD.org
COMMENT= ncurses-based client for the Music Player Daemon
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index be61e7f136e2..0c078b92ad3e 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -3,8 +3,7 @@
PORTNAME= puddletag
PORTVERSION= 1.0.5
CATEGORIES= audio python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= pawel@FreeBSD.org
COMMENT= Audio tag editor
diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index 7fd2a360feff..853534ce1703 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -5,7 +5,7 @@ PORTNAME= rawrec
PORTVERSION= 0.9.991
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE:S/%SUBDIR%/apps\/sound\/recorders/} \
+MASTER_SITES= SUNSITE/apps/sound/recorders \
SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/rexima/Makefile b/audio/rexima/Makefile
index ae6d466d85f5..abb28fe30ce6 100644
--- a/audio/rexima/Makefile
+++ b/audio/rexima/Makefile
@@ -4,8 +4,7 @@
PORTNAME= rexima
PORTVERSION= 1.4
CATEGORIES= audio
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= SUNSITE/apps/sound/mixers
MAINTAINER= jerry@freebsd.se
COMMENT= ncurses-based console mixer
diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index 7e89ecc14c43..762ff8fcbe32 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -3,11 +3,10 @@
PORTNAME= s3mod
PORTVERSION= 1.09
+DISTVERSIONPREFIX= v
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
+MASTER_SITES= SUNSITE/apps/sound/players
MAINTAINER= ports@FreeBSD.org
COMMENT= MOD/S3M player
diff --git a/audio/soundgrab/Makefile b/audio/soundgrab/Makefile
index 5d6768ba7854..55df71365921 100644
--- a/audio/soundgrab/Makefile
+++ b/audio/soundgrab/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.0.1
PORTREVISION= 2
CATEGORIES= audio perl5
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-MASTER_SITE_SUBDIR= apps/sound/editors
MAINTAINER= ports@FreeBSD.org
COMMENT= Interactively select and save sections of an audio file
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 3ba8d021dc1d..9f59731a5cab 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -5,8 +5,7 @@ PORTNAME= soundtracker
PORTVERSION= 0.6.8
PORTREVISION= 16
CATEGORIES= audio
-MASTER_SITES= http://www.soundtracker.org/dl/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${PORTVERSION:R}
+MASTER_SITES= http://www.soundtracker.org/dl/v${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Mod player/tracking tool which supports XM and MOD formats
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index 1c1af8b147ed..cfdf1bd94999 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -5,7 +5,7 @@ PORTNAME= spek
PORTVERSION= 0.8.2
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= alexander@kojevnikov.com
COMMENT= Acoustic spectrum analyser
diff --git a/audio/squeezeboxserver-superdatetime/Makefile b/audio/squeezeboxserver-superdatetime/Makefile
index d80b9eb97437..560c5655abba 100644
--- a/audio/squeezeboxserver-superdatetime/Makefile
+++ b/audio/squeezeboxserver-superdatetime/Makefile
@@ -4,7 +4,7 @@
PORTNAME= superdatetime
PORTVERSION= 5.9.16
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= squeezeboxserver-
DISTNAME= SuperDateTime${PORTVERSION}
DIST_SUBDIR= squeezeboxserver
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index b0b33ec34274..41742e0d169b 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.99.99
PORTREVISION= 20
CATEGORIES= audio www
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+ stream directory browser
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile
index 741cc7d0f010..7f8b4b28a7af 100644
--- a/audio/tcd/Makefile
+++ b/audio/tcd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tcd
PORTVERSION= 2.2.0
PORTREVISION= 8
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple, user-friendly ncurses-based CD player
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index 9056e44eec96..8d758964127c 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tosha
PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= markp
+MASTER_SITES= LOCAL/markp
MAINTAINER= ports@FreeBSD.org
COMMENT= Read CD digital audio and video data via the SCSI bus
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 469b964d67b8..8d41255f24c2 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -6,12 +6,13 @@ PORTVERSION= 1.2
PORTREVISION= 9
CATEGORIES= audio java
MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
- ${MASTER_SITE_LOCAL}/gahr/:fluid \
+ LOCAL/gahr/:fluid \
http://people.freebsd.org/~gahr/distfiles/:fluid \
http://www.alsa-project.org/~james/sound-fonts/:fluid
-DISTFILES= ${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}:src \
+DISTNAME= ${PORTNAME}-src-${DISTVERSION}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src \
8MBGMSFX.SF2:fluid
-EXTRACT_ONLY= ${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multitrack tablature editor and player
@@ -36,7 +37,7 @@ USE_LDCONFIG= yes
JAVA_VERSION= 1.6+
NOCCACHE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/TuxGuitar
+WRKSRC_SUBDIR= TuxGuitar
OPTIONS_DEFINE= DOCS
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index 47384bc4f03e..0ed2aaee9332 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.8.6
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://vagalume.igalia.com/files/source/ \
- ${MASTER_SITE_DEBIAN_POOL}
-MASTER_SITE_SUBDIR= pool/main/v/vagalume/
+ DEBIAN_POOL/pool/main/v/vagalume/
MAINTAINER= decke@FreeBSD.org
COMMENT= A GTK+-based client for the Last.fm online radio
diff --git a/audio/vitunes/Makefile b/audio/vitunes/Makefile
index 72f78fa048be..c1a08d74368a 100644
--- a/audio/vitunes/Makefile
+++ b/audio/vitunes/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://vitunes.org/files/ \
http://mirror.4bit.ws/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dhn
+ LOCAL/dhn
MAINTAINER= dhn@FreeBSD.org
COMMENT= Curses-based media player with vim-like keybinds
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index ae9733d1ce3a..67cf96caff41 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -5,8 +5,7 @@ PORTNAME= workman
PORTVERSION= 1.3a
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications/WorkMan
+MASTER_SITES= XCONTRIB/applications/WorkMan
DISTNAME= WorkMan-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 1c0e938c53b3..3212edd3341b 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.32
PORTREVISION= 1
CATEGORIES= audio hamradio
MASTER_SITES= http://arvin.schnell-web.net/xanalyser/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= db@FreeBSD.org
COMMENT= Spectrum analyser
diff --git a/audio/xfce4-pulseaudio-plugin/Makefile b/audio/xfce4-pulseaudio-plugin/Makefile
index da9e44ce874b..c90488076cbb 100644
--- a/audio/xfce4-pulseaudio-plugin/Makefile
+++ b/audio/xfce4-pulseaudio-plugin/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xfce4-pulseaudio-plugin
PORTVERSION= 0.2.3
CATEGORIES= audio xfce
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index b63a6f81f10d..f292249bdc36 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -5,11 +5,9 @@ PORTNAME= xmix
PORTVERSION= 2.1
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= SUNSITE/apps/sound/mixers
PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
PATCHFILES= xmix-2.1.mixers.patch
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index ae130a62ebe5..780c3863bac3 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+ LOCAL/arved
DISTNAME= xmms_ladspa-${PORTVERSION}
MAINTAINER= arved@FreeBSD.org
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index 2baea4ebf740..1b72cb973abf 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmms-mailnotify
PORTVERSION= 0.2.0
PORTREVISION= 9
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+MASTER_SITES= LOCAL/arved
MAINTAINER= arved@FreeBSD.org
COMMENT= XMMS plugin, that plays a sound on incoming mail and opens the MUA
diff --git a/audio/xpi-musicpm/Makefile b/audio/xpi-musicpm/Makefile
index 1345ad49abf3..08e8dd8cbab9 100644
--- a/audio/xpi-musicpm/Makefile
+++ b/audio/xpi-musicpm/Makefile
@@ -4,7 +4,7 @@
PORTNAME= musicpm
PORTVERSION= 1.4.4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= mpm_${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index aecbd8034e97..009ce540ebac 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xwave
PORTVERSION= 2.2
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+MASTER_SITES= LOCAL/arved
DISTNAME= ${PORTNAME}${PORTVERSION:S/./v/}
MAINTAINER= a0516@marimga.de
diff --git a/benchmarks/cpipe/Makefile b/benchmarks/cpipe/Makefile
index 7888f8bfc339..1da3354ec258 100644
--- a/benchmarks/cpipe/Makefile
+++ b/benchmarks/cpipe/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cpipe
PORTVERSION= 3.0.2
CATEGORIES= benchmarks
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= cpipe.berlios
+MASTER_SITES= BERLIOS
MAINTAINER= chris@uminac.com
COMMENT= Benchmarking tool for pipes
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 343c56c55ee4..87d63afc81b1 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dbench
PORTVERSION= 4.0
PORTREVISION= 2
CATEGORIES= benchmarks
-MASTER_SITES= SAMBA
-MASTER_SITE_SUBDIR= ../../ftp/tridge/dbench
+MASTER_SITES= SAMBA/../../ftp/tridge/dbench
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= Simulation of the Ziff-Davis netbench benchmark
diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile
index f30173a1092a..fd4f7db677aa 100644
--- a/benchmarks/hpl/Makefile
+++ b/benchmarks/hpl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= hpl
PORTVERSION= 2.1
PORTREVISION= 5
CATEGORIES= benchmarks
-MASTER_SITES= ${MASTER_SITE_NETLIB}
-MASTER_SITE_SUBDIR= benchmark/hpl
+MASTER_SITES= NETLIB/benchmark/hpl
MAINTAINER= oliver@FreeBSD.org
COMMENT= High Performance Computing Linpack Benchmark
diff --git a/benchmarks/imb/Makefile b/benchmarks/imb/Makefile
index 159cd2366369..33f680ee22cf 100644
--- a/benchmarks/imb/Makefile
+++ b/benchmarks/imb/Makefile
@@ -5,9 +5,8 @@ PORTNAME= imb
PORTVERSION= 3.0
PORTREVISION= 12
CATEGORIES= benchmarks parallel
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/itetcu \
http://cache-www.intel.com/cd/00/00/32/71/
-MASTER_SITE_SUBDIR= itetcu
DISTNAME= 327191_327191
EXTRACT_SUFX= .gz
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index cedec95d44e5..ff78bb24b217 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -4,8 +4,7 @@
PORTNAME= netio
PORTVERSION= 1.32
CATEGORIES= benchmarks net ipv6
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+MASTER_SITES= LOCAL/arved
DISTNAME= netio132
MAINTAINER= arved@FreeBSD.org
diff --git a/benchmarks/p5-Benchmark-Stopwatch/Makefile b/benchmarks/p5-Benchmark-Stopwatch/Makefile
index 4ddb96ecb84d..c6ea168307aa 100644
--- a/benchmarks/p5-Benchmark-Stopwatch/Makefile
+++ b/benchmarks/p5-Benchmark-Stopwatch/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= benchmarks perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Benchmark
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
index c26d55418912..c4cdb71c4be1 100644
--- a/benchmarks/sipp/Makefile
+++ b/benchmarks/sipp/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 3.3
PORTREVISION= 2
CATEGORIES= benchmarks net
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sipp/sipp/${PORTVERSION}
DISTNAME= ${PORTNAME}-3.3beta2
MAINTAINER= ports@FreeBSD.org
diff --git a/benchmarks/super-smack/Makefile b/benchmarks/super-smack/Makefile
index 4967cbb8ad52..a96e52394198 100644
--- a/benchmarks/super-smack/Makefile
+++ b/benchmarks/super-smack/Makefile
@@ -5,7 +5,7 @@ PORTNAME= super-smack
PORTVERSION= 1.3
PORTREVISION= 2
CATEGORIES= benchmarks databases
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Benchmarking, stress testing, and load generation tool for Databases
diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile
index c570b9ccb774..75d0fb995e17 100644
--- a/benchmarks/ubench/Makefile
+++ b/benchmarks/ubench/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ubench
PORTVERSION= 0.32
CATEGORIES= benchmarks
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/benchmark
+MASTER_SITES= SUNSITE/system/benchmark
MAINTAINER= brian@FreeBSD.org
COMMENT= Unix Benchmark Utility for CPU(s) and memory
diff --git a/benchmarks/webbench/Makefile b/benchmarks/webbench/Makefile
index 8dc0dff1bca5..a7db5be01448 100644
--- a/benchmarks/webbench/Makefile
+++ b/benchmarks/webbench/Makefile
@@ -4,8 +4,7 @@
PORTNAME= webbench
PORTVERSION= 1.5
CATEGORIES= benchmarks www
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/www/servers
+MASTER_SITES= SUNSITE/apps/www/servers
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple forking web benchmark
diff --git a/biology/biococoa/Makefile b/biology/biococoa/Makefile
index 987c836e062c..ab9b60787661 100644
--- a/biology/biococoa/Makefile
+++ b/biology/biococoa/Makefile
@@ -4,8 +4,7 @@ PORTNAME= biococoa
PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= biology gnustep
-MASTER_SITES= http://bioinformatics.org/biococoa/downloads/ ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/b/biococoa.app
+MASTER_SITES= http://bioinformatics.org/biococoa/downloads/ DEBIAN/pool/main/b/biococoa.app
DISTNAME= biococoa-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/biology/clustalw/Makefile b/biology/clustalw/Makefile
index faf13501720e..d9aa9cc35609 100644
--- a/biology/clustalw/Makefile
+++ b/biology/clustalw/Makefile
@@ -5,9 +5,8 @@ PORTNAME= clustalw
PORTVERSION= 2.1
PORTREVISION= 1
CATEGORIES= biology
-MASTER_SITES= ftp://ftp.ebi.ac.uk/pub/software/clustalw2/%SUBDIR%/ \
- http://www.clustal.org/download/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= ftp://ftp.ebi.ac.uk/pub/software/clustalw2/${PORTVERSION}/ \
+ http://www.clustal.org/download/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiple alignment program for DNA or proteins
diff --git a/biology/t_coffee/Makefile b/biology/t_coffee/Makefile
index 5de83fb7f752..ba3cffaee2c0 100644
--- a/biology/t_coffee/Makefile
+++ b/biology/t_coffee/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 9.03
DISTVERSIONSUFFIX= .r1318
PORTREVISION= 3
CATEGORIES= biology
-MASTER_SITES= http://www.tcoffee.org/Packages/Stable/%SUBDIR%/
-MASTER_SITE_SUBDIR= Version_${PORTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITES= http://www.tcoffee.org/Packages/Stable/Version_${PORTVERSION}${DISTVERSIONSUFFIX}/
DISTNAME= T-COFFEE_distribution_Version_${PORTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/basicdsp/Makefile b/cad/basicdsp/Makefile
index 482c29f87c90..8a9973062d8d 100644
--- a/cad/basicdsp/Makefile
+++ b/cad/basicdsp/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.01
PORTREVISION= 6
CATEGORIES= cad hamradio
MASTER_SITES= http://wwwhome.cs.utwente.nl/~ptdeboer/ham/basicdsp/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= db@FreeBSD.org
COMMENT= Program for experimenting with simple audio DSP algorithms
diff --git a/cad/cascade/Makefile b/cad/cascade/Makefile
index a695a1d9abf4..35d9a6e3abf3 100644
--- a/cad/cascade/Makefile
+++ b/cad/cascade/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cascade
PORTVERSION= 1.4
CATEGORIES= cad
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= rfcascade/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/rfcascade/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Simple tool to analyze noise and distortion of a RF system
diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index 7b96f0e16761..7ae6af857b53 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cider
PORTVERSION= 1.b1
PORTREVISION= 8
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mita
+MASTER_SITES= LOCAL/mita
DISTNAME= cider1b1
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 2b4e738a5afb..eaf283f491b4 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -5,10 +5,9 @@ PORTNAME= electric
PORTVERSION= 9.05
PORTREVISION= 1
CATEGORIES= cad java
-MASTER_SITES= ${MASTER_SITE_GNU} \
+MASTER_SITES= GNU/${PORTNAME:S/-ng//} \
http://www.staticfreesoft.com/:1 \
http://www.staticfreesoft.com/jmanual/:2
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-ng//}
PKGNAMESUFFIX= -ng
EXTRACT_SUFX=
DISTFILES+= ${PORTNAME}Binary-${PORTVERSION}.jar
diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile
index 34e77a0ef5ac..c42662e25188 100644
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fidocadj
PORTVERSION= 0.24.4
#PORTREVISION= 0
CATEGORIES= cad
-MASTER_SITES= SF:src,docs
-MASTER_SITE_SUBDIR= ${PORTNAME}/:src ${PORTNAME}/manuals/:docs
+MASTER_SITES= SF/${PORTNAME}/:src SF/${PORTNAME}/manuals/:docs
DISTFILES= ${PORTNAME}.jar:src
EXTRACT_ONLY=
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index a5b2563ca12e..ccb17a67aed5 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.8.2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= cad
-MASTER_SITES= http://ftp.geda-project.org/geda-gaf/stable/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${PORTVERSION:R}/${PORTVERSION}
+MASTER_SITES= http://ftp.geda-project.org/geda-gaf/stable/v${PORTVERSION:R}/${PORTVERSION}/
DISTNAME= ${PORTNAME}-gaf-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index fc62b4288c03..d9f2345e32ef 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kicad
DISTVERSION= r${BZR_SRC_REV}
PORTREVISION= 1
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mr
+MASTER_SITES= LOCAL/mr
PKGNAMESUFFIX= -devel
DIST_SUBDIR= ${PORTNAME}
diff --git a/cad/layouteditor/Makefile b/cad/layouteditor/Makefile
index 90ade69a5dff..d7b4e14122dc 100644
--- a/cad/layouteditor/Makefile
+++ b/cad/layouteditor/Makefile
@@ -5,8 +5,7 @@ PORTNAME= layouteditor
PORTVERSION= 0.0.20110614
PORTREVISION= 2
CATEGORIES= cad
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
DISTNAME= LayoutEditor-${PORTVERSION:S,^0.0.,,}-gpl-src
MAINTAINER= hrs@FreeBSD.org
diff --git a/cad/meshdev/Makefile b/cad/meshdev/Makefile
index a45d31cbf723..bd301711dc50 100644
--- a/cad/meshdev/Makefile
+++ b/cad/meshdev/Makefile
@@ -4,9 +4,8 @@
PORTNAME= meshdev
PORTVERSION= 0.5
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/gahr \
http://people.freebsd.org/~gahr/distfiles/
-MASTER_SITE_SUBDIR= gahr
MAINTAINER= ports@FreeBSD.org
COMMENT= Mesh comparison software
diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index 1f83c9e43aa3..7c82164b1b61 100644
--- a/chinese/auto-cn-l10n/Makefile
+++ b/chinese/auto-cn-l10n/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 3
CATEGORIES= chinese
#MASTER_SITES= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
-MASTER_SITES= ${MASTER_SITE_LOCAL:S/%SUBDIR%/delphij/}
+MASTER_SITES= LOCAL/delphij
DISTNAME= zh-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/chinese/fcitx-googlepinyin/Makefile b/chinese/fcitx-googlepinyin/Makefile
index 9e77d06112db..00e62cb89c81 100644
--- a/chinese/fcitx-googlepinyin/Makefile
+++ b/chinese/fcitx-googlepinyin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= fcitx-googlepinyin
PORTVERSION= 0.1.6
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index 3ee68ed9446f..8ae61aa9c69d 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ibus-pinyin
PORTVERSION= 1.5.0
PORTREVISION= 1
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= henry.hu.sh@gmail.com
COMMENT= PinYin engine for IBus
diff --git a/chinese/joe/Makefile b/chinese/joe/Makefile
index 85c4c6eb46e1..696be5cfb9ee 100644
--- a/chinese/joe/Makefile
+++ b/chinese/joe/Makefile
@@ -3,8 +3,7 @@
CATEGORIES= chinese
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= chinsan/patch
+PATCH_SITES= LOCAL/chinsan/patch
PATCHFILES= zh-joe-3.7.diff
PATCH_DIST_STRIP= -p1
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 667967e71599..27dcdb4ddcba 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kcfonts
PORTVERSION= 1.05
PORTREVISION= 3
CATEGORIES= chinese x11-fonts
-MASTER_SITES= ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Kuo Chauo Chinese Fonts collection
diff --git a/chinese/libgooglepinyin/Makefile b/chinese/libgooglepinyin/Makefile
index 6aa045c3f3ef..4aef86b548e9 100644
--- a/chinese/libgooglepinyin/Makefile
+++ b/chinese/libgooglepinyin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgooglepinyin
PORTVERSION= 0.1.2
CATEGORIES= chinese devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= lichray@gmail.com
COMMENT= Fork of Google Pinyin IME on Android
diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile
index af2996498ed4..da5a5e87d11a 100644
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@@ -4,7 +4,7 @@
PORTNAME= opencc
PORTVERSION= 0.4.3
CATEGORIES= chinese converters
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= lichray@gmail.com
COMMENT= Open Chinese Convert library and utilities
diff --git a/chinese/p5-Lingua-ZH-Segment/Makefile b/chinese/p5-Lingua-ZH-Segment/Makefile
index 5b640bda69d5..4a5c334bfc08 100644
--- a/chinese/p5-Lingua-ZH-Segment/Makefile
+++ b/chinese/p5-Lingua-ZH-Segment/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= chinese perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Lingua
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/chinese/pyzy/Makefile b/chinese/pyzy/Makefile
index 50e2e285edb8..d695ababfe7f 100644
--- a/chinese/pyzy/Makefile
+++ b/chinese/pyzy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pyzy
PORTVERSION= 0.1.0
PORTREVISION= 1
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index e16b86686922..5cb5b708c6ed 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 3.03
PORTEPOCH= 2
CATEGORIES= chinese graphics print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
- ${MASTER_SITE_TEX_CTAN} \
+ TEX_CTAN/support/xpdf \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= support/xpdf
PKGNAMESUFFIX= -zhfont
DISTFILES= xpdf-chinese-simplified-2011-sep-02${EXTRACT_SUFX} \
xpdf-chinese-traditional-2011-sep-02${EXTRACT_SUFX}
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index 9ce9197d8aed..3be10c652a6d 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= aldo
PORTVERSION= 0.7.5
PORTREVISION= 2
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= lambert@lambertfam.org
COMMENT= Morse code training program
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile
index 6b0658549b55..d5a00abff3ba 100644
--- a/comms/bpl+/Makefile
+++ b/comms/bpl+/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bpl+
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= max
+MASTER_SITES= LOCAL/max
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index d24a81e27894..894393ad86a6 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://chirp.danplanet.com/download/${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Chirp is a free, open-source tool for programming your amateur radio
diff --git a/comms/chu/Makefile b/comms/chu/Makefile
index 35fb2250d03e..ef3f15ac1a8d 100644
--- a/comms/chu/Makefile
+++ b/comms/chu/Makefile
@@ -4,9 +4,8 @@
PORTNAME= chu
PORTVERSION= 0.1.29
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/system/admin/time \
http://www.rossi.com/chu/
-MASTER_SITE_SUBDIR= system/admin/time
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Synchronise computer clock to CHU radio station
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index e93770046278..cc731163b214 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.8.2
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://www.cqrlog.com/files/cqrlog_${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
DISTNAME= ${PORTNAME}_${PORTVERSION}.src
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/cwdaemon/Makefile b/comms/cwdaemon/Makefile
index 66a7435d06c9..4bdf1d6101b3 100644
--- a/comms/cwdaemon/Makefile
+++ b/comms/cwdaemon/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cwdaemon
PORTVERSION= 0.9.4
CATEGORIES= comms hamradio
MASTER_SITES= http://www.chronos.org.uk/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Amateur Radio cw (Morse code) keyer daemon
diff --git a/comms/ebook2cw/Makefile b/comms/ebook2cw/Makefile
index 4f79dcabb607..fa09a311b696 100644
--- a/comms/ebook2cw/Makefile
+++ b/comms/ebook2cw/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ebook2cw
PORTVERSION= 0.8.2
CATEGORIES= comms hamradio
MASTER_SITES= http://fkurz.net/ham/ebook2cw/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Convert text files into cw as an mp3 or ogg file
diff --git a/comms/ebook2cwgui/Makefile b/comms/ebook2cwgui/Makefile
index ac44f7990fa1..c3d7c0af3a64 100644
--- a/comms/ebook2cwgui/Makefile
+++ b/comms/ebook2cwgui/Makefile
@@ -6,8 +6,7 @@ PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://fkurz.net/ham/ebook2cw/ \
http://distfiles.bsdjunk.com/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= gui front end for ebooks2cw
diff --git a/comms/esmska/Makefile b/comms/esmska/Makefile
index 3fb2e41ce885..59d5f4414d6f 100644
--- a/comms/esmska/Makefile
+++ b/comms/esmska/Makefile
@@ -4,7 +4,7 @@
PORTNAME= esmska
PORTVERSION= 0.21
CATEGORIES= comms java
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= gamato@users.sf.net
COMMENT= Program for sending SMS over the Internet
diff --git a/comms/fl_moxgen/Makefile b/comms/fl_moxgen/Makefile
index 6d03a5dc9cd9..30d49b2ea3b1 100644
--- a/comms/fl_moxgen/Makefile
+++ b/comms/fl_moxgen/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fl_moxgen
PORTVERSION= 1.00
PORTREVISION= 1
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= flmoxgen
+MASTER_SITES= SF/flmoxgen
DISTNAME= Fl_MoxGen-${PORTVERSION}
MAINTAINER= shurd@FreeBSD.org
diff --git a/comms/fllog/Makefile b/comms/fllog/Makefile
index 92a5ab3175b7..edc31945006c 100644
--- a/comms/fllog/Makefile
+++ b/comms/fllog/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fllog
PORTVERSION= 1.2.0
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/downloads/fllog/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Ham Radio logging program
diff --git a/comms/flrig/Makefile b/comms/flrig/Makefile
index 0350f48244ab..e7748238638a 100644
--- a/comms/flrig/Makefile
+++ b/comms/flrig/Makefile
@@ -5,8 +5,7 @@ PORTNAME= flrig
PORTVERSION= 1.3.22
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/downloads/flrig/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Ham Radio rig control program, cooperates with fldigi
diff --git a/comms/flwrap/Makefile b/comms/flwrap/Makefile
index 4a0f1a6f8b16..6584bf8a2f07 100644
--- a/comms/flwrap/Makefile
+++ b/comms/flwrap/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.3.4
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/downloads/flwrap/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Flwrap is a companion utility for fldigi
diff --git a/comms/geoid/Makefile b/comms/geoid/Makefile
index 7a656c0a128e..364f38b623a7 100644
--- a/comms/geoid/Makefile
+++ b/comms/geoid/Makefile
@@ -6,8 +6,7 @@ PORTREVISION= 7
DISTVERSIONSUFFIX= .src
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/LinuxApps/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= fl_geoid
EXTRACT_SUFX= .src.tar.gz
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 3a192afa02d3..c2279d8fe422 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 3.7.4
PORTREVISION= 2
CATEGORIES= comms astro hamradio
MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Amateur Radio Software defined radio
diff --git a/comms/gtkmmorse/Makefile b/comms/gtkmmorse/Makefile
index 5b4c5b8d2b13..7a8374bde7d0 100644
--- a/comms/gtkmmorse/Makefile
+++ b/comms/gtkmmorse/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gtkmmorse
PORTVERSION= 0.9.27
PORTREVISION= 1
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= shurd@FreeBSD.org
COMMENT= Graphical Morse Code Trainer
diff --git a/comms/ibp/Makefile b/comms/ibp/Makefile
index 45c43dbbe4cc..0e7241ad78fe 100644
--- a/comms/ibp/Makefile
+++ b/comms/ibp/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.21
PORTREVISION= 2
CATEGORIES= comms hamradio
MASTER_SITES= http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Little program for monitoring amateur radio beacons
diff --git a/comms/kb/Makefile b/comms/kb/Makefile
index ac6dce3dfef4..a1091ab3deec 100644
--- a/comms/kb/Makefile
+++ b/comms/kb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 8.04
PORTREVISION= 8
CATEGORIES= comms hamradio
MASTER_SITES= http://www.db.net/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTFILES= kb_src-${PORTVERSION}.tar.gz kb_inst-${PORTVERSION}.tar.gz
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/libfec/Makefile b/comms/libfec/Makefile
index 9330e2b0ab24..9aec53b85f79 100644
--- a/comms/libfec/Makefile
+++ b/comms/libfec/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 3.0.1
PORTREVISION= 1
CATEGORIES= comms astro hamradio math
MASTER_SITES= http://www.ka9q.net/code/fec/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= fec-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index a398eb9aae12..8a1ddad5e474 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -3,8 +3,7 @@
PORTNAME= linpsk
PORTVERSION= 1.2
CATEGORIES= comms hamradio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Simple Qt PSK31, RTTY, and MSK31 client
diff --git a/comms/locator/Makefile b/comms/locator/Makefile
index 834142075037..520a3bb3467c 100644
--- a/comms/locator/Makefile
+++ b/comms/locator/Makefile
@@ -4,7 +4,7 @@
PORTNAME= locator
PORTVERSION= 0.1
CATEGORIES= comms hamradio astro geography
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/ham/}
+MASTER_SITES= SUNSITE/apps/ham/
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Grid square calculator program used in Amateur Radio and GPS work
diff --git a/comms/morse/Makefile b/comms/morse/Makefile
index 748a318494e2..dc6258ef0609 100644
--- a/comms/morse/Makefile
+++ b/comms/morse/Makefile
@@ -5,8 +5,7 @@ PORTNAME= morse
PORTVERSION= 2.5
CATEGORIES= comms hamradio
MASTER_SITES= http://www.catb.org/~esr/morse/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= shurd@FreeBSD.org
COMMENT= Morse Code Trainer
diff --git a/comms/nasawash/Makefile b/comms/nasawash/Makefile
index 93294c66dcd4..683c2c19f3a7 100644
--- a/comms/nasawash/Makefile
+++ b/comms/nasawash/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nasawash
PORTVERSION= 0.50
CATEGORIES= comms hamradio
MASTER_SITES= ftp://ftp.amsat.org/amsat/software/Linux/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= nasawash
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/nec2c/Makefile b/comms/nec2c/Makefile
index fac68676e4c4..af071b96f13e 100644
--- a/comms/nec2c/Makefile
+++ b/comms/nec2c/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= .9
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://nec-archives.pa3kj.com/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= nec2c
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/o2sms/Makefile b/comms/o2sms/Makefile
index 95c963416a53..f5faf6c37b4a 100644
--- a/comms/o2sms/Makefile
+++ b/comms/o2sms/Makefile
@@ -5,9 +5,8 @@ PORTNAME= o2sms
PORTVERSION= 3.36
PORTREVISION= 1
CATEGORIES= comms perl5
-MASTER_SITES= CPAN \
+MASTER_SITES= CPAN/WWW/MACKERS \
http://www.mackers.com/projects/o2sms/releases/
-MASTER_SITE_SUBDIR= WWW/MACKERS
MAINTAINER= ports@FreeBSD.org
COMMENT= Send SMS messages via the websites of Irish mobile operators
diff --git a/comms/picocom/Makefile b/comms/picocom/Makefile
index d74cffaca5d1..da8b31e0047c 100644
--- a/comms/picocom/Makefile
+++ b/comms/picocom/Makefile
@@ -4,7 +4,7 @@
PORTNAME= picocom
PORTVERSION= 1.7
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= dhn@FreeBSD.org
COMMENT= Dumb Terminal Emulator
diff --git a/comms/predict/Makefile b/comms/predict/Makefile
index e5d96d00f553..dc415e1c607e 100644
--- a/comms/predict/Makefile
+++ b/comms/predict/Makefile
@@ -5,8 +5,7 @@ PORTNAME= predict
PORTVERSION= 2.2.3
CATEGORIES= comms astro hamradio
MASTER_SITES= ftp://ftp.amsat.org/amsat/software/Linux/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Satellite tracking program for amateur radio satellites
diff --git a/comms/pyla/Makefile b/comms/pyla/Makefile
index b4c10470656a..802c8a88b718 100644
--- a/comms/pyla/Makefile
+++ b/comms/pyla/Makefile
@@ -5,11 +5,9 @@ PORTNAME= pyla
PORTVERSION= 1.1.7.1
CATEGORIES= comms python
#MASTER_SITES= http://www.teamsw.it/pyla/download/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mr
+MASTER_SITES= LOCAL/mr
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyla${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= mike@Reifenberger.com
COMMENT= Hylafax client written in Python
@@ -19,7 +17,7 @@ COMMENT= Hylafax client written in Python
WRKSRC= ${WRKDIR}/${PORTNAME}
DATADIR= ${PREFIX}/lib/pyla
-USES= python
+USES= python tar:tgz
PLIST= ${WRKDIR}/pkg-plist
do-build:
diff --git a/comms/qrq/Makefile b/comms/qrq/Makefile
index 72b39dce7653..33043228f3a1 100644
--- a/comms/qrq/Makefile
+++ b/comms/qrq/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.3.1
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://fkurz.net/ham/qrq/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Morse telegraphy trainer similar to the classic DOS version by DL4MM
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index bce95898ba51..d8fba3e5a6d9 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 8.2.11
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index e9235504439a..2ca5bbdb3365 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quisk
PORTVERSION= 3.6.22
CATEGORIES= comms hamradio
MASTER_SITES= http://james.ahlstrom.name/quisk/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=shurd
+ LOCAL/shurd
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Software Defined Radio (SDR)
diff --git a/comms/soundmodem/Makefile b/comms/soundmodem/Makefile
index a34a4f8e6517..a9131ffc7628 100644
--- a/comms/soundmodem/Makefile
+++ b/comms/soundmodem/Makefile
@@ -6,8 +6,7 @@ CATEGORIES= comms hamradio
MASTER_SITES= http://www.baycom.org/~tom/ham/soundmodem/ \
http://soundmodem.vk4msl.yi.org/ \
http://pv529.ncsrv.de/soundmodem/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Amateur Radio sound modem
diff --git a/comms/splat/Makefile b/comms/splat/Makefile
index 7d10bc154049..d262753acd8c 100644
--- a/comms/splat/Makefile
+++ b/comms/splat/Makefile
@@ -3,8 +3,7 @@
PORTNAME= splat
PORTVERSION= 1.4.0
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/ham
+MASTER_SITES= SUNSITE/apps/ham
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Used in calculating path losses, useful to ham radio and others
diff --git a/comms/sredird/Makefile b/comms/sredird/Makefile
index 3d8b1f1db3f7..eefe865d269c 100644
--- a/comms/sredird/Makefile
+++ b/comms/sredird/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sredird
PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/serial
+MASTER_SITES= SUNSITE/system/serial
MAINTAINER= ports@FreeBSD.org
COMMENT= RFC 2217 compliant serial port redirector
diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile
index 2ff190041aa4..476968355502 100644
--- a/comms/usrp/Makefile
+++ b/comms/usrp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= usrp
PORTVERSION= 3.4.3
PORTREVISION= 4
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= adrian
+MASTER_SITES= LOCAL/adrian
DISTNAME= Ettus-USRP-3.4.3
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/vrflash/Makefile b/comms/vrflash/Makefile
index 1daa9284f1b8..0c3d9b49c454 100644
--- a/comms/vrflash/Makefile
+++ b/comms/vrflash/Makefile
@@ -3,8 +3,7 @@
PORTNAME= vrflash
PORTVERSION= 0.20
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Flash kernels and romdisks to the Agenda VR3
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 901d2b03e11d..2e015cc955cc 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -5,8 +5,7 @@ VERSION= 9.1
PORTREVISION= 10
DISTVERSION= ${VERSION}.r${SVN_REV}
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+MASTER_SITES= LOCAL/db
DISTNAME= wsjt-r${SVN_REV}
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 3403a8252f1c..3872e3435f51 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -4,8 +4,7 @@ PORTNAME= wspr
DISTVERSION= ${VERSION}.r${SVN_REV}
PORTREVISION= 3
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+MASTER_SITES= LOCAL/db
DISTNAME= wspr-r${SVN_REV}
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/wwl/Makefile b/comms/wwl/Makefile
index 5d1b35eaa91c..8f3f8a2452c9 100644
--- a/comms/wwl/Makefile
+++ b/comms/wwl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wwl
PORTVERSION= 1.3
CATEGORIES= comms hamradio astro geography
MASTER_SITES= http://www.db.net/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= ${PORTNAME}+db-${PORTVERSION}
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/wy60/Makefile b/comms/wy60/Makefile
index edd6003be1ef..afd9368fb3f7 100644
--- a/comms/wy60/Makefile
+++ b/comms/wy60/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wy60
PORTVERSION= 2.0.9
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= naddy@FreeBSD.org
COMMENT= Curses-based emulator for the Wyse 60 terminal
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile
index 6898a474e384..3f5d92f06c2d 100644
--- a/comms/xdx/Makefile
+++ b/comms/xdx/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.4
PORTREVISION= 5
CATEGORIES= comms hamradio
MASTER_SITES= http://www.chronos.org.uk/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= xride@FreeBSD.org
COMMENT= Amateur Radio DX cluster monitor
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 4fc0a8f59789..f9034751be56 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -5,7 +5,6 @@ PORTNAME= xlog
PORTVERSION= 2.0.13
CATEGORIES= comms hamradio
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= xlog
MAINTAINER= danilo@FreeBSD.org
COMMENT= Amateur Radio logging application
diff --git a/comms/xnec2c/Makefile b/comms/xnec2c/Makefile
index 6f987d00cb6d..212c26d8edf9 100644
--- a/comms/xnec2c/Makefile
+++ b/comms/xnec2c/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xnec2c
PORTVERSION= 3.3
CATEGORIES= comms hamradio
MASTER_SITES= http://www.qsl.net/5b4az/pkg/nec2/xnec2c/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Used to calculate antenna patterns useful to ham radio
diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile
index 82ef021a0cb1..e02c10e50ecc 100644
--- a/comms/xwota/Makefile
+++ b/comms/xwota/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.4
PORTREVISION= 7
CATEGORIES= comms hamradio
MASTER_SITES= http://people.fabaris.it/iz0ete/xwota/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= X version of who is on the air
diff --git a/comms/yagiuda/Makefile b/comms/yagiuda/Makefile
index 99b1ebf212f4..c4632f306902 100644
--- a/comms/yagiuda/Makefile
+++ b/comms/yagiuda/Makefile
@@ -5,8 +5,7 @@ PORTNAME= yagiuda
PORTVERSION= 1.19
CATEGORIES= comms hamradio
MASTER_SITES= http://www.g8wrb.org/yagi/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Used to calculate yagi-uda antenna patterns useful to ham radio
diff --git a/comms/yfklog/Makefile b/comms/yfklog/Makefile
index d56846694eef..f06213f5c865 100644
--- a/comms/yfklog/Makefile
+++ b/comms/yfklog/Makefile
@@ -5,11 +5,10 @@ PORTNAME= yfklog
PORTVERSION= 0.3.5
CATEGORIES= comms hamradio
MASTER_SITES= http://fkurz.net/ham/yfklog/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
-DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz yfk.png
+ LOCAL/db
+DISTFILES= ${DISTNAME}.tar.gz yfk.png
DIST_SUBDIR= ${PORTNAME}
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz
+EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Amateur Radio curses based logging program
diff --git a/converters/btoa/Makefile b/converters/btoa/Makefile
index 73bc326c12ce..c465cfcf3427 100644
--- a/converters/btoa/Makefile
+++ b/converters/btoa/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 5.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= pgollucci
+MASTER_SITES= LOCAL/pgollucci
MAINTAINER= ports@FreeBSD.org
COMMENT= Encode/decode binary to printable ASCII
diff --git a/converters/cl-babel/Makefile b/converters/cl-babel/Makefile
index d0f599a9ffb6..74c9f2da65de 100644
--- a/converters/cl-babel/Makefile
+++ b/converters/cl-babel/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 2010.01.16
PORTREVISION= 2
CATEGORIES= converters lisp
PKGNAMEPREFIX= cl-
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Charset encoding/decoding library written in Common Lisp
diff --git a/converters/cocot/Makefile b/converters/cocot/Makefile
index e6b1945465ef..aebfc79032e5 100644
--- a/converters/cocot/Makefile
+++ b/converters/cocot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cocot
PORTVERSION= 20120313
CATEGORIES= converters
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
DISTNAME= ${PORTNAME}-1.1-${PORTVERSION}
MAINTAINER= knu@FreeBSD.org
diff --git a/converters/fconv/Makefile b/converters/fconv/Makefile
index a58c9057d1be..bc7e882f14a9 100644
--- a/converters/fconv/Makefile
+++ b/converters/fconv/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fconv
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= chris
+MASTER_SITES= LOCAL/chris
MAINTAINER= chris@FreeBSD.org
COMMENT= Converts DOS or Mac-style files to Unix format, and vice-versa
diff --git a/converters/iconv-extra/Makefile b/converters/iconv-extra/Makefile
index 678240f83377..c56f508701e0 100644
--- a/converters/iconv-extra/Makefile
+++ b/converters/iconv-extra/Makefile
@@ -4,8 +4,7 @@
PORTNAME= iconv-extra
PORTVERSION= 2.0
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= bland
+MASTER_SITES= LOCAL/bland
MAINTAINER= bland@FreeBSD.org
COMMENT= Additional charsets for the iconv library (those from the Unicode site)
diff --git a/converters/iconv-rfc1345/Makefile b/converters/iconv-rfc1345/Makefile
index bf5473fab2e2..af1e1fc011f3 100644
--- a/converters/iconv-rfc1345/Makefile
+++ b/converters/iconv-rfc1345/Makefile
@@ -4,8 +4,7 @@
PORTNAME= iconv-rfc1345
PORTVERSION= 2.0
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= bland
+MASTER_SITES= LOCAL/bland
MAINTAINER= bland@FreeBSD.org
COMMENT= Additional charset modules for the iconv library (from RFC1345)
diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile
index 692ef49754aa..a8449f5f4f67 100644
--- a/converters/iconv/Makefile
+++ b/converters/iconv/Makefile
@@ -5,8 +5,7 @@ PORTNAME= iconv
PORTVERSION= 2.0
PORTREVISION= 4
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= bland
+MASTER_SITES= LOCAL/bland
MAINTAINER= bland@FreeBSD.org
COMMENT= Charset conversion library and utilities
diff --git a/converters/ish/Makefile b/converters/ish/Makefile
index 6f641e675236..7af205ed4eaf 100644
--- a/converters/ish/Makefile
+++ b/converters/ish/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ish
PORTVERSION= 2.01a5
CATEGORIES= converters
MASTER_SITES= http://www.unix.gr.jp/jnetcex/soft/\
- ${MASTER_SITE_PORTS_JP}
+ PORTS_JP
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 78ca639386f7..b23318638e55 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -34,8 +34,7 @@ CONFIGURE_ARGS+= --enable-extra-encodings
.if ${PORT_OPTIONS:MPATCHES}
PATCH_SITES+= http://apolloron.org/software/libiconv-1.14-ja/
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR+= kwm
+PATCH_SITES+= LOCAL/kwm
PATCHFILES+= ${DISTNAME}-ja-1.patch.gz
PATCH_DIST_STRIP+= -p1
.endif
diff --git a/converters/o3read/Makefile b/converters/o3read/Makefile
index 3173bf24fafb..3f1e99eba4b8 100644
--- a/converters/o3read/Makefile
+++ b/converters/o3read/Makefile
@@ -5,8 +5,7 @@ PORTNAME= o3read
PORTVERSION= 0.0.4
CATEGORIES= converters
MASTER_SITES= http://siag.nu/pub/o3read/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER= samm@os2.kiev.ua
COMMENT= Standalone converter for the OpenOffice.org writer and scalc formats
diff --git a/converters/p5-Cstools/Makefile b/converters/p5-Cstools/Makefile
index 09b4e1aed77d..5e371b73e38e 100644
--- a/converters/p5-Cstools/Makefile
+++ b/converters/p5-Cstools/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 3.42
PORTREVISION= 1
CATEGORIES= converters perl5
MASTER_SITES= http://www.adelton.com/perl/Cstools/ \
- CPAN
-MASTER_SITE_SUBDIR= Cz
+ CPAN/Cz
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/converters/p5-Encode-Detect/Makefile b/converters/p5-Encode-Detect/Makefile
index fcbed0fbf0e5..0156a3d5d5ae 100644
--- a/converters/p5-Encode-Detect/Makefile
+++ b/converters/p5-Encode-Detect/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.01
PORTREVISION= 1
CATEGORIES= converters perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Encode
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/converters/p5-Encode-DoubleEncodedUTF8/Makefile b/converters/p5-Encode-DoubleEncodedUTF8/Makefile
index 13fa03417e10..4ef9b7f308ef 100644
--- a/converters/p5-Encode-DoubleEncodedUTF8/Makefile
+++ b/converters/p5-Encode-DoubleEncodedUTF8/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= converters perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Encode
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index b71be67c78e5..8bbf369b8d42 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pdf2djvu
PORTVERSION= 0.7.17
PORTREVISION= 4
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= darcsis@gmail.com
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index a32636c47b8d..52ebbd53f6f9 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wkhtmltopdf
PORTVERSION= 0.12.2.1
PORTREVISION= 1
CATEGORIES= converters
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
DISTNAME= wkhtmltox-${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 2ce352de37be..0c83d57525bd 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cassandra
PORTVERSION= 1.2.18
PORTREVISION= 1
CATEGORIES= databases java
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= cassandra/${PORTVERSION}
+MASTER_SITES= APACHE/cassandra/${PORTVERSION}
DISTNAME= apache-cassandra-${PORTVERSION}
EXTRACT_SUFX= -bin.tar.gz
diff --git a/databases/cassandra2/Makefile b/databases/cassandra2/Makefile
index 23c11ccef7db..b2b701bfe930 100644
--- a/databases/cassandra2/Makefile
+++ b/databases/cassandra2/Makefile
@@ -3,8 +3,7 @@
PORTNAME= cassandra
PORTVERSION= 2.1.1
CATEGORIES= databases java
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= cassandra/${PORTVERSION}
+MASTER_SITES= APACHE/cassandra/${PORTVERSION}
PKGNAMESUFFIX= 2
DISTNAME= apache-cassandra-${PORTVERSION}
EXTRACT_SUFX= -bin.tar.gz
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index d12de7f83bf3..3782a7fd5575 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.6.1
PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= couchdb/source/${PORTVERSION}
+MASTER_SITES= APACHE/couchdb/source/${PORTVERSION}
DISTNAME= apache-couchdb-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/databases/dbview/Makefile b/databases/dbview/Makefile
index ffffc523e526..53c0ca18d90f 100644
--- a/databases/dbview/Makefile
+++ b/databases/dbview/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dbview
PORTVERSION= 1.0.4
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/database/proprietary
+MASTER_SITES= SUNSITE/apps/database/proprietary
MAINTAINER= ports@FreeBSD.org
COMMENT= View dBase III files
diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 5f746dd0577f..6ab8ceb4dda4 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnats
PORTVERSION= 4.1.0
PORTREVISION= 3
CATEGORIES= databases devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= gnats
+MASTER_SITES= GNU
PKGNAMESUFFIX= 4
MAINTAINER= portmaster@bsdforge.com
diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile
index 0f1869681cc1..97d09ef6a582 100644
--- a/databases/isql-viewer/Makefile
+++ b/databases/isql-viewer/Makefile
@@ -6,9 +6,7 @@ PORTVERSION= 2.1.8
PORTREVISION= 4
CATEGORIES= databases java
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
+ APACHE/ws/soap/version-2.2:bsf
DISTFILES= ${ISQL_JAR}:isql \
${BSF_JAR}:bsf
EXTRACT_ONLY= # none
diff --git a/databases/jdbm2/Makefile b/databases/jdbm2/Makefile
index 5bff267123bd..bc37c828b19a 100644
--- a/databases/jdbm2/Makefile
+++ b/databases/jdbm2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= jdbm
PORTVERSION= 2.4
CATEGORIES= databases java
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ale@FreeBSD.org
COMMENT= Fast, simple, and transactional Java persistence engine
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index dd161a40332b..c881289ab257 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.1.19
PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAMBA
MAINTAINER= timur@FreeBSD.org
COMMENT= LDAP-like embedded database
diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile
index a1001dbd1f9c..44839a01bc64 100644
--- a/databases/luadbi/Makefile
+++ b/databases/luadbi/Makefile
@@ -5,7 +5,7 @@ PORTNAME= luadbi
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= olexander.v.melnyk@gmail.com
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 985ed1ce3000..e9f8f364a0e7 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -5,9 +5,8 @@ PORTNAME= memcached
PORTVERSION= 1.4.22
CATEGORIES= databases
MASTER_SITES= http://www.memcached.org/files/ \
- ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GOOGLE_CODE \
+ GENTOO
MAINTAINER= swills@FreeBSD.org
COMMENT= High-performance distributed memory object cache system
diff --git a/databases/memcacheq/Makefile b/databases/memcacheq/Makefile
index 495593137760..0dfa69fc5658 100644
--- a/databases/memcacheq/Makefile
+++ b/databases/memcacheq/Makefile
@@ -5,9 +5,8 @@ PORTNAME= memcacheq
PORTVERSION= 0.2.0
PORTREVISION= 4
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+MASTER_SITES= GOOGLE_CODE \
+ GENTOO
MAINTAINER= m.tsatsenko@gmail.com
COMMENT= Simple queue service over Memcache
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 604a6c661407..7946aeedbeb3 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mysql-connector-c++
PORTVERSION= 1.1.5
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= Connector-C++
+MASTER_SITES= MYSQL/Connector-C++
MAINTAINER= ports@FreeBSD.org
COMMENT= MySQL database connector for C++
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 3d38a6299953..5bdc72e0df0f 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -5,8 +5,7 @@
PORTNAME= mysql-connector-java
PORTVERSION= 5.1.35
CATEGORIES= databases java
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= Connector-J
+MASTER_SITES= MYSQL/Connector-J
MAINTAINER= matthew@FreeBSD.org
COMMENT= MySQL Connector/J: JDBC interface for MySQL
diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index eb7495a6f339..be5aeac9d5dd 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mysql-proxy
PORTVERSION= 0.8.4
PORTREVISION= 2
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-Proxy
+MASTER_SITES= MYSQL/MySQL-Proxy
MAINTAINER= swills@FreeBSD.org
COMMENT= Monitor, analyze, or transform the communication of MySQL
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index f425bb1a339b..fa44003fe3c3 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mysql-workbench-oss
PORTVERSION= 5.1.16
PORTREVISION= 11
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQLGUITools
+MASTER_SITES= MYSQL/MySQLGUITools
PKGNAMESUFFIX= 51
MAINTAINER= ports@FreeBSD.org
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index c026b74dabc6..ec1baa52cff9 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= mysql
PORTVERSION= 5.1.73
PORTREVISION?= 2
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-5.1
+MASTER_SITES= MYSQL/MySQL-5.1
PKGNAMESUFFIX?= 51-server
MAINTAINER= ale@FreeBSD.org
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index e1e68e6529a6..87457a3b0d95 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= mysql
PORTVERSION= 5.5.43
PORTREVISION?= 0
CATEGORIES= databases ipv6
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-5.5
+MASTER_SITES= MYSQL/MySQL-5.5
PKGNAMESUFFIX?= 55-server
MAINTAINER= ale@FreeBSD.org
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 859c3f4356ff..71b559d97933 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= mysql
PORTVERSION= 5.6.24
PORTREVISION?= 0
CATEGORIES= databases ipv6
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-5.6
+MASTER_SITES= MYSQL/MySQL-5.6
PKGNAMESUFFIX?= 56-server
MAINTAINER= ale@FreeBSD.org
diff --git a/databases/nagios-check_postgres_replication/Makefile b/databases/nagios-check_postgres_replication/Makefile
index e14572be6ad8..91484524c685 100644
--- a/databases/nagios-check_postgres_replication/Makefile
+++ b/databases/nagios-check_postgres_replication/Makefile
@@ -4,8 +4,7 @@ PORTNAME= check_postgres_replication
PORTVERSION= 2010.12.16
CATEGORIES= databases python
MASTER_SITES= https://gist.github.com/raw/743942/4b9454d6aaf919fe77d15ecea09c7a001ae83b59/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+ LOCAL/brooks
PKGNAMEPREFIX= nagios-
DISTNAME= check_postgres_replication.py
EXTRACT_SUFX=
diff --git a/databases/ntdb/Makefile b/databases/ntdb/Makefile
index aae678a36f1b..031b4bc8da63 100644
--- a/databases/ntdb/Makefile
+++ b/databases/ntdb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.0
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= tdb
+MASTER_SITES= SAMBA/tdb
MAINTAINER= timur@FreeBSD.org
COMMENT= Not so Trivial DataBase
diff --git a/databases/openark-kit/Makefile b/databases/openark-kit/Makefile
index 204878a75e12..8d123a5c9ee1 100644
--- a/databases/openark-kit/Makefile
+++ b/databases/openark-kit/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openark-kit
PORTVERSION= 196
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Common utilities for MySQL
diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile
index 28cc8bd27756..f571cb31d353 100644
--- a/databases/p5-Class-DBI-Pg/Makefile
+++ b/databases/p5-Class-DBI-Pg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Class-DBI-Pg
PORTVERSION= 0.09
PORTREVISION= 2
CATEGORIES= databases perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Class/DMAKI
+MASTER_SITES= CPAN/Class/DMAKI
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile
index e195fa0ed1af..46cc3964b8b9 100644
--- a/databases/p5-DBD-InterBase/Makefile
+++ b/databases/p5-DBD-InterBase/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.48
PORTREVISION= 2
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
MAINTAINER= yuri@rivera.ru
diff --git a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
index 02a6158e22f4..0cb90cfd2db8 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= fw@moov.de
diff --git a/databases/p5-DBIx-Class-PassphraseColumn/Makefile b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
index 210a4a28a4e3..1826802ac6d7 100644
--- a/databases/p5-DBIx-Class-PassphraseColumn/Makefile
+++ b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= fw@moov.de
diff --git a/databases/p5-DBIx-Class-TimeStamp/Makefile b/databases/p5-DBIx-Class-TimeStamp/Makefile
index f597969bc11c..d596cee9d65b 100644
--- a/databases/p5-DBIx-Class-TimeStamp/Makefile
+++ b/databases/p5-DBIx-Class-TimeStamp/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.14
PORTREVISION= 2
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/databases/p5-DBIx-Ease/Makefile b/databases/p5-DBIx-Ease/Makefile
index 06ca02e80107..5a7402560e6f 100644
--- a/databases/p5-DBIx-Ease/Makefile
+++ b/databases/p5-DBIx-Ease/Makefile
@@ -5,10 +5,8 @@ PORTNAME= DBIx-Ease
PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= databases perl5
-MASTER_SITES= ${MASTER_SITE_LOCAL:S/$/:local/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
-MASTER_SITE_SUBDIR= mat/:local DBIx/:cpan
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:local,cpan
MAINTAINER= perl@FreeBSD.org
COMMENT= Less-code DBI interactions for all drivers
diff --git a/databases/p5-DBIx-HA/Makefile b/databases/p5-DBIx-HA/Makefile
index e734a0770a89..7ade82529a1d 100644
--- a/databases/p5-DBIx-HA/Makefile
+++ b/databases/p5-DBIx-HA/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-DBIx-MySQLSequence/Makefile b/databases/p5-DBIx-MySQLSequence/Makefile
index 60622cbcc256..a0f6307ac189 100644
--- a/databases/p5-DBIx-MySQLSequence/Makefile
+++ b/databases/p5-DBIx-MySQLSequence/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.04
PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile
index 30b031451090..9eacf23a49b1 100644
--- a/databases/p5-MongoDB/Makefile
+++ b/databases/p5-MongoDB/Makefile
@@ -3,11 +3,11 @@
PORTNAME= MongoDB
PORTVERSION= 0.708.1.0
+DISTVERSIONPREFIX= v
CATEGORIES= databases perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MONGODB
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
COMMENT= Mongo Driver for Perl
diff --git a/databases/p5-Oryx/Makefile b/databases/p5-Oryx/Makefile
index d17a66c435d5..996a2c29d9cd 100644
--- a/databases/p5-Oryx/Makefile
+++ b/databases/p5-Oryx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Oryx
PORTVERSION= 0.24
PORTREVISION= 2
CATEGORIES= databases perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= XML/RHUNDT
+MASTER_SITES= CPAN/XML/RHUNDT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index af57fc5c98e9..dbef4678097d 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.1.1
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= databases perl5
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR= projects/gborg/pgperl/stable
+MASTER_SITES= PGSQL/projects/gborg/pgperl/stable
PKGNAMEPREFIX= p5-
DIST_SUBDIR= postgresql
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index 5d31dcd158e6..f661e6ff65c7 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -5,8 +5,7 @@ PORTNAME= RRD-Simple
PORTVERSION= 1.44
PORTREVISION= 6
CATEGORIES= databases perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Proc/NICOLAW
+MASTER_SITES= CPAN/Proc/NICOLAW
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
index b43663165858..f04dba894829 100644
--- a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
+++ b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Rose-DBx-Object-MoreHelpers
PORTVERSION= 0.100
PORTREVISION= 1
CATEGORIES= databases perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Rose/KARMAN
+MASTER_SITES= CPAN/Rose/KARMAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-TokyoCabinet/Makefile b/databases/p5-TokyoCabinet/Makefile
index b8e1d79fcbeb..7c6c027e51e8 100644
--- a/databases/p5-TokyoCabinet/Makefile
+++ b/databases/p5-TokyoCabinet/Makefile
@@ -4,9 +4,8 @@ PORTNAME= TokyoCabinet
PORTVERSION= 1.34
PORTREVISION= 1
CATEGORIES= databases perl5
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/kuriyama \
http://fallabs.com/tokyocabinet/perlpkg/
-MASTER_SITE_SUBDIR= kuriyama
PKGNAMEPREFIX= p5-
DISTNAME= tokyocabinet-perl-${PORTVERSION}
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 067fd45ca841..30257da0a72d 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pgadmin3
PORTVERSION= 1.18.1
PORTREVISION= 2
CATEGORIES= databases
-MASTER_SITES= PGSQL
-MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src
+MASTER_SITES= PGSQL/pgadmin3/release/v${PORTVERSION}/src
DIST_SUBDIR= postgresql
MAINTAINER= fjoe@FreeBSD.org
diff --git a/databases/pgagent/Makefile b/databases/pgagent/Makefile
index 1d3bf2e240c3..9ecedc2a8e52 100644
--- a/databases/pgagent/Makefile
+++ b/databases/pgagent/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pgagent
PORTVERSION= 3.4.0
PORTREVISION= 0
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR= pgadmin3/release/pgagent
+MASTER_SITES= PGSQL/pgadmin3/release/pgagent
DISTNAME= pgAgent-${PORTVERSION}-Source
MAINTAINER= fjoe@FreeBSD.org
diff --git a/databases/pgbadger/Makefile b/databases/pgbadger/Makefile
index 2b0ac445af0b..c93c6279579d 100644
--- a/databases/pgbadger/Makefile
+++ b/databases/pgbadger/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pgbadger
PORTVERSION= 6.2
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
MAINTAINER= girgen@FreeBSD.org
COMMENT= Very competent log analyzer for PostgreSQL
diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile
index 335a5132d7dd..fb21096092b8 100644
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@@ -5,10 +5,10 @@ PORTNAME= pgtcl
PORTVERSION= 2.0.0
PORTREVISION= 1
CATEGORIES= databases tcl
-MASTER_SITES= SF/pgtclng/pgtclng/${PORTVERSION}:src
-MASTER_SITE_SUBDIR= pgtclng
+MASTER_SITES= SF/pgtclng/pgtclng/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= mi@aldan.algebra.com
COMMENT= TCL extension for accessing a PostgreSQL server (PGTCL-NG)
@@ -33,7 +33,6 @@ MANUALREL= 20110918
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
-EXTRACT_ONLY= ${_DISTFILES:M*tar.gz}
DISTFILES+= pgtcldocs-${MANUALREL}.zip:doc
MASTER_SITES+= SF/pgtclng/Manual/${MANUALREL}:doc
.endif
diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile
index 25135cc0d6b2..bcda0ba4b7eb 100644
--- a/databases/postgresql-libpgeasy/Makefile
+++ b/databases/postgresql-libpgeasy/Makefile
@@ -6,8 +6,7 @@ PORTNAME= libpgeasy
PORTVERSION= 3.0.4
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR= projects/gborg/pgeasy/stable
+MASTER_SITES= PGSQL/projects/gborg/pgeasy/stable
DIST_SUBDIR= postgresql
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index c984f29a92e1..21e1d13e6c50 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= postgresql
DISTVERSION?= 8.4.22
PORTREVISION?= 1
CATEGORIES?= databases
-MASTER_SITES= PGSQL
-MASTER_SITE_SUBDIR= source/v${DISTVERSION}
+MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 858ec228e863..f0d9e54375b1 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= postgresql
DISTVERSION?= 9.1.15
PORTREVISION?= 0
CATEGORIES?= databases
-MASTER_SITES= PGSQL
-MASTER_SITE_SUBDIR= source/v${DISTVERSION}
+MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index ed3c9c6087e1..eb90bcad1316 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= postgresql
DISTVERSION?= 9.2.10
PORTREVISION?= 0
CATEGORIES?= databases
-MASTER_SITES= PGSQL
-MASTER_SITE_SUBDIR= source/v${DISTVERSION}
+MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index 03ef9186cb5d..909e0140e737 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -3,11 +3,11 @@
PORTNAME= apsw
PORTVERSION= 3.8.0.2
+DISTVERSIONSUFFIX= -r1
PORTREVISION= 1
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}-${PORTVERSION}-r1
MAINTAINER= rnejdl@ringofsaturn.com
COMMENT= APSW stands for Another Python SQLite Wrapper
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index ef4188fcdb94..ad7a61e290b4 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bsddb
PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 5
CATEGORIES= databases python
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 2187b1bca27e..eeb9e613b960 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gdbm
PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 3
CATEGORIES= databases python
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
diff --git a/databases/py-mysql-connector-python/Makefile b/databases/py-mysql-connector-python/Makefile
index 3ce237952a13..a4d1f92b90fb 100644
--- a/databases/py-mysql-connector-python/Makefile
+++ b/databases/py-mysql-connector-python/Makefile
@@ -3,8 +3,7 @@
PORTNAME= mysql-connector-python
PORTVERSION= 1.2.3
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= Connector-Python
+MASTER_SITES= MYSQL/Connector-Python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= bofh@FreeBSD.org
diff --git a/databases/py-mysql-connector-python2/Makefile b/databases/py-mysql-connector-python2/Makefile
index 92e49c207916..1e37e4ccd91a 100644
--- a/databases/py-mysql-connector-python2/Makefile
+++ b/databases/py-mysql-connector-python2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mysql-connector-python
PORTVERSION= 2.0.3
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= Connector-Python
+MASTER_SITES= MYSQL/Connector-Python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 2
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index 3343369793db..64c1109d7acd 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -5,7 +5,7 @@ PORTNAME= sqlalchemy-migrate
PORTVERSION= 0.7.2
PORTREVISION= 1
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index ca1535c39c5a..e6fb955bd250 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sqlite3
PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 6
CATEGORIES= databases python
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
DIST_SUBDIR= python
diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index 4151e74696ea..6fc7bdbca692 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -5,8 +5,7 @@ PORTNAME= soci
PORTVERSION= 3.2.2
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= The C++ Database Access Library
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index 6b7db35b2795..876244a5b64b 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -4,8 +4,7 @@ PORTNAME= sqlclient
PORTVERSION= 1.7.0
PORTREVISION= 2
CATEGORIES= databases gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= libs
+MASTER_SITES= GNUSTEP/libs
DISTNAME= SQLClient-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 1683a188fad7..35908062d00b 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.3.4
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAMBA
MAINTAINER= timur@FreeBSD.org
COMMENT= Trivial Database
diff --git a/deskutils/cal/Makefile b/deskutils/cal/Makefile
index 5efd9906aca3..72a897908670 100644
--- a/deskutils/cal/Makefile
+++ b/deskutils/cal/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cal
PORTVERSION= 3.5
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/shell
+MASTER_SITES= SUNSITE/utils/shell
MAINTAINER= sanpei@FreeBSD.org
COMMENT= Enhanced color version of standard calendar utility
diff --git a/deskutils/cartotheque/Makefile b/deskutils/cartotheque/Makefile
index 4b94407bc57f..993296e64554 100644
--- a/deskutils/cartotheque/Makefile
+++ b/deskutils/cartotheque/Makefile
@@ -4,8 +4,7 @@ PORTNAME= cartotheque
PORTVERSION= 0.1
PORTREVISION= 4
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= Cartotheque-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index 2a39b692c2b9..a2feb6136aff 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -5,8 +5,7 @@ PORTNAME= charmap
PORTVERSION= 0.2
PORTREVISION= 4
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= charmap
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Character map for GNUstep
diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile
index 678550eda9cb..df586c4a0588 100644
--- a/deskutils/dlume/Makefile
+++ b/deskutils/dlume/Makefile
@@ -5,7 +5,7 @@ PORTNAME= dlume
PORTVERSION= 0.2.4
PORTREVISION= 12
CATEGORIES= deskutils gnome
-MASTER_SITES= ${MASTER_SITE_TUCOWS}
+MASTER_SITES= TUCOWS
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK2 address book
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 7a087275ca91..6f4638c7935d 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.1.0
PORTREVISION= 4
CATEGORIES= deskutils gnustep
#MASTER_SITES= ftp://ftp.raffael.ch/software/GNUstepWrapper/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
PKGNAMEPREFIX= gnustep-
DISTNAME= GNUstepWrapper-${PORTVERSION}
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 389d226a9483..fa7a122a47f8 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.9.2
PORTREVISION= 4
CATEGORIES= deskutils gnustep
#MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= usr-apps
+MASTER_SITES= GNUSTEP/usr-apps
PKGNAMESUFFIX= -gwmetadata${PKGNAMESUFFIX2}
MAINTAINER= theraven@FreeBSD.org
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index 3692aae1f029..53f9c510208d 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.9.2
PORTREVISION= 2
CATEGORIES= deskutils gnustep
#MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= usr-apps
+MASTER_SITES= GNUSTEP/usr-apps
MAINTAINER= theraven@FreeBSD.org
COMMENT= GNUstep workspace manager
diff --git a/deskutils/hot-babe/Makefile b/deskutils/hot-babe/Makefile
index bf52d815b924..dfea5b5c722a 100644
--- a/deskutils/hot-babe/Makefile
+++ b/deskutils/hot-babe/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.2.2
PORTREVISION= 8
CATEGORIES= deskutils
MASTER_SITES= http://dindinx.net/hotbabe/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= novel
+ LOCAL/novel
MAINTAINER= novel@FreeBSD.org
COMMENT= Small utility which displays the system activity in a special way
diff --git a/deskutils/libgcal/Makefile b/deskutils/libgcal/Makefile
index 77b23f4e303d..3d86c5402321 100644
--- a/deskutils/libgcal/Makefile
+++ b/deskutils/libgcal/Makefile
@@ -5,7 +5,7 @@ PORTNAME= libgcal
PORTVERSION= 0.9.6
PORTREVISION= 2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Library allowing communication with Google calendar and contacts
diff --git a/deskutils/libopensync-plugin-vformat-devel/Makefile b/deskutils/libopensync-plugin-vformat-devel/Makefile
index 7031649e88b0..d8f5aafbad6a 100644
--- a/deskutils/libopensync-plugin-vformat-devel/Makefile
+++ b/deskutils/libopensync-plugin-vformat-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libopensync-plugin-vformat
PORTVERSION= 0.39
CATEGORIES= deskutils
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= danilo
+ LOCAL/danilo
PKGNAMESUFFIX= -devel
MAINTAINER= danilo@FreeBSD.org
diff --git a/deskutils/mrundlg/Makefile b/deskutils/mrundlg/Makefile
index c508e779366d..929173a50719 100644
--- a/deskutils/mrundlg/Makefile
+++ b/deskutils/mrundlg/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= deskutils
# MASTER_SITES= http://matt.sixxgate.com/files/
-MASTER_SITES= ${MASTER_SITE_FREEBSD}
+MASTER_SITES= FREEBSD
MAINTAINER= sixxgate@hotmail.com
COMMENT= Application / program launcher for Motif
diff --git a/deskutils/osynctool/Makefile b/deskutils/osynctool/Makefile
index 7d82c7bd0aa2..ce660585b6ea 100644
--- a/deskutils/osynctool/Makefile
+++ b/deskutils/osynctool/Makefile
@@ -5,8 +5,7 @@ PORTNAME= osynctool
PORTVERSION= 0.39
CATEGORIES= deskutils
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= danilo
+ LOCAL/danilo
MAINTAINER= danilo@FreeBSD.org
COMMENT= Command line client for the OpenSync framework
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 137fa20528d0..0332f921b6df 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -7,7 +7,6 @@ PORTNAME= plan
PORTVERSION= 1.10.1
CATEGORIES+= deskutils
MASTER_SITES= ftp://plan.ftp.fu-berlin.de/
-MASTER_SITE_SUBDIR= applications
MAINTAINER= ports@FreeBSD.org
COMMENT= X/Motif schedule planner with calendar
diff --git a/deskutils/plasma-applet-playwolf/Makefile b/deskutils/plasma-applet-playwolf/Makefile
index d62cd041080b..4c157108117b 100644
--- a/deskutils/plasma-applet-playwolf/Makefile
+++ b/deskutils/plasma-applet-playwolf/Makefile
@@ -4,7 +4,7 @@ PORTNAME= playwolf
PORTVERSION= 0.8.1
PORTREVISION= 6
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= plasma-applet-
MAINTAINER= jhale@FreeBSD.org
diff --git a/deskutils/plopfolio/Makefile b/deskutils/plopfolio/Makefile
index a9acc5f86daf..d7e72b64d846 100644
--- a/deskutils/plopfolio/Makefile
+++ b/deskutils/plopfolio/Makefile
@@ -4,8 +4,7 @@ PORTNAME= plopfolio
PORTVERSION= 0.1.0
PORTREVISION= 4
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= usr-apps
+MASTER_SITES= GNUSTEP/usr-apps
MAINTAINER= ports@FreeBSD.org
COMMENT= Free clone of KlipFolio for GNUstep
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index bb225e739058..97cdeffe8c5f 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -4,8 +4,7 @@
PORTNAME= rednotebook
PORTVERSION= 1.9.0
CATEGORIES= deskutils python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= rednotebook
+MASTER_SITES= SF/rednotebook
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= cheunghonyu@gmail.com
diff --git a/deskutils/sliderule/Makefile b/deskutils/sliderule/Makefile
index 5941761bdce6..b12d4618c9ee 100644
--- a/deskutils/sliderule/Makefile
+++ b/deskutils/sliderule/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sliderule
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
diff --git a/deskutils/sugarcrm/Makefile b/deskutils/sugarcrm/Makefile
index 8eeac747137f..a5d0100e9cdc 100644
--- a/deskutils/sugarcrm/Makefile
+++ b/deskutils/sugarcrm/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sugarcrm
PORTVERSION= 6.5.20
CATEGORIES= deskutils www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X
+MASTER_SITES= SF/${PORTNAME}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X
DISTNAME= SugarCE-${PORTVERSION}
MAINTAINER= wen@FreeBSD.org
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index d198609b092d..8b443b5633dc 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -4,8 +4,7 @@ PORTNAME= systempreferences
PORTVERSION= 1.2.0
PORTREVISION= 3
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR=usr-apps
+MASTER_SITES= GNUSTEP/usr-apps
DISTNAME= SystemPreferences-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index e9ed24874869..98ce95ee004c 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -8,7 +8,6 @@ CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/:treeline \
http://treeline.bellz.org/plugins/:plugins \
http://depot.fsck.ch/mirror/distfiles/:treeline,plugins
-MASTER_SITE_SUBDIR=treeline/:treeline
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:treeline
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index 4a90f0a50bee..457bdacb2272 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tuxcards
PORTVERSION= 2.2.1
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= http://www.tuxcards.de/src/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
+MASTER_SITES= http://www.tuxcards.de/src/${PORTNAME}-${PORTVERSION}/
MAINTAINER= johans@FreeBSD.org
COMMENT= Tool for managing notes within a hierarchical tree
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index 2f5844540119..37432b1b2f73 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -5,7 +5,7 @@ PORTNAME= vboxgtk
PORTVERSION= 0.8.2
PORTREVISION= 1
CATEGORIES= deskutils emulators gnome
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK frontend for VirtualBox
diff --git a/deskutils/vnc2flv/Makefile b/deskutils/vnc2flv/Makefile
index 5174a55f2715..333917f2b8e9 100644
--- a/deskutils/vnc2flv/Makefile
+++ b/deskutils/vnc2flv/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 20100207
PORTREVISION= 1
CATEGORIES= deskutils multimedia www python
MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR= source/v/${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile
index 8db734c4076e..40317ed6d1d8 100644
--- a/deskutils/wmpinboard/Makefile
+++ b/deskutils/wmpinboard/Makefile
@@ -5,7 +5,7 @@ PORTNAME= wmpinboard
PORTVERSION= 1.0
PORTREVISION= 5
CATEGORIES= deskutils afterstep windowmaker
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= t.kempka@web.de
diff --git a/deskutils/xcalendar/Makefile b/deskutils/xcalendar/Makefile
index 8d20db8978d1..ddd0ecb12c7a 100644
--- a/deskutils/xcalendar/Makefile
+++ b/deskutils/xcalendar/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xcalendar
PORTVERSION= 4.0.2008
PORTREVISION= 2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
DISTNAME= ${PORTNAME}-4.0+i18n
MAINTAINER= sarumaru@jp.FreeBSD.org
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 9e6a98757401..978d283fbdb5 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-notifyd
PORTVERSION= 0.2.4
PORTREVISION= 1
CATEGORIES= deskutils xfce
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile
index 3cca6e4b49ec..2d1cf7965776 100644
--- a/deskutils/xfce4-volumed/Makefile
+++ b/deskutils/xfce4-volumed/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-volumed
PORTVERSION= 0.1.13
PORTREVISION= 2
CATEGORIES= deskutils xfce
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= sergey.dyatko@gmail.com
diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile
index 0412cde06183..118d0d9a18d3 100644
--- a/deskutils/xmaddressbook/Makefile
+++ b/deskutils/xmaddressbook/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmaddressbook
PORTVERSION= 1.5.3
PORTREVISION= 3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= office
+MASTER_SITES= XCONTRIB/office
MAINTAINER= ports@FreeBSD.org
COMMENT= X11/Motif-based addressbook program
diff --git a/deskutils/xpostitPlus/Makefile b/deskutils/xpostitPlus/Makefile
index cf9efdbceda2..a97b2ce24958 100644
--- a/deskutils/xpostitPlus/Makefile
+++ b/deskutils/xpostitPlus/Makefile
@@ -5,8 +5,7 @@ PORTNAME= XPostitPlus
PORTVERSION= 2.3
PORTREVISION= 3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= office
+MASTER_SITES= XCONTRIB/office
MAINTAINER= ports2@dclg.ca
COMMENT= PostIt (R) messages onto your X11 screen
diff --git a/devel/ElectricFence/Makefile b/devel/ElectricFence/Makefile
index 2b2422583d13..c39d3a857543 100644
--- a/devel/ElectricFence/Makefile
+++ b/devel/ElectricFence/Makefile
@@ -5,8 +5,7 @@ PORTNAME= electricfence
PORTVERSION= 2.2.2
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/misc
+MASTER_SITES= PACKETSTORM/UNIX/misc
DISTNAME= ElectricFence-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/adabooch/Makefile b/devel/adabooch/Makefile
index c3ddfac04e62..f90fe0c9a8b9 100644
--- a/devel/adabooch/Makefile
+++ b/devel/adabooch/Makefile
@@ -5,8 +5,7 @@ PORTNAME= adabooch
PORTVERSION= 20130322
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= booch95/booch95/${PORTVERSION}
+MASTER_SITES= SF/booch95/booch95/${PORTVERSION}
DISTNAME= bc-${PORTVERSION}
MAINTAINER= marino@FreeBSD.org
diff --git a/devel/ahven/Makefile b/devel/ahven/Makefile
index 35bba8bed99a..a70a8deeeecf 100644
--- a/devel/ahven/Makefile
+++ b/devel/ahven/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ahven
PORTVERSION= 2.4
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/Ahven%20${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Ahven%20${PORTVERSION}
MAINTAINER= marino@FreeBSD.org
COMMENT= Ada unit test framework
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index bddf50991a7c..178aa2092f52 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -32,7 +32,7 @@ READMES= LICENSE README WHATSNEW
.if ${PORT_OPTIONS:MDOCS}
DISTFILES+= ${PORTNAME}-${PORTVERSION}-manual.tar.bz2:doc
-MASTER_SITES+= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/manual/:doc,}
+MASTER_SITES+= APACHE/ant/manual/:doc
PORTDOCS= *
.endif
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index f1d6d60e3eab..718f7870518e 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -4,8 +4,7 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= apr
+MASTER_SITES= APACHE/apr
DISTFILES= apr-${APR_VERSION}.tar.gz \
apr-util-${APU_VERSION}.tar.gz
diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile
index 67c3d1b3b3f4..e3d890c8d41e 100644
--- a/devel/argp-standalone/Makefile
+++ b/devel/argp-standalone/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.3
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.lysator.liu.se/~nisse/misc/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sem
+ LOCAL/sem
MAINTAINER= sem@FreeBSD.org
COMMENT= Standalone version of arguments parsing functions from GLIBC
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index e2e0e99f6069..6a116361621c 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= binutils
PORTVERSION= 2.25
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
PKGNAMEPREFIX= arm-elf-
MAINTAINER= danilo@FreeBSD.org
diff --git a/devel/asl/Makefile b/devel/asl/Makefile
index fe3ccbd90bc8..ae00e7e0029c 100644
--- a/devel/asl/Makefile
+++ b/devel/asl/Makefile
@@ -4,9 +4,8 @@
PORTNAME= asl
PORTVERSION= 1.41r8
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/devel/lang/assemblers \
ftp://john.ccac.rwth-aachen.de/pub/as/source/c_version/
-MASTER_SITE_SUBDIR= devel/lang/assemblers
MAINTAINER= doconnor@gsoft.com.au
COMMENT= Assembler for a variety of microcontrollers/-processors
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 7a26388fdf7c..de35381aff06 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -4,8 +4,7 @@
PORTNAME= autoconf
PORTVERSION= 2.69
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= autoconf
+MASTER_SITES= GNU
DISTNAME= autoconf-${PORTVERSION}
MAINTAINER= autotools@FreeBSD.org
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index d68dde43c74e..00d0cee113c3 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -5,8 +5,7 @@ PORTNAME= autoconf
PORTVERSION= 2.13.000227
PORTREVISION= 6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ade/gnu
+MASTER_SITES= LOCAL/ade/gnu
DISTNAME= autoconf-000227
PKGNAMESUFFIX= 213
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index c6a90142101c..c586e841a01e 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -5,8 +5,7 @@ PORTNAME= automake
PORTVERSION= 1.4.6
PORTREVISION= 7
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= automake
+MASTER_SITES= GNU
PKGNAMESUFFIX= 14
DISTNAME= automake-1.4-p6
diff --git a/devel/avalon-framework/Makefile b/devel/avalon-framework/Makefile
index 5af6408df934..769b4f50cc4e 100644
--- a/devel/avalon-framework/Makefile
+++ b/devel/avalon-framework/Makefile
@@ -5,8 +5,7 @@ PORTNAME= avalon-framework
PORTVERSION= 4.2.0
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= avalon/${PORTNAME}/binaries/
+MASTER_SITES= APACHE/avalon/${PORTNAME}/binaries
MAINTAINER= makc@FreeBSD.org
COMMENT= Apache Avalon core framework for component programming
diff --git a/devel/avr-gcc-devel/Makefile b/devel/avr-gcc-devel/Makefile
index a44890471ad3..c27673582fa3 100644
--- a/devel/avr-gcc-devel/Makefile
+++ b/devel/avr-gcc-devel/Makefile
@@ -3,8 +3,7 @@
PORTNAME= gcc
PORTVERSION= 4.10.0.s20140803
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= snapshots/${DISTVERSION}
+MASTER_SITES= GCC/snapshots/${DISTVERSION}
PKGNAMEPREFIX= avr-
PKGNAMESUFFIX= -devel
# DISTNAME= gcc-${DISTVERSION}
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index b1355c6ccde7..3ae5d744e259 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gcc
PORTVERSION= 4.8.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= releases/gcc-${DISTVERSION}
+MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMEPREFIX= avr-
# DISTNAME= gcc-${DISTVERSION}
diff --git a/devel/avr-gdb/Makefile b/devel/avr-gdb/Makefile
index 444fe20d2ac3..ea6903c89842 100644
--- a/devel/avr-gdb/Makefile
+++ b/devel/avr-gdb/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 7.3.1
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= gdb
PKGNAMEPREFIX= avr-
DISTNAME= gdb-${PORTVERSION}
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 0da5527f37b2..4a6178f508b4 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
COMMENT= C and math library for the Atmel AVR controller family
diff --git a/devel/avro-c/Makefile b/devel/avro-c/Makefile
index 77269ea1f86b..d4e7b920bdf2 100644
--- a/devel/avro-c/Makefile
+++ b/devel/avro-c/Makefile
@@ -4,8 +4,7 @@
PORTNAME= avro
PORTVERSION= 1.7.3
CATEGORIES= devel
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/stable
+MASTER_SITES= APACHE/${PORTNAME}/stable
PKGNAMESUFFIX= -c
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/devel/avro-cpp/Makefile b/devel/avro-cpp/Makefile
index 77fc416697df..a1b4e988e3f9 100644
--- a/devel/avro-cpp/Makefile
+++ b/devel/avro-cpp/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.7.4
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.sai.msu.su/apache/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ \
- APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/stable
+ APACHE/${PORTNAME}/stable
PKGNAMESUFFIX= -cpp
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 12743c1f97c3..1150fe789f85 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -5,8 +5,7 @@ PORTNAME= binutils
PORTVERSION= 2.25
PORTREVISION?= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
MAINTAINER?= bapt@FreeBSD.org
COMMENT?= GNU binary tools
diff --git a/devel/bncsutil-ghost++/Makefile b/devel/bncsutil-ghost++/Makefile
index 7a90a944013a..a985268466f0 100644
--- a/devel/bncsutil-ghost++/Makefile
+++ b/devel/bncsutil-ghost++/Makefile
@@ -4,7 +4,7 @@
PORTNAME= bncsutil
PORTVERSION= 1.3.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -ghost++
DISTNAME= ${PROJECTHOST}_${PROJECTVERSION}
diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile
index d91784e887f2..39ede3b16f5c 100644
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bugzilla
PORTVERSION= 4.4.8
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= BUGZILLA
-MASTER_SITE_SUBDIR= webtools webtools/archived
+MASTER_SITES= BUGZILLA/webtools BUGZILLA/webtools/archived
MAINTAINER= bz-ports@FreeBSD.org
COMMENT= Bug-tracking system developed by Mozilla Project
diff --git a/devel/c-unit/Makefile b/devel/c-unit/Makefile
index 95dbe0d851c1..a467a2749c7a 100644
--- a/devel/c-unit/Makefile
+++ b/devel/c-unit/Makefile
@@ -5,7 +5,7 @@ PORTNAME= c-unit
DISTVERSION= 1.1.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= tak.swd@gmail.com
COMMENT= Unit testing framework for C
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 8760e83bea7d..2a4422bbef50 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cdecl
PORTVERSION= 2.5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= devel/lang/c
+MASTER_SITES= SUNSITE/devel/lang/c
MAINTAINER= ports@FreeBSD.org
COMMENT= Explains complicated C/C++ declarations in plain English
diff --git a/devel/cflow/Makefile b/devel/cflow/Makefile
index 5625b1006bcd..b248fc3e6952 100644
--- a/devel/cflow/Makefile
+++ b/devel/cflow/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cflow
PORTVERSION= 2.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= devel/lang/c
+MASTER_SITES= SUNSITE/devel/lang/c
MAINTAINER= tj@FreeBSD.org
COMMENT= Call graph generator for C code
diff --git a/devel/cl-alexandria/Makefile b/devel/cl-alexandria/Makefile
index fe7d5f286a1e..7f7160ef269f 100644
--- a/devel/cl-alexandria/Makefile
+++ b/devel/cl-alexandria/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 2010.01.16
PORTREVISION= 3
CATEGORIES= devel lisp
PKGNAMEPREFIX= cl-
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Collection of portable public domain utilities for Common Lisp
diff --git a/devel/cl-asdf/Makefile b/devel/cl-asdf/Makefile
index 0c8c3c5810eb..2325e72d58b5 100644
--- a/devel/cl-asdf/Makefile
+++ b/devel/cl-asdf/Makefile
@@ -9,8 +9,7 @@ PORTVERSION= 2.017
PORTEPOCH= 2
CATEGORIES= devel lisp
PKGNAMEPREFIX= cl-
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
MAINTAINER= olgeni@FreeBSD.org
COMMENT= System definition facility for Common Lisp
diff --git a/devel/cl-trivial-features/Makefile b/devel/cl-trivial-features/Makefile
index 61ebfb0e74a6..b51b8ad996f5 100644
--- a/devel/cl-trivial-features/Makefile
+++ b/devel/cl-trivial-features/Makefile
@@ -4,8 +4,7 @@ PORTNAME= trivial-features
PORTVERSION= 2010.01.16
PORTREVISION= 1
CATEGORIES= devel lisp
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
PKGNAMEPREFIX= cl-
MAINTAINER= olgeni@FreeBSD.org
diff --git a/devel/cl-trivial-gray-streams/Makefile b/devel/cl-trivial-gray-streams/Makefile
index bd88a04adc98..57e7ed07c03e 100644
--- a/devel/cl-trivial-gray-streams/Makefile
+++ b/devel/cl-trivial-gray-streams/Makefile
@@ -4,8 +4,7 @@ PORTNAME= trivial-gray-streams
PORTVERSION= 2008.11.02
PORTREVISION= 1
CATEGORIES= devel lisp
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
PKGNAMEPREFIX= cl-
MAINTAINER= olgeni@FreeBSD.org
diff --git a/devel/cld/Makefile b/devel/cld/Makefile
index 5e30a4b85dd8..95e8c4220219 100644
--- a/devel/cld/Makefile
+++ b/devel/cld/Makefile
@@ -5,7 +5,7 @@ PORTNAME= cld
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PROJECTHOST= chromium-compact-language-detector
DISTNAME= compact-language-detector-${PORTVERSION}
diff --git a/devel/cld2/Makefile b/devel/cld2/Makefile
index 5a7a536d2d1b..e92615dde8c1 100644
--- a/devel/cld2/Makefile
+++ b/devel/cld2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cld
PORTVERSION= 20150505
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= demon
+MASTER_SITES= LOCAL/demon
PKGNAMESUFFIX= 2
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/compiler-rt/Makefile b/devel/compiler-rt/Makefile
index cdb9b508b953..d455ea8c2bd1 100644
--- a/devel/compiler-rt/Makefile
+++ b/devel/compiler-rt/Makefile
@@ -4,8 +4,7 @@
PORTNAME= compiler-rt
DISTVERSION= 0.r${SVN_REV}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
MAINTAINER= brooks@FreeBSD.org
COMMENT= Compiler runtime library with Blocks support
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 5d5447bdc4d8..8bff3e467586 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.30
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://miller.emu.id.au/pmiller/software/cook/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=jasone
+ LOCAL/jasone
MAINTAINER= jasone@FreeBSD.org
COMMENT= Like make(1), but more powerful and clean
diff --git a/devel/cvs-devel/Makefile b/devel/cvs-devel/Makefile
index c7b9f3dd63e1..e62939977c0f 100644
--- a/devel/cvs-devel/Makefile
+++ b/devel/cvs-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cvs
PORTVERSION= 1.12.13
PORTREVISION= 11
CATEGORIES= devel ipv6
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= non-gnu/${PORTNAME}/source/feature/${PORTVERSION}
+MASTER_SITES= GNU/non-gnu/${PORTNAME}/source/feature/${PORTVERSION}
PKGNAMESUFFIX= -devel
MAINTAINER= bdheeman@gmail.com
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 8f124dc494d2..6d2c2beb1a30 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES= http://cvs2svn.tigris.org/files/documents/1462/49237/ \
LOCAL/ohauer
PATCHFILES= ${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.bz2
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= ohauer
+PATCH_SITES= LOCAL/ohauer
MAINTAINER= ohauer@FreeBSD.org
COMMENT= CVS to Subversion Repository Converter
diff --git a/devel/cvsdadm/Makefile b/devel/cvsdadm/Makefile
index ea6345064cc9..6147aab99110 100644
--- a/devel/cvsdadm/Makefile
+++ b/devel/cvsdadm/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.3.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/ \
- ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for CVSd pserver user administration
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 4f1b610eacec..60e91b218574 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -5,9 +5,7 @@ PORTNAME= cvsweb
PORTVERSION= 2.0.6
PORTREVISION= 2
CATEGORIES= devel www
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://people.FreeBSD.org/~scop/cvsweb/
-MASTER_SITE_SUBDIR= scop
+MASTER_SITES= LOCAL/scop http://people.FreeBSD.org/~scop/cvsweb/
# For issues that are not specific to this port/package, please consult
# the <freebsd-cvsweb@FreeBSD.org> mailing list.
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 5e42af6c24e1..f9d6dae97296 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -5,9 +5,7 @@ PORTNAME= cvsweb
PORTVERSION= 3.0.6
PORTREVISION= 4
CATEGORIES= devel www
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://people.FreeBSD.org/~scop/cvsweb/
-MASTER_SITE_SUBDIR= scop
+MASTER_SITES= LOCAL/scop http://people.FreeBSD.org/~scop/cvsweb/
PKGNAMESUFFIX= 3
# For issues that are not specific to this port/package, please consult
diff --git a/devel/cvswrap/Makefile b/devel/cvswrap/Makefile
index 7588c9f4e2b3..829c7eec05a5 100644
--- a/devel/cvswrap/Makefile
+++ b/devel/cvswrap/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cvswrap
PORTVERSION= 0.2
CATEGORIES= devel
-MASTER_SITES+= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alfred
+MASTER_SITES+= LOCAL/alfred
MAINTAINER= ports@FreeBSD.org
COMMENT= Helper for multiple CVS repositories
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index aecafe051eeb..8b9ab51b2650 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cweb
PORTVERSION= 3.64a.a
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= web/c_cpp/cweb
+MASTER_SITES= TEX_CTAN/web/c_cpp/cweb
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.([a-z])$/\1/}
MAINTAINER= gerald@FreeBSD.org
diff --git a/devel/d-feet/Makefile b/devel/d-feet/Makefile
index d91cd094b7a6..026e2ace0854 100644
--- a/devel/d-feet/Makefile
+++ b/devel/d-feet/Makefile
@@ -5,8 +5,7 @@ PORTNAME= d-feet
PORTVERSION= 0.1.12
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/d-feet/0.1
+MASTER_SITES= GNOME/sources/d-feet/0.1
MAINTAINER= thinker@codemud.net
COMMENT= D-Feet is a D-Bus debugger written in PyGtk+ by John (J5) Palmieri
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 67ef94bed3e4..304ba6f7bb7e 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ddd
PORTVERSION= 3.3.12
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= sergio@softshark.org
COMMENT= Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index 29c6852e47c6..3cac1753614d 100644
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= dissy
PORTVERSION= 10
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= sbz@FreeBSD.org
COMMENT= Graphical frontend to the objdump disassembler
diff --git a/devel/djgpp-binutils/Makefile b/devel/djgpp-binutils/Makefile
index f4b47fd1c9a9..1720f8236fa3 100644
--- a/devel/djgpp-binutils/Makefile
+++ b/devel/djgpp-binutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= binutils
PORTVERSION= 2.17
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
PKGNAMEPREFIX= djgpp-
MAINTAINER= johnson.peter@gmail.com
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index 1f33f058bde2..79d725aa1cb6 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -5,7 +5,7 @@ PORTNAME= dotconf
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple, powerful configuration-file parser
diff --git a/devel/elftoaout/Makefile b/devel/elftoaout/Makefile
index 970f8cdfaaea..147c7547611f 100644
--- a/devel/elftoaout/Makefile
+++ b/devel/elftoaout/Makefile
@@ -4,8 +4,7 @@
PORTNAME= elftoaout
PORTVERSION= 2.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=pool/main/s/sparc-utils
+MASTER_SITES= DEBIAN/pool/main/s/sparc-utils
DISTNAME= sparc-utils_1.9.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/epm/Makefile b/devel/epm/Makefile
index e960c2a1aef4..75871793bdf4 100644
--- a/devel/epm/Makefile
+++ b/devel/epm/Makefile
@@ -5,7 +5,6 @@ PORTNAME= epm
PORTVERSION= 4.2
CATEGORIES= devel
MASTER_SITES= http://www.msweet.org/files/project2/
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
EXTRACT_SUFX= -source.tar.bz2
MAINTAINER= office@FreeBSD.org
diff --git a/devel/eventxx/Makefile b/devel/eventxx/Makefile
index a74f114c8821..0d02041de3ff 100644
--- a/devel/eventxx/Makefile
+++ b/devel/eventxx/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://proj.llucax.com.ar/home/eventxx/releases/ \
LOCAL/glarkin
-MASTER_SITE_SUBDIR= gahr
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ wrapper for libevent
diff --git a/devel/f77flow/Makefile b/devel/f77flow/Makefile
index 31f8fcd514b3..c7e1c68b3c5d 100644
--- a/devel/f77flow/Makefile
+++ b/devel/f77flow/Makefile
@@ -5,8 +5,7 @@ PORTNAME= f77flow
PORTVERSION= 0.12
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= devel/lang/fortran
+MASTER_SITES= SUNSITE/devel/lang/fortran
MAINTAINER= ports@FreeBSD.org
COMMENT= Analyze the structure of a fortran77 program
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index 895d4c40540c..72a9d0db727a 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= ${THRIFT_PORTVERSION}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= thrift/${PORTVERSION}
+MASTER_SITES= APACHE/thrift/${PORTVERSION}
DISTNAME= thrift-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index 0747999258ea..83a12051b724 100644
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@@ -5,9 +5,7 @@ PORTNAME= ffcall
PORTVERSION= 1.10
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.santafe.edu/pub/gnu/
-MASTER_SITES+= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= libs
+MASTER_SITES= ftp://ftp.santafe.edu/pub/gnu/ GNUSTEP/libs
MAINTAINER= ports@FreeBSD.org
COMMENT= Foreign function call libraries
diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile
index 7de1b63e06df..ad6b4dcd3c62 100644
--- a/devel/fortran-utils/Makefile
+++ b/devel/fortran-utils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= fortran-utils
PORTVERSION= 1.1
CATEGORIES= devel
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= kris
+MASTER_SITES= LOCAL/kris
MAINTAINER= ports@FreeBSD.org
COMMENT= Tools for use with Fortran code, from 4.4BSD
diff --git a/devel/freeocl/Makefile b/devel/freeocl/Makefile
index dc769656ceb1..106f42abf91c 100644
--- a/devel/freeocl/Makefile
+++ b/devel/freeocl/Makefile
@@ -5,7 +5,7 @@ PORTNAME= freeocl
PORTVERSION= 0.3.6
PORTREVISION= 6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= FreeOCL-${PORTVERSION}-src
MAINTAINER= ohartman@zedat.fu-berlin.de
diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index 857939c4465e..f8cf207bf299 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -4,9 +4,8 @@
PORTNAME= ftnchek
PORTVERSION= 3.3.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/devel/lang/fortran \
http://www.dsm.fordham.edu/~ftnchek/download/
-MASTER_SITE_SUBDIR= devel/lang/fortran
MAINTAINER= bf@FreeBSD.org
COMMENT= Fortran 77 semantic checking utility
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 7b55aeb108df..f3579754fdd7 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gazpacho
PORTVERSION= 0.7.2
PORTREVISION= 4
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gazpacho/0.7
+MASTER_SITES= GNOME/sources/gazpacho/0.7
MAINTAINER= ports@FreeBSD.org
COMMENT= GUI builder for the GTK+ toolkit
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index b013c26ce186..6af5cc980528 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gconf2
PORTVERSION= 3.2.6
PORTREVISION= 3
CATEGORIES= devel gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index db465679f342..656145e0ba48 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gindent
PORTVERSION= 2.2.10
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= indent
+MASTER_SITES= GNU/indent
DISTNAME= indent-${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index bf9475423c52..8e1b423ac7a4 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gmake
PORTVERSION= 4.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= make
+MASTER_SITES= GNU/make
DISTNAME= make-${PORTVERSION}
# note: before committing to this port, contact portmgr to arrange for an
diff --git a/devel/gnu-efi/Makefile b/devel/gnu-efi/Makefile
index 4da642c199e4..eeb865474f61 100644
--- a/devel/gnu-efi/Makefile
+++ b/devel/gnu-efi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gnu-efi
PORTVERSION= 3.0.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnu-efi
+MASTER_SITES= SF/gnu-efi
MAINTAINER= trasz@FreeBSD.org
COMMENT= SDK for EFI applications
diff --git a/devel/gnulibiberty/Makefile b/devel/gnulibiberty/Makefile
index 3a02d380c723..c1fb824db76f 100644
--- a/devel/gnulibiberty/Makefile
+++ b/devel/gnulibiberty/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnulibiberty
PORTVERSION= 2.19.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
DISTNAME= binutils-${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
diff --git a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile
index e5fb82fee3c6..8c2db4b9087c 100644
--- a/devel/google-gdata/Makefile
+++ b/devel/google-gdata/Makefile
@@ -4,7 +4,7 @@
PORTNAME= google-gdata
PORTVERSION= 2.2.0.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= libgoogle-data-mono-${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile
index 7d015a6a335b..39e49e50cbef 100644
--- a/devel/google-perftools/Makefile
+++ b/devel/google-perftools/Makefile
@@ -4,8 +4,7 @@
PORTNAME= google-perftools
PORTVERSION= 2.4
CATEGORIES= devel
-MASTER_SITES= https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/ \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/
DISTNAME= gperftools-${PORTVERSION}
MAINTAINER= yuri@rawbw.com
diff --git a/devel/google-sparsehash/Makefile b/devel/google-sparsehash/Makefile
index 4f45b0a1d764..085d37180182 100644
--- a/devel/google-sparsehash/Makefile
+++ b/devel/google-sparsehash/Makefile
@@ -5,9 +5,8 @@ PORTNAME= google-sparsehash
PORTVERSION= 2.0.2
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= vd/${PORTNAME}
+MASTER_SITES= GOOGLE_CODE \
+ LOCAL/vd/${PORTNAME}
PROJECTHOST= sparsehash
DISTNAME= sparsehash-${PORTVERSION}
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index 5a17cd9c2e35..d27c044a42f5 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gorm
PORTVERSION= 1.2.20
PORTREVISION= 2
CATEGORIES= devel gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= dev-apps
+MASTER_SITES= GNUSTEP/dev-apps
MAINTAINER= theraven@FreeBSD.org
COMMENT= Graphical Object Relationship Modeller
diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index b85b6a9ed47e..b4fc8b1a45b1 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gperf
PORTVERSION= 3.0.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= gperf
+MASTER_SITES= GNU
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Generates perfect hash functions for sets of keywords
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index 19f02b5d8c86..df087c9fcbf0 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gtkparasite
PORTVERSION= 20090819
PORTREVISION= 5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= pav
+MASTER_SITES= LOCAL/pav
MAINTAINER= ashish@FreeBSD.org
COMMENT= GTK+ UI debugging tool
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 96e492d7352b..56e5314484e1 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -5,7 +5,7 @@ PORTNAME= guichan
PORTVERSION= 0.8.2
PORTREVISION= 10
CATEGORIES= devel games
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= mva@FreeBSD.org
COMMENT= Small, efficient C++ GUI library designed for games
diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile
index fb616973ef4c..f4fff3b87a74 100644
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@@ -8,15 +8,15 @@
PORTNAME= hadoop
PORTVERSION= 2.6.0
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE} \
+MASTER_SITES= APACHE/${PORTNAME}/common/stable \
LOCAL/demon/:maven \
http://archive.apache.org/dist/tomcat/tomcat-6/v${TOMCAT_VERSION}/bin/:tomcat \
http://dist.codehaus.org/jetty/jetty-6.1.14/:jetty
-MASTER_SITE_SUBDIR=${PORTNAME}/common/stable
PKGNAMESUFFIX= 2
-DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat jetty-6.1.14.zip:jetty
+DISTNAME= ${PORTNAME}-${PORTVERSION}-src
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat jetty-6.1.14.zip:jetty
DIST_SUBDIR= hadoop
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz jetty-6.1.14.zip
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz jetty-6.1.14.zip
MAINTAINER= demon@FreeBSD.org
COMMENT= Apache Map/Reduce framework
@@ -39,7 +39,6 @@ JAVA_VERSION= 1.7+
USE_LDCONFIG= yes
SHEBANG_FILES= hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh
MAKE_ENV+= HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
OPTIONS_DEFINE= EXAMPLES
OPTIONS_DEFAULT= EXAMPLES
diff --git a/devel/htable/Makefile b/devel/htable/Makefile
index c6080e9a94c9..354d9070ade7 100644
--- a/devel/htable/Makefile
+++ b/devel/htable/Makefile
@@ -4,8 +4,7 @@
PORTNAME= htable
PORTVERSION= 1.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= culot
+MASTER_SITES= LOCAL/culot
MAINTAINER= culot@FreeBSD.org
COMMENT= Lightweight implementation of hash tables in C
diff --git a/devel/itext/Makefile b/devel/itext/Makefile
index 57936b5b3b8b..6a742106c808 100644
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 4.2.0
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
MAINTAINER= ale@FreeBSD.org
COMMENT= Java-PDF Library
diff --git a/devel/javolution/Makefile b/devel/javolution/Makefile
index c51d16f5ee6a..57b706628eab 100644
--- a/devel/javolution/Makefile
+++ b/devel/javolution/Makefile
@@ -4,8 +4,7 @@
PORTNAME= javolution
PORTVERSION= 5.5.1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
MAINTAINER= ale@FreeBSD.org
COMMENT= Java solution for real time and embedded systems
diff --git a/devel/jiic/Makefile b/devel/jiic/Makefile
index ab82c0dff770..8cd8eb14f2c4 100644
--- a/devel/jiic/Makefile
+++ b/devel/jiic/Makefile
@@ -4,8 +4,7 @@
PORTNAME= jiic
PORTVERSION= 20120110
CATEGORIES= devel multimedia java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
MAINTAINER= ale@FreeBSD.org
COMMENT= Streaming-based Java implementation of ISO 9660
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index e073b62ab690..1c0de4201652 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -4,8 +4,7 @@
PORTNAME= kdevelop
DISTVERSION= ${KDEVELOP_VERSION}
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src
+MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src
DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION}
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
index 7c71cc098205..cfe41df540b9 100644
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kdevelop-pg-qt
PORTVERSION= 1.0.0
PORTREVISION= 6
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index c6b03dbec81b..a8667611e08f 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -3,8 +3,7 @@
PORTNAME= kdevelop-php-docs
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
+MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION}
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index 104567bd163d..fa8e733c8285 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -3,8 +3,7 @@
PORTNAME= kdevelop-php
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
+MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION}
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 8965ca873a32..f68eff964ef5 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -4,8 +4,7 @@
PORTNAME= kdevplatform
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
+MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION}
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/lcov/Makefile b/devel/lcov/Makefile
index 89e91ad74ea2..7d34022a0eb0 100644
--- a/devel/lcov/Makefile
+++ b/devel/lcov/Makefile
@@ -4,8 +4,7 @@
PORTNAME= lcov
PORTVERSION= 1.10
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=ltp/Coverage%20Analysis/LCOV-${PORTVERSION}
+MASTER_SITES= SF/ltp/Coverage%20Analysis/LCOV-${PORTVERSION}
MAINTAINER= romain@FreeBSD.org
COMMENT= The Linux Test Project GCOV extension
diff --git a/devel/libaura/Makefile b/devel/libaura/Makefile
index dff0e5bd3a6c..47545a1a0deb 100644
--- a/devel/libaura/Makefile
+++ b/devel/libaura/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libaura
PORTVERSION= 3.1.20051222
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= philip
+MASTER_SITES= LOCAL/philip
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Library of Assorted Useful Reusable Abstractions
diff --git a/devel/libavl/Makefile b/devel/libavl/Makefile
index 394a5a4b51fa..d68c2a7f002f 100644
--- a/devel/libavl/Makefile
+++ b/devel/libavl/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libavl
PORTVERSION= 1.4.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= avl
+MASTER_SITES= GNU/avl
DISTNAME= avl-${PORTVERSION}
MAINTAINER= rodrigo@FreeBSD.org
diff --git a/devel/libbfd/Makefile b/devel/libbfd/Makefile
index 1354a3073961..1a3f93fc8585 100644
--- a/devel/libbfd/Makefile
+++ b/devel/libbfd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libbfd
PORTVERSION= 2.19.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
DISTNAME= binutils-${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
diff --git a/devel/libdict/Makefile b/devel/libdict/Makefile
index c9ac80a46055..e4a549795d8f 100644
--- a/devel/libdict/Makefile
+++ b/devel/libdict/Makefile
@@ -5,7 +5,7 @@ PORTNAME= libdict
PORTVERSION= 0.2.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= LOCAL
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source treap_insert.pdf:doc \
avl_insert.pdf:doc empty.pdf:doc
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index 50defdd53f7d..6d37b888bf3a 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.8.13
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.mr511.de/software/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs
+ SUNSITE/libs
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Public ELF file access library similar to libelf(3) in Solaris
diff --git a/devel/libexecinfo/Makefile b/devel/libexecinfo/Makefile
index 9f9dfbc038fd..3bd893b583ed 100644
--- a/devel/libexecinfo/Makefile
+++ b/devel/libexecinfo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libexecinfo
PORTVERSION= 1.1
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= itetcu
+MASTER_SITES= LOCAL/itetcu
MAINTAINER= itetcu@FreeBSD.org
COMMENT= Library for inspecting program's backtrace
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 7eb4564a2133..1731c7b09d8b 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libffi
PORTVERSION= 3.2.1
CATEGORIES= devel
-MASTER_SITES= SOURCEWARE
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SOURCEWARE/${PORTNAME}
MAINTAINER= zeising@FreeBSD.org
COMMENT= Foreign Function Interface
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 4095b2dbc923..350346984fe0 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,8 +6,7 @@ PORTNAME= libglade2
PORTVERSION= 2.6.4
PORTREVISION?= 7
CATEGORIES= devel gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
+MASTER_SITES= GNOME/sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libhash/Makefile b/devel/libhash/Makefile
index 1d82ba99a3c1..6000e317ad11 100644
--- a/devel/libhash/Makefile
+++ b/devel/libhash/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libhash
PORTVERSION= 1.0.3
CATEGORIES= devel
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Library for manipulating hash tables
diff --git a/devel/libiomp5-devel/Makefile b/devel/libiomp5-devel/Makefile
index 7e3085139279..bcce1fa9a87a 100644
--- a/devel/libiomp5-devel/Makefile
+++ b/devel/libiomp5-devel/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libiomp5
PORTVERSION= 3.7.r${SVN_REV}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMESUFFIX= -devel
DISTNAME= openmp-${PORTVERSION}
diff --git a/devel/libkgapi/Makefile b/devel/libkgapi/Makefile
index 6228d974b2ef..db6a671dcdb4 100644
--- a/devel/libkgapi/Makefile
+++ b/devel/libkgapi/Makefile
@@ -3,8 +3,7 @@
PORTNAME= libkgapi
PORTVERSION= 2.2.0
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/libkgapi/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/libkgapi/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/liblouisxml/Makefile b/devel/liblouisxml/Makefile
index 903393718534..30c3cee213af 100644
--- a/devel/liblouisxml/Makefile
+++ b/devel/liblouisxml/Makefile
@@ -5,7 +5,7 @@ PORTNAME= liblouisxml
PORTVERSION= 2.4.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= wen@FreeBSD.org
COMMENT= Library Provide Complete Braille Transcription Services
diff --git a/devel/libmatheval/Makefile b/devel/libmatheval/Makefile
index cc05b2752a1d..f75d6cac98d4 100644
--- a/devel/libmatheval/Makefile
+++ b/devel/libmatheval/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.1.11
PORTREVISION= 2
CATEGORIES= devel math
MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= demon@FreeBSD.org
COMMENT= Library to evaluate mathematical functions
diff --git a/devel/libmpsse/Makefile b/devel/libmpsse/Makefile
index 6f8280464098..95a65168af5a 100644
--- a/devel/libmpsse/Makefile
+++ b/devel/libmpsse/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libmpsse
PORTVERSION= 1.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= uffe@uffe.org
COMMENT= Open source library for SPI/I2C control via FTDI chips
diff --git a/devel/libnxt/Makefile b/devel/libnxt/Makefile
index 0ea89a8e8f43..b5859d1199f6 100644
--- a/devel/libnxt/Makefile
+++ b/devel/libnxt/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libnxt
PORTVERSION= 0.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
http://personalpages.tds.net/~jwbacon/Ports/distfiles/
MAINTAINER= jwbacon@tds.net
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index acf8dd0aaeaf..31d90194d27a 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -5,7 +5,7 @@ PORTNAME= liboop
PORTVERSION= 1.0
PORTREVISION= 12
CATEGORIES= devel
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://download.ofb.net/liboop/
MAINTAINER= rodrigo@FreeBSD.org
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index b159a17f1260..7089f01a75c4 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.39
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= danilo
+ LOCAL/danilo
MAINTAINER= danilo@FreeBSD.org
COMMENT= PIM data synchronization framework
diff --git a/devel/libpasori/Makefile b/devel/libpasori/Makefile
index ff5f50034f8b..2249bf8bb8f3 100644
--- a/devel/libpasori/Makefile
+++ b/devel/libpasori/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libpasori
PORTVERSION= 02
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/20457
+MASTER_SITES= SOURCEFORGE_JP/${PORTNAME}/20457
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= sarumaru@jp.FreeBSD.org
diff --git a/devel/libruin/Makefile b/devel/libruin/Makefile
index e4588af838e7..f2fecf306fdd 100644
--- a/devel/libruin/Makefile
+++ b/devel/libruin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libruin
PORTVERSION= 0.1.4
PORTREVISION= 3
CATEGORIES= devel scheme
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Renderer for User Interfaces in Ncurses
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index fa2174cdfe98..64862a9b18b2 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libsigc++
PORTVERSION= 1.2.7
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
+MASTER_SITES= GNOME
PKGNAMESUFFIX= 12
DIST_SUBDIR= gnome2
diff --git a/devel/libublio/Makefile b/devel/libublio/Makefile
index fc2b0e323ad7..292bc0a5f543 100644
--- a/devel/libublio/Makefile
+++ b/devel/libublio/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libublio
PORTVERSION= 20070103
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mandree
+MASTER_SITES= LOCAL/mandree
MAINTAINER= mandree@FreeBSD.org
COMMENT= User space caching library
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index e834deb7e8f9..c51dc919f953 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -6,8 +6,7 @@ PORTNAME= libunicode
PORTVERSION= 0.4
PORTREVISION= 10
CATEGORIES= devel gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/libunicode/0.4
+MASTER_SITES= GNOME/sources/libunicode/0.4
DISTNAME= ${PORTNAME}-${PORTVERSION}.gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libx86/Makefile b/devel/libx86/Makefile
index 9e608df5692d..88d44e5e4707 100644
--- a/devel/libx86/Makefile
+++ b/devel/libx86/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.codon.org.uk/~mjg59/libx86/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
MAINTAINER= jkim@FreeBSD.org
COMMENT= Hardware-independent library for executing real-mode x86 code
diff --git a/devel/libzookeeper/Makefile b/devel/libzookeeper/Makefile
index bc51f83af6cb..f36860be14bd 100644
--- a/devel/libzookeeper/Makefile
+++ b/devel/libzookeeper/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zookeeper
PORTVERSION= 3.4.6
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/current
+MASTER_SITES= APACHE/${PORTNAME}/current
PKGNAMEPREFIX= lib
MAINTAINER= skreuzer@FreeBSD.org
diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile
index e9196ab7ad64..3e750c30780d 100644
--- a/devel/libzrtpcpp/Makefile
+++ b/devel/libzrtpcpp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libzrtpcpp
PORTVERSION= 2.3.4
PORTREVISION= 6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=ccrtp
+MASTER_SITES= GNU/ccrtp
MAINTAINER= acm@FreeBSD.org
COMMENT= ZRTP extension for GNU ccRTP
diff --git a/devel/linux-c6-qt47/Makefile b/devel/linux-c6-qt47/Makefile
index ae11ad9c2eca..196ec0835c58 100644
--- a/devel/linux-c6-qt47/Makefile
+++ b/devel/linux-c6-qt47/Makefile
@@ -5,8 +5,7 @@ PORTNAME= qt47
PORTVERSION= 4.7.2
PORTREVISION= 1
CATEGORIES= devel linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= xmj
+MASTER_SITES= LOCAL/xmj
DIST_SUBDIR= rpm/${LINUX_RPM_ARCH}/centos/c5
MAINTAINER= emulation@FreeBSD.org
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index 9a4d3a9dbb16..8b18be1ebee9 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -5,8 +5,7 @@ PORTNAME= linux_kdump
PORTVERSION= 1.5
PORTREVISION= 3
CATEGORIES= devel linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= marcel
+MASTER_SITES= LOCAL/marcel
MAINTAINER= emulation@FreeBSD.org
COMMENT= Linux-compatibility ktrace.out processor
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 7e69b63dc115..6a6a0bb40381 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -4,8 +4,7 @@
PORTNAME= llvm
DISTVERSION= 3.7.r${SVN_REV}
CATEGORIES= devel lang
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMESUFFIX= -devel
MAINTAINER= brooks@FreeBSD.org
diff --git a/devel/m17n-db/Makefile b/devel/m17n-db/Makefile
index efe9ccc07c9e..e892efccea18 100644
--- a/devel/m17n-db/Makefile
+++ b/devel/m17n-db/Makefile
@@ -4,10 +4,8 @@
PORTNAME= m17n-db
PORTVERSION= 1.6.5
CATEGORIES= devel textproc
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}:m17n \
- ${MASTER_SITE_GNU:S/$/:glibc/}
-MASTER_SITE_SUBDIR= m17n/:m17n \
- glibc/:glibc
+MASTER_SITES= SAVANNAH/m17n:m17n \
+ GNU/glibc:glibc
DISTFILES= ${M17N_DISTFILE}:m17n \
${GLIBC_DISTFILE}:glibc
EXTRACT_ONLY= ${M17N_DISTFILE}
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index c12d3d394def..b580300f3b38 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -5,8 +5,7 @@ PORTNAME= m17n-lib
PORTVERSION= 1.6.4
PORTREVISION= 6
CATEGORIES= devel textproc
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= m17n
+MASTER_SITES= SAVANNAH/m17n
MAINTAINER= nikola.lecic@anthesphoria.net
COMMENT= Library for the multilingual text handling
diff --git a/devel/m6811-binutils/Makefile b/devel/m6811-binutils/Makefile
index aaa13c67532c..fcb43ac49ec3 100644
--- a/devel/m6811-binutils/Makefile
+++ b/devel/m6811-binutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= binutils
PORTVERSION= 2.15
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= binutils
+MASTER_SITES= GNU
PKGNAMEPREFIX= m6811-
PATCH_SITES= http://stephane.carrez.free.fr/snapshots/
diff --git a/devel/maven-ant-tasks/Makefile b/devel/maven-ant-tasks/Makefile
index 4c7fa293815d..417a0b00d89d 100644
--- a/devel/maven-ant-tasks/Makefile
+++ b/devel/maven-ant-tasks/Makefile
@@ -3,8 +3,7 @@
PORTNAME= maven-ant-tasks
PORTVERSION= 2.1.3
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= maven/binaries
+MASTER_SITES= APACHE/maven/binaries
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile
index fc14a2a103bc..f17231ffce25 100644
--- a/devel/maven3/Makefile
+++ b/devel/maven3/Makefile
@@ -4,8 +4,7 @@
PORTNAME= maven3
DISTVERSION= 3.0.5
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= maven/binaries
+MASTER_SITES= APACHE/maven/binaries
DISTNAME= apache-maven-${DISTVERSION}-bin
MAINTAINER= wombat@marsupial.org
diff --git a/devel/maven31/Makefile b/devel/maven31/Makefile
index ff809ac8a469..3bc886d91cba 100644
--- a/devel/maven31/Makefile
+++ b/devel/maven31/Makefile
@@ -5,8 +5,7 @@ PORTNAME= maven31
DISTVERSION= 3.1.1
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= maven/binaries
+MASTER_SITES= APACHE/maven/binaries
DISTNAME= apache-maven-${DISTVERSION}-bin
MAINTAINER= yerenkow@gmail.com
diff --git a/devel/mingw32-openssl/Makefile b/devel/mingw32-openssl/Makefile
index 6526c5694129..8051ac39ac7c 100644
--- a/devel/mingw32-openssl/Makefile
+++ b/devel/mingw32-openssl/Makefile
@@ -4,10 +4,9 @@
PORTNAME= openssl
PORTVERSION= 1.0.1m
CATEGORIES= devel security
-MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \
- ftp://ftp.openssl.org/%SUBDIR%/ \
- ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/
-MASTER_SITE_SUBDIR= source
+MASTER_SITES= http://www.openssl.org/source/ \
+ ftp://ftp.openssl.org/source/ \
+ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
PKGNAMEPREFIX= mingw32-
DIST_SUBDIR= ${DISTNAME}
diff --git a/devel/mingw32-zlib/Makefile b/devel/mingw32-zlib/Makefile
index ad6dc822a48b..44fde263465c 100644
--- a/devel/mingw32-zlib/Makefile
+++ b/devel/mingw32-zlib/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zlib
PORTVERSION= 1.2.8
CATEGORIES= devel archivers
MASTER_SITES= http://zlib.net/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libpng/${PORTNAME}/${PORTVERSION}
+ SF/libpng/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= mingw32-
MAINTAINER= knu@FreeBSD.org
diff --git a/devel/mm/Makefile b/devel/mm/Makefile
index f9602c30cccf..20059f4fe83c 100644
--- a/devel/mm/Makefile
+++ b/devel/mm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mm
PORTVERSION= 1.4.2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_OSSP}
-MASTER_SITE_SUBDIR= lib/${PORTNAME}
+MASTER_SITES= OSSP/lib/${PORTNAME}
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Shared memory allocation library for pre-forked process models
diff --git a/devel/mph/Makefile b/devel/mph/Makefile
index b3ad618a91a7..58fc751cae8d 100644
--- a/devel/mph/Makefile
+++ b/devel/mph/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mph
PORTVERSION= 1.2
CATEGORIES= devel
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= devel/lang/c
+MASTER_SITES= SUNSITE/devel/lang/c
MAINTAINER= chuck@pkix.net
COMMENT= Minimal perfect hashing code generator
diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 6917f6680820..06c8d1e9f8fd 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -5,16 +5,14 @@ PORTNAME= binutils
PORTVERSION= ${BINUTILVERSION}.${LTSVERSION}
PORTREVISION= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE} \
+MASTER_SITES= SOURCEWARE/binutils/releases \
SF/mspgcc/mspgcc:mspgcc
-MASTER_SITE_SUBDIR= binutils/releases
PKGNAMEPREFIX= msp430-
DISTNAME= ${PORTNAME}-${BINUTILVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
mspgcc-${LTSVERSION}${EXTRACT_SUFX}:mspgcc
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
+PATCH_SITES= SF/mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index 6a4d0d1011f4..08dce6fc5063 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -6,17 +6,15 @@ PORTVERSION= ${GCCVERSION}.${LTSVERSION}
PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE} \
+MASTER_SITES= SOURCEWARE/${PORTNAME}/releases/${PORTNAME}-${GCCVERSION} \
SF/mspgcc/mspgcc:mspgcc
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTNAME}-${GCCVERSION}
PKGNAMEPREFIX= msp430-
DISTNAME= ${PORTNAME}-${GCCVERSION}
DISTFILES= ${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
${PORTNAME}-g++-${GCCVERSION}${EXTRACT_SUFX} \
mspgcc-${LTSVERSION}${EXTRACT_SUFX}:mspgcc
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
+PATCH_SITES= SF/mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
diff --git a/devel/msp430-gdb/Makefile b/devel/msp430-gdb/Makefile
index 7fe04aa13632..7f6e3dc0e8a8 100644
--- a/devel/msp430-gdb/Makefile
+++ b/devel/msp430-gdb/Makefile
@@ -4,9 +4,7 @@
PORTNAME= gdb
PORTVERSION= ${GDBVERSION}.${PATCHVERSION}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU} \
- SF/mspgcc/mspgcc:mspgcc
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU SF/mspgcc/mspgcc:mspgcc
PKGNAMEPREFIX= msp430-
DISTNAME= ${PORTNAME}-${GDBVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/msp430-libc/Makefile b/devel/msp430-libc/Makefile
index a4ab81c352b6..327fd9d183cd 100644
--- a/devel/msp430-libc/Makefile
+++ b/devel/msp430-libc/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES= SF/mspgcc/${PKGNAMEPREFIX}${PORTNAME}
PKGNAMEPREFIX= ${LIBCTARGET}-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${LIBCVERSION}
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
+PATCH_SITES= SF/mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
diff --git a/devel/msp430mcu/Makefile b/devel/msp430mcu/Makefile
index 2810f0e8b8f5..e56f3c22a556 100644
--- a/devel/msp430mcu/Makefile
+++ b/devel/msp430mcu/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= devel
MASTER_SITES= SF/mspgcc/${PORTNAME}
DISTNAME= ${PORTNAME}-${MCUVERSION}
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
+PATCH_SITES= SF/mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 1abaf3677a69..ed8691c76584 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -5,7 +5,6 @@ PORTNAME= ncurses
DISTVERSION= ${RELEASE}-20150214
CATEGORIES= devel
MASTER_SITES= ftp://invisible-island.net/${PORTNAME}/current/
-MASTER_SITE_SUBDIR= ${PORTNAME}/current
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= bapt@FreeBSD.org
diff --git a/devel/netscape-java40/Makefile b/devel/netscape-java40/Makefile
index b9eb41500c30..007f71419365 100644
--- a/devel/netscape-java40/Makefile
+++ b/devel/netscape-java40/Makefile
@@ -5,8 +5,7 @@ PORTNAME= netscape-java40
PORTVERSION= 1999.11.15
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= thierry
+MASTER_SITES= LOCAL/thierry
DISTNAME= ${PORTNAME}
MAINTAINER= thierry@FreeBSD.org
diff --git a/devel/nxt-python/Makefile b/devel/nxt-python/Makefile
index eb6a32000823..91674083050e 100644
--- a/devel/nxt-python/Makefile
+++ b/devel/nxt-python/Makefile
@@ -5,7 +5,7 @@ PORTNAME= nxt-python
PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= acieroid@awesom.eu
COMMENT= Python interface for the Lego Mindstorms NXT robot
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index 8e0021072166..2dc1531afdcd 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sexplib
PORTVERSION= 111.03.00
CATEGORIES= devel
-MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}/individual
+MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/${PORTVERSION}/individual/
PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/ocaml-typeconv/Makefile b/devel/ocaml-typeconv/Makefile
index 52c6bfc70af4..bd5bb96f1f4f 100644
--- a/devel/ocaml-typeconv/Makefile
+++ b/devel/ocaml-typeconv/Makefile
@@ -4,8 +4,7 @@
PORTNAME= type-conv
PORTVERSION= 109.60.01
CATEGORIES= devel
-MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION:R}.00/individual
+MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/${PORTVERSION:R}.00/individual/
PKGNAMEPREFIX= ocaml-
DISTNAME= ${PORTNAME:S,-,_,}-${PORTVERSION}
diff --git a/devel/opencvs/Makefile b/devel/opencvs/Makefile
index 8c356024e80b..a01147bc548f 100644
--- a/devel/opencvs/Makefile
+++ b/devel/opencvs/Makefile
@@ -4,9 +4,8 @@
PORTNAME= opencvs
PORTVERSION= 20150501
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.stack.nl/pub/users/%SUBDIR%/opencvs/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= johans
+MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/opencvs/ \
+ LOCAL/johans
MAINTAINER= johans@FreeBSD.org
COMMENT= BSD-licensed CVS implementation
diff --git a/devel/p5-AnyEvent-AIO/Makefile b/devel/p5-AnyEvent-AIO/Makefile
index 5711af491fab..05e960a18f67 100644
--- a/devel/p5-AnyEvent-AIO/Makefile
+++ b/devel/p5-AnyEvent-AIO/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= AnyEvent
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-App-GitHub/Makefile b/devel/p5-App-GitHub/Makefile
index 050c93f539e2..f90903a3765e 100644
--- a/devel/p5-App-GitHub/Makefile
+++ b/devel/p5-App-GitHub/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= App
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-B-Hooks-OP-PPAddr/Makefile b/devel/p5-B-Hooks-OP-PPAddr/Makefile
index 822e425bf3b5..0003fed434dc 100644
--- a/devel/p5-B-Hooks-OP-PPAddr/Makefile
+++ b/devel/p5-B-Hooks-OP-PPAddr/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= B
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-B-OPCheck/Makefile b/devel/p5-B-OPCheck/Makefile
index 3f02c03828e9..088d19f381b7 100644
--- a/devel/p5-B-OPCheck/Makefile
+++ b/devel/p5-B-OPCheck/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.29
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= B
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Badger/Makefile b/devel/p5-Badger/Makefile
index cb19e221e582..9159a5594e09 100644
--- a/devel/p5-Badger/Makefile
+++ b/devel/p5-Badger/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.09
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Badger
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Cache-AgainstFile/Makefile b/devel/p5-Cache-AgainstFile/Makefile
index e996cd5549da..eeeb782a1886 100644
--- a/devel/p5-Cache-AgainstFile/Makefile
+++ b/devel/p5-Cache-AgainstFile/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.016
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Cache
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/p5-Carp-Clan-Share/Makefile b/devel/p5-Carp-Clan-Share/Makefile
index 9245d917425e..d96d1d730ac1 100644
--- a/devel/p5-Carp-Clan-Share/Makefile
+++ b/devel/p5-Carp-Clan-Share/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.013
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Carp
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-Accessor-Fast-Contained/Makefile b/devel/p5-Class-Accessor-Fast-Contained/Makefile
index 6ebb472a2e12..38409ce0b022 100644
--- a/devel/p5-Class-Accessor-Fast-Contained/Makefile
+++ b/devel/p5-Class-Accessor-Fast-Contained/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.01
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Accessor-Installer/Makefile b/devel/p5-Class-Accessor-Installer/Makefile
index 5b879d95e1d9..eaa81f3ba0c8 100644
--- a/devel/p5-Class-Accessor-Installer/Makefile
+++ b/devel/p5-Class-Accessor-Installer/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.100880
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-#MASTER_SITE_SUBDIR=
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Delegation/Makefile b/devel/p5-Class-Delegation/Makefile
index 9940b2675c85..707fe08fa6fd 100644
--- a/devel/p5-Class-Delegation/Makefile
+++ b/devel/p5-Class-Delegation/Makefile
@@ -3,12 +3,12 @@
PORTNAME= Class-Delegation
PORTVERSION= 1.7.1
+DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DCONWAY
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
COMMENT= Object-oriented delegation
diff --git a/devel/p5-Class-Measure/Makefile b/devel/p5-Class-Measure/Makefile
index ee3c839ff02f..12099ee1e300 100644
--- a/devel/p5-Class-Measure/Makefile
+++ b/devel/p5-Class-Measure/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 0c3a08ff81cb..15fe3dd10998 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 3.02
PORTREVISION= 3
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Config-IniHash/Makefile b/devel/p5-Config-IniHash/Makefile
index d6ed6053191f..a40aedfa8b6a 100644
--- a/devel/p5-Config-IniHash/Makefile
+++ b/devel/p5-Config-IniHash/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Config-IniHash
PORTVERSION= 3.01.01
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Config/JENDA
+MASTER_SITES= CPAN/Config/JENDA
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Config-Wrest/Makefile b/devel/p5-Config-Wrest/Makefile
index 059eed143fe1..b99d33787405 100644
--- a/devel/p5-Config-Wrest/Makefile
+++ b/devel/p5-Config-Wrest/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.036
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Config
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/p5-Danga-Socket-Callback/Makefile b/devel/p5-Danga-Socket-Callback/Makefile
index 7f286f096f99..a457260c1b3f 100644
--- a/devel/p5-Danga-Socket-Callback/Makefile
+++ b/devel/p5-Danga-Socket-Callback/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Danga
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-Data-JavaScript-Anon/Makefile b/devel/p5-Data-JavaScript-Anon/Makefile
index 15072f1038da..80dbc244b86b 100644
--- a/devel/p5-Data-JavaScript-Anon/Makefile
+++ b/devel/p5-Data-JavaScript-Anon/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/p5-Data-Remember/Makefile b/devel/p5-Data-Remember/Makefile
index 63bb980908c7..39d1d10339e2 100644
--- a/devel/p5-Data-Remember/Makefile
+++ b/devel/p5-Data-Remember/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-DateConvert/Makefile b/devel/p5-DateConvert/Makefile
index c10c1d58d2f6..4e2a0c2a0810 100644
--- a/devel/p5-DateConvert/Makefile
+++ b/devel/p5-DateConvert/Makefile
@@ -5,8 +5,7 @@ PORTNAME= DateConvert
PORTVERSION= 0.16
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN/Date
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/p5-DateTime-Format-DateParse/Makefile b/devel/p5-DateTime-Format-DateParse/Makefile
index 3d16b6b92eaa..a4a873a6b1d6 100644
--- a/devel/p5-DateTime-Format-DateParse/Makefile
+++ b/devel/p5-DateTime-Format-DateParse/Makefile
@@ -5,8 +5,7 @@ PORTNAME= DateTime-Format-DateParse
PORTVERSION= 0.05
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= svysh.fbsd@gmail.com
diff --git a/devel/p5-Devel-Callsite/Makefile b/devel/p5-Devel-Callsite/Makefile
index dce385e00103..4882c8cc798d 100644
--- a/devel/p5-Devel-Callsite/Makefile
+++ b/devel/p5-Devel-Callsite/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.06
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Devel-ebug/Makefile b/devel/p5-Devel-ebug/Makefile
index e44826479eb2..f060e0d3b8ee 100644
--- a/devel/p5-Devel-ebug/Makefile
+++ b/devel/p5-Devel-ebug/Makefile
@@ -5,7 +5,6 @@ PORTNAME= Devel-ebug
PORTVERSION= 0.56
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Dist-Zilla/Makefile b/devel/p5-Dist-Zilla/Makefile
index 88f3a5a8afba..27ba901fb862 100644
--- a/devel/p5-Dist-Zilla/Makefile
+++ b/devel/p5-Dist-Zilla/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 4.300030
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Dist
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Event-Notify/Makefile b/devel/p5-Event-Notify/Makefile
index 9c801fd6c581..bf28acae70ac 100644
--- a/devel/p5-Event-Notify/Makefile
+++ b/devel/p5-Event-Notify/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.00004
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Event
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-File-Find-Rule-Perl/Makefile b/devel/p5-File-Find-Rule-Perl/Makefile
index c1ad30f33ada..5aee25159f0f 100644
--- a/devel/p5-File-Find-Rule-Perl/Makefile
+++ b/devel/p5-File-Find-Rule-Perl/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.13
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-File-Finder/Makefile b/devel/p5-File-Finder/Makefile
index da74adefbded..52d58d40a235 100644
--- a/devel/p5-File-Finder/Makefile
+++ b/devel/p5-File-Finder/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.53
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-File-Tail-Dir/Makefile b/devel/p5-File-Tail-Dir/Makefile
index 03693280d111..896ba22eed5f 100644
--- a/devel/p5-File-Tail-Dir/Makefile
+++ b/devel/p5-File-Tail-Dir/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.14
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= jnlin@csie.nctu.edu.tw
diff --git a/devel/p5-Ioctl/Makefile b/devel/p5-Ioctl/Makefile
index ea0bd9e4157f..5705214e2c0b 100644
--- a/devel/p5-Ioctl/Makefile
+++ b/devel/p5-Ioctl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Ioctl
PORTVERSION= 0.81
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Ioctl/JPRIT
+MASTER_SITES= CPAN/Ioctl/JPRIT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Lingua-JA-Fold/Makefile b/devel/p5-Lingua-JA-Fold/Makefile
index 8771d25e7300..ff9ff471836c 100644
--- a/devel/p5-Lingua-JA-Fold/Makefile
+++ b/devel/p5-Lingua-JA-Fold/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.08
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Lingua
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index 210292a2ac85..f53e369c3737 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -4,8 +4,7 @@
PORTNAME= Locale-Maketext-Lexicon
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/DRTECH
+MASTER_SITES= CPAN/Locale/DRTECH
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Log-Dispatch-Array/Makefile b/devel/p5-Log-Dispatch-Array/Makefile
index 63a045fc9bd3..b35216964ba7 100644
--- a/devel/p5-Log-Dispatch-Array/Makefile
+++ b/devel/p5-Log-Dispatch-Array/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.001
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-# MASTER_SITE_SUBDIR= CPAN:RJBS
PKGNAMEPREFIX= p5-
MAINTAINER= geraud@gcu.info
diff --git a/devel/p5-Log-Dispatch-File-Stamped/Makefile b/devel/p5-Log-Dispatch-File-Stamped/Makefile
index 0ca3e5ba0707..43d0ecdbfbae 100644
--- a/devel/p5-Log-Dispatch-File-Stamped/Makefile
+++ b/devel/p5-Log-Dispatch-File-Stamped/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.12
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Log
PKGNAMEPREFIX= p5-
MAINTAINER= jnlin@csie.nctu.edu.tw
diff --git a/devel/p5-Log-Dispatch-Scribe/Makefile b/devel/p5-Log-Dispatch-Scribe/Makefile
index ba5fed2d6528..b7edcddae7e6 100644
--- a/devel/p5-Log-Dispatch-Scribe/Makefile
+++ b/devel/p5-Log-Dispatch-Scribe/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Log
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Log-Trace/Makefile b/devel/p5-Log-Trace/Makefile
index d243ed079a6a..cf86c5e83e6f 100644
--- a/devel/p5-Log-Trace/Makefile
+++ b/devel/p5-Log-Trace/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.070
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Log
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Module-CPANfile/Makefile b/devel/p5-Module-CPANfile/Makefile
index 73c6727897bf..353a00cb7777 100644
--- a/devel/p5-Module-CPANfile/Makefile
+++ b/devel/p5-Module-CPANfile/Makefile
@@ -4,7 +4,6 @@ PORTNAME= Module-CPANfile
PORTVERSION= 1.1000
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Module
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Module-Info-File/Makefile b/devel/p5-Module-Info-File/Makefile
index ef59c6e9dd35..fadd431db1f5 100644
--- a/devel/p5-Module-Info-File/Makefile
+++ b/devel/p5-Module-Info-File/Makefile
@@ -5,7 +5,6 @@ PORTNAME= Module-Info-File
PORTVERSION= 0.14
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Module
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Module-Util/Makefile b/devel/p5-Module-Util/Makefile
index 98a4d0ad3423..53f0ff1db34b 100644
--- a/devel/p5-Module-Util/Makefile
+++ b/devel/p5-Module-Util/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 1.09
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Module
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-MooseX-AttributeShortcuts/Makefile b/devel/p5-MooseX-AttributeShortcuts/Makefile
index b9b5ccf70f35..16d13008ce53 100644
--- a/devel/p5-MooseX-AttributeShortcuts/Makefile
+++ b/devel/p5-MooseX-AttributeShortcuts/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.017
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= MooseX
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-MooseX-Has-Options/Makefile b/devel/p5-MooseX-Has-Options/Makefile
index 822aca88feff..5702ae8cf455 100644
--- a/devel/p5-MooseX-Has-Options/Makefile
+++ b/devel/p5-MooseX-Has-Options/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.003
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= MooseX
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-MouseX-Getopt/Makefile b/devel/p5-MouseX-Getopt/Makefile
index c7a1ae60e0ea..d51161d9959d 100644
--- a/devel/p5-MouseX-Getopt/Makefile
+++ b/devel/p5-MouseX-Getopt/Makefile
@@ -7,7 +7,6 @@ DISTVERSION= 0.34
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= MouseX
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Object-Realize-Later/Makefile b/devel/p5-Object-Realize-Later/Makefile
index ff24403547f5..4d596b7f7be1 100644
--- a/devel/p5-Object-Realize-Later/Makefile
+++ b/devel/p5-Object-Realize-Later/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.19
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Object
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-PHP-Serialization/Makefile b/devel/p5-PHP-Serialization/Makefile
index a402f52b02ae..16ffae0b601c 100644
--- a/devel/p5-PHP-Serialization/Makefile
+++ b/devel/p5-PHP-Serialization/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.34
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= PHP
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Perl-Tidy/Makefile b/devel/p5-Perl-Tidy/Makefile
index 034b2c31a5e7..63b453bb1945 100644
--- a/devel/p5-Perl-Tidy/Makefile
+++ b/devel/p5-Perl-Tidy/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 20140711
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Perl
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Proc-Wait3/Makefile b/devel/p5-Proc-Wait3/Makefile
index d1b1a9b8b67c..61c124cc3f18 100644
--- a/devel/p5-Proc-Wait3/Makefile
+++ b/devel/p5-Proc-Wait3/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Proc
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index 588afab60241..210ba4d480e8 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ReadLine-Gnu
PORTVERSION= 1.26
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR=Term
+MASTER_SITES= CPAN/Term
PKGNAMEPREFIX= p5-
DISTNAME= Term-${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index 88e8e1a15eb7..3f1e0f48f95d 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -5,10 +5,9 @@ PORTNAME= ReadLine-Perl
PORTVERSION= 1.0303
PORTREVISION= 3
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN/Term
PKGNAMEPREFIX= p5-
-DISTNAME= Term-${PORTNAME}-${PORTVERSION:C/0+$//}
+DISTNAME= Term-${PORTNAME}-${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl 5 module for Term::ReadLine editing without GNU readline
diff --git a/devel/p5-ReadLine-TTYtter/Makefile b/devel/p5-ReadLine-TTYtter/Makefile
index 1f7d8b0de387..281304a4b603 100644
--- a/devel/p5-ReadLine-TTYtter/Makefile
+++ b/devel/p5-ReadLine-TTYtter/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ReadLine-TTYtter
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN/Term
PKGNAMEPREFIX= p5-
DISTNAME= Term-${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-Set-ConsistentHash/Makefile b/devel/p5-Set-ConsistentHash/Makefile
index 9d666f946110..b347effc0c9f 100644
--- a/devel/p5-Set-ConsistentHash/Makefile
+++ b/devel/p5-Set-ConsistentHash/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.92
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Set
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Stream-Reader/Makefile b/devel/p5-Stream-Reader/Makefile
index 5d74be23e905..3810da5326c9 100644
--- a/devel/p5-Stream-Reader/Makefile
+++ b/devel/p5-Stream-Reader/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.09
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Stream
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
diff --git a/devel/p5-Sys-RunAlone/Makefile b/devel/p5-Sys-RunAlone/Makefile
index af1f83676352..f0d7b282ba16 100644
--- a/devel/p5-Sys-RunAlone/Makefile
+++ b/devel/p5-Sys-RunAlone/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.12
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Sys
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Sys-RunAlways/Makefile b/devel/p5-Sys-RunAlways/Makefile
index 5e6b35eeb2ea..7376dbea55c6 100644
--- a/devel/p5-Sys-RunAlways/Makefile
+++ b/devel/p5-Sys-RunAlways/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Sys
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Sys-Syscall/Makefile b/devel/p5-Sys-Syscall/Makefile
index 897ce2c9141c..c098bfa9e8d6 100644
--- a/devel/p5-Sys-Syscall/Makefile
+++ b/devel/p5-Sys-Syscall/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.25
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Sys
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-TAP-SimpleOutput/Makefile b/devel/p5-TAP-SimpleOutput/Makefile
index 019f0722ecf6..63bd5f083f1c 100644
--- a/devel/p5-TAP-SimpleOutput/Makefile
+++ b/devel/p5-TAP-SimpleOutput/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.002
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= TAP
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Term-VT102-Boundless/Makefile b/devel/p5-Term-VT102-Boundless/Makefile
index 8edcefec8e40..c40b6b9aa0bc 100644
--- a/devel/p5-Term-VT102-Boundless/Makefile
+++ b/devel/p5-Term-VT102-Boundless/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Term
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-VT102/Makefile b/devel/p5-Term-VT102/Makefile
index 20e46c5c7cb4..4b2506051860 100644
--- a/devel/p5-Term-VT102/Makefile
+++ b/devel/p5-Term-VT102/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.91
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Term
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-Assertions/Makefile b/devel/p5-Test-Assertions/Makefile
index e1cc9359f204..31c98af1505d 100644
--- a/devel/p5-Test-Assertions/Makefile
+++ b/devel/p5-Test-Assertions/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.054
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-FailWarnings/Makefile b/devel/p5-Test-FailWarnings/Makefile
index 67d49d0d6cb1..8749f37eede7 100644
--- a/devel/p5-Test-FailWarnings/Makefile
+++ b/devel/p5-Test-FailWarnings/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.008
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-File-ShareDir/Makefile b/devel/p5-Test-File-ShareDir/Makefile
index c883e77d83ad..4c91cabec6bd 100644
--- a/devel/p5-Test-File-ShareDir/Makefile
+++ b/devel/p5-Test-File-ShareDir/Makefile
@@ -4,7 +4,6 @@ PORTNAME= Test-File-ShareDir
PORTVERSION= 1.001001
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-HexString/Makefile b/devel/p5-Test-HexString/Makefile
index 8512684d8411..2f3477d08205 100644
--- a/devel/p5-Test-HexString/Makefile
+++ b/devel/p5-Test-HexString/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-InDistDir/Makefile b/devel/p5-Test-InDistDir/Makefile
index f89526dd9993..9536358c6558 100644
--- a/devel/p5-Test-InDistDir/Makefile
+++ b/devel/p5-Test-InDistDir/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.112071
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-JSON/Makefile b/devel/p5-Test-JSON/Makefile
index a75b6b3820ee..97f711b7ab3a 100644
--- a/devel/p5-Test-JSON/Makefile
+++ b/devel/p5-Test-JSON/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.11
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${DISTVERSION:C/0$//}
diff --git a/devel/p5-Test-Moose-More/Makefile b/devel/p5-Test-Moose-More/Makefile
index 036855773cc6..20bebc4dace4 100644
--- a/devel/p5-Test-Moose-More/Makefile
+++ b/devel/p5-Test-Moose-More/Makefile
@@ -4,7 +4,6 @@ PORTNAME= Test-Moose-More
PORTVERSION= 0.025
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-Script/Makefile b/devel/p5-Test-Script/Makefile
index 52075981543e..237639ca0b12 100644
--- a/devel/p5-Test-Script/Makefile
+++ b/devel/p5-Test-Script/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.07
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-SubCalls/Makefile b/devel/p5-Test-SubCalls/Makefile
index 8350f551fdf1..7e0f6f71bd3c 100644
--- a/devel/p5-Test-SubCalls/Makefile
+++ b/devel/p5-Test-SubCalls/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.09
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-Without-Module/Makefile b/devel/p5-Test-Without-Module/Makefile
index bf4d7849e673..84be1bc689d7 100644
--- a/devel/p5-Test-Without-Module/Makefile
+++ b/devel/p5-Test-Without-Module/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.18
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-#MASTER_SITE_SUBDIR=
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-XML-Valid/Makefile b/devel/p5-Test-XML-Valid/Makefile
index a919f83d1827..836f7421b5f6 100644
--- a/devel/p5-Test-XML-Valid/Makefile
+++ b/devel/p5-Test-XML-Valid/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Thread-Suspend/Makefile b/devel/p5-Thread-Suspend/Makefile
index 75d2bfe47d8b..f5a6627963d0 100644
--- a/devel/p5-Thread-Suspend/Makefile
+++ b/devel/p5-Thread-Suspend/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Thread-Suspend
PORTVERSION= 1.22
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Thread
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
@@ -15,12 +14,10 @@ COMMENT= Suspend and resume operations for threads
USES= perl5
USE_PERL5= configure
-.include <bsd.port.pre.mk>
-
pre-everything::
@${ECHO_MSG} "----------------------------------------------------------"
@${ECHO_MSG} "This module requires a threaded perl. If your install"
@${ECHO_MSG} "is not threaded please install lang/${PERL_PORT} with threads"
@${ECHO_MSG} "----------------------------------------------------------"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Tie-File-AsHash/Makefile b/devel/p5-Tie-File-AsHash/Makefile
index a7014f1cfb85..923e8832166c 100644
--- a/devel/p5-Tie-File-AsHash/Makefile
+++ b/devel/p5-Tie-File-AsHash/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.08
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Tie
PKGNAMEPREFIX= p5-
MAINTAINER= rdg@bzerk.org
diff --git a/devel/p5-Tie-Util/Makefile b/devel/p5-Tie-Util/Makefile
index 85b3c6c3a122..87c05f93750a 100644
--- a/devel/p5-Tie-Util/Makefile
+++ b/devel/p5-Tie-Util/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Tie
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Time-Out/Makefile b/devel/p5-Time-Out/Makefile
index d6223e56099e..6e304e84073b 100644
--- a/devel/p5-Time-Out/Makefile
+++ b/devel/p5-Time-Out/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.11
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Time
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 648e5fc40377..a3f077abf365 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.30
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR=Date
+MASTER_SITES= CPAN/Date
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index 5a3e17a52dbf..1929172a3e4c 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -5,8 +5,7 @@ PORTNAME= TraceFuncs
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN/Devel
PKGNAMEPREFIX= p5-
DISTNAME= traceFunc-${PORTVERSION}
diff --git a/devel/p5-forks/Makefile b/devel/p5-forks/Makefile
index 69f35c7b4672..a2e681b9ee6e 100644
--- a/devel/p5-forks/Makefile
+++ b/devel/p5-forks/Makefile
@@ -5,8 +5,7 @@ PORTNAME= forks
PORTVERSION= 0.36
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= SOAP/RYBSKEJ
+MASTER_SITES= CPAN/SOAP/RYBSKEJ
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-orz/Makefile b/devel/p5-orz/Makefile
index cbaaab4d229a..eba46596e0f8 100644
--- a/devel/p5-orz/Makefile
+++ b/devel/p5-orz/Makefile
@@ -5,8 +5,7 @@ PORTNAME= orz
PORTVERSION= 0.13
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= CPAN/INGY
+MASTER_SITES= CPAN/CPAN/INGY
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index d56643e1f078..f869fed94be5 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -6,10 +6,9 @@ PORTVERSION= 8.35
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
- ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
- ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
- ftp://ftp.tin.org/pub/libs/%SUBDIR%/
-MASTER_SITE_SUBDIR=${PORTNAME}
+ ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PORTNAME}/ \
+ ftp://ftp.fu-berlin.de/unix/misc/${PORTNAME}/ \
+ ftp://ftp.tin.org/pub/libs/${PORTNAME}/
MAINTAINER= bf@FreeBSD.org
COMMENT= Perl Compatible Regular Expressions library
diff --git a/devel/pear-IO_Bit/Makefile b/devel/pear-IO_Bit/Makefile
index e0d915f03190..f2200b2eccc1 100644
--- a/devel/pear-IO_Bit/Makefile
+++ b/devel/pear-IO_Bit/Makefile
@@ -5,8 +5,7 @@ PORTNAME= IO_Bit
PORTVERSION= 2.1.1
CATEGORIES= devel pear
MASTER_SITES= http://openpear.org/get/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/${PKGNAMEPREFIX}${PORTNAME}
+ LOCAL/tota/${PKGNAMEPREFIX}${PORTNAME}
PKGNAMEPREFIX= pear-
MAINTAINER= yoya@awm.jp
diff --git a/devel/phpsh/Makefile b/devel/phpsh/Makefile
index 1e39097b0b91..f0e04257b7a9 100644
--- a/devel/phpsh/Makefile
+++ b/devel/phpsh/Makefile
@@ -5,9 +5,8 @@ PORTNAME= phpsh
PORTVERSION= 20110513
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ashish
+MASTER_SITES= http://distfiles.pirateparty.in/ashish/ \
+ LOCAL/ashish
MAINTAINER= ashish@FreeBSD.org
COMMENT= Interactive shell for PHP
diff --git a/devel/powerpc64-gcc/Makefile b/devel/powerpc64-gcc/Makefile
index c69dca76972b..2e610ab62acb 100644
--- a/devel/powerpc64-gcc/Makefile
+++ b/devel/powerpc64-gcc/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gcc
PORTVERSION= 4.9.2
PORTREVISION?= 1
CATEGORIES= devel
-MASTER_SITES= GCC
-MASTER_SITE_SUBDIR= releases/gcc-${DISTVERSION}
+MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMEPREFIX?= powerpc64-
MAINTAINER= bapt@FreeBSD.org
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index e04608981dbf..c737a99d8024 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -5,9 +5,8 @@ PORTNAME= ppl
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.cs.unipr.it/pub/ppl/releases/%SUBDIR%/ \
- http://bugseng.com/products/ppl/download/ftp/releases/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= ftp://ftp.cs.unipr.it/pub/ppl/releases/${PORTVERSION}/ \
+ http://bugseng.com/products/ppl/download/ftp/releases/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ library for the manipulation of convex polyhedra
diff --git a/devel/protobuf25/Makefile b/devel/protobuf25/Makefile
index 58a46175d054..c33107f4e3dd 100644
--- a/devel/protobuf25/Makefile
+++ b/devel/protobuf25/Makefile
@@ -6,7 +6,7 @@ PORTNAME= protobuf
PORTVERSION= 2.5.0
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= 25
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/psptoolchain-binutils/Makefile b/devel/psptoolchain-binutils/Makefile
index f7fb5fc72f24..6ca3a1362de5 100644
--- a/devel/psptoolchain-binutils/Makefile
+++ b/devel/psptoolchain-binutils/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.22
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnu.org/pub/gnu/${PORTNAME}/ \
- ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases
+ SOURCEWARE/${PORTNAME}/releases
PKGNAMEPREFIX= psptoolchain-
MAINTAINER= tphilipp@potion-studios.com
diff --git a/devel/psptoolchain-gcc-stage1/Makefile b/devel/psptoolchain-gcc-stage1/Makefile
index d044f25edff3..430ce8f16a66 100644
--- a/devel/psptoolchain-gcc-stage1/Makefile
+++ b/devel/psptoolchain-gcc-stage1/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gcc
PORTVERSION= 4.6.2
PORTREVISION?= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= releases/${DISTNAME}/
+MASTER_SITES= GCC/releases/${DISTNAME}
PKGNAMEPREFIX= psptoolchain-
PKGNAMESUFFIX?= -stage1
diff --git a/devel/psptoolchain-gdb/Makefile b/devel/psptoolchain-gdb/Makefile
index aa08c1475430..d13fbecc904f 100644
--- a/devel/psptoolchain-gdb/Makefile
+++ b/devel/psptoolchain-gdb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gdb
PORTVERSION= 7.3.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}/
+MASTER_SITES= GNU
PKGNAMEPREFIX= psptoolchain-
MAINTAINER= tphilipp@potion-studios.com
diff --git a/devel/psptoolchain-newlib/Makefile b/devel/psptoolchain-newlib/Makefile
index 065f22110470..c1a881415bd4 100644
--- a/devel/psptoolchain-newlib/Makefile
+++ b/devel/psptoolchain-newlib/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.20.0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://sources.redhat.com/pub/ \
- ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SOURCEWARE/${PORTNAME}
PKGNAMEPREFIX= psptoolchain-
MAINTAINER= tphilipp@potion-studios.com
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 7ca38c675b3e..2c520091d970 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pth
PORTVERSION= 2.0.7
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= pth
+MASTER_SITES= GNU
PKGNAMESUFFIX?= # empty
MAINTAINER= vd@FreeBSD.org
diff --git a/devel/py-argparse/Makefile b/devel/py-argparse/Makefile
index c4c7d7ad2864..66fe57e6eaca 100644
--- a/devel/py-argparse/Makefile
+++ b/devel/py-argparse/Makefile
@@ -5,7 +5,7 @@ PORTNAME= argparse
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
diff --git a/devel/py-avro/Makefile b/devel/py-avro/Makefile
index 95a8e8a51b03..aa230afb88a3 100644
--- a/devel/py-avro/Makefile
+++ b/devel/py-avro/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.7.4
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.sai.msu.su/apache/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ \
- APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/stable
+ APACHE/${PORTNAME}/stable
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/devel/py-cld/Makefile b/devel/py-cld/Makefile
index c6e9ba410fb1..3db18f8c3661 100644
--- a/devel/py-cld/Makefile
+++ b/devel/py-cld/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cld
PORTVERSION= 20150113
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= demon
+MASTER_SITES= LOCAL/demon
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= chromium_compact_language_detector-${PORTVERSION}
diff --git a/devel/py-cmdln/Makefile b/devel/py-cmdln/Makefile
index b4f199173d2f..8572b01a86b3 100644
--- a/devel/py-cmdln/Makefile
+++ b/devel/py-cmdln/Makefile
@@ -5,7 +5,7 @@ PORTNAME= cmdln
PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= python@FreeBSD.org
diff --git a/devel/py-country/Makefile b/devel/py-country/Makefile
index f9e9015e9af7..060d07a2a37c 100644
--- a/devel/py-country/Makefile
+++ b/devel/py-country/Makefile
@@ -5,7 +5,6 @@ PORTNAME= country
PORTVERSION= 1.10
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR=source/p/pycountry
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pycountry-${PORTVERSION}
diff --git a/devel/py-extremes/Makefile b/devel/py-extremes/Makefile
index a345acd86662..8b8a886f60f9 100644
--- a/devel/py-extremes/Makefile
+++ b/devel/py-extremes/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Extremes
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/E/Extremes
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile
index 84ebead9c188..c4361e11a89b 100644
--- a/devel/py-freebsd/Makefile
+++ b/devel/py-freebsd/Makefile
@@ -5,9 +5,8 @@ PORTNAME= freebsd
PORTVERSION= 0.9.3
PORTREVISION= 6
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/perky \
http://people.freebsd.org/~perky/distfiles/
-MASTER_SITE_SUBDIR= perky
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py-freebsd-${PORTVERSION}
diff --git a/devel/py-fsm/Makefile b/devel/py-fsm/Makefile
index 65f3f8ef54a1..d818d37ccd06 100644
--- a/devel/py-fsm/Makefile
+++ b/devel/py-fsm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fsm
PORTVERSION= 0.01
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PROJECTHOST= python-${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= python-${PORTNAME}-${PORTVERSION}
diff --git a/devel/py-game_sdl2/Makefile b/devel/py-game_sdl2/Makefile
index 7df9a98580e2..7def1190cb03 100644
--- a/devel/py-game_sdl2/Makefile
+++ b/devel/py-game_sdl2/Makefile
@@ -4,7 +4,7 @@ PORTNAME= game_sdl2
PORTVERSION= 6.99.2
CATEGORIES= devel python
MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \
- GENTOO/distfiles
+ GENTOO
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-for-renpy-${DISTVERSION}
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 7ba8be7ee817..0c3f0fbedf55 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gobject
PORTVERSION= 2.28.6
PORTREVISION= 5
CATEGORIES= devel python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygobject-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/py-icu/Makefile b/devel/py-icu/Makefile
index b5114df568cd..a58a926d5dcb 100644
--- a/devel/py-icu/Makefile
+++ b/devel/py-icu/Makefile
@@ -5,8 +5,7 @@ PORTNAME= icu
PORTVERSION= 1.8
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/P/PyICU
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyICU-${PORTVERSION}
diff --git a/devel/py-ipaddr/Makefile b/devel/py-ipaddr/Makefile
index 15ea0500d510..e55f6d22467d 100644
--- a/devel/py-ipaddr/Makefile
+++ b/devel/py-ipaddr/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ipaddr
PORTVERSION= 2.1.10
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mopsfelder@gmail.com
diff --git a/devel/py-meliae/Makefile b/devel/py-meliae/Makefile
index f795e2231173..8165c62882f1 100644
--- a/devel/py-meliae/Makefile
+++ b/devel/py-meliae/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://launchpadlibrarian.net/74803944/ \
- LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
+ LOCAL/sbz
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sbz@FreeBSD.org
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 05fc088eedf0..2326f89aa2e5 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -6,8 +6,7 @@ PORTNAME= orbit
PORTVERSION= 2.24.0
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyorbit-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/py-prettytable/Makefile b/devel/py-prettytable/Makefile
index d789e8adddec..a35e2b73b2ae 100644
--- a/devel/py-prettytable/Makefile
+++ b/devel/py-prettytable/Makefile
@@ -5,8 +5,7 @@ PORTNAME= prettytable
PORTVERSION= 0.7.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR=source/P/PrettyTable
+MASTER_SITES= CHEESESHOP/source/P/PrettyTable
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= novel@FreeBSD.org
diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile
index 515761744e17..f3986100820f 100644
--- a/devel/py-protocols/Makefile
+++ b/devel/py-protocols/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.9.3
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://peak.telecommunity.com/dist/
-MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyProtocols-${PORTVERSION}
diff --git a/devel/py-pyev/Makefile b/devel/py-pyev/Makefile
index 741965ea0f68..5c342d768e09 100644
--- a/devel/py-pyev/Makefile
+++ b/devel/py-pyev/Makefile
@@ -5,7 +5,6 @@ PORTNAME= pyev
PORTVERSION= 0.9.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR= source/p/pyev
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gd.workbox@gmail.com
diff --git a/devel/py-pygpx/Makefile b/devel/py-pygpx/Makefile
index 8375c3ee7e92..2c41729a1d37 100644
--- a/devel/py-pygpx/Makefile
+++ b/devel/py-pygpx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pygpx
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/p/pygpx/
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wenheping@gmail.com
diff --git a/devel/py-qpid/Makefile b/devel/py-qpid/Makefile
index 3035ec36c1f0..be131c17d0d8 100644
--- a/devel/py-qpid/Makefile
+++ b/devel/py-qpid/Makefile
@@ -4,8 +4,7 @@
PORTNAME= qpid
PORTVERSION= 0.32
CATEGORIES= devel python
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-python-${PORTVERSION}
diff --git a/devel/py-qt4/bsd.pyqt.mk b/devel/py-qt4/bsd.pyqt.mk
index 0ae90cd4691e..259ac4381a26 100644
--- a/devel/py-qt4/bsd.pyqt.mk
+++ b/devel/py-qt4/bsd.pyqt.mk
@@ -13,11 +13,11 @@ PYQT_MAINTAINER= kde@FreeBSD.org
MASTER_SITE_RIVERBANK= http://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
MASTER_SITES_SIP= SF/pyqt/sip/sip-${PORTVERSION} \
- ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
+ GENTOO
MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-${PORTVERSION} \
- ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
+ GENTOO
MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
- ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
+ GENTOO
SIP_VERSION= 4.16.5
PYQT4_VERSION= 4.11.3
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 5e84d5bc5bc0..913ec80a1c71 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -5,7 +5,7 @@ PORTNAME= sip
PORTVERSION= ${SIP_VERSION}
PORTEPOCH= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITES_SIP} ${MASTER_SITE_LOCAL}
+MASTER_SITES= ${MASTER_SITES_SIP}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${SIP_DISTNAME}
diff --git a/devel/py-statgrab/Makefile b/devel/py-statgrab/Makefile
index 4b6d40b4003a..8af0235f87de 100644
--- a/devel/py-statgrab/Makefile
+++ b/devel/py-statgrab/Makefile
@@ -4,9 +4,8 @@
PORTNAME= statgrab
PORTVERSION= 0.6
CATEGORIES= devel python
-MASTER_SITES= http://ftp.mirrorservice.org/pub/i-scream/%SUBDIR%/ \
- http://ftp.i-scream.org/pub/i-scream/%SUBDIR%/
-MASTER_SITE_SUBDIR= py${PORTNAME}
+MASTER_SITES= http://ftp.mirrorservice.org/pub/i-scream/py${PORTNAME}/ \
+ http://ftp.i-scream.org/pub/i-scream/py${PORTNAME}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
diff --git a/devel/py-ydbf/Makefile b/devel/py-ydbf/Makefile
index f40f18430e04..6014caea86a4 100644
--- a/devel/py-ydbf/Makefile
+++ b/devel/py-ydbf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ydbf
PORTVERSION= 0.0.1
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/Y/YDbf/
+MASTER_SITES= CHEESESHOP/source/Y/YDbf/
DISTNAME= YDbf-0.0.1dev-20080514
MAINTAINER= andrey.polyakov@unix.net
diff --git a/devel/py_static_check/Makefile b/devel/py_static_check/Makefile
index 45bfaaf80e64..6249d71e6535 100644
--- a/devel/py_static_check/Makefile
+++ b/devel/py_static_check/Makefile
@@ -5,8 +5,7 @@ PORTNAME= py_static_check
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/p/py_static_check
+MASTER_SITES= CHEESESHOP
MAINTAINER= jnlin@csie.nctu.edu.tw
COMMENT= Statically check your python code
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index ad47fcbe83bb..d84296f63dd7 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gobject
PORTVERSION= 3.14.0
PORTREVISION?= 0
CATEGORIES= devel python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX?= py
PKGNAMESUFFIX?= 3-common
DISTNAME= pygobject-${PORTVERSION}
diff --git a/devel/pyobfuscate/Makefile b/devel/pyobfuscate/Makefile
index 10a16da0c6f7..4f52b63e1537 100644
--- a/devel/pyobfuscate/Makefile
+++ b/devel/pyobfuscate/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.lysator.liu.se/~astrand/projects/pyobfuscate/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+ LOCAL/arved
MAINTAINER= ports@FreeBSD.org
COMMENT= Python source code obfuscator
diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index 1c92509f2c59..59761e757a22 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -5,8 +5,7 @@ PORTNAME= qmake
PORTVERSION= 3.3.8
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR= archive/qt/${PORTVERSION:R:R}
+MASTER_SITES= QT/archive/qt/${PORTVERSION:R:R}
DISTNAME= qt-x11-free-${PORTVERSION}
DIST_SUBDIR= KDE
diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile
index 82300e650b59..26cb491c98d3 100644
--- a/devel/qt4-assistant-adp/Makefile
+++ b/devel/qt4-assistant-adp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= assistant
PORTVERSION= 4.6.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR= archive/qt/${PORTVERSION:R}
+MASTER_SITES= QT
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -adp
DISTNAME= qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 499252efa438..11fa50f5abd3 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libQtAssistantClient
PORTVERSION= 4.6.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR= archive/qt/${PORTVERSION:R}
+MASTER_SITES= QT
PKGNAMEPREFIX= qt4-
DISTNAME= qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
DIST_SUBDIR= KDE
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 63b80e6ecf71..88ae8872f428 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -4,8 +4,7 @@
PORTNAME= qtcreator
DISTVERSION= 3.4.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR=official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
+MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
DISTNAME= qt-creator-opensource-src-${DISTVERSION}
DIST_SUBDIR= KDE
diff --git a/devel/quickcheck++/Makefile b/devel/quickcheck++/Makefile
index 74b75cbe41f5..55395c51777e 100644
--- a/devel/quickcheck++/Makefile
+++ b/devel/quickcheck++/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quickcheck++
PORTVERSION= 0.0.3
CATEGORIES= devel
MASTER_SITES= http://software.legiasoft.com/archives/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+ LOCAL/tota/${PORTNAME}
DISTNAME= quickcheck_${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index 3773736c00a6..91bbc1183f24 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quilt
PORTVERSION= 0.61
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= quilt
+MASTER_SITES= SAVANNAH
MAINTAINER= doj@cubic.org
COMMENT= Collection of bash scripts to ease working with patch files
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index d76ddab74e63..896799845268 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -3,8 +3,7 @@
PORTNAME= rcs
PORTVERSION= 5.9.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= zeising@FreeBSD.org
COMMENT= Version control system
diff --git a/devel/rcs57/Makefile b/devel/rcs57/Makefile
index 6611318f5a2c..99ed58b7be52 100644
--- a/devel/rcs57/Makefile
+++ b/devel/rcs57/Makefile
@@ -3,8 +3,7 @@
PORTNAME= rcs
PORTVERSION= 5.7
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMESUFFIX= 57
MAINTAINER= cy@FreeBSD.org
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 30c27df70b51..6f4330c38312 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -6,11 +6,9 @@ PORTVERSION= 6.3${PATCHLEVEL}
CATEGORIES= devel
MASTER_SITES= GNU \
ftp://ftp.cwru.edu/pub/bash/
-MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([0-9].[0-9]).*/\1/}
-PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR=${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-patches
+PATCH_SITES= GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-patches
MAINTAINER= johans@FreeBSD.org
COMMENT= Library for editing command lines as they are typed
diff --git a/devel/remake/Makefile b/devel/remake/Makefile
index 8ded7125db89..699a2671a42b 100644
--- a/devel/remake/Makefile
+++ b/devel/remake/Makefile
@@ -4,8 +4,7 @@
PORTNAME= remake
PORTVERSION= 0.9
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=bashdb/remake/3.82+dbg-${PORTVERSION}/
+MASTER_SITES= SF/bashdb/remake/3.82+dbg-${PORTVERSION}/
DISTNAME= remake-3.82+dbg${PORTVERSION}
MAINTAINER= arved@FreeBSD.org
diff --git a/devel/renpy/Makefile b/devel/renpy/Makefile
index 8e8ca82c8f8b..8ed6eeaa1f2c 100644
--- a/devel/renpy/Makefile
+++ b/devel/renpy/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 6.99.2
DISTVERSIONSUFFIX=-source
CATEGORIES= devel games
MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Framework for developing visual-novel type games
diff --git a/devel/ruby-langscan/Makefile b/devel/ruby-langscan/Makefile
index 4a2d37779782..085fb203633e 100644
--- a/devel/ruby-langscan/Makefile
+++ b/devel/ruby-langscan/Makefile
@@ -4,8 +4,7 @@
PORTNAME= langscan
PORTVERSION= 1.2.20070115
CATEGORIES= devel ruby
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+MASTER_SITES= LOCAL/tota/${PORTNAME}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ${RUBY_PKGNAMEPREFIX:S|${RUBY_SUFFIX}-||}
diff --git a/devel/ruby-ncurses/Makefile b/devel/ruby-ncurses/Makefile
index 8627438d2b66..1c0b0a0cfb9d 100644
--- a/devel/ruby-ncurses/Makefile
+++ b/devel/ruby-ncurses/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ncurses
PORTVERSION= 1.2.4
CATEGORIES= devel ruby
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= ncurses-ruby
+MASTER_SITES= SF/ncurses-ruby
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-ruby-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/devel/ruby-setup.rb/Makefile b/devel/ruby-setup.rb/Makefile
index 52739f5bf585..6f14a06fa451 100644
--- a/devel/ruby-setup.rb/Makefile
+++ b/devel/ruby-setup.rb/Makefile
@@ -4,8 +4,7 @@
PORTNAME= setup.rb
PORTVERSION= 3.4.1
CATEGORIES= devel ruby
-MASTER_SITES= http://www.loveruby.net/archive/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME:R}
+MASTER_SITES= http://www.loveruby.net/archive/${PORTNAME:R}/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:R}-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/devel/rubygem-atoulme-antwrap/Makefile b/devel/rubygem-atoulme-antwrap/Makefile
index 7d0befa5f5f8..465dedff5058 100644
--- a/devel/rubygem-atoulme-antwrap/Makefile
+++ b/devel/rubygem-atoulme-antwrap/Makefile
@@ -4,7 +4,7 @@
PORTNAME= atoulme-Antwrap
PORTVERSION= 0.7.5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_RUBYGEMS}
+MASTER_SITES= RG
MAINTAINER= arved@FreeBSD.org
COMMENT= Ruby wrapper for Apache Ant
diff --git a/devel/rubygem-io-like/Makefile b/devel/rubygem-io-like/Makefile
index 44f436ee205b..78876c252167 100644
--- a/devel/rubygem-io-like/Makefile
+++ b/devel/rubygem-io-like/Makefile
@@ -4,8 +4,7 @@
PORTNAME= io-like
PORTVERSION= 0.3.0.20130301
CATEGORIES= devel rubygems
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+MASTER_SITES= LOCAL/tota/${PORTNAME}
PKGNAMEPREFIX= rubygem-
MAINTAINER= tota@FreeBSD.org
diff --git a/devel/sabre/Makefile b/devel/sabre/Makefile
index 99c43a77a93d..019a9b3b2004 100644
--- a/devel/sabre/Makefile
+++ b/devel/sabre/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sabre
PORTVERSION= 20100501
CATEGORIES= devel multimedia java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sabre-library
+MASTER_SITES= SF/sabre-library
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
diff --git a/devel/safe-iop/Makefile b/devel/safe-iop/Makefile
index bf6123bc1e5e..70684b914311 100644
--- a/devel/safe-iop/Makefile
+++ b/devel/safe-iop/Makefile
@@ -4,12 +4,12 @@
PORTNAME= safe-iop
PORTVERSION= 0.3.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Safe integer operation library for C
+USES= tar:tgz
USE_LDCONFIG= yes
ALL_TARGET= so
CFLAGS+= -fPIC
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 4277ea31a8cc..403c4145671d 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -4,7 +4,7 @@
PORTNAME= sfio
PORTVERSION= 1999
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
DISTNAME= ${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .src.unix.cpio
diff --git a/devel/sgb/Makefile b/devel/sgb/Makefile
index a4f59e7cdb0d..ed42745e8280 100644
--- a/devel/sgb/Makefile
+++ b/devel/sgb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sgb
PORTVERSION= 20090810
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cs.stanford.edu/pub/sgb/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
DISTNAME= sgb-2009-08-10
MAINTAINER= gerald@FreeBSD.org
diff --git a/devel/shtool/Makefile b/devel/shtool/Makefile
index 09230103f373..54270f97ada4 100644
--- a/devel/shtool/Makefile
+++ b/devel/shtool/Makefile
@@ -4,9 +4,8 @@
PORTNAME= shtool
PORTVERSION= 2.0.8
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU:S/$/:GNU/} ${MASTER_SITE_OSSP:S/$/:OSSP/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:GNU tool/${PORTNAME}/:OSSP
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:GNU,OSSP
+MASTER_SITES= GNU OSSP/tool/${PORTNAME}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= vd@FreeBSD.org
COMMENT= The GNU Portable Shell Tool
diff --git a/devel/smake/Makefile b/devel/smake/Makefile
index acb255159b40..74468488801a 100644
--- a/devel/smake/Makefile
+++ b/devel/smake/Makefile
@@ -4,8 +4,7 @@
PORTNAME= smake
PORTVERSION= 1.2.3
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=s-make
+MASTER_SITES= SF/s-make
MAINTAINER= ports@FreeBSD.org
COMMENT= Portable make program with automake features
diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile
index 557425f89d7d..f9115ab852ef 100644
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 4.5
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
DISTNAME= sourcenavigator-NG${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/storm/Makefile b/devel/storm/Makefile
index edfc3d3e1817..9f1431e7ccc4 100644
--- a/devel/storm/Makefile
+++ b/devel/storm/Makefile
@@ -4,8 +4,7 @@
PORTNAME= storm
DISTVERSION= 0.9.2-incubating
CATEGORIES= devel java
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= incubator/${PORTNAME}/apache-${PORTNAME}-${DISTVERSION}
+MASTER_SITES= APACHE/incubator/${PORTNAME}/apache-${PORTNAME}-${DISTVERSION}
DISTNAME= apache-storm-${DISTVERSION}
MAINTAINER= hsn@sendmail.cz
diff --git a/devel/stormlib-ghost++/Makefile b/devel/stormlib-ghost++/Makefile
index 1d4c8a4955de..c275b3a3cb01 100644
--- a/devel/stormlib-ghost++/Makefile
+++ b/devel/stormlib-ghost++/Makefile
@@ -4,7 +4,7 @@
PORTNAME= stormlib
PORTVERSION= 6.25
CATEGORIES= devel archivers
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -ghost++
DISTNAME= ${PROJECTHOST}_${PROJECTVERSION}
diff --git a/devel/str/Makefile b/devel/str/Makefile
index b3d127b1cfe8..8b36f5de4b3b 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -5,8 +5,7 @@ PORTNAME= str
PORTVERSION= 0.9.12
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_OSSP}
-MASTER_SITE_SUBDIR= lib/${PORTNAME}
+MASTER_SITES= OSSP/lib/${PORTNAME}
MAINTAINER= vd@FreeBSD.org
COMMENT= Generic String Library
diff --git a/devel/streamhtmlparser/Makefile b/devel/streamhtmlparser/Makefile
index 0fcf8fd37c2a..c47be26462a0 100644
--- a/devel/streamhtmlparser/Makefile
+++ b/devel/streamhtmlparser/Makefile
@@ -4,7 +4,7 @@
PORTNAME= streamhtmlparser
PORTVERSION= 0.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= itechbear@gmail.com
COMMENT= C/C++/Python streaming HTML parser library from Google
diff --git a/devel/stringencoders/Makefile b/devel/stringencoders/Makefile
index fde90e7081bc..bd796f3497c7 100644
--- a/devel/stringencoders/Makefile
+++ b/devel/stringencoders/Makefile
@@ -3,10 +3,10 @@
PORTNAME= stringencoders
PORTVERSION= 3.10.3
+DISTVERSIONPREFIX= v
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Collection of high performance c-string transformations
diff --git a/devel/subversion-book/Makefile b/devel/subversion-book/Makefile
index 4620dd9cb856..4c2271edb6d0 100644
--- a/devel/subversion-book/Makefile
+++ b/devel/subversion-book/Makefile
@@ -3,8 +3,7 @@
PORTNAME= subversion-book
DISTVERSION= 4515
CATEGORIES= devel misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=lev
+MASTER_SITES= LOCAL/lev
DISTFILES= svn-book-html-r${DISTVERSION}.tar.bz2 \
svn-book-r${DISTVERSION}.pdf
DIST_SUBDIR= subversion18
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index deecf59269de..a94a641a531c 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -5,9 +5,8 @@ PORTNAME?= subversion
PORTVERSION= 1.8.13
PORTREVISION?= 0
CATEGORIES+= devel
-MASTER_SITES= ${MASTER_SITE_APACHE}
+MASTER_SITES= APACHE/subversion
DIST_SUBDIR= subversion18
-MASTER_SITE_SUBDIR= subversion
GNU_CONFIGURE= yes
USES+= tar:bzip2 pkgconfig libtool cpe
diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common
index eb6bb2bce5bc..114f40dad3cc 100644
--- a/devel/subversion17/Makefile.common
+++ b/devel/subversion17/Makefile.common
@@ -5,10 +5,9 @@ PORTNAME= subversion
PORTVERSION= 1.7.20
PORTREVISION?= 0
CATEGORIES+= devel
-MASTER_SITES= ${MASTER_SITE_APACHE}
+MASTER_SITES= APACHE/subversion
DIST_SUBDIR= subversion17
PKGNAMESUFFIX= 17
-MASTER_SITE_SUBDIR= subversion
USE_KDE4= # Used below if KWallet support is enabled
GNU_CONFIGURE= yes
diff --git a/devel/subversive/Makefile b/devel/subversive/Makefile
index a03da0b6aa74..3bf83c11398d 100644
--- a/devel/subversive/Makefile
+++ b/devel/subversive/Makefile
@@ -5,7 +5,7 @@ PORTNAME= subversive
PORTVERSION= 2.0.0
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_ECLIPSE:S,%SUBDIR%,technology/subversive/2.0/builds,:S,$,:core,} \
+MASTER_SITES= ECLIPSE/technology/subversive/2.0/builds:core \
http://community.polarion.com/projects/subversive/download/eclipse/4.0/builds/:connectors
DISTNAME= Subversive-${PORTVERSION}.I20140519-1700
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:core ${CONNECTORS}:connectors
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 9413453abc70..5d18d460a95b 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 2.1.2
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAMBA
MAINTAINER= timur@FreeBSD.org
COMMENT= Hierarchical pool based memory allocator
diff --git a/devel/tcl-trf/Makefile b/devel/tcl-trf/Makefile
index 40fec6b61b1d..f701e7692179 100644
--- a/devel/tcl-trf/Makefile
+++ b/devel/tcl-trf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Trf
PORTVERSION= 2.1.4
PORTREVISION= 1
CATEGORIES= devel tcl
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=tcltrf/tcltrf/${PORTVERSION}
+MASTER_SITES= SF/tcltrf/tcltrf/${PORTVERSION}
PKGNAMEPREFIX= tcl-
DISTNAME= trf${PORTVERSION}
diff --git a/devel/tclap/Makefile b/devel/tclap/Makefile
index 300bee82dcd2..a0a96823c71a 100644
--- a/devel/tclap/Makefile
+++ b/devel/tclap/Makefile
@@ -4,8 +4,7 @@ PORTNAME= tclap
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}#
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= grog@FreeBSD.org
COMMENT= Verbose replacement for getopt
diff --git a/devel/terminality/Makefile b/devel/terminality/Makefile
index 81ae911c834a..3dde995061c3 100644
--- a/devel/terminality/Makefile
+++ b/devel/terminality/Makefile
@@ -4,8 +4,7 @@
PORTNAME= terminality
PORTVERSION= 2.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= gabor
+MASTER_SITES= LOCAL/gabor
DISTNAME= tn-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 665d1312a756..e7f79a001ca1 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.9.22
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAMBA
MAINTAINER= timur@FreeBSD.org
COMMENT= Talloc based event loop library
diff --git a/devel/thrift-c_glib/Makefile b/devel/thrift-c_glib/Makefile
index 5318a2bc2508..590e2aeca738 100644
--- a/devel/thrift-c_glib/Makefile
+++ b/devel/thrift-c_glib/Makefile
@@ -6,17 +6,14 @@ PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
+MASTER_SITES= APACHE/thrift/${PORTVERSION
+DISTNAME= thrift-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C glib interface to Thrift
PKGNAMESUFFIX= -c_glib
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= /thrift/${PORTVERSION
-DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo
-DISTNAME= thrift-${PORTVERSION}
-
BUILDIR= ${WRKDIR}/${DISTNAME}/lib/c_glib
LIB_DEPENDS= libglib-2.0.so:${PORTSDIR}/devel/glib20
@@ -25,10 +22,12 @@ USE_AUTOTOOLS= autoconf autoheader:env aclocal automake
ACLOCAL_ARGS= -I${WRKSRC}/aclocal
AUTOMAKE_ARGS= --foreign --add-missing --copy
+DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo
+
USES= pkgconfig gmake libtool
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-MAKE_JOBS_UNSAFE= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+MAKE_JOBS_UNSAFE= yes
.include "../thrift/bsd.thrift.mk"
diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
index c94f8510da2a..f94686d894f3 100644
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -6,15 +6,13 @@ PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
+PKGNAMESUFFIX= -cpp
+MASTER_SITES= APACHE/thrift/${PORTVERSION}
+DISTNAME= thrift-${PORTVERSION}
MAINTAINER= komarov@valerka.net
COMMENT= C++ interface to Thrift
-PKGNAMESUFFIX= -cpp
-
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= thrift/${PORTVERSION}
-DISTNAME= thrift-${PORTVERSION}
DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo
LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 1292a4cfe520..acc4d6e8e8cf 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -5,8 +5,7 @@ PORTNAME= thrift
PORTVERSION= ${THRIFT_PORTVERSION} # get these from bsd.thrift.mk. any upgrade needs to check ALL dependencies
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= /thrift/${PORTVERSION}
+MASTER_SITES= APACHE/thrift/${PORTVERSION}
MAINTAINER= komarov@valerka.net
COMMENT= Framework for scalable cross-language services development
diff --git a/devel/tigcc/Makefile b/devel/tigcc/Makefile
index de46e2b98f41..d71df781bcc8 100644
--- a/devel/tigcc/Makefile
+++ b/devel/tigcc/Makefile
@@ -5,11 +5,9 @@ PORTNAME= tigcc
PORTVERSION= 0.96.b8
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GCC:S/$/:gcc/} \
- ${MASTER_SITE_GNU:S/$/:gas/} \
+MASTER_SITES= GCC/snapshots/4.1-20060728:gcc \
+ GNU/binutils:gas \
http://tigcc.ticalc.org/linux/:tigcc
-MASTER_SITE_SUBDIR= snapshots/4.1-20060728/:gcc \
- binutils/:gas
DISTFILES= gcc-core-4.1-20060728.tar.bz2:gcc \
binutils-2.16.1.tar.bz2:gas \
tigcc_src.tar.bz2:tigcc
diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index ec2fb29bdb83..fdc89b7f42f2 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ucommon
PORTVERSION= 6.1.11
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= commoncpp
+MASTER_SITES= GNU/commoncpp
MAINTAINER= ports@FreeBSD.org
COMMENT= Very lightweight C++ design pattern library
diff --git a/devel/udis86/Makefile b/devel/udis86/Makefile
index 48d0ec87b335..5980e02cf67c 100644
--- a/devel/udis86/Makefile
+++ b/devel/udis86/Makefile
@@ -5,8 +5,7 @@ PORTNAME= udis86
PORTVERSION= 1.7.2
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION:R}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
MAINTAINER= bf@FreeBSD.org
COMMENT= Minimalistic x86 and x86-64 disassembler library
diff --git a/devel/ultragetopt/Makefile b/devel/ultragetopt/Makefile
index 24afec1880b0..13c44a89035b 100644
--- a/devel/ultragetopt/Makefile
+++ b/devel/ultragetopt/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ultragetopt
PORTVERSION= 0.6.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= http://kevinlocke.name/programs/ ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://kevinlocke.name/programs/
MAINTAINER= beyert@cs.ucr.edu
COMMENT= Versatile and customizable implementation of getopt()
diff --git a/devel/winpdb/Makefile b/devel/winpdb/Makefile
index 3e86642c84e9..a85b47c2d065 100644
--- a/devel/winpdb/Makefile
+++ b/devel/winpdb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= winpdb
PORTVERSION= 1.4.8
PORTREVISION= 5
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR= winpdb
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= mva@FreeBSD.org
COMMENT= Advanced Python debugger
diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
index 65a51010de88..333d55c1900e 100644
--- a/devel/xwpe/Makefile
+++ b/devel/xwpe/Makefile
@@ -4,10 +4,9 @@
PORTNAME= xwpe
PORTVERSION= 1.5.30a
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/apps/editors/X \
http://www.identicalsoftware.com/xwpe/ \
ftp://ftp.identicalsoftware.com/pub/linux/xwpe/
-MASTER_SITE_SUBDIR= apps/editors/X
MAINTAINER= ports@FreeBSD.org
COMMENT= Borland-like IDE programming environment
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index edf96069d275..4f5602319234 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xxgdb
PORTVERSION= 1.12
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
MAINTAINER= cy@FreeBSD.org
COMMENT= X window interface for gdb
diff --git a/devel/yasm-devel/Makefile b/devel/yasm-devel/Makefile
index 5f8c01aa0954..76355c4ab8af 100644
--- a/devel/yasm-devel/Makefile
+++ b/devel/yasm-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= yasm
PORTVERSION= 1.2.0.29
DISTVERSIONSUFFIX= .g87c0
CATEGORIES= devel lang
-MASTER_SITES= http://www.tortall.net/projects/yasm/snapshots/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${DISTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITES= http://www.tortall.net/projects/yasm/snapshots/v${DISTVERSION}${DISTVERSIONSUFFIX}/
PKGNAMESUFFIX= -devel
MAINTAINER= koobs@FreeBSD.org
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index e42a03186dfe..08ce14e861d5 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zookeeper
PORTVERSION= 3.4.6
PORTREVISION= 3
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= zookeeper/zookeeper-${PORTVERSION}
+MASTER_SITES= APACHE/zookeeper/zookeeper-${PORTVERSION}
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Service for maintaining distributed configuration, naming and locks
diff --git a/devel/zpu-binutils/Makefile b/devel/zpu-binutils/Makefile
index 5ac874fa29d3..cca645a34f63 100644
--- a/devel/zpu-binutils/Makefile
+++ b/devel/zpu-binutils/Makefile
@@ -3,8 +3,7 @@
PORTNAME= zpu-binutils
PORTVERSION= 1.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+MASTER_SITES= LOCAL/db
DISTNAME= zpu-toolchain-${PORTVERSION}
MAINTAINER= db@FreeBSD.org
diff --git a/devel/zpu-gcc/Makefile b/devel/zpu-gcc/Makefile
index dffb3233c562..304bba642313 100644
--- a/devel/zpu-gcc/Makefile
+++ b/devel/zpu-gcc/Makefile
@@ -4,8 +4,7 @@ PORTNAME= zpu-gcc
PORTVERSION= 1.0
CATEGORIES= devel
MASTER_SITES= http://opensource.zylin.com/zpudownload.html/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+MASTER_SITES= LOCAL/db
DISTNAME= zpu-toolchain-${PORTVERSION}
MAINTAINER= db@FreeBSD.org
diff --git a/dns/bind10/Makefile b/dns/bind10/Makefile
index 4d99e679659b..86d2462cff82 100644
--- a/dns/bind10/Makefile
+++ b/dns/bind10/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bind10
PORTVERSION= 1.2.0
PORTREVISION= 3
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+MASTER_SITES= ISC/${PORTNAME}/${PORTVERSION}
MAINTAINER= mat@FreeBSD.org
COMMENT= Development version of ISC BIND 10 DNS Suite
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 53aeace92cc5..d242dd6c188c 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -48,7 +48,7 @@ BROKEN= The jumbo patch currently conflicts with the IPv6, ignoreip2, SRV and D
.endif
PATCH_SITES+= http://people.FreeBSD.org/~roam/ports/dns/djbdns/:jumbo \
- ${MASTER_SITE_LOCAL:S/%SUBDIR%\//roam\/dns\/djbdns\/:jumbo/}
+ LOCAL/roam/dns/djbdns:jumbo
PATCHFILES+= jumbo-p13.patch.gz:jumbo
PATCH_DIST_STRIP= -p1
.if ${PORT_OPTIONS:MDUMPCACHE}
diff --git a/dns/doc/Makefile b/dns/doc/Makefile
index c9fd07f67d52..73f823088e04 100644
--- a/dns/doc/Makefile
+++ b/dns/doc/Makefile
@@ -4,9 +4,8 @@
PORTNAME= doc
PORTVERSION= 2.2.3
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/sanpei \
ftp://ftp.shub-internet.org/pub/shub/brad/dns/
-MASTER_SITE_SUBDIR= sanpei
MAINTAINER= sanpei@FreeBSD.org
COMMENT= Diagnose unhealthy DNS domains
diff --git a/dns/inadyn/Makefile b/dns/inadyn/Makefile
index 533b8980c171..1073f5c89f36 100644
--- a/dns/inadyn/Makefile
+++ b/dns/inadyn/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.96.2
PORTREVISION= 3
CATEGORIES= dns
MASTER_SITES= http://www.inatech.eu/inadyn/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dhn
+ LOCAL/dhn
DISTNAME= ${PORTNAME}.v${PORTVERSION}
MAINTAINER= samm@os2.kiev.ua
diff --git a/dns/ipcheck/Makefile b/dns/ipcheck/Makefile
index 094adfed42ad..84f78f01e7dc 100644
--- a/dns/ipcheck/Makefile
+++ b/dns/ipcheck/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.240
PORTEPOCH= 1
CATEGORIES= dns python
MASTER_SITES= http://ipcheck.sourceforge.net/releases/
-MASTER_SITE_SUBDIR= lioux
DISTNAME= ${PORTNAME}.${PORTVERSION:S/^0.//}
EXTRACT_SUFX=
EXTRACT_ONLY=
diff --git a/dns/nsping/Makefile b/dns/nsping/Makefile
index 1079a1486895..59ff2cc99cb6 100644
--- a/dns/nsping/Makefile
+++ b/dns/nsping/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nsping
PORTVERSION= 0.8
PORTREVISION= 2
CATEGORIES= dns
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= roam
+MASTER_SITES= LOCAL/roam
DISTFILES= nsping.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile
index b5d7ce162019..1bc965412f13 100644
--- a/dns/py-adns/Makefile
+++ b/dns/py-adns/Makefile
@@ -5,7 +5,7 @@ PORTNAME= adns
PORTVERSION= 1.2.1
PORTREVISION= 14
CATEGORIES= dns python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= adns-python-${PORTVERSION}
diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile
index e456961c1a85..d2edf9533395 100644
--- a/dns/samba-nsupdate/Makefile
+++ b/dns/samba-nsupdate/Makefile
@@ -4,8 +4,7 @@ PORTNAME= nsupdate
PORTVERSION= 9.8.6
PORTREVISION= 1
CATEGORIES= dns net ipv6
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
+MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMEPREFIX= samba-
DISTNAME= bind-${ISCVERSION}
diff --git a/dns/updatedd/Makefile b/dns/updatedd/Makefile
index 26cbab85e31c..f43bf0edc20e 100644
--- a/dns/updatedd/Makefile
+++ b/dns/updatedd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= updatedd
PORTVERSION= 2.6
PORTREVISION= 1
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= geniusj@ods.org
diff --git a/editors/abiword-docs/Makefile b/editors/abiword-docs/Makefile
index d6b2580e49d4..e410a6e3e515 100644
--- a/editors/abiword-docs/Makefile
+++ b/editors/abiword-docs/Makefile
@@ -5,8 +5,7 @@
PORTNAME= abiword-docs
PORTVERSION= 2.8.6
CATEGORIES= editors
-MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
-MASTER_SITE_SUBDIR= abiword
+MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
DIST_SUBDIR= AbiWord
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index d7f4ffe96f4f..3a021d4aa323 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -6,8 +6,7 @@ PORTNAME= abiword
PORTVERSION= 2.8.6
PORTREVISION= 10
CATEGORIES= editors
-MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
-MASTER_SITE_SUBDIR= abiword
+MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
DIST_SUBDIR= AbiWord
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index c5dceca31f1a..e4a82a1d6faf 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -5,7 +5,7 @@ PORTNAME= beav
PORTVERSION= 1.40.18
PORTREVISION= 3
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION:R}.orig
PATCH_SITES= ${MASTER_SITES}
diff --git a/editors/calligra-l10n/files/bsd.l10n.mk b/editors/calligra-l10n/files/bsd.l10n.mk
index c65cd75d431b..a49aed2fbfcd 100644
--- a/editors/calligra-l10n/files/bsd.l10n.mk
+++ b/editors/calligra-l10n/files/bsd.l10n.mk
@@ -1,6 +1,5 @@
.if defined(CALLIGRA_L10N)
-MASTER_SITES?= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR?= ${CALLIGRA_BRANCH}/calligra-${PORTVERSION}/calligra-l10n/
+MASTER_SITES?= KDE/${CALLIGRA_BRANCH}/calligra-${PORTVERSION}/calligra-l10n
PKGNAMEPREFIX= ${CALLIGRA_L10N:S/@/_/}-
DISTNAME= ${PORTNAME}-${CALLIGRA_L10N}-${PORTVERSION}
DIST_SUBDIR= KDE/calligra-l10n
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index bd05c62ee01b..6e82b3ba127f 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -4,8 +4,7 @@ PORTNAME= calligra
PORTVERSION= ${CALLIGRA_VERSION}
PORTREVISION= 15
CATEGORIES= editors kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
+MASTER_SITES= KDE/${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 5f81dbb5dc5e..b7b2af541979 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -5,8 +5,7 @@ PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
PORTEPOCH= 3
CATEGORIES= editors ipv6
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMESUFFIX?= 24
PATCH_SITE_SUBDIR+= ashish
@@ -86,7 +85,7 @@ OPTIONS_SUB= SOURCES
CANNA_CONFIGURE_ON= --with-canna \
--with-canna-includes=${LOCALBASE}/include \
--with-canna-libraries=${LOCALBASE}/lib
-CANNA_PATCH_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL}
+CANNA_PATCH_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ LOCAL
CANNA_PATCHFILES= emacs24.4canna-20141030.diff.gz
CANNA_LIB_DEPENDS= libcanna.so:${PORTSDIR}/japanese/canna-lib
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 802867b4c335..619364de9c1e 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 0.4.13
PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://releases.0x539.de/gobby/ \
- LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
+ LOCAL/sbz
MAINTAINER= sbz@FreeBSD.org
COMMENT= Free collaborative editor
diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index b1b69b0eb11b..d72566c0c860 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 4.16
PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= simon/:local
+ LOCAL/simon
MAINTAINER= ports@FreeBSD.org
COMMENT= Jonathan's Own Version of Emacs
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 8a57428341e5..68f91dca2e88 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -7,7 +7,7 @@ DISTVERSIONSUFFIX= -0
PORTREVISION?= 0
CATEGORIES= editors devel
MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
- ${MASTER_SITE_LOCAL:S|$|acm/freepascal/|}
+ LOCAL/acm/freepascal
DIST_SUBDIR= freepascal
MAINTAINER?= freebsd-fpc@FreeBSD.org
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 06c5c03af96e..5841aba7650f 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.8.18.1
PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jgh@FreeBSD.org
COMMENT= GTK+ based simple text editor
diff --git a/editors/nano-devel/Makefile b/editors/nano-devel/Makefile
index 23a5fde99261..cb22ce66b7c2 100644
--- a/editors/nano-devel/Makefile
+++ b/editors/nano-devel/Makefile
@@ -4,7 +4,7 @@ PORTNAME= nano
PORTVERSION= 2.3.6
CATEGORIES= editors
MASTER_SITES= http://www.nano-editor.org/dist/v${PORTVERSION:R}/ \
- ${MASTER_SITE_GNU}
+ GNU
PKGNAMESUFFIX= -devel
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 801c5095a2ac..70e4504a7cd4 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 5.6
PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://people.freebsd.org/~deischen/distfiles/ \
- ${MASTER_SITE_SOURCEFORGE} \
+ SF/${PORTNAME}/${PORTNAME}-source \
ftp://ftp.nluug.nl/pub/editors/NEdit/contrib/misc/
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-source
DISTFILES= nedit-5.6a-src.tar.gz nedit.app-defaults
EXTRACT_ONLY= nedit-5.6a-src.tar.gz
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 73517e24fd24..97b5b8aa56bb 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= editors elisp
MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= hrs
+PATCH_SITES= LOCAL/hrs
PATCHFILES= psgml-symbol-conflict-050503.diff.gz
MAINTAINER= hrs@FreeBSD.org
diff --git a/editors/spe/Makefile b/editors/spe/Makefile
index c9a25e43dfa6..67bba79b86e1 100644
--- a/editors/spe/Makefile
+++ b/editors/spe/Makefile
@@ -5,8 +5,7 @@ PORTNAME= SPE
PORTVERSION= 0.8.4.h
PORTREVISION= 8
CATEGORIES= editors devel python
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= python
+MASTER_SITES= SF/python
DISTNAME= ${PORTNAME:tl}-${PORTVERSION}-wx2.6.1.0
MAINTAINER= nivit@FreeBSD.org
diff --git a/editors/sted/Makefile b/editors/sted/Makefile
index 668282339727..406e8e69ca56 100644
--- a/editors/sted/Makefile
+++ b/editors/sted/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sted
PORTVERSION= 0.2.2
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= gabor
+MASTER_SITES= LOCAL/gabor
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple/Small/Stupid Text Editor
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 79f2078839be..890c5cf6655d 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -5,13 +5,11 @@ PORTNAME= tamago
PORTVERSION= 4.0.6.0.20041122.19
PORTREVISION= 13
CATEGORIES= editors elisp
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/e/egg
+MASTER_SITES= DEBIAN/pool/main/e/egg
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= egg_4.0.6+0.20041122cvs.orig
-PATCH_SITES= ${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
- ${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
+PATCH_SITES= DEBIAN/pool/main/e/egg LOCAL/nork
PATCHFILES= egg_4.0.6+0.20041122cvs-19.diff.gz
PATCH_DIST_STRIP= -p1
diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index 23a3acacf658..258c2f4500a8 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 3
CATEGORIES= editors www
MASTER_SITES= ftp://ftp.inrialpes.fr/pub/opera/sources/thot/ \
ftp://ftp.ruhr-uni-bochum.de/local/jk.collection/thot/
-MASTER_SITE_SUBDIR= apps/editors/X/thot
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile
index 26c1ded9e20f..f7d243808e68 100644
--- a/editors/uzap/Makefile
+++ b/editors/uzap/Makefile
@@ -4,8 +4,7 @@
PORTNAME= uzap
PORTVERSION= 1.0
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
diff --git a/editors/yasnippet/Makefile b/editors/yasnippet/Makefile
index 44541e42bcae..9122cbb40ee6 100644
--- a/editors/yasnippet/Makefile
+++ b/editors/yasnippet/Makefile
@@ -4,7 +4,7 @@ PORTNAME= yasnippet
PORTVERSION= 0.6.1c
PORTREVISION= 10
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
yasnippet-doc-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index 02aa0682570c..ab991a755811 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bsvc
PORTVERSION= 2.1
PORTREVISION= 3
CATEGORIES= emulators tk
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/emulators
+MASTER_SITES= SUNSITE/system/emulators
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/cpmemu/Makefile b/emulators/cpmemu/Makefile
index e8ae89298a9d..648a14b89efc 100644
--- a/emulators/cpmemu/Makefile
+++ b/emulators/cpmemu/Makefile
@@ -4,12 +4,10 @@
PORTNAME= cpmemu
PORTVERSION= 0.2.1.1
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/emulators
+MASTER_SITES= SUNSITE/system/emulators
DISTNAME= cpm-0.2.1
-PATCH_SITES= ${MASTER_SITE_SUNSITE}
-PATCH_SITE_SUBDIR= system/emulators
+PATCH_SITES= SUNSITE/system/emulators
PATCHFILES= cpm-0.2.1-glibc-rjm.patch.gz
PATCH_DIST_STRIP= -p1
diff --git a/emulators/cpmtools/Makefile b/emulators/cpmtools/Makefile
index 42e9cc769003..50e4c6abe39a 100644
--- a/emulators/cpmtools/Makefile
+++ b/emulators/cpmtools/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cpmtools
PORTVERSION= 1.1
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
DISTNAME= cpm-${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile
index 5b9f4b76a257..c26e3d24b7eb 100644
--- a/emulators/darcnes/Makefile
+++ b/emulators/darcnes/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 9b0401
PORTREVISION= 6
CATEGORIES= emulators
MASTER_SITES= http://www.dridus.com/~nyef/darcnes/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= grembo
+ LOCAL/grembo
DISTNAME= dn${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/dboxfe/Makefile b/emulators/dboxfe/Makefile
index 30b5c9c1957c..ed5a0a6ad96c 100644
--- a/emulators/dboxfe/Makefile
+++ b/emulators/dboxfe/Makefile
@@ -4,8 +4,7 @@ PORTNAME= dboxfe
PORTVERSION= 0.1.3
PORTREVISION= 6
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= makc@FreeBSD.org
COMMENT= Qt4 based configuration manager for DOSBox
diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile
index 1a5142553102..9b79dc6da783 100644
--- a/emulators/dtcyber/Makefile
+++ b/emulators/dtcyber/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.0b1
PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://members.iinet.net.au/~tom-hunter/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= trasz
+ LOCAL/trasz
DISTNAME= dtcyber20b1
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index be1f6ff8c03c..835859e117d7 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dynagen
PORTVERSION= 0.11.0
PORTREVISION= 3
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES= SF/dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION}
MAINTAINER= pavelivolkov@gmail.com
COMMENT= Text-based front end for Dynamips development version
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 421fb836f26a..bbeb64e06e31 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -5,8 +5,7 @@ PORTNAME= hatari
PORTVERSION= 1.8.0
PORTREVISION= 3
CATEGORIES= emulators
-MASTER_SITES= http://download.tuxfamily.org/hatari/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Atari ST emulator
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 8407d7057e64..1eb785da2977 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mtools
PORTVERSION= 4.0.10
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= mtools
+MASTER_SITES= GNU
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Collection of tools for manipulating MS-DOS files
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index ac7c18f8c051..7a3c3d6ee5f0 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -5,9 +5,9 @@ PORTNAME= mupen64plus
PORTVERSION?= 2.0
PORTREVISION?= 4
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
- ${MASTER_SITE_GOOGLE_CODE}:plugin \
+MASTER_SITES= GOOGLE_CODE \
+ LOCAL/acm/${PORTNAME} \
+ GOOGLE_CODE:plugin \
http://cdn.bitbucket.org/wahrhaft/${PORTNAME}${PKGNAMESUFFIX}/downloads/:plugin
PKGNAMESUFFIX?= -core
DIST_SUBDIR= ${PORTNAME}
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 5af4fd1de9db..a04a9b8b3a8f 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pcemu
PORTVERSION= 1.01b
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
DISTNAME= pcemu1.01alpha
MAINTAINER= joerg@FreeBSD.org
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index c2e96a2b865d..4d2856d43ec1 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -5,9 +5,8 @@ PORTNAME= qemu
PORTVERSION= 0.11.1
PORTREVISION= 18
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
+MASTER_SITES= SAVANNAH \
http://bellard.org/qemu/
-MASTER_SITE_SUBDIR= qemu
DIST_SUBDIR= qemu
MAINTAINER= nox@FreeBSD.org
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 3c9706c2eefb..dfde0be106e9 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -5,7 +5,7 @@ PORTNAME= raine
PORTVERSION= 0.51.9
PORTREVISION= 3
CATEGORIES= emulators games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
DISTNAME= ${PORTNAME}s-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index a6298d1e8b21..2b5a7c0d8c7b 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -5,8 +5,7 @@ PORTNAME= uae
PORTVERSION= 0.8.29
PORTREVISION= 2
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= grembo
+MASTER_SITES= LOCAL/grembo
MAINTAINER= simond@irrelevant.org
COMMENT= Commodore Amiga emulator
diff --git a/emulators/virtio-kmod/Makefile b/emulators/virtio-kmod/Makefile
index d4169864e4d7..15c235571f4f 100644
--- a/emulators/virtio-kmod/Makefile
+++ b/emulators/virtio-kmod/Makefile
@@ -3,8 +3,7 @@
PORTNAME= virtio
PORTVERSION= 0.${SVN_REV}
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
PKGNAMESUFFIX= -kmod-${OSBRANCH}
DISTFILES= ${FILE_8} ${FILE_9}
diff --git a/emulators/vmsbackup/Makefile b/emulators/vmsbackup/Makefile
index a625f1d887b8..8144332647fb 100644
--- a/emulators/vmsbackup/Makefile
+++ b/emulators/vmsbackup/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 4.1.1
CATEGORIES= emulators sysutils
MASTER_SITES= http://dl.droso.net/FreeBSD/distfiles/ \
http://freebsd.t-hosting.hu/vmsbackup/ \
- ${MASTER_SITE_LOCAL:S/$/erwin\//}
+ LOCAL/erwin
DISTNAME= VMSBACKUP4-1-1
EXTRACT_SUFX= .ZIP
diff --git a/emulators/wxmupen64plus/Makefile b/emulators/wxmupen64plus/Makefile
index 223b778afbea..d52b809f1622 100644
--- a/emulators/wxmupen64plus/Makefile
+++ b/emulators/wxmupen64plus/Makefile
@@ -5,8 +5,8 @@ PORTNAME= wxmupen64plus
PORTVERSION= 0.3
PORTREVISION= 3
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
+MASTER_SITES= GOOGLE_CODE \
+ LOCAL/acm/${PORTNAME} \
http://cdn.bitbucket.org/auria/wxmupen64plus/downloads/
DIST_SUBDIR= ${PORTNAME:S/wx//}
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index b22dc8c8e9be..04b96157bfde 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -3,8 +3,7 @@
PORTNAME= skrooge
PORTVERSION= 1.10.0
CATEGORIES= finance kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}
+MASTER_SITES= KDE/stable/${PORTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE4 personal finance manager
diff --git a/french/aster/bsd.aster.mk b/french/aster/bsd.aster.mk
index fbbde54ca3c8..0204b9c780a0 100644
--- a/french/aster/bsd.aster.mk
+++ b/french/aster/bsd.aster.mk
@@ -6,8 +6,7 @@
DISTVERSIONPREFIX= full-src-
DISTVERSIONSUFFIX= .noarch
MASTER_SITES= http://www.code-aster.org/FICHIERS/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= thierry
+ LOCAL/thierry
DISTNAME= aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
DISTINFO_FILE= ${.CURDIR}/../../french/aster/distinfo
diff --git a/french/tvdownloader/Makefile b/french/tvdownloader/Makefile
index 4c83ad9d6423..de1d023fbcf5 100644
--- a/french/tvdownloader/Makefile
+++ b/french/tvdownloader/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tvdownloader
PORTVERSION= 0.7.2
PORTREVISION= 5
CATEGORIES= french multimedia
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR=
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= thierry@FreeBSD.org
COMMENT= Download podcasts and videos from French websites
diff --git a/ftp/atftp/Makefile b/ftp/atftp/Makefile
index d2a058274d6c..541f16839961 100644
--- a/ftp/atftp/Makefile
+++ b/ftp/atftp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= atftp
PORTVERSION= 0.7
PORTREVISION= 3
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/a/${PORTNAME}
+MASTER_SITES= DEBIAN/pool/main/a/${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}.dfsg.orig
MAINTAINER= kevlo@FreeBSD.org
diff --git a/ftp/ftpsesame/Makefile b/ftp/ftpsesame/Makefile
index 3fec9a1a18c6..35543c651e2a 100644
--- a/ftp/ftpsesame/Makefile
+++ b/ftp/ftpsesame/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ftpsesame
PORTVERSION= 0.95
CATEGORIES= ftp
MASTER_SITES= http://www.sentia.org/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sem
+ LOCAL/sem
MAINTAINER= sem@FreeBSD.org
COMMENT= Helper for pf firewall to pass FTP protocol
diff --git a/ftp/gnustep-ftp/Makefile b/ftp/gnustep-ftp/Makefile
index 75481e1cf703..ca5241469bba 100644
--- a/ftp/gnustep-ftp/Makefile
+++ b/ftp/gnustep-ftp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ftp
PORTVERSION= 0.4
PORTREVISION= 2
CATEGORIES= ftp gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
PKGNAMEPREFIX= gnustep-
DISTNAME= FTP-${PORTVERSION}
diff --git a/ftp/mirror/Makefile b/ftp/mirror/Makefile
index 5a396577ee32..98efbee03459 100644
--- a/ftp/mirror/Makefile
+++ b/ftp/mirror/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 2
CATEGORIES= ftp
MASTER_SITES= ftp://sunsite.ualberta.ca/pub/Mirror/mirror/ \
http://komquats.com/distfiles/ \
- ${MASTER_SITE_LOCAL}/cy/
+ LOCAL/cy
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ftp.pl_wupatch
diff --git a/ftp/tftp-hpa/Makefile b/ftp/tftp-hpa/Makefile
index fd1d10f77c73..f97ab10f046f 100644
--- a/ftp/tftp-hpa/Makefile
+++ b/ftp/tftp-hpa/Makefile
@@ -3,8 +3,7 @@
PORTNAME= tftp-hpa
PORTVERSION= 5.2
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}
-MASTER_SITE_SUBDIR= software/network/tftp/tftp-hpa
+MASTER_SITES= KERNEL_ORG/software/network/tftp/tftp-hpa
MAINTAINER= brooks@FreeBSD.org
COMMENT= Advanced tftp server
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index bf7db04695d3..b0886d3c1e56 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= vsftpd
PORTVERSION= 3.0.2
CATEGORIES= ftp ipv6
MASTER_SITES= https://security.appspot.com/downloads/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index ec4f973340cc..7c124221071a 100644
--- a/games/abuse_sdl/Makefile
+++ b/games/abuse_sdl/Makefile
@@ -5,7 +5,7 @@ PORTNAME= abuse_sdl
PORTVERSION= 0.8
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://abuse.zoy.org/raw-attachment/wiki/download/
DISTNAME= abuse-${DISTVERSION}
diff --git a/games/an/Makefile b/games/an/Makefile
index f4ac104fcb90..06cb8fca8a7d 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -5,7 +5,7 @@ PORTNAME= an
PORTVERSION= 0.95
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index 0e0afc04dcfe..c92a2214a37c 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bugsx
PORTVERSION= 1.08
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= XCONTRIB/applications
DISTNAME= bugsx108
MAINTAINER= ports@FreeBSD.org
diff --git a/games/cardpics/Makefile b/games/cardpics/Makefile
index 8c8bb7507130..8fc6d1f4e1d1 100644
--- a/games/cardpics/Makefile
+++ b/games/cardpics/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cardpics
PORTVERSION= 0.4
CATEGORIES= games devel
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= thierry@FreeBSD.org
COMMENT= Free cards for your free card games!
diff --git a/games/crafty-open-enormous/Makefile b/games/crafty-open-enormous/Makefile
index 03bd914ce9de..4a9845f51542 100644
--- a/games/crafty-open-enormous/Makefile
+++ b/games/crafty-open-enormous/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crafty-open-enormous
PORTVERSION= 20070924
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= http://www.cis.uab.edu/hyatt/crafty/pgn/ \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://www.cis.uab.edu/hyatt/crafty/pgn/
DISTFILES= enormous.zip
EXTRACT_ONLY= ${DISTFILES}
diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile
index 63b708251077..cf661416b863 100644
--- a/games/crafty-open-large/Makefile
+++ b/games/crafty-open-large/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crafty-open-large
PORTVERSION= 20070909
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dd/crafty
+MASTER_SITES= LOCAL/dd/crafty
DISTFILES= large1.zip large2.zip large3.zip large4.zip
MAINTAINER= ports@FreeBSD.org
diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile
index c450acacdfe7..bc4b61a81253 100644
--- a/games/crafty-open-medium/Makefile
+++ b/games/crafty-open-medium/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crafty-open-medium
PORTVERSION= 20070909
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dd/crafty
+MASTER_SITES= LOCAL/dd/crafty
DISTNAME= medium
MAINTAINER= ports@FreeBSD.org
diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile
index 7f2ebd4566f2..3d39c1933580 100644
--- a/games/dmjava/Makefile
+++ b/games/dmjava/Makefile
@@ -5,9 +5,8 @@ PORTNAME= dmjava
PORTVERSION= 1.05
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/oliver \
http://chaos.zpc.cz/files/
-MASTER_SITE_SUBDIR= oliver
DISTNAME= dmj${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
diff --git a/games/doom-freedoom/Makefile b/games/doom-freedoom/Makefile
index e3eed18479f7..b2b205406587 100644
--- a/games/doom-freedoom/Makefile
+++ b/games/doom-freedoom/Makefile
@@ -4,8 +4,7 @@
PORTNAME= freedoom
PORTVERSION= 0.7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-iwad
+MASTER_SITES= SAVANNAH/${PORTNAME}/${PORTNAME}-iwad
PKGNAMEPREFIX= ${DMPKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-iwad-${PORTVERSION}
diff --git a/games/doom/Makefile b/games/doom/Makefile
index b6df2413fc97..6dccf7eec358 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -5,7 +5,7 @@ PORTNAME= doom
PORTVERSION= 1.10
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|source/|}
+MASTER_SITES= IDSOFTWARE/source
DISTNAME= doomsrc
MAINTAINER= ports@FreeBSD.org
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index d84b56ed9ba7..6b86d4f3a50b 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ensemblist
PORTVERSION= 040126
PORTREVISION= 10
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Assemble given shapes from primitives
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 58ed7c4c5dda..7e218d7c3e4f 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -5,7 +5,7 @@ PORTNAME= evq3
PORTVERSION= 1.3.20080810
PORTREVISION= 11
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|alepulver/|}
+MASTER_SITES= LOCAL/alepulver
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
pak-evq3.pk3 \
pak-5evq3.pk3
diff --git a/games/flying/Makefile b/games/flying/Makefile
index bd455b06f369..2a0d2dbd5e2c 100644
--- a/games/flying/Makefile
+++ b/games/flying/Makefile
@@ -5,8 +5,7 @@ PORTNAME= flying
PORTVERSION= 6.20
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= games/arcade
+MASTER_SITES= SUNSITE/games/arcade
MAINTAINER= ports@FreeBSD.org
COMMENT= Pool/snooker/billiards/carrom/etc game
diff --git a/games/fortunate/Makefile b/games/fortunate/Makefile
index 15162ea800f8..8de6344043a3 100644
--- a/games/fortunate/Makefile
+++ b/games/fortunate/Makefile
@@ -4,7 +4,7 @@ PORTNAME= fortunate
PORTVERSION= 3.1
PORTREVISION= 4
CATEGORIES= games gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH}
+MASTER_SITES= GNUSTEP_CH
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical front-end to the command-line BSD fortune
diff --git a/games/freeciv-sounds/Makefile b/games/freeciv-sounds/Makefile
index c2e399e4e43f..d94a8ec8956b 100644
--- a/games/freeciv-sounds/Makefile
+++ b/games/freeciv-sounds/Makefile
@@ -4,7 +4,7 @@
PORTNAME= freeciv
PORTVERSION= 3
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/
PKGNAMESUFFIX= -sounds
DISTNAME= stdsounds${DISTVERSION}
diff --git a/games/freedink-data/Makefile b/games/freedink-data/Makefile
index 71e21a452ef0..fb04355679d5 100644
--- a/games/freedink-data/Makefile
+++ b/games/freedink-data/Makefile
@@ -4,8 +4,7 @@
PORTNAME= freedink-data
PORTVERSION= 1.08.${PORTVER}
CATEGORIES= games
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= freedink
+MASTER_SITES= GNU/freedink
MAINTAINER= shurd@FreeBSD.org
COMMENT= Game data for games/freedink (Dink Smallwood)
diff --git a/games/freedink-dfarc/Makefile b/games/freedink-dfarc/Makefile
index dbae53253d4a..b06d1e96f5bb 100644
--- a/games/freedink-dfarc/Makefile
+++ b/games/freedink-dfarc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= freedink-dfarc
PORTVERSION= 3.12
CATEGORIES= games
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= freedink
+MASTER_SITES= GNU/freedink
DISTNAME= dfarc-${PORTVERSION}
MAINTAINER= shurd@FreeBSD.org
diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile
index 8fc242ed236e..53ab9b3523bf 100644
--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gnugo
PORTVERSION= 3.8
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= gnugo
+MASTER_SITES= GNU
MAINTAINER= spcoltri@omcl.org
COMMENT= The game of Go
diff --git a/games/gnushogi/Makefile.common b/games/gnushogi/Makefile.common
index 13278ffb7b90..c1cde15337f2 100644
--- a/games/gnushogi/Makefile.common
+++ b/games/gnushogi/Makefile.common
@@ -4,9 +4,8 @@
GNUSHOGI_PORTNAME= gnushogi
GNUSHOGI_PORTVERSION= 1.4.0
-GNUSHOGI_MASTER_SITES= ${MASTER_SITE_GNU}
+GNUSHOGI_MASTER_SITES= GNU/${GNUSHOGI_PORTNAME}
GNUSHOGI_DISTNAME= ${GNUSHOGI_PORTNAME}-${GNUSHOGI_PORTVERSION}
-GNUSHOGI_MASTER_SITE_SUBDIR= ${GNUSHOGI_PORTNAME}
USES= tar:bzip2
DISTINFO_FILE= ${.CURDIR}/../../games/gnushogi/distinfo
diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index 3261e2b57b84..248003dd38ca 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -3,8 +3,7 @@
PORTNAME= gtypist
PORTVERSION= 2.9.5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= naddy@FreeBSD.org
COMMENT= Interactive typing tutor
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 61450df6bc92..e54e53384f07 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ifm
PORTVERSION= 5.4
CATEGORIES= games tk
-MASTER_SITES= http://www.ifarchive.org/%SUBDIR%/
-MASTER_SITE_SUBDIR= if-archive/mapping-tools
+MASTER_SITES= http://www.ifarchive.org/if-archive/mapping-tools/
MAINTAINER= akosela@andykosela.com
COMMENT= Interactive Fiction mapper and walkthrough generator
diff --git a/games/ishido/Makefile b/games/ishido/Makefile
index ee446d26a99c..3094283c7350 100644
--- a/games/ishido/Makefile
+++ b/games/ishido/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ishido
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
MAINTAINER= ports@FreeBSD.org
COMMENT= Tile placement game
diff --git a/games/katawa-shoujo/Makefile b/games/katawa-shoujo/Makefile
index 4a267f136a60..acb89c3d15a6 100644
--- a/games/katawa-shoujo/Makefile
+++ b/games/katawa-shoujo/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 1.3
DISTVERSIONSUFFIX=-[linux-x86][FCF758CC]
CATEGORIES= games
MASTER_SITES= http://dl.katawa-shoujo.com/gold_${PORTVERSION}/:game \
- GENTOO/distfiles:icon
+ GENTOO:icon
DISTFILES= [4ls]_${PORTNAME:S|-|_|}_${PORTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}:game \
${PORTNAME}-48.png:icon \
${PORTNAME}-256.png:icon
diff --git a/games/libggz/bsd.ggz.mk b/games/libggz/bsd.ggz.mk
index d4d94d584480..3ef94ffc6cb0 100644
--- a/games/libggz/bsd.ggz.mk
+++ b/games/libggz/bsd.ggz.mk
@@ -5,9 +5,8 @@
GGZ_VERSION= 0.0.14.1
MASTER_SITES= \
- http://mirrors.dotsrc.org/ggzgamingzone/ggz/%SUBDIR%/ \
- http://ftp.ggzgamingzone.org/pub/ggz/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+ http://mirrors.dotsrc.org/ggzgamingzone/ggz/${PORTVERSION}/ \
+ http://ftp.ggzgamingzone.org/pub/ggz/${PORTVERSION}/
DIST_SUBDIR= ggz
# components section
diff --git a/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile
index 33fbe6d16fed..a9d7327e3761 100644
--- a/games/libmaitretarot/Makefile
+++ b/games/libmaitretarot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libmaitretarot
PORTVERSION= 0.1.98
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Core library of MaitreTarot, a Tarot card game
diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile
index 89b3d901fa9b..d945aa5c8090 100644
--- a/games/libmt_client/Makefile
+++ b/games/libmt_client/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libmt_client
PORTVERSION= 0.1.98
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Client-side library of MaitreTarot, a Tarot card game
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index 51de889a017a..4f538f87c4c2 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -5,8 +5,7 @@ PORTNAME= doom3
PORTVERSION= 1.3.1.1304
PORTEPOCH= 1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR= doom3/linux
+MASTER_SITES= IDSOFTWARE/doom3/linux
PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-linux-${PORTVERSION}.x86
EXTRACT_SUFX= .run
@@ -29,7 +28,7 @@ SUB_FILES= doom3 doom3-ded pkg-message pkg-deinstall
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNO_CDKEY}
-MASTER_SITE_SUBDIR= doom3/linux/old
+MASTER_SITES= IDSOFTWARE/doom3/linux/old
PORTVERSION= 1.1.1286
PORTEPOCH= 0
PLIST_SUB+= NEW="@comment "
diff --git a/games/linux-enemyterritory-shrub/Makefile b/games/linux-enemyterritory-shrub/Makefile
index 48e2231b3de6..8a4acb7ed8ce 100644
--- a/games/linux-enemyterritory-shrub/Makefile
+++ b/games/linux-enemyterritory-shrub/Makefile
@@ -5,8 +5,7 @@ PORTNAME= shrub
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
PKGNAMEPREFIX= linux-enemyterritory-
DISTNAME= 1.2-test13-l
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index a5a0f5c5835e..6425073ff0ef 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -5,8 +5,8 @@ PORTNAME= enemyterritory
PORTVERSION= 2.60b
PORTREVISION= 3
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|et/:patch|} \
- ${MASTER_SITE_IDSOFTWARE:S|$|et/linux/:full|}
+MASTER_SITES= IDSOFTWARE/et/:patch \
+ IDSOFTWARE/et/linux/:full
PKGNAMEPREFIX= linux-
DISTNAME= et-linux-2.60b.x86
DISTFILES= et-linux-2.60.x86.run:full ET-2.60b.zip:patch
diff --git a/games/linux-etqw-demo-server/Makefile b/games/linux-etqw-demo-server/Makefile
index 1f3d1c7e1ed9..b9c8da4893e1 100644
--- a/games/linux-etqw-demo-server/Makefile
+++ b/games/linux-etqw-demo-server/Makefile
@@ -4,7 +4,7 @@
PORTNAME= etqw
PORTVERSION= 2.0.r1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|etqw/|}
+MASTER_SITES= IDSOFTWARE/etqw
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -demo-server
DISTNAME= ETQW-demo2-server-full.r1.x86
diff --git a/games/linux-etqw-server/Makefile b/games/linux-etqw-server/Makefile
index fe8fe499bff6..ebd2eb7b6b50 100644
--- a/games/linux-etqw-server/Makefile
+++ b/games/linux-etqw-server/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= games linux
MASTER_SITES= http://ftp.4players.de/pub/hosted/wolfenstein/users/etqw/server/ \
ftp://ftp0.uk.multiplay.co.uk/pub/games/fps/enemyterritory_quakewars/server/linux/ \
ftp://ftp0.nl.multiplay.co.uk/pub/games/fps/enemyterritory_quakewars/server/linux/ \
- ${MASTER_SITE_IDSOFTWARE:S|$|etqw/|}
+ IDSOFTWARE/etqw
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -server
DISTNAME= ETQW${PKGNAMESUFFIX}-1.5-full.x86
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index ca75854b6cb2..64091054c5bc 100644
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -5,7 +5,7 @@ PORTNAME= quake3
DISTVERSION= 1.11-6
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -demo
DISTNAME= linuxq3ademo-${DISTVERSION}.x86
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index d5b2867b9b17..5563c6bdd9aa 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -4,8 +4,8 @@
PORTNAME= quake3
PORTVERSION= 1.32c
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|quake3/linux/:data|} \
- ${MASTER_SITE_IDSOFTWARE:S|$|quake3/:patch|}
+MASTER_SITES= IDSOFTWARE/quake3/linux/:data \
+ IDSOFTWARE/quake3/:patch
PKGNAMEPREFIX= linux-
DISTFILES= ${Q3DATAFILE}:data \
${Q3PATCHFILE}:patch
diff --git a/games/linux-quake4-demo/Makefile b/games/linux-quake4-demo/Makefile
index c32c76bda4d3..78185c8b537a 100644
--- a/games/linux-quake4-demo/Makefile
+++ b/games/linux-quake4-demo/Makefile
@@ -5,7 +5,7 @@ PORTNAME= quake4
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= games linux
-MASTER_SITES= IDSOFTWARE/${PORTNAME}/demo GENTOO/distfiles
+MASTER_SITES= IDSOFTWARE/${PORTNAME}/demo GENTOO
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -demo
DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}${PKGNAMESUFFIX}.x86
diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index 8229e700d1c4..c9fd30632e08 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -6,8 +6,8 @@ PORTVERSION= 1.4.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|quake4/linux/|} \
- ${MASTER_SITE_GENTOO:S|$|distfiles/|}
+MASTER_SITES= IDSOFTWARE/quake4/linux/ \
+ GENTOO
PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}.x86
EXTRACT_SUFX= .run
diff --git a/games/linux-rtcw/Makefile b/games/linux-rtcw/Makefile
index 55fe0a05fc4b..ffcfd24e36fb 100644
--- a/games/linux-rtcw/Makefile
+++ b/games/linux-rtcw/Makefile
@@ -5,8 +5,7 @@ PORTNAME= rtcw
DISTVERSION= 1.41b
PORTREVISION= 2
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR= wolf/linux
+MASTER_SITES= IDSOFTWARE/wolf/linux
PKGNAMEPREFIX= linux-
DISTNAME= wolf-linux-${DISTVERSION}.x86
EXTRACT_SUFX= .run
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index 6b15126b0207..a0ef2d21a5ad 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= ut2003-demo
PORTVERSION= 2206
CATEGORIES= games linux
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
PKGNAMEPREFIX= linux-
DISTNAME= ut2003demo-lnx-${PORTVERSION}
EXTRACT_SUFX= .sh.bin
diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index ae2387660389..5b7830373d53 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 5.6.4
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://liquidwar.sunsite.dk/archive/ \
- ${MASTER_SITE_SAVANNAH} \
+ SAVANNAH \
http://ufoot.hd.free.fr/pub/archive/
-MASTER_SITE_SUBDIR= liquidwar
MAINTAINER= edwin@mavetju.org
COMMENT= You control an army of liquid and have to try and eat your opponents
diff --git a/games/maitretarot/Makefile b/games/maitretarot/Makefile
index 00258e6420d3..acefe998fdd9 100644
--- a/games/maitretarot/Makefile
+++ b/games/maitretarot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= maitretarot
PORTVERSION= 0.1.98
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= thierry@FreeBSD.org
COMMENT= Server side of MaitreTarot, a Tarot card game
diff --git a/games/mt_dolphin_ia/Makefile b/games/mt_dolphin_ia/Makefile
index a7f2784543fe..b91c192640ea 100644
--- a/games/mt_dolphin_ia/Makefile
+++ b/games/mt_dolphin_ia/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mt_dolphin_ia
PORTVERSION= 0.1.98
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Basic AI for MaitreTarot, a Tarot card game
diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile
index dbed834954d8..50df3fc4b9f4 100644
--- a/games/mt_gtk_client/Makefile
+++ b/games/mt_gtk_client/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mt_gtk_client
PORTVERSION= 0.1.98
PORTREVISION= 11
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= GTK+ client for MaitreTarot, a Tarot card game
diff --git a/games/nehquake/Makefile b/games/nehquake/Makefile
index 79e1e32e94b8..fc7829888ffc 100644
--- a/games/nehquake/Makefile
+++ b/games/nehquake/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nehquake
PORTVERSION= 1.0
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
DISTNAME= NehQuake-bjp-bin-src.linux
MAINTAINER= ports@FreeBSD.org
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index eb69d33ac504..3c817b29e8f9 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= games
MASTER_SITES= SF/${TRUEPORTNAME}/${TRUEPORTNAME}/3.2.2
DISTNAME= nethack-322
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:C/%SUBDIR%/${TRUEPORTNAME}\/${TRUEPORTNAME}\/${PORTVERSION}/}
+PATCH_SITES= SOURCEFORGE/${TRUEPORTNAME}/${TRUEPORTNAME}/${PORTVERSION}
PATCHFILES= nh-3.2.2-3.2.3.diff
MAINTAINER= glewis@FreeBSD.org
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 4b8121fe5a98..e5f25f2901b8 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -53,13 +53,13 @@ CFLAGS+= -DMENU_COLOR_REGEX_POSIX
.if defined(WITH_STATUSCOLORS)
PATCHFILES+= nh343-statuscolors.fixed.patch
PATCH_SITES+= http://jdc.koitsu.org/nethack/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|wxs|}
+ LOCAL/wxs
PATCH_DIST_STRIP= -p1
.endif
.if defined(WITH_HPMON)
PATCHFILES+= hpmon.diff
PATCH_SITES+= http://www.netsonic.fi/~walker/nh/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|wxs|}
+ LOCAL/wxs
PATCH_DIST_STRIP= -p1
CFLAGS+= -DHPMON
.endif
diff --git a/games/oldrunner/Makefile b/games/oldrunner/Makefile
index 897294c153a5..9849dc1565c4 100644
--- a/games/oldrunner/Makefile
+++ b/games/oldrunner/Makefile
@@ -4,8 +4,7 @@
PORTNAME= oldrunner
PORTVERSION= 20120131
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= culot
+MASTER_SITES= LOCAL/culot
MAINTAINER= culot@FreeBSD.org
COMMENT= Textmode remake of Broderbund's LodeRunner
diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile
index 662a5224b12a..6811c1a71819 100644
--- a/games/oonsoo/Makefile
+++ b/games/oonsoo/Makefile
@@ -5,9 +5,8 @@ PORTNAME= oonsoo
PORTVERSION= 1.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/games/solitaires \
http://www4.ncsu.edu/~bwmott/www/oonsoo/distributions/
-MASTER_SITE_SUBDIR= games/solitaires
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/games/p5-Acme-GuessNumber/Makefile b/games/p5-Acme-GuessNumber/Makefile
index f34ab8016302..0e6539843b87 100644
--- a/games/p5-Acme-GuessNumber/Makefile
+++ b/games/p5-Acme-GuessNumber/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Acme-GuessNumber
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= games perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/IMACAT
+MASTER_SITES= CPAN/Locale/IMACAT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/games/pycadia/Makefile b/games/pycadia/Makefile
index ca247f966dc4..d006c3c939f2 100644
--- a/games/pycadia/Makefile
+++ b/games/pycadia/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pycadia
PORTVERSION= 0.5.1
PORTREVISION= 6
CATEGORIES= games python
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
SF/nemysisfreebsdp/games/
DIST_SUBDIR= python
diff --git a/games/quake-data/Makefile b/games/quake-data/Makefile
index 31f1c08083b8..7867d8f93190 100644
--- a/games/quake-data/Makefile
+++ b/games/quake-data/Makefile
@@ -38,7 +38,7 @@ PLIST_FILES+= %%DATADIR%%/id1/pak1.pak
.endif
.if ${PORT_OPTIONS:MQW_DATA} || ${PORT_OPTIONS:MQW_SKINS}
-MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|}
+MASTER_SITES+= IDSOFTWARE/quakeworld/unix/:qw
DISTFILES+= ${PROGFILE}:qw
EXTRACT_ONLY+= ${PROGFILE}
COMMENT:= ${COMMENT:S,Quake,& and &World,}
@@ -48,7 +48,7 @@ PLIST_SUB+= QUAKEWORLD="@comment "
.endif
.if ${PORT_OPTIONS:MQW_SKINS}
-MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/skins/:skins|}
+MASTER_SITES+= IDSOFTWARE/quakeworld/skins/:skins
DISTFILES+= ${SKINFILES:S/$/:skins/}
PLIST_SUB+= QUAKEWORLD_SKINS=""
COMMENT+= and skins
diff --git a/games/quake-source/Makefile b/games/quake-source/Makefile
index ce553a881142..fa5c9d98ace6 100644
--- a/games/quake-source/Makefile
+++ b/games/quake-source/Makefile
@@ -26,7 +26,7 @@ QUAKEWORLD_DESC= Install QuakeWorld game source
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQUAKEWORLD}
-MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|}
+MASTER_SITES+= IDSOFTWARE/quakeworld/unix/:qw
DISTFILES+= qwsv-2.30-glibc-i386-unknown-linux2.0${EXTRACT_SUFX}:qw
COMMENT:= ${COMMENT:S/Quake/& and QuakeWorld/}
PLIST_SUB+= QUAKEWORLD=""
diff --git a/games/quake2-source/Makefile b/games/quake2-source/Makefile
index ec91bc9fc443..037fb918de68 100644
--- a/games/quake2-source/Makefile
+++ b/games/quake2-source/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 3.21
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://offload1.icculus.org/quake2/files/:icc \
- ${MASTER_SITE_IDSOFTWARE:S|$|quake2/source/:id|}
+ IDSOFTWARE/quake2/source/:id
PKGNAMEPREFIX= quake2-
DISTNAME= quake2-r0.16.2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:icc
diff --git a/games/quake3/Makefile b/games/quake3/Makefile
index c2169387c04f..cc95ade64234 100644
--- a/games/quake3/Makefile
+++ b/games/quake3/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= games
MASTER_SITES= ftp://mancubus.net/pub/idgames/idstuff/source/ \
http://ftp.mancubus.net/pub/idgames/idstuff/source/ \
http://www.gamers.org/pub/idgames/idstuff/source/ \
- ${MASTER_SITE_IDSOFTWARE:S|$|source/|}
+ IDSOFTWARE/source/
DISTNAME= ${PORTNAME}-${REALVERSION}-source
MAINTAINER= shirshegsm@gmail.com
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 2eb63bf7af2b..1cf8464b85fa 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -6,7 +6,6 @@ DISTVERSION= 1.7.0
PORTREVISION= 3
CATEGORIES= games emulators
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${DISTVERSION}
MAINTAINER= lme@FreeBSD.org
COMMENT= Interpreter for several adventure games
diff --git a/games/senken/Makefile b/games/senken/Makefile
index ccaf3f6133e3..8f18cc0b2347 100644
--- a/games/senken/Makefile
+++ b/games/senken/Makefile
@@ -5,7 +5,7 @@ PORTNAME= senken
PORTVERSION= 0.3.0
PORTREVISION= 15
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= City simulation game
diff --git a/games/sokoban/Makefile b/games/sokoban/Makefile
index 7df317bac0bd..d6974081aa50 100644
--- a/games/sokoban/Makefile
+++ b/games/sokoban/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sokoban
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
DISTNAME= ${PORTNAME}-src
MAINTAINER= lifanov@mail.lifanov.com
diff --git a/games/supertux-devel/Makefile b/games/supertux-devel/Makefile
index 4f2ffda505e7..f912f366504d 100644
--- a/games/supertux-devel/Makefile
+++ b/games/supertux-devel/Makefile
@@ -4,7 +4,7 @@ PORTNAME= supertux
PORTVERSION= 0.3.4
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -devel
MAINTAINER= makc@FreeBSD.org
diff --git a/games/supertux/Makefile b/games/supertux/Makefile
index 06f023331ade..84d04cbaf8d7 100644
--- a/games/supertux/Makefile
+++ b/games/supertux/Makefile
@@ -5,7 +5,7 @@ PORTNAME= supertux
PORTVERSION= 0.1.3
PORTREVISION= 12
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= makc@FreeBSD.org
COMMENT= Side-scroller game similar to Super Mario Brothers
diff --git a/games/timeseal/Makefile b/games/timeseal/Makefile
index 441b9247f4d6..02509db6bf78 100644
--- a/games/timeseal/Makefile
+++ b/games/timeseal/Makefile
@@ -4,8 +4,7 @@
PORTNAME= timeseal
PORTVERSION= 1.0
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jylefort
+MASTER_SITES= LOCAL/jylefort
DISTFILES= timeseal.BSD386-1.0-i386
EXTRACT_ONLY=
diff --git a/games/tractorgen/Makefile b/games/tractorgen/Makefile
index 2750b06db145..8e76501d38d2 100644
--- a/games/tractorgen/Makefile
+++ b/games/tractorgen/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.31.7
PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.vergenet.net/~conrad/software/tractorgen/dl/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= robin@15augustus.nl
COMMENT= Generates ASCII tractors
diff --git a/games/tycho/Makefile b/games/tycho/Makefile
index 7b41357ec687..fe2ea4a5799a 100644
--- a/games/tycho/Makefile
+++ b/games/tycho/Makefile
@@ -4,8 +4,7 @@
PORTNAME= tycho
PORTVERSION= 0.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
DISTNAME= redcoder
MAINTAINER= ports@FreeBSD.org
diff --git a/games/wmquake/Makefile b/games/wmquake/Makefile
index da44fd88b8c2..ba304ca7f62c 100644
--- a/games/wmquake/Makefile
+++ b/games/wmquake/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= ports@FreeBSD.org
COMMENT= Id Software's Quake I in a 64x64 WM dockapp window
diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile
index 002b7fa13a49..a6d7ec5e5f07 100644
--- a/games/wolfpack/Makefile
+++ b/games/wolfpack/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wolfpack
PORTVERSION= 4.3.32
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= empserver/${DISTNAME}
+MASTER_SITES= SF/empserver/${DISTNAME}
DISTNAME= empire-${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile
index 3c108f852f7e..89b954a1d941 100644
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.2.20080621
PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/:full,update \
- ${MASTER_SITE_LOCAL:S|$|alepulver/:source|}
+ LOCAL/alepulver/:source
DISTFILES= worldofpadman.run:full \
wop_patch_1_2.run:update \
${SRC_FILE}.tar.bz2:source
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index a43e0da5639e..f26ce82ded4a 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xbat
PORTVERSION= 1.11
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
DISTNAME= xev111
MAINTAINER= turutani@scphys.kyoto-u.ac.jp
diff --git a/games/xbattle/Makefile b/games/xbattle/Makefile
index ce7df87cf5c4..591982d98ef7 100644
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xbattle
PORTVERSION= 5.4.1
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
${PORTNAME}_icons${EXTRACT_SUFX}:icons
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index 3339d921168e..e9ef53ff0253 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xblackjack
PORTVERSION= 2.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= X11/Motif blackjack game
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index cbdb4ebe98b0..9b32ff53af81 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xboing
PORTVERSION= 2.4
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 8f9bdeb2c11a..ae79f2b5ba7e 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xbubble
PORTVERSION= 0.5.8
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Puzzle Bobble clone for Unix/X11 platforms
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
index e4678a28f3ae..e6ac777bb6d5 100644
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xcubes
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Cube puzzle for X11
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index adb7339f0f72..23ab69964003 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -5,9 +5,8 @@ PORTNAME= xdemineur
PORTVERSION= 2.1.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
+MASTER_SITES= XCONTRIB/games \
http://www.babafou.eu.org/xdemineur/
-MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
COMMENT= Another minesweeper game for the X Window System
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
index 64c313b0c954..3ff551ed9856 100644
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xdino
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Dino puzzle game for X11
diff --git a/games/xhexagons/Makefile b/games/xhexagons/Makefile
index 7fbe7c56e116..ec5b88706b71 100644
--- a/games/xhexagons/Makefile
+++ b/games/xhexagons/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xhexagons
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Hexagons puzzle (similar to Fifteen Puzzle) for X Window System
diff --git a/games/xisola/Makefile b/games/xisola/Makefile
index c6285cf85396..d159ecc97edb 100644
--- a/games/xisola/Makefile
+++ b/games/xisola/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xisola
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple board game for X Window System
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index 739f8f853cd8..dac0ec69ad63 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xjig
PORTVERSION= 2.4
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= Jigsaw puzzle game for X11
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index b0dca2dba32e..d37b41f5dc34 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xjump
PORTVERSION= 2.7.5
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile
index 34ec6ee4e1c5..8877079d680c 100644
--- a/games/xkoules/Makefile
+++ b/games/xkoules/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.4
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.ucw.cz/~hubicka/koules/packages/ \
- GENTOO/distfiles \
+ GENTOO \
SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons
DISTFILES= ${PORTNAME:S/x//}${PORTVERSION}-src${EXTRACT_SUFX} \
${PORTNAME:S/x//}.png:icons
diff --git a/games/xlaby/Makefile b/games/xlaby/Makefile
index 3ede391545c3..343b2ca844e7 100644
--- a/games/xlaby/Makefile
+++ b/games/xlaby/Makefile
@@ -5,9 +5,8 @@ PORTNAME= xlaby
PORTVERSION= 2.0.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/games/strategy \
ftp://quatramaran.ens.fr/pub/madore/xlaby/
-MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= ports@FreeBSD.org
COMMENT= Daemonic X Labyrinth played directly with the mouse pointer
diff --git a/games/xmball/Makefile b/games/xmball/Makefile
index 39ff0c57c17d..4093c4ab5a51 100644
--- a/games/xmball/Makefile
+++ b/games/xmball/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmball
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Masterball puzzle for X Window System
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 4cff8ab4d026..2e59e05d728c 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmille
PORTVERSION= 2.0
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xmines/Makefile b/games/xmines/Makefile
index 0b1bcf10df75..471794d6fcbb 100644
--- a/games/xmines/Makefile
+++ b/games/xmines/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmines
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xmlink/Makefile b/games/xmlink/Makefile
index 696ec9a88c44..4131d63435fb 100644
--- a/games/xmlink/Makefile
+++ b/games/xmlink/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmlink
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Missing Link puzzle for X Window System
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index ed3f8877f6db..04832c9d18b6 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xoct/Makefile b/games/xoct/Makefile
index aa4e4c5c1842..4383136bb0a7 100644
--- a/games/xoct/Makefile
+++ b/games/xoct/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xoct
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Oct puzzle for X Window System
diff --git a/games/xoids/Makefile b/games/xoids/Makefile
index 2c8e1dc5b66d..8fd94af7e34e 100644
--- a/games/xoids/Makefile
+++ b/games/xoids/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xoids
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= X Window Asteroids style game with full color pixmaps
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index c07502283c3c..1f466f81130a 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xoj
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/demos
+MASTER_SITES= SUNSITE/X11/demos
MAINTAINER= ports@FreeBSD.org
COMMENT= O. J. Simpson Simulator root window demo
diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile
index 428edd55685b..1edb3866e3c9 100644
--- a/games/xosmulti/Makefile
+++ b/games/xosmulti/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xosmulti
PORTVERSION= 1.00
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= flathill
+MASTER_SITES= LOCAL/flathill
DISTNAME= ${PORTNAME}_${PORTVERSION}_tar
EXTRACT_SUFX= .gz
diff --git a/games/xpanex/Makefile b/games/xpanex/Makefile
index c553c8f55cdf..da8d5d8a0783 100644
--- a/games/xpanex/Makefile
+++ b/games/xpanex/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpanex
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Panex puzzle for X Window System
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index a1062c97e43f..b9e6cb0e18ec 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpipeman
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xpyraminx/Makefile b/games/xpyraminx/Makefile
index 7f8a3da4ca89..e41d11ed5dab 100644
--- a/games/xpyraminx/Makefile
+++ b/games/xpyraminx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpyraminx
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Pyraminx puzzle for X Window System
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
index d6da8b88e483..3bb5fa51ca65 100644
--- a/games/xrubik/Makefile
+++ b/games/xrubik/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xrubik
PORTVERSION= 5.5.2
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= X-based rubik's cube(tm)
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index d0b605321fc1..ca8aefaa2a00 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xshisen
PORTVERSION= 1.51
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
MAINTAINER= turutani@scphys.kyoto-u.ac.jp
COMMENT= Shisen-sho puzzle game for X11
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index c680a97ddc93..aa1a1d4ff7a5 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xshogi
PORTVERSION= 1.4.2
CATEGORIES= games
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= gnushogi
+MASTER_SITES= GNU/gnushogi
MAINTAINER= johans@FreeBSD.org
COMMENT= Japanese chess-like game for X Window System
diff --git a/games/xskewb/Makefile b/games/xskewb/Makefile
index 32c2a505c5a7..700fb7441403 100644
--- a/games/xskewb/Makefile
+++ b/games/xskewb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xskewb
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Skewb puzzle (similar to Rubik's Cube) for X Window
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index e9cb756a4dfa..33101d6e8e66 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtic
PORTVERSION= 1.12
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xtriangles/Makefile b/games/xtriangles/Makefile
index db0ba2bbc6dc..3bd32cb6ad12 100644
--- a/games/xtriangles/Makefile
+++ b/games/xtriangles/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtriangles
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Triangles puzzle
diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index aaca49e2b0ea..ce19ba4825bb 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtruco
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/german/alt-aspell/Makefile b/german/alt-aspell/Makefile
index 26ca70482e58..bf1b01e34350 100644
--- a/german/alt-aspell/Makefile
+++ b/german/alt-aspell/Makefile
@@ -6,8 +6,7 @@ DISTVERSION= 6-de-alt-2.1-1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= german textproc
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= aspell/dict/de-alt
+MASTER_SITES= GNU/aspell/dict/de-alt
MAINTAINER= office@FreeBSD.org
COMMENT= Aspell German Old Spelling (Deutsch - alte Rechtschreibung) dictionary
diff --git a/german/bugzilla44/Makefile b/german/bugzilla44/Makefile
index d81edf33af46..9d95b94704ef 100644
--- a/german/bugzilla44/Makefile
+++ b/german/bugzilla44/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bugzilla
PORTVERSION= 4.4.6
PORTREVISION= 2
CATEGORIES= german
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
+MASTER_SITES= SF/bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
DISTNAME= germzilla-${PORTVERSION}-1.utf-8
MAINTAINER= bz-ports@FreeBSD.org
diff --git a/graphics/4va/Makefile b/graphics/4va/Makefile
index bb6e9e5fe8e6..53a5608ad704 100644
--- a/graphics/4va/Makefile
+++ b/graphics/4va/Makefile
@@ -5,14 +5,13 @@ PORTNAME= 4va
PORTVERSION= 1.21
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/X
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SUNSITE/apps/graphics/hacks/X
MAINTAINER= ports@FreeBSD.org
COMMENT= Four-Dimensional graphics tumbler for X11
USE_XORG= x11
+USES= tar:tgz
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CLIBS="-lm -lX11 -L${LOCALBASE}/lib"
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index f02434f29192..ccea1e3c8089 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -8,7 +8,6 @@ PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast image processing tools based on ImageMagick
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index 2cd24bd640d2..490ade65554d 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.3.3
PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.su.se/pub/lunar/source-archive/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast pixel formats conversion library
diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index aa3769232df5..4c1f6fd49b53 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= SciPlot
PORTVERSION= 1.36
PORTREVISION= 4
CATEGORIES= graphics math
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= widgets
+MASTER_SITES= XCONTRIB/widgets
MAINTAINER= thierry@FreeBSD.org
COMMENT= Full-featured Xt widget to display 2D data in a graph
diff --git a/graphics/acidwarp/Makefile b/graphics/acidwarp/Makefile
index 26a3085835c7..0c8dec9b2faf 100644
--- a/graphics/acidwarp/Makefile
+++ b/graphics/acidwarp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= acidwarp
PORTVERSION= 1.0
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/svgalib
+MASTER_SITES= SUNSITE/apps/graphics/hacks/svgalib
MAINTAINER= swills@FreeBSD.org
COMMENT= SVGAlib demo which displays trippy mathematical images in cycling colors
diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index e0d58486e407..a1f86cd604a6 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -4,8 +4,7 @@
PORTNAME= barcode
PORTVERSION= 0.98
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= barcode
+MASTER_SITES= GNU
MAINTAINER= jev@ecad.org
COMMENT= A barcode generation library along with a command line frontend
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 4439b13eebb9..e5829ebcc76f 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cal3d
PORTVERSION= 20060720
PORTREVISION= 4
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= acm/${PORTNAME}
+MASTER_SITES= LOCAL/acm/${PORTNAME}
PKGNAMESUFFIX= -devel
DIST_SUBDIR= ${PORTNAME}
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index e20713f14ef6..6b14e5849f85 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cegui
PORTVERSION= 0.8.4
CATEGORIES= graphics devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= crayzedsgui/CEGUI%20Mk-2/0.8
+MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.8
MAINTAINER= oliver@FreeBSD.org
COMMENT= Library providing windowing and widgets for graphics APIs
diff --git a/graphics/dc20pack/Makefile b/graphics/dc20pack/Makefile
index fe04ea9b8740..018f0d4fc624 100644
--- a/graphics/dc20pack/Makefile
+++ b/graphics/dc20pack/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dc20pack
PORTVERSION= 1.0
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/capture
+MASTER_SITES= SUNSITE/apps/graphics/capture
MAINTAINER= maurice@castro.aus.net
COMMENT= Digital camera control and download tool for Kodak DC20/25 camera
diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile
index 9f32d0f5df0f..d4b2b922bc46 100644
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dmtx-utils
PORTVERSION= 0.7.4
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=libdmtx/libdmtx/${PORTVERSION}
+MASTER_SITES= SF/libdmtx/libdmtx/${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
COMMENT= Software for reading and writing Data Matrix barcodes
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index d1ec3dcef057..537aac1d3363 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= driconf
PORTVERSION= 0.9.1
PORTREVISION= 10
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/d/${PORTNAME}
+MASTER_SITES= DEBIAN
DISTFILES= ${PORTNAME}_${PORTVERSION}.orig.tar.gz
MAINTAINER= lichray@gmail.com
diff --git a/graphics/flasm/Makefile b/graphics/flasm/Makefile
index 9f98c85a601b..de3299d1256f 100644
--- a/graphics/flasm/Makefile
+++ b/graphics/flasm/Makefile
@@ -3,9 +3,8 @@
PORTNAME= flasm
PORTVERSION= 1.62
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/kuriyama \
http://www.nowrap.de/download/
-MASTER_SITE_SUBDIR= kuriyama
DISTNAME= flasm16src
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index de9e7bcb1b0f..9c2e30b1e635 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -5,8 +5,7 @@ PORTNAME= g2
PORTVERSION= 0.40
PORTREVISION= 9
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/graphics
+MASTER_SITES= SUNSITE/libs/graphics
MAINTAINER= ports@FreeBSD.org
COMMENT= Easy to use, portable, and powerful 2D graphics library
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 4a538f0b09cd..5cbb27286042 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -6,7 +6,7 @@ PORTNAME= gdk-pixbuf
PORTVERSION= 0.22.0
PORTREVISION= 17
CATEGORIES= graphics
-MASTER_SITES= GNOME/sources/gdk-pixbuf/0.22
+MASTER_SITES= GNOME
DISTNAME= gdk-pixbuf-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index d7ab985eb8df..f3c98d2f3870 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.8.14
PORTREVISION?= 2
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
-MASTER_SITES= GIMP
-MASTER_SITE_SUBDIR= gimp/v${PORTVERSION:R}
+MASTER_SITES= GIMP/gimp/v${PORTVERSION:R}
DISTNAME= gimp-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 795603589490..17ea6ae68ccc 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.3.3
DISTVERSIONPREFIX= 2-
PORTREVISION= 5
CATEGORIES= graphics gnome
-MASTER_SITES= ${MASTER_SITE_GNU_ALPHA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU_ALPHA
MAINTAINER= ports@FreeBSD.org
COMMENT= Small-scale painting program for GNOME
diff --git a/graphics/graphos/Makefile b/graphics/graphos/Makefile
index be41bc0c3eba..a7b305f903fc 100644
--- a/graphics/graphos/Makefile
+++ b/graphics/graphos/Makefile
@@ -4,8 +4,7 @@ PORTNAME= graphos
PORTVERSION= 0.5
PORTREVISION= 2
CATEGORIES= graphics gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= Graphos-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index eaaa5dd0c28e..298735731d8f 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gtk-update-icon-cache
PORTVERSION= 2.24.27
CATEGORIES= graphics
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 53415040d0b2..d20ba1c6b00b 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.4.6
PORTREVISION= 6
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
+MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT= The next generation graphics library for Enlightenment
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index f997af077e84..8ba327f10f31 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.4.6
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
+MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT= Extra image loader plugins for Imlib 2
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 8a783c8d8483..d49b586415c5 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.900.1
PORTREVISION= 14
CATEGORIES= graphics
MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \
- ${MASTER_SITE_IMAGEMAGICK}
-MASTER_SITE_SUBDIR= ImageMagick/delegates
+ ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Implementation of the codec specified in the JPEG-2000 standard
@@ -23,9 +22,6 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-shared --enable-static
USE_LDCONFIG= yes
-MASTER_SITE_IMAGEMAGICK= \
- ftp://ftp.imagemagick.org/pub/%SUBDIR%/
-
OPTIONS_DEFINE= OPENGL UUID DOCS
UUID_DESC= UUID support (required by GDAL)
diff --git a/graphics/jpgtn/Makefile b/graphics/jpgtn/Makefile
index 491f640a3414..c6af00e63482 100644
--- a/graphics/jpgtn/Makefile
+++ b/graphics/jpgtn/Makefile
@@ -5,8 +5,7 @@ PORTNAME= jpgtn
PORTVERSION= 2.06
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/misc
+MASTER_SITES= SUNSITE/apps/graphics/misc
MAINTAINER= ports@FreeBSD.org
COMMENT= Creates thumbnails of JPEG images
diff --git a/graphics/liblug/Makefile b/graphics/liblug/Makefile
index 99285acb1f76..3378cf2ba601 100644
--- a/graphics/liblug/Makefile
+++ b/graphics/liblug/Makefile
@@ -5,8 +5,7 @@ PORTNAME= liblug
PORTVERSION= 1.0.6
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/graphics
+MASTER_SITES= SUNSITE/libs/graphics
MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-format graphics manipulation library
diff --git a/graphics/linplasma/Makefile b/graphics/linplasma/Makefile
index cd0766023c83..eb87ea3b3d42 100644
--- a/graphics/linplasma/Makefile
+++ b/graphics/linplasma/Makefile
@@ -5,8 +5,7 @@ PORTNAME= linplasma
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/svgalib
+MASTER_SITES= SUNSITE/apps/graphics/hacks/svgalib
MAINTAINER= ports@FreeBSD.org
COMMENT= Sinus plasma, an SVGAlib demo
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 4572d7a1e119..4f2d3d1413c6 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 10.35.94
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION} \
- ${MASTER_SITE_LOCAL:S/$/:man/}
-MASTER_SITE_SUBDIR= dinoex/:man
+ LOCAL/dinoex/:man
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Toolkit for conversion of images between different formats
diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index c7d0c4354bc0..29af8ff47602 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -5,7 +5,6 @@ PORTNAME= ocrad
PORTVERSION= 0.22
CATEGORIES= graphics
MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tar.lz
MAINTAINER= lippe@FreeBSD.org
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index 5726eb75d070..e51e4c99d177 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ocropus
PORTVERSION= 0.4
PORTREVISION= 14
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= hiroto.kagotani@gmail.com
COMMENT= The OCRopus(tm) open source document analysis and OCR system
diff --git a/graphics/opengl-man/Makefile b/graphics/opengl-man/Makefile
index 5193fa4e1c7d..99b21c8f3196 100644
--- a/graphics/opengl-man/Makefile
+++ b/graphics/opengl-man/Makefile
@@ -5,8 +5,7 @@ PORTNAME= opengl-man
PORTVERSION= 657.2
CATEGORIES= graphics
MASTER_SITES= http://www2.cons.org/freebsd-distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cracauer
+ LOCAL/cracauer
DISTNAME= opengl-man-657-plusmissing
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile
index 98865526a026..c43d2828c424 100644
--- a/graphics/opennurbs/Makefile
+++ b/graphics/opennurbs/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 20121024
PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://files.na.mcneel.com/opennurbs/5.0/2012-10-24/
-MASTER_SITE_SUBDIR= ${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= fernando.apesteguia@gmail.com
diff --git a/graphics/p5-Color-Calc/Makefile b/graphics/p5-Color-Calc/Makefile
index 929cb5083ef7..f1fa2668aa32 100644
--- a/graphics/p5-Color-Calc/Makefile
+++ b/graphics/p5-Color-Calc/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.074
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Color
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
diff --git a/graphics/p5-Color-Palette/Makefile b/graphics/p5-Color-Palette/Makefile
index 8c7c2b99066f..c66b348c9fed 100644
--- a/graphics/p5-Color-Palette/Makefile
+++ b/graphics/p5-Color-Palette/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.100002
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Color
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/p5-Color-Scheme/Makefile b/graphics/p5-Color-Scheme/Makefile
index 23ee20ab091c..5419205b4555 100644
--- a/graphics/p5-Color-Scheme/Makefile
+++ b/graphics/p5-Color-Scheme/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 1.05
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Color
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/p5-Image-PBMlib/Makefile b/graphics/p5-Image-PBMlib/Makefile
index 874482d1ecef..cbaf46843f77 100644
--- a/graphics/p5-Image-PBMlib/Makefile
+++ b/graphics/p5-Image-PBMlib/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.00
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Image
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile
index 8dbbf0c0086e..b0acb87cd9c7 100644
--- a/graphics/p5-SpringGraph/Makefile
+++ b/graphics/p5-SpringGraph/Makefile
@@ -5,8 +5,7 @@ PORTNAME= SpringGraph
PORTVERSION= 0.05
PORTREVISION= 8
CATEGORIES= graphics perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= GraphViz/TEEJAY
+MASTER_SITES= CPAN/GraphViz/TEEJAY
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/graphics/p5-URI-GoogleChart/Makefile b/graphics/p5-URI-GoogleChart/Makefile
index 8f0024ee297c..63a20fef409b 100644
--- a/graphics/p5-URI-GoogleChart/Makefile
+++ b/graphics/p5-URI-GoogleChart/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.02
PORTREVISION= 1
CATEGORIES= graphics www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= URI
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/pear-IO_SWF/Makefile b/graphics/pear-IO_SWF/Makefile
index 4c7622374bd7..a8a476fe2618 100644
--- a/graphics/pear-IO_SWF/Makefile
+++ b/graphics/pear-IO_SWF/Makefile
@@ -5,8 +5,7 @@ PORTNAME= IO_SWF
PORTVERSION= 2.2.6
CATEGORIES= graphics www pear
MASTER_SITES= http://openpear.org/get/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/${PKGNAMEPREFIX}${PORTNAME}
+ LOCAL/tota/${PKGNAMEPREFIX}${PORTNAME}
PKGNAMEPREFIX= pear-
MAINTAINER= yoya@awm.jp
diff --git a/graphics/pecl-qrencode/Makefile b/graphics/pecl-qrencode/Makefile
index c49f467208e1..f480c0553461 100644
--- a/graphics/pecl-qrencode/Makefile
+++ b/graphics/pecl-qrencode/Makefile
@@ -4,8 +4,7 @@
PORTNAME= qrencode
PORTVERSION= 0.4
CATEGORIES= graphics pear
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= vanilla
+MASTER_SITES= LOCAL/vanilla
PKGNAMEPREFIX= pecl-
DIST_SUBDIR= PECL
diff --git a/graphics/pfscalibration/Makefile b/graphics/pfscalibration/Makefile
index 51b775f359aa..35e0e9ec73ee 100644
--- a/graphics/pfscalibration/Makefile
+++ b/graphics/pfscalibration/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pfscalibration
PORTVERSION= 1.4
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pfstools/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}
MAINTAINER= ii@any.com.ru
COMMENT= Photometric calibration of cameras and recovery HDR images from the set of LDR exposures
diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile
index 4ec317283556..a867c4e73dbd 100644
--- a/graphics/pfstmo/Makefile
+++ b/graphics/pfstmo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pfstmo
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pfstools/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}
MAINTAINER= ii@any.com.ru
COMMENT= Tone mapping operators
diff --git a/graphics/php5-swfed/Makefile b/graphics/php5-swfed/Makefile
index feacc1956df8..09c19e25542c 100644
--- a/graphics/php5-swfed/Makefile
+++ b/graphics/php5-swfed/Makefile
@@ -5,8 +5,7 @@ PORTNAME= swfed
PORTVERSION= 0.62
PORTREVISION= 3
CATEGORIES= graphics www
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= ${PORTNAME}/60548
+MASTER_SITES= SFJP/${PORTNAME}/60548
PKGNAMEPREFIX= php5-
MAINTAINER= yoya@awm.jp
diff --git a/graphics/pixelize/Makefile b/graphics/pixelize/Makefile
index 8ff1d6002e3e..10b5c5e04937 100644
--- a/graphics/pixelize/Makefile
+++ b/graphics/pixelize/Makefile
@@ -8,7 +8,6 @@ CATEGORIES= graphics
MASTER_SITES= ftp://lashwhip.com/pub/ \
http://www.c-s.li/ports/ \
http://lashwhip.com/pixelize/
-MASTER_SITE_SUBDIR= apps/graphics/misc
MAINTAINER= cs@FreeBSD.org
COMMENT= Use many scaled down images to try to duplicate another image
diff --git a/graphics/prison/Makefile b/graphics/prison/Makefile
index 7cd1b11702ce..c1da7e9d824d 100644
--- a/graphics/prison/Makefile
+++ b/graphics/prison/Makefile
@@ -5,8 +5,7 @@ PORTNAME= prison
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= graphics kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
MAINTAINER= fluffy@FreeBSD.org
COMMENT= Barcode library for KDE
diff --git a/graphics/py-gchartwrapper/Makefile b/graphics/py-gchartwrapper/Makefile
index c0048fef075d..8f180afb4d81 100644
--- a/graphics/py-gchartwrapper/Makefile
+++ b/graphics/py-gchartwrapper/Makefile
@@ -5,7 +5,7 @@ PORTNAME= GChartWrapper
PORTVERSION= 0.9
PORTREVISION= 3
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile
index 112f218f3deb..3fc4f4a3c816 100644
--- a/graphics/py-glewpy/Makefile
+++ b/graphics/py-glewpy/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= python
PATCH_SITES= http://mirror.amdmi3.ru/distfiles/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|amdmi3|}
+ LOCAL/amdmi3
PATCHFILES= glewpy-${PORTVERSION}-generatedsources.diff.bz2
MAINTAINER= acm@FreeBSD.org
diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile
index f34852f8d00e..e627432da050 100644
--- a/graphics/py-openexr/Makefile
+++ b/graphics/py-openexr/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
USES= python
USE_PYTHON= distutils autoplist
-MASTER_SITE_SUBDIR=source/O/OpenEXR
post-extract:
${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/setup.py
diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile
index a015790f804e..418a338f2776 100644
--- a/graphics/scr2png/Makefile
+++ b/graphics/scr2png/Makefile
@@ -5,8 +5,7 @@ PORTNAME= scr2png
PORTVERSION= 1.2
PORTREVISION= 6
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nik
+MASTER_SITES= LOCAL/nik
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts the output of "vidcontrol -p" to PNG
diff --git a/graphics/sdl2_gfx/Makefile b/graphics/sdl2_gfx/Makefile
index e27e968cf51b..9be086d65b3c 100644
--- a/graphics/sdl2_gfx/Makefile
+++ b/graphics/sdl2_gfx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sdl2_gfx
PORTVERSION= 1.0.1
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= http://www.ferzkopp.net/Software/%SUBDIR%/
-MASTER_SITE_SUBDIR= SDL2_gfx
+MASTER_SITES= http://www.ferzkopp.net/Software/SDL2_gfx/
DISTNAME= SDL2_gfx-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index b360c6970234..0278d65b06d3 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sdl_gfx
PORTVERSION= 2.0.25
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= http://www.ferzkopp.net/Software/%SUBDIR%/
-MASTER_SITE_SUBDIR= SDL_gfx-${PORTVERSION:R}
+MASTER_SITES= http://www.ferzkopp.net/Software/SDL_gfx-${PORTVERSION:R}/
DISTNAME= SDL_gfx-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile
index e55096b62c92..cf6eec847f83 100644
--- a/graphics/seam-carving-gui/Makefile
+++ b/graphics/seam-carving-gui/Makefile
@@ -5,7 +5,7 @@ PORTNAME= seam-carving-gui
PORTVERSION= 1.11
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= SeamCarvingGui-Src-${PORTVERSION}
MAINTAINER= buganini@gmail.com
diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile
index eb0efd0d4ea9..54af290b56bd 100644
--- a/graphics/seejpeg/Makefile
+++ b/graphics/seejpeg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= seejpeg
PORTVERSION= 1.10
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/viewers/svga
+MASTER_SITES= SUNSITE/apps/graphics/viewers/svga
MAINTAINER= ports@FreeBSD.org
COMMENT= Console graphics viewer using the svga console graphics library
diff --git a/graphics/separate/Makefile b/graphics/separate/Makefile
index d28f124214b7..f300aa32a494 100644
--- a/graphics/separate/Makefile
+++ b/graphics/separate/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.5.8
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= separate-plus/47873
+MASTER_SITES= SFJP/separate-plus/47873
DISTNAME= ${PORTNAME}+-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/svgfig/Makefile b/graphics/svgfig/Makefile
index 09961d5b9ca8..8f1f86127983 100644
--- a/graphics/svgfig/Makefile
+++ b/graphics/svgfig/Makefile
@@ -4,17 +4,16 @@ PORTNAME= SVGFig
PORTVERSION= 1.1.6
PORTREVISION= 1
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:tl}-${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Draw mathematical figures in SVG using Python
WRKSRC= ${WRKDIR}/${PORTNAME:tl}
-USES= python
+USES= python tar:tgz
USE_PYTHON= distutils autoplist
post-patch:
diff --git a/graphics/tesseract-data/Makefile b/graphics/tesseract-data/Makefile
index 8d1646f44d8d..dd10a1c68b33 100644
--- a/graphics/tesseract-data/Makefile
+++ b/graphics/tesseract-data/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tesseract-data
PORTVERSION= 3.02
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= ${TESSERACT_LANGS_300:O:u:S|$|.traineddata.gz|} \
${TESSERACT_LANGS_301:O:u:S|^|tesseract-ocr-3.01.|:S|$|.tar.gz|} \
${TESSERACT_LANGS_302:O:u:S|^|tesseract-ocr-3.02.|:S|$|.tar.gz|}
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 900781e82b6d..159f95b26356 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tesseract
PORTVERSION= 3.02.02
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= tesseract-ocr-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= bf@FreeBSD.org
diff --git a/graphics/timeless/Makefile b/graphics/timeless/Makefile
index 26a60588250d..95e06eab5f3c 100644
--- a/graphics/timeless/Makefile
+++ b/graphics/timeless/Makefile
@@ -5,8 +5,7 @@ PORTNAME= timeless
PORTVERSION= 1.0
PORTREVISION= 7
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shaun
+MASTER_SITES= LOCAL/shaun
MAINTAINER= ports@FreeBSD.org
COMMENT= FreeBSD/SDL port of Tran's Timeless Demo with Sound
diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index e0d2da437114..a38326a35a0c 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -5,11 +5,10 @@ PORTNAME= wmicons
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= graphics windowmaker
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/wmicons|} \
- ${MASTER_SITE_WINDOWMAKER} \
- ${MASTER_SITE_PORTS_JP} \
+MASTER_SITES= LOCAL/kiri/wmicons \
+ WINDOWMAKER/contrib/old/icons \
+ PORTS_JP \
http://www.itlb.te.noda.tus.ac.jp/~manome/wmaker/archive/
-MASTER_SITE_SUBDIR= . contrib/old/icons
DISTFILES= ${EXTRACT_ONLY} isiconpack4.tgz
EXTRACT_ONLY= DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
NeXT_XEmacs_tar.gz wm_icons_png.tar.gz wm_icons_tif.tar.gz \
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index f0800aeb0103..21964a94f04e 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xbmbrowser
PORTVERSION= 5.1
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 35487175033d..4384e8aff1b9 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.3.1
PORTREVISION= 13
CATEGORIES= graphics
MASTER_SITES= http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/rays/pov
+ SUNSITE/apps/graphics/rays/pov
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical interface to POV-Ray
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index be623eb4dbd6..bf3026c9e395 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.17.0
PORTREVISION= 16
CATEGORIES= graphics
MASTER_SITES= DEBIAN
-MASTER_SITE_SUBDIR= pool/main/x/${PORTNAME}
DISTNAME= xli_${PORTVERSION}+${XLI_SNAPVER:C/-//g}.orig
MAINTAINER= lichray@gmail.com
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index f49fc5924713..7593460185ad 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -6,9 +6,8 @@ PORTREVISION= 4
CATEGORIES= graphics print
MASTER_SITES= http://mirrors.rit.edu/zi/ \
ftp://ftp.foolabs.com/pub/xpdf/ \
- ${MASTER_SITE_TEX_CTAN} \
+ TEX_CTAN/support/xpdf \
http://komquats.com/distfiles/
-MASTER_SITE_SUBDIR= support/xpdf
MAINTAINER= cy@FreeBSD.org
COMMENT= Display PDF files and convert them to other formats
diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index 778f68969ab9..c2b368790bdb 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xwpick
PORTVERSION= 2.20
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=applications
+MASTER_SITES= XCONTRIB/applications
MAINTAINER= ports@FreeBSD.org
COMMENT= Image pick up utility for X Window System
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index cdb8b2f9e7f9..c5e55a70ab7b 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.2
PORTREVISION= 14
CATEGORIES= graphics www
MASTER_SITES= http://namazu.org/~satoru/zphoto/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Zooming photo album generator
diff --git a/hebrew/hspell/Makefile b/hebrew/hspell/Makefile
index a5a9384b31dc..0dbc23d2c439 100644
--- a/hebrew/hspell/Makefile
+++ b/hebrew/hspell/Makefile
@@ -5,8 +5,7 @@ PORTNAME= hspell
PORTVERSION= 1.1
CATEGORIES= hebrew
MASTER_SITES= http://hspell.ivrix.org.il/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= makc
+ LOCAL/makc
MAINTAINER= onatan@gmail.com
COMMENT= Hebrew spellchecker and morphology engine
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 0584f2009539..ee822a49b88d 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bitlbee
PORTVERSION= 3.4
CATEGORIES= irc
MASTER_SITES= http://get.bitlbee.org/src/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brix
+ LOCAL/brix
MAINTAINER= garga@FreeBSD.org
COMMENT= IRC to other chat networks gateway
diff --git a/irc/cwirc/Makefile b/irc/cwirc/Makefile
index 4c0c1ed70245..dcdbf06f5bc0 100644
--- a/irc/cwirc/Makefile
+++ b/irc/cwirc/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.0.0
PORTREVISION= 5
CATEGORIES= irc comms hamradio
MASTER_SITES= http://users.skynet.be/ppc/cwirc/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= db@FreeBSD.org
COMMENT= X-Chat Morse plugin
diff --git a/irc/keitairc2/Makefile b/irc/keitairc2/Makefile
index f61b4b0bdc6c..de42695534ea 100644
--- a/irc/keitairc2/Makefile
+++ b/irc/keitairc2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= keitairc
PORTVERSION= 2.0
CATEGORIES= irc
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= ${PORTNAME}/47485
+MASTER_SITES= SFJP/${PORTNAME}/47485
MAINTAINER= ports@FreeBSD.org
COMMENT= IRC proxy for mobilephone that have a web interface
diff --git a/irc/py-gozerbot/Makefile b/irc/py-gozerbot/Makefile
index e656dd7c51fb..d72dc14de170 100644
--- a/irc/py-gozerbot/Makefile
+++ b/irc/py-gozerbot/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.8.1.1
PORTREVISION= 2
CATEGORIES= irc python
MASTER_SITES= http://gozerbot.org/media/tarball/ \
- ${MASTER_SITE_GOOGLE_CODE}
+ GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sten@blinkenlights.nl
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index 66e33790599b..f501993206a6 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -5,13 +5,14 @@ PORTNAME= quirc
PORTVERSION= 0.9.84
PORTREVISION= 5
CATEGORIES= irc tk
-MASTER_SITES= ${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITES= LOCAL:local # This ends up being empty.
MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/Tk IRC client for the X Window System
OPTIONS_DEFINE= DOCS
+BROKEN= Unfetchable
USES= tk
USE_XORG= xt
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index f095e02a3708..ddb3e8874e7f 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= irc elisp
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yasu@utahime.org
diff --git a/irc/simpleirc/Makefile b/irc/simpleirc/Makefile
index 3c2f2825ea70..046393fad72d 100644
--- a/irc/simpleirc/Makefile
+++ b/irc/simpleirc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= simpleirc
PORTVERSION= 1.2
CATEGORIES= irc
MASTER_SITES= http://dl.suckless.org/tools/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dhn
+ LOCAL/dhn
DISTNAME= sic-${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
diff --git a/irc/thales/Makefile b/irc/thales/Makefile
index b17de2b64256..116dd2028f00 100644
--- a/irc/thales/Makefile
+++ b/irc/thales/Makefile
@@ -5,8 +5,7 @@ PORTNAME= thales
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= irc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU Thales -- An IRC to MySQL gateway
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 274399bce2fc..7d42b407ea47 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 20140213
PORTREVISION= 5
CATEGORIES= irc
MASTER_SITES= http://perturb.me.uk/distfiles/weechat-devel/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jase/weechat-devel
+ LOCAL/jase/weechat-devel
PKGNAMESUFFIX= -devel
DISTNAME= weechat-devel-${GITREV}
DISTFILES= ${DISTNAME}.txz
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 0371cc02509b..4074e1983e6f 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://weechat.org/files/src/ \
http://perturb.me.uk/distfiles/weechat/:mandocs \
- ${MASTER_SITE_LOCAL:S/$/:mandocs/}
-MASTER_SITE_SUBDIR= jase/weechat/:mandocs
+ LOCAL/jase/weechat/:mandocs
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= jase@FreeBSD.org
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 4de1976016ad..8b3c3ea8f3d4 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -5,10 +5,8 @@ PORTNAME= FreeWnn
PORTVERSION= 1.1.1.a021
PORTREVISION= 13
CATEGORIES?= japanese
-MASTER_SITES= ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
- ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= FreeWnn/alpha \
- freewnn/17724
+MASTER_SITES= ftp://ftp.freewnn.org/pub/FreeWnn/alpha/ \
+ SFJP/freewnn/17724
PKGNAMESUFFIX= -lib
DISTNAME= ${PORTNAME}-1.1.1-a021
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 6318d4d0c48f..548d90bb19a6 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -5,10 +5,8 @@ PORTNAME= FreeWnn
PORTVERSION= 1.1.1.a021
PORTREVISION= 13
CATEGORIES?= japanese
-MASTER_SITES= ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
- ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= FreeWnn/alpha \
- freewnn/17724
+MASTER_SITES= ftp://ftp.freewnn.org/pub/FreeWnn/alpha/ \
+ SFJP/freewnn/17724
PKGNAMESUFFIX= -server
DISTNAME= ${PORTNAME}-1.1.1-a021
diff --git a/japanese/a2ps/Makefile b/japanese/a2ps/Makefile
index 8bd20854e709..e53bfa84802e 100644
--- a/japanese/a2ps/Makefile
+++ b/japanese/a2ps/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.45
PORTREVISION= 5
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/a2ps|}
+ LOCAL/tota/a2ps
DISTNAME= ${PORTNAME}.pl-${PORTVERSION}
EXTRACT_SUFX= # empty
diff --git a/japanese/ajaxzip2-data/Makefile b/japanese/ajaxzip2-data/Makefile
index 5bf5eb6e3004..b035145a1bdd 100644
--- a/japanese/ajaxzip2-data/Makefile
+++ b/japanese/ajaxzip2-data/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ajaxzip2
PORTVERSION= 20150430
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
PKGNAMESUFFIX= -data
DISTFILES= ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index 6558a17dfa6c..ba33c3e787eb 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -5,8 +5,7 @@ PORTNAME= anthy
PORTVERSION= 9100h
PORTREVISION= 4
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/37536
+MASTER_SITES= SFJP/${PORTNAME}/37536
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= anthy
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/japanese/bugzilla44/Makefile b/japanese/bugzilla44/Makefile
index 5fc78c4de103..c33c84ed2fd7 100644
--- a/japanese/bugzilla44/Makefile
+++ b/japanese/bugzilla44/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bugzilla
PORTVERSION= 4.4.6
CATEGORIES= japanese
MASTER_SITES= http://bug-ja.org/releases/4.4/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/bugzilla-ja
+ LOCAL/tota/bugzilla-ja
DISTNAME= Bugzilla-ja-${PORTVERSION}-template
MAINTAINER= bz-ports@FreeBSD.org
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 03ab7004b462..c0a5c4f697ef 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -5,8 +5,7 @@ PORTNAME= canna
PORTVERSION= 3.7p3
PORTREVISION= 9
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= canna/9565/
+MASTER_SITES= SFJP/canna/9565
PKGNAMESUFFIX= -lib
DISTNAME= Canna${PORTVERSION:S/.//g}
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index d6c4d1857ca5..a83baa5918e0 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME= canna
PORTVERSION= 3.7p3
PORTREVISION= 10
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= canna/9565/
+MASTER_SITES= SFJP/canna/9565
PKGNAMESUFFIX= -server
DISTNAME= Canna${PORTVERSION:S/.//g}
diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 9de42a2c27ed..b0f60f578245 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dbskkd-cdb
PORTVERSION= 2.00
PORTREVISION= 1
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-#DISTVERSIONSUFFIX=
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Yet another dictionary server for SKK
diff --git a/japanese/dvi2tty/Makefile b/japanese/dvi2tty/Makefile
index 4a04ea12e83a..e1f5a8386006 100644
--- a/japanese/dvi2tty/Makefile
+++ b/japanese/dvi2tty/Makefile
@@ -5,13 +5,11 @@ PORTNAME= dvi2tty
PORTVERSION= 5.0
PORTREVISION= 2
CATEGORIES= japanese print
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
PKGNAMESUFFIX= -ascii
DISTNAME= dvi2tty${PORTVERSION}
PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
PATCH_DIST_STRIP= -p1
PATCHFILES= dvi2tty-ascii-jtex-patch dvi2tty.c-patch
diff --git a/japanese/esecanna-module-vje25/Makefile b/japanese/esecanna-module-vje25/Makefile
index 591b35965fd6..8718a89efa20 100644
--- a/japanese/esecanna-module-vje25/Makefile
+++ b/japanese/esecanna-module-vje25/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.14.6
PORTREVISION= 2
CATEGORIES= japanese
MASTER_SITES= http://esecanna.netfort.gr.jp/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
DISTNAME= ${PORTNAME}_${PORTVERSION}
DIST_SUBDIR= esecanna
diff --git a/japanese/esecanna-module-vje30/Makefile b/japanese/esecanna-module-vje30/Makefile
index 43a00a7e7662..11b9ea27e7f7 100644
--- a/japanese/esecanna-module-vje30/Makefile
+++ b/japanese/esecanna-module-vje30/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0.1
PORTREVISION= 2
CATEGORIES= japanese
MASTER_SITES= http://esecanna.netfort.gr.jp/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
DISTNAME= ${PORTNAME}_${PORTVERSION}
DIST_SUBDIR= esecanna
diff --git a/japanese/esecanna-module-wnn6/Makefile b/japanese/esecanna-module-wnn6/Makefile
index 8af409c608d6..45de193e521e 100644
--- a/japanese/esecanna-module-wnn6/Makefile
+++ b/japanese/esecanna-module-wnn6/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0.0
PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES= http://esecanna.netfort.gr.jp/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
DISTNAME= ${PORTNAME}_${PORTVERSION}
DIST_SUBDIR= esecanna
diff --git a/japanese/esecanna/Makefile b/japanese/esecanna/Makefile
index d60fe4c8e2fa..30a22b3c36b4 100644
--- a/japanese/esecanna/Makefile
+++ b/japanese/esecanna/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0.1
PORTREVISION= 6
CATEGORIES= japanese
MASTER_SITES= http://esecanna.netfort.gr.jp/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
DISTNAME= ${PORTNAME}_${PORTVERSION}
DIST_SUBDIR= esecanna
diff --git a/japanese/font-migu/Makefile b/japanese/font-migu/Makefile
index c3525e3b79fd..82cda56a26e6 100644
--- a/japanese/font-migu/Makefile
+++ b/japanese/font-migu/Makefile
@@ -4,8 +4,7 @@ PORTNAME= migu
PORTVERSION= 1.0.20130617
PORTREVISION= 2
CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= mix-mplus-ipa/59022
+MASTER_SITES= SFJP/mix-mplus-ipa/59022
PKGNAMEPREFIX= ja-font-
DISTFILES= ${PORTNAME}-1p-${PORTVERSION:E}${EXTRACT_SUFX} \
${PORTNAME}-1c-${PORTVERSION:E}${EXTRACT_SUFX} \
diff --git a/japanese/font-motoya-al/Makefile b/japanese/font-motoya-al/Makefile
index 3b4e73cc8cdb..32d9a6cdf929 100644
--- a/japanese/font-motoya-al/Makefile
+++ b/japanese/font-motoya-al/Makefile
@@ -4,8 +4,7 @@ PORTNAME= font-motoya-al
PORTVERSION= 0.0.20100921
PORTREVISION= 3
CATEGORIES= japanese x11-fonts
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
DISTNAME= motoya-al-fonts-${PORTVERSION:S,^0.0.,,}
MAINTAINER= hrs@FreeBSD.org
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 4be26be0214d..6b4b9e927cb8 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -4,8 +4,7 @@ PORTNAME= mplus-ipa
PORTVERSION= 1.0.20060520.p1
PORTREVISION= 4
CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
PKGNAMEPREFIX= ja-font-
DISTNAME= mixfont-mplus-ipa-TrueType-20060520p1
diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index fdf30f7a2618..ce17b469591f 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ume
PORTVERSION= 0.0.470
PORTREVISION= 1
CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}-font/22212
+MASTER_SITES= SOURCEFORGE_JP/${PORTNAME}-font/22212
PKGNAMEPREFIX= ja-font-
DISTNAME= umefont_${PORTVERSION:E}
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index 63ea663b5bd3..1244d33898a5 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gawk
PORTVERSION= 3.0.6
PORTREVISION= 1
CATEGORIES= japanese lang
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PATCH_SITES= http://www.hinadori.atnifty.com/~wills/program/
PATCHFILES= ${PORTNAME}mb115.diff.gz
diff --git a/japanese/hns/Makefile b/japanese/hns/Makefile
index 08b5959086ca..b87076df0099 100644
--- a/japanese/hns/Makefile
+++ b/japanese/hns/Makefile
@@ -4,8 +4,7 @@
PORTNAME= hns
PORTVERSION= 2.19.9
CATEGORIES= japanese www perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= h14m/22597
+MASTER_SITES= SFJP/h14m/22597
MAINTAINER= ports@FreeBSD.org
COMMENT= Hyper NIKKI System, a CGI system for Electric Diary Interchange
diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index 3703317888f3..4c436b67340b 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.2.7
PORTREVISION= 6
CATEGORIES= japanese
PROJECTHOST= ibus
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ja-
MAINTAINER= daichi@FreeBSD.org
diff --git a/japanese/japaneseAFM/Makefile b/japanese/japaneseAFM/Makefile
index 96b74fa0e864..4794752b8246 100644
--- a/japanese/japaneseAFM/Makefile
+++ b/japanese/japaneseAFM/Makefile
@@ -4,8 +4,7 @@
PORTNAME= japaneseAFM
PORTVERSION= 1.0
CATEGORIES= japanese print
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kiri
+MASTER_SITES= LOCAL/kiri
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index 3eba1b883857..c6f4128958c9 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -5,9 +5,8 @@ PORTNAME= jed
PORTVERSION= ${VERSION}.j${JP_VERSION}
PORTREVISION= 5
CATEGORIES= japanese editors
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/knu \
http://www.kondara.org/~g/slang/
-MASTER_SITE_SUBDIR= knu
DISTNAME= ${PORTNAME}-B${VERSION:R}-${VERSION:E}__J${JP_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-extralibs-${VERSION}.tar.gz
diff --git a/japanese/jmode/Makefile b/japanese/jmode/Makefile
index 27eee7b1b719..870e858baa0f 100644
--- a/japanese/jmode/Makefile
+++ b/japanese/jmode/Makefile
@@ -5,8 +5,7 @@ PORTNAME= jmode
PORTVERSION= 0.6.7
PORTREVISION= 9
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= anthy/5467
+MASTER_SITES= SFJP/anthy/5467
MAINTAINER= nobutaka@FreeBSD.org
COMMENT?= XIM server for Anthy input method
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index 45b804869865..3d2811164825 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -5,7 +5,7 @@ PORTNAME= kaname12
PORTVERSION= 1.1
PORTREVISION= 5
CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
DISTNAME= kaname_k12_bdf
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
knm_new_linux.tar.gz
diff --git a/japanese/kana-no-quiz/Makefile b/japanese/kana-no-quiz/Makefile
index bf8352a281d1..78eff5acec0e 100644
--- a/japanese/kana-no-quiz/Makefile
+++ b/japanese/kana-no-quiz/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kana-no-quiz
DISTVERSION= 1.9
PORTREVISION= 10
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
DISTNAME= ${PORTNAME:S,k,K,}-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile
index ae9b9dbb651f..ca2be08f6808 100644
--- a/japanese/kanji18/Makefile
+++ b/japanese/kanji18/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kanji
PORTVERSION?= 1.0
PORTREVISION?= 6
CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MASTER_SITE_SUBDIR= ${DISTNAME}
+MASTER_SITES= PORTS_JP/${DISTNAME}
PKGNAMESUFFIX?= 18
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}
DISTFILES?= 573.z 574.z 575.z 576.z 577.z 578.z 579.z 580.z 581.z
diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index c47067f562f9..165c89fa0d90 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -5,7 +5,7 @@ PORTNAME= k20fonts
PORTVERSION= 0.396
PORTREVISION= 7
CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_NETBSD:S/$/:kappa20/:S/%SUBDIR%/LOCAL_PORTS/} \
+MASTER_SITES= NETBSD/LOCAL_PORTS:kappa20 \
SFJP/x-tt/8412/:ayu20
DISTNAME= Kappa20-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:kappa20 \
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index 23146d10ca1b..df745f384e4f 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kasumi
PORTVERSION= 2.5
PORTREVISION= 6
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/41436
+MASTER_SITES= SFJP/${PORTNAME}/41436
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Dictionary management tool for anthy
diff --git a/japanese/kcc/Makefile b/japanese/kcc/Makefile
index 6e899e528884..151769c5d0db 100644
--- a/japanese/kcc/Makefile
+++ b/japanese/kcc/Makefile
@@ -5,7 +5,7 @@ PORTNAME= kcc
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 4b08e789b8ee..9156d7df036f 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.3
PORTREVISION= 7
# '+=' is for slave ports
CATEGORIES+= japanese
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
PKGNAMESUFFIX= -${KONFONT}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
k14.bdf 7x14rk.bdf \
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 0ded7946dd8b..450e5a8aa5fd 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -4,13 +4,10 @@ PORTNAME= kterm
PORTVERSION= 6.2.0
PORTREVISION= 13
CATEGORIES= japanese x11
-MASTER_SITES= ${MASTER_SITE_PORTS_JP:S/$/:wp_jp/} \
- ${MASTER_SITE_XCONTRIB} \
- ${MASTER_SITE_LOCAL:S/$/:wp_local,pcemu/}
-MASTER_SITE_SUBDIR= applications \
- kterm/:wp_jp \
- shige/kterm/:wp_local \
- hrs/:pcemu
+MASTER_SITES= PORTS_JP/kterm/:wp_jp \
+ XCONTRIB/applications \
+ LOCAL/shige/kterm/:wp_local \
+ LOCAL/hrs/:pcemu
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
README.wallpaper.ja:wp_local,wp_jp \
pcemu1.01alpha.tar.gz:pcemu
@@ -20,10 +17,9 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= ftp://ftp.sra.co.jp/pub/x11/kterm/:nfs \
http://www.asahi-net.or.jp/~hc3j-tkg/kterm/:wpi \
http://dists.lovepeers.org/distfiles/:termios \
- ${MASTER_SITE_LOCAL:S/$/:color16,termios,utf/}
-PATCH_SITE_SUBDIR= shige/kterm/:color16 \
- nork/:termios \
- hrs/:utf
+ LOCAL/shige/kterm/:color16 \
+ LOCAL/nork/:termios \
+ LOCAL/hrs/:utf
PATCHFILES= ${DISTNAME}.NFS-xauth.patch:nfs \
${DISTNAME}-wpi.patch.gz:wpi \
${DISTNAME}-color16.patch.gz:color16 \
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index fdfb5b00c4d5..c9a5badef057 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -12,8 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
regex_cs-lwp9k.shar.gz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= nork
+PATCH_SITES= LOCAL/nork
PATCHFILES= ${DISTNAME}-iso258.patch.gz \
${DISTNAME}-iso258-259.patch.gz \
${DISTNAME}-iso259-260.patch.gz \
diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index f683baa23460..eea35dba4a9c 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 5.4.20050911
PORTREVISION= 3
CATEGORIES= japanese
.if !defined(WITH_CVS)
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
.else
DISTFILES= # empty
.endif
diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile
index 88ae4619c8e5..4299ce436e04 100644
--- a/japanese/marumoji-fonts/Makefile
+++ b/japanese/marumoji-fonts/Makefile
@@ -5,8 +5,7 @@ PORTNAME= marumoji-fonts
PORTVERSION= 1.0
PORTREVISION= 7
CATEGORIES= japanese x11-fonts
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= yoichi
+MASTER_SITES= LOCAL/yoichi
DISTFILES= maru14.bdf.v13.gz maru18.bdf.v10.gz \
m18to16.sed \
7x14maru.bdf.gz 7x14rkmr.bdf.gz \
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index 8420fe8db6be..46e1824b573f 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= japanese elisp
MASTER_SITES= http://0xcc.net/migemo/ \
- ${MASTER_SITE_LOCAL:S/$/:skkdic/}
-MASTER_SITE_SUBDIR= nobutaka/:skkdic
+ LOCAL/nobutaka/:skkdic
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${SKKDIC_FILE}.bz2:skkdic
DIST_SUBDIR= migemo
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/japanese/mime_pls/Makefile b/japanese/mime_pls/Makefile
index c674b6658243..0d02927f4c6b 100644
--- a/japanese/mime_pls/Makefile
+++ b/japanese/mime_pls/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mime_pls
PORTVERSION= 2.02
PORTREVISION= 2
CATEGORIES= japanese perl5 mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nork
+MASTER_SITES= LOCAL/nork
PKGNAMEPREFIX= ja-p5-
DISTNAME= ${PORTNAME}${PORTVERSION:C/\.//}
diff --git a/japanese/mtools/Makefile b/japanese/mtools/Makefile
index e29a5545c2ec..76ddad3bcf3b 100644
--- a/japanese/mtools/Makefile
+++ b/japanese/mtools/Makefile
@@ -7,9 +7,7 @@ PORTREVISION= 1
CATEGORIES= japanese emulators
MASTER_SITES= ftp://ftp.tux.org/pub/knaff/mtools/:mtools \
http://mtools.linux.lu/:mtools \
- ${MASTER_SITE_LOCAL:S/$/:local/} \
- ${MASTER_SITE_PORTS_JP:S/$/:jp/}
-MASTER_SITE_SUBDIR= steve/:local ./:jp
+ LOCAL/steve:local PORTS_JP:jp
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:mtools \
${DISTNAME}.PC98.patch.gz:local,jp
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/japanese/namazu/Makefile b/japanese/namazu/Makefile
index 97fd03668376..f6afb8f3b26a 100644
--- a/japanese/namazu/Makefile
+++ b/japanese/namazu/Makefile
@@ -5,8 +5,7 @@ PORTNAME= namazu
PORTVERSION= 1.3.0.11
CATEGORIES= japanese textproc
MASTER_SITES= http://www.namazu.org/stable/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= flathill
+ LOCAL/flathill
MAINTAINER= ports@FreeBSD.org
COMMENT= Search engine software intended for easy use
diff --git a/japanese/newosaka/Makefile b/japanese/newosaka/Makefile
index d6aaf7f256a5..4e85c6557837 100644
--- a/japanese/newosaka/Makefile
+++ b/japanese/newosaka/Makefile
@@ -4,7 +4,7 @@
PORTNAME= newosaka
PORTVERSION= 1.0
CATEGORIES+= japanese
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
DISTFILES= new-osaka.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/japanese/nhocr/Makefile b/japanese/nhocr/Makefile
index 93fbe509f6c3..af5d5d56d59a 100644
--- a/japanese/nhocr/Makefile
+++ b/japanese/nhocr/Makefile
@@ -4,7 +4,7 @@
PORTNAME= nhocr
PORTVERSION= 0.21
CATEGORIES= japanese graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= hiroto.kagotani@gmail.com
COMMENT= OCR engine for Japanese language
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 300217e25c9f..7d6c00751909 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ochusha
PORTVERSION= 0.5.8.2
PORTREVISION= 13
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ochusha/16560
+MASTER_SITES= SFJP/ochusha/16560
MAINTAINER= ports@FreeBSD.org
COMMENT= GUI BBS browser for 2ch.net
diff --git a/japanese/plain2/Makefile b/japanese/plain2/Makefile
index 5456ca7f0354..b3c504338be0 100644
--- a/japanese/plain2/Makefile
+++ b/japanese/plain2/Makefile
@@ -5,12 +5,10 @@ PORTNAME= plain2
PORTVERSION= 2.54.1
PORTREVISION= 2
CATEGORIES= japanese textproc
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
DISTNAME= ${PORTNAME}_${PORTVERSION:R}p${PORTVERSION:E}.orig
PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
PATCHFILES= ${PORTNAME}_${PORTVERSION:R}p${PORTVERSION:E}-4.2.diff.gz
PATCH_DIST_STRIP= -p1
diff --git a/japanese/prn/Makefile b/japanese/prn/Makefile
index 23051206caf7..f0b3edcecd28 100644
--- a/japanese/prn/Makefile
+++ b/japanese/prn/Makefile
@@ -5,7 +5,7 @@ PORTNAME= prn
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= japanese print
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/japanese/rogue_s/Makefile b/japanese/rogue_s/Makefile
index 44458df5efb1..e20eaf2a775b 100644
--- a/japanese/rogue_s/Makefile
+++ b/japanese/rogue_s/Makefile
@@ -5,16 +5,12 @@ PORTNAME= rogue_s
PORTVERSION= 1.3a
PORTREVISION= 2
CATEGORIES= japanese games
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- ${MASTER_SITE_PORTS_JP:S,/%SUBDIR%/,/,}
-MASTER_SITE_SUBDIR= knu
+MASTER_SITES= LOCAL/knu PORTS_JP
DISTFILES= rogue_s.tar.z rogue_s.patch02.z rogue_s.patch03.z \
rogue_s.message.z
EXTRACT_ONLY= rogue_s.tar.z
-PATCH_SITES= ${MASTER_SITE_LOCAL} \
- ${MASTER_SITE_PORTS_JP:S,/%SUBDIR%/,/,}
-PATCH_SITE_SUBDIR= knu
+PATCH_SITES= LOCAL/knu PORTS_JP
PATCHFILES= rogue_s.patch04
MAINTAINER= ports@FreeBSD.org
diff --git a/japanese/ruby-mecab/Makefile b/japanese/ruby-mecab/Makefile
index 906e9926e7fd..6d5331b628b4 100644
--- a/japanese/ruby-mecab/Makefile
+++ b/japanese/ruby-mecab/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mecab
PORTVERSION= 0.996
PORTREVISION= 1
CATEGORIES= japanese textproc ruby
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}-ruby-${PORTVERSION}
MAINTAINER= ruby@FreeBSD.org
diff --git a/japanese/ruby-usersguide/Makefile b/japanese/ruby-usersguide/Makefile
index 681a31fe64b2..425dc04f10c0 100644
--- a/japanese/ruby-usersguide/Makefile
+++ b/japanese/ruby-usersguide/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ruby-usersguide
PORTVERSION= 980206
CATEGORIES= japanese lang ruby
-MASTER_SITES= ${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR= doc
+MASTER_SITES= RUBY/doc
DISTNAME= ${SHORTNAME}-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index eb08512de917..b27215274696 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -5,8 +5,7 @@ PORTNAME= scim-anthy
PORTVERSION= 1.2.7
PORTREVISION= 4
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=scim-imengine/37309
+MASTER_SITES= SFJP/scim-imengine/37309
MAINTAINER= ports@FreeBSD.org
COMMENT= SCIM IMEngine module using Anthy
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 161cd58dac95..d599be838ede 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -5,8 +5,7 @@ PORTNAME= scim-canna
PORTVERSION= 1.0.0
PORTREVISION= 14
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= scim-imengine/18849
+MASTER_SITES= SFJP/scim-imengine/18849
MAINTAINER= ports@FreeBSD.org
COMMENT= SCIM IMEngine module using Canna
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index aa92a2ab224d..33b410b7010a 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -6,8 +6,7 @@ PORTNAME= scim-skk
PORTVERSION= 0.5.2
PORTREVISION= 11
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= scim-imengine/18121
+MASTER_SITES= SFJP/scim-imengine/18121
MAINTAINER= ports@FreeBSD.org
COMMENT= SCIM IMEngine module like SKK
diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile
index 830d0a328d86..0b9ec7b35aa7 100644
--- a/japanese/skkserv/Makefile
+++ b/japanese/skkserv/Makefile
@@ -5,7 +5,7 @@ PORTNAME= skkserv
PORTVERSION= 9.6
PORTREVISION= 6
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
DISTNAME= skk${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
diff --git a/japanese/slrn/Makefile b/japanese/slrn/Makefile
index 564d82abb20c..4d7c871491cb 100644
--- a/japanese/slrn/Makefile
+++ b/japanese/slrn/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://dists.lovepeers.org/distfiles/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-doc-j0.9.5.6-0.tar.gz
-PATCH_SITES= ${MASTER_SITE_PORTS_JP} \
+PATCH_SITES= PORTS_JP \
http://dists.lovepeers.org/distfiles/
PATCHFILES= ${PORTNAME}-${PORTVERSION}jp0.pat.gz
PATCH_DIST_STRIP=-p1
diff --git a/japanese/texinfo/Makefile b/japanese/texinfo/Makefile
index 7cb30049cc95..b3239c60300e 100644
--- a/japanese/texinfo/Makefile
+++ b/japanese/texinfo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= texinfo
PORTVERSION= 4.7
PORTREVISION= 8
CATEGORIES= japanese print
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PATCH_SITES= ftp://jupiter.fsci.fuk.kindai.ac.jp/pub/ptex/utils/ \
http://www.fsci.fuk.kindai.ac.jp/aftp/pub/ptex/utils/
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index 9c5f1d7c0b5c..a16eea315c71 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -3,8 +3,7 @@
PORTNAME= zipcodes
PORTVERSION= 20150430
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
DISTFILES= ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile
index ad98c303568f..4eb5ad65a26b 100644
--- a/java/bootstrap-openjdk/Makefile
+++ b/java/bootstrap-openjdk/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ${JDK_NAME}
PORTVERSION= ${DISTVERSION_${ARCH}}
PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+MASTER_SITES= LOCAL/jkim
PKGNAMEPREFIX= bootstrap-
DISTNAME= ${JDK_PORT}-${ARCH}-${PORTVERSION}
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index b5f04e18f179..34ebf83c9204 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -5,10 +5,9 @@ PORTNAME= classpath
PORTVERSION= 0.99
PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_GNU} \
- ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME:S|$|:src|}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src
+MASTER_SITES= GNU \
+ SAVANNAH
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= java@FreeBSD.org
@@ -48,8 +47,7 @@ QT4_DESC= Enable Qt AWT peer
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MECJ}
-MASTER_SITES+= ${MASTER_SITE_ECLIPSE:S|$|:ecj|}
-MASTER_SITE_SUBDIR+= R-${ECJ_VERSION}-${ECJ_DROPDATE}/:ecj
+MASTER_SITES+= ECLIPSE/R-${ECJ_VERSION}-${ECJ_DROPDATE}:ecj
DISTFILES+= ${ECJ_JAR}:ecj
ECJ_VERSION= 3.8.1
ECJ_DROPDATE= 201209141540
diff --git a/java/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile
index 973277b36745..52e6459949e8 100644
--- a/java/eclipse-cdt/Makefile
+++ b/java/eclipse-cdt/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ${PLUGIN}
PORTVERSION= 6.0.2
PORTREVISION= 3
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=tools/${PLUGIN}/releases/${ECLIPSE_CODENAME}/dist
+MASTER_SITES= ECLIPSE/tools/${PLUGIN}/releases/${ECLIPSE_CODENAME}/dist
PKGNAMEPREFIX= eclipse-
DISTNAME= ${PLUGIN}-master-${PORTVERSION}
diff --git a/java/eclipse-windowbuilder/Makefile b/java/eclipse-windowbuilder/Makefile
index e3f1a6a76462..0cb553abbc17 100644
--- a/java/eclipse-windowbuilder/Makefile
+++ b/java/eclipse-windowbuilder/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.6.1
PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_ECLIPSE:S,/eclipse/downloads/drops/,/windowbuilder/WB/release/,} \
- ${MASTER_SITE_LOCAL:S,%SUBDIR%/,ale/:native,}
+ LOCAL/ale:native
MASTER_SITE_SUBDIR= R201309271200
PKGNAMEPREFIX= eclipse-
DISTFILES= WB_v${PORTVERSION}_UpdateSite_for_Eclipse4.3.zip \
diff --git a/java/jakarta-bcel/Makefile b/java/jakarta-bcel/Makefile
index 47812f858405..23d307c839d8 100644
--- a/java/jakarta-bcel/Makefile
+++ b/java/jakarta-bcel/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bcel
PORTVERSION= 5.2
PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR= ${PORTNAME}/binaries
+MASTER_SITES= APACHE_JAKARTA/${PORTNAME}/binaries
PKGNAMEPREFIX= jakarta-
MAINTAINER= java@FreeBSD.org
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile
index 9d8bed1818d4..32ee3bef3c42 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/jakarta-commons-httpclient/Makefile
@@ -5,8 +5,7 @@ PORTNAME= commons-httpclient
DISTVERSION= 3.1
PORTREVISION= 1
CATEGORIES= java www
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/source
+MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/source
PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile
index 77701aca2dd9..742eb46f4b9f 100644
--- a/java/jakarta-regexp/Makefile
+++ b/java/jakarta-regexp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= jakarta-regexp
PORTVERSION= 1.5
PORTREVISION= 3
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR= regexp/binaries
+MASTER_SITES= APACHE_JAKARTA/regexp/binaries
MAINTAINER= ports@FreeBSD.org
COMMENT= Regular expressions for Java
diff --git a/java/java-zoneinfo/Makefile b/java/java-zoneinfo/Makefile
index 71f768dc4bd7..b5cfde5df547 100644
--- a/java/java-zoneinfo/Makefile
+++ b/java/java-zoneinfo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= zoneinfo
DISTVERSION= 2015b
CATEGORIES= java misc
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/javazi|}
+MASTER_SITES= LOCAL/glewis/javazi
PKGNAMEPREFIX= java-
DISTNAME= javazi-${DISTVERSION}
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index b0fda78d5873..f5c71b2fadbe 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -6,11 +6,10 @@ PORTVERSION= b34
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
+MASTER_SITES= APACHE/ant/binaries/:ant \
http://download.java.net/openjdk/jtreg/promoted/4.1/b05/:jtreg \
https://java.net/downloads/openjdk6/ \
- LOCAL
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
DISTNAME= openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE}
DISTFILES= ${ANTFILE}:ant \
${DISTNAME}${EXTRACT_SUFX}
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 553aa1d49a9c..70abe05fd47b 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MIN
http://icedtea.classpath.org/download/drops/:jaxws \
https://java.net/downloads/jax-ws/JDK7/:jaf \
http://icedtea.classpath.org/download/drops/:jaf \
- ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,}
+ APACHE/ant/binaries/:ant
DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
${ANT_DISTFILE}${EXTRACT_SUFX}:ant
EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
diff --git a/java/proguard/Makefile b/java/proguard/Makefile
index d33ceef94ad1..256c3d0efdf7 100644
--- a/java/proguard/Makefile
+++ b/java/proguard/Makefile
@@ -4,8 +4,7 @@
PORTNAME= proguard
PORTVERSION= 5.2.1
CATEGORIES= java devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION:C/.1$//}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C/.1$//}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
diff --git a/java/rubygem-rjb/Makefile b/java/rubygem-rjb/Makefile
index 6a83f923e14d..237f283114a2 100644
--- a/java/rubygem-rjb/Makefile
+++ b/java/rubygem-rjb/Makefile
@@ -4,7 +4,7 @@
PORTNAME= rjb
PORTVERSION= 1.5.3
CATEGORIES= java ruby
-MASTER_SITES= ${MASTER_SITE_RUBYGEMS}
+MASTER_SITES= RG
MAINTAINER= arved@FreeBSD.org
COMMENT= Call Java Code from Ruby
diff --git a/korean/aleefonts-ttf/Makefile b/korean/aleefonts-ttf/Makefile
index 081a1a72be4e..b9b0542c5b13 100644
--- a/korean/aleefonts-ttf/Makefile
+++ b/korean/aleefonts-ttf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= aleefonts
PORTVERSION= 12
PORTREVISION= 1
CATEGORIES= korean x11-fonts
-MASTER_SITES= DEBIAN
-MASTER_SITE_SUBDIR= pool/main/t/ttf-alee
+MASTER_SITES= DEBIAN/pool/main/t/ttf-alee
PKGNAMESUFFIX= -ttf
DISTNAME= ttf-alee_${PORTVERSION}
diff --git a/korean/man-doc/Makefile b/korean/man-doc/Makefile
index 44a9c1b6bc1e..bf7cb45bc3b6 100644
--- a/korean/man-doc/Makefile
+++ b/korean/man-doc/Makefile
@@ -5,9 +5,8 @@ PORTNAME= man
PORTVERSION= 021120
PORTREVISION= 3
CATEGORIES= korean
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/perky \
http://people.freebsd.org/~perky/distfiles/
-MASTER_SITE_SUBDIR= perky
PKGNAMESUFFIX= -doc
DISTNAME= ko-man-doc-${PORTVERSION}
diff --git a/korean/nanumcoding-ttf/Makefile b/korean/nanumcoding-ttf/Makefile
index 5484abec5dc7..02a33557c529 100644
--- a/korean/nanumcoding-ttf/Makefile
+++ b/korean/nanumcoding-ttf/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 2.0
PORTREVISION= 1
CATEGORIES= korean
MASTER_SITES= http://dev.naver.com/frs/download.php/441/ \
- LOCAL
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
PKGNAMESUFFIX= -ttf
DISTNAME= NanumGothicCoding-${PORTVERSION}
diff --git a/korean/nanumfonts-otf/Makefile b/korean/nanumfonts-otf/Makefile
index afbd2871dd98..3fbf3d1d0480 100644
--- a/korean/nanumfonts-otf/Makefile
+++ b/korean/nanumfonts-otf/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 3.1
PORTREVISION= 1
CATEGORIES= korean
MASTER_SITES= http://cdn.naver.com/naver/NanumFont/fontfiles/ \
- LOCAL
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
PKGNAMESUFFIX= -${FONTTYPE}
DISTFILES= NanumFont_${FONTTYPE:tu}_ALL${EXTRACT_SUFX} \
NanumFontSetup_${FONTTYPE:tu}_GOTHICECO${EXTRACT_SUFX} \
diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile
index eb495cdabb48..3dc8b89d1d1b 100644
--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@@ -5,8 +5,7 @@ PORTNAME= basic256
PORTVERSION= 1.1.4.0
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= kidbasic/${PORTNAME}
+MASTER_SITES= SF/kidbasic/${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= fernando.apesteguia@gmail.com
diff --git a/lang/clang-cheri/Makefile b/lang/clang-cheri/Makefile
index 212777ac54cf..b85c95d62e8c 100644
--- a/lang/clang-cheri/Makefile
+++ b/lang/clang-cheri/Makefile
@@ -3,8 +3,7 @@
PORTNAME= clang-cheri
PORTVERSION= 3.7.d20150512
CATEGORIES= lang devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
MAINTAINER= brooks@FreeBSD.org
COMMENT= C, Objective-C, and C++ compiler with CHERI CPU support
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 5da6b407f45e..03d8601346cf 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -4,8 +4,7 @@
PORTNAME= clang
PORTVERSION= 3.7.r${SVN_REV}
CATEGORIES= lang devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMESUFFIX= -devel
DISTFILES= ${CLANG_SOURCE} \
${LLVM_SOURCE}
diff --git a/lang/emacs-lisp-intro/Makefile b/lang/emacs-lisp-intro/Makefile
index 451b5b7017b3..6296cb339e97 100644
--- a/lang/emacs-lisp-intro/Makefile
+++ b/lang/emacs-lisp-intro/Makefile
@@ -4,8 +4,7 @@
PORTNAME= emacs-lisp-intro
PORTVERSION= 2.04
CATEGORIES= lang elisp
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= emacs
+MASTER_SITES= GNU/emacs
MAINTAINER= amakawa@jp.FreeBSD.org
COMMENT= Introduction to Emacs Lisp programming
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 97869da4c6e6..cb318021dd71 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://www.erlang.se/doc/:erlangse \
http://www.erlang.se/publications/:publications \
http://www.sics.se/~joe/thesis/:joe \
- ${MASTER_SITE_LOCAL:S/$/:local/:S,%SUBDIR%/,olgeni/,}
+ LOCAL/olgeni:local
DISTNAME= otp_src_${ERL_RELEASE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \
${ERLANG_MAN}:erlangorg
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index 7004be00e203..9fa24c9be22d 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= ${SNAPSHOT}
PORTREVISION= ${MAIN_PR}
CATEGORIES= lang
MASTER_SITES= http://downloads.dragonlace.net/src/:boot \
- LOCAL/marino:boot ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= ${MS_SUBDIR}
+ LOCAL/marino:boot GCC/${MS_SUBDIR}
DISTFILES= ${IDENTIFICATION}.tar.bz2
MAINTAINER= marino@FreeBSD.org
diff --git a/lang/gcc47-aux/Makefile b/lang/gcc47-aux/Makefile
index a0142b62c8d7..89de0c8351e1 100644
--- a/lang/gcc47-aux/Makefile
+++ b/lang/gcc47-aux/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= ${SNAPSHOT}
PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://downloads.dragonlace.net/src/:boot \
- ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= releases/gcc-${GCC_VERSION}
+ GCC/releases/gcc-${GCC_VERSION}
DISTFILES= gcc-${GCC_VERSION}.tar.bz2
MAINTAINER= marino@FreeBSD.org
diff --git a/lang/gcc5-aux/Makefile b/lang/gcc5-aux/Makefile
index 89a6db9b4376..05e545c8c0a7 100644
--- a/lang/gcc5-aux/Makefile
+++ b/lang/gcc5-aux/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= ${SNAPSHOT}
PORTREVISION= ${MAIN_PR}
CATEGORIES= lang
MASTER_SITES= http://downloads.dragonlace.net/src/:boot \
- LOCAL/marino:boot ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= ${MS_SUBDIR}
+ LOCAL/marino:boot GCC/${MS_SUBDIR}
DISTFILES= ${IDENTIFICATION}.tar.bz2
MAINTAINER= marino@FreeBSD.org
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 756717020913..68c463580321 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 7.8.3
PORTREVISION= 1
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
- ${MASTER_SITE_LOCAL:S/$/:boot/}
-MASTER_SITE_SUBDIR= pgj/:boot
+ LOCAL/pgj/:boot
DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/gnat_util/Makefile b/lang/gnat_util/Makefile
index 892657cdbb47..d34be6752534 100644
--- a/lang/gnat_util/Makefile
+++ b/lang/gnat_util/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnat_util
PORTVERSION= ${SNAPSHOT}
PORTREVISION= ${UTIL_PR}
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= ${MS_SUBDIR}
+MASTER_SITES= GCC/${MS_SUBDIR}
DISTNAME= ${IDENTIFICATION}
MAINTAINER= marino@FreeBSD.org
diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile
index c2d14574c221..92453c922bab 100644
--- a/lang/gnatdroid-armv7/Makefile
+++ b/lang/gnatdroid-armv7/Makefile
@@ -5,8 +5,7 @@ PORTNAME= armv7
PORTVERSION= ${SNAPSHOT}
PORTREVISION= ${ARMV7_PR}
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= releases/gcc-${GCC_VERSION}
+MASTER_SITES= GCC/releases/gcc-${GCC_VERSION}
PKGNAMEPREFIX= gnatdroid-
DISTFILES= ${IDENTIFICATION}.tar.bz2
diff --git a/lang/gnatdroid-binutils/Makefile b/lang/gnatdroid-binutils/Makefile
index 531d7aaf29f5..0b2c8049409e 100644
--- a/lang/gnatdroid-binutils/Makefile
+++ b/lang/gnatdroid-binutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= binutils
PORTVERSION= 2.25
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
PKGNAMEPREFIX= gnatdroid-
MAINTAINER= marino@FreeBSD.org
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 43d4fc5e30d6..59831da0acef 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -6,8 +6,7 @@ PORTNAME= guile
PORTVERSION= 1.8.8
PORTREVISION= 2
CATEGORIES= lang scheme
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= guile
+MASTER_SITES= GNU
MAINTAINER= bofh@FreeBSD.org
COMMENT= GNU Ubiquitous Intelligent Language for Extension
diff --git a/lang/libstdc++_stldoc_4.2.2/Makefile b/lang/libstdc++_stldoc_4.2.2/Makefile
index bb73b84ec11c..10ddb2727ba9 100644
--- a/lang/libstdc++_stldoc_4.2.2/Makefile
+++ b/lang/libstdc++_stldoc_4.2.2/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libstdc++_stldoc_4.2.2
PORTVERSION= 20071101
PORTREVISION= 1
CATEGORIES= lang devel
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= libstdc++/doxygen
+MASTER_SITES= GCC/libstdc++/doxygen
DISTNAME= libstdc++-html-USERS-4.2.2
MAINTAINER= ports@FreeBSD.org
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index bdac81fd0a67..315f5b931b3c 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -7,7 +7,6 @@ PORTVERSION= 4.02.1
CATEGORIES= lang
MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs
-MASTER_SITE_SUBDIR= distfiles
PKGNAMESUFFIX= ${SFX}
MAINTAINER= michipili@gmail.com
diff --git a/lang/p5-v6/Makefile b/lang/p5-v6/Makefile
index d72fea90c90b..448e08f303e1 100644
--- a/lang/p5-v6/Makefile
+++ b/lang/p5-v6/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.017
PORTREVISION= 1
CATEGORIES= lang perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ../by-authors/id/F/FG/FGLOCK
+MASTER_SITE_SUBDIR= CPAN:FGLOCK
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-alpha-${PORTVERSION}
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index bad2972a3f95..613a27a896cf 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -5,8 +5,7 @@ PORTNAME= php5
PORTVERSION= 5.4.40
PORTREVISION?= 0
CATEGORIES?= lang devel www
-MASTER_SITES= ${MASTER_SITE_PHP}
-MASTER_SITE_SUBDIR= distributions
+MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
@@ -63,8 +62,7 @@ DESTDIRNAME= INSTALL_ROOT
PATCH_DIST_STRIP= -p1
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= ale
+PATCH_SITES+= LOCAL/ale
.if ${PORT_OPTIONS:MMAILHEAD}
PATCHFILES+= php-5.4.x-mail-header.patch:mail
diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index a847afab06ca..bd211e5c83b1 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -5,8 +5,7 @@ PORTNAME= php55
PORTVERSION= 5.5.24
PORTREVISION?= 0
CATEGORIES?= lang devel www
-MASTER_SITES= ${MASTER_SITE_PHP}
-MASTER_SITE_SUBDIR= distributions
+MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
@@ -63,8 +62,7 @@ DESTDIRNAME= INSTALL_ROOT
PATCH_DIST_STRIP= -p1
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= ale
+PATCH_SITES+= LOCAL/ale
.if ${PORT_OPTIONS:MMAILHEAD}
PATCHFILES+= php-5.5.x-mail-header.patch:mail
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index d71863867f77..5f089af9e0d9 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -5,8 +5,7 @@ PORTNAME= php56
PORTVERSION= 5.6.8
PORTREVISION?= 0
CATEGORIES?= lang devel www
-MASTER_SITES= ${MASTER_SITE_PHP}
-MASTER_SITE_SUBDIR= distributions
+MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
@@ -63,8 +62,7 @@ DESTDIRNAME= INSTALL_ROOT
PATCH_DIST_STRIP= -p1
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= ale
+PATCH_SITES+= LOCAL/ale
.if ${PORT_OPTIONS:MMAILHEAD}
PATCHFILES+= php-5.5.x-mail-header.patch:mail
diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index 4de64b1434cb..0df734ca0ec1 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -4,9 +4,8 @@
PORTNAME= python-doc-${DOCFORMAT}
PORTVERSION= ${PYTHON_PORTVERSION}
CATEGORIES= lang python
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/doc/${PORTVERSION} \
- ftp/python/doc/current
+MASTER_SITES= PYTHON/ftp/python/doc/${PORTVERSION} \
+ PYTHON/ftp/python/doc/current
DISTNAME= python-${PORTVERSION}-docs-${DOCFORMAT}
DIST_SUBDIR= python
diff --git a/lang/python-tools/Makefile b/lang/python-tools/Makefile
index 2952f0c77b82..97fb063f24b5 100644
--- a/lang/python-tools/Makefile
+++ b/lang/python-tools/Makefile
@@ -3,8 +3,7 @@
PORTNAME= python-tools
PORTVERSION= ${PYTHON_PORTVERSION}
CATEGORIES= lang python devel
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index f9972e70d9e7..5d4903c39c57 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -4,8 +4,7 @@ PORTNAME= python27
PORTVERSION= 2.7.9
PORTREVISION= 1
CATEGORIES= lang python ipv6
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
DISTNAME= Python-${PORTVERSION}
DIST_SUBDIR= python
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index ef3ceb3e244f..3bbcf0816851 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -4,8 +4,7 @@ PORTNAME= python32
PORTVERSION= 3.2.5
PORTREVISION= 13
CATEGORIES= lang python ipv6
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
DISTNAME= Python-${PORTVERSION}
DIST_SUBDIR= python
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 45c54ed5fb59..1755b4c376d0 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -4,8 +4,7 @@ PORTNAME= python33
PORTVERSION= 3.3.5
PORTREVISION= 6
CATEGORIES= lang python ipv6
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
DISTNAME= Python-${PORTVERSION}
DIST_SUBDIR= python
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index c7db4d43039a..35b9724620eb 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -5,8 +5,7 @@ PORTNAME= python34
PORTVERSION= 3.4.3
PORTREVISION= 1
CATEGORIES= lang python ipv6
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
DISTNAME= Python-${PORTVERSION}
DIST_SUBDIR= python
diff --git a/lang/ratfor/Makefile b/lang/ratfor/Makefile
index c18226c14425..0cfd1889fedf 100644
--- a/lang/ratfor/Makefile
+++ b/lang/ratfor/Makefile
@@ -5,9 +5,8 @@ PORTNAME= ratfor
PORTVERSION= 1985.06
PORTREVISION= 5
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/obrien \
http://sepwww.stanford.edu/sep/prof/
-MASTER_SITE_SUBDIR= obrien
DISTFILES= ratfor.shar.2 local.ratfor77.shar
MAINTAINER= bofh@FreeBSD.org
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile
index 00ae267d21f1..a025ff2ce968 100644
--- a/lang/rhino/Makefile
+++ b/lang/rhino/Makefile
@@ -6,8 +6,7 @@ DISTVERSION= 1_7R4
CATEGORIES= lang java
MASTER_SITES= http://cloud.github.com/downloads/mozilla/rhino/:rhino \
LOCAL/nivit/${PORTNAME}/:swingex \
- ${MASTER_SITE_APACHE}:xmlbeans
-MASTER_SITE_SUBDIR= xmlbeans/binaries/:xmlbeans
+ APACHE/xmlbeans/binaries/:xmlbeans
DISTFILES= ${PORTNAME}${DISTVERSION}.zip:rhino \
src.zip:swingex \
xmlbeans-2.5.0.zip:xmlbeans
diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile
index 804a60cfb9cd..fafe9df09214 100644
--- a/lang/ruby20/Makefile
+++ b/lang/ruby20/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= ${RUBY_PORTVERSION}
PORTREVISION= ${RUBY_PORTREVISION}
PORTEPOCH= ${RUBY_PORTEPOCH}
CATEGORIES= lang ruby ipv6
-MASTER_SITES= ${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR= ${MASTER_SITE_SUBDIR_RUBY}
+MASTER_SITES= RUBY/${MASTER_SITE_SUBDIR_RUBY}
DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index 11ce9d211154..4faab73c62d5 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= ${RUBY_PORTVERSION}
PORTREVISION= ${RUBY_PORTREVISION}
PORTEPOCH= ${RUBY_PORTEPOCH}
CATEGORIES= lang ruby ipv6
-MASTER_SITES= ${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR= ${MASTER_SITE_SUBDIR_RUBY}
+MASTER_SITES= RUBY/${MASTER_SITE_SUBDIR_RUBY}
DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile
index fe7c841f267c..140f55029467 100644
--- a/lang/ruby22/Makefile
+++ b/lang/ruby22/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= ${RUBY_PORTVERSION}
PORTREVISION= ${RUBY_PORTREVISION}
PORTEPOCH= ${RUBY_PORTEPOCH}
CATEGORIES= lang ruby ipv6
-MASTER_SITES= ${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR= ${MASTER_SITE_SUBDIR_RUBY}
+MASTER_SITES= RUBY/${MASTER_SITE_SUBDIR_RUBY}
DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile
index b164ca46565c..63954f65bb2f 100644
--- a/lang/sagittarius-scheme/Makefile
+++ b/lang/sagittarius-scheme/Makefile
@@ -4,9 +4,8 @@
PORTNAME= sagittarius
PORTVERSION= 0.6.3
CATEGORIES= lang
-MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ashish
+MASTER_SITES= http://distfiles.pirateparty.in/ashish/ \
+ LOCAL/ashish
PKGNAMESUFFIX= -scheme
MAINTAINER= ashish@FreeBSD.org
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index 94ee9537585e..33befa1fe403 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -4,8 +4,7 @@
PORTNAME= siod
PORTVERSION= 3.4
CATEGORIES= lang scheme
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkoshy
+MASTER_SITES= LOCAL/jkoshy
DISTNAME= siod
EXTRACT_SUFX= .tgz
diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile
index 4394ed9296ae..a2a3ce8d65e3 100644
--- a/lang/spidermonkey17/Makefile
+++ b/lang/spidermonkey17/Makefile
@@ -5,8 +5,7 @@ PORTNAME= spidermonkey17
DISTVERSION= 1.7.0
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= js
+MASTER_SITES= MOZILLA_EXTENDED/js
DISTNAME= js-${DISTVERSION}
MAINTAINER= citric@cubicone.tmetic.com
diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile
index cf805be975e2..98b3c20cba7f 100644
--- a/lang/spidermonkey170/Makefile
+++ b/lang/spidermonkey170/Makefile
@@ -5,8 +5,7 @@ PORTNAME= spidermonkey170
PORTVERSION= 17.0.0
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= js
+MASTER_SITES= MOZILLA/js
DISTNAME= mozjs${PORTVERSION}
MAINTAINER= kwm@FreeBSD.org
diff --git a/lang/spidermonkey185/Makefile b/lang/spidermonkey185/Makefile
index 35d20f50222b..24983a494a27 100644
--- a/lang/spidermonkey185/Makefile
+++ b/lang/spidermonkey185/Makefile
@@ -5,8 +5,7 @@ PORTNAME= spidermonkey185
PORTVERSION= 1.8.5
PORTREVISION= 2
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= js
+MASTER_SITES= MOZILLA/js
DISTNAME= js185-1.0.0
MAINTAINER= koobs@FreeBSD.org
diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile
index 1c25f1abbf6e..0c262911d6fe 100644
--- a/lang/spidermonkey24/Makefile
+++ b/lang/spidermonkey24/Makefile
@@ -5,9 +5,8 @@ PORTNAME= spidermonkey24
PORTVERSION= 24.2.0
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_MOZILLA}
+MASTER_SITES= MOZILLA/js
#http://people.mozilla.org/~sstangl/
-MASTER_SITE_SUBDIR= js
DISTNAME= mozjs-${PORTVERSION}
MAINTAINER= kwm@FreeBSD.org
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 2756c4635477..f62e3c9a50d9 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 8.4.20
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= lang tcl
-MASTER_SITES= ${MASTER_SITE_TCLTK} \
+MASTER_SITES= TCLTK/tcl8_4 \
SF/tcl/Tcl/${PORTVERSION}
-MASTER_SITE_SUBDIR= tcl8_4
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index 58f4a2ab41d7..ad69b7b44393 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -4,9 +4,8 @@
PORTNAME= tcl
PORTVERSION= 8.5.18
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_TCLTK} \
+MASTER_SITES= TCLTK/tcl8_5 \
SF/tcl/Tcl/${PORTVERSION}
-MASTER_SITE_SUBDIR=tcl8_5
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 966a405e3313..6697ee76e0ad 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tcl
PORTVERSION= 8.6.4
CATEGORIES= lang
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \
- ${MASTER_SITE_TCLTK}
-MASTER_SITE_SUBDIR=tcl8_6
+ TCLTK/tcl8_6
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/lang/tinypy/Makefile b/lang/tinypy/Makefile
index 552c5f126db7..646dc925f478 100644
--- a/lang/tinypy/Makefile
+++ b/lang/tinypy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tinypy
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= lang python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= saper@saper.info
COMMENT= Minimalist implementation of python in 64k of code
diff --git a/lang/ypsilon/Makefile b/lang/ypsilon/Makefile
index 6cd9bc3a967e..a5a6e419f37b 100644
--- a/lang/ypsilon/Makefile
+++ b/lang/ypsilon/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ypsilon
PORTVERSION= 0.9.6.3
PORTREVISION= 3
CATEGORIES= lang scheme
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}-0.9.6.update3
MAINTAINER= vmagerya@gmail.com
diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile
index ebd92ba4714d..87da622031a5 100644
--- a/mail/antivirus-milter/Makefile
+++ b/mail/antivirus-milter/Makefile
@@ -4,8 +4,7 @@ PORTNAME= antivirus
PORTVERSION= 3.30
PORTREVISION= 7
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Sendmail milter wich uses McAfee Virus Scan or clamav
diff --git a/mail/bsfilter/Makefile b/mail/bsfilter/Makefile
index 7a53dc19a2b6..387c6570ac19 100644
--- a/mail/bsfilter/Makefile
+++ b/mail/bsfilter/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bsfilter
PORTVERSION= 1.0.19
PORTREVISION= 1
CATEGORIES= mail ruby
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= bsfilter/59804
+MASTER_SITES= SFJP/bsfilter/59804
MAINTAINER= yasu@utahime.org
COMMENT= Bayesian spam filter written in Ruby
diff --git a/mail/bsmtp/Makefile b/mail/bsmtp/Makefile
index c6bc6360de1d..4a52412cab2b 100644
--- a/mail/bsmtp/Makefile
+++ b/mail/bsmtp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bsmtp
PORTVERSION= 1.02
PORTREVISION= 5
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= naddy
+MASTER_SITES= LOCAL/naddy
MAINTAINER= naddy@FreeBSD.org
COMMENT= Batch SMTP support for sendmail, incoming and outgoing
diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile
index 8b0cb55bb9c7..607c9f59242e 100644
--- a/mail/c-sig/Makefile
+++ b/mail/c-sig/Makefile
@@ -5,8 +5,7 @@ PORTNAME= c-sig
PORTVERSION= 3.8
PORTREVISION= 16
CATEGORIES= mail elisp
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+MASTER_SITES= LOCAL/tota/${PORTNAME}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= ${PORTNAME}.${PORTVERSION}
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index ddb17501584f..238476525cba 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -5,9 +5,7 @@ PORTNAME= coolmail
PORTVERSION= 1.3
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=system/mail/biffs
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SUNSITE/system/mail/biffs
MAINTAINER= udo.schweigert@siemens.com
COMMENT= Xbiff like mail tool with animated 3D graphics
@@ -15,6 +13,7 @@ COMMENT= Xbiff like mail tool with animated 3D graphics
PLIST_FILES= bin/coolmail \
man/man1/coolmail.1.gz
+USES= tar:tgz
USE_XORG= x11 xext xmu xi
PATCH_STRIP= -p1
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 3961e87b7a00..ecacd62f790b 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/ \
http://ftp.riken.go.jp/archives/net/mail/pop/cucipop/ \
http://horms.net/projects/cucipop/download/
-PATCH_SITES= ${MASTER_SITE_RINGSERVER}
-PATCH_SITE_SUBDIR= net/kame/misc
+PATCH_SITES= RINGSERVER/net/kame/misc
PATCHFILES= cucipop-1.31-v6-20010223.diff.gz
PATCH_DIST_STRIP= -p1
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 5373cf2900be..97f359f4313a 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -109,8 +109,7 @@ GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
.if ${PORT_OPTIONS:MAUTOCREATE} || ${PORT_OPTIONS:MAUTOSIEVE}
PATCH_DIST_STRIP= -p1
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= mm
+PATCH_SITES+= LOCAL/mm
.endif
.if ${PORT_OPTIONS:MAUTOCREATE}
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 11ada16d040d..74c744c16698 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dspam
PORTVERSION= 3.10.2
CATEGORIES= mail
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= danny@dannywarren.com
COMMENT= Bayesian spam filter
diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index 4a4122b1dc8d..b0e2d92b4eed 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -4,8 +4,7 @@
PORTNAME= exim
PORTVERSION= 4.85
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/}
-MASTER_SITE_SUBDIR= exim4/:exim
+MASTER_SITES= EXIM/exim4/:exim
PKGNAMESUFFIX= -doc-${DOCFORMAT}
DISTNAME= exim-${DISTDOCFORMAT}-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index c74fd912d1c1..49d6829de1be 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -5,8 +5,7 @@ PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
PORTREVISION?= 1
CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/}
-MASTER_SITE_SUBDIR= exim4/:exim
+MASTER_SITES= EXIM/exim4/:exim
DISTNAME= ${PORTNAME}-${EXIM_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim
DIST_SUBDIR= exim
@@ -95,7 +94,6 @@ WITH_OPENSSL_PORT= yes
.if ${PORT_OPTIONS:MSA_EXIM} || defined(FETCH_ALL)
MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \
SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim
-MASTER_SITE_SUBDIR+= sa-exim/:sa_exim
DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
.endif
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 28c9519af864..0712ec315a1f 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -7,9 +7,7 @@ PORTNAME= exmh
PORTVERSION= 2.8.0
PORTREVISION= 1
CATEGORIES+= mail tk
-MASTER_SITES= ${MASTER_SITE_TCLTK} \
- SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= TCLTK/${PORTNAME} SF/${PORTNAME}
MAINTAINER?= cy@FreeBSD.org
COMMENT?= X11/TK based mail reader front end to MH
diff --git a/mail/greylite/Makefile b/mail/greylite/Makefile
index 84f54e2bb88b..f998b93e107e 100644
--- a/mail/greylite/Makefile
+++ b/mail/greylite/Makefile
@@ -5,8 +5,7 @@ PORTNAME= greylite
PORTVERSION= 2.3
PORTREVISION= 4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= oliver
+MASTER_SITES= LOCAL/oliver
MAINTAINER= oliver@FreeBSD.org
COMMENT= Modified greylisting for qmail and for any other MDA
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index 8d8c07155d11..4626ba4e4dee 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.2
PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \
- LOCAL
-MASTER_SITE_SUBDIR= obrien
+ LOCAL/obrien
MAINTAINER= obrien@FreeBSD.org
COMMENT= Replacement for xbiff that handles popup window with mail headers
diff --git a/mail/imaptools/Makefile b/mail/imaptools/Makefile
index db94d2644982..853c0073a512 100644
--- a/mail/imaptools/Makefile
+++ b/mail/imaptools/Makefile
@@ -4,8 +4,7 @@
PORTNAME= imaptools
PORTVERSION= 1.135
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= bsam
+MASTER_SITES= LOCAL/bsam
DISTNAME= imap_tools_V${PORTVERSION}
MAINTAINER= bsam@FreeBSD.org
diff --git a/mail/james/Makefile b/mail/james/Makefile
index a422294df59b..5a48731b3e48 100644
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@@ -5,8 +5,7 @@ PORTNAME= james
PORTVERSION= 2.3.1
PORTREVISION= 1
CATEGORIES= mail java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/server/binaries
+MASTER_SITES= APACHE/${PORTNAME}/server/binaries
DISTNAME= ${PORTNAME}-binary-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/lens/Makefile b/mail/lens/Makefile
index efc198e7c062..b4a0f0b740b1 100644
--- a/mail/lens/Makefile
+++ b/mail/lens/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= mail ruby
MASTER_SITES= http://www.pitecan.com/Lens/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/lens|}
+ LOCAL/tota/lens
MAINTAINER= tota@FreeBSD.org
COMMENT= Mail filter written in Ruby
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 4a3e2d3a54a8..d9d7f582e0d4 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -8,7 +8,7 @@ PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://www.stafford.uklinux.net/libesmtp/ \
http://ftp.osuosl.org/pub/blfs/svn/l/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for posting electronic mail
diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile
index 3a4a79cf4dab..a3d2af5747ea 100644
--- a/mail/libsrs2/Makefile
+++ b/mail/libsrs2/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libsrs2
PORTVERSION= 1.0.18
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= http://www.libsrs2.org/%SUBDIR%/
-MASTER_SITE_SUBDIR= srs
+MASTER_SITES= http://www.libsrs2.org/srs/
MAINTAINER= pi@FreeBSD.org
COMMENT= Sender Rewriting Scheme 2 C Implementation
diff --git a/mail/lmtp2nntp/Makefile b/mail/lmtp2nntp/Makefile
index f5ae48091e22..a76601edbd7a 100644
--- a/mail/lmtp2nntp/Makefile
+++ b/mail/lmtp2nntp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= lmtp2nntp
PORTVERSION= 1.4.1
CATEGORIES= mail news
-MASTER_SITES= ${MASTER_SITE_OSSP}
-MASTER_SITE_SUBDIR= tool/${PORTNAME}
+MASTER_SITES= OSSP/tool/${PORTNAME}
MAINTAINER= vd@FreeBSD.org
COMMENT= OSSP mail to news gateway
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 84624d2bc026..cea2c44f06a2 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mail-notification
DISTVERSION= 5.4
PORTREVISION= 15
CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= mailnotify-orig
+MASTER_SITES= SAVANNAH/mailnotify-orig
MAINTAINER= ports@FreeBSD.org
COMMENT= Mail notification for freedesktop.org-compliant system trays
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 461cf795676b..c219d2f1c89e 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -4,10 +4,9 @@
PORTNAME= mailman
DISTVERSION= 2.1.20
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_GNU} \
+MASTER_SITES= GNU \
SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
https://launchpad.net/mailman/${DISTVERSION:R}/${DISTVERSION}/+download/
-MASTER_SITE_SUBDIR= ${PORTNAME}
DIST_SUBDIR= mailman
PATCH_DIST_STRIP= -p1
diff --git a/mail/mailtray/Makefile b/mail/mailtray/Makefile
index ef2ec586704c..72c8299b3145 100644
--- a/mail/mailtray/Makefile
+++ b/mail/mailtray/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mailtray
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= mail python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Display email status in tray
diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile
index 750ea3c22969..7a7760e1dbcf 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -5,10 +5,10 @@ PORTNAME= mailx
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
DISTFILES= mail-2.2.8.tar.gz mailx-memo-2.2.8R
-PATCH_SITES= ${MASTER_SITE_PORTS_JP}
+PATCH_SITES= PORTS_JP
PATCHFILES= mailx.v05.patch.gz
PATCH_DIST_STRIP= -p1
diff --git a/mail/missey/Makefile b/mail/missey/Makefile
index 9b8023764a1a..a4a8b62db0cb 100644
--- a/mail/missey/Makefile
+++ b/mail/missey/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dengh.com/missey/
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/%SUBDIR%/delphij/}
+MASTER_SITES+= LOCAL/delphij
DISTNAME= mps.${PORTVERSION}
MAINTAINER= delphij@FreeBSD.org
diff --git a/mail/mlmmj/Makefile b/mail/mlmmj/Makefile
index 8b5717878f79..fc82a85bc2e5 100644
--- a/mail/mlmmj/Makefile
+++ b/mail/mlmmj/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mlmmj
PORTVERSION= 1.2.17.1
CATEGORIES= mail
MASTER_SITES= http://mlmmj.org/releases/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brix
+ LOCAL/brix
MAINTAINER= xi@borderworlds.dk
COMMENT= Mailing list managing made joyful
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 03a6483f9123..e0c92e633eeb 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -4,8 +4,7 @@
PORTNAME= nmh
PORTVERSION= 1.6
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= nmh
+MASTER_SITES= SAVANNAH
MAINTAINER= cy@FreeBSD.org
COMMENT= Cleaned up MH mailer suite
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index ad901399d2b6..292556be8178 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -8,7 +8,6 @@ PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://untroubled.org/nullmailer/ \
http://untroubled.org/nullmailer/archive/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
MAINTAINER= uffe@uffe.org
COMMENT= MTA for hosts which relay to a fixed set of smart relays
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 450e0bcbb178..9b54aa141a3b 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -5,9 +5,8 @@ PORTNAME= opendkim
PORTVERSION= 2.9.2
PORTREVISION= 6
CATEGORIES= mail security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME} \
- ${PORTNAME}/Previous%20Releases
+MASTER_SITES= SF/${PORTNAME} \
+ SF/${PORTNAME}/Previous%20Releases
MAINTAINER= umq@ueo.co.jp
COMMENT= DKIM library and milter implementation
diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
index 28c6ee753a23..8e255081cfe5 100644
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@@ -4,9 +4,8 @@
PORTNAME= opendmarc
PORTVERSION= 1.3.1
CATEGORIES= mail security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME} \
- ${PORTNAME}/Previous%20Releases
+MASTER_SITES= SF/${PORTNAME} \
+ SF/${PORTNAME}/Previous%20Releases
MAINTAINER= freebsd@gushi.org
COMMENT= DMARC library and milter implementation
diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile
index db1c1ca75fa5..4427df878c32 100644
--- a/mail/openwebmail/Makefile
+++ b/mail/openwebmail/Makefile
@@ -5,9 +5,8 @@ PORTNAME= openwebmail
PORTVERSION= 2.53
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= http://openwebmail.acatysmoof.com/download/%SUBDIR%/ \
- http://openwebmail.org/openwebmail/download/%SUBDIR%/
-MASTER_SITE_SUBDIR?= release
+MASTER_SITES= http://openwebmail.acatysmoof.com/download/release/ \
+ http://openwebmail.org/openwebmail/download/release/
MAINTAINER= crees@FreeBSD.org
COMMENT= Webmail system designed to manage big mail folder files efficiently
diff --git a/mail/p5-Email-Abstract/Makefile b/mail/p5-Email-Abstract/Makefile
index 6b7ef5e1eb0b..50c1ef59d460 100644
--- a/mail/p5-Email-Abstract/Makefile
+++ b/mail/p5-Email-Abstract/Makefile
@@ -4,7 +4,6 @@ PORTNAME= Email-Abstract
PORTVERSION= 3.008
CATEGORIES= mail perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Email
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index 35c1002ca800..6dd18dbb645b 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.04.1
PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Email
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
diff --git a/mail/p5-Mail-LMLM/Makefile b/mail/p5-Mail-LMLM/Makefile
index b732b662877c..a0d220cc2168 100644
--- a/mail/p5-Mail-LMLM/Makefile
+++ b/mail/p5-Mail-LMLM/Makefile
@@ -5,7 +5,6 @@ PORTNAME= Mail-LMLM
PORTVERSION= 0.6804
CATEGORIES= mail perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index ccd3f6e42392..f6abc8c475f7 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -5,7 +5,7 @@ PORTNAME= Net-SMTP-Server
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= mail perl5
-MASTER_SITES= CPAN
+MASTER_SITES= CPAN http://www.macgyver.org/software/perl/
PKGNAMEPREFIX= p5-
DISTNAME= SMTP-Server-${PORTVERSION}
@@ -18,7 +18,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
RUN_DEPENDS:= ${BUILD_DEPENDS}
-MASTER_SITE_BACKUP+= http://www.macgyver.org/software/perl/
USES= perl5
USE_PERL5= configure
diff --git a/mail/pm-lib/Makefile b/mail/pm-lib/Makefile
index 943cc4617454..4c8da526006f 100644
--- a/mail/pm-lib/Makefile
+++ b/mail/pm-lib/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pm-lib
PORTVERSION= 20091202
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= procmail-lib
+MASTER_SITES= SAVANNAH/procmail-lib
DISTNAME= procmail-lib-2009.1202
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 31a3cecb4043..3aaccd01abd5 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -200,8 +200,7 @@ POSTFIX_CCARGS+= -DNO_TLS
.if ${PORT_OPTIONS:MSPF}
BROKEN= At the moment, SPF support is unavailable for ${PORTNAME}-${DISTVERSION}
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= mm
+PATCH_SITES+= LOCAL/mm
PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz
PATCH_DIST_STRIP= -p1
POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 1c64cd2bb78e..53b4c1fe2fd5 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -182,8 +182,7 @@ POSTFIX_CCARGS+= -DNO_TLS
.endif
.if ${PORT_OPTIONS:MSPF}
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= mm
+PATCH_SITES+= LOCAL/mm
PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz
PATCH_DIST_STRIP= -p1
POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include
diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index a673e91bc5c5..9235bf2964ac 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= postfixadmin
PORTVERSION= 2.3.7
PORTREVISION= 1
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports.maintainer@evilphi.com
COMMENT= PHP web-based management tool for Postfix virtual domains and users
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index 0eb9b2846c57..1a6e0f456f1f 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.1
PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://cr.yp.to/software/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
DISTFILES= dot-forward-${DF_VER}.tar.gz \
fastforward-${FF_VER}.tar.gz
diff --git a/mail/qmail-dk/Makefile b/mail/qmail-dk/Makefile
index f86fd4f267ff..f05107161598 100644
--- a/mail/qmail-dk/Makefile
+++ b/mail/qmail-dk/Makefile
@@ -4,7 +4,7 @@ PORTNAME= dk
PORTVERSION= 0.54
PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_QMAIL}
+MASTER_SITES= QMAIL
PKGNAMEPREFIX= qmail-
DISTFILES= qmail-1.03.tar.gz
DIST_SUBDIR= qmail
@@ -14,7 +14,7 @@ COMMENT= DomainKeys implementation for qmail
LIB_DEPENDS+= libdomainkeys.so:${PORTSDIR}/mail/libdomainkeys
-PATCH_SITES= ${MASTER_SITE_QMAIL}
+PATCH_SITES= QMAIL
PATCHFILES= qmail-1.03-dk-0.54.patch
USES= qmail
diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile
index 798179fd6280..b99541f3716f 100644
--- a/mail/qmail-spamcontrol/Makefile
+++ b/mail/qmail-spamcontrol/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= ${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES+= http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \
- ${MASTER_SITE_LOCAL:S/$/:spamcontrol/}
-MASTER_SITE_SUBDIR= bdrewery/qmail/:spamcontrol
+ LOCAL/bdrewery/qmail/:spamcontrol
PKGNAMESUFFIX= -spamcontrol
DISTFILES= ${QMAIL_DIST} ${SPAMCONTROL_DIST}:spamcontrol
EXTRACT_ONLY= ${QMAIL_DIST}
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index ad37188c2fa4..82cd77085c2f 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ${QMAIL_PORTNAME}
PORTVERSION?= ${QMAIL_VERSION}
PORTREVISION?= 1
CATEGORIES= mail
-MASTER_SITES+= ${MASTER_SITE_QMAIL}
+MASTER_SITES+= QMAIL
DISTNAME= ${PORTNAME}-${QMAIL_VERSION}
DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY?= ${DISTNAME}${EXTRACT_SUFX}
@@ -175,8 +175,7 @@ TLS_PATCH_NAME= ${QMAIL_PORTNAME}-${QMAIL_VERSION}-tls-${TLS_PATCH_DATE}.patch
PATCHFILES+= ${TLS_PATCH_NAME}:tls
.endif
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
+PATCH_SITES+= LOCAL/bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
PATCH_SITES+= http://mirror.shatow.net/freebsd/qmail/:DEFAULT,dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
OPTIONS_DEFINE+=DOCS
@@ -438,8 +437,7 @@ DISTFILES+= ${SRS_LDAP_PATCH}:srs_ldap
.if ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
MASTER_SITES+= http://tomclegg.net/qmail/:smtp_auth \
- ${MASTER_SITE_LOCAL:S/$/:smtp_auth/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:smtp_auth
+ LOCAL/bdrewery/qmail/:smtp_auth
DISTFILES+= qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz:smtp_auth
EXTRACT_ONLY+= qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz
MASTER_SITES+= http://tomclegg.net/qmail/:close3
@@ -475,8 +473,7 @@ PATCHFILES+= qmail-discard-double-bounces.patch:doublebounce
. if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
. if defined(SLAVE_SPAMCONTROL)
SPF_SPAMCONTROL_PATCH= qmail-spf-rc5.patch-spamcontrol-27_2
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:spf_spamcontrol
+PATCH_SITES+= LOCAL/bdrewery/qmail/:spf_spamcontrol
PATCHFILES+= ${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
. else
# XXX - Move change out of conflicting Makefile hunk
@@ -486,8 +483,7 @@ SPF_TLS_PATCH= qmail-spf-rc5.patch-auth-tls-20110119
SPF_TLS_PATCH= qmail-spf-rc5.patch-tls-20110119
. endif
#MASTER_SITES+= http://manuel.mausz.at/programming/patches/qmail/:spf_tls
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:spf_tls/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:spf_tls
+MASTER_SITES+= LOCAL/bdrewery/qmail/:spf_tls
DISTFILES+= ${SPF_TLS_PATCH}:spf_tls
. endif
. else
@@ -501,8 +497,7 @@ PLIST_SUB+= EXTTODO=""
DOCFILES_WRKSRC+= EXTTODO
. if !empty(PORT_OPTIONS:MBIG_TODO_PATCH) || !empty(PORT_OPTIONS:MBIGTODO)
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:ext_big_todo/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:ext_big_todo
+MASTER_SITES+= LOCAL/bdrewery/qmail/:ext_big_todo
EXT_BIG_TODO_PATCH= ext_todo-20030105+big-todo.103.patch
DISTFILES+= ${EXT_BIG_TODO_PATCH}:ext_big_todo
. endif
@@ -511,22 +506,18 @@ DISTFILES+= ${EXT_BIG_TODO_PATCH}:ext_big_todo
. if defined(SLAVE_TLS)
# XXX - Move qmail-todo out of conflicting Makefile hunk
EXTTODO_PATCH= ext_todo-20030105_spf_tls.patch
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:exttodo
+MASTER_SITES+= LOCAL/bdrewery/qmail/:exttodo
DISTFILES+= ${EXTTODO_PATCH}:exttodo
. else
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:exttodo
+PATCH_SITES+= LOCAL/bdrewery/qmail/:exttodo
PATCHFILES+= ext_todo-20030105_spf.patch:exttodo
. endif
. elif defined(SLAVE_MYSQL)
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
+PATCH_SITES+= LOCAL/bdrewery/qmail/:exttodo
PATCHFILES+= ext_todo-20030105_mysql.patch:exttodo
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:exttodo
. elif defined(SLAVE_TLS)
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/}
+PATCH_SITES+= LOCAL/bdrewery/qmail/:exttodo
PATCHFILES+= ext_todo-20030105_tls.patch:exttodo
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:exttodo
. else
PATCH_SITES+= http://www.nrg4u.com/qmail/:exttodo
PATCHFILES+= ext_todo-20030105.patch:exttodo
@@ -545,7 +536,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dns-cname
|| !empty(PORT_OPTIONS:MBIG_CONCURRENCY_PATCH) \
|| !empty(PORT_OPTIONS:MOUTGOINGIP_PATCH) \
|| !empty(PORT_OPTIONS:MQMTPC_PATCH)
-PATCH_SITES+= ${MASTER_SITE_QMAIL}
+PATCH_SITES+= QMAIL
.endif
.if ${PORT_OPTIONS:MQMAILQUEUE_PATCH}
@@ -588,38 +579,33 @@ SMTPEXTFORK_PATCH= smtpextfork-ldap-20060201_4.patch
. endif
MASTER_SITES+= http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail-smtpextfork/patches/:extfork \
- ${MASTER_SITE_LOCAL:S/$/:extfork/}
-MASTER_SITE_SUBDIR+= bdrewery/qmail/:extfork
+ LOCAL/bdrewery/qmail/:extfork
DISTFILES+= ${SMTPEXTFORK_PATCH:S/$/:extfork/} \
README.smtpextfork:extfork
.endif
.if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MSENDERCHECK4}
PATCH_SITES+= http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:sendercheck4 \
- ${MASTER_SITE_LOCAL:S/$/:sendercheck4/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:sendercheck4
+ LOCAL/bdrewery/qmail/:sendercheck4
PATCHFILES+= qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch:sendercheck4
.endif
.if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MGRTDELAY}
PATCH_SITES+= http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:grtdelay \
- ${MASTER_SITE_LOCAL:S/$/:grtdelay/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:grtdelay
+ LOCAL/bdrewery/qmail/:grtdelay
PATCHFILES+= qmail-ldap-20060201-grtdelay.patch:grtdelay
DOCFILES_WRKSRC+= README.GREETDELAY
.endif
.if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MENHACELOGS}
PATCH_SITES+= http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:ldapenhacelog \
- ${MASTER_SITE_LOCAL:S/$/:ldapenhacelog/}
-PATCH_SITE_SUBDIR+= bdrewery/qmail/:ldapenhacelog
+ LOCAL/bdrewery/qmail/:ldapenhacelog
PATCHFILES+= enhacelogging-ldap-20120221.patch:ldapenhacelog
.endif
.if defined(SLAVE_SPAMCONTROL)
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:ucspi_ssl/} \
+MASTER_SITES+= LOCAL/bdrewery/ucspi-ssl/:ucspi_ssl \
http://www.fehcom.de/ipnet/ucspi-ssl/:ucspi_ssl
-MASTER_SITE_SUBDIR+= bdrewery/ucspi-ssl/:ucspi_ssl
UCSPI_SSL_VER= 0.94
UCSPI_SSL_DIST= ucspi-ssl-${UCSPI_SSL_VER}.tgz
DISTFILES+= ${UCSPI_SSL_DIST}:ucspi_ssl
diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
index 72ecf0efa9aa..d2f41a2865c4 100644
--- a/mail/queue-fix/Makefile
+++ b/mail/queue-fix/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.netmeridian.com/e-huss/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER= bdrewery@FreeBSD.org
COMMENT= Repairs or generates a qmail queue structure
diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile
index 0d4d53f80aa6..2c7bd506f1e6 100644
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@@ -3,8 +3,7 @@
PORTNAME= raysfilter
PORTVERSION= 1.14
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= rays-filter-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index 7bff0a29ba4b..d4b01dac84dd 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ripmime
PORTVERSION= 1.4.0.10
CATEGORIES= mail
MASTER_SITES= http://www.pldaniels.com/ripmime/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Extracts attached files out of a MIME encoded email package
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index a23705014814..227b342c3c35 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sigrot
PORTVERSION= 1.0
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/mail/misc
+MASTER_SITES= SUNSITE/system/mail/misc
DISTNAME= ${PORTNAME}_v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index 1f593b57f7d4..14957ad7984d 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -3,9 +3,8 @@
PORTNAME= sma
PORTVERSION= 1.4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/dinoex \
ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Program that analyses Sendmail log entries
diff --git a/mail/smtpmail/Makefile b/mail/smtpmail/Makefile
index 1d11c23bb380..51352e726f79 100644
--- a/mail/smtpmail/Makefile
+++ b/mail/smtpmail/Makefile
@@ -4,8 +4,7 @@
PORTNAME= smtpmail
PORTVERSION= 0.4.5
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to send e-mail via a remote smtp server
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index ec341b0465d6..7298bf17342e 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -4,8 +4,7 @@
PORTNAME= spamass-milter
PORTVERSION= 0.4.0
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= spamass-milt
+MASTER_SITES= SAVANNAH/spamass-milt
MAINTAINER= bmah@FreeBSD.org
COMMENT= Sendmail Milter (mail filter) plugin for SpamAssassin
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 4210b47a039a..5b8ee16200ea 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -5,10 +5,8 @@ PORTNAME= spamassassin
PORTVERSION= 3.4.1
PORTREVISION?= 1 # also bump japanese/spamassassin
CATEGORIES?= mail perl5
-MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
-MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan
+MASTER_SITES= APACHE/spamassassin/source CPAN/Mail
DISTNAME= Mail-SpamAssassin-${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:apache,cpan
MAINTAINER?= adamw@FreeBSD.org
COMMENT?= Highly efficient mail filter for identifying spam
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index d8b243baba1f..8227eecc3a84 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= spamd
PORTVERSION= 4.9.1
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=freebsdspamd/spamd
+MASTER_SITES= SF/freebsdspamd/spamd
MAINTAINER= ohauer@FreeBSD.org
COMMENT= Traps spammers with a very slow smtp-login and return 4xx error
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 7f20b3938d76..223125c86152 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.60
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.wanlink.com/spamilter/download/
-MASTER_SITE_SUBDIR= dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Sendmail LibMilter filter to block spam
diff --git a/mail/spamstats/Makefile b/mail/spamstats/Makefile
index 7b33865259bd..bba8d326e0f4 100644
--- a/mail/spamstats/Makefile
+++ b/mail/spamstats/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.6c
PORTREVISION= 2
CATEGORIES= mail
#MASTER_SITES= http://www.inl.fr/download/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= leeym
+MASTER_SITES= LOCAL/leeym
MAINTAINER= leeym@FreeBSD.org
COMMENT= Tool to generate statistics for spamd of Mail::SpamAssassin
diff --git a/mail/squirrelmail-translations/Makefile b/mail/squirrelmail-translations/Makefile
index d630bfd55868..2fa3d324bfd4 100644
--- a/mail/squirrelmail-translations/Makefile
+++ b/mail/squirrelmail-translations/Makefile
@@ -4,8 +4,7 @@
PORTNAME= squirrelmail-translations
PORTVERSION= 20150324
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= adamw/squirrelmail
+MASTER_SITES= LOCAL/adamw/squirrelmail
DISTNAME= squirrelmail-${PORTVERSION}_0200-SVN.locales
DIST_SUBDIR= squirrelmail
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 68264016cf71..826eb8c05517 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ssmtp
PORTVERSION= 2.64
PORTREVISION= 1
CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}
MAINTAINER= aragon@phat.za.net
diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
index 443d26c4a174..f4935a1a06d2 100644
--- a/mail/thunderbird-dictionaries/Makefile
+++ b/mail/thunderbird-dictionaries/Makefile
@@ -5,8 +5,7 @@ PORTNAME= thunderbird-dictionaries
PORTVERSION= 20060220
PORTREVISION= 11
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_MOZDEV}
-MASTER_SITE_SUBDIR= dictionaries
+MASTER_SITES= MOZDEV/dictionaries
DISTFILES= # filled in later after options
DIST_SUBDIR= thunderbird
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index f406f12e4db1..d9d65f3268bf 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -6,9 +6,7 @@ PORTVERSION= 1.1.12
PORTREVISION= 1
CATEGORIES= mail python
MASTER_SITES= ftp://tmda.net/pub/tmda/releases/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sergei
-EXTRACT_SUFX= .tgz
+ LOCAL/sergei
MAINTAINER= ports@FreeBSD.org
COMMENT= Python-based SPAM reduction system
@@ -16,7 +14,7 @@ COMMENT= Python-based SPAM reduction system
OPTIONS_DEFINE= CDB DOCS EXAMPLES
CDB_RUN_DEPENDS=${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
-USES= python
+USES= python tar:tgz
SUB_FILES= pkg-message
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index ca69212ba6c1..9d3aa7e2f91d 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tpop3d
PORTVERSION= 1.5.5
PORTREVISION= 3
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= tpop3d
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Virtual-domain capable POP3 server supporting MySQL, PgSQL etc auth
diff --git a/mail/vacation/Makefile b/mail/vacation/Makefile
index 463356fdd9b3..1ec69d89177e 100644
--- a/mail/vacation/Makefile
+++ b/mail/vacation/Makefile
@@ -5,8 +5,7 @@ PORTNAME= vacation
PORTVERSION= 3.3.0
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/v/vacation/
+MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}-0.4
MAINTAINER= mcdouga9@egr.msu.edu
diff --git a/mail/vexim/Makefile b/mail/vexim/Makefile
index 6faaa5a7f566..7d973e54208e 100644
--- a/mail/vexim/Makefile
+++ b/mail/vexim/Makefile
@@ -4,8 +4,7 @@
PORTNAME= vexim
DISTVERSION= 2.2.2_rc1
CATEGORIES= mail www
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= feld
+MASTER_SITES= LOCAL/feld
DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= feld@FreeBSD.org
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 41ca85223060..19d5c88d20fb 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmail
PORTVERSION= 1.6
PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= XCONTRIB/applications
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= sjroz@verizon.net
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 14851df6fbdc..6c7a5d4060de 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= xpbiff
PORTVERSION?= 1.27
PORTREVISION= 4
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sanpei
+MASTER_SITES= LOCAL/sanpei
DISTNAME= xpbiff
DISTFILES= xpbiff-1.27-with-YOUBIN.tar.gz.uu
diff --git a/math/R-cran-SuppDists/Makefile b/math/R-cran-SuppDists/Makefile
index a44b18e4afd6..ad9a40cd1f1c 100644
--- a/math/R-cran-SuppDists/Makefile
+++ b/math/R-cran-SuppDists/Makefile
@@ -5,7 +5,7 @@ PORTNAME= SuppDists
DISTVERSION= 1.1-9.1
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_CRAN} \
+MASTER_SITES= CRAN \
http://r.research.att.com/benchmarks/:benchmark \
LOCAL/bf:benchmark
DISTFILES= ${PORTNAME}_${DISTVERSION}${EXTRACT_SUFX} \
diff --git a/math/R/Makefile b/math/R/Makefile
index db6a77040c8b..011d299e801d 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -22,8 +22,7 @@ MASTER_SITES= http://cran.r-project.org/%SUBDIR%/ \
MASTER_SITE_SUBDIR= src/base/R-${PORTVERSION:C|\..*||}
DISTNAME= R-${PORTVERSION}
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= bf
+PATCH_SITES= LOCAL/bf
PATCHFILES= R-patched-20131112-r64207.diff.bz2
MAINTAINER= bf@FreeBSD.org
diff --git a/math/apc/Makefile b/math/apc/Makefile
index 4209856d976a..fe0005840825 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= apc
PORTVERSION= 1.0
PORTREVISION= 8
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+MASTER_SITES= LOCAL/arved
MAINTAINER= ports@FreeBSD.org
COMMENT= Xforms based Auto Payment Calculator
diff --git a/math/aspcud/Makefile b/math/aspcud/Makefile
index 2bea62db5b72..299d81079023 100644
--- a/math/aspcud/Makefile
+++ b/math/aspcud/Makefile
@@ -5,8 +5,7 @@ PORTNAME= aspcud
PORTVERSION= 1.9.0
DISTVERSIONSUFFIX= -source
CATEGORIES= math ports-mgmt sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= potassco/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION}
MAINTAINER= vsevolod@FreeBSD.org
COMMENT= Advanced solver for package dependencies
diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index f09186aecd8a..f4ef9dbbdbcf 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -5,8 +5,7 @@ PORTNAME= blacs
PORTVERSION= 1.7
PORTREVISION= 24
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_NETLIB}
-MASTER_SITE_SUBDIR=blacs
+MASTER_SITES= NETLIB/blacs
DISTNAME= BLACS
DISTFILES= mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz
DIST_SUBDIR= blacs
diff --git a/math/carve/Makefile b/math/carve/Makefile
index 94602647c543..a745c3313ff2 100644
--- a/math/carve/Makefile
+++ b/math/carve/Makefile
@@ -5,7 +5,7 @@ PORTNAME= carve
PORTVERSION= 1.4.0
PORTREVISION= 5
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast, robust constructive solid geometry library
diff --git a/math/ccmath/Makefile b/math/ccmath/Makefile
index 5db8f8572d94..5448892a824c 100644
--- a/math/ccmath/Makefile
+++ b/math/ccmath/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ccmath
PORTVERSION= 2.2.1
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs
+MASTER_SITES= SUNSITE/libs
MAINTAINER= db@FreeBSD.org
COMMENT= Mathematics library with many different functions
diff --git a/math/clasp/Makefile b/math/clasp/Makefile
index 6b7953427889..6e108b04cc17 100644
--- a/math/clasp/Makefile
+++ b/math/clasp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= clasp
PORTVERSION= 3.1.0
CATEGORIES= math devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= potassco/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION}
EXTRACT_SUFX= -source.tar.gz
MAINTAINER= vsevolod@FreeBSD.org
diff --git a/math/clipper/Makefile b/math/clipper/Makefile
index 88ef52e1e6fc..aa829c9033a2 100644
--- a/math/clipper/Makefile
+++ b/math/clipper/Makefile
@@ -4,8 +4,7 @@
PORTNAME= clipperlib
PORTVERSION= 6.0.0
CATEGORIES= math
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= polyclipping
+MASTER_SITES= SF/polyclipping
DISTNAME= clipper_ver${PORTVERSION}
MAINTAINER= martin.dieringer@gmx.de
diff --git a/math/foma/Makefile b/math/foma/Makefile
index 2b2f484f6c7d..d2cf4f71bd2b 100644
--- a/math/foma/Makefile
+++ b/math/foma/Makefile
@@ -5,7 +5,7 @@ PORTNAME= foma
PORTVERSION= 0.9.17
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= demon@FreeBSD.org
COMMENT= Toolkit for constructing finite-state automata and transducers
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 8b3a03ce7c90..bf9054f7aa6a 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -5,9 +5,8 @@ PORTNAME= geg
PORTVERSION= 1.0.2
PORTREVISION= 8
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/science/visualization/plotting \
http://www.infolaunch.com/~daveb/
-MASTER_SITE_SUBDIR= science/visualization/plotting
MAINTAINER= ports@FreeBSD.org
COMMENT= Visualise multiple 2D-functions of one variable
diff --git a/math/gexpr/Makefile b/math/gexpr/Makefile
index 3316115880ad..43abc4249d7f 100644
--- a/math/gexpr/Makefile
+++ b/math/gexpr/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gexpr
PORTVERSION= 2.0.2
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/math/calc
+MASTER_SITES= SUNSITE/apps/math/calc
MAINTAINER= ports@FreeBSD.org
COMMENT= Shell calculator
diff --git a/math/glm/Makefile b/math/glm/Makefile
index 3eb6b99b25ea..33c742c5aaf8 100644
--- a/math/glm/Makefile
+++ b/math/glm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= glm
PORTVERSION= 0.9.6.3
PORTEPOCH= 1
CATEGORIES= math graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ogl-math/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/ogl-math/${PORTNAME}-${PORTVERSION}
MAINTAINER= demon@FreeBSD.org
COMMENT= C++ mathematics library for software based on the OpenGL GLSL
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 2a857533dbb3..a5a11ee3d251 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -5,8 +5,7 @@ PORTNAME= glpk
PORTVERSION= 4.52.1
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= glpk
+MASTER_SITES= GNU
MAINTAINER= bf@FreeBSD.org
COMMENT= GNU Linear Programming Kit
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index b03b2af9b3e8..7aa7e3205fd4 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gmp
PORTVERSION= 5.1.3
PORTREVISION= 2
CATEGORIES= math devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= gmp
+MASTER_SITES= GNU
MAINTAINER= ale@FreeBSD.org
COMMENT= Free library for arbitrary precision arithmetic
diff --git a/math/gnubc/Makefile b/math/gnubc/Makefile
index afaf593b8f1c..6d045b4543e1 100644
--- a/math/gnubc/Makefile
+++ b/math/gnubc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bc
PORTVERSION= 1.06
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMEPREFIX= gnu
MAINTAINER= gabor@FreeBSD.org
diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile
index c98d36145710..b789ba7db279 100644
--- a/math/gotoblas/Makefile
+++ b/math/gotoblas/Makefile
@@ -5,9 +5,8 @@ PORTNAME= gotoblas
PORTVERSION= 2.${GOTOBLAS2VER}.${LAPACKVER}
PORTREVISION= 5
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/gotoblas|} \
- NL:lapack,lapack_tmg
-MASTER_SITE_SUBDIR= lapack/:lapack lapack/timing/:lapack_tmg
+MASTER_SITES= LOCAL/maho/gotoblas \
+ NL/lapack:lapack NL/lapack/timing:lapack_tmg
DISTFILES= GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz \
lapack-${LAPACKVER}.tgz:lapack \
large.tgz:lapack_tmg timing.tgz:lapack_tmg
diff --git a/math/gringo/Makefile b/math/gringo/Makefile
index d283171ced2d..5395da7b398b 100644
--- a/math/gringo/Makefile
+++ b/math/gringo/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 4.4.0
DISTVERSIONSUFFIX= -source
PORTREVISION= 1
CATEGORIES= math devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= potassco/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION}
MAINTAINER= vsevolod@FreeBSD.org
COMMENT= Grounding algorithm based on semi-naive database evaluation
diff --git a/math/hfst/Makefile b/math/hfst/Makefile
index 1dee0d1035c7..4ce1ab6b2bd8 100644
--- a/math/hfst/Makefile
+++ b/math/hfst/Makefile
@@ -4,8 +4,7 @@
PORTNAME= hfst
PORTVERSION= 3.8.2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/source
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/source
MAINTAINER= demon@FreeBSD.org
COMMENT= A toolkit for for processing natural language morphologies
diff --git a/math/jags/Makefile b/math/jags/Makefile
index ab31eb7590fd..1b9d8e51cb8e 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -5,11 +5,10 @@ PORTNAME= mcmc-jags
PORTVERSION= 3.4.0
PORTREVISION= 4
CATEGORIES= math
-MASTER_SITES= SF:1,2,3,4
-MASTER_SITE_SUBDIR= mcmc-jags/JAGS/${S}.x/Source/:1 \
- mcmc-jags/Examples/${S}.x/:2 \
- mcmc-jags/Manuals/2.x/:3 \
- mcmc-jags/Manuals/${S}.x/:4
+MASTER_SITES= SF/mcmc-jags/JAGS/${S}.x/Source/:1 \
+ SF/mcmc-jags/Examples/${S}.x/:2 \
+ SF/mcmc-jags/Manuals/2.x/:3 \
+ SF/mcmc-jags/Manuals/${S}.x/:4
DISTFILES= JAGS-${PORTVERSION}${EXTRACT_SUFX}:1
EXTRACT_ONLY= ${DISTFILES:M*[12]:C|:.*||}
diff --git a/math/jtransforms/Makefile b/math/jtransforms/Makefile
index 7adc356fc425..26ed4ce46dea 100644
--- a/math/jtransforms/Makefile
+++ b/math/jtransforms/Makefile
@@ -4,8 +4,7 @@ PORTNAME= jtransforms
PORTVERSION= 2.4
CATEGORIES= math java
MASTER_SITES= SF
-MASTER_SITE_SUBDIR=jtransforms/jtransforms/${PORTVERSION}
-DISTNAME= jtransforms-${PORTVERSION}-src
+DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Multithreaded FFT library written in pure Java
diff --git a/math/laspack/Makefile b/math/laspack/Makefile
index 4d6ee3eea909..dc9f7cf26b32 100644
--- a/math/laspack/Makefile
+++ b/math/laspack/Makefile
@@ -4,14 +4,13 @@
PORTNAME= laspack
PORTVERSION= 1.12.2
CATEGORIES= math
-MASTER_SITES= NL
-MASTER_SITE_SUBDIR= linalg
+MASTER_SITES= NL/linalg
DISTNAME= ${PORTNAME}
-EXTRACT_SUFX= .tgz
MAINTAINER= bf@FreeBSD.org
COMMENT= Package for solving large sparse systems of linear equations
+USES= tar:tgz
WRKSRC= ${WRKDIR}/${PORTNAME}
MAKEFILE= makefile
MAKE_ARGS= HOME=${STAGEDIR}${PREFIX}
diff --git a/math/ldouble/Makefile b/math/ldouble/Makefile
index 88db7b109048..336b31e6da76 100644
--- a/math/ldouble/Makefile
+++ b/math/ldouble/Makefile
@@ -5,9 +5,8 @@ PORTNAME= ldouble
PORTVERSION= 0.1
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= LOCAL/ahze
# http://www.moshier.net/
-MASTER_SITE_SUBDIR= ahze
DISTFILES= ${LDOUBLE_DISTFILE}
MAINTAINER= bf@FreeBSD.org
diff --git a/math/libjbigi/Makefile b/math/libjbigi/Makefile
index 0e49df674f0e..43fc347ec8a6 100644
--- a/math/libjbigi/Makefile
+++ b/math/libjbigi/Makefile
@@ -5,7 +5,7 @@ PORTNAME= libjbigi
PORTVERSION= 0.8.7
CATEGORIES= math java
MASTER_SITES= http://mirror.i2p2.de/ \
- ${MASTER_SITE_GOOGLE_CODE}
+ GOOGLE_CODE
DISTNAME= i2psource_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/math/lrng/Makefile b/math/lrng/Makefile
index 1dc9f08aad9e..bde1024bf23a 100644
--- a/math/lrng/Makefile
+++ b/math/lrng/Makefile
@@ -4,9 +4,9 @@
PORTNAME= lrng
PORTVERSION= 20130314
CATEGORIES= math
-MASTER_SITES= http://www.iro.umontreal.ca/%SUBDIR%/:1,2 \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%/$|bf/${PORTNAME}/${PORTVERSION}/:1,2|}
-MASTER_SITE_SUBDIR= ~simardr/rng/:1 ~lecuyer/myftp/papers/:2
+MASTER_SITES= http://www.iro.umontreal.ca/~simardr/rng/:1 \
+ http://www.iro.umontreal.ca/~lecuyer/myftp/papers/:2 \
+ LOCAL/bf/${PORTNAME}/${PORTVERSION}/:1,2
DISTFILES= ex1.c:1 lfsr258.c:1 lfsr113.c:1 WELL1024a.h:1 WELL19937a.h:1 WELL512a.h:1 \
WELL44497a.h:1 WELL19937a.c:1 WELL1024a.c:1 WELL512a.c:1 WELL44497a.c:1 \
MRG63k3a.c:1 MRG32k3a.c:1 MRG32k5a.c:1 MRG63k3a.h:1 MRG32k5a.h:1 MRG32k3a.h:1 \
diff --git a/math/miracl/Makefile b/math/miracl/Makefile
index d53e488ce253..6c1a24a33bea 100644
--- a/math/miracl/Makefile
+++ b/math/miracl/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 5.6
PORTEPOCH= 1
CATEGORIES= math
MASTER_SITES= http://mirror.shatow.net/freebsd/${PORTNAME}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jase
+ LOCAL/jase
MAINTAINER= bdrewery@FreeBSD.org
COMMENT= Multiprecision Integer and Rational Arithmetic C/C++ Library
diff --git a/math/msieve/Makefile b/math/msieve/Makefile
index ad5ee4956d72..29aebb835116 100644
--- a/math/msieve/Makefile
+++ b/math/msieve/Makefile
@@ -5,9 +5,7 @@ PORTNAME= msieve
PORTVERSION= 1.51
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= \
- ${PORTNAME}/${PORTNAME}/${PORTNAME:C/^m/M/}%20v${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME:C/^m/M/}%20v${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= bf@FreeBSD.org
diff --git a/math/ngraph/Makefile b/math/ngraph/Makefile
index b1f2b72983c2..87c4ca57bf5b 100644
--- a/math/ngraph/Makefile
+++ b/math/ngraph/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 6.3.51
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://www2e.biglobe.ne.jp/~isizaka/bin/ \
- ${MASTER_SITE_PORTS_JP}
+ PORTS_JP
DISTNAME= Ngraph-${PORTVERSION}-src
MAINTAINER= sanpei@FreeBSD.org
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 1d637a7cf4ed..0c2f8d63b621 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -5,8 +5,7 @@ PORTNAME= octave
PORTVERSION= 3.8.2
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= octave
+MASTER_SITES= GNU
MAINTAINER= maho@FreeBSD.org
COMMENT= High-level interactive language for numerical computations
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index d2924e1cec8d..0dc11cf132c5 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= oleo
PORTVERSION= 1.99.16
PORTREVISION= 8
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= The GNU spreadsheet for X11 and terminals
diff --git a/math/p5-Algorithm-Munkres/Makefile b/math/p5-Algorithm-Munkres/Makefile
index a944b7434c05..e0c71b122036 100644
--- a/math/p5-Algorithm-Munkres/Makefile
+++ b/math/p5-Algorithm-Munkres/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.08
PORTREVISION= 1
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Algorithm
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Geo-Coordinates-UTM/Makefile b/math/p5-Geo-Coordinates-UTM/Makefile
index 3224ddedb257..52c83708dc19 100644
--- a/math/p5-Geo-Coordinates-UTM/Makefile
+++ b/math/p5-Geo-Coordinates-UTM/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.11
PORTREVISION= 1
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Geo
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Math-Polynomial-Solve/Makefile b/math/p5-Math-Polynomial-Solve/Makefile
index 82412fc79d4b..c145a913f09b 100644
--- a/math/p5-Math-Polynomial-Solve/Makefile
+++ b/math/p5-Math-Polynomial-Solve/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.70
PORTREVISION= 1
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Set-IntSpan-Fast-XS/Makefile b/math/p5-Set-IntSpan-Fast-XS/Makefile
index cf991232b095..f9b04167d503 100644
--- a/math/p5-Set-IntSpan-Fast-XS/Makefile
+++ b/math/p5-Set-IntSpan-Fast-XS/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Set
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Basic/Makefile b/math/p5-Statistics-Basic/Makefile
index 38c3fef85ead..703980d65d26 100644
--- a/math/p5-Statistics-Basic/Makefile
+++ b/math/p5-Statistics-Basic/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.6607
PORTREVISION= 1
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Forecast/Makefile b/math/p5-Statistics-Forecast/Makefile
index 09ccbfe2c744..aa6e385ee09f 100644
--- a/math/p5-Statistics-Forecast/Makefile
+++ b/math/p5-Statistics-Forecast/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Statistics-LineFit/Makefile b/math/p5-Statistics-LineFit/Makefile
index 4dd634c2db00..e5bd7bb4bc87 100644
--- a/math/p5-Statistics-LineFit/Makefile
+++ b/math/p5-Statistics-LineFit/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/p5-Statistics-TTest/Makefile b/math/p5-Statistics-TTest/Makefile
index 011672ed2c22..cd0e39c317fe 100644
--- a/math/p5-Statistics-TTest/Makefile
+++ b/math/p5-Statistics-TTest/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.1.0
PORTREVISION= 3
CATEGORIES= math perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index 426ec7476cf1..6ad6c67f8e57 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.02
PORTREVISION= 1
CATEGORIES= math python
MASTER_SITES= http://gato.sourceforge.net/Download/
-MASTER_SITE_SUBDIR= gato
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Gato-${PORTVERSION}
diff --git a/math/py-gmpy/Makefile b/math/py-gmpy/Makefile
index cf00f16d7bda..1af249091418 100644
--- a/math/py-gmpy/Makefile
+++ b/math/py-gmpy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= gmpy
PORTVERSION= 1.17
PORTREVISION= 1
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile
index 35c4e3b98908..7b2748ab4f4a 100644
--- a/math/py-theano/Makefile
+++ b/math/py-theano/Makefile
@@ -4,8 +4,7 @@
PORTNAME= theano
PORTVERSION= 0.7.0
CATEGORIES= math python
-MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR=source/T/Theano
+MASTER_SITES= CHEESESHOP/source/T/Theano
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Theano-${DISTVERSION}
diff --git a/math/qrupdate/Makefile b/math/qrupdate/Makefile
index 44b2c6b48493..b3adf6f36395 100644
--- a/math/qrupdate/Makefile
+++ b/math/qrupdate/Makefile
@@ -5,8 +5,7 @@ PORTNAME= qrupdate
PORTVERSION= 1.1.2
PORTREVISION= 3
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= qrupdate/qrupdate/1.2
+MASTER_SITES= SOURCEFORGE/qrupdate/qrupdate/1.2
MAINTAINER= robertjenssen@ozemail.com.au
COMMENT= Fortran library for fast updates of QR and Cholesky decomposition
diff --git a/math/sc/Makefile b/math/sc/Makefile
index f9ad08548ba7..eaf0fa208cb3 100644
--- a/math/sc/Makefile
+++ b/math/sc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sc
PORTVERSION= 7.16
PORTREVISION= 3
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/financial/spreadsheet
+MASTER_SITES= SUNSITE/apps/financial/spreadsheet
MAINTAINER= johans@FreeBSD.org
COMMENT= Curses-based spreadsheet program
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index 377085b27e93..8bb5c3966d69 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -5,8 +5,7 @@ PORTNAME= scalapack
PORTVERSION= 2.0.2
PORTREVISION= 6
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_NETLIB}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= NL
DISTFILES= scalapack-${PORTVERSION}.tgz manpages.tgz
DIST_SUBDIR= scalapack
EXTRACT_ONLY= scalapack-${PORTVERSION}.tgz manpages.tgz
diff --git a/math/slatec/Makefile b/math/slatec/Makefile
index 86f896dbdb92..10afe9b06045 100644
--- a/math/slatec/Makefile
+++ b/math/slatec/Makefile
@@ -5,8 +5,7 @@ PORTNAME= slatec
PORTVERSION= 4.1
PORTREVISION= 4
CATEGORIES= math
-MASTER_SITES= NL:slatec,blas
-MASTER_SITE_SUBDIR= slatec/:slatec blas/:blas
+MASTER_SITES= NL/slatec/:slatec NL/blas/:blas
# Get d1mach.f, i1mach.f, r1mach.f from BLAS, rather than from Slatec:
# See Netlib FAQ #2.17: http://netlib.org/misc/faq.html#2.17
DISTFILES= guide:slatec slatec_chk.tgz:slatec slatec_src.tgz:slatec \
diff --git a/math/slgrace/Makefile b/math/slgrace/Makefile
index 3429c1d89453..896ef0e9a122 100644
--- a/math/slgrace/Makefile
+++ b/math/slgrace/Makefile
@@ -6,8 +6,7 @@ PORTREVISION= 7
CATEGORIES= math devel
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v${SLANG_VER}/modules/grace/ \
ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${SLANG_VER}/modules/grace/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= garga/slgrace/
+ LOCAL/garga/slgrace
MAINTAINER= garga@FreeBSD.org
COMMENT= SLang module to plot graphs with grace
diff --git a/math/solitaire/Makefile b/math/solitaire/Makefile
index 44a98e918010..c819c7a2d146 100644
--- a/math/solitaire/Makefile
+++ b/math/solitaire/Makefile
@@ -5,8 +5,7 @@ PORTNAME= solitaire
PORTVERSION= 19980817
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dd
+MASTER_SITES= LOCAL/dd
DISTFILES= sol.pl sol-test.txt
MAINTAINER= ports@FreeBSD.org
diff --git a/math/units/Makefile b/math/units/Makefile
index db29176a8b1b..368b45c969fb 100644
--- a/math/units/Makefile
+++ b/math/units/Makefile
@@ -4,8 +4,7 @@
PORTNAME= units
PORTVERSION= 2.11
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= jharris@widomaker.com
COMMENT= Unit conversion and calculation
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 8827ec9074e3..cb446e31420b 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wxMaxima
PORTVERSION= 14.12.1
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
DISTFILES= ${PORTNAME:tl}-${PORTVERSION}.tar.gz
MAINTAINER= nivit@FreeBSD.org
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 57f642ca719b..75a9037484a9 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xldlas
PORTVERSION= 0.85
PORTREVISION= 8
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/visualization
+MASTER_SITES= SUNSITE/apps/graphics/visualization
EXTRACT_SUFX= -source.tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/amfm/Makefile b/misc/amfm/Makefile
index ae435de23041..13ce7330b6dc 100644
--- a/misc/amfm/Makefile
+++ b/misc/amfm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= amfm
PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= http://github.com/ikegam/amfm/raw/9679aa06eead7ed3571480e892f426828e17e361/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sanpei
+ LOCAL/sanpei
DISTNAME= amfm
EXTRACT_SUFX= .c
diff --git a/misc/asr-manpages/Makefile b/misc/asr-manpages/Makefile
index 3324e2ea71b4..212969913129 100644
--- a/misc/asr-manpages/Makefile
+++ b/misc/asr-manpages/Makefile
@@ -4,8 +4,7 @@
PORTNAME= asr-manpages
PORTVERSION= 20000406
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= fjoe
+MASTER_SITES= LOCAL/fjoe
DISTNAME= asr.pages
MAINTAINER= fjoe@FreeBSD.org
diff --git a/misc/bbjd/Makefile b/misc/bbjd/Makefile
index 044056be1bae..6e10cbd4ae97 100644
--- a/misc/bbjd/Makefile
+++ b/misc/bbjd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bbjd
PORTVERSION= 1.01
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
MAINTAINER= demon@FreeBSD.org
COMMENT= Beat the blackjack dealer
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 8406075515a2..f589fbf7a6c4 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -4,14 +4,13 @@
PORTNAME= buffer
PORTVERSION= 1.19
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_GENTOO} \
+MASTER_SITES= GENTOO \
http://www.mondorescue.org/download/MondoCD/TGZS/
-MASTER_SITE_SUBDIR= distfiles
-EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Buffer sporadic I/O for faster tape and pipe throughput
+USES= tar:tgz
PLIST_FILES= bin/buffer \
man/man1/buffer.1.gz
diff --git a/misc/chef/Makefile b/misc/chef/Makefile
index 3ed68dd4414e..cdd8367f34ee 100644
--- a/misc/chef/Makefile
+++ b/misc/chef/Makefile
@@ -4,16 +4,15 @@ PORTNAME= chef
PORTVERSION= 19930426
CATEGORIES= misc
MASTER_SITES= http://mysite.verizon.net/ebrowne72/chef/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+ LOCAL/brooks
DISTNAME= bork
-EXTRACT_SUFX= .tar.Z
MAINTAINER= brooks@FreeBSD.org
COMMENT= Feelter thet cunferts Ingleesh text tu Muck Cheenese-a
CONFLICTS= filters-* talkfilters-*
PLIST_FILES= bin/chef
+USES= tar:Z
WRKSRC= ${WRKDIR}/bork
diff --git a/misc/compat10x/Makefile b/misc/compat10x/Makefile
index eae7a1524080..97376911569f 100644
--- a/misc/compat10x/Makefile
+++ b/misc/compat10x/Makefile
@@ -3,8 +3,7 @@
PORTNAME= compat10x
PORTVERSION= 10.0.1000510.201410
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= garga/compat
+MASTER_SITES= LOCAL/garga/compat
PKGNAMESUFFIX= -${ARCH}
DISTNAME= ${PORTNAME}-${ARCH}-${PORTVERSION}
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index ff020adcf04a..f578844ae999 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= ${COMPAT4X_PORTVERSION}
PORTREVISION= 10
CATEGORIES= misc
MASTER_SITES= ${COMPAT4X_MASTER_SITES}
-MASTER_SITE_SUBDIR= ${COMPAT4X_MASTER_SITE_SUBDIR}
PKGNAMESUFFIX= -${COMPAT4X_ARCH}
DISTFILES= ${COMPAT4X_DISTFILES}
DIST_SUBDIR= ${COMPAT4X_ARCH}/${PORTVERSION}
@@ -71,12 +70,10 @@ FREEBSD4_LIBS= libc_r.so.4 libperl.so.3
.if defined(COMPAT4X_OSRELDATE) && !empty(COMPAT4X_OSRELDATE)
COMPAT4X_PORTVERSION= ${COMPAT4X_OSVERSION}.${COMPAT4X_OSRELDATE}
-COMPAT4X_MASTER_SITES= ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
-COMPAT4X_MASTER_SITE_SUBDIR= snapshots/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}
+COMPAT4X_MASTER_SITES= ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}/
.else
COMPAT4X_PORTVERSION= ${COMPAT4X_OSVERSION}
-COMPAT4X_MASTER_SITES= ${MASTER_SITE_LOCAL}
-COMPAT4X_MASTER_SITE_SUBDIR= kris/${COMPAT4X_ARCH}
+COMPAT4X_MASTER_SITES= LOCAL/kris/${COMPAT4X_ARCH}
.endif
do-extract:
diff --git a/misc/compat5x/Makefile b/misc/compat5x/Makefile
index 2ca0aaba7a81..5bea85666112 100644
--- a/misc/compat5x/Makefile
+++ b/misc/compat5x/Makefile
@@ -9,8 +9,7 @@ PORTNAME= compat5x
PORTVERSION= 5.4.0.8.1
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=amdmi3/compat5x
+MASTER_SITES= LOCAL/amdmi3/compat5x
PKGNAMESUFFIX= -${ARCH}
DISTNAME= ${PORTNAME}-${ARCH}-${PORTVERSION}
diff --git a/misc/compat6x/Makefile b/misc/compat6x/Makefile
index fb51def717c6..909574cced62 100644
--- a/misc/compat6x/Makefile
+++ b/misc/compat6x/Makefile
@@ -5,9 +5,8 @@ PORTNAME= compat6x
PORTVERSION= 6.4.604000.200810
PORTREVISION= 3
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://people.freebsd.org/~${MASTER_SITE_SUBDIR}/
-MASTER_SITE_SUBDIR= mnag/compat6x
+MASTER_SITES= LOCAL/mnag/compat6x \
+ http://people.freebsd.org/~mnag/compat6x/
PKGNAMESUFFIX= -${ARCH}
DISTNAME= ${PORTNAME}-${ARCH}-${PORTVERSION}
diff --git a/misc/compat7x/Makefile b/misc/compat7x/Makefile
index 8868f0a1d01f..b32bb7ed618d 100644
--- a/misc/compat7x/Makefile
+++ b/misc/compat7x/Makefile
@@ -3,8 +3,7 @@
PORTNAME= compat7x
PORTVERSION= 7.4.704000.201310.1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= garga/compat
+MASTER_SITES= LOCAL/garga/compat
PKGNAMESUFFIX= -${ARCH}
DISTNAME= ${PORTNAME}-${ARCH}-${PORTVERSION}
diff --git a/misc/compat8x/Makefile b/misc/compat8x/Makefile
index cbe2c0bce28d..f0c96e7209e3 100644
--- a/misc/compat8x/Makefile
+++ b/misc/compat8x/Makefile
@@ -4,8 +4,7 @@ PORTNAME= compat8x
PORTVERSION= 8.4.804000.201310
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= garga/compat
+MASTER_SITES= LOCAL/garga/compat
PKGNAMESUFFIX= -${ARCH}
DISTNAME= ${PORTNAME}-${ARCH}-${PORTVERSION}
diff --git a/misc/compat9x/Makefile b/misc/compat9x/Makefile
index 34286f377bfc..24f94dfe5821 100644
--- a/misc/compat9x/Makefile
+++ b/misc/compat9x/Makefile
@@ -3,8 +3,7 @@
PORTNAME= compat9x
PORTVERSION= 9.2.902000.201310
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= garga/compat
+MASTER_SITES= LOCAL/garga/compat
PKGNAMESUFFIX= -${ARCH}
DISTNAME= ${PORTNAME}-${ARCH}-${PORTVERSION}
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index 27bae8de3956..712b70e3f4ad 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -5,9 +5,8 @@ PORTNAME= dahdi-kmod
PORTVERSION= ${DAHDI_VERSION:S/-//g}
PORTREVISION= 7
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}\
+MASTER_SITES= LOCAL/fjoe \
http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
-MASTER_SITE_SUBDIR= fjoe
DISTNAME= dahdi-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}\
oslec-linux-${OSLEC_VERSION}${EXTRACT_SUFX}\
diff --git a/misc/dahdi-kmod26/Makefile b/misc/dahdi-kmod26/Makefile
index e00e7b94cd07..31036865b35a 100644
--- a/misc/dahdi-kmod26/Makefile
+++ b/misc/dahdi-kmod26/Makefile
@@ -5,10 +5,9 @@ PORTNAME= dahdi-kmod26
PORTVERSION= ${DAHDI_VERSION:S/-/./g}
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}\
+MASTER_SITES= LOCAL/fjoe \
http://people.freebsd.org/~fjoe/dahdi/\
http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
-MASTER_SITE_SUBDIR= fjoe
DISTNAME= dahdi-freebsd-${DAHDI_VERSION}
DISTFILES= ${DISTNAME}.tar.bz2\
oslec-linux-${OSLEC_VERSION}${EXTRACT_SUFX}\
diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile
index 874a0a93cad1..c069feb2ff51 100644
--- a/misc/dahdi/Makefile
+++ b/misc/dahdi/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dahdi
PORTVERSION= ${DAHDI_VERSION:S/-//g}
PORTREVISION= 6
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= fjoe
+MASTER_SITES= LOCAL/fjoe
DISTNAME= ${PORTNAME}-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
MAINTAINER= fjoe@FreeBSD.org
diff --git a/misc/diction/Makefile b/misc/diction/Makefile
index 4b1f180a6a7e..062d9beeada4 100644
--- a/misc/diction/Makefile
+++ b/misc/diction/Makefile
@@ -5,8 +5,7 @@ PORTNAME= diction
PORTVERSION= 1.11
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= mva@FreeBSD.org
COMMENT= GNU diction and style
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index 05e4d9edc5b4..783f03127df1 100644
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= ${VERSION}
PORTREVISION= ${REVISION}
PORTEPOCH= 1
CATEGORIES= misc
-MASTER_SITES= http://http.distributed.net/pub/dcti/%SUBDIR%/ \
- ftp://ftp.distributed.net/pub/dcti/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION:S/^/v/:R}
+MASTER_SITES= http://http.distributed.net/pub/dcti/v${PORTVERSION:R}/ \
+ ftp://ftp.distributed.net/pub/dcti/v${PORTVERSION:R}/
# This is architecture dependent
DISTNAME= dnetc${PORTVERSION:E}-freebsd-${ARCH:S/i386/x86/}-elf
diff --git a/misc/dphys-config/Makefile b/misc/dphys-config/Makefile
index 1dee04047355..f46f9bd50033 100644
--- a/misc/dphys-config/Makefile
+++ b/misc/dphys-config/Makefile
@@ -4,7 +4,7 @@
PORTNAME= dphys-config
PORTVERSION= 20100216
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index f56560288ea8..184a060fcbc8 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -5,8 +5,7 @@ PORTNAME= estic
PORTVERSION= 1.61
PORTREVISION= 1
CATEGORIES= misc comms
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
PKGNAMESUFFIX?= ${NOX11_SUFFIX}${PKGNAMESUFFIX2}
DISTFILES= estic-1.60-sources.zip estic-1.61-patch-from-1.60.zip
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 9d63bf2ea3da..2dfe2c290851 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -5,8 +5,7 @@ PORTNAME= figlet
PORTVERSION= 2.2.5
CATEGORIES= misc
MASTER_SITES= ftp://ftp.figlet.org/pub/figlet/program/unix/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= obrien
+ LOCAL/obrien
MAINTAINER= obrien@FreeBSD.org
COMMENT= SysV banner-like program prints strings in large fancy ASCII art
diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile
index e3f9b5e550af..e67a555af335 100644
--- a/misc/findutils/Makefile
+++ b/misc/findutils/Makefile
@@ -5,8 +5,7 @@ PORTNAME= findutils
PORTVERSION= 4.5.14
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_GNU_ALPHA}
-MASTER_SITE_SUBDIR= findutils
+MASTER_SITES= GNU_ALPHA
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/misc/fortune-mod-bofh/Makefile b/misc/fortune-mod-bofh/Makefile
index c3100d6f20f0..76d642870d10 100644
--- a/misc/fortune-mod-bofh/Makefile
+++ b/misc/fortune-mod-bofh/Makefile
@@ -5,10 +5,9 @@ PORTNAME= fortune-mod-bofh
PORTVERSION= 2.0
PORTREVISION= 3
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL:S/$/:freebsd/} \
- http://www.irq.org/:original
-MASTER_SITE_SUBDIR= flz/${PORTNAME}/:freebsd
-DISTFILES= bofh-fortune-mod${PORTVERSION}${EXTRACT_SUFX}:original,freebsd
+MASTER_SITES= LOCAL/flz/${PORTNAME} \
+ http://www.irq.org/
+DISTFILES= bofh-fortune-mod${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= onatan@gmail.com
COMMENT= Compilation of excuses from the "Bastard Operator From Hell"
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index a793c2ae6a81..82abb4e4f1df 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gnuit
PORTVERSION= 4.9.5
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Interactive Tools - a file system browser for UNIX systems
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index 1615248516a3..b78d01c873e6 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gnuls
PORTVERSION= 8.22
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= coreutils
+MASTER_SITES= GNU/coreutils
DISTNAME= coreutils-${PORTVERSION}
MAINTAINER= bmc@clapper.org
diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index 3ea48ccd58ea..c3658a881591 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gnustep-examples
PORTVERSION= 1.4.0
PORTREVISION= 3
CATEGORIES= misc gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= usr-apps
+MASTER_SITES= GNUSTEP/usr-apps
MAINTAINER= ports@FreeBSD.org
COMMENT= GNUstep example applications
diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile
index 1afb1a5ba936..79b448bdedf2 100644
--- a/misc/gregexp/Makefile
+++ b/misc/gregexp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gregexp
PORTVERSION= 0.4
CATEGORIES= misc
-MASTER_SITES= http://dentrassi.de/download/gregexp/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= http://dentrassi.de/download/gregexp/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical regular expression explorer
diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index b98705b1ca35..399aff74237b 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -4,8 +4,7 @@
PORTNAME= hello
PORTVERSION= 2.9
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= hello
+MASTER_SITES= GNU
MAINTAINER= dhn@FreeBSD.org
COMMENT= Utility for saying hello to the world and reading email
diff --git a/misc/histring/Makefile b/misc/histring/Makefile
index 7ce55aed69af..603ef7d14c3b 100644
--- a/misc/histring/Makefile
+++ b/misc/histring/Makefile
@@ -5,8 +5,7 @@ PORTNAME= histring
PORTVERSION= 1.1.0
CATEGORIES= misc
MASTER_SITES= http://ess4.engr.uvic.ca/proj/histring/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= roam/misc
+ LOCAL/roam/misc
MAINTAINER= ports@FreeBSD.org
COMMENT= Highlight strings using the ANSI terminal escape sequences
diff --git a/misc/imerge/Makefile b/misc/imerge/Makefile
index 42cdbfcce7f2..41879de1c42f 100644
--- a/misc/imerge/Makefile
+++ b/misc/imerge/Makefile
@@ -5,8 +5,7 @@ PORTNAME= imerge
PORTVERSION= 0.2.4
CATEGORIES= misc
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
MAINTAINER= knu@FreeBSD.org
COMMENT= Tool to help merge one file to another interactively
diff --git a/misc/inplace/Makefile b/misc/inplace/Makefile
index 0c3b12bc974f..61222fe22fb7 100644
--- a/misc/inplace/Makefile
+++ b/misc/inplace/Makefile
@@ -5,8 +5,7 @@ PORTNAME= inplace
PORTVERSION= 1.2.3
CATEGORIES= misc
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
MAINTAINER= knu@FreeBSD.org
COMMENT= Tool to edit files in-place through given filter commands
diff --git a/misc/ipbt/Makefile b/misc/ipbt/Makefile
index 2fd0b0152da3..5a46db690143 100644
--- a/misc/ipbt/Makefile
+++ b/misc/ipbt/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ipbt
DISTVERSION= r8765
CATEGORIES= misc
MASTER_SITES= http://www.chiark.greenend.org.uk/~sgtatham/ipbt/ \
- LOCAL
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= uqs@FreeBSD.org
COMMENT= High-tech ttyrec player with improvements over ttyplay
diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index 96a30acadf97..0c2a2787fff9 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -4,8 +4,7 @@
PORTNAME= iselect
PORTVERSION= 1.4.0
CATEGORIES= misc
-MASTER_SITES= OSSP
-MASTER_SITE_SUBDIR= tool/iselect
+MASTER_SITES= OSSP/tool/iselect
MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive Selection Tool
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index e46ee6026f10..7c6a7d5f70a7 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -1,5 +1,4 @@
-MASTER_SITES?= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR?= ${KDE4_BRANCH}/${PORTVERSION}/src/kde-l10n/
+MASTER_SITES?= KDE/${KDE4_BRANCH}/${PORTVERSION}/src/kde-l10n/
PKGNAMEPREFIX= ${KDE4_L10N:S/@/_/}-
DISTNAME= ${PORTNAME}-${KDE4_L10N}-${PORTVERSION}
DIST_SUBDIR?= KDE/${PORTVERSION}/kde-l10n
diff --git a/misc/mime-support/Makefile b/misc/mime-support/Makefile
index 087b58aef30e..cfb7cc2d4c99 100644
--- a/misc/mime-support/Makefile
+++ b/misc/mime-support/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mime-support
PORTVERSION= 3.58
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION:C/([0-9]*\.[0-9]*)\.(.*)/\1-\2/}
MAINTAINER= oliver@FreeBSD.org
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 4df6e853b178..5bc4d25d46a5 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mmv
PORTVERSION= 1.01b.15
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_1.01b.orig
PATCH_SITES= ${MASTER_SITES}
diff --git a/misc/nsf/Makefile b/misc/nsf/Makefile
index 0b7130a263d2..52c5a7e8fe21 100644
--- a/misc/nsf/Makefile
+++ b/misc/nsf/Makefile
@@ -4,8 +4,7 @@
PORTNAME= nsf
PORTVERSION= 1.0
CATEGORIES= misc
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= will
+MASTER_SITES= LOCAL/will
MAINTAINER= ports@FreeBSD.org
COMMENT= NAKAMURA's Shell Form input
diff --git a/misc/openr2/Makefile b/misc/openr2/Makefile
index 468a909bbb36..b2dc0ca32a80 100644
--- a/misc/openr2/Makefile
+++ b/misc/openr2/Makefile
@@ -5,7 +5,7 @@ PORTNAME= openr2
PORTVERSION= 1.3.3
PORTREVISION= 0
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= fjoe@FreeBSD.org
COMMENT= MFC/R2 call setup library
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index 8b9cc31cd33f..40a42cd0694f 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -5,8 +5,7 @@ PORTNAME= uuid
PORTVERSION= 1.6.2
PORTREVISION= 7
CATEGORIES= misc devel
-MASTER_SITES= ${MASTER_SITE_OSSP}
-MASTER_SITE_SUBDIR= lib/${PORTNAME}
+MASTER_SITES= OSSP/lib/${PORTNAME}
PKGNAMEPREFIX= ossp-
MAINTAINER= vd@FreeBSD.org
diff --git a/misc/p5-Locale-Msgcat/Makefile b/misc/p5-Locale-Msgcat/Makefile
index e01fce3bd877..031b40d75c78 100644
--- a/misc/p5-Locale-Msgcat/Makefile
+++ b/misc/p5-Locale-Msgcat/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Msgcat
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= misc perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= CPAN/Locale
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index e513fd250b9f..917940a6fff6 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pinfo
PORTVERSION= 0.6.10
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://alioth.debian.org/frs/download.php/file/3351/
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/py-yolk/Makefile b/misc/py-yolk/Makefile
index bc4dbc6397fe..e0d348427c9f 100644
--- a/misc/py-yolk/Makefile
+++ b/misc/py-yolk/Makefile
@@ -5,8 +5,7 @@ PORTNAME= yolk
PORTVERSION= 0.4.3
PORTREVISION= 0
CATEGORIES= misc python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/y/${PORTNAME}
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
diff --git a/misc/rtfm/Makefile b/misc/rtfm/Makefile
index 2aac0d7d39e1..af3ea5729719 100644
--- a/misc/rtfm/Makefile
+++ b/misc/rtfm/Makefile
@@ -4,8 +4,7 @@
PORTNAME= rtfm
PORTVERSION= 1.0
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= chris
+MASTER_SITES= LOCAL/chris
MAINTAINER= chris@FreeBSD.org
COMMENT= FreeBSD documentation search mechanism
diff --git a/misc/ruby-progressbar/Makefile b/misc/ruby-progressbar/Makefile
index a66b7f58cc4a..dbafc5c0b75d 100644
--- a/misc/ruby-progressbar/Makefile
+++ b/misc/ruby-progressbar/Makefile
@@ -5,7 +5,7 @@ PORTNAME= progressbar
PORTVERSION= 0.9
CATEGORIES= misc ruby
MASTER_SITES= http://0xcc.net/ruby-progressbar/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/progressbar|}
+ LOCAL/tota/progressbar
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
diff --git a/misc/shuffle/Makefile b/misc/shuffle/Makefile
index ee72db954673..a7043bdf5803 100644
--- a/misc/shuffle/Makefile
+++ b/misc/shuffle/Makefile
@@ -4,8 +4,7 @@
PORTNAME= shuffle
PORTVERSION= 20010603
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dd
+MASTER_SITES= LOCAL/dd
MAINTAINER= ports@FreeBSD.org
COMMENT= Produce random permutations
diff --git a/misc/sls/Makefile b/misc/sls/Makefile
index 8e8c3ebc67ff..5b39530d94bf 100644
--- a/misc/sls/Makefile
+++ b/misc/sls/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sls
PORTVERSION= 1.00
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dannyboy
+MASTER_SITES= LOCAL/dannyboy
DISTNAME= ${PORTNAME}
MAINTAINER= sec@42.org
diff --git a/misc/tcb/Makefile b/misc/tcb/Makefile
index f8f65cf29937..1e2d6332cfb2 100644
--- a/misc/tcb/Makefile
+++ b/misc/tcb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tcb
PORTVERSION= 1.4a
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/file
+MASTER_SITES= SUNSITE/utils/file
MAINTAINER= ports@FreeBSD.org
COMMENT= File viewer for terminal
diff --git a/misc/team/Makefile b/misc/team/Makefile
index f0144f64d60d..1a0e351676d4 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -5,8 +5,7 @@ PORTNAME= team
PORTVERSION= 3.1
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
MAINTAINER= joerg@FreeBSD.org
COMMENT= Portable multi-buffered tape streaming utility
diff --git a/misc/unclutter/Makefile b/misc/unclutter/Makefile
index 836dde32d87e..d99cadba6ce1 100644
--- a/misc/unclutter/Makefile
+++ b/misc/unclutter/Makefile
@@ -5,8 +5,7 @@ PORTNAME= unclutter
PORTVERSION= 8
PORTREVISION= 3
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
MAINTAINER= ports@FreeBSD.org
COMMENT= Remove idle cursor image from screen
diff --git a/misc/usbrh-libusb/Makefile b/misc/usbrh-libusb/Makefile
index 1269cc02dca0..d58c10818fd1 100644
--- a/misc/usbrh-libusb/Makefile
+++ b/misc/usbrh-libusb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= usbrh-libusb
PORTVERSION= 0.05
CATEGORIES= misc
MASTER_SITES= http://www.dd.iij4u.or.jp/~briareos/soft/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sanpei
+ LOCAL/sanpei
DISTNAME= usbrh-${PORTVERSION}
MAINTAINER= sanpei@FreeBSD.org
diff --git a/misc/vera/Makefile b/misc/vera/Makefile
index b37aedc0a87c..d705bc4ee23a 100644
--- a/misc/vera/Makefile
+++ b/misc/vera/Makefile
@@ -4,8 +4,7 @@
PORTNAME= vera
PORTVERSION= 1.22
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= vera
+MASTER_SITES= GNU
MAINTAINER= demon@FreeBSD.org
COMMENT= Virtual Entity of Relevant Acronyms
diff --git a/misc/viz/Makefile b/misc/viz/Makefile
index 8ef3fef9367e..79231aeb8191 100644
--- a/misc/viz/Makefile
+++ b/misc/viz/Makefile
@@ -4,8 +4,7 @@
PORTNAME= viz
PORTVERSION= 1.1.1
CATEGORIES= misc
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= fenner
+MASTER_SITES= LOCAL/fenner
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert invisible (binary) characters to a visible form
diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile
index d28365dafd44..5602c1c29a08 100644
--- a/misc/wmScoreBoard/Makefile
+++ b/misc/wmScoreBoard/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wmScoreBoard
PORTVERSION= 0.30
PORTREVISION= 4
CATEGORIES= misc windowmaker
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= pat
+MASTER_SITES= LOCAL/pat
MAINTAINER= ports@FreeBSD.org
COMMENT= Window Maker dockapp that display game scores from excite
diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile
index a6eb64476191..f73af455f498 100644
--- a/misc/wmwork/Makefile
+++ b/misc/wmwork/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.2.5
PORTREVISION= 3
CATEGORIES= misc windowmaker afterstep
MASTER_SITES= http://people.debian.org/~godisch/wmwork/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= xride
+ LOCAL/xride
MAINTAINER= xride@FreeBSD.org
COMMENT= Dockapp that keeps track of time you have spent on something
diff --git a/misc/xgas/Makefile b/misc/xgas/Makefile
index eaf7b1077f3b..e05c0d334487 100644
--- a/misc/xgas/Makefile
+++ b/misc/xgas/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xgas
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/demos
+MASTER_SITES= SUNSITE/X11/demos
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/xless/Makefile b/misc/xless/Makefile
index 76a71e5a4a59..92787a0757c5 100644
--- a/misc/xless/Makefile
+++ b/misc/xless/Makefile
@@ -5,9 +5,8 @@ PORTNAME= xless
PORTVERSION= 1.7
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
+MASTER_SITES= XCONTRIB/applications \
ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
-MASTER_SITE_SUBDIR= applications
MAINTAINER= ports@FreeBSD.org
COMMENT= X11-based viewer for text files
diff --git a/misc/xtar/Makefile b/misc/xtar/Makefile
index 8dfbeb64d467..f9f3e7e827f5 100644
--- a/misc/xtar/Makefile
+++ b/misc/xtar/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xtar
PORTVERSION= 1.4
PORTREVISION= 4
CATEGORIES= misc
-MASTER_SITES= MASTER_SITE_XCONTRIB/utilities
+MASTER_SITES= XCONTRIB/utilities
MAINTAINER= ports@FreeBSD.org
COMMENT= View and manipulate contents of a tar file
diff --git a/multimedia/ab25/Makefile b/multimedia/ab25/Makefile
index 061bf4f47946..b758dacb2c0f 100644
--- a/multimedia/ab25/Makefile
+++ b/multimedia/ab25/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ab25
PORTVERSION= 0.2.5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility for ARIB STD-B25 ECM handling in MPEG2-TS stream
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 19831c0508cf..4735407849cd 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= assimp
PORTVERSION= 3.0
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-3.0
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.0
DISTNAME= ${PORTNAME}--${PORTVERSION}.1270-source-only
MAINTAINER= yuri@tsoft.com
diff --git a/multimedia/avbin/Makefile b/multimedia/avbin/Makefile
index 55fa689279c5..38fc3a5a06a8 100644
--- a/multimedia/avbin/Makefile
+++ b/multimedia/avbin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= avbin
PORTVERSION= 7
PORTREVISION= 7
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- http://mirror.amdmi3.ru/distfiles/
+MASTER_SITES= GOOGLE_CODE http://mirror.amdmi3.ru/distfiles/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/multimedia/bangarang/Makefile b/multimedia/bangarang/Makefile
index b1e78115b80d..f97f3638c7e3 100644
--- a/multimedia/bangarang/Makefile
+++ b/multimedia/bangarang/Makefile
@@ -5,7 +5,7 @@ PORTNAME= bangarang
PORTVERSION= 2.1
PORTREVISION= 5
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= dnebdal@gmail.com
COMMENT= Media player for KDE 4
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 44aa444f91c1..9202c5a50530 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ffmpegthumbnailer
PORTVERSION= 2.0.9
PORTREVISION= 1
CATEGORIES= multimedia graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= riggs/${PORTNAME}
+MASTER_SITES= LOCAL/riggs/${PORTNAME}
MAINTAINER= clutton@zoho.com
COMMENT= Lightweight video thumbnailer that can be used by file managers
diff --git a/multimedia/flvstreamer/Makefile b/multimedia/flvstreamer/Makefile
index a7aaa134999a..32f77736a36b 100644
--- a/multimedia/flvstreamer/Makefile
+++ b/multimedia/flvstreamer/Makefile
@@ -4,8 +4,7 @@ PORTNAME= flvstreamer
PORTVERSION= 2.1.c.1
PORTREVISION= 1
CATEGORIES= multimedia net
-MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}/source
+MASTER_SITES= SAVANNAH/${PORTNAME}/source
DISTNAME= ${PORTNAME}-2.1c1
MAINTAINER= hrs@FreeBSD.org
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index ac6e66cd66bc..191bdf07d41f 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -3,8 +3,7 @@
PORTNAME= kdenlive
PORTVERSION= 0.9.10
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src/
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src/
MAINTAINER= avilla@FreeBSD.org
COMMENT= KDE professional quality non-linear video editing suite
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index a94830992e6b..7b9fd90f2030 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libdvbpsi
PORTVERSION= 1.2.0
CATEGORIES= multimedia
-MASTER_SITES= http://download.videolan.org/pub/libdvbpsi/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= http://download.videolan.org/pub/libdvbpsi/${PORTVERSION}/
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Library for MPEG TS and DVB PSI tables decoding and generation
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 1160b2382727..d47f0b9764e1 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libdvdcss
PORTVERSION= 1.3.99
CATEGORIES= multimedia
-MASTER_SITES= http://download.videolan.org/pub/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+MASTER_SITES= http://download.videolan.org/pub/${PORTNAME}/${PORTVERSION}/
MAINTAINER= jpaetzel@FreeBSD.org
COMMENT= Portable abstraction library for DVD decryption
diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index 058d1bc252a4..e6f3de912ad9 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -5,7 +5,7 @@ PORTNAME= libkate
PORTVERSION= 0.4.1
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= bar@FreeBSD.org
COMMENT= Codec for karaoke and text encapsulation for Ogg
diff --git a/multimedia/mimms/Makefile b/multimedia/mimms/Makefile
index b5183cd78381..2a07a36d842c 100644
--- a/multimedia/mimms/Makefile
+++ b/multimedia/mimms/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mimms
DISTVERSION= 3.2.1
CATEGORIES= multimedia net
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= liu_yinghong@yahoo.com.cn
COMMENT= Download streams using the MMS protocol
diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index 2bdb6698f5df..a322145b833f 100644
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mjpg-streamer
PORTVERSION= r63
CATEGORIES= multimedia net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/Sourcecode
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Sourcecode
MAINTAINER= kozlov.sergey.404@gmail.com
COMMENT= HTTP video streaming daemon
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 705031a5e2af..df94278a8812 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 32
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= LOCAL/ahze
# http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
-#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITE_SUBDIR= ${PORTNAME}
+#MASTER_SITES= SF/${PORTNAME}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Standards-based system to encode, stream, and play MPEG-4 audio/video
diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile
index d5c2ad754108..cc08180e9789 100644
--- a/multimedia/mplayer-skins/Makefile
+++ b/multimedia/mplayer-skins/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mplayer-skins
PORTVERSION= 1.1.3
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_MPLAYERHQ}
-MASTER_SITE_SUBDIR= skins
+MASTER_SITES= MPLAYERHQ/skins
DISTFILES= # filled in later after options
DIST_SUBDIR= mplayer-skins
diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared
index d1c39856f53c..6335101c4269 100644
--- a/multimedia/mplayer/Makefile.shared
+++ b/multimedia/mplayer/Makefile.shared
@@ -7,8 +7,7 @@
MPLAYER_SNAPSHOT_DATE= 2015-04-03
MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
CATEGORIES?= multimedia audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= riggs/mplayer
+MASTER_SITES= LOCAL/riggs/mplayer
DISTNAME= mplayer-${MPLAYER_PORT_VERSION:S/.r/./g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index 31ade5ab95db..66c19459e4b7 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mplex
PORTVERSION= 1.1
CATEGORIES= multimedia
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= sanpei
+MASTER_SITES= LOCAL/sanpei
MAINTAINER= sanpei@FreeBSD.org
COMMENT= Multiplexes MPEG component streams into system layers
diff --git a/multimedia/opencinematools/Makefile b/multimedia/opencinematools/Makefile
index 397e66595c59..ad54d70e377f 100644
--- a/multimedia/opencinematools/Makefile
+++ b/multimedia/opencinematools/Makefile
@@ -4,7 +4,7 @@ PORTNAME= opencinematools
PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTVERSIONSUFFIX= -src
MAINTAINER= olgeni@FreeBSD.org
diff --git a/multimedia/pwcbsd/Makefile b/multimedia/pwcbsd/Makefile
index a8bd00b26f73..b2825171a8bd 100644
--- a/multimedia/pwcbsd/Makefile
+++ b/multimedia/pwcbsd/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 12
CATEGORIES= multimedia sysutils kld
MASTER_SITES= http://raaf.atspace.org/ \
http://www.bsd-geek.de/FreeBSD/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= miwi
+ LOCAL/miwi
MAINTAINER= lme@FreeBSD.org
COMMENT= The Linux pwc webcam driver ported to FreeBSD
diff --git a/multimedia/pwcview/Makefile b/multimedia/pwcview/Makefile
index 74cb0f1a273e..c04ecc7ef95e 100644
--- a/multimedia/pwcview/Makefile
+++ b/multimedia/pwcview/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 6
CATEGORIES= multimedia
MASTER_SITES= http://raaf.atspace.org/ \
http://www.selasky.org/hans_petter/video4bsd/releases/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kwm
+ LOCAL/kwm
MAINTAINER= hselasky@FreeBSD.org
COMMENT= The Video4Linux PWC webcam viewer
diff --git a/multimedia/replex/Makefile b/multimedia/replex/Makefile
index 70a51d6d3c41..e5bca4dc8def 100644
--- a/multimedia/replex/Makefile
+++ b/multimedia/replex/Makefile
@@ -4,8 +4,7 @@ PORTNAME= replex
PORTVERSION= 0.1.6.8
PORTEPOCH= 1
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Remultiplex an MPEG2 TS into a PS for DVD
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index ddc5a46a7c15..1132c1cd3862 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.4.4
PORTREVISION= 14
CATEGORIES= multimedia
MASTER_SITES= ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= acm@FreeBSD.org
COMMENT= Free MPEG1 video player library with sound support
diff --git a/multimedia/spigot/Makefile b/multimedia/spigot/Makefile
index e6ff6b419a5d..b9f60b52c67f 100644
--- a/multimedia/spigot/Makefile
+++ b/multimedia/spigot/Makefile
@@ -4,9 +4,8 @@
PORTNAME= spigot
PORTVERSION= 1.7
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= fenner
-DISTFILES= spigot.1.7.tar.gz
+MASTER_SITES= LOCAL/fenner
+DISTFILES= ${PORTNAME}.${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Video spigot for Windows library
diff --git a/multimedia/szap-s2/Makefile b/multimedia/szap-s2/Makefile
index a69886fbff7c..81472618a3d8 100644
--- a/multimedia/szap-s2/Makefile
+++ b/multimedia/szap-s2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= szap_s2
PORTVERSION= 20100129s
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nox/
+MASTER_SITES= LOCAL/nox
MAINTAINER= nox@FreeBSD.org
COMMENT= Simple zapping tool for the Linux DVB S2 API
diff --git a/multimedia/tstools/Makefile b/multimedia/tstools/Makefile
index 1f0527a52515..4dc0e2a61c82 100644
--- a/multimedia/tstools/Makefile
+++ b/multimedia/tstools/Makefile
@@ -4,8 +4,7 @@
PORTNAME= tstools
DISTVERSION= 1_11
CATEGORIES= multimedia
-MASTER_SITES= SF/${PORTNAME}.berlios
-MASTER_SITE_SUBDIR= tstools
+MASTER_SITES= BERLIOS
MAINTAINER= fbsd@opal.com
COMMENT= MPEG transport, program, and elementary stream tools
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index 551cbbe66db1..04f19c0a4dc0 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -5,8 +5,7 @@ PORTNAME= vcdimager
PORTVERSION= 0.7.24
PORTREVISION= 6
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= vcdimager
+MASTER_SITES= GNU
MAINTAINER= multimedia@FreeBSD.org
COMMENT= GNU VCDImager/VCDRip -- The GNU VideoCD Image Maker/Ripping Tool
diff --git a/multimedia/vdr-plugin-control/Makefile b/multimedia/vdr-plugin-control/Makefile
index af66e9f638ff..680e6d1fa8e0 100644
--- a/multimedia/vdr-plugin-control/Makefile
+++ b/multimedia/vdr-plugin-control/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES= http://ricomp.de/vdr/
DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a45/a/}${DISTVERSIONSUFFIX}
PATCH_SITES= http://ppa.launchpad.net/the-vdr-team/unstable-plugins/ubuntu/pool/main/v/vdr-plugin-control/ \
- ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= nox/
+ LOCAL/nox
PATCHFILES= ${PORTNAME}_${PORTVERSION:S/a45/a-45/}yavdr1.diff.gz
MAINTAINER= nox@FreeBSD.org
diff --git a/multimedia/vdr-plugin-streamdev/Makefile b/multimedia/vdr-plugin-streamdev/Makefile
index 73801751dead..0d1b5dbaf276 100644
--- a/multimedia/vdr-plugin-streamdev/Makefile
+++ b/multimedia/vdr-plugin-streamdev/Makefile
@@ -5,8 +5,7 @@ PORTNAME= vdr-plugin-streamdev
PORTVERSION= 0.6.1
CATEGORIES= multimedia
MASTER_SITES= http://projects.vdr-developer.org/attachments/download/1580/:release \
- LOCAL:snapshot
-MASTER_SITE_SUBDIR= nox/:snapshot
+ LOCAL/nox:snapshot
DISTFILES= ${DISTNAME:S/plugin-//}${EXTRACT_SUFX}:release
MAINTAINER= nox@FreeBSD.org
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index efa7ae3331e0..c144ba32313d 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -5,10 +5,8 @@ PORTNAME= vdr-plugin-xineliboutput
PORTVERSION= 1.0.90s20120511
PORTREVISION= 13
CATEGORIES= multimedia
-MASTER_SITES= SF:release \
- LOCAL:snapshot
-MASTER_SITE_SUBDIR= xineliboutput/files/xineliboutput/vdr-xineliboutput-${PORTVERSION}/:release \
- nox/:snapshot
+MASTER_SITES= SF/xineliboutput/files/xineliboutput/vdr-xineliboutput-${PORTVERSION}/:release \
+ LOCAL/nox:snapshot
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot
MAINTAINER= nox@FreeBSD.org
diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index d5a105f67e45..ca8bbab7b636 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -5,10 +5,9 @@ PORTNAME= win32-codecs
DISTVERSION= 20110131
PORTEPOCH= 1
CATEGORIES= multimedia audio
-MASTER_SITES= ${MASTER_SITE_MPLAYERHQ} \
+MASTER_SITES= MPLAYERHQ/releases/codecs \
http://ftp.lug.udel.edu/MPlayer/releases/codecs/ \
ftp://ftp.lug.udel.edu/MPlayer/releases/codecs/
-MASTER_SITE_SUBDIR= releases/codecs
DISTFILES= all-${DISTVERSION}.tar.bz2 \
${ADDITIONAL_CODECS_DISTFILES}
DIST_SUBDIR= win32
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 1323dcc4d425..2c52d8f99289 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 2.92.0
PORTREVISION= 2
CATEGORIES= multimedia graphics
MASTER_SITES= ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/ \
- ${MASTER_SITE_LOCAL} \
+ LOCAL/dinoex \
ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/dlls/
-MASTER_SITE_SUBDIR= dinoex
DISTNAME= xanim2920
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main ${EXTRA_FILES}
diff --git a/net-im/cicquin/Makefile b/net-im/cicquin/Makefile
index ce7cf8f3b2cf..c0cc70cba21d 100644
--- a/net-im/cicquin/Makefile
+++ b/net-im/cicquin/Makefile
@@ -4,11 +4,10 @@
PORTNAME= cicquin
PORTVERSION= 0.1
CATEGORIES= net-im
-#MASTER_SITES= ${MASTER_SITE_LOCAL} \
+#MASTER_SITES= LOCAL/roam/misc/cicquin \
MASTER_SITES= \
http://devel.ringlet.net/misc/cicquin/ \
http://people.FreeBSD.org/~roam/misc/cicquin/
-MASTER_SITE_SUBDIR= roam/misc/cicquin
MAINTAINER= ports@FreeBSD.org
COMMENT= Look up users in the CenterICQ user database
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index b5178181641d..8809eabaf5b9 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -5,9 +5,8 @@ PORTNAME= ejabberd
PORTVERSION= 15.04
CATEGORIES= net-im
MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \
- http://distfiles.pirateparty.in/%SUBDIR%/:deps \
- LOCAL:deps
-MASTER_SITE_SUBDIR= ashish/:deps
+ http://distfiles.pirateparty.in/ashish/:deps \
+ LOCAL/ashish:deps
DISTFILES+= ${DISTNAME}.tgz:p1 ejabberd-deps-2.tar.xz:deps
MAINTAINER= ashish@FreeBSD.org
diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index 7a3ef3c6c6b9..d8ba3e4f9779 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -6,8 +6,8 @@ PORTVERSION= 1.6.3
PORTREVISION= 3
CATEGORIES= net-im python
#MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-MASTER_SITES= ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
- ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= LOCAL/acm/${PORTNAME} \
+ GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= MSN Messenger client written in python
diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index d83a55f5c05e..c98fc189e930 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 0.8.1.5
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= jabber-
PKGNAMESUFFIX= -transport
DISTNAME= ${PORTNAME}t-${PORTVERSION}
diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile
index 2bdc9d15ad32..9aec82ce70af 100644
--- a/net-im/ktp-accounts-kcm/Makefile
+++ b/net-im/ktp-accounts-kcm/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-accounts-kcm
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE instant messaging account management module
diff --git a/net-im/ktp-approver/Makefile b/net-im/ktp-approver/Makefile
index bb0c4976f606..517e5535a68c 100644
--- a/net-im/ktp-approver/Makefile
+++ b/net-im/ktp-approver/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-approver
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE instant messaging notifier
diff --git a/net-im/ktp-auth-handler/Makefile b/net-im/ktp-auth-handler/Makefile
index 1e8220fe2f87..911d8ac4bf36 100644
--- a/net-im/ktp-auth-handler/Makefile
+++ b/net-im/ktp-auth-handler/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-auth-handler
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KWallet integration module for KDE Telepathy
diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile
index 684f1c414c5b..6ae055dc7cd8 100644
--- a/net-im/ktp-common-internals/Makefile
+++ b/net-im/ktp-common-internals/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-common-internals
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Telepathy internal library
diff --git a/net-im/ktp-contact-list/Makefile b/net-im/ktp-contact-list/Makefile
index 33948e351520..3375fd37eafd 100644
--- a/net-im/ktp-contact-list/Makefile
+++ b/net-im/ktp-contact-list/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-contact-list
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE instant messaging contact list application
diff --git a/net-im/ktp-contact-runner/Makefile b/net-im/ktp-contact-runner/Makefile
index d706c8dd88f7..eb39dd2d55e4 100644
--- a/net-im/ktp-contact-runner/Makefile
+++ b/net-im/ktp-contact-runner/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-contact-runner
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KRunner integration module for KDE Telepathy
diff --git a/net-im/ktp-desktop-applets/Makefile b/net-im/ktp-desktop-applets/Makefile
index b566f1844497..809dabdf42c7 100644
--- a/net-im/ktp-desktop-applets/Makefile
+++ b/net-im/ktp-desktop-applets/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-desktop-applets
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE instant messaging plasma widgets
diff --git a/net-im/ktp-filetransfer-handler/Makefile b/net-im/ktp-filetransfer-handler/Makefile
index f4ab3c13ca03..b87cb923f4a0 100644
--- a/net-im/ktp-filetransfer-handler/Makefile
+++ b/net-im/ktp-filetransfer-handler/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-filetransfer-handler
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE instant messaging file transfer handler
diff --git a/net-im/ktp-kded-integration-module/Makefile b/net-im/ktp-kded-integration-module/Makefile
index de8fc985ba3b..a17e718c4379 100644
--- a/net-im/ktp-kded-integration-module/Makefile
+++ b/net-im/ktp-kded-integration-module/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-kded-integration-module
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= Module for integration of instant messaging into KDE Workspaces
diff --git a/net-im/ktp-send-file/Makefile b/net-im/ktp-send-file/Makefile
index 194f435f14fc..4fbe767513dc 100644
--- a/net-im/ktp-send-file/Makefile
+++ b/net-im/ktp-send-file/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp-send-file
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE instant messaging file transfer application
diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile
index 5ff871624d36..04026d90c500 100644
--- a/net-im/ktp-text-ui/Makefile
+++ b/net-im/ktp-text-ui/Makefile
@@ -3,9 +3,8 @@
PORTNAME= ktp-text-ui
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.1
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.1
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE chat window application
diff --git a/net-im/mikutter/Makefile b/net-im/mikutter/Makefile
index ade78ec19a4c..fdb1422f5ece 100644
--- a/net-im/mikutter/Makefile
+++ b/net-im/mikutter/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mikutter
PORTVERSION= 3.2.2
CATEGORIES= net-im ruby
MASTER_SITES= http://mikutter.hachune.net/bin/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+ LOCAL/tota/${PORTNAME}
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
diff --git a/net-im/p5-Net-XMPP2/Makefile b/net-im/p5-Net-XMPP2/Makefile
index f00a5fecfc7e..26b770134862 100644
--- a/net-im/p5-Net-XMPP2/Makefile
+++ b/net-im/p5-Net-XMPP2/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.14
PORTREVISION= 2
CATEGORIES= net-im perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net-im/plasma-applet-ktp/Makefile b/net-im/plasma-applet-ktp/Makefile
index 4665b8f8fd7a..d696e02bc34e 100644
--- a/net-im/plasma-applet-ktp/Makefile
+++ b/net-im/plasma-applet-ktp/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ktp
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
PKGNAMEPREFIX= plasma-applet-
DISTNAME= ${PORTNAME}-desktop-applets-${PORTVERSION}
diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile
index 32c3a2eb638e..a9418d8c011c 100644
--- a/net-im/py-xmpppy-yahoo/Makefile
+++ b/net-im/py-xmpppy-yahoo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= yahoo
PORTVERSION= 0.3.20070314
PORTREVISION= 1
CATEGORIES= net-im python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=lofi
+MASTER_SITES= LOCAL/lofi
PKGNAMEPREFIX= xmpppy-
DISTNAME= yahoo-transport-${PORTVERSION}
diff --git a/net-im/qwit/Makefile b/net-im/qwit/Makefile
index ddce276637dc..73c4cc7a0795 100644
--- a/net-im/qwit/Makefile
+++ b/net-im/qwit/Makefile
@@ -5,7 +5,7 @@ PORTNAME= qwit
DISTVERSION= r154
PORTREVISION= 3
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= qwit-${PORTVERSION}-src
MAINTAINER= sokolov@TrueBSD.org
diff --git a/net-im/telepathy-logger-qt4/Makefile b/net-im/telepathy-logger-qt4/Makefile
index bb0f53e9a462..1ce6dc7c3b67 100644
--- a/net-im/telepathy-logger-qt4/Makefile
+++ b/net-im/telepathy-logger-qt4/Makefile
@@ -3,8 +3,7 @@
PORTNAME= telepathy-logger-qt4
PORTVERSION= ${KTP_VERSION}
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME:C/4$//}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME:C/4$//}/${PORTVERSION}/src
DISTNAME= ${PORTNAME:C/4$//}-${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
diff --git a/net-mgmt/aggregate/Makefile b/net-mgmt/aggregate/Makefile
index 2ad1f03d695d..c86d60b5cf42 100644
--- a/net-mgmt/aggregate/Makefile
+++ b/net-mgmt/aggregate/Makefile
@@ -5,8 +5,7 @@ PORTNAME= aggregate
PORTVERSION= 1.6
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= aggregate
+MASTER_SITES= ISC/aggregate
MAINTAINER= jabley@automagic.org
COMMENT= Optimise a list of route prefixes to help make nice short filters
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index a288dc973279..f179382214d9 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -6,7 +6,7 @@ DISTVERSION= 2.1a15
PORTREVISION= 8
CATEGORIES= net-mgmt
MASTER_SITES= ftp://ftp.ee.lbl.gov/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Monitor arp & rarp requests
diff --git a/net-mgmt/clog/Makefile b/net-mgmt/clog/Makefile
index 49453fb9bd92..e7f7b89e187c 100644
--- a/net-mgmt/clog/Makefile
+++ b/net-mgmt/clog/Makefile
@@ -4,8 +4,7 @@
PORTNAME= clog
PORTVERSION= 1.6
CATEGORIES= net-mgmt security
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
MAINTAINER= obrien@FreeBSD.org
COMMENT= Tcp connection logger daemon
diff --git a/net-mgmt/flow-tools-ng/Makefile b/net-mgmt/flow-tools-ng/Makefile
index d6c45c673412..520ed51bfa64 100644
--- a/net-mgmt/flow-tools-ng/Makefile
+++ b/net-mgmt/flow-tools-ng/Makefile
@@ -5,7 +5,7 @@ PORTNAME= flow-tools
PORTVERSION= 0.68.5.1
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -ng
MAINTAINER= c.kworr@gmail.com
diff --git a/net-mgmt/grepip/Makefile b/net-mgmt/grepip/Makefile
index ace10eeccc06..c99028402287 100644
--- a/net-mgmt/grepip/Makefile
+++ b/net-mgmt/grepip/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://komquats.com/distfiles/ \
- ${MASTER_SITE_LOCAL}/cy/
+ LOCAL/cy
MAINTAINER= cy@FreeBSD.org
COMMENT= Print lines contans IP matching a pattern in CIDR format
diff --git a/net-mgmt/ipacctd/Makefile b/net-mgmt/ipacctd/Makefile
index e4b44eafb524..6d10d0095085 100644
--- a/net-mgmt/ipacctd/Makefile
+++ b/net-mgmt/ipacctd/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ipacctd
PORTVERSION= 1.47
CATEGORIES= net-mgmt
MASTER_SITES= ftp://ftp.wuppy.net.ru/pub/FreeBSD/local/ipacctd/ \
- ${MASTER_SITE_LOCAL:S!$!skv/!}
+ LOCAL/skv
MAINTAINER= ports@FreeBSD.org
COMMENT= IP accounting using divert socket
diff --git a/net-mgmt/nagvis/Makefile b/net-mgmt/nagvis/Makefile
index dd461bb3a0d8..7a5dabeb6de1 100644
--- a/net-mgmt/nagvis/Makefile
+++ b/net-mgmt/nagvis/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nagvis
PORTVERSION= 1.7.2
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/NagVis%201.7
+MASTER_SITES= SF/${PORTNAME}/NagVis%201.7
MAINTAINER= derfi@vei.ru
COMMENT= Visualization addon for Nagios
diff --git a/net-mgmt/nbtscan/Makefile b/net-mgmt/nbtscan/Makefile
index 19d16909ba02..12dc922a61bf 100644
--- a/net-mgmt/nbtscan/Makefile
+++ b/net-mgmt/nbtscan/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= http://www.inetcat.net/software/ \
GENTOO
-MASTER_SITE_SUBDIR= distfiles
MAINTAINER= ports@FreeBSD.org
COMMENT= NetBIOS name network scanner
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index 8d72f761d24c..4f1c0ea2b292 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -3,12 +3,12 @@
PORTNAME= Net-SNMP
PORTVERSION= 6.0.1
+DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= net-mgmt perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DTOWN
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= lth@FreeBSD.org
COMMENT= Object oriented interface to SNMP
diff --git a/net-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile
index c5a2a93a215c..c85ca478a401 100644
--- a/net-mgmt/p5-SNMP_Session/Makefile
+++ b/net-mgmt/p5-SNMP_Session/Makefile
@@ -5,7 +5,7 @@ PORTNAME= SNMP_Session
PORTVERSION= 1.13
PORTREVISION= 3
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PROJECTHOST= snmp-session
PKGNAMEPREFIX= p5-
diff --git a/net-mgmt/p5-jmx4perl/Makefile b/net-mgmt/p5-jmx4perl/Makefile
index d47e6bb552d5..2cccde99590f 100644
--- a/net-mgmt/p5-jmx4perl/Makefile
+++ b/net-mgmt/p5-jmx4perl/Makefile
@@ -3,8 +3,8 @@
PORTNAME= jmx4perl
PORTVERSION= 1.11
CATEGORIES= net-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/R/RO/ROLAND
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= CPAN:ROLAND
PKGNAMEPREFIX= p5-
DISTFILES= ${DISTNAME}_2${EXTRACT_SUFX}
diff --git a/net-mgmt/phpipam/Makefile b/net-mgmt/phpipam/Makefile
index 7544d5780d23..9053920a0f73 100644
--- a/net-mgmt/phpipam/Makefile
+++ b/net-mgmt/phpipam/Makefile
@@ -4,9 +4,7 @@
PORTNAME= phpipam
PORTVERSION= 1.0
CATEGORIES= net-mgmt
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
-EXTRACT_SUFX= .tar
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= jake@xz.cx
COMMENT= PHP IP Address Management IPv4/IPv6
@@ -25,6 +23,7 @@ SUB_LIST= DISTNAME=${DISTNAME}
OPTIONS_DEFINE= LDAP
+USES= tar:
USE_PHP= ctype gettext gmp json mysqli pcntl session simplexml
LDAP_USE= PHP=ldap
WANT_PHP_WEB= yes
diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index 36dd82ab4558..3b89aa58b148 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pnp
PORTVERSION= 0.6.25
CATEGORIES= net-mgmt
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=pnp4nagios/PNP-0.6
+MASTER_SITES= SF/pnp4nagios/PNP-0.6
DISTNAME= pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER?= lme@FreeBSD.org
diff --git a/net-mgmt/py-ipcalc/Makefile b/net-mgmt/py-ipcalc/Makefile
index 2bd5d1721f08..32681022635d 100644
--- a/net-mgmt/py-ipcalc/Makefile
+++ b/net-mgmt/py-ipcalc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ipcalc
PORTVERSION= 1.1.2
CATEGORIES= net-mgmt python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/i/ipcalc
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/net-mgmt/send/Makefile b/net-mgmt/send/Makefile
index 898b768b7160..f2556fae96ea 100644
--- a/net-mgmt/send/Makefile
+++ b/net-mgmt/send/Makefile
@@ -5,8 +5,7 @@ PORTNAME= send
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= net-mgmt ipv6
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
diff --git a/net-mgmt/spectools/Makefile b/net-mgmt/spectools/Makefile
index b472fbdc6f87..69e2e807b187 100644
--- a/net-mgmt/spectools/Makefile
+++ b/net-mgmt/spectools/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 201108.r1
PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://www.kismetwireless.net/code/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brix
+ LOCAL/brix
DISTNAME= spectools-2011-08-R1
MAINTAINER= brix@FreeBSD.org
diff --git a/net-mgmt/subcalc/Makefile b/net-mgmt/subcalc/Makefile
index 06ab2dd905bd..60a9d41c6cb0 100644
--- a/net-mgmt/subcalc/Makefile
+++ b/net-mgmt/subcalc/Makefile
@@ -5,7 +5,6 @@ PORTNAME= subcalc
PORTVERSION= 1.1
CATEGORIES= net-mgmt ipv6
MASTER_SITES= http://www.seccuris.com/documents/downloads/
-MASTER_SITE_SUBDIR= subcalc
MAINTAINER= csjp@FreeBSD.org
COMMENT= Advanced IP/IPv6 subnet calculation and discovery
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 7d3de3abf105..b3a68c6a9b9f 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -5,8 +5,7 @@ PORTNAME= retroshare
PORTVERSION= 0.5.5c
PORTREVISION= 3
CATEGORIES= net-p2p
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${BINARY}/${PORTVERSION}
DISTNAME= ${PORTNAME}_${SRC_VERSION}-${SRC_REVISION}
MAINTAINER= peter@netkey.at
diff --git a/net-p2p/rtgui/Makefile b/net-p2p/rtgui/Makefile
index 589c86705717..70696727e968 100644
--- a/net-p2p/rtgui/Makefile
+++ b/net-p2p/rtgui/Makefile
@@ -3,20 +3,21 @@
PORTNAME= rtgui
PORTVERSION= 0.2.81
CATEGORIES= net-p2p www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= jadawin@FreeBSD.org
COMMENT= Web based front end for rTorrent
+BUILD_DEPENDS+= xmlrpc-c-config:${PORTSDIR}/net/xmlrpc-c
+
+USES= tar:tgz
+
OPTIONS_DEFINE= APACHE LIGHTTPD
OPTIONS_RADIO= HTTP
OPTIONS_RADIO_HTTP= APACHE LIGHTTPD
OPTIONS_DEFAULTS= APACHE
-BUILD_DEPENDS+= xmlrpc-c-config:${PORTSDIR}/net/xmlrpc-c
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MAPACHE}
diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
index 10b58e2c7ca7..c790d5fb5491 100644
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -5,7 +5,7 @@ PORTNAME= transmission-remote-gui
PORTVERSION= 5.0.1
PORTREVISION= 3
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= transgui-${PORTVERSION}-src
MAINTAINER= acm@FreeBSD.org
diff --git a/net/44bsd-rdist/Makefile b/net/44bsd-rdist/Makefile
index 4274b59eba7e..4d39af242bc6 100644
--- a/net/44bsd-rdist/Makefile
+++ b/net/44bsd-rdist/Makefile
@@ -4,8 +4,7 @@
PORTNAME= 44bsd-rdist
PORTVERSION= 20001111
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
+MASTER_SITES= LOCAL/cy
MAINTAINER= cy@FreeBSD.org
COMMENT= The traditional 4.4BSD rdist
diff --git a/net/aprsc/Makefile b/net/aprsc/Makefile
index cdb5edf4ce30..506ebe84314d 100644
--- a/net/aprsc/Makefile
+++ b/net/aprsc/Makefile
@@ -6,8 +6,7 @@ PORTREVISION= 3
DISTVERSIONSUFFIX= .g28c5a6a
CATEGORIES= net hamradio
MASTER_SITES= http://he.fi/aprsc/down/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= toyokun@gmail.com
COMMENT= Plain APRS-IS server
diff --git a/net/boinc_curses/Makefile b/net/boinc_curses/Makefile
index 4e760400844d..a213bf38ccf7 100644
--- a/net/boinc_curses/Makefile
+++ b/net/boinc_curses/Makefile
@@ -5,9 +5,7 @@ PORTNAME= boinc_curses
PORTVERSION= 0.2.2
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://www.oook.cz/bsd/boinc_curses/
-MASTER_SITE_SUBDIR=rene
+MASTER_SITES= LOCAL/rene http://www.oook.cz/bsd/boinc_curses/
MAINTAINER= ports@FreeBSD.org
COMMENT= Console, ncurses based monitor and manager for BOINC
diff --git a/net/bounce/Makefile b/net/bounce/Makefile
index 47e51ce2386e..8a714dfcfb8c 100644
--- a/net/bounce/Makefile
+++ b/net/bounce/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0
PORTREVISION= 8
CATEGORIES= net security
MASTER_SITES= http://www.iagora.com/~espel/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= obrien
+ LOCAL/obrien
DISTNAME= bounce
EXTRACT_SUFX= .c
diff --git a/net/cagibi/Makefile b/net/cagibi/Makefile
index aacb73a481dd..91eee010c017 100644
--- a/net/cagibi/Makefile
+++ b/net/cagibi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cagibi
PORTVERSION= 0.2.0
CATEGORIES= net devel
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/cagibi
+MASTER_SITES= KDE/stable/${PORTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE SSDP/uPNP proxy
diff --git a/net/clamz/Makefile b/net/clamz/Makefile
index 9321d0db07c6..6449c7acbb60 100644
--- a/net/clamz/Makefile
+++ b/net/clamz/Makefile
@@ -5,7 +5,7 @@ PORTNAME= clamz
PORTVERSION= 0.5
PORTREVISION= 4
CATEGORIES= net audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= glathe.helko@googlemail.com
COMMENT= Command-line program to download MP3 files from Amazon's music store
diff --git a/net/cvsup-static/Makefile b/net/cvsup-static/Makefile
index e34d21fda4f0..b79c8bc36eb0 100644
--- a/net/cvsup-static/Makefile
+++ b/net/cvsup-static/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cvsup-static
PORTVERSION= 16.1h
CATEGORIES= net devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= delphij
+MASTER_SITES= LOCAL/delphij
PKGNAMEPREFIX= binary-
DISTNAME= cvsup-without-gui-static-${ARCH}-${PORTVERSION}
diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile
index 31a93b1865c4..51ed47da3998 100644
--- a/net/dgd-lpmud/Makefile
+++ b/net/dgd-lpmud/Makefile
@@ -5,7 +5,7 @@ PORTNAME= dgd-lpmud
PORTVERSION= 2.4.5
PORTREVISION= 5
CATEGORIES= net games
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/dgd|} \
+MASTER_SITES= LOCAL/glewis/dgd \
http://ftp.dworkin.nl/dgd/lib/
DISTNAME= 2.4.5-for-1.4
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index aa8aabe776e3..d5187d22684f 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dico
PORTVERSION= 2.2
PORTREVISION= 6
CATEGORIES= net textproc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMEPREFIX= gnu-
MAINTAINER= goran.tal@gmail.com
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index a5119b5018ae..3743045d1ccd 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnu-radius
PORTVERSION= 1.6.1
PORTREVISION= 6
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= radius
+MASTER_SITES= GNU/radius
DISTNAME= radius-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index 387971f7fc4b..34cfdab62c86 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -4,7 +4,7 @@
PORTNAME= googlecl
PORTVERSION= 0.9.14
CATEGORIES= net www python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= sbz@FreeBSD.org
COMMENT= Command line tools for the Google Data APIs
diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index cd439db899ad..6838249fc5bd 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -5,8 +5,7 @@ PORTNAME= grdesktop
PORTVERSION= 0.23
PORTREVISION= 12
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= flz@FreeBSD.org
COMMENT= GNOME frontend for the remote desktop client (rdesktop)
diff --git a/net/hexinject/Makefile b/net/hexinject/Makefile
index 6e64cef00b8e..27f4a95b5f46 100644
--- a/net/hexinject/Makefile
+++ b/net/hexinject/Makefile
@@ -4,8 +4,7 @@
PORTNAME= hexinject
PORTVERSION= 1.5
CATEGORIES= net security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= sbz@FreeBSD.org
COMMENT= HexInject is a very versatile packet injector and sniffer
diff --git a/net/icmpinfo/Makefile b/net/icmpinfo/Makefile
index a7022e61a7fd..98de7a794a10 100644
--- a/net/icmpinfo/Makefile
+++ b/net/icmpinfo/Makefile
@@ -4,8 +4,7 @@
PORTNAME= icmpinfo
PORTVERSION= 1.11
CATEGORIES= net sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/network/admin
+MASTER_SITES= SUNSITE/system/network/admin
MAINTAINER= ports@FreeBSD.org
COMMENT= Looks at the icmp messages received by the host
diff --git a/net/iet/Makefile b/net/iet/Makefile
index c285cb7364b8..13b2c8b2cee3 100644
--- a/net/iet/Makefile
+++ b/net/iet/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= net kld
MASTER_SITES= SF/iscsitarget/iscsitarget/${PORTVERSION}/
DISTNAME= iscsitarget-${PORTVERSION}
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= delphij
+PATCH_SITES= LOCAL/delphij
PATCHFILES= ${PORTNAME}-${PORTVERSION}.diff.bz2
PATCH_DIST_STRIP= -p1
diff --git a/net/ifstat/Makefile b/net/ifstat/Makefile
index 662b1c76e7d8..7d9f6120b403 100644
--- a/net/ifstat/Makefile
+++ b/net/ifstat/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ifstat
PORTVERSION= 1.1
PORTREVISION= 5
CATEGORIES= net
-MASTER_SITES= http://gael.roualland.free.fr/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= http://gael.roualland.free.fr/${PORTNAME}/
MAINTAINER= alexey@renatasystems.org
COMMENT= Network interface statistics monitoring tool
diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile
index 9c18cf29b1c2..0c938595c83c 100644
--- a/net/igmpproxy/Makefile
+++ b/net/igmpproxy/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF
MAINTAINER= melifaro@ipfw.ru
COMMENT= Multicast forwarding IGMP proxy
diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index a2e36c230e25..0211674451dd 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -5,8 +5,7 @@ DISTVERSION= 4.1-ESV
PORTREVISION= ${DHCP_PORTREVISION}
PORTEPOCH= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${DISTVERSION}-${PATCHLEVEL}
+MASTER_SITES= ISC/${PORTNAME}/${DISTVERSION}-${PATCHLEVEL}
PKGNAMEPREFIX= isc-
PKGNAMESUFFIX= 41-${SUBSYS}
DISTFILES= ${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}${EXTRACT_SUFX}
diff --git a/net/isc-dhcp42-server/Makefile b/net/isc-dhcp42-server/Makefile
index 1527e097ddd1..ccdf5556811f 100644
--- a/net/isc-dhcp42-server/Makefile
+++ b/net/isc-dhcp42-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dhcp
DISTVERSION= 4.2.8
PORTREVISION= ${DHCP_PORTREVISION}
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${DISTVERSION}
+MASTER_SITES= ISC/${PORTNAME}/${DISTVERSION}
PKGNAMEPREFIX= isc-
PKGNAMESUFFIX= 42-${SUBSYS}
#DISTNAME= ${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile
index f9b83e705761..e2084cbe568a 100644
--- a/net/isc-dhcp43-server/Makefile
+++ b/net/isc-dhcp43-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dhcp
DISTVERSION= 4.3.2
PORTREVISION= ${DHCP_PORTREVISION}
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${DISTVERSION}
+MASTER_SITES= ISC/${PORTNAME}/${DISTVERSION}
PKGNAMEPREFIX= isc-
PKGNAMESUFFIX= 43-${SUBSYS}
#DISTNAME= ${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
diff --git a/net/jgroups/Makefile b/net/jgroups/Makefile
index d17789e1d001..ae8ef03c132a 100644
--- a/net/jgroups/Makefile
+++ b/net/jgroups/Makefile
@@ -4,8 +4,7 @@
PORTNAME= jgroups
PORTVERSION= 2.12.0
CATEGORIES= net java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
MAINTAINER= ale@FreeBSD.org
COMMENT= Java toolkit for reliable multicast communication
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 346d95755d88..127595a0e0f8 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -5,8 +5,7 @@ PORTNAME= jwhois
PORTVERSION= 4.0
PORTREVISION= 3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= jwhois
+MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= Improved WHOIS client capable of selecting server to query
diff --git a/net/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile
index 85ba0843f3eb..faa24c34db1d 100644
--- a/net/kio-upnp-ms/Makefile
+++ b/net/kio-upnp-ms/Makefile
@@ -5,10 +5,8 @@ PORTNAME= kio-upnp-ms
DISTVERSION= 1.0.0.git20110808
PORTREVISION= 5
CATEGORIES= net devel
-#MASTER_SITES= ${MASTER_SITE_KDE}
-#MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= fluffy
+#MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= LOCAL/fluffy
MAINTAINER= kde@FreeBSD.org
COMMENT= KIO slave to access UPnP MediaServers
diff --git a/net/kippo/Makefile b/net/kippo/Makefile
index 23ef5977b0d0..df73422c5768 100644
--- a/net/kippo/Makefile
+++ b/net/kippo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= kippo
PORTVERSION= 0.8
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= culot@FreeBSD.org
COMMENT= Medium interaction ssh honeypot
diff --git a/net/libkfbapi/Makefile b/net/libkfbapi/Makefile
index c850a657ef57..6b44aed18447 100644
--- a/net/libkfbapi/Makefile
+++ b/net/libkfbapi/Makefile
@@ -4,8 +4,7 @@ PORTNAME= libkfbapi
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= net kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/libkfbapi/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/libkfbapi/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index 381eb171560c..dba367086f7f 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -6,7 +6,7 @@ PORTNAME= libproxy
PORTVERSION= 0.4.6
PORTREVISION?= 0
CATEGORIES?= net devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= gnome@FreeBSD.org
COMMENT?= Library that provides automatic proxy configuration management
diff --git a/net/lvwimax/Makefile b/net/lvwimax/Makefile
index 52092778c8e6..af3ea382c53e 100644
--- a/net/lvwimax/Makefile
+++ b/net/lvwimax/Makefile
@@ -5,8 +5,7 @@ PORTNAME= lvwimax
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ftp://ftp.wart.ru/pub/download/ \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= ftp://ftp.wart.ru/pub/download/
MAINTAINER= bsam@FreeBSD.org
COMMENT= Userland driver for Samsung WiMAX modems
diff --git a/net/mopd/Makefile b/net/mopd/Makefile
index b87d0d9897c4..4005bc30edcf 100644
--- a/net/mopd/Makefile
+++ b/net/mopd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mopd
PORTVERSION= 2.5.3
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/msend/Makefile b/net/msend/Makefile
index 359cc828e2b9..880e2643237b 100644
--- a/net/msend/Makefile
+++ b/net/msend/Makefile
@@ -5,8 +5,7 @@ PORTNAME= msend
PORTVERSION= 3.0
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= markp
+MASTER_SITES= LOCAL/markp
MAINTAINER= gd.workbox@gmail.com
COMMENT= Client and server for the RFC1312 message protocol
diff --git a/net/nc/Makefile b/net/nc/Makefile
index 610cdb226d8f..9c195223dbb8 100644
--- a/net/nc/Makefile
+++ b/net/nc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nc
PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/file
+MASTER_SITES= SUNSITE/utils/file
DISTNAME= ncat-${PORTVERSION}
MAINTAINER= lx@redundancy.redundancy.org
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 651aaef59a5b..7c559931c224 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF
-#MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/3.1
PKGNAMESUFFIX= 3
MAINTAINER= marcus@FreeBSD.org
diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 643dcf904297..0d554e51f90e 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -10,8 +10,7 @@ DISTNAME= nc${PORTVERSION:S/.//}
EXTRACT_SUFX= .tgz
#PATCH_SITES= ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/
-PATCH_SITES= ${MASTER_SITE_GENTOO}
-PATCH_SITE_SUBDIR= distfiles
+PATCH_SITES= GENTOO
PATCHFILES= nc-v6-20000918.patch.gz
PATCH_DIST_STRIP= -p1
diff --git a/net/netembryo/Makefile b/net/netembryo/Makefile
index 683bd1a41e41..b2474f4963ca 100644
--- a/net/netembryo/Makefile
+++ b/net/netembryo/Makefile
@@ -5,10 +5,9 @@ PORTNAME= netembryo
PORTVERSION= 0.1.1
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/rakuco \
http://pkgs.fedoraproject.org/repo/pkgs/netembryo/netembryo-0.1.1.tar.bz2/d5a3c96b37fe3e4fb1c49df1f7a4a16f/ \
http://lscube.org/files/downloads/netembryo/
-MASTER_SITE_SUBDIR= rakuco
MAINTAINER= ports@FreeBSD.org
COMMENT= Network abstraction library
diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile
index 4c24f2890eff..92a250050953 100644
--- a/net/netpipes/Makefile
+++ b/net/netpipes/Makefile
@@ -4,8 +4,7 @@
PORTNAME= netpipes
PORTVERSION= 4.2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=kris
+MASTER_SITES= LOCAL/kris
DISTNAME= netpipes-4.2-export
MAINTAINER= doconnor@gsoft.com.au
diff --git a/net/netselect/Makefile b/net/netselect/Makefile
index dd047898198a..3813ecd0fed7 100644
--- a/net/netselect/Makefile
+++ b/net/netselect/Makefile
@@ -5,7 +5,7 @@ PORTNAME= netselect
PORTVERSION= 0.3
CATEGORIES= net
MASTER_SITES= http://apenwarr.ca/netselect/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Ultrafast implementation of ping
diff --git a/net/ntraceroute/Makefile b/net/ntraceroute/Makefile
index a07df8afc15a..c17a8bcf761f 100644
--- a/net/ntraceroute/Makefile
+++ b/net/ntraceroute/Makefile
@@ -5,9 +5,8 @@ PORTNAME= ntraceroute
PORTVERSION= 6.4.2
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_NETBSD} \
+MASTER_SITES= NETBSD/traceroute-nanog \
http://mirrors.rit.edu/zi/
-MASTER_SITE_SUBDIR= traceroute-nanog
DISTNAME= traceroute.c
EXTRACT_SUFX=
DIST_SUBDIR= ${PORTNAME}
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index 73b5e853dfdb..c94b12bd3676 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -4,10 +4,8 @@ PORTNAME= openbgpd
PORTVERSION= 5.2.20121209
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_OPENBSD}
-MASTER_SITE_SUBDIR= OpenBGPD
+MASTER_SITES= OPENBSD/OpenBGPD
DISTNAME= ${PORTNAME}-4.6
-EXTRACT_SUFX= .tgz
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= hrs@FreeBSD.org
@@ -19,7 +17,7 @@ LICENSE_FILE= ${FILESDIR}/COPYING
CONFLICTS= zebra-[0-9]* quagga-[0-9]*
WRKSRC= ${WRKDIR}
-USES= uidfix
+USES= uidfix tar:tgz
USE_RC_SUBR= ${PORTNAME}
PLIST_FILES= sbin/bgpctl sbin/bgpd man/man5/bgpd.conf.5.gz \
man/man8/bgpctl.8.gz man/man8/bgpd.8.gz
diff --git a/net/opendpi/Makefile b/net/opendpi/Makefile
index 09e7965e3237..d6178f432fb0 100644
--- a/net/opendpi/Makefile
+++ b/net/opendpi/Makefile
@@ -5,7 +5,7 @@ PORTNAME= opendpi
PORTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= fernando@netfilter.com.br
COMMENT= Open source deep packet inspection engine
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 21b25af11eea..48d71604a156 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 5.7p4
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_OPENBSD}
-MASTER_SITE_SUBDIR= OpenNTPD
+MASTER_SITES= OPENBSD/OpenNTPD
MAINTAINER= naddy@FreeBSD.org
COMMENT= Network Time Protocol (NTP) daemon
diff --git a/net/ostinato/Makefile b/net/ostinato/Makefile
index d9847073425c..7c628807bb05 100644
--- a/net/ostinato/Makefile
+++ b/net/ostinato/Makefile
@@ -5,8 +5,8 @@ PORTNAME= ostinato
PORTVERSION= 0.5.1
PORTREVISION= 2
CATEGORIES= net security
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-DISTNAME= ${PORTNAME}-src-${PORTVERSION}${EXTRACTSUFFIX}
+MASTER_SITES= GOOGLE_CODE
+DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= zeising@FreeBSD.org
COMMENT= Packet crafter/generator and analyzer with friendly GUI
diff --git a/net/p5-Net-CascadeCopy/Makefile b/net/p5-Net-CascadeCopy/Makefile
index 9596a3816c81..ace270592e93 100644
--- a/net/p5-Net-CascadeCopy/Makefile
+++ b/net/p5-Net-CascadeCopy/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.2.6
PORTREVISION= 2
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-GrowlClient/Makefile b/net/p5-Net-GrowlClient/Makefile
index f69a58c48e83..b40a01b0cea3 100644
--- a/net/p5-Net-GrowlClient/Makefile
+++ b/net/p5-Net-GrowlClient/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.02
PORTREVISION= 2
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/net/p5-Net-IRR/Makefile b/net/p5-Net-IRR/Makefile
index ce563c38025a..1e87e1da502a 100644
--- a/net/p5-Net-IRR/Makefile
+++ b/net/p5-Net-IRR/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.08
PORTREVISION= 1
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Net-Proxy/Makefile b/net/p5-Net-Proxy/Makefile
index 6026869bd572..0b67968f1169 100644
--- a/net/p5-Net-Proxy/Makefile
+++ b/net/p5-Net-Proxy/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.13
PORTREVISION= 1
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= jadawin@FreeBSD.org
diff --git a/net/p5-Net-Trackback/Makefile b/net/p5-Net-Trackback/Makefile
index 2ca11c00a401..4a39d162ef04 100644
--- a/net/p5-Net-Trackback/Makefile
+++ b/net/p5-Net-Trackback/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.01
PORTREVISION= 1
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= coryking@mozimedia.com
diff --git a/net/p5-POE-Component-PubSub/Makefile b/net/p5-POE-Component-PubSub/Makefile
index cb5451c6ad37..c91515044078 100644
--- a/net/p5-POE-Component-PubSub/Makefile
+++ b/net/p5-POE-Component-PubSub/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= net perl5
MASTER_SITES= CPAN
-#MASTER_SITE_SUBDIR= CPAN:nperez
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index 9e2b2fe35efa..9ee1ab2448ea 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -5,8 +5,7 @@ PORTNAME= PlRPC
PORTVERSION= 0.2020
PORTREVISION= 2
CATEGORIES= net perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= RPC
+MASTER_SITES= CPAN/RPC
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Samba-LDAP/Makefile b/net/p5-Samba-LDAP/Makefile
index 9d6b26320fc6..6bbb25acb376 100644
--- a/net/p5-Samba-LDAP/Makefile
+++ b/net/p5-Samba-LDAP/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 2
CATEGORIES= net perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Samba
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 7229236b12ad..2e0e3d5afe6d 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -5,8 +5,7 @@ PORTNAME= SOCKS
PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= net perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN/Net
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/net/pload/Makefile b/net/pload/Makefile
index afc252a43542..fe990c064581 100644
--- a/net/pload/Makefile
+++ b/net/pload/Makefile
@@ -5,9 +5,8 @@ PORTNAME= pload
PORTVERSION= 0.9.5
PORTREVISION= 4
CATEGORIES= net sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/pav \
http://opal.com/jr/freebsd/ports/net/pload/
-MASTER_SITE_SUBDIR= pav
MAINTAINER= fbsd@opal.com
COMMENT= X11 program to display network traffic graphs
diff --git a/net/py-amqplib/Makefile b/net/py-amqplib/Makefile
index 4b19fed0af5a..9c37bb984631 100644
--- a/net/py-amqplib/Makefile
+++ b/net/py-amqplib/Makefile
@@ -5,17 +5,16 @@ PORTNAME= amqplib
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX= .tgz
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= AMQP Client Library
PROJECTHOST= py-amqplib
-USES= python
+USES= python tar:tgz
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg_httpsclient/Makefile
index dd61ff337a94..9c327baf943f 100644
--- a/net/py-ndg_httpsclient/Makefile
+++ b/net/py-ndg_httpsclient/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ndg_httpsclient
PORTVERSION= 0.3.3
CATEGORIES= net python
-MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR= source/${DISTNAME:C/(.).*/\1/}/${PORTNAME:S/_/-/}
+MASTER_SITES= CHEESESHOP/source/${DISTNAME:C/(.).*/\1/}/${PORTNAME:S/_/-/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= olivierd@FreeBSD.org
diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile
index e00f43a451b5..f2edbd65f899 100644
--- a/net/py-pypcap/Makefile
+++ b/net/py-pypcap/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pypcap
PORTVERSION= 1.1
PORTREVISION= 5
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wxs@FreeBSD.org
diff --git a/net/py-pyvmomi/Makefile b/net/py-pyvmomi/Makefile
index 38c94f58de9c..5237008e8273 100644
--- a/net/py-pyvmomi/Makefile
+++ b/net/py-pyvmomi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pyvmomi
DISTVERSION= 5.5.0-2014.1.1
CATEGORIES= net python
-MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR= source/p/${PORTNAME}
+MASTER_SITES= CHEESESHOP/source/p/${PORTNAME}
MAINTAINER= robak@FreeBSD.org
COMMENT= Python SDK for the VMware vSphere API of ESX, ESXi, and vCenter
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index e46f8d107a67..a3569fc8d134 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.62
PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.boutell.com/rinetd/http/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
DISTNAME= rinetd
MAINTAINER= garga@FreeBSD.org
diff --git a/net/rsync-bpc/Makefile b/net/rsync-bpc/Makefile
index 359f334996d8..9674e0be496e 100644
--- a/net/rsync-bpc/Makefile
+++ b/net/rsync-bpc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= rsync-bpc
PORTVERSION= 3.0.9.3
CATEGORIES= net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= backuppc/backuppc-beta/4.0.0alpha3
+MASTER_SITES= SF/backuppc/backuppc-beta/4.0.0alpha3
MAINTAINER= moiseev@mezonplus.ru
COMMENT= Modified rsync that used as part of BackupPC
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index d242a1e23616..73df13a77e88 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -5,13 +5,12 @@ PORTNAME= rsync
PORTVERSION= 3.1.1
PORTREVISION= 3
CATEGORIES= net ipv6
-MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \
- ftp://ftp.samba.org/pub/%SUBDIR%/ \
- ftp://ftp.sunet.se/pub/unix/admin/%SUBDIR%/ \
- ftp://ftp.fu-berlin.de/pub/unix/network/%SUBDIR%/ \
+MASTER_SITES= http://rsync.samba.org/ftp/rsync/ \
+ ftp://ftp.samba.org/pub/rsync/ \
+ ftp://ftp.sunet.se/pub/unix/admin/rsync/ \
+ ftp://ftp.fu-berlin.de/pub/unix/network/rsync/ \
http://www.mirrorservice.org/sites/rsync.samba.org/ \
LOCAL/ehaupt/rsync
-MASTER_SITE_SUBDIR= rsync
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 09b88eb3c71a..feb64d8dd3b3 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ${SAMBA_BASENAME}36
PORTVERSION= 3.6.25
PORTREVISION?= 0
CATEGORIES?= net
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= samba samba/stable samba/pre
+MASTER_SITES= SAMBA/samba SAMBA/samba/stable SAMBA/samba/pre
DISTNAME= ${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
MAINTAINER?= timur@FreeBSD.org
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 519520315b58..994d30840ef3 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= ${SAMBA4_BASENAME}4
PORTVERSION?= ${SAMBA4_VERSION}
PORTREVISION?= 0
CATEGORIES?= net
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= samba/stable samba/rc
+MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
MAINTAINER?= timur@FreeBSD.org
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index b6ab84cbf242..37dd8e20eec3 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= ${SAMBA4_BASENAME}41
PORTVERSION?= ${SAMBA4_VERSION}
PORTREVISION?= 0
CATEGORIES?= net
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= samba/stable samba/rc
+MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
MAINTAINER?= timur@FreeBSD.org
diff --git a/net/samplicator/Makefile b/net/samplicator/Makefile
index 7dd46743a61c..facbba891517 100644
--- a/net/samplicator/Makefile
+++ b/net/samplicator/Makefile
@@ -4,8 +4,7 @@ PORTNAME= samplicator
PORTVERSION= 1.3.7.b6
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR= samplicator
+MASTER_SITES= GOOGLE_CODE
DISTNAME= samplicator-1.3.7-beta6
MAINTAINER= me@falz.net
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index 9d2d7a502536..18cc69ef2134 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -5,8 +5,7 @@ PORTNAME= smb4k-kde4
PORTVERSION= 0.10.9
PORTREVISION= 11
CATEGORIES= net kde
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= smb4k
+MASTER_SITES= SF/smb4k
DISTNAME= smb4k-${PORTVERSION}
MAINTAINER= jpaetzel@FreeBSD.org
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 84c9ea624461..ff57a0f63e13 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= net security
MASTER_SITES= http://www.mavetju.org/download/adopted/
DISTNAME= sniffit.0.3.7.beta
-PATCH_SITES= ${MASTER_SITE_DEBIAN_POOL} \
- http://www.mavetju.org/download/adopted/:patches
-PATCHFILES= sniffit_0.3.7.beta-10.diff.gz:patches
+PATCH_SITES= http://www.mavetju.org/download/adopted/
+PATCHFILES= sniffit_0.3.7.beta-10.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= edwin@mavetju.org
diff --git a/net/stf-6rd-kmod/Makefile b/net/stf-6rd-kmod/Makefile
index 88af8a749ef5..e70649ddc953 100644
--- a/net/stf-6rd-kmod/Makefile
+++ b/net/stf-6rd-kmod/Makefile
@@ -3,8 +3,7 @@
PORTNAME= stf
PORTVERSION= 0.${SVN_REV}
CATEGORIES= net ipv6
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
PKGNAMESUFFIX= -6rd-kmod
DISTNAME= freebsd-stf-${OSREL}-${PORTVERSION}
diff --git a/net/suckblow/Makefile b/net/suckblow/Makefile
index fbc12bb914c9..a698ba79a7a7 100644
--- a/net/suckblow/Makefile
+++ b/net/suckblow/Makefile
@@ -4,8 +4,7 @@
PORTNAME= suckblow
PORTVERSION= 1.1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= archie
+MASTER_SITES= LOCAL/archie
MAINTAINER= ports@FreeBSD.org
COMMENT= Two companion utilities for transferring data over a TCP socket
diff --git a/net/tcpcat/Makefile b/net/tcpcat/Makefile
index 10f35b4453dc..83837e5f1b17 100644
--- a/net/tcpcat/Makefile
+++ b/net/tcpcat/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tcpcat
PORTVERSION= 1.2.0
CATEGORIES= net
MASTER_SITES= http://ess4.engr.uvic.ca/proj/tcpcat/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= roam/net
+ LOCAL/roam/net
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple utility for sending/receiving data over a TCP or a Unix-domain socket
diff --git a/net/tcpshow/Makefile b/net/tcpshow/Makefile
index 47e30b966740..463bfa91b48c 100644
--- a/net/tcpshow/Makefile
+++ b/net/tcpshow/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tcpshow
PORTVERSION= 1.74
PORTREVISION= 1
CATEGORIES= net security
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
DISTFILES= tcpshow.c tcpshow.1
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile
index 7b4dd3465ed6..0279458994c2 100644
--- a/net/trafshow3/Makefile
+++ b/net/trafshow3/Makefile
@@ -6,10 +6,8 @@ PORTVERSION= 3.1
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sem
+MASTER_SITES= LOCAL/sem
PKGNAMESUFFIX= 3
-EXTRACT_SUFX= .tgz
MAINTAINER= sem@FreeBSD.org
COMMENT= Full screen visualization of network traffic (an ancient version)
@@ -21,6 +19,7 @@ CONFLICTS= trafshow-[45].*
LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2
.endif
+USES= tar:tgz
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index e9d7898a5dde..763385df534b 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tramp
PORTVERSION= 2.2.7
PORTREVISION= 2
CATEGORIES= net elisp
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index 23d5dfecce6b..c86ac2e63015 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tridiavnc
PORTVERSION= 1.4
PORTREVISION= 5
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dwcjr
+MASTER_SITES= LOCAL/dwcjr
DISTNAME= DevVNC_unix
MAINTAINER= ports@FreeBSD.org
diff --git a/net/uget/Makefile b/net/uget/Makefile
index 947ae6d61393..042a2eed349b 100644
--- a/net/uget/Makefile
+++ b/net/uget/Makefile
@@ -4,8 +4,7 @@
PORTNAME= uget
PORTVERSION= 2.0
CATEGORIES= net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
+MASTER_SITES= SF/urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
MAINTAINER= olivierd@FreeBSD.org
COMMENT= Download manager application
diff --git a/net/vblade/Makefile b/net/vblade/Makefile
index aea4d9c0bf7d..214ca0110d83 100644
--- a/net/vblade/Makefile
+++ b/net/vblade/Makefile
@@ -5,9 +5,7 @@ PORTNAME= vblade
PORTVERSION= 21
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= aoetools/${PORTNAME}/${PORTVERSION}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SF/aoetools/${PORTNAME}/${PORTVERSION}
MAINTAINER= fjoe@FreeBSD.org
COMMENT= Virtual EtherDrive(R) blade AoE target
@@ -18,6 +16,7 @@ MAKE_ARGS= PLATFORM=freebsd\
INSTALL_MAN="${INSTALL_MAN}"
MAKEFILE= makefile
ALL_TARGET=
+USES= tar:tgz
PLIST_FILES= sbin/vblade sbin/vbladed man/man8/vblade.8.gz
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 817f81ce37af..60a21681d4ef 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -42,8 +42,7 @@ BROKEN= Does not compile on arm
.endif
.if ${PORT_OPTIONS:MSERVER}
-MASTER_SITES+= ${MASTER_SITE_XORG:S/$/:x/}
-MASTER_SITE_SUBDIR+= 4.3.0/:x
+MASTER_SITES+= XORG/4.3.0/:x
DISTFILES+= X430src-1.tgz:x \
X430src-2.tgz:x \
X430src-3.tgz:x
diff --git a/net/wmnd/Makefile b/net/wmnd/Makefile
index 8862edd6cfa0..060b581f6434 100644
--- a/net/wmnd/Makefile
+++ b/net/wmnd/Makefile
@@ -5,7 +5,6 @@ PORTNAME= wmnd
PORTVERSION= 0.4.17
CATEGORIES= net
MASTER_SITES= http://www.thregr.org/~wavexx/software/wmnd/releases/
-MASTER_SITE_SUBDIR= distfiles
MAINTAINER= garga@FreeBSD.org
COMMENT= Improved network monitoring dock app (with tons of features)
diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile
index 7a855397df31..8da67bd6b3ad 100644
--- a/net/wmnet/Makefile
+++ b/net/wmnet/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.2
PORTREVISION= 3
CATEGORIES= net windowmaker
MASTER_SITES= ftp://ftp.enteract.com/users/rneswold/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= novel
+ LOCAL/novel
MAINTAINER= novel@FreeBSD.org
COMMENT= Network bandwidth monitor intended for the WindowMaker dock
diff --git a/net/wmwifi/Makefile b/net/wmwifi/Makefile
index 16a4330dc549..654eece11668 100644
--- a/net/wmwifi/Makefile
+++ b/net/wmwifi/Makefile
@@ -7,8 +7,7 @@ DISTVERSIONSUFFIX=-bsd
PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://digitalssg.net/debian/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= uqs@FreeBSD.org
COMMENT= Dockapp displaying the signal strength of WiFi connection
diff --git a/net/xpvm/Makefile b/net/xpvm/Makefile
index 099f4c0aaed1..78fc2caedac7 100644
--- a/net/xpvm/Makefile
+++ b/net/xpvm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpvm
PORTVERSION= 1.2.5
PORTREVISION= 4
CATEGORIES= net parallel
-MASTER_SITES= NL
-MASTER_SITE_SUBDIR= pvm3/xpvm
+MASTER_SITES= NL/pvm3/xpvm
DISTNAME= XPVM.src.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net/yconalyzer/Makefile b/net/yconalyzer/Makefile
index 06e3595886aa..d6593b35dae6 100644
--- a/net/yconalyzer/Makefile
+++ b/net/yconalyzer/Makefile
@@ -5,8 +5,7 @@ PORTNAME= yconalyzer
PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= TCP Traffic Analyzer
diff --git a/news/atp/Makefile b/news/atp/Makefile
index 7e87ef663722..9bfa3f0278cf 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= atp
PORTVERSION= 1.50
PORTREVISION= 2
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/bbs/mail
+MASTER_SITES= SUNSITE/system/bbs/mail
DISTFILES= ${DISTNAME}-src.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/news/husky/Makefile.local b/news/husky/Makefile.local
index 92ce8ffddd04..a0c90a6802ea 100644
--- a/news/husky/Makefile.local
+++ b/news/husky/Makefile.local
@@ -11,8 +11,7 @@ PORTEPOCH= 1
MAINTAINER= osharoiko@gmail.com
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= husky/husky/1.9-current/2014.05.19
+MASTER_SITES= SF/husky/husky/1.9-current/2014.05.19
DISTNAME= husky-all-1.9-source-20140519
HUSKY_ROOTDIR= ${WRKDIR}/husky
diff --git a/news/ifmail/Makefile b/news/ifmail/Makefile
index 24ec38d63baa..4b55eb27e9cc 100644
--- a/news/ifmail/Makefile
+++ b/news/ifmail/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ifmail
PORTVERSION= 2.15
PORTREVISION= 5
CATEGORIES= news comms
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/fido
+MASTER_SITES= SUNSITE/system/fido
MAINTAINER= dinoex@FreeBSD.org
COMMENT= FidoNet(tm) support package for UN*X platform
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 735fa8f4b49f..b072522c8153 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -6,8 +6,7 @@ PORTVERSION?= 2.5.4
PORTREVISION?= 2
CATEGORIES= news ipv6
# Master distribution broken
-MASTER_SITES?= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR?= ${PORTNAME}
+MASTER_SITES?= ISC/${PORTNAME}
MAINTAINER= johans@FreeBSD.org
COMMENT= InterNetNews -- the Internet meets Netnews
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 55118007b9af..cc2bc82f8118 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -5,8 +5,7 @@ PORTNAME= knews
PORTVERSION= 1.0b.1
PORTREVISION= 13
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Threaded nntp newsreader for X
diff --git a/news/lusernet/Makefile b/news/lusernet/Makefile
index 1a5aa39de137..e7543e4acb3e 100644
--- a/news/lusernet/Makefile
+++ b/news/lusernet/Makefile
@@ -4,8 +4,7 @@ PORTNAME= lusernet
PORTVERSION= 0.4.2
PORTREVISION= 4
CATEGORIES= news gnustep
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= LuserNET-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile
index aa83f708c0c0..56178b3c0ad2 100644
--- a/news/newsfetch/Makefile
+++ b/news/newsfetch/Makefile
@@ -5,8 +5,7 @@ PORTNAME= newsfetch
PORTVERSION= 1.21
PORTREVISION= 2
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/news/readers
+MASTER_SITES= SUNSITE/system/news/readers
MAINTAINER= ports@FreeBSD.org
COMMENT= Download news articles from NNTP server
diff --git a/news/p5-NNTPClient/Makefile b/news/p5-NNTPClient/Makefile
index e4a133d320d0..d73336bf8f12 100644
--- a/news/p5-NNTPClient/Makefile
+++ b/news/p5-NNTPClient/Makefile
@@ -5,8 +5,7 @@ PORTNAME= NNTPClient
PORTVERSION= 0.37
PORTREVISION= 1
CATEGORIES= news perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= News
+MASTER_SITES= CPAN/News
PKGNAMEPREFIX= p5-
MAINTAINER= gary@hayers.org
diff --git a/news/pgpmoose/Makefile b/news/pgpmoose/Makefile
index 064dd492ac23..746b22940989 100644
--- a/news/pgpmoose/Makefile
+++ b/news/pgpmoose/Makefile
@@ -6,8 +6,7 @@ PORTREVISION= 1
CATEGORIES= news security
# Distribution broken
# MASTER_SITES= http://people.qualcomm.com/ggr/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= PGPMoose
EXTRACT_SUFX= .tar.Z
diff --git a/news/plor/Makefile b/news/plor/Makefile
index cca323d1f983..6357dead4e14 100644
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@@ -5,8 +5,7 @@ PORTNAME= plor
PORTVERSION= 0.3.3
PORTREVISION= 1
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/bbs/mail
+MASTER_SITES= SUNSITE/system/bbs/mail
MAINTAINER= ports@FreeBSD.org
COMMENT= Alpha-release reader for reading SOUP and QWK packets
diff --git a/news/slrnface/Makefile b/news/slrnface/Makefile
index a39b1b1be383..9ee4d5c6cfb0 100644
--- a/news/slrnface/Makefile
+++ b/news/slrnface/Makefile
@@ -5,8 +5,7 @@ PORTNAME= slrnface
PORTVERSION= 2.1.1
PORTREVISION= 6
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/s/${PORTNAME}
+MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/ports-mgmt/p5-FreeBSD-Ports/Makefile b/ports-mgmt/p5-FreeBSD-Ports/Makefile
index 36dbf99e79ec..1101b05f9ade 100644
--- a/ports-mgmt/p5-FreeBSD-Ports/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Ports/Makefile
@@ -5,8 +5,7 @@ PORTNAME= FreeBSD-Ports
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= ports-mgmt perl5
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= tom
+MASTER_SITES= LOCAL/tom
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/ports-mgmt/portsearch/Makefile b/ports-mgmt/portsearch/Makefile
index dff81b664cc3..6332605bdb82 100644
--- a/ports-mgmt/portsearch/Makefile
+++ b/ports-mgmt/portsearch/Makefile
@@ -5,8 +5,7 @@ PORTNAME= portsearch
PORTVERSION= 1.3.4
CATEGORIES= ports-mgmt
MASTER_SITES= http://people.freebsd.org/~vd/portsearch/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= vd/portsearch
+ LOCAL/vd/portsearch
MAINTAINER= vd@FreeBSD.org
COMMENT= Port searching tool that supports search by packing list files
diff --git a/ports-mgmt/porttree/Makefile b/ports-mgmt/porttree/Makefile
index c28681b357cf..252cd934bc84 100644
--- a/ports-mgmt/porttree/Makefile
+++ b/ports-mgmt/porttree/Makefile
@@ -4,7 +4,7 @@
PORTNAME= porttree
PORTVERSION= 0.3.r${SVN_REV}
CATEGORIES= ports-mgmt python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= Vladimir.Chukharev@gmail.com
COMMENT= Show dependences of FreeBSD port as pseudo graphical tree
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 0685dcfbef13..c2813f5020e6 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -5,9 +5,7 @@ PORTNAME= a2ps
PORTVERSION= 4.13b
PORTREVISION= 6
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_GNU} \
- ${MASTER_SITE_LOCAL:S/$/:i18n/}
-MASTER_SITE_SUBDIR= ${PORTNAME} hrs/a2ps/:i18n
+MASTER_SITES= GNU LOCAL/hrs/a2ps/:i18n
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Formats an ASCII file for printing on a postscript printer
diff --git a/print/abc2mtex/Makefile b/print/abc2mtex/Makefile
index 038fbb2e58fd..4021d84ed0a7 100644
--- a/print/abc2mtex/Makefile
+++ b/print/abc2mtex/Makefile
@@ -4,8 +4,7 @@
PORTNAME= abc2mtex
PORTVERSION= 1.6.1
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= support/abc2mtex
+MASTER_SITES= TEX_CTAN/support/abc2mtex
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
diff --git a/print/adobe-cmaps/Makefile b/print/adobe-cmaps/Makefile
index 609a9970da03..4420a2ca94fb 100644
--- a/print/adobe-cmaps/Makefile
+++ b/print/adobe-cmaps/Makefile
@@ -5,8 +5,7 @@ PORTNAME= adobe-cmaps
PORTVERSION= 20051217
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= hrs/adobe
+MASTER_SITES= LOCAL/hrs/adobe
DISTFILES= ac15.tar.gz ag15.tar.gz \
ai0.tar.gz aj16.tar.gz \
aj20.tar.gz ak12.tar.gz rksj-cmaps.tar.gz
diff --git a/print/alignmargins/Makefile b/print/alignmargins/Makefile
index b9649ff0010f..9dbfc43fc53f 100644
--- a/print/alignmargins/Makefile
+++ b/print/alignmargins/Makefile
@@ -5,9 +5,8 @@ PORTNAME= alignmargins
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/lofi \
http://www.linuxprinting.org/download/printing/
-MASTER_SITE_SUBDIR=lofi
DISTFILES= alignmargins align.ps
MAINTAINER= ports@FreeBSD.org
diff --git a/print/asprint/Makefile b/print/asprint/Makefile
index f4a4e11ede5a..9ba1b914d0de 100644
--- a/print/asprint/Makefile
+++ b/print/asprint/Makefile
@@ -5,8 +5,7 @@ PORTNAME= asprint
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR= apps/asprint
+MASTER_SITES= AFTERSTEP/apps/asprint
DISTNAME= asprint
MAINTAINER= ports@FreeBSD.org
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 3824b05bd93d..a350468aa46d 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -5,8 +5,7 @@ PORTNAME= auctex
PORTVERSION= 11.88
PORTREVISION= 2
CATEGORIES= print elisp
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= hrs@FreeBSD.org
diff --git a/print/bibview/Makefile b/print/bibview/Makefile
index 57c1ee2253ab..02fb1c3270be 100644
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bibview
PORTVERSION= 2.2
PORTREVISION= 2
CATEGORIES= print databases
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= biblio/bibtex/utils/bibview-2.0
+MASTER_SITES= TEX_CTAN/biblio/bibtex/utils/bibview-2.0
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical interface for manipulating BibTeX bibliography databases
diff --git a/print/cm-super/Makefile b/print/cm-super/Makefile
index a4df3fee4947..ad1ae767c836 100644
--- a/print/cm-super/Makefile
+++ b/print/cm-super/Makefile
@@ -5,10 +5,8 @@ PORTNAME= cm-super
PORTVERSION= 0.3.4
PORTREVISION= 5
CATEGORIES= print x11-fonts
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
-#MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-#MASTER_SITE_SUBDIR= fonts/ps-type1
+MASTER_SITES= LOCAL/hrs
+#MASTER_SITES= TEX_CTAN/fonts/ps-type1
#DISTNAME= ${PORTNAME}
MAINTAINER= hrs@FreeBSD.org
diff --git a/print/dot2tex/Makefile b/print/dot2tex/Makefile
index b3fd70de5b89..bfbb51fed3e0 100644
--- a/print/dot2tex/Makefile
+++ b/print/dot2tex/Makefile
@@ -5,7 +5,7 @@ PORTNAME= dot2tex
PORTVERSION= 2.8.7
PORTREVISION= 1
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= romain@FreeBSD.org
COMMENT= Graphviz to LaTeX converter
diff --git a/print/font-amsfonts/Makefile b/print/font-amsfonts/Makefile
index d04bf56829a4..aa91b66bc34b 100644
--- a/print/font-amsfonts/Makefile
+++ b/print/font-amsfonts/Makefile
@@ -5,8 +5,7 @@ PORTNAME= amsfonts
PORTVERSION= 3.02
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
PKGNAMEPREFIX= font-
DIST_SUBDIR= teTeX
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index 6e04742c7b01..e15f03d81bfa 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -4,8 +4,8 @@
PORTNAME= foo2zjs
PORTVERSION= 20140417
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_LOCAL:S,$,bsam/${PORTNAME}/,} \
+MASTER_SITES= GOOGLE_CODE \
+ LOCAL/bsam/${PORTNAME} \
ftp://ftp.wart.ru/pub/FreeBSD/ports/distfiles/
MAINTAINER= ports@FreeBSD.org
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 51e5f1ff2967..f3eadd698d0e 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -4,8 +4,7 @@
PORTNAME= db
PORTVERSION= 20150415
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= danilo
+MASTER_SITES= LOCAL/danilo
PKGNAMEPREFIX= foomatic-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${FOOMATICVER}-${PORTVERSION}
diff --git a/print/foxitreader/Makefile b/print/foxitreader/Makefile
index 5f1545df8171..4484fd448aee 100644
--- a/print/foxitreader/Makefile
+++ b/print/foxitreader/Makefile
@@ -5,9 +5,8 @@ PORTNAME= foxitreader
PORTVERSION= 1.1.0
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= http://cdn04.foxitsoftware.com/pub/foxit/%SUBDIR%/:reader,manual
-MASTER_SITE_SUBDIR= reader/desktop/linux/1.x/${PORTVERSION:R}/enu/:reader \
- manual/enu/:manual
+MASTER_SITES= http://cdn04.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/${PORTVERSION:R}/enu/:reader
+
DISTFILES= FoxitReader-${PORTVERSION}.tar.bz2:reader
EXTRACT_ONLY= FoxitReader-${PORTVERSION}.tar.bz2
@@ -33,6 +32,7 @@ WRKSRC= ${WRKDIR}/${PORTVERSION:R}-release
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
+MASTER_SITES+= http://cdn04.foxitsoftware.com/pub/foxit/manual/enu/:manual
DISTFILES+= FoxitReader${PORTVERSION:R}ForLinux_Manual.pdf:manual
.endif
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 8417584dc73e..4faa29c3c65f 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -7,10 +7,7 @@ PORTREVISION= 31
CATEGORIES= print
MASTER_SITES= SF/ghostscript/gnu-gs/${PORTVERSION}:gs_srcs \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${PORTVERSION:S/.//}/:gs_srcs \
- ${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/}
-MASTER_SITE_SUBDIR= \
- ghostscript/:gs_srcs \
- ./:ports_jp
+ PORTS_JP:ports_jp,ports_jp_gs
PKGNAMESUFFIX= 7
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs
DIST_SUBDIR= ${PORTNAME}
diff --git a/print/ghostscript7/files/Makefile.bjc250 b/print/ghostscript7/files/Makefile.bjc250
index 222c9e289c2e..bafe557b6c1d 100644
--- a/print/ghostscript7/files/Makefile.bjc250
+++ b/print/ghostscript7/files/Makefile.bjc250
@@ -2,8 +2,7 @@
# BJC250 - additional driver for Canon BJC-210/240/250/265/1000
# http://bjc250gs.sourceforge.net/
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:bjc250/}
-MASTER_SITE_SUBDIR+= bjc250gs/:bjc250
+MASTER_SITES+= SOURCEFORGE/bjc250gs/:bjc250
DISTFILES+= gs7.05-bjc250-v0.756.diff.gz:bjc250
EXTRADEVMKFILE+= ${FILESDIR}/bjc250.contrib.mak
diff --git a/print/ghostscript7/files/Makefile.cpca b/print/ghostscript7/files/Makefile.cpca
index e48516153ece..b819d75d290b 100644
--- a/print/ghostscript7/files/Makefile.cpca
+++ b/print/ghostscript7/files/Makefile.cpca
@@ -2,7 +2,7 @@
# CPCA - additional driver for Canon CPCA printers
# http://cweb.canon.jp/open-mie/technical/index-j.html
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/:S/$/:cpca/}
+MASTER_SITES+= LOCAL/pav:cpca
DISTFILES+= canon-lips4-1.0.0-651.tgz:cpca
EXTRADEVMKFILE+=${WRKSRC}/src/cpca_gdev.mak
diff --git a/print/ghostscript7/files/Makefile.eplaser b/print/ghostscript7/files/Makefile.eplaser
index 7a5debd2f3fe..9aa186dd9e60 100644
--- a/print/ghostscript7/files/Makefile.eplaser
+++ b/print/ghostscript7/files/Makefile.eplaser
@@ -2,8 +2,7 @@
# EPLASER - additional driver for ESC/Page printers, by EPSON AVASYS Corp.
# http://www.avasys.jp/english/linux_e/index.html
-MASTER_SITES+= ${MASTER_SITE_LOCAL}:eplaser
-MASTER_SITE_SUBDIR+= arved/:eplaser
+MASTER_SITES+= LOCAL/arved/:eplaser
DISTFILES+= eplaser-3.1.4-705.tgz:eplaser
EXTRADEVMKFILE+= ${WRKSRC}/eplaser/gdevescv7.mak \
${WRKSRC}/eplaser/gdevesmv7.mak
diff --git a/print/ghostscript7/files/Makefile.gprint b/print/ghostscript7/files/Makefile.gprint
index 11ab9689135a..f6d304b56133 100644
--- a/print/ghostscript7/files/Makefile.gprint
+++ b/print/ghostscript7/files/Makefile.gprint
@@ -9,8 +9,7 @@
#
# For that reason, integration of stp driver is disabled by default.
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/gimp-print/:S/$/:gprint/} \
-MASTER_SITE_SUBDIR= gimp-print/:gprint
+MASTER_SITES+= SOURCEFORGE/gimp-print/:gprint
DISTFILES+= gimp-print-4.2.7.tar.gz:gprint
EXTRADEVMKFILE+= ${FILESDIR}/stp.contrib.mak
diff --git a/print/ghostscript7/files/Makefile.lex7000 b/print/ghostscript7/files/Makefile.lex7000
index 48377a06aff9..9c72af416840 100644
--- a/print/ghostscript7/files/Makefile.lex7000
+++ b/print/ghostscript7/files/Makefile.lex7000
@@ -2,7 +2,7 @@
# LEX7000 - additional driver for Lexmark 2050/3200/5700/7000
# http://bimbo.fjfi.cvut.cz/~paluch/l7kdriver/
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/:S/$/:lex7000/}
+MASTER_SITES+= LOCAL/pav:lex7000
DISTFILES+= gs6.0.lexmark7000.patch:lex7000
EXTRADEVMKFILE+= ${FILESDIR}/lex7000.contrib.mak
diff --git a/print/ghostscript7/files/Makefile.lx5000 b/print/ghostscript7/files/Makefile.lx5000
index bf636d65805c..b80198913a42 100644
--- a/print/ghostscript7/files/Makefile.lx5000
+++ b/print/ghostscript7/files/Makefile.lx5000
@@ -2,7 +2,7 @@
# LX5000 - additional driver for Lexmark 5000/Z51/Z82
# http://homepage.powerup.com.au/~pbwest/lexmark/lexmark.html
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/:S/$/:lx5000/}
+MASTER_SITES+= LOCAL/pav:lx5000
DISTFILES+= gdevlx50.c:lx5000
EXTRADEVMKFILE+= ${FILESDIR}/lx5000.contrib.mak
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 9b29feec2c28..f7b79758ac6a 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
http://www.humblesoft.com/pub/:epag
-MASTER_SITE_SUBDIR= ghostscript/:gs_srcs
PKGNAMESUFFIX= 8
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
DIST_SUBDIR= ${PORTNAME}
diff --git a/print/ghostscript9-agpl/Makefile b/print/ghostscript9-agpl/Makefile
index a95c28306f33..31cd9df0b04e 100644
--- a/print/ghostscript9-agpl/Makefile
+++ b/print/ghostscript9-agpl/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
http://www.humblesoft.com/pub/:epag
-MASTER_SITE_SUBDIR= ghostscript/:gs_srcs
PKGNAMESUFFIX= 9-agpl
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
DIST_SUBDIR= ${PORTNAME}
diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 8cc82c8f5c50..a051395bd726 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
http://www.humblesoft.com/pub/:epag
-MASTER_SITE_SUBDIR= ghostscript/:gs_srcs
PKGNAMESUFFIX= 9
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
DIST_SUBDIR= ${PORTNAME}
diff --git a/print/html2latex/Makefile b/print/html2latex/Makefile
index 9deddc0a6d3e..850d418afe50 100644
--- a/print/html2latex/Makefile
+++ b/print/html2latex/Makefile
@@ -4,8 +4,7 @@
PORTNAME= html2latex
PORTVERSION= 0.9c
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
MAINTAINER= joerg@FreeBSD.org
COMMENT= Convert HTML document into LaTeX
diff --git a/print/kde_poster/Makefile b/print/kde_poster/Makefile
index 98350e52f31a..47e080c77230 100644
--- a/print/kde_poster/Makefile
+++ b/print/kde_poster/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kde_poster
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= print kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= printing
+MASTER_SITES= KDE/printing
DISTNAME= poster
MAINTAINER= ports@FreeBSD.org
diff --git a/print/latex-ltablex/Makefile b/print/latex-ltablex/Makefile
index b6a25496c2cf..0373f44c2d4f 100644
--- a/print/latex-ltablex/Makefile
+++ b/print/latex-ltablex/Makefile
@@ -6,10 +6,8 @@ PORTREVISION= 2
CATEGORIES= print
# As of 2012-08-24, some mirrors are returning a tarball with a
# different checksum, so I am mirroring it locally instead.
-# MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-# MASTER_SITE_SUBDIR= macros/latex/contrib
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= rakuco/latex
+# MASTER_SITES= TEX_CTAN/macros/latex/contrib
+MASTER_SITES= LOCAL/rakuco/latex
PKGNAMEPREFIX= latex-
DIST_SUBDIR= latex
diff --git a/print/latex-resume/Makefile b/print/latex-resume/Makefile
index d58ccf60c8f6..0d3c4c0a51a3 100644
--- a/print/latex-resume/Makefile
+++ b/print/latex-resume/Makefile
@@ -5,8 +5,7 @@ PORTNAME= resume
PORTVERSION= 20010823
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= macros/latex/contrib/${PORTNAME}
+MASTER_SITES= TEX_CTAN/macros/latex/contrib/${PORTNAME}
PKGNAMEPREFIX= latex-
DISTNAME= res
EXTRACT_SUFX= .cls
diff --git a/print/latex2rtf/Makefile b/print/latex2rtf/Makefile
index 328829ab35b1..f371a909dcc7 100644
--- a/print/latex2rtf/Makefile
+++ b/print/latex2rtf/Makefile
@@ -5,7 +5,7 @@ PORTNAME= latex2rtf
PORTVERSION= 2.3.8
CATEGORIES= print
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION} \
- ${MASTER_SITE_TEX_CTAN}
+ TEX_CTAN
MAINTAINER= danilo@FreeBSD.org
COMMENT= Translator from LaTeX to RTF
diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index 85f030fe99be..b24872476190 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libotf
PORTVERSION= 0.9.13
PORTREVISION= 2
CATEGORIES= print devel textproc
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}:m17n
-MASTER_SITE_SUBDIR= m17n
+MASTER_SITES= SAVANNAH/m17n
MAINTAINER= nikola.lecic@anthesphoria.net
COMMENT= Library for handling OpenType fonts
diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index 96934ca3a9e1..5f7a4804effe 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libpaper
PORTVERSION= 1.1.24.3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/libp/libpaper
+MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION:C/.([0-9]+)$/+nmu\1/}
MAINTAINER= hrs@FreeBSD.org
diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile
index 50d3e3eed283..fc5419dfc98a 100644
--- a/print/openprinting/Makefile
+++ b/print/openprinting/Makefile
@@ -5,9 +5,7 @@ PORTNAME= openprinting
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= print net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=\
- openprinting/papi/1.0%20Beta
+MASTER_SITES= SF/openprinting/papi/1.0%20Beta
DISTNAME= papi-${PORTVERSION}_beta
DIST_SUBDIR= ${PORTNAME}
diff --git a/print/pdfbox/Makefile b/print/pdfbox/Makefile
index 5fd5b7a84a3e..522e91d3bad5 100644
--- a/print/pdfbox/Makefile
+++ b/print/pdfbox/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pdfbox
PORTVERSION= 1.8.9
CATEGORIES= print textproc java
-MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%,pdfbox/${PORTVERSION},}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= APACHE/pdfbox/${PORTVERSION}
DISTFILES= ${JAR_NAMES:S/$/-${PORTVERSION}.jar/}
MAINTAINER= ale@FreeBSD.org
diff --git a/print/pic2fig/Makefile b/print/pic2fig/Makefile
index cd44f959d6fc..05440b056b55 100644
--- a/print/pic2fig/Makefile
+++ b/print/pic2fig/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pic2fig
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
MAINTAINER= ports@FreeBSD.org
COMMENT= Pic format to fig format converter
diff --git a/print/pkfonts300/Makefile b/print/pkfonts300/Makefile
index 3ad7cb18f5b1..5673760e86a7 100644
--- a/print/pkfonts300/Makefile
+++ b/print/pkfonts300/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pkfonts${RESOLUTION}
PORTVERSION= 1.0
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MASTER_SITE_SUBDIR= pkfonts
+MASTER_SITES= PORTS_JP/pkfonts
DISTFILES= pk${RESOLUTION}.tar.gz
# see below for RESOLUTION definition
diff --git a/print/pstotext/Makefile b/print/pstotext/Makefile
index 4b6816123cc4..06387a57608c 100644
--- a/print/pstotext/Makefile
+++ b/print/pstotext/Makefile
@@ -5,11 +5,10 @@ PORTNAME= pstotext
PORTVERSION= 1.9
PORTREVISION= 4
CATEGORIES= print
-MASTER_SITES= http://ftp.gwdg.de/pub/%SUBDIR%/ \
- http://ftp.sunet.se/pub/text-processing/postscript/interpreters/%SUBDIR%/ \
- http://gd.tuwien.ac.at/pub/publishing/%SUBDIR%/ \
+MASTER_SITES= http://ftp.gwdg.de/pub/ghostscript/contrib/ \
+ http://ftp.sunet.se/pub/text-processing/postscript/interpreters/ghostscript/contrib/ \
+ http://gd.tuwien.ac.at/pub/publishing/ghostscript/contrib/ \
http://fossies.org/unix/misc/
-MASTER_SITE_SUBDIR= ghostscript/contrib
MAINTAINER= ports@FreeBSD.org
COMMENT= PostScript to Text converter
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 7183abce40e6..302d44644fd1 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= ftp://ftp.dcs.ed.ac.uk/pub/ajcd/ \
ftp://ftp.knackered.org/pub/psutils/ \
- ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= support/psutils
+ TEX_CTAN/support/psutils
DISTNAME= psutils-p17
MAINTAINER= hrs@FreeBSD.org
diff --git a/print/py-reportlab1/Makefile b/print/py-reportlab1/Makefile
index 544f3c4a857b..135c4d99293b 100644
--- a/print/py-reportlab1/Makefile
+++ b/print/py-reportlab1/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 1.21.2
PORTREVISION= 3
CATEGORIES= print python
MASTER_SITES= http://www.reportlab.com/ftp/ \
- ${MASTER_SITE_LOCAL:S/$/:accel/} \
+ LOCAL/erwin/:accel \
http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/:accel
-MASTER_SITE_SUBDIR= erwin/:accel
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 1
DISTFILES= reportlab-${PORTVERSION}.tar.gz \
diff --git a/print/tex/Makefile b/print/tex/Makefile
index 7280d84e2ac0..35241ab90fbe 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -5,10 +5,8 @@ PORTNAME= tex
PORTVERSION= 3.14159
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mikeh
-#${MASTER_SITE_TEX_CTAN} XXX distfiles disappeared/moved?
-#MASTER_SITE_SUBDIR= systems/web2c
+MASTER_SITES= LOCAL/mikeh
+#TEX_CTAN/systems/web2c XXX distfiles disappeared/moved?
DISTNAME= web2c-7.2
DISTFILES= web2c-7.2b.tar.gz web-7.2a.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
mf_lib.tar.gz cm_mf.tar.gz modes.mf
diff --git a/print/trueprint/Makefile b/print/trueprint/Makefile
index a9da3f498df9..cb929977bc8a 100644
--- a/print/trueprint/Makefile
+++ b/print/trueprint/Makefile
@@ -4,8 +4,7 @@
PORTNAME= trueprint
PORTVERSION= 5.4
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= trueprint
+MASTER_SITES= GNU
MAINTAINER= danilo@FreeBSD.org
COMMENT= Print program listings on postscript printer
diff --git a/russian/artwiz-ru/Makefile b/russian/artwiz-ru/Makefile
index 6d2c0e886794..0314fd139fca 100644
--- a/russian/artwiz-ru/Makefile
+++ b/russian/artwiz-ru/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 20041031
PORTREVISION= 3
CATEGORIES= russian x11-fonts
MASTER_SITES= http://dev.gentoo.org/~sergey/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= novel
+ LOCAL/novel
DISTNAME= artwiz_ru
MAINTAINER= novel@FreeBSD.org
diff --git a/russian/bugzilla44/Makefile b/russian/bugzilla44/Makefile
index dd84096f9868..d496ab6eb4c1 100644
--- a/russian/bugzilla44/Makefile
+++ b/russian/bugzilla44/Makefile
@@ -3,8 +3,7 @@
PORTNAME= bugzilla
PORTVERSION= 4.4.4
CATEGORIES= russian
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=bugzilla-ru/bugzilla-${PORTVERSION:R}-ru/${PORTVERSION}
+MASTER_SITES= SF/bugzilla-ru/bugzilla-${PORTVERSION:R}-ru/${PORTVERSION}
DISTNAME= bugzilla-${PORTVERSION}-ru-20140422
MAINTAINER= bz-ports@FreeBSD.org
diff --git a/science/crf++/Makefile b/science/crf++/Makefile
index 6ca75089bfe5..f64ca10fce04 100644
--- a/science/crf++/Makefile
+++ b/science/crf++/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crf++
PORTVERSION= 0.54
PORTREVISION= 1
CATEGORIES= science math
-MASTER_SITES= SF/crfpp/crfpp/${PORTVERSION} \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= SF/crfpp/crfpp/${PORTVERSION}
DISTNAME= CRF++-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/science/fisicalab/Makefile b/science/fisicalab/Makefile
index 80269f686efc..dd13571f671d 100644
--- a/science/fisicalab/Makefile
+++ b/science/fisicalab/Makefile
@@ -4,8 +4,7 @@ PORTNAME= fisicalab
PORTVERSION= 0.3.3
PORTREVISION= 2
CATEGORIES= science gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= fisicalab
+MASTER_SITES= SAVANNAH
MAINTAINER= theraven@FreeBSD.org
COMMENT= Physics simulation program for educational use
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index d25b624d5f19..5cb08b653749 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gchemutils
PORTVERSION= 0.14.10
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= SAVANNAH/${PORTNAME}/${PORTVERSION:R}
DISTNAME= gnome-chemistry-utils-${PORTVERSION}
MAINTAINER= kwm@FreeBSD.org
diff --git a/science/p5-Geo-Coordinates-Converter/Makefile b/science/p5-Geo-Coordinates-Converter/Makefile
index f38f1df9798f..1e626acee792 100644
--- a/science/p5-Geo-Coordinates-Converter/Makefile
+++ b/science/p5-Geo-Coordinates-Converter/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.13
PORTREVISION= 1
CATEGORIES= science geography perl5
MASTER_SITES= CPAN
-#MASTER_SITE_SUBDIR= CPAN:YAPPO
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/science/py-pydicom/Makefile b/science/py-pydicom/Makefile
index bcd9a781468b..7e3062200bdb 100644
--- a/science/py-pydicom/Makefile
+++ b/science/py-pydicom/Makefile
@@ -4,7 +4,7 @@
PORTNAME= pydicom
PORTVERSION= 0.9.8
CATEGORIES= science python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile
index 0afb03fc4bf0..0c27f0adb9e3 100644
--- a/science/py-scikit-learn/Makefile
+++ b/science/py-scikit-learn/Makefile
@@ -4,8 +4,7 @@
PORTNAME= scikit-learn
PORTVERSION= 0.16.0
CATEGORIES= science python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR=source/s/scikit-learn
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= demon@FreeBSD.org
diff --git a/science/simsmith/Makefile b/science/simsmith/Makefile
index f460a591a838..1c23465625a3 100644
--- a/science/simsmith/Makefile
+++ b/science/simsmith/Makefile
@@ -5,8 +5,7 @@ PORTNAME= simsmith
PORTVERSION= 9.9
CATEGORIES= science hamradio
MASTER_SITES= http://ae6ty.com/Smith_Charts_files/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
DISTNAME= SimSmith9p9
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/science/xfce4-equake-plugin/Makefile b/science/xfce4-equake-plugin/Makefile
index 38e50b70b976..6157a0c7e1e4 100644
--- a/science/xfce4-equake-plugin/Makefile
+++ b/science/xfce4-equake-plugin/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xfce4-equake-plugin
PORTVERSION= 1.3.7
CATEGORIES= science xfce
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/security/ADMsmb/Makefile b/security/ADMsmb/Makefile
index 8f5142589563..95ccff23d191 100644
--- a/security/ADMsmb/Makefile
+++ b/security/ADMsmb/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ADMsmb
PORTVERSION= 0.3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= groups/ADM
+MASTER_SITES= PACKETSTORM/groups/ADM
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/ADMsnmp/Makefile b/security/ADMsnmp/Makefile
index c2bbec374b46..3bb613a570cc 100644
--- a/security/ADMsnmp/Makefile
+++ b/security/ADMsnmp/Makefile
@@ -6,14 +6,14 @@ PORTVERSION= 0.1
CATEGORIES= security
MASTER_SITES= ftp://adm.freelsd.net/pub/ADM/ \
http://adm.freelsd.net/ADM/ \
- ${MASTER_SITE_PACKETSTORM:=groups/ADM/}
+ PACKETSTORM/groups/ADM
DISTNAME= ${PORTNAME}.${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= onatan@gmail.com
COMMENT= SNMP audit scanner
WRKSRC= ${WRKDIR}/ADMsnmp
+USES= tar:tgz
do-build:
${CC} ${CFLAGS} -DPORTSHAREDIR="${PREFIX}/share/ADMsnmp" \
diff --git a/security/amap/Makefile b/security/amap/Makefile
index 31320042b929..4975a336a229 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -5,8 +5,7 @@ PORTNAME= amap
PORTVERSION= 5.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= groups/thc
+MASTER_SITES= PACKETSTORM/groups/thc
MAINTAINER= onatan@gmail.com
COMMENT= Application mapper
diff --git a/security/amavis-stats/Makefile b/security/amavis-stats/Makefile
index db58d990ccf8..ae7bf4953cf8 100644
--- a/security/amavis-stats/Makefile
+++ b/security/amavis-stats/Makefile
@@ -5,8 +5,7 @@ PORTNAME= amavis-stats
PORTVERSION= 0.1.12
PORTREVISION= 4
CATEGORIES= security
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= feld
+MASTER_SITES= LOCAL/feld
MAINTAINER= feld@FreeBSD.org
COMMENT= Simple AMaViS statistics generator based on rrdtool
diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index 90dcfcff2a82..6ea0679289ac 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xml-security-c
PORTVERSION= 1.7.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=santuario/c-library
+MASTER_SITES= APACHE/santuario/c-library
PKGNAMEPREFIX= apache-
MAINTAINER= girgen@FreeBSD.org
diff --git a/security/arirang/Makefile b/security/arirang/Makefile
index 021af395ff9e..68e39c5f37e8 100644
--- a/security/arirang/Makefile
+++ b/security/arirang/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.03
PORTEPOCH= 1
CATEGORIES= security www
MASTER_SITES= http://monkey.org/~pilot/arirang/
-MASTER_SITE_SUBDIR= UNIX/cgi-scanners
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful webserver security scanner for network
diff --git a/security/axTLS/Makefile b/security/axTLS/Makefile
index 15d6eab9350e..ae7e66ad8d6e 100644
--- a/security/axTLS/Makefile
+++ b/security/axTLS/Makefile
@@ -5,8 +5,7 @@ PORTNAME= axTLS
PORTVERSION= 1.4.9
PORTREVISION= 2
CATEGORIES= security devel net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME:tl}/${PORTVERSION}
MAINTAINER= umq@ueo.co.jp
COMMENT= SSL/TLS client/server library implementation
diff --git a/security/blindelephant/Makefile b/security/blindelephant/Makefile
index cc3750772517..97701358307c 100644
--- a/security/blindelephant/Makefile
+++ b/security/blindelephant/Makefile
@@ -5,9 +5,8 @@ PORTNAME= blindelephant
PORTVERSION= 1.0
PORTREVISION= 20100819
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/niels \
http://people.freebsd.org/~niels/distfiles/
-MASTER_SITE_SUBDIR= niels
DISTNAME= ${PORTNAME}-${PORTREVISION}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/bruteforceblocker/Makefile b/security/bruteforceblocker/Makefile
index f53fa599bb4a..b2f68a649a29 100644
--- a/security/bruteforceblocker/Makefile
+++ b/security/bruteforceblocker/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.2.3
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://danger.rulez.sk/projects/bruteforceblocker/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= pav
+ LOCAL/pav
MAINTAINER= danger@FreeBSD.org
COMMENT= Checks for SSH bruteforce and blocks given IPs
diff --git a/security/bsmtrace/Makefile b/security/bsmtrace/Makefile
index adfa8e25e519..661f005cdd2a 100644
--- a/security/bsmtrace/Makefile
+++ b/security/bsmtrace/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bsmtrace
PORTVERSION= 1.4
PORTREVISION= 0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= csjp
+MASTER_SITES= LOCAL/csjp
MAINTAINER= alm@FreeBSD.org
COMMENT= BSM based intrusion detection system
diff --git a/security/ccsrch/Makefile b/security/ccsrch/Makefile
index 651eb613787f..c64991814729 100644
--- a/security/ccsrch/Makefile
+++ b/security/ccsrch/Makefile
@@ -5,9 +5,7 @@ PORTNAME= ccsrch
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
MAINTAINER= pavelivolkov@gmail.com
COMMENT= Is a tool that searches for credit card numbers (PAN) and track data
@@ -16,6 +14,7 @@ LICENSE= GPLv2
OPTIONS_DEFINE= DOCS
+USES= tar:tgz
PORTDOCS= README
PLIST_FILES= bin/${PORTNAME}
diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index f5d558c6ad61..71fc1c7848e5 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -5,8 +5,7 @@ PORTNAME= checkpassword
PORTVERSION= 0.90
CATEGORIES= security
MASTER_SITES= http://cr.yp.to/checkpwd/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER= garga@FreeBSD.org
COMMENT= Simple password-checking interface
diff --git a/security/clambc/Makefile b/security/clambc/Makefile
index 332aa6ecbbd3..4371d3dd90bf 100644
--- a/security/clambc/Makefile
+++ b/security/clambc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= clambc
DISTVERSION= 0.98.5rc1
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= clamav/${PORTNAME:tl}
+MASTER_SITES= SF/clamav/${PORTNAME:tl}
MAINTAINER= zi@FreeBSD.org
COMMENT= Bytecode signature compiler for ClamAV
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index c2c669a0e067..a4f77956f2e9 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -7,7 +7,6 @@ PORTREVISION?= 0
CATEGORIES?= security mail
.if defined(PKGNAMESUFFIX)
MASTER_SITES= SF/courier/authlib/${PORTVERSION}
-MASTER_SITE_SUBDIR= courier
.else
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/security/cracklib/Makefile b/security/cracklib/Makefile
index f38921b9f389..9e3237dbbd34 100644
--- a/security/cracklib/Makefile
+++ b/security/cracklib/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= security
CATEGORIES+= python
.endif
MASTER_SITES= SF \
- LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
+ LOCAL/cy
MAINTAINER= cy@FreeBSD.org
COMMENT?= Password-checking library
diff --git a/security/cryptstring/Makefile b/security/cryptstring/Makefile
index ee126d40a764..612d099cab54 100644
--- a/security/cryptstring/Makefile
+++ b/security/cryptstring/Makefile
@@ -4,7 +4,7 @@
PORTNAME= cryptstring
PORTVERSION= 0.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Crypto Strings for PHP
diff --git a/security/dcetest/Makefile b/security/dcetest/Makefile
index 3c575544ccea..aa52beb75753 100644
--- a/security/dcetest/Makefile
+++ b/security/dcetest/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dcetest
PORTVERSION= 1.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/scanners
+MASTER_SITES= PACKETSTORM/UNIX/scanners
MAINTAINER= onatan@gmail.com
COMMENT= Utility to dump MSRPC endpoint information from Windows systems
diff --git a/security/digest/Makefile b/security/digest/Makefile
index b66ebd1e94d1..2c206997fa2e 100644
--- a/security/digest/Makefile
+++ b/security/digest/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= digest
PORTVERSION?= 20050323
PORTREVISION= 1
CATEGORIES?= security sysutils
-MASTER_SITES?= ${MASTER_SITE_NETBSD}
-MASTER_SITE_SUBDIR= ../../misc/digest
+MASTER_SITES?= NETBSD/../../misc/digest
MAINTAINER?= ports@FreeBSD.org
COMMENT?= Message digest wrapper utility
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index bb3bec1bf413..0b11ba20b4ed 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dirmngr
PORTVERSION= 1.1.0
PORTREVISION= 13
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= dirmngr
+MASTER_SITES= GNUPG
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/dmitry/Makefile b/security/dmitry/Makefile
index 69ab6ab250e1..e4d887d6e17e 100644
--- a/security/dmitry/Makefile
+++ b/security/dmitry/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dmitry
PORTVERSION= 1.3a
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/misc
+MASTER_SITES= PACKETSTORM/UNIX/misc
DISTNAME= DMitry-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/dradis/Makefile b/security/dradis/Makefile
index 2a0bf4b02c3a..96434ff9e69e 100644
--- a/security/dradis/Makefile
+++ b/security/dradis/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= dradis
+DISTVERSIONPREFIX= v
DISTVERSION= 2.6.1
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/v${PORTVERSION}
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/v${PORTVERSION}
MAINTAINER= semprix@gmx.com
COMMENT= Opensource framework to enable effective information gathering
diff --git a/security/easypg/Makefile b/security/easypg/Makefile
index 557a14be5396..ac2d18247234 100644
--- a/security/easypg/Makefile
+++ b/security/easypg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= easypg
PORTVERSION= 0.0.16
PORTREVISION= 14
CATEGORIES= security elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= epg/29289
+MASTER_SITES= SFJP/epg/29289
DISTNAME= epg-${PORTVERSION}
MAINTAINER= iwazaki8@yahoo.co.jp
diff --git a/security/fakeroot/Makefile b/security/fakeroot/Makefile
index f96e03e5ca98..7693dffef2e3 100644
--- a/security/fakeroot/Makefile
+++ b/security/fakeroot/Makefile
@@ -4,8 +4,7 @@
PORTNAME= fakeroot
PORTVERSION= 1.20.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/f/fakeroot
+MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= martymac@FreeBSD.org
diff --git a/security/flawfinder/Makefile b/security/flawfinder/Makefile
index bbca190880b1..adbf1fdd54dc 100644
--- a/security/flawfinder/Makefile
+++ b/security/flawfinder/Makefile
@@ -5,8 +5,7 @@ PORTNAME= flawfinder
PORTVERSION= 1.31
CATEGORIES= security devel
MASTER_SITES= http://www.dwheeler.com/flawfinder/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/security
+ PACKETSTORM/UNIX/security
MAINTAINER= lx@FreeBSD.org
COMMENT= Examines source code looking for security weaknesses
diff --git a/security/fprint_demo/Makefile b/security/fprint_demo/Makefile
index 94b53109a1c5..2cac74de2610 100644
--- a/security/fprint_demo/Makefile
+++ b/security/fprint_demo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fprint_demo
PORTVERSION= 20080303
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/f/${PORTNAME:C/_/-/}
+MASTER_SITES= DEBIAN/pool/main/f/${PORTNAME:C/_/-/}
DISTNAME= ${PORTNAME:C/_/-/}_${PORTVERSION}git.orig
MAINTAINER= lichray@gmail.com
diff --git a/security/fragroute/Makefile b/security/fragroute/Makefile
index 70f3b715906f..ff171f285c09 100644
--- a/security/fragroute/Makefile
+++ b/security/fragroute/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.2
PORTREVISION= 12
CATEGORIES= security net
MASTER_SITES= http://monkey.org/~dugsong/fragroute/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/security
+ PACKETSTORM/UNIX/security
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for intercepting, modifying, and rewriting egress traffic
diff --git a/security/fuzzdb/Makefile b/security/fuzzdb/Makefile
index d24843d6f207..76023df6cafc 100644
--- a/security/fuzzdb/Makefile
+++ b/security/fuzzdb/Makefile
@@ -4,12 +4,12 @@
PORTNAME= fuzzdb
PORTVERSION= 1.09
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Comprehensive set of fuzzing patterns
+USES= tar:tgz
NO_BUILD= yes
EXTRACT_AFTER_ARGS= --exclude .svn
PORTDOCS= _copyright.txt _readme.txt
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 072d0560152c..93f673db929e 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -4,7 +4,7 @@ PORTNAME= gnupg
PORTVERSION= 2.1.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= GNUPG/gnupg
+MASTER_SITES= GNUPG
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 6c2d31f95c28..8b26014bcc3e 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gnupg
PORTVERSION= 1.4.19
#PORTREVISION= 0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= gnupg
+MASTER_SITES= GNUPG
PKGNAMESUFFIX= 1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/gnupg20/Makefile b/security/gnupg20/Makefile
index f4290e095417..f4c56077c78e 100644
--- a/security/gnupg20/Makefile
+++ b/security/gnupg20/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gnupg
PORTVERSION= 2.0.27
#PORTREVISION= 0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= gnupg
+MASTER_SITES= GNUPG
PKGNAMESUFFIX= 20
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/gwee/Makefile b/security/gwee/Makefile
index 3f419599047a..abcaa044154a 100644
--- a/security/gwee/Makefile
+++ b/security/gwee/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gwee
PORTVERSION= 1.36
CATEGORIES= security www
-MASTER_SITES= PACKETSTORM
-MASTER_SITE_SUBDIR= UNIX/utilities
+MASTER_SITES= PACKETSTORM/UNIX/utilities
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to exploit command execution vulnerabilities in web scripts
diff --git a/security/honggfuzz/Makefile b/security/honggfuzz/Makefile
index 5f8a23744082..5e743a554f2c 100644
--- a/security/honggfuzz/Makefile
+++ b/security/honggfuzz/Makefile
@@ -5,7 +5,7 @@ PORTNAME= honggfuzz
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= sbz@FreeBSD.org
COMMENT= General-purpose fuzzer with simple, command-line interface
diff --git a/security/hotssh/Makefile b/security/hotssh/Makefile
index 5aafc4300a22..d1fe5c3683bc 100644
--- a/security/hotssh/Makefile
+++ b/security/hotssh/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.2.7
PORTREVISION= 5
CATEGORIES= security gnome
MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= ashish@FreeBSD.org
COMMENT= HotSSH is an interface to Secure Shell, for GNOME and OpenSSH
diff --git a/security/iaikpkcs11wrapper/Makefile b/security/iaikpkcs11wrapper/Makefile
index cda85e003b46..27efc672eacc 100644
--- a/security/iaikpkcs11wrapper/Makefile
+++ b/security/iaikpkcs11wrapper/Makefile
@@ -4,8 +4,7 @@
PORTNAME= iaikPkcs11Wrapper
PORTVERSION= 1.2.18
CATEGORIES= security java devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
MAINTAINER= ale@FreeBSD.org
diff --git a/security/isnprober/Makefile b/security/isnprober/Makefile
index 1a53de8ed38a..69323c3387b4 100644
--- a/security/isnprober/Makefile
+++ b/security/isnprober/Makefile
@@ -5,8 +5,7 @@ PORTNAME= isnprober
PORTVERSION= 1.02
CATEGORIES= security
MASTER_SITES= ftp://ftp.ubizen.com/tools/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/scanners
+ PACKETSTORM/UNIX/scanners
MAINTAINER= onatan@gmail.com
COMMENT= PenTest tool for TCP Initial Sequence Numbers research
diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index 2f7d3a68cefa..37c70ca3ab65 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 2.8.0
PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.funtoo.org/archive/keychain/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= garga@FreeBSD.org
COMMENT= User-friendly front-end to ssh-agent(1)
diff --git a/security/keyprint/Makefile b/security/keyprint/Makefile
index 96365a7f5d66..0c303355503e 100644
--- a/security/keyprint/Makefile
+++ b/security/keyprint/Makefile
@@ -4,8 +4,7 @@
PORTNAME= keyprint
PORTVERSION= 1.0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mharo
+MASTER_SITES= LOCAL/mharo
MAINTAINER= ports@FreeBSD.org
COMMENT= Print S/Key keys on a piece of paper, twice the size of a credit card
diff --git a/security/kripp/Makefile b/security/kripp/Makefile
index c765ee74212d..cac3124ed290 100644
--- a/security/kripp/Makefile
+++ b/security/kripp/Makefile
@@ -4,9 +4,8 @@
PORTNAME= kripp
PORTVERSION= 0.6.1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM} \
+MASTER_SITES= PACKETSTORM/sniffers \
http://konst.org.ua/download/
-MASTER_SITE_SUBDIR= sniffers
MAINTAINER= ports@FreeBSD.org
COMMENT= Lightweight network password sniffer
diff --git a/security/l0pht-watch/Makefile b/security/l0pht-watch/Makefile
index 8e427d06581a..bd6b75fbc9a7 100644
--- a/security/l0pht-watch/Makefile
+++ b/security/l0pht-watch/Makefile
@@ -4,8 +4,7 @@
PORTNAME= l0pht-watch
PORTVERSION= 1.1
CATEGORIES= security
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= vs
+MASTER_SITES= LOCAL/vs
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index bc834742ceb1..f98b29fb756b 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -3,8 +3,7 @@
PORTNAME= libgcrypt
PORTVERSION= 1.6.3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNUPG
MAINTAINER= cpm@fbsd.es
COMMENT= General purpose crypto library based on code used in GnuPG
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index c28761da4123..522e7aba7a40 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libgpg-error
PORTVERSION= 1.19
CATEGORIES= security devel
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNUPG
MAINTAINER= novel@FreeBSD.org
COMMENT= Common error values for all GnuPG components
diff --git a/security/libressl/Makefile b/security/libressl/Makefile
index 454b8c473adb..93b7559ff7cf 100644
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libressl
PORTVERSION= 2.1.6
CATEGORIES= security devel
-MASTER_SITES= ${MASTER_SITE_OPENBSD}
-MASTER_SITE_SUBDIR= LibreSSL
+MASTER_SITES= OPENBSD/LibreSSL
MAINTAINER= vsevolod@FreeBSD.org
COMMENT= Free version of the SSL/TLS protocol forked from OpenSSL
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 5087cac9d997..0ad17c13a010 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libtasn1
PORTVERSION= 4.5
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= libtasn1
+MASTER_SITES= GNU
MAINTAINER= novel@FreeBSD.org
COMMENT= ASN.1 structure parser library
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index fa2345f63498..dd9904530dbe 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -4,7 +4,7 @@
PORTNAME= logcheck
PORTVERSION= 1.3.17
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= yasu@utahime.org
diff --git a/security/makepasswd/Makefile b/security/makepasswd/Makefile
index 22af57791fc0..328c4c855714 100644
--- a/security/makepasswd/Makefile
+++ b/security/makepasswd/Makefile
@@ -5,12 +5,11 @@ PORTNAME= makepasswd
PORTVERSION= 1.10
PORTREVISION= 6
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
PATCHFILES= ${PORTNAME}_${PORTVERSION}-5.diff.gz
PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
PATCH_DIST_STRIP= -p1
MAINTAINER= toni.viemero@iki.fi
diff --git a/security/mindterm-binary/Makefile b/security/mindterm-binary/Makefile
index 726194fb1e72..f4fc21077b16 100644
--- a/security/mindterm-binary/Makefile
+++ b/security/mindterm-binary/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mindterm-binary
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alex
+MASTER_SITES= LOCAL/alex
DISTNAME= mindtermbin-v121
DISTFILES= mindterm-ssh.html ${EXTRACT_ONLY}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index 001df2f5cc7f..00649926328d 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -4,10 +4,9 @@
PORTNAME= nettle
PORTVERSION= 2.7.1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNU} \
+MASTER_SITES= GNU \
http://www.lysator.liu.se/~nisse/archive/:liu \
ftp://ftp.lysator.liu.se/pub/security/lsh/:liu
-MASTER_SITE_SUBDIR= ${PORTNAME}/:DEFAULT
MAINTAINER= johans@FreeBSD.org
COMMENT= Low-level cryptographic library
diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index fe396233563e..67131b61afeb 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -5,8 +5,7 @@ PORTNAME= oath-toolkit
PORTVERSION= 2.4.1
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ale@FreeBSD.org
COMMENT= Library, tools, and PAM module for OATH authentication
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 84bba7494793..eb148f119be5 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= http://josefsson.org/gnutls/releases/opencdk/
-MASTER_SITE_SUBDIR= alpha/gnutls/opencdk
MAINTAINER= novel@FreeBSD.org
COMMENT= Open Crypto Development Kit
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index f84e4ea00f59..d9bd0aa755eb 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -6,8 +6,7 @@ DISTVERSION= 6.8p1
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= security ipv6
-MASTER_SITES= ${MASTER_SITE_OPENBSD}
-MASTER_SITE_SUBDIR= OpenSSH/portable
+MASTER_SITES= OPENBSD/OpenSSH/portable
PKGNAMESUFFIX?= -portable
MAINTAINER= bdrewery@FreeBSD.org
@@ -94,8 +93,7 @@ EXTRA_PATCHES:= ${EXTRA_PATCHES:N${TCP_WRAPPERS_EXTRA_PATCHES}}
PORTDOCS+= HPN-README
HPN_VERSION= 14v5
HPN_DISTVERSION= 6.7p1
-#PATCH_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:hpn/}
-#PATCH_SITE_SUBDIR+= hpnssh/HPN-SSH%20${HPN_VERSION}%20${HPN_DISTVERSION}/:hpn
+#PATCH_SITES+= SOURCEFORGE/hpnssh/HPN-SSH%20${HPN_VERSION}%20${HPN_DISTVERSION}/:hpn
#PATCHFILES+= ${PORTNAME}-${HPN_DISTVERSION}-hpnssh${HPN_VERSION}.diff.gz:-p1:hpn
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn:-p2
.endif
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 9501eae43489..58a341f10e66 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -6,10 +6,9 @@ PORTVERSION= 1.0.2
DISTVERSIONSUFFIX= a
PORTREVISION= 1
CATEGORIES= security devel
-MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \
- ftp://ftp.openssl.org/%SUBDIR%/ \
- ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/
-MASTER_SITE_SUBDIR= source
+MASTER_SITES= http://www.openssl.org/source/ \
+ ftp://ftp.openssl.org/source/ \
+ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
DIST_SUBDIR= ${DISTNAME}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
index c58d8c5491de..d1a12fea9a5e 100644
--- a/security/openvpn-auth-ldap/Makefile
+++ b/security/openvpn-auth-ldap/Makefile
@@ -5,7 +5,7 @@ PORTNAME= openvpn-auth-ldap
PORTVERSION= 2.0.4.0.s1379
PORTREVISION= 1
CATEGORIES= security
-#MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+#MASTER_SITES= GOOGLE_CODE
MASTER_SITES= LOCAL/mandree
DISTNAME= auth-ldap-${PORTVERSION}
diff --git a/security/outguess/Makefile b/security/outguess/Makefile
index 4a58d22aa5a4..5ea2d75c1483 100644
--- a/security/outguess/Makefile
+++ b/security/outguess/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES= http://www.outguess.org/ \
http://cimarron.river.com/mirrors/www.outguess.org/ \
http://munitions.vipul.net/software/steganography/ \
http://the25200-1.gw.connect.com.au/security/steganography/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= crypt/stego
+ PACKETSTORM/crypt/stego
MAINTAINER= ports@FreeBSD.org
COMMENT= Steganographic tool
diff --git a/security/p5-Crypt-CAST5/Makefile b/security/p5-Crypt-CAST5/Makefile
index b86c5192db2c..625abb8811c9 100644
--- a/security/p5-Crypt-CAST5/Makefile
+++ b/security/p5-Crypt-CAST5/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Juniper/Makefile b/security/p5-Crypt-Juniper/Makefile
index e66d18d9dd6b..a12fa6cac689 100644
--- a/security/p5-Crypt-Juniper/Makefile
+++ b/security/p5-Crypt-Juniper/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Crypt-Juniper
PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/security/p5-Crypt-Rijndael/Makefile b/security/p5-Crypt-Rijndael/Makefile
index 4b68cbad43ce..84182311d305 100644
--- a/security/p5-Crypt-Rijndael/Makefile
+++ b/security/p5-Crypt-Rijndael/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.11
PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
diff --git a/security/p5-CryptX/Makefile b/security/p5-CryptX/Makefile
index d40bc8e193fe..8316f2c66001 100644
--- a/security/p5-CryptX/Makefile
+++ b/security/p5-CryptX/Makefile
@@ -5,8 +5,7 @@ PORTNAME= CryptX
PORTVERSION= 0.021
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN/Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
diff --git a/security/p5-GSSAPI/Makefile b/security/p5-GSSAPI/Makefile
index 505a90a10e67..8468c56fe7c3 100644
--- a/security/p5-GSSAPI/Makefile
+++ b/security/p5-GSSAPI/Makefile
@@ -5,8 +5,7 @@ PORTNAME= GSSAPI
PORTVERSION= 0.28
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= LWP/AGROLMS
+MASTER_SITES= CPAN/LWP/AGROLMS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index 0c457583f496..fbef809fcf45 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -5,8 +5,7 @@ PORTNAME= MD5
PORTVERSION= 2.03
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ${PORTNAME}/GAAS
+MASTER_SITES= CPAN/${PORTNAME}/GAAS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Net-Radius-Server/Makefile b/security/p5-Net-Radius-Server/Makefile
index 9f3ca9b1759d..2df562379199 100644
--- a/security/p5-Net-Radius-Server/Makefile
+++ b/security/p5-Net-Radius-Server/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.116
PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-SAVI-Perl/Makefile b/security/p5-SAVI-Perl/Makefile
index 4c75014c608c..4f79896a3bb9 100644
--- a/security/p5-SAVI-Perl/Makefile
+++ b/security/p5-SAVI-Perl/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.30
PORTREVISION= 6
CATEGORIES= security perl5
MASTER_SITES= http://www.csupomona.edu/~henson/archive/projects/SAVI-Perl/dist/
-MASTER_SITE_SUBDIR= security
PKGNAMEPREFIX= p5-
MAINTAINER= pi@FreeBSD.org
diff --git a/security/pam_fprint/Makefile b/security/pam_fprint/Makefile
index 983332629e97..d1ee036309a5 100644
--- a/security/pam_fprint/Makefile
+++ b/security/pam_fprint/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pam_fprint
PORTVERSION= 20080330
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/p/${PORTNAME:C/_/-/}
+MASTER_SITES= DEBIAN/pool/main/p/${PORTNAME:C/_/-/}
DISTNAME= ${PORTNAME:C/_/-/}_${PORTVERSION}+git.orig
MAINTAINER= lichray@gmail.com
diff --git a/security/pgpgpg/Makefile b/security/pgpgpg/Makefile
index 7176ab00a6e2..fdba7ac8fc87 100644
--- a/security/pgpgpg/Makefile
+++ b/security/pgpgpg/Makefile
@@ -5,10 +5,9 @@ PORTNAME= pgpgpg
PORTVERSION= 0.13
PORTREVISION= 4
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM} \
+MASTER_SITES= PACKETSTORM/crypt/pgpgpg \
ftp://ftp.gnupg.org/gcrypt/historic/ \
http://www.nessie.de/mroth/pgpgpg/
-MASTER_SITE_SUBDIR= crypt/pgpgpg
MAINTAINER= ports@FreeBSD.org
COMMENT= Wrapper for GnuPG to simulate PGP 2.6.x
diff --git a/security/pgpin/Makefile b/security/pgpin/Makefile
index e34c5f68b6ca..eddfa10a7570 100644
--- a/security/pgpin/Makefile
+++ b/security/pgpin/Makefile
@@ -3,8 +3,7 @@
PORTNAME= pgpin
PORTVERSION= 010323
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= pgp263in${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/security/pkcs11-dump/Makefile b/security/pkcs11-dump/Makefile
index b57790c42f46..387b5c73ec2f 100644
--- a/security/pkcs11-dump/Makefile
+++ b/security/pkcs11-dump/Makefile
@@ -4,7 +4,7 @@
PORTNAME= pkcs11-dump
PORTVERSION= 0.3.4
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ale@FreeBSD.org
COMMENT= Allow dumping PKCS\#11 token content
diff --git a/security/pkcs11-gateway/Makefile b/security/pkcs11-gateway/Makefile
index b7817a5ffe89..44b420c79369 100644
--- a/security/pkcs11-gateway/Makefile
+++ b/security/pkcs11-gateway/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pkcs11-gateway
PORTVERSION= 1.2
CATEGORIES= security devel linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
MAINTAINER= ale@FreeBSD.org
COMMENT= Wrapper Cryptoki library to use Linux PKCS\#11 modules
diff --git a/security/pks/Makefile b/security/pks/Makefile
index f6aa862f5265..2e1f490120c6 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -5,9 +5,8 @@ PORTNAME= pks
PORTVERSION= 0.9.6.20040312
PORTREVISION= 1
CATEGORIES= security www
-MASTER_SITES= http://pks.sourceforge.net/:sf ${MASTER_SITE_LOCAL}:local
-MASTER_SITE_SUBDIR= .:sf mandree:local
-DISTFILES= pks-current.tgz:sf,local
+MASTER_SITES= http://pks.sourceforge.net/ LOCAL/mandree
+DISTFILES= pks-current.tgz
MAINTAINER= tphilipp@potion-studios.com
COMMENT= PGP Public Key Server
diff --git a/security/pulledpork/Makefile b/security/pulledpork/Makefile
index 1216bd72d168..6257d09ed122 100644
--- a/security/pulledpork/Makefile
+++ b/security/pulledpork/Makefile
@@ -4,7 +4,7 @@
PORTNAME= pulledpork
PORTVERSION= 0.7.0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ohauer@FreeBSD.org
COMMENT= Script to update snort-2.8+ rules
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 0d5449e0eec1..a9017eb64447 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -3,9 +3,8 @@
PORTNAME= putty
PORTVERSION= 0.64
CATEGORIES= security ipv6
-MASTER_SITES= http://the.earth.li/~sgtatham/putty/%SUBDIR%/ \
+MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
# Beat Gaetzi (beat@) is permitted to take maintainership back
# or commit to this port without my prior approval.
diff --git a/security/pwauth/Makefile b/security/pwauth/Makefile
index e6c066e1531e..0d5e737c3c3d 100644
--- a/security/pwauth/Makefile
+++ b/security/pwauth/Makefile
@@ -4,7 +4,7 @@
PORTNAME= pwauth
PORTVERSION= 2.3.11
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
http://www.unixpapa.com/software/
MAINTAINER= eg@fbsd.lt
diff --git a/security/quantis-kmod/Makefile b/security/quantis-kmod/Makefile
index 73791dc1282f..ed32888d1cb4 100644
--- a/security/quantis-kmod/Makefile
+++ b/security/quantis-kmod/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quantis
DISTVERSION= v13.11.08
CATEGORIES= security
MASTER_SITES= http://www.idquantique.com/~download/Quantis/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+ LOCAL/ale
PKGNAMESUFFIX= -kmod
DISTNAME= Quantis-${DISTVERSION}-src
diff --git a/security/quantis/Makefile b/security/quantis/Makefile
index c2672aec0396..f08c84298d67 100644
--- a/security/quantis/Makefile
+++ b/security/quantis/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quantis
DISTVERSION= v13.11.08
CATEGORIES= security devel java
MASTER_SITES= http://www.idquantique.com/~download/Quantis/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+ LOCAL/ale
DISTNAME= Quantis-${DISTVERSION}-src
MAINTAINER= ale@FreeBSD.org
diff --git a/security/ranpwd/Makefile b/security/ranpwd/Makefile
index 9bdba7bfb9f7..f56c5e9660f7 100644
--- a/security/ranpwd/Makefile
+++ b/security/ranpwd/Makefile
@@ -6,11 +6,10 @@ PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= security
#MASTER_SITES= KERNEL_ORG
-MASTER_SITES= http://artfiles.org/kernel.org/pub/%SUBDIR%/ \
- http://debian.securedservers.com/kernel/pub/%SUBDIR%/ \
- http://ftp.cc.uoc.gr/pub/%SUBDIR%/ \
- http://ftp.naist.jp/pub/Linux/kernel.org/%SUBDIR%/
-MASTER_SITE_SUBDIR= software/utils/admin/ranpwd
+MASTER_SITES= http://artfiles.org/kernel.org/pub/software/utils/admin/ranpwd/ \
+ http://debian.securedservers.com/kernel/pub/software/utils/admin/ranpwd/ \
+ http://ftp.cc.uoc.gr/pub/software/utils/admin/ranpwd/ \
+ http://ftp.naist.jp/pub/Linux/kernel.org/software/utils/admin/ranpwd/
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to generate random passwords
diff --git a/security/sasp/Makefile b/security/sasp/Makefile
index 91d6edbaf2aa..08a366cbe4d5 100644
--- a/security/sasp/Makefile
+++ b/security/sasp/Makefile
@@ -5,9 +5,8 @@ PORTNAME= sasp
PORTVERSION= 0.1
PORTREVISION= 3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/ahze \
http://people.freebsd.org/~ahze/distfiles/
-MASTER_SITE_SUBDIR= ahze
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool that permits to use a gateway whatever IP we have
diff --git a/security/seccure/Makefile b/security/seccure/Makefile
index 489562e95a3d..cafa19fd4540 100644
--- a/security/seccure/Makefile
+++ b/security/seccure/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://point-at-infinity.org/seccure/ \
- ${MASTER_SITE_NETBSD}
+ NETBSD
MAINTAINER= zi@FreeBSD.org
COMMENT= Elliptic Curve Crypto Utility for Reliable Encryption
diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile
index 4eeabccba4b4..5186aa2779cb 100644
--- a/security/signing-party/Makefile
+++ b/security/signing-party/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.0
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/signing-party/ \
- ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/s/signing-party
+ DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= johans@FreeBSD.org
diff --git a/security/skipfish/Makefile b/security/skipfish/Makefile
index 6310237af84f..6b26ccf9fdef 100644
--- a/security/skipfish/Makefile
+++ b/security/skipfish/Makefile
@@ -5,7 +5,7 @@ PORTNAME= skipfish
PORTVERSION= 2.10b
PORTREVISION= 3
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= zi@FreeBSD.org
COMMENT= Fully automated, active web application security reconnaissance tool
diff --git a/security/srm/Makefile b/security/srm/Makefile
index db8cb14ead22..3057f4684e6e 100644
--- a/security/srm/Makefile
+++ b/security/srm/Makefile
@@ -4,10 +4,9 @@
PORTNAME= srm
PORTVERSION= 1.2.12
CATEGORIES= security sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} \
- ${PORTNAME}/old_releases \
- ${PORTNAME}/old_releases/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} \
+ SF/${PORTNAME}/old_releases \
+ SF/${PORTNAME}/old_releases/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Secure rm, a utility which destroys file contents before unlinking
diff --git a/security/sshit/Makefile b/security/sshit/Makefile
index 06cdb2185174..26c9f1ce0943 100644
--- a/security/sshit/Makefile
+++ b/security/sshit/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sshit
PORTVERSION= 0.6
PORTREVISION= 4
CATEGORIES= security
-MASTER_SITES= http://anp.ath.cx/sshit/ \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://anp.ath.cx/sshit/
MAINTAINER= ports@FreeBSD.org
COMMENT= Checks for SSH/FTP bruteforce and blocks given IPs
diff --git a/security/stoken/Makefile b/security/stoken/Makefile
index 7b70a3cb0e14..c913a6573f6f 100644
--- a/security/stoken/Makefile
+++ b/security/stoken/Makefile
@@ -4,8 +4,7 @@
PORTNAME= stoken
PORTVERSION= 0.6
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=stoken
+MASTER_SITES= SF/stoken
MAINTAINER= samm@os2.kiev.ua
COMMENT= Software Token for UNIX compatible with RSA SecurID
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 4f7e471b9632..5d738ef844c2 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= sudo
DISTVERSION= 1.8.13
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SUDO}
+MASTER_SITES= SUDO
MAINTAINER= garga@FreeBSD.org
COMMENT= Allow others to run commands as root
diff --git a/security/tripwire12/Makefile b/security/tripwire12/Makefile
index 797c06f88724..216f1f700595 100644
--- a/security/tripwire12/Makefile
+++ b/security/tripwire12/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tripwire
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
PKGNAMESUFFIX= 12
MAINTAINER= cy@FreeBSD.org
diff --git a/security/webscarab/Makefile b/security/webscarab/Makefile
index ad4d325c8e70..9e730f19d244 100644
--- a/security/webscarab/Makefile
+++ b/security/webscarab/Makefile
@@ -4,9 +4,8 @@
PORTNAME= webscarab
PORTVERSION= 20090427
CATEGORIES= security www java
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/niels \
http://people.freebsd.org/~niels/distfiles/
-MASTER_SITE_SUBDIR= niels
MAINTAINER= ports@FreeBSD.org
COMMENT= Framework for analysing HTTP and HTTPS web application traffic
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index b1634bac8b07..3281cd5980be 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xinetd
PORTVERSION= 2.3.15
PORTREVISION= 1
CATEGORIES= security ipv6
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= sem@FreeBSD.org
COMMENT= Replacement for inetd with better control and logging
diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile
index ca24b8021e7c..6e9982db4994 100644
--- a/security/xml-security/Makefile
+++ b/security/xml-security/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= xml-security
-PORTVERSION= 1.5.5
+DISTVERSION= 1_5_5
CATEGORIES= security java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= santuario/java-library/${PORTVERSION:S/./_/g}
-DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/./_/g}
+MASTER_SITES= APACHE/santuario/java-library/${DISTVERSION}
+DISTNAME= ${PORTNAME}-src-${DISTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= Java library for XML Signature and Encryption
@@ -23,7 +22,7 @@ CPE_PRODUCT= xml_security_for_java
CPE_VENDOR= apache
USE_JAVA= yes
JAVA_VERSION= 1.6+
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
USE_ANT= yes
MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES
ALL_TARGET= jar
diff --git a/shells/44bsd-csh/Makefile b/shells/44bsd-csh/Makefile
index 66d7c324e115..ba3a745e0b2d 100644
--- a/shells/44bsd-csh/Makefile
+++ b/shells/44bsd-csh/Makefile
@@ -4,8 +4,7 @@ PORTNAME= 44bsd-csh
PORTVERSION= 20001106
PORTREVISION= 4
CATEGORIES= shells
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
+MASTER_SITES= LOCAL/cy
MAINTAINER= cy@FreeBSD.org
COMMENT= The traditional 4.4BSD /bin/csh C-shell
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 6af15a4e7d6e..f482f9029548 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -4,7 +4,7 @@
PORTNAME= esh
PORTVERSION= 0.8.5
CATEGORIES= shells
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= The "easy shell", a small shell with Lisp-like syntax
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index bb1f6e0bb091..949cc8185172 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -5,8 +5,7 @@ PORTNAME= scponly
PORTVERSION= 4.8.20110526
PORTREVISION= 1
CATEGORIES= shells security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-snapshots
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-snapshots
DISTNAME= ${PORTNAME}-20110526
MAINTAINER= gjb@FreeBSD.org
diff --git a/sysutils/44bsd-more/Makefile b/sysutils/44bsd-more/Makefile
index 7da9e3327132..154055c8ec25 100644
--- a/sysutils/44bsd-more/Makefile
+++ b/sysutils/44bsd-more/Makefile
@@ -4,8 +4,7 @@
PORTNAME= 44bsd-more
PORTVERSION= ${RELDATE}
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
+MASTER_SITES= LOCAL/cy
MAINTAINER= cy@FreeBSD.org
COMMENT= The pager installed with FreeBSD before less(1) was imported
diff --git a/sysutils/915resolution/Makefile b/sysutils/915resolution/Makefile
index 52838b3a1ade..5bae447c4b4a 100644
--- a/sysutils/915resolution/Makefile
+++ b/sysutils/915resolution/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.5.3
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= ehaupt
+MASTER_SITES= LOCAL/ehaupt
MAINTAINER= ports@FreeBSD.org
COMMENT= Resolution tool for Intel i915 video cards
diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 03c0e545d3b0..e927d09d083e 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -4,8 +4,7 @@ PORTNAME= acpica
PORTVERSION= 20150410
CATEGORIES= sysutils devel
MASTER_SITES= https://acpica.org/sites/acpica/files/ \
- LOCAL
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
PKGNAMESUFFIX= -tools
DISTNAME= ${PORTNAME}-unix2-${PORTVERSION}
diff --git a/sysutils/afbinit/Makefile b/sysutils/afbinit/Makefile
index b16a74076cd1..69b90490be46 100644
--- a/sysutils/afbinit/Makefile
+++ b/sysutils/afbinit/Makefile
@@ -5,16 +5,13 @@ PORTNAME= afbinit
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= sysutils graphics
-MASTER_SITES= ${MASTER_SITE_DEBIAN:S/$/:afbinit,patch/} \
- http://dlc.sun.com/%SUBDIR%/:microcode
-MASTER_SITE_SUBDIR= pool/contrib/a/afbinit/:afbinit,patch \
- osol/sparc-gfx/downloads/:microcode
+MASTER_SITES= DEBIAN/pool/contrib/a/afbinit/:afbinit,patch \
+ http://dlc.sun.com/osol/sparc-gfx/downloads/:microcode
DISTFILES= ${PORTNAME}_${PORTVERSION}.orig.tar.gz:afbinit \
afb-ucode.tar.bz2:microcode
DIST_SUBDIR= ${PORTNAME}
PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
PATCHFILES= ${PORTNAME}_${PORTVERSION}-4.diff.gz:patch
PATCH_DIST_STRIP= -p1
diff --git a/sysutils/amrstat/Makefile b/sysutils/amrstat/Makefile
index b99ded8b15ff..74429cdd71df 100644
--- a/sysutils/amrstat/Makefile
+++ b/sysutils/amrstat/Makefile
@@ -4,8 +4,7 @@
PORTNAME= amrstat
PORTVERSION= 20070216
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+MASTER_SITES= LOCAL/jkim
MAINTAINER= jkim@FreeBSD.org
COMMENT= Utility for LSI Logic's MegaRAID RAID controllers
diff --git a/sysutils/apcpwr/Makefile b/sysutils/apcpwr/Makefile
index a35bd7e592fa..af2b67c73435 100644
--- a/sysutils/apcpwr/Makefile
+++ b/sysutils/apcpwr/Makefile
@@ -5,8 +5,7 @@ PORTNAME= apcpwr
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= sysutils net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jwd
+MASTER_SITES= LOCAL/jwd
MAINTAINER= ports@FreeBSD.org
COMMENT= Control APC 9211 MasterSwitchs via snmp
diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile
index ba37d89e15cf..52e87bb34670 100644
--- a/sysutils/apt/Makefile
+++ b/sysutils/apt/Makefile
@@ -5,7 +5,7 @@ PORTNAME= apt
PORTVERSION= 0.6.46.4.1
PORTREVISION= 8
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= apt_0.6.46.4-0.1
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index b2a2a45eb436..d38c2ae019e6 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -5,8 +5,7 @@ PORTNAME= asmon
PORTVERSION= 0.61
PORTREVISION= 3
CATEGORIES= sysutils afterstep
-MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR= apps/asmon
+MASTER_SITES= AFTERSTEP/apps/asmon
MAINTAINER= bofh@FreeBSD.org
COMMENT= Swallowable applet monitors the CPU usage, memory, and swap, etc
diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index e967806557a8..99d4c12c9394 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -4,8 +4,7 @@ PORTNAME= asusoled
PORTVERSION= 0.10
PORTREVISION= 10
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+MASTER_SITES= LOCAL/jkim
MAINTAINER= jkim@FreeBSD.org
COMMENT= Utility for ASUS USB OLED Display
diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile
index f318f10b2354..20cbd7e4e32b 100644
--- a/sysutils/backuppc-devel/Makefile
+++ b/sysutils/backuppc-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= backuppc
DISTVERSION= 4.0.0alpha3
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-beta/${DISTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-beta/${DISTVERSION}
PKGNAMESUFFIX= -devel
DISTNAME= BackupPC-${DISTVERSION}
diff --git a/sysutils/batmon/Makefile b/sysutils/batmon/Makefile
index c722aae9a0d8..1e33772af1e3 100644
--- a/sysutils/batmon/Makefile
+++ b/sysutils/batmon/Makefile
@@ -4,8 +4,7 @@ PORTNAME= batmon
PORTVERSION= 0.6
PORTREVISION= 2
CATEGORIES= sysutils gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
MAINTAINER= ports@FreeBSD.org
COMMENT= GNUstep battery monitor for laptops
diff --git a/sysutils/battray/Makefile b/sysutils/battray/Makefile
index d06aca8a2577..d9e7e32fafaf 100644
--- a/sysutils/battray/Makefile
+++ b/sysutils/battray/Makefile
@@ -4,7 +4,7 @@
PORTNAME= battray
PORTVERSION= 1.5
CATEGORIES= sysutils python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= martin@arp242.net
COMMENT= Display notebook battery status in tray
diff --git a/sysutils/bbapm/Makefile b/sysutils/bbapm/Makefile
index 94471a1af42e..12780c2bd9b5 100644
--- a/sysutils/bbapm/Makefile
+++ b/sysutils/bbapm/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:C/%SUBDIR%/bbtools\/${PORTNAME}\/bbapm-0.0.1-freebsd-patch/}
-PATCH_SITE_SUBDIR= bbtools
+PATCH_SITES= SF/bbtools/${PORTNAME}/bbapm-0.0.1-freebsd-patch
PATCHFILES= bbapm-0.0.1-freebsd-patch-2.diff
PATCH_DIST_STRIP= -p1
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 79f00ac0633e..9cd914fc4490 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -4,7 +4,7 @@
PORTNAME= boxbackup
PORTVERSION= 0.11.r${SVNVERSION:C/^[0-9\.]+_[a-z]+_([0-9]+)/\1/}
CATEGORIES= sysutils
-MASTER_SITES= http://www.boxbackup.org/snapshots/%SUBDIR%/
+MASTER_SITES= http://www.boxbackup.org/snapshots/201108/
PKGNAMESUFFIX= ${CLIENT_OR_SERVER}-devel
DISTNAME= ${PORTNAME}-${SVNVERSION}
@@ -15,7 +15,6 @@ LICENSE= BSD3CLAUSE GPLv2
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE-DUAL.txt
-MASTER_SITE_SUBDIR=201108
SVNVERSION= 0.11_trunk_2979
NO_LATEST_LINK= yes
diff --git a/sysutils/cdf/Makefile b/sysutils/cdf/Makefile
index 7714cf53a8e2..43a63f37647d 100644
--- a/sysutils/cdf/Makefile
+++ b/sysutils/cdf/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cdf
PORTVERSION= 0.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= bmp-plugins
+MASTER_SITES= SF/bmp-plugins
MAINTAINER= novel@FreeBSD.org
COMMENT= Colorized df
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 4ac6be3a78c5..ca0c9f7c34dd 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.2.3
PORTREVISION?= 5
CATEGORIES= sysutils audio
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= cdrdao/cdrdao/${PORTVERSION}
DISTNAME= cdrdao-${PORTVERSION}
MAINTAINER= marius@FreeBSD.org
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 7dd354c4c245..5f409547bfa4 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -21,8 +21,7 @@ PORTNAME= cdrtools
PORTVERSION= 3.01a24
PORTEPOCH= 1
CATEGORIES= sysutils audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/alpha
+MASTER_SITES= SF/${PORTNAME}/alpha
MAINTAINER= marius@FreeBSD.org
COMMENT= CD/DVD/BluRay and ISO-9660 image creation and extraction tools
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index e05eb85277d5..a16722a131c0 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -22,8 +22,7 @@ PORTNAME= cdrtools
PORTVERSION= 3.00
PORTREVISION= 2
CATEGORIES= sysutils audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= marius@FreeBSD.org
COMMENT= CD/DVD/BluRay and ISO-9660 image creation and extraction tools
diff --git a/sysutils/confctl/Makefile b/sysutils/confctl/Makefile
index b6624fbca91b..e26cc88fbdeb 100644
--- a/sysutils/confctl/Makefile
+++ b/sysutils/confctl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= confctl
PORTVERSION= 1.2
CATEGORIES= sysutils
MASTER_SITES= http://cloud.github.com/downloads/trasz/confctl/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= trasz
+ LOCAL/trasz
MAINTAINER= trasz@FreeBSD.org
COMMENT= Utility to parse and modify C-like configuration files
diff --git a/sysutils/consolehm/Makefile b/sysutils/consolehm/Makefile
index 324500da626e..147cf68da6b4 100644
--- a/sysutils/consolehm/Makefile
+++ b/sysutils/consolehm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= consolehm
PORTVERSION= 1.31
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= fenner
+MASTER_SITES= LOCAL/fenner
MAINTAINER= ports@FreeBSD.org
COMMENT= Console based hardware monitor for FreeBSD
diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile
index f12bfa21ebd7..5c935ce3f3f1 100644
--- a/sysutils/copytape/Makefile
+++ b/sysutils/copytape/Makefile
@@ -4,8 +4,7 @@
PORTNAME= copytape
PORTVERSION= 1.0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_COMP_SOURCES}
-MASTER_SITE_SUBDIR= unix/volume10
+MASTER_SITES= COMP_SOURCES/unix/volume10
DISTNAME= copytape
EXTRACT_SUFX= .Z
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 66a3a90c9c82..9d95a018fb6b 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crashme
PORTVERSION= 2.4
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR=kris
+MASTER_SITES= LOCAL/kris
DISTNAME= crashme
MAINTAINER= gjc@alum.mit.edu
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 9796a79be988..a869e9a7e0fd 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -55,8 +55,7 @@ DISTFILES+= ${DISTNAME}-man${MANDATE}.tar.gz:1
.if ${PORT_OPTIONS:MSIGQ12}
#PATCH_SITES+= http://thedjbway.org/patches/:sigq12
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:sigq12/}
-PATCH_SITE_SUBDIR+= bdrewery/${PORTNAME}/:sigq12
+PATCH_SITES+= LOCAL/bdrewery/${PORTNAME}/:sigq12
PATCHFILES+= daemontools-0.76.sigq12.patch:-p2:sigq12
.endif
diff --git a/sysutils/dvdimagecmp/Makefile b/sysutils/dvdimagecmp/Makefile
index eaf783b7e13b..9b50685ea41c 100644
--- a/sysutils/dvdimagecmp/Makefile
+++ b/sysutils/dvdimagecmp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dvdimagecmp
PORTVERSION= 0.3
CATEGORIES= sysutils
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= apps/video
+MASTER_SITES= SUNSITE/apps/video
MAINTAINER= ports@thepentagon.org
COMMENT= Simple tool for comparing an image to a burned disc
diff --git a/sysutils/farbot/Makefile b/sysutils/farbot/Makefile
index e72170b44040..f23433466b6a 100644
--- a/sysutils/farbot/Makefile
+++ b/sysutils/farbot/Makefile
@@ -5,7 +5,7 @@ PORTNAME= farbot
PORTVERSION= 1.0.b2
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= farbot-1.0-beta2
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/fortunelock/Makefile b/sysutils/fortunelock/Makefile
index 2687785cc7c5..060b456a3bba 100644
--- a/sysutils/fortunelock/Makefile
+++ b/sysutils/fortunelock/Makefile
@@ -4,8 +4,7 @@
PORTNAME= fortunelock
PORTVERSION= 0.1.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dannyboy
+MASTER_SITES= LOCAL/dannyboy
MAINTAINER= ports@FreeBSD.org
COMMENT= Locks a terminal while showing fortunes
diff --git a/sysutils/fsc/Makefile b/sysutils/fsc/Makefile
index f3a07eb04113..24d706f79c1a 100644
--- a/sysutils/fsc/Makefile
+++ b/sysutils/fsc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fsc
PORTVERSION= 1.0.1
PORTREVISION= 3
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= trhodes
+MASTER_SITES= LOCAL/trhodes
MAINTAINER= trhodes@FreeBSD.org
COMMENT= The FreeBSD Services Control family of utilities
diff --git a/sysutils/fusefs-afuse/Makefile b/sysutils/fusefs-afuse/Makefile
index b0b79d29973a..9d43a7aec19d 100644
--- a/sysutils/fusefs-afuse/Makefile
+++ b/sysutils/fusefs-afuse/Makefile
@@ -4,7 +4,7 @@
PORTNAME= afuse
PORTVERSION= 0.4.1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= fusefs-
MAINTAINER= ak@FreeBSD.org
diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile
index 90b9b5e53095..c5c97f1e2f76 100644
--- a/sysutils/fusefs-chironfs/Makefile
+++ b/sysutils/fusefs-chironfs/Makefile
@@ -5,7 +5,7 @@ PORTNAME= chironfs
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= fusefs-
MAINTAINER= leeym@FreeBSD.org
diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile
index 3986aa0fdd31..07414b64ddf0 100644
--- a/sysutils/fusefs-rar2fs/Makefile
+++ b/sysutils/fusefs-rar2fs/Makefile
@@ -5,7 +5,7 @@ PORTNAME= rar2fs
PORTVERSION= 1.15.1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}:rar2fs http://www.rarlab.com/rar/:unrarsrc
+MASTER_SITES= GOOGLE_CODE:rar2fs http://www.rarlab.com/rar/:unrarsrc
PKGNAMEPREFIX= fusefs-
DISTFILES= rar2fs-1.15.1.tar.gz:rar2fs unrarsrc-4.2.4.tar.gz:unrarsrc
diff --git a/sysutils/fusefs-sqlfs/Makefile b/sysutils/fusefs-sqlfs/Makefile
index ff7bd1bd911f..7d81ffbaa947 100644
--- a/sysutils/fusefs-sqlfs/Makefile
+++ b/sysutils/fusefs-sqlfs/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils
-MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= libsqlfs
+MASTER_SITES= SAVANNAH/libsqlfs
PKGNAMEPREFIX= fusefs-
DISTNAME= lib${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile
index 5854c332f3c4..56b7a5beed6c 100644
--- a/sysutils/geomgui/Makefile
+++ b/sysutils/geomgui/Makefile
@@ -5,8 +5,7 @@ PORTNAME= geomgui
PORTVERSION= 0.13
CATEGORIES= sysutils
MASTER_SITES= http://tinkering.hambrew.net/geomgui/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= xride
+ LOCAL/xride
MAINTAINER= xride@FreeBSD.org
COMMENT= Viewer for kernel geom layer
diff --git a/sysutils/getdelta/Makefile b/sysutils/getdelta/Makefile
index 059f47762f37..d776b3b98ef3 100644
--- a/sysutils/getdelta/Makefile
+++ b/sysutils/getdelta/Makefile
@@ -5,11 +5,10 @@ PORTNAME= getdelta
PORTVERSION= 0.7.8
PORTREVISION= 5
CATEGORIES= sysutils ports-mgmt
-MASTER_SITES= ${MASTER_SITE_GENTOO} \
+MASTER_SITES= GENTOO \
http://132.207.4.160/distfiles/ \
http://distfiles.gentoo.org/distfiles/ \
http://linux01.gwdg.de/~nlissne/
-MASTER_SITE_SUBDIR= distfiles
MAINTAINER= astatutov@gmail.com
COMMENT= Script for reducing bandwidth load while upgrading ports disfiles
diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile
index cc644b653179..10270ed1f02d 100644
--- a/sysutils/gigolo/Makefile
+++ b/sysutils/gigolo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gigolo
PORTVERSION= 0.4.2
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
MAINTAINER= koalative@gmail.com
COMMENT= Frontend to easily manage filesystem connections
diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile
index ce52a38ed985..0333173b0649 100644
--- a/sysutils/gkfreq/Makefile
+++ b/sysutils/gkfreq/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gkrellm-gkfreq
PORTVERSION= 2.2
#PORTREVISION= 0
CATEGORIES= sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
MAINTAINER= ume@FreeBSD.org
COMMENT= Plugin to GKrellM that displays the current CPU frequencies
diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile
index 1c474fe892ee..e60293112d97 100644
--- a/sysutils/gkrellfire/Makefile
+++ b/sysutils/gkrellfire/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.4.2
PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://freenet-homepage.de/thomas-steinke/ \
- LOCAL
-MASTER_SITE_SUBDIR= novel
+ LOCAL/novel
MAINTAINER= novel@FreeBSD.org
COMMENT= Gkrellm2 plugin which shows the system load as a flame
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 2a2a98676d84..05526ea3666e 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 2.3.5
PORTREVISION= 6
CATEGORIES= sysutils ipv6
MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ume
+ LOCAL/ume
PKGNAMESUFFIX= 2
MAINTAINER= ume@FreeBSD.org
diff --git a/sysutils/gstopd/Makefile b/sysutils/gstopd/Makefile
index 6cfda4aba35c..30c1c1094fbc 100644
--- a/sysutils/gstopd/Makefile
+++ b/sysutils/gstopd/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gstopd
PORTVERSION= 1.1
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= mr
+MASTER_SITES= LOCAL/mr
MAINTAINER= mr@FreeBSD.org
COMMENT= GEOM stop daemon
diff --git a/sysutils/hatop/Makefile b/sysutils/hatop/Makefile
index a7abcc3c5b0b..8e66f9d3e024 100644
--- a/sysutils/hatop/Makefile
+++ b/sysutils/hatop/Makefile
@@ -4,7 +4,7 @@
PORTNAME= hatop
PORTVERSION= 0.7.7
CATEGORIES= sysutils net
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@christianserving.org
COMMENT= Interactive real-time monitoring tool for the HAProxy unix socket
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index c72c250f8f30..155d1e7e3857 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.1.4
PORTREVISION= 24
CATEGORIES= sysutils
#MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama/heartbeat
+MASTER_SITES= LOCAL/kuriyama/heartbeat
DISTNAME= STABLE-${PORTVERSION}
DIST_SUBDIR= heartbeat
diff --git a/sysutils/isc-cron/Makefile b/sysutils/isc-cron/Makefile
index 720309c7c768..d1f227c5b50a 100644
--- a/sysutils/isc-cron/Makefile
+++ b/sysutils/isc-cron/Makefile
@@ -5,8 +5,7 @@ PORTNAME= isc-cron
PORTVERSION= 4.1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= cron
+MASTER_SITES= ISC/cron
DISTNAME= cron_${PORTVERSION}.shar
EXTRACT_SUFX=
diff --git a/sysutils/ldapenter/Makefile b/sysutils/ldapenter/Makefile
index 7c7dd0252a4b..a11b613b0e72 100644
--- a/sysutils/ldapenter/Makefile
+++ b/sysutils/ldapenter/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ldapenter
PORTVERSION= 0.2.0
PORTREVISION= 1
CATEGORIES= sysutils editors net
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Add/Modify LDAP entries using template forms
diff --git a/sysutils/less/Makefile b/sysutils/less/Makefile
index a4700d0d8e15..51f38dead7c3 100644
--- a/sysutils/less/Makefile
+++ b/sysutils/less/Makefile
@@ -4,9 +4,8 @@
PORTNAME= less
PORTVERSION= 458
CATEGORIES= sysutils
-MASTER_SITES= http://www.greenwoodsoftware.com/%SUBDIR%/ \
+MASTER_SITES= http://www.greenwoodsoftware.com/less/ \
http://bitrote.org/distfiles/
-MASTER_SITE_SUBDIR= less
MAINTAINER= jharris@widomaker.com
COMMENT= Better pager utility
diff --git a/sysutils/libcdio-paranoia/Makefile b/sysutils/libcdio-paranoia/Makefile
index 446ae056f940..130ddac874b8 100644
--- a/sysutils/libcdio-paranoia/Makefile
+++ b/sysutils/libcdio-paranoia/Makefile
@@ -4,8 +4,7 @@ PORTNAME= libcdio-paranoia
PORTVERSION= 10.2+0.90+1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= libcdio
+MASTER_SITES= GNU/libcdio
MAINTAINER= arved@FreeBSD.org
COMMENT= Read audio from the CDROM directly as data
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index d763b8f58640..efd565bde7d7 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libcdio
PORTVERSION= 0.92
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= libcdio
+MASTER_SITES= GNU
MAINTAINER= arved@FreeBSD.org
COMMENT= Compact Disc Input and Control Library
diff --git a/sysutils/libchk/Makefile b/sysutils/libchk/Makefile
index eeb11835017c..404e25252a6a 100644
--- a/sysutils/libchk/Makefile
+++ b/sysutils/libchk/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libchk
PORTVERSION= 1.10.3
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
MAINTAINER= knu@FreeBSD.org
COMMENT= Tool to check shared library links
diff --git a/sysutils/mgeupsd/Makefile b/sysutils/mgeupsd/Makefile
index a9e987eaa05c..d5a026f4b775 100644
--- a/sysutils/mgeupsd/Makefile
+++ b/sysutils/mgeupsd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mgeupsd
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/ups
+MASTER_SITES= SUNSITE/system/ups
MAINTAINER= ports@FreeBSD.org
COMMENT= Monitor a state of MGE Pulsar UPS connected to RS-232 port
diff --git a/sysutils/mkntpwd/Makefile b/sysutils/mkntpwd/Makefile
index 2a800f21e9fd..2facfe863767 100644
--- a/sysutils/mkntpwd/Makefile
+++ b/sysutils/mkntpwd/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mkntpwd
PORTVERSION= 1.0
CATEGORIES= sysutils net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ldaputils/Contrib/mkntpwd
+MASTER_SITES= SF/ldaputils/Contrib/mkntpwd
DISTNAME= ${PORTNAME}
MAINTAINER= pcTA@cs.nctu.edu.tw
diff --git a/sysutils/mksunbootcd/Makefile b/sysutils/mksunbootcd/Makefile
index 53db36b3f233..bfa844477a40 100644
--- a/sysutils/mksunbootcd/Makefile
+++ b/sysutils/mksunbootcd/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mksunbootcd
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
MAINTAINER= ports@FreeBSD.org
COMMENT= Makes ISO images suitable to boot on sparc systems
diff --git a/sysutils/mountsmb2/Makefile b/sysutils/mountsmb2/Makefile
index 388946c07806..05564390e824 100644
--- a/sysutils/mountsmb2/Makefile
+++ b/sysutils/mountsmb2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mountsmb2
PORTVERSION= 0.90.2
CATEGORIES= sysutils net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= lippe
+MASTER_SITES= LOCAL/lippe
MAINTAINER= ports@FreeBSD.org
COMMENT= SMB/CIFS shares mounting scripts to do it at login
diff --git a/sysutils/msktutil/Makefile b/sysutils/msktutil/Makefile
index 4cb47a9af901..01a960e5a007 100644
--- a/sysutils/msktutil/Makefile
+++ b/sysutils/msktutil/Makefile
@@ -5,7 +5,7 @@ PORTNAME= msktutil
PORTVERSION= 0.5.1
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
http://mirrors.rit.edu/zi/
MAINTAINER= zi@FreeBSD.org
diff --git a/sysutils/no-login/Makefile b/sysutils/no-login/Makefile
index 6b7a5948341c..e5fcea6104cf 100644
--- a/sysutils/no-login/Makefile
+++ b/sysutils/no-login/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nologin
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=wes
+MASTER_SITES= LOCAL/wes
MAINTAINER= ports@FreeBSD.org
COMMENT= Refuse a login to a user, and make a note of it in syslog
diff --git a/sysutils/open/Makefile b/sysutils/open/Makefile
index 7072cd51169d..47ef18a3d7a4 100644
--- a/sysutils/open/Makefile
+++ b/sysutils/open/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.4
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.hs-niederrhein.de/pub/linux/src/ \
ftp://ftp.uni-bremen.de/pub/mirrors/sunsite/utils/console/ \
- ${MASTER_SITE_LOCAL:S^$^fjoe/^}
+ LOCAL/fjoe
MAINTAINER= fjoe@FreeBSD.org
COMMENT= Open opens a new vt and runs a command on it
diff --git a/sysutils/p5-BackupPC-XS/Makefile b/sysutils/p5-BackupPC-XS/Makefile
index 6eb6fa9e5867..d6d53b0d9621 100644
--- a/sysutils/p5-BackupPC-XS/Makefile
+++ b/sysutils/p5-BackupPC-XS/Makefile
@@ -5,8 +5,7 @@ PORTNAME= BackupPC-XS
PORTVERSION= 0.30
PORTREVISION= 1
CATEGORIES= sysutils perl5
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= backuppc/backuppc-beta/4.0.0alpha3
+MASTER_SITES= SF/backuppc/backuppc-beta/4.0.0alpha3
PKGNAMEPREFIX= p5-
MAINTAINER= moiseev@mezonplus.ru
diff --git a/sysutils/p5-Filesys-DfPortable/Makefile b/sysutils/p5-Filesys-DfPortable/Makefile
index a54674a67643..959b24ba356d 100644
--- a/sysutils/p5-Filesys-DfPortable/Makefile
+++ b/sysutils/p5-Filesys-DfPortable/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.85
PORTREVISION= 1
CATEGORIES= sysutils perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Filesys
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/sysutils/p5-Samba-SIDhelper/Makefile b/sysutils/p5-Samba-SIDhelper/Makefile
index 6ac6fd93a377..afaf9eb6b4f2 100644
--- a/sysutils/p5-Samba-SIDhelper/Makefile
+++ b/sysutils/p5-Samba-SIDhelper/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.0.0
PORTREVISION= 3
CATEGORIES= sysutils perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Samba
PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net
diff --git a/sysutils/p5-Sys-Filesystem/Makefile b/sysutils/p5-Sys-Filesystem/Makefile
index 165503eb3ede..eeea50def38e 100644
--- a/sysutils/p5-Sys-Filesystem/Makefile
+++ b/sysutils/p5-Sys-Filesystem/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.401
PORTREVISION= 1
CATEGORIES= sysutils perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Sys
PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@FreeBSD.org
diff --git a/sysutils/p5-arclog/Makefile b/sysutils/p5-arclog/Makefile
index 72e66f00dcca..a20123af186c 100644
--- a/sysutils/p5-arclog/Makefile
+++ b/sysutils/p5-arclog/Makefile
@@ -5,8 +5,7 @@ PORTNAME= arclog
PORTVERSION= 3.04
PORTREVISION= 3
CATEGORIES= sysutils perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/IMACAT
+MASTER_SITES= CPAN/Locale/IMACAT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/sysutils/p5-reslog/Makefile b/sysutils/p5-reslog/Makefile
index 581ceba552ff..a69fdc472bf3 100644
--- a/sysutils/p5-reslog/Makefile
+++ b/sysutils/p5-reslog/Makefile
@@ -5,8 +5,7 @@ PORTNAME= reslog
PORTVERSION= 3.16
PORTREVISION= 3
CATEGORIES= sysutils perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/IMACAT
+MASTER_SITES= CPAN/Locale/IMACAT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/sysutils/paicc/Makefile b/sysutils/paicc/Makefile
index 688cb8733526..c73badaa8681 100644
--- a/sysutils/paicc/Makefile
+++ b/sysutils/paicc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= paicc
PORTVERSION= 1.4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/shell
+MASTER_SITES= SUNSITE/utils/shell
MAINTAINER= peter@FreeBSD.org
COMMENT= Paint Changed Characters
diff --git a/sysutils/pdixtract/Makefile b/sysutils/pdixtract/Makefile
index 2a2ceb565b0c..024b0805c21e 100644
--- a/sysutils/pdixtract/Makefile
+++ b/sysutils/pdixtract/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pdixtract
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= markus
+MASTER_SITES= LOCAL/markus
DISTNAME= PDITOOL
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile
index e0576b375ef3..62af8182be85 100644
--- a/sysutils/polkit-kde/Makefile
+++ b/sysutils/polkit-kde/Makefile
@@ -5,8 +5,7 @@ PORTNAME= polkit-kde
PORTVERSION= 0.99.1
PORTREVISION= 3
CATEGORIES= sysutils kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/apps/KDE4.x/admin/
+MASTER_SITES= KDE/stable/apps/KDE4.x/admin/
DISTNAME= ${PORTNAME}-agent-1-${PORTVERSION:C/1$/0/}
MAINTAINER= kde@FreeBSD.org
diff --git a/sysutils/py-danzfs/Makefile b/sysutils/py-danzfs/Makefile
index 891d173f6f95..9c74577141a0 100644
--- a/sysutils/py-danzfs/Makefile
+++ b/sysutils/py-danzfs/Makefile
@@ -4,7 +4,7 @@
PORTNAME= danzfs
PORTVERSION= 0.2.0
CATEGORIES= sysutils python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= knaggsy2000@gmail.com
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index a576cfa5a4a9..2817f7495c0e 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -5,8 +5,7 @@ PORTNAME= radmind
PORTVERSION= 1.14.1
PORTREVISION= 2014052201
CATEGORIES= sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mikeg@bsd-box.net
COMMENT= Utility for administering filesystem changes
diff --git a/sysutils/rdate/Makefile b/sysutils/rdate/Makefile
index 3766abb35a4d..03052a9508e0 100644
--- a/sysutils/rdate/Makefile
+++ b/sysutils/rdate/Makefile
@@ -4,9 +4,8 @@
PORTNAME= rdate
PORTVERSION= 20150501
CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.stack.nl/pub/users/%SUBDIR%/rdate/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= johans
+MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/rdate/ \
+ LOCAL/johans
MAINTAINER= johans@FreeBSD.org
COMMENT= Sets the clock of the local host to the time of another host
diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile
index c869b268b138..3bdabef6f666 100644
--- a/sysutils/rdiff-backup-devel/Makefile
+++ b/sysutils/rdiff-backup-devel/Makefile
@@ -5,12 +5,9 @@ PORTNAME= rdiff-backup
PORTVERSION= 1.3.3
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:savannah \
- vd/${PORTNAME}${PKGNAMESUFFIX}/:local
+MASTER_SITES= SAVANNAH \
+ LOCAL/vd/${PORTNAME}${PKGNAMESUFFIX}
PKGNAMESUFFIX= -devel
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:savannah,local
MAINTAINER= ports@FreeBSD.org
COMMENT= Local/remote mirroring+incremental backup
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index de6085543789..417ac2c9916b 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -6,11 +6,8 @@ PORTVERSION= 1.2.8
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:savannah \
- vd/${PORTNAME}${PKGNAMESUFFIX}/:local
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:savannah,local
+MASTER_SITES= SAVANNAH \
+ LOCAL/vd/${PORTNAME}${PKGNAMESUFFIX}
MAINTAINER= udvzsolt@gmail.com
COMMENT= Local/remote mirroring+incremental backup
diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile
index 9c796ad8ddd7..11f263757d3a 100644
--- a/sysutils/rfstool/Makefile
+++ b/sysutils/rfstool/Makefile
@@ -4,7 +4,7 @@
PORTNAME= rfstool
PORTVERSION= 0.14
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
DISTNAME= rfstool-0.14-source
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/rsyncbackup/Makefile b/sysutils/rsyncbackup/Makefile
index 9bae23703fa7..6774b066deea 100644
--- a/sysutils/rsyncbackup/Makefile
+++ b/sysutils/rsyncbackup/Makefile
@@ -4,7 +4,7 @@
PORTNAME= rsyncbackup
PORTVERSION= 1.0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= rsyncbackup
MAINTAINER= ports@danielbond.org
diff --git a/sysutils/samesame/Makefile b/sysutils/samesame/Makefile
index 7481a96cec4c..70a476eadf92 100644
--- a/sysutils/samesame/Makefile
+++ b/sysutils/samesame/Makefile
@@ -5,8 +5,7 @@ PORTNAME= samesame
PORTVERSION= 1.10
CATEGORIES= sysutils
MASTER_SITES= http://samesame.kruijff.org/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dhn
+ LOCAL/dhn
MAINTAINER= samesame@akruijff.dds.nl
COMMENT= Find duplicate files and optionally link them together
diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index 7118326a1c6b..8e0d63283ad8 100644
--- a/sysutils/sformat/Makefile
+++ b/sysutils/sformat/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 3.5
PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.berlios.de/pub/sformat/:sformat \
- ${MASTER_SITE_LOCAL:S/$/:libschily,sformat/}
-MASTER_SITE_SUBDIR= marius/:libschily,sformat
+ LOCAL/marius:libschily,sformat
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sformat \
${LIBSCHILY}:libschily
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/sysutils/slack/Makefile b/sysutils/slack/Makefile
index 98e47588e462..f6db3997cea1 100644
--- a/sysutils/slack/Makefile
+++ b/sysutils/slack/Makefile
@@ -5,7 +5,7 @@ PORTNAME= slack
PORTVERSION= 0.15.2
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
http://www.sundell.net/~alan/projects/slack/
MAINTAINER= satwell@disjoint.net
diff --git a/sysutils/superiotool/Makefile b/sysutils/superiotool/Makefile
index ead41d784468..e018d0772732 100644
--- a/sysutils/superiotool/Makefile
+++ b/sysutils/superiotool/Makefile
@@ -4,9 +4,8 @@
PORTNAME= superiotool
DISTVERSION= 20121019
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/avg \
http://www.icyb.net.ua/~avg/distfiles/
-MASTER_SITE_SUBDIR=avg
MAINTAINER= avg@icyb.net.ua
COMMENT= Helper tool for Super I/O chip detection and analysis
diff --git a/sysutils/symlinks/Makefile b/sysutils/symlinks/Makefile
index 0e01b8cea9cd..d6ad19c770b4 100644
--- a/sysutils/symlinks/Makefile
+++ b/sysutils/symlinks/Makefile
@@ -4,8 +4,7 @@
PORTNAME= symlinks
PORTVERSION= 1.4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/file
+MASTER_SITES= SUNSITE/utils/file
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Symbolic link maintenance utility
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index eb578d9b114a..4889a422045f 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.86
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://wpd.home.xs4all.nl/symon/philes/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= uqs@FreeBSD.org
COMMENT= Performance and information monitoring tool
diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index 77de6dbc09ca..705c3148623b 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -5,8 +5,7 @@ PORTNAME= thefish
PORTVERSION= 0.6.6
PORTREVISION= 6
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gtk+/ncurses rc.conf editor/management tool
diff --git a/sysutils/timemon/Makefile b/sysutils/timemon/Makefile
index d6edabf5578b..a2bf91be53b1 100644
--- a/sysutils/timemon/Makefile
+++ b/sysutils/timemon/Makefile
@@ -5,8 +5,7 @@ PORTNAME= timemon
PORTVERSION= 4.1
PORTREVISION= 2
CATEGORIES= sysutils gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= TimeMon-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/ucspi-ssl-tls/Makefile b/sysutils/ucspi-ssl-tls/Makefile
index a8fffd2a45ac..08b7e5713c60 100644
--- a/sysutils/ucspi-ssl-tls/Makefile
+++ b/sysutils/ucspi-ssl-tls/Makefile
@@ -10,8 +10,7 @@ COMMENT= UCSPI tools for building SSL client-server applications w/ TLS support
CONFLICTS= ucspi-ssl-[0-9]*
PATCH_SITES+= http://www.fehcom.de/qmail/spamcontrol/:tls \
- ${MASTER_SITE_LOCAL:S/$/:tls/}
-PATCH_SITE_SUBDIR+= garga/ucspi-ssl/:tls
+ LOCAL/garga/ucspi-ssl/:tls
PATCHFILES+= ucspi-ssl-0.70_ucspitls-0.6.patch_:tls
PATCH_WRKSRC= ${WRKSRC}/src
diff --git a/sysutils/ucspi-ssl/Makefile b/sysutils/ucspi-ssl/Makefile
index bc44c1547469..47f95dc774a0 100644
--- a/sysutils/ucspi-ssl/Makefile
+++ b/sysutils/ucspi-ssl/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= sysutils
MASTER_SITES= LOCAL/garga/ucspi-ssl \
http://www.superscript.com/ucspi-ssl/ \
http://dev.qmailrocks.org/downloads/qmailrocks_3.0-beta/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER?= lx@FreeBSD.org
COMMENT?= UCSPI tools for building SSL client-server applications
diff --git a/sysutils/ucspi-tcp/Makefile b/sysutils/ucspi-tcp/Makefile
index 3910103140ad..3e10991d6548 100644
--- a/sysutils/ucspi-tcp/Makefile
+++ b/sysutils/ucspi-tcp/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.88
PORTREVISION= 2
CATEGORIES= sysutils net
MASTER_SITES= http://cr.yp.to/ucspi-tcp/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= garga/ucspi-tcp
+ LOCAL/garga/ucspi-tcp
PATCH_DIST_STRIP= -p1
@@ -55,8 +54,7 @@ BROKEN= SSL and LIMITS options cannot coexist, please choose one of them
.endif
MASTER_SITES+= http://smarden.org/pape/djb/manpages/:man \
- ${MASTER_SITE_LOCAL:S/$/:man/}
-MASTER_SITE_SUBDIR+= garga/ucspi-tcp/:man
+ LOCAL/garga/ucspi-tcp/:man
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
${DISTNAME}-man.tar.gz:man
MAN_FILES= addcr.1 argv0.1 date@.1 delcr.1 finger@.1 fixcrio.1 \
@@ -98,8 +96,7 @@ PATCH_SITES+= http://www.fefe.de/ucspi/:ipv6
PATCHFILES+= ucspi-tcp-0.88-ipv6.diff19.bz2:ipv6
.endif
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:rss,ssl,rbl2smtpd/}
-PATCH_SITE_SUBDIR+= garga/ucspi-tcp/:rss,ssl,rbl2smtpd
+PATCH_SITES+= LOCAL/garga/ucspi-tcp/:rss,ssl,rbl2smtpd
.include <bsd.port.pre.mk>
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index bbc28a97104e..1da76c6a7349 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 0.7.5
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.13thmonkey.org/udfclient/releases/ \
- ${MASTER_SITE_NETBSD} \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= miwi
+ NETBSD \
+ LOCAL/miwi
DISTFILES= UDFclient.${PORTVERSION}.tgz
MAINTAINER= avg@icyb.net.ua
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index 1c2909ba7c85..10eff11620f4 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.650
CATEGORIES= sysutils
MASTER_SITES= http://www.webmin.com/uupdates/:up \
SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \
- ${MASTER_SITE_LOCAL:S/$/:up/}
-MASTER_SITE_SUBDIR= olgeni/:up
+ LOCAL/olgeni/:up
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf ${USERMIN_MODULES:S/gz$/gz:up/}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/sysutils/vbetool/Makefile b/sysutils/vbetool/Makefile
index d624d1e61f00..10b3edfa023f 100644
--- a/sysutils/vbetool/Makefile
+++ b/sysutils/vbetool/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.codon.org.uk/~mjg59/vbetool/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
MAINTAINER= jkim@FreeBSD.org
COMMENT= Application for executing video card BIOS code
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
index e61093812cf8..18b0af2bf23c 100644
--- a/sysutils/whowatch/Makefile
+++ b/sysutils/whowatch/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/IDS
+ PACKETSTORM/UNIX/IDS
MAINTAINER= ports@FreeBSD.org
COMMENT= Displays information in real time about users currently logged on
diff --git a/sysutils/wmbluecpu/Makefile b/sysutils/wmbluecpu/Makefile
index 1fbe45fc10bc..868bef78c6b8 100644
--- a/sysutils/wmbluecpu/Makefile
+++ b/sysutils/wmbluecpu/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wmbluecpu
PORTVERSION= 0.4
PORTREVISION= 4
CATEGORIES= sysutils windowmaker
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/xutils
+MASTER_SITES= SUNSITE/X11/xutils
MAINTAINER= benjsc@FreeBSD.org
COMMENT= CPU monitoring dockapp
diff --git a/sysutils/wmcube/Makefile b/sysutils/wmcube/Makefile
index a76119a743c8..3c0a76d39766 100644
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@@ -5,10 +5,9 @@ PORTNAME= wmcube
PORTVERSION= 0.98
PORTREVISION= 3
CATEGORIES= sysutils windowmaker
-MASTER_SITES= ${MASTER_SITE_TUCOWS} \
+MASTER_SITES= TUCOWS/x11/dock \
http://dockapps.org/download.php/id/222/ \
http://freebsd.unixfreunde.de/sources/
-MASTER_SITE_SUBDIR= x11/dock
MAINTAINER= garga@FreeBSD.org
COMMENT= Window Maker dockapp that displays cpu load and a realtime 3D object
diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile
index cefcfd97aede..18b377ba6a33 100644
--- a/sysutils/wmmemfree/Makefile
+++ b/sysutils/wmmemfree/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wmmemfree
PORTVERSION= 0.7
PORTREVISION= 4
CATEGORIES= sysutils windowmaker
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/xutils
+MASTER_SITES= SUNSITE/X11/xutils
MAINTAINER= ports@FreeBSD.org
COMMENT= Memory and swap monitoring dockapp
diff --git a/sysutils/xe-guest-utilities/Makefile b/sysutils/xe-guest-utilities/Makefile
index d41e25f9b943..ea05a1ad6a41 100644
--- a/sysutils/xe-guest-utilities/Makefile
+++ b/sysutils/xe-guest-utilities/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xe-guest-utilities
PORTVERSION= 6.2.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= feld
+MASTER_SITES= LOCAL/feld
DISTNAME= ${PORTNAME}-6.0.2
MAINTAINER= dinoex@FreeBSD.org
diff --git a/sysutils/xfsm/Makefile b/sysutils/xfsm/Makefile
index 91a57a76fb1a..bc747df7e88b 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfsm
PORTVERSION= 1.99
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/status/xstatus
+MASTER_SITES= SUNSITE/system/status/xstatus
MAINTAINER= ports@FreeBSD.org
COMMENT= X File System Monitor
diff --git a/sysutils/xin/Makefile b/sysutils/xin/Makefile
index 29d9b53b7f8b..9c5b156ba49b 100644
--- a/sysutils/xin/Makefile
+++ b/sysutils/xin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xin
PORTVERSION= 1.0.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/file
+MASTER_SITES= SUNSITE/utils/file
MAINTAINER= ports@FreeBSD.org
COMMENT= Splits standard input and pipes into a command
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 113d6c9e721d..0955f2c2eb62 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xlogmaster
PORTVERSION= 1.6.2
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= Quick & easy monitoring of logfiles and devices
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index a5e2a4fa1ff5..26174f6536c4 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -4,8 +4,7 @@ PORTNAME= xsysstats
PORTVERSION= 1.51
PORTREVISION= 3
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile
index ab09db76ab85..4b0368218411 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zisofs-tools
PORTVERSION= 1.0.8
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}
-MASTER_SITE_SUBDIR= linux/utils/fs/zisofs
+MASTER_SITES= KERNEL_ORG/linux/utils/fs/zisofs
MAINTAINER= chip-set@mail.ru
COMMENT= User utilities for zisofs
diff --git a/textproc/apache-poi/Makefile b/textproc/apache-poi/Makefile
index eebdbc4ebc29..a289b07a05d3 100644
--- a/textproc/apache-poi/Makefile
+++ b/textproc/apache-poi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= poi
PORTVERSION= 3.10.1
CATEGORIES= textproc devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/release/bin
+MASTER_SITES= APACHE/${PORTNAME}/release/bin
PKGNAMEPREFIX= apache-
DISTNAME= ${PORTNAME}-bin-${PORTVERSION}-${RELEASE_DATE}
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 6894beef670e..03f7f44af200 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -4,8 +4,7 @@
PORTNAME= apache-solr
PORTVERSION= 4.10.1
CATEGORIES= textproc java
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= lucene/solr/${PORTVERSION}
+MASTER_SITES= APACHE/lucene/solr/${PORTVERSION}
DISTNAME= solr-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/apache-solr3/Makefile b/textproc/apache-solr3/Makefile
index e4e1d08c4638..4b157a4ce86d 100644
--- a/textproc/apache-solr3/Makefile
+++ b/textproc/apache-solr3/Makefile
@@ -4,8 +4,7 @@
PORTNAME= apache-solr
PORTVERSION= 3.6.2
CATEGORIES= textproc java
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= lucene/solr/${PORTVERSION}/
+MASTER_SITES= APACHE/lucene/solr/${PORTVERSION}
PKGNAMESUFFIX= 3
MAINTAINER= gaod@hychen.org
diff --git a/textproc/aspell/Makefile.inc b/textproc/aspell/Makefile.inc
index 428e47f4eb44..2bd9e70966aa 100644
--- a/textproc/aspell/Makefile.inc
+++ b/textproc/aspell/Makefile.inc
@@ -1,8 +1,7 @@
# $FreeBSD$
# To be included by dictionaries ports.
-MASTER_SITES?= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR?= aspell/dict/${DICT}
+MASTER_SITES?= GNU/aspell/dict/${DICT}
DISTNAME?= aspell${DISTVERSION}
PORTVERSION?= ${DISTVERSION:tl:C/cvs/0_/:C/pt_../p/:C/[0-9]?-?[a-z]+-//g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
diff --git a/textproc/bibtool/Makefile b/textproc/bibtool/Makefile
index f426f53c0139..adc3f932577d 100644
--- a/textproc/bibtool/Makefile
+++ b/textproc/bibtool/Makefile
@@ -4,8 +4,7 @@
PORTNAME= bibtool
PORTVERSION= 2.59
CATEGORIES= textproc print
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= biblio/bibtex/utils/${PORTNAME}
+MASTER_SITES= TEX_CTAN/biblio/bibtex/utils/${PORTNAME}
DISTNAME= BibTool-${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
diff --git a/textproc/bsddiff/Makefile b/textproc/bsddiff/Makefile
index 21040366a2b7..e4dfbc7a42dd 100644
--- a/textproc/bsddiff/Makefile
+++ b/textproc/bsddiff/Makefile
@@ -4,8 +4,7 @@
PORTNAME= diff
PORTVERSION= 20120705
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= gabor
+MASTER_SITES= LOCAL/gabor
PKGNAMEPREFIX= bsd-
MAINTAINER= gabor@FreeBSD.org
diff --git a/textproc/bsdgrep/Makefile b/textproc/bsdgrep/Makefile
index 750e251182dc..8b19d4b3b0e3 100644
--- a/textproc/bsdgrep/Makefile
+++ b/textproc/bsdgrep/Makefile
@@ -5,8 +5,7 @@ PORTNAME= grep
PORTVERSION= 20111002
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= gabor
+MASTER_SITES= LOCAL/gabor
PKGNAMEPREFIX= bsd-
MAINTAINER= gabor@FreeBSD.org
diff --git a/textproc/bsdsort/Makefile b/textproc/bsdsort/Makefile
index 27a6fe64135a..e05af7085cfd 100644
--- a/textproc/bsdsort/Makefile
+++ b/textproc/bsdsort/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sort
PORTVERSION= 20120716
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= gabor
+MASTER_SITES= LOCAL/gabor
PKGNAMEPREFIX= bsd-
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index 6921751787dc..ee3d4f6c4f6f 100644
--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@@ -4,8 +4,7 @@
PORTNAME= c2html
PORTVERSION= 0.9.6
CATEGORIES= textproc www
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/www/converters
+MASTER_SITES= SUNSITE/apps/www/converters
MAINTAINER= mkamm@gmx.net
COMMENT= C-language sources to HTML converter
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 61797906fe68..309234d95baa 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cdif
PORTVERSION= 1.19
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sanpei
+MASTER_SITES= LOCAL/sanpei
EXTRACT_SUFX= # empty
MAINTAINER= sanpei@FreeBSD.org
diff --git a/textproc/chm2pdf/Makefile b/textproc/chm2pdf/Makefile
index 8ca3a8816d93..ef0887dfec60 100644
--- a/textproc/chm2pdf/Makefile
+++ b/textproc/chm2pdf/Makefile
@@ -5,7 +5,7 @@ PORTNAME= chm2pdf
PORTVERSION= 0.9.1
PORTREVISION= 3
CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= kevlo@FreeBSD.org
COMMENT= Python script that converts CHM files into PDF files
diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile
index ebdf82794969..dceb1d8abf48 100644
--- a/textproc/docbook-utils/Makefile
+++ b/textproc/docbook-utils/Makefile
@@ -5,8 +5,7 @@ PORTNAME= docbook-utils
PORTVERSION= 0.6.14
PORTREVISION= 13
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= docbook-tools/new-trials/SOURCES
+MASTER_SITES= SOURCEWARE/docbook-tools/new-trials/SOURCES
MAINTAINER= gabor@FreeBSD.org
COMMENT= Generates various output formats from DocBook SGML documents
diff --git a/textproc/flip/Makefile b/textproc/flip/Makefile
index 7f5a599bfe8c..83f7f12cf1d4 100644
--- a/textproc/flip/Makefile
+++ b/textproc/flip/Makefile
@@ -4,8 +4,7 @@
PORTNAME= flip
PORTVERSION= 1.19
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= itetcu
+MASTER_SITES= LOCAL/itetcu
DISTNAME= ${PORTNAME}.${PORTVERSION}
EXTRACT_SUFX= .tar.Z
diff --git a/textproc/foiltex/Makefile b/textproc/foiltex/Makefile
index 6e183638d8dc..96a3a3e9b1c7 100644
--- a/textproc/foiltex/Makefile
+++ b/textproc/foiltex/Makefile
@@ -5,8 +5,7 @@ PORTNAME= foiltex
PORTVERSION= 2.1.4b
PORTREVISION= 5
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= macros/latex/contrib/${PORTNAME}
+MASTER_SITES= TEX_CTAN/macros/latex/contrib/${PORTNAME}
DISTFILES= foiltex.dtx foiltex.ins
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/gladtex/Makefile b/textproc/gladtex/Makefile
index 9a528d119973..ed22ab151329 100644
--- a/textproc/gladtex/Makefile
+++ b/textproc/gladtex/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gladtex
PORTVERSION= 1.3
PORTREVISION= 3
CATEGORIES= textproc math www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Program to replace LaTeX formulas in HTML files with images
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 5062d50428ed..aeb5ca3248dd 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -5,8 +5,7 @@ PORTNAME= groff
PORTVERSION= 1.22.2
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= groff
+MASTER_SITES= GNU
MAINTAINER= uqs@FreeBSD.org
COMMENT= Software typesetting package
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index b6a71f9d7d74..859e2c4518ef 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gtkspell
PORTVERSION= 2.0.16
PORTREVISION?= 5
CATEGORIES= textproc gnome
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= marcus
+MASTER_SITES= LOCAL/marcus
MAINTAINER= gnome@FreeBSD.org
COMMENT= GTK+ 2 spell checking component
diff --git a/textproc/hhm/Makefile b/textproc/hhm/Makefile
index 372484eaacba..7690aafa2e50 100644
--- a/textproc/hhm/Makefile
+++ b/textproc/hhm/Makefile
@@ -4,8 +4,7 @@
PORTNAME= hhm
PORTVERSION= 0.1.1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= HTML Help Maker
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index b8835fe50210..22a7ba152779 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -5,8 +5,7 @@ PORTNAME= htdig
PORTVERSION= 3.2.0.b6
PORTREVISION= 6
CATEGORIES= textproc www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/3.2.0b6
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3.2.0b6
DISTNAME= htdig-3.2.0b6
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile
index 3f271f0c7929..678fab352a39 100644
--- a/textproc/html2text/Makefile
+++ b/textproc/html2text/Makefile
@@ -4,9 +4,8 @@
PORTNAME= html2text
PORTVERSION= 1.3.2a
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/apps/www/converters \
http://www.mbayer.de/html2text/downloads/
-MASTER_SITE_SUBDIR= apps/www/converters
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts HTML documents into plain text
diff --git a/textproc/ibus-m17n/Makefile b/textproc/ibus-m17n/Makefile
index cea471314abc..dd2b2e9c7822 100644
--- a/textproc/ibus-m17n/Makefile
+++ b/textproc/ibus-m17n/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ibus-m17n
PORTVERSION= 1.3.3
PORTREVISION= 5
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= nikola.lecic@anthesphoria.net
COMMENT= The m17n IMEngine for IBus framework
diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile
index ee94382cb565..768c8bc41931 100644
--- a/textproc/ibus-table/Makefile
+++ b/textproc/ibus-table/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ibus-table
PORTVERSION= 1.5.0
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= nikola.lecic@anthesphoria.net
COMMENT= Table based input method framework for IBus
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index a0621930775f..a77de58da043 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -5,7 +5,7 @@ PORTNAME= iksemel
PORTVERSION= 1.4
PORTREVISION= 6
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= rhaamo@gruik.at
COMMENT= XML parser library mainly designed for Jabber applications
diff --git a/textproc/irstlm/Makefile b/textproc/irstlm/Makefile
index 5c996b24c9b6..157a8094cbcb 100644
--- a/textproc/irstlm/Makefile
+++ b/textproc/irstlm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= irstlm
PORTVERSION= 5.80.03
PORTREVISION= 4
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-5.80
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-5.80
MAINTAINER= demon@FreeBSD.org
COMMENT= The IRST Language Modeling Toolkit
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index 7ace079b9ef5..c82336f08f44 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -5,8 +5,7 @@ PORTNAME= iso12083
PORTVERSION= 1993
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama/iso12083
+MASTER_SITES= LOCAL/kuriyama/iso12083
DISTFILES= article.dtd book.dtd maths.dtd serial.dtd
EXTRACT_ONLY= # empty
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 271bc0df24f1..91ef807a8bf3 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -5,8 +5,7 @@ PORTNAME= iso8879
PORTVERSION= 1986
PORTREVISION= 3
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
DISTNAME= isoENTS
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile
index 884f6dea963a..3015897136d7 100644
--- a/textproc/java2html/Makefile
+++ b/textproc/java2html/Makefile
@@ -5,8 +5,7 @@ PORTNAME= java2html
PORTVERSION= 0.9.2
PORTREVISION= 1
CATEGORIES= textproc www
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/www/converters
+MASTER_SITES= SUNSITE/apps/www/converters
MAINTAINER= mkamm@gmx.net
COMMENT= Java sources to HTML converter
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 2cdeb80e06df..65d83e1843ff 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -5,8 +5,7 @@ PORTNAME= latex2html
PORTVERSION= 2008
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= support/${PORTNAME}
+MASTER_SITES= TEX_CTAN/support/${PORTNAME}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Convert LaTeX documents to HTML
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 6efcf2f04ba8..996ef6b009b7 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -5,7 +5,7 @@ PORTNAME= liblrdf
PORTVERSION= 0.5.0
PORTREVISION= 7
CATEGORIES= textproc
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for manipulating RDF files describing LADSPA plugins
diff --git a/textproc/libtext-charwidth-perl/Makefile b/textproc/libtext-charwidth-perl/Makefile
index c3de7ad6805c..fcf4ff7c0057 100644
--- a/textproc/libtext-charwidth-perl/Makefile
+++ b/textproc/libtext-charwidth-perl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libtext-charwidth-perl
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/libt/libtext-charwidth-perl
+MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/libtext-wrapi18n-perl/Makefile b/textproc/libtext-wrapi18n-perl/Makefile
index 0009b128ba0e..a95f858872e5 100644
--- a/textproc/libtext-wrapi18n-perl/Makefile
+++ b/textproc/libtext-wrapi18n-perl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libtext-wrapi18n-perl
PORTVERSION= 0.06
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/libt/libtext-wrapi18n-perl
+MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/ltxml/Makefile b/textproc/ltxml/Makefile
index e7e42b22257d..fd088472f12d 100644
--- a/textproc/ltxml/Makefile
+++ b/textproc/ltxml/Makefile
@@ -4,7 +4,7 @@
PORTNAME= ltxml
PORTVERSION= 1.2.9
CATEGORIES= textproc
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/lucene/Makefile b/textproc/lucene/Makefile
index 17142bcaa8ca..726cc37a2ca7 100644
--- a/textproc/lucene/Makefile
+++ b/textproc/lucene/Makefile
@@ -6,9 +6,7 @@ PORTVERSION= 3.6.2
# Be sure to chase devel/openoffice-devel and textproc/py-lucene
# when updating this
CATEGORIES= textproc java devel
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/java/${PORTVERSION}/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= APACHE/${PORTNAME}/java/${PORTVERSION}
MAINTAINER= danilo@FreeBSD.org
COMMENT= Full-text search engine for Java
@@ -19,6 +17,7 @@ CONFLICTS= lucene4-[0-9].*
PORTSCOUT= limit:^3\.
+USES= tar:tgz
USE_JAVA= yes
NO_BUILD= yes
JAVA_VERSION= 1.6+
diff --git a/textproc/lucene4/Makefile b/textproc/lucene4/Makefile
index 4abc98593730..a21c781995c7 100644
--- a/textproc/lucene4/Makefile
+++ b/textproc/lucene4/Makefile
@@ -4,8 +4,7 @@
PORTNAME= lucene
PORTVERSION= 4.10.4
CATEGORIES= textproc java devel
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/java/${PORTVERSION}/
+MASTER_SITES= APACHE/${PORTNAME}/java/${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
COMMENT= Full-text search engine for Java, 4.x branch
diff --git a/textproc/lucene5/Makefile b/textproc/lucene5/Makefile
index 3427274d5515..13ebbfb455f1 100644
--- a/textproc/lucene5/Makefile
+++ b/textproc/lucene5/Makefile
@@ -4,8 +4,7 @@
PORTNAME= lucene
PORTVERSION= 5.1.0
CATEGORIES= textproc java devel
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/java/${PORTVERSION}/
+MASTER_SITES= APACHE/${PORTNAME}/java/${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
COMMENT= Full-text search engine for Java, 5.x branch
diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index 3ac8364a54b4..097212791176 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mdocml
PORTVERSION= 1.13.3
CATEGORIES= textproc
MASTER_SITES= http://mdocml.bsd.lv/snapshots/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= uqs@FreeBSD.org
COMMENT= mdoc macro compiler
diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
index 17fd28caf824..1c9feb4aa54e 100644
--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mgdiff
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= XCONTRIB/applications
DISTNAME= ${PORTNAME}
MAINTAINER= portmaster@BSDforge.com
diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile
index 8d2c117d4bca..6b5508cf476d 100644
--- a/textproc/muse/Makefile
+++ b/textproc/muse/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 3.20
PORTREVISION= 10
CATEGORIES= textproc elisp
MASTER_SITES= http://download.gna.org/muse-el/ \
- ${MASTER_SITE_LOCAL} \
+ LOCAL/dryice \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= dryice
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/p5-Google-Data-JSON/Makefile b/textproc/p5-Google-Data-JSON/Makefile
index 313be3b6a9e4..881229722930 100644
--- a/textproc/p5-Google-Data-JSON/Makefile
+++ b/textproc/p5-Google-Data-JSON/Makefile
@@ -3,12 +3,12 @@
PORTNAME= Google-Data-JSON
PORTVERSION= 0.1.10
+DISTVERSIONPREFIX= v
PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:TAKERU
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
COMMENT= General XML-JSON converter based on Google Data APIs
diff --git a/textproc/p5-PPI-XS/Makefile b/textproc/p5-PPI-XS/Makefile
index 7bf4d3969e22..649b0104dd62 100644
--- a/textproc/p5-PPI-XS/Makefile
+++ b/textproc/p5-PPI-XS/Makefile
@@ -4,8 +4,7 @@ PORTNAME= PPI-XS
PORTVERSION= 0.902
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= PPI
+MASTER_SITES= CPAN/PPI
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/textproc/p5-Pod-Strip/Makefile b/textproc/p5-Pod-Strip/Makefile
index f21cf4173d2e..f558eddcbae8 100644
--- a/textproc/p5-Pod-Strip/Makefile
+++ b/textproc/p5-Pod-Strip/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.02
PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Pod
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-String-BufferStack/Makefile b/textproc/p5-String-BufferStack/Makefile
index b910301f5b7e..7127c5ead2e1 100644
--- a/textproc/p5-String-BufferStack/Makefile
+++ b/textproc/p5-String-BufferStack/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.16
PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= String
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-Text-FixEOL/Makefile b/textproc/p5-Text-FixEOL/Makefile
index 41bcd98a0177..6d1baef6d9dd 100644
--- a/textproc/p5-Text-FixEOL/Makefile
+++ b/textproc/p5-Text-FixEOL/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.06
PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/textproc/p5-Text-Reform/Makefile b/textproc/p5-Text-Reform/Makefile
index d453d104900b..482d9135ce58 100644
--- a/textproc/p5-Text-Reform/Makefile
+++ b/textproc/p5-Text-Reform/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.20
PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-Text-Trim/Makefile b/textproc/p5-Text-Trim/Makefile
index 9e319613bdc2..4e52e1b97c2c 100644
--- a/textproc/p5-Text-Trim/Makefile
+++ b/textproc/p5-Text-Trim/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.02
PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-DOM2/Makefile b/textproc/p5-XML-DOM2/Makefile
index baf965221592..76e44f437b33 100644
--- a/textproc/p5-XML-DOM2/Makefile
+++ b/textproc/p5-XML-DOM2/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.06
PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/p5-XML-Parser-Style-EasyTree/Makefile b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
index 112029f7d81c..0fa69f6febf5 100644
--- a/textproc/p5-XML-Parser-Style-EasyTree/Makefile
+++ b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.09
PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/textproc/p5-podlators/Makefile b/textproc/p5-podlators/Makefile
index 659dc360d066..bf01fab2a452 100644
--- a/textproc/p5-podlators/Makefile
+++ b/textproc/p5-podlators/Makefile
@@ -5,8 +5,7 @@ PORTNAME= podlators
PORTVERSION= 2.5.3
PORTREVISION= 2
CATEGORIES= textproc perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN/Pod
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile
index d15ad76c28fe..a5956370937b 100644
--- a/textproc/pdfgrep/Makefile
+++ b/textproc/pdfgrep/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pdfgrep
PORTVERSION= 1.3.0
PORTREVISION= 3
CATEGORIES= textproc
-MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
MAINTAINER= michael@ranner.eu
COMMENT= Tool to search text in PDF files
diff --git a/textproc/pecl-ctemplate/Makefile b/textproc/pecl-ctemplate/Makefile
index 3d688f5d2749..7387e9a8639d 100644
--- a/textproc/pecl-ctemplate/Makefile
+++ b/textproc/pecl-ctemplate/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cTemplate
PORTVERSION= 1.11
PORTREVISION= 0
CATEGORIES= textproc pear
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= vanilla
+MASTER_SITES= LOCAL/vanilla
PKGNAMEPREFIX= pecl-
DIST_SUBDIR= PECL
diff --git a/textproc/perl2html/Makefile b/textproc/perl2html/Makefile
index 3f948f3d623e..9adf5cbcd6ab 100644
--- a/textproc/perl2html/Makefile
+++ b/textproc/perl2html/Makefile
@@ -5,8 +5,7 @@ PORTNAME= perl2html
PORTVERSION= 0.9.2
PORTREVISION= 1
CATEGORIES= textproc www
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/www/converters
+MASTER_SITES= SUNSITE/apps/www/converters
MAINTAINER= mkamm@gmx.net
COMMENT= Perl sources to HTML converter
diff --git a/textproc/popup-stacks/Makefile b/textproc/popup-stacks/Makefile
index 342904c9ceb0..95bf5a83814c 100644
--- a/textproc/popup-stacks/Makefile
+++ b/textproc/popup-stacks/Makefile
@@ -4,7 +4,6 @@ PORTNAME= popup
PORTVERSION= 1.0
CATEGORIES= textproc
MASTER_SITES= http://popup.sourceforge.net/files/cstack/
-MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMESUFFIX= -stacks${PKGNAMESUFFIX2}
DISTFILES= English-German.cstack.gz German-French.cstack.gz
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index e7c7f27126e8..dc1bc8c9c378 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ppower4
PORTVERSION= 0.9.4
PORTREVISION= 7
CATEGORIES= textproc java
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= support/${PORTNAME}
+MASTER_SITES= TEX_CTAN/support/${PORTNAME}
DISTFILES= pp4sty.zip pp4p.jar manual.pdf leveldemo.zip
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= pp4sty.zip leveldemo.zip
diff --git a/textproc/py-wordnet/Makefile b/textproc/py-wordnet/Makefile
index 4c0c8eb1f8a4..eec80e6b456e 100644
--- a/textproc/py-wordnet/Makefile
+++ b/textproc/py-wordnet/Makefile
@@ -8,7 +8,6 @@ CATEGORIES= textproc python
MASTER_SITES= SF/pywordnet/pywordnet/${PORTVERSION}:pywn \
http://wordnetcode.princeton.edu/${WN_VERSION}/:wn \
ftp://ftp.ims.uni-stuttgart.de/pub/WordNet/${WN_VERSION}/:wn
-MASTER_SITE_SUBDIR= pywordnet
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= pywordnet-${PORTVERSION}.tar.gz:pywn \
WordNet-${WN_VERSION}.tar.gz:wn
diff --git a/textproc/py2html/Makefile b/textproc/py2html/Makefile
index 00a8c4d74fbd..e8bcd221669a 100644
--- a/textproc/py2html/Makefile
+++ b/textproc/py2html/Makefile
@@ -4,8 +4,7 @@
PORTNAME= py2html
PORTVERSION= 0.7
CATEGORIES= textproc www python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= perky
+MASTER_SITES= LOCAL/perky
PKGNAMESUFFIX= -${PYTHON_PKGNAMEPREFIX:S/-//}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/randlm/Makefile b/textproc/randlm/Makefile
index 2df1b844efd1..e678b3120663 100644
--- a/textproc/randlm/Makefile
+++ b/textproc/randlm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= randlm
PORTVERSION= 0.2.5
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= demon@FreeBSD.org
COMMENT= A toolkit for building randomized language models
diff --git a/textproc/ruby-escape/Makefile b/textproc/ruby-escape/Makefile
index 877cd258cb12..cd8a14801cc2 100644
--- a/textproc/ruby-escape/Makefile
+++ b/textproc/ruby-escape/Makefile
@@ -5,7 +5,7 @@ PORTNAME= escape
PORTVERSION= 0.2
CATEGORIES= textproc ruby
MASTER_SITES= http://www.a-k-r.org/${PORTNAME}/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/ruby-escape|}
+ LOCAL/tota/ruby-escape
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ${RUBY_PKGNAMEPREFIX:S|${RUBY_SUFFIX}-||}
diff --git a/textproc/ruby-rttool/Makefile b/textproc/ruby-rttool/Makefile
index 1320501cd6db..78044499984c 100644
--- a/textproc/ruby-rttool/Makefile
+++ b/textproc/ruby-rttool/Makefile
@@ -5,7 +5,7 @@ PORTNAME= rttool
PORTVERSION= 1.0.3
CATEGORIES= textproc ruby
MASTER_SITES= http://www.rubyist.net/~rubikitch/archive/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/ruby-rttool|}
+ LOCAL/tota/ruby-rttool
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ${RUBY_PKGNAMEPREFIX:S|${RUBY_SUFFIX}-||}
diff --git a/textproc/scr2txt/Makefile b/textproc/scr2txt/Makefile
index c5b27df984b0..76fe9123d53f 100644
--- a/textproc/scr2txt/Makefile
+++ b/textproc/scr2txt/Makefile
@@ -4,14 +4,12 @@
PORTNAME= scr2txt
PORTVERSION= 1.2
CATEGORIES= textproc
-
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nik
-NO_WRKSUBDIR= yes
+MASTER_SITES= LOCAL/nik
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts the output of "vidcontrol -p" to text
+NO_WRKSUBDIR= yes
USES= uidfix
MAKE_ENV= BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX}
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index 1a139df823d4..1d41a2e5118d 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.1.5
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= senna/46945
+MASTER_SITES= SFJP/senna/46945
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Embeddable Fulltext Search Engine
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index 5340bb109e45..4f0835988b36 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sgmlformat
PORTVERSION= 1.7
PORTREVISION= 6
CATEGORIES= textproc print
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Generates groff and HTML from linuxdoc and docbook SGML documents
diff --git a/textproc/sgrep/Makefile b/textproc/sgrep/Makefile
index 805b93f046ac..971ff1d9f460 100644
--- a/textproc/sgrep/Makefile
+++ b/textproc/sgrep/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.99
PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkoshy
+ LOCAL/jkoshy
MAINTAINER= ports@FreeBSD.org
COMMENT= Grep for structured text like SGML and HTML
diff --git a/textproc/sgrep2/Makefile b/textproc/sgrep2/Makefile
index 4f87fc5102d4..e8758c461018 100644
--- a/textproc/sgrep2/Makefile
+++ b/textproc/sgrep2/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sgrep2
PORTVERSION= 1.94a
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkoshy
+ LOCAL/jkoshy
DISTNAME= sgrep-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index abd40f65a5bc..fee82b2a4091 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -5,8 +5,7 @@ PORTNAME= source-highlight
PORTVERSION= 3.1.6
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= src-highlite
+MASTER_SITES= GNU/src-highlite
MAINTAINER= kevlo@FreeBSD.org
COMMENT= C/C++ and Java sources to HTML converter
diff --git a/textproc/txt2tags/Makefile b/textproc/txt2tags/Makefile
index 1d712445bffd..957a7968c1ca 100644
--- a/textproc/txt2tags/Makefile
+++ b/textproc/txt2tags/Makefile
@@ -4,13 +4,12 @@
PORTNAME= txt2tags
PORTVERSION= 2.6
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert simply formatted text into markup (e.g., HTML)
-USES= python:2
+USES= python:2 tar:tgz
NO_BUILD= yes
PORTDOCS= ChangeLog README userguide.pdf
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index e74a4760e2ee..88d90accbfc2 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -5,7 +5,7 @@ PORTNAME= uim-el
PORTVERSION= 1.8.6
PORTREVISION= 3
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= uim-${PORTVERSION}
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 9dbef5c88788..94682f86a01a 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -5,7 +5,7 @@ PORTNAME= uim
PORTVERSION= 1.8.6
PORTREVISION?= 1
CATEGORIES?= textproc
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
.if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
PKGNAMESUFFIX= -nox11
.endif
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index 60f9c7a9e41b..58566b8b7efe 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -5,13 +5,11 @@ PORTNAME= unroff
PORTVERSION= 1.0.2
PORTREVISION= 5
CATEGORIES= textproc
-MASTER_SITES= http://www-rn.informatik.uni-bremen.de/software/unroff/%SUBDIR%/
-MASTER_SITE_SUBDIR= dist
+MASTER_SITES= http://www-rn.informatik.uni-bremen.de/software/unroff/dist/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}
DIST_SUBDIR= unroff
-PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= contrib
+PATCH_SITES= http://www-rn.informatik.uni-bremen.de/software/unroff/contrib/
PATCHFILES= me-misc-patch.gz misc-patch-2.gz
PATCH_DIST_STRIP= -p1
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 332605547180..ca5d2124e471 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xalan-j
PORTVERSION= 2.7.1
CATEGORIES= textproc java
-MASTER_SITES= ${MASTER_SITE_APACHE_XML}
-MASTER_SITE_SUBDIR= ${PORTNAME}/binaries
+MASTER_SITES= APACHE_XML/${PORTNAME}/binaries
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}-bin
MAINTAINER= ale@FreeBSD.org
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index 4cd1cd540d77..de17a121a453 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xerces-j
PORTVERSION= 2.11.0
CATEGORIES= textproc java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= xerces/j
+MASTER_SITES= APACHE/xerces/j
DISTNAME= Xerces-J-bin.${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile
index bfbacc8323ee..873e7e9c9d82 100644
--- a/textproc/xhtml/Makefile
+++ b/textproc/xhtml/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0.20020801
PORTREVISION= 4
CATEGORIES= textproc
#MASTER_SITES= http://www.w3.org/TR/xhtml1/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
DISTNAME= xhtml1-20020801
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index f7016f0baf43..d579079ef7d6 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -5,8 +5,7 @@ PORTNAME= unicode-uhoai
PORTVERSION= 2.1
PORTREVISION= 4
CATEGORIES= vietnamese x11-fonts
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
DISTNAME= uhoaiw21
MAINTAINER= obrien@FreeBSD.org
diff --git a/vietnamese/vis2u/Makefile b/vietnamese/vis2u/Makefile
index 747f136de1ec..03692c257e7a 100644
--- a/vietnamese/vis2u/Makefile
+++ b/vietnamese/vis2u/Makefile
@@ -4,8 +4,7 @@
PORTNAME= vis2u
PORTVERSION= 1.0
CATEGORIES= vietnamese textproc
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= obrien@FreeBSD.org
diff --git a/vietnamese/vnconvert/Makefile b/vietnamese/vnconvert/Makefile
index 42d55c34a865..ea8c8e21a8e7 100644
--- a/vietnamese/vnconvert/Makefile
+++ b/vietnamese/vnconvert/Makefile
@@ -4,8 +4,7 @@
PORTNAME= vnconvert
PORTVERSION= 1.0
CATEGORIES= vietnamese
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
DISTNAME= convert
EXTRACT_SUFX= .tar
diff --git a/vietnamese/vnroff/Makefile b/vietnamese/vnroff/Makefile
index 4e1d513f4eda..eecb57e9ccd5 100644
--- a/vietnamese/vnroff/Makefile
+++ b/vietnamese/vnroff/Makefile
@@ -4,8 +4,7 @@
PORTNAME= vnroff
PORTVERSION= 2.1
CATEGORIES= vietnamese print
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
DISTNAME= ${PORTNAME}-2.0
DISTFILES= vnroff.c.Z vnroff.1.Z
diff --git a/vietnamese/x-unikey/Makefile b/vietnamese/x-unikey/Makefile
index d622c6b9f8eb..1dbcca0d1acf 100644
--- a/vietnamese/x-unikey/Makefile
+++ b/vietnamese/x-unikey/Makefile
@@ -4,8 +4,7 @@
PORTNAME= x-unikey
PORTVERSION= 1.0.4
CATEGORIES= vietnamese textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= unikey/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/unikey/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Vietnamese input method for X
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 93bd486343cb..a7e54b4ac81e 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -4,7 +4,7 @@ PORTNAME= apache22
PORTVERSION= 2.2.29
PORTREVISION?= 2
CATEGORIES= www ipv6
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
+MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}
DIST_SUBDIR= apache22
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 24628a65f1cb..a3dee05da099 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -3,7 +3,7 @@
PORTNAME= apache24
PORTVERSION= 2.4.12
CATEGORIES= www ipv6
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
+MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}
DIST_SUBDIR= apache24
diff --git a/www/axis/Makefile b/www/axis/Makefile
index e814bb6092ac..cdd928048055 100644
--- a/www/axis/Makefile
+++ b/www/axis/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= axis
-PORTVERSION= 1.4
+DISTVERSION= 1_4
PORTREVISION= 6
CATEGORIES= www java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= ws/axis/${PORTVERSION:S,.,_,g}
-DISTNAME= axis-bin-${PORTVERSION:S,.,_,g}
+MASTER_SITES= APACHE/ws/axis/${DISTVERSION}
+DISTNAME= axis-bin-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Java SOAP implementation by Apache
@@ -39,7 +38,7 @@ JAVA_VERSION= 1.6+
USER= www
GROUP= www
-WRKSRC= ${WRKDIR}/axis-${PORTVERSION:S,.,_,g}
+WRKSRC= ${WRKDIR}/axis-${DISTVERSION}
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index 0419226139a3..ec1f0334a0cd 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -5,7 +5,7 @@ PORTNAME= bozohttpd
PORTVERSION= 20130711
CATEGORIES= www ipv6
MASTER_SITES= http://www.eterna.com.au/bozohttpd/ \
- ${MASTER_SITE_NETBSD}
+ NETBSD
MAINTAINER= jmohacsi@bsd.hu
COMMENT= The bozotic HTTP server
diff --git a/www/cgi-lib.pl/Makefile b/www/cgi-lib.pl/Makefile
index ff90c8e5f90b..dccfd95be5ce 100644
--- a/www/cgi-lib.pl/Makefile
+++ b/www/cgi-lib.pl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cgi-lib_pl
PORTVERSION= 2.18
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sada
+MASTER_SITES= LOCAL/sada
DISTNAME= cgi-lib.pl-${PORTVERSION}
EXTRACT_SUFX= .gz
diff --git a/www/cgi-lib/Makefile b/www/cgi-lib/Makefile
index bfe637fb1331..f7e830a7d2aa 100644
--- a/www/cgi-lib/Makefile
+++ b/www/cgi-lib/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cgi-lib
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alex
+MASTER_SITES= LOCAL/alex
MAINTAINER= gonza@techline.ru
COMMENT= ANSI C Library for CGI Programming
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 56ffdd454cd6..d6d047f4738b 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -4,8 +4,7 @@ PORTNAME= cocoon
PORTVERSION= 2.1.11
PORTREVISION= 1
CATEGORIES= www java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= APACHE/${PORTNAME}
DISTNAME= ${PDISTNAME}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/www/demoroniser/Makefile b/www/demoroniser/Makefile
index deb4c9d2ec3f..5832c0a73111 100644
--- a/www/demoroniser/Makefile
+++ b/www/demoroniser/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0.20030916
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.fourmilab.ch/webtools/demoroniser/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=jedgar
+ LOCAL/jedgar
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/diamanda/Makefile b/www/diamanda/Makefile
index 5d7fef94d30c..058100f6e26a 100644
--- a/www/diamanda/Makefile
+++ b/www/diamanda/Makefile
@@ -5,7 +5,7 @@ PORTNAME= diamanda
PORTVERSION= 0.0.${SNAPSHOT:S/.//g}
PORTREVISION= 3
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}-${SNAPSHOT}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 684ca208980a..e7dc9b9dc491 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -5,9 +5,7 @@ PORTNAME= dillo
PORTVERSION= 3.0.4.1
CATEGORIES= www ipv6
MASTER_SITES= http://www.dillo.org/download/ LOCAL/bf/dillo/ \
- TEX_CTAN:hyphen
-MASTER_SITE_SUBDIR= \
- language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen
+ TEX_CTAN/language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 2a340cb166bb..0260d24e4ea1 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -5,8 +5,7 @@ PORTNAME= emacs-w3m
PORTVERSION= 1.4.538.b.${SNAPDATE}
PORTREVISION= 1
CATEGORIES= www elisp
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nobutaka
+MASTER_SITES= LOCAL/nobutaka
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= ${PORTNAME}-1.4.538-${SNAPDATE}
diff --git a/www/eventum/Makefile b/www/eventum/Makefile
index a57f76928521..f96f4833ef7d 100644
--- a/www/eventum/Makefile
+++ b/www/eventum/Makefile
@@ -5,8 +5,7 @@ PORTNAME= eventum
PORTVERSION= 2.2
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= eventum
+MASTER_SITES= MYSQL/eventum
MAINTAINER= ports@FreeBSD.org
COMMENT= Eventum issue tracking system
diff --git a/www/feedonfeeds/Makefile b/www/feedonfeeds/Makefile
index 8e6e2267c3b3..e24f10071bfb 100644
--- a/www/feedonfeeds/Makefile
+++ b/www/feedonfeeds/Makefile
@@ -4,7 +4,7 @@
PORTNAME= feedonfeeds
PORTVERSION= 0.5
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
EXTRACT_SUFX= .tgz
MAINTAINER= wtp@bsdserwis.com
diff --git a/www/free-sa-devel/Makefile b/www/free-sa-devel/Makefile
index 5f640e496e59..23aa839372d6 100644
--- a/www/free-sa-devel/Makefile
+++ b/www/free-sa-devel/Makefile
@@ -4,8 +4,7 @@
PORTNAME= free-sa
PORTVERSION= 2.0.0b6.7
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= free-sa/free-sa-dev/2.0.0b6p7
+MASTER_SITES= SF/free-sa/free-sa-dev/2.0.0b6p7
PKGNAMESUFFIX= -devel
DISTNAME= free-sa-2.0.0b6p7
diff --git a/www/fswiki/Makefile b/www/fswiki/Makefile
index e80c39e2ddf6..4b45947a64a9 100644
--- a/www/fswiki/Makefile
+++ b/www/fswiki/Makefile
@@ -4,8 +4,7 @@ PORTNAME= fswiki
PORTVERSION= 3.6.2
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= fswiki/20797
+MASTER_SITES= SFJP/fswiki/20797
DISTNAME= wiki${PORTVERSION:S|.|_|g}
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/www/fusionpbx/Makefile b/www/fusionpbx/Makefile
index eb6059767a1a..17645dc4580b 100644
--- a/www/fusionpbx/Makefile
+++ b/www/fusionpbx/Makefile
@@ -6,7 +6,7 @@ DISTVERSION= 3.3
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.fusionpbx.com/downloads/ \
- ${MASTER_SITE_GOOGLE_CODE}
+ GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= PHP5 Graphical User Interface for FreeSwitch
diff --git a/www/gaeo/Makefile b/www/gaeo/Makefile
index f547a1e5fd8a..1237e7d13aee 100644
--- a/www/gaeo/Makefile
+++ b/www/gaeo/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.3
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Open-source web framework running on Google App Engine
diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile
index 60556d03b149..86957af36276 100644
--- a/www/geronimo/Makefile
+++ b/www/geronimo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= geronimo
DISTVERSION= 3.0-beta-1
PORTREVISION= 1
CATEGORIES= www devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= geronimo/${DISTVERSION}
+MASTER_SITES= APACHE/geronimo/${DISTVERSION}
DISTNAME= ${PORTNAME}-${WEBSERVER}-javaee6-${DISTVERSION}-bin
MAINTAINER= ports@FreeBSD.org
diff --git a/www/grr/Makefile b/www/grr/Makefile
index 05af2f0e07f8..83470dc6c894 100644
--- a/www/grr/Makefile
+++ b/www/grr/Makefile
@@ -4,8 +4,7 @@ PORTNAME= grr
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= www gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= Grr-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 53479463a151..4f6ef4fd50ab 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gtkhtml3
PORTVERSION= 3.32.1
PORTREVISION= 4
CATEGORIES= www gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/www/guile-www/Makefile b/www/guile-www/Makefile
index e34e9c4e352c..f4593bb56c82 100644
--- a/www/guile-www/Makefile
+++ b/www/guile-www/Makefile
@@ -5,8 +5,7 @@ PORTNAME= guile-www
PORTVERSION= 1.1.1
PORTREVISION= 2
CATEGORIES= www devel scheme
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= guile
+MASTER_SITES= GNU/guile
MAINTAINER= ports@FreeBSD.org
COMMENT= Guile modules for WWW interaction
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 01ccf992cd42..528ada29f2be 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gurlchecker
PORTVERSION= 0.10.1
PORTREVISION= 22
CATEGORIES= www gnome
-MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
-MASTER_SITE_SUBDIR= 547
+MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/547/
MAINTAINER= ports@FreeBSD.org
COMMENT= Gnome program to check a page/website for broken links
diff --git a/www/htdigest/Makefile b/www/htdigest/Makefile
index bf9da723b6a3..cda470481f3d 100644
--- a/www/htdigest/Makefile
+++ b/www/htdigest/Makefile
@@ -4,7 +4,7 @@ PORTNAME= htdigest
PORTVERSION= 2.4.6
PORTREVISION= 1
CATEGORIES= www ipv6
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
+MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}
DIST_SUBDIR= apache24
diff --git a/www/html2hdml/Makefile b/www/html2hdml/Makefile
index a2dc04a77887..ab277aba1285 100644
--- a/www/html2hdml/Makefile
+++ b/www/html2hdml/Makefile
@@ -4,8 +4,7 @@
PORTNAME= html2hdml
PORTVERSION= 1.0.5
CATEGORIES= www textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= html2hdml/6351
+MASTER_SITES= SFJP/html2hdml/6351
MAINTAINER= ports@FreeBSD.org
COMMENT= I-mode HTML to EZweb HDML converter
diff --git a/www/httpasyncclient/Makefile b/www/httpasyncclient/Makefile
index 27b0e0af23c5..f37ed63f1142 100644
--- a/www/httpasyncclient/Makefile
+++ b/www/httpasyncclient/Makefile
@@ -4,8 +4,7 @@
PORTNAME= httpasyncclient
DISTVERSION= 4.0.2
CATEGORIES= www java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/binary
+MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/binary
DISTNAME= httpcomponents-asyncclient-${DISTVERSION}-bin
MAINTAINER= ale@FreeBSD.org
diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile
index 1703ee926f11..eaf856d26816 100644
--- a/www/httpclient/Makefile
+++ b/www/httpclient/Makefile
@@ -4,8 +4,7 @@
PORTNAME= httpclient
DISTVERSION= 4.3.6
CATEGORIES= www java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/binary
+MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/binary
DISTNAME= httpcomponents-client-${DISTVERSION}-bin
MAINTAINER= ale@FreeBSD.org
diff --git a/www/httpcore/Makefile b/www/httpcore/Makefile
index bbb7b3e2e360..2c38cd5906a4 100644
--- a/www/httpcore/Makefile
+++ b/www/httpcore/Makefile
@@ -4,8 +4,7 @@
PORTNAME= httpcore
DISTVERSION= 4.3.3
CATEGORIES= www java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/binary
+MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/binary
DISTNAME= httpcomponents-core-${DISTVERSION}-bin
MAINTAINER= ale@FreeBSD.org
diff --git a/www/httpsqs/Makefile b/www/httpsqs/Makefile
index 66bcd54e8746..d2d2a1efbb48 100644
--- a/www/httpsqs/Makefile
+++ b/www/httpsqs/Makefile
@@ -5,7 +5,7 @@ PORTNAME= httpsqs
PORTVERSION= 1.7
PORTREVISION= 1
CATEGORIES= www devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= lichray@gmail.com
COMMENT= Simple Queue Service based on HTTP GET/POST protocol
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 1a507a330792..53d1024b59bb 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -4,7 +4,7 @@
PORTNAME= ikiwiki
PORTVERSION= 3.20141016.2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} \
+MASTER_SITES= DEBIAN_POOL \
http://kitenet.net/~joey/debian/unstable/ \
LOCAL/mat/${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/www/jetty/Makefile b/www/jetty/Makefile
index 4ce8e2fca1a2..ad52d8c834e6 100644
--- a/www/jetty/Makefile
+++ b/www/jetty/Makefile
@@ -5,8 +5,7 @@ PORTNAME= jetty
PORTVERSION= 8.1.15
CATEGORIES= www java
-MASTER_SITES= ${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=jetty/${PORTVERSION}.${JDVDATE}/dist
+MASTER_SITES= ECLIPSE/jetty/${PORTVERSION}.${JDVDATE}/dist
DISTNAME= jetty-distribution-${PORTVERSION}.${JDVDATE}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index 93deccaa6b1a..157effd04686 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -4,8 +4,7 @@
PORTNAME= apache-jmeter
PORTVERSION= 2.11
CATEGORIES= www benchmarks java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= jmeter/binaries
+MASTER_SITES= APACHE/jmeter/binaries
EXTRACT_SUFX= .tgz
MAINTAINER= mi@aldan.algebra.com
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index c4a0119f117c..9f9cd41f37e2 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libapreq2
PORTVERSION= 2.13
PORTREVISION= 4
CATEGORIES= www devel
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
-MASTER_SITE_SUBDIR=libapreq
+MASTER_SITES= APACHE_HTTPD/libapreq
MAINTAINER= apache@FreeBSD.org
COMMENT= Generic Apache2 Request Library
diff --git a/www/lighttpd-mod_geoip/Makefile b/www/lighttpd-mod_geoip/Makefile
index d24c6c03dd63..c588802edd1d 100644
--- a/www/lighttpd-mod_geoip/Makefile
+++ b/www/lighttpd-mod_geoip/Makefile
@@ -17,9 +17,8 @@ MASTERDIR= ${.CURDIR}/../lighttpd
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
+PATCH_SITES+= LOCAL/mm
PATCHFILES+= lighttpd-1.4.26_mod_geoip.patch.gz
-PATCH_SITE_SUBDIR+= mm
BUILD_WRKSRC= ${WRKSRC}/src
ALL_TARGET= ${PORTNAME}.la
diff --git a/www/lighttpd-mod_h264_streaming/Makefile b/www/lighttpd-mod_h264_streaming/Makefile
index 5bc054df5c14..b915288a1234 100644
--- a/www/lighttpd-mod_h264_streaming/Makefile
+++ b/www/lighttpd-mod_h264_streaming/Makefile
@@ -25,9 +25,8 @@ PLIST= ${.CURDIR}/pkg-plist
MANUAL_PACKAGE_BUILD= free for non-commercial use only
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
+PATCH_SITES+= LOCAL/mm
PATCHFILES+= lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz
-PATCH_SITE_SUBDIR+= mm
BUILD_WRKSRC= ${WRKSRC}/src
ALL_TARGET= ${PORTNAME}.la
diff --git a/www/mod_amazon_proxy/Makefile b/www/mod_amazon_proxy/Makefile
index 9678a10700e4..4e92f81eac09 100644
--- a/www/mod_amazon_proxy/Makefile
+++ b/www/mod_amazon_proxy/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mod_amazon_proxy
PORTVERSION= 20100913
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+MASTER_SITES= LOCAL/tota/${PORTNAME}
MAINTAINER= tota@FreeBSD.org
COMMENT= Amazon Auth Proxy for Product Advertising API
diff --git a/www/mod_asn/Makefile b/www/mod_asn/Makefile
index 78dca95a7c82..e27931bb7851 100644
--- a/www/mod_asn/Makefile
+++ b/www/mod_asn/Makefile
@@ -4,9 +4,8 @@ PORTNAME= mod_asn
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/kuriyama \
http://mirrorbrain.org/files/releases/
-MASTER_SITE_SUBDIR= kuriyama
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Look up the AS and network prefix of IP address
diff --git a/www/mod_auth_tkt/Makefile b/www/mod_auth_tkt/Makefile
index f9cb8ac79ea9..f2528e85df05 100644
--- a/www/mod_auth_tkt/Makefile
+++ b/www/mod_auth_tkt/Makefile
@@ -4,9 +4,8 @@ PORTNAME= mod_auth_tkt
PORTVERSION= 2.1.0
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/kuriyama \
http://www.openfusion.com.au/labs/dist/mod_auth_tkt/
-MASTER_SITE_SUBDIR= kuriyama
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Lightweight single-sign-on authentication module for apache
diff --git a/www/mod_authn_sasl/Makefile b/www/mod_authn_sasl/Makefile
index d2221687c744..835947051abb 100644
--- a/www/mod_authn_sasl/Makefile
+++ b/www/mod_authn_sasl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mod_authn_sasl
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=mod-authn-sasl/mod-authn-sasl/${PORTVERSION}
+MASTER_SITES= SF/mod-authn-sasl/mod-authn-sasl/${PORTVERSION}
MAINTAINER= apache@FreeBSD.org
COMMENT= Allows user authentication based on libsasl2 mechanisms on apache 2.2
diff --git a/www/mod_fcgid/Makefile b/www/mod_fcgid/Makefile
index 977316ba2ef6..59860c0b6410 100644
--- a/www/mod_fcgid/Makefile
+++ b/www/mod_fcgid/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mod_fcgid
PORTVERSION= 2.3.9
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= APACHE_HTTPD/${PORTNAME}
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
DIST_SUBDIR= apache2
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index c4b71866d3b3..6470a4d6e03f 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mod_jk
PORTVERSION= 1.2.40
PORTEPOCH?= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= tomcat/tomcat-connectors/jk/
+MASTER_SITES= APACHE/tomcat/tomcat-connectors/jk/
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
DISTNAME= tomcat-connectors-${PORTVERSION}-src
diff --git a/www/mod_memcache/Makefile b/www/mod_memcache/Makefile
index 99b30036c4cb..764c39e58eee 100644
--- a/www/mod_memcache/Makefile
+++ b/www/mod_memcache/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mod_memcache
PORTVERSION= 0.1.0
PORTREVISION= 4
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 6ff000cc914b..1ddc61387ca2 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES= APACHE/perl
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
PKGNAMESUFFIX= 2
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= ohauer
+PATCH_SITES= LOCAL/ohauer
MAINTAINER= apache@FreeBSD.org
COMMENT= Embeds a Perl interpreter in the Apache2 server
diff --git a/www/mod_python33/Makefile b/www/mod_python33/Makefile
index 04c989abb640..136b480deeeb 100644
--- a/www/mod_python33/Makefile
+++ b/www/mod_python33/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mod_python
PORTVERSION= 3.3.1
PORTREVISION= 7
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
-MASTER_SITE_SUBDIR= modpython
+MASTER_SITES= APACHE_HTTPD/modpython
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
PKGNAMESUFFIX= 33
DIST_SUBDIR= apache2
diff --git a/www/mod_python35/Makefile b/www/mod_python35/Makefile
index 06e6827d0364..0fcfad008c7d 100644
--- a/www/mod_python35/Makefile
+++ b/www/mod_python35/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= http://dist.modpython.org/dist/ \
LOCAL/ohauer
-MASTER_SITE_SUBDIR= modpython
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
PKGNAMESUFFIX= 35
DIST_SUBDIR= apache2
diff --git a/www/mod_qos/Makefile b/www/mod_qos/Makefile
index 190b9a6a3b55..afca39a0d229 100644
--- a/www/mod_qos/Makefile
+++ b/www/mod_qos/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mod_qos
PORTVERSION= 11.12
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= mod-qos
+MASTER_SITES= SF/mod-qos
DIST_SUBDIR= apache2
MAINTAINER= fax@nohik.ee
diff --git a/www/mod_remoteip/Makefile b/www/mod_remoteip/Makefile
index 00e304471c7a..fe08fb63fc6f 100644
--- a/www/mod_remoteip/Makefile
+++ b/www/mod_remoteip/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mod_remoteip
PORTVERSION= 2.3.5.a
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
+MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-2.3.5-alpha
MAINTAINER= ports@christianserving.org
diff --git a/www/mod_reproxy/Makefile b/www/mod_reproxy/Makefile
index fdeee2d668eb..f6854c966a58 100644
--- a/www/mod_reproxy/Makefile
+++ b/www/mod_reproxy/Makefile
@@ -3,8 +3,7 @@
PORTNAME= mod_reproxy
PORTVERSION= 0.02.20110826
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Apache module to support x-reproxy-url header
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index bddd976b2cfd..0484ff045ad7 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mod_rivet
PORTVERSION= 2.2.2
CATEGORIES= www tcl
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= tcl/rivet
+MASTER_SITES= APACHE/tcl/rivet
DISTNAME= rivet-${PORTVERSION}
MAINTAINER= jeff.lawson@flightaware.com
diff --git a/www/mod_setenvifplus/Makefile b/www/mod_setenvifplus/Makefile
index d33e951065a4..cc0954347ebc 100644
--- a/www/mod_setenvifplus/Makefile
+++ b/www/mod_setenvifplus/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mod_setenvifplus
PORTVERSION= 0.22
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= modsetenvifplus
+MASTER_SITES= SF/modsetenvifplus
EXTRACT_SUFX= -src.tar.gz
DIST_SUBDIR= apache2
diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile
index 6f0b09fb61e0..ad7bf6ba136b 100644
--- a/www/mod_spdy/Makefile
+++ b/www/mod_spdy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mod_spdy
PORTVERSION= 0.9.4.1
CATEGORIES= www
MASTER_SITES= http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \
- ${MASTER_SITE_APACHE_HTTPD}:apache22
+ APACHE_HTTPD:apache22
DISTFILES= mod_spdy_source_${PORTVERSION}.tar.xz:mod_spdy \
httpd-2.2.22.tar.gz:apache22
DIST_SUBDIR= ${PORTNAME}
diff --git a/www/mod_vhost_ldap/Makefile b/www/mod_vhost_ldap/Makefile
index 3eb628033eb5..279a98c44d98 100644
--- a/www/mod_vhost_ldap/Makefile
+++ b/www/mod_vhost_ldap/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mod_vhost_ldap
PORTVERSION= 2.0.8
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=pool/main/m/mod-vhost-ldap
+MASTER_SITES= DEBIAN/pool/main/m/mod-vhost-ldap
DISTNAME= ${PORTNAME:S/_/-/g}_${PORTVERSION}.orig
DIST_SUBDIR= apache2
diff --git a/www/myfaces/Makefile b/www/myfaces/Makefile
index 356ce761a016..b0e6f0d37f02 100644
--- a/www/myfaces/Makefile
+++ b/www/myfaces/Makefile
@@ -5,8 +5,7 @@ PORTNAME= myfaces
PORTVERSION= 1.1.1
PORTREVISION= 2
CATEGORIES= www devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/binaries
+MASTER_SITES= APACHE/${PORTNAME}/binaries
MAINTAINER= ports@FreeBSD.org
COMMENT= Free open source JavaServer(tm) Faces implementation
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 5e43c0b243c3..188f2ee9c936 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.9.0
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
-MASTER_SITES+= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= osa
+MASTER_SITES+= LOCAL/osa
PKGNAMESUFFIX= -devel
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -272,8 +271,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/giom-nginx_accept_language_module-${GIT_A
.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
NGINX_ACCESSKEY_VERSION= 2.0.3
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:accesskey/}
-MASTER_SITE_SUBDIR+= osa/:accesskey
+MASTER_SITES+= LOCAL/osa:accesskey
DISTFILES+= nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:accesskey
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}
.endif
@@ -455,8 +453,7 @@ CONFIGURE_ARGS+=--with-http_realip_module
.if ${PORT_OPTIONS:MHTTP_REDIS}
NGINX_REDIS_VERSION= 0.3.7
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:redis/}
-MASTER_SITE_SUBDIR+= osa/:redis
+MASTER_SITES+= LOCAL/osa:redis
DISTFILES+= ngx_http_redis-${NGINX_REDIS_VERSION}.tar.gz:redis
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION}
.endif
@@ -498,8 +495,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${
.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR)
NGINX_UPSTREAM_FAIR_VERSION= 20090923
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:upstreamfair/}
-MASTER_SITE_SUBDIR+= osa/:upstreamfair
+MASTER_SITES+= LOCAL/osa:upstreamfair
DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}
.endif
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 99c63e1b5f46..6a5b8d13bb12 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
-MASTER_SITES+= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= osa
+MASTER_SITES+= LOCAL/osa
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= osa@FreeBSD.org
@@ -268,8 +267,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/giom-nginx_accept_language_module-${GIT_A
.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
NGINX_ACCESSKEY_VERSION= 2.0.3
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:accesskey/}
-MASTER_SITE_SUBDIR+= osa/:accesskey
+MASTER_SITES+= LOCAL/osa:accesskey
DISTFILES+= nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:accesskey
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}
.endif
@@ -451,8 +449,7 @@ CONFIGURE_ARGS+=--with-http_realip_module
.if ${PORT_OPTIONS:MHTTP_REDIS}
NGINX_REDIS_VERSION= 0.3.7
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:redis/}
-MASTER_SITE_SUBDIR+= osa/:redis
+MASTER_SITES+= LOCAL/osa:redis
DISTFILES+= ngx_http_redis-${NGINX_REDIS_VERSION}.tar.gz:redis
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION}
.endif
@@ -494,8 +491,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${
.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR)
NGINX_UPSTREAM_FAIR_VERSION= 20090923
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:upstreamfair/}
-MASTER_SITE_SUBDIR+= osa/:upstreamfair
+MASTER_SITES+= LOCAL/osa:upstreamfair
DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}
.endif
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index 57adac6d411d..fefc9ec01328 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.00
DISTVERSIONSUFFIX= _7
PORTREVISION= 3
CATEGORIES= www perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Apache/GEOFF
+MASTER_SITES= CPAN/Apache/GEOFF
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/www/p5-Ark/Makefile b/www/p5-Ark/Makefile
index 9941ccaedd95..c9f6aa8dcac0 100644
--- a/www/p5-Ark/Makefile
+++ b/www/p5-Ark/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.1.r1
PORTREVISION= 2
CATEGORIES= www perl5
MASTER_SITES= http://cloud.github.com/downloads/typester/ark-perl/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+ LOCAL/kuriyama
PKGNAMEPREFIX= p5-
DISTNAME= Ark-0.001000_001
diff --git a/www/p5-CGI-Compress-Gzip/Makefile b/www/p5-CGI-Compress-Gzip/Makefile
index e6f62db653b2..6fadb278d6ca 100644
--- a/www/p5-CGI-Compress-Gzip/Makefile
+++ b/www/p5-CGI-Compress-Gzip/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.03
PORTREVISION= 3
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= CGI
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/www/p5-CGI-Session-ExpireSessions/Makefile b/www/p5-CGI-Session-ExpireSessions/Makefile
index 002320fcfe1a..d066170e927a 100644
--- a/www/p5-CGI-Session-ExpireSessions/Makefile
+++ b/www/p5-CGI-Session-ExpireSessions/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.12
PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= CGI
PKGNAMEPREFIX= p5-
MAINTAINER= gerard@seibercom.net
diff --git a/www/p5-CSS-DOM/Makefile b/www/p5-CSS-DOM/Makefile
index 5283c8f737bb..f8ba29673186 100644
--- a/www/p5-CSS-DOM/Makefile
+++ b/www/p5-CSS-DOM/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.15
PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= CSS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/www/p5-Catalyst-View-Jemplate/Makefile b/www/p5-Catalyst-View-Jemplate/Makefile
index 081dbdc2b7ae..45e88951eb4a 100644
--- a/www/p5-Catalyst-View-Jemplate/Makefile
+++ b/www/p5-Catalyst-View-Jemplate/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.06
PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Catalyst
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/www/p5-Catalyst-View-XML-Simple/Makefile b/www/p5-Catalyst-View-XML-Simple/Makefile
index 61a2156034d6..f30ea4b06722 100644
--- a/www/p5-Catalyst-View-XML-Simple/Makefile
+++ b/www/p5-Catalyst-View-XML-Simple/Makefile
@@ -4,8 +4,7 @@ PORTNAME= Catalyst-View-XML-Simple
PORTVERSION= 0.01
PORTREVISION= 2
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/www/p5-Data-Validate-URI/Makefile b/www/p5-Data-Validate-URI/Makefile
index 7ed44a39974e..8e3c25d0631c 100644
--- a/www/p5-Data-Validate-URI/Makefile
+++ b/www/p5-Data-Validate-URI/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.06
PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= freebsd-ports@t-b-o-h.net
diff --git a/www/p5-HTML-FromANSI/Makefile b/www/p5-HTML-FromANSI/Makefile
index 635dbbab2bda..fe8559ecbd08 100644
--- a/www/p5-HTML-FromANSI/Makefile
+++ b/www/p5-HTML-FromANSI/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.03
PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/www/p5-HTTP-Response-Encoding/Makefile b/www/p5-HTTP-Response-Encoding/Makefile
index 7cc67eb2b493..73590015fd88 100644
--- a/www/p5-HTTP-Response-Encoding/Makefile
+++ b/www/p5-HTTP-Response-Encoding/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.06
PORTREVISION= 2
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= HTTP
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/www/p5-HTTP-Server-Simple-Static/Makefile b/www/p5-HTTP-Server-Simple-Static/Makefile
index 3eaa13ed2a16..552bd6823976 100644
--- a/www/p5-HTTP-Server-Simple-Static/Makefile
+++ b/www/p5-HTTP-Server-Simple-Static/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.09
PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= HTTP
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/www/p5-LWP-UserAgent-POE/Makefile b/www/p5-LWP-UserAgent-POE/Makefile
index 44f40ec7f372..17712efe87c8 100644
--- a/www/p5-LWP-UserAgent-POE/Makefile
+++ b/www/p5-LWP-UserAgent-POE/Makefile
@@ -5,7 +5,6 @@ PORTNAME= LWP-UserAgent-POE
PORTVERSION= 0.05
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= LWP
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/www/p5-Net-Trac/Makefile b/www/p5-Net-Trac/Makefile
index fd9d55c0677f..f59e4c2a9a73 100644
--- a/www/p5-Net-Trac/Makefile
+++ b/www/p5-Net-Trac/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.16
PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/www/p5-PodToHTML/Makefile b/www/p5-PodToHTML/Makefile
index c901dee2056b..d0c605b52cc8 100644
--- a/www/p5-PodToHTML/Makefile
+++ b/www/p5-PodToHTML/Makefile
@@ -5,8 +5,7 @@ PORTNAME= PodToHTML
PORTVERSION= 0.08
PORTREVISION= 2
CATEGORIES= www perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Pod
+MASTER_SITES= CPAN/Pod
PKGNAMEPREFIX= p5-
MAINTAINER= hrs@FreeBSD.org
diff --git a/www/p5-Template-Plugin-FillInForm/Makefile b/www/p5-Template-Plugin-FillInForm/Makefile
index 46d019165d9a..014f67ad2f11 100644
--- a/www/p5-Template-Plugin-FillInForm/Makefile
+++ b/www/p5-Template-Plugin-FillInForm/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Template
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/www/p5-TestGen4Web-Runner/Makefile b/www/p5-TestGen4Web-Runner/Makefile
index b87cefd7e6d3..f57376bfcb28 100644
--- a/www/p5-TestGen4Web-Runner/Makefile
+++ b/www/p5-TestGen4Web-Runner/Makefile
@@ -5,8 +5,7 @@ PORTNAME= TestGen4Web-Runner
PORTVERSION= 0.11
PORTREVISION= 2
CATEGORIES= www perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= WWW/MACKERS
+MASTER_SITES= CPAN/WWW/MACKERS
PKGNAMEPREFIX= p5-
MAINTAINER= eg@fbsd.lt
diff --git a/www/p5-URI-Title/Makefile b/www/p5-URI-Title/Makefile
index 12266956d99e..52a8a8b2982d 100644
--- a/www/p5-URI-Title/Makefile
+++ b/www/p5-URI-Title/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.86
PORTREVISION= 2
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= URI
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/www/p5-WWW-DHL/Makefile b/www/p5-WWW-DHL/Makefile
index 0c3e754204b0..0fc12e3a6b0a 100644
--- a/www/p5-WWW-DHL/Makefile
+++ b/www/p5-WWW-DHL/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.03
PORTREVISION= 2
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= WWW
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/www/p5-WebService-Google-Sets/Makefile b/www/p5-WebService-Google-Sets/Makefile
index d198a4920f30..23ed14b5f78e 100644
--- a/www/p5-WebService-Google-Sets/Makefile
+++ b/www/p5-WebService-Google-Sets/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= WebService
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/www/p5-chklinks/Makefile b/www/p5-chklinks/Makefile
index 201bb63171c8..d641e9fa4d52 100644
--- a/www/p5-chklinks/Makefile
+++ b/www/p5-chklinks/Makefile
@@ -5,8 +5,7 @@ PORTNAME= chklinks
PORTVERSION= 3.09
PORTREVISION= 1
CATEGORIES= www perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/IMACAT
+MASTER_SITES= CPAN/Locale/IMACAT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 0691c1f155c0..440a7ddfb232 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -4,8 +4,7 @@ PORTNAME= libapreq2
PORTVERSION= 2.13
PORTREVISION= 5
CATEGORIES= www perl5 devel
-MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
-MASTER_SITE_SUBDIR=libapreq
+MASTER_SITES= APACHE_HTTPD/libapreq
DISTFILE= libapreq2-${PORTVERSION}
PKGNAMEPREFIX= p5-
diff --git a/www/phpgroupware/Makefile b/www/phpgroupware/Makefile
index 603ff63ba775..f03c35eb590d 100644
--- a/www/phpgroupware/Makefile
+++ b/www/phpgroupware/Makefile
@@ -3,8 +3,7 @@
PORTNAME= phpgroupware
PORTVERSION= 0.9.16.017
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= phpgroupware/phpgroupware/${PORTVERSION}
+MASTER_SITES= SF/phpgroupware/phpgroupware/${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Web based GroupWare system
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 5c0f41ee1a38..ce9afba6d05c 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -4,10 +4,9 @@
PORTNAME= HTMLgen
PORTVERSION= 2.2.2
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/dryice \
http://dryice.name/computer/FreeBSD/distfiles/ \
http://starship.python.net/crew/friedrich/
-MASTER_SITE_SUBDIR= dryice
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= HTMLgen
diff --git a/www/py-apachelog/Makefile b/www/py-apachelog/Makefile
index 8b4cede0da71..a33b701fa78a 100644
--- a/www/py-apachelog/Makefile
+++ b/www/py-apachelog/Makefile
@@ -5,7 +5,7 @@ PORTNAME= apachelog
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
http://freebsd.unixfreunde.de/sources/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-app-plugins/Makefile b/www/py-django-app-plugins/Makefile
index 4ccdec4f5694..8e5f9a02a5bc 100644
--- a/www/py-django-app-plugins/Makefile
+++ b/www/py-django-app-plugins/Makefile
@@ -5,7 +5,7 @@ PORTNAME= django-app-plugins
PORTVERSION= 0.1.1
PORTREVISION= 1
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@caomhin.org
diff --git a/www/py-django-classy-tags/Makefile b/www/py-django-classy-tags/Makefile
index 5906e3b2bd2c..004a0806566c 100644
--- a/www/py-django-classy-tags/Makefile
+++ b/www/py-django-classy-tags/Makefile
@@ -4,8 +4,7 @@
PORTNAME= django-classy-tags
PORTVERSION= 0.5.1
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/d/${PORTNAME}
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile
index 5bdc0e30f524..dbe044e040a8 100644
--- a/www/py-django-livesettings/Makefile
+++ b/www/py-django-livesettings/Makefile
@@ -4,8 +4,7 @@
PORTNAME= django-livesettings
DISTVERSION= 1.4-14
CATEGORIES= www python
-MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR= source/d/${PORTNAME}
+MASTER_SITES= CHEESESHOP/source/d/${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@caomhin.org
diff --git a/www/py-formalchemy/Makefile b/www/py-formalchemy/Makefile
index 60e6243eb1a6..ab6d4207a197 100644
--- a/www/py-formalchemy/Makefile
+++ b/www/py-formalchemy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= formalchemy
PORTVERSION= 1.3.3
PORTREVISION= 2
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= FormAlchemy-${DISTVERSION}
diff --git a/www/py-pywebdav/Makefile b/www/py-pywebdav/Makefile
index 544c1411c432..9ae54cc5f045 100644
--- a/www/py-pywebdav/Makefile
+++ b/www/py-pywebdav/Makefile
@@ -5,9 +5,7 @@ PORTNAME= PyWebDAV
PORTVERSION= 0.9.8
PORTREVISION= 1
CATEGORIES= www net python
-MASTER_SITES= GOOGLE_CODE \
- CHEESESHOP
-MASTER_SITE_SUBDIR= source/P/PyWebDAV
+MASTER_SITES= GOOGLE_CODE CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
diff --git a/www/py-recaptcha/Makefile b/www/py-recaptcha/Makefile
index ff8f7e8088f2..c119894eb21c 100644
--- a/www/py-recaptcha/Makefile
+++ b/www/py-recaptcha/Makefile
@@ -5,8 +5,7 @@ PORTNAME= recaptcha
PORTVERSION= 1.0.6
PORTREVISION= 1
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/r/recaptcha-client
+MASTER_SITES= CHEESESHOP/source/r/recaptcha-client
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-client-${PORTVERSION}
diff --git a/www/py-utidy/Makefile b/www/py-utidy/Makefile
index 87bbb276ee7c..3e58fbdfe382 100644
--- a/www/py-utidy/Makefile
+++ b/www/py-utidy/Makefile
@@ -5,8 +5,7 @@ PORTNAME= utidy
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= utidylib
+MASTER_SITES= SF/utidylib
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= uTidylib-${PORTVERSION}
diff --git a/www/py-wikitools/Makefile b/www/py-wikitools/Makefile
index 1851e251f138..df278fe9a89a 100644
--- a/www/py-wikitools/Makefile
+++ b/www/py-wikitools/Makefile
@@ -5,7 +5,7 @@ PORTNAME= wikitools
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
diff --git a/www/py-wsgiauth/Makefile b/www/py-wsgiauth/Makefile
index 1f0f24761612..cc0d2ea139ac 100644
--- a/www/py-wsgiauth/Makefile
+++ b/www/py-wsgiauth/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wsgiauth
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/w/wsgiauth
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= bamby@sippysoft.com
diff --git a/www/pylot/Makefile b/www/pylot/Makefile
index aea5cb3181f4..f4e16731b27c 100644
--- a/www/pylot/Makefile
+++ b/www/pylot/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pylot
PORTVERSION= 1.26
PORTREVISION= 5
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
diff --git a/www/sahi/Makefile b/www/sahi/Makefile
index 0ad8e83e86de..83d49659cff6 100644
--- a/www/sahi/Makefile
+++ b/www/sahi/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 3.5.${SAHI_BUILD}
#PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-v${PORTVERSION:R:R:R:S,.,,}/${SAHI_BUILD:S,.,,g}/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-v${PORTVERSION:R:R:R:S,.,,}/${SAHI_BUILD:S,.,,g}/
DISTNAME= ${PORTNAME}_${SAHI_BUILD:S,.,,g}
MAINTAINER= nivit@FreeBSD.org
diff --git a/www/samidare/Makefile b/www/samidare/Makefile
index 4f17c1ab60c1..c64a745a2e20 100644
--- a/www/samidare/Makefile
+++ b/www/samidare/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.7
PORTREVISION= 1
CATEGORIES= www ruby
MASTER_SITES= http://www.a-k-r.org/${PORTNAME}/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/samidare|}
+ LOCAL/tota/samidare
MAINTAINER= tota@FreeBSD.org
COMMENT= Web page update checker written in Ruby
diff --git a/www/selenium/Makefile b/www/selenium/Makefile
index 4efaaad3814b..ccf97943382a 100644
--- a/www/selenium/Makefile
+++ b/www/selenium/Makefile
@@ -4,8 +4,7 @@
PORTNAME= selenium
PORTVERSION= 0.6.1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/17210
+MASTER_SITES= SFJP/${PORTNAME}/17210
MAINTAINER= kaworu@users.sourceforge.jp
COMMENT= Selenium is web application test tool!
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 7aa0dcc9aeb2..d399511d546e 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.16.6
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.manyfish.co.uk/${PORTNAME}/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER= sitecopy@oldach.net
COMMENT= Maintains remote websites, uses FTP or WebDAV to sync up w/ local copy
diff --git a/www/smb_auth/Makefile b/www/smb_auth/Makefile
index 8aafd31f885c..f5a3746dad4a 100644
--- a/www/smb_auth/Makefile
+++ b/www/smb_auth/Makefile
@@ -5,8 +5,7 @@ PORTNAME= smb_auth
PORTVERSION= 0.05
PORTREVISION= 5
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Proxy authentication module against an SMB server
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 927bcb151dbe..3ab3debf6a11 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
http://www1.at.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
http://www.eu.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
http://www1.jp.squid-cache.org/Versions/v3/${PORTVERSION:R}/
-MASTER_SITE_SUBDIR= squid
DIST_SUBDIR= squid${PORTVERSION:R}
PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
diff --git a/www/squidstats/Makefile b/www/squidstats/Makefile
index e3fead732f1e..a416b1011222 100644
--- a/www/squidstats/Makefile
+++ b/www/squidstats/Makefile
@@ -5,7 +5,7 @@ PORTNAME= squidstats
PORTVERSION= 54
PORTREVISION= 3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= squidstats-r${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
index d4970312f477..ec7579a24f06 100644
--- a/www/tclhttpd/Makefile
+++ b/www/tclhttpd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tclhttpd
PORTVERSION= 3.5.1
PORTREVISION= 3
CATEGORIES= www tcl
-MASTER_SITES= ${MASTER_SITE_TCLTK}
-MASTER_SITE_SUBDIR= httpd
+MASTER_SITES= TCLTK/httpd
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
diff --git a/www/tengine/Makefile b/www/tengine/Makefile
index e16cceb46f52..d1ed2c6f796e 100644
--- a/www/tengine/Makefile
+++ b/www/tengine/Makefile
@@ -272,8 +272,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/giom-nginx_accept_language_module-${GIT_A
.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
NGINX_ACCESSKEY_VERSION= 2.0.3
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:accesskey/}
-MASTER_SITE_SUBDIR+= osa/:accesskey
+MASTER_SITES+= LOCAL/osa:accesskey
DISTFILES+= nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:accesskey
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}
.endif
@@ -363,8 +362,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/vkholodkov-nginx-eval-module-${GIT_EVAL_V
.if ${PORT_OPTIONS:MHTTP_FANCYINDEX}
NGINX_FANCYINDEX_VERSION= 0.3.1
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:fancyindex/}
-MASTER_SITE_SUBDIR+= osa/:fancyindex
+MASTER_SITES+= LOCAL/osa:fancyindex
DISTFILES+= ngx-fancyindex-${NGINX_FANCYINDEX_VERSION}.tar.gz:fancyindex
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx-fancyindex-${NGINX_FANCYINDEX_VERSION}
.endif
@@ -415,8 +413,7 @@ CONFIGURE_ARGS+=--with-http_realip_module
.if ${PORT_OPTIONS:MHTTP_REDIS}
NGINX_REDIS_VERSION= 0.3.7
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:redis/}
-MASTER_SITE_SUBDIR+= osa/:redis
+MASTER_SITES+= LOCAL/osa:redis
DISTFILES+= ngx_http_redis-${NGINX_REDIS_VERSION}.tar.gz:redis
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION}
.endif
@@ -449,8 +446,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${
.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) || !empty(PORT_OPTIONS:MSUPERVISORD)
NGINX_UPSTREAM_FAIR_VERSION= 20090923
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:upstreamfair/}
-MASTER_SITE_SUBDIR+= osa/:upstreamfair
+MASTER_SITES+= LOCAL/osa:upstreamfair
DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}
.endif
diff --git a/www/testlink/Makefile b/www/testlink/Makefile
index 99a63372cf01..24b442554d31 100644
--- a/www/testlink/Makefile
+++ b/www/testlink/Makefile
@@ -4,8 +4,7 @@
PORTNAME= testlink
PORTVERSION= 1.9.13
CATEGORIES= www devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/TestLink%201.9/TestLink%20${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/TestLink%201.9/TestLink%20${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
COMMENT= Web based test management and test execution system
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index e871da0d935b..6ad814a2d686 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.thundercache.com.br/dist/ \
http://www.bmsoftware.org/packs/ \
http://www8.freebsdbrasil.com.br/~eksffa/thunder/ \
http://www6.freebsdbrasil.com.br/~eksffa/l/dev/thunder/ \
- ${MASTER_SITE_LOCAL}/jmelo
+ LOCAL/jmelo
DISTNAME= thundercache-6.1.201104260900-${BITS}-fbsd
MAINTAINER= eksffa@freebsdbrasil.com.br
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index 6d66989f2d96..60caa40c8f08 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -6,7 +6,7 @@ PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= http://www.tracanelli.com.br/l/dev/thunder/ \
- ${MASTER_SITE_LOCAL}/jmelo
+ LOCAL/jmelo
MAINTAINER= eksffa@freebsdbrasil.com.br
COMMENT= Web reporting and trending analysis for Thunder Cache Pro
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index 20bac1e841fc..9f2a53eb7f44 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -5,11 +5,10 @@ PORTNAME?= tidy
DISTVERSION= 090315-cvs
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= LOCAL/thierry
#MASTER_SITES= http://tidy.sourceforge.net/src/%SUBDIR%/ \
# http://tidy.sourceforge.net/docs/:docs
#MASTER_SITE_SUBDIR= . old
-MASTER_SITE_SUBDIR= thierry
PKGNAMESUFFIX?= -devel
MAINTAINER?= thierry@FreeBSD.org
diff --git a/www/tinytinyhttpd/Makefile b/www/tinytinyhttpd/Makefile
index 8df84b68129e..02de8a4ae4d7 100644
--- a/www/tinytinyhttpd/Makefile
+++ b/www/tinytinyhttpd/Makefile
@@ -4,8 +4,7 @@
PORTNAME= tinytinyhttpd
PORTVERSION= 0.0.11
CATEGORIES= www
-MASTER_SITES= http://cloud.github.com/downloads/mattn/tinytinyhttpd/ \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://cloud.github.com/downloads/mattn/tinytinyhttpd/
MAINTAINER= smatsui@karashi.org
COMMENT= Tiny tiny httpd
diff --git a/www/trac-accountmanager/Makefile b/www/trac-accountmanager/Makefile
index c3841c02a57d..fdc61801b373 100644
--- a/www/trac-accountmanager/Makefile
+++ b/www/trac-accountmanager/Makefile
@@ -5,9 +5,8 @@ PORTVERSION= 0.5.${REV}
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/kuriyama \
http://trac-hacks.org/changeset/${REV}/accountmanagerplugin/trunk?old_path=/&format=zip&filename=
-MASTER_SITE_SUBDIR= kuriyama
PKGNAMEPREFIX= trac-
DIST_SUBDIR= trac
diff --git a/www/trac-discussion/Makefile b/www/trac-discussion/Makefile
index 588f7c1b65ea..aac116abb918 100644
--- a/www/trac-discussion/Makefile
+++ b/www/trac-discussion/Makefile
@@ -4,8 +4,7 @@ PORTNAME= discussion
PORTVERSION= 0.7
PORTREVISION= 2
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
MAINTAINER= ports@FreeBSD.org
diff --git a/www/trac-downloads/Makefile b/www/trac-downloads/Makefile
index 68971deff761..dea5b843cb17 100644
--- a/www/trac-downloads/Makefile
+++ b/www/trac-downloads/Makefile
@@ -4,8 +4,7 @@ PORTNAME= downloads
PORTVERSION= ${TRAC_VERSION}.${PLUGIN_VERSION}.${SVN_REV}
PORTREVISION= 2
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
DISTNAME= ${PORTNAME}plugin-${PORTVERSION}
DIST_SUBDIR= trac
diff --git a/www/trac-fivestarvote/Makefile b/www/trac-fivestarvote/Makefile
index 7982019b1505..76ad3bfea250 100644
--- a/www/trac-fivestarvote/Makefile
+++ b/www/trac-fivestarvote/Makefile
@@ -4,8 +4,7 @@ PORTNAME= fivestarvote
PORTVERSION= 0.1
PORTREVISION= 4
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
MAINTAINER= ports@FreeBSD.org
diff --git a/www/trac-fullblog/Makefile b/www/trac-fullblog/Makefile
index 40ffb3f2af8e..68f0492709df 100644
--- a/www/trac-fullblog/Makefile
+++ b/www/trac-fullblog/Makefile
@@ -4,8 +4,7 @@ PORTNAME= fullblog
PORTVERSION= 0.1.1
PORTREVISION= 2
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
DISTNAME= ${PORTNAME}plugin-${PORTVERSION}
DIST_SUBDIR= trac
diff --git a/www/trac-fullblognotification/Makefile b/www/trac-fullblognotification/Makefile
index bbf899ef2982..b17b840d8f01 100644
--- a/www/trac-fullblognotification/Makefile
+++ b/www/trac-fullblognotification/Makefile
@@ -4,8 +4,7 @@ PORTNAME= fullblognotification
PORTVERSION= 0.2.1
PORTREVISION= 2
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
DISTNAME= ${PORTNAME}plugin-${PORTVERSION}
DIST_SUBDIR= trac
diff --git a/www/trac-graphviz/Makefile b/www/trac-graphviz/Makefile
index 7cc97139fafb..f23245531e4d 100644
--- a/www/trac-graphviz/Makefile
+++ b/www/trac-graphviz/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
PORTVERSION= 0.7.4
PORTREVISION= 7
CATEGORIES= www devel graphics python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
DISTNAME= ${PORTNAME}plugin-${PORTVERSION}
diff --git a/www/trac-math/Makefile b/www/trac-math/Makefile
index 60427367c7bc..2cc604d193f1 100644
--- a/www/trac-math/Makefile
+++ b/www/trac-math/Makefile
@@ -4,8 +4,7 @@ PORTNAME= math
PORTVERSION= 0.1
PORTREVISION= 7
CATEGORIES= www math python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
MAINTAINER= ports@FreeBSD.org
diff --git a/www/trac-navadd/Makefile b/www/trac-navadd/Makefile
index b5852dff490f..9f79b15b4f9a 100644
--- a/www/trac-navadd/Makefile
+++ b/www/trac-navadd/Makefile
@@ -4,8 +4,7 @@ PORTNAME= navadd
PORTVERSION= 0.1
PORTREVISION= 4
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
DISTNAME= ${PORTNAME}plugin-${PORTVERSION}
diff --git a/www/trac-pydotorgtheme/Makefile b/www/trac-pydotorgtheme/Makefile
index 37b6737a9da2..842e4ec942fa 100644
--- a/www/trac-pydotorgtheme/Makefile
+++ b/www/trac-pydotorgtheme/Makefile
@@ -4,8 +4,7 @@ PORTNAME= pydotorgtheme
PORTVERSION= 2.0
PORTREVISION= 4
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
MAINTAINER= ports@FreeBSD.org
diff --git a/www/trac-tags/Makefile b/www/trac-tags/Makefile
index b2717643a8df..e862f4d90255 100644
--- a/www/trac-tags/Makefile
+++ b/www/trac-tags/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tags
DISTVERSION= 0.7.r${SVN_REV}
PORTREVISION= 2
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
DIST_SUBDIR= trac
diff --git a/www/trac-ticketimport/Makefile b/www/trac-ticketimport/Makefile
index 0b2cfd133971..4945535739d8 100644
--- a/www/trac-ticketimport/Makefile
+++ b/www/trac-ticketimport/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ticketimport
PORTVERSION= 0.7c
PORTREVISION= 3
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
MAINTAINER= ports@FreeBSD.org
diff --git a/www/trac-vote/Makefile b/www/trac-vote/Makefile
index adee47a7c49c..89f51183e055 100644
--- a/www/trac-vote/Makefile
+++ b/www/trac-vote/Makefile
@@ -4,8 +4,7 @@ PORTNAME= vote
PORTVERSION= 0.1.2
PORTREVISION= 3
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
MAINTAINER= ports@FreeBSD.org
diff --git a/www/trac-wikitopdf/Makefile b/www/trac-wikitopdf/Makefile
index c10c54c71b46..8c639cee9bcf 100644
--- a/www/trac-wikitopdf/Makefile
+++ b/www/trac-wikitopdf/Makefile
@@ -4,8 +4,7 @@ PORTNAME= wikitopdf
PORTVERSION= 2.2.2
PORTREVISION= 6
CATEGORIES= www devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMEPREFIX= trac-
DISTNAME= ${PORTNAME}plugin-${PORTVERSION}
diff --git a/www/twiki-BugzillaLinkPlugin/Makefile b/www/twiki-BugzillaLinkPlugin/Makefile
index ffe8a85697cd..e12cbc6a1d31 100644
--- a/www/twiki-BugzillaLinkPlugin/Makefile
+++ b/www/twiki-BugzillaLinkPlugin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= BugzillaLinkPlugin
SVNREV= 15560
MASTER_SITES= http://protey.ru/freebsd/distfiles/ \
- ${MASTER_SITE_LOCAL:S!$!skv/!}
+ LOCAL/skv
COMMENT= Link to Bugzilla bugs using shorthand references
diff --git a/www/twiki-GluePlugin/Makefile b/www/twiki-GluePlugin/Makefile
index 1af1095b17df..a7cc58dbfe37 100644
--- a/www/twiki-GluePlugin/Makefile
+++ b/www/twiki-GluePlugin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= GluePlugin
SVNREV= 15708
MASTER_SITES= http://protey.ru/freebsd/distfiles/ \
- ${MASTER_SITE_LOCAL:S!$!skv/!}
+ LOCAL/skv
COMMENT= Allow to format tags and arguments on multiple lines
diff --git a/www/twiki-LdapContrib/Makefile b/www/twiki-LdapContrib/Makefile
index 3aa3f2c63828..0fbab84d3bdc 100644
--- a/www/twiki-LdapContrib/Makefile
+++ b/www/twiki-LdapContrib/Makefile
@@ -5,7 +5,7 @@ PORTNAME= LdapContrib
SVNREV= 16840
PORTREVISION= 1
MASTER_SITES= http://protey.ru/freebsd/distfiles/ \
- ${MASTER_SITE_LOCAL:S!$!skv/!}
+ LOCAL/skv
COMMENT= LDAP services for TWiki
diff --git a/www/twiki-LdapNgPlugin/Makefile b/www/twiki-LdapNgPlugin/Makefile
index a2d4288d4d56..5a6c1b98d03c 100644
--- a/www/twiki-LdapNgPlugin/Makefile
+++ b/www/twiki-LdapNgPlugin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= LdapNgPlugin
SVNREV= 15577
MASTER_SITES= http://protey.ru/freebsd/distfiles/ \
- ${MASTER_SITE_LOCAL:S!$!skv/!}
+ LOCAL/skv
COMMENT= Query and display data from an LDAP directory
diff --git a/www/twiki-MathModePlugin/Makefile b/www/twiki-MathModePlugin/Makefile
index 041bfa8415ac..5f4c9c3e5ff9 100644
--- a/www/twiki-MathModePlugin/Makefile
+++ b/www/twiki-MathModePlugin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= MathModePlugin
SVNREV= 15934
MASTER_SITES= http://protey.ru/freebsd/distfiles/ \
- ${MASTER_SITE_LOCAL:S!$!skv/!}
+ LOCAL/skv
COMMENT= Include LaTeX formatted math in your TWiki pages
diff --git a/www/twiki-NewUserPlugin/Makefile b/www/twiki-NewUserPlugin/Makefile
index 91402ad1dd57..27d2dbab9f18 100644
--- a/www/twiki-NewUserPlugin/Makefile
+++ b/www/twiki-NewUserPlugin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= NewUserPlugin
SVNREV= 17515
MASTER_SITES= http://protey.ru/freebsd/distfiles/ \
- ${MASTER_SITE_LOCAL:S!$!skv/!}
+ LOCAL/skv
COMMENT= Create user's topic for externally authenticated users
diff --git a/www/uwsgitop/Makefile b/www/uwsgitop/Makefile
index 96ceee83961e..f382792ea702 100644
--- a/www/uwsgitop/Makefile
+++ b/www/uwsgitop/Makefile
@@ -4,8 +4,7 @@
PORTNAME= uwsgitop
PORTVERSION= 0.8
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR=source/u/${PORTNAME}
+MASTER_SITES= CHEESESHOP
MAINTAINER= demon@FreeBSD.org
COMMENT= uWSGI top-like app
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index eeea1961dc1f..d123c602c9bf 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -4,8 +4,7 @@
PORTNAME= webcopy
PORTVERSION= 0.98b7
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
+MASTER_SITES= LOCAL/cy
MAINTAINER= cy@FreeBSD.org
COMMENT= Web Mirroring Program
diff --git a/www/webcrawl/Makefile b/www/webcrawl/Makefile
index 2c6b08af1e80..5361b5e07dd8 100644
--- a/www/webcrawl/Makefile
+++ b/www/webcrawl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= webcrawl
PORTVERSION= 1.10
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/www/mirroring
+MASTER_SITES= SUNSITE/apps/www/mirroring
MAINTAINER= demon@FreeBSD.org
COMMENT= Download web sites without user interaction by following links
diff --git a/www/websh/Makefile b/www/websh/Makefile
index 1d9cebd3813d..36f4b2b7fc72 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -5,8 +5,7 @@ PORTNAME= websh
PORTVERSION= 3.6.0b5
PORTREVISION= 4
CATEGORIES= www tcl
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=tcl/${PORTNAME}/source
+MASTER_SITES= APACHE/tcl/${PORTNAME}/source
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= mi@aldan.algebra.com
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 2c7934122062..6a2283be973e 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.0.12
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= www lang
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=thewml
+MASTER_SITES= SF/thewml
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Website META Language, webdesign toolkit for HTML generation
diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi
index 623391664664..ef813068251e 100644
--- a/www/xpi-adblock/Makefile.xpi
+++ b/www/xpi-adblock/Makefile.xpi
@@ -61,11 +61,11 @@
MASTER_SITE_MOZILLA_ADDONS= http://addons.cdn.mozilla.net/user-media/%SUBDIR%/
.ifndef MASTER_SITES
-MASTER_SITES?= MOZILLA_ADDONS
.ifdef XPI_NUM
-MASTER_SITE_SUBDIR?= addons/${XPI_NUM}
+MASTER_SITES?= MOZILLA_ADDONS/addons/${XPI_NUM}
+.else
+MASTER_SITES?= MOZILLA_ADDONS/extensions/${XPI_DISTNAME}
.endif
-MASTER_SITE_SUBDIR?= extensions/${XPI_DISTNAME}
.endif
PKGNAMEPREFIX?= xpi-
EXTRACT_SUFX?= .xpi
diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile
index a988f6d86416..6193adde17c7 100644
--- a/www/xpi-conkeror/Makefile
+++ b/www/xpi-conkeror/Makefile
@@ -4,9 +4,8 @@
PORTNAME= conkeror
PORTVERSION= 20140911
CATEGORIES= www
-MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ashish
+MASTER_SITES= http://distfiles.pirateparty.in/ashish/ \
+ LOCAL/ashish
MAINTAINER= ashish@FreeBSD.org
COMMENT= Keyboard-oriented, customizable web browser based on Mozilla XULRunner
diff --git a/www/xpi-delicious/Makefile b/www/xpi-delicious/Makefile
index 1563ad241217..19dd4f67289f 100644
--- a/www/xpi-delicious/Makefile
+++ b/www/xpi-delicious/Makefile
@@ -4,8 +4,7 @@
PORTNAME= delicious
PORTVERSION= 1.3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_MOZDEV}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= MOZDEV/${PORTNAME}
MAINTAINER= lapo@lapo.it
COMMENT= Extension to ease the use of del.icio.us remote bookmarks
diff --git a/www/xpi-downthemall/Makefile b/www/xpi-downthemall/Makefile
index b7fe754c08b1..d8ec8890f90a 100644
--- a/www/xpi-downthemall/Makefile
+++ b/www/xpi-downthemall/Makefile
@@ -5,8 +5,7 @@ PORTNAME= downthemall
PORTVERSION= 2.0.17
DISTVERSIONSUFFIX= -fx+sm
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= addons/201
+MASTER_SITES= MOZILLA_EXTENDED/addons/201
MAINTAINER= gecko@FreeBSD.org
COMMENT= Lets you download all the links in a webpage and much more
diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile
index 4bc7697bc463..1e412d423bd2 100644
--- a/x11-clocks/alltraxclock/Makefile
+++ b/x11-clocks/alltraxclock/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.0.2
PORTREVISION= 11
CATEGORIES= x11-clocks
MASTER_SITES= http://perso.wanadoo.fr/alltrax/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= novel
+ LOCAL/novel
DISTNAME= ${PORTNAME}2_0.2-1
MAINTAINER= novel@FreeBSD.org
diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 8cb7aaf74de1..697988d8d260 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -4,8 +4,7 @@ PORTNAME= asclock-xlib
PORTVERSION= 2.0.11
PORTREVISION= 4
CATEGORIES= x11-clocks afterstep windowmaker
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= New flavor of asclock
diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile
index 44bc9b6cb307..cbf7d367b92d 100644
--- a/x11-clocks/asclock/Makefile
+++ b/x11-clocks/asclock/Makefile
@@ -5,8 +5,7 @@ PORTNAME= asclock
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= x11-clocks afterstep
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= XCONTRIB/applications
DISTNAME= ${PORTNAME}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile
index b5f7b624629d..e759aebf0004 100644
--- a/x11-clocks/bclock/Makefile
+++ b/x11-clocks/bclock/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bclock
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= x11-clocks
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/clocks
+MASTER_SITES= SUNSITE/X11/clocks
MAINTAINER= ports@FreeBSD.org
COMMENT= Round, analog X11 clock with Bezier curve hands
diff --git a/x11-clocks/mouseclock/Makefile b/x11-clocks/mouseclock/Makefile
index c11588ea3d56..e9da221b6f6a 100644
--- a/x11-clocks/mouseclock/Makefile
+++ b/x11-clocks/mouseclock/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mouseclock
PORTVERSION= 1.0
PORTREVISION= 5
CATEGORIES= x11-clocks
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/clocks
+MASTER_SITES= SUNSITE/X11/clocks
MAINTAINER= ports@FreeBSD.org
COMMENT= Display the current time using the X root cursor
diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile
index 2759146d49cf..63675a9b52b0 100644
--- a/x11-clocks/osdclock/Makefile
+++ b/x11-clocks/osdclock/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.5
PORTREVISION= 10
CATEGORIES= x11-clocks
MASTER_SITES= http://leftorium.net/software/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= novel
+ LOCAL/novel
DISTNAME= osd_clock-${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile
index 26db48220358..879dbc127404 100644
--- a/x11-clocks/pclock/Makefile
+++ b/x11-clocks/pclock/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pclock
PORTVERSION= 0.13.1
PORTREVISION= 4
CATEGORIES= x11-clocks windowmaker afterstep
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-clocks/swisswatch/Makefile b/x11-clocks/swisswatch/Makefile
index d87e2bf0ca6d..0251f5155962 100644
--- a/x11-clocks/swisswatch/Makefile
+++ b/x11-clocks/swisswatch/Makefile
@@ -5,7 +5,7 @@ PORTNAME= swisswatch
PORTVERSION= 0.06
PORTREVISION= 2
CATEGORIES= x11-clocks
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
MAINTAINER= sanpei@FreeBSD.org
COMMENT= Swiss railway clock emulation, and a fancy default appearance
diff --git a/x11-clocks/wmblueclock/Makefile b/x11-clocks/wmblueclock/Makefile
index 2f4fb279f183..d5ad9bdd96f7 100644
--- a/x11-clocks/wmblueclock/Makefile
+++ b/x11-clocks/wmblueclock/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wmblueclock
PORTVERSION= 0.0
PORTREVISION= 3
CATEGORIES= x11-clocks windowmaker
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/xutils
+MASTER_SITES= SUNSITE/X11/xutils
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple dockable clock application
diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile
index 33407e8bc752..7aa2d1beb586 100644
--- a/x11-clocks/wmtimer/Makefile
+++ b/x11-clocks/wmtimer/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.92
PORTREVISION= 10
CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://www.darkops.net/wmtimer/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= uqs@FreeBSD.org
COMMENT= Multi-Function timer dockapp for WindowMaker
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index f04486e11d6c..fe3684ea0db3 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -5,7 +5,6 @@ PORTNAME= xdaliclock
PORTVERSION= 2.43
CATEGORIES= x11-clocks
MASTER_SITES= http://www.jwz.org/xdaliclock/
-MASTER_SITE_SUBDIR= applications
MAINTAINER= wxs@FreeBSD.org
COMMENT= Rather neat animated clock
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index 51c9a1cb2059..40ca85aafb60 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -5,8 +5,7 @@ PORTNAME= asfiles
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= x11-fm afterstep windowmaker
-MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR= apps/ASFiles
+MASTER_SITES= AFTERSTEP/apps/ASFiles
DISTNAME= ASFiles-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 5668956d25fd..4477dbd41e14 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -4,7 +4,7 @@
PORTNAME= doublecmd
PORTVERSION= 0.6.1
CATEGORIES= x11-fm
-MASTER_SITES= SOURCEFORGE/${PORTNAME}/Double%20Commander%20Source
+MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
DISTFILES= ${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz
diff --git a/x11-fonts/charis-compact/Makefile b/x11-fonts/charis-compact/Makefile
index 399bd2515328..7a324044309b 100644
--- a/x11-fonts/charis-compact/Makefile
+++ b/x11-fonts/charis-compact/Makefile
@@ -11,7 +11,6 @@ MASTER_SITES= http://scripts.sil.org/ttw/fonts2go.cgi?family=CharisSIL&pkg=Compa
.else
MASTER_SITES= LOCAL/bf
.endif
-MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
MAINTAINER= bf@FreeBSD.org
COMMENT= Charis SIL TrueType font collection, compact variant
diff --git a/x11-fonts/charis/Makefile b/x11-fonts/charis/Makefile
index 489cd7ba0717..dc62f08f571e 100644
--- a/x11-fonts/charis/Makefile
+++ b/x11-fonts/charis/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
LOCAL/bf
-MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
MAINTAINER= bf@FreeBSD.org
COMMENT= Charis SIL TrueType font collection
diff --git a/x11-fonts/doulos-compact/Makefile b/x11-fonts/doulos-compact/Makefile
index 43776052c7cf..ad556a3d2ef4 100644
--- a/x11-fonts/doulos-compact/Makefile
+++ b/x11-fonts/doulos-compact/Makefile
@@ -11,7 +11,6 @@ MASTER_SITES= http://scripts.sil.org/ttw/fonts2go.cgi?family=DoulosSIL&pkg=Compa
.else
MASTER_SITES= LOCAL/bf
.endif
-MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
MAINTAINER= bf@FreeBSD.org
COMMENT= Doulos SIL TrueType font collection, compact variant
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index 067f851a64f0..f18d0249d640 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -5,7 +5,7 @@ PORTNAME= font-manager
PORTVERSION= 0.5.7
PORTREVISION= 5
CATEGORIES= x11-fonts gnome
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= lichray@gmail.com
COMMENT= Font management application for the GNOME desktop
diff --git a/x11-fonts/gfe/Makefile b/x11-fonts/gfe/Makefile
index 006b3e693c72..7df26ac6ebec 100644
--- a/x11-fonts/gfe/Makefile
+++ b/x11-fonts/gfe/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gfe
PORTVERSION= 0.0.4
PORTREVISION= 6
CATEGORIES= x11-fonts
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/fonts
+MASTER_SITES= SUNSITE/X11/fonts
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+-based .bdf font editor for X
diff --git a/x11-fonts/gnu-unifont-ttf/Makefile b/x11-fonts/gnu-unifont-ttf/Makefile
index f67da54e3778..7ec6dfb68a5e 100644
--- a/x11-fonts/gnu-unifont-ttf/Makefile
+++ b/x11-fonts/gnu-unifont-ttf/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 7.0.03
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fonts
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=unifont/unifont-${PORTVERSION}
+MASTER_SITES= GNU/unifont/unifont-${PORTVERSION}
DISTNAME= unifont-${PORTVERSION}
MAINTAINER= bsdports@gmail.com
diff --git a/x11-fonts/gnu-unifont/Makefile b/x11-fonts/gnu-unifont/Makefile
index 54e035e03c72..26a3d007e994 100644
--- a/x11-fonts/gnu-unifont/Makefile
+++ b/x11-fonts/gnu-unifont/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 7.0.03
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fonts
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=unifont/unifont-${PORTVERSION}
+MASTER_SITES= GNU/unifont/unifont-${PORTVERSION}
DISTNAME= unifont-${PORTVERSION}.pcf
EXTRACT_SUFX= .gz
EXTRACT_ONLY=
diff --git a/x11-fonts/hanazono-fonts-ttf/Makefile b/x11-fonts/hanazono-fonts-ttf/Makefile
index 07e5f3e57d1d..d8b9e8fc9ad9 100644
--- a/x11-fonts/hanazono-fonts-ttf/Makefile
+++ b/x11-fonts/hanazono-fonts-ttf/Makefile
@@ -4,8 +4,7 @@
PORTNAME= hanazono-fonts-ttf
PORTVERSION= 20141012
CATEGORIES= x11-fonts
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= hanazono-font/62072
+MASTER_SITES= SFJP/hanazono-font/62072
DISTNAME= ${PORTNAME:C/-.*//}-${PORTVERSION}
MAINTAINER= lichray@gmail.com
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index 42b6c703d7c3..78e75f69afd7 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -5,8 +5,7 @@ PORTNAME= intlfonts
PORTVERSION= 1.2.1
PORTREVISION= 4
CATEGORIES= x11-fonts
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= intlfonts
+MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= Free X11 fonts for all characters that Emacs can handle
diff --git a/x11-fonts/liberation-fonts-ttf/Makefile b/x11-fonts/liberation-fonts-ttf/Makefile
index ce753ed313e5..0a37312fff62 100644
--- a/x11-fonts/liberation-fonts-ttf/Makefile
+++ b/x11-fonts/liberation-fonts-ttf/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.00.1
PORTEPOCH= 2
CATEGORIES= x11-fonts
MASTER_SITES= https://fedorahosted.org/releases/l/i/liberation-fonts/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= thierry
+ LOCAL/thierry
MAINTAINER= thierry@FreeBSD.org
COMMENT= Liberation fonts from Red Hat to replace MS TTF fonts
diff --git a/x11-fonts/mkbold/Makefile b/x11-fonts/mkbold/Makefile
index 24acd46320b3..027a40f9ef3c 100644
--- a/x11-fonts/mkbold/Makefile
+++ b/x11-fonts/mkbold/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mkbold
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= x11-fonts
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
EXTRACT_SUFX= .bz2
MAINTAINER= koma2@lovepeers.org
diff --git a/x11-fonts/mkitalic/Makefile b/x11-fonts/mkitalic/Makefile
index c8e132c8d7ab..35d9ffd40bb1 100644
--- a/x11-fonts/mkitalic/Makefile
+++ b/x11-fonts/mkitalic/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mkitalic
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= x11-fonts
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
EXTRACT_SUFX= .bz2
MAINTAINER= koma2@lovepeers.org
diff --git a/x11-fonts/nexfontsel/Makefile b/x11-fonts/nexfontsel/Makefile
index b502f5be25fc..35f7ad85fcde 100644
--- a/x11-fonts/nexfontsel/Makefile
+++ b/x11-fonts/nexfontsel/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 3.0.1
PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= pav
+ LOCAL/pav
DISTNAME= NeXFontSel-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index f86425b4e589..bb1271384c39 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -5,8 +5,7 @@ PORTNAME= type1inst
PORTVERSION= 0.6.1
PORTREVISION= 5
CATEGORIES= x11-fonts perl5
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=X11/xutils
+MASTER_SITES= SUNSITE/X11/xutils
PKGNAMEPREFIX= p5-
MAINTAINER= hrs@FreeBSD.org
diff --git a/x11-fonts/paratype/Makefile b/x11-fonts/paratype/Makefile
index 8e1d6026d9bf..0fb073a1d657 100644
--- a/x11-fonts/paratype/Makefile
+++ b/x11-fonts/paratype/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.004
PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= http://paratype.0xdc.ru/
-MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
DISTFILES= PTSansOFL-2.004.zip PTSerifOFL-1.000.zip PTMonoOFL-1.002_1.zip
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index af5da795e342..bf2e521b419c 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -5,7 +5,7 @@ PORTNAME= terminus-font
PORTVERSION= 4.39
PORTREVISION= 1
CATEGORIES= x11-fonts
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}|}
+MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}
MAINTAINER= zeising@FreeBSD.org
COMMENT= Terminus Font - a clean fixed width font
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index b1ce5b00749e..a5467775d77e 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tkfont
PORTVERSION= 1.1
PORTREVISION= 3
CATEGORIES= x11-fonts tcl tk
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= petef
+MASTER_SITES= LOCAL/petef
MAINTAINER= ports@FreeBSD.org
COMMENT= Tk based replacement for xfontsel
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 05d1134acd68..ae0ebf651cd4 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.14.7
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-servers
-MASTER_SITES= XORG
-MASTER_SITE_SUBDIR= individual/xserver
+MASTER_SITES= XORG/individual/xserver
DISTNAME= xorg-server-${PORTVERSION}
DIST_SUBDIR= xorg/xserver
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index b4c539150142..7179cf2a6bfd 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.14.7
PORTREVISION?= 4
PORTEPOCH?= 1
CATEGORIES= x11-servers
-MASTER_SITES= XORG
-MASTER_SITE_SUBDIR= individual/xserver
+MASTER_SITES= XORG/individual/xserver
DISTNAME= xorg-server-${PORTVERSION}
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 54134a5740bf..b7cb9178b68e 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.14.7
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-servers
-MASTER_SITES= XORG
-MASTER_SITE_SUBDIR= individual/xserver
+MASTER_SITES= XORG/individual/xserver
DISTNAME= xorg-server-${PORTVERSION}
DIST_SUBDIR= xorg/xserver
diff --git a/x11-themes/beastie/Makefile b/x11-themes/beastie/Makefile
index ff8d26fa2300..c8ef14100f9d 100644
--- a/x11-themes/beastie/Makefile
+++ b/x11-themes/beastie/Makefile
@@ -6,9 +6,8 @@ PORTNAME= beastie
PORTVERSION= 06.05.03
PORTREVISION= 5
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/ahze \
http://people.freebsd.org/~ahze/distfiles/
-MASTER_SITE_SUBDIR= ahze
DISTNAME= Beastie-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/clearlooks-metacity/Makefile b/x11-themes/clearlooks-metacity/Makefile
index e9a1ad0fe67e..fe20f7a32447 100644
--- a/x11-themes/clearlooks-metacity/Makefile
+++ b/x11-themes/clearlooks-metacity/Makefile
@@ -7,8 +7,7 @@ PORTVERSION= 2.0
PORTREVISION= 7
CATEGORIES= x11-themes
MASTER_SITES= http://www.stellingwerff.com/
-#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITE_SUBDIR= clearlooks
+#MASTER_SITES= SOURCEFORGE/clearlooks
MAINTAINER= ports@FreeBSD.org
COMMENT= Clearlooks Metacity theme
diff --git a/x11-themes/gnome-icons-aqua-fusion/Makefile b/x11-themes/gnome-icons-aqua-fusion/Makefile
index 7bc002c550c0..fb1974fbd67d 100644
--- a/x11-themes/gnome-icons-aqua-fusion/Makefile
+++ b/x11-themes/gnome-icons-aqua-fusion/Makefile
@@ -9,8 +9,7 @@ PORTNAME= aqua-fusion
PORTVERSION= 20030216
PORTREVISION= 3
CATEGORIES= x11-themes gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= teams/art.gnome.org/archive/themes/icon
+MASTER_SITES= GNOME/teams/art.gnome.org/archive/themes/icon
DISTNAME= ICON-AquaFusion
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-faenza/Makefile b/x11-themes/gnome-icons-faenza/Makefile
index f116cf92751d..208be38a3295 100644
--- a/x11-themes/gnome-icons-faenza/Makefile
+++ b/x11-themes/gnome-icons-faenza/Makefile
@@ -4,7 +4,7 @@
PORTNAME= faenza
PORTVERSION= 1.3
CATEGORIES= x11-themes gnome
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PROJECTHOST= ${PORTNAME}-icon-theme
PKGNAMEPREFIX= gnome-icons-
DISTNAME= ${PROJECTHOST}_${PORTVERSION}
diff --git a/x11-themes/gnome-icons-gentoo-test/Makefile b/x11-themes/gnome-icons-gentoo-test/Makefile
index c73537fd6e90..6438628ee00d 100644
--- a/x11-themes/gnome-icons-gentoo-test/Makefile
+++ b/x11-themes/gnome-icons-gentoo-test/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gentoo-test
PORTVERSION= 0.1
PORTREVISION= 3
CATEGORIES= x11-themes gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= teams/art.gnome.org/archive/themes/icon
+MASTER_SITES= GNOME/teams/art.gnome.org/archive/themes/icon
DISTNAME= ICON-Gentoo-Test
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-iris/Makefile b/x11-themes/gnome-icons-iris/Makefile
index e017fb0f1a76..8b2834d13431 100644
--- a/x11-themes/gnome-icons-iris/Makefile
+++ b/x11-themes/gnome-icons-iris/Makefile
@@ -9,8 +9,7 @@ PORTNAME= iris
PORTVERSION= 20050420
PORTREVISION= 1
CATEGORIES= x11-themes gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= teams/art.gnome.org/themes/icon
+MASTER_SITES= GNOME/teams/art.gnome.org/themes/icon
DISTNAME= ICON-Iris
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-noia-warm/Makefile b/x11-themes/gnome-icons-noia-warm/Makefile
index 9d2aafc460fa..ab8d53c93c07 100644
--- a/x11-themes/gnome-icons-noia-warm/Makefile
+++ b/x11-themes/gnome-icons-noia-warm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= noia-warm
PORTVERSION= 20041102
PORTREVISION= 2
CATEGORIES= x11-themes gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= teams/art.gnome.org/archive/themes/icon
+MASTER_SITES= GNOME/teams/art.gnome.org/archive/themes/icon
DISTNAME= ICON-NoiaWarm
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-refined/Makefile b/x11-themes/gnome-icons-refined/Makefile
index 16b391fc06e7..100a4809967e 100644
--- a/x11-themes/gnome-icons-refined/Makefile
+++ b/x11-themes/gnome-icons-refined/Makefile
@@ -9,8 +9,7 @@ PORTNAME= refined
PORTVERSION= 20030203
PORTREVISION= 3
CATEGORIES= x11-themes gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= teams/art.gnome.org/archive/themes/icon
+MASTER_SITES= GNOME/teams/art.gnome.org/archive/themes/icon
DISTNAME= ICON-Gnome-RH8
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-slick/Makefile b/x11-themes/gnome-icons-slick/Makefile
index 108ea9fa6fa0..7a5778630bf7 100644
--- a/x11-themes/gnome-icons-slick/Makefile
+++ b/x11-themes/gnome-icons-slick/Makefile
@@ -9,8 +9,7 @@ PORTNAME= slick
PORTVERSION= 20030209
PORTREVISION= 3
CATEGORIES= x11-themes gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= teams/art.gnome.org/archive/themes/icon
+MASTER_SITES= GNOME/teams/art.gnome.org/archive/themes/icon
DISTNAME= ICON-Slick
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-snow-apple/Makefile b/x11-themes/gnome-icons-snow-apple/Makefile
index 2f82df3b44d2..120a3ed0fadc 100644
--- a/x11-themes/gnome-icons-snow-apple/Makefile
+++ b/x11-themes/gnome-icons-snow-apple/Makefile
@@ -9,8 +9,7 @@ PORTNAME= snow-apple
PORTVERSION= 20030202
PORTREVISION= 3
CATEGORIES= x11-themes gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= teams/art.gnome.org/archive/themes/icon
+MASTER_SITES= GNOME/teams/art.gnome.org/archive/themes/icon
DISTNAME= ICON-Snow-Apple
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-stylish/Makefile b/x11-themes/gnome-icons-stylish/Makefile
index 9bdf712fc357..b820c540d2a6 100644
--- a/x11-themes/gnome-icons-stylish/Makefile
+++ b/x11-themes/gnome-icons-stylish/Makefile
@@ -9,8 +9,7 @@ PORTNAME= stylish
PORTVERSION= 20030129
PORTREVISION= 2
CATEGORIES= x11-themes gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= teams/art.gnome.org/archive/themes/icon
+MASTER_SITES= GNOME/teams/art.gnome.org/archive/themes/icon
DISTNAME= ICON-Stylish
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-ximian-south/Makefile b/x11-themes/gnome-icons-ximian-south/Makefile
index 1b711fd8b447..ea0a4ac7df0c 100644
--- a/x11-themes/gnome-icons-ximian-south/Makefile
+++ b/x11-themes/gnome-icons-ximian-south/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ximian-south
PORTVERSION= 1.3.6
PORTREVISION= 3
CATEGORIES= x11-themes gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= teams/art.gnome.org/archive/themes/icon
+MASTER_SITES= GNOME/teams/art.gnome.org/archive/themes/icon
DISTNAME= ICON-Ximian-South-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/gtk-aqualightblue-theme/Makefile b/x11-themes/gtk-aqualightblue-theme/Makefile
index db0b66845694..fcc464d6b1f7 100644
--- a/x11-themes/gtk-aqualightblue-theme/Makefile
+++ b/x11-themes/gtk-aqualightblue-theme/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gtk-aqualightblue-theme
PORTVERSION= 0.1
PORTREVISION= 11
CATEGORIES= x11-themes gnome
-MASTER_SITES= ${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR= aqualightblue-gtk2
+MASTER_SITES= THEMES/aqualightblue-gtk2
DISTNAME= aqualightblue-gtk2-default
MAINTAINER= philip@FreeBSD.org
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 8485c27b8367..50ee9c976920 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gtk-engines2
PORTVERSION= 2.20.2
PORTREVISION= 2
CATEGORIES= x11-themes
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index e30a0af763ab..7af53481b8f5 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gtk-flat-theme2
PORTVERSION= 0.1
PORTREVISION= 14
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR= gtk2flat
+MASTER_SITES= THEMES/gtk2flat
DISTNAME= gtk2flat-default
MAINTAINER= philip@FreeBSD.org
diff --git a/x11-themes/gtk-murrina-aqua/Makefile b/x11-themes/gtk-murrina-aqua/Makefile
index ba2e01a66d93..e722a093641f 100644
--- a/x11-themes/gtk-murrina-aqua/Makefile
+++ b/x11-themes/gtk-murrina-aqua/Makefile
@@ -5,9 +5,8 @@ PORTNAME= gtk-murrina-aqua
PORTVERSION= 0.1
PORTREVISION= 6
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/itetcu \
http://www5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-stable/source/gnome-extra/gtk+2-engines-murrine/
-MASTER_SITE_SUBDIR= itetcu
DISTNAME= Murrina-Aqua
MAINTAINER= pneumann@gmail.com
diff --git a/x11-themes/gtk-oxygen-engine/Makefile b/x11-themes/gtk-oxygen-engine/Makefile
index c814c43444eb..b965af20f11e 100644
--- a/x11-themes/gtk-oxygen-engine/Makefile
+++ b/x11-themes/gtk-oxygen-engine/Makefile
@@ -3,8 +3,7 @@
PORTNAME= oxygen
PORTVERSION= 1.4.6
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}-gtk2/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}-gtk2/${PORTVERSION}/src
PKGNAMEPREFIX= gtk-
PKGNAMESUFFIX= -engine
DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION}
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index bcb7d90a9490..a4aba9504295 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -5,7 +5,7 @@ PORTNAME= gtk-qt-engine
PORTVERSION= 1.1
PORTREVISION= 12
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= makc@FreeBSD.org
COMMENT= GTK+ 2.x theme engine allowing to use Qt/KDE styles
diff --git a/x11-themes/gtk3-oxygen-engine/Makefile b/x11-themes/gtk3-oxygen-engine/Makefile
index 771c46c723fd..90106036d314 100644
--- a/x11-themes/gtk3-oxygen-engine/Makefile
+++ b/x11-themes/gtk3-oxygen-engine/Makefile
@@ -3,8 +3,7 @@
PORTNAME= oxygen
PORTVERSION= 1.4.1
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}-gtk3/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}-gtk3/${PORTVERSION}/src
PKGNAMEPREFIX= gtk3-
PKGNAMESUFFIX= -engine
DISTNAME= ${PORTNAME}-gtk3-${PORTVERSION}
diff --git a/x11-themes/icon-naming-utils/Makefile b/x11-themes/icon-naming-utils/Makefile
index e63a181b4d78..a2de15874ada 100644
--- a/x11-themes/icon-naming-utils/Makefile
+++ b/x11-themes/icon-naming-utils/Makefile
@@ -5,7 +5,7 @@ PORTNAME= icon-naming-utils
PORTVERSION= 0.8.90
PORTREVISION= 1
CATEGORIES= x11-themes
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Utilities of the Tango project
diff --git a/x11-themes/icons-tango-extras/Makefile b/x11-themes/icons-tango-extras/Makefile
index 2b7d793c27f4..f88069a06b21 100644
--- a/x11-themes/icons-tango-extras/Makefile
+++ b/x11-themes/icons-tango-extras/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.1.0
PORTREVISION= 5
CATEGORIES= x11-themes
MASTER_SITES= http://tango.freedesktop.org/releases/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
DISTNAME= tango-icon-theme-extras-${PORTVERSION}
MAINTAINER= flz@FreeBSD.org
diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile
index eaedc342731d..70939193c473 100644
--- a/x11-themes/icons-tango/Makefile
+++ b/x11-themes/icons-tango/Makefile
@@ -5,7 +5,7 @@ PORTNAME= icons-tango
PORTVERSION= 0.8.90
PORTREVISION= 2
CATEGORIES= x11-themes
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
DISTNAME= tango-icon-theme-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-themes/irssi-themes/Makefile b/x11-themes/irssi-themes/Makefile
index 14cbaea0ccd8..c598035fcc94 100644
--- a/x11-themes/irssi-themes/Makefile
+++ b/x11-themes/irssi-themes/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 20101013
CATEGORIES= x11-themes irc
MASTER_SITES= http://www.irssi.org/themefiles/ \
LOCAL/ehaupt/${PORTNAME}
-MASTER_SITE_SUBDIR= ${PORTNAME}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/x11-themes/kde-gtk-config/Makefile b/x11-themes/kde-gtk-config/Makefile
index 17172371a516..55a83bcc0859 100644
--- a/x11-themes/kde-gtk-config/Makefile
+++ b/x11-themes/kde-gtk-config/Makefile
@@ -4,8 +4,7 @@ PORTNAME= kde-gtk-config
PORTVERSION= 2.2.1
PORTREVISION= 3
CATEGORIES= x11-themes kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= GTK2 and GTK3 Configurator for KDE
diff --git a/x11-themes/kde-icons-gartoon-blue-svg/Makefile b/x11-themes/kde-icons-gartoon-blue-svg/Makefile
index 8f9661e53a3e..bf310f469851 100644
--- a/x11-themes/kde-icons-gartoon-blue-svg/Makefile
+++ b/x11-themes/kde-icons-gartoon-blue-svg/Makefile
@@ -3,9 +3,8 @@
PORTNAME= gartoon
PORTVERSION= 1.3
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/fluffy \
http://ns.ael.ru/ports/distfiles/KDE/
-MASTER_SITE_SUBDIR= fluffy
PKGNAMESUFFIX= -blue-svg
DISTNAME= ICONS-Gartoon.Blue-SVG-v${PORTVERSION}
diff --git a/x11-themes/kde-icons-gartoon-svg/Makefile b/x11-themes/kde-icons-gartoon-svg/Makefile
index b5caead12231..0599fb6a9d45 100644
--- a/x11-themes/kde-icons-gartoon-svg/Makefile
+++ b/x11-themes/kde-icons-gartoon-svg/Makefile
@@ -3,9 +3,8 @@
PORTNAME= gartoon
PORTVERSION= 1.3
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/fluffy \
http://ns.ael.ru/ports/distfiles/KDE/
-MASTER_SITE_SUBDIR= fluffy
PKGNAMESUFFIX= -svg
DISTNAME= ICONS-Gartoon-SVG-v${PORTVERSION}
diff --git a/x11-themes/kde-icons-kool-gorilla/Makefile b/x11-themes/kde-icons-kool-gorilla/Makefile
index 06364a989629..4a231441abf2 100644
--- a/x11-themes/kde-icons-kool-gorilla/Makefile
+++ b/x11-themes/kde-icons-kool-gorilla/Makefile
@@ -3,8 +3,7 @@
PORTNAME= kool-gorilla
PORTVERSION= 1.3.5
-MASTER_SITES= ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+MASTER_SITES= GENTOO
DISTNAME= Korilla_Icons-v${PORTVERSION}
diff --git a/x11-themes/kde-icons-noia/Makefile b/x11-themes/kde-icons-noia/Makefile
index e20e44ee0cb7..c7d3993c5a3f 100644
--- a/x11-themes/kde-icons-noia/Makefile
+++ b/x11-themes/kde-icons-noia/Makefile
@@ -3,13 +3,12 @@
PORTNAME= noia
PORTVERSION= 1.00
-MASTER_SITES= ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+MASTER_SITES= GENTOO
DISTNAME= noia-kde-icons-${PORTVERSION}
-EXTRACT_SUFX= .tgz
COMMENT= KDE Noia complete iconset
+USES= tar:tgz
WRKSRC= "${WRKDIR}/noia_kde_${PORTVERSION:C/\.//}"
PORT_SHAREDIR= ${PORTNAME}
diff --git a/x11-themes/kde-icons-nuvola/Makefile b/x11-themes/kde-icons-nuvola/Makefile
index a89a49371274..c23ced0b0cfb 100644
--- a/x11-themes/kde-icons-nuvola/Makefile
+++ b/x11-themes/kde-icons-nuvola/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nuvola
PORTVERSION= 1.0
PORTREVISION= 1
MASTER_SITES= http://www.icon-king.com/files/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
COMMENT= KDE Nuvola iconset, SVG evolution of SKY
diff --git a/x11-themes/metacity-themes/Makefile.metacity b/x11-themes/metacity-themes/Makefile.metacity
index 7d8bafbff8c3..cfb8cabcf5b3 100644
--- a/x11-themes/metacity-themes/Makefile.metacity
+++ b/x11-themes/metacity-themes/Makefile.metacity
@@ -1,6 +1,5 @@
PKGNAMEPREFIX= metacity-theme-
-MASTER_SITES?= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR?= teams/art.gnome.org/themes/metacity
+MASTER_SITES?= GNOME/teams/art.gnome.org/themes/metacity
DIST_SUBDIR= gnome2
NO_BUILD= yes
diff --git a/x11-themes/openbox-themes/Makefile b/x11-themes/openbox-themes/Makefile
index a994feed68b4..45b635106f20 100644
--- a/x11-themes/openbox-themes/Makefile
+++ b/x11-themes/openbox-themes/Makefile
@@ -5,8 +5,7 @@ PORTNAME= openbox-themes
PORTVERSION= 1.0.1
PORTREVISION= 5
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= novel
+MASTER_SITES= LOCAL/novel
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
diff --git a/x11-toolkits/attica/Makefile b/x11-toolkits/attica/Makefile
index e27e642056aa..3552d43040c7 100644
--- a/x11-toolkits/attica/Makefile
+++ b/x11-toolkits/attica/Makefile
@@ -5,8 +5,7 @@ PORTNAME= attica
PORTVERSION= 0.4.2
PORTEPOCH= 2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}
+MASTER_SITES= KDE/stable/${PORTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Open Collaboration Services API library
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index c3120b3657ae..082e2e538876 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gal2
PORTVERSION= 2.5.3
PORTREVISION?= 12
CATEGORIES= x11-toolkits gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5
+MASTER_SITES= GNOME/sources/${PORTNAME:S/2$//}/2.5
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 75fba785f0dd..22dea441bfd7 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnustep-gui
PORTVERSION= 0.24.0
PORTREVISION= 5
CATEGORIES= x11-toolkits gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= core
+MASTER_SITES= GNUSTEP/core
MAINTAINER= theraven@FreeBSD.org
COMMENT= GNUstep GUI library
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 4600fcd62c49..b8f7c9d47107 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gtk
PORTVERSION= 1.2.10
PORTREVISION= 24
CATEGORIES= x11-toolkits
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/gtk+/1.2
+MASTER_SITES= GNOME/sources/gtk+/1.2
PKGNAMESUFFIX= 12
DISTNAME= gtk+-${PORTVERSION}
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index f3b79eb4b3f8..2481979e7371 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gtk
PORTVERSION= 2.24.27
PORTREVISION?= 0
CATEGORIES= x11-toolkits
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX= 2
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index a4f7e6b6109a..0aa9bb6ef12b 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -7,8 +7,7 @@ PORTNAME= gtk
PORTVERSION= 3.14.12
PORTREVISION?= 0
CATEGORIES= x11-toolkits
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX= 3
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome3
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index be4a8cc9b9b0..e6e30968353d 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gtksourceview2
PORTVERSION= 2.10.5
PORTREVISION?= 4
CATEGORIES= x11-toolkits gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index a5fc2adb164f..24b1a172ccb5 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -5,8 +5,7 @@ PORTNAME= qt47-x11
PORTVERSION= 4.7.2
PORTREVISION= 1
CATEGORIES= x11-toolkits linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= xmj
+MASTER_SITES= LOCAL/xmj
DIST_SUBDIR= rpm/${LINUX_RPM_ARCH}/centos/c5
MAINTAINER= emulation@FreeBSD.org
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index e51af8243a07..30f2c1391eec 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -5,9 +5,7 @@ PORTNAME= pango
PORTVERSION= 1.28.3
PORTREVISION= 1
CATEGORIES= x11-toolkits linux
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
-MASTER_SITE_SRC_SUBDIR= netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
+MASTER_SITES= LOCAL/netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Pango library (Linux Fedora 10)
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index c041488180e8..a9b4b3f4a306 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gnome
PORTVERSION= 2.28.1
PORTREVISION= 5
CATEGORIES= x11-toolkits python gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= gnome-python-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 2e996e1513ab..bb30340065bd 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gtk
PORTVERSION= 2.24.0
PORTREVISION= 3
CATEGORIES= x11-toolkits python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 2
DISTNAME= pygtk-${PORTVERSION}
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 68fbba88a8c6..d3873bc658f7 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gtksourceview
PORTVERSION= 2.10.1
PORTREVISION= 1
CATEGORIES= x11-toolkits gnome python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygtksourceview-${PORTVERSION}
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index d62ffe0d91d1..63e87251de59 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tkinter
PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 5
CATEGORIES= x11-toolkits python
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index e59780925d7c..87f277b87282 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
http://komquats.com/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
+ LOCAL/cy
DISTNAME= SlingShot${PORTVERSION}
diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index 2a4a7a4cc54a..f354a0a36aec 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -6,8 +6,7 @@ DISTVERSION= 3.7.1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits devel java
-MASTER_SITES= ECLIPSE
-MASTER_SITE_SUBDIR= R-${DISTVERSION}-201109091335
+MASTER_SITES= ECLIPSE/R-${DISTVERSION}-201109091335
PKGNAMESUFFIX= -devel
DISTNAME= swt-${DISTVERSION}-${DIST_EXT}
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 0f7e28fa9e97..67cde4f8c15f 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -5,9 +5,8 @@ PORTNAME= swt
DISTVERSION= 3.5.2
PORTREVISION= 3
CATEGORIES= x11-toolkits devel java
-#MASTER_SITES= ${MASTER_SITE_ECLIPSE}
-MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops/${MASTER_SITE_SUBDIR}/
-MASTER_SITE_SUBDIR= R-${DISTVERSION}-201002111343
+#MASTER_SITES= ECLIPSE/R-${DISTVERSION}-201002111343
+MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops/R-${DISTVERSION}-201002111343/
DISTNAME= swt-${DISTVERSION}-${DIST_EXT}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index b4d162e36421..0cff9f305399 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -4,9 +4,7 @@ PORTNAME= tk
PORTVERSION= 8.4.20
PORTEPOCH= 2
CATEGORIES= x11-toolkits tk
-MASTER_SITES= ${MASTER_SITE_TCLTK} \
- SF/tcl/Tcl/${PORTVERSION}
-MASTER_SITE_SUBDIR=tcl8_4
+MASTER_SITES= TCLTK/tcl8_4 SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index e84bdd3fe772..279fbf55d7e6 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -4,9 +4,7 @@
PORTNAME= tk
PORTVERSION= 8.5.18
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_TCLTK} \
- SF/tcl/Tcl/${PORTVERSION}
-MASTER_SITE_SUBDIR=tcl8_5
+MASTER_SITES= TCLTK/tcl8_5 SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index ffb2fdba40a4..7d420ca2e864 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -4,9 +4,7 @@
PORTNAME= tk
PORTVERSION= 8.6.4
CATEGORIES= x11-toolkits
-MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \
- ${MASTER_SITE_TCLTK}
-MASTER_SITE_SUBDIR=tcl8_6
+MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} TCLTK/tcl8_6
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index 21aca0846d1c..21ee31a91eab 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -4,7 +4,7 @@
PORTNAME= tktray
PORTVERSION= 1.3.9
CATEGORIES= x11-toolkits tk
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= tcltk@FreeBSD.org
diff --git a/x11-toolkits/vte290/Makefile b/x11-toolkits/vte290/Makefile
index 0de60fdbd4b4..579ebd8280e3 100644
--- a/x11-toolkits/vte290/Makefile
+++ b/x11-toolkits/vte290/Makefile
@@ -7,7 +7,6 @@ PORTVERSION= 0.34.7
PORTREVISION?= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/gnome-pty-helper/vte/}/${PORTVERSION:R}
DISTNAME= vte-${PORTVERSION}
PKGNAMESUFFIX?= 3-290
DIST_SUBDIR= gnome3
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index 56915476e076..aedda06a25fa 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -6,8 +6,7 @@ PORTNAME?= vte
PORTVERSION= 0.38.3
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/gnome-pty-helper/vte/}/${PORTVERSION:R}
+MASTER_SITES= GNOME/sources/${PORTNAME:S/gnome-pty-helper/vte/}/${PORTVERSION:R}
DISTNAME= vte-${PORTVERSION}
PKGNAMESUFFIX?= 3
DIST_SUBDIR= gnome3
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index bc35adf7a8b7..f6e239993278 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -6,8 +6,7 @@ DISTVERSION= 1.2.4
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11-toolkits graphics
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical user interface toolkit for X Window System
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index daf5b55842de..11b1a5ab60b0 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.physionet.org/physiotools/xview/src/ \
http://komquats.com/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
+ LOCAL/cy
DISTNAME= xview-3.2p1.4-19c
# EXTRACT_ONLY= # empty
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index f67fff60d11e..3c88c6f78f3a 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.physionet.org/physiotools/xview/src/ \
http://komquats.com/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
+ LOCAL/cy
DISTNAME= xview-3.2p1.4-19c
MAINTAINER= cy@FreeBSD.org
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 2ef214c69d00..aa4476b1bd15 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -5,8 +5,7 @@ PORTNAME= afterstep
PORTVERSION= 2.2.12
PORTREVISION= 4
CATEGORIES= x11-wm afterstep
-MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR= stable
+MASTER_SITES= AFTERSTEP/stable
DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= glewis@FreeBSD.org
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 522d29508325..e078f7ad2904 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -5,8 +5,7 @@ PORTNAME= afterstep
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= x11-wm afterstep
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= AfterStep-${PORTVERSION}
PKGNAMESUFFIX= 1${PKGNAMESUFFIX2}
diff --git a/x11-wm/euclid-wm/Makefile b/x11-wm/euclid-wm/Makefile
index 17115941bcf5..d974a66fdfd7 100644
--- a/x11-wm/euclid-wm/Makefile
+++ b/x11-wm/euclid-wm/Makefile
@@ -4,7 +4,7 @@ PORTNAME= euclid-wm
PORTVERSION= 0.4.3
CATEGORIES= x11-wm
#MASTER_SITES= http://euclid-wm.googlecode.com/files/
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= anastmag@gmail.com
COMMENT= Minimalist, tiling window manager for X11
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index d02eb217d6f1..169e9f38f788 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --enable-debug
.if ${PORT_OPTIONS:MDOCHTML}
# http://fluxbox.org/docbook/en/tarballs/
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:html \
+MASTER_SITES+= LOCAL/mezz:html \
http://people.freebsd.org/~mezz/distfiles/:html
DISTFILES+= fb-doc-mfhtml-${DOCSVERSION}.tgz:html
EXTRACT_ONLY+= fb-doc-mfhtml-${DOCSVERSION}.tgz
@@ -55,7 +55,7 @@ PLIST_SUB+= DOCHTML="@comment "
.if ${PORT_OPTIONS:MPDFDOCS}
# http://fluxbox.org/docbook/en/pdf/
-MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \
+MASTER_SITES+= LOCAL/mezz:pdf \
http://people.freebsd.org/~mezz/distfiles/:pdf
DISTFILES+= fluxbook-${DOCSVERSION}.pdf:pdf
PLIST_SUB+= DOCPDF=""
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index a9947005500e..d7a745817cc6 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libdockapp
PORTVERSION= 0.6.2
PORTREVISION= 4
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= xride
+MASTER_SITES= LOCAL/xride
MAINTAINER= xride@FreeBSD.org
COMMENT= Standard library for Window Maker dock apps
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index d02e1e73e914..e0b341138c2c 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -4,8 +4,7 @@ PORTNAME= libwraster
PORTVERSION= 0.95.6
PORTREVISION= 4
CATEGORIES= x11-wm windowmaker
-MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/
-MASTER_SITE_SUBDIR= source/release
+MASTER_SITES= http://windowmaker.org/pub/source/release/
DISTNAME= WindowMaker-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 5327a92f69da..5433da5ef51f 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -6,12 +6,9 @@ PORTVERSION= 4.2
PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
- ${MASTER_SITE_XCONTRIB} \
+ XCONTRIB/window_managers \
http://komquats.com/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
-
-MASTER_SITE_SUBDIR= window_managers
+ LOCAL/cy
DISTNAME= ${PORTNAME}4
PATCH_SITES= ${MASTER_SITES}
diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile
index a4c461fe487a..fbd7ff538558 100644
--- a/x11-wm/ratpoison/Makefile
+++ b/x11-wm/ratpoison/Makefile
@@ -4,9 +4,7 @@
PORTNAME= ratpoison
PORTVERSION= 1.4.6
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
- http://mirror.4bit.ws/
-MASTER_SITE_SUBDIR= ratpoison
+MASTER_SITES= SAVANNAH http://mirror.4bit.ws/
MAINTAINER= dhn@FreeBSD.org
COMMENT= Simple window manager with no fat library dependencies
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 7fda7a857fd4..7b2abbf49d55 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tvtwm
PORTVERSION= pl11
PORTREVISION= 1
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= window_managers
+MASTER_SITES= XCONTRIB/window_managers
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 6d757a0a4429..42c55596db3b 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -5,8 +5,7 @@ PORTNAME= windowmaker
PORTVERSION= 0.95.6
PORTREVISION= 4
CATEGORIES= x11-wm windowmaker
-MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/
-MASTER_SITE_SUBDIR= source/release
+MASTER_SITES= http://windowmaker.org/pub/source/release/
DISTNAME= WindowMaker-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 042a0fb66230..693f6585016d 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -5,7 +5,7 @@ PORTNAME= wmanager
PORTVERSION= 0.2.1
PORTREVISION= 13
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/9box/Makefile b/x11/9box/Makefile
index bcb8cdcac2ae..148517abda53 100644
--- a/x11/9box/Makefile
+++ b/x11/9box/Makefile
@@ -5,8 +5,7 @@ PORTNAME= 9box
PORTVERSION= 0.2.1
PORTREVISION= 3
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= thierry
+MASTER_SITES= LOCAL/thierry
MAINTAINER= ports@FreeBSD.org
COMMENT= 9box can "pack" windows inside itself
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index 134026339413..33d140fb8908 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.8
PORTREVISION= 2
CATEGORIES= x11 plan9
MASTER_SITES= ftp://freefriends.org/arnold/Source/ \
- ${MASTER_SITE_NETBSD}
+ NETBSD
EXTRACT_SUFX= .shar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/arandr/Makefile b/x11/arandr/Makefile
index 7ac2de86b170..532b7a5ce7bd 100644
--- a/x11/arandr/Makefile
+++ b/x11/arandr/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.1.7.1
PORTREVISION= 2
CATEGORIES= x11 deskutils
MASTER_SITES= http://christian.amsuess.com/tools/arandr/files/ \
- LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
+ LOCAL/sbz
MAINTAINER= sbz@FreeBSD.org
COMMENT= Another XRandR GUI
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index 0238b90f4af3..4fe52a0d089f 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -5,8 +5,7 @@ PORTNAME= blast
PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/b/blast
+MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index 3e724d3f5afb..3a2e7d89aff0 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -5,8 +5,7 @@ PORTNAME= E-Run
PORTVERSION= 1.2
PORTREVISION= 13
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kbyanc
+MASTER_SITES= LOCAL/kbyanc
MAINTAINER= enlightenment@FreeBSD.org
COMMENT= Simple epplet for launching arbitrary programs
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 1ff4a237ef81..bf8b4a57f76c 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.4.1
PORTREVISION= 6
CATEGORIES= x11
MASTER_SITES= http://fluxbox.sourceforge.net/download/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Fluxbox utility to create and manage icons on the desktop
diff --git a/x11/hotwire-shell/Makefile b/x11/hotwire-shell/Makefile
index fdad391bf976..19f599f6a609 100644
--- a/x11/hotwire-shell/Makefile
+++ b/x11/hotwire-shell/Makefile
@@ -5,7 +5,7 @@ PORTNAME= hotwire-shell
PORTVERSION= 0.721
PORTREVISION= 5
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= hotwire-${DISTVERSION}
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index 3c18b0e86fac..9cf174428839 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -5,7 +5,7 @@ PORTNAME= kb2mb2
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
MAINTAINER= ports@FreeBSD.org
COMMENT= Redirect any key to second mouse button
diff --git a/x11/keybinder-gtk3/Makefile b/x11/keybinder-gtk3/Makefile
index 40231b56f422..646e0a241579 100644
--- a/x11/keybinder-gtk3/Makefile
+++ b/x11/keybinder-gtk3/Makefile
@@ -3,7 +3,7 @@
PORTNAME= keybinder
PORTVERSION= 0.3.0
CATEGORIES= x11
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
PKGNAMESUFFIX= -gtk3
DISTNAME= ${PORTNAME}-3.0-${PORTVERSION}
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 9e8acbeca343..40e0fd362610 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -4,7 +4,7 @@ PORTNAME= keybinder
PORTVERSION= 0.3.0
PORTREVISION= 3
CATEGORIES= x11
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for registering keyboard shortcuts
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 19abcb3f1fe6..055861db1520 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://komquats.com/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
+ LOCAL/cy
MAINTAINER= cy@FreeBSD.org
COMMENT= The OpenLook props application
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index 4f21ce8d95ac..96cd2603edd0 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -5,8 +5,7 @@ PORTNAME= qimageblitz
PORTVERSION= 0.0.6
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}
+MASTER_SITES= KDE/stable/${PORTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Graphical effects and filters library for KDE4
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index 57db8bf8032e..310f107c2cb1 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sxpc
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
EXTRACT_SUFX= .shar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 25d6e8cd02f3..9e3042693cbb 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -5,7 +5,7 @@ PORTNAME= wbar
PORTVERSION= 2.3.4
PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= nivit@FreeBSD.org
COMMENT= Simple and highly customizable quick launch bar
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 691193f0c68a..abdcd2d5650c 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 15
CATEGORIES= x11 windowmaker
MASTER_SITES= http://voins.program.ru/wdm/:wdm \
http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \
- ${MASTER_SITE_LOCAL:S/$/:pic_small/}
-MASTER_SITE_SUBDIR= tg/:pic_small
+ LOCAL/tg:pic_small
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:wdm \
beastie.xpm:pic_small \
daemon1-HQ-1280x960.jpg:pic_large
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 029511594413..a7bd7e84ae09 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= x11 windowmaker
MASTER_SITES= http://linux.nawebu.cz/wmcliphist/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= uqs@FreeBSD.org
COMMENT= Clipboard history management dockapp for Window Maker
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 9e60a5a22bb2..22c51285d273 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xautolock
PORTVERSION= 2.2
PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/screensavers
+MASTER_SITES= SUNSITE/X11/screensavers
MAINTAINER= romain@FreeBSD.org
COMMENT= Activate xlock after a user defined time of inactivity
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 9b946698a10f..e80d69a1a84a 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xbanner
PORTVERSION= 1.31
PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/xutils
+MASTER_SITES= SUNSITE/X11/xutils
DISTNAME= XBanner${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/xcmd/Makefile b/x11/xcmd/Makefile
index b949b1295fb6..dc3ef93f1e4b 100644
--- a/x11/xcmd/Makefile
+++ b/x11/xcmd/Makefile
@@ -5,9 +5,8 @@ PORTNAME= xcmd
PORTVERSION= 1.8
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/X11/xutils \
http://www.breuninger.org/files/distfiles/
-MASTER_SITE_SUBDIR= X11/xutils
MAINTAINER= ports@FreeBSD.org
COMMENT= Xcmd is a front-end for starting programs under X11
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 690b1c56bfca..e1c7ba864407 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xcolors
PORTVERSION= 1.3
PORTREVISION= 4
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= markp
+MASTER_SITES= LOCAL/markp
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index 1c7274e37d6c..1abec55a6586 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-whiskermenu-plugin
PORTVERSION= 1.5.0
PORTREVISION= 1
CATEGORIES= x11 xfce
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index c75f8c4fcfd5..30282fc1cce1 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xgrab
PORTVERSION= 2.41
PORTREVISION= 3
CATEGORIES= x11
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= XCONTRIB/applications
DISTNAME= ${PORTNAME}sc.2_41
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile
index e27931e50a54..b361f894fc01 100644
--- a/x11/xidle/Makefile
+++ b/x11/xidle/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xidle
PORTVERSION= 24102005
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= novel
+MASTER_SITES= LOCAL/novel
MAINTAINER= novel@FreeBSD.org
COMMENT= Run a program on X inactivity
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index 9fd1b099b55a..00bb39166cce 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xkbctrl
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= unsupported/test/Xkb/programs
+MASTER_SITES= XORG/unsupported/test/Xkb/programs
DISTFILES= Imakefile xkbctrl.c
MAINTAINER= sanpei@FreeBSD.org
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index d162fcc22d30..8230267f703c 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xkeyboard-config
PORTVERSION= 2.14
CATEGORIES= x11
-MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME}
+MASTER_SITES= XORG/individual/${XORG_CAT}/${PORTNAME}
MAINTAINER= x11@FreeBSD.org
COMMENT= X Keyboard Configuration Database
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 651b62244f61..804c2e6473a7 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xloadimage
PORTVERSION= 4.1.21
PORTREVISION= 1
CATEGORIES= x11 graphics
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}.${VERSION}
DISTFILES= ${DISTNAME:S/./_/}.orig${EXTRACT_SUFX} \
${DISTNAME:S/./_/}-${REVISION}.debian.tar.gz
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index cd96bf9daf4e..e1ad47ed32af 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmon
PORTVERSION= 1.5.6
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= devel_tools
+MASTER_SITES= XCONTRIB/devel_tools
DISTNAME= xmon.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index 3410cffdf2d3..b151a7d405c8 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xprompt
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= mph
+MASTER_SITES= LOCAL/mph
MAINTAINER= ports@FreeBSD.org
COMMENT= Displays a dialog box and prompts user for text
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index 248c2b93040b..dd901b475f5a 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpyb
PORTVERSION= 1.3.1
PORTREVISION= 2
CATEGORIES= x11 python
-MASTER_SITES= http://xcb.freedesktop.org/%SUBDIR%/
-MASTER_SITE_SUBDIR= dist
+MASTER_SITES= http://xcb.freedesktop.org/dist/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ashish@FreeBSD.org
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index 113b8ad23b36..bcde5da5d65e 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.14
PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.ultranet.com/~jjohnson/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/X
+ SUNSITE/apps/graphics/hacks/X
DISTNAME= ${PORTNAME}114
MAINTAINER= matt@bdd.net
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index 47591e6d409a..9e1a855f79e3 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtoolwait
PORTVERSION= 1.3
PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool startup utility for X11
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index 0970ae258451..49838ac7ee19 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xwatchwin
PORTVERSION= 1.1.1
PORTREVISION= 3
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
DISTNAME= xwatchwin
MAINTAINER= ports@FreeBSD.org
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index 17a0f94ae2c5..29d8a1dbd145 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xzoom
PORTVERSION= 0.3
PORTREVISION= 2
CATEGORIES= x11 accessibility
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/X
+MASTER_SITES= SUNSITE/libs/X
MAINTAINER= ports@FreeBSD.org
COMMENT= Magnify, rotate, mirror the image on the X screen