Update to sawfish-1.5.0. Changes:

1.5.0
=====
* New/Updated requirements:
 - librep 0.17 -> 0.90.0
 - rep-gtk 0.18.3 -> 0.18.4
* User visible changes:
 - Fully renamed from "sawmill" to "sawfish" If your `.sawfishrc' has a
   line `(require 'sawmill-defaults)', then change it to
   `(require 'sawfish-defaults)'.
   If your configuration file is named `~/.sawmillrc', then rename it
   to `~/.sawfish/rc' or `~/.sawfishrc'.
 - Configurator GUI's default style is tree view of categories.
   Configurator GUI (sawfish-ui) used to display categories in flat row,
   but now arranges them in tree diagram. To use the old style, put
   `(define-special-variable customize-program "sawfish-ui --flatten")'
   in your configuration file.
* Bugs fixed:
 - Fixed an compilation-error caused by glib
 - Make building with imlib1 instead of gdk-pixbuf work again
 - Create src/build.h, since it has been missing before
 - Fixed an "unknown remote error" that might appear
 - Make "make uninstall" work again
 - Fixed the issue that apps did not start iconified, even if requested
 - First create $datadir/applications, then install the desktop file
 - Fixed default animation outline coordinates
 - Don't ignore datarootdir setting
 - Make Sawfish more error-tolerant if an app has an incomplete WM_CLASS
 - Make sure we don't mix Super and Hyper
 - Fixup the last incomplete AC_DEFINE
 - Fixed a speed-issue with microGUI
 - Make properly use of WM_NAME in Elberg-tabbed
* New features:
 - UTF-8 Support in Windowmenus
 - UTF-8 Support in GTK Widgets
 - Tabbed Windowing Support
 - Improved KDE3 Integration
 - Replaced hardcoded focus logic by focus-revert function
 - Tabbed Windowing Support: Raise Tabs on hover
 - Warp cursor to cycled windows, if warp-cursor is enabled
 - Warp cursor to unmaximied windows, if warp-cursor is enabled
 - 3 New Window-Animators: cross, elliptical and draft
 - Shrinking/Yanking Support
 - Infinite Desktop Feature (make the virtual desktop bigger than
   the physical)
 - Make Viewport commands appear in Sawfish-UI
 - Make Window History appear in Sawfish-UI
 - Added cycle-among-groups(,-backwards) commands (cycle between the
   most recently used window of groups)
 - Interactive placement-mode now also for transients
 - Improved prompt.jl (allows changing font, fg and bg color)
 - Expose fixed-position, never-iconify, never-maximize in the
   Window-Matcher UI
* Other changes:
 - To build with XFree86/X.Org < 7.0 add -without-xorg-x11r7 flag
 - To build without Pango add -without-pango flag
 - To prevent installing translations add -without-nls flag
 - Set RestartStyleHint to 2
 - When matching window to alist try WM_NAME if WM_CLASS is unset
 - Major Documentation update
 - New Sound Theme
 - Added ebuild
 - Added session desktop file
 - rep.m4 has been dropped use librep.pc/rep-gtk.pc instead
 - Added sawfish.pc
 - Improved Makefile's distclean rule
 - Updated .desktop files for gnome-session >=2.23
 - Fixed autogen for libtool >2.2
 - Major configure script rework
 - Don't ship config.sub config.guess and install-sh in $srcdir/etc
 - Reworked Sawfish-UI
 - Dropped libgnome|gnomeui|gnomecanvas widgets, use pure gtk instead
 - Merged changes from sawfish-pager
 - Major update of the spec file
 - Print usefull stuff at the end of configure
 - Add distclean rule to all Makefiles
 - Add KEYBINDINGS file, containing a list of all default keybindings
 - Updated OPTIONS for all new options
 - Cleaned Up Makedefs.in
 - Move 'avoid' window-matcher from placement to state
 - Updated compat.jl
 - Removed all old ChangeLog files
 - Make move-cursor.jl export all functions described in the doc

1.3.5
=====
* The 1.3.5 version has new features and bugfixes
* New/Updated requirements:
 - librep 0.14 -> 0.17
 - rep-gtk 0.18 -> 0.18.3
* New features:
 - Support _NET_WM_USER_TIME
 - Added ATK-A11Y Support
 - Added Viewport-Boundary
 - Added Error-Handler "both"
 - Added 2 new Buttonlayouts to Crux "complete" and "complete inverse"
 - Honour ICCCM Aspect Ratio
 - Expose all Keybindings in SawfishUI
 - Added Animated Viewport Scrolling
 - Also expose the "Stagger" and "Off-Center" placement-modes
 - Add a new hook: "before-slide-hook"
 - Expose all smart placement-modes, "Best-Fit", "Best-Fit-Group",
   "First-Fit-Or-Interactively"
 - Better GNOME Integration
* Bugfixes:
 - Minimum pango version is 1.8.0 not 1.16.0
 - Fix Installation of mxflat
* Other Changes:
 - Remove all ^L in the source
 - Small Code-cleanup to make build with "-Wall -ansi -pedantic"
   possible again (also requires recent librep for this to work)
 - Major Documentation Update
 - updated the shipped config.sub and config.guess

4 files changed, 91 insertions, 386 deletions

diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index d29c92e7fa0..d49f72b15ea 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,38 +1,38 @@
-# $NetBSD: Makefile,v 1.49 2008/09/23 19:10:52 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2009/07/14 10:33:28 tnn Exp $
 #
 
-DISTNAME=		sawfish-1.3.4
+DISTNAME=		sawfish-1.5.0
 CATEGORIES=		x11 wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sawmill/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tnn@NetBSD.org
 HOMEPAGE=		http://sawfish.wikia.com/
 COMMENT=		Extensible window manager that is fully configurable in Lisp
 
-DEPENDS+=		rep-gtk2>=0.18:../../x11/rep-gtk2
-
 CONFLICTS+=		sawfish-replibs-[0-9]*
 CONFLICTS+=		sawfish-themes-[0-9]*
 
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ENV+=		REP_ENV_PKGSRC=${REP_ENV_PKGSRC:Q}
 MAKE_ENV+=		REP_ENV_PKGSRC=${REP_ENV_PKGSRC:Q}
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-themer
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+GNU_CONFIGURE=		yes
+INFO_FILES=		YES
+PKGCONFIG_OVERRIDE+=	sawfish.pc.in
 USE_TOOLS+=		gmake makeinfo msgfmt pkg-config xgettext
+USE_TOOLS+=		gtar:run	# for librep run-time theme extraction
 USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
-INFO_FILES=		YES
-
 SUBST_CLASSES+=		env
 SUBST_STAGE.env=	pre-configure
 SUBST_FILES.env=	lisp/sawfish/ui/main.jl.in po/sawfish-xgettext
-SUBST_FILES.env+=	scripts/sawfish-*.jl* themer/themer.in
+SUBST_FILES.env+=	scripts/sawfish-*.jl*
 SUBST_SED.env=		-e 's,exec rep,exec env ${REP_ENV_PKGSRC} rep,g'
 
 .include "../../mk/bsd.prefs.mk"
@@ -43,10 +43,11 @@ REP_ENV_PKGSRC=		LD_PRELOAD=/usr/lib/libpthread.so
 REP_ENV_PKGSRC=
 .endif
 
-BUILDLINK_DEPMETHOD.libXt?=	build
-
 .include "../../audio/esound/buildlink3.mk"
 .include "../../lang/librep/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt+=	build
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/rep-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST
index ad264191a07..8dbf14e16a6 100644
--- a/wm/sawfish/PLIST
+++ b/wm/sawfish/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 21:40:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/07/14 10:33:28 tnn Exp $
 bin/sawfish
 bin/sawfish-client
 bin/sawfish-ui
 info/sawfish.info
+lib/pkgconfig/sawfish.pc
 libexec/rep/${MACHINE_GNU_PLATFORM}/sawfish/client.la
 libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/DOC
 libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gradient.la
@@ -16,7 +17,8 @@ libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/selection.
 libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/x.la
 libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/selection.la
 libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/x.la
-share/gnome/wm-properties/sawfish.desktop
+share/applications/sawfish.desktop
+share/gnome/wm-properties/sawfish-wm.desktop
 share/locale/am/LC_MESSAGES/sawfish.mo
 share/locale/ar/LC_MESSAGES/sawfish.mo
 share/locale/az/LC_MESSAGES/sawfish.mo
@@ -112,10 +114,14 @@ share/sawfish/${PKGVERSION}/lisp/grow-pack.jl
 share/sawfish/${PKGVERSION}/lisp/grow-pack.jlc
 share/sawfish/${PKGVERSION}/lisp/gtkrc.jl
 share/sawfish/${PKGVERSION}/lisp/gtkrc.jlc
+share/sawfish/${PKGVERSION}/lisp/infinite-desktop.jl
+share/sawfish/${PKGVERSION}/lisp/infinite-desktop.jlc
 share/sawfish/${PKGVERSION}/lisp/keymap.jl
 share/sawfish/${PKGVERSION}/lisp/keymap.jlc
 share/sawfish/${PKGVERSION}/lisp/make-theme.jl
 share/sawfish/${PKGVERSION}/lisp/make-theme.jlc
+share/sawfish/${PKGVERSION}/lisp/marks.jl
+share/sawfish/${PKGVERSION}/lisp/marks.jlc
 share/sawfish/${PKGVERSION}/lisp/match-window.jl
 share/sawfish/${PKGVERSION}/lisp/match-window.jlc
 share/sawfish/${PKGVERSION}/lisp/maximize.jl
@@ -130,6 +136,8 @@ share/sawfish/${PKGVERSION}/lisp/prompt.jl
 share/sawfish/${PKGVERSION}/lisp/prompt.jlc
 share/sawfish/${PKGVERSION}/lisp/rects.jl
 share/sawfish/${PKGVERSION}/lisp/rects.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish-defaults.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish-defaults.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/color-preview.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/color-preview.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/stock.jl
@@ -217,6 +225,8 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/move-resize.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/move-resize.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/raise-commands.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/raise-commands.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/shrink-yank.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/shrink-yank.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/size-window.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/size-window.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/slide-window.jl
@@ -253,6 +263,8 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/error-handler.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/error-handler.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/hide-dialogs.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/hide-dialogs.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/infinite-desktop.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/infinite-desktop.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/match-window.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/match-window.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/old-window-menu.jl
@@ -325,6 +337,10 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/state/wm-spec.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/state/wm-spec.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/swapper.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/swapper.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/tabs/tab.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/tabs/tab.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/tabs/tabgroup.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/tabs/tabgroup.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/theming/make-theme-preview.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/theming/make-theme-preview.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/theming/make-theme.jl
@@ -351,6 +367,8 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/util/keymap-diff.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/util/keymap-diff.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/util/keymap.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/util/keymap.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/util/marks.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/util/marks.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/util/nokogiri.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/util/nokogiri.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/util/ping.jl
@@ -385,12 +403,16 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/windows.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/windows.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/workspace.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/workspace.jlc
-share/sawfish/${PKGVERSION}/lisp/sawmill-defaults.jl
-share/sawfish/${PKGVERSION}/lisp/sawmill-defaults.jlc
 share/sawfish/${PKGVERSION}/lisp/shade-hover.jl
 share/sawfish/${PKGVERSION}/lisp/shade-hover.jlc
 share/sawfish/${PKGVERSION}/lisp/shading.jl
 share/sawfish/${PKGVERSION}/lisp/shading.jlc
+share/sawfish/${PKGVERSION}/lisp/shrink-yank.jl
+share/sawfish/${PKGVERSION}/lisp/shrink-yank.jlc
+share/sawfish/${PKGVERSION}/lisp/tab.jl
+share/sawfish/${PKGVERSION}/lisp/tab.jlc
+share/sawfish/${PKGVERSION}/lisp/tabgroup.jl
+share/sawfish/${PKGVERSION}/lisp/tabgroup.jlc
 share/sawfish/${PKGVERSION}/lisp/tooltips.jl
 share/sawfish/${PKGVERSION}/lisp/tooltips.jlc
 share/sawfish/${PKGVERSION}/lisp/viewport-linear.jl
@@ -406,341 +428,32 @@ share/sawfish/${PKGVERSION}/lisp/with-output.jlc
 share/sawfish/${PKGVERSION}/lisp/x-cycle.jl
 share/sawfish/${PKGVERSION}/lisp/x-cycle.jlc
 share/sawfish/${PKGVERSION}/monitor.png
-share/sawfish/${PKGVERSION}/sounds/activate.wav
-share/sawfish/${PKGVERSION}/sounds/clicked.wav
-share/sawfish/${PKGVERSION}/sounds/gameover.wav
-share/sawfish/${PKGVERSION}/sounds/slide.wav
-share/sawfish/${PKGVERSION}/sounds/toggled.wav
-share/sawfish/${PKGVERSION}/themes/Crux/README
-share/sawfish/${PKGVERSION}/themes/Crux/README.gl
-share/sawfish/${PKGVERSION}/themes/Crux/active:bottom-left-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:bottom-left-corner.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:bottom-right-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:bottom-right-corner.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:button-hilight.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:button-pressed.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:button.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:close-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:left-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:left-top-border-shaped.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:left-top-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:maximize-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:menu-button-hilight.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:menu-button-pressed.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:menu-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:minimize-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:right-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:right-top-border-shaped.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:right-top-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:shade-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:top-center-left-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:top-center-left.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:top-center-mid.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:top-center-right-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:top-center-right.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:top-left-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/active:top-right-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:bottom-left-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:bottom-left-corner.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:bottom-right-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:bottom-right-corner.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:button-hilight.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:button-pressed.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:button.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:close-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:left-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:left-top-border-shaped.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:left-top-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:maximize-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:menu-button-hilight.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:menu-button-pressed.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:menu-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:minimize-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:right-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:right-top-border-shaped.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:right-top-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:shade-button.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:top-center-left-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:top-center-left.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:top-center-mid.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:top-center-right-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:top-center-right.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:top-left-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/inactive:top-right-border.png
-share/sawfish/${PKGVERSION}/themes/Crux/theme.jl
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/INSTALL
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-bot.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-ll.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-lr.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-ls.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-rs.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-t0.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-t1.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-t2.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-t3.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tbot.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-th.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-ti.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tll.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tlr.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tlrs.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tls.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tm.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tt0.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-ttop.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-ttx.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tul.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tur.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-turs.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-tx.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-ul.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-uls.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-ur.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/a-urs.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/c-th.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/c-ti.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/c-tm.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/c-ttx.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/c-tx.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-bot.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-ll.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-lr.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-ls.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-rs.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-t0.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-t1.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-t2.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-t3.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tbot.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-th.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-ti.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tll.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tlr.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tlrs.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tls.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tm.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tt0.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-ttop.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-ttx.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tul.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tur.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-turs.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-tx.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-ul.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-uls.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-ur.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/i-urs.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/p-th.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/p-ti.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/p-tm.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/p-ttx.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/p-tx.png
-share/sawfish/${PKGVERSION}/themes/Elberg-tabbed/theme.jl
-share/sawfish/${PKGVERSION}/themes/absolute-e/README
-share/sawfish/${PKGVERSION}/themes/absolute-e/README.gl
-share/sawfish/${PKGVERSION}/themes/absolute-e/README.it
-share/sawfish/${PKGVERSION}/themes/absolute-e/README.ja
-share/sawfish/${PKGVERSION}/themes/absolute-e/README.pl
-share/sawfish/${PKGVERSION}/themes/absolute-e/bar_clicked_active.png
-share/sawfish/${PKGVERSION}/themes/absolute-e/bar_hilited_active.png
-share/sawfish/${PKGVERSION}/themes/absolute-e/bar_normal.png
-share/sawfish/${PKGVERSION}/themes/absolute-e/bar_normal_active.png
-share/sawfish/${PKGVERSION}/themes/absolute-e/theme.jl
-share/sawfish/${PKGVERSION}/themes/brushed-metal/README
-share/sawfish/${PKGVERSION}/themes/brushed-metal/README.gl
-share/sawfish/${PKGVERSION}/themes/brushed-metal/README.it
-share/sawfish/${PKGVERSION}/themes/brushed-metal/README.ja
-share/sawfish/${PKGVERSION}/themes/brushed-metal/README.pl
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b1-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b1.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b2-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b2.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b3-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b3.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b5-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b5.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b6-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b6.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b7-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/b7.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t1-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t1-b.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t1.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t1b.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t2-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t2.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t2s-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t2s.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t3-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t3-b.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t3.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t3b.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t4-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t4-b.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t4.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t4b.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t5-.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t5-b.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t5.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/t5b.png
-share/sawfish/${PKGVERSION}/themes/brushed-metal/theme.jl
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/INSTALL
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/README
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/border_bottom.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/border_left.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/border_right.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/border_top.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/close-clicked.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/close-normal.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/corner_bottom_left.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/corner_bottom_left_2.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/corner_bottom_right.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/corner_bottom_right_2.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/corner_top_left.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/corner_top_left_2.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/corner_top_right.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/corner_top_right_2.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/example.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/foo-l.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/foo-r.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/iconify-clicked.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/iconify-normal.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/maximize-clicked.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/maximize-normal.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/menu-clicked.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/menu-normal.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/theme.jl
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-bar-active.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-bar-inactive.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-active-f.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-active-l.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-active-m.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-active-r.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-active.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-inactive-f.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-inactive-l.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-inactive-m.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-inactive-r.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-left-inactive.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-right-l.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-right-r.png
-share/sawfish/${PKGVERSION}/themes/get-S-tabbed/title-right.png
-share/sawfish/${PKGVERSION}/themes/gradient/README
-share/sawfish/${PKGVERSION}/themes/gradient/README.gl
-share/sawfish/${PKGVERSION}/themes/gradient/README.it
-share/sawfish/${PKGVERSION}/themes/gradient/README.ja
-share/sawfish/${PKGVERSION}/themes/gradient/README.pl
-share/sawfish/${PKGVERSION}/themes/gradient/as_close-b.png
-share/sawfish/${PKGVERSION}/themes/gradient/as_close.png
-share/sawfish/${PKGVERSION}/themes/gradient/as_min-b.png
-share/sawfish/${PKGVERSION}/themes/gradient/as_min.png
-share/sawfish/${PKGVERSION}/themes/gradient/theme.jl
-share/sawfish/${PKGVERSION}/themes/gtk/README
-share/sawfish/${PKGVERSION}/themes/gtk/README.gl
-share/sawfish/${PKGVERSION}/themes/gtk/README.it
-share/sawfish/${PKGVERSION}/themes/gtk/README.ja
-share/sawfish/${PKGVERSION}/themes/gtk/README.pl
-share/sawfish/${PKGVERSION}/themes/gtk/as_close-b.png
-share/sawfish/${PKGVERSION}/themes/gtk/as_close.png
-share/sawfish/${PKGVERSION}/themes/gtk/as_min-b.png
-share/sawfish/${PKGVERSION}/themes/gtk/as_min.png
-share/sawfish/${PKGVERSION}/themes/gtk/theme.jl
-share/sawfish/${PKGVERSION}/themes/microGUI/README
-share/sawfish/${PKGVERSION}/themes/microGUI/README.gl
-share/sawfish/${PKGVERSION}/themes/microGUI/README.it
-share/sawfish/${PKGVERSION}/themes/microGUI/README.ja
-share/sawfish/${PKGVERSION}/themes/microGUI/README.pl
-share/sawfish/${PKGVERSION}/themes/microGUI/TODO
-share/sawfish/${PKGVERSION}/themes/microGUI/bl.png
-share/sawfish/${PKGVERSION}/themes/microGUI/bottom.png
-share/sawfish/${PKGVERSION}/themes/microGUI/br.png
-share/sawfish/${PKGVERSION}/themes/microGUI/close_active.png
-share/sawfish/${PKGVERSION}/themes/microGUI/close_clicked.png
-share/sawfish/${PKGVERSION}/themes/microGUI/close_normal.png
-share/sawfish/${PKGVERSION}/themes/microGUI/left.png
-share/sawfish/${PKGVERSION}/themes/microGUI/maximize_active.png
-share/sawfish/${PKGVERSION}/themes/microGUI/maximize_clicked.png
-share/sawfish/${PKGVERSION}/themes/microGUI/maximize_normal.png
-share/sawfish/${PKGVERSION}/themes/microGUI/menu_active.png
-share/sawfish/${PKGVERSION}/themes/microGUI/menu_clicked.png
-share/sawfish/${PKGVERSION}/themes/microGUI/menu_normal.png
-share/sawfish/${PKGVERSION}/themes/microGUI/minimize_active.png
-share/sawfish/${PKGVERSION}/themes/microGUI/minimize_clicked.png
-share/sawfish/${PKGVERSION}/themes/microGUI/minimize_normal.png
-share/sawfish/${PKGVERSION}/themes/microGUI/right.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_bottom.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_bottom_left.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_bottom_right.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_close_active.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_close_clicked.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_close_normal.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_left.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_right.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_top.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_top_left.png
-share/sawfish/${PKGVERSION}/themes/microGUI/t_top_right.png
-share/sawfish/${PKGVERSION}/themes/microGUI/theme.jl
-share/sawfish/${PKGVERSION}/themes/microGUI/top_blue.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_blue_inactive.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_curves.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_curves_inactive.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_grey.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_left.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_left_inactive.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_left_inactive_s.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_left_s.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_right.png
-share/sawfish/${PKGVERSION}/themes/microGUI/top_right_s.png
-share/sawfish/${PKGVERSION}/themes/mono/README
-share/sawfish/${PKGVERSION}/themes/mono/README.gl
-share/sawfish/${PKGVERSION}/themes/mono/README.it
-share/sawfish/${PKGVERSION}/themes/mono/README.ja
-share/sawfish/${PKGVERSION}/themes/mono/README.pl
-share/sawfish/${PKGVERSION}/themes/mono/close-c.png
-share/sawfish/${PKGVERSION}/themes/mono/close.png
-share/sawfish/${PKGVERSION}/themes/mono/max-c.png
-share/sawfish/${PKGVERSION}/themes/mono/max.png
-share/sawfish/${PKGVERSION}/themes/mono/menu-c.png
-share/sawfish/${PKGVERSION}/themes/mono/menu.png
-share/sawfish/${PKGVERSION}/themes/mono/min-c.png
-share/sawfish/${PKGVERSION}/themes/mono/min.png
-share/sawfish/${PKGVERSION}/themes/mono/restore-c.png
-share/sawfish/${PKGVERSION}/themes/mono/restore.png
-share/sawfish/${PKGVERSION}/themes/mono/theme.jl
-share/sawfish/${PKGVERSION}/themes/mxflat/CHANGELOG
-share/sawfish/${PKGVERSION}/themes/mxflat/GPL
-share/sawfish/${PKGVERSION}/themes/mxflat/README
-share/sawfish/${PKGVERSION}/themes/mxflat/TODO
-share/sawfish/${PKGVERSION}/themes/mxflat/clean
-share/sawfish/${PKGVERSION}/themes/mxflat/compile
-share/sawfish/${PKGVERSION}/themes/mxflat/reformat
-share/sawfish/${PKGVERSION}/themes/mxflat/resize
-share/sawfish/${PKGVERSION}/themes/mxflat/restart
-share/sawfish/${PKGVERSION}/themes/mxflat/screenshot.xcf
-share/sawfish/${PKGVERSION}/themes/mxflat/theme.jl
-share/sawfish/${PKGVERSION}/themes/simple/README
-share/sawfish/${PKGVERSION}/themes/simple/README.gl
-share/sawfish/${PKGVERSION}/themes/simple/README.it
-share/sawfish/${PKGVERSION}/themes/simple/README.ja
-share/sawfish/${PKGVERSION}/themes/simple/README.pl
-share/sawfish/${PKGVERSION}/themes/simple/as_close-b.png
-share/sawfish/${PKGVERSION}/themes/simple/as_close.png
-share/sawfish/${PKGVERSION}/themes/simple/as_min-b.png
-share/sawfish/${PKGVERSION}/themes/simple/as_min.png
-share/sawfish/${PKGVERSION}/themes/simple/theme.jl
-share/sawfish/${PKGVERSION}/themes/smaker/README
-share/sawfish/${PKGVERSION}/themes/smaker/README.gl
-share/sawfish/${PKGVERSION}/themes/smaker/README.it
-share/sawfish/${PKGVERSION}/themes/smaker/README.ja
-share/sawfish/${PKGVERSION}/themes/smaker/README.pl
-share/sawfish/${PKGVERSION}/themes/smaker/bar_clicked_active.png
-share/sawfish/${PKGVERSION}/themes/smaker/bar_hilited_active.png
-share/sawfish/${PKGVERSION}/themes/smaker/bar_normal.png
-share/sawfish/${PKGVERSION}/themes/smaker/bar_normal_active.png
-share/sawfish/${PKGVERSION}/themes/smaker/close.png
-share/sawfish/${PKGVERSION}/themes/smaker/close_inv.png
-share/sawfish/${PKGVERSION}/themes/smaker/min.png
-share/sawfish/${PKGVERSION}/themes/smaker/min_inv.png
-share/sawfish/${PKGVERSION}/themes/smaker/theme.jl
+share/sawfish/${PKGVERSION}/sounds/focused.wav
+share/sawfish/${PKGVERSION}/sounds/iconify.wav
+share/sawfish/${PKGVERSION}/sounds/map-transient.wav
+share/sawfish/${PKGVERSION}/sounds/map.wav
+share/sawfish/${PKGVERSION}/sounds/maximize.wav
+share/sawfish/${PKGVERSION}/sounds/move-viewport.wav
+share/sawfish/${PKGVERSION}/sounds/shade.wav
+share/sawfish/${PKGVERSION}/sounds/switch-workspace.wav
+share/sawfish/${PKGVERSION}/sounds/unfocused.wav
+share/sawfish/${PKGVERSION}/sounds/uniconify.wav
+share/sawfish/${PKGVERSION}/sounds/unmap-transient.wav
+share/sawfish/${PKGVERSION}/sounds/unmap.wav
+share/sawfish/${PKGVERSION}/sounds/unmaximize.wav
+share/sawfish/${PKGVERSION}/sounds/unshade.wav
+share/sawfish/${PKGVERSION}/themes/Crux.tar.gz
+share/sawfish/${PKGVERSION}/themes/Elberg-tabbed.tar.gz
+share/sawfish/${PKGVERSION}/themes/absolute-e.tar.gz
+share/sawfish/${PKGVERSION}/themes/brushed-metal.tar.gz
+share/sawfish/${PKGVERSION}/themes/get-S-tabbed.tar.gz
+share/sawfish/${PKGVERSION}/themes/gradient.tar.gz
+share/sawfish/${PKGVERSION}/themes/gtk.tar.gz
+share/sawfish/${PKGVERSION}/themes/microGUI.tar.gz
+share/sawfish/${PKGVERSION}/themes/mono.tar.gz
+share/sawfish/${PKGVERSION}/themes/mxflat.tar.gz
+share/sawfish/${PKGVERSION}/themes/simple.tar.gz
+share/sawfish/${PKGVERSION}/themes/smaker.tar.gz
+share/xsessions/sawfish.desktop
 @pkgdir share/sawfish/themes
 @pkgdir share/sawfish/sounds
diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo
index 264780f265d..cd345f425d0 100644
--- a/wm/sawfish/distinfo
+++ b/wm/sawfish/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2008/09/23 19:10:52 tnn Exp $
+$NetBSD: distinfo,v 1.17 2009/07/14 10:33:28 tnn Exp $
 
-SHA1 (sawfish-1.3.4.tar.gz) = 5b981d1f6c0cbdce421d27b19f243c9abd7ca19a
-RMD160 (sawfish-1.3.4.tar.gz) = c772e28ed0803b17603db7435ccbc312ff69be0c
-Size (sawfish-1.3.4.tar.gz) = 1820444 bytes
-SHA1 (patch-aa) = 2473c91b12ea72f91bca598881e2cb95a4a320af
+SHA1 (sawfish-1.5.0.tar.bz2) = 8c9900009fd8f2cde5bcc63120d843c59a73238b
+RMD160 (sawfish-1.5.0.tar.bz2) = dac38623d258f26b5f331878249ab71688eac978
+Size (sawfish-1.5.0.tar.bz2) = 3595897 bytes
+SHA1 (patch-aa) = e3af7b30c7740d50636cb946cda0b9553bf0c07d
 SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e
diff --git a/wm/sawfish/patches/patch-aa b/wm/sawfish/patches/patch-aa
index 2708197cf6d..ebfc7ab3570 100644
--- a/wm/sawfish/patches/patch-aa
+++ b/wm/sawfish/patches/patch-aa
@@ -1,31 +1,22 @@
-$NetBSD: patch-aa,v 1.8 2008/09/23 19:10:52 tnn Exp $
+$NetBSD: patch-aa,v 1.9 2009/07/14 10:33:28 tnn Exp $
 
---- configure.orig	2008-08-29 14:25:26.000000000 +0200
+--- configure.orig	2009-07-03 15:46:24.000000000 +0200
 +++ configure
-@@ -1933,7 +1933,7 @@ esac
- 
- sawfishdir='${datadir}/sawfish'
- lispdir='${sawfishdir}/${version}/lisp'
--localedir='${datadir}/locale'
+@@ -1043,7 +1043,7 @@ dvidir='${docdir}'
+ pdfdir='${docdir}'
+ psdir='${docdir}'
+ libdir='${exec_prefix}/lib'
+-localedir='${datarootdir}/locale'
 +localedir='${prefix}/${PKGLOCALEDIR}/locale'
- sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
+ mandir='${datarootdir}/man'
+ 
+ ac_prev=
+@@ -15226,7 +15226,7 @@ fi
+ 
+ 
+ if test "$with_nls" = "yes"; then
+-	SUBDIRS+=" po"
++	SUBDIRS="${SUBDIRS} po"
+ fi
  
- ac_ext=c
-@@ -6723,7 +6723,7 @@ cat >conftest <<EOF
-   (error
-     (throw 'quit 1)))
- EOF
--if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
-+if env ${REP_ENV_PKGSRC} REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
-@@ -7549,7 +7549,7 @@ fi
- if test "$enable_gnome_widgets" != "no"; then
-   { echo "$as_me:$LINENO: checking for rep-gtk GNOME wrappers" >&5
- echo $ECHO_N "checking for rep-gtk GNOME wrappers... $ECHO_C" >&6; }
--  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk-2.gnome-ui 2>&5; then
-+  if env ${REP_ENV_PKGSRC} REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk-2.gnome-ui 2>&5; then
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-     REP_GTK_GNOME=yes
+ doug_lea_malloc=yes