8 files changed, 250 insertions, 94 deletions

diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index db5d2332df06..c251945e64a3 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sawfish
-PORTVERSION= 	0.28.1
+PORTVERSION= 	0.29
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sawmill
@@ -34,18 +34,16 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share --with-readline
 .if !defined(NOGNOME)
 CONFIGURE_ARGS+=	--enable-capplet
+PLIST_SUB+=	GNOME:=""
 .else
 CONFIGURE_ARGS+=	--disable-capplet
+PLIST_SUB+=	GNOME:="@comment "
 .endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib -lxpg4"
 
-.if defined(NOGNOME)
-PLIST=		${PKGDIR}/PLIST.nognome
-.endif
-
 post-install:
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
diff --git a/x11-wm/sawfish/distinfo b/x11-wm/sawfish/distinfo
index c978eddd57cc..656c1e4a1724 100644
--- a/x11-wm/sawfish/distinfo
+++ b/x11-wm/sawfish/distinfo
@@ -1 +1 @@
-MD5 (sawfish-0.28.1.tar.gz) = 98346603de3c6a2b0a7e5c29158b4193
+MD5 (sawfish-0.29.tar.gz) = de1892c61b8924755f1d29f0e284c460
diff --git a/x11-wm/sawfish/files/patch-ac b/x11-wm/sawfish/files/patch-ac
index 6f875a880999..93e3b1a4f47c 100644
--- a/x11-wm/sawfish/files/patch-ac
+++ b/x11-wm/sawfish/files/patch-ac
@@ -1,11 +1,29 @@
---- configure.in.orig	Thu May 18 19:23:25 2000
-+++ configure.in	Sun May 28 08:03:33 2000
-@@ -55,7 +55,7 @@
- 
+--- configure.in.orig	Sun Jul  2 18:17:23 2000
++++ configure.in	Mon Jul  3 13:19:32 2000
+@@ -57,7 +57,7 @@
  sawfishdir='${datadir}/sawfish'
  lispdir='${sawfishdir}/${version}/lisp'
+ nokogiridir='${sawfishdir}/${version}/nokogiri'
 -localedir='${sawfishdir}/${version}/locale'
 +localedir='${datadir}/locale'
  sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
  
  dnl Checks for programs.
