From e4b782585673e1ff61fc18dc73e92fc3af8d074a Mon Sep 17 00:00:00 2001
From: Charlie Root <root@sting.dragonflybsd.org>
Date: Mon, 10 May 2021 16:07:50 -0700
Subject: [PATCH] Update x11-wm/icewm to version 2.3.1

---
 x11-wm/icewm/Makefile                    |  5 ++---
 x11-wm/icewm/distinfo                    |  5 ++---
 x11-wm/icewm/files/bsd-daemon.xpm        |  2 +-
 x11-wm/icewm/files/patch-src_Makefile.in | 20 +++++++++++++++++++-
 x11-wm/icewm/pkg-descr                   |  8 +++++---
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 9c0a01fa4b4..f4da3995076 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -1,13 +1,12 @@
 # Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
-# $FreeBSD$
 
 PORTNAME=	icewm
-PORTVERSION=	2.1.2
+PORTVERSION=	2.3.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/
 
 MAINTAINER=	portmaster@bsdforge.com
-COMMENT=	Window Manager designed for speed, usability and consistency
+COMMENT=	Window manager designed for speed and usability
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index d698eb49d72..d5dac5ec76a 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,3 +1,2 @@
-TIMESTAMP = 1612894283
-SHA256 (icewm-2.1.2.tar.lz) = ad1e621a48655692425c4a51e813194458938fe7d878d030b21d9fe29c0f925b
-SIZE (icewm-2.1.2.tar.lz) = 1694969
+SHA256 (icewm-2.3.1.tar.lz) = e0946b6169c9ba89bea07643b2ab9bb54ffb0ffaf4bd95961ea2507ed16caed8
+SIZE (icewm-2.3.1.tar.lz) = 1697840
diff --git a/x11-wm/icewm/files/bsd-daemon.xpm b/x11-wm/icewm/files/bsd-daemon.xpm
index abe28e3bb14..64765bdbb9c 100644
--- a/x11-wm/icewm/files/bsd-daemon.xpm
+++ b/x11-wm/icewm/files/bsd-daemon.xpm
@@ -1,4 +1,4 @@
-/* XPM */
+/* XPM, courtesy of Steve Farrell */
 static char * bsd_daemon_xpm[] = {
 "48 20 146 2",
 "  	c #D75CD75CD75C",
diff --git a/x11-wm/icewm/files/patch-src_Makefile.in b/x11-wm/icewm/files/patch-src_Makefile.in
index 32bcd5377fd..0ee219da128 100644
--- a/x11-wm/icewm/files/patch-src_Makefile.in
+++ b/x11-wm/icewm/files/patch-src_Makefile.in
@@ -9,7 +9,16 @@
  icesh_SOURCES = \
  	intl.h \
  	debug.h \
-@@ -960,7 +960,7 @@ icewmbg_SOURCES = \
+@@ -960,7 +960,7 @@ icewmhint_SOURCES = \
+ 	base.h \
+ 	icewmhint.cc
+ 
+-icewmhint_LDADD = libice.la $(CORE_LIBS) @LIBINTL@
++icewmhint_LDADD = libice.la $(CORE_LIBS) @LIBINTL@ @LIBICONV@
+ icewmbg_SOURCES = \
+ 	intl.h \
+ 	debug.h \
+@@ -962,7 +962,7 @@ icewmbg_SOURCES = \
  	icewmbg.cc \
  	icewmbg_prefs.h
  
@@ -18,6 +27,15 @@
  icesound_SOURCES = \
  	base.h \
  	debug.h \
+@@ -974,7 +974,7 @@ icesound_SOURCES = \
+ 	ytimer.h \
+ 	icesound.cc
+ 
+-icesound_LDADD = libice.la $(AUDIO_LIBS) $(CORE_LIBS) @LIBINTL@
++icesound_LDADD = libice.la $(AUDIO_LIBS) $(CORE_LIBS) @LIBINTL@ @LIBICONV@
+ icewm_menu_fdo_SOURCES = \
+ 	appnames.h \
+ 	base.h \
 @@ -1002,7 +1002,7 @@ icehelp_SOURCES = \
  	yrect.h \
  	icehelp.cc
diff --git a/x11-wm/icewm/pkg-descr b/x11-wm/icewm/pkg-descr
index 5151b2cff12..e92ecec742c 100644
--- a/x11-wm/icewm/pkg-descr
+++ b/x11-wm/icewm/pkg-descr
@@ -1,5 +1,7 @@
-Window Manager designed for speed, usability and consistency.
-
-'bsd-daemon.xpm' is from Steve Farrell.
+IceWM is a window manager for the X Window System.  The goal of IceWM
+is speed, simplicity, and not getting in the user's way.  It comes with
+a taskbar with pager, global and per-window keybindings, a dynamic menu
+system, a simple session manager, and a system tray.  It is standards
+compliant, very configurable, themeable, and well documented.
 
 WWW: https://ice-wm.org/
-- 
2.41.0