Index: head/x11-wm/icewm/Makefile
===================================================================
--- head/x11-wm/icewm/Makefile	(revision 566785)
+++ head/x11-wm/icewm/Makefile	(revision 566786)
@@ -1,69 +1,69 @@
 # Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	icewm
-PORTVERSION=	2.1.2
+PORTVERSION=	2.2.0
 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
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libsndfile.so:audio/libsndfile
 
 USES=		compiler:c++11-lang gmake gnome iconv:translit localbase \
 		perl5 pkgconfig shebangfix tar:lz xorg
 USE_GNOME=	glib20
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xpm xrender
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-icesound=oss
 SHEBANG_FILES=	contrib/icewm-menu-xrandr
 
 OPTIONS_DEFINE=		BEASTIE DOCS IMLIB2 NLS SVG XFT XINERAMA XRANDR
 OPTIONS_DEFAULT=	BEASTIE IMLIB2 XFT XINERAMA XRANDR
 OPTIONS_SUB=		yes
 
 BEASTIE_DESC=		Use Beastie'fied startup button
 BEASTIE_VARS=		STARTUP_PIXMAP=bsd-daemon.xpm
 BEASTIE_VARS_OFF=	STARTUP_PIXMAP=icewm-logo.xpm
 
 IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_DESC=		Use Imlib2 for rendering
 IMLIB2_CONFIGURE_OFF=	--disable-imlib2 --enable-gdk-pixbuf
 IMLIB2_USE_OFF=		GNOME=gdkpixbuf2
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 SVG_USE=		GNOME=librsvg2
 
 XFT_LIB_DEPENDS=	libXft.so:x11-fonts/libXft
 XFT_CONFIGURE_OFF=	--enable-corefonts --disable-xfreetype
 
 XINERAMA_USE=		XORG=xinerama
 XINERAMA_CONFIGURE_ENABLE=	xinerama
 
 XRANDR_USE=		XORG=xrandr
 XRANDR_CONFIGURE_ENABLE=	xrandr
 
 post-extract:
 .for dir in taskbar themes/Infadel2/taskbar
 	@cd ${WRKSRC}/lib/${dir} && ${MV} start.xpm icewm-logo.xpm
 	@${LN} -sf ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/${dir}
 	@${LN} -sf ${STARTUP_PIXMAP} ${WRKSRC}/lib/${dir}/start.xpm
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ChangeLog NEWS README TODO doc/*.html
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-wm/icewm/distinfo
===================================================================
--- head/x11-wm/icewm/distinfo	(revision 566785)
+++ head/x11-wm/icewm/distinfo	(revision 566786)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612894283
-SHA256 (icewm-2.1.2.tar.lz) = ad1e621a48655692425c4a51e813194458938fe7d878d030b21d9fe29c0f925b
-SIZE (icewm-2.1.2.tar.lz) = 1694969
+TIMESTAMP = 1614520201
+SHA256 (icewm-2.2.0.tar.lz) = 385df54aa39f02cb40a3d208b36db40a4d55cc35ec9539633b832fac15759afe
+SIZE (icewm-2.2.0.tar.lz) = 1697312
Index: head/x11-wm/icewm/files/patch-src_Makefile.in
===================================================================
--- head/x11-wm/icewm/files/patch-src_Makefile.in	(revision 566785)
+++ head/x11-wm/icewm/files/patch-src_Makefile.in	(revision 566786)
@@ -1,29 +1,47 @@
 --- src/Makefile.in.orig	2020-12-14 01:14:27 UTC
 +++ src/Makefile.in
 @@ -916,7 +916,7 @@ icewm_SOURCES = \
  	yxtray.cc \
  	yxtray.h
  
 -icewm_LDADD = libitk.la libice.la $(IMAGE_LIBS) $(XSM_LIBS) $(CORE_LIBS)
 +icewm_LDADD = libitk.la libice.la $(IMAGE_LIBS) $(XSM_LIBS) $(CORE_LIBS) @LIBINTL@ @LIBICONV@
  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
  
 -icewmbg_LDADD = libice.la $(IMAGE_LIBS) $(CORE_LIBS) @LIBINTL@
 +icewmbg_LDADD = libice.la $(IMAGE_LIBS) $(CORE_LIBS) @LIBINTL@ @LIBICONV@
  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
  
 -icehelp_LDADD = libitk.la libice.la $(IMAGE_LIBS) $(CORE_LIBS) @LIBINTL@
 +icehelp_LDADD = libitk.la libice.la $(IMAGE_LIBS) $(CORE_LIBS) @LIBINTL@ @LIBICONV@
  iceclock_SOURCES = \
  	intl.h \
  	debug.h \