git: 81ff56db9fc6 - main - x11-wm/icewm: update IceWM to version 3.3.0

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=81ff56db9fc6aff09acba4a787f09ecdc5aa2360

commit 81ff56db9fc6aff09acba4a787f09ecdc5aa2360
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-12-29 04:22:32 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-12-29 04:22:32 +0000

    x11-wm/icewm: update IceWM to version 3.3.0
    
    Build against `graphics/nanosvg' by default, which is currently
    supported only with Imlib2 renderer.  Being a simple two-header
    dependency, it does not warrant an additional option.  LIBRSVG2
    would override it if selected.
---
 x11-wm/icewm/Makefile | 18 +++++++++++++-----
 x11-wm/icewm/distinfo |  6 +++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 94411d3adca7..4ea013a8834f 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	icewm
-PORTVERSION=	3.2.3
+PORTVERSION=	3.3.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/
 
@@ -24,7 +24,7 @@ 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_DEFINE=		BEASTIE DOCS IMLIB2 LIBRSVG2 NLS XFT XINERAMA XRANDR
 OPTIONS_DEFAULT=	BEASTIE IMLIB2 XFT XINERAMA XRANDR
 OPTIONS_SUB=		yes
 
@@ -32,17 +32,19 @@ BEASTIE_DESC=		Use Beastie'fied startup button
 BEASTIE_VARS=		STARTUP_PIXMAP=bsd-daemon.xpm
 BEASTIE_VARS_OFF=	STARTUP_PIXMAP=icewm-logo.xpm
 
+IMLIB2_BUILD_DEPENDS=	${LOCALBASE}/include/nanosvg.h:graphics/nanosvg
 IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_DESC=		Use Imlib2 for rendering
+IMLIB2_CONFIGURE_ON=	--enable-nanosvg
 IMLIB2_CONFIGURE_OFF=	--disable-imlib2 --enable-gdk-pixbuf
 IMLIB2_USE_OFF=		GNOME=gdkpixbuf2xlib
 
+LIBRSVG2_USE=		GNOME=librsvg2
+LIBRSVG2_CONFIGURE_OFF=	--disable-rsvg
+
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-SVG_USE=		GNOME=librsvg2
-SVG_CONFIGURE_OFF=	--disable-rsvg
-
 XFT_LIB_DEPENDS=	libXft.so:x11-fonts/libXft
 XFT_CONFIGURE_OFF=	--enable-corefonts --disable-xfreetype
 
@@ -59,6 +61,12 @@ post-extract:
 	@${LN} -sf ${STARTUP_PIXMAP} ${WRKSRC}/lib/${dir}/start.xpm
 .endfor
 
+post-patch-IMLIB2-on:
+	@${LN} -sf ${LOCALBASE}/include/nanosvg.h \
+		${LOCALBASE}/include/nanosvgrast.h ${WRKSRC}/src
+	@${REINPLACE_CMD} -e '/NANOSVG_IMPLEMENTATION/{ x; \
+		s,^,#include <stdio.h>,; G; }' ${WRKSRC}/src/ysvg.cc
+
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ChangeLog NEWS README TODO doc/*.html
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 7849efd21d79..6497a5eb0615 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670195464
-SHA256 (icewm-3.2.3.tar.lz) = af735dedcc8ee8912de0a7651a451e7caa68a54b343475947068b779b2d48421
-SIZE (icewm-3.2.3.tar.lz) = 1788099
+TIMESTAMP = 1671564310
+SHA256 (icewm-3.3.0.tar.lz) = f8dea2bc4f8648ee11fbcb3b7efe9162eebe0f9e33eb561f928eef9c72d97393
+SIZE (icewm-3.3.0.tar.lz) = 1794714