Remove unneeded usage of:

- MASTER_SITE_SUBDIR
- ${MASTER_SITES_FOO}
- :DEFAULT (and use a default when appropriate)

Sponsored by:	Absolight

29 files changed, 41 insertions, 62 deletions

diff --git a/audio/etktab/Makefile b/audio/etktab/Makefile
index a0acdad46566..0ae273b93a12 100644
--- a/audio/etktab/Makefile
+++ b/audio/etktab/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	3
 CATEGORIES=	audio tcl tk
 MASTER_SITES=	SF/${PORTNAME}/eTktab/${PORTVERSION} \
 		SF/${PORTNAME}/keyboard%20layout%20support/${PORTVERSION}:keyboard
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index 72add71783ad..3845889f728f 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28current%29/${PORTVERSION} \
 		http://gd.tuwien.ac.at/hci/cdk/:cdk
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		cdk-${CDK_VERSION}.tgz:cdk
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/biology/slclust/Makefile b/biology/slclust/Makefile
index 628a08d01026..85d4e0be6c1c 100644
--- a/biology/slclust/Makefile
+++ b/biology/slclust/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	slclust
 PORTVERSION=	2010.02.02
 CATEGORIES=	biology
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	slclust/slclust
+MASTER_SITES=	SF/slclust/slclust
 DISTNAME=	${PORTNAME}_02022010
 
 MAINTAINER=	bacon4000@gmail.com
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 11cbaa56c979..1db224a963fc 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	opencascade
 PORTVERSION=	6.9.1
 PORTREVISION=	1
 CATEGORIES=	cad science
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	thierry
+MASTER_SITES=	LOCAL/thierry
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Open CASCADE Technology, 3D modeling & numerical simulation
diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile
index d0279334a454..08083b29e1e8 100644
--- a/databases/py-odbc/Makefile
+++ b/databases/py-odbc/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	pyodbc
 PORTVERSION=	3.0.10
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
-MASTER_SITE_SUBDIR=	source/p/${PORTNAME}
+MASTER_SITES=	CHEESESHOP/source/p/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rob.kruus@gmail.com
diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile
index f5c299270ef8..98c23e39dee3 100644
--- a/deskutils/ganttproject/Makefile
+++ b/deskutils/ganttproject/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	ganttproject
 PORTVERSION=	2.7.1
 DISTVERSIONSUFFIX=	-r1924
 CATEGORIES=	deskutils java
-MASTER_SITES=	https://dl.ganttproject.biz/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	https://dl.ganttproject.biz/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gantt chart based project scheduling and management tool
diff --git a/deskutils/teapot/Makefile b/deskutils/teapot/Makefile
index 99f4b13f1f30..108a9237945b 100644
--- a/deskutils/teapot/Makefile
+++ b/deskutils/teapot/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	2.3.0
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.syntax-k.de/projekte/${PORTNAME}/ \
 		http://www.syntax-k.de/projekte/${PORTNAME}/:docs
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME:C/^./T/}-Linux-i386${EXTRACT_SUFX}:docs
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile
index a12de95fb630..a6c8d63de761 100644
--- a/devel/ocaml-lacaml/Makefile
+++ b/devel/ocaml-lacaml/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	lacaml
 PORTVERSION=	8.0.7
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/mmottl/lacaml/releases/download/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION:S/^/v/}
+MASTER_SITES=	https://github.com/mmottl/lacaml/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/py-cycler/Makefile b/devel/py-cycler/Makefile
index 2280bda415de..2b9c713b1ea6 100644
--- a/devel/py-cycler/Makefile
+++ b/devel/py-cycler/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	cycler
 PORTVERSION=	0.10.0
 CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-MASTER_SITE_SUBDIR=	source/C/Cycler
+MASTER_SITES=	CHEESESHOP/source/C/Cycler
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@rawbw.com
diff --git a/devel/py-pyinotify/Makefile b/devel/py-pyinotify/Makefile
index 692143bd017c..691d423c5673 100644
--- a/devel/py-pyinotify/Makefile
+++ b/devel/py-pyinotify/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	pyinotify
 PORTVERSION=	0.9.6
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR=source/p/pyinotify
+MASTER_SITES=	CHEESESHOP/source/p/pyinotify
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jpaetzel@FreeBSD.org
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index ba6f8d4ce8a2..b3c873e21053 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	zookeeper
 PORTVERSION=	3.4.7
 PORTREVISION=	1
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	${PORTNAME}/current
+MASTER_SITES=	APACHE/${PORTNAME}/current
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Coordination Service for Distributed Applications
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index b257dc6e25e0..f70d83cef432 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	Padre
 PORTVERSION=	1.00
 PORTREVISION=	4
 CATEGORIES=	editors perl5
