Update after MASTER_SITE_THEMES move to freshmeat. New subdir structure

and new filenames.

PR:		38032
Submitted by:	 Hendrik Scholz <hendrik@scholz.net>

66 files changed, 122 insertions, 124 deletions

diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index 3f9f6b8a1282..3b8e5060e71d 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	buffy
 PORTVERSION=	0.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	buffy-${PORTVERSION}-1.2-199908211221
+MASTER_SITE_SUBDIR= buffy02
+DISTNAME=	buffy02-1.2
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/x11-themes/buffy/distinfo b/x11-themes/buffy/distinfo
index 75837720da3b..6b605a9bc75f 100644
--- a/x11-themes/buffy/distinfo
+++ b/x11-themes/buffy/distinfo
@@ -1 +1 @@
-MD5 (buffy-0.2-1.2-199908211221.tar.gz) = 8124ebe688d117b272624770c95276e2
+MD5 (buffy02-1.2.tar.gz) = 8124ebe688d117b272624770c95276e2
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index 29470b931f9f..678b355a57b9 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	clean-theme-gtk
-PORTVERSION=	200103022011
+PORTVERSION=	1.2.x
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	clean-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= clean___
+DISTNAME=	clean___-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/x11-themes/clean-theme-gtk/distinfo b/x11-themes/clean-theme-gtk/distinfo
index d9c772269351..8d408e3ca053 100644
--- a/x11-themes/clean-theme-gtk/distinfo
+++ b/x11-themes/clean-theme-gtk/distinfo
@@ -1 +1 @@
-MD5 (clean-1.2.x-200103022011.tar.gz) = 17c3b918edb5c9b90301cb73e486433c
+MD5 (clean___-1.2.x.tar.gz) = 17c3b918edb5c9b90301cb73e486433c
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 42fdfb6dbfd0..fb2afd66c846 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	colorstep
-PORTVERSION=	200011041447
+PORTVERSION=    0.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	ColorStep-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR=	colorstep
+DISTNAME=	${PORTNAME}-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-themes/colorstep/distinfo b/x11-themes/colorstep/distinfo
index eb7d0087c007..103f788a1e52 100644
--- a/x11-themes/colorstep/distinfo
+++ b/x11-themes/colorstep/distinfo
@@ -1 +1 @@
-MD5 (ColorStep-1.2.x-200011041447.tar.gz) = a28ecd36f2650cc5fc89bd738556a191
+MD5 (colorstep-1.2.x.tar.gz) = a28ecd36f2650cc5fc89bd738556a191
diff --git a/x11-themes/colorstep/pkg-comment b/x11-themes/colorstep/pkg-comment
index 71f5cc59972f..c1c06206ed0e 100644
--- a/x11-themes/colorstep/pkg-comment
+++ b/x11-themes/colorstep/pkg-comment
@@ -1 +1 @@
-A theme engine based on GtkStep and Step-pastel to make GTK+ look nicier
+A theme engine based on GtkStep and Step-pastel
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index 9f5d17c700dc..b059ca6d5927 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	engradient
-PORTVERSION=	200011051535
+PORTVERSION=	0.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	EnGradient-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR=	engradient
+DISTNAME=	${PORTNAME}-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.5
+WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-themes/engradient/distinfo b/x11-themes/engradient/distinfo
index e82dabc2396e..d61ddf40e9c2 100644
--- a/x11-themes/engradient/distinfo
+++ b/x11-themes/engradient/distinfo
@@ -1 +1 @@
-MD5 (EnGradient-1.2.x-200011051535.tar.gz) = 6d7fe812e13a3429f3256374b18267f1
+MD5 (engradient-1.2.x.tar.gz) = 6d7fe812e13a3429f3256374b18267f1
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index 1cab7d6bca19..1b40d526065c 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	gtk-Mac2-theme
 PORTVERSION=	200003050858
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Mac2-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= mac2
+DISTNAME=	mac2-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-themes/gtk-Mac2-theme/distinfo b/x11-themes/gtk-Mac2-theme/distinfo
index 607757a3bf51..f8c15eb40404 100644
--- a/x11-themes/gtk-Mac2-theme/distinfo
+++ b/x11-themes/gtk-Mac2-theme/distinfo
@@ -1 +1 @@
-MD5 (Mac2-1.2.x-200003050858.tar.gz) = 168499ad46923b8382dc8f2118ea1878
+MD5 (mac2-1.2.x.tar.gz) = 168499ad46923b8382dc8f2118ea1878
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index 2b14e3c81ce9..46054c28c259 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	gtk-flat-theme
-PORTVERSION=	200010301024
+PORTVERSION=	0.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Flat-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR=	flat
+DISTNAME=	flat-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-themes/gtk-flat-theme/distinfo b/x11-themes/gtk-flat-theme/distinfo
index 5b38fee6c2e9..22dad259c008 100644
--- a/x11-themes/gtk-flat-theme/distinfo
+++ b/x11-themes/gtk-flat-theme/distinfo
@@ -1 +1 @@
-MD5 (Flat-1.2.x-200010301024.tar.gz) = 5b9e6c974c2417b5793b5c930be29f5d
+MD5 (flat-1.2.x.tar.gz) = 5b9e6c974c2417b5793b5c930be29f5d
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index 2b14e3c81ce9..46054c28c259 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	gtk-flat-theme
-PORTVERSION=	200010301024
+PORTVERSION=	0.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Flat-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR=	flat
+DISTNAME=	flat-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-themes/gtk-flat-theme2/distinfo b/x11-themes/gtk-flat-theme2/distinfo
index 5b38fee6c2e9..22dad259c008 100644
--- a/x11-themes/gtk-flat-theme2/distinfo
+++ b/x11-themes/gtk-flat-theme2/distinfo
@@ -1 +1 @@
-MD5 (Flat-1.2.x-200010301024.tar.gz) = 5b9e6c974c2417b5793b5c930be29f5d
+MD5 (flat-1.2.x.tar.gz) = 5b9e6c974c2417b5793b5c930be29f5d
diff --git a/x11-themes/gtk-qn-x11-theme/Makefile b/x11-themes/gtk-qn-x11-theme/Makefile
index 12f57b8e055e..b335ea197fda 100644
--- a/x11-themes/gtk-qn-x11-theme/Makefile
+++ b/x11-themes/gtk-qn-x11-theme/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gtk-qn-x11-theme
 PORTVERSION=	0.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.freshmeat.net/themes/qnx11__/
