From owner-svn-ports-head@freebsd.org Tue Jan 5 13:45:01 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3DE3C4E57C7; Tue, 5 Jan 2021 13:45:01 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9DJY1HGRz4TvX; Tue, 5 Jan 2021 13:45:01 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A8845422; Tue, 5 Jan 2021 13:45:01 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 105Dj07h067203; Tue, 5 Jan 2021 13:45:00 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 105Dj0TP067200; Tue, 5 Jan 2021 13:45:00 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202101051345.105Dj0TP067200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 5 Jan 2021 13:45:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560396 - in head/x11-wm/icewm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11-wm/icewm: . files X-SVN-Commit-Revision: 560396 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2021 13:45:01 -0000 Author: danfe Date: Tue Jan 5 13:45:00 2021 New Revision: 560396 URL: https://svnweb.freebsd.org/changeset/ports/560396 Log: - Update IceWM to version 2.0.1 - Imlib2 is now preferred for rendering - Allow to build with SVG support Added: head/x11-wm/icewm/files/patch-src_Makefile.in (contents, props changed) Modified: head/x11-wm/icewm/Makefile head/x11-wm/icewm/distinfo Modified: head/x11-wm/icewm/Makefile ============================================================================== --- head/x11-wm/icewm/Makefile Tue Jan 5 13:42:12 2021 (r560395) +++ head/x11-wm/icewm/Makefile Tue Jan 5 13:45:00 2021 (r560396) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= icewm -PORTVERSION= 1.9.2 +PORTVERSION= 2.0.1 CATEGORIES= x11-wm MASTER_SITES= https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/ @@ -19,7 +19,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= gdkpixbuf2 +USE_GNOME= glib20 USE_PERL5= build USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xpm xrender GNU_CONFIGURE= yes @@ -29,19 +29,30 @@ CONFIGURE_ARGS= --with-icesound=oss \ --with-docdir=${PREFIX}/share/doc SHEBANG_FILES= contrib/icewm-menu-xrandr -OPTIONS_DEFINE= BEASTIE DOCS NLS XFT XINERAMA XRANDR -OPTIONS_DEFAULT= BEASTIE XFT XINERAMA 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 @@ -51,12 +62,6 @@ post-extract: @${LN} -sf ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/${dir} @${LN} -sf ${STARTUP_PIXMAP} ${WRKSRC}/lib/${dir}/start.xpm .endfor - -post-patch: - @${REINPLACE_CMD} -E -e \ - '/^(icewm|icehelp|icewmbg)_LDADD =/s|$$| @LIBICONV@| ; \ - /@echo/s|^|#| ; \ - s|@$$\(|$$(|' ${WRKSRC}/src/Makefile.in post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/x11-wm/icewm/distinfo ============================================================================== --- head/x11-wm/icewm/distinfo Tue Jan 5 13:42:12 2021 (r560395) +++ head/x11-wm/icewm/distinfo Tue Jan 5 13:45:00 2021 (r560396) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604966270 -SHA256 (icewm-1.9.2.tar.lz) = 713bd7849f9fba8338beb278c94c16a6ae610de7e718707e19a334429f17203f -SIZE (icewm-1.9.2.tar.lz) = 1694602 +TIMESTAMP = 1609628232 +SHA256 (icewm-2.0.1.tar.lz) = ac295bc1291539b892fa478346ad0d1f0a057476eb265399bd42f35b81a47d77 +SIZE (icewm-2.0.1.tar.lz) = 1694439 Added: head/x11-wm/icewm/files/patch-src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/icewm/files/patch-src_Makefile.in Tue Jan 5 13:45:00 2021 (r560396) @@ -0,0 +1,29 @@ +--- 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 = \ + 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 \ +@@ -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 \