VNroff converts VIQR format Vietnamese characters into troff format so groff/troff can print it out. To use this program: vnroff file | groff | ... or vnroff file | whater_program_that_print_out_a_troff_file WWW: http://www.trichlor.org/ git.cgi/freebsd-ports-gnome/atom/?h=gnome-3.36' type='application/atom+xml'/>
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.sites.mk27
-rw-r--r--accessibility/py-atspi/Makefile3
-rw-r--r--accessibility/py3-atspi/Makefile3
-rw-r--r--archivers/dpkg/Makefile2
-rw-r--r--archivers/fastjar/Makefile3
-rw-r--r--archivers/gcpio/Makefile3
-rw-r--r--archivers/lbrate/Makefile3
-rw-r--r--archivers/lha-ac/Makefile5
-rw-r--r--archivers/macutils/Makefile3
-rw-r--r--archivers/mscompress/Makefile3
-rw-r--r--archivers/mtf/Makefile5
-rw-r--r--archivers/nomarch/Makefile3
-rw-r--r--archivers/nulib/Makefile5
-rw-r--r--archivers/p5-IO-Zlib/Makefile1
-rw-r--r--archivers/packddir/Makefile3
-rw-r--r--archivers/php5-snappy/Makefile2
-rw-r--r--archivers/ppunpack/Makefile5
-rw-r--r--archivers/pxz/Makefile3
-rw-r--r--archivers/py-liblzma/Makefile3
-rw-r--r--archivers/rzip/Makefile3
-rw-r--r--archivers/unace/Makefile3
-rw-r--r--archivers/wzip/Makefile2
-rw-r--r--archivers/xar/Makefile2
-rw-r--r--archivers/xarchiver/Makefile3
-rw-r--r--archivers/zipper/Makefile3
-rw-r--r--archivers/zopfli/Makefile2
-rw-r--r--astro/ephem/Makefile3
-rw-r--r--astro/libgal/Makefile3
-rw-r--r--astro/mymoon/Makefile3
-rw-r--r--astro/p5-Astro-ADS/Makefile1
-rw-r--r--astro/p5-Astro-DSS/Makefile1
-rw-r--r--astro/p5-Astro-SIMBAD/Makefile1
-rw-r--r--astro/p5-Astro-SunTime/Makefile1
-rw-r--r--astro/p5-Geo-METAR/Makefile1
-rw-r--r--astro/planets/Makefile2
-rw-r--r--astro/xworld/Makefile3
-rw-r--r--audio/alsa-lib/Makefile2
-rw-r--r--audio/alsa-plugins/Makefile2
-rw-r--r--audio/alsa-utils/Makefile2
-rw-r--r--audio/amarok-kde4/Makefile3
-rw-r--r--audio/beast/Makefile3
-rw-r--r--audio/cam/Makefile3
-rw-r--r--audio/ccaudio2/Makefile3
-rw-r--r--audio/cdplay/Makefile3
-rw-r--r--audio/dagrab/Makefile3
-rw-r--r--audio/dir2ogg/Makefile3
-rw-r--r--audio/dtmfdial/Makefile3
-rw-r--r--audio/eawpats/Makefile2
-rw-r--r--audio/eawplus/Makefile3
-rw-r--r--audio/etcd/Makefile3
-rw-r--r--audio/festdoc/Makefile3
-rw-r--r--audio/festival/Makefile3
-rw-r--r--audio/festlex-cmu/Makefile3
-rw-r--r--audio/festlex-oald/Makefile3
-rw-r--r--audio/festlex-poslex/Makefile3
-rw-r--r--audio/festvox-don/Makefile3
-rw-r--r--audio/festvox-el11/Makefile3
-rw-r--r--audio/festvox-kal16/Makefile3
-rw-r--r--audio/festvox-kal8/Makefile3
-rw-r--r--audio/festvox-ked16/Makefile3
-rw-r--r--audio/festvox-ked8/Makefile3
-rw-r--r--audio/festvox-rab16/Makefile3
-rw-r--r--audio/festvox-rab8/Makefile3
-rw-r--r--audio/festvox-russian/Makefile3
-rw-r--r--audio/flake/Makefile3
-rw-r--r--audio/funktrackergold/Makefile6
-rw-r--r--audio/gmixer/Makefile3
-rw-r--r--audio/gnomoradio/Makefile3
-rw-r--r--audio/gnupod/Makefile3
-rw-r--r--audio/gtkguitune/Makefile2
-rw-r--r--audio/harp/Makefile3
-rw-r--r--audio/id3ed/Makefile3
-rw-r--r--audio/julius/Makefile3
-rw-r--r--audio/libaudiofile/Makefile3
-rw-r--r--audio/libworkman/Makefile3
-rw-r--r--audio/linux-f10-pulseaudio-libs/Makefile3
-rw-r--r--audio/lollypop/Makefile3
-rw-r--r--audio/mehdiaplayer/Makefile2
-rw-r--r--audio/mixer.app/Makefile2
-rw-r--r--audio/mixmos/Makefile2
-rw-r--r--audio/mp32ogg/Makefile3
-rw-r--r--audio/mp3info/Makefile5
-rw-r--r--audio/mp3rename/Makefile2
-rw-r--r--audio/mpdcon/Makefile3
-rw-r--r--audio/nspmod/Makefile3
-rw-r--r--audio/openal/Makefile2
-rw-r--r--audio/opus-tools/Makefile3
-rw-r--r--audio/opus/Makefile3
-rw-r--r--audio/opusfile/Makefile3
-rw-r--r--audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile1
-rw-r--r--audio/play/Makefile2
-rw-r--r--audio/pm3umpdl/Makefile5
-rw-r--r--audio/pms/Makefile1
-rw-r--r--audio/puddletag/Makefile3
-rw-r--r--audio/rawrec/Makefile2
-rw-r--r--audio/rexima/Makefile3
-rw-r--r--audio/s3mod/Makefile5
-rw-r--r--audio/soundgrab/Makefile1
-rw-r--r--audio/soundtracker/Makefile3
-rw-r--r--audio/spek/Makefile2
-rw-r--r--audio/squeezeboxserver-superdatetime/Makefile2
-rw-r--r--audio/streamtuner/Makefile1
-rw-r--r--audio/tcd/Makefile3
-rw-r--r--audio/tosha/Makefile3
-rw-r--r--audio/tuxguitar/Makefile9
-rw-r--r--audio/vagalume/Makefile3
-rw-r--r--audio/vitunes/Makefile3
-rw-r--r--audio/workman/Makefile3
-rw-r--r--audio/xanalyser/Makefile3
-rw-r--r--audio/xfce4-pulseaudio-plugin/Makefile3
-rw-r--r--audio/xmix/Makefile4
-rw-r--r--audio/xmms-ladspa/Makefile3
-rw-r--r--audio/xmms-mailnotify/Makefile3
-rw-r--r--audio/xpi-musicpm/Makefile2
-rw-r--r--audio/xwave/Makefile3
-rw-r--r--benchmarks/cpipe/Makefile3
-rw-r--r--benchmarks/dbench/Makefile3
-rw-r--r--benchmarks/hpl/Makefile3
-rw-r--r--benchmarks/imb/Makefile3
-rw-r--r--benchmarks/netio/Makefile3
-rw-r--r--benchmarks/p5-Benchmark-Stopwatch/Makefile1
-rw-r--r--benchmarks/sipp/Makefile1
-rw-r--r--benchmarks/super-smack/Makefile2
-rw-r--r--benchmarks/ubench/Makefile3
-rw-r--r--benchmarks/webbench/Makefile3
-rw-r--r--biology/biococoa/Makefile3
-rw-r--r--biology/clustalw/Makefile5
-rw-r--r--biology/t_coffee/Makefile3
-rw-r--r--cad/basicdsp/Makefile3
-rw-r--r--cad/cascade/Makefile3
-rw-r--r--cad/cider/Makefile3
-rw-r--r--cad/electric-ng/Makefile3
-rw-r--r--cad/fidocadj/Makefile3
-rw-r--r--cad/geda/Makefile3
-rw-r--r--cad/kicad-devel/Makefile3
-rw-r--r--cad/layouteditor/Makefile3
-rw-r--r--cad/meshdev/Makefile3
-rw-r--r--chinese/auto-cn-l10n/Makefile2
-rw-r--r--chinese/fcitx-googlepinyin/Makefile2
-rw-r--r--chinese/ibus-pinyin/Makefile2
-rw-r--r--chinese/joe/Makefile3
-rw-r--r--chinese/kcfonts/Makefile3
-rw-r--r--chinese/libgooglepinyin/Makefile2
-rw-r--r--chinese/opencc/Makefile2
-rw-r--r--chinese/p5-Lingua-ZH-Segment/Makefile1
-rw-r--r--chinese/pyzy/Makefile2
-rw-r--r--chinese/xpdf/Makefile3
-rw-r--r--comms/aldo/Makefile3
-rw-r--r--comms/bpl+/Makefile3
-rw-r--r--comms/chirp/Makefile3
-rw-r--r--comms/chu/Makefile3
-rw-r--r--comms/cqrlog/Makefile3
-rw-r--r--comms/cwdaemon/Makefile3
-rw-r--r--comms/ebook2cw/Makefile3
-rw-r--r--comms/ebook2cwgui/Makefile3
-rw-r--r--comms/esmska/Makefile2
-rw-r--r--comms/fl_moxgen/Makefile3
-rw-r--r--comms/fllog/Makefile3
-rw-r--r--comms/flrig/Makefile3
-rw-r--r--comms/flwrap/Makefile3
-rw-r--r--comms/geoid/Makefile3
-rw-r--r--comms/gnuradio/Makefile3
-rw-r--r--comms/gtkmmorse/Makefile3
-rw-r--r--comms/ibp/Makefile3
-rw-r--r--comms/kb/Makefile3
-rw-r--r--comms/libfec/Makefile3
-rw-r--r--comms/linpsk/Makefile3
-rw-r--r--comms/locator/Makefile2
-rw-r--r--comms/morse/Makefile3
-rw-r--r--comms/nasawash/Makefile3
-rw-r--r--comms/nec2c/Makefile3
-rw-r--r--comms/o2sms/Makefile3
-rw-r--r--comms/picocom/Makefile2
-rw-r--r--comms/predict/Makefile3
-rw-r--r--comms/pyla/Makefile6
-rw-r--r--comms/qrq/Makefile3
-rw-r--r--comms/qsstv/Makefile3
-rw-r--r--comms/quisk/Makefile3
-rw-r--r--comms/soundmodem/Makefile3
-rw-r--r--comms/splat/Makefile3
-rw-r--r--comms/sredird/Makefile3
-rw-r--r--comms/usrp/Makefile3
-rw-r--r--comms/vrflash/Makefile3
-rw-r--r--comms/wsjt/Makefile3
-rw-r--r--comms/wspr/Makefile3
-rw-r--r--comms/wwl/Makefile3
-rw-r--r--comms/wy60/Makefile2
-rw-r--r--comms/xdx/Makefile3
-rw-r--r--comms/xlog/Makefile1
-rw-r--r--comms/xnec2c/Makefile3
-rw-r--r--comms/xwota/Makefile3
-rw-r--r--comms/yagiuda/Makefile3
-rw-r--r--comms/yfklog/Makefile7
-rw-r--r--converters/btoa/Makefile3
-rw-r--r--converters/cl-babel/Makefile3
-rw-r--r--converters/cocot/Makefile3
-rw-r--r--converters/fconv/Makefile3
-rw-r--r--converters/iconv-extra/Makefile3
-rw-r--r--converters/iconv-rfc1345/Makefile3
-rw-r--r--converters/iconv/Makefile3
-rw-r--r--converters/ish/Makefile2
-rw-r--r--converters/libiconv/Makefile3
-rw-r--r--converters/o3read/Makefile3
-rw-r--r--converters/p5-Cstools/Makefile3
-rw-r--r--converters/p5-Encode-Detect/Makefile1
-rw-r--r--converters/p5-Encode-DoubleEncodedUTF8/Makefile1
-rw-r--r--converters/pdf2djvu/Makefile2
-rw-r--r--converters/wkhtmltopdf/Makefile3
-rw-r--r--databases/cassandra/Makefile3
-rw-r--r--databases/cassandra2/Makefile3
-rw-r--r--databases/couchdb/Makefile3
-rw-r--r--databases/dbview/Makefile3
-rw-r--r--databases/gnats4/Makefile3
-rw-r--r--databases/isql-viewer/Makefile4
-rw-r--r--databases/jdbm2/Makefile2
-rw-r--r--databases/ldb/Makefile3
-rw-r--r--databases/luadbi/Makefile2
-rw-r--r--databases/memcached/Makefile5
-rw-r--r--databases/memcacheq/Makefile5
-rw-r--r--databases/mysql-connector-c++/Makefile3
-rw-r--r--databases/mysql-connector-java/Makefile3
-rw-r--r--databases/mysql-proxy/Makefile3
-rw-r--r--databases/mysql-workbench51/Makefile3
-rw-r--r--databases/mysql51-server/Makefile3
-rw-r--r--databases/mysql55-server/Makefile3
-rw-r--r--databases/mysql56-server/Makefile3
-rw-r--r--databases/nagios-check_postgres_replication/Makefile3
-rw-r--r--databases/ntdb/Makefile3
-rw-r--r--databases/openark-kit/Makefile2
-rw-r--r--databases/p5-Class-DBI-Pg/Makefile3
-rw-r--r--databases/p5-DBD-InterBase/Makefile1
-rw-r--r--databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile1
-rw-r--r--databases/p5-DBIx-Class-PassphraseColumn/Makefile1
-rw-r--r--databases/p5-DBIx-Class-TimeStamp/Makefile1
-rw-r--r--databases/p5-DBIx-Ease/Makefile4
-rw-r--r--databases/p5-DBIx-HA/Makefile1
-rw-r--r--databases/p5-DBIx-MySQLSequence/Makefile1
-rw-r--r--databases/p5-MongoDB/Makefile2
-rw-r--r--databases/p5-Oryx/Makefile3
-rw-r--r--databases/p5-Pg/Makefile3
-rw-r--r--databases/p5-RRD-Simple/Makefile3
-rw-r--r--databases/p5-Rose-DBx-Object-MoreHelpers/Makefile3
-rw-r--r--databases/p5-TokyoCabinet/Makefile3
-rw-r--r--databases/pgadmin3/Makefile3
-rw-r--r--databases/pgagent/Makefile3
-rw-r--r--databases/pgbadger/Makefile3
-rw-r--r--databases/pgtcl/Makefile7
-rw-r--r--databases/postgresql-libpgeasy/Makefile3
-rw-r--r--databases/postgresql84-server/Makefile3
-rw-r--r--databases/postgresql91-server/Makefile3
-rw-r--r--databases/postgresql92-server/Makefile3
-rw-r--r--databases/py-apsw/Makefile4
-rw-r--r--databases/py-bsddb/Makefile3
-rw-r--r--databases/py-gdbm/Makefile3
-rw-r--r--databases/py-mysql-connector-python/Makefile3
-rw-r--r--databases/py-mysql-connector-python2/Makefile3
-rw-r--r--databases/py-sqlalchemy-migrate/Makefile2
-rw-r--r--databases/py-sqlite3/Makefile3
-rw-r--r--databases/soci/Makefile3
-rw-r--r--databases/sqlclient/Makefile3
-rw-r--r--databases/tdb/Makefile3
-rw-r--r--deskutils/cal/Makefile3
-rw-r--r--deskutils/cartotheque/Makefile3
-rw-r--r--deskutils/charmap/Makefile3
-rw-r--r--deskutils/dlume/Makefile2
-rw-r--r--deskutils/gnustep-wrapper/Makefile3
-rw-r--r--deskutils/gworkspace-gwmetadata/Makefile3
-rw-r--r--deskutils/gworkspace/Makefile3
-rw-r--r--deskutils/hot-babe/Makefile3
-rw-r--r--deskutils/libgcal/Makefile2
-rw-r--r--deskutils/libopensync-plugin-vformat-devel/Makefile3
-rw-r--r--deskutils/mrundlg/Makefile2
-rw-r--r--deskutils/osynctool/Makefile3
-rw-r--r--deskutils/plan/Makefile1
-rw-r--r--deskutils/plasma-applet-playwolf/Makefile2
-rw-r--r--deskutils/plopfolio/Makefile3
-rw-r--r--deskutils/rednotebook/Makefile3
-rw-r--r--deskutils/sliderule/Makefile3
-rw-r--r--deskutils/sugarcrm/Makefile3
-rw-r--r--deskutils/systempreferences/Makefile3
-rw-r--r--deskutils/treeline/Makefile1
-rw-r--r--deskutils/tuxcards/Makefile3
-rw-r--r--deskutils/vboxgtk/Makefile2
-rw-r--r--deskutils/vnc2flv/Makefile1
-rw-r--r--deskutils/wmpinboard/Makefile2
-rw-r--r--deskutils/xcalendar/Makefile2
-rw-r--r--deskutils/xfce4-notifyd/Makefile3
-rw-r--r--deskutils/xfce4-volumed/Makefile3
-rw-r--r--deskutils/xmaddressbook/Makefile3
-rw-r--r--deskutils/xpostitPlus/Makefile3
-rw-r--r--devel/ElectricFence/Makefile3
-rw-r--r--devel/adabooch/Makefile3
-rw-r--r--devel/ahven/Makefile3
-rw-r--r--devel/apache-ant/Makefile2
-rw-r--r--devel/apr1/Makefile3
-rw-r--r--devel/argp-standalone/Makefile3
-rw-r--r--devel/arm-elf-binutils/Makefile3
-rw-r--r--devel/asl/Makefile3
-rw-r--r--devel/autoconf/Makefile3
-rw-r--r--devel/autoconf213/Makefile3
-rw-r--r--devel/automake14/Makefile3
-rw-r--r--devel/avalon-framework/Makefile3
-rw-r--r--devel/avr-gcc-devel/Makefile3
-rw-r--r--devel/avr-gcc/Makefile3
-rw-r--r--devel/avr-gdb/Makefile1
-rw-r--r--devel/avr-libc/Makefile1
-rw-r--r--devel/avro-c/Makefile3
-rw-r--r--devel/avro-cpp/Makefile3
-rw-r--r--devel/binutils/Makefile3
-rw-r--r--devel/bncsutil-ghost++/Makefile2
-rw-r--r--devel/bugzilla44/Makefile3
-rw-r--r--devel/c-unit/Makefile2
-rw-r--r--devel/cdecl/Makefile3
-rw-r--r--devel/cflow/Makefile3
-rw-r--r--devel/cl-alexandria/Makefile3
-rw-r--r--devel/cl-asdf/Makefile3
-rw-r--r--devel/cl-trivial-features/Makefile3
-rw-r--r--devel/cl-trivial-gray-streams/Makefile3
-rw-r--r--devel/cld/Makefile2
-rw-r--r--devel/cld2/Makefile3
-rw-r--r--devel/compiler-rt/Makefile3
-rw-r--r--devel/cook/Makefile3
-rw-r--r--devel/cvs-devel/Makefile3
-rw-r--r--devel/cvs2svn/Makefile3
-rw-r--r--devel/cvsdadm/Makefile3
-rw-r--r--devel/cvsweb/Makefile4
-rw-r--r--devel/cvsweb3/Makefile4
-rw-r--r--devel/cvswrap/Makefile3
-rw-r--r--devel/cweb/Makefile3
-rw-r--r--devel/d-feet/Makefile3
-rw-r--r--devel/ddd/Makefile3
-rw-r--r--devel/dissy/Makefile2
-rw-r--r--devel/djgpp-binutils/Makefile3
-rw-r--r--devel/dotconf/Makefile2
-rw-r--r--devel/elftoaout/Makefile3
-rw-r--r--devel/epm/Makefile1
-rw-r--r--devel/eventxx/Makefile1
-rw-r--r--devel/f77flow/Makefile3
-rw-r--r--devel/fb303/Makefile3
-rw-r--r--devel/ffcall/Makefile4
-rw-r--r--devel/fortran-utils/Makefile3
-rw-r--r--devel/freeocl/Makefile2
-rw-r--r--devel/ftnchek/Makefile3
-rw-r--r--devel/gazpacho/Makefile3
-rw-r--r--devel/gconf2/Makefile3
-rw-r--r--devel/gindent/Makefile3
-rw-r--r--devel/gmake/Makefile3
-rw-r--r--devel/gnu-efi/Makefile3
-rw-r--r--devel/gnulibiberty/Makefile3
-rw-r--r--devel/google-gdata/Makefile2
-rw-r--r--devel/google-perftools/Makefile3
-rw-r--r--devel/google-sparsehash/Makefile5
-rw-r--r--devel/gorm/Makefile3
-rw-r--r--devel/gperf/Makefile3
-rw-r--r--devel/gtkparasite/Makefile3
-rw-r--r--devel/guichan/Makefile2
-rw-r--r--devel/hadoop2/Makefile9
-rw-r--r--devel/htable/Makefile3
-rw-r--r--devel/itext/Makefile3
-rw-r--r--devel/javolution/Makefile3
-rw-r--r--devel/jiic/Makefile3
-rw-r--r--devel/kdevelop-kde4/Makefile3
-rw-r--r--devel/kdevelop-pg-qt/Makefile3
-rw-r--r--devel/kdevelop-php-docs/Makefile3
-rw-r--r--devel/kdevelop-php/Makefile3
-rw-r--r--devel/kdevplatform/Makefile3
-rw-r--r--devel/lcov/Makefile3
-rw-r--r--devel/libaura/Makefile3
-rw-r--r--devel/libavl/Makefile3
-rw-r--r--devel/libbfd/Makefile3
-rw-r--r--devel/libdict/Makefile2
-rw-r--r--devel/libelf/Makefile3
-rw-r--r--devel/libexecinfo/Makefile3
-rw-r--r--devel/libffi/Makefile3
-rw-r--r--devel/libglade2/Makefile3
-rw-r--r--devel/libhash/Makefile2
-rw-r--r--devel/libiomp5-devel/Makefile3
-rw-r--r--devel/libkgapi/Makefile3
-rw-r--r--devel/liblouisxml/Makefile2
-rw-r--r--devel/libmatheval/Makefile1
-rw-r--r--devel/libmpsse/Makefile2
-rw-r--r--devel/libnxt/Makefile2
-rw-r--r--devel/liboop/Makefile2
-rw-r--r--devel/libopensync/Makefile3
-rw-r--r--devel/libpasori/Makefile3
-rw-r--r--devel/libruin/Makefile3
-rw-r--r--devel/libsigc++12/Makefile3
-rw-r--r--devel/libublio/Makefile3
-rw-r--r--devel/libunicode/Makefile3
-rw-r--r--devel/libx86/Makefile3
-rw-r--r--devel/libzookeeper/Makefile3
-rw-r--r--devel/libzrtpcpp/Makefile3
-rw-r--r--devel/linux-c6-qt47/Makefile3
-rw-r--r--devel/linux_kdump/Makefile3
-rw-r--r--devel/llvm-devel/Makefile3
-rw-r--r--devel/m17n-db/Makefile6
-rw-r--r--devel/m17n-lib/Makefile3
-rw-r--r--devel/m6811-binutils/Makefile3
-rw-r--r--devel/maven-ant-tasks/Makefile3
-rw-r--r--devel/maven3/Makefile3
-rw-r--r--devel/maven31/Makefile3
-rw-r--r--devel/mingw32-openssl/Makefile7
-rw-r--r--devel/mingw32-zlib/Makefile3
-rw-r--r--devel/mm/Makefile3
-rw-r--r--devel/mph/Makefile3
-rw-r--r--devel/msp430-binutils/Makefile6
-rw-r--r--devel/msp430-gcc/Makefile6
-rw-r--r--devel/msp430-gdb/Makefile4
-rw-r--r--devel/msp430-libc/Makefile3
-rw-r--r--devel/msp430mcu/Makefile3
-rw-r--r--devel/ncurses/Makefile1
-rw-r--r--devel/netscape-java40/Makefile3
-rw-r--r--devel/nxt-python/Makefile2
-rw-r--r--devel/ocaml-sexplib/Makefile3
-rw-r--r--devel/ocaml-typeconv/Makefile3
-rw-r--r--devel/opencvs/Makefile5
-rw-r--r--devel/p5-AnyEvent-AIO/Makefile1
-rw-r--r--devel/p5-App-GitHub/Makefile1
-rw-r--r--devel/p5-B-Hooks-OP-PPAddr/Makefile1
-rw-r--r--devel/p5-B-OPCheck/Makefile1
-rw-r--r--devel/p5-Badger/Makefile1
-rw-r--r--devel/p5-Cache-AgainstFile/Makefile1
-rw-r--r--devel/p5-Carp-Clan-Share/Makefile1
-rw-r--r--devel/p5-Class-Accessor-Fast-Contained/Makefile1
-rw-r--r--devel/p5-Class-Accessor-Installer/Makefile1
-rw-r--r--devel/p5-Class-Delegation/Makefile2
-rw-r--r--devel/p5-Class-Measure/Makefile1
-rw-r--r--devel/p5-Class-Tom/Makefile1
-rw-r--r--devel/p5-Config-IniHash/Makefile3
-rw-r--r--devel/p5-Config-Wrest/Makefile1
-rw-r--r--devel/p5-Danga-Socket-Callback/Makefile1
-rw-r--r--devel/p5-Data-JavaScript-Anon/Makefile1
-rw-r--r--devel/p5-Data-Remember/Makefile1
-rw-r--r--devel/p5-DateConvert/Makefile3
-rw-r--r--devel/p5-DateTime-Format-DateParse/Makefile3
-rw-r--r--devel/p5-Devel-Callsite/Makefile1
-rw-r--r--devel/p5-Devel-ebug/Makefile1
-rw-r--r--devel/p5-Dist-Zilla/Makefile1
-rw-r--r--devel/p5-Event-Notify/Makefile1
-rw-r--r--devel/p5-File-Find-Rule-Perl/Makefile1
-rw-r--r--devel/p5-File-Finder/Makefile1
-rw-r--r--devel/p5-File-Tail-Dir/Makefile1
-rw-r--r--devel/p5-Ioctl/Makefile3
-rw-r--r--devel/p5-Lingua-JA-Fold/Makefile1
-rw-r--r--devel/p5-Locale-Maketext-Lexicon/Makefile3
-rw-r--r--devel/p5-Log-Dispatch-Array/Makefile1
-rw-r--r--devel/p5-Log-Dispatch-File-Stamped/Makefile1
-rw-r--r--devel/p5-Log-Dispatch-Scribe/Makefile1
-rw-r--r--devel/p5-Log-Trace/Makefile1
-rw-r--r--devel/p5-Module-CPANfile/Makefile1
-rw-r--r--devel/p5-Module-Info-File/Makefile1
-rw-r--r--devel/p5-Module-Util/Makefile1
-rw-r--r--devel/p5-MooseX-AttributeShortcuts/Makefile1
-rw-r--r--devel/p5-MooseX-Has-Options/Makefile1
-rw-r--r--devel/p5-MouseX-Getopt/Makefile1
-rw-r--r--devel/p5-Object-Realize-Later/Makefile1
-rw-r--r--devel/p5-PHP-Serialization/Makefile1
-rw-r--r--devel/p5-Perl-Tidy/Makefile1
-rw-r--r--devel/p5-Proc-Wait3/Makefile1
-rw-r--r--devel/p5-ReadLine-Gnu/Makefile3
-rw-r--r--devel/p5-ReadLine-Perl/Makefile5
-rw-r--r--devel/p5-ReadLine-TTYtter/Makefile3
-rw-r--r--devel/p5-Set-ConsistentHash/Makefile1
-rw-r--r--devel/p5-Stream-Reader/Makefile1
-rw-r--r--devel/p5-Sys-RunAlone/Makefile1
-rw-r--r--devel/p5-Sys-RunAlways/Makefile1
-rw-r--r--devel/p5-Sys-Syscall/Makefile1
-rw-r--r--devel/p5-TAP-SimpleOutput/Makefile1
-rw-r--r--devel/p5-Term-VT102-Boundless/Makefile1
-rw-r--r--devel/p5-Term-VT102/Makefile1
-rw-r--r--devel/p5-Test-Assertions/Makefile1
-rw-r--r--devel/p5-Test-FailWarnings/Makefile1
-rw-r--r--devel/p5-Test-File-ShareDir/Makefile1
-rw-r--r--devel/p5-Test-HexString/Makefile1
-rw-r--r--devel/p5-Test-InDistDir/Makefile1
-rw-r--r--devel/p5-Test-JSON/Makefile1
-rw-r--r--devel/p5-Test-Moose-More/Makefile1
-rw-r--r--devel/p5-Test-Script/Makefile1
-rw-r--r--devel/p5-Test-SubCalls/Makefile1
-rw-r--r--devel/p5-Test-Without-Module/Makefile1
-rw-r--r--devel/p5-Test-XML-Valid/Makefile1
-rw-r--r--devel/p5-Thread-Suspend/Makefile7
-rw-r--r--devel/p5-Tie-File-AsHash/Makefile1
-rw-r--r--devel/p5-Tie-Util/Makefile1
-rw-r--r--devel/p5-Time-Out/Makefile1
-rw-r--r--devel/p5-TimeDate/Makefile3
-rw-r--r--devel/p5-TraceFuncs/Makefile3
-rw-r--r--devel/p5-forks/Makefile3
-rw-r--r--devel/p5-orz/Makefile3
-rw-r--r--devel/pcre/Makefile7
-rw-r--r--devel/pear-IO_Bit/Makefile3
-rw-r--r--devel/phpsh/Makefile5
-rw-r--r--devel/powerpc64-gcc/Makefile3
-rw-r--r--devel/ppl/Makefile5
-rw-r--r--devel/protobuf25/Makefile2
-rw-r--r--devel/psptoolchain-binutils/Makefile3
-rw-r--r--devel/psptoolchain-gcc-stage1/Makefile3
-rw-r--r--devel/psptoolchain-gdb/Makefile3
-rw-r--r--devel/psptoolchain-newlib/Makefile3
-rw-r--r--devel/pth/Makefile3
-rw-r--r--devel/py-argparse/Makefile2
-rw-r--r--devel/py-avro/Makefile3
-rw-r--r--devel/py-cld/Makefile3
-rw-r--r--devel/py-cmdln/Makefile2
-rw-r--r--devel/py-country/Makefile1
-rw-r--r--devel/py-extremes/Makefile3
-rw-r--r--devel/py-freebsd/Makefile3
-rw-r--r--devel/py-fsm/Makefile2
-rw-r--r--devel/py-game_sdl2/Makefile2
-rw-r--r--devel/py-gobject/Makefile3
-rw-r--r--devel/py-icu/Makefile3
-rw-r--r--devel/py-ipaddr/Makefile2
-rw-r--r--devel/py-meliae/Makefile2
-rw-r--r--devel/py-orbit/Makefile3
-rw-r--r--devel/py-prettytable/Makefile3
-rw-r--r--devel/py-protocols/Makefile1
-rw-r--r--devel/py-pyev/Makefile1
-rw-r--r--devel/py-pygpx/Makefile3
-rw-r--r--devel/py-qpid/Makefile3
-rw-r--r--devel/py-qt4/bsd.pyqt.mk6
-rw-r--r--devel/py-sip/Makefile2
-rw-r--r--devel/py-statgrab/Makefile5
-rw-r--r--devel/py-ydbf/Makefile3
-rw-r--r--devel/py_static_check/Makefile3
-rw-r--r--devel/pygobject3-common/Makefile3
-rw-r--r--devel/pyobfuscate/Makefile3
-rw-r--r--devel/qmake/Makefile3
-rw-r--r--devel/qt4-assistant-adp/Makefile3
-rw-r--r--devel/qt4-libqtassistantclient/Makefile3
-rw-r--r--devel/qtcreator/Makefile3
-rw-r--r--devel/quickcheck++/Makefile3
-rw-r--r--devel/quilt/Makefile3
-rw-r--r--devel/rcs/Makefile3
-rw-r--r--devel/rcs57/Makefile3
-rw-r--r--devel/readline/Makefile4
-rw-r--r--devel/remake/Makefile3
-rw-r--r--devel/renpy/Makefile2
-rw-r--r--devel/ruby-langscan/Makefile3
-rw-r--r--devel/ruby-ncurses/Makefile3
-rw-r--r--devel/ruby-setup.rb/Makefile3
-rw-r--r--devel/rubygem-atoulme-antwrap/Makefile2
-rw-r--r--devel/rubygem-io-like/Makefile3
-rw-r--r--devel/sabre/Makefile3
-rw-r--r--devel/safe-iop/Makefile4
-rw-r--r--devel/sfio/Makefile2
-rw-r--r--devel/sgb/Makefile3
-rw-r--r--devel/shtool/Makefile5
-rw-r--r--devel/smake/Makefile3
-rw-r--r--devel/sourcenav/Makefile3
-rw-r--r--devel/storm/Makefile3
-rw-r--r--devel/stormlib-ghost++/Makefile2
-rw-r--r--devel/str/Makefile3
-rw-r--r--devel/streamhtmlparser/Makefile2
-rw-r--r--devel/stringencoders/Makefile4
-rw-r--r--devel/subversion-book/Makefile3
-rw-r--r--devel/subversion/Makefile.common3
-rw-r--r--devel/subversion17/Makefile.common3
-rw-r--r--devel/subversive/Makefile2
-rw-r--r--devel/talloc/Makefile3
-rw-r--r--devel/tcl-trf/Makefile3
-rw-r--r--devel/tclap/Makefile3
-rw-r--r--devel/terminality/Makefile3
-rw-r--r--devel/tevent/Makefile3
-rw-r--r--devel/thrift-c_glib/Makefile15
-rw-r--r--devel/thrift-cpp/Makefile8
-rw-r--r--devel/thrift/Makefile3
-rw-r--r--devel/tigcc/Makefile6
-rw-r--r--devel/ucommon/Makefile3
-rw-r--r--devel/udis86/Makefile3
-rw-r--r--devel/ultragetopt/Makefile2
-rw-r--r--devel/winpdb/Makefile3
-rw-r--r--devel/xwpe/Makefile3
-rw-r--r--devel/xxgdb/Makefile3
-rw-r--r--devel/yasm-devel/Makefile3
-rw-r--r--devel/zookeeper/Makefile3
-rw-r--r--devel/zpu-binutils/Makefile3
-rw-r--r--devel/zpu-gcc/Makefile3
-rw-r--r--dns/bind10/Makefile3
-rw-r--r--dns/djbdns/Makefile2
-rw-r--r--dns/doc/Makefile3
-rw-r--r--dns/inadyn/Makefile3
-rw-r--r--dns/ipcheck/Makefile1
-rw-r--r--dns/nsping/Makefile3
-rw-r--r--dns/py-adns/Makefile2
-rw-r--r--dns/samba-nsupdate/Makefile3
-rw-r--r--dns/updatedd/Makefile3
-rw-r--r--editors/abiword-docs/Makefile3
-rw-r--r--editors/abiword/Makefile3
-rw-r--r--editors/beav/Makefile2
-rw-r--r--editors/calligra-l10n/files/bsd.l10n.mk3
-rw-r--r--editors/calligra/Makefile3
-rw-r--r--editors/emacs/Makefile5
-rw-r--r--editors/gobby/Makefile2
-rw-r--r--editors/jove/Makefile3
-rw-r--r--editors/lazarus/Makefile2
-rw-r--r--editors/leafpad/Makefile1
-rw-r--r--editors/nano-devel/Makefile2
-rw-r--r--editors/nedit/Makefile3
-rw-r--r--editors/psgml/Makefile3
-rw-r--r--editors/spe/Makefile3
-rw-r--r--editors/sted/Makefile3
-rw-r--r--editors/tamago/Makefile6
-rw-r--r--editors/thoteditor/Makefile1
-rw-r--r--editors/uzap/Makefile3
-rw-r--r--editors/yasnippet/Makefile2
-rw-r--r--emulators/bsvc/Makefile3
-rw-r--r--emulators/cpmemu/Makefile6
-rw-r--r--emulators/cpmtools/Makefile3
-rw-r--r--emulators/darcnes/Makefile3
-rw-r--r--emulators/dboxfe/Makefile3
-rw-r--r--emulators/dtcyber/Makefile3
-rw-r--r--emulators/dynagen/Makefile3
-rw-r--r--emulators/hatari/Makefile3
-rw-r--r--emulators/mtools/Makefile3
-rw-r--r--emulators/mupen64plus-core/Makefile6
-rw-r--r--emulators/pcemu/Makefile3
-rw-r--r--emulators/qemu/Makefile3
-rw-r--r--emulators/raine/Makefile2
-rw-r--r--emulators/uae/Makefile3
-rw-r--r--emulators/virtio-kmod/Makefile3
-rw-r--r--emulators/vmsbackup/Makefile2
-rw-r--r--emulators/wxmupen64plus/Makefile4
-rw-r--r--finance/skrooge/Makefile3
-rw-r--r--french/aster/bsd.aster.mk3
-rw-r--r--french/tvdownloader/Makefile3
-rw-r--r--ftp/atftp/Makefile3
-rw-r--r--ftp/ftpsesame/Makefile3
-rw-r--r--ftp/gnustep-ftp/Makefile3
-rw-r--r--ftp/mirror/Makefile2
-rw-r--r--ftp/tftp-hpa/Makefile3
-rw-r--r--ftp/vsftpd/Makefile3
-rw-r--r--games/abuse_sdl/Makefile2
-rw-r--r--games/an/Makefile2
-rw-r--r--games/bugsx/Makefile3
-rw-r--r--games/cardpics/Makefile3
-rw-r--r--games/crafty-open-enormous/Makefile3
-rw-r--r--games/crafty-open-large/Makefile3
-rw-r--r--games/crafty-open-medium/Makefile3
-rw-r--r--games/dmjava/Makefile3
-rw-r--r--games/doom-freedoom/Makefile3
-rw-r--r--games/doom/Makefile2
-rw-r--r--games/ensemblist/Makefile3
-rw-r--r--games/evq3/Makefile2
-rw-r--r--games/flying/Makefile3
-rw-r--r--games/fortunate/Makefile2
-rw-r--r--games/freeciv-sounds/Makefile2
-rw-r--r--games/freedink-data/Makefile3
-rw-r--r--games/freedink-dfarc/Makefile3
-rw-r--r--games/gnugo/Makefile3
-rw-r--r--games/gnushogi/Makefile.common3
-rw-r--r--games/gtypist/Makefile3
-rw-r--r--games/ifm/Makefile3
-rw-r--r--games/ishido/Makefile3
-rw-r--r--games/katawa-shoujo/Makefile2
-rw-r--r--games/libggz/bsd.ggz.mk5
-rw-r--r--games/libmaitretarot/Makefile3
-rw-r--r--games/libmt_client/Makefile3
-rw-r--r--games/linux-doom3/Makefile5
-rw-r--r--games/linux-enemyterritory-shrub/Makefile3
-rw-r--r--games/linux-enemyterritory/Makefile4
-rw-r--r--games/linux-etqw-demo-server/Makefile2
-rw-r--r--games/linux-etqw-server/Makefile2
-rw-r--r--games/linux-quake3-demo/Makefile2
-rw-r--r--games/linux-quake3/Makefile4
-rw-r--r--games/linux-quake4-demo/Makefile2
-rw-r--r--games/linux-quake4/Makefile4
-rw-r--r--games/linux-rtcw/Makefile3
-rw-r--r--games/linux-ut2003-demo/Makefile2
-rw-r--r--games/liquidwar/Makefile3
-rw-r--r--games/maitretarot/Makefile3
-rw-r--r--games/mt_dolphin_ia/Makefile3
-rw-r--r--games/mt_gtk_client/Makefile3
-rw-r--r--games/nehquake/Makefile3
-rw-r--r--games/nethack32/Makefile2
-rw-r--r--games/nethack34/Makefile4
-rw-r--r--games/oldrunner/Makefile3
-rw-r--r--games/oonsoo/Makefile3
-rw-r--r--games/p5-Acme-GuessNumber/Makefile3
-rw-r--r--games/pycadia/Makefile2
-rw-r--r--games/quake-data/Makefile4
-rw-r--r--games/quake-source/Makefile2
-rw-r--r--games/quake2-source/Makefile2
-rw-r--r--games/quake3/Makefile2
-rw-r--r--games/scummvm/Makefile1
-rw-r--r--games/senken/Makefile2
-rw-r--r--games/sokoban/Makefile3
-rw-r--r--games/supertux-devel/Makefile2
-rw-r--r--games/supertux/Makefile2
-rw-r--r--games/timeseal/Makefile3
-rw-r--r--games/tractorgen/Makefile1
-rw-r--r--games/tycho/Makefile3
-rw-r--r--games/wmquake/Makefile3
-rw-r--r--games/wolfpack/Makefile3
-rw-r--r--games/worldofpadman/Makefile2
-rw-r--r--games/xbat/Makefile3
-rw-r--r--games/xbattle/Makefile2
-rw-r--r--games/xblackjack/Makefile3
-rw-r--r--games/xboing/Makefile3
-rw-r--r--games/xbubble/Makefile2
-rw-r--r--games/xcubes/Makefile3
-rw-r--r--games/xdemineur/Makefile3
-rw-r--r--games/xdino/Makefile3
-rw-r--r--games/xhexagons/Makefile3
-rw-r--r--games/xisola/Makefile3
-rw-r--r--games/xjig/Makefile3
-rw-r--r--games/xjump/Makefile2
-rw-r--r--games/xkoules/Makefile2
-rw-r--r--games/xlaby/Makefile3
-rw-r--r--games/xmball/Makefile3
-rw-r--r--games/xmille/Makefile3
-rw-r--r--games/xmines/Makefile3
-rw-r--r--games/xmlink/Makefile3
-rw-r--r--games/xneko/Makefile3
-rw-r--r--games/xoct/Makefile3
-rw-r--r--games/xoids/Makefile3
-rw-r--r--games/xoj/Makefile3
-rw-r--r--games/xosmulti/Makefile3
-rw-r--r--games/xpanex/Makefile3
-rw-r--r--games/xpipeman/Makefile3
-rw-r--r--games/xpyraminx/Makefile3
-rw-r--r--games/xrubik/Makefile3
-rw-r--r--games/xshisen/Makefile3
-rw-r--r--games/xshogi/Makefile3
-rw-r--r--games/xskewb/Makefile3
-rw-r--r--games/xtic/Makefile3
-rw-r--r--games/xtriangles/Makefile3
-rw-r--r--games/xtruco/Makefile3
-rw-r--r--german/alt-aspell/Makefile3
-rw-r--r--german/bugzilla44/Makefile3
-rw-r--r--graphics/4va/Makefile5
-rw-r--r--graphics/GraphicsMagick/Makefile1
-rw-r--r--graphics/Hermes/Makefile2
-rw-r--r--graphics/SciPlot/Makefile3
-rw-r--r--graphics/acidwarp/Makefile3
-rw-r--r--graphics/barcode/Makefile3
-rw-r--r--graphics/cal3d-devel/Makefile3
-rw-r--r--graphics/cegui/Makefile3
-rw-r--r--graphics/dc20pack/Makefile3
-rw-r--r--graphics/dmtx-utils/Makefile3
-rw-r--r--graphics/driconf/Makefile3
-rw-r--r--graphics/flasm/Makefile3
-rw-r--r--graphics/g2/Makefile3
-rw-r--r--graphics/gdk-pixbuf/Makefile2
-rw-r--r--graphics/gimp-app/Makefile3
-rw-r--r--graphics/gpaint/Makefile3
-rw-r--r--graphics/graphos/Makefile3
-rw-r--r--graphics/gtk-update-icon-cache/Makefile3
-rw-r--r--graphics/imlib2/Makefile3
-rw-r--r--graphics/imlib2_loaders/Makefile3
-rw-r--r--graphics/jasper/Makefile6
-rw-r--r--graphics/jpgtn/Makefile3
-rw-r--r--graphics/liblug/Makefile3
-rw-r--r--graphics/linplasma/Makefile3
-rw-r--r--graphics/netpbm/Makefile3
-rw-r--r--graphics/ocrad/Makefile1
-rw-r--r--graphics/ocropus/Makefile2
-rw-r--r--graphics/opengl-man/Makefile3
-rw-r--r--graphics/opennurbs/Makefile1
-rw-r--r--graphics/p5-Color-Calc/Makefile1
-rw-r--r--graphics/p5-Color-Palette/Makefile1
-rw-r--r--graphics/p5-Color-Scheme/Makefile1
-rw-r--r--graphics/p5-Image-PBMlib/Makefile1
-rw-r--r--graphics/p5-SpringGraph/Makefile3
-rw-r--r--graphics/p5-URI-GoogleChart/Makefile1
-rw-r--r--graphics/pear-IO_SWF/Makefile3
-rw-r--r--graphics/pecl-qrencode/Makefile3
-rw-r--r--graphics/pfscalibration/Makefile3
-rw-r--r--graphics/pfstmo/Makefile3
-rw-r--r--graphics/php5-swfed/Makefile3
-rw-r--r--graphics/pixelize/Makefile1
-rw-r--r--graphics/prison/Makefile3
-rw-r--r--graphics/py-gchartwrapper/Makefile2
-rw-r--r--graphics/py-glewpy/Makefile2
-rw-r--r--graphics/py-openexr/Makefile1
-rw-r--r--graphics/scr2png/Makefile3
-rw-r--r--graphics/sdl2_gfx/Makefile3
-rw-r--r--graphics/sdl_gfx/Makefile3
-rw-r--r--graphics/seam-carving-gui/Makefile2
-rw-r--r--graphics/seejpeg/Makefile3
-rw-r--r--graphics/separate/Makefile3
-rw-r--r--graphics/svgfig/Makefile5
-rw-r--r--graphics/tesseract-data/Makefile2
-rw-r--r--graphics/tesseract/Makefile2
-rw-r--r--graphics/timeless/Makefile3
-rw-r--r--graphics/wmicons/Makefile7
-rw-r--r--graphics/xbmbrowser/Makefile3
-rw-r--r--graphics/xfpovray/Makefile3
-rw-r--r--graphics/xli/Makefile1
-rw-r--r--graphics/xpdf/Makefile3
-rw-r--r--graphics/xwpick/Makefile3
-rw-r--r--graphics/zphoto/Makefile1
-rw-r--r--hebrew/hspell/Makefile3
-rw-r--r--irc/bitlbee/Makefile3
-rw-r--r--irc/cwirc/Makefile3
-rw-r--r--irc/keitairc2/Makefile3
-rw-r--r--irc/py-gozerbot/Makefile2
-rw-r--r--irc/quirc/Makefile3
-rw-r--r--irc/riece/Makefile1
-rw-r--r--irc/simpleirc/Makefile3
-rw-r--r--irc/thales/Makefile3
-rw-r--r--irc/weechat-devel/Makefile3
-rw-r--r--irc/weechat/Makefile3
-rw-r--r--japanese/FreeWnn-lib/Makefile6
-rw-r--r--japanese/FreeWnn-server/Makefile6
-rw-r--r--japanese/a2ps/Makefile2
-rw-r--r--japanese/ajaxzip2-data/Makefile3
-rw-r--r--japanese/anthy/Makefile3
-rw-r--r--japanese/bugzilla44/Makefile3
-rw-r--r--japanese/canna-lib/Makefile3
-rw-r--r--japanese/canna-server/Makefile3
-rw-r--r--japanese/dbskkd-cdb/Makefile3
-rw-r--r--japanese/dvi2tty/Makefile4
-rw-r--r--japanese/esecanna-module-vje25/Makefile3
-rw-r--r--japanese/esecanna-module-vje30/Makefile3
-rw-r--r--japanese/esecanna-module-wnn6/Makefile3
-rw-r--r--japanese/esecanna/Makefile3
-rw-r--r--japanese/font-migu/Makefile3
-rw-r--r--japanese/font-motoya-al/Makefile3
-rw-r--r--japanese/font-mplus-ipa/Makefile3
-rw-r--r--japanese/font-ume/Makefile3
-rw-r--r--japanese/gawk/Makefile3
-rw-r--r--japanese/hns/Makefile3
-rw-r--r--japanese/ibus-anthy/Makefile2
-rw-r--r--japanese/japaneseAFM/Makefile3
-rw-r--r--japanese/jed/Makefile3
-rw-r--r--japanese/jmode/Makefile3
-rw-r--r--japanese/k12/Makefile2
-rw-r--r--japanese/kana-no-quiz/Makefile3
-rw-r--r--japanese/kanji18/Makefile3
-rw-r--r--japanese/kappa20/Makefile2
-rw-r--r--japanese/kasumi/Makefile3
-rw-r--r--japanese/kcc/Makefile2
-rw-r--r--japanese/kon2-16dot/Makefile2
-rw-r--r--japanese/kterm/Makefile18
-rw-r--r--japanese/less/Makefile3
-rw-r--r--japanese/man-doc/Makefile3
-rw-r--r--japanese/marumoji-fonts/Makefile3
-rw-r--r--japanese/migemo/Makefile3
-rw-r--r--japanese/mime_pls/Makefile3
-rw-r--r--japanese/mtools/Makefile4
-rw-r--r--japanese/namazu/Makefile3
-rw-r--r--japanese/newosaka/Makefile2
-rw-r--r--japanese/nhocr/Makefile2
-rw-r--r--japanese/ochusha/Makefile3
-rw-r--r--japanese/plain2/Makefile4
-rw-r--r--japanese/prn/Makefile2
-rw-r--r--japanese/rogue_s/Makefile8
-rw-r--r--japanese/ruby-mecab/Makefile2
-rw-r--r--japanese/ruby-usersguide/Makefile3
-rw-r--r--japanese/scim-anthy/Makefile3
-rw-r--r--japanese/scim-canna/Makefile3
-rw-r--r--japanese/scim-skk/Makefile3
-rw-r--r--japanese/skkserv/Makefile2
-rw-r--r--japanese/slrn/Makefile2
-rw-r--r--japanese/texinfo/Makefile3
-rw-r--r--japanese/zipcodes/Makefile3
-rw-r--r--java/bootstrap-openjdk/Makefile3
-rw-r--r--java/classpath/Makefile10
-rw-r--r--java/eclipse-cdt/Makefile3
-rw-r--r--java/eclipse-windowbuilder/Makefile2
-rw-r--r--java/jakarta-bcel/Makefile3
-rw-r--r--java/jakarta-commons-httpclient/Makefile3
-rw-r--r--java/jakarta-regexp/Makefile3
-rw-r--r--java/java-zoneinfo/Makefile2
-rw-r--r--java/openjdk6/Makefile5
-rw-r--r--java/openjdk7/Makefile2
-rw-r--r--java/proguard/Makefile3
-rw-r--r--java/rubygem-rjb/Makefile2
-rw-r--r--korean/aleefonts-ttf/Makefile3
-rw-r--r--korean/man-doc/Makefile3
-rw-r--r--korean/nanumcoding-ttf/Makefile3
-rw-r--r--korean/nanumfonts-otf/Makefile3
-rw-r--r--lang/basic256/Makefile3
-rw-r--r--lang/clang-cheri/Makefile3
-rw-r--r--lang/clang-devel/Makefile3
-rw-r--r--lang/emacs-lisp-intro/Makefile3
-rw-r--r--lang/erlang/Makefile2
-rw-r--r--lang/gcc-aux/Makefile3
-rw-r--r--lang/gcc47-aux/Makefile3
-rw-r--r--lang/gcc5-aux/Makefile3
-rw-r--r--lang/ghc/Makefile3
-rw-r--r--lang/gnat_util/Makefile3
-rw-r--r--lang/gnatdroid-armv7/Makefile3
-rw-r--r--lang/gnatdroid-binutils/Makefile3
-rw-r--r--lang/guile/Makefile3
-rw-r--r--lang/libstdc++_stldoc_4.2.2/Makefile3
-rw-r--r--lang/ocaml/Makefile1
-rw-r--r--lang/p5-v6/Makefile2
-rw-r--r--lang/php5/Makefile6
-rw-r--r--lang/php55/Makefile6
-rw-r--r--lang/php56/Makefile6
-rw-r--r--lang/python-doc-html/Makefile5
-rw-r--r--lang/python-tools/Makefile3
-rw-r--r--lang/python27/Makefile3
-rw-r--r--lang/python32/Makefile3
-rw-r--r--lang/python33/Makefile3
-rw-r--r--lang/python34/Makefile3
-rw-r--r--lang/ratfor/Makefile3
-rw-r--r--lang/rhino/Makefile3
-rw-r--r--lang/ruby20/Makefile3
-rw-r--r--lang/ruby21/Makefile3
-rw-r--r--lang/ruby22/Makefile3
-rw-r--r--lang/sagittarius-scheme/Makefile5
-rw-r--r--lang/siod/Makefile3
-rw-r--r--lang/spidermonkey17/Makefile3
-rw-r--r--lang/spidermonkey170/Makefile3
-rw-r--r--lang/spidermonkey185/Makefile3
-rw-r--r--lang/spidermonkey24/Makefile3
-rw-r--r--lang/tcl84/Makefile3
-rw-r--r--lang/tcl85/Makefile3
-rw-r--r--lang/tcl86/Makefile3
-rw-r--r--lang/tinypy/Makefile2
-rw-r--r--lang/ypsilon/Makefile2
-rw-r--r--mail/antivirus-milter/Makefile3
-rw-r--r--mail/bsfilter/Makefile3
-rw-r--r--mail/bsmtp/Makefile3
-rw-r--r--mail/c-sig/Makefile3
-rw-r--r--mail/coolmail/Makefile5
-rw-r--r--mail/cucipop/Makefile3
-rw-r--r--mail/cyrus-imapd24/Makefile3
-rw-r--r--mail/dspam/Makefile3
-rw-r--r--mail/exim-doc-html/Makefile3
-rw-r--r--mail/exim/Makefile4
-rw-r--r--mail/exmh2/Makefile4
-rw-r--r--mail/greylite/Makefile3
-rw-r--r--mail/hbiff/Makefile3
-rw-r--r--mail/imaptools/Makefile3
-rw-r--r--mail/james/Makefile3
-rw-r--r--mail/lens/Makefile2
-rw-r--r--mail/libesmtp/Makefile2
-rw-r--r--mail/libsrs2/Makefile3
-rw-r--r--mail/lmtp2nntp/Makefile3
-rw-r--r--mail/mail-notification/Makefile3
-rw-r--r--mail/mailman/Makefile3
-rw-r--r--mail/mailtray/Makefile2
-rw-r--r--mail/mailx/Makefile4
-rw-r--r--mail/missey/Makefile2
-rw-r--r--mail/mlmmj/Makefile3
-rw-r--r--mail/nmh/Makefile3
-rw-r--r--mail/nullmailer/Makefile1
-rw-r--r--mail/opendkim/Makefile5
-rw-r--r--mail/opendmarc/Makefile5
-rw-r--r--mail/openwebmail/Makefile5
-rw-r--r--mail/p5-Email-Abstract/Makefile1
-rw-r--r--mail/p5-Email-FolderType-Net/Makefile1
-rw-r--r--mail/p5-Mail-LMLM/Makefile1
-rw-r--r--mail/p5-Net-SMTP-Server/Makefile3
-rw-r--r--mail/pm-lib/Makefile3
-rw-r--r--mail/postfix-current/Makefile3
-rw-r--r--mail/postfix/Makefile3
-rw-r--r--mail/postfixadmin/Makefile3
-rw-r--r--mail/qmail-contrib/Makefile3
-rw-r--r--mail/qmail-dk/Makefile4
-rw-r--r--mail/qmail-spamcontrol/Makefile3
-rw-r--r--mail/qmail/Makefile46
-rw-r--r--mail/queue-fix/Makefile3
-rw-r--r--mail/raysfilter/Makefile3
-rw-r--r--mail/ripmime/Makefile3
-rw-r--r--mail/sigrot/Makefile3
-rw-r--r--mail/sma/Makefile3
-rw-r--r--mail/smtpmail/Makefile3
-rw-r--r--mail/spamass-milter/Makefile3
-rw-r--r--mail/spamassassin/Makefile4
-rw-r--r--mail/spamd/Makefile3
-rw-r--r--mail/spamilter/Makefile1
-rw-r--r--mail/spamstats/Makefile3
-rw-r--r--mail/squirrelmail-translations/Makefile3
-rw-r--r--mail/ssmtp/Makefile2
-rw-r--r--mail/thunderbird-dictionaries/Makefile3
-rw-r--r--mail/tmda/Makefile6
-rw-r--r--mail/tpop3d/Makefile3
-rw-r--r--mail/vacation/Makefile3
-rw-r--r--mail/vexim/Makefile3
-rw-r--r--mail/xmail/Makefile3
-rw-r--r--mail/xpbiff/Makefile3
-rw-r--r--math/R-cran-SuppDists/Makefile2
-rw-r--r--math/R/Makefile3
-rw-r--r--math/apc/Makefile3
-rw-r--r--math/aspcud/Makefile3
-rw-r--r--math/blacs/Makefile3
-rw-r--r--math/carve/Makefile2
-rw-r--r--math/ccmath/Makefile3
-rw-r--r--math/clasp/Makefile3
-rw-r--r--math/clipper/Makefile3
-rw-r--r--math/foma/Makefile2
-rw-r--r--math/geg/Makefile3
-rw-r--r--math/gexpr/Makefile3
-rw-r--r--math/glm/Makefile3
-rw-r--r--math/glpk/Makefile3
-rw-r--r--math/gmp/Makefile3
-rw-r--r--math/gnubc/Makefile3
-rw-r--r--math/gotoblas/Makefile5
-rw-r--r--math/gringo/Makefile3
-rw-r--r--math/hfst/Makefile3
-rw-r--r--math/jags/Makefile9
-rw-r--r--math/jtransforms/Makefile3
-rw-r--r--math/laspack/Makefile5
-rw-r--r--math/ldouble/Makefile3
-rw-r--r--math/libjbigi/Makefile2
-rw-r--r--math/lrng/Makefile6
-rw-r--r--math/miracl/Makefile3
-rw-r--r--math/msieve/Makefile4
-rw-r--r--math/ngraph/Makefile2
-rw-r--r--math/octave/Makefile3
-rw-r--r--math/oleo/Makefile3
-rw-r--r--math/p5-Algorithm-Munkres/Makefile1
-rw-r--r--math/p5-Geo-Coordinates-UTM/Makefile1
-rw-r--r--math/p5-Math-Polynomial-Solve/Makefile1
-rw-r--r--math/p5-Set-IntSpan-Fast-XS/Makefile1
-rw-r--r--math/p5-Statistics-Basic/Makefile1
-rw-r--r--math/p5-Statistics-Forecast/Makefile1
-rw-r--r--math/p5-Statistics-LineFit/Makefile1
-rw-r--r--math/p5-Statistics-TTest/Makefile1
-rw-r--r--math/py-gato/Makefile1
-rw-r--r--math/py-gmpy/Makefile2
-rw-r--r--math/py-theano/Makefile3
-rw-r--r--math/qrupdate/Makefile3
-rw-r--r--math/sc/Makefile3
-rw-r--r--math/scalapack/Makefile3
-rw-r--r--math/slatec/Makefile3
-rw-r--r--math/slgrace/Makefile3
-rw-r--r--math/solitaire/Makefile3
-rw-r--r--math/units/Makefile3
-rw-r--r--math/wxMaxima/Makefile3
-rw-r--r--math/xldlas/Makefile3
-rw-r--r--misc/amfm/Makefile3
-rw-r--r--misc/asr-manpages/Makefile3
-rw-r--r--misc/bbjd/Makefile3
-rw-r--r--misc/buffer/Makefile5
-rw-r--r--misc/chef/Makefile5
-rw-r--r--misc/compat10x/Makefile3
-rw-r--r--misc/compat4x/Makefile7
-rw-r--r--misc/compat5x/Makefile3
-rw-r--r--misc/compat6x/Makefile5
-rw-r--r--misc/compat7x/Makefile3
-rw-r--r--misc/compat8x/Makefile3
-rw-r--r--misc/compat9x/Makefile3
-rw-r--r--misc/dahdi-kmod/Makefile3
-rw-r--r--misc/dahdi-kmod26/Makefile3
-rw-r--r--misc/dahdi/Makefile3
-rw-r--r--misc/diction/Makefile3
-rw-r--r--misc/dnetc/Makefile5
-rw-r--r--misc/dphys-config/Makefile2
-rw-r--r--misc/estic/Makefile3
-rw-r--r--misc/figlet/Makefile3
-rw-r--r--misc/findutils/Makefile3
-rw-r--r--misc/fortune-mod-bofh/Makefile7
-rw-r--r--misc/gnuit/Makefile3
-rw-r--r--misc/gnuls/Makefile3
-rw-r--r--misc/gnustep-examples/Makefile3
-rw-r--r--misc/gregexp/Makefile3
-rw-r--r--misc/hello/Makefile3
-rw-r--r--misc/histring/Makefile3
-rw-r--r--misc/imerge/Makefile3
-rw-r--r--misc/inplace/Makefile3
-rw-r--r--misc/ipbt/Makefile3
-rw-r--r--misc/iselect/Makefile3
-rw-r--r--misc/kde4-l10n/files/bsd.l10n.mk3
-rw-r--r--misc/mime-support/Makefile2
-rw-r--r--misc/mmv/Makefile2
-rw-r--r--misc/nsf/Makefile3
-rw-r--r--misc/openr2/Makefile2
-rw-r--r--misc/ossp-uuid/Makefile3
-rw-r--r--misc/p5-Locale-Msgcat/Makefile3
-rw-r--r--misc/pinfo/Makefile2
-rw-r--r--misc/py-yolk/Makefile3
-rw-r--r--misc/rtfm/Makefile3
-rw-r--r--misc/ruby-progressbar/Makefile2
-rw-r--r--misc/shuffle/Makefile3
-rw-r--r--misc/sls/Makefile3
-rw-r--r--misc/tcb/Makefile3
-rw-r--r--misc/team/Makefile3
-rw-r--r--misc/unclutter/Makefile3
-rw-r--r--misc/usbrh-libusb/Makefile3
-rw-r--r--misc/vera/Makefile3
-rw-r--r--misc/viz/Makefile3
-rw-r--r--misc/wmScoreBoard/Makefile3
-rw-r--r--misc/wmwork/Makefile3
-rw-r--r--misc/xgas/Makefile3
-rw-r--r--misc/xless/Makefile3
-rw-r--r--misc/xtar/Makefile2
-rw-r--r--multimedia/ab25/Makefile3
-rw-r--r--multimedia/assimp/Makefile3
-rw-r--r--multimedia/avbin/Makefile3
-rw-r--r--multimedia/bangarang/Makefile2
-rw-r--r--multimedia/ffmpegthumbnailer/Makefile3
-rw-r--r--multimedia/flvstreamer/Makefile3
-rw-r--r--multimedia/kdenlive/Makefile3
-rw-r--r--multimedia/libdvbpsi/Makefile3
-rw-r--r--multimedia/libdvdcss/Makefile3
-rw-r--r--multimedia/libkate/Makefile2
-rw-r--r--multimedia/mimms/Makefile3
-rw-r--r--multimedia/mjpg-streamer/Makefile3
-rw-r--r--multimedia/mpeg4ip/Makefile3
-rw-r--r--multimedia/mplayer-skins/Makefile3
-rw-r--r--multimedia/mplayer/Makefile.shared3
-rw-r--r--multimedia/mplex/Makefile3
-rw-r--r--multimedia/opencinematools/Makefile2
-rw-r--r--multimedia/pwcbsd/Makefile3
-rw-r--r--multimedia/pwcview/Makefile3
-rw-r--r--multimedia/replex/Makefile3
-rw-r--r--multimedia/smpeg/Makefile2
-rw-r--r--multimedia/spigot/Makefile5
-rw-r--r--multimedia/szap-s2/Makefile3
-rw-r--r--multimedia/tstools/Makefile3
-rw-r--r--multimedia/vcdimager/Makefile3
-rw-r--r--multimedia/vdr-plugin-control/Makefile3
-rw-r--r--multimedia/vdr-plugin-streamdev/Makefile3
-rw-r--r--multimedia/vdr-plugin-xineliboutput/Makefile6
-rw-r--r--multimedia/win32-codecs/Makefile3
-rw-r--r--multimedia/xanim/Makefile3
-rw-r--r--net-im/cicquin/Makefile3
-rw-r--r--net-im/ejabberd/Makefile5
-rw-r--r--net-im/emesene/Makefile4
-rw-r--r--net-im/jabber-pyicq/Makefile2
-rw-r--r--net-im/ktp-accounts-kcm/Makefile3
-rw-r--r--net-im/ktp-approver/Makefile3
-rw-r--r--net-im/ktp-auth-handler/Makefile3
-rw-r--r--net-im/ktp-common-internals/Makefile3
-rw-r--r--net-im/ktp-contact-list/Makefile3
-rw-r--r--net-im/ktp-contact-runner/Makefile3
-rw-r--r--net-im/ktp-desktop-applets/Makefile3
-rw-r--r--net-im/ktp-filetransfer-handler/Makefile3
-rw-r--r--net-im/ktp-kded-integration-module/Makefile3
-rw-r--r--net-im/ktp-send-file/Makefile3
-rw-r--r--net-im/ktp-text-ui/Makefile5
-rw-r--r--net-im/mikutter/Makefile3
-rw-r--r--net-im/p5-Net-XMPP2/Makefile1
-rw-r--r--net-im/plasma-applet-ktp/Makefile3
-rw-r--r--net-im/py-xmpppy-yahoo/Makefile3
-rw-r--r--net-im/qwit/Makefile2
-rw-r--r--net-im/telepathy-logger-qt4/Makefile3
-rw-r--r--net-mgmt/aggregate/Makefile3
-rw-r--r--net-mgmt/arpwatch/Makefile2
-rw-r--r--net-mgmt/clog/Makefile3
-rw-r--r--net-mgmt/flow-tools-ng/Makefile2
-rw-r--r--net-mgmt/grepip/Makefile2
-rw-r--r--net-mgmt/ipacctd/Makefile2
-rw-r--r--net-mgmt/nagvis/Makefile3
-rw-r--r--net-mgmt/nbtscan/Makefile1
-rw-r--r--net-mgmt/p5-Net-SNMP/Makefile2
-rw-r--r--net-mgmt/p5-SNMP_Session/Makefile2
-rw-r--r--net-mgmt/p5-jmx4perl/Makefile4
-rw-r--r--net-mgmt/phpipam/Makefile5
-rw-r--r--net-mgmt/pnp/Makefile3
-rw-r--r--net-mgmt/py-ipcalc/Makefile3
-rw-r--r--net-mgmt/send/Makefile3
-rw-r--r--net-mgmt/spectools/Makefile3
-rw-r--r--net-mgmt/subcalc/Makefile1
-rw-r--r--net-p2p/retroshare/Makefile3
-rw-r--r--net-p2p/rtgui/Makefile9
-rw-r--r--net-p2p/transmission-remote-gui/Makefile2
-rw-r--r--net/44bsd-rdist/Makefile3
-rw-r--r--net/aprsc/Makefile3
-rw-r--r--net/boinc_curses/Makefile4
-rw-r--r--net/bounce/Makefile3
-rw-r--r--net/cagibi/Makefile3
-rw-r--r--net/clamz/Makefile2
-rw-r--r--net/cvsup-static/Makefile3
-rw-r--r--net/dgd-lpmud/Makefile2
-rw-r--r--net/gnu-dico/Makefile3
-rw-r--r--net/gnu-radius/Makefile3
-rw-r--r--net/googlecl/Makefile2
-rw-r--r--net/grdesktop/Makefile3
-rw-r--r--net/hexinject/Makefile3
-rw-r--r--net/icmpinfo/Makefile3
-rw-r--r--net/iet/Makefile3
-rw-r--r--net/ifstat/Makefile3
-rw-r--r--net/igmpproxy/Makefile3
-rw-r--r--net/isc-dhcp41-server/Makefile3
-rw-r--r--net/isc-dhcp42-server/Makefile3
-rw-r--r--net/isc-dhcp43-server/Makefile3
-rw-r--r--net/jgroups/Makefile3
-rw-r--r--net/jwhois/Makefile3
-rw-r--r--net/kio-upnp-ms/Makefile6
-rw-r--r--net/kippo/Makefile2
-rw-r--r--net/libkfbapi/Makefile3
-rw-r--r--net/libproxy/Makefile2
-rw-r--r--net/lvwimax/Makefile3
-rw-r--r--net/mopd/Makefile3
-rw-r--r--net/msend/Makefile3
-rw-r--r--net/nc/Makefile3
-rw-r--r--net/netatalk3/Makefile1
-rw-r--r--net/netcat/Makefile3
-rw-r--r--net/netembryo/Makefile3
-rw-r--r--net/netpipes/Makefile3
-rw-r--r--net/netselect/Makefile2
-rw-r--r--net/ntraceroute/Makefile3
-rw-r--r--net/openbgpd/Makefile6
-rw-r--r--net/opendpi/Makefile2
-rw-r--r--net/openntpd/Makefile3
-rw-r--r--net/ostinato/Makefile4
-rw-r--r--net/p5-Net-CascadeCopy/Makefile1
-rw-r--r--net/p5-Net-GrowlClient/Makefile1
-rw-r--r--net/p5-Net-IRR/Makefile1
-rw-r--r--net/p5-Net-Proxy/Makefile1
-rw-r--r--net/p5-Net-Trackback/Makefile1
-rw-r--r--net/p5-POE-Component-PubSub/Makefile1
-rw-r--r--net/p5-PlRPC/Makefile3
-rw-r--r--net/p5-Samba-LDAP/Makefile1
-rw-r--r--net/p5-Socks/Makefile3
-rw-r--r--net/pload/Makefile3
-rw-r--r--net/py-amqplib/Makefile5
-rw-r--r--net/py-ndg_httpsclient/Makefile3
-rw-r--r--net/py-pypcap/Makefile2
-rw-r--r--net/py-pyvmomi/Makefile3
-rw-r--r--net/rinetd/Makefile3
-rw-r--r--net/rsync-bpc/Makefile3
-rw-r--r--net/rsync/Makefile9
-rw-r--r--net/samba36/Makefile3
-rw-r--r--net/samba4/Makefile3
-rw-r--r--net/samba41/Makefile3
-rw-r--r--net/samplicator/Makefile3
-rw-r--r--net/smb4k-kde4/Makefile3
-rw-r--r--net/sniffit/Makefile5
-rw-r--r--net/stf-6rd-kmod/Makefile3
-rw-r--r--net/suckblow/Makefile3
-rw-r--r--net/tcpcat/Makefile3
-rw-r--r--net/tcpshow/Makefile3
-rw-r--r--net/trafshow3/Makefile5
-rw-r--r--net/tramp/Makefile3
-rw-r--r--net/tridiavnc/Makefile3
-rw-r--r--net/uget/Makefile3
-rw-r--r--net/vblade/Makefile5
-rw-r--r--net/vnc/Makefile3
-rw-r--r--net/wmnd/Makefile1
-rw-r--r--net/wmnet/Makefile3
-rw-r--r--net/wmwifi/Makefile3
-rw-r--r--net/xpvm/Makefile3
-rw-r--r--net/yconalyzer/Makefile3
-rw-r--r--news/atp/Makefile3
-rw-r--r--news/husky/Makefile.local3
-rw-r--r--news/ifmail/Makefile3
-rw-r--r--news/inn/Makefile3
-rw-r--r--news/knews/Makefile3
-rw-r--r--news/lusernet/Makefile3
-rw-r--r--news/newsfetch/Makefile3
-rw-r--r--news/p5-NNTPClient/Makefile3
-rw-r--r--news/pgpmoose/Makefile3
-rw-r--r--news/plor/Makefile3
-rw-r--r--news/slrnface/Makefile3
-rw-r--r--ports-mgmt/p5-FreeBSD-Ports/Makefile3
-rw-r--r--ports-mgmt/portsearch/Makefile3
-rw-r--r--ports-mgmt/porttree/Makefile2
-rw-r--r--print/a2ps/Makefile4
-rw-r--r--print/abc2mtex/Makefile3
-rw-r--r--print/adobe-cmaps/Makefile3
-rw-r--r--print/alignmargins/Makefile3
-rw-r--r--print/asprint/Makefile3
-rw-r--r--print/auctex/Makefile3
-rw-r--r--print/bibview/Makefile3
-rw-r--r--print/cm-super/Makefile6
-rw-r--r--print/dot2tex/Makefile2
-rw-r--r--print/font-amsfonts/Makefile3
-rw-r--r--print/foo2zjs/Makefile4
-rw-r--r--print/foomatic-db/Makefile3
-rw-r--r--print/foxitreader/Makefile6
-rw-r--r--print/ghostscript7/Makefile5
-rw-r--r--print/ghostscript7/files/Makefile.bjc2503
-rw-r--r--print/ghostscript7/files/Makefile.cpca2
-rw-r--r--print/ghostscript7/files/Makefile.eplaser3
-rw-r--r--print/ghostscript7/files/Makefile.gprint3
-rw-r--r--print/ghostscript7/files/Makefile.lex70002
-rw-r--r--print/ghostscript7/files/Makefile.lx50002
-rw-r--r--print/ghostscript8/Makefile1
-rw-r--r--print/ghostscript9-agpl/Makefile1
-rw-r--r--print/ghostscript9/Makefile1
-rw-r--r--print/html2latex/Makefile3
-rw-r--r--print/kde_poster/Makefile3
-rw-r--r--print/latex-ltablex/Makefile6
-rw-r--r--print/latex-resume/Makefile3
-rw-r--r--print/latex2rtf/Makefile2
-rw-r--r--print/libotf/Makefile3
-rw-r--r--print/libpaper/Makefile3
-rw-r--r--print/openprinting/Makefile4
-rw-r--r--print/pdfbox/Makefile3
-rw-r--r--print/pic2fig/Makefile3
-rw-r--r--print/pkfonts300/Makefile3
-rw-r--r--print/pstotext/Makefile7
-rw-r--r--print/psutils/Makefile3
-rw-r--r--print/py-reportlab1/Makefile3
-rw-r--r--print/tex/Makefile6
-rw-r--r--print/trueprint/Makefile3
-rw-r--r--russian/artwiz-ru/Makefile3
-rw-r--r--russian/bugzilla44/Makefile3
-rw-r--r--science/crf++/Makefile3
-rw-r--r--science/fisicalab/Makefile3
-rw-r--r--science/gchemutils/Makefile3
-rw-r--r--science/p5-Geo-Coordinates-Converter/Makefile1
-rw-r--r--science/py-pydicom/Makefile2
-rw-r--r--science/py-scikit-learn/Makefile3
-rw-r--r--science/simsmith/Makefile3
-rw-r--r--science/xfce4-equake-plugin/Makefile3
-rw-r--r--security/ADMsmb/Makefile3
-rw-r--r--security/ADMsnmp/Makefile4
-rw-r--r--security/amap/Makefile3
-rw-r--r--security/amavis-stats/Makefile3
-rw-r--r--security/apache-xml-security-c/Makefile3
-rw-r--r--security/arirang/Makefile1
-rw-r--r--security/axTLS/Makefile3
-rw-r--r--security/blindelephant/Makefile3
-rw-r--r--security/bruteforceblocker/Makefile3
-rw-r--r--security/bsmtrace/Makefile3
-rw-r--r--security/ccsrch/Makefile5
-rw-r--r--security/checkpassword/Makefile3
-rw-r--r--security/clambc/Makefile3
-rw-r--r--security/courier-authlib/Makefile1
-rw-r--r--security/cracklib/Makefile2
-rw-r--r--security/cryptstring/Makefile2
-rw-r--r--security/dcetest/Makefile3
-rw-r--r--security/digest/Makefile3
-rw-r--r--security/dirmngr/Makefile3
-rw-r--r--security/dmitry/Makefile3
-rw-r--r--security/dradis/Makefile5
-rw-r--r--security/easypg/Makefile3
-rw-r--r--security/fakeroot/Makefile3
-rw-r--r--security/flawfinder/Makefile3
-rw-r--r--security/fprint_demo/Makefile3
-rw-r--r--security/fragroute/Makefile3
-rw-r--r--security/fuzzdb/Makefile4
-rw-r--r--security/gnupg/Makefile2
-rw-r--r--security/gnupg1/Makefile3
-rw-r--r--security/gnupg20/Makefile3
-rw-r--r--security/gwee/Makefile3
-rw-r--r--security/honggfuzz/Makefile2
-rw-r--r--security/hotssh/Makefile1
-rw-r--r--security/iaikpkcs11wrapper/Makefile3
-rw-r--r--security/isnprober/Makefile3
-rw-r--r--security/keychain/Makefile2
-rw-r--r--security/keyprint/Makefile3
-rw-r--r--security/kripp/Makefile3
-rw-r--r--security/l0pht-watch/Makefile3
-rw-r--r--security/libgcrypt/Makefile3
-rw-r--r--security/libgpg-error/Makefile3
-rw-r--r--security/libressl/Makefile3
-rw-r--r--security/libtasn1/Makefile3
-rw-r--r--security/logcheck/Makefile2
-rw-r--r--security/makepasswd/Makefile3
-rw-r--r--security/mindterm-binary/Makefile3
-rw-r--r--security/nettle/Makefile3
-rw-r--r--security/oath-toolkit/Makefile3
-rw-r--r--security/opencdk/Makefile1
-rw-r--r--security/openssh-portable/Makefile6
-rw-r--r--security/openssl/Makefile7
-rw-r--r--security/openvpn-auth-ldap/Makefile2
-rw-r--r--security/outguess/Makefile3
-rw-r--r--security/p5-Crypt-CAST5/Makefile1
-rw-r--r--security/p5-Crypt-Juniper/Makefile3
-rw-r--r--security/p5-Crypt-Rijndael/Makefile1
-rw-r--r--security/p5-CryptX/Makefile3
-rw-r--r--security/p5-GSSAPI/Makefile3
-rw-r--r--security/p5-MD5/Makefile3
-rw-r--r--security/p5-Net-Radius-Server/Makefile1
-rw-r--r--security/p5-SAVI-Perl/Makefile1
-rw-r--r--security/pam_fprint/Makefile3
-rw-r--r--security/pgpgpg/Makefile3
-rw-r--r--security/pgpin/Makefile3
-rw-r--r--security/pkcs11-dump/Makefile2
-rw-r--r--security/pkcs11-gateway/Makefile3
-rw-r--r--security/pks/Makefile5
-rw-r--r--security/pulledpork/Makefile2
-rw-r--r--security/putty/Makefile3
-rw-r--r--security/pwauth/Makefile2
-rw-r--r--security/quantis-kmod/Makefile3
-rw-r--r--security/quantis/Makefile3
-rw-r--r--security/ranpwd/Makefile9
-rw-r--r--security/sasp/Makefile3
-rw-r--r--security/seccure/Makefile2
-rw-r--r--security/signing-party/Makefile3
-rw-r--r--security/skipfish/Makefile2
-rw-r--r--security/srm/Makefile7
-rw-r--r--security/sshit/Makefile3
-rw-r--r--security/stoken/Makefile3
-rw-r--r--security/sudo/Makefile2
-rw-r--r--security/tripwire12/Makefile2
-rw-r--r--security/webscarab/Makefile3
-rw-r--r--security/xinetd/Makefile2
-rw-r--r--security/xml-security/Makefile9
-rw-r--r--shells/44bsd-csh/Makefile3
-rw-r--r--shells/esh/Makefile2
-rw-r--r--shells/scponly/Makefile3
-rw-r--r--sysutils/44bsd-more/Makefile3
-rw-r--r--sysutils/915resolution/Makefile3
-rw-r--r--sysutils/acpica-tools/Makefile3
-rw-r--r--sysutils/afbinit/Makefile7
-rw-r--r--sysutils/amrstat/Makefile3
-rw-r--r--sysutils/apcpwr/Makefile3
-rw-r--r--sysutils/apt/Makefile2
-rw-r--r--sysutils/asmon/Makefile3
-rw-r--r--sysutils/asusoled/Makefile3
-rw-r--r--sysutils/backuppc-devel/Makefile3
-rw-r--r--sysutils/batmon/Makefile3
-rw-r--r--sysutils/battray/Makefile2
-rw-r--r--sysutils/bbapm/Makefile3
-rw-r--r--sysutils/boxbackup-devel/Makefile3
-rw-r--r--sysutils/cdf/Makefile3
-rw-r--r--sysutils/cdrdao/Makefile1
-rw-r--r--sysutils/cdrtools-devel/Makefile3
-rw-r--r--sysutils/cdrtools/Makefile3
-rw-r--r--sysutils/confctl/Makefile3
-rw-r--r--sysutils/consolehm/Makefile3
-rw-r--r--sysutils/copytape/Makefile3
-rw-r--r--sysutils/crashme/Makefile3
-rw-r--r--sysutils/daemontools/Makefile3
-rw-r--r--sysutils/dvdimagecmp/Makefile3
-rw-r--r--sysutils/farbot/Makefile2
-rw-r--r--sysutils/fortunelock/Makefile3
-rw-r--r--sysutils/fsc/Makefile3
-rw-r--r--sysutils/fusefs-afuse/Makefile2
-rw-r--r--sysutils/fusefs-chironfs/Makefile2
-rw-r--r--sysutils/fusefs-rar2fs/Makefile2
-rw-r--r--sysutils/fusefs-sqlfs/Makefile3
-rw-r--r--sysutils/geomgui/Makefile3
-rw-r--r--sysutils/getdelta/Makefile3
-rw-r--r--sysutils/gigolo/Makefile3
-rw-r--r--sysutils/gkfreq/Makefile3
-rw-r--r--sysutils/gkrellfire/Makefile3
-rw-r--r--sysutils/gkrellm2/Makefile3
-rw-r--r--sysutils/gstopd/Makefile3
-rw-r--r--sysutils/hatop/Makefile2
-rw-r--r--sysutils/heartbeat/Makefile3
-rw-r--r--sysutils/isc-cron/Makefile3
-rw-r--r--sysutils/ldapenter/Makefile2
-rw-r--r--sysutils/less/Makefile3
-rw-r--r--sysutils/libcdio-paranoia/Makefile3
-rw-r--r--sysutils/libcdio/Makefile3
-rw-r--r--sysutils/libchk/Makefile3
-rw-r--r--sysutils/mgeupsd/Makefile3
-rw-r--r--sysutils/mkntpwd/Makefile3
-rw-r--r--sysutils/mksunbootcd/Makefile2
-rw-r--r--sysutils/mountsmb2/Makefile3
-rw-r--r--sysutils/msktutil/Makefile2
-rw-r--r--sysutils/no-login/Makefile3
-rw-r--r--sysutils/open/Makefile2
-rw-r--r--sysutils/p5-BackupPC-XS/Makefile3
-rw-r--r--sysutils/p5-Filesys-DfPortable/Makefile1
-rw-r--r--sysutils/p5-Samba-SIDhelper/Makefile1
-rw-r--r--sysutils/p5-Sys-Filesystem/Makefile1
-rw-r--r--sysutils/p5-arclog/Makefile3
-rw-r--r--sysutils/p5-reslog/Makefile3
-rw-r--r--sysutils/paicc/Makefile3
-rw-r--r--sysutils/pdixtract/Makefile3
-rw-r--r--sysutils/polkit-kde/Makefile3
-rw-r--r--sysutils/py-danzfs/Makefile2
-rw-r--r--sysutils/radmind/Makefile3
-rw-r--r--sysutils/rdate/Makefile5
-rw-r--r--sysutils/rdiff-backup-devel/Makefile7
-rw-r--r--sysutils/rdiff-backup/Makefile7
-rw-r--r--sysutils/rfstool/Makefile2
-rw-r--r--sysutils/rsyncbackup/Makefile2
-rw-r--r--sysutils/samesame/Makefile3
-rw-r--r--sysutils/sformat/Makefile3
-rw-r--r--sysutils/slack/Makefile2
-rw-r--r--sysutils/superiotool/Makefile3
-rw-r--r--sysutils/symlinks/Makefile3
-rw-r--r--sysutils/symon/Makefile3
-rw-r--r--sysutils/thefish/Makefile3
-rw-r--r--sysutils/timemon/Makefile3
-rw-r--r--sysutils/ucspi-ssl-tls/Makefile3
-rw-r--r--sysutils/ucspi-ssl/Makefile3
-rw-r--r--sysutils/ucspi-tcp/Makefile9
-rw-r--r--sysutils/udfclient/Makefile5
-rw-r--r--sysutils/usermin/Makefile3
-rw-r--r--sysutils/vbetool/Makefile3
-rw-r--r--sysutils/whowatch/Makefile3
-rw-r--r--sysutils/wmbluecpu/Makefile3
-rw-r--r--sysutils/wmcube/Makefile3
-rw-r--r--sysutils/wmmemfree/Makefile3
-rw-r--r--sysutils/xe-guest-utilities/Makefile3
-rw-r--r--sysutils/xfsm/Makefile3
-rw-r--r--sysutils/xin/Makefile3
-rw-r--r--sysutils/xlogmaster/Makefile3
-rw-r--r--sysutils/xsysstats/Makefile3
-rw-r--r--sysutils/zisofs-tools/Makefile3
-rw-r--r--textproc/apache-poi/Makefile3
-rw-r--r--textproc/apache-solr/Makefile3
-rw-r--r--textproc/apache-solr3/Makefile3
-rw-r--r--textproc/aspell/Makefile.inc3
-rw-r--r--textproc/bibtool/Makefile3
-rw-r--r--textproc/bsddiff/Makefile3
-rw-r--r--textproc/bsdgrep/Makefile3
-rw-r--r--textproc/bsdsort/Makefile3
-rw-r--r--textproc/c2html/Makefile3
-rw-r--r--textproc/cdif/Makefile3
-rw-r--r--textproc/chm2pdf/Makefile2
-rw-r--r--textproc/docbook-utils/Makefile3
-rw-r--r--textproc/flip/Makefile3
-rw-r--r--textproc/foiltex/Makefile3
-rw-r--r--textproc/gladtex/Makefile3
-rw-r--r--textproc/groff/Makefile3
-rw-r--r--textproc/gtkspell/Makefile3
-rw-r--r--textproc/hhm/Makefile3
-rw-r--r--textproc/htdig/Makefile3
-rw-r--r--textproc/html2text/Makefile3
-rw-r--r--textproc/ibus-m17n/Makefile2
-rw-r--r--textproc/ibus-table/Makefile2
-rw-r--r--textproc/iksemel/Makefile2
-rw-r--r--textproc/irstlm/Makefile3
-rw-r--r--textproc/iso12083/Makefile3
-rw-r--r--textproc/iso8879/Makefile3
-rw-r--r--textproc/java2html/Makefile3
-rw-r--r--textproc/latex2html/Makefile3
-rw-r--r--textproc/liblrdf/Makefile2
-rw-r--r--textproc/libtext-charwidth-perl/Makefile3
-rw-r--r--textproc/libtext-wrapi18n-perl/Makefile3
-rw-r--r--textproc/ltxml/Makefile2
-rw-r--r--textproc/lucene/Makefile5
-rw-r--r--textproc/lucene4/Makefile3
-rw-r--r--textproc/lucene5/Makefile3
-rw-r--r--textproc/mdocml/Makefile3
-rw-r--r--textproc/mgdiff/Makefile3
-rw-r--r--textproc/muse/Makefile3
-rw-r--r--textproc/p5-Google-Data-JSON/Makefile2
-rw-r--r--textproc/p5-PPI-XS/Makefile3
-rw-r--r--textproc/p5-Pod-Strip/Makefile1
-rw-r--r--textproc/p5-String-BufferStack/Makefile1
-rw-r--r--textproc/p5-Text-FixEOL/Makefile1
-rw-r--r--textproc/p5-Text-Reform/Makefile1
-rw-r--r--textproc/p5-Text-Trim/Makefile1
-rw-r--r--textproc/p5-XML-DOM2/Makefile1
-rw-r--r--textproc/p5-XML-Parser-Style-EasyTree/Makefile1
-rw-r--r--textproc/p5-podlators/Makefile3
-rw-r--r--textproc/pdfgrep/Makefile3
-rw-r--r--textproc/pecl-ctemplate/Makefile3
-rw-r--r--textproc/perl2html/Makefile3
-rw-r--r--textproc/popup-stacks/Makefile1
-rw-r--r--textproc/ppower4/Makefile3
-rw-r--r--textproc/py-wordnet/Makefile1
-rw-r--r--textproc/py2html/Makefile3
-rw-r--r--textproc/randlm/Makefile3
-rw-r--r--textproc/ruby-escape/Makefile2
-rw-r--r--textproc/ruby-rttool/Makefile2
-rw-r--r--textproc/scr2txt/Makefile6
-rw-r--r--textproc/senna/Makefile3
-rw-r--r--textproc/sgmlformat/Makefile3
-rw-r--r--textproc/sgrep/Makefile3
-rw-r--r--textproc/sgrep2/Makefile3
-rw-r--r--textproc/source-highlight/Makefile3
-rw-r--r--textproc/txt2tags/Makefile5
-rw-r--r--textproc/uim-el/Makefile2
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--textproc/unroff/Makefile6
-rw-r--r--textproc/xalan-j/Makefile3
-rw-r--r--textproc/xerces-j/Makefile3
-rw-r--r--textproc/xhtml/Makefile3
-rw-r--r--vietnamese/unicode-uhoai/Makefile3
-rw-r--r--vietnamese/vis2u/Makefile3
-rw-r--r--vietnamese/vnconvert/Makefile3
-rw-r--r--vietnamese/vnroff/Makefile3
-rw-r--r--vietnamese/x-unikey/Makefile3
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/apache24/Makefile2
-rw-r--r--www/axis/Makefile9
-rw-r--r--www/bozohttpd/Makefile2
-rw-r--r--www/cgi-lib.pl/Makefile3
-rw-r--r--www/cgi-lib/Makefile3
-rw-r--r--www/cocoon/Makefile3
-rw-r--r--www/demoroniser/Makefile3
-rw-r--r--www/diamanda/Makefile2
-rw-r--r--www/dillo2/Makefile4
-rw-r--r--www/emacs-w3m/Makefile3
-rw-r--r--www/eventum/Makefile3
-rw-r--r--www/feedonfeeds/Makefile2
-rw-r--r--www/free-sa-devel/Makefile3
-rw-r--r--www/fswiki/Makefile3
-rw-r--r--www/fusionpbx/Makefile2
-rw-r--r--www/gaeo/Makefile2
-rw-r--r--www/geronimo/Makefile3
-rw-r--r--www/grr/Makefile3
-rw-r--r--www/gtkhtml3/Makefile3
-rw-r--r--www/guile-www/Makefile3
-rw-r--r--www/gurlchecker/Makefile3
-rw-r--r--www/htdigest/Makefile2
-rw-r--r--www/html2hdml/Makefile3
-rw-r--r--www/httpasyncclient/Makefile3
-rw-r--r--www/httpclient/Makefile3
-rw-r--r--www/httpcore/Makefile3
-rw-r--r--www/httpsqs/Makefile2
-rw-r--r--www/ikiwiki/Makefile2
-rw-r--r--www/jetty/Makefile3
-rw-r--r--www/jmeter/Makefile3
-rw-r--r--www/libapreq2/Makefile3
-rw-r--r--www/lighttpd-mod_geoip/Makefile3
-rw-r--r--www/lighttpd-mod_h264_streaming/Makefile3
-rw-r--r--www/mod_amazon_proxy/Makefile3
-rw-r--r--www/mod_asn/Makefile3
-rw-r--r--www/mod_auth_tkt/Makefile3
-rw-r--r--www/mod_authn_sasl/Makefile3
-rw-r--r--www/mod_fcgid/Makefile3
-rw-r--r--www/mod_jk/Makefile3
-rw-r--r--www/mod_memcache/Makefile2
-rw-r--r--www/mod_perl2/Makefile3
-rw-r--r--www/mod_python33/Makefile3
-rw-r--r--www/mod_python35/Makefile1
-rw-r--r--www/mod_qos/Makefile3
-rw-r--r--www/mod_remoteip/Makefile2
-rw-r--r--www/mod_reproxy/Makefile3
-rw-r--r--www/mod_rivet/Makefile3
-rw-r--r--www/mod_setenvifplus/Makefile3
-rw-r--r--www/mod_spdy/Makefile2
-rw-r--r--www/mod_vhost_ldap/Makefile3
-rw-r--r--www/myfaces/Makefile3
-rw-r--r--www/nginx-devel/Makefile12
-rw-r--r--www/nginx/Makefile12
-rw-r--r--www/p5-Apache-Clean2/Makefile3
-rw-r--r--www/p5-Ark/Makefile3
-rw-r--r--www/p5-CGI-Compress-Gzip/Makefile1
-rw-r--r--www/p5-CGI-Session-ExpireSessions/Makefile1
-rw-r--r--www/p5-CSS-DOM/Makefile1
-rw-r--r--www/p5-Catalyst-View-Jemplate/Makefile1
-rw-r--r--www/p5-Catalyst-View-XML-Simple/Makefile3
-rw-r--r--www/p5-Data-Validate-URI/Makefile1
-rw-r--r--www/p5-HTML-FromANSI/Makefile1
-rw-r--r--www/p5-HTTP-Response-Encoding/Makefile1
-rw-r--r--www/p5-HTTP-Server-Simple-Static/Makefile1
-rw-r--r--www/p5-LWP-UserAgent-POE/Makefile1
-rw-r--r--www/p5-Net-Trac/Makefile1
-rw-r--r--www/p5-PodToHTML/Makefile3
-rw-r--r--www/p5-Template-Plugin-FillInForm/Makefile1
-rw-r--r--www/p5-TestGen4Web-Runner/Makefile3
-rw-r--r--www/p5-URI-Title/Makefile1
-rw-r--r--www/p5-WWW-DHL/Makefile1
-rw-r--r--www/p5-WebService-Google-Sets/Makefile1
-rw-r--r--www/p5-chklinks/Makefile3
-rw-r--r--www/p5-libapreq2/Makefile3
-rw-r--r--www/phpgroupware/Makefile3
-rw-r--r--www/py-HTMLgen/Makefile3
-rw-r--r--www/py-apachelog/Makefile2
-rw-r--r--www/py-django-app-plugins/Makefile2
-rw-r--r--www/py-django-classy-tags/Makefile3
-rw-r--r--www/py-django-livesettings/Makefile3
-rw-r--r--www/py-formalchemy/Makefile2
-rw-r--r--www/py-pywebdav/Makefile4
-rw-r--r--www/py-recaptcha/Makefile3
-rw-r--r--www/py-utidy/Makefile3
-rw-r--r--www/py-wikitools/Makefile2
-rw-r--r--www/py-wsgiauth/Makefile3
-rw-r--r--www/pylot/Makefile2
-rw-r--r--www/sahi/Makefile3
-rw-r--r--www/samidare/Makefile2
-rw-r--r--www/selenium/Makefile3
-rw-r--r--www/sitecopy/Makefile3
-rw-r--r--www/smb_auth/Makefile3
-rw-r--r--www/squid/Makefile1
-rw-r--r--www/squidstats/Makefile2
-rw-r--r--www/tclhttpd/Makefile3
-rw-r--r--www/tengine/Makefile12
-rw-r--r--www/testlink/Makefile3
-rw-r--r--www/thundercache/Makefile2
-rw-r--r--www/thundersnarf/Makefile2
-rw-r--r--www/tidy-devel/Makefile3
-rw-r--r--www/tinytinyhttpd/Makefile3
-rw-r--r--www/trac-accountmanager/Makefile3
-rw-r--r--www/trac-discussion/Makefile3
-rw-r--r--www/trac-downloads/Makefile3
-rw-r--r--www/trac-fivestarvote/Makefile3
-rw-r--r--www/trac-fullblog/Makefile3
-rw-r--r--www/trac-fullblognotification/Makefile3
-rw-r--r--www/trac-graphviz/Makefile3
-rw-r--r--www/trac-math/Makefile3
-rw-r--r--www/trac-navadd/Makefile3
-rw-r--r--www/trac-pydotorgtheme/Makefile3
-rw-r--r--www/trac-tags/Makefile3
-rw-r--r--www/trac-ticketimport/Makefile3
-rw-r--r--www/trac-vote/Makefile3
-rw-r--r--www/trac-wikitopdf/Makefile3
-rw-r--r--www/twiki-BugzillaLinkPlugin/Makefile2
-rw-r--r--www/twiki-GluePlugin/Makefile2
-rw-r--r--www/twiki-LdapContrib/Makefile2
-rw-r--r--www/twiki-LdapNgPlugin/Makefile2
-rw-r--r--www/twiki-MathModePlugin/Makefile2
-rw-r--r--www/twiki-NewUserPlugin/Makefile2
-rw-r--r--www/uwsgitop/Makefile3
-rw-r--r--www/webcopy/Makefile3
-rw-r--r--www/webcrawl/Makefile3
-rw-r--r--www/websh/Makefile3
-rw-r--r--www/wml/Makefile3
-rw-r--r--www/xpi-adblock/Makefile.xpi6
-rw-r--r--www/xpi-conkeror/Makefile5
-rw-r--r--www/xpi-delicious/Makefile3
-rw-r--r--www/xpi-downthemall/Makefile3
-rw-r--r--x11-clocks/alltraxclock/Makefile3
-rw-r--r--x11-clocks/asclock-xlib/Makefile3
-rw-r--r--x11-clocks/asclock/Makefile3
-rw-r--r--x11-clocks/bclock/Makefile3
-rw-r--r--x11-clocks/mouseclock/Makefile3
-rw-r--r--x11-clocks/osdclock/Makefile3
-rw-r--r--x11-clocks/pclock/Makefile2
-rw-r--r--x11-clocks/swisswatch/Makefile2
-rw-r--r--x11-clocks/wmblueclock/Makefile3
-rw-r--r--x11-clocks/wmtimer/Makefile3
-rw-r--r--x11-clocks/xdaliclock/Makefile1
-rw-r--r--x11-fm/asfiles/Makefile3
-rw-r--r--x11-fm/doublecmd/Makefile2
-rw-r--r--x11-fonts/charis-compact/Makefile1
-rw-r--r--x11-fonts/charis/Makefile1
-rw-r--r--x11-fonts/doulos-compact/Makefile1
-rw-r--r--x11-fonts/font-manager/Makefile2
-rw-r--r--x11-fonts/gfe/Makefile3
-rw-r--r--x11-fonts/gnu-unifont-ttf/Makefile3
-rw-r--r--x11-fonts/gnu-unifont/Makefile3
-rw-r--r--x11-fonts/hanazono-fonts-ttf/Makefile3
-rw-r--r--x11-fonts/intlfonts/Makefile3
-rw-r--r--x11-fonts/liberation-fonts-ttf/Makefile3
-rw-r--r--x11-fonts/mkbold/Makefile2
-rw-r--r--x11-fonts/mkitalic/Makefile2
-rw-r--r--x11-fonts/nexfontsel/Makefile3
-rw-r--r--x11-fonts/p5-type1inst/Makefile3
-rw-r--r--x11-fonts/paratype/Makefile1
-rw-r--r--x11-fonts/terminus-font/Makefile2
-rw-r--r--x11-fonts/tkfont/Makefile3
-rw-r--r--x11-servers/xorg-nestserver/Makefile3
-rw-r--r--x11-servers/xorg-server/Makefile3
-rw-r--r--x11-servers/xorg-vfbserver/Makefile3
-rw-r--r--x11-themes/beastie/Makefile3
-rw-r--r--x11-themes/clearlooks-metacity/Makefile3
-rw-r--r--x11-themes/gnome-icons-aqua-fusion/Makefile3
-rw-r--r--x11-themes/gnome-icons-faenza/Makefile2
-rw-r--r--x11-themes/gnome-icons-gentoo-test/Makefile3
-rw-r--r--x11-themes/gnome-icons-iris/Makefile3
-rw-r--r--x11-themes/gnome-icons-noia-warm/Makefile3
-rw-r--r--x11-themes/gnome-icons-refined/Makefile3
-rw-r--r--x11-themes/gnome-icons-slick/Makefile3
-rw-r--r--x11-themes/gnome-icons-snow-apple/Makefile3
-rw-r--r--x11-themes/gnome-icons-stylish/Makefile3
-rw-r--r--x11-themes/gnome-icons-ximian-south/Makefile3
-rw-r--r--x11-themes/gtk-aqualightblue-theme/Makefile3
-rw-r--r--x11-themes/gtk-engines2/Makefile3
-rw-r--r--x11-themes/gtk-flat-theme2/Makefile3
-rw-r--r--x11-themes/gtk-murrina-aqua/Makefile3
-rw-r--r--x11-themes/gtk-oxygen-engine/Makefile3
-rw-r--r--x11-themes/gtk-qt4-engine/Makefile2
-rw-r--r--x11-themes/gtk3-oxygen-engine/Makefile3
-rw-r--r--x11-themes/icon-naming-utils/Makefile2
-rw-r--r--x11-themes/icons-tango-extras/Makefile3
-rw-r--r--x11-themes/icons-tango/Makefile2
-rw-r--r--x11-themes/irssi-themes/Makefile1
-rw-r--r--x11-themes/kde-gtk-config/Makefile3
-rw-r--r--x11-themes/kde-icons-gartoon-blue-svg/Makefile3
-rw-r--r--x11-themes/kde-icons-gartoon-svg/Makefile3
-rw-r--r--x11-themes/kde-icons-kool-gorilla/Makefile3
-rw-r--r--x11-themes/kde-icons-noia/Makefile5
-rw-r--r--x11-themes/kde-icons-nuvola/Makefile3
-rw-r--r--x11-themes/metacity-themes/Makefile.metacity3
-rw-r--r--x11-themes/openbox-themes/Makefile3
-rw-r--r--x11-toolkits/attica/Makefile3
-rw-r--r--x11-toolkits/gal2/Makefile3
-rw-r--r--x11-toolkits/gnustep-gui/Makefile3
-rw-r--r--x11-toolkits/gtk12/Makefile3
-rw-r--r--x11-toolkits/gtk20/Makefile3
-rw-r--r--x11-toolkits/gtk30/Makefile3
-rw-r--r--x11-toolkits/gtksourceview2/Makefile3
-rw-r--r--x11-toolkits/linux-c6-qt47-x11/Makefile3
-rw-r--r--x11-toolkits/linux-f10-pango/Makefile4
-rw-r--r--x11-toolkits/py-gnome2/Makefile3
-rw-r--r--x11-toolkits/py-gtk2/Makefile3
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile3
-rw-r--r--x11-toolkits/py-tkinter/Makefile3
-rw-r--r--x11-toolkits/slingshot/Makefile3
-rw-r--r--x11-toolkits/swt-devel/Makefile3
-rw-r--r--x11-toolkits/swt/Makefile5
-rw-r--r--x11-toolkits/tk84/Makefile4
-rw-r--r--x11-toolkits/tk85/Makefile4
-rw-r--r--x11-toolkits/tk86/Makefile4
-rw-r--r--x11-toolkits/tktray/Makefile2
-rw-r--r--x11-toolkits/vte290/Makefile1
-rw-r--r--x11-toolkits/vte3/Makefile3
-rw-r--r--x11-toolkits/xforms/Makefile3
-rw-r--r--x11-toolkits/xview-clients/Makefile3
-rw-r--r--x11-toolkits/xview/Makefile3
-rw-r--r--x11-wm/afterstep-stable/Makefile3
-rw-r--r--x11-wm/afterstep/Makefile3
-rw-r--r--x11-wm/euclid-wm/Makefile2
-rw-r--r--x11-wm/fluxbox/Makefile4
-rw-r--r--x11-wm/libdockapp/Makefile3
-rw-r--r--x11-wm/libwraster/Makefile3
-rw-r--r--x11-wm/olvwm/Makefile7
-rw-r--r--x11-wm/ratpoison/Makefile4
-rw-r--r--x11-wm/tvtwm/Makefile3
-rw-r--r--x11-wm/windowmaker/Makefile3
-rw-r--r--x11-wm/wmanager/Makefile2
-rw-r--r--x11/9box/Makefile3
-rw-r--r--x11/9menu/Makefile2
-rw-r--r--x11/arandr/Makefile2
-rw-r--r--x11/blast/Makefile3
-rw-r--r--x11/erun/Makefile3
-rw-r--r--x11/fbdesk/Makefile2
-rw-r--r--x11/hotwire-shell/Makefile2
-rw-r--r--x11/kb2mb2/Makefile2
-rw-r--r--x11/keybinder-gtk3/Makefile2
-rw-r--r--x11/keybinder/Makefile2
-rw-r--r--x11/props/Makefile3
-rw-r--r--x11/qimageblitz/Makefile3
-rw-r--r--x11/sxpc/Makefile3
-rw-r--r--x11/wbar/Makefile2
-rw-r--r--x11/wdm/Makefile3
-rw-r--r--x11/wmcliphist/Makefile3
-rw-r--r--x11/xautolock/Makefile3
-rw-r--r--x11/xbanner/Makefile3
-rw-r--r--x11/xcmd/Makefile3
-rw-r--r--x11/xcolors/Makefile3
-rw-r--r--x11/xfce4-whiskermenu-plugin/Makefile3
-rw-r--r--x11/xgrab/Makefile3
-rw-r--r--x11/xidle/Makefile3
-rw-r--r--x11/xkbctrl/Makefile3
-rw-r--r--x11/xkeyboard-config/Makefile2
-rw-r--r--x11/xloadimage/Makefile2
-rw-r--r--x11/xmon/Makefile3
-rw-r--r--x11/xprompt/Makefile3
-rw-r--r--x11/xpyb/Makefile3
-rw-r--r--x11/xtacy/Makefile3
-rw-r--r--x11/xtoolwait/Makefile3
-rw-r--r--x11/xwatchwin/Makefile3
-rw-r--r--x11/xzoom/Makefile3
1814 files changed, 1845 insertions, 3433 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 8d13d9027a5c..0940b9d56295 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1345,13 +1345,16 @@ MASTER_SITES_SUBDIRS= APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \
DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
FARSIGHT:${PORTNAME} \
+ FESTIVAL:${PORTVERSION} \
GCC:releases/${DISTNAME} \
+ GENTOO:distfiles \
+ GIMP:${PORTNAME}/${PORTVERSION:R}/ \
GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/ \
GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \
GITHUB_LEGACY:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/ \
GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
- GIMP:${PORTNAME}/${PORTVERSION:R}/ \
GNU:${PORTNAME} \
+ GNUPG:${PORTNAME} \
GNU_ALPHA:${PORTNAME} \
HORDE:${PORTNAME} \
LIBREOFFICE_DEV:${PORTNAME} \
@@ -1359,6 +1362,8 @@ MASTER_SITES_SUBDIRS= APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
MOZDEV:${PORTNAME:tl} \
NETLIB:${PORTNAME} \
PERL_CPAN:${PORTNAME:C/-.*//} \
+ QT:archive/qt/${PORTVERSION:R} \
+ SAMBA:${PORTNAME} \
SAVANNAH:${PORTNAME:tl} \
SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} \
XFCE:xfce/${XFCE_MASTER_SITE_VER}/src
@@ -1385,11 +1390,13 @@ _site_group_= ${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://}
_site_url_= ${_abbrev_:C/.*://}
. endif
. endfor
-. for _subdir_ in ${MASTER_SITES_SUBDIRS}
-. if ${_site_url_} == ${_subdir_:C/:.*//} && !defined(MASTER_SITE_SUBDIR)
+. if !defined(MASTER_SITE_SUBDIR)
+. for _subdir_ in ${MASTER_SITES_SUBDIRS}
+. if ${_site_url_} == ${_subdir_:C/:.*//}
_site_subdir_?= ${_subdir_:C/.*://}
-. endif
-. endfor
+. endif
+. endfor
+. endif
. ifdef MASTER_SITE_${_site_url_}
. ifdef _site_subdir_
MASTER_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//}
@@ -1426,11 +1433,13 @@ _site_group_= ${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://}
_site_url_= ${_abbrev_:C/.*://}
. endif
. endfor
-. for _subdir_ in ${MASTER_SITES_SUBDIRS}
-. if ${_site_url_} == ${_subdir_:C/:.*//} && !defined(MASTER_SITE_SUBDIR)
+. if !defined(MASTER_SITE_SUBDIR)
+. for _subdir_ in ${MASTER_SITES_SUBDIRS}
+. if ${_site_url_} == ${_subdir_:C/:.*//}
_site_subdir_?= ${_subdir_:C/.*://}
-. endif
-. endfor
+. endif
+. endfor
+. endif
. ifdef MASTER_SITE_${_site_url_}
. ifdef _site_subdir_
PATCH_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//}
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index 5c2f8466f43a..679a637bebe7 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -6,8 +6,7 @@ PORTNAME= atspi
PORTVERSION= 2.12.0
PORTREVISION= 3
CATEGORIES= accessibility x11-toolkits python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyatspi-${PORTVERSION}
DIST_SUBDIR= gnome3
diff --git a/accessibility/py3-atspi/Makefile b/accessibility/py3-atspi/Makefile
index ab93b6a59d41..a8aeef751278 100644
--- a/accessibility/py3-atspi/Makefile
+++ b/accessibility/py3-atspi/Makefile
@@ -6,8 +6,7 @@ PORTNAME= atspi
PORTVERSION= 2.12.0
PORTREVISION= 2
CATEGORIES= accessibility x11-toolkits python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyatspi-${PORTVERSION}
DIST_SUBDIR= gnome3
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 366cffde8883..26982354af4d 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -4,7 +4,7 @@
PORTNAME= dpkg
PORTVERSION= 1.17.25
CATEGORIES= archivers sysutils
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= dpkg_${PORTVERSION}
MAINTAINER= pawel@FreeBSD.org
diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index 0f7c25175a23..699decb81259 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -4,8 +4,7 @@
PORTNAME= fastjar
PORTVERSION= 0.93.20060808
CATEGORIES= archivers java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= maho/fastjar
+MASTER_SITES= LOCAL/maho/fastjar
MAINTAINER= maho@FreeBSD.org
COMMENT= Version of JDK's `jar' command written entirely in C
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 75146f8b8fb1..6ebbf11bf39d 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -4,8 +4,7 @@ PORTNAME= cpio
PORTVERSION= 2.11
PORTREVISION= 3
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMEPREFIX= g
MAINTAINER= naddy@FreeBSD.org
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile
index c99e0baceb64..d524d4bcc6f7 100644
--- a/archivers/lbrate/Makefile
+++ b/archivers/lbrate/Makefile
@@ -5,8 +5,7 @@ PORTNAME= lbrate
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
MAINTAINER= ports@FreeBSD.org
COMMENT= Extract/decompress CP/M LBR archives
diff --git a/archivers/lha-ac/Makefile b/archivers/lha-ac/Makefile
index 7fcd589df0ec..3d6953b1eabd 100644
--- a/archivers/lha-ac/Makefile
+++ b/archivers/lha-ac/Makefile
@@ -4,9 +4,8 @@ PORTNAME= lha
PORTVERSION= 1.14i
PORTREVISION= 10
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} \
- http://osdn.dl.sourceforge.jp/%SUBDIR%/
-MASTER_SITE_SUBDIR= lha/22231
+MASTER_SITES= SFJP/lha/22231 \
+ http://osdn.dl.sourceforge.jp/lha/22231/
PKGNAMESUFFIX= -ac${PKGNAMESUFFIX2}
DISTNAME= ${PORTNAME}-${PORTVERSION}-ac20050924p1
diff --git a/archivers/macutils/Makefile b/archivers/macutils/Makefile
index 043701a20a2b..ca6342720d91 100644
--- a/archivers/macutils/Makefile
+++ b/archivers/macutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= macutils
PORTVERSION= 2.0b3
CATEGORIES= archivers emulators
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index daa240938663..c9b29c52072b 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mscompress
PORTVERSION= 0.3
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
MAINTAINER= tj@FreeBSD.org
COMMENT= Microsoft "compress.exe/expand.exe" compatible (de)compressor
diff --git a/archivers/mtf/Makefile b/archivers/mtf/Makefile
index 7727c68e5c49..1fa7df8303d6 100644
--- a/archivers/mtf/Makefile
+++ b/archivers/mtf/Makefile
@@ -5,15 +5,14 @@ PORTNAME= mtf
PORTVERSION= 0.2.1
PORTREVISION= 1
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/backup
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SUNSITE/system/backup
MAINTAINER= ports@FreeBSD.org
COMMENT= Unix reader for the Microsoft Tape Format used by NT Backup
LICENSE= GPLv2
+USES= tar:tgz
ALL_TARGET= # empty
PLIST_FILES= bin/mtf
PORTDOCS= README
diff --git a/archivers/nomarch/Makefile b/archivers/nomarch/Makefile
index 126dc359e4b7..cc3ac463f0a0 100644
--- a/archivers/nomarch/Makefile
+++ b/archivers/nomarch/Makefile
@@ -4,8 +4,7 @@
PORTNAME= nomarch
PORTVERSION= 1.4
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
MAINTAINER= gabor@FreeBSD.org
COMMENT= Extracts files from the old '.arc' archive format
diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile
index ca36aa3484cf..1c664818652c 100644
--- a/archivers/nulib/Makefile
+++ b/archivers/nulib/Makefile
@@ -4,14 +4,13 @@
PORTNAME= nulib
PORTVERSION= 3.25
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jseger
+MASTER_SITES= LOCAL/jseger
DISTNAME= nulib325
-EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
COMMENT= NuFX archive utility
+USES= tar:Z
WRKSRC= ${WRKDIR}/nulib
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/archivers/p5-IO-Zlib/Makefile b/archivers/p5-IO-Zlib/Makefile
index a005b417bdb0..684a2e0e9466 100644
--- a/archivers/p5-IO-Zlib/Makefile
+++ b/archivers/p5-IO-Zlib/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 1.10
PORTREVISION= 2
CATEGORIES= archivers perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= IO
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/archivers/packddir/Makefile b/archivers/packddir/Makefile
index d6d5dea9444d..bb62ed979578 100644
--- a/archivers/packddir/Makefile
+++ b/archivers/packddir/Makefile
@@ -4,8 +4,7 @@
PORTNAME= packddir
PORTVERSION= 0.0.6
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
DISTNAME= upackddir_${PORTVERSION}-1
MAINTAINER= ayu@commun.jp
diff --git a/archivers/php5-snappy/Makefile b/archivers/php5-snappy/Makefile
index 75bbbb3ab005..aaf0a5de4f5b 100644
--- a/archivers/php5-snappy/Makefile
+++ b/archivers/php5-snappy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= php5-snappy
PORTVERSION= 0.0.2
PORTREVISION= 1
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PROJECTHOST= php-snappy
DISTNAME= ${PROJECTHOST}-${PORTVERSION}
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 50d15401ad68..4a761db761a7 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -4,16 +4,15 @@
PORTNAME= ppunpack
PORTVERSION= 1.0
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= thierry
+MASTER_SITES= LOCAL/thierry
DISTNAME= ppsmall-${PORTVERSION}
-EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
COMMENT= Decompresses Amiga PowerPacker files
NO_CDROM= No commercial redistribution
+USES= tar:Z
WRKSRC= ${WRKDIR}/PPUnpack
MAKE_ARGS= CC="${CC}" COPTS="${CFLAGS}"
PLIST_FILES= bin/ppunpack
diff --git a/archivers/pxz/Makefile b/archivers/pxz/Makefile
index f0cb2f9728c0..56576c6acd09 100644
--- a/archivers/pxz/Makefile
+++ b/archivers/pxz/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pxz
PORTVERSION= 0.20141018
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= delphij
+MASTER_SITES= LOCAL/delphij
DISTNAME= pxz-git-${PORTVERSION:S/0.//}
MAINTAINER= ports@FreeBSD.org
diff --git a/archivers/py-liblzma/Makefile b/archivers/py-liblzma/Makefile
index 0dd30918e58a..6a601fa8997d 100644
--- a/archivers/py-liblzma/Makefile
+++ b/archivers/py-liblzma/Makefile
@@ -5,8 +5,7 @@ PORTNAME= liblzma
PORTVERSION= 0.5.3
PORTREVISION= 4
CATEGORIES= archivers python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/p/py${PORTNAME}
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
diff --git a/archivers/rzip/Makefile b/archivers/rzip/Makefile
index 0d818fa75bd3..3c187ba4bd8d 100644
--- a/archivers/rzip/Makefile
+++ b/archivers/rzip/Makefile
@@ -4,8 +4,7 @@
PORTNAME= rzip
PORTVERSION= 2.1
CATEGORIES= archivers
-MASTER_SITES= SAMBA
-MASTER_SITE_SUBDIR= rzip
+MASTER_SITES= SAMBA/rzip
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Compression program similar to gzip or bzip2
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index b7f30c88b46f..b9abc4ab9296 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -5,8 +5,7 @@ PORTNAME= unace
PORTVERSION= 1.2b
PORTREVISION= 3
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+MASTER_SITES= SUNSITE/utils/compress
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Extract, view & test ACE archives
diff --git a/archivers/wzip/Makefile b/archivers/wzip/Makefile
index 6a18db3bdb16..d0e8db394c92 100644
--- a/archivers/wzip/Makefile
+++ b/archivers/wzip/Makefile
@@ -4,7 +4,7 @@
PORTNAME= wzip
PORTVERSION= 1.1.1
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= onatan@gmail.com
diff --git a/archivers/xar/Makefile b/archivers/xar/Makefile
index 40e3fbe7abc6..15d5d0af4415 100644
--- a/archivers/xar/Makefile
+++ b/archivers/xar/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xar
PORTVERSION= 1.5.2
PORTREVISION= 2
CATEGORIES= archivers
-MASTER_SITES= GOOGLE_CODE GENTOO/distfiles
+MASTER_SITES= GOOGLE_CODE GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= OpenDarwin XML eXtensible ARchiver
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 80b507909bf3..79da256d1c64 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xarchiver
PORTVERSION= 0.5.4
CATEGORIES= archivers
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}
+MASTER_SITES= SF/${PORTNAME:tl}
MAINTAINER= danilo@FreeBSD.org
COMMENT= Desktop-agnostic GTK+2 frontend to various archiving tools
diff --git a/archivers/zipper/Makefile b/archivers/zipper/Makefile
index 6cc8b868fbfd..5a2a3b493d0b 100644
--- a/archivers/zipper/Makefile
+++ b/archivers/zipper/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zipper
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= archivers gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= Zipper-${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
diff --git a/archivers/zopfli/Makefile b/archivers/zopfli/Makefile
index dc0680ba8065..1f8a5948cfe3 100644
--- a/archivers/zopfli/Makefile
+++ b/archivers/zopfli/Makefile
@@ -4,7 +4,7 @@
PORTNAME= zopfli
PORTVERSION= 1.0.0
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= freebsd@nagilum.org
COMMENT= Zopfli Compression Algorithm
diff --git a/astro/ephem/Makefile b/astro/ephem/Makefile
index 5fe89f810bcb..2ed2f24aa5a3 100644
--- a/astro/ephem/Makefile
+++ b/astro/ephem/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ephem
PORTVERSION= 4.28
PORTREVISION= 1
CATEGORIES= astro
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= trevor
+MASTER_SITES= LOCAL/trevor
DISTNAME= ${PORTNAME}_${PORTVERSION}_unix
MAINTAINER= slaven@rezic.de
diff --git a/astro/libgal/Makefile b/astro/libgal/Makefile
index 0da2f6b41d6f..e2b9d377c10b 100644
--- a/astro/libgal/Makefile
+++ b/astro/libgal/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.5.0
PORTREVISION= 1
CATEGORIES= astro hamradio
MASTER_SITES= http://homepage.mac.com/pclwillmott/GAL/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= db@FreeBSD.org
COMMENT= General Astrodynamics Library
diff --git a/astro/mymoon/Makefile b/astro/mymoon/Makefile
index 9298a60cd2f6..d1e5152698f8 100644
--- a/astro/mymoon/Makefile
+++ b/astro/mymoon/Makefile
@@ -6,8 +6,7 @@ DISTVERSION= 1.2a
PORTREVISION= 5
CATEGORIES= astro
MASTER_SITES= http://makemebad.net/geek/codes/${PORTNAME}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= krion
+ LOCAL/krion
MAINTAINER= ports@FreeBSD.org
COMMENT= Show latitude and longitude of the moon
diff --git a/astro/p5-Astro-ADS/Makefile b/astro/p5-Astro-ADS/Makefile
index 811064323583..f769daf94d7c 100644
--- a/astro/p5-Astro-ADS/Makefile
+++ b/astro/p5-Astro-ADS/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.26
PORTREVISION= 1
CATEGORIES= astro perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Astro
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Astro-DSS/Makefile b/astro/p5-Astro-DSS/Makefile
index 8c1aab2c4548..649b8c272447 100644
--- a/astro/p5-Astro-DSS/Makefile
+++ b/astro/p5-Astro-DSS/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.6.1
PORTREVISION= 1
CATEGORIES= astro perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Astro
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Astro-SIMBAD/Makefile b/astro/p5-Astro-SIMBAD/Makefile
index 5220342b1173..53e1c425f15a 100644
--- a/astro/p5-Astro-SIMBAD/Makefile
+++ b/astro/p5-Astro-SIMBAD/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.0.0
PORTREVISION= 1
CATEGORIES= astro perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Astro
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Astro-SunTime/Makefile b/astro/p5-Astro-SunTime/Makefile
index 8bf6514dbc17..f6aac1359d58 100644
--- a/astro/p5-Astro-SunTime/Makefile
+++ b/astro/p5-Astro-SunTime/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= astro perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Astro
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/p5-Geo-METAR/Makefile b/astro/p5-Geo-METAR/Makefile
index 2b15d558e0ec..fc00b3479292 100644
--- a/astro/p5-Geo-METAR/Makefile
+++ b/astro/p5-Geo-METAR/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.15
PORTREVISION= 1
CATEGORIES= astro geography perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Geo
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/astro/planets/Makefile b/astro/planets/Makefile
index cc3976c63644..a3b58ecc994a 100644
--- a/astro/planets/Makefile
+++ b/astro/planets/Makefile
@@ -5,7 +5,7 @@ PORTNAME= planets
PORTVERSION= 0.1.13
PORTREVISION= 1
CATEGORIES= astro
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://planets.homedns.org/dist/
MAINTAINER= ports@FreeBSD.org
diff --git a/astro/xworld/Makefile b/astro/xworld/Makefile
index d38ecd74765e..950198bd1a18 100644
--- a/astro/xworld/Makefile
+++ b/astro/xworld/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xworld
PORTVERSION= 2.0
PORTREVISION= 2
CATEGORIES= astro geography
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= naddy
+MASTER_SITES= LOCAL/naddy
MAINTAINER= naddy@FreeBSD.org
COMMENT= Earth as seen from the direction of the sun
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 0e97eaeed6ab..df97ad9e32b2 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -5,7 +5,7 @@ PORTNAME= alsa-lib
PORTVERSION= 1.0.29
CATEGORIES= audio
MASTER_SITES= ALSA/lib \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= ALSA compatibility library
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index e38153b5ec16..63be5ff70713 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -5,7 +5,7 @@ PORTNAME= alsa-plugins
PORTVERSION= 1.0.29
CATEGORIES= audio
MASTER_SITES= ALSA/plugins \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= ALSA compatibility library plugins
diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index e09a17400f33..3144452753f3 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -5,7 +5,7 @@ PORTNAME= alsa-utils
PORTVERSION= 1.0.29
CATEGORIES= audio
MASTER_SITES= ALSA/utils \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= ALSA compatibility utils
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 0860f5ad0758..319140cfadc5 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,8 +5,7 @@ PORTNAME= amarok
PORTVERSION= 2.8.0
PORTREVISION= 5
CATEGORIES= audio kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE music player
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 03452d095be6..2be9f375c9ae 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -5,8 +5,7 @@ PORTNAME= beast
PORTVERSION= 0.7.8
PORTREVISION= 8
CATEGORIES= audio
-MASTER_SITES= http://dist.testbit.eu/beast/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${PORTVERSION:R}
+MASTER_SITES= http://dist.testbit.eu/beast/v${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful music composition and modular synthesis application
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index 548e4e605efe..f404a59b8c10 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cam
PORTVERSION= 1.02
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= SUNSITE/apps/sound/mixers
MAINTAINER= ports@FreeBSD.org
COMMENT= Cpu's Audio Mixer [curses based]
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index b6cf09bc9229..4bd8dd1fc775 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ccaudio2
PORTVERSION= 2.1.3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=ccaudio
+MASTER_SITES= GNU/ccaudio
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ class framework for manipulating audio files
diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile
index 71a3e8eb378f..4f7aa634cdbc 100644
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cdplay
PORTVERSION= 0.92
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dannyboy
+MASTER_SITES= LOCAL/dannyboy
MAINTAINER= ports@FreeBSD.org
COMMENT= CD-player with text-based user interface
diff --git a/audio/dagrab/Makefile b/audio/dagrab/Makefile
index 8626b2d65e93..7950091ac75f 100644
--- a/audio/dagrab/Makefile
+++ b/audio/dagrab/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dagrab
PORTVERSION= 0.3.5
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/cdrom
+MASTER_SITES= SUNSITE/apps/sound/cdrom
MAINTAINER= clkao@CirX.ORG
COMMENT= Read audio tracks from a CD into wav sound files
diff --git a/audio/dir2ogg/Makefile b/audio/dir2ogg/Makefile
index 7e1b5e0a650c..549ea09cff5e 100644
--- a/audio/dir2ogg/Makefile
+++ b/audio/dir2ogg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dir2ogg
PORTVERSION= 0.11.8
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= http://jak-linux.org/projects/dir2ogg/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION:R}
+MASTER_SITES= http://jak-linux.org/projects/dir2ogg/${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Command-line {wav,mp3,m4a} to ogg converter
diff --git a/audio/dtmfdial/Makefile b/audio/dtmfdial/Makefile
index d795e22ffed3..2f9dd0407eeb 100644
--- a/audio/dtmfdial/Makefile
+++ b/audio/dtmfdial/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dtmfdial
PORTVERSION= 0.2
CATEGORIES= audio comms
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/misc
+MASTER_SITES= SUNSITE/apps/sound/misc
DISTNAME= dtmf-dial-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/eawpats/Makefile b/audio/eawpats/Makefile
index 1df50f89be0c..3917c902ef1d 100644
--- a/audio/eawpats/Makefile
+++ b/audio/eawpats/Makefile
@@ -5,7 +5,7 @@ PORTNAME= eawpats
PORTVERSION= 12
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
DISTNAME= eawpats12_full
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/eawplus/Makefile b/audio/eawplus/Makefile
index 934c19632346..149285072e76 100644
--- a/audio/eawplus/Makefile
+++ b/audio/eawplus/Makefile
@@ -5,8 +5,7 @@ PORTNAME= eawplus
PORTVERSION= 12.1
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nork
+MASTER_SITES= LOCAL/nork
MAINTAINER= ports@FreeBSD.org
COMMENT= E.A.W.+Izumo+Tamuki collection of Gravis Ultrasound MIDI patches
diff --git a/audio/etcd/Makefile b/audio/etcd/Makefile
index c9aab0c35f58..d82bcab65ed5 100644
--- a/audio/etcd/Makefile
+++ b/audio/etcd/Makefile
@@ -5,10 +5,9 @@ PORTNAME= etcd
PORTVERSION= 1.0.1
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/gahr \
http://people.freebsd.org/~gahr/distfiles/ \
http://www.gahr.ch/etcd/
-MASTER_SITE_SUBDIR= gahr
MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced Tiny CD, a simple ncurses-based CD player
diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index 293f1246bed4..5f86c4179c01 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= festdoc
PORTVERSION= 1.4.0.1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DIST_SUBDIR= festival
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 2894748bc6c6..2c108c8175b8 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festival
PORTVERSION= 2.1
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTFILES= ${DISTNAME}-release.tar.gz \
speech_tools-${PORTVERSION}-release.tar.gz
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index 50a913fe42b7..86ba7d5eb761 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -4,8 +4,7 @@
PORTNAME= festlex-cmu
PORTVERSION= 1.95
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festlex_CMU
DIST_SUBDIR= festival
EXTRACT_ONLY=
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index 439978bc731d..e8c165f78a26 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festlex-oald
PORTVERSION= 1.4.1
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festlex_OALD
DIST_SUBDIR= festival
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index 75df1ab1ac45..cdb864b0150d 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festlex-poslex
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festlex_POSLEX
DIST_SUBDIR= festival
EXTRACT_ONLY=
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index f648062222b3..9561491d6435 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-don
PORTVERSION= 1.4.0
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_don
DIST_SUBDIR= festival
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 9f97a5ab394c..f65d5217afb2 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-el11
PORTVERSION= 1.4.0
PORTREVISION= 2
CATEGORIES= audio accessibility spanish
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.95
+MASTER_SITES= FESTIVAL/1.95
DISTNAME= festvox_ellpc11k
DIST_SUBDIR= festival
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 6e020d806884..cef597111442 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -4,8 +4,7 @@
PORTNAME= festvox-kal16
PORTVERSION= 1.4.0
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kallpc16k
DIST_SUBDIR= festival
EXTRACT_ONLY=
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index d9b9517312c4..21307d7f9510 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-kal8
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kallpc8k
DIST_SUBDIR= festival
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index 157355703ece..a8ac324ceb8b 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-ked16
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kedlpc16k
DIST_SUBDIR= festival
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index d336a7d75419..0cd4d5c9ed62 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-ked8
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kedlpc8k
DIST_SUBDIR= festival
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 3ad716b786f1..0801dd8a6b16 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-rab16
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festvox_rablpc16k
DIST_SUBDIR= festival
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 2bfd06b83c75..16ebfc65235c 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-rab8
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festvox_rablpc8k
DIST_SUBDIR= festival
diff --git a/audio/festvox-russian/Makefile b/audio/festvox-russian/Makefile
index 79863e8b1410..606eab51e19e 100644
--- a/audio/festvox-russian/Makefile
+++ b/audio/festvox-russian/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox
PORTVERSION= 0.5
CATEGORIES= audio
MASTER_SITES= SF/festlang.berlios/ \
- ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= festlang
+ BERLIOS/festlang
PKGNAMESUFFIX= -russian
DISTNAME= msu_ru_nsh_clunits-${PORTVERSION}
DIST_SUBDIR= festival
diff --git a/audio/flake/Makefile b/audio/flake/Makefile
index 4dd36423dd69..cadc1dbbc159 100644
--- a/audio/flake/Makefile
+++ b/audio/flake/Makefile
@@ -4,8 +4,7 @@
PORTNAME= flake
PORTVERSION= 0.11
CATEGORIES= audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}-enc/${PORTNAME:tl}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME:tl}-enc/${PORTNAME:tl}/${PORTVERSION}
MAINTAINER= dbn@FreeBSD.org
COMMENT= FLAC audio encoder
diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile
index 6e4b7147ca42..de3594cf11b3 100644
--- a/audio/funktrackergold/Makefile
+++ b/audio/funktrackergold/Makefile
@@ -2,12 +2,10 @@
# $FreeBSD$
PORTNAME= funktrackergold
-PORTVERSION= 1.5.2
+DISTVERSION= 1.5-2
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
-DISTNAME= funktrackergold-1.5-2
+MASTER_SITES= SUNSITE/apps/sound/players
MAINTAINER= ports@FreeBSD.org
COMMENT= Curses MOD/FNK music tracker
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index 75298e65c4fa..8b5689e96411 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gmixer
PORTVERSION= 0.98c
PORTREVISION= 6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cpiazza
+MASTER_SITES= LOCAL/cpiazza
MAINTAINER= ports@FreeBSD.org
COMMENT= X11/gtk+ mixer control
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index c8a2c72bb12e..2d8b04a959c0 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnomoradio
PORTVERSION= 0.15.1
PORTREVISION= 18
CATEGORIES= audio net
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Program for finding and playing free music from the Internet
diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index f3655c712c9f..56b4bfeef55e 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -5,9 +5,8 @@ PORTNAME= gnupod
PORTVERSION= 0.99.8
PORTREVISION= 2
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
+MASTER_SITES= SAVANNAH \
http://www.blinkenlights.ch/gnupod-dist/stable/
-MASTER_SITE_SUBDIR= gnupod
MAINTAINER= ports@FreeBSD.org
COMMENT= Set of Perl scripts for using an Apple iPod
diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile
index 74444404bea2..7c41c225dcd9 100644
--- a/audio/gtkguitune/Makefile
+++ b/audio/gtkguitune/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.8
DISTVERSIONPREFIX= gtk2-
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://www.oocities.org/harpin_floh/mysoft/
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index fdf4cee79136..896e09c3fe9a 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= harp
PORTVERSION= 0.5.2
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= heckendorfc@gmail.com
COMMENT= Minimalist audio player
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index ee96ddbe0d3c..bb37ba2452cc 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -4,13 +4,14 @@
PORTNAME= id3ed
PORTVERSION= 1.10.4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
MAINTAINER= turutani@scphys.kyoto-u.ac.jp
COMMENT= Id3 tag editor for mp3 files
LICENSE= GPLv2
+BROKEN= Unfetchable
GNU_CONFIGURE= yes
PLIST_FILES= bin/id3ed \
diff --git a/audio/julius/Makefile b/audio/julius/Makefile
index e410d75d4750..5ace26ac95db 100644
--- a/audio/julius/Makefile
+++ b/audio/julius/Makefile
@@ -5,8 +5,7 @@ PORTNAME= julius
PORTVERSION= 4.1.2
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= julius/37582
+MASTER_SITES= SFJP/julius/37582
MAINTAINER= numisemis@yahoo.com
COMMENT= Large Vocabulary Continuous Speech Recognition Engine
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 0f3ed13e0ecd..983b780166d5 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -6,8 +6,7 @@ PORTNAME= libaudiofile
PORTVERSION= 0.3.6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/lib//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/${PORTNAME:S/lib//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= audiofile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index 2db5f374b088..5c690052e8dc 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libworkman
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jim
+MASTER_SITES= LOCAL/jim
DISTNAME= ${PORTNAME}-1999-06-20
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/linux-f10-pulseaudio-libs/Makefile b/audio/linux-f10-pulseaudio-libs/Makefile
index fc7c74f4a7b0..ca7d5a55e79c 100644
--- a/audio/linux-f10-pulseaudio-libs/Makefile
+++ b/audio/linux-f10-pulseaudio-libs/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pulseaudio-libs
PORTVERSION= 0.9.14
CATEGORIES= audio linux
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
+MASTER_SITES= LOCAL/netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for PulseAudio clients (Linux Fedora 10)
diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index 7f4ebaefeb1f..5e002d1411bb 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -4,8 +4,7 @@
PORTNAME= lollypop
PORTVERSION= 0.9.15
CATEGORIES= audio
-MASTER_SITES= https://github.com/gnumdk/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/download/${PORTVERSION}
+MASTER_SITES= https://github.com/gnumdk/${PORTNAME}/releases/download/${PORTVERSION}/
MAINTAINER= olivierd@FreeBSD.org
COMMENT= Play and organize your music collection
diff --git a/audio/mehdiaplayer/Makefile b/audio/mehdiaplayer/Makefile
index e3b32e25fa1e..13633de22282 100644
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mehdiaplayer
PORTVERSION= 0.2
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= vg@FreeBSD.org
COMMENT= Simple media player using Qt/Phonon
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 925919b9830f..2a731b1c2c1e 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mixer.app
PORTVERSION= 1.8.0
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mixmos/Makefile b/audio/mixmos/Makefile
index 956a976375f4..0a5ee125bd7c 100644
--- a/audio/mixmos/Makefile
+++ b/audio/mixmos/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mixmos
PORTVERSION= 0.2.0
PORTREVISION= 9
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_TUCOWS}
+MASTER_SITES= TUCOWS
MAINTAINER= h.skuhra@gmail.com
COMMENT= GTK2 audio mixer
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index 11173508df7a..a986ed41ced1 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.11
PORTREVISION= 2
CATEGORIES= audio perl5
MASTER_SITES= ftp://ftp.faceprint.com/pub/software/scripts/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
EXTRACT_SUFX= # empty
MAINTAINER= uqs@FreeBSD.org
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index 26592b6f9e23..3f836aec7d05 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -3,10 +3,9 @@
PORTNAME= mp3info
PORTVERSION= 0.8.5
+DISTVERSIONSUFFIX= a
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mp3-utils/mp3info
-DISTNAME= ${PORTNAME}-${PORTVERSION}a
+MASTER_SITES= SUNSITE/apps/sound/mp3-utils/mp3info
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= MP3 technical info viewer and ID3 1.x tag editor
diff --git a/audio/mp3rename/Makefile b/audio/mp3rename/Makefile
index fb17efb3c351..d47a714b3e32 100644
--- a/audio/mp3rename/Makefile
+++ b/audio/mp3rename/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mp3rename
PORTVERSION= 0.6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index bf191e25203c..8a086c7c7d1e 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -4,8 +4,7 @@ PORTNAME= mpdcon
PORTVERSION= 1.5.1
PORTREVISION= 2
CATEGORIES= audio gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= MPDCon-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index efa452da1462..d512917db4af 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -4,8 +4,7 @@
PORTNAME= nspmod
PORTVERSION= 0.1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
+MASTER_SITES= SUNSITE/apps/sound/players
MAINTAINER= ports@FreeBSD.org
COMMENT= MOD/S3M/MTM tracker that does its own DSP, uses VoxWare v2.90+
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 445615e2c978..54ff84767606 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -5,7 +5,7 @@ PORTNAME= openal
PORTVERSION= 20060211
PORTREVISION= 15
CATEGORIES= audio
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
DISTVERSION= 0.0.8
MAINTAINER= erik@bz.bzflag.bz
diff --git a/audio/opus-tools/Makefile b/audio/opus-tools/Makefile
index 4d5f01b92766..08b44cbc3216 100644
--- a/audio/opus-tools/Makefile
+++ b/audio/opus-tools/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.1.9
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
- ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= opus
+ MOZILLA_EXTENDED/opus
MAINTAINER= naddy@FreeBSD.org
COMMENT= Encode, inspect, and decode Opus files
diff --git a/audio/opus/Makefile b/audio/opus/Makefile
index 9635a02d1fcc..2dfe7f792f0c 100644
--- a/audio/opus/Makefile
+++ b/audio/opus/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
- ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= opus
+ MOZILLA_EXTENDED/opus
MAINTAINER= naddy@FreeBSD.org
COMMENT= IETF audio codec
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index 2f38900e8577..e8d7352084c8 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
- ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= opus
+ MOZILLA_EXTENDED/opus
MAINTAINER= liangtai.s16@gmail.com
COMMENT= Opus playback library
diff --git a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
index fa0315d6e685..81f3d773014f 100644
--- a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= audio perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR=Ogg
PKGNAMEPREFIX= p5-
MAINTAINER= dominique.goncalves@gmail.com
diff --git a/audio/play/Makefile b/audio/play/Makefile
index 6bcdf939de03..0be482589c24 100644
--- a/audio/play/Makefile
+++ b/audio/play/Makefile
@@ -5,7 +5,7 @@ PORTNAME= play
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple audio file player
diff --git a/audio/pm3umpdl/Makefile b/audio/pm3umpdl/Makefile
index 14fa3f8869f6..2c518d7ade00 100644
--- a/audio/pm3umpdl/Makefile
+++ b/audio/pm3umpdl/Makefile
@@ -7,7 +7,6 @@ CATEGORIES= audio deskutils
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
EXTRACT_SUFX=
-EXTRACT_ONLY=
MAINTAINER= ports@FreeBSD.org
COMMENT= Loading a M3U file into musicpd
@@ -15,11 +14,11 @@ COMMENT= Loading a M3U file into musicpd
RUN_DEPENDS= ${LOCALBASE}/bin/mpc:${PORTSDIR}/audio/musicpc
USES= perl5
-NO_WRKSUBDIR= yes
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
-post-extract:
+do-extract:
+ @${MKDIR} ${WRKSRC}
@${CP} -v ${DISTDIR}/${DISTNAME} ${WRKSRC}
do-build:
diff --git a/audio/pms/Makefile b/audio/pms/Makefile
index 70e6e7ac1b6e..f478322f52b2 100644
--- a/audio/pms/Makefile
+++ b/audio/pms/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.42
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= riggs@FreeBSD.org
COMMENT= ncurses-based client for the Music Player Daemon
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index be61e7f136e2..0c078b92ad3e 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -3,8 +3,7 @@
PORTNAME= puddletag
PORTVERSION= 1.0.5
CATEGORIES= audio python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= pawel@FreeBSD.org
COMMENT= Audio tag editor
diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index 7fd2a360feff..853534ce1703 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -5,7 +5,7 @@ PORTNAME= rawrec
PORTVERSION= 0.9.991
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE:S/%SUBDIR%/apps\/sound\/recorders/} \
+MASTER_SITES= SUNSITE/apps/sound/recorders \
SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/rexima/Makefile b/audio/rexima/Makefile
index ae6d466d85f5..abb28fe30ce6 100644
--- a/audio/rexima/Makefile
+++ b/audio/rexima/Makefile
@@ -4,8 +4,7 @@
PORTNAME= rexima
PORTVERSION= 1.4
CATEGORIES= audio
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= SUNSITE/apps/sound/mixers
MAINTAINER= jerry@freebsd.se
COMMENT= ncurses-based console mixer
diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index 7e89ecc14c43..762ff8fcbe32 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -3,11 +3,10 @@
PORTNAME= s3mod
PORTVERSION= 1.09
+DISTVERSIONPREFIX= v
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
+MASTER_SITES= SUNSITE/apps/sound/players
MAINTAINER= ports@FreeBSD.org
COMMENT= MOD/S3M player
diff --git a/audio/soundgrab/Makefile b/audio/soundgrab/Makefile
index 5d6768ba7854..55df71365921 100644
--- a/audio/soundgrab/Makefile
+++ b/audio/soundgrab/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.0.1
PORTREVISION= 2
CATEGORIES= audio perl5
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-MASTER_SITE_SUBDIR= apps/sound/editors
MAINTAINER= ports@FreeBSD.org
COMMENT= Interactively select and save sections of an audio file
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 3ba8d021dc1d..9f59731a5cab 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -5,8 +5,7 @@ PORTNAME= soundtracker
PORTVERSION= 0.6.8
PORTREVISION= 16
CATEGORIES= audio
-MASTER_SITES= http://www.soundtracker.org/dl/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${PORTVERSION:R}
+MASTER_SITES= http://www.soundtracker.org/dl/v${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Mod player/tracking tool which supports XM and MOD formats
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index 1c1af8b147ed..cfdf1bd94999 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -5,7 +5,7 @@ PORTNAME= spek
PORTVERSION= 0.8.2
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= alexander@kojevnikov.com
COMMENT= Acoustic spectrum analyser
diff --git a/audio/squeezeboxserver-superdatetime/Makefile b/audio/squeezeboxserver-superdatetime/Makefile
index d80b9eb97437..560c5655abba 100644
--- a/audio/squeezeboxserver-superdatetime/Makefile
+++ b/audio/squeezeboxserver-superdatetime/Makefile
@@ -4,7 +4,7 @@
PORTNAME= superdatetime
PORTVERSION= 5.9.16
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= squeezeboxserver-
DISTNAME= SuperDateTime${PORTVERSION}
DIST_SUBDIR= squeezeboxserver
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index b0b33ec34274..41742e0d169b 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.99.99
PORTREVISION= 20
CATEGORIES= audio www
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+ stream directory browser
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile
index 741cc7d0f010..7f8b4b28a7af 100644
--- a/audio/tcd/Makefile
+++ b/audio/tcd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tcd
PORTVERSION= 2.2.0
PORTREVISION= 8
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple, user-friendly ncurses-based CD player
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index 9056e44eec96..8d758964127c 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tosha
PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= markp
+MASTER_SITES= LOCAL/markp
MAINTAINER= ports@FreeBSD.org
COMMENT= Read CD digital audio and video data via the SCSI bus
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 469b964d67b8..8d41255f24c2 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -6,12 +6,13 @@ PORTVERSION= 1.2
PORTREVISION= 9
CATEGORIES= audio java
MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
- ${MASTER_SITE_LOCAL}/gahr/:fluid \
+ LOCAL/gahr/:fluid \
http://people.freebsd.org/~gahr/distfiles/:fluid \
http://www.alsa-project.org/~james/sound-fonts/:fluid
-DISTFILES= ${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}:src \
+DISTNAME= ${PORTNAME}-src-${DISTVERSION}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src \
8MBGMSFX.SF2:fluid
-EXTRACT_ONLY= ${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multitrack tablature editor and player
@@ -36,7 +37,7 @@ USE_LDCONFIG= yes
JAVA_VERSION= 1.6+
NOCCACHE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/TuxGuitar
+WRKSRC_SUBDIR= TuxGuitar
OPTIONS_DEFINE= DOCS
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index 47384bc4f03e..0ed2aaee9332 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.8.6
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://vagalume.igalia.com/files/source/ \
- ${MASTER_SITE_DEBIAN_POOL}
-MASTER_SITE_SUBDIR= pool/main/v/vagalume/
+ DEBIAN_POOL/pool/main/v/vagalume/
MAINTAINER= decke@FreeBSD.org
COMMENT= A GTK+-based client for the Last.fm online radio
diff --git a/audio/vitunes/Makefile b/audio/vitunes/Makefile
index 72f78fa048be..c1a08d74368a 100644
--- a/audio/vitunes/Makefile
+++ b/audio/vitunes/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://vitunes.org/files/ \
http://mirror.4bit.ws/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dhn
+ LOCAL/dhn
MAINTAINER= dhn@FreeBSD.org
COMMENT= Curses-based media player with vim-like keybinds
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index ae9733d1ce3a..67cf96caff41 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -5,8 +5,7 @@ PORTNAME= workman
PORTVERSION= 1.3a
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications/WorkMan
+MASTER_SITES= XCONTRIB/applications/WorkMan
DISTNAME= WorkMan-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 1c0e938c53b3..3212edd3341b 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.32
PORTREVISION= 1
CATEGORIES= audio hamradio
MASTER_SITES= http://arvin.schnell-web.net/xanalyser/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= db@FreeBSD.org
COMMENT= Spectrum analyser
diff --git a/audio/xfce4-pulseaudio-plugin/Makefile b/audio/xfce4-pulseaudio-plugin/Makefile
index da9e44ce874b..c90488076cbb 100644
--- a/audio/xfce4-pulseaudio-plugin/Makefile
+++ b/audio/xfce4-pulseaudio-plugin/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xfce4-pulseaudio-plugin
PORTVERSION= 0.2.3
CATEGORIES= audio xfce
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index b63a6f81f10d..f292249bdc36 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -5,11 +5,9 @@ PORTNAME= xmix
PORTVERSION= 2.1
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= SUNSITE/apps/sound/mixers
PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
PATCHFILES= xmix-2.1.mixers.patch
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index ae130a62ebe5..780c3863bac3 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+ LOCAL/arved
DISTNAME= xmms_ladspa-${PORTVERSION}
MAINTAINER= arved@FreeBSD.org
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index 2baea4ebf740..1b72cb973abf 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmms-mailnotify
PORTVERSION= 0.2.0
PORTREVISION= 9
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+MASTER_SITES= LOCAL/arved
MAINTAINER= arved@FreeBSD.org
COMMENT= XMMS plugin, that plays a sound on incoming mail and opens the MUA
diff --git a/audio/xpi-musicpm/Makefile b/audio/xpi-musicpm/Makefile
index 1345ad49abf3..08e8dd8cbab9 100644
--- a/audio/xpi-musicpm/Makefile
+++ b/audio/xpi-musicpm/Makefile
@@ -4,7 +4,7 @@
PORTNAME= musicpm
PORTVERSION= 1.4.4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= mpm_${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index aecbd8034e97..009ce540ebac 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xwave
PORTVERSION= 2.2
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+MASTER_SITES= LOCAL/arved
DISTNAME= ${PORTNAME}${PORTVERSION:S/./v/}
MAINTAINER= a0516@marimga.de
diff --git a/benchmarks/cpipe/Makefile b/benchmarks/cpipe/Makefile
index 7888f8bfc339..1da3354ec258 100644
--- a/benchmarks/cpipe/Makefile
+++ b/benchmarks/cpipe/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cpipe
PORTVERSION= 3.0.2
CATEGORIES= benchmarks
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= cpipe.berlios
+MASTER_SITES= BERLIOS
MAINTAINER= chris@uminac.com
COMMENT= Benchmarking tool for pipes
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 343c56c55ee4..87d63afc81b1 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dbench
PORTVERSION= 4.0
PORTREVISION= 2
CATEGORIES= benchmarks
-MASTER_SITES= SAMBA
-MASTER_SITE_SUBDIR= ../../ftp/tridge/dbench
+MASTER_SITES= SAMBA/../../ftp/tridge/dbench
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= Simulation of the Ziff-Davis netbench benchmark
diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile
index f30173a1092a..fd4f7db677aa 100644
--- a/benchmarks/hpl/Makefile
+++ b/benchmarks/hpl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= hpl
PORTVERSION= 2.1
PORTREVISION= 5
CATEGORIES= benchmarks
-MASTER_SITES= ${MASTER_SITE_NETLIB}
-MASTER_SITE_SUBDIR= benchmark/hpl
+MASTER_SITES= NETLIB/benchmark/hpl
MAINTAINER= oliver@FreeBSD.org
COMMENT= High Performance Computing Linpack Benchmark
diff --git a/benchmarks/imb/Makefile b/benchmarks/imb/Makefile
index 159cd2366369..33f680ee22cf 100644
--- a/benchmarks/imb/Makefile
+++ b/benchmarks/imb/Makefile
@@ -5,9 +5,8 @@ PORTNAME= imb
PORTVERSION= 3.0
PORTREVISION= 12
CATEGORIES= benchmarks parallel
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/itetcu \
http://cache-www.intel.com/cd/00/00/32/71/
-MASTER_SITE_SUBDIR= itetcu
DISTNAME= 327191_327191
EXTRACT_SUFX= .gz
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index cedec95d44e5..ff78bb24b217 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -4,8 +4,7 @@
PORTNAME= netio
PORTVERSION= 1.32
CATEGORIES= benchmarks net ipv6
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+MASTER_SITES= LOCAL/arved
DISTNAME= netio132
MAINTAINER= arved@FreeBSD.org
diff --git a/benchmarks/p5-Benchmark-Stopwatch/Makefile b/benchmarks/p5-Benchmark-Stopwatch/Makefile
index 4ddb96ecb84d..c6ea168307aa 100644
--- a/benchmarks/p5-Benchmark-Stopwatch/Makefile
+++ b/benchmarks/p5-Benchmark-Stopwatch/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= benchmarks perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Benchmark
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
index c26d55418912..c4cdb71c4be1 100644
--- a/benchmarks/sipp/Makefile
+++ b/benchmarks/sipp/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 3.3
PORTREVISION= 2
CATEGORIES= benchmarks net
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sipp/sipp/${PORTVERSION}
DISTNAME= ${PORTNAME}-3.3beta2
MAINTAINER= ports@FreeBSD.org
diff --git a/benchmarks/super-smack/Makefile b/benchmarks/super-smack/Makefile
index 4967cbb8ad52..a96e52394198 100644
--- a/benchmarks/super-smack/Makefile
+++ b/benchmarks/super-smack/Makefile
@@ -5,7 +5,7 @@ PORTNAME= super-smack
PORTVERSION= 1.3
PORTREVISION= 2
CATEGORIES= benchmarks databases
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Benchmarking, stress testing, and load generation tool for Databases
diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile
index c570b9ccb774..75d0fb995e17 100644
--- a/benchmarks/ubench/Makefile
+++ b/benchmarks/ubench/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ubench
PORTVERSION= 0.32
CATEGORIES= benchmarks
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/benchmark
+MASTER_SITES= SUNSITE/system/benchmark
MAINTAINER= brian@FreeBSD.org
COMMENT= Unix Benchmark Utility for CPU(s) and memory
diff --git a/benchmarks/webbench/Makefile b/benchmarks/webbench/Makefile
index 8dc0dff1bca5..a7db5be01448 100644
--- a/benchmarks/webbench/Makefile
+++ b/benchmarks/webbench/Makefile
@@ -4,8 +4,7 @@
PORTNAME= webbench
PORTVERSION= 1.5
CATEGORIES= benchmarks www
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/www/servers
+MASTER_SITES= SUNSITE/apps/www/servers
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple forking web benchmark
diff --git a/biology/biococoa/Makefile b/biology/biococoa/Makefile
index 987c836e062c..ab9b60787661 100644
--- a/biology/biococoa/Makefile
+++ b/biology/biococoa/Makefile
@@ -4,8 +4,7 @@ PORTNAME= biococoa
PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= biology gnustep
-MASTER_SITES= http://bioinformatics.org/biococoa/downloads/ ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/b/biococoa.app
+MASTER_SITES= http://bioinformatics.org/biococoa/downloads/ DEBIAN/pool/main/b/biococoa.app
DISTNAME= biococoa-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/biology/clustalw/Makefile b/biology/clustalw/Makefile
index faf13501720e..d9aa9cc35609 100644
--- a/biology/clustalw/Makefile
+++ b/biology/clustalw/Makefile
@@ -5,9 +5,8 @@ PORTNAME= clustalw
PORTVERSION= 2.1
PORTREVISION= 1
CATEGORIES= biology
-MASTER_SITES= ftp://ftp.ebi.ac.uk/pub/software/clustalw2/%SUBDIR%/ \
- http://www.clustal.org/download/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= ftp://ftp.ebi.ac.uk/pub/software/clustalw2/${PORTVERSION}/ \
+ http://www.clustal.org/download/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiple alignment program for DNA or proteins
diff --git a/biology/t_coffee/Makefile b/biology/t_coffee/Makefile
index 5de83fb7f752..ba3cffaee2c0 100644
--- a/biology/t_coffee/Makefile
+++ b/biology/t_coffee/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 9.03
DISTVERSIONSUFFIX= .r1318
PORTREVISION= 3
CATEGORIES= biology
-MASTER_SITES= http://www.tcoffee.org/Packages/Stable/%SUBDIR%/
-MASTER_SITE_SUBDIR= Version_${PORTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITES= http://www.tcoffee.org/Packages/Stable/Version_${PORTVERSION}${DISTVERSIONSUFFIX}/
DISTNAME= T-COFFEE_distribution_Version_${PORTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/basicdsp/Makefile b/cad/basicdsp/Makefile
index 482c29f87c90..8a9973062d8d 100644
--- a/cad/basicdsp/Makefile
+++ b/cad/basicdsp/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.01
PORTREVISION= 6
CATEGORIES= cad hamradio
MASTER_SITES= http://wwwhome.cs.utwente.nl/~ptdeboer/ham/basicdsp/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= db@FreeBSD.org
COMMENT= Program for experimenting with simple audio DSP algorithms
diff --git a/cad/cascade/Makefile b/cad/cascade/Makefile
index a695a1d9abf4..35d9a6e3abf3 100644
--- a/cad/cascade/Makefile
+++ b/cad/cascade/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cascade
PORTVERSION= 1.4
CATEGORIES= cad
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= rfcascade/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/rfcascade/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Simple tool to analyze noise and distortion of a RF system
diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index 7b96f0e16761..7ae6af857b53 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cider
PORTVERSION= 1.b1
PORTREVISION= 8
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mita
+MASTER_SITES= LOCAL/mita
DISTNAME= cider1b1
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 2b4e738a5afb..eaf283f491b4 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -5,10 +5,9 @@ PORTNAME= electric
PORTVERSION= 9.05
PORTREVISION= 1
CATEGORIES= cad java
-MASTER_SITES= ${MASTER_SITE_GNU} \
+MASTER_SITES= GNU/${PORTNAME:S/-ng//} \
http://www.staticfreesoft.com/:1 \
http://www.staticfreesoft.com/jmanual/:2
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-ng//}
PKGNAMESUFFIX= -ng
EXTRACT_SUFX=
DISTFILES+= ${PORTNAME}Binary-${PORTVERSION}.jar
diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile
index 34e77a0ef5ac..c42662e25188 100644
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fidocadj
PORTVERSION= 0.24.4
#PORTREVISION= 0
CATEGORIES= cad
-MASTER_SITES= SF:src,docs
-MASTER_SITE_SUBDIR= ${PORTNAME}/:src ${PORTNAME}/manuals/:docs
+MASTER_SITES= SF/${PORTNAME}/:src SF/${PORTNAME}/manuals/:docs
DISTFILES= ${PORTNAME}.jar:src
EXTRACT_ONLY=
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index a5b2563ca12e..ccb17a67aed5 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.8.2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= cad
-MASTER_SITES= http://ftp.geda-project.org/geda-gaf/stable/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${PORTVERSION:R}/${PORTVERSION}
+MASTER_SITES= http://ftp.geda-project.org/geda-gaf/stable/v${PORTVERSION:R}/${PORTVERSION}/
DISTNAME= ${PORTNAME}-gaf-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index fc62b4288c03..d9f2345e32ef 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kicad
DISTVERSION= r${BZR_SRC_REV}
PORTREVISION= 1
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mr
+MASTER_SITES= LOCAL/mr
PKGNAMESUFFIX= -devel
DIST_SUBDIR= ${PORTNAME}
diff --git a/cad/layouteditor/Makefile b/cad/layouteditor/Makefile
index 90ade69a5dff..d7b4e14122dc 100644
--- a/cad/layouteditor/Makefile
+++ b/cad/layouteditor/Makefile
@@ -5,8 +5,7 @@ PORTNAME= layouteditor
PORTVERSION= 0.0.20110614
PORTREVISION= 2
CATEGORIES= cad
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
DISTNAME= LayoutEditor-${PORTVERSION:S,^0.0.,,}-gpl-src
MAINTAINER= hrs@FreeBSD.org
diff --git a/cad/meshdev/Makefile b/cad/meshdev/Makefile
index a45d31cbf723..bd301711dc50 100644
--- a/cad/meshdev/Makefile
+++ b/cad/meshdev/Makefile
@@ -4,9 +4,8 @@
PORTNAME= meshdev
PORTVERSION= 0.5
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/gahr \
http://people.freebsd.org/~gahr/distfiles/
-MASTER_SITE_SUBDIR= gahr
MAINTAINER= ports@FreeBSD.org
COMMENT= Mesh comparison software
diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index 1f83c9e43aa3..7c82164b1b61 100644
--- a/chinese/auto-cn-l10n/Makefile
+++ b/chinese/auto-cn-l10n/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 3
CATEGORIES= chinese
#MASTER_SITES= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
-MASTER_SITES= ${MASTER_SITE_LOCAL:S/%SUBDIR%/delphij/}
+MASTER_SITES= LOCAL/delphij
DISTNAME= zh-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/chinese/fcitx-googlepinyin/Makefile b/chinese/fcitx-googlepinyin/Makefile
index 9e77d06112db..00e62cb89c81 100644
--- a/chinese/fcitx-googlepinyin/Makefile
+++ b/chinese/fcitx-googlepinyin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= fcitx-googlepinyin
PORTVERSION= 0.1.6
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index 3ee68ed9446f..8ae61aa9c69d 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ibus-pinyin
PORTVERSION= 1.5.0
PORTREVISION= 1
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= henry.hu.sh@gmail.com
COMMENT= PinYin engine for IBus
diff --git a/chinese/joe/Makefile b/chinese/joe/Makefile
index 85c4c6eb46e1..696be5cfb9ee 100644
--- a/chinese/joe/Makefile
+++ b/chinese/joe/Makefile
@@ -3,8 +3,7 @@
CATEGORIES= chinese
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= chinsan/patch
+PATCH_SITES= LOCAL/chinsan/patch
PATCHFILES= zh-joe-3.7.diff
PATCH_DIST_STRIP= -p1
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 667967e71599..27dcdb4ddcba 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kcfonts
PORTVERSION= 1.05
PORTREVISION= 3
CATEGORIES= chinese x11-fonts
-MASTER_SITES= ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Kuo Chauo Chinese Fonts collection
diff --git a/chinese/libgooglepinyin/Makefile b/chinese/libgooglepinyin/Makefile
index 6aa045c3f3ef..4aef86b548e9 100644
--- a/chinese/libgooglepinyin/Makefile
+++ b/chinese/libgooglepinyin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgooglepinyin
PORTVERSION= 0.1.2
CATEGORIES= chinese devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= lichray@gmail.com
COMMENT= Fork of Google Pinyin IME on Android
diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile
index af2996498ed4..da5a5e87d11a 100644
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@@ -4,7 +4,7 @@
PORTNAME= opencc
PORTVERSION= 0.4.3
CATEGORIES= chinese converters
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= lichray@gmail.com
COMMENT= Open Chinese Convert library and utilities
diff --git a/chinese/p5-Lingua-ZH-Segment/Makefile b/chinese/p5-Lingua-ZH-Segment/Makefile
index 5b640bda69d5..4a5c334bfc08 100644
--- a/chinese/p5-Lingua-ZH-Segment/Makefile
+++ b/chinese/p5-Lingua-ZH-Segment/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= chinese perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Lingua
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/chinese/pyzy/Makefile b/chinese/pyzy/Makefile
index 50e2e285edb8..d695ababfe7f 100644
--- a/chinese/pyzy/Makefile
+++ b/chinese/pyzy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pyzy
PORTVERSION= 0.1.0
PORTREVISION= 1
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index e16b86686922..5cb5b708c6ed 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 3.03
PORTEPOCH= 2
CATEGORIES= chinese graphics print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
- ${MASTER_SITE_TEX_CTAN} \
+ TEX_CTAN/support/xpdf \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= support/xpdf
PKGNAMESUFFIX= -zhfont
DISTFILES= xpdf-chinese-simplified-2011-sep-02${EXTRACT_SUFX} \
xpdf-chinese-traditional-2011-sep-02${EXTRACT_SUFX}
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index 9ce9197d8aed..3be10c652a6d 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= aldo
PORTVERSION= 0.7.5
PORTREVISION= 2
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= lambert@lambertfam.org
COMMENT= Morse code training program
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile
index 6b0658549b55..d5a00abff3ba 100644
--- a/comms/bpl+/Makefile
+++ b/comms/bpl+/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bpl+
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= max
+MASTER_SITES= LOCAL/max
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index d24a81e27894..894393ad86a6 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://chirp.danplanet.com/download/${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Chirp is a free, open-source tool for programming your amateur radio
diff --git a/comms/chu/Makefile b/comms/chu/Makefile
index 35fb2250d03e..ef3f15ac1a8d 100644
--- a/comms/chu/Makefile
+++ b/comms/chu/Makefile
@@ -4,9 +4,8 @@
PORTNAME= chu
PORTVERSION= 0.1.29
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/system/admin/time \
http://www.rossi.com/chu/
-MASTER_SITE_SUBDIR= system/admin/time
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Synchronise computer clock to CHU radio station
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index e93770046278..cc731163b214 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.8.2
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://www.cqrlog.com/files/cqrlog_${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
DISTNAME= ${PORTNAME}_${PORTVERSION}.src
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/cwdaemon/Makefile b/comms/cwdaemon/Makefile
index 66a7435d06c9..4bdf1d6101b3 100644
--- a/comms/cwdaemon/Makefile
+++ b/comms/cwdaemon/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cwdaemon
PORTVERSION= 0.9.4
CATEGORIES= comms hamradio
MASTER_SITES= http://www.chronos.org.uk/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Amateur Radio cw (Morse code) keyer daemon
diff --git a/comms/ebook2cw/Makefile b/comms/ebook2cw/Makefile
index 4f79dcabb607..fa09a311b696 100644
--- a/comms/ebook2cw/Makefile
+++ b/comms/ebook2cw/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ebook2cw
PORTVERSION= 0.8.2
CATEGORIES= comms hamradio
MASTER_SITES= http://fkurz.net/ham/ebook2cw/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Convert text files into cw as an mp3 or ogg file
diff --git a/comms/ebook2cwgui/Makefile b/comms/ebook2cwgui/Makefile
index ac44f7990fa1..c3d7c0af3a64 100644
--- a/comms/ebook2cwgui/Makefile
+++ b/comms/ebook2cwgui/Makefile
@@ -6,8 +6,7 @@ PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://fkurz.net/ham/ebook2cw/ \
http://distfiles.bsdjunk.com/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= gui front end for ebooks2cw
diff --git a/comms/esmska/Makefile b/comms/esmska/Makefile
index 3fb2e41ce885..59d5f4414d6f 100644
--- a/comms/esmska/Makefile
+++ b/comms/esmska/Makefile
@@ -4,7 +4,7 @@
PORTNAME= esmska
PORTVERSION= 0.21
CATEGORIES= comms java
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= gamato@users.sf.net
COMMENT= Program for sending SMS over the Internet
diff --git a/comms/fl_moxgen/Makefile b/comms/fl_moxgen/Makefile
index 6d03a5dc9cd9..30d49b2ea3b1 100644
--- a/comms/fl_moxgen/Makefile
+++ b/comms/fl_moxgen/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fl_moxgen
PORTVERSION= 1.00
PORTREVISION= 1
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= flmoxgen
+MASTER_SITES= SF/flmoxgen
DISTNAME= Fl_MoxGen-${PORTVERSION}
MAINTAINER= shurd@FreeBSD.org
diff --git a/comms/fllog/Makefile b/comms/fllog/Makefile
index 92a5ab3175b7..edc31945006c 100644
--- a/comms/fllog/Makefile
+++ b/comms/fllog/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fllog
PORTVERSION= 1.2.0
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/downloads/fllog/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Ham Radio logging program
diff --git a/comms/flrig/Makefile b/comms/flrig/Makefile
index 0350f48244ab..e7748238638a 100644
--- a/comms/flrig/Makefile
+++ b/comms/flrig/Makefile
@@ -5,8 +5,7 @@ PORTNAME= flrig
PORTVERSION= 1.3.22
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/downloads/flrig/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Ham Radio rig control program, cooperates with fldigi
diff --git a/comms/flwrap/Makefile b/comms/flwrap/Makefile
index 4a0f1a6f8b16..6584bf8a2f07 100644
--- a/comms/flwrap/Makefile
+++ b/comms/flwrap/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.3.4
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/downloads/flwrap/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Flwrap is a companion utility for fldigi
diff --git a/comms/geoid/Makefile b/comms/geoid/Makefile
index 7a656c0a128e..364f38b623a7 100644
--- a/comms/geoid/Makefile
+++ b/comms/geoid/Makefile
@@ -6,8 +6,7 @@ PORTREVISION= 7
DISTVERSIONSUFFIX= .src
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/LinuxApps/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= fl_geoid
EXTRACT_SUFX= .src.tar.gz
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 3a192afa02d3..c2279d8fe422 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 3.7.4
PORTREVISION= 2
CATEGORIES= comms astro hamradio
MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Amateur Radio Software defined radio
diff --git a/comms/gtkmmorse/Makefile b/comms/gtkmmorse/Makefile
index 5b4c5b8d2b13..7a8374bde7d0 100644
--- a/comms/gtkmmorse/Makefile
+++ b/comms/gtkmmorse/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gtkmmorse
PORTVERSION= 0.9.27
PORTREVISION= 1
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= shurd@FreeBSD.org
COMMENT= Graphical Morse Code Trainer
diff --git a/comms/ibp/Makefile b/comms/ibp/Makefile
index 45c43dbbe4cc..0e7241ad78fe 100644
--- a/comms/ibp/Makefile
+++ b/comms/ibp/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.21
PORTREVISION= 2
CATEGORIES= comms hamradio
MASTER_SITES= http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Little program for monitoring amateur radio beacons
diff --git a/comms/kb/Makefile b/comms/kb/Makefile
index ac6dce3dfef4..a1091ab3deec 100644
--- a/comms/kb/Makefile
+++ b/comms/kb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 8.04
PORTREVISION= 8
CATEGORIES= comms hamradio
MASTER_SITES= http://www.db.net/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTFILES= kb_src-${PORTVERSION}.tar.gz kb_inst-${PORTVERSION}.tar.gz
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/libfec/Makefile b/comms/libfec/Makefile
index 9330e2b0ab24..9aec53b85f79 100644
--- a/comms/libfec/Makefile
+++ b/comms/libfec/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 3.0.1
PORTREVISION= 1
CATEGORIES= comms astro hamradio math
MASTER_SITES= http://www.ka9q.net/code/fec/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= fec-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index a398eb9aae12..8a1ddad5e474 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -3,8 +3,7 @@
PORTNAME= linpsk
PORTVERSION= 1.2
CATEGORIES= comms hamradio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Simple Qt PSK31, RTTY, and MSK31 client
diff --git a/comms/locator/Makefile b/comms/locator/Makefile
index 834142075037..520a3bb3467c 100644
--- a/comms/locator/Makefile
+++ b/comms/locator/Makefile
@@ -4,7 +4,7 @@
PORTNAME= locator
PORTVERSION= 0.1
CATEGORIES= comms hamradio astro geography
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/ham/}
+MASTER_SITES= SUNSITE/apps/ham/
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Grid square calculator program used in Amateur Radio and GPS work
diff --git a/comms/morse/Makefile b/comms/morse/Makefile
index 748a318494e2..dc6258ef0609 100644
--- a/comms/morse/Makefile
+++ b/comms/morse/Makefile
@@ -5,8 +5,7 @@ PORTNAME= morse
PORTVERSION= 2.5
CATEGORIES= comms hamradio
MASTER_SITES= http://www.catb.org/~esr/morse/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= shurd@FreeBSD.org
COMMENT= Morse Code Trainer
diff --git a/comms/nasawash/Makefile b/comms/nasawash/Makefile
index 93294c66dcd4..683c2c19f3a7 100644
--- a/comms/nasawash/Makefile
+++ b/comms/nasawash/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nasawash
PORTVERSION= 0.50
CATEGORIES= comms hamradio
MASTER_SITES= ftp://ftp.amsat.org/amsat/software/Linux/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= nasawash
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/nec2c/Makefile b/comms/nec2c/Makefile
index fac68676e4c4..af071b96f13e 100644
--- a/comms/nec2c/Makefile
+++ b/comms/nec2c/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= .9
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://nec-archives.pa3kj.com/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= nec2c
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/o2sms/Makefile b/comms/o2sms/Makefile
index 95c963416a53..f5faf6c37b4a 100644
--- a/comms/o2sms/Makefile
+++ b/comms/o2sms/Makefile
@@ -5,9 +5,8 @@ PORTNAME= o2sms
PORTVERSION= 3.36
PORTREVISION= 1
CATEGORIES= comms perl5
-MASTER_SITES= CPAN \
+MASTER_SITES= CPAN/WWW/MACKERS \
http://www.mackers.com/projects/o2sms/releases/
-MASTER_SITE_SUBDIR= WWW/MACKERS
MAINTAINER= ports@FreeBSD.org
COMMENT= Send SMS messages via the websites of Irish mobile operators
diff --git a/comms/picocom/Makefile b/comms/picocom/Makefile
index d74cffaca5d1..da8b31e0047c 100644
--- a/comms/picocom/Makefile
+++ b/comms/picocom/Makefile
@@ -4,7 +4,7 @@
PORTNAME= picocom
PORTVERSION= 1.7
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= dhn@FreeBSD.org
COMMENT= Dumb Terminal Emulator
diff --git a/comms/predict/Makefile b/comms/predict/Makefile
index e5d96d00f553..dc415e1c607e 100644
--- a/comms/predict/Makefile
+++ b/comms/predict/Makefile
@@ -5,8 +5,7 @@ PORTNAME= predict
PORTVERSION= 2.2.3
CATEGORIES= comms astro hamradio
MASTER_SITES= ftp://ftp.amsat.org/amsat/software/Linux/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Satellite tracking program for amateur radio satellites
diff --git a/comms/pyla/Makefile b/comms/pyla/Makefile
index b4c10470656a..802c8a88b718 100644
--- a/comms/pyla/Makefile
+++ b/comms/pyla/Makefile
@@ -5,11 +5,9 @@ PORTNAME= pyla
PORTVERSION= 1.1.7.1
CATEGORIES= comms python
#MASTER_SITES= http://www.teamsw.it/pyla/download/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mr
+MASTER_SITES= LOCAL/mr
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyla${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= mike@Reifenberger.com
COMMENT= Hylafax client written in Python
@@ -19,7 +17,7 @@ COMMENT= Hylafax client written in Python
WRKSRC= ${WRKDIR}/${PORTNAME}
DATADIR= ${PREFIX}/lib/pyla
-USES= python
+USES= python tar:tgz
PLIST= ${WRKDIR}/pkg-plist
do-build:
diff --git a/comms/qrq/Makefile b/comms/qrq/Makefile
index 72b39dce7653..33043228f3a1 100644
--- a/comms/qrq/Makefile
+++ b/comms/qrq/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.3.1
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://fkurz.net/ham/qrq/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Morse telegraphy trainer similar to the classic DOS version by DL4MM
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index bce95898ba51..d8fba3e5a6d9 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 8.2.11
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index e9235504439a..2ca5bbdb3365 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quisk
PORTVERSION= 3.6.22
CATEGORIES= comms hamradio
MASTER_SITES= http://james.ahlstrom.name/quisk/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=shurd
+ LOCAL/shurd
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Software Defined Radio (SDR)
diff --git a/comms/soundmodem/Makefile b/comms/soundmodem/Makefile
index a34a4f8e6517..a9131ffc7628 100644
--- a/comms/soundmodem/Makefile
+++ b/comms/soundmodem/Makefile
@@ -6,8 +6,7 @@ CATEGORIES= comms hamradio
MASTER_SITES= http://www.baycom.org/~tom/ham/soundmodem/ \
http://soundmodem.vk4msl.yi.org/ \
http://pv529.ncsrv.de/soundmodem/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Amateur Radio sound modem
diff --git a/comms/splat/Makefile b/comms/splat/Makefile
index 7d10bc154049..d262753acd8c 100644
--- a/comms/splat/Makefile
+++ b/comms/splat/Makefile
@@ -3,8 +3,7 @@
PORTNAME= splat
PORTVERSION= 1.4.0
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/ham
+MASTER_SITES= SUNSITE/apps/ham
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Used in calculating path losses, useful to ham radio and others
diff --git a/comms/sredird/Makefile b/comms/sredird/Makefile
index 3d8b1f1db3f7..eefe865d269c 100644
--- a/comms/sredird/Makefile
+++ b/comms/sredird/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sredird
PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/serial
+MASTER_SITES= SUNSITE/system/serial
MAINTAINER= ports@FreeBSD.org
COMMENT= RFC 2217 compliant serial port redirector
diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile
index 2ff190041aa4..476968355502 100644
--- a/comms/usrp/Makefile
+++ b/comms/usrp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= usrp
PORTVERSION= 3.4.3
PORTREVISION= 4
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= adrian
+MASTER_SITES= LOCAL/adrian
DISTNAME= Ettus-USRP-3.4.3
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/vrflash/Makefile b/comms/vrflash/Makefile
index 1daa9284f1b8..0c3d9b49c454 100644
--- a/comms/vrflash/Makefile
+++ b/comms/vrflash/Makefile
@@ -3,8 +3,7 @@
PORTNAME= vrflash
PORTVERSION= 0.20
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Flash kernels and romdisks to the Agenda VR3
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 901d2b03e11d..2e015cc955cc 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -5,8 +5,7 @@ VERSION= 9.1
PORTREVISION= 10
DISTVERSION= ${VERSION}.r${SVN_REV}
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+MASTER_SITES= LOCAL/db
DISTNAME= wsjt-r${SVN_REV}
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 3403a8252f1c..3872e3435f51 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -4,8 +4,7 @@ PORTNAME= wspr
DISTVERSION= ${VERSION}.r${SVN_REV}
PORTREVISION= 3
CATEGORIES= comms hamradio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+MASTER_SITES= LOCAL/db
DISTNAME= wspr-r${SVN_REV}
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/wwl/Makefile b/comms/wwl/Makefile
index 5d1b35eaa91c..8f3f8a2452c9 100644
--- a/comms/wwl/Makefile
+++ b/comms/wwl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wwl
PORTVERSION= 1.3
CATEGORIES= comms hamradio astro geography
MASTER_SITES= http://www.db.net/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
DISTNAME= ${PORTNAME}+db-${PORTVERSION}
MAINTAINER= hamradio@FreeBSD.org
diff --git a/comms/wy60/Makefile b/comms/wy60/Makefile
index edd6003be1ef..afd9368fb3f7 100644
--- a/comms/wy60/Makefile
+++ b/comms/wy60/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wy60
PORTVERSION= 2.0.9
CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= naddy@FreeBSD.org
COMMENT= Curses-based emulator for the Wyse 60 terminal
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile
index 6898a474e384..3f5d92f06c2d 100644
--- a/comms/xdx/Makefile
+++ b/comms/xdx/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.4
PORTREVISION= 5
CATEGORIES= comms hamradio
MASTER_SITES= http://www.chronos.org.uk/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= xride@FreeBSD.org
COMMENT= Amateur Radio DX cluster monitor
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 4fc0a8f59789..f9034751be56 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -5,7 +5,6 @@ PORTNAME= xlog
PORTVERSION= 2.0.13
CATEGORIES= comms hamradio
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= xlog
MAINTAINER= danilo@FreeBSD.org
COMMENT= Amateur Radio logging application
diff --git a/comms/xnec2c/Makefile b/comms/xnec2c/Makefile
index 6f987d00cb6d..212c26d8edf9 100644
--- a/comms/xnec2c/Makefile
+++ b/comms/xnec2c/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xnec2c
PORTVERSION= 3.3
CATEGORIES= comms hamradio
MASTER_SITES= http://www.qsl.net/5b4az/pkg/nec2/xnec2c/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Used to calculate antenna patterns useful to ham radio
diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile
index 82ef021a0cb1..e02c10e50ecc 100644
--- a/comms/xwota/Makefile
+++ b/comms/xwota/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.4
PORTREVISION= 7
CATEGORIES= comms hamradio
MASTER_SITES= http://people.fabaris.it/iz0ete/xwota/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= X version of who is on the air
diff --git a/comms/yagiuda/Makefile b/comms/yagiuda/Makefile
index 99b1ebf212f4..c4632f306902 100644
--- a/comms/yagiuda/Makefile
+++ b/comms/yagiuda/Makefile
@@ -5,8 +5,7 @@ PORTNAME= yagiuda
PORTVERSION= 1.19
CATEGORIES= comms hamradio
MASTER_SITES= http://www.g8wrb.org/yagi/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Used to calculate yagi-uda antenna patterns useful to ham radio
diff --git a/comms/yfklog/Makefile b/comms/yfklog/Makefile
index d56846694eef..f06213f5c865 100644
--- a/comms/yfklog/Makefile
+++ b/comms/yfklog/Makefile
@@ -5,11 +5,10 @@ PORTNAME= yfklog
PORTVERSION= 0.3.5
CATEGORIES= comms hamradio
MASTER_SITES= http://fkurz.net/ham/yfklog/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
-DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz yfk.png
+ LOCAL/db
+DISTFILES= ${DISTNAME}.tar.gz yfk.png
DIST_SUBDIR= ${PORTNAME}
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz
+EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Amateur Radio curses based logging program
diff --git a/converters/btoa/Makefile b/converters/btoa/Makefile
index 73bc326c12ce..c465cfcf3427 100644
--- a/converters/btoa/Makefile
+++ b/converters/btoa/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 5.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= pgollucci
+MASTER_SITES= LOCAL/pgollucci
MAINTAINER= ports@FreeBSD.org
COMMENT= Encode/decode binary to printable ASCII
diff --git a/converters/cl-babel/Makefile b/converters/cl-babel/Makefile
index d0f599a9ffb6..74c9f2da65de 100644
--- a/converters/cl-babel/Makefile
+++ b/converters/cl-babel/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 2010.01.16
PORTREVISION= 2
CATEGORIES= converters lisp
PKGNAMEPREFIX= cl-
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Charset encoding/decoding library written in Common Lisp
diff --git a/converters/cocot/Makefile b/converters/cocot/Makefile
index e6b1945465ef..aebfc79032e5 100644
--- a/converters/cocot/Makefile
+++ b/converters/cocot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cocot
PORTVERSION= 20120313
CATEGORIES= converters
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
DISTNAME= ${PORTNAME}-1.1-${PORTVERSION}
MAINTAINER= knu@FreeBSD.org
diff --git a/converters/fconv/Makefile b/converters/fconv/Makefile
index a58c9057d1be..bc7e882f14a9 100644
--- a/converters/fconv/Makefile
+++ b/converters/fconv/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fconv
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= chris
+MASTER_SITES= LOCAL/chris
MAINTAINER= chris@FreeBSD.org
COMMENT= Converts DOS or Mac-style files to Unix format, and vice-versa
diff --git a/converters/iconv-extra/Makefile b/converters/iconv-extra/Makefile
index 678240f83377..c56f508701e0 100644
--- a/converters/iconv-extra/Makefile
+++ b/converters/iconv-extra/Makefile
@@ -4,8 +4,7 @@
PORTNAME= iconv-extra
PORTVERSION= 2.0
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= bland
+MASTER_SITES= LOCAL/bland
MAINTAINER= bland@FreeBSD.org
COMMENT= Additional charsets for the iconv library (those from the Unicode site)
diff --git a/converters/iconv-rfc1345/Makefile b/converters/iconv-rfc1345/Makefile
index bf5473fab2e2..af1e1fc011f3 100644
--- a/converters/iconv-rfc1345/Makefile
+++ b/converters/iconv-rfc1345/Makefile
@@ -4,8 +4,7 @@
PORTNAME= iconv-rfc1345
PORTVERSION= 2.0
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= bland
+MASTER_SITES= LOCAL/bland
MAINTAINER= bland@FreeBSD.org
COMMENT= Additional charset modules for the iconv library (from RFC1345)
diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile
index 692ef49754aa..a8449f5f4f67 100644
--- a/converters/iconv/Makefile
+++ b/converters/iconv/Makefile
@@ -5,8 +5,7 @@ PORTNAME= iconv
PORTVERSION= 2.0
PORTREVISION= 4
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= bland
+MASTER_SITES= LOCAL/bland
MAINTAINER= bland@FreeBSD.org
COMMENT= Charset conversion library and utilities
diff --git a/converters/ish/Makefile b/converters/ish/Makefile
index 6f641e675236..7af205ed4eaf 100644
--- a/converters/ish/Makefile
+++ b/converters/ish/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ish
PORTVERSION= 2.01a5
CATEGORIES= converters
MASTER_SITES= http://www.unix.gr.jp/jnetcex/soft/\
- ${MASTER_SITE_PORTS_JP}
+ PORTS_JP
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= ports@FreeBSD.org
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 78ca639386f7..b23318638e55 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -34,8 +34,7 @@ CONFIGURE_ARGS+= --enable-extra-encodings
.if ${PORT_OPTIONS:MPATCHES}
PATCH_SITES+= http://apolloron.org/software/libiconv-1.14-ja/
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR+= kwm
+PATCH_SITES+= LOCAL/kwm
PATCHFILES+= ${DISTNAME}-ja-1.patch.gz
PATCH_DIST_STRIP+= -p1
.endif
diff --git a/converters/o3read/Makefile b/converters/o3read/Makefile
index 3173bf24fafb..3f1e99eba4b8 100644
--- a/converters/o3read/Makefile
+++ b/converters/o3read/Makefile
@@ -5,8 +5,7 @@ PORTNAME= o3read
PORTVERSION= 0.0.4
CATEGORIES= converters
MASTER_SITES= http://siag.nu/pub/o3read/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER= samm@os2.kiev.ua
COMMENT= Standalone converter for the OpenOffice.org writer and scalc formats
diff --git a/converters/p5-Cstools/Makefile b/converters/p5-Cstools/Makefile
index 09b4e1aed77d..5e371b73e38e 100644
--- a/converters/p5-Cstools/Makefile
+++ b/converters/p5-Cstools/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 3.42
PORTREVISION= 1
CATEGORIES= converters perl5
MASTER_SITES= http://www.adelton.com/perl/Cstools/ \
- CPAN
-MASTER_SITE_SUBDIR= Cz
+ CPAN/Cz
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/converters/p5-Encode-Detect/Makefile b/converters/p5-Encode-Detect/Makefile
index fcbed0fbf0e5..0156a3d5d5ae 100644
--- a/converters/p5-Encode-Detect/Makefile
+++ b/converters/p5-Encode-Detect/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.01
PORTREVISION= 1
CATEGORIES= converters perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Encode
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/converters/p5-Encode-DoubleEncodedUTF8/Makefile b/converters/p5-Encode-DoubleEncodedUTF8/Makefile
index 13fa03417e10..4ef9b7f308ef 100644
--- a/converters/p5-Encode-DoubleEncodedUTF8/Makefile
+++ b/converters/p5-Encode-DoubleEncodedUTF8/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= converters perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Encode
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index b71be67c78e5..8bbf369b8d42 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pdf2djvu
PORTVERSION= 0.7.17
PORTREVISION= 4
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= darcsis@gmail.com
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index a32636c47b8d..52ebbd53f6f9 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wkhtmltopdf
PORTVERSION= 0.12.2.1
PORTREVISION= 1
CATEGORIES= converters
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
DISTNAME= wkhtmltox-${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 2ce352de37be..0c83d57525bd 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cassandra
PORTVERSION= 1.2.18
PORTREVISION= 1
CATEGORIES= databases java
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= cassandra/${PORTVERSION}
+MASTER_SITES= APACHE/cassandra/${PORTVERSION}
DISTNAME= apache-cassandra-${PORTVERSION}
EXTRACT_SUFX= -bin.tar.gz
diff --git a/databases/cassandra2/Makefile b/databases/cassandra2/Makefile
index 23c11ccef7db..b2b701bfe930 100644
--- a/databases/cassandra2/Makefile
+++ b/databases/cassandra2/Makefile
@@ -3,8 +3,7 @@
PORTNAME= cassandra
PORTVERSION= 2.1.1
CATEGORIES= databases java
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= cassandra/${PORTVERSION}
+MASTER_SITES= APACHE/cassandra/${PORTVERSION}
PKGNAMESUFFIX= 2
DISTNAME= apache-cassandra-${PORTVERSION}
EXTRACT_SUFX= -bin.tar.gz
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index d12de7f83bf3..3782a7fd5575 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.6.1
PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= couchdb/source/${PORTVERSION}
+MASTER_SITES= APACHE/couchdb/source/${PORTVERSION}
DISTNAME= apache-couchdb-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/databases/dbview/Makefile b/databases/dbview/Makefile
index ffffc523e526..53c0ca18d90f 100644
--- a/databases/dbview/Makefile
+++ b/databases/dbview/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dbview
PORTVERSION= 1.0.4
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/database/proprietary
+MASTER_SITES= SUNSITE/apps/database/proprietary
MAINTAINER= ports@FreeBSD.org
COMMENT= View dBase III files
diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 5f746dd0577f..6ab8ceb4dda4 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnats
PORTVERSION= 4.1.0
PORTREVISION= 3
CATEGORIES= databases devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= gnats
+MASTER_SITES= GNU
PKGNAMESUFFIX= 4
MAINTAINER= portmaster@bsdforge.com
diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile
index 0f1869681cc1..97d09ef6a582 100644
--- a/databases/isql-viewer/Makefile
+++ b/databases/isql-viewer/Makefile
@@ -6,9 +6,7 @@ PORTVERSION= 2.1.8
PORTREVISION= 4
CATEGORIES= databases java
MASTER_SITES= SF/isql/Stand%20Alone%20Jars/Version%20${PORTVERSION}:isql \
- ${MASTER_SITE_APACHE:S/$/:bsf/}
-MASTER_SITE_SUBDIR= isql/:isql \
- ws/soap/version-2.2/:bsf
+ APACHE/ws/soap/version-2.2:bsf
DISTFILES= ${ISQL_JAR}:isql \
${BSF_JAR}:bsf
EXTRACT_ONLY= # none
diff --git a/databases/jdbm2/Makefile b/databases/jdbm2/Makefile
index 5bff267123bd..bc37c828b19a 100644
--- a/databases/jdbm2/Makefile
+++ b/databases/jdbm2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= jdbm
PORTVERSION= 2.4
CATEGORIES= databases java
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ale@FreeBSD.org
COMMENT= Fast, simple, and transactional Java persistence engine
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index dd161a40332b..c881289ab257 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.1.19
PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAMBA
MAINTAINER= timur@FreeBSD.org
COMMENT= LDAP-like embedded database
diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile
index a1001dbd1f9c..44839a01bc64 100644
--- a/databases/luadbi/Makefile
+++ b/databases/luadbi/Makefile
@@ -5,7 +5,7 @@ PORTNAME= luadbi
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= olexander.v.melnyk@gmail.com
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 985ed1ce3000..e9f8f364a0e7 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -5,9 +5,8 @@ PORTNAME= memcached
PORTVERSION= 1.4.22
CATEGORIES= databases
MASTER_SITES= http://www.memcached.org/files/ \
- ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GOOGLE_CODE \
+ GENTOO
MAINTAINER= swills@FreeBSD.org
COMMENT= High-performance distributed memory object cache system
diff --git a/databases/memcacheq/Makefile b/databases/memcacheq/Makefile
index 495593137760..0dfa69fc5658 100644
--- a/databases/memcacheq/Makefile
+++ b/databases/memcacheq/Makefile
@@ -5,9 +5,8 @@ PORTNAME= memcacheq
PORTVERSION= 0.2.0
PORTREVISION= 4
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+MASTER_SITES= GOOGLE_CODE \
+ GENTOO
MAINTAINER= m.tsatsenko@gmail.com
COMMENT= Simple queue service over Memcache
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 604a6c661407..7946aeedbeb3 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mysql-connector-c++
PORTVERSION= 1.1.5
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= Connector-C++
+MASTER_SITES= MYSQL/Connector-C++
MAINTAINER= ports@FreeBSD.org
COMMENT= MySQL database connector for C++
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 3d38a6299953..5bdc72e0df0f 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -5,8 +5,7 @@
PORTNAME= mysql-connector-java
PORTVERSION= 5.1.35
CATEGORIES= databases java
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= Connector-J
+MASTER_SITES= MYSQL/Connector-J
MAINTAINER= matthew@FreeBSD.org
COMMENT= MySQL Connector/J: JDBC interface for MySQL
diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index eb7495a6f339..be5aeac9d5dd 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mysql-proxy
PORTVERSION= 0.8.4
PORTREVISION= 2
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-Proxy
+MASTER_SITES= MYSQL/MySQL-Proxy
MAINTAINER= swills@FreeBSD.org
COMMENT= Monitor, analyze, or transform the communication of MySQL
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index f425bb1a339b..fa44003fe3c3 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mysql-workbench-oss
PORTVERSION= 5.1.16
PORTREVISION= 11
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQLGUITools
+MASTER_SITES= MYSQL/MySQLGUITools
PKGNAMESUFFIX= 51
MAINTAINER= ports@FreeBSD.org
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index c026b74dabc6..ec1baa52cff9 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= mysql
PORTVERSION= 5.1.73
PORTREVISION?= 2
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-5.1
+MASTER_SITES= MYSQL/MySQL-5.1
PKGNAMESUFFIX?= 51-server
MAINTAINER= ale@FreeBSD.org
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index e1e68e6529a6..87457a3b0d95 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= mysql
PORTVERSION= 5.5.43
PORTREVISION?= 0
CATEGORIES= databases ipv6
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-5.5
+MASTER_SITES= MYSQL/MySQL-5.5
PKGNAMESUFFIX?= 55-server
MAINTAINER= ale@FreeBSD.org
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 859c3f4356ff..71b559d97933 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= mysql
PORTVERSION= 5.6.24
PORTREVISION?= 0
CATEGORIES= databases ipv6
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-5.6
+MASTER_SITES= MYSQL/MySQL-5.6
PKGNAMESUFFIX?= 56-server
MAINTAINER= ale@FreeBSD.org
diff --git a/databases/nagios-check_postgres_replication/Makefile b/databases/nagios-check_postgres_replication/Makefile
index e14572be6ad8..91484524c685 100644
--- a/databases/nagios-check_postgres_replication/Makefile
+++ b/databases/nagios-check_postgres_replication/Makefile
@@ -4,8 +4,7 @@ PORTNAME= check_postgres_replication
PORTVERSION= 2010.12.16
CATEGORIES= databases python
MASTER_SITES= https://gist.github.com/raw/743942/4b9454d6aaf919fe77d15ecea09c7a001ae83b59/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+ LOCAL/brooks
PKGNAMEPREFIX= nagios-
DISTNAME= check_postgres_replication.py
EXTRACT_SUFX=
diff --git a/databases/ntdb/Makefile b/databases/ntdb/Makefile
index aae678a36f1b..031b4bc8da63 100644
--- a/databases/ntdb/Makefile
+++ b/databases/ntdb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.0
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= tdb
+MASTER_SITES= SAMBA/tdb
MAINTAINER= timur@FreeBSD.org
COMMENT= Not so Trivial DataBase
diff --git a/databases/openark-kit/Makefile b/databases/openark-kit/Makefile
index 204878a75e12..8d123a5c9ee1 100644
--- a/databases/openark-kit/Makefile
+++ b/databases/openark-kit/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openark-kit
PORTVERSION= 196
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Common utilities for MySQL
diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile
index 28cc8bd27756..f571cb31d353 100644
--- a/databases/p5-Class-DBI-Pg/Makefile
+++ b/databases/p5-Class-DBI-Pg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Class-DBI-Pg
PORTVERSION= 0.09
PORTREVISION= 2
CATEGORIES= databases perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Class/DMAKI
+MASTER_SITES= CPAN/Class/DMAKI
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile
index e195fa0ed1af..46cc3964b8b9 100644
--- a/databases/p5-DBD-InterBase/Makefile
+++ b/databases/p5-DBD-InterBase/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.48
PORTREVISION= 2
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
MAINTAINER= yuri@rivera.ru
diff --git a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
index 02a6158e22f4..0cb90cfd2db8 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= fw@moov.de
diff --git a/databases/p5-DBIx-Class-PassphraseColumn/Makefile b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
index 210a4a28a4e3..1826802ac6d7 100644
--- a/databases/p5-DBIx-Class-PassphraseColumn/Makefile
+++ b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= fw@moov.de
diff --git a/databases/p5-DBIx-Class-TimeStamp/Makefile b/databases/p5-DBIx-Class-TimeStamp/Makefile
index f597969bc11c..d596cee9d65b 100644
--- a/databases/p5-DBIx-Class-TimeStamp/Makefile
+++ b/databases/p5-DBIx-Class-TimeStamp/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.14
PORTREVISION= 2
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/databases/p5-DBIx-Ease/Makefile b/databases/p5-DBIx-Ease/Makefile
index 06ca02e80107..5a7402560e6f 100644
--- a/databases/p5-DBIx-Ease/Makefile
+++ b/databases/p5-DBIx-Ease/Makefile
@@ -5,10 +5,8 @@ PORTNAME= DBIx-Ease
PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= databases perl5
-MASTER_SITES= ${MASTER_SITE_LOCAL:S/$/:local/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
-MASTER_SITE_SUBDIR= mat/:local DBIx/:cpan
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:local,cpan
MAINTAINER= perl@FreeBSD.org
COMMENT= Less-code DBI interactions for all drivers
diff --git a/databases/p5-DBIx-HA/Makefile b/databases/p5-DBIx-HA/Makefile
index e734a0770a89..7ade82529a1d 100644
--- a/databases/p5-DBIx-HA/Makefile
+++ b/databases/p5-DBIx-HA/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-DBIx-MySQLSequence/Makefile b/databases/p5-DBIx-MySQLSequence/Makefile
index 60622cbcc256..a0f6307ac189 100644
--- a/databases/p5-DBIx-MySQLSequence/Makefile
+++ b/databases/p5-DBIx-MySQLSequence/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.04
PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile
index 30b031451090..9eacf23a49b1 100644
--- a/databases/p5-MongoDB/Makefile
+++ b/databases/p5-MongoDB/Makefile
@@ -3,11 +3,11 @@
PORTNAME= MongoDB
PORTVERSION= 0.708.1.0
+DISTVERSIONPREFIX= v
CATEGORIES= databases perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MONGODB
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
COMMENT= Mongo Driver for Perl
diff --git a/databases/p5-Oryx/Makefile b/databases/p5-Oryx/Makefile
index d17a66c435d5..996a2c29d9cd 100644
--- a/databases/p5-Oryx/Makefile
+++ b/databases/p5-Oryx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Oryx
PORTVERSION= 0.24
PORTREVISION= 2
CATEGORIES= databases perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= XML/RHUNDT
+MASTER_SITES= CPAN/XML/RHUNDT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index af57fc5c98e9..dbef4678097d 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.1.1
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= databases perl5
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR= projects/gborg/pgperl/stable
+MASTER_SITES= PGSQL/projects/gborg/pgperl/stable
PKGNAMEPREFIX= p5-
DIST_SUBDIR= postgresql
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index 5d31dcd158e6..f661e6ff65c7 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -5,8 +5,7 @@ PORTNAME= RRD-Simple
PORTVERSION= 1.44
PORTREVISION= 6
CATEGORIES= databases perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Proc/NICOLAW
+MASTER_SITES= CPAN/Proc/NICOLAW
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
index b43663165858..f04dba894829 100644
--- a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
+++ b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Rose-DBx-Object-MoreHelpers
PORTVERSION= 0.100
PORTREVISION= 1
CATEGORIES= databases perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Rose/KARMAN
+MASTER_SITES= CPAN/Rose/KARMAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/databases/p5-TokyoCabinet/Makefile b/databases/p5-TokyoCabinet/Makefile
index b8e1d79fcbeb..7c6c027e51e8 100644
--- a/databases/p5-TokyoCabinet/Makefile
+++ b/databases/p5-TokyoCabinet/Makefile
@@ -4,9 +4,8 @@ PORTNAME= TokyoCabinet
PORTVERSION= 1.34
PORTREVISION= 1
CATEGORIES= databases perl5
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/kuriyama \
http://fallabs.com/tokyocabinet/perlpkg/
-MASTER_SITE_SUBDIR= kuriyama
PKGNAMEPREFIX= p5-
DISTNAME= tokyocabinet-perl-${PORTVERSION}
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 067fd45ca841..30257da0a72d 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pgadmin3
PORTVERSION= 1.18.1
PORTREVISION= 2
CATEGORIES= databases
-MASTER_SITES= PGSQL
-MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src
+MASTER_SITES= PGSQL/pgadmin3/release/v${PORTVERSION}/src
DIST_SUBDIR= postgresql
MAINTAINER= fjoe@FreeBSD.org
diff --git a/databases/pgagent/Makefile b/databases/pgagent/Makefile
index 1d3bf2e240c3..9ecedc2a8e52 100644
--- a/databases/pgagent/Makefile
+++ b/databases/pgagent/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pgagent
PORTVERSION= 3.4.0
PORTREVISION= 0
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR= pgadmin3/release/pgagent
+MASTER_SITES= PGSQL/pgadmin3/release/pgagent
DISTNAME= pgAgent-${PORTVERSION}-Source
MAINTAINER= fjoe@FreeBSD.org
diff --git a/databases/pgbadger/Makefile b/databases/pgbadger/Makefile
index 2b0ac445af0b..c93c6279579d 100644
--- a/databases/pgbadger/Makefile
+++ b/databases/pgbadger/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pgbadger
PORTVERSION= 6.2
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
MAINTAINER= girgen@FreeBSD.org
COMMENT= Very competent log analyzer for PostgreSQL
diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile
index 335a5132d7dd..fb21096092b8 100644
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@@ -5,10 +5,10 @@ PORTNAME= pgtcl
PORTVERSION= 2.0.0
PORTREVISION= 1
CATEGORIES= databases tcl
-MASTER_SITES= SF/pgtclng/pgtclng/${PORTVERSION}:src
-MASTER_SITE_SUBDIR= pgtclng
+MASTER_SITES= SF/pgtclng/pgtclng/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= mi@aldan.algebra.com
COMMENT= TCL extension for accessing a PostgreSQL server (PGTCL-NG)
@@ -33,7 +33,6 @@ MANUALREL= 20110918
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
-EXTRACT_ONLY= ${_DISTFILES:M*tar.gz}
DISTFILES+= pgtcldocs-${MANUALREL}.zip:doc
MASTER_SITES+= SF/pgtclng/Manual/${MANUALREL}:doc
.endif
diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile
index 25135cc0d6b2..bcda0ba4b7eb 100644
--- a/databases/postgresql-libpgeasy/Makefile
+++ b/databases/postgresql-libpgeasy/Makefile
@@ -6,8 +6,7 @@ PORTNAME= libpgeasy
PORTVERSION= 3.0.4
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR= projects/gborg/pgeasy/stable
+MASTER_SITES= PGSQL/projects/gborg/pgeasy/stable
DIST_SUBDIR= postgresql
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index c984f29a92e1..21e1d13e6c50 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= postgresql
DISTVERSION?= 8.4.22
PORTREVISION?= 1
CATEGORIES?= databases
-MASTER_SITES= PGSQL
-MASTER_SITE_SUBDIR= source/v${DISTVERSION}
+MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 858ec228e863..f0d9e54375b1 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= postgresql
DISTVERSION?= 9.1.15
PORTREVISION?= 0
CATEGORIES?= databases
-MASTER_SITES= PGSQL
-MASTER_SITE_SUBDIR= source/v${DISTVERSION}
+MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index ed3c9c6087e1..eb90bcad1316 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= postgresql
DISTVERSION?= 9.2.10
PORTREVISION?= 0
CATEGORIES?= databases
-MASTER_SITES= PGSQL
-MASTER_SITE_SUBDIR= source/v${DISTVERSION}
+MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index 03ef9186cb5d..909e0140e737 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -3,11 +3,11 @@
PORTNAME= apsw
PORTVERSION= 3.8.0.2
+DISTVERSIONSUFFIX= -r1
PORTREVISION= 1
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}-${PORTVERSION}-r1
MAINTAINER= rnejdl@ringofsaturn.com
COMMENT= APSW stands for Another Python SQLite Wrapper
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index ef4188fcdb94..ad7a61e290b4 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bsddb
PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 5
CATEGORIES= databases python
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 2187b1bca27e..eeb9e613b960 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gdbm
PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 3
CATEGORIES= databases python
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
diff --git a/databases/py-mysql-connector-python/Makefile b/databases/py-mysql-connector-python/Makefile
index 3ce237952a13..a4d1f92b90fb 100644
--- a/databases/py-mysql-connector-python/Makefile
+++ b/databases/py-mysql-connector-python/Makefile
@@ -3,8 +3,7 @@
PORTNAME= mysql-connector-python
PORTVERSION= 1.2.3
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= Connector-Python
+MASTER_SITES= MYSQL/Connector-Python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= bofh@FreeBSD.org
diff --git a/databases/py-mysql-connector-python2/Makefile b/databases/py-mysql-connector-python2/Makefile
index 92e49c207916..1e37e4ccd91a 100644
--- a/databases/py-mysql-connector-python2/Makefile
+++ b/databases/py-mysql-connector-python2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mysql-connector-python
PORTVERSION= 2.0.3
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= Connector-Python
+MASTER_SITES= MYSQL/Connector-Python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 2
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index 3343369793db..64c1109d7acd 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -5,7 +5,7 @@ PORTNAME= sqlalchemy-migrate
PORTVERSION= 0.7.2
PORTREVISION= 1
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index ca1535c39c5a..e6fb955bd250 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sqlite3
PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 6
CATEGORIES= databases python
-MASTER_SITES= PYTHON
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Python-${PORTVERSION}
DIST_SUBDIR= python
diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index 4151e74696ea..6fc7bdbca692 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -5,8 +5,7 @@ PORTNAME= soci
PORTVERSION= 3.2.2
PORTREVISION= 1
CATEGORIES= databases
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= The C++ Database Access Library
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index 6b7db35b2795..876244a5b64b 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -4,8 +4,7 @@ PORTNAME= sqlclient
PORTVERSION= 1.7.0
PORTREVISION= 2
CATEGORIES= databases gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= libs
+MASTER_SITES= GNUSTEP/libs
DISTNAME= SQLClient-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 1683a188fad7..35908062d00b 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.3.4
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAMBA
MAINTAINER= timur@FreeBSD.org
COMMENT= Trivial Database
diff --git a/deskutils/cal/Makefile b/deskutils/cal/Makefile
index 5efd9906aca3..72a897908670 100644
--- a/deskutils/cal/Makefile
+++ b/deskutils/cal/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cal
PORTVERSION= 3.5
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/shell
+MASTER_SITES= SUNSITE/utils/shell
MAINTAINER= sanpei@FreeBSD.org
COMMENT= Enhanced color version of standard calendar utility
diff --git a/deskutils/cartotheque/Makefile b/deskutils/cartotheque/Makefile
index 4b94407bc57f..993296e64554 100644
--- a/deskutils/cartotheque/Makefile
+++ b/deskutils/cartotheque/Makefile
@@ -4,8 +4,7 @@ PORTNAME= cartotheque
PORTVERSION= 0.1
PORTREVISION= 4
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= Cartotheque-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index 2a39b692c2b9..a2feb6136aff 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -5,8 +5,7 @@ PORTNAME= charmap
PORTVERSION= 0.2
PORTREVISION= 4
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= charmap
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Character map for GNUstep
diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile
index 678550eda9cb..df586c4a0588 100644
--- a/deskutils/dlume/Makefile
+++ b/deskutils/dlume/Makefile
@@ -5,7 +5,7 @@ PORTNAME= dlume
PORTVERSION= 0.2.4
PORTREVISION= 12
CATEGORIES= deskutils gnome
-MASTER_SITES= ${MASTER_SITE_TUCOWS}
+MASTER_SITES= TUCOWS
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK2 address book
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 7a087275ca91..6f4638c7935d 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.1.0
PORTREVISION= 4
CATEGORIES= deskutils gnustep
#MASTER_SITES= ftp://ftp.raffael.ch/software/GNUstepWrapper/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
PKGNAMEPREFIX= gnustep-
DISTNAME= GNUstepWrapper-${PORTVERSION}
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 389d226a9483..fa7a122a47f8 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.9.2
PORTREVISION= 4
CATEGORIES= deskutils gnustep
#MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= usr-apps
+MASTER_SITES= GNUSTEP/usr-apps
PKGNAMESUFFIX= -gwmetadata${PKGNAMESUFFIX2}
MAINTAINER= theraven@FreeBSD.org
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index 3692aae1f029..53f9c510208d 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.9.2
PORTREVISION= 2
CATEGORIES= deskutils gnustep
#MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= usr-apps
+MASTER_SITES= GNUSTEP/usr-apps
MAINTAINER= theraven@FreeBSD.org
COMMENT= GNUstep workspace manager
diff --git a/deskutils/hot-babe/Makefile b/deskutils/hot-babe/Makefile
index bf52d815b924..dfea5b5c722a 100644
--- a/deskutils/hot-babe/Makefile
+++ b/deskutils/hot-babe/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.2.2
PORTREVISION= 8
CATEGORIES= deskutils
MASTER_SITES= http://dindinx.net/hotbabe/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= novel
+ LOCAL/novel
MAINTAINER= novel@FreeBSD.org
COMMENT= Small utility which displays the system activity in a special way
diff --git a/deskutils/libgcal/Makefile b/deskutils/libgcal/Makefile
index 77b23f4e303d..3d86c5402321 100644
--- a/deskutils/libgcal/Makefile
+++ b/deskutils/libgcal/Makefile
@@ -5,7 +5,7 @@ PORTNAME= libgcal
PORTVERSION= 0.9.6
PORTREVISION= 2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Library allowing communication with Google calendar and contacts
diff --git a/deskutils/libopensync-plugin-vformat-devel/Makefile b/deskutils/libopensync-plugin-vformat-devel/Makefile
index 7031649e88b0..d8f5aafbad6a 100644
--- a/deskutils/libopensync-plugin-vformat-devel/Makefile
+++ b/deskutils/libopensync-plugin-vformat-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libopensync-plugin-vformat
PORTVERSION= 0.39
CATEGORIES= deskutils
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= danilo
+ LOCAL/danilo
PKGNAMESUFFIX= -devel
MAINTAINER= danilo@FreeBSD.org
diff --git a/deskutils/mrundlg/Makefile b/deskutils/mrundlg/Makefile
index c508e779366d..929173a50719 100644
--- a/deskutils/mrundlg/Makefile
+++ b/deskutils/mrundlg/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= deskutils
# MASTER_SITES= http://matt.sixxgate.com/files/
-MASTER_SITES= ${MASTER_SITE_FREEBSD}
+MASTER_SITES= FREEBSD
MAINTAINER= sixxgate@hotmail.com
COMMENT= Application / program launcher for Motif
diff --git a/deskutils/osynctool/Makefile b/deskutils/osynctool/Makefile
index 7d82c7bd0aa2..ce660585b6ea 100644
--- a/deskutils/osynctool/Makefile
+++ b/deskutils/osynctool/Makefile
@@ -5,8 +5,7 @@ PORTNAME= osynctool
PORTVERSION= 0.39
CATEGORIES= deskutils
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= danilo
+ LOCAL/danilo
MAINTAINER= danilo@FreeBSD.org
COMMENT= Command line client for the OpenSync framework
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 137fa20528d0..0332f921b6df 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -7,7 +7,6 @@ PORTNAME= plan
PORTVERSION= 1.10.1
CATEGORIES+= deskutils
MASTER_SITES= ftp://plan.ftp.fu-berlin.de/
-MASTER_SITE_SUBDIR= applications
MAINTAINER= ports@FreeBSD.org
COMMENT= X/Motif schedule planner with calendar
diff --git a/deskutils/plasma-applet-playwolf/Makefile b/deskutils/plasma-applet-playwolf/Makefile
index d62cd041080b..4c157108117b 100644
--- a/deskutils/plasma-applet-playwolf/Makefile
+++ b/deskutils/plasma-applet-playwolf/Makefile
@@ -4,7 +4,7 @@ PORTNAME= playwolf
PORTVERSION= 0.8.1
PORTREVISION= 6
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= plasma-applet-
MAINTAINER= jhale@FreeBSD.org
diff --git a/deskutils/plopfolio/Makefile b/deskutils/plopfolio/Makefile
index a9acc5f86daf..d7e72b64d846 100644
--- a/deskutils/plopfolio/Makefile
+++ b/deskutils/plopfolio/Makefile
@@ -4,8 +4,7 @@ PORTNAME= plopfolio
PORTVERSION= 0.1.0
PORTREVISION= 4
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= usr-apps
+MASTER_SITES= GNUSTEP/usr-apps
MAINTAINER= ports@FreeBSD.org
COMMENT= Free clone of KlipFolio for GNUstep
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index bb225e739058..97cdeffe8c5f 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -4,8 +4,7 @@
PORTNAME= rednotebook
PORTVERSION= 1.9.0
CATEGORIES= deskutils python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= rednotebook
+MASTER_SITES= SF/rednotebook
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= cheunghonyu@gmail.com
diff --git a/deskutils/sliderule/Makefile b/deskutils/sliderule/Makefile
index 5941761bdce6..b12d4618c9ee 100644
--- a/deskutils/sliderule/Makefile
+++ b/deskutils/sliderule/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sliderule
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
diff --git a/deskutils/sugarcrm/Makefile b/deskutils/sugarcrm/Makefile
index 8eeac747137f..a5d0100e9cdc 100644
--- a/deskutils/sugarcrm/Makefile
+++ b/deskutils/sugarcrm/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sugarcrm
PORTVERSION= 6.5.20
CATEGORIES= deskutils www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X
+MASTER_SITES= SF/${PORTNAME}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X
DISTNAME= SugarCE-${PORTVERSION}
MAINTAINER= wen@FreeBSD.org
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index d198609b092d..8b443b5633dc 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -4,8 +4,7 @@ PORTNAME= systempreferences
PORTVERSION= 1.2.0
PORTREVISION= 3
CATEGORIES= deskutils gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR=usr-apps
+MASTER_SITES= GNUSTEP/usr-apps
DISTNAME= SystemPreferences-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index e9ed24874869..98ce95ee004c 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -8,7 +8,6 @@ CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/:treeline \
http://treeline.bellz.org/plugins/:plugins \
http://depot.fsck.ch/mirror/distfiles/:treeline,plugins
-MASTER_SITE_SUBDIR=treeline/:treeline
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:treeline
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index 4a90f0a50bee..457bdacb2272 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tuxcards
PORTVERSION= 2.2.1
PORTREVISION= 1
CATEGORIES= deskutils
-MASTER_SITES= http://www.tuxcards.de/src/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
+MASTER_SITES= http://www.tuxcards.de/src/${PORTNAME}-${PORTVERSION}/
MAINTAINER= johans@FreeBSD.org
COMMENT= Tool for managing notes within a hierarchical tree
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index 2f5844540119..37432b1b2f73 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -5,7 +5,7 @@ PORTNAME= vboxgtk
PORTVERSION= 0.8.2
PORTREVISION= 1
CATEGORIES= deskutils emulators gnome
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK frontend for VirtualBox
diff --git a/deskutils/vnc2flv/Makefile b/deskutils/vnc2flv/Makefile
index 5174a55f2715..333917f2b8e9 100644
--- a/deskutils/vnc2flv/Makefile
+++ b/deskutils/vnc2flv/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 20100207
PORTREVISION= 1
CATEGORIES= deskutils multimedia www python
MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR= source/v/${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile
index 8db734c4076e..40317ed6d1d8 100644
--- a/deskutils/wmpinboard/Makefile
+++ b/deskutils/wmpinboard/Makefile
@@ -5,7 +5,7 @@ PORTNAME= wmpinboard
PORTVERSION= 1.0
PORTREVISION= 5
CATEGORIES= deskutils afterstep windowmaker
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= t.kempka@web.de
diff --git a/deskutils/xcalendar/Makefile b/deskutils/xcalendar/Makefile
index 8d20db8978d1..ddd0ecb12c7a 100644
--- a/deskutils/xcalendar/Makefile
+++ b/deskutils/xcalendar/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xcalendar
PORTVERSION= 4.0.2008
PORTREVISION= 2
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
DISTNAME= ${PORTNAME}-4.0+i18n
MAINTAINER= sarumaru@jp.FreeBSD.org
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 9e6a98757401..978d283fbdb5 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-notifyd
PORTVERSION= 0.2.4
PORTREVISION= 1
CATEGORIES= deskutils xfce
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile
index 3cca6e4b49ec..2d1cf7965776 100644
--- a/deskutils/xfce4-volumed/Makefile
+++ b/deskutils/xfce4-volumed/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-volumed
PORTVERSION= 0.1.13
PORTREVISION= 2
CATEGORIES= deskutils xfce
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= sergey.dyatko@gmail.com
diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile
index 0412cde06183..118d0d9a18d3 100644
--- a/deskutils/xmaddressbook/Makefile
+++ b/deskutils/xmaddressbook/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmaddressbook
PORTVERSION= 1.5.3
PORTREVISION= 3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= office
+MASTER_SITES= XCONTRIB/office
MAINTAINER= ports@FreeBSD.org
COMMENT= X11/Motif-based addressbook program
diff --git a/deskutils/xpostitPlus/Makefile b/deskutils/xpostitPlus/Makefile
index cf9efdbceda2..a97b2ce24958 100644
--- a/deskutils/xpostitPlus/Makefile
+++ b/deskutils/xpostitPlus/Makefile
@@ -5,8 +5,7 @@ PORTNAME= XPostitPlus
PORTVERSION= 2.3
PORTREVISION= 3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= office
+MASTER_SITES= XCONTRIB/office
MAINTAINER= ports2@dclg.ca
COMMENT= PostIt (R) messages onto your X11 screen
diff --git a/devel/ElectricFence/Makefile b/devel/ElectricFence/Makefile
index 2b2422583d13..c39d3a857543 100644
--- a/devel/ElectricFence/Makefile
+++ b/devel/ElectricFence/Makefile
@@ -5,8 +5,7 @@ PORTNAME= electricfence
PORTVERSION= 2.2.2
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/misc
+MASTER_SITES= PACKETSTORM/UNIX/misc
DISTNAME= ElectricFence-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/adabooch/Makefile b/devel/adabooch/Makefile
index c3ddfac04e62..f90fe0c9a8b9 100644
--- a/devel/adabooch/Makefile
+++ b/devel/adabooch/Makefile
@@ -5,8 +5,7 @@ PORTNAME= adabooch
PORTVERSION= 20130322
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= booch95/booch95/${PORTVERSION}
+MASTER_SITES= SF/booch95/booch95/${PORTVERSION}
DISTNAME= bc-${PORTVERSION}
MAINTAINER= marino@FreeBSD.org
diff --git a/devel/ahven/Makefile b/devel/ahven/Makefile
index 35bba8bed99a..a70a8deeeecf 100644
--- a/devel/ahven/Makefile
+++ b/devel/ahven/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ahven
PORTVERSION= 2.4
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/Ahven%20${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Ahven%20${PORTVERSION}
MAINTAINER= marino@FreeBSD.org
COMMENT= Ada unit test framework
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index bddf50991a7c..178aa2092f52 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -32,7 +32,7 @@ READMES= LICENSE README WHATSNEW
.if ${PORT_OPTIONS:MDOCS}
DISTFILES+= ${PORTNAME}-${PORTVERSION}-manual.tar.bz2:doc
-MASTER_SITES+= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/manual/:doc,}
+MASTER_SITES+= APACHE/ant/manual/:doc
PORTDOCS= *
.endif
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index f1d6d60e3eab..718f7870518e 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -4,8 +4,7 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= apr
+MASTER_SITES= APACHE/apr
DISTFILES= apr-${APR_VERSION}.tar.gz \
apr-util-${APU_VERSION}.tar.gz
diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile
index 67c3d1b3b3f4..e3d890c8d41e 100644
--- a/devel/argp-standalone/Makefile
+++ b/devel/argp-standalone/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.3
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.lysator.liu.se/~nisse/misc/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sem
+ LOCAL/sem
MAINTAINER= sem@FreeBSD.org
COMMENT= Standalone version of arguments parsing functions from GLIBC
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index e2e0e99f6069..6a116361621c 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= binutils
PORTVERSION= 2.25
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
PKGNAMEPREFIX= arm-elf-
MAINTAINER= danilo@FreeBSD.org
diff --git a/devel/asl/Makefile b/devel/asl/Makefile
index fe3ccbd90bc8..ae00e7e0029c 100644
--- a/devel/asl/Makefile
+++ b/devel/asl/Makefile
@@ -4,9 +4,8 @@
PORTNAME= asl
PORTVERSION= 1.41r8
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/devel/lang/assemblers \
ftp://john.ccac.rwth-aachen.de/pub/as/source/c_version/
-MASTER_SITE_SUBDIR= devel/lang/assemblers
MAINTAINER= doconnor@gsoft.com.au
COMMENT= Assembler for a variety of microcontrollers/-processors
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 7a26388fdf7c..de35381aff06 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -4,8 +4,7 @@
PORTNAME= autoconf
PORTVERSION= 2.69
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= autoconf
+MASTER_SITES= GNU
DISTNAME= autoconf-${PORTVERSION}
MAINTAINER= autotools@FreeBSD.org
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index d68dde43c74e..00d0cee113c3 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -5,8 +5,7 @@ PORTNAME= autoconf
PORTVERSION= 2.13.000227
PORTREVISION= 6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ade/gnu
+MASTER_SITES= LOCAL/ade/gnu
DISTNAME= autoconf-000227
PKGNAMESUFFIX= 213
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index c6a90142101c..c586e841a01e 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -5,8 +5,7 @@ PORTNAME= automake
PORTVERSION= 1.4.6
PORTREVISION= 7
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= automake
+MASTER_SITES= GNU
PKGNAMESUFFIX= 14
DISTNAME= automake-1.4-p6
diff --git a/devel/avalon-framework/Makefile b/devel/avalon-framework/Makefile
index 5af6408df934..769b4f50cc4e 100644
--- a/devel/avalon-framework/Makefile
+++ b/devel/avalon-framework/Makefile
@@ -5,8 +5,7 @@ PORTNAME= avalon-framework
PORTVERSION= 4.2.0
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= avalon/${PORTNAME}/binaries/
+MASTER_SITES= APACHE/avalon/${PORTNAME}/binaries
MAINTAINER= makc@FreeBSD.org
COMMENT= Apache Avalon core framework for component programming
diff --git a/devel/avr-gcc-devel/Makefile b/devel/avr-gcc-devel/Makefile
index a44890471ad3..c27673582fa3 100644
--- a/devel/avr-gcc-devel/Makefile
+++ b/devel/avr-gcc-devel/Makefile
@@ -3,8 +3,7 @@
PORTNAME= gcc
PORTVERSION= 4.10.0.s20140803
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= snapshots/${DISTVERSION}
+MASTER_SITES= GCC/snapshots/${DISTVERSION}
PKGNAMEPREFIX= avr-
PKGNAMESUFFIX= -devel
# DISTNAME= gcc-${DISTVERSION}
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index b1355c6ccde7..3ae5d744e259 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gcc
PORTVERSION= 4.8.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= releases/gcc-${DISTVERSION}
+MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMEPREFIX= avr-
# DISTNAME= gcc-${DISTVERSION}
diff --git a/devel/avr-gdb/Makefile b/devel/avr-gdb/Makefile
index 444fe20d2ac3..ea6903c89842 100644
--- a/devel/avr-gdb/Makefile
+++ b/devel/avr-gdb/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 7.3.1
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= gdb
PKGNAMEPREFIX= avr-
DISTNAME= gdb-${PORTVERSION}
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 0da5527f37b2..4a6178f508b4 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
COMMENT= C and math library for the Atmel AVR controller family
diff --git a/devel/avro-c/Makefile b/devel/avro-c/Makefile
index 77269ea1f86b..d4e7b920bdf2 100644
--- a/devel/avro-c/Makefile
+++ b/devel/avro-c/Makefile
@@ -4,8 +4,7 @@
PORTNAME= avro
PORTVERSION= 1.7.3
CATEGORIES= devel
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/stable
+MASTER_SITES= APACHE/${PORTNAME}/stable
PKGNAMESUFFIX= -c
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/devel/avro-cpp/Makefile b/devel/avro-cpp/Makefile
index 77fc416697df..a1b4e988e3f9 100644
--- a/devel/avro-cpp/Makefile
+++ b/devel/avro-cpp/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.7.4
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.sai.msu.su/apache/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ \
- APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/stable
+ APACHE/${PORTNAME}/stable
PKGNAMESUFFIX= -cpp
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 12743c1f97c3..1150fe789f85 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -5,8 +5,7 @@ PORTNAME= binutils
PORTVERSION= 2.25
PORTREVISION?= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
MAINTAINER?= bapt@FreeBSD.org
COMMENT?= GNU binary tools
diff --git a/devel/bncsutil-ghost++/Makefile b/devel/bncsutil-ghost++/Makefile
index 7a90a944013a..a985268466f0 100644
--- a/devel/bncsutil-ghost++/Makefile
+++ b/devel/bncsutil-ghost++/Makefile
@@ -4,7 +4,7 @@
PORTNAME= bncsutil
PORTVERSION= 1.3.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -ghost++
DISTNAME= ${PROJECTHOST}_${PROJECTVERSION}
diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile
index d91784e887f2..39ede3b16f5c 100644
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bugzilla
PORTVERSION= 4.4.8
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= BUGZILLA
-MASTER_SITE_SUBDIR= webtools webtools/archived
+MASTER_SITES= BUGZILLA/webtools BUGZILLA/webtools/archived
MAINTAINER= bz-ports@FreeBSD.org
COMMENT= Bug-tracking system developed by Mozilla Project
diff --git a/devel/c-unit/Makefile b/devel/c-unit/Makefile
index 95dbe0d851c1..a467a2749c7a 100644
--- a/devel/c-unit/Makefile
+++ b/devel/c-unit/Makefile
@@ -5,7 +5,7 @@ PORTNAME= c-unit
DISTVERSION= 1.1.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= tak.swd@gmail.com
COMMENT= Unit testing framework for C
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 8760e83bea7d..2a4422bbef50 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cdecl
PORTVERSION= 2.5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= devel/lang/c
+MASTER_SITES= SUNSITE/devel/lang/c
MAINTAINER= ports@FreeBSD.org
COMMENT= Explains complicated C/C++ declarations in plain English
diff --git a/devel/cflow/Makefile b/devel/cflow/Makefile
index 5625b1006bcd..b248fc3e6952 100644
--- a/devel/cflow/Makefile
+++ b/devel/cflow/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cflow
PORTVERSION= 2.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= devel/lang/c
+MASTER_SITES= SUNSITE/devel/lang/c
MAINTAINER= tj@FreeBSD.org
COMMENT= Call graph generator for C code
diff --git a/devel/cl-alexandria/Makefile b/devel/cl-alexandria/Makefile
index fe7d5f286a1e..7f7160ef269f 100644
--- a/devel/cl-alexandria/Makefile
+++ b/devel/cl-alexandria/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 2010.01.16
PORTREVISION= 3
CATEGORIES= devel lisp
PKGNAMEPREFIX= cl-
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Collection of portable public domain utilities for Common Lisp
diff --git a/devel/cl-asdf/Makefile b/devel/cl-asdf/Makefile
index 0c8c3c5810eb..2325e72d58b5 100644
--- a/devel/cl-asdf/Makefile
+++ b/devel/cl-asdf/Makefile
@@ -9,8 +9,7 @@ PORTVERSION= 2.017
PORTEPOCH= 2
CATEGORIES= devel lisp
PKGNAMEPREFIX= cl-
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
MAINTAINER= olgeni@FreeBSD.org
COMMENT= System definition facility for Common Lisp
diff --git a/devel/cl-trivial-features/Makefile b/devel/cl-trivial-features/Makefile
index 61ebfb0e74a6..b51b8ad996f5 100644
--- a/devel/cl-trivial-features/Makefile
+++ b/devel/cl-trivial-features/Makefile
@@ -4,8 +4,7 @@ PORTNAME= trivial-features
PORTVERSION= 2010.01.16
PORTREVISION= 1
CATEGORIES= devel lisp
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
PKGNAMEPREFIX= cl-
MAINTAINER= olgeni@FreeBSD.org
diff --git a/devel/cl-trivial-gray-streams/Makefile b/devel/cl-trivial-gray-streams/Makefile
index bd88a04adc98..57e7ed07c03e 100644
--- a/devel/cl-trivial-gray-streams/Makefile
+++ b/devel/cl-trivial-gray-streams/Makefile
@@ -4,8 +4,7 @@ PORTNAME= trivial-gray-streams
PORTVERSION= 2008.11.02
PORTREVISION= 1
CATEGORIES= devel lisp
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= olgeni
+MASTER_SITES= LOCAL/olgeni
PKGNAMEPREFIX= cl-
MAINTAINER= olgeni@FreeBSD.org
diff --git a/devel/cld/Makefile b/devel/cld/Makefile
index 5e30a4b85dd8..95e8c4220219 100644
--- a/devel/cld/Makefile
+++ b/devel/cld/Makefile
@@ -5,7 +5,7 @@ PORTNAME= cld
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PROJECTHOST= chromium-compact-language-detector
DISTNAME= compact-language-detector-${PORTVERSION}
diff --git a/devel/cld2/Makefile b/devel/cld2/Makefile
index 5a7a536d2d1b..e92615dde8c1 100644
--- a/devel/cld2/Makefile
+++ b/devel/cld2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cld
PORTVERSION= 20150505
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= demon
+MASTER_SITES= LOCAL/demon
PKGNAMESUFFIX= 2
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/compiler-rt/Makefile b/devel/compiler-rt/Makefile
index cdb9b508b953..d455ea8c2bd1 100644
--- a/devel/compiler-rt/Makefile
+++ b/devel/compiler-rt/Makefile
@@ -4,8 +4,7 @@
PORTNAME= compiler-rt
DISTVERSION= 0.r${SVN_REV}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
MAINTAINER= brooks@FreeBSD.org
COMMENT= Compiler runtime library with Blocks support
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 5d5447bdc4d8..8bff3e467586 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.30
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://miller.emu.id.au/pmiller/software/cook/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=jasone
+ LOCAL/jasone
MAINTAINER= jasone@FreeBSD.org
COMMENT= Like make(1), but more powerful and clean
diff --git a/devel/cvs-devel/Makefile b/devel/cvs-devel/Makefile
index c7b9f3dd63e1..e62939977c0f 100644
--- a/devel/cvs-devel/Makefile
+++ b/devel/cvs-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cvs
PORTVERSION= 1.12.13
PORTREVISION= 11
CATEGORIES= devel ipv6
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= non-gnu/${PORTNAME}/source/feature/${PORTVERSION}
+MASTER_SITES= GNU/non-gnu/${PORTNAME}/source/feature/${PORTVERSION}
PKGNAMESUFFIX= -devel
MAINTAINER= bdheeman@gmail.com
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 8f124dc494d2..6d2c2beb1a30 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES= http://cvs2svn.tigris.org/files/documents/1462/49237/ \
LOCAL/ohauer
PATCHFILES= ${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.bz2
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= ohauer
+PATCH_SITES= LOCAL/ohauer
MAINTAINER= ohauer@FreeBSD.org
COMMENT= CVS to Subversion Repository Converter
diff --git a/devel/cvsdadm/Makefile b/devel/cvsdadm/Makefile
index ea6345064cc9..6147aab99110 100644
--- a/devel/cvsdadm/Makefile
+++ b/devel/cvsdadm/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.3.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/ \
- ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for CVSd pserver user administration
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 4f1b610eacec..60e91b218574 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -5,9 +5,7 @@ PORTNAME= cvsweb
PORTVERSION= 2.0.6
PORTREVISION= 2
CATEGORIES= devel www
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://people.FreeBSD.org/~scop/cvsweb/
-MASTER_SITE_SUBDIR= scop
+MASTER_SITES= LOCAL/scop http://people.FreeBSD.org/~scop/cvsweb/
# For issues that are not specific to this port/package, please consult
# the <freebsd-cvsweb@FreeBSD.org> mailing list.
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 5e42af6c24e1..f9d6dae97296 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -5,9 +5,7 @@ PORTNAME= cvsweb
PORTVERSION= 3.0.6
PORTREVISION= 4
CATEGORIES= devel www
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://people.FreeBSD.org/~scop/cvsweb/
-MASTER_SITE_SUBDIR= scop
+MASTER_SITES= LOCAL/scop http://people.FreeBSD.org/~scop/cvsweb/
PKGNAMESUFFIX= 3
# For issues that are not specific to this port/package, please consult
diff --git a/devel/cvswrap/Makefile b/devel/cvswrap/Makefile
index 7588c9f4e2b3..829c7eec05a5 100644
--- a/devel/cvswrap/Makefile
+++ b/devel/cvswrap/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cvswrap
PORTVERSION= 0.2
CATEGORIES= devel
-MASTER_SITES+= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alfred
+MASTER_SITES+= LOCAL/alfred
MAINTAINER= ports@FreeBSD.org
COMMENT= Helper for multiple CVS repositories
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index aecafe051eeb..8b9ab51b2650 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cweb
PORTVERSION= 3.64a.a
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= web/c_cpp/cweb
+MASTER_SITES= TEX_CTAN/web/c_cpp/cweb
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.([a-z])$/\1/}
MAINTAINER= gerald@FreeBSD.org
diff --git a/devel/d-feet/Makefile b/devel/d-feet/Makefile
index d91cd094b7a6..026e2ace0854 100644
--- a/devel/d-feet/Makefile
+++ b/devel/d-feet/Makefile
@@ -5,8 +5,7 @@ PORTNAME= d-feet
PORTVERSION= 0.1.12
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/d-feet/0.1
+MASTER_SITES= GNOME/sources/d-feet/0.1
MAINTAINER= thinker@codemud.net
COMMENT= D-Feet is a D-Bus debugger written in PyGtk+ by John (J5) Palmieri
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 67ef94bed3e4..304ba6f7bb7e 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ddd
PORTVERSION= 3.3.12
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= sergio@softshark.org
COMMENT= Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index 29c6852e47c6..3cac1753614d 100644
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@@ -5,7 +5,7 @@ PORTNAME= dissy
PORTVERSION= 10
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= sbz@FreeBSD.org
COMMENT= Graphical frontend to the objdump disassembler
diff --git a/devel/djgpp-binutils/Makefile b/devel/djgpp-binutils/Makefile
index f4b47fd1c9a9..1720f8236fa3 100644
--- a/devel/djgpp-binutils/Makefile
+++ b/devel/djgpp-binutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= binutils
PORTVERSION= 2.17
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
PKGNAMEPREFIX= djgpp-
MAINTAINER= johnson.peter@gmail.com
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index 1f33f058bde2..79d725aa1cb6 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -5,7 +5,7 @@ PORTNAME= dotconf
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple, powerful configuration-file parser
diff --git a/devel/elftoaout/Makefile b/devel/elftoaout/Makefile
index 970f8cdfaaea..147c7547611f 100644
--- a/devel/elftoaout/Makefile
+++ b/devel/elftoaout/Makefile
@@ -4,8 +4,7 @@
PORTNAME= elftoaout
PORTVERSION= 2.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=pool/main/s/sparc-utils
+MASTER_SITES= DEBIAN/pool/main/s/sparc-utils
DISTNAME= sparc-utils_1.9.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/epm/Makefile b/devel/epm/Makefile
index e960c2a1aef4..75871793bdf4 100644
--- a/devel/epm/Makefile
+++ b/devel/epm/Makefile
@@ -5,7 +5,6 @@ PORTNAME= epm
PORTVERSION= 4.2
CATEGORIES= devel
MASTER_SITES= http://www.msweet.org/files/project2/
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
EXTRACT_SUFX= -source.tar.bz2
MAINTAINER= office@FreeBSD.org
diff --git a/devel/eventxx/Makefile b/devel/eventxx/Makefile
index a74f114c8821..0d02041de3ff 100644
--- a/devel/eventxx/Makefile
+++ b/devel/eventxx/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://proj.llucax.com.ar/home/eventxx/releases/ \
LOCAL/glarkin
-MASTER_SITE_SUBDIR= gahr
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ wrapper for libevent
diff --git a/devel/f77flow/Makefile b/devel/f77flow/Makefile
index 31f8fcd514b3..c7e1c68b3c5d 100644
--- a/devel/f77flow/Makefile
+++ b/devel/f77flow/Makefile
@@ -5,8 +5,7 @@ PORTNAME= f77flow
PORTVERSION= 0.12
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= devel/lang/fortran
+MASTER_SITES= SUNSITE/devel/lang/fortran
MAINTAINER= ports@FreeBSD.org
COMMENT= Analyze the structure of a fortran77 program
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index 895d4c40540c..72a9d0db727a 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= ${THRIFT_PORTVERSION}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= thrift/${PORTVERSION}
+MASTER_SITES= APACHE/thrift/${PORTVERSION}
DISTNAME= thrift-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index 0747999258ea..83a12051b724 100644
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@@ -5,9 +5,7 @@ PORTNAME= ffcall
PORTVERSION= 1.10
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.santafe.edu/pub/gnu/
-MASTER_SITES+= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= libs
+MASTER_SITES= ftp://ftp.santafe.edu/pub/gnu/ GNUSTEP/libs
MAINTAINER= ports@FreeBSD.org
COMMENT= Foreign function call libraries
diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile
index 7de1b63e06df..ad6b4dcd3c62 100644
--- a/devel/fortran-utils/Makefile
+++ b/devel/fortran-utils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= fortran-utils
PORTVERSION= 1.1
CATEGORIES= devel
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= kris
+MASTER_SITES= LOCAL/kris
MAINTAINER= ports@FreeBSD.org
COMMENT= Tools for use with Fortran code, from 4.4BSD
diff --git a/devel/freeocl/Makefile b/devel/freeocl/Makefile
index dc769656ceb1..106f42abf91c 100644
--- a/devel/freeocl/Makefile
+++ b/devel/freeocl/Makefile
@@ -5,7 +5,7 @@ PORTNAME= freeocl
PORTVERSION= 0.3.6
PORTREVISION= 6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= FreeOCL-${PORTVERSION}-src
MAINTAINER= ohartman@zedat.fu-berlin.de
diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index 857939c4465e..f8cf207bf299 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -4,9 +4,8 @@
PORTNAME= ftnchek
PORTVERSION= 3.3.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/devel/lang/fortran \
http://www.dsm.fordham.edu/~ftnchek/download/
-MASTER_SITE_SUBDIR= devel/lang/fortran
MAINTAINER= bf@FreeBSD.org
COMMENT= Fortran 77 semantic checking utility
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 7b55aeb108df..f3579754fdd7 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gazpacho
PORTVERSION= 0.7.2
PORTREVISION= 4
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gazpacho/0.7
+MASTER_SITES= GNOME/sources/gazpacho/0.7
MAINTAINER= ports@FreeBSD.org
COMMENT= GUI builder for the GTK+ toolkit
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index b013c26ce186..6af5cc980528 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gconf2
PORTVERSION= 3.2.6
PORTREVISION= 3
CATEGORIES= devel gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index db465679f342..656145e0ba48 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gindent
PORTVERSION= 2.2.10
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= indent
+MASTER_SITES= GNU/indent
DISTNAME= indent-${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index bf9475423c52..8e1b423ac7a4 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gmake
PORTVERSION= 4.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= make
+MASTER_SITES= GNU/make
DISTNAME= make-${PORTVERSION}
# note: before committing to this port, contact portmgr to arrange for an
diff --git a/devel/gnu-efi/Makefile b/devel/gnu-efi/Makefile
index 4da642c199e4..eeb865474f61 100644
--- a/devel/gnu-efi/Makefile
+++ b/devel/gnu-efi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gnu-efi
PORTVERSION= 3.0.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnu-efi
+MASTER_SITES= SF/gnu-efi
MAINTAINER= trasz@FreeBSD.org
COMMENT= SDK for EFI applications
diff --git a/devel/gnulibiberty/Makefile b/devel/gnulibiberty/Makefile
index 3a02d380c723..c1fb824db76f 100644
--- a/devel/gnulibiberty/Makefile
+++ b/devel/gnulibiberty/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnulibiberty
PORTVERSION= 2.19.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
DISTNAME= binutils-${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
diff --git a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile
index e5fb82fee3c6..8c2db4b9087c 100644
--- a/devel/google-gdata/Makefile
+++ b/devel/google-gdata/Makefile
@@ -4,7 +4,7 @@
PORTNAME= google-gdata
PORTVERSION= 2.2.0.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= libgoogle-data-mono-${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile
index 7d015a6a335b..39e49e50cbef 100644
--- a/devel/google-perftools/Makefile
+++ b/devel/google-perftools/Makefile
@@ -4,8 +4,7 @@
PORTNAME= google-perftools
PORTVERSION= 2.4
CATEGORIES= devel
-MASTER_SITES= https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/ \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/
DISTNAME= gperftools-${PORTVERSION}
MAINTAINER= yuri@rawbw.com
diff --git a/devel/google-sparsehash/Makefile b/devel/google-sparsehash/Makefile
index 4f45b0a1d764..085d37180182 100644
--- a/devel/google-sparsehash/Makefile
+++ b/devel/google-sparsehash/Makefile
@@ -5,9 +5,8 @@ PORTNAME= google-sparsehash
PORTVERSION= 2.0.2
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= vd/${PORTNAME}
+MASTER_SITES= GOOGLE_CODE \
+ LOCAL/vd/${PORTNAME}
PROJECTHOST= sparsehash
DISTNAME= sparsehash-${PORTVERSION}
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index 5a17cd9c2e35..d27c044a42f5 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gorm
PORTVERSION= 1.2.20
PORTREVISION= 2
CATEGORIES= devel gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= dev-apps
+MASTER_SITES= GNUSTEP/dev-apps
MAINTAINER= theraven@FreeBSD.org
COMMENT= Graphical Object Relationship Modeller
diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index b85b6a9ed47e..b4fc8b1a45b1 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gperf
PORTVERSION= 3.0.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= gperf
+MASTER_SITES= GNU
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Generates perfect hash functions for sets of keywords
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index 19f02b5d8c86..df087c9fcbf0 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gtkparasite
PORTVERSION= 20090819
PORTREVISION= 5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= pav
+MASTER_SITES= LOCAL/pav
MAINTAINER= ashish@FreeBSD.org
COMMENT= GTK+ UI debugging tool
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 96e492d7352b..56e5314484e1 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -5,7 +5,7 @@ PORTNAME= guichan
PORTVERSION= 0.8.2
PORTREVISION= 10
CATEGORIES= devel games
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= mva@FreeBSD.org
COMMENT= Small, efficient C++ GUI library designed for games
diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile
index fb616973ef4c..f4fff3b87a74 100644
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@@ -8,15 +8,15 @@
PORTNAME= hadoop
PORTVERSION= 2.6.0
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE} \
+MASTER_SITES= APACHE/${PORTNAME}/common/stable \
LOCAL/demon/:maven \
http://archive.apache.org/dist/tomcat/tomcat-6/v${TOMCAT_VERSION}/bin/:tomcat \
http://dist.codehaus.org/jetty/jetty-6.1.14/:jetty
-MASTER_SITE_SUBDIR=${PORTNAME}/common/stable
PKGNAMESUFFIX= 2
-DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat jetty-6.1.14.zip:jetty
+DISTNAME= ${PORTNAME}-${PORTVERSION}-src
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat jetty-6.1.14.zip:jetty
DIST_SUBDIR= hadoop
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz jetty-6.1.14.zip
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz jetty-6.1.14.zip
MAINTAINER= demon@FreeBSD.org
COMMENT= Apache Map/Reduce framework
@@ -39,7 +39,6 @@ JAVA_VERSION= 1.7+
USE_LDCONFIG= yes
SHEBANG_FILES= hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh
MAKE_ENV+= HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
OPTIONS_DEFINE= EXAMPLES
OPTIONS_DEFAULT= EXAMPLES
diff --git a/devel/htable/Makefile b/devel/htable/Makefile
index c6080e9a94c9..354d9070ade7 100644
--- a/devel/htable/Makefile
+++ b/devel/htable/Makefile
@@ -4,8 +4,7 @@
PORTNAME= htable
PORTVERSION= 1.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= culot
+MASTER_SITES= LOCAL/culot
MAINTAINER= culot@FreeBSD.org
COMMENT= Lightweight implementation of hash tables in C
diff --git a/devel/itext/Makefile b/devel/itext/Makefile
index 57936b5b3b8b..6a742106c808 100644
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 4.2.0
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
MAINTAINER= ale@FreeBSD.org
COMMENT= Java-PDF Library
diff --git a/devel/javolution/Makefile b/devel/javolution/Makefile
index c51d16f5ee6a..57b706628eab 100644
--- a/devel/javolution/Makefile
+++ b/devel/javolution/Makefile
@@ -4,8 +4,7 @@
PORTNAME= javolution
PORTVERSION= 5.5.1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
MAINTAINER= ale@FreeBSD.org
COMMENT= Java solution for real time and embedded systems
diff --git a/devel/jiic/Makefile b/devel/jiic/Makefile
index ab82c0dff770..8cd8eb14f2c4 100644
--- a/devel/jiic/Makefile
+++ b/devel/jiic/Makefile
@@ -4,8 +4,7 @@
PORTNAME= jiic
PORTVERSION= 20120110
CATEGORIES= devel multimedia java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
MAINTAINER= ale@FreeBSD.org
COMMENT= Streaming-based Java implementation of ISO 9660
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index e073b62ab690..1c0de4201652 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -4,8 +4,7 @@
PORTNAME= kdevelop
DISTVERSION= ${KDEVELOP_VERSION}
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src
+MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src
DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION}
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
index 7c71cc098205..cfe41df540b9 100644
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@@ -5,8 +5,7 @@ PORTNAME= kdevelop-pg-qt
PORTVERSION= 1.0.0
PORTREVISION= 6
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index c6b03dbec81b..a8667611e08f 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -3,8 +3,7 @@
PORTNAME= kdevelop-php-docs
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
+MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION}
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index 104567bd163d..fa8e733c8285 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -3,8 +3,7 @@
PORTNAME= kdevelop-php
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
+MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION}
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 8965ca873a32..f68eff964ef5 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -4,8 +4,7 @@
PORTNAME= kdevplatform
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
+MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION}
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/lcov/Makefile b/devel/lcov/Makefile
index 89e91ad74ea2..7d34022a0eb0 100644
--- a/devel/lcov/Makefile
+++ b/devel/lcov/Makefile
@@ -4,8 +4,7 @@
PORTNAME= lcov
PORTVERSION= 1.10
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=ltp/Coverage%20Analysis/LCOV-${PORTVERSION}
+MASTER_SITES= SF/ltp/Coverage%20Analysis/LCOV-${PORTVERSION}
MAINTAINER= romain@FreeBSD.org
COMMENT= The Linux Test Project GCOV extension
diff --git a/devel/libaura/Makefile b/devel/libaura/Makefile
index dff0e5bd3a6c..47545a1a0deb 100644
--- a/devel/libaura/Makefile
+++ b/devel/libaura/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libaura
PORTVERSION= 3.1.20051222
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= philip
+MASTER_SITES= LOCAL/philip
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Library of Assorted Useful Reusable Abstractions
diff --git a/devel/libavl/Makefile b/devel/libavl/Makefile
index 394a5a4b51fa..d68c2a7f002f 100644
--- a/devel/libavl/Makefile
+++ b/devel/libavl/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libavl
PORTVERSION= 1.4.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= avl
+MASTER_SITES= GNU/avl
DISTNAME= avl-${PORTVERSION}
MAINTAINER= rodrigo@FreeBSD.org
diff --git a/devel/libbfd/Makefile b/devel/libbfd/Makefile
index 1354a3073961..1a3f93fc8585 100644
--- a/devel/libbfd/Makefile
+++ b/devel/libbfd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libbfd
PORTVERSION= 2.19.1
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/releases
+MASTER_SITES= SOURCEWARE/binutils/releases
DISTNAME= binutils-${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
diff --git a/devel/libdict/Makefile b/devel/libdict/Makefile
index c9ac80a46055..e4a549795d8f 100644
--- a/devel/libdict/Makefile
+++ b/devel/libdict/Makefile
@@ -5,7 +5,7 @@ PORTNAME= libdict
PORTVERSION= 0.2.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= LOCAL
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source treap_insert.pdf:doc \
avl_insert.pdf:doc empty.pdf:doc
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index 50defdd53f7d..6d37b888bf3a 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.8.13
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.mr511.de/software/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs
+ SUNSITE/libs
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Public ELF file access library similar to libelf(3) in Solaris
diff --git a/devel/libexecinfo/Makefile b/devel/libexecinfo/Makefile
index 9f9dfbc038fd..3bd893b583ed 100644
--- a/devel/libexecinfo/Makefile
+++ b/devel/libexecinfo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libexecinfo
PORTVERSION= 1.1
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= itetcu
+MASTER_SITES= LOCAL/itetcu
MAINTAINER= itetcu@FreeBSD.org
COMMENT= Library for inspecting program's backtrace
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 7eb4564a2133..1731c7b09d8b 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libffi
PORTVERSION= 3.2.1
CATEGORIES= devel
-MASTER_SITES= SOURCEWARE
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SOURCEWARE/${PORTNAME}
MAINTAINER= zeising@FreeBSD.org
COMMENT= Foreign Function Interface
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 4095b2dbc923..350346984fe0 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,8 +6,7 @@ PORTNAME= libglade2
PORTVERSION= 2.6.4
PORTREVISION?= 7
CATEGORIES= devel gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
+MASTER_SITES= GNOME/sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libhash/Makefile b/devel/libhash/Makefile
index 1d82ba99a3c1..6000e317ad11 100644
--- a/devel/libhash/Makefile
+++ b/devel/libhash/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libhash
PORTVERSION= 1.0.3
CATEGORIES= devel
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Library for manipulating hash tables
diff --git a/devel/libiomp5-devel/Makefile b/devel/libiomp5-devel/Makefile
index 7e3085139279..bcce1fa9a87a 100644
--- a/devel/libiomp5-devel/Makefile
+++ b/devel/libiomp5-devel/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libiomp5
PORTVERSION= 3.7.r${SVN_REV}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMESUFFIX= -devel
DISTNAME= openmp-${PORTVERSION}
diff --git a/devel/libkgapi/Makefile b/devel/libkgapi/Makefile
index 6228d974b2ef..db6a671dcdb4 100644
--- a/devel/libkgapi/Makefile
+++ b/devel/libkgapi/Makefile
@@ -3,8 +3,7 @@
PORTNAME= libkgapi
PORTVERSION= 2.2.0
CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/libkgapi/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/libkgapi/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/liblouisxml/Makefile b/devel/liblouisxml/Makefile
index 903393718534..30c3cee213af 100644
--- a/devel/liblouisxml/Makefile
+++ b/devel/liblouisxml/Makefile
@@ -5,7 +5,7 @@ PORTNAME= liblouisxml
PORTVERSION= 2.4.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= wen@FreeBSD.org
COMMENT= Library Provide Complete Braille Transcription Services
diff --git a/devel/libmatheval/Makefile b/devel/libmatheval/Makefile
index cc05b2752a1d..f75d6cac98d4 100644
--- a/devel/libmatheval/Makefile
+++ b/devel/libmatheval/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.1.11
PORTREVISION= 2
CATEGORIES= devel math
MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= demon@FreeBSD.org
COMMENT= Library to evaluate mathematical functions
diff --git a/devel/libmpsse/Makefile b/devel/libmpsse/Makefile
index 6f8280464098..95a65168af5a 100644
--- a/devel/libmpsse/Makefile
+++ b/devel/libmpsse/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libmpsse
PORTVERSION= 1.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= uffe@uffe.org
COMMENT= Open source library for SPI/I2C control via FTDI chips
diff --git a/devel/libnxt/Makefile b/devel/libnxt/Makefile
index 0ea89a8e8f43..b5859d1199f6 100644
--- a/devel/libnxt/Makefile
+++ b/devel/libnxt/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libnxt
PORTVERSION= 0.3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
http://personalpages.tds.net/~jwbacon/Ports/distfiles/
MAINTAINER= jwbacon@tds.net
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index acf8dd0aaeaf..31d90194d27a 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -5,7 +5,7 @@ PORTNAME= liboop
PORTVERSION= 1.0
PORTREVISION= 12
CATEGORIES= devel
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://download.ofb.net/liboop/
MAINTAINER= rodrigo@FreeBSD.org
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index b159a17f1260..7089f01a75c4 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.39
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= danilo
+ LOCAL/danilo
MAINTAINER= danilo@FreeBSD.org
COMMENT= PIM data synchronization framework
diff --git a/devel/libpasori/Makefile b/devel/libpasori/Makefile
index ff5f50034f8b..2249bf8bb8f3 100644
--- a/devel/libpasori/Makefile
+++ b/devel/libpasori/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libpasori
PORTVERSION= 02
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/20457
+MASTER_SITES= SOURCEFORGE_JP/${PORTNAME}/20457
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= sarumaru@jp.FreeBSD.org
diff --git a/devel/libruin/Makefile b/devel/libruin/Makefile
index e4588af838e7..f2fecf306fdd 100644
--- a/devel/libruin/Makefile
+++ b/devel/libruin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libruin
PORTVERSION= 0.1.4
PORTREVISION= 3
CATEGORIES= devel scheme
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Renderer for User Interfaces in Ncurses
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index fa2174cdfe98..64862a9b18b2 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libsigc++
PORTVERSION= 1.2.7
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
+MASTER_SITES= GNOME
PKGNAMESUFFIX= 12
DIST_SUBDIR= gnome2
diff --git a/devel/libublio/Makefile b/devel/libublio/Makefile
index fc2b0e323ad7..292bc0a5f543 100644
--- a/devel/libublio/Makefile
+++ b/devel/libublio/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libublio
PORTVERSION= 20070103
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mandree
+MASTER_SITES= LOCAL/mandree
MAINTAINER= mandree@FreeBSD.org
COMMENT= User space caching library
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index e834deb7e8f9..c51dc919f953 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -6,8 +6,7 @@ PORTNAME= libunicode
PORTVERSION= 0.4
PORTREVISION= 10
CATEGORIES= devel gnome
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/libunicode/0.4
+MASTER_SITES= GNOME/sources/libunicode/0.4
DISTNAME= ${PORTNAME}-${PORTVERSION}.gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libx86/Makefile b/devel/libx86/Makefile
index 9e608df5692d..88d44e5e4707 100644
--- a/devel/libx86/Makefile
+++ b/devel/libx86/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.codon.org.uk/~mjg59/libx86/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
MAINTAINER= jkim@FreeBSD.org
COMMENT= Hardware-independent library for executing real-mode x86 code
diff --git a/devel/libzookeeper/Makefile b/devel/libzookeeper/Makefile
index bc51f83af6cb..f36860be14bd 100644
--- a/devel/libzookeeper/Makefile
+++ b/devel/libzookeeper/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zookeeper
PORTVERSION= 3.4.6
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/current
+MASTER_SITES= APACHE/${PORTNAME}/current
PKGNAMEPREFIX= lib
MAINTAINER= skreuzer@FreeBSD.org
diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile
index e9196ab7ad64..3e750c30780d 100644
--- a/devel/libzrtpcpp/Makefile
+++ b/devel/libzrtpcpp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libzrtpcpp
PORTVERSION= 2.3.4
PORTREVISION= 6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=ccrtp
+MASTER_SITES= GNU/ccrtp
MAINTAINER= acm@FreeBSD.org
COMMENT= ZRTP extension for GNU ccRTP
diff --git a/devel/linux-c6-qt47/Makefile b/devel/linux-c6-qt47/Makefile
index ae11ad9c2eca..196ec0835c58 100644
--- a/devel/linux-c6-qt47/Makefile
+++ b/devel/linux-c6-qt47/Makefile
@@ -5,8 +5,7 @@ PORTNAME= qt47
PORTVERSION= 4.7.2
PORTREVISION= 1
CATEGORIES= devel linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= xmj
+MASTER_SITES= LOCAL/xmj
DIST_SUBDIR= rpm/${LINUX_RPM_ARCH}/centos/c5
MAINTAINER= emulation@FreeBSD.org
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index 9a4d3a9dbb16..8b18be1ebee9 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -5,8 +5,7 @@ PORTNAME= linux_kdump
PORTVERSION= 1.5
PORTREVISION= 3
CATEGORIES= devel linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= marcel
+MASTER_SITES= LOCAL/marcel
MAINTAINER= emulation@FreeBSD.org
COMMENT= Linux-compatibility ktrace.out processor
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 7e69b63dc115..6a6a0bb40381 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -4,8 +4,7 @@
PORTNAME= llvm
DISTVERSION= 3.7.r${SVN_REV}
CATEGORIES= devel lang
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brooks
+MASTER_SITES= LOCAL/brooks
PKGNAMESUFFIX= -devel
MAINTAINER= brooks@FreeBSD.org
diff --git a/devel/m17n-db/Makefile b/devel/m17n-db/Makefile
index efe9ccc07c9e..e892efccea18 100644
--- a/devel/m17n-db/Makefile
+++ b/devel/m17n-db/Makefile
@@ -4,10 +4,8 @@
PORTNAME= m17n-db
PORTVERSION= 1.6.5
CATEGORIES= devel textproc
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}:m17n \
- ${MASTER_SITE_GNU:S/$/:glibc/}
-MASTER_SITE_SUBDIR= m17n/:m17n \
- glibc/:glibc
+MASTER_SITES= SAVANNAH/m17n:m17n \
+ GNU/glibc:glibc
DISTFILES= ${M17N_DISTFILE}:m17n \
${GLIBC_DISTFILE}:glibc
EXTRACT_ONLY= ${M17N_DISTFILE}
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index c12d3d394def..b580300f3b38 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -5,8 +5,7 @@ PORTNAME= m17n-lib
PORTVERSION= 1.6.4
PORTREVISION= 6
CATEGORIES= devel textproc
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= m17n
+MASTER_SITES= SAVANNAH/m17n
MAINTAINER= nikola.lecic@anthesphoria.net
COMMENT= Library for the multilingual text handling
diff --git a/devel/m6811-binutils/Makefile b/devel/m6811-binutils/Makefile
index aaa13c67532c..fcb43ac49ec3 100644
--- a/devel/m6811-binutils/Makefile
+++ b/devel/m6811-binutils/Makefile
@@ -4,8 +4,7 @@
PORTNAME= binutils
PORTVERSION= 2.15
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= binutils
+MASTER_SITES= GNU
PKGNAMEPREFIX= m6811-
PATCH_SITES= http://stephane.carrez.free.fr/snapshots/
diff --git a/devel/maven-ant-tasks/Makefile b/devel/maven-ant-tasks/Makefile
index 4c7fa293815d..417a0b00d89d 100644
--- a/devel/maven-ant-tasks/Makefile
+++ b/devel/maven-ant-tasks/Makefile
@@ -3,8 +3,7 @@
PORTNAME= maven-ant-tasks
PORTVERSION= 2.1.3
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= maven/binaries
+MASTER_SITES= APACHE/maven/binaries
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile
index fc14a2a103bc..f17231ffce25 100644
--- a/devel/maven3/Makefile
+++ b/devel/maven3/Makefile
@@ -4,8 +4,7 @@
PORTNAME= maven3
DISTVERSION= 3.0.5
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= maven/binaries
+MASTER_SITES= APACHE/maven/binaries
DISTNAME= apache-maven-${DISTVERSION}-bin
MAINTAINER= wombat@marsupial.org
diff --git a/devel/maven31/Makefile b/devel/maven31/Makefile
index ff809ac8a469..3bc886d91cba 100644
--- a/devel/maven31/Makefile
+++ b/devel/maven31/Makefile
@@ -5,8 +5,7 @@ PORTNAME= maven31
DISTVERSION= 3.1.1
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= maven/binaries
+MASTER_SITES= APACHE/maven/binaries
DISTNAME= apache-maven-${DISTVERSION}-bin
MAINTAINER= yerenkow@gmail.com
diff --git a/devel/mingw32-openssl/Makefile b/devel/mingw32-openssl/Makefile
index 6526c5694129..8051ac39ac7c 100644
--- a/devel/mingw32-openssl/Makefile
+++ b/devel/mingw32-openssl/Makefile
@@ -4,10 +4,9 @@
PORTNAME= openssl
PORTVERSION= 1.0.1m
CATEGORIES= devel security
-MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \
- ftp://ftp.openssl.org/%SUBDIR%/ \
- ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/
-MASTER_SITE_SUBDIR= source
+MASTER_SITES= http://www.openssl.org/source/ \
+ ftp://ftp.openssl.org/source/ \
+ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
PKGNAMEPREFIX= mingw32-
DIST_SUBDIR= ${DISTNAME}
diff --git a/devel/mingw32-zlib/Makefile b/devel/mingw32-zlib/Makefile
index ad6dc822a48b..44fde263465c 100644
--- a/devel/mingw32-zlib/Makefile
+++ b/devel/mingw32-zlib/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zlib
PORTVERSION= 1.2.8
CATEGORIES= devel archivers
MASTER_SITES= http://zlib.net/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libpng/${PORTNAME}/${PORTVERSION}
+ SF/libpng/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= mingw32-
MAINTAINER= knu@FreeBSD.org
diff --git a/devel/mm/Makefile b/devel/mm/Makefile
index f9602c30cccf..20059f4fe83c 100644
--- a/devel/mm/Makefile
+++ b/devel/mm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mm
PORTVERSION= 1.4.2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_OSSP}
-MASTER_SITE_SUBDIR= lib/${PORTNAME}
+MASTER_SITES= OSSP/lib/${PORTNAME}
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Shared memory allocation library for pre-forked process models
diff --git a/devel/mph/Makefile b/devel/mph/Makefile
index b3ad618a91a7..58fc751cae8d 100644
--- a/devel/mph/Makefile
+++ b/devel/mph/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mph
PORTVERSION= 1.2
CATEGORIES= devel
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= devel/lang/c
+MASTER_SITES= SUNSITE/devel/lang/c
MAINTAINER= chuck@pkix.net
COMMENT= Minimal perfect hashing code generator
diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 6917f6680820..06c8d1e9f8fd 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -5,16 +5,14 @@ PORTNAME= binutils
PORTVERSION= ${BINUTILVERSION}.${LTSVERSION}
PORTREVISION= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE} \
+MASTER_SITES= SOURCEWARE/binutils/releases \
SF/mspgcc/mspgcc:mspgcc
-MASTER_SITE_SUBDIR= binutils/releases
PKGNAMEPREFIX= msp430-
DISTNAME= ${PORTNAME}-${BINUTILVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
mspgcc-${LTSVERSION}${EXTRACT_SUFX}:mspgcc
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
+PATCH_SITES= SF/mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index 6a4d0d1011f4..08dce6fc5063 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -6,17 +6,15 @@ PORTVERSION= ${GCCVERSION}.${LTSVERSION}
PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEWARE} \
+MASTER_SITES= SOURCEWARE/${PORTNAME}/releases/${PORTNAME}-${GCCVERSION} \
SF/mspgcc/mspgcc:mspgcc
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTNAME}-${GCCVERSION}
PKGNAMEPREFIX= msp430-
DISTNAME= ${PORTNAME}-${GCCVERSION}
DISTFILES= ${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
${PORTNAME}-g++-${GCCVERSION}${EXTRACT_SUFX} \
mspgcc-${LTSVERSION}${EXTRACT_SUFX}:mspgcc
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
+PATCH_SITES= SF/mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
diff --git a/devel/msp430-gdb/Makefile b/devel/msp430-gdb/Makefile
index 7fe04aa13632..7f6e3dc0e8a8 100644
--- a/devel/msp430-gdb/Makefile
+++ b/devel/msp430-gdb/Makefile
@@ -4,9 +4,7 @@
PORTNAME= gdb
PORTVERSION= ${GDBVERSION}.${PATCHVERSION}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU} \
- SF/mspgcc/mspgcc:mspgcc
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU SF/mspgcc/mspgcc:mspgcc
PKGNAMEPREFIX= msp430-
DISTNAME= ${PORTNAME}-${GDBVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/msp430-libc/Makefile b/devel/msp430-libc/Makefile
index a4ab81c352b6..327fd9d183cd 100644
--- a/devel/msp430-libc/Makefile
+++ b/devel/msp430-libc/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES= SF/mspgcc/${PKGNAMEPREFIX}${PORTNAME}
PKGNAMEPREFIX= ${LIBCTARGET}-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${LIBCVERSION}
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
+PATCH_SITES= SF/mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
diff --git a/devel/msp430mcu/Makefile b/devel/msp430mcu/Makefile
index 2810f0e8b8f5..e56f3c22a556 100644
--- a/devel/msp430mcu/Makefile
+++ b/devel/msp430mcu/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= devel
MASTER_SITES= SF/mspgcc/${PORTNAME}
DISTNAME= ${PORTNAME}-${MCUVERSION}
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${LTSVERSION}
+PATCH_SITES= SF/mspgcc/Patches/LTS/${LTSVERSION}
PATCHFILES= ${LTS_PATCHES}
PATCH_DIST_STRIP= -p1
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 1abaf3677a69..ed8691c76584 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -5,7 +5,6 @@ PORTNAME= ncurses
DISTVERSION= ${RELEASE}-20150214
CATEGORIES= devel
MASTER_SITES= ftp://invisible-island.net/${PORTNAME}/current/
-MASTER_SITE_SUBDIR= ${PORTNAME}/current
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= bapt@FreeBSD.org
diff --git a/devel/netscape-java40/Makefile b/devel/netscape-java40/Makefile
index b9eb41500c30..007f71419365 100644
--- a/devel/netscape-java40/Makefile
+++ b/devel/netscape-java40/Makefile
@@ -5,8 +5,7 @@ PORTNAME= netscape-java40
PORTVERSION= 1999.11.15
PORTREVISION= 2
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= thierry
+MASTER_SITES= LOCAL/thierry
DISTNAME= ${PORTNAME}
MAINTAINER= thierry@FreeBSD.org
diff --git a/devel/nxt-python/Makefile b/devel/nxt-python/Makefile
index eb6a32000823..91674083050e 100644
--- a/devel/nxt-python/Makefile
+++ b/devel/nxt-python/Makefile
@@ -5,7 +5,7 @@ PORTNAME= nxt-python
PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= acieroid@awesom.eu
COMMENT= Python interface for the Lego Mindstorms NXT robot
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index 8e0021072166..2dc1531afdcd 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sexplib
PORTVERSION= 111.03.00
CATEGORIES= devel
-MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}/individual
+MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/${PORTVERSION}/individual/
PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/ocaml-typeconv/Makefile b/devel/ocaml-typeconv/Makefile
index 52c6bfc70af4..bd5bb96f1f4f 100644
--- a/devel/ocaml-typeconv/Makefile
+++ b/devel/ocaml-typeconv/Makefile
@@ -4,8 +4,7 @@
PORTNAME= type-conv
PORTVERSION= 109.60.01
CATEGORIES= devel
-MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION:R}.00/individual
+MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/${PORTVERSION:R}.00/individual/
PKGNAMEPREFIX= ocaml-
DISTNAME= ${PORTNAME:S,-,_,}-${PORTVERSION}
diff --git a/devel/opencvs/Makefile b/devel/opencvs/Makefile
index 8c356024e80b..a01147bc548f 100644
--- a/devel/opencvs/Makefile
+++ b/devel/opencvs/Makefile
@@ -4,9 +4,8 @@
PORTNAME= opencvs
PORTVERSION= 20150501
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.stack.nl/pub/users/%SUBDIR%/opencvs/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= johans
+MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/opencvs/ \
+ LOCAL/johans
MAINTAINER= johans@FreeBSD.org
COMMENT= BSD-licensed CVS implementation
diff --git a/devel/p5-AnyEvent-AIO/Makefile b/devel/p5-AnyEvent-AIO/Makefile
index 5711af491fab..05e960a18f67 100644
--- a/devel/p5-AnyEvent-AIO/Makefile
+++ b/devel/p5-AnyEvent-AIO/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= AnyEvent
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-App-GitHub/Makefile b/devel/p5-App-GitHub/Makefile
index 050c93f539e2..f90903a3765e 100644
--- a/devel/p5-App-GitHub/Makefile
+++ b/devel/p5-App-GitHub/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= App
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-B-Hooks-OP-PPAddr/Makefile b/devel/p5-B-Hooks-OP-PPAddr/Makefile
index 822e425bf3b5..0003fed434dc 100644
--- a/devel/p5-B-Hooks-OP-PPAddr/Makefile
+++ b/devel/p5-B-Hooks-OP-PPAddr/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= B
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-B-OPCheck/Makefile b/devel/p5-B-OPCheck/Makefile
index 3f02c03828e9..088d19f381b7 100644
--- a/devel/p5-B-OPCheck/Makefile
+++ b/devel/p5-B-OPCheck/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.29
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= B
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Badger/Makefile b/devel/p5-Badger/Makefile
index cb19e221e582..9159a5594e09 100644
--- a/devel/p5-Badger/Makefile
+++ b/devel/p5-Badger/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.09
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Badger
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Cache-AgainstFile/Makefile b/devel/p5-Cache-AgainstFile/Makefile
index e996cd5549da..eeeb782a1886 100644
--- a/devel/p5-Cache-AgainstFile/Makefile
+++ b/devel/p5-Cache-AgainstFile/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.016
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Cache
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/p5-Carp-Clan-Share/Makefile b/devel/p5-Carp-Clan-Share/Makefile
index 9245d917425e..d96d1d730ac1 100644
--- a/devel/p5-Carp-Clan-Share/Makefile
+++ b/devel/p5-Carp-Clan-Share/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.013
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Carp
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Class-Accessor-Fast-Contained/Makefile b/devel/p5-Class-Accessor-Fast-Contained/Makefile
index 6ebb472a2e12..38409ce0b022 100644
--- a/devel/p5-Class-Accessor-Fast-Contained/Makefile
+++ b/devel/p5-Class-Accessor-Fast-Contained/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.01
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Accessor-Installer/Makefile b/devel/p5-Class-Accessor-Installer/Makefile
index 5b879d95e1d9..eaa81f3ba0c8 100644
--- a/devel/p5-Class-Accessor-Installer/Makefile
+++ b/devel/p5-Class-Accessor-Installer/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.100880
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-#MASTER_SITE_SUBDIR=
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Delegation/Makefile b/devel/p5-Class-Delegation/Makefile
index 9940b2675c85..707fe08fa6fd 100644
--- a/devel/p5-Class-Delegation/Makefile
+++ b/devel/p5-Class-Delegation/Makefile
@@ -3,12 +3,12 @@
PORTNAME= Class-Delegation
PORTVERSION= 1.7.1
+DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DCONWAY
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
COMMENT= Object-oriented delegation
diff --git a/devel/p5-Class-Measure/Makefile b/devel/p5-Class-Measure/Makefile
index ee3c839ff02f..12099ee1e300 100644
--- a/devel/p5-Class-Measure/Makefile
+++ b/devel/p5-Class-Measure/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 0c3a08ff81cb..15fe3dd10998 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 3.02
PORTREVISION= 3
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Config-IniHash/Makefile b/devel/p5-Config-IniHash/Makefile
index d6ed6053191f..a40aedfa8b6a 100644
--- a/devel/p5-Config-IniHash/Makefile
+++ b/devel/p5-Config-IniHash/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Config-IniHash
PORTVERSION= 3.01.01
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Config/JENDA
+MASTER_SITES= CPAN/Config/JENDA
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Config-Wrest/Makefile b/devel/p5-Config-Wrest/Makefile
index 059eed143fe1..b99d33787405 100644
--- a/devel/p5-Config-Wrest/Makefile
+++ b/devel/p5-Config-Wrest/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.036
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Config
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/p5-Danga-Socket-Callback/Makefile b/devel/p5-Danga-Socket-Callback/Makefile
index 7f286f096f99..a457260c1b3f 100644
--- a/devel/p5-Danga-Socket-Callback/Makefile
+++ b/devel/p5-Danga-Socket-Callback/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Danga
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-Data-JavaScript-Anon/Makefile b/devel/p5-Data-JavaScript-Anon/Makefile
index 15072f1038da..80dbc244b86b 100644
--- a/devel/p5-Data-JavaScript-Anon/Makefile
+++ b/devel/p5-Data-JavaScript-Anon/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/p5-Data-Remember/Makefile b/devel/p5-Data-Remember/Makefile
index 63bb980908c7..39d1d10339e2 100644
--- a/devel/p5-Data-Remember/Makefile
+++ b/devel/p5-Data-Remember/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-DateConvert/Makefile b/devel/p5-DateConvert/Makefile
index c10c1d58d2f6..4e2a0c2a0810 100644
--- a/devel/p5-DateConvert/Makefile
+++ b/devel/p5-DateConvert/Makefile
@@ -5,8 +5,7 @@ PORTNAME= DateConvert
PORTVERSION= 0.16
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Date
+MASTER_SITES= CPAN/Date
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/p5-DateTime-Format-DateParse/Makefile b/devel/p5-DateTime-Format-DateParse/Makefile
index 3d16b6b92eaa..a4a873a6b1d6 100644
--- a/devel/p5-DateTime-Format-DateParse/Makefile
+++ b/devel/p5-DateTime-Format-DateParse/Makefile
@@ -5,8 +5,7 @@ PORTNAME= DateTime-Format-DateParse
PORTVERSION= 0.05
PORTREVISION= 2
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= DateTime
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= svysh.fbsd@gmail.com
diff --git a/devel/p5-Devel-Callsite/Makefile b/devel/p5-Devel-Callsite/Makefile
index dce385e00103..4882c8cc798d 100644
--- a/devel/p5-Devel-Callsite/Makefile
+++ b/devel/p5-Devel-Callsite/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.06
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Devel-ebug/Makefile b/devel/p5-Devel-ebug/Makefile
index e44826479eb2..f060e0d3b8ee 100644
--- a/devel/p5-Devel-ebug/Makefile
+++ b/devel/p5-Devel-ebug/Makefile
@@ -5,7 +5,6 @@ PORTNAME= Devel-ebug
PORTVERSION= 0.56
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Dist-Zilla/Makefile b/devel/p5-Dist-Zilla/Makefile
index 88f3a5a8afba..27ba901fb862 100644
--- a/devel/p5-Dist-Zilla/Makefile
+++ b/devel/p5-Dist-Zilla/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 4.300030
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Dist
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Event-Notify/Makefile b/devel/p5-Event-Notify/Makefile
index 9c801fd6c581..bf28acae70ac 100644
--- a/devel/p5-Event-Notify/Makefile
+++ b/devel/p5-Event-Notify/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.00004
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Event
PKGNAMEPREFIX= p5-
MAINTAINER= markun@onohara.to
diff --git a/devel/p5-File-Find-Rule-Perl/Makefile b/devel/p5-File-Find-Rule-Perl/Makefile
index c1ad30f33ada..5aee25159f0f 100644
--- a/devel/p5-File-Find-Rule-Perl/Makefile
+++ b/devel/p5-File-Find-Rule-Perl/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.13
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-File-Finder/Makefile b/devel/p5-File-Finder/Makefile
index da74adefbded..52d58d40a235 100644
--- a/devel/p5-File-Finder/Makefile
+++ b/devel/p5-File-Finder/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.53
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-File-Tail-Dir/Makefile b/devel/p5-File-Tail-Dir/Makefile
index 03693280d111..896ba22eed5f 100644
--- a/devel/p5-File-Tail-Dir/Makefile
+++ b/devel/p5-File-Tail-Dir/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.14
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= jnlin@csie.nctu.edu.tw
diff --git a/devel/p5-Ioctl/Makefile b/devel/p5-Ioctl/Makefile
index ea0bd9e4157f..5705214e2c0b 100644
--- a/devel/p5-Ioctl/Makefile
+++ b/devel/p5-Ioctl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Ioctl
PORTVERSION= 0.81
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Ioctl/JPRIT
+MASTER_SITES= CPAN/Ioctl/JPRIT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Lingua-JA-Fold/Makefile b/devel/p5-Lingua-JA-Fold/Makefile
index 8771d25e7300..ff9ff471836c 100644
--- a/devel/p5-Lingua-JA-Fold/Makefile
+++ b/devel/p5-Lingua-JA-Fold/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.08
PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Lingua
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index 210292a2ac85..f53e369c3737 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -4,8 +4,7 @@
PORTNAME= Locale-Maketext-Lexicon
PORTVERSION= 1.00
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/DRTECH
+MASTER_SITES= CPAN/Locale/DRTECH
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Log-Dispatch-Array/Makefile b/devel/p5-Log-Dispatch-Array/Makefile
index 63a045fc9bd3..b35216964ba7 100644
--- a/devel/p5-Log-Dispatch-Array/Makefile
+++ b/devel/p5-Log-Dispatch-Array/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.001
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-# MASTER_SITE_SUBDIR= CPAN:RJBS
PKGNAMEPREFIX= p5-
MAINTAINER= geraud@gcu.info
diff --git a/devel/p5-Log-Dispatch-File-Stamped/Makefile b/devel/p5-Log-Dispatch-File-Stamped/Makefile
index 0ca3e5ba0707..43d0ecdbfbae 100644
--- a/devel/p5-Log-Dispatch-File-Stamped/Makefile
+++ b/devel/p5-Log-Dispatch-File-Stamped/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.12
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Log
PKGNAMEPREFIX= p5-
MAINTAINER= jnlin@csie.nctu.edu.tw
diff --git a/devel/p5-Log-Dispatch-Scribe/Makefile b/devel/p5-Log-Dispatch-Scribe/Makefile
index ba5fed2d6528..b7edcddae7e6 100644
--- a/devel/p5-Log-Dispatch-Scribe/Makefile
+++ b/devel/p5-Log-Dispatch-Scribe/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Log
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Log-Trace/Makefile b/devel/p5-Log-Trace/Makefile
index d243ed079a6a..cf86c5e83e6f 100644
--- a/devel/p5-Log-Trace/Makefile
+++ b/devel/p5-Log-Trace/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.070
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Log
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Module-CPANfile/Makefile b/devel/p5-Module-CPANfile/Makefile
index 73c6727897bf..353a00cb7777 100644
--- a/devel/p5-Module-CPANfile/Makefile
+++ b/devel/p5-Module-CPANfile/Makefile
@@ -4,7 +4,6 @@ PORTNAME= Module-CPANfile
PORTVERSION= 1.1000
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Module
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Module-Info-File/Makefile b/devel/p5-Module-Info-File/Makefile
index ef59c6e9dd35..fadd431db1f5 100644
--- a/devel/p5-Module-Info-File/Makefile
+++ b/devel/p5-Module-Info-File/Makefile
@@ -5,7 +5,6 @@ PORTNAME= Module-Info-File
PORTVERSION= 0.14
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Module
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Module-Util/Makefile b/devel/p5-Module-Util/Makefile
index 98a4d0ad3423..53f0ff1db34b 100644
--- a/devel/p5-Module-Util/Makefile
+++ b/devel/p5-Module-Util/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 1.09
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Module
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-MooseX-AttributeShortcuts/Makefile b/devel/p5-MooseX-AttributeShortcuts/Makefile
index b9b5ccf70f35..16d13008ce53 100644
--- a/devel/p5-MooseX-AttributeShortcuts/Makefile
+++ b/devel/p5-MooseX-AttributeShortcuts/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.017
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= MooseX
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-MooseX-Has-Options/Makefile b/devel/p5-MooseX-Has-Options/Makefile
index 822aca88feff..5702ae8cf455 100644
--- a/devel/p5-MooseX-Has-Options/Makefile
+++ b/devel/p5-MooseX-Has-Options/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.003
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= MooseX
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-MouseX-Getopt/Makefile b/devel/p5-MouseX-Getopt/Makefile
index c7a1ae60e0ea..d51161d9959d 100644
--- a/devel/p5-MouseX-Getopt/Makefile
+++ b/devel/p5-MouseX-Getopt/Makefile
@@ -7,7 +7,6 @@ DISTVERSION= 0.34
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= MouseX
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/devel/p5-Object-Realize-Later/Makefile b/devel/p5-Object-Realize-Later/Makefile
index ff24403547f5..4d596b7f7be1 100644
--- a/devel/p5-Object-Realize-Later/Makefile
+++ b/devel/p5-Object-Realize-Later/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.19
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Object
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-PHP-Serialization/Makefile b/devel/p5-PHP-Serialization/Makefile
index a402f52b02ae..16ffae0b601c 100644
--- a/devel/p5-PHP-Serialization/Makefile
+++ b/devel/p5-PHP-Serialization/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.34
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= PHP
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Perl-Tidy/Makefile b/devel/p5-Perl-Tidy/Makefile
index 034b2c31a5e7..63b453bb1945 100644
--- a/devel/p5-Perl-Tidy/Makefile
+++ b/devel/p5-Perl-Tidy/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 20140711
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Perl
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Proc-Wait3/Makefile b/devel/p5-Proc-Wait3/Makefile
index d1b1a9b8b67c..61c124cc3f18 100644
--- a/devel/p5-Proc-Wait3/Makefile
+++ b/devel/p5-Proc-Wait3/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Proc
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index 588afab60241..210ba4d480e8 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ReadLine-Gnu
PORTVERSION= 1.26
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR=Term
+MASTER_SITES= CPAN/Term
PKGNAMEPREFIX= p5-
DISTNAME= Term-${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index 88e8e1a15eb7..3f1e0f48f95d 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -5,10 +5,9 @@ PORTNAME= ReadLine-Perl
PORTVERSION= 1.0303
PORTREVISION= 3
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN/Term
PKGNAMEPREFIX= p5-
-DISTNAME= Term-${PORTNAME}-${PORTVERSION:C/0+$//}
+DISTNAME= Term-${PORTNAME}-${PORTVERSION}
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl 5 module for Term::ReadLine editing without GNU readline
diff --git a/devel/p5-ReadLine-TTYtter/Makefile b/devel/p5-ReadLine-TTYtter/Makefile
index 1f7d8b0de387..281304a4b603 100644
--- a/devel/p5-ReadLine-TTYtter/Makefile
+++ b/devel/p5-ReadLine-TTYtter/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ReadLine-TTYtter
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Term
+MASTER_SITES= CPAN/Term
PKGNAMEPREFIX= p5-
DISTNAME= Term-${PORTNAME}-${PORTVERSION}
diff --git a/devel/p5-Set-ConsistentHash/Makefile b/devel/p5-Set-ConsistentHash/Makefile
index 9d666f946110..b347effc0c9f 100644
--- a/devel/p5-Set-ConsistentHash/Makefile
+++ b/devel/p5-Set-ConsistentHash/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.92
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Set
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Stream-Reader/Makefile b/devel/p5-Stream-Reader/Makefile
index 5d74be23e905..3810da5326c9 100644
--- a/devel/p5-Stream-Reader/Makefile
+++ b/devel/p5-Stream-Reader/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.09
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Stream
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
diff --git a/devel/p5-Sys-RunAlone/Makefile b/devel/p5-Sys-RunAlone/Makefile
index af1f83676352..f0d7b282ba16 100644
--- a/devel/p5-Sys-RunAlone/Makefile
+++ b/devel/p5-Sys-RunAlone/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.12
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Sys
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Sys-RunAlways/Makefile b/devel/p5-Sys-RunAlways/Makefile
index 5e6b35eeb2ea..7376dbea55c6 100644
--- a/devel/p5-Sys-RunAlways/Makefile
+++ b/devel/p5-Sys-RunAlways/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Sys
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Sys-Syscall/Makefile b/devel/p5-Sys-Syscall/Makefile
index 897ce2c9141c..c098bfa9e8d6 100644
--- a/devel/p5-Sys-Syscall/Makefile
+++ b/devel/p5-Sys-Syscall/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.25
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Sys
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-TAP-SimpleOutput/Makefile b/devel/p5-TAP-SimpleOutput/Makefile
index 019f0722ecf6..63bd5f083f1c 100644
--- a/devel/p5-TAP-SimpleOutput/Makefile
+++ b/devel/p5-TAP-SimpleOutput/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 0.002
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= TAP
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Term-VT102-Boundless/Makefile b/devel/p5-Term-VT102-Boundless/Makefile
index 8edcefec8e40..c40b6b9aa0bc 100644
--- a/devel/p5-Term-VT102-Boundless/Makefile
+++ b/devel/p5-Term-VT102-Boundless/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Term
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Term-VT102/Makefile b/devel/p5-Term-VT102/Makefile
index 20e46c5c7cb4..4b2506051860 100644
--- a/devel/p5-Term-VT102/Makefile
+++ b/devel/p5-Term-VT102/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.91
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Term
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-Assertions/Makefile b/devel/p5-Test-Assertions/Makefile
index e1cc9359f204..31c98af1505d 100644
--- a/devel/p5-Test-Assertions/Makefile
+++ b/devel/p5-Test-Assertions/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.054
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-FailWarnings/Makefile b/devel/p5-Test-FailWarnings/Makefile
index 67d49d0d6cb1..8749f37eede7 100644
--- a/devel/p5-Test-FailWarnings/Makefile
+++ b/devel/p5-Test-FailWarnings/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.008
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-File-ShareDir/Makefile b/devel/p5-Test-File-ShareDir/Makefile
index c883e77d83ad..4c91cabec6bd 100644
--- a/devel/p5-Test-File-ShareDir/Makefile
+++ b/devel/p5-Test-File-ShareDir/Makefile
@@ -4,7 +4,6 @@ PORTNAME= Test-File-ShareDir
PORTVERSION= 1.001001
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-HexString/Makefile b/devel/p5-Test-HexString/Makefile
index 8512684d8411..2f3477d08205 100644
--- a/devel/p5-Test-HexString/Makefile
+++ b/devel/p5-Test-HexString/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-InDistDir/Makefile b/devel/p5-Test-InDistDir/Makefile
index f89526dd9993..9536358c6558 100644
--- a/devel/p5-Test-InDistDir/Makefile
+++ b/devel/p5-Test-InDistDir/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.112071
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-JSON/Makefile b/devel/p5-Test-JSON/Makefile
index a75b6b3820ee..97f711b7ab3a 100644
--- a/devel/p5-Test-JSON/Makefile
+++ b/devel/p5-Test-JSON/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.11
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${DISTVERSION:C/0$//}
diff --git a/devel/p5-Test-Moose-More/Makefile b/devel/p5-Test-Moose-More/Makefile
index 036855773cc6..20bebc4dace4 100644
--- a/devel/p5-Test-Moose-More/Makefile
+++ b/devel/p5-Test-Moose-More/Makefile
@@ -4,7 +4,6 @@ PORTNAME= Test-Moose-More
PORTVERSION= 0.025
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-Script/Makefile b/devel/p5-Test-Script/Makefile
index 52075981543e..237639ca0b12 100644
--- a/devel/p5-Test-Script/Makefile
+++ b/devel/p5-Test-Script/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.07
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-SubCalls/Makefile b/devel/p5-Test-SubCalls/Makefile
index 8350f551fdf1..7e0f6f71bd3c 100644
--- a/devel/p5-Test-SubCalls/Makefile
+++ b/devel/p5-Test-SubCalls/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.09
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Test-Without-Module/Makefile b/devel/p5-Test-Without-Module/Makefile
index bf4d7849e673..84be1bc689d7 100644
--- a/devel/p5-Test-Without-Module/Makefile
+++ b/devel/p5-Test-Without-Module/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.18
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-#MASTER_SITE_SUBDIR=
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-Test-XML-Valid/Makefile b/devel/p5-Test-XML-Valid/Makefile
index a919f83d1827..836f7421b5f6 100644
--- a/devel/p5-Test-XML-Valid/Makefile
+++ b/devel/p5-Test-XML-Valid/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/devel/p5-Thread-Suspend/Makefile b/devel/p5-Thread-Suspend/Makefile
index 75d2bfe47d8b..f5a6627963d0 100644
--- a/devel/p5-Thread-Suspend/Makefile
+++ b/devel/p5-Thread-Suspend/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Thread-Suspend
PORTVERSION= 1.22
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Thread
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
@@ -15,12 +14,10 @@ COMMENT= Suspend and resume operations for threads
USES= perl5
USE_PERL5= configure
-.include <bsd.port.pre.mk>
-
pre-everything::
@${ECHO_MSG} "----------------------------------------------------------"
@${ECHO_MSG} "This module requires a threaded perl. If your install"
@${ECHO_MSG} "is not threaded please install lang/${PERL_PORT} with threads"
@${ECHO_MSG} "----------------------------------------------------------"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Tie-File-AsHash/Makefile b/devel/p5-Tie-File-AsHash/Makefile
index a7014f1cfb85..923e8832166c 100644
--- a/devel/p5-Tie-File-AsHash/Makefile
+++ b/devel/p5-Tie-File-AsHash/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.08
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Tie
PKGNAMEPREFIX= p5-
MAINTAINER= rdg@bzerk.org
diff --git a/devel/p5-Tie-Util/Makefile b/devel/p5-Tie-Util/Makefile
index 85b3c6c3a122..87c05f93750a 100644
--- a/devel/p5-Tie-Util/Makefile
+++ b/devel/p5-Tie-Util/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Tie
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-Time-Out/Makefile b/devel/p5-Time-Out/Makefile
index d6223e56099e..6e304e84073b 100644
--- a/devel/p5-Time-Out/Makefile
+++ b/devel/p5-Time-Out/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.11
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Time
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 648e5fc40377..a3f077abf365 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.30
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR=Date
+MASTER_SITES= CPAN/Date
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index 5a3e17a52dbf..1929172a3e4c 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -5,8 +5,7 @@ PORTNAME= TraceFuncs
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= CPAN/Devel
PKGNAMEPREFIX= p5-
DISTNAME= traceFunc-${PORTVERSION}
diff --git a/devel/p5-forks/Makefile b/devel/p5-forks/Makefile
index 69f35c7b4672..a2e681b9ee6e 100644
--- a/devel/p5-forks/Makefile
+++ b/devel/p5-forks/Makefile
@@ -5,8 +5,7 @@ PORTNAME= forks
PORTVERSION= 0.36
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= SOAP/RYBSKEJ
+MASTER_SITES= CPAN/SOAP/RYBSKEJ
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/devel/p5-orz/Makefile b/devel/p5-orz/Makefile
index cbaaab4d229a..eba46596e0f8 100644
--- a/devel/p5-orz/Makefile
+++ b/devel/p5-orz/Makefile
@@ -5,8 +5,7 @@ PORTNAME= orz
PORTVERSION= 0.13
PORTREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= CPAN/INGY
+MASTER_SITES= CPAN/CPAN/INGY
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index d56643e1f078..f869fed94be5 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -6,10 +6,9 @@ PORTVERSION= 8.35
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
- ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
- ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
- ftp://ftp.tin.org/pub/libs/%SUBDIR%/
-MASTER_SITE_SUBDIR=${PORTNAME}
+ ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PORTNAME}/ \
+ ftp://ftp.fu-berlin.de/unix/misc/${PORTNAME}/ \
+ ftp://ftp.tin.org/pub/libs/${PORTNAME}/
MAINTAINER= bf@FreeBSD.org
COMMENT= Perl Compatible Regular Expressions library
diff --git a/devel/pear-IO_Bit/Makefile b/devel/pear-IO_Bit/Makefile
index e0d915f03190..f2200b2eccc1 100644
--- a/devel/pear-IO_Bit/Makefile
+++ b/devel/pear-IO_Bit/Makefile
@@ -5,8 +5,7 @@ PORTNAME= IO_Bit
PORTVERSION= 2.1.1
CATEGORIES= devel pear
MASTER_SITES= http://openpear.org/get/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/${PKGNAMEPREFIX}${PORTNAME}
+ LOCAL/tota/${PKGNAMEPREFIX}${PORTNAME}
PKGNAMEPREFIX= pear-
MAINTAINER= yoya@awm.jp
diff --git a/devel/phpsh/Makefile b/devel/phpsh/Makefile
index 1e39097b0b91..f0e04257b7a9 100644
--- a/devel/phpsh/Makefile
+++ b/devel/phpsh/Makefile
@@ -5,9 +5,8 @@ PORTNAME= phpsh
PORTVERSION= 20110513
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ashish
+MASTER_SITES= http://distfiles.pirateparty.in/ashish/ \
+ LOCAL/ashish
MAINTAINER= ashish@FreeBSD.org
COMMENT= Interactive shell for PHP
diff --git a/devel/powerpc64-gcc/Makefile b/devel/powerpc64-gcc/Makefile
index c69dca76972b..2e610ab62acb 100644
--- a/devel/powerpc64-gcc/Makefile
+++ b/devel/powerpc64-gcc/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gcc
PORTVERSION= 4.9.2
PORTREVISION?= 1
CATEGORIES= devel
-MASTER_SITES= GCC
-MASTER_SITE_SUBDIR= releases/gcc-${DISTVERSION}
+MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMEPREFIX?= powerpc64-
MAINTAINER= bapt@FreeBSD.org
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index e04608981dbf..c737a99d8024 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -5,9 +5,8 @@ PORTNAME= ppl
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.cs.unipr.it/pub/ppl/releases/%SUBDIR%/ \
- http://bugseng.com/products/ppl/download/ftp/releases/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= ftp://ftp.cs.unipr.it/pub/ppl/releases/${PORTVERSION}/ \
+ http://bugseng.com/products/ppl/download/ftp/releases/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ library for the manipulation of convex polyhedra
diff --git a/devel/protobuf25/Makefile b/devel/protobuf25/Makefile
index 58a46175d054..c33107f4e3dd 100644
--- a/devel/protobuf25/Makefile
+++ b/devel/protobuf25/Makefile
@@ -6,7 +6,7 @@ PORTNAME= protobuf
PORTVERSION= 2.5.0
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= 25
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/psptoolchain-binutils/Makefile b/devel/psptoolchain-binutils/Makefile
index f7fb5fc72f24..6ca3a1362de5 100644
--- a/devel/psptoolchain-binutils/Makefile
+++ b/devel/psptoolchain-binutils/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.22
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnu.org/pub/gnu/${PORTNAME}/ \
- ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases
+ SOURCEWARE/${PORTNAME}/releases
PKGNAMEPREFIX= psptoolchain-
MAINTAINER= tphilipp@potion-studios.com
diff --git a/devel/psptoolchain-gcc-stage1/Makefile b/devel/psptoolchain-gcc-stage1/Makefile
index d044f25edff3..430ce8f16a66 100644
--- a/devel/psptoolchain-gcc-stage1/Makefile
+++ b/devel/psptoolchain-gcc-stage1/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gcc
PORTVERSION= 4.6.2
PORTREVISION?= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= releases/${DISTNAME}/
+MASTER_SITES= GCC/releases/${DISTNAME}
PKGNAMEPREFIX= psptoolchain-
PKGNAMESUFFIX?= -stage1
diff --git a/devel/psptoolchain-gdb/Makefile b/devel/psptoolchain-gdb/Makefile
index aa08c1475430..d13fbecc904f 100644
--- a/devel/psptoolchain-gdb/Makefile
+++ b/devel/psptoolchain-gdb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gdb
PORTVERSION= 7.3.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}/
+MASTER_SITES= GNU
PKGNAMEPREFIX= psptoolchain-
MAINTAINER= tphilipp@potion-studios.com
diff --git a/devel/psptoolchain-newlib/Makefile b/devel/psptoolchain-newlib/Makefile
index 065f22110470..c1a881415bd4 100644
--- a/devel/psptoolchain-newlib/Makefile
+++ b/devel/psptoolchain-newlib/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.20.0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://sources.redhat.com/pub/ \
- ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SOURCEWARE/${PORTNAME}
PKGNAMEPREFIX= psptoolchain-
MAINTAINER= tphilipp@potion-studios.com
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 7ca38c675b3e..2c520091d970 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pth
PORTVERSION= 2.0.7
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= pth
+MASTER_SITES= GNU
PKGNAMESUFFIX?= # empty
MAINTAINER= vd@FreeBSD.org
diff --git a/devel/py-argparse/Makefile b/devel/py-argparse/Makefile
index c4c7d7ad2864..66fe57e6eaca 100644
--- a/devel/py-argparse/Makefile
+++ b/devel/py-argparse/Makefile
@@ -5,7 +5,7 @@ PORTNAME= argparse
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
diff --git a/devel/py-avro/Makefile b/devel/py-avro/Makefile
index 95a8e8a51b03..aa230afb88a3 100644
--- a/devel/py-avro/Makefile
+++ b/devel/py-avro/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.7.4
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.sai.msu.su/apache/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ \
- APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/stable
+ APACHE/${PORTNAME}/stable
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/devel/py-cld/Makefile b/devel/py-cld/Makefile
index c6e9ba410fb1..3db18f8c3661 100644
--- a/devel/py-cld/Makefile
+++ b/devel/py-cld/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cld
PORTVERSION= 20150113
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= demon
+MASTER_SITES= LOCAL/demon
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= chromium_compact_language_detector-${PORTVERSION}
diff --git a/devel/py-cmdln/Makefile b/devel/py-cmdln/Makefile
index b4f199173d2f..8572b01a86b3 100644
--- a/devel/py-cmdln/Makefile
+++ b/devel/py-cmdln/Makefile
@@ -5,7 +5,7 @@ PORTNAME= cmdln
PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= python@FreeBSD.org
diff --git a/devel/py-country/Makefile b/devel/py-country/Makefile
index f9e9015e9af7..060d07a2a37c 100644
--- a/devel/py-country/Makefile
+++ b/devel/py-country/Makefile
@@ -5,7 +5,6 @@ PORTNAME= country
PORTVERSION= 1.10
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR=source/p/pycountry
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pycountry-${PORTVERSION}
diff --git a/devel/py-extremes/Makefile b/devel/py-extremes/Makefile
index a345acd86662..8b8a886f60f9 100644
--- a/devel/py-extremes/Makefile
+++ b/devel/py-extremes/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Extremes
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/E/Extremes
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile
index 84ebead9c188..c4361e11a89b 100644
--- a/devel/py-freebsd/Makefile
+++ b/devel/py-freebsd/Makefile
@@ -5,9 +5,8 @@ PORTNAME= freebsd
PORTVERSION= 0.9.3
PORTREVISION= 6
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/perky \
http://people.freebsd.org/~perky/distfiles/
-MASTER_SITE_SUBDIR= perky
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py-freebsd-${PORTVERSION}
diff --git a/devel/py-fsm/Makefile b/devel/py-fsm/Makefile
index 65f3f8ef54a1..d818d37ccd06 100644
--- a/devel/py-fsm/Makefile
+++ b/devel/py-fsm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fsm
PORTVERSION= 0.01
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PROJECTHOST= python-${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= python-${PORTNAME}-${PORTVERSION}
diff --git a/devel/py-game_sdl2/Makefile b/devel/py-game_sdl2/Makefile
index 7df9a98580e2..7def1190cb03 100644
--- a/devel/py-game_sdl2/Makefile
+++ b/devel/py-game_sdl2/Makefile
@@ -4,7 +4,7 @@ PORTNAME= game_sdl2
PORTVERSION= 6.99.2
CATEGORIES= devel python
MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \
- GENTOO/distfiles
+ GENTOO
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-for-renpy-${DISTVERSION}
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 7ba8be7ee817..0c3f0fbedf55 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gobject
PORTVERSION= 2.28.6
PORTREVISION= 5
CATEGORIES= devel python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygobject-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/py-icu/Makefile b/devel/py-icu/Makefile
index b5114df568cd..a58a926d5dcb 100644
--- a/devel/py-icu/Makefile
+++ b/devel/py-icu/Makefile
@@ -5,8 +5,7 @@ PORTNAME= icu
PORTVERSION= 1.8
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/P/PyICU
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyICU-${PORTVERSION}
diff --git a/devel/py-ipaddr/Makefile b/devel/py-ipaddr/Makefile
index 15ea0500d510..e55f6d22467d 100644
--- a/devel/py-ipaddr/Makefile
+++ b/devel/py-ipaddr/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ipaddr
PORTVERSION= 2.1.10
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mopsfelder@gmail.com
diff --git a/devel/py-meliae/Makefile b/devel/py-meliae/Makefile
index f795e2231173..8165c62882f1 100644
--- a/devel/py-meliae/Makefile
+++ b/devel/py-meliae/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://launchpadlibrarian.net/74803944/ \
- LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
+ LOCAL/sbz
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sbz@FreeBSD.org
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 05fc088eedf0..2326f89aa2e5 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -6,8 +6,7 @@ PORTNAME= orbit
PORTVERSION= 2.24.0
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyorbit-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/py-prettytable/Makefile b/devel/py-prettytable/Makefile
index d789e8adddec..a35e2b73b2ae 100644
--- a/devel/py-prettytable/Makefile
+++ b/devel/py-prettytable/Makefile
@@ -5,8 +5,7 @@ PORTNAME= prettytable
PORTVERSION= 0.7.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR=source/P/PrettyTable
+MASTER_SITES= CHEESESHOP/source/P/PrettyTable
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= novel@FreeBSD.org
diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile
index 515761744e17..f3986100820f 100644
--- a/devel/py-protocols/Makefile
+++ b/devel/py-protocols/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.9.3
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://peak.telecommunity.com/dist/
-MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyProtocols-${PORTVERSION}
diff --git a/devel/py-pyev/Makefile b/devel/py-pyev/Makefile
index 741965ea0f68..5c342d768e09 100644
--- a/devel/py-pyev/Makefile
+++ b/devel/py-pyev/Makefile
@@ -5,7 +5,6 @@ PORTNAME= pyev
PORTVERSION= 0.9.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
-MASTER_SITE_SUBDIR= source/p/pyev
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gd.workbox@gmail.com
diff --git a/devel/py-pygpx/Makefile b/devel/py-pygpx/Makefile
index 8375c3ee7e92..2c41729a1d37 100644
--- a/devel/py-pygpx/Makefile
+++ b/devel/py-pygpx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pygpx
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/p/pygpx/
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wenheping@gmail.com
diff --git a/devel/py-qpid/Makefile b/devel/py-qpid/Makefile
index 3035ec36c1f0..be131c17d0d8 100644
--- a/devel/py-qpid/Makefile
+++ b/devel/py-qpid/Makefile
@@ -4,8 +4,7 @@
PORTNAME= qpid
PORTVERSION= 0.32
CATEGORIES= devel python
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-python-${PORTVERSION}
diff --git a/devel/py-qt4/bsd.pyqt.mk b/devel/py-qt4/bsd.pyqt.mk
index 0ae90cd4691e..259ac4381a26 100644
--- a/devel/py-qt4/bsd.pyqt.mk
+++ b/devel/py-qt4/bsd.pyqt.mk
@@ -13,11 +13,11 @@ PYQT_MAINTAINER= kde@FreeBSD.org
MASTER_SITE_RIVERBANK= http://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
MASTER_SITES_SIP= SF/pyqt/sip/sip-${PORTVERSION} \
- ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
+ GENTOO
MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-${PORTVERSION} \
- ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
+ GENTOO
MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
- ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
+ GENTOO
SIP_VERSION= 4.16.5
PYQT4_VERSION= 4.11.3
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 5e84d5bc5bc0..913ec80a1c71 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -5,7 +5,7 @@ PORTNAME= sip
PORTVERSION= ${SIP_VERSION}
PORTEPOCH= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITES_SIP} ${MASTER_SITE_LOCAL}
+MASTER_SITES= ${MASTER_SITES_SIP}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${SIP_DISTNAME}
diff --git a/devel/py-statgrab/Makefile b/devel/py-statgrab/Makefile
index 4b6d40b4003a..8af0235f87de 100644
--- a/devel/py-statgrab/Makefile
+++ b/devel/py-statgrab/Makefile
@@ -4,9 +4,8 @@
PORTNAME= statgrab
PORTVERSION= 0.6
CATEGORIES= devel python
-MASTER_SITES= http://ftp.mirrorservice.org/pub/i-scream/%SUBDIR%/ \
- http://ftp.i-scream.org/pub/i-scream/%SUBDIR%/
-MASTER_SITE_SUBDIR= py${PORTNAME}
+MASTER_SITES= http://ftp.mirrorservice.org/pub/i-scream/py${PORTNAME}/ \
+ http://ftp.i-scream.org/pub/i-scream/py${PORTNAME}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
diff --git a/devel/py-ydbf/Makefile b/devel/py-ydbf/Makefile
index f40f18430e04..6014caea86a4 100644
--- a/devel/py-ydbf/Makefile
+++ b/devel/py-ydbf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ydbf
PORTVERSION= 0.0.1
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/Y/YDbf/
+MASTER_SITES= CHEESESHOP/source/Y/YDbf/
DISTNAME= YDbf-0.0.1dev-20080514
MAINTAINER= andrey.polyakov@unix.net
diff --git a/devel/py_static_check/Makefile b/devel/py_static_check/Makefile
index 45bfaaf80e64..6249d71e6535 100644
--- a/devel/py_static_check/Makefile
+++ b/devel/py_static_check/Makefile
@@ -5,8 +5,7 @@ PORTNAME= py_static_check
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR= source/p/py_static_check
+MASTER_SITES= CHEESESHOP
MAINTAINER= jnlin@csie.nctu.edu.tw
COMMENT= Statically check your python code
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index ad47fcbe83bb..d84296f63dd7 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -6,8 +6,7 @@ PORTNAME= gobject
PORTVERSION= 3.14.0
PORTREVISION?= 0
CATEGORIES= devel python
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX?= py
PKGNAMESUFFIX?= 3-common
DISTNAME= pygobject-${PORTVERSION}
diff --git a/devel/pyobfuscate/Makefile b/devel/pyobfuscate/Makefile
index 10a16da0c6f7..4f52b63e1537 100644
--- a/devel/pyobfuscate/Makefile
+++ b/devel/pyobfuscate/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.lysator.liu.se/~astrand/projects/pyobfuscate/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+ LOCAL/arved
MAINTAINER= ports@FreeBSD.org
COMMENT= Python source code obfuscator
diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index 1c92509f2c59..59761e757a22 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -5,8 +5,7 @@ PORTNAME= qmake
PORTVERSION= 3.3.8
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR= archive/qt/${PORTVERSION:R:R}
+MASTER_SITES= QT/archive/qt/${PORTVERSION:R:R}
DISTNAME= qt-x11-free-${PORTVERSION}
DIST_SUBDIR= KDE
diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile
index 82300e650b59..26cb491c98d3 100644
--- a/devel/qt4-assistant-adp/Makefile
+++ b/devel/qt4-assistant-adp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= assistant
PORTVERSION= 4.6.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR= archive/qt/${PORTVERSION:R}
+MASTER_SITES= QT
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -adp
DISTNAME= qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 499252efa438..11fa50f5abd3 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libQtAssistantClient
PORTVERSION= 4.6.3
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR= archive/qt/${PORTVERSION:R}
+MASTER_SITES= QT
PKGNAMEPREFIX= qt4-
DISTNAME= qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
DIST_SUBDIR= KDE
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 63b80e6ecf71..88ae8872f428 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -4,8 +4,7 @@
PORTNAME= qtcreator
DISTVERSION= 3.4.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR=official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
+MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
DISTNAME= qt-creator-opensource-src-${DISTVERSION}
DIST_SUBDIR= KDE
diff --git a/devel/quickcheck++/Makefile b/devel/quickcheck++/Makefile
index 74b75cbe41f5..55395c51777e 100644
--- a/devel/quickcheck++/Makefile
+++ b/devel/quickcheck++/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quickcheck++
PORTVERSION= 0.0.3
CATEGORIES= devel
MASTER_SITES= http://software.legiasoft.com/archives/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+ LOCAL/tota/${PORTNAME}
DISTNAME= quickcheck_${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index 3773736c00a6..91bbc1183f24 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quilt
PORTVERSION= 0.61
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= quilt
+MASTER_SITES= SAVANNAH
MAINTAINER= doj@cubic.org
COMMENT= Collection of bash scripts to ease working with patch files
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index d76ddab74e63..896799845268 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -3,8 +3,7 @@
PORTNAME= rcs
PORTVERSION= 5.9.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= zeising@FreeBSD.org
COMMENT= Version control system
diff --git a/devel/rcs57/Makefile b/devel/rcs57/Makefile
index 6611318f5a2c..99ed58b7be52 100644
--- a/devel/rcs57/Makefile
+++ b/devel/rcs57/Makefile
@@ -3,8 +3,7 @@
PORTNAME= rcs
PORTVERSION= 5.7
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMESUFFIX= 57
MAINTAINER= cy@FreeBSD.org
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 30c27df70b51..6f4330c38312 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -6,11 +6,9 @@ PORTVERSION= 6.3${PATCHLEVEL}
CATEGORIES= devel
MASTER_SITES= GNU \
ftp://ftp.cwru.edu/pub/bash/
-MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([0-9].[0-9]).*/\1/}
-PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR=${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-patches
+PATCH_SITES= GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-patches
MAINTAINER= johans@FreeBSD.org
COMMENT= Library for editing command lines as they are typed
diff --git a/devel/remake/Makefile b/devel/remake/Makefile
index 8ded7125db89..699a2671a42b 100644
--- a/devel/remake/Makefile
+++ b/devel/remake/Makefile
@@ -4,8 +4,7 @@
PORTNAME= remake
PORTVERSION= 0.9
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=bashdb/remake/3.82+dbg-${PORTVERSION}/
+MASTER_SITES= SF/bashdb/remake/3.82+dbg-${PORTVERSION}/
DISTNAME= remake-3.82+dbg${PORTVERSION}
MAINTAINER= arved@FreeBSD.org
diff --git a/devel/renpy/Makefile b/devel/renpy/Makefile
index 8e8ca82c8f8b..8ed6eeaa1f2c 100644
--- a/devel/renpy/Makefile
+++ b/devel/renpy/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 6.99.2
DISTVERSIONSUFFIX=-source
CATEGORIES= devel games
MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Framework for developing visual-novel type games
diff --git a/devel/ruby-langscan/Makefile b/devel/ruby-langscan/Makefile
index 4a2d37779782..085fb203633e 100644
--- a/devel/ruby-langscan/Makefile
+++ b/devel/ruby-langscan/Makefile
@@ -4,8 +4,7 @@
PORTNAME= langscan
PORTVERSION= 1.2.20070115
CATEGORIES= devel ruby
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+MASTER_SITES= LOCAL/tota/${PORTNAME}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ${RUBY_PKGNAMEPREFIX:S|${RUBY_SUFFIX}-||}
diff --git a/devel/ruby-ncurses/Makefile b/devel/ruby-ncurses/Makefile
index 8627438d2b66..1c0b0a0cfb9d 100644
--- a/devel/ruby-ncurses/Makefile
+++ b/devel/ruby-ncurses/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ncurses
PORTVERSION= 1.2.4
CATEGORIES= devel ruby
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= ncurses-ruby
+MASTER_SITES= SF/ncurses-ruby
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-ruby-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/devel/ruby-setup.rb/Makefile b/devel/ruby-setup.rb/Makefile
index 52739f5bf585..6f14a06fa451 100644
--- a/devel/ruby-setup.rb/Makefile
+++ b/devel/ruby-setup.rb/Makefile
@@ -4,8 +4,7 @@
PORTNAME= setup.rb
PORTVERSION= 3.4.1
CATEGORIES= devel ruby
-MASTER_SITES= http://www.loveruby.net/archive/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME:R}
+MASTER_SITES= http://www.loveruby.net/archive/${PORTNAME:R}/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:R}-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/devel/rubygem-atoulme-antwrap/Makefile b/devel/rubygem-atoulme-antwrap/Makefile
index 7d0befa5f5f8..465dedff5058 100644
--- a/devel/rubygem-atoulme-antwrap/Makefile
+++ b/devel/rubygem-atoulme-antwrap/Makefile
@@ -4,7 +4,7 @@
PORTNAME= atoulme-Antwrap
PORTVERSION= 0.7.5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_RUBYGEMS}
+MASTER_SITES= RG
MAINTAINER= arved@FreeBSD.org
COMMENT= Ruby wrapper for Apache Ant
diff --git a/devel/rubygem-io-like/Makefile b/devel/rubygem-io-like/Makefile
index 44f436ee205b..78876c252167 100644
--- a/devel/rubygem-io-like/Makefile
+++ b/devel/rubygem-io-like/Makefile
@@ -4,8 +4,7 @@
PORTNAME= io-like
PORTVERSION= 0.3.0.20130301
CATEGORIES= devel rubygems
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= tota/${PORTNAME}
+MASTER_SITES= LOCAL/tota/${PORTNAME}
PKGNAMEPREFIX= rubygem-
MAINTAINER= tota@FreeBSD.org
diff --git a/devel/sabre/Makefile b/devel/sabre/Makefile
index 99c43a77a93d..019a9b3b2004 100644
--- a/devel/sabre/Makefile
+++ b/devel/sabre/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sabre
PORTVERSION= 20100501
CATEGORIES= devel multimedia java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sabre-library
+MASTER_SITES= SF/sabre-library
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
diff --git a/devel/safe-iop/Makefile b/devel/safe-iop/Makefile
index bf6123bc1e5e..70684b914311 100644
--- a/devel/safe-iop/Makefile
+++ b/devel/safe-iop/Makefile
@@ -4,12 +4,12 @@
PORTNAME= safe-iop
PORTVERSION= 0.3.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Safe integer operation library for C
+USES= tar:tgz
USE_LDCONFIG= yes
ALL_TARGET= so
CFLAGS+= -fPIC
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 4277ea31a8cc..403c4145671d 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -4,7 +4,7 @@
PORTNAME= sfio
PORTVERSION= 1999
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
DISTNAME= ${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .src.unix.cpio
diff --git a/devel/sgb/Makefile b/devel/sgb/Makefile
index a4f59e7cdb0d..ed42745e8280 100644
--- a/devel/sgb/Makefile
+++ b/devel/sgb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sgb
PORTVERSION= 20090810
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cs.stanford.edu/pub/sgb/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
DISTNAME= sgb-2009-08-10
MAINTAINER= gerald@FreeBSD.org
diff --git a/devel/shtool/Makefile b/devel/shtool/Makefile
index 09230103f373..54270f97ada4 100644
--- a/devel/shtool/Makefile
+++ b/devel/shtool/Makefile
@@ -4,9 +4,8 @@
PORTNAME= shtool
PORTVERSION= 2.0.8
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU:S/$/:GNU/} ${MASTER_SITE_OSSP:S/$/:OSSP/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:GNU tool/${PORTNAME}/:OSSP
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:GNU,OSSP
+MASTER_SITES= GNU OSSP/tool/${PORTNAME}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= vd@FreeBSD.org
COMMENT= The GNU Portable Shell Tool
diff --git a/devel/smake/Makefile b/devel/smake/Makefile
index acb255159b40..74468488801a 100644
--- a/devel/smake/Makefile
+++ b/devel/smake/Makefile
@@ -4,8 +4,7 @@
PORTNAME= smake
PORTVERSION= 1.2.3
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=s-make
+MASTER_SITES= SF/s-make
MAINTAINER= ports@FreeBSD.org
COMMENT= Portable make program with automake features
diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile
index 557425f89d7d..f9115ab852ef 100644
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 4.5
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
DISTNAME= sourcenavigator-NG${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/storm/Makefile b/devel/storm/Makefile
index edfc3d3e1817..9f1431e7ccc4 100644
--- a/devel/storm/Makefile
+++ b/devel/storm/Makefile
@@ -4,8 +4,7 @@
PORTNAME= storm
DISTVERSION= 0.9.2-incubating
CATEGORIES= devel java
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= incubator/${PORTNAME}/apache-${PORTNAME}-${DISTVERSION}
+MASTER_SITES= APACHE/incubator/${PORTNAME}/apache-${PORTNAME}-${DISTVERSION}
DISTNAME= apache-storm-${DISTVERSION}
MAINTAINER= hsn@sendmail.cz
diff --git a/devel/stormlib-ghost++/Makefile b/devel/stormlib-ghost++/Makefile
index 1d4c8a4955de..c275b3a3cb01 100644
--- a/devel/stormlib-ghost++/Makefile
+++ b/devel/stormlib-ghost++/Makefile
@@ -4,7 +4,7 @@
PORTNAME= stormlib
PORTVERSION= 6.25
CATEGORIES= devel archivers
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -ghost++
DISTNAME= ${PROJECTHOST}_${PROJECTVERSION}
diff --git a/devel/str/Makefile b/devel/str/Makefile
index b3d127b1cfe8..8b36f5de4b3b 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -5,8 +5,7 @@ PORTNAME= str
PORTVERSION= 0.9.12
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_OSSP}
-MASTER_SITE_SUBDIR= lib/${PORTNAME}
+MASTER_SITES= OSSP/lib/${PORTNAME}
MAINTAINER= vd@FreeBSD.org
COMMENT= Generic String Library
diff --git a/devel/streamhtmlparser/Makefile b/devel/streamhtmlparser/Makefile
index 0fcf8fd37c2a..c47be26462a0 100644
--- a/devel/streamhtmlparser/Makefile
+++ b/devel/streamhtmlparser/Makefile
@@ -4,7 +4,7 @@
PORTNAME= streamhtmlparser
PORTVERSION= 0.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= itechbear@gmail.com
COMMENT= C/C++/Python streaming HTML parser library from Google
diff --git a/devel/stringencoders/Makefile b/devel/stringencoders/Makefile
index fde90e7081bc..bd796f3497c7 100644
--- a/devel/stringencoders/Makefile
+++ b/devel/stringencoders/Makefile
@@ -3,10 +3,10 @@
PORTNAME= stringencoders
PORTVERSION= 3.10.3
+DISTVERSIONPREFIX= v
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Collection of high performance c-string transformations
diff --git a/devel/subversion-book/Makefile b/devel/subversion-book/Makefile
index 4620dd9cb856..4c2271edb6d0 100644
--- a/devel/subversion-book/Makefile
+++ b/devel/subversion-book/Makefile
@@ -3,8 +3,7 @@
PORTNAME= subversion-book
DISTVERSION= 4515
CATEGORIES= devel misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=lev
+MASTER_SITES= LOCAL/lev
DISTFILES= svn-book-html-r${DISTVERSION}.tar.bz2 \
svn-book-r${DISTVERSION}.pdf
DIST_SUBDIR= subversion18
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index deecf59269de..a94a641a531c 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -5,9 +5,8 @@ PORTNAME?= subversion
PORTVERSION= 1.8.13
PORTREVISION?= 0
CATEGORIES+= devel
-MASTER_SITES= ${MASTER_SITE_APACHE}
+MASTER_SITES= APACHE/subversion
DIST_SUBDIR= subversion18
-MASTER_SITE_SUBDIR= subversion
GNU_CONFIGURE= yes
USES+= tar:bzip2 pkgconfig libtool cpe
diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common
index eb6bb2bce5bc..114f40dad3cc 100644
--- a/devel/subversion17/Makefile.common
+++ b/devel/subversion17/Makefile.common
@@ -5,10 +5,9 @@ PORTNAME= subversion
PORTVERSION= 1.7.20
PORTREVISION?= 0
CATEGORIES+= devel
-MASTER_SITES= ${MASTER_SITE_APACHE}
+MASTER_SITES= APACHE/subversion
DIST_SUBDIR= subversion17
PKGNAMESUFFIX= 17
-MASTER_SITE_SUBDIR= subversion
USE_KDE4= # Used below if KWallet support is enabled
GNU_CONFIGURE= yes
diff --git a/devel/subversive/Makefile b/devel/subversive/Makefile
index a03da0b6aa74..3bf83c11398d 100644
--- a/devel/subversive/Makefile
+++ b/devel/subversive/Makefile
@@ -5,7 +5,7 @@ PORTNAME= subversive
PORTVERSION= 2.0.0
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_ECLIPSE:S,%SUBDIR%,technology/subversive/2.0/builds,:S,$,:core,} \
+MASTER_SITES= ECLIPSE/technology/subversive/2.0/builds:core \
http://community.polarion.com/projects/subversive/download/eclipse/4.0/builds/:connectors
DISTNAME= Subversive-${PORTVERSION}.I20140519-1700
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:core ${CONNECTORS}:connectors
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 9413453abc70..5d18d460a95b 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 2.1.2
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAMBA
MAINTAINER= timur@FreeBSD.org
COMMENT= Hierarchical pool based memory allocator
diff --git a/devel/tcl-trf/Makefile b/devel/tcl-trf/Makefile
index 40fec6b61b1d..f701e7692179 100644
--- a/devel/tcl-trf/Makefile
+++ b/devel/tcl-trf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Trf
PORTVERSION= 2.1.4
PORTREVISION= 1
CATEGORIES= devel tcl
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=tcltrf/tcltrf/${PORTVERSION}
+MASTER_SITES= SF/tcltrf/tcltrf/${PORTVERSION}
PKGNAMEPREFIX= tcl-
DISTNAME= trf${PORTVERSION}
diff --git a/devel/tclap/Makefile b/devel/tclap/Makefile
index 300bee82dcd2..a0a96823c71a 100644
--- a/devel/tclap/Makefile
+++ b/devel/tclap/Makefile
@@ -4,8 +4,7 @@ PORTNAME= tclap
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}#
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= grog@FreeBSD.org
COMMENT= Verbose replacement for getopt
diff --git a/devel/terminality/Makefile b/devel/terminality/Makefile
index 81ae911c834a..3dde995061c3 100644
--- a/devel/terminality/Makefile
+++ b/devel/terminality/Makefile
@@ -4,8 +4,7 @@
PORTNAME= terminality
PORTVERSION= 2.1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= gabor
+MASTER_SITES= LOCAL/gabor
DISTNAME= tn-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 665d1312a756..e7f79a001ca1 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.9.22
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAMBA
MAINTAINER= timur@FreeBSD.org
COMMENT= Talloc based event loop library
diff --git a/devel/thrift-c_glib/Makefile b/devel/thrift-c_glib/Makefile
index 5318a2bc2508..590e2aeca738 100644
--- a/devel/thrift-c_glib/Makefile
+++ b/devel/thrift-c_glib/Makefile
@@ -6,17 +6,14 @@ PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
+MASTER_SITES= APACHE/thrift/${PORTVERSION
+DISTNAME= thrift-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C glib interface to Thrift
PKGNAMESUFFIX= -c_glib
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= /thrift/${PORTVERSION
-DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo
-DISTNAME= thrift-${PORTVERSION}
-
BUILDIR= ${WRKDIR}/${DISTNAME}/lib/c_glib
LIB_DEPENDS= libglib-2.0.so:${PORTSDIR}/devel/glib20
@@ -25,10 +22,12 @@ USE_AUTOTOOLS= autoconf autoheader:env aclocal automake
ACLOCAL_ARGS= -I${WRKSRC}/aclocal
AUTOMAKE_ARGS= --foreign --add-missing --copy
+DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo
+
USES= pkgconfig gmake libtool
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-MAKE_JOBS_UNSAFE= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+MAKE_JOBS_UNSAFE= yes
.include "../thrift/bsd.thrift.mk"
diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
index c94f8510da2a..f94686d894f3 100644
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -6,15 +6,13 @@ PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
+PKGNAMESUFFIX= -cpp
+MASTER_SITES= APACHE/thrift/${PORTVERSION}
+DISTNAME= thrift-${PORTVERSION}
MAINTAINER= komarov@valerka.net
COMMENT= C++ interface to Thrift
-PKGNAMESUFFIX= -cpp
-
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= thrift/${PORTVERSION}
-DISTNAME= thrift-${PORTVERSION}
DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo
LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 1292a4cfe520..acc4d6e8e8cf 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -5,8 +5,7 @@ PORTNAME= thrift
PORTVERSION= ${THRIFT_PORTVERSION} # get these from bsd.thrift.mk. any upgrade needs to check ALL dependencies
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= APACHE
-MASTER_SITE_SUBDIR= /thrift/${PORTVERSION}
+MASTER_SITES= APACHE/thrift/${PORTVERSION}
MAINTAINER= komarov@valerka.net
COMMENT= Framework for scalable cross-language services development
diff --git a/devel/tigcc/Makefile b/devel/tigcc/Makefile
index de46e2b98f41..d71df781bcc8 100644
--- a/devel/tigcc/Makefile
+++ b/devel/tigcc/Makefile
@@ -5,11 +5,9 @@ PORTNAME= tigcc
PORTVERSION= 0.96.b8
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GCC:S/$/:gcc/} \
- ${MASTER_SITE_GNU:S/$/:gas/} \
+MASTER_SITES= GCC/snapshots/4.1-20060728:gcc \
+ GNU/binutils:gas \
http://tigcc.ticalc.org/linux/:tigcc
-MASTER_SITE_SUBDIR= snapshots/4.1-20060728/:gcc \
- binutils/:gas
DISTFILES= gcc-core-4.1-20060728.tar.bz2:gcc \
binutils-2.16.1.tar.bz2:gas \
tigcc_src.tar.bz2:tigcc
diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index ec2fb29bdb83..fdc89b7f42f2 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ucommon
PORTVERSION= 6.1.11
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= commoncpp
+MASTER_SITES= GNU/commoncpp
MAINTAINER= ports@FreeBSD.org
COMMENT= Very lightweight C++ design pattern library
diff --git a/devel/udis86/Makefile b/devel/udis86/Makefile
index 48d0ec87b335..5980e02cf67c 100644
--- a/devel/udis86/Makefile
+++ b/devel/udis86/Makefile
@@ -5,8 +5,7 @@ PORTNAME= udis86
PORTVERSION= 1.7.2
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION:R}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
MAINTAINER= bf@FreeBSD.org
COMMENT= Minimalistic x86 and x86-64 disassembler library
diff --git a/devel/ultragetopt/Makefile b/devel/ultragetopt/Makefile
index 24afec1880b0..13c44a89035b 100644
--- a/devel/ultragetopt/Makefile
+++ b/devel/ultragetopt/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ultragetopt
PORTVERSION= 0.6.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= http://kevinlocke.name/programs/ ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://kevinlocke.name/programs/
MAINTAINER= beyert@cs.ucr.edu
COMMENT= Versatile and customizable implementation of getopt()
diff --git a/devel/winpdb/Makefile b/devel/winpdb/Makefile
index 3e86642c84e9..a85b47c2d065 100644
--- a/devel/winpdb/Makefile
+++ b/devel/winpdb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= winpdb
PORTVERSION= 1.4.8
PORTREVISION= 5
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR= winpdb
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= mva@FreeBSD.org
COMMENT= Advanced Python debugger
diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
index 65a51010de88..333d55c1900e 100644
--- a/devel/xwpe/Makefile
+++ b/devel/xwpe/Makefile
@@ -4,10 +4,9 @@
PORTNAME= xwpe
PORTVERSION= 1.5.30a
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/apps/editors/X \
http://www.identicalsoftware.com/xwpe/ \
ftp://ftp.identicalsoftware.com/pub/linux/xwpe/
-MASTER_SITE_SUBDIR= apps/editors/X
MAINTAINER= ports@FreeBSD.org
COMMENT= Borland-like IDE programming environment
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index edf96069d275..4f5602319234 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xxgdb
PORTVERSION= 1.12
PORTREVISION= 4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
MAINTAINER= cy@FreeBSD.org
COMMENT= X window interface for gdb
diff --git a/devel/yasm-devel/Makefile b/devel/yasm-devel/Makefile
index 5f8c01aa0954..76355c4ab8af 100644
--- a/devel/yasm-devel/Makefile
+++ b/devel/yasm-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= yasm
PORTVERSION= 1.2.0.29
DISTVERSIONSUFFIX= .g87c0
CATEGORIES= devel lang
-MASTER_SITES= http://www.tortall.net/projects/yasm/snapshots/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${DISTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITES= http://www.tortall.net/projects/yasm/snapshots/v${DISTVERSION}${DISTVERSIONSUFFIX}/
PKGNAMESUFFIX= -devel
MAINTAINER= koobs@FreeBSD.org
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index e42a03186dfe..08ce14e861d5 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zookeeper
PORTVERSION= 3.4.6
PORTREVISION= 3
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= zookeeper/zookeeper-${PORTVERSION}
+MASTER_SITES= APACHE/zookeeper/zookeeper-${PORTVERSION}
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Service for maintaining distributed configuration, naming and locks
diff --git a/devel/zpu-binutils/Makefile b/devel/zpu-binutils/Makefile
index 5ac874fa29d3..cca645a34f63 100644
--- a/devel/zpu-binutils/Makefile
+++ b/devel/zpu-binutils/Makefile
@@ -3,8 +3,7 @@
PORTNAME= zpu-binutils
PORTVERSION= 1.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+MASTER_SITES= LOCAL/db
DISTNAME= zpu-toolchain-${PORTVERSION}
MAINTAINER= db@FreeBSD.org
diff --git a/devel/zpu-gcc/Makefile b/devel/zpu-gcc/Makefile
index dffb3233c562..304bba642313 100644
--- a/devel/zpu-gcc/Makefile
+++ b/devel/zpu-gcc/Makefile
@@ -4,8 +4,7 @@ PORTNAME= zpu-gcc
PORTVERSION= 1.0
CATEGORIES= devel
MASTER_SITES= http://opensource.zylin.com/zpudownload.html/
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+MASTER_SITES= LOCAL/db
DISTNAME= zpu-toolchain-${PORTVERSION}
MAINTAINER= db@FreeBSD.org
diff --git a/dns/bind10/Makefile b/dns/bind10/Makefile
index 4d99e679659b..86d2462cff82 100644
--- a/dns/bind10/Makefile
+++ b/dns/bind10/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bind10
PORTVERSION= 1.2.0
PORTREVISION= 3
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+MASTER_SITES= ISC/${PORTNAME}/${PORTVERSION}
MAINTAINER= mat@FreeBSD.org
COMMENT= Development version of ISC BIND 10 DNS Suite
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 53aeace92cc5..d242dd6c188c 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -48,7 +48,7 @@ BROKEN= The jumbo patch currently conflicts with the IPv6, ignoreip2, SRV and D
.endif
PATCH_SITES+= http://people.FreeBSD.org/~roam/ports/dns/djbdns/:jumbo \
- ${MASTER_SITE_LOCAL:S/%SUBDIR%\//roam\/dns\/djbdns\/:jumbo/}
+ LOCAL/roam/dns/djbdns:jumbo
PATCHFILES+= jumbo-p13.patch.gz:jumbo
PATCH_DIST_STRIP= -p1
.if ${PORT_OPTIONS:MDUMPCACHE}
diff --git a/dns/doc/Makefile b/dns/doc/Makefile
index c9fd07f67d52..73f823088e04 100644
--- a/dns/doc/Makefile
+++ b/dns/doc/Makefile
@@ -4,9 +4,8 @@
PORTNAME= doc
PORTVERSION= 2.2.3
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/sanpei \
ftp://ftp.shub-internet.org/pub/shub/brad/dns/
-MASTER_SITE_SUBDIR= sanpei
MAINTAINER= sanpei@FreeBSD.org
COMMENT= Diagnose unhealthy DNS domains
diff --git a/dns/inadyn/Makefile b/dns/inadyn/Makefile
index 533b8980c171..1073f5c89f36 100644
--- a/dns/inadyn/Makefile
+++ b/dns/inadyn/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.96.2
PORTREVISION= 3
CATEGORIES= dns
MASTER_SITES= http://www.inatech.eu/inadyn/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dhn
+ LOCAL/dhn
DISTNAME= ${PORTNAME}.v${PORTVERSION}
MAINTAINER= samm@os2.kiev.ua
diff --git a/dns/ipcheck/Makefile b/dns/ipcheck/Makefile
index 094adfed42ad..84f78f01e7dc 100644
--- a/dns/ipcheck/Makefile
+++ b/dns/ipcheck/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.240
PORTEPOCH= 1
CATEGORIES= dns python
MASTER_SITES= http://ipcheck.sourceforge.net/releases/
-MASTER_SITE_SUBDIR= lioux
DISTNAME= ${PORTNAME}.${PORTVERSION:S/^0.//}
EXTRACT_SUFX=
EXTRACT_ONLY=
diff --git a/dns/nsping/Makefile b/dns/nsping/Makefile
index 1079a1486895..59ff2cc99cb6 100644
--- a/dns/nsping/Makefile
+++ b/dns/nsping/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nsping
PORTVERSION= 0.8
PORTREVISION= 2
CATEGORIES= dns
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= roam
+MASTER_SITES= LOCAL/roam
DISTFILES= nsping.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile
index b5d7ce162019..1bc965412f13 100644
--- a/dns/py-adns/Makefile
+++ b/dns/py-adns/Makefile
@@ -5,7 +5,7 @@ PORTNAME= adns
PORTVERSION= 1.2.1
PORTREVISION= 14
CATEGORIES= dns python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= adns-python-${PORTVERSION}
diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile
index e456961c1a85..d2edf9533395 100644
--- a/dns/samba-nsupdate/Makefile
+++ b/dns/samba-nsupdate/Makefile
@@ -4,8 +4,7 @@ PORTNAME= nsupdate
PORTVERSION= 9.8.6
PORTREVISION= 1
CATEGORIES= dns net ipv6
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
+MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMEPREFIX= samba-
DISTNAME= bind-${ISCVERSION}
diff --git a/dns/updatedd/Makefile b/dns/updatedd/Makefile
index 26cbab85e31c..f43bf0edc20e 100644
--- a/dns/updatedd/Makefile
+++ b/dns/updatedd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= updatedd
PORTVERSION= 2.6
PORTREVISION= 1
CATEGORIES= dns
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= geniusj@ods.org
diff --git a/editors/abiword-docs/Makefile b/editors/abiword-docs/Makefile
index d6b2580e49d4..e410a6e3e515 100644
--- a/editors/abiword-docs/Makefile
+++ b/editors/abiword-docs/Makefile
@@ -5,8 +5,7 @@
PORTNAME= abiword-docs
PORTVERSION= 2.8.6
CATEGORIES= editors
-MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
-MASTER_SITE_SUBDIR= abiword
+MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
DIST_SUBDIR= AbiWord
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index d7f4ffe96f4f..3a021d4aa323 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -6,8 +6,7 @@ PORTNAME= abiword
PORTVERSION= 2.8.6
PORTREVISION= 10
CATEGORIES= editors
-MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
-MASTER_SITE_SUBDIR= abiword
+MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
DIST_SUBDIR= AbiWord
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index c5dceca31f1a..e4a82a1d6faf 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -5,7 +5,7 @@ PORTNAME= beav
PORTVERSION= 1.40.18
PORTREVISION= 3
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION:R}.orig
PATCH_SITES= ${MASTER_SITES}
diff --git a/editors/calligra-l10n/files/bsd.l10n.mk b/editors/calligra-l10n/files/bsd.l10n.mk
index c65cd75d431b..a49aed2fbfcd 100644
--- a/editors/calligra-l10n/files/bsd.l10n.mk
+++ b/editors/calligra-l10n/files/bsd.l10n.mk
@@ -1,6 +1,5 @@
.if defined(CALLIGRA_L10N)
-MASTER_SITES?= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR?= ${CALLIGRA_BRANCH}/calligra-${PORTVERSION}/calligra-l10n/
+MASTER_SITES?= KDE/${CALLIGRA_BRANCH}/calligra-${PORTVERSION}/calligra-l10n
PKGNAMEPREFIX= ${CALLIGRA_L10N:S/@/_/}-
DISTNAME= ${PORTNAME}-${CALLIGRA_L10N}-${PORTVERSION}
DIST_SUBDIR= KDE/calligra-l10n
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index bd05c62ee01b..6e82b3ba127f 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -4,8 +4,7 @@ PORTNAME= calligra
PORTVERSION= ${CALLIGRA_VERSION}
PORTREVISION= 15
CATEGORIES= editors kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
+MASTER_SITES= KDE/${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 5f81dbb5dc5e..b7b2af541979 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -5,8 +5,7 @@ PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
PORTEPOCH= 3
CATEGORIES= editors ipv6
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
PKGNAMESUFFIX?= 24
PATCH_SITE_SUBDIR+= ashish
@@ -86,7 +85,7 @@ OPTIONS_SUB= SOURCES
CANNA_CONFIGURE_ON= --with-canna \
--with-canna-includes=${LOCALBASE}/include \
--with-canna-libraries=${LOCALBASE}/lib
-CANNA_PATCH_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL}
+CANNA_PATCH_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ LOCAL
CANNA_PATCHFILES= emacs24.4canna-20141030.diff.gz
CANNA_LIB_DEPENDS= libcanna.so:${PORTSDIR}/japanese/canna-lib
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 802867b4c335..619364de9c1e 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 0.4.13
PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://releases.0x539.de/gobby/ \
- LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
+ LOCAL/sbz
MAINTAINER= sbz@FreeBSD.org
COMMENT= Free collaborative editor
diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index b1b69b0eb11b..d72566c0c860 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 4.16
PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= simon/:local
+ LOCAL/simon
MAINTAINER= ports@FreeBSD.org
COMMENT= Jonathan's Own Version of Emacs
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 8a57428341e5..68f91dca2e88 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -7,7 +7,7 @@ DISTVERSIONSUFFIX= -0
PORTREVISION?= 0
CATEGORIES= editors devel
MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
- ${MASTER_SITE_LOCAL:S|$|acm/freepascal/|}
+ LOCAL/acm/freepascal
DIST_SUBDIR= freepascal
MAINTAINER?= freebsd-fpc@FreeBSD.org
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 06c5c03af96e..5841aba7650f 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.8.18.1
PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jgh@FreeBSD.org
COMMENT= GTK+ based simple text editor
diff --git a/editors/nano-devel/Makefile b/editors/nano-devel/Makefile
index 23a5fde99261..cb22ce66b7c2 100644
--- a/editors/nano-devel/Makefile
+++ b/editors/nano-devel/Makefile
@@ -4,7 +4,7 @@ PORTNAME= nano
PORTVERSION= 2.3.6
CATEGORIES= editors
MASTER_SITES= http://www.nano-editor.org/dist/v${PORTVERSION:R}/ \
- ${MASTER_SITE_GNU}
+ GNU
PKGNAMESUFFIX= -devel
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 801c5095a2ac..70e4504a7cd4 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 5.6
PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://people.freebsd.org/~deischen/distfiles/ \
- ${MASTER_SITE_SOURCEFORGE} \
+ SF/${PORTNAME}/${PORTNAME}-source \
ftp://ftp.nluug.nl/pub/editors/NEdit/contrib/misc/
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-source
DISTFILES= nedit-5.6a-src.tar.gz nedit.app-defaults
EXTRACT_ONLY= nedit-5.6a-src.tar.gz
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 73517e24fd24..97b5b8aa56bb 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= editors elisp
MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= hrs
+PATCH_SITES= LOCAL/hrs
PATCHFILES= psgml-symbol-conflict-050503.diff.gz
MAINTAINER= hrs@FreeBSD.org
diff --git a/editors/spe/Makefile b/editors/spe/Makefile
index c9a25e43dfa6..67bba79b86e1 100644
--- a/editors/spe/Makefile
+++ b/editors/spe/Makefile
@@ -5,8 +5,7 @@ PORTNAME= SPE
PORTVERSION= 0.8.4.h
PORTREVISION= 8
CATEGORIES= editors devel python
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= python
+MASTER_SITES= SF/python
DISTNAME= ${PORTNAME:tl}-${PORTVERSION}-wx2.6.1.0
MAINTAINER= nivit@FreeBSD.org
diff --git a/editors/sted/Makefile b/editors/sted/Makefile
index 668282339727..406e8e69ca56 100644
--- a/editors/sted/Makefile
+++ b/editors/sted/Makefile
@@ -4,8 +4,7 @@
PORTNAME= sted
PORTVERSION= 0.2.2
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= gabor
+MASTER_SITES= LOCAL/gabor
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple/Small/Stupid Text Editor
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 79f2078839be..890c5cf6655d 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -5,13 +5,11 @@ PORTNAME= tamago
PORTVERSION= 4.0.6.0.20041122.19
PORTREVISION= 13
CATEGORIES= editors elisp
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/e/egg
+MASTER_SITES= DEBIAN/pool/main/e/egg
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= egg_4.0.6+0.20041122cvs.orig
-PATCH_SITES= ${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
- ${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
+PATCH_SITES= DEBIAN/pool/main/e/egg LOCAL/nork
PATCHFILES= egg_4.0.6+0.20041122cvs-19.diff.gz
PATCH_DIST_STRIP= -p1
diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index 23a3acacf658..258c2f4500a8 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 3
CATEGORIES= editors www
MASTER_SITES= ftp://ftp.inrialpes.fr/pub/opera/sources/thot/ \
ftp://ftp.ruhr-uni-bochum.de/local/jk.collection/thot/
-MASTER_SITE_SUBDIR= apps/editors/X/thot
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile
index 26c1ded9e20f..f7d243808e68 100644
--- a/editors/uzap/Makefile
+++ b/editors/uzap/Makefile
@@ -4,8 +4,7 @@
PORTNAME= uzap
PORTVERSION= 1.0
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
diff --git a/editors/yasnippet/Makefile b/editors/yasnippet/Makefile
index 44541e42bcae..9122cbb40ee6 100644
--- a/editors/yasnippet/Makefile
+++ b/editors/yasnippet/Makefile
@@ -4,7 +4,7 @@ PORTNAME= yasnippet
PORTVERSION= 0.6.1c
PORTREVISION= 10
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
yasnippet-doc-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index 02aa0682570c..ab991a755811 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bsvc
PORTVERSION= 2.1
PORTREVISION= 3
CATEGORIES= emulators tk
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/emulators
+MASTER_SITES= SUNSITE/system/emulators
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/cpmemu/Makefile b/emulators/cpmemu/Makefile
index e8ae89298a9d..648a14b89efc 100644
--- a/emulators/cpmemu/Makefile
+++ b/emulators/cpmemu/Makefile
@@ -4,12 +4,10 @@
PORTNAME= cpmemu
PORTVERSION= 0.2.1.1
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/emulators
+MASTER_SITES= SUNSITE/system/emulators
DISTNAME= cpm-0.2.1
-PATCH_SITES= ${MASTER_SITE_SUNSITE}
-PATCH_SITE_SUBDIR= system/emulators
+PATCH_SITES= SUNSITE/system/emulators
PATCHFILES= cpm-0.2.1-glibc-rjm.patch.gz
PATCH_DIST_STRIP= -p1
diff --git a/emulators/cpmtools/Makefile b/emulators/cpmtools/Makefile
index 42e9cc769003..50e4c6abe39a 100644
--- a/emulators/cpmtools/Makefile
+++ b/emulators/cpmtools/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cpmtools
PORTVERSION= 1.1
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
DISTNAME= cpm-${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile
index 5b9f4b76a257..c26e3d24b7eb 100644
--- a/emulators/darcnes/Makefile
+++ b/emulators/darcnes/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 9b0401
PORTREVISION= 6
CATEGORIES= emulators
MASTER_SITES= http://www.dridus.com/~nyef/darcnes/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= grembo
+ LOCAL/grembo
DISTNAME= dn${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/dboxfe/Makefile b/emulators/dboxfe/Makefile
index 30b5c9c1957c..ed5a0a6ad96c 100644
--- a/emulators/dboxfe/Makefile
+++ b/emulators/dboxfe/Makefile
@@ -4,8 +4,7 @@ PORTNAME= dboxfe
PORTVERSION= 0.1.3
PORTREVISION= 6
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= makc@FreeBSD.org
COMMENT= Qt4 based configuration manager for DOSBox
diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile
index 1a5142553102..9b79dc6da783 100644
--- a/emulators/dtcyber/Makefile
+++ b/emulators/dtcyber/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.0b1
PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://members.iinet.net.au/~tom-hunter/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= trasz
+ LOCAL/trasz
DISTNAME= dtcyber20b1
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index be1f6ff8c03c..835859e117d7 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dynagen
PORTVERSION= 0.11.0
PORTREVISION= 3
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES= SF/dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION}
MAINTAINER= pavelivolkov@gmail.com
COMMENT= Text-based front end for Dynamips development version
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 421fb836f26a..bbeb64e06e31 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -5,8 +5,7 @@ PORTNAME= hatari
PORTVERSION= 1.8.0
PORTREVISION= 3
CATEGORIES= emulators
-MASTER_SITES= http://download.tuxfamily.org/hatari/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Atari ST emulator
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 8407d7057e64..1eb785da2977 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mtools
PORTVERSION= 4.0.10
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= mtools
+MASTER_SITES= GNU
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Collection of tools for manipulating MS-DOS files
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index ac7c18f8c051..7a3c3d6ee5f0 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -5,9 +5,9 @@ PORTNAME= mupen64plus
PORTVERSION?= 2.0
PORTREVISION?= 4
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
- ${MASTER_SITE_GOOGLE_CODE}:plugin \
+MASTER_SITES= GOOGLE_CODE \
+ LOCAL/acm/${PORTNAME} \
+ GOOGLE_CODE:plugin \
http://cdn.bitbucket.org/wahrhaft/${PORTNAME}${PKGNAMESUFFIX}/downloads/:plugin
PKGNAMESUFFIX?= -core
DIST_SUBDIR= ${PORTNAME}
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 5af4fd1de9db..a04a9b8b3a8f 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pcemu
PORTVERSION= 1.01b
PORTREVISION= 4
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= joerg
+MASTER_SITES= LOCAL/joerg
DISTNAME= pcemu1.01alpha
MAINTAINER= joerg@FreeBSD.org
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index c2e96a2b865d..4d2856d43ec1 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -5,9 +5,8 @@ PORTNAME= qemu
PORTVERSION= 0.11.1
PORTREVISION= 18
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
+MASTER_SITES= SAVANNAH \
http://bellard.org/qemu/
-MASTER_SITE_SUBDIR= qemu
DIST_SUBDIR= qemu
MAINTAINER= nox@FreeBSD.org
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 3c9706c2eefb..dfde0be106e9 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -5,7 +5,7 @@ PORTNAME= raine
PORTVERSION= 0.51.9
PORTREVISION= 3
CATEGORIES= emulators games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
DISTNAME= ${PORTNAME}s-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index a6298d1e8b21..2b5a7c0d8c7b 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -5,8 +5,7 @@ PORTNAME= uae
PORTVERSION= 0.8.29
PORTREVISION= 2
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= grembo
+MASTER_SITES= LOCAL/grembo
MAINTAINER= simond@irrelevant.org
COMMENT= Commodore Amiga emulator
diff --git a/emulators/virtio-kmod/Makefile b/emulators/virtio-kmod/Makefile
index d4169864e4d7..15c235571f4f 100644
--- a/emulators/virtio-kmod/Makefile
+++ b/emulators/virtio-kmod/Makefile
@@ -3,8 +3,7 @@
PORTNAME= virtio
PORTVERSION= 0.${SVN_REV}
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
PKGNAMESUFFIX= -kmod-${OSBRANCH}
DISTFILES= ${FILE_8} ${FILE_9}
diff --git a/emulators/vmsbackup/Makefile b/emulators/vmsbackup/Makefile
index a625f1d887b8..8144332647fb 100644
--- a/emulators/vmsbackup/Makefile
+++ b/emulators/vmsbackup/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 4.1.1
CATEGORIES= emulators sysutils
MASTER_SITES= http://dl.droso.net/FreeBSD/distfiles/ \
http://freebsd.t-hosting.hu/vmsbackup/ \
- ${MASTER_SITE_LOCAL:S/$/erwin\//}
+ LOCAL/erwin
DISTNAME= VMSBACKUP4-1-1
EXTRACT_SUFX= .ZIP
diff --git a/emulators/wxmupen64plus/Makefile b/emulators/wxmupen64plus/Makefile
index 223b778afbea..d52b809f1622 100644
--- a/emulators/wxmupen64plus/Makefile
+++ b/emulators/wxmupen64plus/Makefile
@@ -5,8 +5,8 @@ PORTNAME= wxmupen64plus
PORTVERSION= 0.3
PORTREVISION= 3
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
+MASTER_SITES= GOOGLE_CODE \
+ LOCAL/acm/${PORTNAME} \
http://cdn.bitbucket.org/auria/wxmupen64plus/downloads/
DIST_SUBDIR= ${PORTNAME:S/wx//}
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index b22dc8c8e9be..04b96157bfde 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -3,8 +3,7 @@
PORTNAME= skrooge
PORTVERSION= 1.10.0
CATEGORIES= finance kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}
+MASTER_SITES= KDE/stable/${PORTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE4 personal finance manager
diff --git a/french/aster/bsd.aster.mk b/french/aster/bsd.aster.mk
index fbbde54ca3c8..0204b9c780a0 100644
--- a/french/aster/bsd.aster.mk
+++ b/french/aster/bsd.aster.mk
@@ -6,8 +6,7 @@
DISTVERSIONPREFIX= full-src-
DISTVERSIONSUFFIX= .noarch
MASTER_SITES= http://www.code-aster.org/FICHIERS/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= thierry
+ LOCAL/thierry
DISTNAME= aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
DISTINFO_FILE= ${.CURDIR}/../../french/aster/distinfo
diff --git a/french/tvdownloader/Makefile b/french/tvdownloader/Makefile
index 4c83ad9d6423..de1d023fbcf5 100644
--- a/french/tvdownloader/Makefile
+++ b/french/tvdownloader/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tvdownloader
PORTVERSION= 0.7.2
PORTREVISION= 5
CATEGORIES= french multimedia
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR=
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= thierry@FreeBSD.org
COMMENT= Download podcasts and videos from French websites
diff --git a/ftp/atftp/Makefile b/ftp/atftp/Makefile
index d2a058274d6c..541f16839961 100644
--- a/ftp/atftp/Makefile
+++ b/ftp/atftp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= atftp
PORTVERSION= 0.7
PORTREVISION= 3
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/a/${PORTNAME}
+MASTER_SITES= DEBIAN/pool/main/a/${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}.dfsg.orig
MAINTAINER= kevlo@FreeBSD.org
diff --git a/ftp/ftpsesame/Makefile b/ftp/ftpsesame/Makefile
index 3fec9a1a18c6..35543c651e2a 100644
--- a/ftp/ftpsesame/Makefile
+++ b/ftp/ftpsesame/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ftpsesame
PORTVERSION= 0.95
CATEGORIES= ftp
MASTER_SITES= http://www.sentia.org/downloads/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= sem
+ LOCAL/sem
MAINTAINER= sem@FreeBSD.org
COMMENT= Helper for pf firewall to pass FTP protocol
diff --git a/ftp/gnustep-ftp/Makefile b/ftp/gnustep-ftp/Makefile
index 75481e1cf703..ca5241469bba 100644
--- a/ftp/gnustep-ftp/Makefile
+++ b/ftp/gnustep-ftp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ftp
PORTVERSION= 0.4
PORTREVISION= 2
CATEGORIES= ftp gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
PKGNAMEPREFIX= gnustep-
DISTNAME= FTP-${PORTVERSION}
diff --git a/ftp/mirror/Makefile b/ftp/mirror/Makefile
index 5a396577ee32..98efbee03459 100644
--- a/ftp/mirror/Makefile
+++ b/ftp/mirror/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 2
CATEGORIES= ftp
MASTER_SITES= ftp://sunsite.ualberta.ca/pub/Mirror/mirror/ \
http://komquats.com/distfiles/ \
- ${MASTER_SITE_LOCAL}/cy/
+ LOCAL/cy
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ftp.pl_wupatch
diff --git a/ftp/tftp-hpa/Makefile b/ftp/tftp-hpa/Makefile
index fd1d10f77c73..f97ab10f046f 100644
--- a/ftp/tftp-hpa/Makefile
+++ b/ftp/tftp-hpa/Makefile
@@ -3,8 +3,7 @@
PORTNAME= tftp-hpa
PORTVERSION= 5.2
CATEGORIES= ftp
-MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}
-MASTER_SITE_SUBDIR= software/network/tftp/tftp-hpa
+MASTER_SITES= KERNEL_ORG/software/network/tftp/tftp-hpa
MAINTAINER= brooks@FreeBSD.org
COMMENT= Advanced tftp server
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index bf7db04695d3..b0886d3c1e56 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= vsftpd
PORTVERSION= 3.0.2
CATEGORIES= ftp ipv6
MASTER_SITES= https://security.appspot.com/downloads/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index ec4f973340cc..7c124221071a 100644
--- a/games/abuse_sdl/Makefile
+++ b/games/abuse_sdl/Makefile
@@ -5,7 +5,7 @@ PORTNAME= abuse_sdl
PORTVERSION= 0.8
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://abuse.zoy.org/raw-attachment/wiki/download/
DISTNAME= abuse-${DISTVERSION}
diff --git a/games/an/Makefile b/games/an/Makefile
index f4ac104fcb90..06cb8fca8a7d 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -5,7 +5,7 @@ PORTNAME= an
PORTVERSION= 0.95
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index 0e0afc04dcfe..c92a2214a37c 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bugsx
PORTVERSION= 1.08
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= XCONTRIB/applications
DISTNAME= bugsx108
MAINTAINER= ports@FreeBSD.org
diff --git a/games/cardpics/Makefile b/games/cardpics/Makefile
index 8c8bb7507130..8fc6d1f4e1d1 100644
--- a/games/cardpics/Makefile
+++ b/games/cardpics/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cardpics
PORTVERSION= 0.4
CATEGORIES= games devel
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= thierry@FreeBSD.org
COMMENT= Free cards for your free card games!
diff --git a/games/crafty-open-enormous/Makefile b/games/crafty-open-enormous/Makefile
index 03bd914ce9de..4a9845f51542 100644
--- a/games/crafty-open-enormous/Makefile
+++ b/games/crafty-open-enormous/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crafty-open-enormous
PORTVERSION= 20070924
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= http://www.cis.uab.edu/hyatt/crafty/pgn/ \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://www.cis.uab.edu/hyatt/crafty/pgn/
DISTFILES= enormous.zip
EXTRACT_ONLY= ${DISTFILES}
diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile
index 63b708251077..cf661416b863 100644
--- a/games/crafty-open-large/Makefile
+++ b/games/crafty-open-large/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crafty-open-large
PORTVERSION= 20070909
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dd/crafty
+MASTER_SITES= LOCAL/dd/crafty
DISTFILES= large1.zip large2.zip large3.zip large4.zip
MAINTAINER= ports@FreeBSD.org
diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile
index c450acacdfe7..bc4b61a81253 100644
--- a/games/crafty-open-medium/Makefile
+++ b/games/crafty-open-medium/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crafty-open-medium
PORTVERSION= 20070909
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dd/crafty
+MASTER_SITES= LOCAL/dd/crafty
DISTNAME= medium
MAINTAINER= ports@FreeBSD.org
diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile
index 7f2ebd4566f2..3d39c1933580 100644
--- a/games/dmjava/Makefile
+++ b/games/dmjava/Makefile
@@ -5,9 +5,8 @@ PORTNAME= dmjava
PORTVERSION= 1.05
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/oliver \
http://chaos.zpc.cz/files/
-MASTER_SITE_SUBDIR= oliver
DISTNAME= dmj${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
diff --git a/games/doom-freedoom/Makefile b/games/doom-freedoom/Makefile
index e3eed18479f7..b2b205406587 100644
--- a/games/doom-freedoom/Makefile
+++ b/games/doom-freedoom/Makefile
@@ -4,8 +4,7 @@
PORTNAME= freedoom
PORTVERSION= 0.7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-iwad
+MASTER_SITES= SAVANNAH/${PORTNAME}/${PORTNAME}-iwad
PKGNAMEPREFIX= ${DMPKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-iwad-${PORTVERSION}
diff --git a/games/doom/Makefile b/games/doom/Makefile
index b6df2413fc97..6dccf7eec358 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -5,7 +5,7 @@ PORTNAME= doom
PORTVERSION= 1.10
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|source/|}
+MASTER_SITES= IDSOFTWARE/source
DISTNAME= doomsrc
MAINTAINER= ports@FreeBSD.org
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index d84b56ed9ba7..6b86d4f3a50b 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ensemblist
PORTVERSION= 040126
PORTREVISION= 10
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Assemble given shapes from primitives
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 58ed7c4c5dda..7e218d7c3e4f 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -5,7 +5,7 @@ PORTNAME= evq3
PORTVERSION= 1.3.20080810
PORTREVISION= 11
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|alepulver/|}
+MASTER_SITES= LOCAL/alepulver
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
pak-evq3.pk3 \
pak-5evq3.pk3
diff --git a/games/flying/Makefile b/games/flying/Makefile
index bd455b06f369..2a0d2dbd5e2c 100644
--- a/games/flying/Makefile
+++ b/games/flying/Makefile
@@ -5,8 +5,7 @@ PORTNAME= flying
PORTVERSION= 6.20
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= games/arcade
+MASTER_SITES= SUNSITE/games/arcade
MAINTAINER= ports@FreeBSD.org
COMMENT= Pool/snooker/billiards/carrom/etc game
diff --git a/games/fortunate/Makefile b/games/fortunate/Makefile
index 15162ea800f8..8de6344043a3 100644
--- a/games/fortunate/Makefile
+++ b/games/fortunate/Makefile
@@ -4,7 +4,7 @@ PORTNAME= fortunate
PORTVERSION= 3.1
PORTREVISION= 4
CATEGORIES= games gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH}
+MASTER_SITES= GNUSTEP_CH
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical front-end to the command-line BSD fortune
diff --git a/games/freeciv-sounds/Makefile b/games/freeciv-sounds/Makefile
index c2e399e4e43f..d94a8ec8956b 100644
--- a/games/freeciv-sounds/Makefile
+++ b/games/freeciv-sounds/Makefile
@@ -4,7 +4,7 @@
PORTNAME= freeciv
PORTVERSION= 3
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/
PKGNAMESUFFIX= -sounds
DISTNAME= stdsounds${DISTVERSION}
diff --git a/games/freedink-data/Makefile b/games/freedink-data/Makefile
index 71e21a452ef0..fb04355679d5 100644
--- a/games/freedink-data/Makefile
+++ b/games/freedink-data/Makefile
@@ -4,8 +4,7 @@
PORTNAME= freedink-data
PORTVERSION= 1.08.${PORTVER}
CATEGORIES= games
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= freedink
+MASTER_SITES= GNU/freedink
MAINTAINER= shurd@FreeBSD.org
COMMENT= Game data for games/freedink (Dink Smallwood)
diff --git a/games/freedink-dfarc/Makefile b/games/freedink-dfarc/Makefile
index dbae53253d4a..b06d1e96f5bb 100644
--- a/games/freedink-dfarc/Makefile
+++ b/games/freedink-dfarc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= freedink-dfarc
PORTVERSION= 3.12
CATEGORIES= games
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= freedink
+MASTER_SITES= GNU/freedink
DISTNAME= dfarc-${PORTVERSION}
MAINTAINER= shurd@FreeBSD.org
diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile
index 8fc242ed236e..53ab9b3523bf 100644
--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gnugo
PORTVERSION= 3.8
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= gnugo
+MASTER_SITES= GNU
MAINTAINER= spcoltri@omcl.org
COMMENT= The game of Go
diff --git a/games/gnushogi/Makefile.common b/games/gnushogi/Makefile.common
index 13278ffb7b90..c1cde15337f2 100644
--- a/games/gnushogi/Makefile.common
+++ b/games/gnushogi/Makefile.common
@@ -4,9 +4,8 @@
GNUSHOGI_PORTNAME= gnushogi
GNUSHOGI_PORTVERSION= 1.4.0
-GNUSHOGI_MASTER_SITES= ${MASTER_SITE_GNU}
+GNUSHOGI_MASTER_SITES= GNU/${GNUSHOGI_PORTNAME}
GNUSHOGI_DISTNAME= ${GNUSHOGI_PORTNAME}-${GNUSHOGI_PORTVERSION}
-GNUSHOGI_MASTER_SITE_SUBDIR= ${GNUSHOGI_PORTNAME}
USES= tar:bzip2
DISTINFO_FILE= ${.CURDIR}/../../games/gnushogi/distinfo
diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index 3261e2b57b84..248003dd38ca 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -3,8 +3,7 @@
PORTNAME= gtypist
PORTVERSION= 2.9.5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= naddy@FreeBSD.org
COMMENT= Interactive typing tutor
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 61450df6bc92..e54e53384f07 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ifm
PORTVERSION= 5.4
CATEGORIES= games tk
-MASTER_SITES= http://www.ifarchive.org/%SUBDIR%/
-MASTER_SITE_SUBDIR= if-archive/mapping-tools
+MASTER_SITES= http://www.ifarchive.org/if-archive/mapping-tools/
MAINTAINER= akosela@andykosela.com
COMMENT= Interactive Fiction mapper and walkthrough generator
diff --git a/games/ishido/Makefile b/games/ishido/Makefile
index ee446d26a99c..3094283c7350 100644
--- a/games/ishido/Makefile
+++ b/games/ishido/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ishido
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
MAINTAINER= ports@FreeBSD.org
COMMENT= Tile placement game
diff --git a/games/katawa-shoujo/Makefile b/games/katawa-shoujo/Makefile
index 4a267f136a60..acb89c3d15a6 100644
--- a/games/katawa-shoujo/Makefile
+++ b/games/katawa-shoujo/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 1.3
DISTVERSIONSUFFIX=-[linux-x86][FCF758CC]
CATEGORIES= games
MASTER_SITES= http://dl.katawa-shoujo.com/gold_${PORTVERSION}/:game \
- GENTOO/distfiles:icon
+ GENTOO:icon
DISTFILES= [4ls]_${PORTNAME:S|-|_|}_${PORTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}:game \
${PORTNAME}-48.png:icon \
${PORTNAME}-256.png:icon
diff --git a/games/libggz/bsd.ggz.mk b/games/libggz/bsd.ggz.mk
index d4d94d584480..3ef94ffc6cb0 100644
--- a/games/libggz/bsd.ggz.mk
+++ b/games/libggz/bsd.ggz.mk
@@ -5,9 +5,8 @@
GGZ_VERSION= 0.0.14.1
MASTER_SITES= \
- http://mirrors.dotsrc.org/ggzgamingzone/ggz/%SUBDIR%/ \
- http://ftp.ggzgamingzone.org/pub/ggz/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+ http://mirrors.dotsrc.org/ggzgamingzone/ggz/${PORTVERSION}/ \
+ http://ftp.ggzgamingzone.org/pub/ggz/${PORTVERSION}/
DIST_SUBDIR= ggz
# components section
diff --git a/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile
index 33fbe6d16fed..a9d7327e3761 100644
--- a/games/libmaitretarot/Makefile
+++ b/games/libmaitretarot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libmaitretarot
PORTVERSION= 0.1.98
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Core library of MaitreTarot, a Tarot card game
diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile
index 89b3d901fa9b..d945aa5c8090 100644
--- a/games/libmt_client/Makefile
+++ b/games/libmt_client/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libmt_client
PORTVERSION= 0.1.98
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Client-side library of MaitreTarot, a Tarot card game
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index 51de889a017a..4f538f87c4c2 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -5,8 +5,7 @@ PORTNAME= doom3
PORTVERSION= 1.3.1.1304
PORTEPOCH= 1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR= doom3/linux
+MASTER_SITES= IDSOFTWARE/doom3/linux
PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-linux-${PORTVERSION}.x86
EXTRACT_SUFX= .run
@@ -29,7 +28,7 @@ SUB_FILES= doom3 doom3-ded pkg-message pkg-deinstall
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNO_CDKEY}
-MASTER_SITE_SUBDIR= doom3/linux/old
+MASTER_SITES= IDSOFTWARE/doom3/linux/old
PORTVERSION= 1.1.1286
PORTEPOCH= 0
PLIST_SUB+= NEW="@comment "
diff --git a/games/linux-enemyterritory-shrub/Makefile b/games/linux-enemyterritory-shrub/Makefile
index 48e2231b3de6..8a4acb7ed8ce 100644
--- a/games/linux-enemyterritory-shrub/Makefile
+++ b/games/linux-enemyterritory-shrub/Makefile
@@ -5,8 +5,7 @@ PORTNAME= shrub
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
PKGNAMEPREFIX= linux-enemyterritory-
DISTNAME= 1.2-test13-l
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index a5a0f5c5835e..6425073ff0ef 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -5,8 +5,8 @@ PORTNAME= enemyterritory
PORTVERSION= 2.60b
PORTREVISION= 3
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|et/:patch|} \
- ${MASTER_SITE_IDSOFTWARE:S|$|et/linux/:full|}
+MASTER_SITES= IDSOFTWARE/et/:patch \
+ IDSOFTWARE/et/linux/:full
PKGNAMEPREFIX= linux-
DISTNAME= et-linux-2.60b.x86
DISTFILES= et-linux-2.60.x86.run:full ET-2.60b.zip:patch
diff --git a/games/linux-etqw-demo-server/Makefile b/games/linux-etqw-demo-server/Makefile
index 1f3d1c7e1ed9..b9c8da4893e1 100644
--- a/games/linux-etqw-demo-server/Makefile
+++ b/games/linux-etqw-demo-server/Makefile
@@ -4,7 +4,7 @@
PORTNAME= etqw
PORTVERSION= 2.0.r1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|etqw/|}
+MASTER_SITES= IDSOFTWARE/etqw
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -demo-server
DISTNAME= ETQW-demo2-server-full.r1.x86
diff --git a/games/linux-etqw-server/Makefile b/games/linux-etqw-server/Makefile
index fe8fe499bff6..ebd2eb7b6b50 100644
--- a/games/linux-etqw-server/Makefile
+++ b/games/linux-etqw-server/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= games linux
MASTER_SITES= http://ftp.4players.de/pub/hosted/wolfenstein/users/etqw/server/ \
ftp://ftp0.uk.multiplay.co.uk/pub/games/fps/enemyterritory_quakewars/server/linux/ \
ftp://ftp0.nl.multiplay.co.uk/pub/games/fps/enemyterritory_quakewars/server/linux/ \
- ${MASTER_SITE_IDSOFTWARE:S|$|etqw/|}
+ IDSOFTWARE/etqw
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -server
DISTNAME= ETQW${PKGNAMESUFFIX}-1.5-full.x86
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index ca75854b6cb2..64091054c5bc 100644
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -5,7 +5,7 @@ PORTNAME= quake3
DISTVERSION= 1.11-6
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -demo
DISTNAME= linuxq3ademo-${DISTVERSION}.x86
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index d5b2867b9b17..5563c6bdd9aa 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -4,8 +4,8 @@
PORTNAME= quake3
PORTVERSION= 1.32c
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|quake3/linux/:data|} \
- ${MASTER_SITE_IDSOFTWARE:S|$|quake3/:patch|}
+MASTER_SITES= IDSOFTWARE/quake3/linux/:data \
+ IDSOFTWARE/quake3/:patch
PKGNAMEPREFIX= linux-
DISTFILES= ${Q3DATAFILE}:data \
${Q3PATCHFILE}:patch
diff --git a/games/linux-quake4-demo/Makefile b/games/linux-quake4-demo/Makefile
index c32c76bda4d3..78185c8b537a 100644
--- a/games/linux-quake4-demo/Makefile
+++ b/games/linux-quake4-demo/Makefile
@@ -5,7 +5,7 @@ PORTNAME= quake4
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= games linux
-MASTER_SITES= IDSOFTWARE/${PORTNAME}/demo GENTOO/distfiles
+MASTER_SITES= IDSOFTWARE/${PORTNAME}/demo GENTOO
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -demo
DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}${PKGNAMESUFFIX}.x86
diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index 8229e700d1c4..c9fd30632e08 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -6,8 +6,8 @@ PORTVERSION= 1.4.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|quake4/linux/|} \
- ${MASTER_SITE_GENTOO:S|$|distfiles/|}
+MASTER_SITES= IDSOFTWARE/quake4/linux/ \
+ GENTOO
PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}.x86
EXTRACT_SUFX= .run
diff --git a/games/linux-rtcw/Makefile b/games/linux-rtcw/Makefile
index 55fe0a05fc4b..ffcfd24e36fb 100644
--- a/games/linux-rtcw/Makefile
+++ b/games/linux-rtcw/Makefile
@@ -5,8 +5,7 @@ PORTNAME= rtcw
DISTVERSION= 1.41b
PORTREVISION= 2
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR= wolf/linux
+MASTER_SITES= IDSOFTWARE/wolf/linux
PKGNAMEPREFIX= linux-
DISTNAME= wolf-linux-${DISTVERSION}.x86
EXTRACT_SUFX= .run
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index 6b15126b0207..a0ef2d21a5ad 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= ut2003-demo
PORTVERSION= 2206
CATEGORIES= games linux
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
PKGNAMEPREFIX= linux-
DISTNAME= ut2003demo-lnx-${PORTVERSION}
EXTRACT_SUFX= .sh.bin
diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index ae2387660389..5b7830373d53 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 5.6.4
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://liquidwar.sunsite.dk/archive/ \
- ${MASTER_SITE_SAVANNAH} \
+ SAVANNAH \
http://ufoot.hd.free.fr/pub/archive/
-MASTER_SITE_SUBDIR= liquidwar
MAINTAINER= edwin@mavetju.org
COMMENT= You control an army of liquid and have to try and eat your opponents
diff --git a/games/maitretarot/Makefile b/games/maitretarot/Makefile
index 00258e6420d3..acefe998fdd9 100644
--- a/games/maitretarot/Makefile
+++ b/games/maitretarot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= maitretarot
PORTVERSION= 0.1.98
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= thierry@FreeBSD.org
COMMENT= Server side of MaitreTarot, a Tarot card game
diff --git a/games/mt_dolphin_ia/Makefile b/games/mt_dolphin_ia/Makefile
index a7f2784543fe..b91c192640ea 100644
--- a/games/mt_dolphin_ia/Makefile
+++ b/games/mt_dolphin_ia/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mt_dolphin_ia
PORTVERSION= 0.1.98
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Basic AI for MaitreTarot, a Tarot card game
diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile
index dbed834954d8..50df3fc4b9f4 100644
--- a/games/mt_gtk_client/Makefile
+++ b/games/mt_gtk_client/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mt_gtk_client
PORTVERSION= 0.1.98
PORTREVISION= 11
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= GTK+ client for MaitreTarot, a Tarot card game
diff --git a/games/nehquake/Makefile b/games/nehquake/Makefile
index 79e1e32e94b8..fc7829888ffc 100644
--- a/games/nehquake/Makefile
+++ b/games/nehquake/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nehquake
PORTVERSION= 1.0
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
DISTNAME= NehQuake-bjp-bin-src.linux
MAINTAINER= ports@FreeBSD.org
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index eb69d33ac504..3c817b29e8f9 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= games
MASTER_SITES= SF/${TRUEPORTNAME}/${TRUEPORTNAME}/3.2.2
DISTNAME= nethack-322
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:C/%SUBDIR%/${TRUEPORTNAME}\/${TRUEPORTNAME}\/${PORTVERSION}/}
+PATCH_SITES= SOURCEFORGE/${TRUEPORTNAME}/${TRUEPORTNAME}/${PORTVERSION}
PATCHFILES= nh-3.2.2-3.2.3.diff
MAINTAINER= glewis@FreeBSD.org
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 4b8121fe5a98..e5f25f2901b8 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -53,13 +53,13 @@ CFLAGS+= -DMENU_COLOR_REGEX_POSIX
.if defined(WITH_STATUSCOLORS)
PATCHFILES+= nh343-statuscolors.fixed.patch
PATCH_SITES+= http://jdc.koitsu.org/nethack/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|wxs|}
+ LOCAL/wxs
PATCH_DIST_STRIP= -p1
.endif
.if defined(WITH_HPMON)
PATCHFILES+= hpmon.diff
PATCH_SITES+= http://www.netsonic.fi/~walker/nh/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|wxs|}
+ LOCAL/wxs
PATCH_DIST_STRIP= -p1
CFLAGS+= -DHPMON
.endif
diff --git a/games/oldrunner/Makefile b/games/oldrunner/Makefile
index 897294c153a5..9849dc1565c4 100644
--- a/games/oldrunner/Makefile
+++ b/games/oldrunner/Makefile
@@ -4,8 +4,7 @@
PORTNAME= oldrunner
PORTVERSION= 20120131
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= culot
+MASTER_SITES= LOCAL/culot
MAINTAINER= culot@FreeBSD.org
COMMENT= Textmode remake of Broderbund's LodeRunner
diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile
index 662a5224b12a..6811c1a71819 100644
--- a/games/oonsoo/Makefile
+++ b/games/oonsoo/Makefile
@@ -5,9 +5,8 @@ PORTNAME= oonsoo
PORTVERSION= 1.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/games/solitaires \
http://www4.ncsu.edu/~bwmott/www/oonsoo/distributions/
-MASTER_SITE_SUBDIR= games/solitaires
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/games/p5-Acme-GuessNumber/Makefile b/games/p5-Acme-GuessNumber/Makefile
index f34ab8016302..0e6539843b87 100644
--- a/games/p5-Acme-GuessNumber/Makefile
+++ b/games/p5-Acme-GuessNumber/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Acme-GuessNumber
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= games perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/IMACAT
+MASTER_SITES= CPAN/Locale/IMACAT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/games/pycadia/Makefile b/games/pycadia/Makefile
index ca247f966dc4..d006c3c939f2 100644
--- a/games/pycadia/Makefile
+++ b/games/pycadia/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pycadia
PORTVERSION= 0.5.1
PORTREVISION= 6
CATEGORIES= games python
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
SF/nemysisfreebsdp/games/
DIST_SUBDIR= python
diff --git a/games/quake-data/Makefile b/games/quake-data/Makefile
index 31f1c08083b8..7867d8f93190 100644
--- a/games/quake-data/Makefile
+++ b/games/quake-data/Makefile
@@ -38,7 +38,7 @@ PLIST_FILES+= %%DATADIR%%/id1/pak1.pak
.endif
.if ${PORT_OPTIONS:MQW_DATA} || ${PORT_OPTIONS:MQW_SKINS}
-MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|}
+MASTER_SITES+= IDSOFTWARE/quakeworld/unix/:qw
DISTFILES+= ${PROGFILE}:qw
EXTRACT_ONLY+= ${PROGFILE}
COMMENT:= ${COMMENT:S,Quake,& and &World,}
@@ -48,7 +48,7 @@ PLIST_SUB+= QUAKEWORLD="@comment "
.endif
.if ${PORT_OPTIONS:MQW_SKINS}
-MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/skins/:skins|}
+MASTER_SITES+= IDSOFTWARE/quakeworld/skins/:skins
DISTFILES+= ${SKINFILES:S/$/:skins/}
PLIST_SUB+= QUAKEWORLD_SKINS=""
COMMENT+= and skins
diff --git a/games/quake-source/Makefile b/games/quake-source/Makefile
index ce553a881142..fa5c9d98ace6 100644
--- a/games/quake-source/Makefile
+++ b/games/quake-source/Makefile
@@ -26,7 +26,7 @@ QUAKEWORLD_DESC= Install QuakeWorld game source
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQUAKEWORLD}
-MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|}
+MASTER_SITES+= IDSOFTWARE/quakeworld/unix/:qw
DISTFILES+= qwsv-2.30-glibc-i386-unknown-linux2.0${EXTRACT_SUFX}:qw
COMMENT:= ${COMMENT:S/Quake/& and QuakeWorld/}
PLIST_SUB+= QUAKEWORLD=""
diff --git a/games/quake2-source/Makefile b/games/quake2-source/Makefile
index ec91bc9fc443..037fb918de68 100644
--- a/games/quake2-source/Makefile
+++ b/games/quake2-source/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 3.21
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://offload1.icculus.org/quake2/files/:icc \
- ${MASTER_SITE_IDSOFTWARE:S|$|quake2/source/:id|}
+ IDSOFTWARE/quake2/source/:id
PKGNAMEPREFIX= quake2-
DISTNAME= quake2-r0.16.2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:icc
diff --git a/games/quake3/Makefile b/games/quake3/Makefile
index c2169387c04f..cc95ade64234 100644
--- a/games/quake3/Makefile
+++ b/games/quake3/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= games
MASTER_SITES= ftp://mancubus.net/pub/idgames/idstuff/source/ \
http://ftp.mancubus.net/pub/idgames/idstuff/source/ \
http://www.gamers.org/pub/idgames/idstuff/source/ \
- ${MASTER_SITE_IDSOFTWARE:S|$|source/|}
+ IDSOFTWARE/source/
DISTNAME= ${PORTNAME}-${REALVERSION}-source
MAINTAINER= shirshegsm@gmail.com
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 2eb63bf7af2b..1cf8464b85fa 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -6,7 +6,6 @@ DISTVERSION= 1.7.0
PORTREVISION= 3
CATEGORIES= games emulators
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${DISTVERSION}
MAINTAINER= lme@FreeBSD.org
COMMENT= Interpreter for several adventure games
diff --git a/games/senken/Makefile b/games/senken/Makefile
index ccaf3f6133e3..8f18cc0b2347 100644
--- a/games/senken/Makefile
+++ b/games/senken/Makefile
@@ -5,7 +5,7 @@ PORTNAME= senken
PORTVERSION= 0.3.0
PORTREVISION= 15
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= City simulation game
diff --git a/games/sokoban/Makefile b/games/sokoban/Makefile
index 7df317bac0bd..d6974081aa50 100644
--- a/games/sokoban/Makefile
+++ b/games/sokoban/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sokoban
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
DISTNAME= ${PORTNAME}-src
MAINTAINER= lifanov@mail.lifanov.com
diff --git a/games/supertux-devel/Makefile b/games/supertux-devel/Makefile
index 4f2ffda505e7..f912f366504d 100644
--- a/games/supertux-devel/Makefile
+++ b/games/supertux-devel/Makefile
@@ -4,7 +4,7 @@ PORTNAME= supertux
PORTVERSION= 0.3.4
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -devel
MAINTAINER= makc@FreeBSD.org
diff --git a/games/supertux/Makefile b/games/supertux/Makefile
index 06f023331ade..84d04cbaf8d7 100644
--- a/games/supertux/Makefile
+++ b/games/supertux/Makefile
@@ -5,7 +5,7 @@ PORTNAME= supertux
PORTVERSION= 0.1.3
PORTREVISION= 12
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= makc@FreeBSD.org
COMMENT= Side-scroller game similar to Super Mario Brothers
diff --git a/games/timeseal/Makefile b/games/timeseal/Makefile
index 441b9247f4d6..02509db6bf78 100644
--- a/games/timeseal/Makefile
+++ b/games/timeseal/Makefile
@@ -4,8 +4,7 @@
PORTNAME= timeseal
PORTVERSION= 1.0
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jylefort
+MASTER_SITES= LOCAL/jylefort
DISTFILES= timeseal.BSD386-1.0-i386
EXTRACT_ONLY=
diff --git a/games/tractorgen/Makefile b/games/tractorgen/Makefile
index 2750b06db145..8e76501d38d2 100644
--- a/games/tractorgen/Makefile
+++ b/games/tractorgen/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.31.7
PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.vergenet.net/~conrad/software/tractorgen/dl/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= robin@15augustus.nl
COMMENT= Generates ASCII tractors
diff --git a/games/tycho/Makefile b/games/tycho/Makefile
index 7b41357ec687..fe2ea4a5799a 100644
--- a/games/tycho/Makefile
+++ b/games/tycho/Makefile
@@ -4,8 +4,7 @@
PORTNAME= tycho
PORTVERSION= 0.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
DISTNAME= redcoder
MAINTAINER= ports@FreeBSD.org
diff --git a/games/wmquake/Makefile b/games/wmquake/Makefile
index da44fd88b8c2..ba304ca7f62c 100644
--- a/games/wmquake/Makefile
+++ b/games/wmquake/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= ports@FreeBSD.org
COMMENT= Id Software's Quake I in a 64x64 WM dockapp window
diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile
index 002b7fa13a49..a6d7ec5e5f07 100644
--- a/games/wolfpack/Makefile
+++ b/games/wolfpack/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wolfpack
PORTVERSION= 4.3.32
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= empserver/${DISTNAME}
+MASTER_SITES= SF/empserver/${DISTNAME}
DISTNAME= empire-${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile
index 3c108f852f7e..89b954a1d941 100644
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.2.20080621
PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/:full,update \
- ${MASTER_SITE_LOCAL:S|$|alepulver/:source|}
+ LOCAL/alepulver/:source
DISTFILES= worldofpadman.run:full \
wop_patch_1_2.run:update \
${SRC_FILE}.tar.bz2:source
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index a43e0da5639e..f26ce82ded4a 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xbat
PORTVERSION= 1.11
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
DISTNAME= xev111
MAINTAINER= turutani@scphys.kyoto-u.ac.jp
diff --git a/games/xbattle/Makefile b/games/xbattle/Makefile
index ce7df87cf5c4..591982d98ef7 100644
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xbattle
PORTVERSION= 5.4.1
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
${PORTNAME}_icons${EXTRACT_SUFX}:icons
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index 3339d921168e..e9ef53ff0253 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xblackjack
PORTVERSION= 2.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= X11/Motif blackjack game
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index cbdb4ebe98b0..9b32ff53af81 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xboing
PORTVERSION= 2.4
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 8f9bdeb2c11a..ae79f2b5ba7e 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xbubble
PORTVERSION= 0.5.8
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Puzzle Bobble clone for Unix/X11 platforms
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
index e4678a28f3ae..e6ac777bb6d5 100644
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xcubes
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Cube puzzle for X11
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index adb7339f0f72..23ab69964003 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -5,9 +5,8 @@ PORTNAME= xdemineur
PORTVERSION= 2.1.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
+MASTER_SITES= XCONTRIB/games \
http://www.babafou.eu.org/xdemineur/
-MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
COMMENT= Another minesweeper game for the X Window System
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
index 64c313b0c954..3ff551ed9856 100644
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xdino
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Dino puzzle game for X11
diff --git a/games/xhexagons/Makefile b/games/xhexagons/Makefile
index 7fbe7c56e116..ec5b88706b71 100644
--- a/games/xhexagons/Makefile
+++ b/games/xhexagons/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xhexagons
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Hexagons puzzle (similar to Fifteen Puzzle) for X Window System
diff --git a/games/xisola/Makefile b/games/xisola/Makefile
index c6285cf85396..d159ecc97edb 100644
--- a/games/xisola/Makefile
+++ b/games/xisola/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xisola
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple board game for X Window System
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index 739f8f853cd8..dac0ec69ad63 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xjig
PORTVERSION= 2.4
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= Jigsaw puzzle game for X11
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index b0dca2dba32e..d37b41f5dc34 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xjump
PORTVERSION= 2.7.5
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile
index 34ec6ee4e1c5..8877079d680c 100644
--- a/games/xkoules/Makefile
+++ b/games/xkoules/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.4
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.ucw.cz/~hubicka/koules/packages/ \
- GENTOO/distfiles \
+ GENTOO \
SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons
DISTFILES= ${PORTNAME:S/x//}${PORTVERSION}-src${EXTRACT_SUFX} \
${PORTNAME:S/x//}.png:icons
diff --git a/games/xlaby/Makefile b/games/xlaby/Makefile
index 3ede391545c3..343b2ca844e7 100644
--- a/games/xlaby/Makefile
+++ b/games/xlaby/Makefile
@@ -5,9 +5,8 @@ PORTNAME= xlaby
PORTVERSION= 2.0.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/games/strategy \
ftp://quatramaran.ens.fr/pub/madore/xlaby/
-MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= ports@FreeBSD.org
COMMENT= Daemonic X Labyrinth played directly with the mouse pointer
diff --git a/games/xmball/Makefile b/games/xmball/Makefile
index 39ff0c57c17d..4093c4ab5a51 100644
--- a/games/xmball/Makefile
+++ b/games/xmball/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmball
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Masterball puzzle for X Window System
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 4cff8ab4d026..2e59e05d728c 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmille
PORTVERSION= 2.0
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xmines/Makefile b/games/xmines/Makefile
index 0b1bcf10df75..471794d6fcbb 100644
--- a/games/xmines/Makefile
+++ b/games/xmines/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmines
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xmlink/Makefile b/games/xmlink/Makefile
index 696ec9a88c44..4131d63435fb 100644
--- a/games/xmlink/Makefile
+++ b/games/xmlink/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmlink
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Missing Link puzzle for X Window System
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index ed3f8877f6db..04832c9d18b6 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xoct/Makefile b/games/xoct/Makefile
index aa4e4c5c1842..4383136bb0a7 100644
--- a/games/xoct/Makefile
+++ b/games/xoct/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xoct
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Oct puzzle for X Window System
diff --git a/games/xoids/Makefile b/games/xoids/Makefile
index 2c8e1dc5b66d..8fd94af7e34e 100644
--- a/games/xoids/Makefile
+++ b/games/xoids/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xoids
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= X Window Asteroids style game with full color pixmaps
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index c07502283c3c..1f466f81130a 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xoj
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/demos
+MASTER_SITES= SUNSITE/X11/demos
MAINTAINER= ports@FreeBSD.org
COMMENT= O. J. Simpson Simulator root window demo
diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile
index 428edd55685b..1edb3866e3c9 100644
--- a/games/xosmulti/Makefile
+++ b/games/xosmulti/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xosmulti
PORTVERSION= 1.00
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= flathill
+MASTER_SITES= LOCAL/flathill
DISTNAME= ${PORTNAME}_${PORTVERSION}_tar
EXTRACT_SUFX= .gz
diff --git a/games/xpanex/Makefile b/games/xpanex/Makefile
index c553c8f55cdf..da8d5d8a0783 100644
--- a/games/xpanex/Makefile
+++ b/games/xpanex/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpanex
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Panex puzzle for X Window System
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index a1062c97e43f..b9e6cb0e18ec 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpipeman
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xpyraminx/Makefile b/games/xpyraminx/Makefile
index 7f8a3da4ca89..e41d11ed5dab 100644
--- a/games/xpyraminx/Makefile
+++ b/games/xpyraminx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpyraminx
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Pyraminx puzzle for X Window System
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
index d6da8b88e483..3bb5fa51ca65 100644
--- a/games/xrubik/Makefile
+++ b/games/xrubik/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xrubik
PORTVERSION= 5.5.2
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= X-based rubik's cube(tm)
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index d0b605321fc1..ca8aefaa2a00 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xshisen
PORTVERSION= 1.51
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
MAINTAINER= turutani@scphys.kyoto-u.ac.jp
COMMENT= Shisen-sho puzzle game for X11
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index c680a97ddc93..aa1a1d4ff7a5 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xshogi
PORTVERSION= 1.4.2
CATEGORIES= games
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= gnushogi
+MASTER_SITES= GNU/gnushogi
MAINTAINER= johans@FreeBSD.org
COMMENT= Japanese chess-like game for X Window System
diff --git a/games/xskewb/Makefile b/games/xskewb/Makefile
index 32c2a505c5a7..700fb7441403 100644
--- a/games/xskewb/Makefile
+++ b/games/xskewb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xskewb
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Skewb puzzle (similar to Rubik's Cube) for X Window
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index e9cb756a4dfa..33101d6e8e66 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtic
PORTVERSION= 1.12
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xtriangles/Makefile b/games/xtriangles/Makefile
index db0ba2bbc6dc..3bd32cb6ad12 100644
--- a/games/xtriangles/Makefile
+++ b/games/xtriangles/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtriangles
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Triangles puzzle
diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index aaca49e2b0ea..ce19ba4825bb 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtruco
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/german/alt-aspell/Makefile b/german/alt-aspell/Makefile
index 26ca70482e58..bf1b01e34350 100644
--- a/german/alt-aspell/Makefile
+++ b/german/alt-aspell/Makefile
@@ -6,8 +6,7 @@ DISTVERSION= 6-de-alt-2.1-1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= german textproc
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= aspell/dict/de-alt
+MASTER_SITES= GNU/aspell/dict/de-alt
MAINTAINER= office@FreeBSD.org
COMMENT= Aspell German Old Spelling (Deutsch - alte Rechtschreibung) dictionary
diff --git a/german/bugzilla44/Makefile b/german/bugzilla44/Makefile
index d81edf33af46..9d95b94704ef 100644
--- a/german/bugzilla44/Makefile
+++ b/german/bugzilla44/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bugzilla
PORTVERSION= 4.4.6
PORTREVISION= 2
CATEGORIES= german
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
+MASTER_SITES= SF/bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
DISTNAME= germzilla-${PORTVERSION}-1.utf-8
MAINTAINER= bz-ports@FreeBSD.org
diff --git a/graphics/4va/Makefile b/graphics/4va/Makefile
index bb6e9e5fe8e6..53a5608ad704 100644
--- a/graphics/4va/Makefile
+++ b/graphics/4va/Makefile
@@ -5,14 +5,13 @@ PORTNAME= 4va
PORTVERSION= 1.21
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/X
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SUNSITE/apps/graphics/hacks/X
MAINTAINER= ports@FreeBSD.org
COMMENT= Four-Dimensional graphics tumbler for X11
USE_XORG= x11
+USES= tar:tgz
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CLIBS="-lm -lX11 -L${LOCALBASE}/lib"
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index f02434f29192..ccea1e3c8089 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -8,7 +8,6 @@ PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast image processing tools based on ImageMagick
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index 2cd24bd640d2..490ade65554d 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.3.3
PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.su.se/pub/lunar/source-archive/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast pixel formats conversion library
diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index aa3769232df5..4c1f6fd49b53 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= SciPlot
PORTVERSION= 1.36
PORTREVISION= 4
CATEGORIES= graphics math
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= widgets
+MASTER_SITES= XCONTRIB/widgets
MAINTAINER= thierry@FreeBSD.org
COMMENT= Full-featured Xt widget to display 2D data in a graph
diff --git a/graphics/acidwarp/Makefile b/graphics/acidwarp/Makefile
index 26a3085835c7..0c8dec9b2faf 100644
--- a/graphics/acidwarp/Makefile
+++ b/graphics/acidwarp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= acidwarp
PORTVERSION= 1.0
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/svgalib
+MASTER_SITES= SUNSITE/apps/graphics/hacks/svgalib
MAINTAINER= swills@FreeBSD.org
COMMENT= SVGAlib demo which displays trippy mathematical images in cycling colors
diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index e0d58486e407..a1f86cd604a6 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -4,8 +4,7 @@
PORTNAME= barcode
PORTVERSION= 0.98
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= barcode
+MASTER_SITES= GNU
MAINTAINER= jev@ecad.org
COMMENT= A barcode generation library along with a command line frontend
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 4439b13eebb9..e5829ebcc76f 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cal3d
PORTVERSION= 20060720
PORTREVISION= 4
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= acm/${PORTNAME}
+MASTER_SITES= LOCAL/acm/${PORTNAME}
PKGNAMESUFFIX= -devel
DIST_SUBDIR= ${PORTNAME}
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index e20713f14ef6..6b14e5849f85 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cegui
PORTVERSION= 0.8.4
CATEGORIES= graphics devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= crayzedsgui/CEGUI%20Mk-2/0.8
+MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.8
MAINTAINER= oliver@FreeBSD.org
COMMENT= Library providing windowing and widgets for graphics APIs
diff --git a/graphics/dc20pack/Makefile b/graphics/dc20pack/Makefile
index fe04ea9b8740..018f0d4fc624 100644
--- a/graphics/dc20pack/Makefile
+++ b/graphics/dc20pack/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dc20pack
PORTVERSION= 1.0
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/capture
+MASTER_SITES= SUNSITE/apps/graphics/capture
MAINTAINER= maurice@castro.aus.net
COMMENT= Digital camera control and download tool for Kodak DC20/25 camera
diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile
index 9f32d0f5df0f..d4b2b922bc46 100644
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dmtx-utils
PORTVERSION= 0.7.4
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=libdmtx/libdmtx/${PORTVERSION}
+MASTER_SITES= SF/libdmtx/libdmtx/${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
COMMENT= Software for reading and writing Data Matrix barcodes
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index d1ec3dcef057..537aac1d3363 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= driconf
PORTVERSION= 0.9.1
PORTREVISION= 10
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/d/${PORTNAME}
+MASTER_SITES= DEBIAN
DISTFILES= ${PORTNAME}_${PORTVERSION}.orig.tar.gz
MAINTAINER= lichray@gmail.com
diff --git a/graphics/flasm/Makefile b/graphics/flasm/Makefile
index 9f98c85a601b..de3299d1256f 100644
--- a/graphics/flasm/Makefile
+++ b/graphics/flasm/Makefile
@@ -3,9 +3,8 @@
PORTNAME= flasm
PORTVERSION= 1.62
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/kuriyama \
http://www.nowrap.de/download/
-MASTER_SITE_SUBDIR= kuriyama
DISTNAME= flasm16src
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index de9e7bcb1b0f..9c2e30b1e635 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -5,8 +5,7 @@ PORTNAME= g2
PORTVERSION= 0.40
PORTREVISION= 9
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/graphics
+MASTER_SITES= SUNSITE/libs/graphics
MAINTAINER= ports@FreeBSD.org
COMMENT= Easy to use, portable, and powerful 2D graphics library
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 4a538f0b09cd..5cbb27286042 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -6,7 +6,7 @@ PORTNAME= gdk-pixbuf
PORTVERSION= 0.22.0
PORTREVISION= 17
CATEGORIES= graphics
-MASTER_SITES= GNOME/sources/gdk-pixbuf/0.22
+MASTER_SITES= GNOME
DISTNAME= gdk-pixbuf-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index d7ab985eb8df..f3c98d2f3870 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.8.14
PORTREVISION?= 2
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
-MASTER_SITES= GIMP
-MASTER_SITE_SUBDIR= gimp/v${PORTVERSION:R}
+MASTER_SITES= GIMP/gimp/v${PORTVERSION:R}
DISTNAME= gimp-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 795603589490..17ea6ae68ccc 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.3.3
DISTVERSIONPREFIX= 2-
PORTREVISION= 5
CATEGORIES= graphics gnome
-MASTER_SITES= ${MASTER_SITE_GNU_ALPHA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU_ALPHA
MAINTAINER= ports@FreeBSD.org
COMMENT= Small-scale painting program for GNOME
diff --git a/graphics/graphos/Makefile b/graphics/graphos/Makefile
index be41bc0c3eba..a7b305f903fc 100644
--- a/graphics/graphos/Makefile
+++ b/graphics/graphos/Makefile
@@ -4,8 +4,7 @@ PORTNAME= graphos
PORTVERSION= 0.5
PORTREVISION= 2
CATEGORIES= graphics gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= Graphos-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index eaaa5dd0c28e..298735731d8f 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gtk-update-icon-cache
PORTVERSION= 2.24.27
CATEGORIES= graphics
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 53415040d0b2..d20ba1c6b00b 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.4.6
PORTREVISION= 6
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
+MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT= The next generation graphics library for Enlightenment
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index f997af077e84..8ba327f10f31 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.4.6
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
+MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT= Extra image loader plugins for Imlib 2
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 8a783c8d8483..d49b586415c5 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.900.1
PORTREVISION= 14
CATEGORIES= graphics
MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \
- ${MASTER_SITE_IMAGEMAGICK}
-MASTER_SITE_SUBDIR= ImageMagick/delegates
+ ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Implementation of the codec specified in the JPEG-2000 standard
@@ -23,9 +22,6 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-shared --enable-static
USE_LDCONFIG= yes
-MASTER_SITE_IMAGEMAGICK= \
- ftp://ftp.imagemagick.org/pub/%SUBDIR%/
-
OPTIONS_DEFINE= OPENGL UUID DOCS
UUID_DESC= UUID support (required by GDAL)
diff --git a/graphics/jpgtn/Makefile b/graphics/jpgtn/Makefile
index 491f640a3414..c6af00e63482 100644
--- a/graphics/jpgtn/Makefile
+++ b/graphics/jpgtn/Makefile
@@ -5,8 +5,7 @@ PORTNAME= jpgtn
PORTVERSION= 2.06
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/misc
+MASTER_SITES= SUNSITE/apps/graphics/misc
MAINTAINER= ports@FreeBSD.org
COMMENT= Creates thumbnails of JPEG images
diff --git a/graphics/liblug/Makefile b/graphics/liblug/Makefile
index 99285acb1f76..3378cf2ba601 100644
--- a/graphics/liblug/Makefile
+++ b/graphics/liblug/Makefile
@@ -5,8 +5,7 @@ PORTNAME= liblug
PORTVERSION= 1.0.6
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/graphics
+MASTER_SITES= SUNSITE/libs/graphics
MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-format graphics manipulation library
diff --git a/graphics/linplasma/Makefile b/graphics/linplasma/Makefile
index cd0766023c83..eb87ea3b3d42 100644
--- a/graphics/linplasma/Makefile
+++ b/graphics/linplasma/Makefile
@@ -5,8 +5,7 @@ PORTNAME= linplasma
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/svgalib
+MASTER_SITES= SUNSITE/apps/graphics/hacks/svgalib
MAINTAINER= ports@FreeBSD.org
COMMENT= Sinus plasma, an SVGAlib demo
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 4572d7a1e119..4f2d3d1413c6 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 10.35.94
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION} \
- ${MASTER_SITE_LOCAL:S/$/:man/}
-MASTER_SITE_SUBDIR= dinoex/:man
+ LOCAL/dinoex/:man
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Toolkit for conversion of images between different formats
diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index c7d0c4354bc0..29af8ff47602 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -5,7 +5,6 @@ PORTNAME= ocrad
PORTVERSION= 0.22
CATEGORIES= graphics
MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tar.lz
MAINTAINER= lippe@FreeBSD.org
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index 5726eb75d070..e51e4c99d177 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ocropus
PORTVERSION= 0.4
PORTREVISION= 14
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= hiroto.kagotani@gmail.com
COMMENT= The OCRopus(tm) open source document analysis and OCR system
diff --git a/graphics/opengl-man/Makefile b/graphics/opengl-man/Makefile
index 5193fa4e1c7d..99b21c8f3196 100644
--- a/graphics/opengl-man/Makefile
+++ b/graphics/opengl-man/Makefile
@@ -5,8 +5,7 @@ PORTNAME= opengl-man
PORTVERSION= 657.2
CATEGORIES= graphics
MASTER_SITES= http://www2.cons.org/freebsd-distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cracauer
+ LOCAL/cracauer
DISTNAME= opengl-man-657-plusmissing
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile
index 98865526a026..c43d2828c424 100644
--- a/graphics/opennurbs/Makefile
+++ b/graphics/opennurbs/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 20121024
PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://files.na.mcneel.com/opennurbs/5.0/2012-10-24/
-MASTER_SITE_SUBDIR= ${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= fernando.apesteguia@gmail.com
diff --git a/graphics/p5-Color-Calc/Makefile b/graphics/p5-Color-Calc/Makefile
index 929cb5083ef7..f1fa2668aa32 100644
--- a/graphics/p5-Color-Calc/Makefile
+++ b/graphics/p5-Color-Calc/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.074
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Color
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
diff --git a/graphics/p5-Color-Palette/Makefile b/graphics/p5-Color-Palette/Makefile
index 8c7c2b99066f..c66b348c9fed 100644
--- a/graphics/p5-Color-Palette/Makefile
+++ b/graphics/p5-Color-Palette/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.100002
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Color
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/p5-Color-Scheme/Makefile b/graphics/p5-Color-Scheme/Makefile
index 23ee20ab091c..5419205b4555 100644
--- a/graphics/p5-Color-Scheme/Makefile
+++ b/graphics/p5-Color-Scheme/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 1.05
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Color
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/p5-Image-PBMlib/Makefile b/graphics/p5-Image-PBMlib/Makefile
index 874482d1ecef..cbaf46843f77 100644
--- a/graphics/p5-Image-PBMlib/Makefile
+++ b/graphics/p5-Image-PBMlib/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.00
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Image
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile
index 8dbbf0c0086e..b0acb87cd9c7 100644
--- a/graphics/p5-SpringGraph/Makefile
+++ b/graphics/p5-SpringGraph/Makefile
@@ -5,8 +5,7 @@ PORTNAME= SpringGraph
PORTVERSION= 0.05
PORTREVISION= 8
CATEGORIES= graphics perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= GraphViz/TEEJAY
+MASTER_SITES= CPAN/GraphViz/TEEJAY
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/graphics/p5-URI-GoogleChart/Makefile b/graphics/p5-URI-GoogleChart/Makefile
index 8f0024ee297c..63a20fef409b 100644
--- a/graphics/p5-URI-GoogleChart/Makefile
+++ b/graphics/p5-URI-GoogleChart/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.02
PORTREVISION= 1
CATEGORIES= graphics www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= URI
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/pear-IO_SWF/Makefile b/graphics/pear-IO_SWF/Makefile
index 4c7622374bd7..a8a476fe2618 100644
--- a/graphics/pear-IO_SWF/Makefile
+++ b/graphics/pear-IO_SWF/Makefile
@@ -5,8 +5,7 @@ PORTNAME= IO_SWF
PORTVERSION= 2.2.6
CATEGORIES= graphics www pear
MASTER_SITES= http://openpear.org/get/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/${PKGNAMEPREFIX}${PORTNAME}
+ LOCAL/tota/${PKGNAMEPREFIX}${PORTNAME}
PKGNAMEPREFIX= pear-
MAINTAINER= yoya@awm.jp
diff --git a/graphics/pecl-qrencode/Makefile b/graphics/pecl-qrencode/Makefile
index c49f467208e1..f480c0553461 100644
--- a/graphics/pecl-qrencode/Makefile
+++ b/graphics/pecl-qrencode/Makefile
@@ -4,8 +4,7 @@
PORTNAME= qrencode
PORTVERSION= 0.4
CATEGORIES= graphics pear
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= vanilla
+MASTER_SITES= LOCAL/vanilla
PKGNAMEPREFIX= pecl-
DIST_SUBDIR= PECL
diff --git a/graphics/pfscalibration/Makefile b/graphics/pfscalibration/Makefile
index 51b775f359aa..35e0e9ec73ee 100644
--- a/graphics/pfscalibration/Makefile
+++ b/graphics/pfscalibration/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pfscalibration
PORTVERSION= 1.4
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pfstools/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}
MAINTAINER= ii@any.com.ru
COMMENT= Photometric calibration of cameras and recovery HDR images from the set of LDR exposures
diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile
index 4ec317283556..a867c4e73dbd 100644
--- a/graphics/pfstmo/Makefile
+++ b/graphics/pfstmo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pfstmo
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pfstools/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}
MAINTAINER= ii@any.com.ru
COMMENT= Tone mapping operators
diff --git a/graphics/php5-swfed/Makefile b/graphics/php5-swfed/Makefile
index feacc1956df8..09c19e25542c 100644
--- a/graphics/php5-swfed/Makefile
+++ b/graphics/php5-swfed/Makefile
@@ -5,8 +5,7 @@ PORTNAME= swfed
PORTVERSION= 0.62
PORTREVISION= 3
CATEGORIES= graphics www
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= ${PORTNAME}/60548
+MASTER_SITES= SFJP/${PORTNAME}/60548
PKGNAMEPREFIX= php5-
MAINTAINER= yoya@awm.jp
diff --git a/graphics/pixelize/Makefile b/graphics/pixelize/Makefile
index 8ff1d6002e3e..10b5c5e04937 100644
--- a/graphics/pixelize/Makefile
+++ b/graphics/pixelize/Makefile
@@ -8,7 +8,6 @@ CATEGORIES= graphics
MASTER_SITES= ftp://lashwhip.com/pub/ \
http://www.c-s.li/ports/ \
http://lashwhip.com/pixelize/
-MASTER_SITE_SUBDIR= apps/graphics/misc
MAINTAINER= cs@FreeBSD.org
COMMENT= Use many scaled down images to try to duplicate another image
diff --git a/graphics/prison/Makefile b/graphics/prison/Makefile
index 7cd1b11702ce..c1da7e9d824d 100644
--- a/graphics/prison/Makefile
+++ b/graphics/prison/Makefile
@@ -5,8 +5,7 @@ PORTNAME= prison
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= graphics kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
MAINTAINER= fluffy@FreeBSD.org
COMMENT= Barcode library for KDE
diff --git a/graphics/py-gchartwrapper/Makefile b/graphics/py-gchartwrapper/Makefile
index c0048fef075d..8f180afb4d81 100644
--- a/graphics/py-gchartwrapper/Makefile
+++ b/graphics/py-gchartwrapper/Makefile
@@ -5,7 +5,7 @@ PORTNAME= GChartWrapper
PORTVERSION= 0.9
PORTREVISION= 3
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile
index 112f218f3deb..3fc4f4a3c816 100644
--- a/graphics/py-glewpy/Makefile
+++ b/graphics/py-glewpy/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= python
PATCH_SITES= http://mirror.amdmi3.ru/distfiles/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|amdmi3|}
+ LOCAL/amdmi3
PATCHFILES= glewpy-${PORTVERSION}-generatedsources.diff.bz2
MAINTAINER= acm@FreeBSD.org
diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile
index f34852f8d00e..e627432da050 100644
--- a/graphics/py-openexr/Makefile
+++ b/graphics/py-openexr/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
USES= python
USE_PYTHON= distutils autoplist
-MASTER_SITE_SUBDIR=source/O/OpenEXR
post-extract:
${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/setup.py
diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile
index a015790f804e..418a338f2776 100644
--- a/graphics/scr2png/Makefile
+++ b/graphics/scr2png/Makefile
@@ -5,8 +5,7 @@ PORTNAME= scr2png
PORTVERSION= 1.2
PORTREVISION= 6
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nik
+MASTER_SITES= LOCAL/nik
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts the output of "vidcontrol -p" to PNG
diff --git a/graphics/sdl2_gfx/Makefile b/graphics/sdl2_gfx/Makefile
index e27e968cf51b..9be086d65b3c 100644
--- a/graphics/sdl2_gfx/Makefile
+++ b/graphics/sdl2_gfx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sdl2_gfx
PORTVERSION= 1.0.1
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= http://www.ferzkopp.net/Software/%SUBDIR%/
-MASTER_SITE_SUBDIR= SDL2_gfx
+MASTER_SITES= http://www.ferzkopp.net/Software/SDL2_gfx/
DISTNAME= SDL2_gfx-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index b360c6970234..0278d65b06d3 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sdl_gfx
PORTVERSION= 2.0.25
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= http://www.ferzkopp.net/Software/%SUBDIR%/
-MASTER_SITE_SUBDIR= SDL_gfx-${PORTVERSION:R}
+MASTER_SITES= http://www.ferzkopp.net/Software/SDL_gfx-${PORTVERSION:R}/
DISTNAME= SDL_gfx-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile
index e55096b62c92..cf6eec847f83 100644
--- a/graphics/seam-carving-gui/Makefile
+++ b/graphics/seam-carving-gui/Makefile
@@ -5,7 +5,7 @@ PORTNAME= seam-carving-gui
PORTVERSION= 1.11
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= SeamCarvingGui-Src-${PORTVERSION}
MAINTAINER= buganini@gmail.com
diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile
index eb0efd0d4ea9..54af290b56bd 100644
--- a/graphics/seejpeg/Makefile
+++ b/graphics/seejpeg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= seejpeg
PORTVERSION= 1.10
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/viewers/svga
+MASTER_SITES= SUNSITE/apps/graphics/viewers/svga
MAINTAINER= ports@FreeBSD.org
COMMENT= Console graphics viewer using the svga console graphics library
diff --git a/graphics/separate/Makefile b/graphics/separate/Makefile
index d28f124214b7..f300aa32a494 100644
--- a/graphics/separate/Makefile
+++ b/graphics/separate/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.5.8
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= separate-plus/47873
+MASTER_SITES= SFJP/separate-plus/47873
DISTNAME= ${PORTNAME}+-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/svgfig/Makefile b/graphics/svgfig/Makefile
index 09961d5b9ca8..8f1f86127983 100644
--- a/graphics/svgfig/Makefile
+++ b/graphics/svgfig/Makefile
@@ -4,17 +4,16 @@ PORTNAME= SVGFig
PORTVERSION= 1.1.6
PORTREVISION= 1
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:tl}-${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Draw mathematical figures in SVG using Python
WRKSRC= ${WRKDIR}/${PORTNAME:tl}
-USES= python
+USES= python tar:tgz
USE_PYTHON= distutils autoplist
post-patch:
diff --git a/graphics/tesseract-data/Makefile b/graphics/tesseract-data/Makefile
index 8d1646f44d8d..dd10a1c68b33 100644
--- a/graphics/tesseract-data/Makefile
+++ b/graphics/tesseract-data/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tesseract-data
PORTVERSION= 3.02
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= ${TESSERACT_LANGS_300:O:u:S|$|.traineddata.gz|} \
${TESSERACT_LANGS_301:O:u:S|^|tesseract-ocr-3.01.|:S|$|.tar.gz|} \
${TESSERACT_LANGS_302:O:u:S|^|tesseract-ocr-3.02.|:S|$|.tar.gz|}
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 900781e82b6d..159f95b26356 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tesseract
PORTVERSION= 3.02.02
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= tesseract-ocr-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= bf@FreeBSD.org
diff --git a/graphics/timeless/Makefile b/graphics/timeless/Makefile
index 26a60588250d..95e06eab5f3c 100644
--- a/graphics/timeless/Makefile
+++ b/graphics/timeless/Makefile
@@ -5,8 +5,7 @@ PORTNAME= timeless
PORTVERSION= 1.0
PORTREVISION= 7
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shaun
+MASTER_SITES= LOCAL/shaun
MAINTAINER= ports@FreeBSD.org
COMMENT= FreeBSD/SDL port of Tran's Timeless Demo with Sound
diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index e0d2da437114..a38326a35a0c 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -5,11 +5,10 @@ PORTNAME= wmicons
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= graphics windowmaker
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/wmicons|} \
- ${MASTER_SITE_WINDOWMAKER} \
- ${MASTER_SITE_PORTS_JP} \
+MASTER_SITES= LOCAL/kiri/wmicons \
+ WINDOWMAKER/contrib/old/icons \
+ PORTS_JP \
http://www.itlb.te.noda.tus.ac.jp/~manome/wmaker/archive/
-MASTER_SITE_SUBDIR= . contrib/old/icons
DISTFILES= ${EXTRACT_ONLY} isiconpack4.tgz
EXTRACT_ONLY= DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
NeXT_XEmacs_tar.gz wm_icons_png.tar.gz wm_icons_tif.tar.gz \
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index f0800aeb0103..21964a94f04e 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xbmbrowser
PORTVERSION= 5.1
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 35487175033d..4384e8aff1b9 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.3.1
PORTREVISION= 13
CATEGORIES= graphics
MASTER_SITES= http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/rays/pov
+ SUNSITE/apps/graphics/rays/pov
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical interface to POV-Ray
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index be623eb4dbd6..bf3026c9e395 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.17.0
PORTREVISION= 16
CATEGORIES= graphics
MASTER_SITES= DEBIAN
-MASTER_SITE_SUBDIR= pool/main/x/${PORTNAME}
DISTNAME= xli_${PORTVERSION}+${XLI_SNAPVER:C/-//g}.orig
MAINTAINER= lichray@gmail.com
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index f49fc5924713..7593460185ad 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -6,9 +6,8 @@ PORTREVISION= 4
CATEGORIES= graphics print
MASTER_SITES= http://mirrors.rit.edu/zi/ \
ftp://ftp.foolabs.com/pub/xpdf/ \
- ${MASTER_SITE_TEX_CTAN} \
+ TEX_CTAN/support/xpdf \
http://komquats.com/distfiles/
-MASTER_SITE_SUBDIR= support/xpdf
MAINTAINER= cy@FreeBSD.org
COMMENT= Display PDF files and convert them to other formats
diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index 778f68969ab9..c2b368790bdb 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xwpick
PORTVERSION= 2.20
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=applications
+MASTER_SITES= XCONTRIB/applications
MAINTAINER= ports@FreeBSD.org
COMMENT= Image pick up utility for X Window System
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index cdb8b2f9e7f9..c5e55a70ab7b 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.2
PORTREVISION= 14
CATEGORIES= graphics www
MASTER_SITES= http://namazu.org/~satoru/zphoto/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Zooming photo album generator
diff --git a/hebrew/hspell/Makefile b/hebrew/hspell/Makefile
index a5a9384b31dc..0dbc23d2c439 100644
--- a/hebrew/hspell/Makefile
+++ b/hebrew/hspell/Makefile
@@ -5,8 +5,7 @@ PORTNAME= hspell
PORTVERSION= 1.1
CATEGORIES= hebrew
MASTER_SITES= http://hspell.ivrix.org.il/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= makc
+ LOCAL/makc
MAINTAINER= onatan@gmail.com
COMMENT= Hebrew spellchecker and morphology engine
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 0584f2009539..ee822a49b88d 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bitlbee
PORTVERSION= 3.4
CATEGORIES= irc
MASTER_SITES= http://get.bitlbee.org/src/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brix
+ LOCAL/brix
MAINTAINER= garga@FreeBSD.org
COMMENT= IRC to other chat networks gateway
diff --git a/irc/cwirc/Makefile b/irc/cwirc/Makefile
index 4c0c1ed70245..dcdbf06f5bc0 100644
--- a/irc/cwirc/Makefile
+++ b/irc/cwirc/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.0.0
PORTREVISION= 5
CATEGORIES= irc comms hamradio
MASTER_SITES= http://users.skynet.be/ppc/cwirc/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= db@FreeBSD.org
COMMENT= X-Chat Morse plugin
diff --git a/irc/keitairc2/Makefile b/irc/keitairc2/Makefile
index f61b4b0bdc6c..de42695534ea 100644
--- a/irc/keitairc2/Makefile
+++ b/irc/keitairc2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= keitairc
PORTVERSION= 2.0
CATEGORIES= irc
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= ${PORTNAME}/47485
+MASTER_SITES= SFJP/${PORTNAME}/47485
MAINTAINER= ports@FreeBSD.org
COMMENT= IRC proxy for mobilephone that have a web interface
diff --git a/irc/py-gozerbot/Makefile b/irc/py-gozerbot/Makefile
index e656dd7c51fb..d72dc14de170 100644
--- a/irc/py-gozerbot/Makefile
+++ b/irc/py-gozerbot/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.8.1.1
PORTREVISION= 2
CATEGORIES= irc python
MASTER_SITES= http://gozerbot.org/media/tarball/ \
- ${MASTER_SITE_GOOGLE_CODE}
+ GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sten@blinkenlights.nl
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index 66e33790599b..f501993206a6 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -5,13 +5,14 @@ PORTNAME= quirc
PORTVERSION= 0.9.84
PORTREVISION= 5
CATEGORIES= irc tk
-MASTER_SITES= ${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITES= LOCAL:local # This ends up being empty.
MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/Tk IRC client for the X Window System
OPTIONS_DEFINE= DOCS
+BROKEN= Unfetchable
USES= tk
USE_XORG= xt
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index f095e02a3708..ddb3e8874e7f 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= irc elisp
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yasu@utahime.org
diff --git a/irc/simpleirc/Makefile b/irc/simpleirc/Makefile
index 3c2f2825ea70..046393fad72d 100644
--- a/irc/simpleirc/Makefile
+++ b/irc/simpleirc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= simpleirc
PORTVERSION= 1.2
CATEGORIES= irc
MASTER_SITES= http://dl.suckless.org/tools/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dhn
+ LOCAL/dhn
DISTNAME= sic-${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
diff --git a/irc/thales/Makefile b/irc/thales/Makefile
index b17de2b64256..116dd2028f00 100644
--- a/irc/thales/Makefile
+++ b/irc/thales/Makefile
@@ -5,8 +5,7 @@ PORTNAME= thales
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= irc
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU Thales -- An IRC to MySQL gateway
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 274399bce2fc..7d42b407ea47 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 20140213
PORTREVISION= 5
CATEGORIES= irc
MASTER_SITES= http://perturb.me.uk/distfiles/weechat-devel/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jase/weechat-devel
+ LOCAL/jase/weechat-devel
PKGNAMESUFFIX= -devel
DISTNAME= weechat-devel-${GITREV}
DISTFILES= ${DISTNAME}.txz
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 0371cc02509b..4074e1983e6f 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://weechat.org/files/src/ \
http://perturb.me.uk/distfiles/weechat/:mandocs \
- ${MASTER_SITE_LOCAL:S/$/:mandocs/}
-MASTER_SITE_SUBDIR= jase/weechat/:mandocs
+ LOCAL/jase/weechat/:mandocs
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= jase@FreeBSD.org
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 4de1976016ad..8b3c3ea8f3d4 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -5,10 +5,8 @@ PORTNAME= FreeWnn
PORTVERSION= 1.1.1.a021
PORTREVISION= 13
CATEGORIES?= japanese
-MASTER_SITES= ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
- ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= FreeWnn/alpha \
- freewnn/17724
+MASTER_SITES= ftp://ftp.freewnn.org/pub/FreeWnn/alpha/ \
+ SFJP/freewnn/17724
PKGNAMESUFFIX= -lib
DISTNAME= ${PORTNAME}-1.1.1-a021
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 6318d4d0c48f..548d90bb19a6 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -5,10 +5,8 @@ PORTNAME= FreeWnn
PORTVERSION= 1.1.1.a021
PORTREVISION= 13
CATEGORIES?= japanese
-MASTER_SITES= ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
- ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= FreeWnn/alpha \
- freewnn/17724
+MASTER_SITES= ftp://ftp.freewnn.org/pub/FreeWnn/alpha/ \
+ SFJP/freewnn/17724
PKGNAMESUFFIX= -server
DISTNAME= ${PORTNAME}-1.1.1-a021
diff --git a/japanese/a2ps/Makefile b/japanese/a2ps/Makefile
index 8bd20854e709..e53bfa84802e 100644
--- a/japanese/a2ps/Makefile
+++ b/japanese/a2ps/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.45
PORTREVISION= 5
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/a2ps|}
+ LOCAL/tota/a2ps
DISTNAME= ${PORTNAME}.pl-${PORTVERSION}
EXTRACT_SUFX= # empty
diff --git a/japanese/ajaxzip2-data/Makefile b/japanese/ajaxzip2-data/Makefile
index 5bf5eb6e3004..b035145a1bdd 100644
--- a/japanese/ajaxzip2-data/Makefile
+++ b/japanese/ajaxzip2-data/Makefile
@@ -3,8 +3,7 @@
PORTNAME= ajaxzip2
PORTVERSION= 20150430
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama
+MASTER_SITES= LOCAL/kuriyama
PKGNAMESUFFIX= -data
DISTFILES= ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index 6558a17dfa6c..ba33c3e787eb 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -5,8 +5,7 @@ PORTNAME= anthy
PORTVERSION= 9100h
PORTREVISION= 4
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/37536
+MASTER_SITES= SFJP/${PORTNAME}/37536
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= anthy
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/japanese/bugzilla44/Makefile b/japanese/bugzilla44/Makefile
index 5fc78c4de103..c33c84ed2fd7 100644
--- a/japanese/bugzilla44/Makefile
+++ b/japanese/bugzilla44/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bugzilla
PORTVERSION= 4.4.6
CATEGORIES= japanese
MASTER_SITES= http://bug-ja.org/releases/4.4/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/bugzilla-ja
+ LOCAL/tota/bugzilla-ja
DISTNAME= Bugzilla-ja-${PORTVERSION}-template
MAINTAINER= bz-ports@FreeBSD.org
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 03ab7004b462..c0a5c4f697ef 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -5,8 +5,7 @@ PORTNAME= canna
PORTVERSION= 3.7p3
PORTREVISION= 9
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= canna/9565/
+MASTER_SITES= SFJP/canna/9565
PKGNAMESUFFIX= -lib
DISTNAME= Canna${PORTVERSION:S/.//g}
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index d6c4d1857ca5..a83baa5918e0 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME= canna
PORTVERSION= 3.7p3
PORTREVISION= 10
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= canna/9565/
+MASTER_SITES= SFJP/canna/9565
PKGNAMESUFFIX= -server
DISTNAME= Canna${PORTVERSION:S/.//g}
diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 9de42a2c27ed..b0f60f578245 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile