--- x11-wm/windowmaker/Makefile	2019-11-07 19:36:55.000000000 +0100
+++ x11-wm/windowmaker/Makefile	2020-04-08 12:52:29.457803000 +0200
@@ -2,8 +2,7 @@
 # $FreeBSD: head/x11-wm/windowmaker/Makefile 517000 2019-11-07 18:36:55Z zeising $
 
 PORTNAME=	windowmaker
-PORTVERSION=	0.95.8
-PORTREVISION=	2
+PORTVERSION=	0.95.9
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
@@ -18,7 +17,7 @@
 		libjbig.so:graphics/jbigkit \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
-		libMagickWand-6.so:graphics/ImageMagick6 \
+		libMagickWand-7.so:graphics/ImageMagick7 \
 		libwraster.so.6:x11-wm/libwraster \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \

--- x11-wm/windowmaker/distinfo	2018-02-28 05:58:15.000000000 +0100
+++ x11-wm/windowmaker/distinfo	2020-04-08 12:04:56.621726000 +0200
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519793700
-SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
-SIZE (WindowMaker-0.95.8.tar.gz) = 3253515
+TIMESTAMP = 1586340296
+SHA256 (WindowMaker-0.95.9.tar.gz) = f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
+SIZE (WindowMaker-0.95.9.tar.gz) = 3397167

--- x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in	2015-10-06 07:12:56.000000000 +0200
+++ x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in	2020-04-09 17:22:28.232480000 +0200
@@ -1,11 +1,11 @@
---- WindowMaker/Defaults/Makefile.in.orig	2015-10-06 04:12:10 UTC
-+++ WindowMaker/Defaults/Makefile.in
-@@ -542,7 +542,9 @@ WMWindowAttributes: $(srcdir)/WMWindowAt
- 	chmod 644 WMWindowAttributes
+--- WindowMaker/Defaults/Makefile.in.orig	2020-04-09 16:31:45.097263000 +0200
++++ WindowMaker/Defaults/Makefile.in		2020-04-09 17:04:35.279521000 +0200
+@@ -562,7 +562,9 @@
  
  WindowMaker: $(srcdir)/WindowMaker.in
--	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
-+	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
+ 	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
+-		-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
++		-e "s:#pixmapdir#:$(pixmapdir):" \
 +		-e "s:#prefix#:$(prefix):" \
 +		$(srcdir)/WindowMaker.in \
  		> WindowMaker ; \

--- x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in	2015-10-06 07:12:56.000000000 +0200
+++ x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
---- WindowMaker/Defaults/WindowMaker.in.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/Defaults/WindowMaker.in
-@@ -13,12 +13,10 @@
-     "~/GNUstep/Library/Icons",
-     "#pkgdatadir#/Icons",
-     "#pkgdatadir#/Pixmaps",
--    "/usr/include/X11/pixmaps",
-     "~/GNUstep/Library/WindowMaker/Pixmaps",
-     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
--    "/usr/share/icons",
--    "/usr/local/share/pixmaps",
--    "/usr/share/pixmaps"
-+    "#prefix#/share/icons",
-+    "#prefix#/share/pixmaps"
-   );
-   PixmapPath = (
-     "~/GNUstep/Library/WindowMaker/Pixmaps",
-@@ -26,9 +24,7 @@
-     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
-     "#pkgdatadir#/Pixmaps",
-     "#pkgdatadir#/Backgrounds",
--    "/usr/include/X11/pixmaps",
--    "/usr/local/share/pixmaps",
--    "/usr/share/pixmaps"
-+    "#prefix#/share/pixmaps"
-   );
-   WindowTitleBalloons = YES;
-   IconSize = 64;

--- x11-wm/windowmaker/files/patch-doc__Makefile.in	2015-10-06 07:12:56.000000000 +0200
+++ x11-wm/windowmaker/files/patch-doc__Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- doc/Makefile.in.orig	2015-10-06 04:12:09 UTC
-+++ doc/Makefile.in
-@@ -382,7 +382,6 @@ dist_man_MANS = \
- 	geticonset.1 \
- 	getstyle.1 \
- 	get-wings-flags.1 \
--	get-wraster-flags.1 \
- 	get-wutil-flags.1 \
- 	seticons.1 \
- 	setstyle.1 \

--- x11-wm/windowmaker/pkg-plist	2017-10-08 11:00:49.000000000 +0200
+++ x11-wm/windowmaker/pkg-plist	2020-04-09 17:51:09.929530000 +0200
@@ -74,8 +74,6 @@
 GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff
 GNUstep/Applications/WPrefs.app/tiff/xis.tiff
 bin/convertfonts
-bin/get-wings-flags
-bin/get-wutil-flags
 bin/geticonset
 bin/getstyle
 bin/seticons
@@ -199,6 +197,7 @@
 share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/README
 share/WindowMaker/README.themes
+share/WindowMaker/Styles/Adwaita.style
 share/WindowMaker/Styles/Autumn.style
 share/WindowMaker/Styles/Black.style
 share/WindowMaker/Styles/BlackTexture.style
@@ -240,8 +239,12 @@
 share/WindowMaker/Themes/Pastel.style
 share/WindowMaker/Themes/SteelBlueSilk.style
 share/WindowMaker/appearance.menu
+share/WindowMaker/appearance.menu.fy
+share/WindowMaker/appearance.menu.nl
 share/WindowMaker/autostart.sh
 share/WindowMaker/background.menu
+share/WindowMaker/background.menu.fy
+share/WindowMaker/background.menu.nl
 share/WindowMaker/exitscript.sh
 share/WindowMaker/menu
 share/WindowMaker/menu.bg
@@ -372,8 +375,6 @@
 %%NLS%%man/cs/man1/wxpaste.1.gz
 man/man1/WPrefs.1.gz
 man/man1/WindowMaker.1.gz
-man/man1/get-wings-flags.1.gz
-man/man1/get-wutil-flags.1.gz
 man/man1/geticonset.1.gz
 man/man1/getstyle.1.gz
 man/man1/seticons.1.gz
@@ -388,7 +389,6 @@
 man/man1/wmsetbg.1.gz
 man/man1/wxcopy.1.gz
 man/man1/wxpaste.1.gz
-man/man8/upgrade-windowmaker-defaults.8.gz
 %%NLS%%man/ru/man1/geticonset.1.gz
 %%NLS%%man/ru/man1/getstyle.1.gz
 %%NLS%%man/ru/man1/seticons.1.gz