From nobody Mon Jan 24 08:15:48 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 582901982D22; Mon, 24 Jan 2022 08:15:48 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jj2qS205jz4TXq; Mon, 24 Jan 2022 08:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643012148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JthTdBUNoJDyXgRh7qAVVdFINEPB/+BBkbTdqvODcVA=; b=uPCl+JCdnL03EGgRvWCXXDJ1rQKq0K/R4ZLAMGlTqxwWv9P69+LkvJumwMAQ76tdBiO/7x I2jnTPIMSmxCIwZBknduek57iXMCp+qni5+vKakDqUArHDZfgRmZY5qd0oQL1RexqLgkWb AlAuqLUvkZPHz3bvX9XtEuDE7S2NT3bnYnW0ebbkwmq7cwcVuzBsrlYIkNV5FzcI4eFb6J CPhp4ZESq7yuG3x0CP9AXkRIg4OQHPGRbInEgqxMj9n2MQcW2WcbkdAYRuVNGWrbBKAuoE BoBvh32D+6ndGtvM+SI2vw/+9jCdLS/3rDPwNbeR8pOsXNFSGNoiwC/Ks5Ej/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2156812C41; Mon, 24 Jan 2022 08:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20O8Fm5N052134; Mon, 24 Jan 2022 08:15:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20O8FmTE052133; Mon, 24 Jan 2022 08:15:48 GMT (envelope-from git) Date: Mon, 24 Jan 2022 08:15:48 GMT Message-Id: <202201240815.20O8FmTE052133@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 26a430ac9995 - main - sysutils/hw-probe: the port had been updated to version 1.6.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26a430ac999518b63d97307230b7282c05630cc8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643012148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JthTdBUNoJDyXgRh7qAVVdFINEPB/+BBkbTdqvODcVA=; b=PnssuDiURQ2OhDPJBdrQ8IYSlGhKpyYjHOsXHWB6Uum9wzl5w+uuFEhzJS/7rFWN17kKyp lmgqtZ2wiTtpKemaTK6I5ONkiJIfIOkmFTWJ5vac7DaBG0x2cWOV+ey1cfDWYSWWjIEEqh iIcD/77Ei0q1mHze3GX9K+Vr5GubLQ1eDc5sGkRzuhmmRHOFBg2gvC10EJWWBKExetZRCA AjyisEKANu66o6LSAjrOol3lWIE16CvnAUeB/q+kh7TDiwYTVf8ga0W+F7jPVbD6AJShwu lkxtN2Rbnujl44kwYQethrs5VUw8pPY5SrmxHrlIKSdzc6l3OpHZRAwSIdb1sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643012148; a=rsa-sha256; cv=none; b=H4yBGiNq2adtFHn+9fWSNA5M7czwxwdnB/V4y1qP5c3JFEqvwrv4fZ3ou6o/VQPltr8Dw9 XzROZQyzNg8mOHhsBh27BTz1pw3xKCCPKoGQWNEffiZ3G0FNZ+c/dX03SX3nMzak0cPIGj Ec+1YTb/awQ/Ktd5fxbAIKetacov8B/iHlPGPHbgOeoQve9tL0LCySEaHm1uHmKuXZPZk9 YceC75/jFQXMUrlmOFqNak+APPfLvKg9j9gDH2+floZ2CLztv3/m5zrlHG12EwQjdgoRyL vyBlGCJFZ+G9IhmmFQ27n5zJh+7ka9OfA7t4cuvVcPUuDvIxa7KtwGChcouULQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=26a430ac999518b63d97307230b7282c05630cc8 commit 26a430ac999518b63d97307230b7282c05630cc8 Author: Alexey Dokuchaev AuthorDate: 2022-01-24 08:14:14 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-01-24 08:14:14 +0000 sysutils/hw-probe: the port had been updated to version 1.6.1 Modify upstream source code a bit: 1) FreeBSD is definitely a known BSD, so add it to the corresponding list; 2) limit GhostBSD-specific "pkg rquery '%v' ports" command to GhostBSD: it tries to access the network which slows down the probing process, sometimes considerably (e.g. when network is not available or blocked); 3) search processes correctly with pgrep(1), as filtering ``ps x'' output would capture the grep(1) arguments themselves. Reported by: portscout --- sysutils/hw-probe/Makefile | 8 ++++++-- sysutils/hw-probe/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sysutils/hw-probe/Makefile b/sysutils/hw-probe/Makefile index 36573377c225..cc2231aaaa3c 100644 --- a/sysutils/hw-probe/Makefile +++ b/sysutils/hw-probe/Makefile @@ -1,7 +1,7 @@ # Created by: Alexey Dokuchaev PORTNAME= hw-probe -DISTVERSION= 1.6-beta2 +PORTVERSION= 1.6.1 CATEGORIES= sysutils perl5 MAINTAINER= danfe@FreeBSD.org @@ -16,7 +16,6 @@ RUN_DEPENDS= curl:ftp/curl \ USE_GITHUB= yes GH_ACCOUNT= linuxhw -GH_TAGNAME= d1de28b USES= perl5 USE_PERL5= run @@ -35,6 +34,11 @@ RUN_DEPENDS+= dmidecode:sysutils/dmidecode \ lscpu:sysutils/lscpu .endif +post-patch: + @${REINPLACE_CMD} -e '/my @KNOWN_BSD/s/free/&bsd", "&/ ; \ + s/if(checkCmd("pkg")/& and $$Name eq "ghostbsd"/ ; \ + s/ps x | grep/pgrep -l/' ${WRKSRC}/${PORTNAME}.pl + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} diff --git a/sysutils/hw-probe/distinfo b/sysutils/hw-probe/distinfo index e3b749bb478b..659492ca5919 100644 --- a/sysutils/hw-probe/distinfo +++ b/sysutils/hw-probe/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1590737484 -SHA256 (linuxhw-hw-probe-1.6-beta2-d1de28b_GH0.tar.gz) = 3a313ecf60f117a7bc453dc712c8a0d0c1bcefd7ee1dee50966397a1a80ebb2f -SIZE (linuxhw-hw-probe-1.6-beta2-d1de28b_GH0.tar.gz) = 143598 +TIMESTAMP = 1638169260 +SHA256 (linuxhw-hw-probe-1.6.1_GH0.tar.gz) = 6fe0ffb3bad9875219df60baa1d0722d0bd27f1e957d547e2f5d58a0f33382dd +SIZE (linuxhw-hw-probe-1.6.1_GH0.tar.gz) = 161991