+@@ -108,12 +108,12 @@
+   (error
+     (throw 'quit 1)))
+ EOF
+-if rep ./conftest 2>&5; then
++#if rep ./conftest 2>&5; then
+   AC_MSG_RESULT([yes])
+-else
+-  AC_MSG_RESULT([no])
+-  AC_MSG_ERROR([You need rep-gtk version ${rep_gtk_version}+])
+-fi
++#else
++#  AC_MSG_RESULT([no])
++#  AC_MSG_ERROR([You need rep-gtk version ${rep_gtk_version}+])
++#fi
+ 
+ dnl is X available?
+ if test "${no_x}" != "yes"; then
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 16f831c5300c..41e4757ee999 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -1,5 +1,5 @@
 bin/sawfish
-bin/sawfish-capplet
+%%GNOME:%%bin/sawfish-capplet
 bin/sawfish-client
 bin/sawfish-themer
 bin/sawfish-ui
@@ -36,43 +36,48 @@ share/locale/ko/LC_MESSAGES/sawfish.mo
 share/locale/nl/LC_MESSAGES/sawfish.mo
 share/locale/pl/LC_MESSAGES/sawfish.mo
 share/locale/pt_PT/LC_MESSAGES/sawfish.mo
+share/locale/ru/LC_MESSAGES/sawfish.mo
 share/locale/sv/LC_MESSAGES/sawfish.mo
 share/locale/tr/LC_MESSAGES/sawfish.mo
-share/gnome/control-center/Sawfish/.directory
-share/gnome/control-center/Sawfish/appearance-properties.desktop
-share/gnome/control-center/Sawfish/bindings-properties.desktop
-share/gnome/control-center/Sawfish/focus-properties.desktop
-share/gnome/control-center/Sawfish/match-properties.desktop
-share/gnome/control-center/Sawfish/maximize-properties.desktop
-share/gnome/control-center/Sawfish/misc-properties.desktop
-share/gnome/control-center/Sawfish/move-properties.desktop
-share/gnome/control-center/Sawfish/placement-properties.desktop
-share/gnome/control-center/Sawfish/sound-properties.desktop
-share/gnome/control-center/Sawfish/workspace-properties.desktop
-share/gnome/apps/Settings/Sawfish/.directory
-share/gnome/apps/Settings/Sawfish/appearance-properties.desktop
-share/gnome/apps/Settings/Sawfish/bindings-properties.desktop
-share/gnome/apps/Settings/Sawfish/focus-properties.desktop
-share/gnome/apps/Settings/Sawfish/match-properties.desktop
-share/gnome/apps/Settings/Sawfish/maximize-properties.desktop
-share/gnome/apps/Settings/Sawfish/misc-properties.desktop
-share/gnome/apps/Settings/Sawfish/move-properties.desktop
-share/gnome/apps/Settings/Sawfish/placement-properties.desktop
-share/gnome/apps/Settings/Sawfish/sound-properties.desktop
-share/gnome/apps/Settings/Sawfish/workspace-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/.directory
+%%GNOME:%%share/gnome/control-center/Sawfish/.order
+%%GNOME:%%share/gnome/control-center/Sawfish/appearance-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/bindings-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/focus-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/match-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/maximize-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/meta-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/misc-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/move-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/placement-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/sound-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/workspace-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/.directory
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/.order
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/appearance-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/bindings-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/focus-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/match-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/maximize-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/meta-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/misc-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/move-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/placement-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/sound-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/workspace-properties.desktop
 share/gnome/wm-properties/Sawfish.desktop
-share/gnome/pixmaps/sawfish-appearance.png
-share/gnome/pixmaps/sawfish-edgeflip.png
-share/gnome/pixmaps/sawfish-focus.png
-share/gnome/pixmaps/sawfish-logo.png
-share/gnome/pixmaps/sawfish-matched.png
-share/gnome/pixmaps/sawfish-minmax.png
-share/gnome/pixmaps/sawfish-misc.png
-share/gnome/pixmaps/sawfish-moveresize.png
-share/gnome/pixmaps/sawfish-placement.png
-share/gnome/pixmaps/sawfish-shortcuts.png
-share/gnome/pixmaps/sawfish-tooltips.png
-share/gnome/pixmaps/sawfish-workspaces.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-appearance.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-edgeflip.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-focus.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-logo.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-matched.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-minmax.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-misc.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-moveresize.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-placement.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-shortcuts.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-tooltips.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-workspaces.png
 share/sawfish/%%VERSION%%/lisp/3d-hack.jl
 share/sawfish/%%VERSION%%/lisp/3d-hack.jlc
 share/sawfish/%%VERSION%%/lisp/anim-outline.jl
@@ -158,6 +163,8 @@ share/sawfish/%%VERSION%%/lisp/move-resize.jl
 share/sawfish/%%VERSION%%/lisp/move-resize.jlc
 share/sawfish/%%VERSION%%/lisp/mwm.jl
 share/sawfish/%%VERSION%%/lisp/mwm.jlc
+share/sawfish/%%VERSION%%/lisp/nokogiri-sawfish.jl
+share/sawfish/%%VERSION%%/lisp/nokogiri-sawfish.jlc
 share/sawfish/%%VERSION%%/lisp/old-window-menu.jl
 share/sawfish/%%VERSION%%/lisp/old-window-menu.jlc
 share/sawfish/%%VERSION%%/lisp/open-look.jl
@@ -206,6 +213,8 @@ share/sawfish/%%VERSION%%/lisp/smart-placement.jl
 share/sawfish/%%VERSION%%/lisp/smart-placement.jlc
 share/sawfish/%%VERSION%%/lisp/stacking.jl
 share/sawfish/%%VERSION%%/lisp/stacking.jlc
+share/sawfish/%%VERSION%%/lisp/stagger-placement.jl
+share/sawfish/%%VERSION%%/lisp/stagger-placement.jlc
 share/sawfish/%%VERSION%%/lisp/tooltips.jl
 share/sawfish/%%VERSION%%/lisp/tooltips.jlc
 share/sawfish/%%VERSION%%/lisp/transient.jl
@@ -230,6 +239,56 @@ share/sawfish/%%VERSION%%/lisp/workspace.jl
 share/sawfish/%%VERSION%%/lisp/workspace.jlc
 share/sawfish/%%VERSION%%/lisp/x-cycle.jl
 share/sawfish/%%VERSION%%/lisp/x-cycle.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-apply.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-apply.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-color-preview.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-color-preview.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-config.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-config.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-dialog.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-dialog.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-group.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-group.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-i18n.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-i18n.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-layout.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-layout.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-layouts/keymaps.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-layouts/keymaps.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-main.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-main.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-shell.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-shell.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-slot.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-slot.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-user-level.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-user-level.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget-dialog.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget-dialog.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget-test.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget-test.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/alist.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/alist.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/color.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/color.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/file.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/file.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/font.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/font.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/frame-style.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/frame-style.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/keymap.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/keymap.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/list.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/list.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/match-window.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/match-window.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/pair.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/pair.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-wm.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-wm.jlc
 share/sawfish/%%VERSION%%/sounds/activate.wav
 share/sawfish/%%VERSION%%/sounds/clicked.wav
 share/sawfish/%%VERSION%%/sounds/gameover.wav
@@ -385,8 +444,8 @@ share/sawfish/%%VERSION%%/themes/smaker/theme.jl
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%
 @dirrm libexec/sawfish/%%VERSION%%
 @dirrm libexec/sawfish
-@dirrm share/gnome/control-center/Sawfish
-@dirrm share/gnome/apps/Settings/Sawfish
+%%GNOME:%%@dirrm share/gnome/control-center/Sawfish
+%%GNOME:%%@dirrm share/gnome/apps/Settings/Sawfish
 @dirrm share/sawfish/%%VERSION%%/lisp
 @dirrm share/sawfish/%%VERSION%%/sounds
 @dirrm share/sawfish/%%VERSION%%/themes/absolute-e
@@ -398,6 +457,9 @@ share/sawfish/%%VERSION%%/themes/smaker/theme.jl
 @dirrm share/sawfish/%%VERSION%%/themes/simple
 @dirrm share/sawfish/%%VERSION%%/themes/smaker
 @dirrm share/sawfish/%%VERSION%%/themes
+@dirrm share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets
+@dirrm share/sawfish/%%VERSION%%/nokogiri/nokogiri-layouts
+@dirrm share/sawfish/%%VERSION%%/nokogiri
 @dirrm share/sawfish/%%VERSION%%
 @dirrm share/sawfish/sounds
 @dirrm share/sawfish/themes
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index db5d2332df06..c251945e64a3 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sawfish
-PORTVERSION= 	0.28.1
+PORTVERSION= 	0.29
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sawmill
@@ -34,18 +34,16 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share --with-readline
 .if !defined(NOGNOME)
 CONFIGURE_ARGS+=	--enable-capplet
+PLIST_SUB+=	GNOME:=""
 .else
 CONFIGURE_ARGS+=	--disable-capplet
+PLIST_SUB+=	GNOME:="@comment "
 .endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib -lxpg4"
 
-.if defined(NOGNOME)
-PLIST=		${PKGDIR}/PLIST.nognome
-.endif
-
 post-install:
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo
index c978eddd57cc..656c1e4a1724 100644
--- a/x11-wm/sawfish2/distinfo
+++ b/x11-wm/sawfish2/distinfo
@@ -1 +1 @@
-MD5 (sawfish-0.28.1.tar.gz) = 98346603de3c6a2b0a7e5c29158b4193
+MD5 (sawfish-0.29.tar.gz) = de1892c61b8924755f1d29f0e284c460
diff --git a/x11-wm/sawfish2/files/patch-ac b/x11-wm/sawfish2/files/patch-ac
index 6f875a880999..93e3b1a4f47c 100644
--- a/x11-wm/sawfish2/files/patch-ac
+++ b/x11-wm/sawfish2/files/patch-ac
@@ -1,11 +1,29 @@
---- configure.in.orig	Thu May 18 19:23:25 2000
-+++ configure.in	Sun May 28 08:03:33 2000
-@@ -55,7 +55,7 @@
- 
+--- configure.in.orig	Sun Jul  2 18:17:23 2000
++++ configure.in	Mon Jul  3 13:19:32 2000
+@@ -57,7 +57,7 @@
  sawfishdir='${datadir}/sawfish'
  lispdir='${sawfishdir}/${version}/lisp'
+ nokogiridir='${sawfishdir}/${version}/nokogiri'
 -localedir='${sawfishdir}/${version}/locale'
 +localedir='${datadir}/locale'
  sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
  
  dnl Checks for programs.
+@@ -108,12 +108,12 @@
+   (error
+     (throw 'quit 1)))
+ EOF
+-if rep ./conftest 2>&5; then
++#if rep ./conftest 2>&5; then
+   AC_MSG_RESULT([yes])
+-else
+-  AC_MSG_RESULT([no])
+-  AC_MSG_ERROR([You need rep-gtk version ${rep_gtk_version}+])
+-fi
++#else
++#  AC_MSG_RESULT([no])
++#  AC_MSG_ERROR([You need rep-gtk version ${rep_gtk_version}+])
++#fi
+ 
+ dnl is X available?
+ if test "${no_x}" != "yes"; then
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist
index 16f831c5300c..41e4757ee999 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish2/pkg-plist
@@ -1,5 +1,5 @@
 bin/sawfish
-bin/sawfish-capplet
+%%GNOME:%%bin/sawfish-capplet
 bin/sawfish-client
 bin/sawfish-themer
 bin/sawfish-ui
@@ -36,43 +36,48 @@ share/locale/ko/LC_MESSAGES/sawfish.mo
 share/locale/nl/LC_MESSAGES/sawfish.mo
 share/locale/pl/LC_MESSAGES/sawfish.mo
 share/locale/pt_PT/LC_MESSAGES/sawfish.mo
+share/locale/ru/LC_MESSAGES/sawfish.mo
 share/locale/sv/LC_MESSAGES/sawfish.mo
 share/locale/tr/LC_MESSAGES/sawfish.mo
-share/gnome/control-center/Sawfish/.directory
-share/gnome/control-center/Sawfish/appearance-properties.desktop
-share/gnome/control-center/Sawfish/bindings-properties.desktop
-share/gnome/control-center/Sawfish/focus-properties.desktop
-share/gnome/control-center/Sawfish/match-properties.desktop
-share/gnome/control-center/Sawfish/maximize-properties.desktop
-share/gnome/control-center/Sawfish/misc-properties.desktop
-share/gnome/control-center/Sawfish/move-properties.desktop
-share/gnome/control-center/Sawfish/placement-properties.desktop
-share/gnome/control-center/Sawfish/sound-properties.desktop
-share/gnome/control-center/Sawfish/workspace-properties.desktop
-share/gnome/apps/Settings/Sawfish/.directory
-share/gnome/apps/Settings/Sawfish/appearance-properties.desktop
-share/gnome/apps/Settings/Sawfish/bindings-properties.desktop
-share/gnome/apps/Settings/Sawfish/focus-properties.desktop
-share/gnome/apps/Settings/Sawfish/match-properties.desktop
-share/gnome/apps/Settings/Sawfish/maximize-properties.desktop
-share/gnome/apps/Settings/Sawfish/misc-properties.desktop
-share/gnome/apps/Settings/Sawfish/move-properties.desktop
-share/gnome/apps/Settings/Sawfish/placement-properties.desktop
-share/gnome/apps/Settings/Sawfish/sound-properties.desktop
-share/gnome/apps/Settings/Sawfish/workspace-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/.directory
+%%GNOME:%%share/gnome/control-center/Sawfish/.order
+%%GNOME:%%share/gnome/control-center/Sawfish/appearance-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/bindings-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/focus-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/match-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/maximize-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/meta-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/misc-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/move-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/placement-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/sound-properties.desktop
+%%GNOME:%%share/gnome/control-center/Sawfish/workspace-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/.directory
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/.order
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/appearance-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/bindings-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/focus-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/match-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/maximize-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/meta-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/misc-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/move-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/placement-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/sound-properties.desktop
+%%GNOME:%%share/gnome/apps/Settings/Sawfish/workspace-properties.desktop
 share/gnome/wm-properties/Sawfish.desktop
-share/gnome/pixmaps/sawfish-appearance.png
-share/gnome/pixmaps/sawfish-edgeflip.png
-share/gnome/pixmaps/sawfish-focus.png
-share/gnome/pixmaps/sawfish-logo.png
-share/gnome/pixmaps/sawfish-matched.png
-share/gnome/pixmaps/sawfish-minmax.png
-share/gnome/pixmaps/sawfish-misc.png
-share/gnome/pixmaps/sawfish-moveresize.png
-share/gnome/pixmaps/sawfish-placement.png
-share/gnome/pixmaps/sawfish-shortcuts.png
-share/gnome/pixmaps/sawfish-tooltips.png
-share/gnome/pixmaps/sawfish-workspaces.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-appearance.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-edgeflip.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-focus.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-logo.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-matched.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-minmax.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-misc.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-moveresize.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-placement.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-shortcuts.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-tooltips.png
+%%GNOME:%%share/gnome/pixmaps/sawfish-workspaces.png
 share/sawfish/%%VERSION%%/lisp/3d-hack.jl
 share/sawfish/%%VERSION%%/lisp/3d-hack.jlc
 share/sawfish/%%VERSION%%/lisp/anim-outline.jl
@@ -158,6 +163,8 @@ share/sawfish/%%VERSION%%/lisp/move-resize.jl
 share/sawfish/%%VERSION%%/lisp/move-resize.jlc
 share/sawfish/%%VERSION%%/lisp/mwm.jl
 share/sawfish/%%VERSION%%/lisp/mwm.jlc
+share/sawfish/%%VERSION%%/lisp/nokogiri-sawfish.jl
+share/sawfish/%%VERSION%%/lisp/nokogiri-sawfish.jlc
 share/sawfish/%%VERSION%%/lisp/old-window-menu.jl
 share/sawfish/%%VERSION%%/lisp/old-window-menu.jlc
 share/sawfish/%%VERSION%%/lisp/open-look.jl
@@ -206,6 +213,8 @@ share/sawfish/%%VERSION%%/lisp/smart-placement.jl
 share/sawfish/%%VERSION%%/lisp/smart-placement.jlc
 share/sawfish/%%VERSION%%/lisp/stacking.jl
 share/sawfish/%%VERSION%%/lisp/stacking.jlc
+share/sawfish/%%VERSION%%/lisp/stagger-placement.jl
+share/sawfish/%%VERSION%%/lisp/stagger-placement.jlc
 share/sawfish/%%VERSION%%/lisp/tooltips.jl
 share/sawfish/%%VERSION%%/lisp/tooltips.jlc
 share/sawfish/%%VERSION%%/lisp/transient.jl
@@ -230,6 +239,56 @@ share/sawfish/%%VERSION%%/lisp/workspace.jl
 share/sawfish/%%VERSION%%/lisp/workspace.jlc
 share/sawfish/%%VERSION%%/lisp/x-cycle.jl
 share/sawfish/%%VERSION%%/lisp/x-cycle.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-apply.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-apply.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-color-preview.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-color-preview.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-config.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-config.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-dialog.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-dialog.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-group.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-group.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-i18n.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-i18n.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-layout.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-layout.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-layouts/keymaps.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-layouts/keymaps.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-main.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-main.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-shell.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-shell.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-slot.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-slot.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-user-level.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-user-level.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget-dialog.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget-dialog.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget-test.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget-test.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widget.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/alist.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/alist.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/color.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/color.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/file.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/file.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/font.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/font.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/frame-style.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/frame-style.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/keymap.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/keymap.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/list.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/list.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/match-window.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/match-window.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/pair.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/pair.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-wm.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-wm.jlc
 share/sawfish/%%VERSION%%/sounds/activate.wav
 share/sawfish/%%VERSION%%/sounds/clicked.wav
 share/sawfish/%%VERSION%%/sounds/gameover.wav
@@ -385,8 +444,8 @@ share/sawfish/%%VERSION%%/themes/smaker/theme.jl
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%
 @dirrm libexec/sawfish/%%VERSION%%
 @dirrm libexec/sawfish
-@dirrm share/gnome/control-center/Sawfish
-@dirrm share/gnome/apps/Settings/Sawfish
+%%GNOME:%%@dirrm share/gnome/control-center/Sawfish
+%%GNOME:%%@dirrm share/gnome/apps/Settings/Sawfish
 @dirrm share/sawfish/%%VERSION%%/lisp
 @dirrm share/sawfish/%%VERSION%%/sounds
 @dirrm share/sawfish/%%VERSION%%/themes/absolute-e
@@ -398,6 +457,9 @@ share/sawfish/%%VERSION%%/themes/smaker/theme.jl
 @dirrm share/sawfish/%%VERSION%%/themes/simple
 @dirrm share/sawfish/%%VERSION%%/themes/smaker
 @dirrm share/sawfish/%%VERSION%%/themes
+@dirrm share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets
+@dirrm share/sawfish/%%VERSION%%/nokogiri/nokogiri-layouts
+@dirrm share/sawfish/%%VERSION%%/nokogiri
 @dirrm share/sawfish/%%VERSION%%
 @dirrm share/sawfish/sounds
 @dirrm share/sawfish/themes