git: ab7c83a5fca2 - main - - Update IceWM to version 2.3.4 which now upholds --disable-rsvg switch - Revert bogus changes to USE_GNOME and BEASTIE_DESC done in cf6ea18e37 - Fix the header of `files/bsd-daemon.xpm' one more time: certain image loaders, e.g. Imlib2, employ overly zealous checks of XPM header (see line 155 of imlib2-1.7.0/src/modules/loaders/loader_xpm.c), so resort to more traditional /* XPM */ and move attribution to its own comment

[Alexey Dokuchaev]

The branch main has been updated by danfe:

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

commit ab7c83a5fca29a0b713b1e778f30691c63d93158
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-05-07 05:46:00 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-05-07 05:50:12 +0000

    - Update IceWM to version 2.3.4 which now upholds --disable-rsvg switch
    - Revert bogus changes to USE_GNOME and BEASTIE_DESC done in cf6ea18e37
    - Fix the header of `files/bsd-daemon.xpm' one more time: certain image
      loaders, e.g. Imlib2, employ overly zealous checks of XPM header (see
      line 155 of imlib2-1.7.0/src/modules/loaders/loader_xpm.c), so resort
      to more traditional /* XPM */ and move attribution to its own comment
---
 x11-wm/icewm/Makefile             | 8 ++++----
 x11-wm/icewm/distinfo             | 6 +++---
 x11-wm/icewm/files/bsd-daemon.xpm | 3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 2730770cac1b..f7b6ebfc505c 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -1,8 +1,7 @@
 # Created by: Yukihiro Nakai <Nakai at Mlab.t.u-tokyo.ac.jp>
 
 PORTNAME=	icewm
-PORTVERSION=	2.3.3
-PORTREVISION=	1
+PORTVERSION=	2.3.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/
 
@@ -19,7 +18,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 
 USES=		compiler:c++11-lang gmake gnome iconv:translit localbase \
 		perl5 pkgconfig shebangfix tar:lz xorg
-USE_GNOME=	cairo gdkpixbuf2 glib20 librsvg2
+USE_GNOME=	glib20
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xpm xrender
 GNU_CONFIGURE=	yes
@@ -30,7 +29,7 @@ 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_DESC=		Use Beastie'fied startup button
 BEASTIE_VARS=		STARTUP_PIXMAP=bsd-daemon.xpm
 BEASTIE_VARS_OFF=	STARTUP_PIXMAP=icewm-logo.xpm
 
@@ -43,6 +42,7 @@ 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
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 094402d151f4..eb28e6c0741f 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619562935
-SHA256 (icewm-2.3.3.tar.lz) = 4162565cf7566d78d786e4ecf4b0639451b8464bcb24e761b1f08ef43e95e513
-SIZE (icewm-2.3.3.tar.lz) = 1704180
+TIMESTAMP = 1620344565
+SHA256 (icewm-2.3.4.tar.lz) = 1368f7db61589b1309274a2fe7250961e21904a294b1cff2c13273abd73725f4
+SIZE (icewm-2.3.4.tar.lz) = 1708239
diff --git a/x11-wm/icewm/files/bsd-daemon.xpm b/x11-wm/icewm/files/bsd-daemon.xpm
index 3ca75eb127e5..8d87c095ac39 100644
--- a/x11-wm/icewm/files/bsd-daemon.xpm
+++ b/x11-wm/icewm/files/bsd-daemon.xpm
@@ -1,4 +1,5 @@
-/* courtesy of Steve Farrell XPM */
+/* XPM */
+/* Courtesy of Steve Farrell */
 static char * bsd_daemon_xpm[] = {
 "48 20 146 2",
 "  	c #D75CD75CD75C",