+MASTER_SITES=	${MASTER_SITE_THEMES}
+MASTER_SITE_SUBDIR=	qnx11__
 DISTNAME=	qnx11__-1.2.x
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/x11-themes/gtk-zenith-theme/Makefile b/x11-themes/gtk-zenith-theme/Makefile
index c507761f063f..5dd301f3b50a 100644
--- a/x11-themes/gtk-zenith-theme/Makefile
+++ b/x11-themes/gtk-zenith-theme/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	gtk-zenith-theme
 PORTVERSION=	1.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Zenith-1.2-199909251951
+MASTER_SITE_SUBDIR=	zenith
+DISTNAME=	zenith-1.2
 
 MAINTAINER=	olgeni@FreeBSD.org
 
diff --git a/x11-themes/gtk-zenith-theme/distinfo b/x11-themes/gtk-zenith-theme/distinfo
index 954463f1a712..cb5ce3a40e57 100644
--- a/x11-themes/gtk-zenith-theme/distinfo
+++ b/x11-themes/gtk-zenith-theme/distinfo
@@ -1 +1 @@
-MD5 (Zenith-1.2-199909251951.tar.gz) = f4dba97979f4d053f34da12a14b33cd3
+MD5 (zenith-1.2.tar.gz) = f4dba97979f4d053f34da12a14b33cd3
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index af3a34ff6fb7..c11b2450b925 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	gtkbe
 PORTVERSION=	200007091019
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	GTK-Be-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= gtkbe
+DISTNAME=	gtkbe-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-themes/gtkbe/distinfo b/x11-themes/gtkbe/distinfo
index 25c979af5cd0..b7c6d1a1c4c5 100644
--- a/x11-themes/gtkbe/distinfo
+++ b/x11-themes/gtkbe/distinfo
@@ -1 +1 @@
-MD5 (GTK-Be-1.2.x-200007091019.tar.gz) = ff31c74c4e411a2083a8af8d466c1fb2
+MD5 (gtkbe-1.2.x.tar.gz) = ff31c74c4e411a2083a8af8d466c1fb2
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index eb85cfa6708c..0dacbb38ce13 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	gtkstep-pastel
-PORTVERSION=	200007290343
+PORTVERSION=    0.10.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	${PORTNAME}-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= gtksteppastel
+DISTNAME=	gtksteppastel-1.2.x
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.10.1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-themes/gtkstep-pastel/distinfo b/x11-themes/gtkstep-pastel/distinfo
index 19a5b523a6f3..2a4de6c21afd 100644
--- a/x11-themes/gtkstep-pastel/distinfo
+++ b/x11-themes/gtkstep-pastel/distinfo
@@ -1 +1 @@
-MD5 (gtkstep-pastel-1.2.x-200007290343.tar.gz) = dd53a9fe80bed02e989311ba70440bfa
+MD5 (gtksteppastel-1.2.x.tar.gz) = dd53a9fe80bed02e989311ba70440bfa
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index f6c8c69e2c8e..5b0e35aaacbe 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	notif2
 PORTVERSION=	1.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Notif2-${PORTVERSION}-${GTKVERSION}-199908211219
