wmakerconf update to 2.4

user visible changes since 2.3:
        * Replaced misc and effects page by a set of new dialogs
          (with descriptive text for the attributes and their values)
        * Added theme renaming command
        * Redesign of shortcut dialog
        * Attributes updates for
                - WindowMaker 0.61.1
                - Windoze cycling
                - Workspace indicator font
        * Some bug fixes

5 files changed, 25 insertions, 31 deletions

diff --git a/x11/wmakerconf/Makefile b/x11/wmakerconf/Makefile
index 84a3e15d029..42a8332f7dc 100644
--- a/x11/wmakerconf/Makefile
+++ b/x11/wmakerconf/Makefile
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.12 1999/11/08 19:56:00 tron Exp $
+# $NetBSD: Makefile,v 1.13 2000/01/02 01:03:53 wiz Exp $
 #
 
-DISTNAME=	wmakerconf-2.3
+DISTNAME=	wmakerconf-2.4
 CATEGORIES=	x11
-MASTER_SITES=	http://members.linuxstart.com/~ulli/wmakerconf/
+MASTER_SITES=	http://ulli.linuxbox.com/wmakerconf/
 EXTRACT_SUFX=	.tar.bz2
 
+PATCHFILES=	wmakerconf-2.4.patch
+PATCH_SITES=	${MASTER_SITES}
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://members.linuxstart.com/~ulli/wmakerconf/
+HOMEPAGE=	http://ulli.linuxbox.com/wmakerconf/
 
 DEPENDS+=	imlib-*:../../graphics/imlib
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
diff --git a/x11/wmakerconf/files/md5 b/x11/wmakerconf/files/md5
index 04fa0f45280..1aa1952b8d6 100644
--- a/x11/wmakerconf/files/md5
+++ b/x11/wmakerconf/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.5 1999/10/09 01:06:13 jlam Exp $
+$NetBSD: md5,v 1.6 2000/01/02 01:03:54 wiz Exp $
 
-MD5 (wmakerconf-2.3.tar.bz2) = ae07ae057c76bc48a68a29313c38d43d
+MD5 (wmakerconf-2.4.tar.bz2) = 0f2d272aab868b53d64f651adc3ee44a
+MD5 (wmakerconf-2.4.patch) = d91b48dd22f4cef2e19bf39e0c5625f2
diff --git a/x11/wmakerconf/files/patch-sum b/x11/wmakerconf/files/patch-sum
index e068cf7fd13..80d0d920c80 100644
--- a/x11/wmakerconf/files/patch-sum
+++ b/x11/wmakerconf/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.3 1999/10/09 21:08:26 rh Exp $
+$NetBSD: patch-sum,v 1.4 2000/01/02 01:03:54 wiz Exp $
 
-MD5 (patch-aa) = fd77f10799a0cdc9bd5142c212ab5450
+MD5 (patch-aa) = 50c554e38b9064fb0c15b817cae1c612
diff --git a/x11/wmakerconf/patches/patch-aa b/x11/wmakerconf/patches/patch-aa
index 1685cf66574..4280796c58b 100644
--- a/x11/wmakerconf/patches/patch-aa
+++ b/x11/wmakerconf/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1999/10/09 21:08:26 rh Exp $
+$NetBSD: patch-aa,v 1.4 2000/01/02 01:03:54 wiz Exp $
 
---- configure.orig	Tue Sep 28 22:01:36 1999
-+++ configure	Sat Oct  9 23:00:48 1999
-@@ -1193,8 +1193,8 @@
+--- configure.orig	Fri Dec  3 16:34:48 1999
++++ configure	Sun Jan  2 01:48:50 2000
+@@ -1212,8 +1212,8 @@
  fi
  
  # Add some common include and library path's
diff --git a/x11/wmakerconf/pkg/PLIST b/x11/wmakerconf/pkg/PLIST
index e39667e8095..06b34151aa9 100644
--- a/x11/wmakerconf/pkg/PLIST
+++ b/x11/wmakerconf/pkg/PLIST
@@ -1,40 +1,27 @@
-@comment $NetBSD: PLIST,v 1.4 1999/10/09 01:06:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/01/02 01:03:54 wiz Exp $
 bin/mkpreview
 bin/wmakerconf
