- Update IceWM to version 1.8.0

- Adapt to strtok_r() behavior on FreeBSD (see
  https://github.com/ice-wm/icewm/issues/23)

Found out via:	www.opennet.ru

4 files changed, 36 insertions, 28 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index cf025f905a67..4d9cc80f2846 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -2,13 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	icewm
-PORTVERSION=	1.6.6
+PORTVERSION=	1.8.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/
 
-PATCH_SITES=	https://github.com/bbidulock/icewm/commit/
-PATCHFILES=	32c295c85d22.diff:-p1 f60340768c55.diff:-p1
-
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Window Manager designed for speed, usability and consistency
 
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 398d10a48841..7a8dc85bf020 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1590778501
-SHA256 (icewm-1.6.6.tar.lz) = 77f512e0bcdc9c6ec8e1a10c822b8238548265babc70dfe4eb76b4520d60c01c
-SIZE (icewm-1.6.6.tar.lz) = 1684639
-SHA256 (32c295c85d22.diff) = d6801471b14780b34399a7e9ebb75744a4eb3153f97856c1109a81a76d4706c6
-SIZE (32c295c85d22.diff) = 304
-SHA256 (f60340768c55.diff) = 94178b00d71e9a8e8959247616f8758a9c89f3dc976c9f74022307376854a14a
-SIZE (f60340768c55.diff) = 298
+TIMESTAMP = 1598315124
+SHA256 (icewm-1.8.0.tar.lz) = a71ab11c30f3e5997fdee209f1bc528141e9f6f343c6a37031339491e2db2a87
+SIZE (icewm-1.8.0.tar.lz) = 1679913
diff --git a/x11-wm/icewm/files/patch-src_misc.cc b/x11-wm/icewm/files/patch-src_misc.cc
new file mode 100644
index 000000000000..0c068ae1708a
--- /dev/null
+++ b/x11-wm/icewm/files/patch-src_misc.cc
@@ -0,0 +1,12 @@
+--- src/misc.cc.orig	2020-08-24 22:02:15 UTC
++++ src/misc.cc
+@@ -972,7 +972,8 @@ char* path_lookup(const char* name) {
+     if (env == nullptr)
+         return nullptr;
+ 
+-    while ((directory = strtok_r(save ? nullptr : env, ":", &save)) != nullptr) {
++    for (directory = strtok_r(env, ":", &save); directory != nullptr;
++      directory = strtok_r(nullptr, ":", &save)) {
+         size_t length = strlen(directory) + strlen(name) + 3;
+         filebuf = new char[length];
+         if (filebuf == nullptr)
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index b13a7a209d8e..a7322ab0c316 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -183,6 +183,8 @@ man/man5/icewm-winoptions.5.gz
 %%DATADIR%%/taskbar/start.xpm
 %%DATADIR%%/taskbar/windows.xpm
 %%DATADIR%%/taskbar/xfreeos2.xpm
+%%DATADIR%%/themes/CrystalBlue/buttonA.xpm
+%%DATADIR%%/themes/CrystalBlue/buttonI.xpm
 %%DATADIR%%/themes/CrystalBlue/close.xpm
 %%DATADIR%%/themes/CrystalBlue/closeA.xpm
 %%DATADIR%%/themes/CrystalBlue/closeO.xpm
@@ -265,6 +267,8 @@ man/man5/icewm-winoptions.5.gz
 %%DATADIR%%/themes/CrystalBlue/taskbar/taskbuttonminimized.xpm
 %%DATADIR%%/themes/CrystalBlue/taskbar/toolbuttonbg.xpm
 %%DATADIR%%/themes/CrystalBlue/taskbar/windows.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/workspacebuttonactive.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/workspacebuttonbg.xpm
 %%DATADIR%%/themes/CrystalBlue/titleAB.xpm
 %%DATADIR%%/themes/CrystalBlue/titleAJ.xpm
 %%DATADIR%%/themes/CrystalBlue/titleAM.xpm
@@ -382,8 +386,6 @@ man/man5/icewm-winoptions.5.gz
 %%DATADIR%%/themes/NanoBlue/dframeIT.xpm
 %%DATADIR%%/themes/NanoBlue/dframeITL.xpm
 %%DATADIR%%/themes/NanoBlue/dframeITR.xpm
-%%DATADIR%%/themes/NanoBlue/drameAB.xpm
-%%DATADIR%%/themes/NanoBlue/drameATR.xpm
 %%DATADIR%%/themes/NanoBlue/eos.jpg
 %%DATADIR%%/themes/NanoBlue/expandA.xpm
 %%DATADIR%%/themes/NanoBlue/expandI.xpm
@@ -404,21 +406,22 @@ man/man5/icewm-winoptions.5.gz
 %%DATADIR%%/themes/NanoBlue/frameIT.xpm
 %%DATADIR%%/themes/NanoBlue/frameITL.xpm
 %%DATADIR%%/themes/NanoBlue/frameITR.xpm
-%%DATADIR%%/themes/NanoBlue/icons/IceWM_16x16.png
-%%DATADIR%%/themes/NanoBlue/icons/IceWM_32x32.png
-%%DATADIR%%/themes/NanoBlue/icons/app_16x16.png
-%%DATADIR%%/themes/NanoBlue/icons/firefox_16x16.png
-%%DATADIR%%/themes/NanoBlue/icons/firefox_32x32.png
-%%DATADIR%%/themes/NanoBlue/icons/folder_16x16.png
-%%DATADIR%%/themes/NanoBlue/icons/folder_32x32.png
-%%DATADIR%%/themes/NanoBlue/icons/gimp_16x16.png
-%%DATADIR%%/themes/NanoBlue/icons/gimp_32x32.png
-%%DATADIR%%/themes/NanoBlue/icons/mplayer_16x16.png
-%%DATADIR%%/themes/NanoBlue/icons/mplayer_32x32.png
-%%DATADIR%%/themes/NanoBlue/icons/thunderbird_16x16.png
-%%DATADIR%%/themes/NanoBlue/icons/thunderbird_32x32.png
-%%DATADIR%%/themes/NanoBlue/icons/xterm_16x16.png
-%%DATADIR%%/themes/NanoBlue/icons/xterm_32x32.png
+%%DATADIR%%/themes/NanoBlue/icons/IceWM_16x16.xpm
+%%DATADIR%%/themes/NanoBlue/icons/IceWM_32x32.xpm
+%%DATADIR%%/themes/NanoBlue/icons/app_16x16.xpm
+%%DATADIR%%/themes/NanoBlue/icons/app_32x32.xpm
+%%DATADIR%%/themes/NanoBlue/icons/firefox_16x16.xpm
+%%DATADIR%%/themes/NanoBlue/icons/firefox_32x32.xpm
+%%DATADIR%%/themes/NanoBlue/icons/folder_16x16.xpm
+%%DATADIR%%/themes/NanoBlue/icons/folder_32x32.xpm
+%%DATADIR%%/themes/NanoBlue/icons/gimp_16x16.xpm
+%%DATADIR%%/themes/NanoBlue/icons/gimp_32x32.xpm
+%%DATADIR%%/themes/NanoBlue/icons/mplayer_16x16.xpm
+%%DATADIR%%/themes/NanoBlue/icons/mplayer_32x32.xpm
+%%DATADIR%%/themes/NanoBlue/icons/thunderbird_16x16.xpm
+%%DATADIR%%/themes/NanoBlue/icons/thunderbird_32x32.xpm
+%%DATADIR%%/themes/NanoBlue/icons/xterm_16x16.xpm
+%%DATADIR%%/themes/NanoBlue/icons/xterm_32x32.xpm
 %%DATADIR%%/themes/NanoBlue/ledclock/a.xpm
 %%DATADIR%%/themes/NanoBlue/ledclock/colon.xpm
 %%DATADIR%%/themes/NanoBlue/ledclock/dot.xpm