Update to version 2.9.1

PR:		ports/68394
Submitted by:	Ports Fury

6 files changed, 88 insertions, 104 deletions

diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index f52a3064a8c6..e83c6e547646 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	wmakerconf
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.9.1
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_NETBSD}
+MASTER_SITES=	http://www.starplot.org/wmakerconf/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A configuration tool for Window Maker
@@ -18,34 +17,40 @@ RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 .if !exists(/usr/bin/bzip2)
 RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2
 .endif
-LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		png.5:${PORTSDIR}/graphics/png \
 		wraster.4:${PORTSDIR}/x11-wm/windowmaker
 
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehier gnometarget imlib
 USE_PERL5=	yes
-USE_GMAKE=	yes
 USE_XPM=	yes
-USE_GNOME=	imlib
-WANT_GNOME=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wmakerdir="${X11BASE}/share/WindowMaker"
 
-.include <bsd.port.pre.mk>
+MAN1=		mkpreview.1 wmakerconf.1
 
-.if defined(HAVE_GNOME)
-BUILD_DEPENDS+=	gnome2wmaker:${PORTSDIR}/x11-wm/gnome2wmaker
-RUN_DEPENDS+=	gnome2wmaker:${PORTSDIR}/x11-wm/gnome2wmaker
-PLIST_SUB+=	GNOME:=""
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .else
-PLIST_SUB+=	GNOME:="@comment "
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
 .endif
 
-post-configure:
-	@${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}| ; s|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/data/WMWmakerconf.gettext ${WRKSRC}/data/WMWmakerconf
+pre-configure:
+	@${PERL} -pi -e 's|lynx wget|lynx fetch|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|: install-data-local|:|g' ${WRKSRC}/Makefile.in
+.for file in WMWmakerconf.gettext WMWmakerconf
+	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		 s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/data/${file}
+.endfor
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/wmakerconf.desktop \
+		${PREFIX}/share/gnome/apps/Settings
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/wmakerconf/distinfo b/x11-wm/wmakerconf/distinfo
index 86b2fca4f46d..c36d294520c0 100644
--- a/x11-wm/wmakerconf/distinfo
+++ b/x11-wm/wmakerconf/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmakerconf-2.8.1.tar.bz2) = 1dbd2a586cfd351a264f84bc544f6b7a
-SIZE (wmakerconf-2.8.1.tar.bz2) = 446073
+MD5 (wmakerconf-2.9.1.tar.gz) = d460204c04bb494bf3f9a2ea218c99c3
+SIZE (wmakerconf-2.9.1.tar.gz) = 770144
diff --git a/x11-wm/wmakerconf/files/patch-aa b/x11-wm/wmakerconf/files/patch-aa
index 0c4a504e26da..1956f065fd1a 100644
--- a/x11-wm/wmakerconf/files/patch-aa
+++ b/x11-wm/wmakerconf/files/patch-aa
@@ -1,7 +1,6 @@
---- scripts/wget.pl.orig	Thu Mar 16 09:11:14 2000
-+++ scripts/wget.pl	Fri Apr  7 22:06:14 2000
-@@ -1,6 +1,6 @@
- #! /usr/bin/perl
+--- scripts/wget.pl.orig	Mon Jan 26 07:20:31 2004
++++ scripts/wget.pl	Wed Jun  2 01:56:42 2004
+@@ -1,5 +1,5 @@
  quit ("Wget not installed") if $wwwget eq "";
  
 -$rc = system ("$wwwget --quiet -c --tries=0 -O$tmpfile '$url'");
diff --git a/x11-wm/wmakerconf/files/patch-ab b/x11-wm/wmakerconf/files/patch-ab
deleted file mode 100644
index 8ef6485847a9..000000000000
--- a/x11-wm/wmakerconf/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Mon Sep 25 21:16:48 2000
-+++ configure	Wed Oct 11 12:11:11 2000
-@@ -964,7 +964,7 @@
- 	echo $ac_n "checking for GNOME apps directory""... $ac_c" 1>&6
- echo "configure:966: checking for GNOME apps directory" >&5
- 	GNOMEAPPS=`$gnomecfg --datadir`
--	GNOMEAPPS="$GNOMEAPPS/gnome/apps/Settings"
-+	GNOMEAPPS="$GNOMEAPPS/apps/Settings"
- 	GNOMEAPP="wmakerconf.desktop"
-         echo "$ac_t""$GNOMEAPPS" 1>&6
- fi
-@@ -2856,7 +2856,7 @@
-                 www_support="yes"
-         else
-                 echo "$ac_t"""no"" 1>&6
--                for ac_prog in lynx wget
-+                for ac_prog in lynx fetch
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/x11-wm/wmakerconf/pkg-descr b/x11-wm/wmakerconf/pkg-descr
index b5e1ca2863ac..f87357cfafc9 100644
--- a/x11-wm/wmakerconf/pkg-descr
+++ b/x11-wm/wmakerconf/pkg-descr
@@ -1,4 +1,4 @@
 Wmakerconf is a configuration tool for the famous window manager 
 Window Maker.  It is based on the GTK+ and Imlib libraries.
 
