Update wmakerconf to version 2.3.

user visible changes since 2.2:
        * New shortcut dialog
        * Option to enable/disable tooltips
        * WindowMaker 0.61.0 attributes update (including
        * drawPlainString plugin support with libwmfun-0.0.2)
        * Bugfix shortcut dialog

4 files changed, 55 insertions, 53 deletions

diff --git a/x11/wmakerconf/Makefile b/x11/wmakerconf/Makefile
index 16846889e4e..f2e4b968e06 100644
--- a/x11/wmakerconf/Makefile
+++ b/x11/wmakerconf/Makefile
@@ -1,23 +1,26 @@
-# $NetBSD: Makefile,v 1.10 1999/10/05 21:07:06 tron Exp $
+# $NetBSD: Makefile,v 1.11 1999/10/09 01:06:13 jlam Exp $
 #
 
-DISTNAME=	wmakerconf-2.2
+DISTNAME=	wmakerconf-2.3
 CATEGORIES=	x11
-MASTER_SITES=	http://www-info2.informatik.uni-wuerzburg.de/staff/ulli/wmakerconf/ \
-		ftp://ftp.ema.fr/pub/mirrors/windowmaker/wmakerconf/
+MASTER_SITES=	http://members.linuxstart.com/~ulli/wmakerconf/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www-info2.informatik.uni-wuerzburg.de/staff/ulli/wmakerconf/
+HOMEPAGE=	http://members.linuxstart.com/~ulli/wmakerconf/
 
 DEPENDS+=	imlib-1.9.4:../../graphics/imlib
-DEPENDS+=	gtk+-1.2.4:../../x11/gtk
+DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	windowmaker-*:../../x11/windowmaker
 
 USE_X11BASE=	yes
+USE_PERL=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
+
+# for libintl and libProplist
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -R${LOCALBASE}/lib	# for libPropList.so.1.1
+LDFLAGS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmakerconf/files/md5 b/x11/wmakerconf/files/md5
index 28b355b76af..04fa0f45280 100644
--- a/x11/wmakerconf/files/md5
+++ b/x11/wmakerconf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/08/30 08:44:47 jlam Exp $
+$NetBSD: md5,v 1.5 1999/10/09 01:06:13 jlam Exp $
 
-MD5 (wmakerconf-2.2.tar.bz2) = b3316a061e31438b0f7353607a6089a6
+MD5 (wmakerconf-2.3.tar.bz2) = ae07ae057c76bc48a68a29313c38d43d
diff --git a/x11/wmakerconf/pkg/COMMENT b/x11/wmakerconf/pkg/COMMENT
index 9a74b56a955..8b18836dddb 100644
--- a/x11/wmakerconf/pkg/COMMENT
+++ b/x11/wmakerconf/pkg/COMMENT
@@ -1 +1 @@
-Gtk+ based configuration tool for WindowMaker
+Gtk+ based configuration tool for Window Maker
diff --git a/x11/wmakerconf/pkg/PLIST b/x11/wmakerconf/pkg/PLIST
index e189b08ed8d..e39667e8095 100644
--- a/x11/wmakerconf/pkg/PLIST
+++ b/x11/wmakerconf/pkg/PLIST
@@ -1,64 +1,63 @@
-@comment $NetBSD: PLIST,v 1.3 1999/08/29 10:34:46 tron Exp $
-bin/wmakerconf
+@comment $NetBSD: PLIST,v 1.4 1999/10/09 01:06:14 jlam Exp $
 bin/mkpreview
-share/locale/fr/LC_MESSAGES/wmakerconf.mo
-share/locale/fr/LC_MESSAGES/wmakerconf-data.mo
-share/locale/sv/LC_MESSAGES/wmakerconf.mo
-share/locale/sv/LC_MESSAGES/wmakerconf-data.mo
+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/ru/LC_MESSAGES/wmakerconf-data.mo
-share/locale/ru/LC_MESSAGES/wmakerconf.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/da/LC_MESSAGES/wmakerconf-data.mo
-share/locale/da/LC_MESSAGES/wmakerconf.mo
 share/locale/it/LC_MESSAGES/wmakerconf-data.mo
 share/locale/it/LC_MESSAGES/wmakerconf.mo
-share/locale/no/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/ca/LC_MESSAGES/wmakerconf-data.mo
-share/locale/ca/LC_MESSAGES/wmakerconf.mo
-share/locale/fi/LC_MESSAGES/wmakerconf-data.mo
-share/locale/fi/LC_MESSAGES/wmakerconf.mo
-share/locale/de/LC_MESSAGES/wmakerconf.mo
-share/locale/de/LC_MESSAGES/wmakerconf-data.mo
-share/locale/ro/LC_MESSAGES/wmakerconf-data.mo
-share/locale/pt_BR/LC_MESSAGES/wmakerconf.mo
+share/locale/no/LC_MESSAGES/wmakerconf.mo
 share/locale/pt_BR/LC_MESSAGES/wmakerconf-data.mo
-share/locale/ko/LC_MESSAGES/wmakerconf.mo
-share/locale/ko/LC_MESSAGES/wmakerconf-data.mo
-share/locale/ja/LC_MESSAGES/wmakerconf.mo
-share/locale/ja/LC_MESSAGES/wmakerconf-data.mo
-share/locale/el/LC_MESSAGES/wmakerconf-data.mo
-share/locale/cz/LC_MESSAGES/wmakerconf-data.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/themes.org.jpg
-share/wmakerconf/black.xpm
+share/wmakerconf/ABOUT-NLS
+share/wmakerconf/COPYING
+share/wmakerconf/MANUAL
+share/wmakerconf/NLS-TEAM1
+share/wmakerconf/NLS-TEAM2
+share/wmakerconf/README
+share/wmakerconf/WMWmakerconf
 share/wmakerconf/appearance.xpm
+share/wmakerconf/black.xpm
 share/wmakerconf/effects.xpm
+share/wmakerconf/getfile.pl
+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.org.jpg
+share/wmakerconf/themes.xpm
 share/wmakerconf/tiles.xpm
 share/wmakerconf/titlebar.xpm
-share/wmakerconf/menustyle.xpm
-share/wmakerconf/workspace.xpm
-share/wmakerconf/themes.xpm
-share/wmakerconf/wm-oldmenu2new.sh
 share/wmakerconf/upgrade.pl
-share/wmakerconf/gettile.pl
-share/wmakerconf/getfile.pl
-share/wmakerconf/libwww.pl
-share/wmakerconf/lynx.pl
 share/wmakerconf/wget.pl
-share/wmakerconf/wmakerconf.xpm
-share/wmakerconf/WMWmakerconf
-share/wmakerconf/README
+share/wmakerconf/wm-oldmenu2new.sh
 share/wmakerconf/wmaker-version
-share/wmakerconf/NLS-TEAM2
-share/wmakerconf/COPYING
-share/wmakerconf/MANUAL
-share/wmakerconf/ABOUT-NLS
-share/wmakerconf/NLS-TEAM1
+share/wmakerconf/wmakerconf.xpm
+share/wmakerconf/workspace.xpm
 @dirrm share/wmakerconf