Update to sawfish 1.6.3.1

1.6.3.1 "Acid Folk"
===================

   * Fixed a possible compilation-error in prompt.jl [Harald van Dijk]

1.6.3 "Hava Nagila"
===================

   * Bugfixes
        - In tabbed-windows the left/right end is no longer outside the
          window, if that is too small [Fuchur]

        - Unsupported option `ignore-window-input-hint' is deleted
          which has been invalid for long. [Teika kazura]

        - Honor the user option `maximize-raises' in
          `maximize-window-fullscreen' and
          `maximize-window-fullxinerama', too, not just in
          maximize-window [Nolan Leake]

        - More robustness in applications menu [Teika Kazura, Matthew
          Love]

          Before it broke for 'R' (statistics software), and whitespace
          handling didn't follow the specification.

          Some *.desktop files are not ignored any more either, i.e.,
          leading empty lines and comments are allowed.

        - Allow compilation with -DDEBUG flag passed [Alexey I. Froloff]

   * New Features
        - XRandR events (eg resolution changes) call the new hook
          `randr-changed-notify-hook' [Daniel M. German]
          See *Note RandR and Xinerama::.

        - Tabbed windowing system improvements [Fuchur]
             + Support for transient tab-frames

             + New frame classes:
                  x tab-s (side tab)
                  x tab-ls (side tab, left/bottom end)
                  x tab-rs (side tab, right/top end)

             + Tabgroups now support a set of new properties and
               actions: `type', `set-frame-style', `fixed-position',
               `iconify'. In addition, new tabs gain those properties
               from their parent window.

        - New command `display-window-position' [Teika kazura]

          User chooses a window by cursor and click, and it prints its
          position and size in a popup. Also available as a function,
          defined in `sawfish.wm.util.display-wininfo'.

        - New function `window-pid' [Teika kazura]

          It returns the process ID of a window. (*note Window
          Attributes::

        - Window instance name is now accessible [Teika kazura]

          Technically, the window class consists of "instance" and
          "class", but only the latter was returned previously by the
          function `window-class'. Now with the new optional argument,
          the instance is returned too. (*note Window Attributes::)

        - Customizable lisp directory [Teika kazura]

          User can add lisp directories to be read with the
          environmental variable `SAWFISH_USER_LISP_DIR'. Its value is
          directories separated by colon, like `PATH', and prepended to
          `load-path'. If not set, `~/.sawfish/lisp' is assumed.  For
          example, if you define a module `sawfish.wm.super-hack', then
          it can be read from
          `~/.sawfish/lisp/sawfish/wm/super-hack.jl'.

          User can override system lisp files, too. For example, if
          there is `~/.sawfish/lisp/sawfish/wm/windows.jl', then it
          defines `sawfish.wm.windows', instead of the installed one.
          (But this can easily break your Sawfish startup.) In fact, it
          was possible for some lisp files, but now it's guaranteed for
          all files.

   * Other Changes
        - Info improvements [Teika kazura]
             + "Windows" chapter is partly revised. Function
               `display-window' is documented. Difference between
               `window-wants-input-p' and `window-really-wants-input-p'
               is described. Short description on the root window.

             + In past few versions we made more changes which were not
               described in the news, including clarification in
               viewport, workspace and event, and window matching lisp
               functions.

             + Added a faq item on multi-head and workspace.

             + Edition number and the date of last change are dropped
               from the info.  We now edit the info often, so they are
               not so much meaningful.

        - Pressing the lock-button does the state-change of the window
          accordingly. [Fuchur]
          No theme shipped with Sawfish does have the lock-button yet,
          though.

        - Make xinerama an optional dependency [original patch from
          Gentoo]

1.6.2 "Mighty Disco King"
=========================

   * The 1.6.2 release has some improvements.

   * Bugfixes
        - Application menu is more robust now.  [Matthew Love,
          Christopher Bratusek]

          Application menu, introduced in 1.6.0, made Sawfish crash if
          `*.desktop' file had a malformed key value (say ; as first
          character or # somewhere inside), or it was unreadable. It is
          fixed.

        - Minor fix of window placement by direction [Teika kazura]

          When the window placement mode is for example `east' and the
          window is wider than the screen, then the window was put
          wrongly. It is fixed.

   * New features
        - New command `maximize-discard' [Teika kazura]

          The command `maximize-discard' stops a maximized window to be
          treated as maximized any more, so that you can move and
          resize the window.

          The functinon `maximize-discard' has existed, and now it's
          exported.

        - New command `jump-or-exec' [Christopher Bratusek]

          The user uploaded module "jump-or-exec" has been merged. It
          provides `jump-or-exec', a command which may be used to focus
          a window, or if it does not exist, start the application.

          Unlike the original version this one also supports matching a
          window by its class (returned by `window-class' function),
          which makes it more flexible for applications like music
          player or browsers, which tend to change their WM_NAME
          relatively often.

          For usage, see `lisp/sawfish/wm/commands/jump-or-exec.jl'
          file.

   * Misc
        - Improved ebuild and specfile [Christopher Bratusek] [Kim B.
          Heino]

        - Updated documentation [Christopher Bratusek] [Teika Kazura]

        - Removed `frame-style-editable-p' and all other remaining
          sawfish-themer fragments, as it's dead. [Christopher Bratusek]

