- Use GNOME macro instead of ${MASTER_SITE_GNOME}, remove

  MASTER_SITE_SUBDIR when possible.

PR:		ports/125243
Submitted by:	pgollucci
Reworked by:	myself
Tested on:	pointyhat exp-run (pav)

12 files changed, 12 insertions, 13 deletions

diff --git a/x11-themes/gnome-icons-aqua-fusion/Makefile b/x11-themes/gnome-icons-aqua-fusion/Makefile
index 6462d997aff5..9013e9103d71 100644
--- a/x11-themes/gnome-icons-aqua-fusion/Makefile
+++ b/x11-themes/gnome-icons-aqua-fusion/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	aqua-fusion
 PORTVERSION=	20030216
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-AquaFusion
 
diff --git a/x11-themes/gnome-icons-gentoo-test/Makefile b/x11-themes/gnome-icons-gentoo-test/Makefile
index 9aea9e9bf4d9..d0a903de581a 100644
--- a/x11-themes/gnome-icons-gentoo-test/Makefile
+++ b/x11-themes/gnome-icons-gentoo-test/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	gentoo-test
 PORTVERSION=	0.1
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Gentoo-Test
 
diff --git a/x11-themes/gnome-icons-iris/Makefile b/x11-themes/gnome-icons-iris/Makefile
index f3d588a06bd2..7a26a2602251 100644
--- a/x11-themes/gnome-icons-iris/Makefile
+++ b/x11-themes/gnome-icons-iris/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	iris
 PORTVERSION=	20050420
 PORTREVISION=	1
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/themes/icon
 DISTNAME=	ICON-Iris
 
diff --git a/x11-themes/gnome-icons-noia-full/Makefile b/x11-themes/gnome-icons-noia-full/Makefile
index 25be80752422..7bb779c8fcac 100644
--- a/x11-themes/gnome-icons-noia-full/Makefile
+++ b/x11-themes/gnome-icons-noia-full/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	noia-full
 PORTVERSION=	20041102
 PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Noia
 
diff --git a/x11-themes/gnome-icons-noia-warm/Makefile b/x11-themes/gnome-icons-noia-warm/Makefile
index d09b194d1c74..d6d8be18a2e0 100644
--- a/x11-themes/gnome-icons-noia-warm/Makefile
+++ b/x11-themes/gnome-icons-noia-warm/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	noia-warm
 PORTVERSION=	20041102
 PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-NoiaWarm
 
diff --git a/x11-themes/gnome-icons-refined/Makefile b/x11-themes/gnome-icons-refined/Makefile
index 4d377d88f91e..1222a0e63c4e 100644
--- a/x11-themes/gnome-icons-refined/Makefile
+++ b/x11-themes/gnome-icons-refined/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	refined
 PORTVERSION=	20030203
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Gnome-RH8
 
diff --git a/x11-themes/gnome-icons-slick/Makefile b/x11-themes/gnome-icons-slick/Makefile
index 5039beda84be..e7de64ce7233 100644
--- a/x11-themes/gnome-icons-slick/Makefile
+++ b/x11-themes/gnome-icons-slick/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	slick
 PORTVERSION=	20030209
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Slick
 
diff --git a/x11-themes/gnome-icons-snow-apple/Makefile b/x11-themes/gnome-icons-snow-apple/Makefile
index 11d7e4dfab94..fd469d13c286 100644
--- a/x11-themes/gnome-icons-snow-apple/Makefile
+++ b/x11-themes/gnome-icons-snow-apple/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	snow-apple
 PORTVERSION=	20030202
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Snow-Apple
 
diff --git a/x11-themes/gnome-icons-stylish/Makefile b/x11-themes/gnome-icons-stylish/Makefile
index b8f03c0d5f6b..5a1da70cd79d 100644
--- a/x11-themes/gnome-icons-stylish/Makefile
+++ b/x11-themes/gnome-icons-stylish/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	stylish
 PORTVERSION=	20030129
 PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Stylish
 
diff --git a/x11-themes/gnome-icons-ximian-south/Makefile b/x11-themes/gnome-icons-ximian-south/Makefile
index 2993924b1bca..3895b1803e20 100644
--- a/x11-themes/gnome-icons-ximian-south/Makefile
+++ b/x11-themes/gnome-icons-ximian-south/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	ximian-south
 PORTVERSION=	1.3.6
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Ximian-South-${PORTVERSION}
 
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index 2dd013f70e1e..4b9bfc30b9c0 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtk-engines
 PORTVERSION=	0.12
 PORTREVISION=	8
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtk-engines/0.12
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Theme engine for gtk+ toolkits
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 9c98f0049882..8dc7e4f64b5b 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gtk-engines2
 PORTVERSION=	2.16.1
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2