Diff below brings icewm to 1.6.2. Changes are listed at
https://github.com/ice-wm/icewm/blob/master/NEWS.
While here sync WANTLIB.
Run tested on amd64.
Comments/OK?
diff --git Makefile Makefile
index 1ca4202a5a9..4821b34579e 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.70 2019/08/26 19:43:45 bcallah Exp $
-V= 1.6.1
+V= 1.6.2
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
@@ -12,7 +12,7 @@ HOMEPAGE= https://www.ice-wm.org/
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xcomposite Xdamage
-WANTLIB += Xext Xfixes Xft Xinerama Xrandr Xrender ao c expat
+WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender ao c expat
WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl
WANTLIB += m ogg pcre sndfile vorbis vorbisenc xcb z
diff --git distinfo distinfo
index b1944bd930b..b4deafc4663 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.6.1.tar.lz) = 5xkW9cg5II8nnH/8+G0rGRYy/wU6PO0QtjH/r7Zhmhw=
-SIZE (icewm-1.6.1.tar.lz) = 1651274
+SHA256 (icewm-1.6.2.tar.lz) = j/Ca4REHXyINv1zbE0AaLCoFHMq4yBFn0jTW5FDGqiQ=
+SIZE (icewm-1.6.2.tar.lz) = 1673647
diff --git patches/patch-lib_Makefile_in patches/patch-lib_Makefile_in
index de9f1100e1c..66ce3f7ade1 100644
--- patches/patch-lib_Makefile_in
+++ patches/patch-lib_Makefile_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.4 2019/08/26 19:43:45
bcallah Exp $
Index: lib/Makefile.in
--- lib/Makefile.in.orig
+++ lib/Makefile.in
-@@ -358,7 +358,7 @@ target_vendor = @target_vendor@
+@@ -362,7 +362,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
diff --git patches/patch-man_icewm-preferences_pod
patches/patch-man_icewm-preferences_pod
index 878eaa6d36d..5e5fa9ab2dc 100644
--- patches/patch-man_icewm-preferences_pod
+++ patches/patch-man_icewm-preferences_pod
@@ -3,7 +3,7 @@ $OpenBSD: patch-man_icewm-preferences_pod,v 1.3 2019/08/26
19:43:45 bcallah Exp
Index: man/icewm-preferences.pod
--- man/icewm-preferences.pod.orig
+++ man/icewm-preferences.pod
-@@ -985,7 +985,7 @@ B<WM_CLASS> to allow B<runonce> for B<CPUStatusCommand
+@@ -977,7 +977,7 @@ B<WM_CLASS> to allow B<runonce> for B<CPUStatusCommand
Combine all CPUs to one.
diff --git patches/patch-src_default_h patches/patch-src_default_h
index 3a807f34353..10187a6d41e 100644
--- patches/patch-src_default_h
+++ patches/patch-src_default_h
@@ -15,9 +15,9 @@ Index: src/default.h
XSV(const char *, acpiIgnoreBatteries, 0)
XSV(const char *, mailBoxPath, 0)
--XSV(const char *, mailCommand, "xterm -name mutt -e mutt")
+-XSV(const char *, mailCommand, TERM " -name mutt -e mutt")
-XSV(const char *, mailClassHint, "mutt.XTerm")
-+XSV(const char *, mailCommand, "xterm -name mail -title MAIL
-e mail")
++XSV(const char *, mailCommand, TERM " -name mail -title MAIL
-e mail")
+XSV(const char *, mailClassHint, "mail.XTerm")
XSV(const char *, newMailCommand, 0)
-XSV(const char *, lockCommand, 0)
@@ -26,11 +26,11 @@ Index: src/default.h
XSV(const char *, clockClassHint, "icewm.XClock")
XSV(const char *, runDlgCommand, 0)
@@ -206,7 +206,7 @@ XIV(bool, cpuCombine, true)
- XSV(const char *, netCommand, "xterm -name 'ss' -title
'Socket Statistics' -hold -e sh -c 'which ss > /dev/null && watch -t ss -putswl
|| netstat -c'")
+ XSV(const char *, netCommand, TERM " -name 'ss' -title
'Socket Statistics' -hold -e sh -c 'which ss > /dev/null && watch -t ss -putswl
|| netstat -c'")
XSV(const char *, netClassHint, "ss.XTerm")
#else
--XSV(const char *, netCommand, "xterm -name netstat -title
'Network Status' -hold -e netstat -c")
-+XSV(const char *, netCommand, "xterm -name netstat -title
'Network Status' -hold -e netstat -w 1")
+-XSV(const char *, netCommand, TERM " -name netstat -title
'Network Status' -hold -e netstat -c")
++XSV(const char *, netCommand, TERM " -name netstat -title
'Network Status' -hold -e netstat -w 1")
XSV(const char *, netClassHint, "netstat.XTerm")
#endif
diff --git patches/patch-src_icesh_cc patches/patch-src_icesh_cc
index 4c9e570f126..491928215c7 100644
--- patches/patch-src_icesh_cc
+++ patches/patch-src_icesh_cc
@@ -5,7 +5,7 @@ Don't do this GNU extension stuff.
Index: src/icesh.cc
--- src/icesh.cc.orig
+++ src/icesh.cc
-@@ -1663,6 +1663,8 @@ bool IceSh::change()
+@@ -1823,6 +1823,8 @@ void IceSh::doSync()
bool IceSh::colormaps()
{
@@ -14,7 +14,7 @@ Index: src/icesh.cc
if ( !isAction("colormaps", 0))
return false;
-@@ -1671,7 +1673,7 @@ bool IceSh::colormaps()
+@@ -1831,7 +1833,7 @@ bool IceSh::colormaps()
tlog("colormaps");
running = true;
@@ -23,7 +23,7 @@ Index: src/icesh.cc
while (running) {
int n = 0;
Colormap* map = XListInstalledColormaps(display, root, &n);
-@@ -1698,11 +1700,13 @@ bool IceSh::colormaps()
+@@ -1858,11 +1860,13 @@ bool IceSh::colormaps()
bool IceSh::guiEvents()
{
diff --git pkg/PLIST pkg/PLIST
index a167cba2344..1c2b8a7e0a6 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -56,6 +56,7 @@ share/doc/icewm/icewm.html
share/doc/icewm/icewmbg.1.html
share/doc/icewm/icewmhint.1.html
share/icewm/
+share/icewm/IceWM.jpg
share/icewm/icons/
share/icewm/icons/about_16x16.xpm
share/icewm/icons/about_32x32.xpm
