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
MASTER_SITES cleanup.
- Replace ${MASTER_SITE_FOO} with FOO. - Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9% of the time.) - Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and no hint of what it should be was present. - Fix some logic. - And generally, make things more simple and easy to understand. While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and SAMBA macros. Also, replace some EXTRACT_SUFX occurences with USES=tar:*. Checked by: make fetch-urlall-list With hat: portmgr Sponsored by: Absolight
Notes
Notes: svn path=/head/; revision=386312
-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<