7 files changed, 137 insertions, 300 deletions

diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 2116e7ba3642..adbe0b7f1d27 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	sawfish
-PORTVERSION=	1.3.3
-PORTREVISION=	2
+PORTVERSION=	1.3.5.2
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
@@ -27,17 +26,14 @@ PLIST_SUB=	GNUHOST=${GNUHOST} VERSION=${PORTVERSION}
 
 USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GNOME=	gnomehier gnomehack esound
-USE_AUTOTOOLS=	autoconf:262:env automake:19:env libtool:15:env
-WANT_GNOME=	yes
+USE_GNOME=	esound
+USE_BZIP2=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_SCRIPT=	autogen.sh
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share \
-		--enable-capplet \
-		--disable-themer \
+		--disable-gnome-widgets \
 		--with-esd
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -47,6 +43,7 @@ INFO=		sawfish
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|prog_name|program_name|g' \
-	    	${WRKSRC}/src/main.c
+	${WRKSRC}/src/main.c
+	@${MKDIR} ${WRKSRC}/m4
 
 .include <bsd.port.mk>
diff --git a/x11-wm/sawfish/distinfo b/x11-wm/sawfish/distinfo
index 8382d932f7de..5371f845cbce 100644
--- a/x11-wm/sawfish/distinfo
+++ b/x11-wm/sawfish/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sawfish-1.3.3.tar.gz) = 456724c79ddb0b78d03d45dcaffa4103
-SHA256 (gnome2/sawfish-1.3.3.tar.gz) = 3040baecd4a521f02067fef5de9e4e03f4eeb95ce2d29dfdabbdca62ccfedb30
-SIZE (gnome2/sawfish-1.3.3.tar.gz) = 1805122
+MD5 (gnome2/sawfish-1.3.5.2.tar.bz2) = c552404e721abb7b82fa2028483123b5
+SHA256 (gnome2/sawfish-1.3.5.2.tar.bz2) = 66d5fcabb01df82d5f529fbc604cdc7dc36c781e18bc13ff9b6533e8049aadc8
+SIZE (gnome2/sawfish-1.3.5.2.tar.bz2) = 1545082
diff --git a/x11-wm/sawfish/files/patch-ae b/x11-wm/sawfish/files/patch-ae
deleted file mode 100644
index ccd0bc67f4b6..000000000000
--- a/x11-wm/sawfish/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplet/Makefile.in.orig	2007-10-10 17:59:01.000000000 -0500
-+++ capplet/Makefile.in	2007-10-10 17:59:24.000000000 -0500
-@@ -26,7 +26,7 @@
- srcdir=@srcdir@
- VPATH=@srcdir@:@top_srcdir@
- 
--G_CC_DIR = $(GNOMEDIR)/share/control-center-2.0/capplets
-+G_CC_DIR = $(GNOMEDIR)/share/applications
- G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps
- 
- all :
diff --git a/x11-wm/sawfish/files/patch-config.h.in b/x11-wm/sawfish/files/patch-config.h.in
new file mode 100644
index 000000000000..dc36ec6d903b
--- /dev/null
+++ b/x11-wm/sawfish/files/patch-config.h.in
@@ -0,0 +1,116 @@
+--- config.h.in.orig
++++ config.h.in
+@@ -1,8 +1,5 @@
+ /* config.h.in.  Generated from configure.in by autoheader.  */
+ 
+-/* Define if building universal (internal helper macro) */
+-#undef AC_APPLE_UNIVERSAL_BUILD
+-
+ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+    systems. This function is required for `alloca.c' support on those systems.
+    */
+@@ -24,13 +21,13 @@
+ /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+ #undef HAVE_DOPRNT
+ 
+-/* Have esound */
++/* Have ESD */
+ #undef HAVE_ESD
+ 
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #undef HAVE_FCNTL_H
+ 
+-/* gdk pixbuf */
++/* Have gdk-pixbuf */
+ #undef HAVE_GDK_PIXBUF
+ 
+ /* Define to 1 if you have the `gethostname' function. */
+@@ -39,13 +36,16 @@
+ /* Define to 1 if you have the `getpagesize' function. */
+ #undef HAVE_GETPAGESIZE
+ 
+-/* have imlib */
++/* Have GTK */
++#undef HAVE_GTK
++
++/* Have Imlib1 */
+ #undef HAVE_IMLIB
+ 
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
+-/* have libaudiofile */
++/* Have libaudiofile */
+ #undef HAVE_LIBAUDIOFILE
+ 
+ /* Define to 1 if you have the `nsl' library (-lnsl). */
+@@ -57,6 +57,15 @@
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+ 
++/* Have pango */
++#undef HAVE_PANGO
++
++/* Have pangox */
++#undef HAVE_PANGO_X
++
++/* Have pangoxft */
++#undef HAVE_PANGO_XFT
++
+ /* Define to 1 if you have the `snprintf' function. */
+ #undef HAVE_SNPRINTF
+ 
+@@ -96,7 +105,7 @@
+ /* Define to 1 if you have the `vprintf' function. */
+ #undef HAVE_VPRINTF
+ 
+-/* have x11 */
++/* Have X11 */
+ #undef HAVE_X11
+ 
+ /* Define to 1 if you have the <X11/extensions/Xdbe.h> header file. */
+@@ -108,13 +117,19 @@
+ /* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */
+ #undef HAVE_X11_EXTENSIONS_XRANDR_H
+ 
++/* Define to 1 if you have the <X11/ICE/ICE.h> header file. */
++#undef HAVE_X11_ICE_ICE_H
++
+ /* Define to 1 if you have the <X11/SM/SMlib.h> header file. */
+ #undef HAVE_X11_SM_SMLIB_H
+ 
++/* Have xft */
++#undef HAVE_X11_XFT_XFT_H
++
+ /* libc malloc */
+ #undef LIBC_MALLOC
+ 
+-/* pixmap cache */
++/* Need pixmap cache */
+ #undef NEED_PIXMAP_CACHE
+ 
+ /* Define to the address where bug reports for this package should be sent. */
+@@ -146,19 +161,11 @@
+ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+ #undef TIME_WITH_SYS_TIME
+ 
+-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+-   significant byte first (like Motorola and SPARC, unlike Intel). */
+-#if defined AC_APPLE_UNIVERSAL_BUILD
+-# if defined __BIG_ENDIAN__
+-#  define WORDS_BIGENDIAN 1
+-# endif
+-#else
+-# ifndef WORDS_BIGENDIAN
+-#  undef WORDS_BIGENDIAN
+-# endif
+-#endif
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN
+ 
+-/* Define to 1 if the X Window System is missing or not being used. */
++/* Have x11 */
+ #undef X_DISPLAY_MISSING
+ 
+ /* Define to empty if `const' does not conform to ANSI C. */
diff --git a/x11-wm/sawfish/files/patch-configure.in b/x11-wm/sawfish/files/patch-configure.in
deleted file mode 100644
index 59959371f208..000000000000
--- a/x11-wm/sawfish/files/patch-configure.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.orig	2007-07-27 15:43:23.000000000 +0300
-+++ configure.in	2007-11-24 00:39:45.000000000 +0200
-@@ -159,7 +159,7 @@
-   (error
-     (throw 'quit 1)))
- EOF
--if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
-+if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then
-   AC_MSG_RESULT([yes])
- else
-   AC_MSG_RESULT([no])
-@@ -264,7 +264,7 @@
- if test "$enable_themer" = yes; then
-   dnl configure redirects &5 to config.log
-   AC_MSG_CHECKING([for rep-gtk libglade wrapper])
--  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then 
-+  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then 
-     AC_MSG_RESULT([yes])
-     add_subdir "themer"
-   else 
diff --git a/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
deleted file mode 100644
index af4e2b49afb1..000000000000
--- a/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
+++ /dev/null
@@ -1,10 +0,0 @@
---- lisp/sawfish/ui/widgets/workspace-geometry.jl	2002/04/29 19:16:50	1.1
-+++ lisp/sawfish/ui/widgets/workspace-geometry.jl	2002/04/29 19:17:07
-@@ -28,7 +28,6 @@
-     (open rep
- 	  gui.gtk-2.gtk
- 	  gui.gtk-2.gnome-canvas
--	  gui.gtk-2.gdk-pixbuf
- 	  rep.io.files
- 	  sawfish.gtk.widget
- 	  sawfish.ui.layout)
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 38f587299868..c823a7b38fa8 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -23,29 +23,6 @@ libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.so
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.so
-share/applications/appearance-properties.desktop
-share/applications/bindings-properties.desktop
-share/applications/focus-properties.desktop
-share/applications/match-properties.desktop
-share/applications/maximize-properties.desktop
-share/applications/misc-properties.desktop
-share/applications/move-properties.desktop
-share/applications/placement-properties.desktop
-share/applications/sound-properties.desktop
-share/applications/workspace-properties.desktop
-share/pixmaps/sawfish-appearance.png
-share/pixmaps/sawfish-edgeflip.png
-share/pixmaps/sawfish-focus.png
-share/pixmaps/sawfish-logo.png
-share/pixmaps/sawfish-matched.png
-share/pixmaps/sawfish-minmax.png
-share/pixmaps/sawfish-misc.png
-share/pixmaps/sawfish-moveresize.png
-share/pixmaps/sawfish-placement.png
-share/pixmaps/sawfish-shortcuts.png
-share/pixmaps/sawfish-tooltips.png
-share/pixmaps/sawfish-workspaces.png
-share/gnome/wm-properties/Sawfish.desktop
 share/locale/am/LC_MESSAGES/sawfish.mo
 share/locale/ar/LC_MESSAGES/sawfish.mo
 share/locale/az/LC_MESSAGES/sawfish.mo
@@ -439,230 +416,18 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
 %%DATADIR%%/%%VERSION%%/sounds/gameover.wav
 %%DATADIR%%/%%VERSION%%/sounds/slide.wav
 %%DATADIR%%/%%VERSION%%/sounds/toggled.wav
-%%DATADIR%%/%%VERSION%%/themes/Crux/README
-%%DATADIR%%/%%VERSION%%/themes/Crux/README.gl
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:bottom-left-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:bottom-left-corner.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:bottom-right-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:bottom-right-corner.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:button-hilight.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:button-pressed.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:close-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:left-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:left-top-border-shaped.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:left-top-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:maximize-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:menu-button-hilight.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:menu-button-pressed.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:menu-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:minimize-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:right-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:right-top-border-shaped.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:right-top-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:shade-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:top-center-left-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:top-center-left.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:top-center-mid.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:top-center-right-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:top-center-right.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:top-left-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/active:top-right-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:bottom-left-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:bottom-left-corner.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:bottom-right-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:bottom-right-corner.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:button-hilight.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:button-pressed.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:close-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:left-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:left-top-border-shaped.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:left-top-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:maximize-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:menu-button-hilight.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:menu-button-pressed.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:menu-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:minimize-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:right-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:right-top-border-shaped.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:right-top-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:shade-button.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:top-center-left-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:top-center-left.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:top-center-mid.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:top-center-right-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:top-center-right.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:top-left-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/inactive:top-right-border.png
-%%DATADIR%%/%%VERSION%%/themes/Crux/theme.jl
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/README
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/README.gl
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/README.it
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/README.ja
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/README.pl
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/bar_clicked_active.png
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/bar_hilited_active.png
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/bar_normal.png
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/bar_normal_active.png
-%%DATADIR%%/%%VERSION%%/themes/absolute-e/theme.jl
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/README
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/README.gl
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/README.it
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/README.ja
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/README.pl
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b1-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b1.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b2-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b2.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b3-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b3.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b5-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b5.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b6-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b6.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b7-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/b7.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t1-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t1-b.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t1.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t1b.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t2-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t2.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t2s-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t2s.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t3-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t3-b.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t3.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t3b.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t4-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t4-b.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t4.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t4b.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t5-.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t5-b.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t5.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/t5b.png
-%%DATADIR%%/%%VERSION%%/themes/brushed-metal/theme.jl
-%%DATADIR%%/%%VERSION%%/themes/gradient/README
-%%DATADIR%%/%%VERSION%%/themes/gradient/README.gl
-%%DATADIR%%/%%VERSION%%/themes/gradient/README.it
-%%DATADIR%%/%%VERSION%%/themes/gradient/README.ja
-%%DATADIR%%/%%VERSION%%/themes/gradient/README.pl
-%%DATADIR%%/%%VERSION%%/themes/gradient/as_close-b.png
-%%DATADIR%%/%%VERSION%%/themes/gradient/as_close.png
-%%DATADIR%%/%%VERSION%%/themes/gradient/as_min-b.png
-%%DATADIR%%/%%VERSION%%/themes/gradient/as_min.png
-%%DATADIR%%/%%VERSION%%/themes/gradient/theme.jl
-%%DATADIR%%/%%VERSION%%/themes/gtk/README
-%%DATADIR%%/%%VERSION%%/themes/gtk/README.gl
-%%DATADIR%%/%%VERSION%%/themes/gtk/README.it
-%%DATADIR%%/%%VERSION%%/themes/gtk/README.ja
-%%DATADIR%%/%%VERSION%%/themes/gtk/README.pl
-%%DATADIR%%/%%VERSION%%/themes/gtk/as_close-b.png
-%%DATADIR%%/%%VERSION%%/themes/gtk/as_close.png
-%%DATADIR%%/%%VERSION%%/themes/gtk/as_min-b.png
-%%DATADIR%%/%%VERSION%%/themes/gtk/as_min.png
-%%DATADIR%%/%%VERSION%%/themes/gtk/theme.jl
-%%DATADIR%%/%%VERSION%%/themes/microGUI/README
-%%DATADIR%%/%%VERSION%%/themes/microGUI/README.gl
-%%DATADIR%%/%%VERSION%%/themes/microGUI/README.it
-%%DATADIR%%/%%VERSION%%/themes/microGUI/README.ja
-%%DATADIR%%/%%VERSION%%/themes/microGUI/README.pl
-%%DATADIR%%/%%VERSION%%/themes/microGUI/TODO
-%%DATADIR%%/%%VERSION%%/themes/microGUI/bl.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/bottom.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/br.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/close_active.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/close_clicked.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/close_normal.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/left.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/maximize_active.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/maximize_clicked.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/maximize_normal.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/menu_active.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/menu_clicked.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/menu_normal.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/minimize_active.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/minimize_clicked.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/minimize_normal.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/right.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_bottom.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_bottom_left.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_bottom_right.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_close_active.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_close_clicked.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_close_normal.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_left.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_right.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_top.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_top_left.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/t_top_right.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/theme.jl
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_blue.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_blue_inactive.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_curves.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_curves_inactive.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_grey.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_left.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_left_inactive.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_left_inactive_s.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_left_s.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_right.png
-%%DATADIR%%/%%VERSION%%/themes/microGUI/top_right_s.png
-%%DATADIR%%/%%VERSION%%/themes/mono/README
-%%DATADIR%%/%%VERSION%%/themes/mono/README.gl
-%%DATADIR%%/%%VERSION%%/themes/mono/README.it
-%%DATADIR%%/%%VERSION%%/themes/mono/README.ja
-%%DATADIR%%/%%VERSION%%/themes/mono/README.pl
-%%DATADIR%%/%%VERSION%%/themes/mono/close-c.png
-%%DATADIR%%/%%VERSION%%/themes/mono/close.png
-%%DATADIR%%/%%VERSION%%/themes/mono/max-c.png
-%%DATADIR%%/%%VERSION%%/themes/mono/max.png
-%%DATADIR%%/%%VERSION%%/themes/mono/menu-c.png
-%%DATADIR%%/%%VERSION%%/themes/mono/menu.png
-%%DATADIR%%/%%VERSION%%/themes/mono/min-c.png
-%%DATADIR%%/%%VERSION%%/themes/mono/min.png
-%%DATADIR%%/%%VERSION%%/themes/mono/restore-c.png
-%%DATADIR%%/%%VERSION%%/themes/mono/restore.png
-%%DATADIR%%/%%VERSION%%/themes/mono/theme.jl
-%%DATADIR%%/%%VERSION%%/themes/simple/README
-%%DATADIR%%/%%VERSION%%/themes/simple/README.gl
-%%DATADIR%%/%%VERSION%%/themes/simple/README.it
-%%DATADIR%%/%%VERSION%%/themes/simple/README.ja
-%%DATADIR%%/%%VERSION%%/themes/simple/README.pl
-%%DATADIR%%/%%VERSION%%/themes/simple/as_close-b.png
-%%DATADIR%%/%%VERSION%%/themes/simple/as_close.png
-%%DATADIR%%/%%VERSION%%/themes/simple/as_min-b.png
-%%DATADIR%%/%%VERSION%%/themes/simple/as_min.png
-%%DATADIR%%/%%VERSION%%/themes/simple/theme.jl
-%%DATADIR%%/%%VERSION%%/themes/smaker/README
-%%DATADIR%%/%%VERSION%%/themes/smaker/README.gl
-%%DATADIR%%/%%VERSION%%/themes/smaker/README.it
-%%DATADIR%%/%%VERSION%%/themes/smaker/README.ja
-%%DATADIR%%/%%VERSION%%/themes/smaker/README.pl
-%%DATADIR%%/%%VERSION%%/themes/smaker/bar_clicked_active.png
-%%DATADIR%%/%%VERSION%%/themes/smaker/bar_hilited_active.png
-%%DATADIR%%/%%VERSION%%/themes/smaker/bar_normal.png
-%%DATADIR%%/%%VERSION%%/themes/smaker/bar_normal_active.png
-%%DATADIR%%/%%VERSION%%/themes/smaker/close.png
-%%DATADIR%%/%%VERSION%%/themes/smaker/close_inv.png
-%%DATADIR%%/%%VERSION%%/themes/smaker/min.png
-%%DATADIR%%/%%VERSION%%/themes/smaker/min_inv.png
-%%DATADIR%%/%%VERSION%%/themes/smaker/theme.jl
-@exec mkdir -p %D/%%DATADIR%%/sounds
-@exec mkdir -p %D/%%DATADIR%%/themes
-@dirrmtry %%DATADIR%%/themes
-@dirrmtry %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/%%VERSION%%/themes/smaker
-@dirrm %%DATADIR%%/%%VERSION%%/themes/simple
-@dirrm %%DATADIR%%/%%VERSION%%/themes/mono
-@dirrm %%DATADIR%%/%%VERSION%%/themes/microGUI
-@dirrm %%DATADIR%%/%%VERSION%%/themes/gtk
-@dirrm %%DATADIR%%/%%VERSION%%/themes/gradient
-@dirrm %%DATADIR%%/%%VERSION%%/themes/brushed-metal
-@dirrm %%DATADIR%%/%%VERSION%%/themes/absolute-e
-@dirrm %%DATADIR%%/%%VERSION%%/themes/Crux
+%%DATADIR%%/%%VERSION%%/themes/Crux.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/Elberg-tabbed.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/absolute-e.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/brushed-metal.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/get-S-tabbed.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/gradient.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/gtk.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/microGUI.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/mono.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/mxflat.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/simple.tar.gz
+%%DATADIR%%/%%VERSION%%/themes/smaker.tar.gz
 @dirrmtry %%DATADIR%%/%%VERSION%%/themes
 @dirrm %%DATADIR%%/%%VERSION%%/sounds
 @dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/wm/util