Changes 2.9.2:

        * Improved handling of specific workspaces (WorkspaceSpecificBack
          attribute), fixing segfaults and previews
        * Panels are now shown sorted alphabetically instead of in the previous
          haphazard order

Changes 2.9.1:
        * Updated Danish translation (Morten Bo Johansen <mojo@image.dk>)
          and German translation (Florian Ernst <florian@uni-hd.de>)
        * Various segfaults fixed
        * Fixed bug causing non-alphanumeric keyboard shortcuts to be ignored
        * Fixed bug where middle and right mouse buttons were swapped in dialog
        * Installing a theme now puts it in GNUstep/Library/WindowMaker/Themes
          as one would expect
        * New themes websites in "Themes" menu to replace those that have
          ceased to exist

7 files changed, 43 insertions, 63 deletions

diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index b4c9ec66f2d..b7ea6554e47 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2004/10/03 00:18:23 tv Exp $
-#
+# $NetBSD: Makefile,v 1.22 2004/11/08 10:14:33 adam Exp $
 
-DISTNAME=	wmakerconf-2.8.1
-PKGREVISION=	6
+DISTNAME=	wmakerconf-2.9.2
 CATEGORIES=	x11 wm windowmaker
-MASTER_SITES=	http://ulli.on.openave.net/wmakerconf/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://starplot.org/wmakerconf/
 
 MAINTAINER=	wiz@NetBSD.org
-HOMEPAGE=	http://ulli.on.openave.net/wmakerconf/
+HOMEPAGE=	http://starplot.org/wmakerconf/
 COMMENT=	Gtk+ based configuration tool for Window Maker
 
 USE_BUILDLINK3=		yes
@@ -30,7 +27,6 @@ pre-configure:
 		> ${WRKSRC}/data/WMWmakerconf
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libproplist/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../wm/windowmaker/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/wm/wmakerconf/PLIST b/wm/wmakerconf/PLIST
index 1d3ff35591d..63f35f3d50f 100644
--- a/wm/wmakerconf/PLIST
+++ b/wm/wmakerconf/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/08 10:14:33 adam Exp $
 bin/mkpreview
 bin/wmakerconf
