x11-wm/{libwraster,windowmaker}: update Window Maker to version 0.96.0

PR:		273739
Approved by:	maintainer timeout (hrs; ~14 weeks)

19 files changed, 77 insertions, 117 deletions

diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index eb06f6558a85..7e2d57a58e03 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libwraster
-PORTVERSION=	0.95.9
-PORTREVISION=	3
+PORTVERSION=	0.96.0
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
@@ -17,7 +16,7 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp
 
-USES=		jpeg libtool localbase pathfix pkgconfig xorg
+USES=		gmake jpeg libtool localbase pathfix pkgconfig xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xft xinerama xmu xpm
 BUILD_WRKSRC=	${WRKSRC}/wrlib
diff --git a/x11-wm/libwraster/distinfo b/x11-wm/libwraster/distinfo
index 3721787debdf..1bba940edf1b 100644
--- a/x11-wm/libwraster/distinfo
+++ b/x11-wm/libwraster/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597295266
-SHA256 (WindowMaker-0.95.9.tar.gz) = f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
-SIZE (WindowMaker-0.95.9.tar.gz) = 3397167
+TIMESTAMP = 1691413426
+SHA256 (WindowMaker-0.96.0.tar.gz) = 4fe130ba23cf4aa21c156ec8f01f748df537d0604ec06c6bbcec896df1926f6d
+SIZE (WindowMaker-0.96.0.tar.gz) = 3443048
diff --git a/x11-wm/libwraster/files/patch-configure b/x11-wm/libwraster/files/patch-configure
deleted file mode 100644
index 21de9e03d0bf..000000000000
--- a/x11-wm/libwraster/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2020-04-05 13:42:01 UTC
-+++ configure
-@@ -14305,7 +14305,7 @@ case "$host" in #(
-   *-*-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/libwraster/files/patch-wrlib__wraster.h b/x11-wm/libwraster/files/patch-wrlib_wraster.h.in
index 164b7430dcd9..802c22548eea 100644
--- a/x11-wm/libwraster/files/patch-wrlib__wraster.h
+++ b/x11-wm/libwraster/files/patch-wrlib_wraster.h.in
@@ -1,6 +1,6 @@
---- wrlib/wraster.h.orig	2015-08-11 18:41:14 UTC
-+++ wrlib/wraster.h
-@@ -61,10 +61,14 @@
+--- wrlib/wraster.h.in.orig	2023-03-02 14:20:26 UTC
++++ wrlib/wraster.h.in
+@@ -58,10 +58,14 @@
   * mechanism and define an internal macro appropriately. Please note that the macro are not considered being
   * part of the public API.
   */
diff --git a/x11-wm/libwraster/pkg-plist b/x11-wm/libwraster/pkg-plist
index 91881c7065c9..151f303228bc 100644
--- a/x11-wm/libwraster/pkg-plist
+++ b/x11-wm/libwraster/pkg-plist
@@ -2,5 +2,5 @@ include/wraster.h
 lib/libwraster.a
 lib/libwraster.so
 lib/libwraster.so.6
-lib/libwraster.so.6.0.0
+lib/libwraster.so.6.1.0
 libdata/pkgconfig/wrlib.pc
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 3051c8b1f82e..629cc5a866de 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	windowmaker
-PORTVERSION=	0.95.9
-PORTREVISION=	3
+PORTVERSION=	0.96.0
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
@@ -22,7 +21,8 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libexif.so:graphics/libexif
 RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:graphics/wmicons
 
-USES=		cpe gnome jpeg libtool shebangfix pathfix perl5 pkgconfig xorg
+USES=		cpe gmake gnome jpeg libtool pathfix perl5 pkgconfig \
+		shebangfix xorg
 USE_CSTD=	c99
 USE_GNOME=	pango
 USE_LDCONFIG=	yes
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index 2e733f723cf1..1bba940edf1b 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597295523
-SHA256 (WindowMaker-0.95.9.tar.gz) = f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
-SIZE (WindowMaker-0.95.9.tar.gz) = 3397167
+TIMESTAMP = 1691413426
+SHA256 (WindowMaker-0.96.0.tar.gz) = 4fe130ba23cf4aa21c156ec8f01f748df537d0604ec06c6bbcec896df1926f6d
+SIZE (WindowMaker-0.96.0.tar.gz) = 3443048
diff --git a/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in b/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
index 248a18b90c87..cf7c2ac1e92c 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
@@ -7,7 +7,7 @@
 -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@ @XLIBS@
