Update to sawfish-1.7.1.

1.7.1 "Chewing Drum"
====================
* Build and Installation
- Fixed installation for non-root users [Stefano Sabatini]
Previously when installing to a private directory as an
ordinary user, the installation failed, because some files
were forced to be installed in /usr. This is fixed now.
- Chooseable session files [Christopher Bratusek] Now you can
choose what session files to install. This is done by a
tripplet of configure-options:
* -with/out-kde4session: enable or disable the
installation of session files for KDE4. Default: enabled
* -with/out-gnome2session: enable or disable the
installation of session files for GNOME2.
Default: enabled
* -with/out-xdmsession: enable or disable the installation
of session files for XDM (or other display-managers like
KDM/GDM). Default: enabled
* Bug Fixes
- Interactive `call-command' [Teika Kazura] Interactive
`call-command' used to print an error-message when cancelled
via pressing escape. It doesn't anymore.
* Misc Changes
- Turn `focus-ignore-pointer-events' into an internal variable
(has wrongly been a user-option before) [Teika Kazura]

3 files changed, 22 insertions, 30 deletions

diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 80a497c73d6..fdc46b6e129 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2011/01/13 13:39:35 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2011/01/24 00:03:29 tnn Exp $
 #
 
-DISTNAME=		sawfish-1.6.3.1
-PKGREVISION=		3
+DISTNAME=		sawfish-1.7.1
 CATEGORIES=		x11 wm
 MASTER_SITES=		http://download.tuxfamily.org/sawfish/sawfish/
 EXTRACT_SUFX=		.tar.bz2
@@ -24,7 +23,7 @@ USE_TOOLS+=		gtar:run	# for librep run-time theme extraction
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
-CONFIGURE_ARGS+=	--mandir=$(PREFIX)/$(PKGMANDIR)
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ENV+=		REP_ENV_PKGSRC=${REP_ENV_PKGSRC:Q}
@@ -44,7 +43,7 @@ REP_ENV_PKGSRC=		LD_PRELOAD=/usr/lib/libpthread.so
 REP_ENV_PKGSRC=
 .endif
 
-.include "../../audio/esound/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
 .include "../../lang/librep/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST
index b19f37bac9a..ea2b08fd71c 100644
--- a/wm/sawfish/PLIST
+++ b/wm/sawfish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2010/08/21 17:33:11 asau Exp $
+@comment $NetBSD: PLIST,v 1.19 2011/01/24 00:03:29 tnn Exp $
 bin/sawfish
 bin/sawfish-client
 bin/sawfish-config
@@ -23,11 +23,13 @@ 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
+man/man1/sawfish-client.1
+man/man1/sawfish-config.1
+man/man1/sawfish.1
 share/applications/sawfish.desktop
 share/gnome/wm-properties/sawfish-wm.desktop
+share/icons/hicolor/32x32/apps/sawfish-config.png
+share/kde4/apps/ksmserver/windowmanagers/sawfish.desktop
 share/locale/am/LC_MESSAGES/sawfish.mo
 share/locale/ar/LC_MESSAGES/sawfish.mo
 share/locale/az/LC_MESSAGES/sawfish.mo
@@ -145,8 +147,6 @@ 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/cfg/apply.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/apply.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/config.jl
@@ -165,6 +165,8 @@ 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/utils.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/cfg/utils.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
@@ -183,12 +185,6 @@ 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
-share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widget-dialog.jlc
-share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widget-test.jl
-share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widget-test.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widget.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widget.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widgets/alist.jl
@@ -207,6 +203,8 @@ 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/gtk/widgets/simple-dialog.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/gtk/widgets/simple-dialog.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/animation/outline.jl
@@ -256,10 +254,6 @@ share/sawfish/${PKGVERSION}/lisp/sawfish/wm/custom.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/custom.jlc
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/customize.jl
 share/sawfish/${PKGVERSION}/lisp/sawfish/wm/customize.jlc
-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
@@ -298,8 +292,8 @@ 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/integration/xfce.jl
+share/sawfish/${PKGVERSION}/lisp/sawfish/wm/integration/xfce.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
@@ -418,8 +412,6 @@ 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
@@ -438,7 +430,8 @@ share/sawfish/${PKGVERSION}/lisp/with-output.jl
 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}/lisp/xfce-int.jl
+share/sawfish/${PKGVERSION}/lisp/xfce-int.jlc
 share/sawfish/${PKGVERSION}/sounds/focused.wav
 share/sawfish/${PKGVERSION}/sounds/iconify.wav
 share/sawfish/${PKGVERSION}/sounds/map-transient.wav
diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo
index 916860fb11f..cdbc9ae7c07 100644
--- a/wm/sawfish/distinfo
+++ b/wm/sawfish/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2010/08/21 17:33:11 asau Exp $
+$NetBSD: distinfo,v 1.19 2011/01/24 00:03:29 tnn Exp $
 
-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 (sawfish-1.7.1.tar.bz2) = d4bd4cad90ece608cef51427994ca5667ee6f939
+RMD160 (sawfish-1.7.1.tar.bz2) = de04ff3b740da9dac853a7ef5ca2c0b4998f4808
+Size (sawfish-1.7.1.tar.bz2) = 3693938 bytes
 SHA1 (patch-aa) = 4cd1f7be1c8e994065f09cb7b4c836551c61552e
 SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e
 SHA1 (patch-af) = dc60cca36ad2b799a3d11e0c62f198e9277583ba