git: fb9f09b43fe4 - main - sysutils/xxd: Make port track vim version, fix WWW
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 31 Mar 2023 16:35:58 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fb9f09b43fe4eb97d1e9579f2642c9a19839b359
commit fb9f09b43fe4eb97d1e9579f2642c9a19839b359
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-03-31 16:34:43 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
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 <gmarco@giovannelli.it> (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 <bsd.port.pre.mk>
+
+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 <bsd.port.mk>
+.include <bsd.port.post.mk>
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.