+man/man1/wmakerconf.1
+man/man1/mkpreview.1
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/wmakerconf.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wmakerconf-data.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wmakerconf.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wmakerconf-data.mo
 ${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/wmakerconf-data.mo
diff --git a/wm/wmakerconf/distinfo b/wm/wmakerconf/distinfo
index 467c67aa418..abec3306f11 100644
--- a/wm/wmakerconf/distinfo
+++ b/wm/wmakerconf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/05/06 16:21:26 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2004/11/08 10:14:33 adam Exp $
 
-SHA1 (wmakerconf-2.8.1.tar.bz2) = 570021015265f3d44a144981e93ee6755ba9b943
-Size (wmakerconf-2.8.1.tar.bz2) = 446073 bytes
-SHA1 (patch-aa) = 73bf90a8c009325cd0dfbccc673bc45a07ca008c
-SHA1 (patch-ab) = 5b65a4eb480eeec18d5ee8357d1741480c5a193b
-SHA1 (patch-ac) = 074c96d12f7fe4cf770e5dc973b380e29d9094ce
-SHA1 (patch-ad) = 3a56d3117d8eb6b473a9bc82387b350a42751907
+SHA1 (wmakerconf-2.9.2.tar.gz) = 78240647a93c6dddf1db838a810ec48ce7646b32
+Size (wmakerconf-2.9.2.tar.gz) = 766440 bytes
+SHA1 (patch-aa) = 49ea35c55dba4e42ceaca8eeb39fdac9d4680530
+SHA1 (patch-ab) = db537545899839e6132ad0c0c2e9db26c7a83dc4
+SHA1 (patch-ac) = a1a5295ec8250db09b4b702bc60c8976d0e53d21
+SHA1 (patch-ad) = 8bd56bee7f7493c4ef0c555daadc90640aafeb9f
diff --git a/wm/wmakerconf/patches/patch-aa b/wm/wmakerconf/patches/patch-aa
index a99a101168b..6266b709753 100644
--- a/wm/wmakerconf/patches/patch-aa
+++ b/wm/wmakerconf/patches/patch-aa
@@ -1,34 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/05/06 16:21:26 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2004/11/08 10:14:33 adam Exp $
 
---- configure.orig	2001-03-16 18:01:49.000000000 +0100
+--- configure.orig	2004-07-22 03:43:52.000000000 +0000
 +++ configure
-@@ -18,7 +18,7 @@ ac_help="$ac_help
-        (e.g., PFX=/usr/share if the dir WindowMaker/Styles is part of this dir)"
- ac_help="$ac_help
-   --with-wmakeretcprefix=PFX Prefix to sysconfig files installed by Window Maker
--       (e.g., PFX=/etc if the file WindowMaker/WindowMaker is part of this dir)"
-+       (e.g., PFX=/etc if the file WindowMaker is part of this dir)"
- ac_help="$ac_help
-   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
- ac_help="$ac_help
-@@ -914,13 +914,13 @@ echo $ac_n "checking for Window Maker sy
- echo "configure:915: checking for Window Maker sysconfig directory" >&5
- if test ! -r "$wmakeretcprefix/WindowMaker/WindowMaker"; then
-         echo "$ac_t""missing" 1>&6
--        echo "configure: warning: file WindowMaker not found in $wmakeretcprefix/WindowMaker.
-+        echo "configure: warning: file WindowMaker not found in $wmakeretcprefix.
- Use option --with-wmakeretcprefix=PFX to find Window Maker sysconfig directory" 1>&2
- else
--        echo "$ac_t""$wmakeretcprefix/WindowMaker" 1>&6
-+        echo "$ac_t""$wmakeretcprefix" 1>&6
- fi
- cat >> confdefs.h <<EOF
--#define WMAKERDIR "$wmakeretcprefix/WindowMaker"
-+#define WMAKERDIR "$wmakeretcprefix"
- EOF
- 
- 
-@@ -1259,8 +1259,8 @@ if test "$x_libraries" != "NONE"; then
+@@ -3284,8 +3284,8 @@ if test "$x_libraries" != "NONE"; then
  fi
  
  # Add some common include and library path's
diff --git a/wm/wmakerconf/patches/patch-ab b/wm/wmakerconf/patches/patch-ab
index c79cea40028..e2b2774ef39 100644
--- a/wm/wmakerconf/patches/patch-ab
+++ b/wm/wmakerconf/patches/patch-ab
@@ -1,16 +1,23 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/15 23:25:17 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2004/11/08 10:14:33 adam Exp $
 
---- Makefile.in.orig	Fri Sep 29 21:05:59 2000
+--- Makefile.in.orig	2004-07-22 03:44:05.000000000 +0000
 +++ Makefile.in
-@@ -124,8 +124,9 @@
+@@ -112,7 +112,7 @@ GENCAT = @GENCAT@
+ GETSCRIPT = @GETSCRIPT@
+ GLIBC21 = @GLIBC21@
+ GMSGFMT = @GMSGFMT@
+-GNOMEAPP = @GNOMEAPP@
++GNOMEAPP =
+ GNOMEAPPS = @GNOMEAPPS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+@@ -229,7 +229,8 @@ DISTCLEANFILES = intl/libintl.h
  pkgdata_DATA = AUTHORS README COPYING NEWS MANUAL ABOUT-NLS NLS-TEAM1 ChangeLog
+ dist_man_MANS = man/wmakerconf.1 man/mkpreview.1
  EXTRA_DIST = MANUAL wmakerconf.spec NLS-TEAM1 wmakerconf.desktop.in
- 
 -GNOMEDIR = @GNOMEAPPS@
--GNOMEAPP = @GNOMEAPP@
 +# to avoid installing the gnome support file
-+GNOMEDIR = 
-+GNOMEAPP =
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
++GNOMEDIR =
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/wm/wmakerconf/patches/patch-ac b/wm/wmakerconf/patches/patch-ac
index 8107998f874..400f2d87522 100644
--- a/wm/wmakerconf/patches/patch-ac
+++ b/wm/wmakerconf/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2003/05/06 16:21:26 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2004/11/08 10:14:33 adam Exp $
 
---- src/rootmenu.c.orig	2000-09-25 20:15:24.000000000 +0200
+--- src/rootmenu.c.orig	2004-01-25 22:20:31.000000000 +0000
 +++ src/rootmenu.c
-@@ -471,7 +471,7 @@ real_rootmenu (GtkTooltips *tooltips, pr
+@@ -470,7 +470,7 @@ real_rootmenu (GtkTooltips *tooltips, pr
  
        if (!file)
        {
diff --git a/wm/wmakerconf/patches/patch-ad b/wm/wmakerconf/patches/patch-ad
index 7cbf88fea3f..eb267dfc77a 100644
--- a/wm/wmakerconf/patches/patch-ad
+++ b/wm/wmakerconf/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2003/05/06 16:21:26 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2004/11/08 10:14:33 adam Exp $
 
---- data/WMWmakerconf.in.orig	2001-03-16 18:07:08.000000000 +0100
+--- data/WMWmakerconf.in.orig	2004-02-20 15:59:21.000000000 +0000
 +++ data/WMWmakerconf.in
-@@ -553,6 +553,8 @@
+@@ -564,6 +564,8 @@
        Default = (
          "~/GNUstep/Library/WindowMaker/Pixmaps",
          "~/GNUstep/Library/WindowMaker/Backgrounds",
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1 2003/05/06 16:21:26 jmmv Exp $
          "/usr/share/WindowMaker/Pixmaps",
          "/usr/share/WindowMaker/Backgrounds",
          "/usr/local/share/WindowMaker/Pixmaps",
-@@ -571,6 +573,8 @@
+@@ -582,6 +584,8 @@
        Default = (
          "~/GNUstep/Library/Icons",
          "~/GNUstep/Library/WindowMaker/Pixmaps",
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.1 2003/05/06 16:21:26 jmmv Exp $
          "/usr/share/WindowMaker/Icons",
          "/usr/share/WindowMaker/Pixmaps",
          "/usr/local/share/WindowMaker/Icons",
-@@ -587,6 +591,7 @@
+@@ -598,6 +602,7 @@
        Info = "Wmakerconf searches each of these paths in order for the list of available themes.";
        Title = "Theme search paths";
        Default = (