+ 	@XFT_LIBS@ @INTLIBS@ @XLIBS@
  
  colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
  fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
diff --git a/x11-wm/windowmaker/files/patch-WINGs__Makefile.in b/x11-wm/windowmaker/files/patch-WINGs__Makefile.in
index 5f7b92069e66..5ed29dbfce23 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Makefile.in
@@ -15,19 +15,18 @@
  libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
  lib_LTLIBRARIES = libWUtil.la libWINGs.la
 -LDADD = libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
--libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
+-libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
 +LDADD = libWUtil.la libWINGs.la -lwraster @INTLIBS@
-+libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
++libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
  libWUtil_la_LIBADD = @LIBBSD@
  EXTRA_DIST = BUGS make-rgb Examples Extras Tests
  
-@@ -553,7 +552,8 @@ libWUtil_la_SOURCES = \
- 
+@@ -553,7 +552,7 @@ libWUtil_la_SOURCES = \
  AM_CFLAGS = 
  AM_CPPFLAGS = -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@
+ 	 -I$(top_srcdir)/WINGs/WINGs -I$(top_builddir)/WINGs/WINGs \
+-	 -I$(top_builddir)/wrlib -I$(top_srcdir)/src \
++	 -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/src \
+ 	@XFT_CFLAGS@ @HEADER_SEARCH_PATH@
  
  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 c9551b184714..4f0238c770fa 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
@@ -29,13 +29,13 @@
 -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@ @XLIBS@ 
+ 	@XFT_LIBS@ @INTLIBS@ @XLIBS@
  
- testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
+ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
  wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
  EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
 -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\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
+ 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFT_CFLAGS@ @HEADER_SEARCH_PATH@ \
+ 	@PANGO_CFLAGS@
  
