From nobody Fri Mar 31 16:35:58 2023 X-Original-To: dev-commits-ports-all@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 4Pp5Wg079Jz42yK7; Fri, 31 Mar 2023 16:35:59 +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 4Pp5Wf4dqDz4N5B; Fri, 31 Mar 2023 16:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680280558; 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=IycZ5tPlNq8Wh6rgrWX1uApgvP+d+EWqAOFGcskfeMw=; b=F1VQFftfzXG8tbOuPwryC47ZcI+s+VU5f1Qt+QGNwmmKQmMiNKK4rQGx4K03wDZTEWz2uW vX3j0SwIiQb/+MXnwVKcazjUA5qW+SCQJMQZWrUDDzJi2ilWVY2SNs0B+VNeutozJAAL1x JIKzaJu3g4m1TUVwRb33QnstqOSq3WfV3txwnMQhLKyUAy7BVcigrgybUFfcrh5x93Xwdd m8QLlQJm1MwHGMTqnk/xnzaDomwg+xsWy4El2wMB+nZ34PdJ5IsvZJ1zsZKcAc/zLuCIWu OXCgaBkNvoerXSxWtiovb7xCurphBNLRrnzAZf0GxpPdJGovJ8GCNoD34dW1xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680280558; 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=IycZ5tPlNq8Wh6rgrWX1uApgvP+d+EWqAOFGcskfeMw=; b=teM/RNVwVHVE98pcbCWYvpToZiHaKyWle63OYJYJqxEOeDfGJtTchUP41VxEKOHIflBDYu uuxQinXiFfI/mATuWG/J0dnS3NaCea8xru+8UwXFgwbGpW9zWX7GSFHui1iXqOaHfC/f+B l9B712kQVuRuzLVcA01McQBVplxQyCpFkiBIf3tpXe9GHW7HlYPfbzwmaSe33Y477KIY1P HUq2eo0TR02ESwgJL1OjkHqkQ1SMGr+4pM5A14g9WV9+6Slp0hU3tn+zGYRjp1AGwsStrv ftw+IMstufBYbGYc3VMkjIIfAADBH0mSSWURWNYnrIx/EfVgnec6ECOtUbleJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680280558; a=rsa-sha256; cv=none; b=HWy20ZAdjtwbNmTNZ26xtKPhHPCNtGsqlr05zyke9o/BTtxC8VMYyCkByrzoQ0uLDLcxsZ H0vjkRlIMrqIBNfMLV3RaOeNDRqsoaplXS261V2d3c6W4tl8P8oGT7s9cQyY1FxDOkKWZU r5Be7JrHIj4OolNP2aTM+LaBB19LMw3lQqxvYQELN7g0QV/MSLAMrhte9MQfOlmSCzDxmm IoiLk702bmZ+YC0MLiku1W6EwzlRBrzOojn3njcKz+MrnorV68aV5Js++QmFDXl4aqjYqk NuVtordY53k/PB9aDQrX4P6NLxDfH+vtDD6/km1DN7wSvq3suP/dLgHucdQzhw== 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 4Pp5Wf3R0bz11Hk; Fri, 31 Mar 2023 16:35:58 +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 32VGZwLd047553; Fri, 31 Mar 2023 16:35:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VGZwCK047552; Fri, 31 Mar 2023 16:35:58 GMT (envelope-from git) Date: Fri, 31 Mar 2023 16:35:58 GMT Message-Id: <202303311635.32VGZwCK047552@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: fb9f09b43fe4 - main - sysutils/xxd: Make port track vim version, fix WWW List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb9f09b43fe4eb97d1e9579f2642c9a19839b359 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb9f09b43fe4eb97d1e9579f2642c9a19839b359 commit fb9f09b43fe4eb97d1e9579f2642c9a19839b359 Author: Guido Falsi AuthorDate: 2023-03-31 16:34:43 +0000 Commit: Guido Falsi CommitDate: 2023-03-31 16:35:54 +0000 sysutils/xxd: Make port track vim version, fix WWW As suggested by adamw, since the port uses the vim distribution, it can track the vim port PORTVERSION, and use its distfile. [1] While here: - Fix WWW, tracking vim one here too [1] - Adjust COMMENT and pkg-plist a little Reported by: adamw [1] Approved by: Gianmarco Giovannelli (maintainer) --- sysutils/xxd/Makefile | 18 +++++++++++++----- sysutils/xxd/distinfo | 3 --- sysutils/xxd/pkg-descr | 4 +++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile index 378f364cf4bf..3db60c1ba60e 100644 --- a/sysutils/xxd/Makefile +++ b/sysutils/xxd/Makefile @@ -1,14 +1,15 @@ PORTNAME= xxd -DISTVERSIONPREFIX= v -DISTVERSION= 9.0.1366 +DISTVERSIONPREFIX= ${VIM_DISTVERSIONPREFIX} +DISTVERSION= ${VIM_DISTVERSION} CATEGORIES= sysutils MAINTAINER= gmarco@giovannelli.it -COMMENT= Hexdump and reverse hexdump utility -WWW= https://github.com/mew-cx/xxd +COMMENT= Hexdump and reverse hexdump utility from vim distribution +WWW= ${VIM_WWW} CONFLICTS_INSTALL= vim-[0-9]* vim-gtk2 vim-gtk3 vim-motif vim-x11 +DISTINFO_FILE= ${VIM_PORT}/distinfo ALL_TARGET= ${PORTNAME} PORTSCOUT= ignore:1 EXTRACT_AFTER_ARGS= --include='*/src/xxd*' @@ -20,7 +21,14 @@ USE_GITHUB= yes GH_ACCOUNT= vim GH_PROJECT= vim +.include + +VIM_PORT= ${.CURDIR}/../../editors/vim +VIM_DISTVERSIONPREFIX!= ${BSDMAKE} -f ${VIM_PORT}/Makefile -V DISTVERSIONPREFIX +VIM_DISTVERSION!= ${BSDMAKE} -f ${VIM_PORT}/Makefile -V DISTVERSION +VIM_WWW!= ${BSDMAKE} -f ${VIM_PORT}/Makefile -V WWW + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xxd ${STAGEDIR}${PREFIX}/bin -.include +.include diff --git a/sysutils/xxd/distinfo b/sysutils/xxd/distinfo deleted file mode 100644 index 621edaeec981..000000000000 --- a/sysutils/xxd/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1680090877 -SHA256 (vim-vim-v9.0.1366_GH0.tar.gz) = a9e52c123ab0cc7f96d320c3f1e0fc7d65fab8a081b4887651f9f1a75ca001c1 -SIZE (vim-vim-v9.0.1366_GH0.tar.gz) = 16974070 diff --git a/sysutils/xxd/pkg-descr b/sysutils/xxd/pkg-descr index 15a6cd75699f..1a5c47503439 100644 --- a/sysutils/xxd/pkg-descr +++ b/sysutils/xxd/pkg-descr @@ -1,2 +1,4 @@ -Xxd creates a hex dump of a given file or standard input. +Standalone xxd utility fromt eh vim editor ditribution. + +Xxd creates an hex dump of a given file or standard input. It can also convert a hex dump back to its original binary form.