3 files changed, 124 insertions, 149 deletions

diff --git a/x11-clocks/cairo-clock/Makefile b/x11-clocks/cairo-clock/Makefile
index fd7beda651a1..aa71255ca3fe 100644
--- a/x11-clocks/cairo-clock/Makefile
+++ b/x11-clocks/cairo-clock/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cairo-clock
 PORTVERSION=	0.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks net gnome
 MASTER_SITES=	http://macslow.thepimp.net/projects/cairo-clock/
 
@@ -11,26 +11,14 @@ MAINTAINER=	daichi@FreeBSD.org
 COMMENT=	MacSlow's Cairo-Clock
 
 USE_GNOME=	gtk20 intlhack libglade2 librsvg2
-USES=		pathfix iconv gmake pkgconfig
+USES=		pathfix iconv gmake pkgconfig gettext
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-MAN1=		cairo-clock.1
-
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS NLS
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
 
 post-patch:
 	@${GZIP_CMD} -d ${WRKSRC}/man/cairo-clock.1.gz
@@ -43,16 +31,4 @@ post-configure:
 		${WRKSRC}/src/Makefile
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for file in README NEWS AUTHORS TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-	@${ECHO} ""
-	@${ECHO} "************************************************************************"
-	@${ECHO} " Please note that you need composite extension enabled in X.org or Xgl. "
-	@${ECHO} "************************************************************************"
-
 .include <bsd.port.mk>
diff --git a/x11-clocks/cairo-clock/pkg-message b/x11-clocks/cairo-clock/pkg-message
new file mode 100644
index 000000000000..42c7422d7ebf
--- /dev/null
+++ b/x11-clocks/cairo-clock/pkg-message
@@ -0,0 +1,3 @@
+************************************************************************
+ Please note that you need composite extension enabled in X.org or Xgl. 
+************************************************************************
diff --git a/x11-clocks/cairo-clock/pkg-plist b/x11-clocks/cairo-clock/pkg-plist
index 163d6abd7f09..678ccac87feb 100644
--- a/x11-clocks/cairo-clock/pkg-plist
+++ b/x11-clocks/cairo-clock/pkg-plist
@@ -1,5 +1,8 @@
 bin/cairo-clock
+man/man1/cairo-clock.1.gz
+share/applications/cairo-clock.desktop
 %%DATADIR%%/glade/cairo-clock.glade
+%%DATADIR%%/pixmaps/cairo-clock-logo.png
 %%DATADIR%%/themes/antique/clock-drop-shadow.svg
 %%DATADIR%%/themes/antique/clock-face-shadow.svg
 %%DATADIR%%/themes/antique/clock-face.svg
@@ -12,18 +15,6 @@ bin/cairo-clock
 %%DATADIR%%/themes/antique/clock-minute-hand.svg
 %%DATADIR%%/themes/antique/clock-second-hand-shadow.svg
 %%DATADIR%%/themes/antique/clock-second-hand.svg
-%%DATADIR%%/themes/default/clock-drop-shadow.svg
-%%DATADIR%%/themes/default/clock-face-shadow.svg
-%%DATADIR%%/themes/default/clock-face.svg
-%%DATADIR%%/themes/default/clock-frame.svg
-%%DATADIR%%/themes/default/clock-glass.svg
-%%DATADIR%%/themes/default/clock-hour-hand-shadow.svg
-%%DATADIR%%/themes/default/clock-hour-hand.svg
-%%DATADIR%%/themes/default/clock-marks.svg
-%%DATADIR%%/themes/default/clock-minute-hand-shadow.svg
-%%DATADIR%%/themes/default/clock-minute-hand.svg
-%%DATADIR%%/themes/default/clock-second-hand-shadow.svg
-%%DATADIR%%/themes/default/clock-second-hand.svg
 %%DATADIR%%/themes/default-24/clock-drop-shadow.svg
 %%DATADIR%%/themes/default-24/clock-face-shadow.svg
 %%DATADIR%%/themes/default-24/clock-face.svg