- all: all-am
diff --git a/x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h b/x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h
deleted file mode 100644
index e224a445920a..000000000000
--- a/x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- WINGs/WINGs/WINGsP.h.orig	2019-02-15 23:34:25 UTC
-+++ WINGs/WINGs/WINGsP.h
-@@ -17,7 +17,13 @@
- 
- #include <assert.h>
- 
-+#ifdef _XLOCALE_H_	/* workaround for libX11<1.4 */
-+#undef _XLOCALE_H_
- #include <stdlib.h>
-+#define _XLOCALE_H_
-+#else
-+#include <stdlib.h>
-+#endif
- #include <string.h>
- #include <strings.h>
- #include <stdio.h>
diff --git a/x11-wm/windowmaker/files/patch-WINGs__wapplication.c b/x11-wm/windowmaker/files/patch-WINGs__wapplication.c
deleted file mode 100644
index 6770c6427f5a..000000000000
--- a/x11-wm/windowmaker/files/patch-WINGs__wapplication.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- WINGs/wapplication.c.orig	2015-08-11 18:41:14 UTC
-+++ WINGs/wapplication.c
-@@ -187,7 +187,7 @@ char *WMPathForResourceOfType(const char
- 	if (path)
- 		goto out;
- 
--	path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
-+	path = checkFile(PREFIX "/GNUstep", appdir, ext, resource);
- 	if (path)
- 		goto out;
- 
diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in b/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
index c3e1a4c3d3ea..305cccebab7a 100644
--- a/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
@@ -1,12 +1,12 @@
 --- WPrefs.app/Makefile.in.orig	2020-08-13 06:26:57 UTC
 +++ WPrefs.app/Makefile.in
-@@ -481,13 +481,14 @@ WPrefs_SOURCES = \
+@@ -481,13 +481,13 @@ WPrefs_SOURCES = \
  #	Themes.c
  AM_CFLAGS = 
  AM_CPPFLAGS = -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@ 
+-	 -I$(top_builddir)/wrlib -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \
++	 -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \
+ 	 @HEADER_SEARCH_PATH@
  
  WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
  WPrefs_LDADD = \
diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c b/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
index 234ef6c603eb..b8ec0a108b0a 100644
--- a/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
+++ b/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
@@ -1,25 +1,30 @@
---- WPrefs.app/Menu.c.orig	2020-04-05 13:41:15 UTC
+--- WPrefs.app/Menu.c.orig	2023-03-13 14:40:46 UTC
 +++ WPrefs.app/Menu.c
-@@ -518,19 +518,19 @@ static void createPanel(_Panel * p)
+@@ -520,8 +520,7 @@ static void createPanel(_Panel * p)
  		data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
  		data->param.directory.command = "setstyle";
  		data->param.directory.directory =
--		    "/usr/share/WindowMaker/Themes /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
-+		    "/usr/share/WindowMaker/Themes " PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
+-		    "/usr/share/" PACKAGE_TARNAME "/Themes"
+-		    " /usr/local/share/" PACKAGE_TARNAME "/Themes"
++		    PREFIX "/share/" PACKAGE_TARNAME "/Themes"
+ 		    " $HOME/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/" PACKAGE_TARNAME "/Themes";
  		data->param.directory.stripExt = 1;
  
- 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
+@@ -529,7 +528,7 @@ static void createPanel(_Panel * p)
  		data->param.directory.command = "wmsetbg -u -s";
  		data->param.directory.directory =
--		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
-+		    "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+ 		    "/opt/kde2/share/wallpapers"
+-		    " /usr/share/" PACKAGE_TARNAME "/Backgrounds"
++		    " " PREFIX "/share/" PACKAGE_TARNAME "/Backgrounds"
+ 		    " $HOME/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/" PACKAGE_TARNAME "/Backgrounds";
  		data->param.directory.stripExt = 1;
  
- 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (tile)"));
+@@ -537,7 +536,7 @@ static void createPanel(_Panel * p)
  		data->param.directory.command = "wmsetbg -u -t";
  		data->param.directory.directory =
--		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
-+		    "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+ 		    "/opt/kde2/share/wallpapers"
+-		    " /usr/share/" PACKAGE_TARNAME "/Backgrounds"
++		    " " PREFIX "/share/" PACKAGE_TARNAME "/Backgrounds"
+ 		    " $HOME/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/" PACKAGE_TARNAME "/Backgrounds";
  		data->param.directory.stripExt = 1;
  
- 		smenu = putNewSubmenu(pad, _("Assorted XTerms"));
diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c b/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
index c4f3976ad4f1..70f4a5acd2e3 100644
--- a/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
+++ b/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
@@ -1,24 +1,25 @@
---- WPrefs.app/Paths.c.orig	2015-08-11 18:41:14 UTC
+--- WPrefs.app/Paths.c.orig	2023-01-06 21:34:50 UTC
 +++ WPrefs.app/Paths.c
-@@ -78,9 +78,9 @@ static void showData(_Panel * panel)
+@@ -78,10 +78,9 @@ static void showData(_Panel * panel)
  			wwarning(_("bad value in option IconPath. Using default path list"));
  		addPathToList(panel->icoL, -1, "~/pixmaps");
- 		addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
+ 		addPathToList(panel->icoL, -1, "~/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/Icons");
 -		addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
--		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
--		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
+-		addPathToList(panel->icoL, -1, "/usr/local/share/" PACKAGE_TARNAME "/Icons");
+-		addPathToList(panel->icoL, -1, "/usr/local/share/" PACKAGE_TARNAME "/Pixmaps");
+-		addPathToList(panel->icoL, -1, "/usr/share/" PACKAGE_TARNAME "/Icons");
 +		addPathToList(panel->icoL, -1, PREFIX "/share/pixmaps");
-+		addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Icons");
-+		addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Pixmaps");
- 		addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
++		addPathToList(panel->icoL, -1, PREFIX "/share/" PACKAGE_TARNAME "/Icons");
++		addPathToList(panel->icoL, -1, PREFIX "/share/" PACKAGE_TARNAME "/Pixmaps");
  	} else {
  		for (i = 0; i < WMGetPropListItemCount(array); i++) {
-@@ -95,7 +95,7 @@ static void showData(_Panel * panel)
+ 			val = WMGetFromPLArray(array, i);
+@@ -95,7 +94,7 @@ static void showData(_Panel * panel)
  			wwarning(_("bad value in option PixmapPath. Using default path list"));
  		addPathToList(panel->pixL, -1, "~/pixmaps");
- 		addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
--		addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
-+		addPathToList(panel->pixL, -1, PREFIX "/share/WindowMaker/Pixmaps");
+ 		addPathToList(panel->pixL, -1, "~/" GSUSER_SUBDIR "/" USERDATA_SUBDIR "/" PACKAGE_TARNAME "/Pixmaps");
+-		addPathToList(panel->pixL, -1, "/usr/local/share/" PACKAGE_TARNAME "/Pixmaps");
++		addPathToList(panel->pixL, -1, PREFIX "/share/" PACKAGE_TARNAME "/Pixmaps");
  	} else {
  		for (i = 0; i < WMGetPropListItemCount(array); i++) {
  			val = WMGetFromPLArray(array, i);
diff --git a/x11-wm/windowmaker/files/patch-configure b/x11-wm/windowmaker/files/patch-configure
deleted file mode 100644
index 21de9e03d0bf..000000000000
--- a/x11-wm/windowmaker/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2020-04-05 13:42:01 UTC
-+++ configure
-@@ -14305,7 +14305,7 @@ case "$host" in #(
-   *-*-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__Makefile.in b/x11-wm/windowmaker/files/patch-src__Makefile.in
index bcb2929c750a..6cb443173c47 100644
--- a/x11-wm/windowmaker/files/patch-src__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-src__Makefile.in
@@ -10,12 +10,13 @@
  AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
-@@ -467,13 +466,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h actions.c act
+@@ -467,14 +466,13 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h actions.c act
  @USE_NESTED_FUNC_FALSE@CLEANFILES = $(nodist_wmaker_SOURCES)
  AM_CFLAGS = 
  AM_CPPFLAGS = $(DFLAGS) \
--	-I$(top_srcdir)/wrlib \
- 	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+-	-I$(top_builddir)/wrlib \
+ 	-I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \
+ 	@HEADER_SEARCH_PATH@
  
  wmaker_LDADD = \
  	$(top_builddir)/WINGs/libWINGs.la\
diff --git a/x11-wm/windowmaker/files/patch-util__Makefile.in b/x11-wm/windowmaker/files/patch-util__Makefile.in
index 1a763ff886f2..363bf45ec0c0 100644
--- a/x11-wm/windowmaker/files/patch-util__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-util__Makefile.in
@@ -10,13 +10,13 @@
  am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT)
  wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS)
  wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
- am_wmiv_OBJECTS = wmiv.$(OBJEXT)
+ am_wmiv_OBJECTS = wmiv-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) \
+ 	$(top_builddir)/WINGs/libWINGs.la
+ wmiv_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(wmiv_CFLAGS) $(CFLAGS) \
 @@ -172,8 +171,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)/WINGs/libWUti
  wmsetbg_SOURCES = wmsetbg.c
  wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