-share/locale/ca/LC_MESSAGES/wmakerconf-data.mo
 share/locale/ca/LC_MESSAGES/wmakerconf.mo
-share/locale/cs/LC_MESSAGES/wmakerconf-data.mo
-share/locale/da/LC_MESSAGES/wmakerconf-data.mo
 share/locale/da/LC_MESSAGES/wmakerconf.mo
 share/locale/de/LC_MESSAGES/wmakerconf-data.mo
 share/locale/de/LC_MESSAGES/wmakerconf.mo
-share/locale/el/LC_MESSAGES/wmakerconf-data.mo
-share/locale/es/LC_MESSAGES/wmakerconf-data.mo
-share/locale/fi/LC_MESSAGES/wmakerconf-data.mo
 share/locale/fi/LC_MESSAGES/wmakerconf.mo
-share/locale/fr/LC_MESSAGES/wmakerconf-data.mo
 share/locale/fr/LC_MESSAGES/wmakerconf.mo
-share/locale/hu/LC_MESSAGES/wmakerconf-data.mo
 share/locale/hu/LC_MESSAGES/wmakerconf.mo
-share/locale/it/LC_MESSAGES/wmakerconf-data.mo
 share/locale/it/LC_MESSAGES/wmakerconf.mo
-share/locale/ja/LC_MESSAGES/wmakerconf-data.mo
 share/locale/ja/LC_MESSAGES/wmakerconf.mo
-share/locale/ko/LC_MESSAGES/wmakerconf-data.mo
 share/locale/ko/LC_MESSAGES/wmakerconf.mo
-share/locale/no/LC_MESSAGES/wmakerconf-data.mo
 share/locale/no/LC_MESSAGES/wmakerconf.mo
-share/locale/pt_BR/LC_MESSAGES/wmakerconf-data.mo
+share/locale/pl/LC_MESSAGES/wmakerconf.mo
 share/locale/pt_BR/LC_MESSAGES/wmakerconf.mo
-share/locale/ro/LC_MESSAGES/wmakerconf-data.mo
-share/locale/ru/LC_MESSAGES/wmakerconf-data.mo
 share/locale/ru/LC_MESSAGES/wmakerconf.mo
-share/locale/sv/LC_MESSAGES/wmakerconf-data.mo
 share/locale/sv/LC_MESSAGES/wmakerconf.mo
-share/locale/tr/LC_MESSAGES/wmakerconf-data.mo
 share/wmakerconf/ABOUT-NLS
+share/wmakerconf/AUTHORS
 share/wmakerconf/COPYING
+share/wmakerconf/ChangeLog
 share/wmakerconf/MANUAL
+share/wmakerconf/NEWS
 share/wmakerconf/NLS-TEAM1
 share/wmakerconf/NLS-TEAM2
 share/wmakerconf/README
@@ -43,6 +30,9 @@ share/wmakerconf/appearance.xpm
 share/wmakerconf/black.xpm
 share/wmakerconf/effects.xpm
 share/wmakerconf/getfile.pl
+share/wmakerconf/gnome-ccdesktop.xpm
+share/wmakerconf/gnome-ccwindowmanager.xpm
+share/wmakerconf/gnome-mouse.xpm
 share/wmakerconf/libwww.pl
 share/wmakerconf/lynx.pl
 share/wmakerconf/menu.xpm
@@ -50,7 +40,6 @@ share/wmakerconf/menustyle.xpm
 share/wmakerconf/misc.xpm
 share/wmakerconf/paths.xpm
 share/wmakerconf/shortcuts.xpm
-share/wmakerconf/themes.org.jpg
 share/wmakerconf/themes.xpm
 share/wmakerconf/tiles.xpm
 share/wmakerconf/titlebar.xpm