1.6.1 "Astral"
==============

   * The 1.6.1 release brings several bugfixes and improvements

   * Build and Installation
        - New/Updated requirements:
             + librep 0.90.4 -> 0.90.5
             + rep-gtk 0.90.0 -> 0.90.2

        - The configure option `--without-nine-mouse-buttons' is not
          allowed to have 4 hyphens, therefore it's renamed to
          `--without-nine-mousebuttons'.  [Christopher Bratusek]

        - Reworked configures help-message for better readability.
          [Kim B. Heino]

        - Configure now uses `kde4-config --install data' rather than
          `kde4-config --path data', so no sed-kludge is needed anymore.

          Make $datadir/kde4/apps/ the fallback path, if KDE4 is not
          installed.  [Kim B. Heino]

        - Majorly improved debian and rpm packaging scripts.
          [Christopher Bratusek] [Kim B. Heino]

        - The spec has been reworked to detect kde4/librep directories
          while runtime, instead of hardcoding those paths from
          configure, which makes it more portable.  [Kim B. Heino]

        - Our own implementation of dlmalloc is disabled since 2002, as
          it breaks sawfish on several architectures. From this version
          on, we don't ship it anymore.  [Kim B. Heino]

        - Export the imageloader beeing used by sawfish in the .pc file.
          [Christopher Bratusek]

        - Don't remove the .pot file upon `make distclean'.
          [Christopher Bratusek]

        - Install Sawfishs header files to $includedir/sawfish/.
          [Christopher Bratusek]

        - Autotools improvements (Makefile, autogen.sh & Co.)
          [Christopher Bratusek]

   * Bugfixes
        - Fixed a bug where the gnome-panels pager gets confused about
          the current viewport when displaying all workspaces.  [Jeremy
          Hankins]

        - Fixed minor bugs in viewport.jl.  [Jeremy Hankins]

   * Doc
        - Fixed a small doc misstake (refered to window-set instead of
          window-put).  [Christopher Bratusek]

        - Fixed the docstrings of shrink and yank.  [Timo Korvola]

   * Misc
        - Last 3 instances of "sawmill" replaced by "sawfish".  [Kim B.
          Heino]

