From owner-svn-ports-all@freebsd.org Thu Aug 27 08:11:32 2020 Return-Path: Delivered-To: svn-ports-all@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 5424B3CAB72; Thu, 27 Aug 2020 08:11:32 +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 4Bcb6D1bGTz4LVB; Thu, 27 Aug 2020 08:11:32 +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 1A3E620C5F; Thu, 27 Aug 2020 08:11:32 +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 07R8BVUh015995; Thu, 27 Aug 2020 08:11:31 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07R8BVsh015992; Thu, 27 Aug 2020 08:11:31 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202008270811.07R8BVsh015992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 27 Aug 2020 08:11:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546330 - 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: 546330 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Aug 2020 08:11:32 -0000 Author: danfe Date: Thu Aug 27 08:11:31 2020 New Revision: 546330 URL: https://svnweb.freebsd.org/changeset/ports/546330 Log: - Update IceWM to version 1.8.0 - Adapt to strtok_r() behavior on FreeBSD (see https://github.com/ice-wm/icewm/issues/23) Found out via: www.opennet.ru Added: head/x11-wm/icewm/files/patch-src_misc.cc (contents, props changed) Modified: head/x11-wm/icewm/Makefile head/x11-wm/icewm/distinfo head/x11-wm/icewm/pkg-plist Modified: head/x11-wm/icewm/Makefile ============================================================================== --- head/x11-wm/icewm/Makefile Thu Aug 27 08:11:18 2020 (r546329) +++ head/x11-wm/icewm/Makefile Thu Aug 27 08:11:31 2020 (r546330) @@ -2,12 +2,9 @@ # $FreeBSD$ PORTNAME= icewm -PORTVERSION= 1.6.6 +PORTVERSION= 1.8.0 CATEGORIES= x11-wm MASTER_SITES= https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/ - -PATCH_SITES= https://github.com/bbidulock/icewm/commit/ -PATCHFILES= 32c295c85d22.diff:-p1 f60340768c55.diff:-p1 MAINTAINER= portmaster@bsdforge.com COMMENT= Window Manager designed for speed, usability and consistency Modified: head/x11-wm/icewm/distinfo ============================================================================== --- head/x11-wm/icewm/distinfo Thu Aug 27 08:11:18 2020 (r546329) +++ head/x11-wm/icewm/distinfo Thu Aug 27 08:11:31 2020 (r546330) @@ -1,7 +1,3 @@ -TIMESTAMP = 1590778501 -SHA256 (icewm-1.6.6.tar.lz) = 77f512e0bcdc9c6ec8e1a10c822b8238548265babc70dfe4eb76b4520d60c01c -SIZE (icewm-1.6.6.tar.lz) = 1684639 -SHA256 (32c295c85d22.diff) = d6801471b14780b34399a7e9ebb75744a4eb3153f97856c1109a81a76d4706c6 -SIZE (32c295c85d22.diff) = 304 -SHA256 (f60340768c55.diff) = 94178b00d71e9a8e8959247616f8758a9c89f3dc976c9f74022307376854a14a -SIZE (f60340768c55.diff) = 298 +TIMESTAMP = 1598315124 +SHA256 (icewm-1.8.0.tar.lz) = a71ab11c30f3e5997fdee209f1bc528141e9f6f343c6a37031339491e2db2a87 +SIZE (icewm-1.8.0.tar.lz) = 1679913 Added: head/x11-wm/icewm/files/patch-src_misc.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/icewm/files/patch-src_misc.cc Thu Aug 27 08:11:31 2020 (r546330) @@ -0,0 +1,12 @@ +--- src/misc.cc.orig 2020-08-24 22:02:15 UTC ++++ src/misc.cc +@@ -972,7 +972,8 @@ char* path_lookup(const char* name) { + if (env == nullptr) + return nullptr; + +- while ((directory = strtok_r(save ? nullptr : env, ":", &save)) != nullptr) { ++ for (directory = strtok_r(env, ":", &save); directory != nullptr; ++ directory = strtok_r(nullptr, ":", &save)) { + size_t length = strlen(directory) + strlen(name) + 3; + filebuf = new char[length]; + if (filebuf == nullptr) Modified: head/x11-wm/icewm/pkg-plist ============================================================================== --- head/x11-wm/icewm/pkg-plist Thu Aug 27 08:11:18 2020 (r546329) +++ head/x11-wm/icewm/pkg-plist Thu Aug 27 08:11:31 2020 (r546330) @@ -183,6 +183,8 @@ man/man5/icewm-winoptions.5.gz %%DATADIR%%/taskbar/start.xpm %%DATADIR%%/taskbar/windows.xpm %%DATADIR%%/taskbar/xfreeos2.xpm +%%DATADIR%%/themes/CrystalBlue/buttonA.xpm +%%DATADIR%%/themes/CrystalBlue/buttonI.xpm %%DATADIR%%/themes/CrystalBlue/close.xpm %%DATADIR%%/themes/CrystalBlue/closeA.xpm %%DATADIR%%/themes/CrystalBlue/closeO.xpm @@ -265,6 +267,8 @@ man/man5/icewm-winoptions.5.gz %%DATADIR%%/themes/CrystalBlue/taskbar/taskbuttonminimized.xpm %%DATADIR%%/themes/CrystalBlue/taskbar/toolbuttonbg.xpm %%DATADIR%%/themes/CrystalBlue/taskbar/windows.xpm +%%DATADIR%%/themes/CrystalBlue/taskbar/workspacebuttonactive.xpm +%%DATADIR%%/themes/CrystalBlue/taskbar/workspacebuttonbg.xpm %%DATADIR%%/themes/CrystalBlue/titleAB.xpm %%DATADIR%%/themes/CrystalBlue/titleAJ.xpm %%DATADIR%%/themes/CrystalBlue/titleAM.xpm @@ -382,8 +386,6 @@ man/man5/icewm-winoptions.5.gz %%DATADIR%%/themes/NanoBlue/dframeIT.xpm %%DATADIR%%/themes/NanoBlue/dframeITL.xpm %%DATADIR%%/themes/NanoBlue/dframeITR.xpm -%%DATADIR%%/themes/NanoBlue/drameAB.xpm -%%DATADIR%%/themes/NanoBlue/drameATR.xpm %%DATADIR%%/themes/NanoBlue/eos.jpg %%DATADIR%%/themes/NanoBlue/expandA.xpm %%DATADIR%%/themes/NanoBlue/expandI.xpm @@ -404,21 +406,22 @@ man/man5/icewm-winoptions.5.gz %%DATADIR%%/themes/NanoBlue/frameIT.xpm %%DATADIR%%/themes/NanoBlue/frameITL.xpm %%DATADIR%%/themes/NanoBlue/frameITR.xpm -%%DATADIR%%/themes/NanoBlue/icons/IceWM_16x16.png -%%DATADIR%%/themes/NanoBlue/icons/IceWM_32x32.png -%%DATADIR%%/themes/NanoBlue/icons/app_16x16.png -%%DATADIR%%/themes/NanoBlue/icons/firefox_16x16.png -%%DATADIR%%/themes/NanoBlue/icons/firefox_32x32.png -%%DATADIR%%/themes/NanoBlue/icons/folder_16x16.png -%%DATADIR%%/themes/NanoBlue/icons/folder_32x32.png -%%DATADIR%%/themes/NanoBlue/icons/gimp_16x16.png -%%DATADIR%%/themes/NanoBlue/icons/gimp_32x32.png -%%DATADIR%%/themes/NanoBlue/icons/mplayer_16x16.png -%%DATADIR%%/themes/NanoBlue/icons/mplayer_32x32.png -%%DATADIR%%/themes/NanoBlue/icons/thunderbird_16x16.png -%%DATADIR%%/themes/NanoBlue/icons/thunderbird_32x32.png -%%DATADIR%%/themes/NanoBlue/icons/xterm_16x16.png -%%DATADIR%%/themes/NanoBlue/icons/xterm_32x32.png +%%DATADIR%%/themes/NanoBlue/icons/IceWM_16x16.xpm +%%DATADIR%%/themes/NanoBlue/icons/IceWM_32x32.xpm +%%DATADIR%%/themes/NanoBlue/icons/app_16x16.xpm +%%DATADIR%%/themes/NanoBlue/icons/app_32x32.xpm +%%DATADIR%%/themes/NanoBlue/icons/firefox_16x16.xpm +%%DATADIR%%/themes/NanoBlue/icons/firefox_32x32.xpm +%%DATADIR%%/themes/NanoBlue/icons/folder_16x16.xpm +%%DATADIR%%/themes/NanoBlue/icons/folder_32x32.xpm +%%DATADIR%%/themes/NanoBlue/icons/gimp_16x16.xpm +%%DATADIR%%/themes/NanoBlue/icons/gimp_32x32.xpm +%%DATADIR%%/themes/NanoBlue/icons/mplayer_16x16.xpm +%%DATADIR%%/themes/NanoBlue/icons/mplayer_32x32.xpm +%%DATADIR%%/themes/NanoBlue/icons/thunderbird_16x16.xpm +%%DATADIR%%/themes/NanoBlue/icons/thunderbird_32x32.xpm +%%DATADIR%%/themes/NanoBlue/icons/xterm_16x16.xpm +%%DATADIR%%/themes/NanoBlue/icons/xterm_32x32.xpm %%DATADIR%%/themes/NanoBlue/ledclock/a.xpm %%DATADIR%%/themes/NanoBlue/ledclock/colon.xpm %%DATADIR%%/themes/NanoBlue/ledclock/dot.xpm