@@ -36,6 +27,18 @@ bin/cairo-clock
 %%DATADIR%%/themes/default-24/clock-minute-hand.svg
 %%DATADIR%%/themes/default-24/clock-second-hand-shadow.svg
 %%DATADIR%%/themes/default-24/clock-second-hand.svg
+%%DATADIR%%/themes/default/clock-drop-shadow.svg
+%%DATADIR%%/themes/default/clock-face-shadow.svg
+%%DATADIR%%/themes/default/clock-face.svg
+%%DATADIR%%/themes/default/clock-frame.svg
+%%DATADIR%%/themes/default/clock-glass.svg
+%%DATADIR%%/themes/default/clock-hour-hand-shadow.svg
+%%DATADIR%%/themes/default/clock-hour-hand.svg
+%%DATADIR%%/themes/default/clock-marks.svg
+%%DATADIR%%/themes/default/clock-minute-hand-shadow.svg
+%%DATADIR%%/themes/default/clock-minute-hand.svg
+%%DATADIR%%/themes/default/clock-second-hand-shadow.svg
+%%DATADIR%%/themes/default/clock-second-hand.svg
 %%DATADIR%%/themes/fdo/clock-drop-shadow.svg
 %%DATADIR%%/themes/fdo/clock-face-shadow.svg
 %%DATADIR%%/themes/fdo/clock-face.svg
@@ -72,42 +75,30 @@ bin/cairo-clock
 %%DATADIR%%/themes/glassy/clock-minute-hand.svg
 %%DATADIR%%/themes/glassy/clock-second-hand-shadow.svg
 %%DATADIR%%/themes/glassy/clock-second-hand.svg
-%%DATADIR%%/themes/gremlin/clock-marks.svg
+%%DATADIR%%/themes/gremlin-24/clock-drop-shadow.svg
+%%DATADIR%%/themes/gremlin-24/clock-face-shadow.svg
+%%DATADIR%%/themes/gremlin-24/clock-face.svg
+%%DATADIR%%/themes/gremlin-24/clock-frame.svg
+%%DATADIR%%/themes/gremlin-24/clock-glass.svg
+%%DATADIR%%/themes/gremlin-24/clock-hour-hand-shadow.svg
+%%DATADIR%%/themes/gremlin-24/clock-hour-hand.svg
+%%DATADIR%%/themes/gremlin-24/clock-marks.svg
+%%DATADIR%%/themes/gremlin-24/clock-minute-hand-shadow.svg
+%%DATADIR%%/themes/gremlin-24/clock-minute-hand.svg
+%%DATADIR%%/themes/gremlin-24/clock-second-hand-shadow.svg
+%%DATADIR%%/themes/gremlin-24/clock-second-hand.svg
+%%DATADIR%%/themes/gremlin/clock-drop-shadow.svg
 %%DATADIR%%/themes/gremlin/clock-face-shadow.svg
+%%DATADIR%%/themes/gremlin/clock-face.svg
 %%DATADIR%%/themes/gremlin/clock-frame.svg
 %%DATADIR%%/themes/gremlin/clock-glass.svg
-%%DATADIR%%/themes/gremlin/clock-face.svg
+%%DATADIR%%/themes/gremlin/clock-hour-hand-shadow.svg
 %%DATADIR%%/themes/gremlin/clock-hour-hand.svg
-%%DATADIR%%/themes/gremlin/clock-second-hand.svg
+%%DATADIR%%/themes/gremlin/clock-marks.svg
 %%DATADIR%%/themes/gremlin/clock-minute-hand-shadow.svg
-%%DATADIR%%/themes/gremlin/clock-second-hand-shadow.svg
-%%DATADIR%%/themes/gremlin/clock-drop-shadow.svg
-%%DATADIR%%/themes/gremlin/clock-hour-hand-shadow.svg
 %%DATADIR%%/themes/gremlin/clock-minute-hand.svg