+MASTER_SITE_SUBDIR=	notif210
+DISTNAME=	notif210-${GTKVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-themes/notif2/distinfo b/x11-themes/notif2/distinfo
index bbf5599416e7..0aa7144cccfb 100644
--- a/x11-themes/notif2/distinfo
+++ b/x11-themes/notif2/distinfo
@@ -1 +1 @@
-MD5 (Notif2-1.0-1.2-199908211219.tar.gz) = e117977d4d15e070da519b431045b701
+MD5 (notif210-1.2.tar.gz) = e117977d4d15e070da519b431045b701
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index b0f6e3925ee6..d02bd529e386 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -8,11 +8,9 @@
 PORTNAME=	thinice
 PORTVERSION=	1.0.4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_THEMES} \
-		http://www.ing.umu.se/~stric/theme/
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	ThinIce-1.2.x-200104091453
-#DISTNAME=	gtk-${PORTNAME}-theme-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_THEMES}
+MASTER_SITE_SUBDIR= thinice
+DISTNAME=	thinice-1.2.x
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/x11-themes/thinice/distinfo b/x11-themes/thinice/distinfo
index e40d5645b9d1..2737015d5725 100644
--- a/x11-themes/thinice/distinfo
+++ b/x11-themes/thinice/distinfo
@@ -1 +1 @@
-MD5 (ThinIce-1.2.x-200104091453.tar.gz) = f2b6e8f4c3ea3710e27a59195f2abc9a
+MD5 (thinice-1.2.x.tar.gz) = f2b6e8f4c3ea3710e27a59195f2abc9a
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index 8426bc2d2e58..4100007bb82f 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	WhistlerK
 PORTVERSION=	200010142358
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	${PORTNAME}-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= whistlerk
+DISTNAME=	whistlerk-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-themes/whistlerk/distinfo b/x11-themes/whistlerk/distinfo
index e51b92354fa5..e66f1b555145 100644
--- a/x11-themes/whistlerk/distinfo
+++ b/x11-themes/whistlerk/distinfo
@@ -1 +1 @@
-MD5 (WhistlerK-1.2.x-200010142358.tar.gz) = 23a4ab5a4d67f0e70ef2853ab48b6721
+MD5 (whistlerk-1.2.x.tar.gz) = 23a4ab5a4d67f0e70ef2853ab48b6721
diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile
index 1eaa8383faac..9e4a74d5b3a3 100644
--- a/x11-themes/xenophilia/Makefile
+++ b/x11-themes/xenophilia/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	xenophilia
-PORTVERSION=	200105061008
+PORTVERSION=    0.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Xenophilia-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= xenophilia
+DISTNAME=	xenophilia-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-themes/xenophilia/distinfo b/x11-themes/xenophilia/distinfo
index 04af2303ed61..cd7131ef1623 100644
--- a/x11-themes/xenophilia/distinfo
+++ b/x11-themes/xenophilia/distinfo
@@ -1 +1 @@
-MD5 (Xenophilia-1.2.x-200105061008.tar.gz) = c6bc873959a4ea299c0c80d10f7dd109
+MD5 (xenophilia-1.2.x.tar.gz) = c6bc873959a4ea299c0c80d10f7dd109
diff --git a/x11-themes/xenostep/Makefile b/x11-themes/xenostep/Makefile
index a566e4e1dd78..f61f89777825 100644
--- a/x11-themes/xenostep/Makefile
+++ b/x11-themes/xenostep/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	200011270836
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	XenoStep-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= xenostep
+DISTNAME=	${PORTNAME}-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-themes/xenostep/distinfo b/x11-themes/xenostep/distinfo
index 3874cde003dc..08624f6b08b7 100644
--- a/x11-themes/xenostep/distinfo
+++ b/x11-themes/xenostep/distinfo
@@ -1 +1 @@
-MD5 (XenoStep-1.2.x-200011270836.tar.gz) = d6b0020ca47b30acc937ce24d39d4a06
+MD5 (xenostep-1.2.x.tar.gz) = d6b0020ca47b30acc937ce24d39d4a06
diff --git a/x11-themes/xenostep/pkg-comment b/x11-themes/xenostep/pkg-comment
index 677bea0bdd82..69ccab35401d 100644
--- a/x11-themes/xenostep/pkg-comment
+++ b/x11-themes/xenostep/pkg-comment
@@ -1 +1 @@
-A GTK+ theme engine based on the Xenophilia and Interface theme engines
+A GTK+ theme engine based on the Xenophilia and Interface engines
diff --git a/x11-toolkits/buffy/Makefile b/x11-toolkits/buffy/Makefile
index 3f9f6b8a1282..3b8e5060e71d 100644
--- a/x11-toolkits/buffy/Makefile
+++ b/x11-toolkits/buffy/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	buffy
 PORTVERSION=	0.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	buffy-${PORTVERSION}-1.2-199908211221
