- Move to new category x11-themes.

PR:		ports/67478
Submitted by:	pav
Repocopy by:	marcus

19 files changed, 12 insertions, 119 deletions

diff --git a/MOVED b/MOVED
index 56ba4a69586d..2dae3c70805f 100644
--- a/MOVED
+++ b/MOVED
@@ -1129,3 +1129,6 @@ x11-wm/qinx|x11-themes/qinx|2004-06-02|new category
 x11-wm/qnxstyle|x11-themes/qnxstyle|2004-06-02|new category
 x11-wm/sapphire-themes|x11-themes/sapphire-themes|2004-06-02|new category
 x11-toolkits/gtk-qt-engine|x11-themes/gtk-qt-engine|2004-06-02|new category
+x11-toolkits/gtkbe|x11-themes/gtkbe|2004-06-02|new category
+x11-toolkits/gtkstep|x11-themes/gtkstep|2004-06-02|new category
+x11-toolkits/gtkstep-pastel|x11-themes/gtkstep-pastel|2004-06-02|new category
diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index 4a19e8d935f0..5620c17d7a10 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -43,6 +43,9 @@
     SUBDIR += gtk-smooth-engine
     SUBDIR += gtk-xfce-engine
     SUBDIR += gtk-zenith-theme
+    SUBDIR += gtkbe
+    SUBDIR += gtkstep
+    SUBDIR += gtkstep-pastel
     SUBDIR += icegradient
     SUBDIR += kde-icons-amaranth
     SUBDIR += kde-icons-amaranth-althaea
diff --git a/x11-themes/gtk-engines-collection/Makefile b/x11-themes/gtk-engines-collection/Makefile
index 2c4961f47d73..7462f677adb5 100644
--- a/x11-themes/gtk-engines-collection/Makefile
+++ b/x11-themes/gtk-engines-collection/Makefile
@@ -22,13 +22,13 @@ RUN_DEPENDS=	${THEMESBASE}/libbuffy.so:${PORTSDIR}/x11-themes/buffy \
 		${THEMESBASE}/libengradient.so:${PORTSDIR}/x11-themes/engradient \
 		${THEMESBASE}/libflat.so:${PORTSDIR}/x11-themes/gtk-flat-theme \
 		${THEMESBASE}/libgnomelook.so:${PORTSDIR}/x11-themes/gnome-look \
-		${THEMESBASE}/libgtkbe.so:${THEMESPORTDIR}/gtkbe \
+		${THEMESBASE}/libgtkbe.so:${PORTSDIR}/x11-themes/gtkbe \
 		${THEMESBASE}/libicegradient.so:${PORTSDIR}/x11-themes/icegradient \
 		${THEMESBASE}/libmac2.so:${PORTSDIR}/x11-themes/gtk-Mac2-theme \
 		${THEMESBASE}/libpixmap.so:${PORTSDIR}/x11-themes/gtk-engines \
 		${THEMESBASE}/libqnx.so:${PORTSDIR}/x11-themes/gtk-qn-x11-theme \
-		${THEMESBASE}/libstep.so:${THEMESPORTDIR}/gtkstep \
-		${THEMESBASE}/libsteppastel.so:${THEMESPORTDIR}/gtkstep-pastel \
+		${THEMESBASE}/libstep.so:${PORTSDIR}/x11-themes/gtkstep \
+		${THEMESBASE}/libsteppastel.so:${PORTSDIR}/x11-themes/gtkstep-pastel \
 		${THEMESBASE}/libzenith.so:${PORTSDIR}/gtk-zenith-theme \
 		${THEMESBASE}/libthinice.so:${PORTSDIR}/x11-themes/thinice \
 		${THEMESBASE}/libXenoStep.so:${PORTSDIR}/x11-themes/xenostep \
@@ -36,7 +36,6 @@ RUN_DEPENDS=	${THEMESBASE}/libbuffy.so:${PORTSDIR}/x11-themes/buffy \
 		${THEMESBASE}/libwhistler.so:${PORTSDIR}/x11-themes/whistlerk
 
 THEMESBASE=	${X11BASE}/lib/gtk/themes/engines
-THEMESPORTDIR=	${PORTSDIR}/x11-toolkits
 
 NO_BUILD=	yes
 
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index 5797abaefdfe..6e0210860ed5 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gtkbe
 PORTVERSION=	200007091019
 PORTREVISION=	1
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	gtkbe
 DISTNAME=	gtkbe-1.2.x
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index d7a952ef8c55..695e666969c6 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gtkstep-pastel
 PORTVERSION=	0.10.1
 PORTREVISION=	1
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	gtksteppastel
 DISTNAME=	gtksteppastel-1.2.x
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 45152a994b6c..6376f890002b 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gtkstep
 PORTVERSION=	2.2
 PORTREVISION=	1
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/gtk-engines-gtkstep
 DISTNAME=	gtk-engines-${PORTNAME}_${PORTVERSION}.orig
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index ea39e0bf0386..0dd8ec3dd28f 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -43,7 +43,6 @@
     SUBDIR += gtk20
     SUBDIR += gtk20-apireference
     SUBDIR += gtkada
-    SUBDIR += gtkbe
     SUBDIR += gtkdatabox
     SUBDIR += gtkextra
     SUBDIR += gtkextra--
@@ -55,8 +54,6 @@
     SUBDIR += gtkmathview
     SUBDIR += gtkscintilla
     SUBDIR += gtksourceview
-    SUBDIR += gtkstep
-    SUBDIR += gtkstep-pastel
     SUBDIR += gtoolkit
     SUBDIR += guile-gnome
     SUBDIR += guile-gtk