-%%DATADIR%%/themes/gremlin-24/clock-face-shadow.svg
-%%DATADIR%%/themes/gremlin-24/clock-minute-hand-shadow.svg
-%%DATADIR%%/themes/gremlin-24/clock-face.svg
-%%DATADIR%%/themes/gremlin-24/clock-hour-hand.svg
-%%DATADIR%%/themes/gremlin-24/clock-second-hand.svg
-%%DATADIR%%/themes/gremlin-24/clock-second-hand-shadow.svg
-%%DATADIR%%/themes/gremlin-24/clock-marks.svg
-%%DATADIR%%/themes/gremlin-24/clock-hour-hand-shadow.svg
-%%DATADIR%%/themes/gremlin-24/clock-frame.svg
-%%DATADIR%%/themes/gremlin-24/clock-glass.svg
-%%DATADIR%%/themes/gremlin-24/clock-minute-hand.svg
-%%DATADIR%%/themes/gremlin-24/clock-drop-shadow.svg
-%%DATADIR%%/themes/ipulse/clock-drop-shadow.svg
-%%DATADIR%%/themes/ipulse/clock-face-shadow.svg
-%%DATADIR%%/themes/ipulse/clock-face.svg
-%%DATADIR%%/themes/ipulse/clock-frame.svg
-%%DATADIR%%/themes/ipulse/clock-glass.svg
-%%DATADIR%%/themes/ipulse/clock-hour-hand-shadow.svg
-%%DATADIR%%/themes/ipulse/clock-hour-hand.svg
-%%DATADIR%%/themes/ipulse/clock-marks.svg
-%%DATADIR%%/themes/ipulse/clock-minute-hand-shadow.svg
-%%DATADIR%%/themes/ipulse/clock-minute-hand.svg
-%%DATADIR%%/themes/ipulse/clock-second-hand-shadow.svg
-%%DATADIR%%/themes/ipulse/clock-second-hand.svg
+%%DATADIR%%/themes/gremlin/clock-second-hand-shadow.svg
+%%DATADIR%%/themes/gremlin/clock-second-hand.svg
 %%DATADIR%%/themes/ipulse-24/clock-drop-shadow.svg
 %%DATADIR%%/themes/ipulse-24/clock-face-shadow.svg
 %%DATADIR%%/themes/ipulse-24/clock-face.svg
@@ -120,6 +111,18 @@ bin/cairo-clock
 %%DATADIR%%/themes/ipulse-24/clock-minute-hand.svg
 %%DATADIR%%/themes/ipulse-24/clock-second-hand-shadow.svg
 %%DATADIR%%/themes/ipulse-24/clock-second-hand.svg
+%%DATADIR%%/themes/ipulse/clock-drop-shadow.svg
+%%DATADIR%%/themes/ipulse/clock-face-shadow.svg
+%%DATADIR%%/themes/ipulse/clock-face.svg
+%%DATADIR%%/themes/ipulse/clock-frame.svg
+%%DATADIR%%/themes/ipulse/clock-glass.svg
+%%DATADIR%%/themes/ipulse/clock-hour-hand-shadow.svg
+%%DATADIR%%/themes/ipulse/clock-hour-hand.svg
+%%DATADIR%%/themes/ipulse/clock-marks.svg
+%%DATADIR%%/themes/ipulse/clock-minute-hand-shadow.svg
+%%DATADIR%%/themes/ipulse/clock-minute-hand.svg
+%%DATADIR%%/themes/ipulse/clock-second-hand-shadow.svg
+%%DATADIR%%/themes/ipulse/clock-second-hand.svg
 %%DATADIR%%/themes/quartz-24/clock-drop-shadow.svg
 %%DATADIR%%/themes/quartz-24/clock-face-shadow.svg
 %%DATADIR%%/themes/quartz-24/clock-face.svg