+MASTER_SITE_SUBDIR= buffy02
+DISTNAME=	buffy02-1.2
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/x11-toolkits/buffy/distinfo b/x11-toolkits/buffy/distinfo
index 75837720da3b..6b605a9bc75f 100644
--- a/x11-toolkits/buffy/distinfo
+++ b/x11-toolkits/buffy/distinfo
@@ -1 +1 @@
-MD5 (buffy-0.2-1.2-199908211221.tar.gz) = 8124ebe688d117b272624770c95276e2
+MD5 (buffy02-1.2.tar.gz) = 8124ebe688d117b272624770c95276e2
diff --git a/x11-toolkits/clean-theme-gtk/Makefile b/x11-toolkits/clean-theme-gtk/Makefile
index 29470b931f9f..678b355a57b9 100644
--- a/x11-toolkits/clean-theme-gtk/Makefile
+++ b/x11-toolkits/clean-theme-gtk/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	clean-theme-gtk
-PORTVERSION=	200103022011
+PORTVERSION=	1.2.x
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	clean-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= clean___
+DISTNAME=	clean___-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/x11-toolkits/clean-theme-gtk/distinfo b/x11-toolkits/clean-theme-gtk/distinfo
index d9c772269351..8d408e3ca053 100644
--- a/x11-toolkits/clean-theme-gtk/distinfo
+++ b/x11-toolkits/clean-theme-gtk/distinfo
@@ -1 +1 @@
-MD5 (clean-1.2.x-200103022011.tar.gz) = 17c3b918edb5c9b90301cb73e486433c
+MD5 (clean___-1.2.x.tar.gz) = 17c3b918edb5c9b90301cb73e486433c
diff --git a/x11-toolkits/colorstep/Makefile b/x11-toolkits/colorstep/Makefile
index 42fdfb6dbfd0..fb2afd66c846 100644
--- a/x11-toolkits/colorstep/Makefile
+++ b/x11-toolkits/colorstep/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	colorstep
-PORTVERSION=	200011041447
+PORTVERSION=    0.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	ColorStep-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR=	colorstep
+DISTNAME=	${PORTNAME}-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-toolkits/colorstep/distinfo b/x11-toolkits/colorstep/distinfo
index eb7d0087c007..103f788a1e52 100644
--- a/x11-toolkits/colorstep/distinfo
+++ b/x11-toolkits/colorstep/distinfo
@@ -1 +1 @@
-MD5 (ColorStep-1.2.x-200011041447.tar.gz) = a28ecd36f2650cc5fc89bd738556a191
+MD5 (colorstep-1.2.x.tar.gz) = a28ecd36f2650cc5fc89bd738556a191
diff --git a/x11-toolkits/colorstep/pkg-comment b/x11-toolkits/colorstep/pkg-comment
index 71f5cc59972f..c1c06206ed0e 100644
--- a/x11-toolkits/colorstep/pkg-comment
+++ b/x11-toolkits/colorstep/pkg-comment
@@ -1 +1 @@
-A theme engine based on GtkStep and Step-pastel to make GTK+ look nicier
+A theme engine based on GtkStep and Step-pastel
diff --git a/x11-toolkits/engradient/Makefile b/x11-toolkits/engradient/Makefile
index 9f5d17c700dc..b059ca6d5927 100644
--- a/x11-toolkits/engradient/Makefile
+++ b/x11-toolkits/engradient/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	engradient
-PORTVERSION=	200011051535
+PORTVERSION=	0.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	EnGradient-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR=	engradient
+DISTNAME=	${PORTNAME}-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.5
+WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-toolkits/engradient/distinfo b/x11-toolkits/engradient/distinfo
index e82dabc2396e..d61ddf40e9c2 100644
--- a/x11-toolkits/engradient/distinfo
+++ b/x11-toolkits/engradient/distinfo
@@ -1 +1 @@
-MD5 (EnGradient-1.2.x-200011051535.tar.gz) = 6d7fe812e13a3429f3256374b18267f1
+MD5 (engradient-1.2.x.tar.gz) = 6d7fe812e13a3429f3256374b18267f1
diff --git a/x11-toolkits/gtk-Mac2-theme/Makefile b/x11-toolkits/gtk-Mac2-theme/Makefile
index 1cab7d6bca19..1b40d526065c 100644
--- a/x11-toolkits/gtk-Mac2-theme/Makefile
+++ b/x11-toolkits/gtk-Mac2-theme/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	gtk-Mac2-theme
 PORTVERSION=	200003050858
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Mac2-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= mac2
+DISTNAME=	mac2-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-toolkits/gtk-Mac2-theme/distinfo b/x11-toolkits/gtk-Mac2-theme/distinfo
index 607757a3bf51..f8c15eb40404 100644
--- a/x11-toolkits/gtk-Mac2-theme/distinfo
+++ b/x11-toolkits/gtk-Mac2-theme/distinfo
@@ -1 +1 @@
-MD5 (Mac2-1.2.x-200003050858.tar.gz) = 168499ad46923b8382dc8f2118ea1878
+MD5 (mac2-1.2.x.tar.gz) = 168499ad46923b8382dc8f2118ea1878
diff --git a/x11-toolkits/gtk-flat-theme/Makefile b/x11-toolkits/gtk-flat-theme/Makefile
index 2b14e3c81ce9..46054c28c259 100644
--- a/x11-toolkits/gtk-flat-theme/Makefile
+++ b/x11-toolkits/gtk-flat-theme/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	gtk-flat-theme
-PORTVERSION=	200010301024
+PORTVERSION=	0.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Flat-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR=	flat
+DISTNAME=	flat-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-toolkits/gtk-flat-theme/distinfo b/x11-toolkits/gtk-flat-theme/distinfo
index 5b38fee6c2e9..22dad259c008 100644
--- a/x11-toolkits/gtk-flat-theme/distinfo
+++ b/x11-toolkits/gtk-flat-theme/distinfo
@@ -1 +1 @@
-MD5 (Flat-1.2.x-200010301024.tar.gz) = 5b9e6c974c2417b5793b5c930be29f5d
+MD5 (flat-1.2.x.tar.gz) = 5b9e6c974c2417b5793b5c930be29f5d
diff --git a/x11-toolkits/gtk-flat-theme2/Makefile b/x11-toolkits/gtk-flat-theme2/Makefile
index 2b14e3c81ce9..46054c28c259 100644
--- a/x11-toolkits/gtk-flat-theme2/Makefile
+++ b/x11-toolkits/gtk-flat-theme2/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	gtk-flat-theme
-PORTVERSION=	200010301024
+PORTVERSION=	0.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Flat-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR=	flat
+DISTNAME=	flat-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-toolkits/gtk-flat-theme2/distinfo b/x11-toolkits/gtk-flat-theme2/distinfo
index 5b38fee6c2e9..22dad259c008 100644
--- a/x11-toolkits/gtk-flat-theme2/distinfo
+++ b/x11-toolkits/gtk-flat-theme2/distinfo
@@ -1 +1 @@
-MD5 (Flat-1.2.x-200010301024.tar.gz) = 5b9e6c974c2417b5793b5c930be29f5d
+MD5 (flat-1.2.x.tar.gz) = 5b9e6c974c2417b5793b5c930be29f5d
diff --git a/x11-toolkits/gtk-qn-x11-theme/Makefile b/x11-toolkits/gtk-qn-x11-theme/Makefile
index 12f57b8e055e..b335ea197fda 100644
--- a/x11-toolkits/gtk-qn-x11-theme/Makefile
+++ b/x11-toolkits/gtk-qn-x11-theme/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gtk-qn-x11-theme
 PORTVERSION=	0.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.freshmeat.net/themes/qnx11__/