-MASTER_SITES=	CPAN/${PORTNAME}/:DEFAULT CPAN/Wx/:wxsc
+MASTER_SITES=	CPAN/${PORTNAME}/ CPAN/Wx/:wxsc
 PKGNAMEPREFIX=	p5-
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${WXSC_DISTFILE}:wxsc
 
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 1f255e978afe..92cdfa5945b3 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	hatari
 PORTVERSION=	1.9.0
 CATEGORIES=	emulators
-MASTER_SITES=	http://download.tuxfamily.org/hatari/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	http://download.tuxfamily.org/hatari/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Atari ST emulator
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index 5e474847ec7a..49e1a02c0867 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME} \
 		SF/${PORTNAME}/${PORTNAME}-data:data
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		pg-data${EXTRACT_SUFX}:data
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/robocode-naval/Makefile b/games/robocode-naval/Makefile
index 90de0df0e018..0b0e1cc95df3 100644
--- a/games/robocode-naval/Makefile
+++ b/games/robocode-naval/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	robocode
 PORTVERSION=	0.9.2
 DISTVERSIONSUFFIX=	-setup
 CATEGORIES=	games java
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}/naval-robocode/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/naval-robocode/${PORTVERSION}
 PKGNAMESUFFIX=	-naval
 EXTRACT_SUFX=	.jar
 DIST_SUBDIR=	java
diff --git a/mail/openemm2013/Makefile b/mail/openemm2013/Makefile
index d6aa2bc809aa..df15543eb657 100644
--- a/mail/openemm2013/Makefile
+++ b/mail/openemm2013/Makefile
@@ -5,12 +5,10 @@ PORTNAME=	openemm2013
 PORTVERSION=	R2
 PORTREVISION=	1
 CATEGORIES=	mail java www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT/} \
-		http://central.maven.org/maven2/%SUBDIR%/:MAVEN2
-MASTER_SITE_SUBDIR=	openemm/OpenEMM%20software/OpenEMM%202013/:DEFAULT \
-			com/lowagie/itext/2.1.7/:MAVEN2
+MASTER_SITES=	SF/openemm/OpenEMM%20software/OpenEMM%202013/ \
+		http://central.maven.org/maven2/com/lowagie/itext/2.1.7/:MAVEN2
 DISTNAME=	OpenEMM-2013_${PORTVERSION}-src
-DISTFILES=	OpenEMM-2013_${PORTVERSION}-src.tar.gz:DEFAULT OpenEMM-2013_${PORTVERSION}-JARs.tar.gz:DEFAULT \
+DISTFILES=	OpenEMM-2013_${PORTVERSION}-src.tar.gz OpenEMM-2013_${PORTVERSION}-JARs.tar.gz \
 		itext-2.1.7.jar:MAVEN2
 
 MAINTAINER=	horst.leitenmueller@liwest.at
diff --git a/mail/openemm2015/Makefile b/mail/openemm2015/Makefile
index ac9fc5a2979d..81a8a2675cd6 100644
--- a/mail/openemm2015/Makefile
+++ b/mail/openemm2015/Makefile
@@ -4,12 +4,10 @@
 PORTNAME=	openemm2015
 PORTVERSION=	0
 CATEGORIES=	mail java www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT/} \
-		http://central.maven.org/maven2/%SUBDIR%/:MAVEN2
-MASTER_SITE_SUBDIR=	openemm/OpenEMM%20software/OpenEMM%202015/:DEFAULT \
-			com/lowagie/itext/2.1.7/:MAVEN2
+MASTER_SITES=	SF/openemm/OpenEMM%20software/OpenEMM%202015/ \
+		http://central.maven.org/maven2/com/lowagie/itext/2.1.7/:MAVEN2
 DISTNAME=	OpenEMM-2015-src
-DISTFILES=	OpenEMM-2015-src.tar.gz:DEFAULT OpenEMM-2015-JARs.tar.gz:DEFAULT \
+DISTFILES=	OpenEMM-2015-src.tar.gz OpenEMM-2015-JARs.tar.gz \
 		itext-2.1.7.jar:MAVEN2
 
 MAINTAINER=	horst.leitenmueller@liwest.at