@@ -132,18 +135,6 @@ bin/cairo-clock
 %%DATADIR%%/themes/quartz-24/clock-minute-hand.svg
 %%DATADIR%%/themes/quartz-24/clock-second-hand-shadow.svg
 %%DATADIR%%/themes/quartz-24/clock-second-hand.svg
-%%DATADIR%%/themes/radium/clock-drop-shadow.svg
-%%DATADIR%%/themes/radium/clock-face-shadow.svg
-%%DATADIR%%/themes/radium/clock-face.svg
-%%DATADIR%%/themes/radium/clock-frame.svg
-%%DATADIR%%/themes/radium/clock-glass.svg
-%%DATADIR%%/themes/radium/clock-hour-hand-shadow.svg
-%%DATADIR%%/themes/radium/clock-hour-hand.svg
-%%DATADIR%%/themes/radium/clock-marks.svg
-%%DATADIR%%/themes/radium/clock-minute-hand-shadow.svg
-%%DATADIR%%/themes/radium/clock-minute-hand.svg
-%%DATADIR%%/themes/radium/clock-second-hand-shadow.svg
-%%DATADIR%%/themes/radium/clock-second-hand.svg
 %%DATADIR%%/themes/radium-24/clock-drop-shadow.svg
 %%DATADIR%%/themes/radium-24/clock-face-shadow.svg
 %%DATADIR%%/themes/radium-24/clock-face.svg
@@ -156,18 +147,18 @@ bin/cairo-clock
 %%DATADIR%%/themes/radium-24/clock-minute-hand.svg
 %%DATADIR%%/themes/radium-24/clock-second-hand-shadow.svg
 %%DATADIR%%/themes/radium-24/clock-second-hand.svg
-%%DATADIR%%/themes/silvia/clock-drop-shadow.svg
-%%DATADIR%%/themes/silvia/clock-face-shadow.svg
-%%DATADIR%%/themes/silvia/clock-face.svg
-%%DATADIR%%/themes/silvia/clock-frame.svg
-%%DATADIR%%/themes/silvia/clock-glass.svg
-%%DATADIR%%/themes/silvia/clock-hour-hand-shadow.svg
-%%DATADIR%%/themes/silvia/clock-hour-hand.svg
-%%DATADIR%%/themes/silvia/clock-marks.svg
-%%DATADIR%%/themes/silvia/clock-minute-hand-shadow.svg
-%%DATADIR%%/themes/silvia/clock-minute-hand.svg
-%%DATADIR%%/themes/silvia/clock-second-hand-shadow.svg
-%%DATADIR%%/themes/silvia/clock-second-hand.svg
+%%DATADIR%%/themes/radium/clock-drop-shadow.svg
+%%DATADIR%%/themes/radium/clock-face-shadow.svg
+%%DATADIR%%/themes/radium/clock-face.svg
+%%DATADIR%%/themes/radium/clock-frame.svg
+%%DATADIR%%/themes/radium/clock-glass.svg
+%%DATADIR%%/themes/radium/clock-hour-hand-shadow.svg
+%%DATADIR%%/themes/radium/clock-hour-hand.svg
+%%DATADIR%%/themes/radium/clock-marks.svg
+%%DATADIR%%/themes/radium/clock-minute-hand-shadow.svg
+%%DATADIR%%/themes/radium/clock-minute-hand.svg
+%%DATADIR%%/themes/radium/clock-second-hand-shadow.svg
+%%DATADIR%%/themes/radium/clock-second-hand.svg
 %%DATADIR%%/themes/silvia-24/clock-drop-shadow.svg
 %%DATADIR%%/themes/silvia-24/clock-face-shadow.svg
 %%DATADIR%%/themes/silvia-24/clock-face.svg
@@ -180,18 +171,18 @@ bin/cairo-clock
 %%DATADIR%%/themes/silvia-24/clock-minute-hand.svg
 %%DATADIR%%/themes/silvia-24/clock-second-hand-shadow.svg
 %%DATADIR%%/themes/silvia-24/clock-second-hand.svg
