Update to 0.95.6.

14 files changed, 114 insertions, 122 deletions

diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index b9bd2a0178b9..205d0d1632ec 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	windowmaker
-PORTVERSION=	0.95.5
-PORTREVISION=	4
+PORTVERSION=	0.95.6
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/release
@@ -18,14 +17,15 @@ LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
 		libpng15.so:${PORTSDIR}/graphics/png \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libwraster.so:${PORTSDIR}/x11-wm/libwraster
-RUN_DEPENDS=	libwraster>=${PORTVERSION}:${PORTSDIR}/x11-wm/libwraster \
-		${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
+		libwebp.so:${PORTSDIR}/graphics/webp \
+		libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
+		libwraster.so.5:${PORTSDIR}/x11-wm/libwraster
+RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
 
-USES=		libtool pathfix perl5 pkgconfig shebangfix
-SHEBANG_FILES=	util/wkdemenu.pl
+USES=		libtool shebangfix pathfix perl5 pkgconfig
 USE_LDCONFIG=	yes
 USE_XORG=	xft xinerama xmu xpm
+SHEBANG_FILES=	util/wkdemenu.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
@@ -38,24 +38,17 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-x
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
 		INSTALL-WMAKER NEWS README README.definable-cursor TODO
 LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it \
 		ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
-INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	DOCS NLS XRANDR
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENV=	LINGUAS="${LINGUAS}"
 NLS_CONFIGURE_ENABLE=	locale
-XRANDR_USE=	XORG=xrandr
-XRANDR_CONFIGURE_ENABLE=	xrandr
-
-post-patch:
-	@${REINPLACE_CMD} 's,PREFIX,"${PREFIX}",' \
-		${WRKSRC}/WINGs/wapplication.c ${WRKSRC}/WPrefs.app/Menu.c \
-		${WRKSRC}/WPrefs.app/Paths.c ${WRKSRC}/util/wmgenmenu.c
 
 post-install:
 	@${MKDIR} \
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index a8a58b4c50e7..befc6d63369d 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (WindowMaker-0.95.5.tar.gz) = 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0
-SIZE (WindowMaker-0.95.5.tar.gz) = 2927995
+SHA256 (WindowMaker-0.95.6.tar.gz) = 435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4
+SIZE (WindowMaker-0.95.6.tar.gz) = 3004856
diff --git a/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in b/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
index 00af3b229b20..1367bda2ca47 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
@@ -1,6 +1,6 @@
---- WINGs/Examples/Makefile.in.orig
-+++ WINGs/Examples/Makefile.in
-@@ -254,7 +254,7 @@
+--- WINGs/Examples/Makefile.in.orig	2014-09-05 03:57:46.000000000 +0900
++++ WINGs/Examples/Makefile.in	2014-09-05 03:59:22.000000000 +0900
+@@ -286,14 +286,14 @@
  wprefs_bindir = @wprefs_bindir@
  wprefs_datadir = @wprefs_datadir@
  AUTOMAKE_OPTIONS = 
@@ -9,10 +9,9 @@
  	$(top_builddir)/WINGs/libWUtil.la \
  	@XFTLIBS@ @INTLIBS@
  
-@@ -265,7 +265,7 @@
- connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@
- server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
- server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@
+ colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 -AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 +AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
  	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
diff --git a/x11-wm/windowmaker/files/patch-WINGs__Makefile.in b/x11-wm/windowmaker/files/patch-WINGs__Makefile.in
index e3b91c0d1246..c3104863dfd0 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Makefile.in
@@ -1,6 +1,6 @@
---- WINGs/Makefile.in.orig
-+++ WINGs/Makefile.in
-@@ -76,8 +76,7 @@
+--- WINGs/Makefile.in.orig	2014-09-05 04:10:28.000000000 +0900
++++ WINGs/Makefile.in	2014-09-05 04:12:50.000000000 +0900
+@@ -106,8 +106,7 @@
  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
  	"$(DESTDIR)$(pkgconfigdir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -10,7 +10,7 @@
  am_libWINGs_la_OBJECTS = configuration.lo dragcommon.lo \
  	dragdestination.lo dragsource.lo selection.lo wappresource.lo \
  	wballoon.lo wbox.lo wbrowser.lo wbutton.lo wcolor.lo \
-@@ -335,8 +334,8 @@
+@@ -378,8 +377,8 @@
  libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
  bin_SCRIPTS = get-wings-flags get-wutil-flags
  lib_LTLIBRARIES = libWUtil.la libWINGs.la
@@ -21,12 +21,13 @@
  libWUtil_la_LIBADD = @LIBBSD@
  EXTRA_DIST = BUGS make-rgb Examples Extras Tests get-wings-flags.in get-wutil-flags.in
  
-@@ -408,7 +407,7 @@
+@@ -453,7 +452,8 @@
  
  AM_CFLAGS = 
  AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
 -	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
++	 -DPREFIX=\"$(prefix)\" \
 +	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/src \
  	@XFTFLAGS@ @HEADER_SEARCH_PATH@
  
- pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in b/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
index 75a1f6362222..e00b3feb0052 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
@@ -1,14 +1,14 @@
---- WINGs/Tests/Makefile.in.orig
-+++ WINGs/Tests/Makefile.in
-@@ -56,7 +56,6 @@
+--- WINGs/Tests/Makefile.in.orig	2014-09-05 03:59:36.000000000 +0900
++++ WINGs/Tests/Makefile.in	2014-09-05 04:00:47.000000000 +0900
+@@ -80,7 +80,6 @@
  testmywidget_OBJECTS = $(am_testmywidget_OBJECTS)
  testmywidget_LDADD = $(LDADD)
  testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
 -	$(top_builddir)/wrlib/libwraster.la \
  	$(top_builddir)/WINGs/libWUtil.la
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -65,13 +64,11 @@
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -89,13 +88,11 @@
  wmfile_OBJECTS = wmfile.$(OBJEXT)
  wmfile_LDADD = $(LDADD)
  wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@@ -22,14 +22,14 @@
  	$(top_builddir)/WINGs/libWUtil.la
  wtest_SOURCES = wtest.c
  wtest_OBJECTS = wtest.$(OBJEXT)
-@@ -262,14 +259,14 @@
+@@ -299,14 +296,14 @@
  wprefs_bindir = @wprefs_bindir@
  wprefs_datadir = @wprefs_datadir@
  AUTOMAKE_OPTIONS = 
 -LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 +LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
  	$(top_builddir)/WINGs/libWUtil.la \
- 	@XFTLIBS@ @INTLIBS@
+ 	@XFTLIBS@ @INTLIBS@ @XLIBS@ 
  
  testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
  wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in b/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
index 2aefc1c2ecc0..961f682fbe99 100644
--- a/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
@@ -1,10 +1,11 @@
---- WPrefs.app/Makefile.in.orig
-+++ WPrefs.app/Makefile.in
-@@ -347,13 +347,13 @@
- 
+--- WPrefs.app/Makefile.in.orig	2014-09-05 04:29:28.000000000 +0900
++++ WPrefs.app/Makefile.in	2014-09-05 04:30:48.000000000 +0900
+@@ -395,13 +395,14 @@
+ #	Themes.c
  AM_CFLAGS = 
  AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
 -	 -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
++	 -DPREFIX=\"$(prefix)\" \
 +	 -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
  
  WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl b/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl
index 61b9d0a644a8..77d75a219f68 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl
@@ -1,11 +1,11 @@
---- WindowMaker/menu.nl.orig	2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.nl	2013-05-03 03:12:17.000000000 +0900
-@@ -54,7 +54,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape
-   		"Ghostview" EXEC ghostview
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread
-   		"TkDesk" EXEC tkdesk
- 	"Applicaties" END
- 	"Editors" MENU
+--- WindowMaker/menu.nl.orig	2014-08-30 21:29:09.000000000 +0900
++++ WindowMaker/menu.nl	2014-09-05 04:03:19.000000000 +0900
+@@ -208,7 +208,7 @@
+ 		"Achtergrond" END
+ 		"Thema opslaan" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Themanaam,Voer bestandsnaam in:)"
+ 		"Iconenset opslaan" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam in:)"
+-		"Voorkeurenhulpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
++		"Voorkeurenhulpmiddel" EXEC PREFIX/GNUstep/Applications/WPrefs.app/WPrefs
+ 	"Uiterlijk" END
+ 
+ 	"Sessie" MENU
diff --git a/x11-wm/windowmaker/files/patch-configure b/x11-wm/windowmaker/files/patch-configure
new file mode 100644
index 000000000000..0c664965f351
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2014-09-05 04:28:09.000000000 +0900
++++ configure	2014-09-05 04:29:09.000000000 +0900
+@@ -13046,7 +13046,7 @@
+   *-*-linux*|*-*-cygwin*|*-gnu*) :
+     WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(
+   *-*-freebsd*|*-k*bsd-gnu*) :
+-    WM_OSDEP="bsd"   ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -DFREEBSD" ;; #(
++    WM_OSDEP="bsd"   ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=700 -DFREEBSD" ;; #(
+   *-*-netbsd*) :
+     WM_OSDEP="bsd"   ; CPPFLAGS="$CPPFLAGS -DNETBSD" ;; #(
+   *-*-openbsd*) :
diff --git a/x11-wm/windowmaker/files/patch-src-osdep_bsd.c b/x11-wm/windowmaker/files/patch-src-osdep_bsd.c
deleted file mode 100644
index d1188e250ee9..000000000000
--- a/x11-wm/windowmaker/files/patch-src-osdep_bsd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osdep_bsd.c.orig	2014-03-09 06:12:39.000000000 +0900
-+++ src/osdep_bsd.c	2014-03-09 06:14:45.000000000 +0900
-@@ -85,8 +85,6 @@
- 	if (argmax == 0) { /* it hopefully doesn't change at runtime *g* */
- 		mib[0] = CTL_KERN;
- 		mib[1] = KERN_ARGMAX;
--		mib[2] = 0;
--		mib[4] = 0;
- 
- 		count = sizeof(argmax);
- 		if (sysctl(mib, 2, &argmax, &count, NULL, 0) == -1)
diff --git a/x11-wm/windowmaker/files/patch-src__Makefile.in b/x11-wm/windowmaker/files/patch-src__Makefile.in
index 7209bc1ae45b..60602dfddf24 100644
--- a/x11-wm/windowmaker/files/patch-src__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-src__Makefile.in
@@ -1,16 +1,16 @@
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -72,8 +72,7 @@
- 	wmspec.$(OBJEXT) workspace.$(OBJEXT)
+--- src/Makefile.in.orig	2014-09-05 04:06:51.000000000 +0900
++++ src/Makefile.in	2014-09-05 04:07:46.000000000 +0900
+@@ -124,8 +124,7 @@
+ 	$(am__objects_3) $(am__objects_4)
  wmaker_OBJECTS = $(am_wmaker_OBJECTS)
  wmaker_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
 -	$(top_builddir)/WINGs/libWUtil.la \
 -	$(top_builddir)/wrlib/libwraster.la
 +	$(top_builddir)/WINGs/libWUtil.la
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
-@@ -365,13 +364,12 @@
+@@ -353,13 +352,12 @@
  AM_CFLAGS = 
  AM_CPPFLAGS = \
  	$(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\" \
diff --git a/x11-wm/windowmaker/files/patch-util__Makefile.in b/x11-wm/windowmaker/files/patch-util__Makefile.in
index 18d98467d7a1..9dfc3d6e9f16 100644
--- a/x11-wm/windowmaker/files/patch-util__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-util__Makefile.in
@@ -1,6 +1,6 @@
---- util/Makefile.in.orig
-+++ util/Makefile.in
-@@ -91,8 +91,7 @@
+--- util/Makefile.in.orig	2014-09-05 04:13:22.000000000 +0900
++++ util/Makefile.in	2014-09-05 04:14:30.000000000 +0900
+@@ -115,14 +115,13 @@
  wmagnify_SOURCES = wmagnify.c
  wmagnify_OBJECTS = wmagnify.$(OBJEXT)
  wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@@ -10,7 +10,14 @@
  am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT)
  wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS)
  wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