diff --git a/x11-toolkits/gtkbe/Makefile b/x11-toolkits/gtkbe/Makefile
deleted file mode 100644
index 5797abaefdfe..000000000000
--- a/x11-toolkits/gtkbe/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	gtkbe
-# Date Created:				6 July 2000
-# Whom:				 	Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gtkbe
-PORTVERSION=	200007091019
-PORTREVISION=	1
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtkbe
-DISTNAME=	gtkbe-1.2.x
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	BeOS look-alike GTK+ theme engine
-
-WRKSRC=		${WRKDIR}/GTKBeEngine
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
-USE_GMAKE=	yes
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkbe/distinfo b/x11-toolkits/gtkbe/distinfo
deleted file mode 100644
index 4ab0cec4bef4..000000000000
--- a/x11-toolkits/gtkbe/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gtkbe-1.2.x.tar.gz) = ff31c74c4e411a2083a8af8d466c1fb2
-SIZE (gtkbe-1.2.x.tar.gz) = 144191
diff --git a/x11-toolkits/gtkbe/pkg-descr b/x11-toolkits/gtkbe/pkg-descr
deleted file mode 100644
index caa59fb8c78b..000000000000
--- a/x11-toolkits/gtkbe/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A BeOS look-alike GTK+ theme engine.
-
-WWW: http://themes.freshmeat.net/projects/gtkbe/
diff --git a/x11-toolkits/gtkbe/pkg-plist b/x11-toolkits/gtkbe/pkg-plist
deleted file mode 100644
index eec881230cec..000000000000
--- a/x11-toolkits/gtkbe/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/gtk/themes/engines/libgtkbe.so
-share/themes/GTKBe/ICON.png
-share/themes/GTKBe/README.html
-share/themes/GTKBe/gtk/gtkrc
-@dirrm share/themes/GTKBe/gtk
-@dirrm share/themes/GTKBe
diff --git a/x11-toolkits/gtkstep-pastel/Makefile b/x11-toolkits/gtkstep-pastel/Makefile
deleted file mode 100644
index d7a952ef8c55..000000000000
--- a/x11-toolkits/gtkstep-pastel/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	gtkstep-pastel
-# Date Created:				1 June 2000
-# Whom:				 	Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gtkstep-pastel
-PORTVERSION=	0.10.1
-PORTREVISION=	1
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtksteppastel
-DISTNAME=	gtksteppastel-1.2.x
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Theme engine based on GtkStep to make GTK+ look nicier
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkstep-pastel/distinfo b/x11-toolkits/gtkstep-pastel/distinfo
deleted file mode 100644
index bfa49c184806..000000000000
--- a/x11-toolkits/gtkstep-pastel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gtksteppastel-1.2.x.tar.gz) = dd53a9fe80bed02e989311ba70440bfa
-SIZE (gtksteppastel-1.2.x.tar.gz) = 143403
diff --git a/x11-toolkits/gtkstep-pastel/pkg-descr b/x11-toolkits/gtkstep-pastel/pkg-descr
deleted file mode 100644
index e0063d9ff838..000000000000
--- a/x11-toolkits/gtkstep-pastel/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A GTK+ theme engine to make GTK+ look nicier. This theme is based on
-gtkstep-1.6, by Ullrich Hafner.
-
-WWW: http://fly.to/eru/
diff --git a/x11-toolkits/gtkstep-pastel/pkg-plist b/x11-toolkits/gtkstep-pastel/pkg-plist
deleted file mode 100644
index 94c0115b27ec..000000000000
--- a/x11-toolkits/gtkstep-pastel/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/gtk/themes/engines/libsteppastel.so
-share/themes/StepPastel/ICON.png
-share/themes/StepPastel/README.html
-share/themes/StepPastel/gtk/gtkrc
-@dirrm share/themes/StepPastel/gtk
-@dirrm share/themes/StepPastel
diff --git a/x11-toolkits/gtkstep/Makefile b/x11-toolkits/gtkstep/Makefile
deleted file mode 100644
index 45152a994b6c..000000000000
--- a/x11-toolkits/gtkstep/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	gtkstep
-# Date Created:				7 nov 98
-# Whom:				 	Gilad Rom
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gtkstep
-PORTVERSION=	2.2
-PORTREVISION=	1
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/g/gtk-engines-gtkstep
-DISTNAME=	gtk-engines-${PORTNAME}_${PORTVERSION}.orig
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A theme module to make GTK+ look like the NeXTSTEP(tm) interface
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkstep/distinfo b/x11-toolkits/gtkstep/distinfo
deleted file mode 100644
index 5082c2505d5b..000000000000
--- a/x11-toolkits/gtkstep/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gtk-engines-gtkstep_2.2.orig.tar.gz) = 22716ce2b8d4d1de8b2947aec3e75064
-SIZE (gtk-engines-gtkstep_2.2.orig.tar.gz) = 146889
diff --git a/x11-toolkits/gtkstep/pkg-descr b/x11-toolkits/gtkstep/pkg-descr
deleted file mode 100644
index 67c4111272e6..000000000000
--- a/x11-toolkits/gtkstep/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-GTKstep is a GTK+ theme engine to improve the boring 
-GTK+ look and feel with the NeXTSTEP(tm) look and feel. 
diff --git a/x11-toolkits/gtkstep/pkg-plist b/x11-toolkits/gtkstep/pkg-plist
deleted file mode 100644
index 813409b1de80..000000000000
--- a/x11-toolkits/gtkstep/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/gtk/themes/engines/libstep.so
-share/themes/Step/ICON.png
-share/themes/Step/README.html
-share/themes/Step/gtk/gtkrc
-@dirrm share/themes/Step/gtk
-@dirrm share/themes/Step