-%%DATADIR%%/themes/simple/clock-drop-shadow.svg
-%%DATADIR%%/themes/simple/clock-face-shadow.svg
-%%DATADIR%%/themes/simple/clock-face.svg
-%%DATADIR%%/themes/simple/clock-frame.svg
-%%DATADIR%%/themes/simple/clock-glass.svg
-%%DATADIR%%/themes/simple/clock-hour-hand-shadow.svg
-%%DATADIR%%/themes/simple/clock-hour-hand.svg
-%%DATADIR%%/themes/simple/clock-marks.svg
-%%DATADIR%%/themes/simple/clock-minute-hand-shadow.svg
-%%DATADIR%%/themes/simple/clock-minute-hand.svg
-%%DATADIR%%/themes/simple/clock-second-hand-shadow.svg
-%%DATADIR%%/themes/simple/clock-second-hand.svg
+%%DATADIR%%/themes/silvia/clock-drop-shadow.svg
+%%DATADIR%%/themes/silvia/clock-face-shadow.svg
+%%DATADIR%%/themes/silvia/clock-face.svg
+%%DATADIR%%/themes/silvia/clock-frame.svg
+%%DATADIR%%/themes/silvia/clock-glass.svg
+%%DATADIR%%/themes/silvia/clock-hour-hand-shadow.svg
+%%DATADIR%%/themes/silvia/clock-hour-hand.svg
+%%DATADIR%%/themes/silvia/clock-marks.svg
+%%DATADIR%%/themes/silvia/clock-minute-hand-shadow.svg
+%%DATADIR%%/themes/silvia/clock-minute-hand.svg
+%%DATADIR%%/themes/silvia/clock-second-hand-shadow.svg
+%%DATADIR%%/themes/silvia/clock-second-hand.svg
 %%DATADIR%%/themes/simple-24/clock-drop-shadow.svg
 %%DATADIR%%/themes/simple-24/clock-face-shadow.svg
 %%DATADIR%%/themes/simple-24/clock-face.svg
@@ -204,6 +195,18 @@ bin/cairo-clock
 %%DATADIR%%/themes/simple-24/clock-minute-hand.svg
 %%DATADIR%%/themes/simple-24/clock-second-hand-shadow.svg
 %%DATADIR%%/themes/simple-24/clock-second-hand.svg
+%%DATADIR%%/themes/simple/clock-drop-shadow.svg
+%%DATADIR%%/themes/simple/clock-face-shadow.svg
+%%DATADIR%%/themes/simple/clock-face.svg
+%%DATADIR%%/themes/simple/clock-frame.svg
+%%DATADIR%%/themes/simple/clock-glass.svg
+%%DATADIR%%/themes/simple/clock-hour-hand-shadow.svg
+%%DATADIR%%/themes/simple/clock-hour-hand.svg
+%%DATADIR%%/themes/simple/clock-marks.svg
+%%DATADIR%%/themes/simple/clock-minute-hand-shadow.svg
+%%DATADIR%%/themes/simple/clock-minute-hand.svg
+%%DATADIR%%/themes/simple/clock-second-hand-shadow.svg
+%%DATADIR%%/themes/simple/clock-second-hand.svg
 %%DATADIR%%/themes/tango/clock-drop-shadow.svg
 %%DATADIR%%/themes/tango/clock-face-shadow.svg
 %%DATADIR%%/themes/tango/clock-face.svg
@@ -228,52 +231,45 @@ bin/cairo-clock
 %%DATADIR%%/themes/zen/clock-minute-hand.svg
 %%DATADIR%%/themes/zen/clock-second-hand-shadow.svg
 %%DATADIR%%/themes/zen/clock-second-hand.svg
