Don't use MASTER_SITE_SUBDIR when it is not needed.

Sponsored by:	Absolight

12 files changed, 11 insertions, 23 deletions

diff --git a/deskutils/latte-dock/Makefile b/deskutils/latte-dock/Makefile
index 432f71880acf..1274424d8696 100644
--- a/deskutils/latte-dock/Makefile
+++ b/deskutils/latte-dock/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	latte-dock
 DISTVERSION=	0.7.2
 CATEGORIES=	deskutils kde
-MASTER_SITES=	KDE
-MASTER_SITE_SUBDIR=	stable/latte-dock
+MASTER_SITES=	KDE/stable/latte-dock
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Launcher for Qt and Plasma desktops
diff --git a/graphics/libetonyek01/Makefile b/graphics/libetonyek01/Makefile
index b09922f51692..983bd78a5011 100644
--- a/graphics/libetonyek01/Makefile
+++ b/graphics/libetonyek01/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	libetonyek
 PORTVERSION=	0.1.7
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	LODEV
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	LODEV/${PORTNAME}
 PKGNAMESUFFIX=	01
 
 MAINTAINER=	office@FreeBSD.org
diff --git a/japanese/font-genjyuugothic/Makefile b/japanese/font-genjyuugothic/Makefile
index 5793b405d5e4..ed5323bb9928 100644
--- a/japanese/font-genjyuugothic/Makefile
+++ b/japanese/font-genjyuugothic/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	genjyuugothic
 PORTVERSION=	20150607
 #PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	SOURCEFORGE_JP
-MASTER_SITE_SUBDIR=users/8/8636
+MASTER_SITES=	SOURCEFORGE_JP/users/8/8636
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER=	ume@FreeBSD.org
diff --git a/japanese/font-genshingothic/Makefile b/japanese/font-genshingothic/Makefile
index d2df984f234e..022440ca4287 100644
--- a/japanese/font-genshingothic/Makefile
+++ b/japanese/font-genshingothic/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	genshingothic
 PORTVERSION=	20150607
 PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	SOURCEFORGE_JP
-MASTER_SITE_SUBDIR=users/8/8634
+MASTER_SITES=	SOURCEFORGE_JP/users/8/8634
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER=	ume@FreeBSD.org
diff --git a/japanese/font-mgenplus/Makefile b/japanese/font-mgenplus/Makefile
index 805a45e55b7d..c05706a582ed 100644
--- a/japanese/font-mgenplus/Makefile
+++ b/japanese/font-mgenplus/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	mgenplus
 PORTVERSION=	20150602
 #PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	SOURCEFORGE_JP
-MASTER_SITE_SUBDIR=users/8/8597
+MASTER_SITES=	SOURCEFORGE_JP/users/8/8597
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER=	ume@FreeBSD.org
diff --git a/japanese/font-nasu/Makefile b/japanese/font-nasu/Makefile
index 3a5bc6053182..488c3a960165 100644
--- a/japanese/font-nasu/Makefile
+++ b/japanese/font-nasu/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	nasu
 PORTVERSION=	20141215
 PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	SOURCEFORGE_JP
-MASTER_SITE_SUBDIR=users/7/7587
+MASTER_SITES=	SOURCEFORGE_JP/users/7/7587
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	NasuFont-${PORTVERSION}
 
diff --git a/japanese/font-rounded-mgenplus/Makefile b/japanese/font-rounded-mgenplus/Makefile
index 84150c257de3..c11254df05cf 100644
--- a/japanese/font-rounded-mgenplus/Makefile
+++ b/japanese/font-rounded-mgenplus/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	rounded-mgenplus
 PORTVERSION=	20150602
 #PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	SOURCEFORGE_JP
-MASTER_SITE_SUBDIR=users/8/8598
+MASTER_SITES=	SOURCEFORGE_JP/users/8/8598
 PKGNAMEPREFIX=	ja-font-
 
 MAINTAINER=	ume@FreeBSD.org
diff --git a/java/jakarta-commons-lang3/Makefile b/java/jakarta-commons-lang3/Makefile
index 75acdeb60415..18de9005c41b 100644
--- a/java/jakarta-commons-lang3/Makefile
+++ b/java/jakarta-commons-lang3/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	commons-lang3
 PORTVERSION=	3.4
 CATEGORIES=	java devel
-MASTER_SITES=	APACHE_COMMONS_SOURCE
-MASTER_SITE_SUBDIR=	lang
+MASTER_SITES=	APACHE_COMMONS_SOURCE/lang
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/math/p5-Statistics-Frequency/Makefile b/math/p5-Statistics-Frequency/Makefile
index e83ac4d740b0..1d036c17fa8e 100644
--- a/math/p5-Statistics-Frequency/Makefile
+++ b/math/p5-Statistics-Frequency/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	Statistics-Frequency
 PORTVERSION=	0.04
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Statistics
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/net-mgmt/ipaudit/Makefile b/net-mgmt/ipaudit/Makefile
index 0fdc440e7ef6..93590e893a3f 100644
--- a/net-mgmt/ipaudit/Makefile
+++ b/net-mgmt/ipaudit/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	ipaudit
 PORTVERSION=	1.1
 CATEGORIES=	net-mgmt sysutils
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	ipaudit/ipaudit
+MASTER_SITES=	SF/ipaudit/ipaudit
 
 MAINTAINER=	amutu@amutu.com
 COMMENT=	IP traffic summarizer
diff --git a/ports-mgmt/porttree/Makefile b/ports-mgmt/porttree/Makefile
index 268040e53096..4097bfe1cfd9 100644
--- a/ports-mgmt/porttree/Makefile
+++ b/ports-mgmt/porttree/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	porttree
 PORTVERSION=	0.3.r${SVN_REV}
 PORTREVISION=	1
 CATEGORIES=	ports-mgmt python
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	Vladimir.Chukharev@gmail.com
 COMMENT=	Show dependences of FreeBSD port as pseudo graphical tree
diff --git a/textproc/libvisio01/Makefile b/textproc/libvisio01/Makefile
index 6768dee097ce..2ef68afbb99f 100644
--- a/textproc/libvisio01/Makefile
+++ b/textproc/libvisio01/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	libvisio
 PORTVERSION=	0.1.6
 PORTREVISION=	1
 CATEGORIES=	textproc devel
-MASTER_SITES=	LODEV
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	LODEV/${PORTNAME}
 PKGNAMESUFFIX=	01
 
 MAINTAINER=	office@FreeBSD.org