diff --git a/math/spooles/Makefile b/math/spooles/Makefile
index 42697eeac2c2..45677b7518a7 100644
--- a/math/spooles/Makefile
+++ b/math/spooles/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	spooles
 PORTVERSION=	2.2
 PORTREVISION=	12
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_NETLIB}
-MASTER_SITE_SUBDIR=linalg/spooles
+MASTER_SITES=	NETLIB/linalg/spooles
 .ifdef WITH_MPI
 PKGNAMESUFFIX=	-mpich
 .endif
diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index e9e74b0bcd5e..e5bd71a109b7 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	WinFF
 PORTVERSION=	1.5.2
 PORTREVISION=	7
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	${_PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 5f056a05c5a1..0a832142833a 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -5,12 +5,12 @@ PORTNAME=	asterisk
 PORTVERSION=	1.8.32.3
 PORTREVISION=	7
 CATEGORIES=	net
-MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
-MASTER_SITE_SUBDIR=	asterisk/:main \
-			asterisk/old-releases/:main \
+MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
+MASTER_SITE_SUBDIR=	asterisk/ \
+			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	18
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index f102d4113197..b8830acba218 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -4,12 +4,12 @@ PORTNAME=	asterisk
 PORTVERSION=	11.22.0
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
-MASTER_SITE_SUBDIR=	asterisk/:main \
-			asterisk/old-releases/:main \
+MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
+MASTER_SITE_SUBDIR=	asterisk/ \
+			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	11
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index 7a942c37211a..5dae0b8d2bd9 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -3,12 +3,12 @@
 PORTNAME=	asterisk
 PORTVERSION=	13.9.1
 CATEGORIES=	net
-MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
-MASTER_SITE_SUBDIR=	asterisk/:main \
-			asterisk/old-releases/:main \
+MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
+MASTER_SITE_SUBDIR=	asterisk/ \
+			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	13
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
diff --git a/net/kea/Makefile b/net/kea/Makefile
index 1768dc997c68..425dd52b8745 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	kea
 PORTVERSION=	1.0.0
 CATEGORIES=	net ipv6
-MASTER_SITES=	ISC
-MASTER_SITE_SUBDIR=	kea/${PORTVERSION}
+MASTER_SITES=	ISC/kea/${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Alternative DHCP implementation by ISC
diff --git a/net/libnss-pgsql/Makefile b/net/libnss-pgsql/Makefile
index 5fe7c6ad8876..f6726bcda31e 100644
--- a/net/libnss-pgsql/Makefile
+++ b/net/libnss-pgsql/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	libnss-pgsql
 PORTVERSION=	1.5.0
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	projects/pgFoundry/sysauth/NSS/nss1.5.0-beta
+MASTER_SITES=	PGSQL/projects/pgFoundry/sysauth/NSS/nss1.5.0-beta
 DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
 
 MAINTAINER=	felix@userspace.com.au
diff --git a/shells/klish/Makefile b/shells/klish/Makefile
index fb260833fcd7..8cefefd4b381 100644
--- a/shells/klish/Makefile
+++ b/shells/klish/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	klish
 PORTVERSION=	2.1.1
 CATEGORIES=	shells
 MASTER_SITES=	http://libcode.org/attachments/download/61/
-MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	Klish - Kommand Line Interface Shell
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 8aff6d0496e6..9ea098db33ff 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	xalan-j
 PORTVERSION=	2.7.2
 CATEGORIES=	textproc java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=xalan/xalan-j/binaries
+MASTER_SITES=	APACHE/xalan/xalan-j/binaries
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}-bin
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/www/py-blogofile/Makefile b/www/py-blogofile/Makefile
index 183b5069de11..ccc04f4a3c8b 100644
--- a/www/py-blogofile/Makefile
+++ b/www/py-blogofile/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	blogofile
 PORTVERSION=	0.7.1
 PORTREVISION=	3
 CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-MASTER_SITE_SUBDIR=	source/B/Blogofile
+MASTER_SITES=	CHEESESHOP/source/B/Blogofile
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
diff --git a/x11-clocks/xalarm/Makefile b/x11-clocks/xalarm/Makefile
index 8cf1220196d9..7aecd85bed17 100644
--- a/x11-clocks/xalarm/Makefile
+++ b/x11-clocks/xalarm/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	xalarm
 PORTVERSION=	3.06
 CATEGORIES=	x11-clocks
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
+MASTER_SITES=	XCONTRIB/utilities
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	X based alarm clock
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 16bad9d7e7e3..4387ed141a88 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -15,7 +15,7 @@ DISTVERSION?=	346.96
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_NVIDIA}
+MASTER_SITES=	NVIDIA
 # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}