-WWW: http://ulli.on.openave.net/wmakerconf/index.html
+WWW: http://www.starplot.org/wmakerconf/
diff --git a/x11-wm/wmakerconf/pkg-plist b/x11-wm/wmakerconf/pkg-plist
index 065e2a40f9ce..b659610e0448 100644
--- a/x11-wm/wmakerconf/pkg-plist
+++ b/x11-wm/wmakerconf/pkg-plist
@@ -1,60 +1,60 @@
 bin/mkpreview
 bin/wmakerconf
-%%GNOME:%%share/gnome/apps/Settings/wmakerconf.desktop
-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/es_ES/LC_MESSAGES/wmakerconf-data.mo
-share/locale/es_ES/LC_MESSAGES/wmakerconf.mo
-share/locale/fi/LC_MESSAGES/wmakerconf.mo
-share/locale/fr/LC_MESSAGES/wmakerconf.mo
-share/locale/hu/LC_MESSAGES/wmakerconf.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.mo
-share/locale/pl/LC_MESSAGES/wmakerconf-data.mo
-share/locale/pl/LC_MESSAGES/wmakerconf.mo
-share/locale/pt_BR/LC_MESSAGES/wmakerconf-data.mo
-share/locale/pt_BR/LC_MESSAGES/wmakerconf.mo
-share/locale/ru/LC_MESSAGES/wmakerconf-data.mo
-share/locale/ru/LC_MESSAGES/wmakerconf.mo
-share/locale/sv/LC_MESSAGES/wmakerconf.mo
-share/locale/tr/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/desktop.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/mouse.xpm
-share/wmakerconf/paths.xpm
-share/wmakerconf/shortcuts.xpm
-share/wmakerconf/themes.xpm
-share/wmakerconf/tiles.xpm
-share/wmakerconf/titlebar.xpm
-share/wmakerconf/upgrade.pl
-share/wmakerconf/wget.pl
-share/wmakerconf/windows.xpm
-share/wmakerconf/wm-oldmenu2new.sh
-share/wmakerconf/wmaker-version
-share/wmakerconf/wmakerconf.xpm
-share/wmakerconf/workspace.xpm
-@dirrm share/wmakerconf
+share/gnome/apps/Settings/wmakerconf.desktop
+%%NLS%%share/locale/ca/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/da/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/de/LC_MESSAGES/wmakerconf-data.mo
+%%NLS%%share/locale/de/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/es_ES/LC_MESSAGES/wmakerconf-data.mo
+%%NLS%%share/locale/es_ES/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/it/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/wmakerconf-data.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/wmakerconf-data.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/no/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/wmakerconf-data.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/wmakerconf-data.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/wmakerconf-data.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/wmakerconf.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/wmakerconf.mo
+%%DATADIR%%/ABOUT-NLS
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/COPYING
+%%DATADIR%%/ChangeLog
+%%DATADIR%%/MANUAL
+%%DATADIR%%/NEWS
+%%DATADIR%%/NLS-TEAM1
+%%DATADIR%%/NLS-TEAM2
+%%DATADIR%%/README
+%%DATADIR%%/WMWmakerconf
+%%DATADIR%%/appearance.xpm
+%%DATADIR%%/black.xpm
+%%DATADIR%%/desktop.xpm
+%%DATADIR%%/effects.xpm
+%%DATADIR%%/getfile.pl
+%%DATADIR%%/libwww.pl
+%%DATADIR%%/lynx.pl
+%%DATADIR%%/menu.xpm
+%%DATADIR%%/menustyle.xpm
+%%DATADIR%%/misc.xpm
+%%DATADIR%%/mouse.xpm
+%%DATADIR%%/paths.xpm
+%%DATADIR%%/shortcuts.xpm
+%%DATADIR%%/themes.xpm
+%%DATADIR%%/tiles.xpm
+%%DATADIR%%/titlebar.xpm
+%%DATADIR%%/upgrade.pl
+%%DATADIR%%/wget.pl
+%%DATADIR%%/windows.xpm
+%%DATADIR%%/wm-oldmenu2new.sh
+%%DATADIR%%/wmaker-version
+%%DATADIR%%/wmakerconf.xpm
+%%DATADIR%%/workspace.xpm
+@dirrm %%DATADIR%%