-%%DATADIR%%/pixmaps/cairo-clock-logo.png
-%%NLS%%share/locale/de/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/it/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/da/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/es/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/cairo-clock.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/cairo-clock.mo
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/applications/cairo-clock.desktop
+share/locale/da/LC_MESSAGES/cairo-clock.mo
+share/locale/de/LC_MESSAGES/cairo-clock.mo
+share/locale/en_GB/LC_MESSAGES/cairo-clock.mo
+share/locale/es/LC_MESSAGES/cairo-clock.mo
+share/locale/fi/LC_MESSAGES/cairo-clock.mo
+share/locale/fr/LC_MESSAGES/cairo-clock.mo
+share/locale/it/LC_MESSAGES/cairo-clock.mo
+share/locale/ja/LC_MESSAGES/cairo-clock.mo
+share/locale/nl/LC_MESSAGES/cairo-clock.mo
+share/locale/nn/LC_MESSAGES/cairo-clock.mo
+share/locale/pl/LC_MESSAGES/cairo-clock.mo
+share/locale/pt_PT/LC_MESSAGES/cairo-clock.mo
+share/locale/ru/LC_MESSAGES/cairo-clock.mo
+share/locale/sl/LC_MESSAGES/cairo-clock.mo
+share/locale/sv/LC_MESSAGES/cairo-clock.mo
+share/locale/tr/LC_MESSAGES/cairo-clock.mo
+share/locale/zh_CN/LC_MESSAGES/cairo-clock.mo
+share/locale/zh_TW/LC_MESSAGES/cairo-clock.mo
 share/pixmaps/cairo-clock.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/themes/zen
-@dirrmtry %%DATADIR%%/themes/tango
-@dirrmtry %%DATADIR%%/themes/simple-24
-@dirrmtry %%DATADIR%%/themes/simple
-@dirrmtry %%DATADIR%%/themes/silvia-24
-@dirrmtry %%DATADIR%%/themes/silvia
-@dirrmtry %%DATADIR%%/themes/radium-24
-@dirrmtry %%DATADIR%%/themes/radium
-@dirrmtry %%DATADIR%%/themes/quartz-24
-@dirrmtry %%DATADIR%%/themes/ipulse-24
-@dirrmtry %%DATADIR%%/themes/ipulse
-@dirrmtry %%DATADIR%%/themes/gremlin-24
-@dirrmtry %%DATADIR%%/themes/gremlin
-@dirrmtry %%DATADIR%%/themes/glassy
-@dirrmtry %%DATADIR%%/themes/funky
-@dirrmtry %%DATADIR%%/themes/fdo
-@dirrmtry %%DATADIR%%/themes/default-24
-@dirrmtry %%DATADIR%%/themes/default
+@dirrmtry %%DATADIR%%/glade
+@dirrmtry %%DATADIR%%/pixmaps
 @dirrmtry %%DATADIR%%/themes/antique
+@dirrmtry %%DATADIR%%/themes/default
+@dirrmtry %%DATADIR%%/themes/default-24
+@dirrmtry %%DATADIR%%/themes/fdo
+@dirrmtry %%DATADIR%%/themes/funky
+@dirrmtry %%DATADIR%%/themes/glassy
+@dirrmtry %%DATADIR%%/themes/gremlin
+@dirrmtry %%DATADIR%%/themes/gremlin-24
+@dirrmtry %%DATADIR%%/themes/ipulse
+@dirrmtry %%DATADIR%%/themes/ipulse-24
+@dirrmtry %%DATADIR%%/themes/quartz-24
+@dirrmtry %%DATADIR%%/themes/radium
+@dirrmtry %%DATADIR%%/themes/radium-24
+@dirrmtry %%DATADIR%%/themes/silvia
+@dirrmtry %%DATADIR%%/themes/silvia-24
+@dirrmtry %%DATADIR%%/themes/simple
+@dirrmtry %%DATADIR%%/themes/simple-24
+@dirrmtry %%DATADIR%%/themes/tango
+@dirrmtry %%DATADIR%%/themes/zen
 @dirrmtry %%DATADIR%%/themes
-@dirrmtry %%DATADIR%%/pixmaps
-@dirrmtry %%DATADIR%%/glade
 @dirrmtry %%DATADIR%%