- 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)
author: araujo <araujo@FreeBSD.org> 2009-02-02 09:36:16 +0800
committer: araujo <araujo@FreeBSD.org> 2009-02-02 09:36:16 +0800
commit: 56fcc5f4afd03a3eb53f30b6fc8eca1afcdc623b (patch)
tree: 2510c2c5894eaaef9493d02e6ef64a10e9772205 /x11-toolkits
parent: ed6d9d787703496956d2f31c13fcf56be0ae3763 (diff)
download: freebsd-ports-gnome-56fcc5f4afd03a3eb53f30b6fc8eca1afcdc623b.tar.gz
freebsd-ports-gnome-56fcc5f4afd03a3eb53f30b6fc8eca1afcdc623b.tar.zst
freebsd-ports-gnome-56fcc5f4afd03a3eb53f30b6fc8eca1afcdc623b.zip
28 files changed, 28 insertions, 46 deletions
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index eabf67f22726..32d12466f41a 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gal
 PORTVERSION=	0.24
 PORTREVISION=	6
 CATEGORIES?=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.24
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 7adc4706dd12..2e29eed1026c 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gal2
 PORTVERSION=	2.5.3
 PORTREVISION?=	6
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index e06bfd277e11..1a27b7f2bedf 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnome-sharp
 PORTVERSION=	2.16.0
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.16
+MASTER_SITES=	GNOME
 
 MAINTAINER=	bsd-sharp@googlegroups.com
 COMMENT=	GNOME interfaces for the .NET runtime
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index fd6738881326..e28969ac9ac4 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gob
 PORTVERSION=	1.0.12
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gob/1.0
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A preprocessor for making GTK+ objects with inline C
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 9f57236d6067..267fa076f6a1 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gtk
 PORTVERSION=	1.2.10
 PORTREVISION=	20
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gtk+/1.2
 DISTNAME=	gtk+-${PORTVERSION}
 
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 1d4d590b6d7d..f8611fdb5732 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkglarea
 PORTVERSION=	1.99.0
 PORTREVISION=	11
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtkglarea/1.99
+MASTER_SITES=	GNOME
 DISTNAME=	gtkglarea-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 7a91844e0bd2..d9fbaad32ff7 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
 PORTREVISION=	8
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtkmm/1.2
+MASTER_SITES=	GNOME
 #DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 0e4df50f30ff..df949e7e4f98 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
 PORTREVISION?=	9
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME} \
+MASTER_SITES=	GNOME \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2 \
 		gtkmm
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 0e4df50f30ff..df949e7e4f98 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
 PORTREVISION?=	9
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME} \
+MASTER_SITES=	GNOME \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2 \
 		gtkmm
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index ce200ca4d53a..d5d98534f877 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gtksourceview
 PORTVERSION=	1.8.5
 PORTREVISION?=	4
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 0b4273c563c1..728749e891c7 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gtksourceview2
 PORTVERSION=	2.4.2
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
-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
diff --git a/x11-toolkits/hippo-canvas/Makefile b/x11-toolkits/hippo-canvas/Makefile
index d7b0d21c82e4..a33f775cac8c 100644
--- a/x11-toolkits/hippo-canvas/Makefile
+++ b/x11-toolkits/hippo-canvas/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	hippo-canvas
 PORTVERSION=	0.3.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	wahjava@gmail.com
 COMMENT=	A client stacker popup widget for GTK+ toolkit
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 0d2ef1f50b22..9e7cf34c38d6 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libbonoboui
 PORTVERSION=	2.24.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index 55623e746f6f..cb2f6dc0cefc 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libbonobouimm
 PORTVERSION=	1.3.7
 PORTREVISION=	10
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 4447b49a9ada..ce25a2af6bef 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libgnomeprintui
 PORTVERSION=	2.18.3
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index 3df2d7c9c87b..e0f4124f3f5c 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libgnomeprintuimm
 PORTVERSION=	2.5.2
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 8a23c20c90a8..d4435b4f1f90 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libgnomeui
 PORTVERSION=	2.24.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index a04438039e09..2bbc2d76bc11 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libgnomeuimm
 PORTVERSION=	2.24.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index ab6f23e01e51..11c74ea588e4 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libpanelappletmm
 PORTVERSION=	2.22.0
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index d8c55d5f4c72..f5f93bf21723 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libzvt
 PORTVERSION=	2.0.1
 PORTREVISION=	17
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index d1ddb461a5e6..e8c61109ead6 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	pangomm
 PORTVERSION=	2.14.1
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index f2de7e8508c8..51ddec0080ba 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gnome
 PORTVERSION=	2.24.1
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-desktop
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 655c04591ba7..e494fff56031 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gnome
 PORTVERSION=	2.19.1
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-extras
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index eda1d1cdce74..8cf336e32251 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	py-gnome
 PORTVERSION=	1.4.4
 PORTREVISION=	9
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
 DISTNAME=	gnome-python-${PORTVERSION}
 DIST_SUBDIR=	gnome
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index c65979fa2da9..1b9cd91b4e0c 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gnome
 PORTVERSION=	2.22.3
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	gnome-python-${PORTVERSION}
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index e848a46f6e25..d31d1347ffc9 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	py-gtk
 PORTVERSION=	0.6.11
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
+MASTER_SITES=	GNOME
 DISTNAME=	gnome-python-1.4.4
 DIST_SUBDIR=	gnome
 
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 0606876c2ea6..837371f7d625 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gtksourceview
 PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtksourceview-${PORTVERSION}
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index 3316fd61e708..22521c220d03 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	rep-gtk
 PORTVERSION=	0.15
 PORTREVISION=	7
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/rep-gtk/0.15
+MASTER_SITES=	GNOME
 #DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
author	araujo <araujo@FreeBSD.org>	2009-02-02 09:36:16 +0800
committer	araujo <araujo@FreeBSD.org>	2009-02-02 09:36:16 +0800
commit	56fcc5f4afd03a3eb53f30b6fc8eca1afcdc623b (patch)
tree	2510c2c5894eaaef9493d02e6ef64a10e9772205 /x11-toolkits
parent	ed6d9d787703496956d2f31c13fcf56be0ae3763 (diff)
download	freebsd-ports-gnome-56fcc5f4afd03a3eb53f30b6fc8eca1afcdc623b.tar.gz freebsd-ports-gnome-56fcc5f4afd03a3eb53f30b6fc8eca1afcdc623b.tar.zst freebsd-ports-gnome-56fcc5f4afd03a3eb53f30b6fc8eca1afcdc623b.zip