1.6.0 "Sound Of Thunder"
========================

   * The 1.6.0 release has new features and bugfixes

   * Build and installation changes
        - New/Updated requirements:
             + librep 0.90.0 -> 0.90.4
             + rep-gtk 0.18.4 -> 0.90.0

        - Removed requirements: LibAudioFile and ESounD

        - Mouse buttons 6 - 9 support is now optional

          Support for 6 - 9 mouse buttons is now optional.
          X.Org/XFree86 headers only define up to 5 buttons, and we use
          a working but somewhat hackish workaround for getting buttons
          6 - 9 which is suspected to cause some problems with
          modifiers. Support for them is enabled by default. If you
          want to disable it, add the following flag to configure:

          `--without-nine-mousebuttons'

          If you drop it, then you can't use mouse button 8 to, for
          example, drag windows.

        - Installation directory change

          Directory `libexec' is not used anymore for library files
          installation. Instead, they go into `lib' by default.

   * Incompatible user visible changes:
        - Configurator's binary, `sawfish-ui', is renamed to
          `sawfish-config' [Christopher Bratusek]

          Its window class is changed to `sawfish-configurator' /
          `Sawfish-Configurator', too. The lisp module is renamed from
          `sawfish.ui' to `sawfish.cfg'.

        - Infinite Desktop boundary behavior and option

          In `infinite-desktop', the option to specify the boundary
          behavior has changed. If `viewport-boundary-mode' is
          `dynamic', then you can go as far as you like. Otherwise, it
          stops at the workspace boundary of which size is specified by
          `viewport-dimensions'. Now the latter is the default. See also
          "dynamic viewport" described below.

          The previous variable,
          `infinite-desktop.stop-at-workspace-borders', which is used
          for this purpose, no longer exists.

        - User config file changes

          In Sawfish < 1.6, `sawfish.wm.defaults' is loaded by default,
          only if the `~/.sawfishrc' lacks. Now, it is always read, so
          you don't have to `require' it. It sets up GNOME or KDE
          support if found running, and does load the error-handling
          module.

          Since Sawfish 1.5 `~/.sawmillrc' is no longer a valid
          configuration- file. From this version on, Sawfish will
          rename `~/.sawmillrc' to `~/.sawfishrc', if the former does
          exist on your system, but the latter doesn't.

        - In configurator, the "Matched Windows" group has been renamed
          to "Window Rules"

        - Sound support has changed. [Christopher Bratusek]

          Sawfish used to rely on ESounD and LibAudioFile to play
          sound, but we dropped that. If you want sound, set the
          variable `play-sample-program' to the path of the program
          capable of playing *.wav file. You can set the variable from
          the Configurator, too. By default `paplay' is beeing used.

          You can't set any arguments to pass from this variable. If
          you want to give arguments or redirect output, write a wrapper
          program. (*note FAQ::, "Sound support" section.)

        - GNOME integration updates [Christopher Bratusek]

          GNOME support is trimmed down. All we offer now is as follows:

          If GNOME runs, in `session' submenu under Sawfish root menu,
          logout and shutdown from GNOME are added. Don't remove `quit'
          and `restart' from menu now. GNOME help is available in menu.

          Unless set by user, gnome-terminal.wrapper and
          gnome-www-browser are used for user options `xterm-program'
          and `browser-program'.

          Most of dropped GNOME integrationcode is ancient, mainly for
          1.x and early 2.x. Files `lisp/sawfish/wm/commands/gnome.jl'
          and `lisp/sawfish/wm/state/gnome.jl' are deleted.

          GNOME-Detection has been updated for recent versions. [Alexey
          I. Froloff]

        - xterm and browser changes

          Module `sawfish.wm.commands.xterm' is renamed to
          `sawfish.wm.commands.launcher'. Option `xterm-args' is
          dropped. If you use it, simply append its value to
          `xterm-program'.

          Customization-group is changed from `misc' to `External
          Applications'.

          The functinon `display-url' is renamed to `browser', now
          defined in the module cited above. Variable
          `display-url-command' is renamed to `browser-program'.

        - Sawfish pager

          If you've been using Sawfish-pager, then you have to
          recompile it, due to library files location change.

        - Deletion of `user-level' property

          (This affects almost none.) There has been a defcustom
          property `user-level'. It has been deprecated for years, and
          it's now deleted.

   * Bugs fixed:
        - Prevents crashes for quick window destructions, especially
          under high load

          There have been crashes if a window is destroyed soon after
          its creation.  It happens in `add_window' function, and the
          cause is guessed to be garbage collection following window
          destruction before the object access.

          Now most parts of `add_window' are protected from garbage
          collection with `rep_PUSHGC' / `rep_POPGC'. It also prevents
          `add_window_hook' from being called with uninitialised
          argument.  [Timo Korvola, Janek Kozicki]

        - Random window disapperance prevention

          There're reports of sudden, random window disapperance, under
          Xinerama and some other drivers. It is partly prevented, but
          not completely, as this may also be caused by other libraries
          or buggy video drivers.

          Now in error_handler() in src/display.c, when a window sends
          request_code 12 (X_ConfigureWindow), don't auto-assume it to
          be unmapped. [Janek Kozicki]

        - Build and Installation:
             + Library check: Fix in `SMlib' and `libICE' check on
               x11r7 [Christopher Bratusek]

             + `.desktop' files fixes: typos fixed and unneeded entries
               removal [Christopher Bratusek]

             + In spec file, repexecdir definition is fixed
               [Christopher Bratusek]

             + In `po/Makefile.in', a wrong call of make-pot is fixed
               [Christopher Bratusek]

             + Always build the FAQ upon make [Christopher Bratusek]

             + Expand REP_ENVIRON in scripts/Makefile.in [Luis Rodrigo
               Gallardo Cruz]

             + Add `--tag=CC' to libtool where necessary. It unbrakes
               compilation on some arches [Gentoo Linux]

             + Use $prefix/lib instead of $prefix/libexecdir, to
               satisfy the FHS [Christopher Bratusek]

        - In configurator,

          Strings are now fully translatable [Alexey I. Froloff]

          SpinButton listens to manual value change. (It's now
          connected to the correct signal.)  [Christoper Bratusek]

          Position parameters can be negative [Christopher Bratusek,
          Teika Kazura]

        - Fixed Focus issues with KDE4 Menu/Run-Dialog [Timo Korvola]

        - Fix cursor-warping in conjuction with Infinite-Desktop
          [Jeremy Hankins]

        - Fixed group of the stagger options [Christopher Bratusek]

        - Fixed a call of `select-workspace-from-first' [Michal Maruška]

        - In `Simple' theme, windows are now resizable from the right
          border [Christopher Bratusek]

        - Missing exports are now supplied, for shrink-yank functions
          and `send-to-workspace'. [Christopher Bratusek]

        - Commands `maximize-window-fullscreen' and
          `maximize-window-fullxinerame' work. [Teika kazura]

        - Variable `this-command' is `nil' outside of command call.

        - Customization option `uniconify-to-current-viewport' has been
          undeprecated. [Teika kazura]

   * New features:
        - New application menu [Matthew Love, Timo Korvola]

          Sawfish now generates application menu automatically, by
          reading `/usr/share/applications/*.desktop' files. If you
          manually set `apps-menu', then it won't be. If you like to
          have both your own applications menu and auto the generated
          one, then refer back to `user-apps-menu' rather than
          `apps-menu'. In addition you can use the variable
          `desktop-directory' to specify a different directory to look
          for *.desktop files, or a set of directories, if desired.

          Root, and Window-Operations menus are revamped, too.
          [Christopher Bratusek]

        - Added options to change the font color of window title,
          independent of the theme in use [Matthew Love, Christopher
          Bratusek, Timo Korvola]

          Internally, a new function `remove-frame-part-value' which
          allows to change/remove values from frame-parts is used.
          [Timo Korvola]

        - Sawfish does now support theme-tarballs compressed with XZ
          (aka LZMA2) and LZMA [Christopher Bratusek]

        - Xinerama support for Grow/Pack [Nolan Leake]

          Make grow/pack Xinerama aware. The support still remains
          basic, as shrink/yank still lacks it.

        - Window rules can be set by lisp

          Window rules (former "matched windows") can easily be set from
          configurator, but it can now be set by lisp, too, with
          `add-window-matcher' function. For the details, *Note Window
          Rules by Matching::. An example usage is like this:

               (add-window-matcher '((WM_NAME . "^root$")
                                     (WM_CLASS . "^XTerm/xterm$"))
                                   '((ignore-program-position . t)
                                     (maximize . vertical)))

          In fact, this function has already existed, but now it can
          now specify both windowname and -class, also the grammar has
          changed. The old syntax is still allowed, but deprecated.

        - Keymap translation [Scott Scriven]

          Sawfish can "translate" keymaps for each window. Suppose you
          have the following lines in your `~/.sawfish/rc':

               (add-window-matcher
                       '((WM_NAME . "^Terminal$"))
                       '(keymap-trans . (("C-n" "C-S-t")
                                         ("C-w" "C-S-w"))))

          Then, when you press `C-n', any windows with name "Terminal"
          receive `C-S-t', and so on.

          This is part of window rules, but it cannot be exposed in the
          configurator yet.

        - New window rules
             + Maximizations `fullscreen' and `full-xinerama' are
               available now (*note Maximizing Without Borders::)
               [Jeremy Hankins]

             + Window position can also be specified by the direction,
               like north or east, instead of the coordinates. [Jeremy
               Hankins]

             + New window rules `new-workspace' and `new-viewport',
               which place a window on the first empty Workspace or
               Viewport (if there's none, one will be generated), have
               been introduced [Jeremy Hankins]

               If `new-workspace' is chosen, then the window is put in
               an empty workspace, or a new workspace is created if
               none. A workspace with sticky windows only are
               considered empty. `new-viewport' is the same but an
               empty viewport is chosen. If none is, the workspace is
               enlarged, and the window is put in a new viewport.

             + `window-name' can change the window's name. [Christopher
               Bratusek]

        - New commands [Christopher Bratusek]

          5 new move-cursor commands, 4 diagonals and 1 to center.
          (*note Pointer Functions::

          Three window manipulation commands, `double-window-size',
          `halve-window-size', and `move-window-center'.  The former
          two are based on the `resize-by-factor' metafunction.

          `browser' invokes a browser instance.

        - New functions `rename-window' changes the window name. [from
          "mmc" fork, Christopher Bratusek]

          In practice, it works, but technically speaking, the window
          name is not supposed to be changed in ICCCM, by the
          Window-Manager.

          `viewport-windows' returns windows in a viewport. [Jeremy
          Hankins]

          `get-window-by-class' and `get-window-by-class-re'
          [Christopher Bratusek]

        - Dynamic Viewport-Boundary-Mode [Jeremy Hankins]

          When you set `viewport-boundary-mode' to `dynamic', then the
          workspace grows and shrinks dynamically so that it contains
          all windows and the current viewport. For the details, *Note
          Dynamic Viewport::.

        - KDE4 integration module [Christopher Bratusek]

          KDE4 is automatically detected. KDE help, and KDE logout,
          shutdown, and reboot are provided in the menu. In KDE4 WM
          Selector, Sawfish is added.

          Unless set by user, konsole and konqueror are used for user
          options `xterm-program' and `browser-program'.

        - Poweroff from menu

          Added poweroff commands in menu for non KDE/GNOME users.
          There are reboot, halt, suspend and hibernate. The used shell
          commands can be set from configurator, under "Misc" ->
          "External Applications". If you don't want it, set
          `want-poweroff-menu' to nil.

          User needs the appropriate privilege. For a way to do so, see
          *Note FAQ::, "Shutdown privilege" section.

          Reboot and halt call `before-exit-hook' and do
          `delete-window' to each window before actually rebooting or
          halting, to ensure everything is fine on the next startup.

        - New Frame Classes [Christopher Bratusek]
          A "frame class" defines frame component and are used by
          themers to add buttons or frames to their theme in charge.
          There are no user visible changes.

             + `sticky-button', a button to toggle window `sticky' or
               `viewport-sticky'

             + `lock-button', a button to toggle window position `fixed'

             + `rename-button', a button to rename the window-title and
               window-icon properties (not ICCCM compliant)

             + `move-resize-button', a button to perform various move
               and resize actions on a window

             + `raise-lower-button', a button to perform various
               raising and lowering actions on a window

   * Widget Transistion [Christopher Bratusek]
        - Custom make-url-widget replaced by GtkLinkButton

        - Custom about-dialog replaced by GtkAboutDialog

        - GtkButton + GtkPreview + GtkColorSelection trio replaced by
          single GtkColorButton

   * Other Changes:
        - Startup window placement improvement [Jeremy Hankins]

          At Sawfish startup including restart, maximized windows and
          position specified windows used to mess up viewport, appearing
          in wrong viewports. It's fixed now.

        - Renamed `after-add-window' to `maxmize-after-add-window'
          This function is only used in a hook [Teika Kazura]

        - Don't let `cycle-class' and `cycle-class-backwards' ignore
          WINDOW-ORDER [Daniel M. German]

        - Docks/panels are unframed, and window type is set to `dock'
          by default [Timo Korvola]

        - You can exit from sawfish-client with `,quit' (also `C-d'),
          unlike `C-c' it won't kill the WM [Teika Kazura, Timo Korvola]

        - Number widget (GtkSpinButton) can take optional initial value
          [Teika Kazura]

        - Changing `raise-tabs-on-hover' takes effect immediately now
          [Christopher Bratusek]

        - Inactive windows in Crux theme do now have black text for
          better readability [Christopher Bratusek]

        - With new option `customize-redirect', configurator's output
          can be redirected. [Teika Kazura]

        - Grow/Pack and Shrink/Yank options are in the same group now
          [Christopher Bratusek]

          These commands are now available from window operation menu,
          too.

        - When moving a window the cursor shape is now `hand2', when
          resizing `crosshair' [Christopher Bratusek]

        - In the theme document in the configurator, the cursor is
          invisible and the wrap mode is set to word-char [Christopher
          Bratusek]

        - Build, installation and source
             + Improved ebuild [Christopher Bratusek]

             + Encoding is unified to utf-8 for all distributed files
               [Teika Kazura]

             + Squashed all bytecompiler warnings [Matthew Love]
               Some warnings were superfluous, though.

             + To info file `dir' the section `sawfish' has been added
               [Luis Rodrigo Gallardo Cruz]

             + Distclean rule for po/Makefile.in [Christopher Bratusek]

             + Removed ancient sawmill removal fragments from Makefile
               [Christopher Bratusek]

             + Block comments in lisp files are now semicolons
               Sorry, without reason. Block comment remains allowed.

        - Docs
             + Added man-pages for `sawfish', `sawfish-client' and
               `sawfish-config' [Debian]

             + News items for 1.5.0 are rewritten in a more readable
               fashion [Teika Kazura]

             + Info manual updates [Christopher Bratusek, Jeremy
               Hankins, Teika Kazura]

             + Added new contributors to `THANKS' section of
               `CONTRIBUTING' [Christopher Bratusek]

             + Updated OPTIONS and KEYBINDINGS [Christopher Bratusek]

             + Fixed the license header of tabbed-windowing files
               [Christopher Bratusek]

5 files changed, 136 insertions, 98 deletions

diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index e5a789195ba..21352312b23 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2010/06/13 22:45:31 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/08/21 17:33:11 asau Exp $
 #
 
-DISTNAME=		sawfish-1.5.0
-PKGREVISION=		3
+DISTNAME=		sawfish-1.6.3.1
 CATEGORIES=		x11 wm
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sawmill/}
+MASTER_SITES=		http://download.tuxfamily.org/sawfish/sawfish/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tnn@NetBSD.org
@@ -16,11 +15,6 @@ CONFLICTS+=		sawfish-themes-[0-9]*
 
 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
 INFO_FILES=		YES
 PKGCONFIG_OVERRIDE+=	sawfish.pc.in
@@ -29,6 +23,12 @@ USE_TOOLS+=		gtar:run	# for librep run-time theme extraction
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
+CONFIGURE_ARGS+=	--mandir=$(PREFIX)/$(PKGMANDIR)
+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}
+
 SUBST_CLASSES+=		env
 SUBST_STAGE.env=	pre-configure
 SUBST_FILES.env=	lisp/sawfish/ui/main.jl.in po/sawfish-xgettext
diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST
index 8dbf14e16a6..b19f37bac9a 100644
--- a/wm/sawfish/PLIST
+++ b/wm/sawfish/PLIST
@@ -1,22 +1,31 @@
-@comment $NetBSD: PLIST,v 1.17 2009/07/14 10:33:28 tnn Exp $
+@comment $NetBSD: PLIST,v 1.18 2010/08/21 17:33:11 asau Exp $
 bin/sawfish
 bin/sawfish-client
-bin/sawfish-ui
+bin/sawfish-config
+include/sawfish/build.h
+include/sawfish/keys.h
+include/sawfish/libclient.h
+include/sawfish/sawfish.h
+include/sawfish/sawfish_config.h
+include/sawfish/sawfish_subrs.h
+include/sawfish/server.h
 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
-libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gtk-style
-libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish-about
-libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish-menu
-libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/flippers.la
-libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/gradient.la
-libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/play-sample.la
-libexec/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/selection.la
-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
+lib/rep/${MACHINE_GNU_PLATFORM}/sawfish/client.la
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/DOC
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gradient.la
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gtk-style
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish-about
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish-menu
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/flippers.la
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/gradient.la
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/selection.la
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/x.la
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/selection.la
+lib/sawfish/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/x.la
+man/man1/sawfish-client.1.gz
+man/man1/sawfish-config.1.gz
+man/man1/sawfish.1.gz
 share/applications/sawfish.desktop
 share/gnome/wm-properties/sawfish-wm.desktop
 share/locale/am/LC_MESSAGES/sawfish.mo
@@ -41,6 +50,7 @@ share/locale/fr/LC_MESSAGES/sawfish.mo
 share/locale/ga/LC_MESSAGES/sawfish.mo
 share/locale/gl/LC_MESSAGES/sawfish.mo
 share/locale/hu/LC_MESSAGES/sawfish.mo
+share/locale/id/LC_MESSAGES/sawfish.mo
 share/locale/it/LC_MESSAGES/sawfish.mo
 share/locale/ja/LC_MESSAGES/sawfish.mo
 share/locale/ko/LC_MESSAGES/sawfish.mo
@@ -71,9 +81,10 @@ share/locale/vi/LC_MESSAGES/sawfish.mo
 share/locale/wa/LC_MESSAGES/sawfish.mo
 share/locale/zh_CN/LC_MESSAGES/sawfish.mo
 share/locale/zh_TW/LC_MESSAGES/sawfish.mo
-share/pixmaps/sawfish-logo.png
 share/sawfish/${PKGVERSION}/lisp/anim-outline.jl
 share/sawfish/${PKGVERSION}/lisp/anim-outline.jlc
+share/sawfish/${PKGVERSION}/lisp/apps-menu.jl
+share/sawfish/${PKGVERSION}/lisp/apps-menu.jlc
 share/sawfish/${PKGVERSION}/lisp/audio-events.jl
 share/sawfish/${PKGVERSION}/lisp/audio-events.jlc
 share/sawfish/${PKGVERSION}/lisp/auto-raise.jl
@@ -96,16 +107,8 @@ share/sawfish/${PKGVERSION}/lisp/edges.jl
 share/sawfish/${PKGVERSION}/lisp/edges.jlc
 share/sawfish/${PKGVERSION}/lisp/error-handler.jl
 share/sawfish/${PKGVERSION}/lisp/error-handler.jlc
-share/sawfish/${PKGVERSION}/lisp/gnome-commands.jl
-share/sawfish/${PKGVERSION}/lisp/gnome-commands.jlc
 share/sawfish/${PKGVERSION}/lisp/gnome-int.jl
 share/sawfish/${PKGVERSION}/lisp/gnome-int.jlc
-share/sawfish/${PKGVERSION}/lisp/gnome-match.jl
-share/sawfish/${PKGVERSION}/lisp/gnome-match.jlc
-share/sawfish/${PKGVERSION}/lisp/gnome-menu.jl
-share/sawfish/${PKGVERSION}/lisp/gnome-menu.jlc
-share/sawfish/${PKGVERSION}/lisp/gnome.jl
-share/sawfish/${PKGVERSION}/lisp/gnome.jlc
 share/sawfish/${PKGVERSION}/lisp/group-funs.jl
 share/sawfish/${PKGVERSION}/lisp/group-funs.jlc
 share/sawfish/${PKGVERSION}/lisp/groups.jl
@@ -116,8 +119,12 @@ 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/kde-int.jl
+share/sawfish/${PKGVERSION}/lisp/kde-int.jlc
 share/sawfish/${PKGVERSION}/lisp/keymap.jl
 share/sawfish/${PKGVERSION}/lisp/keymap.jlc
+share/sawfish/${PKGVERSION}/lisp/launcher.jl
+share/sawfish/${PKGVERSION}/lisp/launcher.jlc
 share/sawfish/${PKGVERSION}/lisp/make-theme.jl
 share/sawfish/${PKGVERSION}/lisp/make-theme.jlc
 share/sawfish/${PKGVERSION}/lisp/marks.jl
@@ -132,14 +139,50 @@ share/sawfish/${PKGVERSION}/lisp/move-resize.jl
 share/sawfish/${PKGVERSION}/lisp/move-resize.jlc
 share/sawfish/${PKGVERSION}/lisp/old-window-menu.jl
 share/sawfish/${PKGVERSION}/lisp/old-window-menu.jlc
+share/sawfish/${PKGVERSION}/lisp/poweroff.jl
+share/sawfish/${PKGVERSION}/lisp/poweroff.jlc
 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/cfg/apply.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/apply.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/config.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/config.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/group.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/group.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/i18n.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/i18n.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/layout.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/layout.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/layouts/keymaps.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/layouts/keymaps.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/main.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/main.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/shell.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/shell.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/slot.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/slot.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/command.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/command.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/event.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/event.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/frame-style.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/frame-style.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/icon.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/icon.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/keymap.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/keymap.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/match-window.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/match-window.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/modifier-list.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/modifier-list.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/workspace-geometry.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/widgets/workspace-geometry.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/wm.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/wm.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/stock.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/stock.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widget-dialog.jl
@@ -164,42 +207,6 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widgets/program.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widgets/program.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widgets/scheme-boolean.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widgets/scheme-boolean.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/apply.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/apply.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/config.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/config.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/group.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/group.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/i18n.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/i18n.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/layout.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/layout.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/layouts/keymaps.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/layouts/keymaps.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/main.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/main.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/shell.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/shell.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/slot.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/slot.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/command.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/command.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/event.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/event.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/frame-style.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/frame-style.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/icon.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/icon.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/keymap.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/keymap.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/match-window.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/match-window.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/modifier-list.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/modifier-list.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/workspace-geometry.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/widgets/workspace-geometry.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/wm.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/ui/wm.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/animation/outline.jl
@@ -211,18 +218,22 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/cycle.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/cycle.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/describe.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/describe.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/gnome.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/gnome.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/groups.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/groups.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/grow-pack.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/grow-pack.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/help.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/help.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/jump-or-exec.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/jump-or-exec.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/launcher.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/launcher.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/move-cursor.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/move-cursor.jlc
 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/poweroff.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/poweroff.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
@@ -237,8 +248,6 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/viewport-linear.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/viewport-linear.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/x-cycle.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/x-cycle.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/xterm.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/commands/xterm.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/cursors.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/cursors.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/custom-defaults.jl
@@ -251,6 +260,8 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/defaults.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/defaults.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/3d-hack.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/3d-hack.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/apps-menu.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/apps-menu.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/audio-events.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/audio-events.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/ext/auto-raise.jl
@@ -283,12 +294,12 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/frames.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/frames.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/gaol.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/gaol.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/gnome/integration.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/gnome/integration.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/gnome/match-window.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/gnome/match-window.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/gnome/menus.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/gnome/menus.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/integration/gnome.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/integration/gnome.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/integration/kde.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/integration/kde.jlc
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/integration/standalone.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/integration/standalone.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/keymaps.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/keymaps.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/menus.jl
@@ -317,8 +328,6 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/stacking.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/stacking.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/state/configure.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/state/configure.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/state/gnome.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/wm/state/gnome.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/state/iconify.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/state/iconify.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/state/ignored.jl
@@ -409,6 +418,8 @@ 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/standalone-int.jl
+share/sawfish/${PKGVERSION}/lisp/standalone-int.jlc
 share/sawfish/${PKGVERSION}/lisp/tab.jl
 share/sawfish/${PKGVERSION}/lisp/tab.jlc
 share/sawfish/${PKGVERSION}/lisp/tabgroup.jl
@@ -454,6 +465,7 @@ 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/sawfish/sawfish.png
 share/xsessions/sawfish.desktop
 @pkgdir share/sawfish/themes
 @pkgdir share/sawfish/sounds
diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo
index cd345f425d0..916860fb11f 100644
--- a/wm/sawfish/distinfo
+++ b/wm/sawfish/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.17 2009/07/14 10:33:28 tnn Exp $
+$NetBSD: distinfo,v 1.18 2010/08/21 17:33:11 asau Exp $
 
-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 (sawfish-1.6.3.1.tar.bz2) = e29817db4989d4d22d6d569a69a215442b7eceaa
+RMD160 (sawfish-1.6.3.1.tar.bz2) = 477fd23e85f160e477d52018b9263ac4ebbfef1f
+Size (sawfish-1.6.3.1.tar.bz2) = 3723259 bytes
+SHA1 (patch-aa) = 4cd1f7be1c8e994065f09cb7b4c836551c61552e
 SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e
+SHA1 (patch-af) = dc60cca36ad2b799a3d11e0c62f198e9277583ba
diff --git a/wm/sawfish/patches/patch-aa b/wm/sawfish/patches/patch-aa
index ebfc7ab3570..b0f0cdffbc0 100644
--- a/wm/sawfish/patches/patch-aa
+++ b/wm/sawfish/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2009/07/14 10:33:28 tnn Exp $
+$NetBSD: patch-aa,v 1.10 2010/08/21 17:33:11 asau Exp $
 
 --- configure.orig	2009-07-03 15:46:24.000000000 +0200
 +++ configure
@@ -11,12 +11,3 @@ $NetBSD: patch-aa,v 1.9 2009/07/14 10:33:28 tnn Exp $
  mandir='${datarootdir}/man'
  
  ac_prev=
-@@ -15226,7 +15226,7 @@ fi
- 
- 
- if test "$with_nls" = "yes"; then
--	SUBDIRS+=" po"
-+	SUBDIRS="${SUBDIRS} po"
- fi
- 
- doug_lea_malloc=yes
diff --git a/wm/sawfish/patches/patch-af b/wm/sawfish/patches/patch-af
new file mode 100644
index 00000000000..1d3cefd6748
--- /dev/null
+++ b/wm/sawfish/patches/patch-af
@@ -0,0 +1,34 @@
+$NetBSD: patch-af,v 1.1 2010/08/21 17:33:11 asau Exp $
+
+Honour MANDIR.
+
+--- man/Makefile.in.orig	2010-06-21 22:46:18.000000000 +0400
++++ man/Makefile.in	2010-08-21 21:24:42.000000000 +0400
+@@ -23,6 +23,7 @@
+ top_builddir=..
+ top_srcdir=@top_srcdir@
+ srcdir=@srcdir@
++mandir=@mandir@
+ VPATH=@srcdir@:@top_srcdir@
+ 
+ SRCS = sawfish.texi news.texi faq.texi
+@@ -58,16 +59,16 @@
+ 	-install-info --info-dir=$(DESTDIR)$(infodir) sawfish.info
+ 	for f in sawfish*.1; do \
+ 		gzip $$f -c > $$f.gz; \
+-		$(INSTALL_DATA) $$f.gz $(DESTDIR)$(prefix)/share/man/man1/; \
++		$(INSTALL_DATA) $$f.gz $(DESTDIR)$(mandir)/man1/; \
+ 	done
+ 
+ installdirs : mkinstalldirs
+ 	$(SHELL) $< $(DESTDIR)$(infodir)
+-	$(SHELL) $< $(DESTDIR)$(prefix)/share/man/man1/
++	$(SHELL) $< $(DESTDIR)$(mandir)/man1
+ 
+ uninstall :
+ 	rm -f $(DESTDIR)$(infodir)/sawfish.info*
+-	rm -f $(DESTDIR)$(prefix)/share/man/man1/sawfish*
++	rm -f $(DESTDIR)$(mandir)/sawfish*
+ 	-install-info --remove --info-dir=$(DESTDIR)$(infodir) sawfish.info
+ 
+ clean :