@@ -31,7 +31,7 @@
  bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
  EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
  AM_CPPFLAGS = \
--	 $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
+-	 $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_builddir)/wrlib \
 +	 $(DFLAGS) -I$(top_srcdir)/WINGs \
  	@HEADER_SEARCH_PATH@ \
  	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
@@ -58,6 +58,6 @@
  wmiv_LDADD = \
 -	$(top_builddir)/wrlib/libwraster.la \
 +	-lwraster \
- 	@XLFLAGS@ @XLIBS@ \
- 	@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
- 
+ 	$(top_builddir)/WINGs/libWINGs.la \
+ 	@XLFLAGS@ @XLIBS@ @GFXLIBS@ \
+ 	@PANGO_LIBS@ @PTHREAD_LIBS@ @LIBEXIF@
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 565e62437099..3fc01f976e47 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -14,6 +14,7 @@ GNUstep/Applications/WPrefs.app/tiff/drawer.tiff
 GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff
 GNUstep/Applications/WPrefs.app/tiff/expert.tiff
 GNUstep/Applications/WPrefs.app/tiff/fonts.tiff
+GNUstep/Applications/WPrefs.app/tiff/hotcorners.tiff
 GNUstep/Applications/WPrefs.app/tiff/iconprefs.tiff
 GNUstep/Applications/WPrefs.app/tiff/keyboard.tiff
 GNUstep/Applications/WPrefs.app/tiff/keyboardprefs.tiff
@@ -103,7 +104,7 @@ include/WMaker.h
 lib/libWINGs.a
 lib/libWINGs.so
 lib/libWINGs.so.3
-lib/libWINGs.so.3.1.0
+lib/libWINGs.so.3.2.0
 lib/libWMaker.a
 lib/libWMaker.so
 lib/libWMaker.so.1
@@ -357,6 +358,7 @@ share/WindowMaker/wmmacros
 %%NLS%%share/locale/sk/LC_MESSAGES/WPrefs.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/WindowMaker.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/WPrefs.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/WindowMaker.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/WPrefs.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/WindowMaker.mo
@@ -407,5 +409,7 @@ man/man1/wxpaste.1.gz
 %%NLS%%man/sk/man1/wmsetbg.1.gz
 %%NLS%%man/sk/man1/wxcopy.1.gz
 %%NLS%%man/sk/man1/wxpaste.1.gz
+share/applications/WPrefs.desktop
+share/xsessions/wmaker.desktop
 @dir GNUstep/Applications/WPrefs.app/xpm
 @dir share/WindowMaker/Sounds