+MASTER_SITES=	${MASTER_SITE_THEMES}
+MASTER_SITE_SUBDIR=	qnx11__
 DISTNAME=	qnx11__-1.2.x
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/x11-toolkits/gtk-zenith-theme/Makefile b/x11-toolkits/gtk-zenith-theme/Makefile
index c507761f063f..5dd301f3b50a 100644
--- a/x11-toolkits/gtk-zenith-theme/Makefile
+++ b/x11-toolkits/gtk-zenith-theme/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	gtk-zenith-theme
 PORTVERSION=	1.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Zenith-1.2-199909251951
+MASTER_SITE_SUBDIR=	zenith
+DISTNAME=	zenith-1.2
 
 MAINTAINER=	olgeni@FreeBSD.org
 
diff --git a/x11-toolkits/gtk-zenith-theme/distinfo b/x11-toolkits/gtk-zenith-theme/distinfo
index 954463f1a712..cb5ce3a40e57 100644
--- a/x11-toolkits/gtk-zenith-theme/distinfo
+++ b/x11-toolkits/gtk-zenith-theme/distinfo
@@ -1 +1 @@
-MD5 (Zenith-1.2-199909251951.tar.gz) = f4dba97979f4d053f34da12a14b33cd3
+MD5 (zenith-1.2.tar.gz) = f4dba97979f4d053f34da12a14b33cd3
diff --git a/x11-toolkits/gtkbe/Makefile b/x11-toolkits/gtkbe/Makefile
index af3a34ff6fb7..c11b2450b925 100644
--- a/x11-toolkits/gtkbe/Makefile
+++ b/x11-toolkits/gtkbe/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	gtkbe
 PORTVERSION=	200007091019
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	GTK-Be-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= gtkbe
+DISTNAME=	gtkbe-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-toolkits/gtkbe/distinfo b/x11-toolkits/gtkbe/distinfo
index 25c979af5cd0..b7c6d1a1c4c5 100644
--- a/x11-toolkits/gtkbe/distinfo
+++ b/x11-toolkits/gtkbe/distinfo
@@ -1 +1 @@
-MD5 (GTK-Be-1.2.x-200007091019.tar.gz) = ff31c74c4e411a2083a8af8d466c1fb2
+MD5 (gtkbe-1.2.x.tar.gz) = ff31c74c4e411a2083a8af8d466c1fb2
diff --git a/x11-toolkits/gtkstep-pastel/Makefile b/x11-toolkits/gtkstep-pastel/Makefile
index eb85cfa6708c..0dacbb38ce13 100644
--- a/x11-toolkits/gtkstep-pastel/Makefile
+++ b/x11-toolkits/gtkstep-pastel/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	gtkstep-pastel
-PORTVERSION=	200007290343
+PORTVERSION=    0.10.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	${PORTNAME}-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= gtksteppastel
+DISTNAME=	gtksteppastel-1.2.x
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.10.1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-toolkits/gtkstep-pastel/distinfo b/x11-toolkits/gtkstep-pastel/distinfo
index 19a5b523a6f3..2a4de6c21afd 100644
--- a/x11-toolkits/gtkstep-pastel/distinfo
+++ b/x11-toolkits/gtkstep-pastel/distinfo
@@ -1 +1 @@
-MD5 (gtkstep-pastel-1.2.x-200007290343.tar.gz) = dd53a9fe80bed02e989311ba70440bfa
+MD5 (gtksteppastel-1.2.x.tar.gz) = dd53a9fe80bed02e989311ba70440bfa
diff --git a/x11-toolkits/notif2/Makefile b/x11-toolkits/notif2/Makefile
index f6c8c69e2c8e..5b0e35aaacbe 100644
--- a/x11-toolkits/notif2/Makefile
+++ b/x11-toolkits/notif2/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	notif2
 PORTVERSION=	1.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Notif2-${PORTVERSION}-${GTKVERSION}-199908211219
