aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2015-05-14 10:15:04 +0000
committerMathieu Arnold <mat@FreeBSD.org>2015-05-14 10:15:04 +0000
commit60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree627649ff7699a289d5d78c11bf8d105881402ca8 /devel
parenta50428b01c275f058b067787701d333a9d45cbcb (diff)
downloadports-60d1a83c2a113150cedbc43ff12a7375144f741a.tar.gz
ports-60d1a83c2a113150cedbc43ff12a7375144f741a.zip
Notes
Diffstat (limited to 'devel')
-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
287 files changed, 250 insertions, 514 deletions
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