-@@ -104,8 +103,7 @@
+ am_wmiv_OBJECTS = wmiv.$(OBJEXT)
+ wmiv_OBJECTS = $(am_wmiv_OBJECTS)
+-wmiv_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
++wmiv_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
+@@ -133,8 +132,7 @@
  wmsetbg_SOURCES = wmsetbg.c
  wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
  wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@@ -20,16 +27,16 @@
  wxcopy_SOURCES = wxcopy.c
  wxcopy_OBJECTS = wxcopy.$(OBJEXT)
  wxcopy_DEPENDENCIES =
-@@ -369,7 +367,7 @@
+@@ -417,7 +415,7 @@
  bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
- EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl
+ EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
  AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" \
 -	 $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
 +	 $(DFLAGS) -I$(top_srcdir)/WINGs \
  	@HEADER_SEARCH_PATH@ \
  	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
  
-@@ -392,13 +390,13 @@
+@@ -440,13 +438,13 @@
  wmagnify_LDADD = \
  	$(top_builddir)/WINGs/libWINGs.la \
  	$(top_builddir)/WINGs/libWUtil.la \
@@ -45,3 +52,12 @@
  	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
  
  wmgenmenu_LDADD = \
+@@ -463,7 +461,7 @@
+ 	wmmenugen_parse_xdg.c
+ 
+ wmiv_LDADD = \
+-	$(top_builddir)/wrlib/libwraster.la \
++	-lwraster \
+ 	@XLFLAGS@ @XLIBS@ \
+ 	@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
+ 
diff --git a/x11-wm/windowmaker/files/patch-util__wmgenmenu.c b/x11-wm/windowmaker/files/patch-util__wmgenmenu.c
deleted file mode 100644
index 09cf7547a758..000000000000
--- a/x11-wm/windowmaker/files/patch-util__wmgenmenu.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- util/wmgenmenu.c.orig	2013-01-10 06:42:39.000000000 +0900
-+++ util/wmgenmenu.c	2013-05-03 03:21:14.000000000 +0900
-@@ -146,7 +146,7 @@
- 	L2Menu = WMCreatePLArray(
- 		WMCreatePLString(_("Themes")),
- 		WMCreatePLString("OPEN_MENU"),
--		WMCreatePLString("-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-+		WMCreatePLString("-noext " PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
- 		NULL
- 	);
- 	WMAddToPLArray(L1Menu, L2Menu);
-@@ -155,7 +155,7 @@
- 	L2Menu = WMCreatePLArray(
- 		WMCreatePLString(_("Styles")),
- 		WMCreatePLString("OPEN_MENU"),
--		WMCreatePLString("-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-+		WMCreatePLString("-noext " PREFIX "/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
- 		NULL
- 	);
- 	WMAddToPLArray(L1Menu, L2Menu);
-@@ -164,7 +164,7 @@
- 	L2Menu = WMCreatePLArray(
- 		WMCreatePLString(_("Icon Sets")),
- 		WMCreatePLString("OPEN_MENU"),
--		WMCreatePLString("-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-+		WMCreatePLString("-noext " PREFIX "/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
- 		NULL
- 	);
- 	WMAddToPLArray(L1Menu, L2Menu);
-@@ -321,7 +321,7 @@
- 	L1Menu = WMCreatePLArray(
- 		WMCreatePLString(_("Configure Window Maker")),
- 		WMCreatePLString("EXEC"),
--		WMCreatePLString("WPrefs"),
-+		WMCreatePLString(PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs"),
- 		NULL
- 	);
- 	WMAddToPLArray(RMenu, L1Menu);
diff --git a/x11-wm/windowmaker/files/patch-util__wmiv.c b/x11-wm/windowmaker/files/patch-util__wmiv.c
new file mode 100644
index 000000000000..e3677a937e5c
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-util__wmiv.c
@@ -0,0 +1,12 @@
+--- util/wmiv.c.orig	2014-09-05 04:35:03.000000000 +0900
++++ util/wmiv.c	2014-09-05 04:35:45.000000000 +0900
+@@ -28,7 +28,9 @@
+ #include <X11/Xlib.h>
+ #include "wraster.h"
+ #include <stdlib.h>
++#define	__BSD_VISIBLE	1
+ #include <stdio.h>
++#undef __BSD_VISIBLE
+ #include <string.h>
+ #include <dirent.h>
+ #include <limits.h>
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 828308c9ce32..39a25eb443ae 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -87,6 +87,7 @@ bin/wmagnify
 bin/wmaker
 bin/wmaker.inst
 bin/wmgenmenu
+bin/wmiv
 bin/wmmenugen
 bin/wmsetbg
 bin/wxcopy
@@ -102,17 +103,18 @@ include/WINGs/WUtil.h
 include/WMaker.h
 lib/libWINGs.a
 lib/libWINGs.so
-lib/libWINGs.so.2
-lib/libWINGs.so.2.0.1
+lib/libWINGs.so.3
+lib/libWINGs.so.3.0.0
 lib/libWMaker.a
 lib/libWMaker.so
 lib/libWMaker.so.1
 lib/libWMaker.so.1.0.1
 lib/libWUtil.a
 lib/libWUtil.so
-lib/libWUtil.so.3
-lib/libWUtil.so.3.0.0
+lib/libWUtil.so.5
+lib/libWUtil.so.5.0.0
 libdata/pkgconfig/WINGs.pc
+libdata/pkgconfig/WUtil.pc
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
@@ -121,7 +123,8 @@ share/WindowMaker/Backgrounds/BlueImage.jpeg
 share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/BitchX.tiff
 share/WindowMaker/Icons/BitchX.xpm
-share/WindowMaker/Icons/Drawer.png
+share/WindowMaker/Icons/Drawer.tiff
+share/WindowMaker/Icons/Drawer.xpm
 share/WindowMaker/Icons/Ear.png
 share/WindowMaker/Icons/Ftp.png
 share/WindowMaker/Icons/GNUstep.tiff
@@ -278,6 +281,7 @@ share/WindowMaker/plmenu.hr
 share/WindowMaker/plmenu.it
 share/WindowMaker/plmenu.ja
 share/WindowMaker/plmenu.ko
+share/WindowMaker/plmenu.nl
 share/WindowMaker/plmenu.pl
 share/WindowMaker/plmenu.ro
 share/WindowMaker/plmenu.sk
@@ -315,6 +319,7 @@ share/WindowMaker/wmmacros
 %%NLS%%share/locale/gl/LC_MESSAGES/WindowMaker.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/WPrefs.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/WINGs.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/WPrefs.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/WindowMaker.mo
 %%NLS%%share/locale/hy/LC_MESSAGES/WindowMaker.mo
@@ -325,7 +330,10 @@ share/WindowMaker/wmmacros
 %%NLS%%share/locale/ko/LC_MESSAGES/WPrefs.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/WindowMaker.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/WINGs.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/WPrefs.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/wmgenmenu.mo
 %%NLS%%share/locale/no/LC_MESSAGES/WindowMaker.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/WindowMaker.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/WPrefs.mo