summaryrefslogtreecommitdiff
path: root/wm/sawfish
diff options
context:
space:
mode:
Diffstat (limited to 'wm/sawfish')
-rw-r--r--wm/sawfish/Makefile18
-rw-r--r--wm/sawfish/PLIST160
-rw-r--r--wm/sawfish/distinfo11
-rw-r--r--wm/sawfish/patches/patch-aa11
-rw-r--r--wm/sawfish/patches/patch-af34
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 :