Update wmakerconf to 2.6.1

Changes include:
 * Several bug fixes (old style root menu conversion, debian menu,
   theme download of wm.themes.org, wraster library 0.62.0
   support)
 * Theme saving: ask user whether to overwrite a theme
 * Improved debugging output of shell commands
 * Icons update (thanks to Tim Allen )

3 files changed, 30 insertions, 34 deletions

diff --git a/x11/wmakerconf/Makefile b/x11/wmakerconf/Makefile
index 39e7002e122..e2b4d02a82e 100644
--- a/x11/wmakerconf/Makefile
+++ b/x11/wmakerconf/Makefile
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2000/02/05 17:27:20 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2000/04/08 08:41:26 rh Exp $
 #
 
-DISTNAME=	wmakerconf-2.5
+DISTNAME=	wmakerconf-2.6.1
 CATEGORIES=	x11
-MASTER_SITES=	http://ulli.linuxbox.com/wmakerconf/
+MASTER_SITES=	http://ulli.linuxave.net/wmakerconf/
 EXTRACT_SUFX=	.tar.bz2
 
-PATCHFILES=    wmakerconf.patch
-PATCH_SITES=   ${MASTER_SITES}
-PATCH_DIST_STRIP=      -p1
-
 MAINTAINER=	wiz@netbsd.org
-HOMEPAGE=	http://ulli.linuxbox.com/wmakerconf/
+HOMEPAGE=	http://ulli.linuxave.net/wmakerconf/
 
 DEPENDS+=	imlib-*:../../graphics/imlib
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
diff --git a/x11/wmakerconf/files/md5 b/x11/wmakerconf/files/md5
index f81933aefd3..9b7634e3da1 100644
--- a/x11/wmakerconf/files/md5
+++ b/x11/wmakerconf/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.7 2000/02/05 17:27:20 wiz Exp $
+$NetBSD: md5,v 1.8 2000/04/08 08:41:27 rh Exp $
 
-MD5 (wmakerconf-2.5.tar.bz2) = 1a8979f7f9d47cc4cc719125110c8447
+MD5 (wmakerconf-2.6.1.tar.bz2) = 5eab769c1f43f6979ca355282c1477f1
 MD5 (wmakerconf.patch) = ce0d33f236479d6e247fcec87fb5c24e
diff --git a/x11/wmakerconf/pkg/PLIST b/x11/wmakerconf/pkg/PLIST
index b14a2598750..e9dbdf1ba5e 100644
--- a/x11/wmakerconf/pkg/PLIST
+++ b/x11/wmakerconf/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2000/02/05 17:27:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/04/08 08:41:28 rh Exp $
 bin/mkpreview
 bin/wmakerconf
 share/locale/ca/LC_MESSAGES/wmakerconf.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/de/LC_MESSAGES/wmakerconf-data.mo
 share/locale/fi/LC_MESSAGES/wmakerconf.mo
 share/locale/fr/LC_MESSAGES/wmakerconf.mo
 share/locale/hu/LC_MESSAGES/wmakerconf.mo
@@ -17,37 +17,37 @@ share/locale/pl/LC_MESSAGES/wmakerconf.mo
 share/locale/pt_BR/LC_MESSAGES/wmakerconf.mo
 share/locale/ru/LC_MESSAGES/wmakerconf.mo
 share/locale/sv/LC_MESSAGES/wmakerconf.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
-share/wmakerconf/WMWmakerconf
-share/wmakerconf/appearance.xpm
 share/wmakerconf/black.xpm
+share/wmakerconf/appearance.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
-share/wmakerconf/menustyle.xpm
 share/wmakerconf/misc.xpm
 share/wmakerconf/paths.xpm
 share/wmakerconf/shortcuts.xpm
-share/wmakerconf/themes.xpm
 share/wmakerconf/tiles.xpm
 share/wmakerconf/titlebar.xpm
+share/wmakerconf/menustyle.xpm
+share/wmakerconf/wmakerconf.xpm
+share/wmakerconf/workspace.xpm
+share/wmakerconf/themes.xpm
+share/wmakerconf/windows.xpm
+share/wmakerconf/desktop.xpm
+share/wmakerconf/mouse.xpm
+share/wmakerconf/wm-oldmenu2new.sh
 share/wmakerconf/upgrade.pl
+share/wmakerconf/getfile.pl
+share/wmakerconf/libwww.pl
+share/wmakerconf/lynx.pl
 share/wmakerconf/wget.pl
-share/wmakerconf/wm-oldmenu2new.sh
+share/wmakerconf/WMWmakerconf
 share/wmakerconf/wmaker-version
-share/wmakerconf/wmakerconf.xpm
-share/wmakerconf/workspace.xpm
+share/wmakerconf/NLS-TEAM2
+share/wmakerconf/AUTHORS
+share/wmakerconf/README
+share/wmakerconf/COPYING
+share/wmakerconf/NEWS
+share/wmakerconf/MANUAL
+share/wmakerconf/ABOUT-NLS
+share/wmakerconf/NLS-TEAM1
+share/wmakerconf/ChangeLog
 @dirrm share/wmakerconf