+MASTER_SITE_SUBDIR=	notif210
+DISTNAME=	notif210-${GTKVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-toolkits/notif2/distinfo b/x11-toolkits/notif2/distinfo
index bbf5599416e7..0aa7144cccfb 100644
--- a/x11-toolkits/notif2/distinfo
+++ b/x11-toolkits/notif2/distinfo
@@ -1 +1 @@
-MD5 (Notif2-1.0-1.2-199908211219.tar.gz) = e117977d4d15e070da519b431045b701
+MD5 (notif210-1.2.tar.gz) = e117977d4d15e070da519b431045b701
diff --git a/x11-toolkits/thinice/Makefile b/x11-toolkits/thinice/Makefile
index b0f6e3925ee6..d02bd529e386 100644
--- a/x11-toolkits/thinice/Makefile
+++ b/x11-toolkits/thinice/Makefile
@@ -8,11 +8,9 @@
 PORTNAME=	thinice
 PORTVERSION=	1.0.4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_THEMES} \
-		http://www.ing.umu.se/~stric/theme/
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	ThinIce-1.2.x-200104091453
-#DISTNAME=	gtk-${PORTNAME}-theme-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_THEMES}
+MASTER_SITE_SUBDIR= thinice
+DISTNAME=	thinice-1.2.x
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/x11-toolkits/thinice/distinfo b/x11-toolkits/thinice/distinfo
index e40d5645b9d1..2737015d5725 100644
--- a/x11-toolkits/thinice/distinfo
+++ b/x11-toolkits/thinice/distinfo
@@ -1 +1 @@
-MD5 (ThinIce-1.2.x-200104091453.tar.gz) = f2b6e8f4c3ea3710e27a59195f2abc9a
+MD5 (thinice-1.2.x.tar.gz) = f2b6e8f4c3ea3710e27a59195f2abc9a
diff --git a/x11-toolkits/whistlerk/Makefile b/x11-toolkits/whistlerk/Makefile
index 8426bc2d2e58..4100007bb82f 100644
--- a/x11-toolkits/whistlerk/Makefile
+++ b/x11-toolkits/whistlerk/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	WhistlerK
 PORTVERSION=	200010142358
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	${PORTNAME}-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= whistlerk
+DISTNAME=	whistlerk-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-toolkits/whistlerk/distinfo b/x11-toolkits/whistlerk/distinfo
index e51b92354fa5..e66f1b555145 100644
--- a/x11-toolkits/whistlerk/distinfo
+++ b/x11-toolkits/whistlerk/distinfo
@@ -1 +1 @@
-MD5 (WhistlerK-1.2.x-200010142358.tar.gz) = 23a4ab5a4d67f0e70ef2853ab48b6721
+MD5 (whistlerk-1.2.x.tar.gz) = 23a4ab5a4d67f0e70ef2853ab48b6721
diff --git a/x11-toolkits/xenophilia/Makefile b/x11-toolkits/xenophilia/Makefile
index 1eaa8383faac..9e4a74d5b3a3 100644
--- a/x11-toolkits/xenophilia/Makefile
+++ b/x11-toolkits/xenophilia/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	xenophilia
-PORTVERSION=	200105061008
+PORTVERSION=    0.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	Xenophilia-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= xenophilia
+DISTNAME=	xenophilia-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-toolkits/xenophilia/distinfo b/x11-toolkits/xenophilia/distinfo
index 04af2303ed61..cd7131ef1623 100644
--- a/x11-toolkits/xenophilia/distinfo
+++ b/x11-toolkits/xenophilia/distinfo
@@ -1 +1 @@
-MD5 (Xenophilia-1.2.x-200105061008.tar.gz) = c6bc873959a4ea299c0c80d10f7dd109
+MD5 (xenophilia-1.2.x.tar.gz) = c6bc873959a4ea299c0c80d10f7dd109
diff --git a/x11-toolkits/xenostep/Makefile b/x11-toolkits/xenostep/Makefile
index a566e4e1dd78..f61f89777825 100644
--- a/x11-toolkits/xenostep/Makefile
+++ b/x11-toolkits/xenostep/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	200011270836
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk
-DISTNAME=	XenoStep-1.2.x-${PORTVERSION}
+MASTER_SITE_SUBDIR= xenostep
+DISTNAME=	${PORTNAME}-1.2.x
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-toolkits/xenostep/distinfo b/x11-toolkits/xenostep/distinfo
index 3874cde003dc..08624f6b08b7 100644
--- a/x11-toolkits/xenostep/distinfo
+++ b/x11-toolkits/xenostep/distinfo
@@ -1 +1 @@
-MD5 (XenoStep-1.2.x-200011270836.tar.gz) = d6b0020ca47b30acc937ce24d39d4a06
+MD5 (xenostep-1.2.x.tar.gz) = d6b0020ca47b30acc937ce24d39d4a06
diff --git a/x11-toolkits/xenostep/pkg-comment b/x11-toolkits/xenostep/pkg-comment
index 677bea0bdd82..69ccab35401d 100644
--- a/x11-toolkits/xenostep/pkg-comment
+++ b/x11-toolkits/xenostep/pkg-comment
@@ -1 +1 @@
-A GTK+ theme engine based on the Xenophilia and Interface theme engines
+A GTK+ theme engine based on the Xenophilia and Interface engines