git: 8021dd27ef3d - main - x11-wm/icewm: update IceWM to version 3.2.2

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8021dd27ef3daab40dd8891360b01e35bcc45cc8

commit 8021dd27ef3daab40dd8891360b01e35bcc45cc8
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-11-15 11:22:18 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-11-15 11:22:18 +0000

    x11-wm/icewm: update IceWM to version 3.2.2
    
    Remove situational patches added in commit cbcb71ff6481,
    the problem had been addressed differently upstream.
---
 x11-wm/icewm/Makefile                              |  2 +-
 x11-wm/icewm/distinfo                              |  6 +++---
 x11-wm/icewm/files/patch-lib_Makefile.in           | 15 ++++++++++++---
 x11-wm/icewm/files/patch-lib_icewm-session.desktop | 13 -------------
 x11-wm/icewm/files/patch-lib_icewm.desktop         | 13 -------------
 5 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 11b4ad5b9154..53175323515d 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	icewm
-PORTVERSION=	3.2.1
+PORTVERSION=	3.2.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/
 
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index fef62e60a044..a9a70a556650 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667925997
-SHA256 (icewm-3.2.1.tar.lz) = e32e1c05fd5ed648993d0992c514bc1d3575f30d2a8008872b629359ea030c24
-SIZE (icewm-3.2.1.tar.lz) = 1787266
+TIMESTAMP = 1668448751
+SHA256 (icewm-3.2.2.tar.lz) = 22d308846a4ba746df6b3212a00d23415ff2a4e96e54bae985a6f7f8d42d9b19
+SIZE (icewm-3.2.2.tar.lz) = 1787950
diff --git a/x11-wm/icewm/files/patch-lib_Makefile.in b/x11-wm/icewm/files/patch-lib_Makefile.in
index a06473f857b0..2a0db630e958 100644
--- a/x11-wm/icewm/files/patch-lib_Makefile.in
+++ b/x11-wm/icewm/files/patch-lib_Makefile.in
@@ -1,6 +1,6 @@
---- lib/Makefile.in.orig	2020-07-12 18:02:27 UTC
+--- lib/Makefile.in.orig	2022-11-14 17:44:07 UTC
 +++ lib/Makefile.in
-@@ -488,11 +488,13 @@ nobase_dist_pkgdata_DATA = \
+@@ -506,11 +506,13 @@ nobase_dist_pkgdata_DATA = \
  	mailbox/newmail.xpm \
  	mailbox/nomail.xpm \
  	mailbox/unreadmail.xpm \
@@ -14,7 +14,7 @@
  	taskbar/linux1.xpm \
  	taskbar/linux20.xpm \
  	taskbar/linux2.xpm \
-@@ -562,6 +564,8 @@ nobase_dist_pkgdata_DATA = \
+@@ -580,6 +582,8 @@ nobase_dist_pkgdata_DATA = \
  	themes/Infadel2/rollupA.xpm \
  	themes/Infadel2/rollupI.xpm \
  	themes/Infadel2/snap.pcf \
@@ -23,3 +23,12 @@
  	themes/Infadel2/taskbar/linux.xpm \
  	themes/Infadel2/taskbar/start.xpm \
  	themes/Infadel2/taskbar/windows.xpm \
+@@ -1230,7 +1234,7 @@ install-data-hook:
+ 
+ 
+ install-data-hook:
+-	$(AM_V_GEN)sed -i 's|Exec=/.*/|Exec=$(bindir)/|' \
++	$(AM_V_GEN)sed -i.bak -e 's|Exec=/.*/|Exec=$(bindir)/|' \
+ 	    $(DESTDIR)$(xsessiondir)/icewm.desktop \
+ 	    $(DESTDIR)$(xsessiondir)/icewm-session.desktop
+ 
diff --git a/x11-wm/icewm/files/patch-lib_icewm-session.desktop b/x11-wm/icewm/files/patch-lib_icewm-session.desktop
deleted file mode 100644
index d3e4e8df6ee8..000000000000
--- a/x11-wm/icewm/files/patch-lib_icewm-session.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/icewm-session.desktop.orig	2022-11-07 10:45:52.521479000 -0800
-+++ lib/icewm-session.desktop	2022-11-07 10:46:39.992803000 -0800
-@@ -60,8 +60,8 @@
- Comment[zh_CN]=此会话使您登录到 IceWM
- Comment[zh_TW]=選取這個作業階段後會進入 IceWM 環境
- Icon=icewm
--TryExec=/usr/bin/icewm-session
--Exec=/usr/bin/icewm-session
-+TryExec=/usr/local/bin/icewm-session
-+Exec=/usr/local/bin/icewm-session
- NoDisplay=false
- Hidden=false
- StartupNotify=false
diff --git a/x11-wm/icewm/files/patch-lib_icewm.desktop b/x11-wm/icewm/files/patch-lib_icewm.desktop
deleted file mode 100644
index 5abe5732e026..000000000000
--- a/x11-wm/icewm/files/patch-lib_icewm.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/icewm.desktop.orig	2022-11-07 10:45:37.073745000 -0800
-+++ lib/icewm.desktop	2022-11-07 10:46:22.473136000 -0800
-@@ -18,8 +18,8 @@
- Comment[pt_BR]=Gerenciador simples e rápido de janelas
- Comment[uk]=Простий та швидкий менеджер вікон
- Icon=icewm
--TryExec=/usr/bin/icewm
--Exec=/usr/bin/icewm
-+TryExec=/usr/local/bin/icewm
-+Exec=/usr/local/bin/icewm
- NoDisplay=false
- Hidden=false
- Categories=WindowManager;Application;System;