- Take advantage of CPAN macro from bsd.sites.mk, change ${MASTER_SITE_PERL_CPAN} to CPAN.

PR:		ports/122674
Submitted by:	Philip M. Gollucci <pgollucci@p6m7g8.com>
Reworked by:	araujo (myself)
Approved by:	portmgr (pav)

22 files changed, 22 insertions, 41 deletions

diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile
index 3d045425e6d9..198ab5480106 100644
--- a/x11-toolkits/p5-GdkImlib/Makefile
+++ b/x11-toolkits/p5-GdkImlib/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	GdkImlib
 PORTVERSION=	0.7009
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Gtk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Gtk-Perl-${PORTVERSION}
 
diff --git a/x11-toolkits/p5-GdkPixbuf/Makefile b/x11-toolkits/p5-GdkPixbuf/Makefile
index 04ad53fd9064..d1c76caed152 100644
--- a/x11-toolkits/p5-GdkPixbuf/Makefile
+++ b/x11-toolkits/p5-GdkPixbuf/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	GdkPixbuf
 PORTVERSION=	0.7009
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits lang perl5 gnome
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Gtk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Gtk-Perl-${PORTVERSION}
 
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index 0e67b753c87d..c4cc0d3fd684 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Glade
 PORTVERSION=	1.006
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/T/TS/TSCH/
 PKGNAMEPREFIX=	p5-
 PKGNAMESUFFIX=	2
diff --git a/x11-toolkits/p5-Gnome/Makefile b/x11-toolkits/p5-Gnome/Makefile
index 667bf3f26078..7c62bcf27f14 100644
--- a/x11-toolkits/p5-Gnome/Makefile
+++ b/x11-toolkits/p5-Gnome/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Gnome
 PORTVERSION=	0.7009
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Gtk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Gtk-Perl-${PORTVERSION}
 
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index beef0803d26c..6a9e04b929bd 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Gtk
 PORTVERSION=	0.7009
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Gtk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
index 96b1acc80aff..c9f3c7d47525 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Gtk2-TrayIcon
 PORTVERSION=	0.06
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/B/BO/BORUP
 PKGNAMEPREFIX=	p5-
 
diff --git a/x11-toolkits/p5-GtkXmHTML/Makefile b/x11-toolkits/p5-GtkXmHTML/Makefile
index d898289c9ed7..bca28f48e4bb 100644
--- a/x11-toolkits/p5-GtkXmHTML/Makefile
+++ b/x11-toolkits/p5-GtkXmHTML/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	GtkXmHTML
 PORTVERSION=	0.7009
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits lang perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Gtk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Gtk-Perl-${PORTVERSION}
 
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index fd1c28e67011..261193eda4a5 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Prima
 PORTVERSION=	1.22
 CATEGORIES=	x11-toolkits perl5 graphics
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=Prima
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dmitry@karasik.eu.org
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index 9de2fdcc7a5f..10a4437ed883 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Tcl-Tk
 PORTVERSION=	0.97
 CATEGORIES=	x11-toolkits lang perl5 tk
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tcl
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index 4b897f62f4fa..03a8394815d5 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	TclTk
 PORTVERSION=	0.75
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang perl5 tk
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Tcl
 PKGNAMEPREFIX=	p5-
 
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index 7cf9fa86f961..6ff74ba67d11 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Tk-Autoscroll
 PORTVERSION=	1.14
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index 009514d6db0c..b10f4f13ea26 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Tk-ColourChooser
 PORTVERSION=	1.52
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index 20563a54b39b..ed53cd8281fc 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Tk-Date
 PORTVERSION=	0.42
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index 5555662a2868..aad3d63c2cc7 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Tk-Enscript
 PORTVERSION=	1.10
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index 00ce3fa4addf..d01757e0a599 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	Tk-FileDialog
 PORTVERSION=	1.3
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 
 MAINTAINER=	minter@lunenburg.org
 COMMENT=	Tk::FileDialog - A file selector dialog for perl/Tk
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index 43ee9f39933d..bdb0ee28eab7 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Tk-GBARR
 PORTVERSION=	2.07
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index 21783c3ce747..f4563ea0bfd2 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Tk-Getopt
 PORTVERSION=	0.49
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index 4c8934634a5c..15f68d4a7927 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Tk-HistEntry
 PORTVERSION=	0.43
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-ResizeButton/Makefile b/x11-toolkits/p5-Tk-ResizeButton/Makefile
index 9859596b8486..82d505427909 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/Makefile
+++ b/x11-toolkits/p5-Tk-ResizeButton/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		Tk-ResizeButton
 PORTVERSION=	0.01
 PORTREVISION=	1
 CATEGORIES=		x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=		Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=		ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-Splashscreen/Makefile b/x11-toolkits/p5-Tk-Splashscreen/Makefile
index 22d8510c4107..942e885a3ed9 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/Makefile
+++ b/x11-toolkits/p5-Tk-Splashscreen/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Tk-Splashscreen
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index 6ab2fcac5254..2fe2ac550fae 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Tk-TableMatrix
 PORTVERSION=	1.23
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index b5aabb99eb69..66362ddec61f 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Tk
 PORTVERSION=	804.027
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits tk perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tk
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw