Update to 2.11

PR:		ports/78752
Submitted by:	Ports Fury

5 files changed, 40 insertions, 162 deletions

diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 0d3d4ac..fbad8cf 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -6,51 +6,45 @@
 #
 
 PORTNAME=	wmakerconf
-PORTVERSION=	2.9.2
+PORTVERSION=	2.11
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.starplot.org/wmakerconf/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A configuration tool for Window Maker
 
+LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker
 RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 .if !exists(/usr/bin/bzip2)
 RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2
 .endif
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		png.5:${PORTSDIR}/graphics/png \
-		wraster.4:${PORTSDIR}/x11-wm/windowmaker
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehier gnometarget imlib
+USE_GNOME=	gnomehier gnometarget gtk20
 USE_PERL5=	yes
-USE_XPM=	yes
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wmakerdir="${X11BASE}/share/WindowMaker"
 
 MAN1=		mkpreview.1 wmakerconf.1
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.endif
+post-extract:
+	@${FIND} ${WRKSRC} -name "*.gmo" -delete
 
 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}
+.for file in data/WMWmakerconf data/WMWmakerconf.gettext
+	@${PERL} -pi -e 's|/usr/local/share|${LOCALBASE}|g ; \
+		 s|/usr/share|${X11BASE}|g' ${WRKSRC}/${file}
+.endfor
+.for file in data/po/ja.po po/ja.po
+	@${PERL} -pi -e 's|JISX-0208-1983-0|euc-jp|g' ${WRKSRC}/${file}
 .endfor
 
 post-install:
+	@${MKDIR} ${PREFIX}/share/gnome/applications
 	${INSTALL_DATA} ${WRKSRC}/wmakerconf.desktop \
-		${PREFIX}/share/gnome/apps/Settings
+		${PREFIX}/share/gnome/applications
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wmakerconf/distinfo b/x11-wm/wmakerconf/distinfo
index 39ec754..2826dcf 100644
--- a/x11-wm/wmakerconf/distinfo
+++ b/x11-wm/wmakerconf/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmakerconf-2.9.2.tar.gz) = f233c31759e3ab5330c7e41c28a120d9
-SIZE (wmakerconf-2.9.2.tar.gz) = 766440
+MD5 (wmakerconf-2.11.tar.gz) = d98ff7f6c18cd0d6ffdfa0a990bcf698
+SIZE (wmakerconf-2.11.tar.gz) = 791166
diff --git a/x11-wm/wmakerconf/files/patch-data_WMWmakerconf b/x11-wm/wmakerconf/files/patch-data_WMWmakerconf
deleted file mode 100644
index 8c3f219..0000000
--- a/x11-wm/wmakerconf/files/patch-data_WMWmakerconf
+++ /dev/null
@@ -1,58 +0,0 @@
-
-$FreeBSD$
-
---- data/WMWmakerconf	2001/01/12 13:53:53	1.1
-+++ data/WMWmakerconf	2001/01/12 13:56:24
-@@ -537,13 +537,13 @@
-       Default = (
-         "~/GNUstep/Library/WindowMaker/Pixmaps",
-         "~/GNUstep/Library/WindowMaker/Backgrounds",
--        "/usr/share/WindowMaker/Pixmaps",
--        "/usr/share/WindowMaker/Backgrounds",
--        "/usr/local/share/WindowMaker/Pixmaps",
--        "/usr/local/share/WindowMaker/Backgrounds",
--        "/usr/X11R6/include/X11/pixmaps",
--        "/usr/local/share/pixmaps",
--        "/usr/share/pixmaps"
-+        "%%X11BASE%%/share/WindowMaker/Pixmaps",
-+        "%%X11BASE%%/share/WindowMaker/Backgrounds",
-+        "%%LOCALBASE%%/share/WindowMaker/Pixmaps",
-+        "%%LOCALBASE%%/share/WindowMaker/Backgrounds",
-+        "%%X11BASE%%/include/X11/pixmaps",
-+        "%%LOCALBASE%%/share/pixmaps",
-+        "%%X11BASE%%/share/pixmaps"
-       );
-       Range = ();
-     };
-@@ -555,13 +555,13 @@
-       Default = (
-         "~/GNUstep/Library/Icons",
-         "~/GNUstep/Library/WindowMaker/Pixmaps",
--        "/usr/share/WindowMaker/Icons",
--        "/usr/share/WindowMaker/Pixmaps",
--        "/usr/local/share/WindowMaker/Icons",
--        "/usr/local/share/WindowMaker/Pixmaps",
--        "/usr/X11R6/include/X11/pixmaps",
--        "/usr/local/share/pixmaps",
--        "/usr/share/pixmaps"
-+        "%%X11BASE%%/share/WindowMaker/Icons",
-+        "%%X11BASE%%/share/WindowMaker/Pixmaps",
-+        "%%LOCALBASE%%/share/WindowMaker/Icons",
-+        "%%LOCALBASE%%/share/WindowMaker/Pixmaps",
-+        "%%X11BASE%%/include/X11/pixmaps",
-+        "%%LOCALBASE%%/share/pixmaps",
-+        "%%X11BASE%%/share/pixmaps"
-       );
-       Range = ();
-     };
-@@ -571,8 +571,8 @@
-       Info = "Wmakerconf searches each of these paths in order for the list of available themes.";
-       Title = "Theme search paths";
-       Default = (
--        "/usr/share/WindowMaker/Themes",
--	"/usr/local/share/WindowMaker/Themes",
-+        "%%X11BASE%%/share/WindowMaker/Themes",
-+	"%%LOCALBASE%%/share/WindowMaker/Themes",
-         "~/GNUstep/Library/WindowMaker/Themes"
-       );
-       Range = ();
diff --git a/x11-wm/wmakerconf/files/patch-data_WMWmakerconf.gettext b/x11-wm/wmakerconf/files/patch-data_WMWmakerconf.gettext
deleted file mode 100644
index 2f01d91..0000000
--- a/x11-wm/wmakerconf/files/patch-data_WMWmakerconf.gettext
+++ /dev/null
@@ -1,58 +0,0 @@
-
-$FreeBSD$
-
---- data/WMWmakerconf.gettext	2001/01/12 13:54:02	1.1
-+++ data/WMWmakerconf.gettext	2001/01/12 13:56:24
-@@ -619,13 +619,13 @@
-       Default = (
-         "~/GNUstep/Library/WindowMaker/Pixmaps",
-         "~/GNUstep/Library/WindowMaker/Backgrounds",
--        "/usr/share/WindowMaker/Pixmaps",
--        "/usr/share/WindowMaker/Backgrounds",
--        "/usr/local/share/WindowMaker/Pixmaps",
--        "/usr/local/share/WindowMaker/Backgrounds",
--        "/usr/X11R6/include/X11/pixmaps",
--        "/usr/local/share/pixmaps",
--        "/usr/share/pixmaps"
-+        "%%X11BASE%%/share/WindowMaker/Pixmaps",
-+        "%%X11BASE%%/share/WindowMaker/Backgrounds",
-+        "%%LOCALBASE%%/share/WindowMaker/Pixmaps",
-+        "%%LOCALBASE%%/share/WindowMaker/Backgrounds",
-+        "%%X11BASE%%/include/X11/pixmaps",
-+        "%%LOCALBASE%%/share/pixmaps",
-+        "%%X11BASE%%/share/pixmaps"
-       );
-       Range = ();
-     };
-@@ -639,13 +639,13 @@
-       Default = (
-         "~/GNUstep/Library/Icons",
-         "~/GNUstep/Library/WindowMaker/Pixmaps",
--        "/usr/share/WindowMaker/Icons",
--        "/usr/share/WindowMaker/Pixmaps",
--        "/usr/local/share/WindowMaker/Icons",
--        "/usr/local/share/WindowMaker/Pixmaps",
--        "/usr/X11R6/include/X11/pixmaps",
--        "/usr/local/share/pixmaps",
--        "/usr/share/pixmaps"
-+        "%%X11BASE%%/share/WindowMaker/Icons",
-+        "%%X11BASE%%/share/WindowMaker/Pixmaps",
-+        "%%LOCALBASE%%/share/WindowMaker/Icons",
-+        "%%LOCALBASE%%/share/WindowMaker/Pixmaps",
-+        "%%X11BASE%%/include/X11/pixmaps",
-+        "%%LOCALBASE%%/share/pixmaps",
-+        "%%X11BASE%%/share/pixmaps"
-       );
-       Range = ();
-     };
-@@ -657,8 +657,8 @@
- /* Title: ThemePath */
-       Title = _("Theme search paths");
-       Default = (
--        "/usr/share/WindowMaker/Themes",
--	"/usr/local/share/WindowMaker/Themes",
-+        "%%X11BASE%%/share/WindowMaker/Themes",
-+	"%%LOCALBASE%%/share/WindowMaker/Themes",
-         "~/GNUstep/Library/WindowMaker/Themes"
-       );
-       Range = ();
diff --git a/x11-wm/wmakerconf/pkg-plist b/x11-wm/wmakerconf/pkg-plist
index 4fd09da..fedb57c 100644
--- a/x11-wm/wmakerconf/pkg-plist
+++ b/x11-wm/wmakerconf/pkg-plist
@@ -1,30 +1,30 @@
 bin/mkpreview
 bin/wmakerconf
-share/gnome/apps/Settings/wmakerconf.desktop
-%%NLS%%share/locale/ca/LC_MESSAGES/wmakerconf.mo
-%%NLS%%share/locale/da/LC_MESSAGES/wmakerconf-data.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
+share/gnome/applications/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-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.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
 %%DATADIR%%/ABOUT-NLS
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING