summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2004-06-02 02:26:24 +0000
committerPav Lucistnik <pav@FreeBSD.org>2004-06-02 02:26:24 +0000
commitecd8d027187b05a6968c4df9638a15b359e8cfc1 (patch)
tree7543d8545795e719996df4071c5d2ad144038bdc
parentAdd qicosi after repocopy from qico. Qicosi is ifcico-like ftn mailer, (diff)
- Populate new category x11-themes with some suitable candidates
from x11-toolkits. PR: ports/63145 List compiled by: adamw Repocopy by: marcus
-rw-r--r--MOVED30
-rw-r--r--graphics/librsvg2/Makefile2
-rw-r--r--x11-themes/Makefile30
-rw-r--r--x11-themes/buffy/Makefile2
-rw-r--r--x11-themes/clean-theme-gtk/Makefile2
-rw-r--r--x11-themes/colorstep/Makefile2
-rw-r--r--x11-themes/engradient/Makefile2
-rw-r--r--x11-themes/geramik/Makefile2
-rw-r--r--x11-themes/gnome-industrial-theme/Makefile6
-rw-r--r--x11-themes/gnome-look/Makefile2
-rw-r--r--x11-themes/gnome-themes-extras/Makefile2
-rw-r--r--x11-themes/gnome-themes/Makefile2
-rw-r--r--x11-themes/gtk-Mac2-theme/Makefile2
-rw-r--r--x11-themes/gtk-aqualightblue-theme/Makefile2
-rw-r--r--x11-themes/gtk-bluecurve-theme/Makefile2
-rw-r--r--x11-themes/gtk-cleanice-engine/Makefile2
-rw-r--r--x11-themes/gtk-engines-collection/Makefile30
-rw-r--r--x11-themes/gtk-engines/Makefile2
-rw-r--r--x11-themes/gtk-engines2/Makefile2
-rw-r--r--x11-themes/gtk-flat-theme/Makefile2
-rw-r--r--x11-themes/gtk-flat-theme2/Makefile2
-rw-r--r--x11-themes/gtk-industrial-theme/Makefile2
-rw-r--r--x11-themes/gtk-qn-x11-theme/Makefile2
-rw-r--r--x11-themes/gtk-qnxtheme/Makefile2
-rw-r--r--x11-themes/gtk-smooth-engine/Makefile2
-rw-r--r--x11-themes/gtk-xfce-engine/Makefile2
-rw-r--r--x11-themes/gtk-zenith-theme/Makefile2
-rw-r--r--x11-themes/icegradient/Makefile2
-rw-r--r--x11-themes/qt-bluecurve-theme/Makefile2
-rw-r--r--x11-themes/thinice/Makefile2
-rw-r--r--x11-themes/whistlerk/Makefile2
-rw-r--r--x11-themes/xenophilia/Makefile2
-rw-r--r--x11-themes/xenostep/Makefile2
-rw-r--r--x11-toolkits/Makefile30
-rw-r--r--x11-wm/xfce4/Makefile2
-rw-r--r--x11/gnome2-lite/Makefile2
-rw-r--r--x11/gnome2/Makefile2
37 files changed, 110 insertions, 80 deletions
diff --git a/MOVED b/MOVED
index 65bb6520e119..529de6ace933 100644
--- a/MOVED
+++ b/MOVED
@@ -1090,3 +1090,33 @@ databases/postgresql-client|databases/postgresql7|2004-05-25|Remove the -client
deskutils/logjam2|deskutils/logjam|2004-05-26|GTK2 logjam is now default
devel/camlp4||2004-05-27|removed, no longer works, no longer developed
audio/mpio-driver||2004-05-31|no longer needed with mpiosh 0.7.1
+x11-toolkits/buffy|x11-themes/buffy|2004-06-02|new category
+x11-toolkits/clean-theme-gtk|x11-themes/clean-theme-gtk|2004-06-02|new category
+x11-toolkits/colorstep|x11-themes/colorstep|2004-06-02|new category
+x11-toolkits/engradient|x11-themes/engradient|2004-06-02|new category
+x11-toolkits/geramik|x11-themes/geramik|2004-06-02|new category
+x11-toolkits/gnome-industrial-theme|x11-themes/gnome-industrial-theme|2004-06-02|new category
+x11-toolkits/gnome-look|x11-themes/gnome-look|2004-06-02|new category
+x11-toolkits/gnome-themes|x11-themes/gnome-themes|2004-06-02|new category
+x11-toolkits/gnome-themes-extras|x11-themes/gnome-themes-extras|2004-06-02|new category
+x11-toolkits/gtk-Mac2-theme|x11-themes/gtk-Mac2-theme|2004-06-02|new category
+x11-toolkits/gtk-aqualightblue-theme|x11-themes/gtk-aqualightblue-theme|2004-06-02|new category
+x11-toolkits/gtk-bluecurve-theme|x11-themes/gtk-bluecurve-theme|2004-06-02|new category
+x11-toolkits/gtk-cleanice-engine|x11-themes/gtk-cleanice-engine|2004-06-02|new category
+x11-toolkits/gtk-engines|x11-themes/gtk-engines|2004-06-02|new category
+x11-toolkits/gtk-engines-collection|x11-themes/gtk-engines-collection|2004-06-02|new category
+x11-toolkits/gtk-engines2|x11-themes/gtk-engines2|2004-06-02|new category
+x11-toolkits/gtk-flat-theme|x11-themes/gtk-flat-theme|2004-06-02|new category
+x11-toolkits/gtk-flat-theme2|x11-themes/gtk-flat-theme2|2004-06-02|new category
+x11-toolkits/gtk-industrial-theme|x11-themes/gtk-industrial-theme|2004-06-02|new category
+x11-toolkits/gtk-qn-x11-theme|x11-themes/gtk-qn-x11-theme|2004-06-02|new category
+x11-toolkits/gtk-qnxtheme|x11-themes/gtk-qnxtheme|2004-06-02|new category
+x11-toolkits/gtk-smooth-engine|x11-themes/gtk-smooth-engine|2004-06-02|new category
+x11-toolkits/gtk-xfce-engine|x11-themes/gtk-xfce-engine|2004-06-02|new category
+x11-toolkits/gtk-zenith-theme|x11-themes/gtk-zenith-theme|2004-06-02|new category
+x11-toolkits/icegradient|x11-themes/icegradient|2004-06-02|new category
+x11-toolkits/qt-bluecurve-theme|x11-themes/qt-bluecurve-theme|2004-06-02|new category
+x11-toolkits/thinice|x11-themes/thinice|2004-06-02|new category
+x11-toolkits/whistlerk|x11-themes/whistlerk|2004-06-02|new category
+x11-toolkits/xenophilia|x11-themes/xenophilia|2004-06-02|new category
+x11-toolkits/xenostep|x11-themes/xenostep|2004-06-02|new category
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 2608046ea4fc..5f3c0c22fd5a 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
popt.0:${PORTSDIR}/devel/popt \
croco.3:${PORTSDIR}/textproc/libcroco
-RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2
+RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index df9f738afaa8..9eb077b8446a 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -3,6 +3,11 @@
COMMENT = X Windows System themes
+ SUBDIR += buffy
+ SUBDIR += clean-theme-gtk
+ SUBDIR += colorstep
+ SUBDIR += engradient
+ SUBDIR += geramik
SUBDIR += gnome-icons
SUBDIR += gnome-icons-aqua-fusion
SUBDIR += gnome-icons-cool-gorilla
@@ -16,6 +21,26 @@
SUBDIR += gnome-icons-snow-apple
SUBDIR += gnome-icons-stylish
SUBDIR += gnome-icons-ximian-south
+ SUBDIR += gnome-industrial-theme
+ SUBDIR += gnome-look
+ SUBDIR += gnome-themes
+ SUBDIR += gnome-themes-extras
+ SUBDIR += gtk-Mac2-theme
+ SUBDIR += gtk-aqualightblue-theme
+ SUBDIR += gtk-bluecurve-theme
+ SUBDIR += gtk-cleanice-theme
+ SUBDIR += gtk-engines
+ SUBDIR += gtk-engines-collection
+ SUBDIR += gtk-engines2
+ SUBDIR += gtk-flat-theme
+ SUBDIR += gtk-flat-theme2
+ SUBDIR += gtk-industrial-theme
+ SUBDIR += gtk-qn-x11-theme
+ SUBDIR += gtk-qnxtheme
+ SUBDIR += gtk-smooth-engine
+ SUBDIR += gtk-xfce-engine
+ SUBDIR += gtk-zenith-theme
+ SUBDIR += icegradient
SUBDIR += kde-icons-amaranth
SUBDIR += kde-icons-amaranth-althaea
SUBDIR += kde-icons-crystalosx
@@ -44,6 +69,11 @@
SUBDIR += metacity-theme-iridium-rounded
SUBDIR += metacity-theme-microgui
SUBDIR += metacity-themes
+ SUBDIR += qt-bluecurve-theme
SUBDIR += sawfish-themes
+ SUBDIR += thinice
+ SUBDIR += whistlerk
+ SUBDIR += xenophilia
+ SUBDIR += xenostep
.include <bsd.port.subdir.mk>
diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index 6edf306f0221..79f3b8b38cd1 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= buffy
PORTVERSION= 0.2
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= buffy02
DISTNAME= buffy02-1.2
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index b23aea166ae1..ddafc2675689 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= clean-theme-gtk
PORTVERSION= 1.2.x
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= clean___
DISTNAME= clean___-${PORTVERSION}
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 3a5edd86748b..5d3c7b4cfa94 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -8,7 +8,7 @@
PORTNAME= colorstep
PORTVERSION= 0.6
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= colorstep
DISTNAME= ${PORTNAME}-1.2.x
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index 0e5df60266bb..fc631e4d548a 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -8,7 +8,7 @@
PORTNAME= engradient
PORTVERSION= 0.5
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= engradient
DISTNAME= ${PORTNAME}-1.2.x
diff --git a/x11-themes/geramik/Makefile b/x11-themes/geramik/Makefile
index 46332143f95c..8ccb4f5261e6 100644
--- a/x11-themes/geramik/Makefile
+++ b/x11-themes/geramik/Makefile
@@ -8,7 +8,7 @@
PORTNAME= geramik
PORTVERSION= 0.26
PORTREVISION= 2
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= http://www.kde-look.org/content/files/ \
http://distfiles.towardex.com/
DISTNAME= 3952-Geramik-${PORTVERSION}
diff --git a/x11-themes/gnome-industrial-theme/Makefile b/x11-themes/gnome-industrial-theme/Makefile
index b805ef645161..b92c78b9a1d3 100644
--- a/x11-themes/gnome-industrial-theme/Makefile
+++ b/x11-themes/gnome-industrial-theme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-industrial-theme
PORTVERSION= 0.2.29
PORTREVISION= 2
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/ \
http://www.linux-friends.de/stoerte/FreeBSD/
DISTNAME= ximian-artwork-${PORTVERSION}-${XIMIAN_SUBVERSION}.ximian.${XIMIAN_DISTVERSION}.src
@@ -18,8 +18,8 @@ MAINTAINER= stoerte@dreamwarrior.net
COMMENT= Slick GNOME2 theme from Ximian
EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras
-RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras
+BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras
+RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras
NO_BUILD= yes
USE_X_PREFIX= yes
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index ec1122302055..9e451551c4e5 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-look
PORTVERSION= 0.1.3
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 305ad420f495..57739eec20bc 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-themes-extras
PORTVERSION= 0.7
-CATEGORIES= x11-toolkits gnome
+CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index c19b4c77e503..961c40b929f3 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-themes
PORTVERSION= 2.6.1
-CATEGORIES= x11-toolkits gnome
+CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index 0bfe5546a239..4c1d47e0c13a 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-Mac2-theme
PORTVERSION= 200003050858
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= mac2
DISTNAME= mac2-1.2.x
diff --git a/x11-themes/gtk-aqualightblue-theme/Makefile b/x11-themes/gtk-aqualightblue-theme/Makefile
index 6d8341b7d391..bbf9a8fed27b 100644
--- a/x11-themes/gtk-aqualightblue-theme/Makefile
+++ b/x11-themes/gtk-aqualightblue-theme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-aqualightblue-theme
PORTVERSION= 0.1
PORTREVISION= 3
-CATEGORIES= x11-toolkits gnome
+CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= aqualightblue-gtk2
DISTNAME= aqualightblue-gtk2-default
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index 3b5e84beab9f..325be6c59ae8 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-bluecurve-theme
PORTVERSION= 0.73
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX}
MASTER_SITE_SUBDIR= 9/en/os/i386/SRPMS
DISTFILES= redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index ae5b21f17c02..93cdc1ef5061 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-cleanice-engine
PORTVERSION= 1.2.8
PORTREVISION= 1
-CATEGORIES= x11-toolkits gnome
+CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= elysium-project
DISTNAME= gtk-engines-cleanice-${PORTVERSION}
diff --git a/x11-themes/gtk-engines-collection/Makefile b/x11-themes/gtk-engines-collection/Makefile
index ed3cbd3f5df4..ce384ff1299e 100644
--- a/x11-themes/gtk-engines-collection/Makefile
+++ b/x11-themes/gtk-engines-collection/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-engines-collection
PORTVERSION= 1.8
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= # empty
DISTFILES= # empty
EXTRACT_ONLY= # empty
@@ -16,24 +16,24 @@ EXTRACT_ONLY= # empty
MAINTAINER= ports@FreeBSD.org
COMMENT= The "meta-port" for the collection of several GTK+ theme engines
-RUN_DEPENDS= ${THEMESBASE}/libbuffy.so:${THEMESPORTDIR}/buffy \
- ${THEMESBASE}/libclean.so:${THEMESPORTDIR}/clean-theme-gtk \
- ${THEMESBASE}/libcolorstep.so:${THEMESPORTDIR}/colorstep \
- ${THEMESBASE}/libengradient.so:${THEMESPORTDIR}/engradient \
- ${THEMESBASE}/libflat.so:${THEMESPORTDIR}/gtk-flat-theme \
- ${THEMESBASE}/libgnomelook.so:${THEMESPORTDIR}/gnome-look \
+RUN_DEPENDS= ${THEMESBASE}/libbuffy.so:${PORTSDIR}/x11-themes/buffy \
+ ${THEMESBASE}/libclean.so:${PORTSDIR}/x11-themes/clean-theme-gtk \
+ ${THEMESBASE}/libcolorstep.so:${PORTSDIR}/x11-themes/colorstep \
+ ${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}/libicegradient.so:${THEMESPORTDIR}/icegradient \
- ${THEMESBASE}/libmac2.so:${THEMESPORTDIR}/gtk-Mac2-theme \
- ${THEMESBASE}/libpixmap.so:${THEMESPORTDIR}/gtk-engines \
- ${THEMESBASE}/libqnx.so:${THEMESPORTDIR}/gtk-qn-x11-theme \
+ ${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}/libzenith.so:${THEMESPORTDIR}/gtk-zenith-theme \
- ${THEMESBASE}/libthinice.so:${THEMESPORTDIR}/thinice \
- ${THEMESBASE}/libXenoStep.so:${THEMESPORTDIR}/xenostep \
- ${THEMESBASE}/libxeno.so:${THEMESPORTDIR}/xenophilia \
- ${THEMESBASE}/libwhistler.so:${THEMESPORTDIR}/whistlerk
+ ${THEMESBASE}/libthinice.so:${PORTSDIR}/x11-themes/thinice \
+ ${THEMESBASE}/libXenoStep.so:${PORTSDIR}/x11-themes/xenostep \
+ ${THEMESBASE}/libxeno.so:${PORTSDIR}/x11-themes/xenophilia \
+ ${THEMESBASE}/libwhistler.so:${PORTSDIR}/x11-themes/whistlerk
THEMESBASE= ${X11BASE}/lib/gtk/themes/engines
THEMESPORTDIR= ${PORTSDIR}/x11-toolkits
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index be7905fbdfef..c96cd686cb8c 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-engines
PORTVERSION= 0.12
PORTREVISION= 3
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk-engines/0.12
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index c0a3d06fe08b..18019d95afa8 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-engines2
PORTVERSION= 2.2.0
PORTREVISION= 3
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index f19f50fea524..b4ead780a8e0 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-flat-theme
PORTVERSION= 0.1
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= flat
DISTNAME= flat-1.2.x
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index 343ae50675c5..2447ff79b476 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-flat-theme2
PORTVERSION= 0.1
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= gtk2flat
DISTNAME= gtk2flat-default
diff --git a/x11-themes/gtk-industrial-theme/Makefile b/x11-themes/gtk-industrial-theme/Makefile
index 851fa2d7b52e..50dc69db66ee 100644
--- a/x11-themes/gtk-industrial-theme/Makefile
+++ b/x11-themes/gtk-industrial-theme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-industrial-theme
PORTVERSION= 0.2.29
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/ \
http://www.linux-friends.de/stoerte/FreeBSD/
DISTNAME= ximian-artwork-${PORTVERSION}-${XIMIAN_SUBVERSION}.ximian.${XIMIAN_DISTVERSION}.src
diff --git a/x11-themes/gtk-qn-x11-theme/Makefile b/x11-themes/gtk-qn-x11-theme/Makefile
index 4b06292d1cce..8059e045a911 100644
--- a/x11-themes/gtk-qn-x11-theme/Makefile
+++ b/x11-themes/gtk-qn-x11-theme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-qn-x11-theme
PORTVERSION= 0.1
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= qnx11__
DISTNAME= qnx11__-1.2.x
diff --git a/x11-themes/gtk-qnxtheme/Makefile b/x11-themes/gtk-qnxtheme/Makefile
index 45c7a4af0ce6..32ec7eddb96f 100644
--- a/x11-themes/gtk-qnxtheme/Makefile
+++ b/x11-themes/gtk-qnxtheme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-qnxtheme
PORTVERSION= 0.1
PORTREVISION= 2
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= http://download.freshmeat.net/themes/qnxtheme/
DISTNAME= qnxtheme-default-${PORTVERSION}
diff --git a/x11-themes/gtk-smooth-engine/Makefile b/x11-themes/gtk-smooth-engine/Makefile
index 8fbae7800c5a..db99979dea76 100644
--- a/x11-themes/gtk-smooth-engine/Makefile
+++ b/x11-themes/gtk-smooth-engine/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-smooth-engine
PORTVERSION= 0.5.6
PORTREVISION= 1
-CATEGORIES= x11-toolkits gnome
+CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= smooth-engine
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 9516f31b864d..4143a403a9ce 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-xfce-engine
PORTVERSION= 2.1.9
PORTREVISION= 2
-CATEGORIES= x11-toolkits xfce
+CATEGORIES= x11-themes xfce
MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/4.0.5/ \
http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.0.5/src/
diff --git a/x11-themes/gtk-zenith-theme/Makefile b/x11-themes/gtk-zenith-theme/Makefile
index 47e7dd10f2c2..cb8c6a312d8d 100644
--- a/x11-themes/gtk-zenith-theme/Makefile
+++ b/x11-themes/gtk-zenith-theme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-zenith-theme
PORTVERSION= 1.0
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= zenith
DISTNAME= zenith-1.2
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index 40c6dec63f42..dfb35dee4e47 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -8,7 +8,7 @@
PORTNAME= icegradient
PORTVERSION= 200012290259
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ftp://ftp.themes.org/pub/themes/gtk/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= sobomax
diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index 048befe93aac..de283e4c3abc 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qt-bluecurve-theme
PORTVERSION= 0.88
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= fedora/fedora/1/i386/SRPMS.os
DISTFILES= redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index e4cc8ff5b1a8..dc7f2bca1330 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -8,7 +8,7 @@
PORTNAME= thinice
PORTVERSION= 1.0.4
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= thinice
DISTNAME= thinice-1.2.x
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index d55be38d2917..6e800bfc9c31 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= WhistlerK
PORTVERSION= 200010142358
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= whistlerk
DISTNAME= whistlerk-1.2.x
diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile
index ca53a4a7f8f4..476c1b32827b 100644
--- a/x11-themes/xenophilia/Makefile
+++ b/x11-themes/xenophilia/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xenophilia
PORTVERSION= 0.7
PORTREVISION= 1
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= xenophilia
DISTNAME= xenophilia-1.2.x
diff --git a/x11-themes/xenostep/Makefile b/x11-themes/xenostep/Makefile
index ed20bfaa0223..d18a8e1ee93e 100644
--- a/x11-themes/xenostep/Makefile
+++ b/x11-themes/xenostep/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xenostep
PORTVERSION= 200011270836
PORTREVISION= 2
-CATEGORIES= x11-toolkits
+CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= xenostep
DISTNAME= ${PORTNAME}-1.2.x
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index f14d236a1ba9..7ade5e08cf7b 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -10,14 +10,10 @@
SUBDIR += bakery
SUBDIR += bakery_gnomeui
SUBDIR += blt
- SUBDIR += buffy
SUBDIR += bwidget
- SUBDIR += clean-theme-gtk
- SUBDIR += colorstep
SUBDIR += easygtk
SUBDIR += eel2
SUBDIR += efltk
- SUBDIR += engradient
SUBDIR += erlgtk
SUBDIR += fl_editor
SUBDIR += fltk
@@ -30,14 +26,9 @@
SUBDIR += gal2
SUBDIR += gauche-gtk
SUBDIR += gdl
- SUBDIR += geramik
SUBDIR += gevas
SUBDIR += gnocl
SUBDIR += gnome--
- SUBDIR += gnome-industrial-theme
- SUBDIR += gnome-look
- SUBDIR += gnome-themes
- SUBDIR += gnome-themes-extras
SUBDIR += gnomemm
SUBDIR += gnustep-art
SUBDIR += gnustep-back
@@ -46,23 +37,8 @@
SUBDIR += gob
SUBDIR += gtk--
SUBDIR += gtk--2
- SUBDIR += gtk-Mac2-theme
- SUBDIR += gtk-aqualightblue-theme
- SUBDIR += gtk-bluecurve-theme
- SUBDIR += gtk-cleanice-engine
- SUBDIR += gtk-engines
- SUBDIR += gtk-engines-collection
- SUBDIR += gtk-engines2
- SUBDIR += gtk-flat-theme
- SUBDIR += gtk-flat-theme2
- SUBDIR += gtk-industrial-theme
- SUBDIR += gtk-qn-x11-theme
- SUBDIR += gtk-qnxtheme
SUBDIR += gtk-qt-engine
SUBDIR += gtk-sharp
- SUBDIR += gtk-smooth-engine
- SUBDIR += gtk-xfce-engine
- SUBDIR += gtk-zenith-theme
SUBDIR += gtk12
SUBDIR += gtk12-apireference
SUBDIR += gtk20
@@ -91,7 +67,6 @@
SUBDIR += hs-gtk+hs
SUBDIR += hs-gtk2hs
SUBDIR += hs-port
- SUBDIR += icegradient
SUBDIR += inti
SUBDIR += inti-gconf
SUBDIR += inti-gl
@@ -178,7 +153,6 @@
SUBDIR += py-wxPython
SUBDIR += py-xlib
SUBDIR += qscintilla
- SUBDIR += qt-bluecurve-theme
SUBDIR += qt145
SUBDIR += qt2-static
SUBDIR += qt23
@@ -197,7 +171,6 @@
SUBDIR += sdl_gui
SUBDIR += slingshot
SUBDIR += soqt
- SUBDIR += thinice
SUBDIR += tix
SUBDIR += tk80
SUBDIR += tk82
@@ -211,7 +184,6 @@
SUBDIR += viewkit
SUBDIR += viewklass
SUBDIR += vte
- SUBDIR += whistlerk
SUBDIR += wmapp
SUBDIR += wxgtk
SUBDIR += wxgtk-common
@@ -226,8 +198,6 @@
SUBDIR += xbae
SUBDIR += xclass
SUBDIR += xclasses
- SUBDIR += xenophilia
- SUBDIR += xenostep
SUBDIR += xforms
SUBDIR += xg
SUBDIR += xmhtml
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 8893f4b0a38f..563eb55759ae 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${X11BASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/
xffm:${PORTSDIR}/x11-fm/xfce4-fm \
xfprint4:${PORTSDIR}/print/xfce4-print \
xfce4-iconbox:${PORTSDIR}/misc/xfce4-iconbox \
- ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libxfce.so:${PORTSDIR}/x11-toolkits/gtk-xfce-engine
+ ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine
.if exists(${X11BASE}/bin/gdm)
WITH_GDM= yes
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index e762335c52a0..a4941713f8ef 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \
${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \
file-roller:${PORTSDIR}/archivers/fileroller \
- ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-toolkits/gnome-themes \
+ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
ggv:${PORTSDIR}/print/ggv2 \
gcalctool:${PORTSDIR}/math/gcalctool \
gucharmap:${PORTSDIR}/deskutils/gucharmap \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index f1f1d0f3e79f..5d20fa0a99d3 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -35,7 +35,7 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \
${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
file-roller:${PORTSDIR}/archivers/fileroller \
- ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-toolkits/gnome-themes \
+ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
ggv:${PORTSDIR}/print/ggv2 \
gok:${PORTSDIR}/accessibility/gok \
gpdf:${PORTSDIR}/graphics/gpdf \