shells/bash-completion: Update to 2.14.0

- Update MASTER_SITES: use upstream release tarball - Simplify LICENSE section - Add FREEBSD option Changes: https://github.com/scop/bash-completion/releases
freebsd · May 19, 2024 · 59df533 · 59df533
1 parent 36e4a25
commit 59df533
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
@@ -1,48 +1,42 @@
 PORTNAME=	bash-completion
-PORTVERSION=	2.13.0
-PORTREVISION=	1
+PORTVERSION=	2.14.0
 PORTEPOCH=	2
 CATEGORIES=	shells
+MASTER_SITES=	https://github.com/scop/bash-completion/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Programmable completion library for Bash
 WWW=		https://github.com/scop/bash-completion
 
-# bash-completion is licensed under GPLv2+
-# bash-completion-freebsd is licensed under BSD2CLAUSE
-LICENSE=	BSD2CLAUSE GPLv2+
-LICENSE_COMB=	multi
-LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/freebsd/LICENSE
-LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	runtest:misc/dejagnu \
 		${LOCALBASE}/lib/tcllib/cmdline/cmdline.tcl:devel/tcllib
 
-USES=		autoreconf gmake pathfix
+USES=		autoreconf gmake pathfix tar:xz
 
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	RUNFILE=${DATADIR}/bash_completion.sh
 
-GH_ACCOUNT=	scop
-USE_GITHUB=	yes
-GH_TUPLE=	0mp:bash-completion-freebsd:1.2.0:freebsd/freebsd
-
 PORTSCOUT=	limit:^[0-9\.]*$$
 
-OPTIONS_DEFINE=	CMAKE_MODULES
+OPTIONS_DEFINE=	CMAKE_MODULES FREEBSD
 OPTIONS_SINGLE=	BASH
 OPTIONS_SINGLE_BASH=	BASH_SHARED BASH_STATIC
-OPTIONS_DEFAULT=BASH_SHARED CMAKE_MODULES
+OPTIONS_DEFAULT=BASH_SHARED CMAKE_MODULES FREEBSD
 OPTIONS_SUB=	yes
 BASH_SHARED_DESC=	Use shells/bash as backend
 BASH_STATIC_DESC=	Use shells/bash-static as backend
 CMAKE_MODULES_DESC=	Install bash-completion modules for cmake
+FREEBSD_DESC=		Add FreeBSD-specific completion
 
 BASH_SHARED_RUN_DEPENDS=bash:shells/bash
 BASH_STATIC_RUN_DEPENDS=bash:shells/bash-static
+FREEBSD_RUN_DEPENDS=	bash-completion-freebsd>=0:shells/bash-completion-freebsd
 
 .include <bsd.port.pre.mk>
 
@@ -61,7 +55,6 @@ post-configure:
 			${WRKSRC}/completions/*
 
 post-install:
-	cd ${WRKSRC}/freebsd/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 	${RM} ${STAGEDIR}${DATADIR}/completions/makepkg
 
 do-test:

diff --git a/shells/bash-completion/distinfo b/shells/bash-completion/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1712580504
-SHA256 (scop-bash-completion-2.13.0_GH0.tar.gz) = 6c1cc04bb506e7ba6bd7bb3c7c6f6ad2b46e6198e86666ef4c88139597250601
-SIZE (scop-bash-completion-2.13.0_GH0.tar.gz) = 484155
-SHA256 (0mp-bash-completion-freebsd-1.2.0_GH0.tar.gz) = c6aacb55a913b0b5474579fcfecff38549982046abe0fe81dae89e76c711b2d5
-SIZE (0mp-bash-completion-freebsd-1.2.0_GH0.tar.gz) = 7109
+TIMESTAMP = 1715842542
+SHA256 (bash-completion-2.14.0.tar.xz) = 5c7494f968280832d6adb5aa19f745a56f1a79df311e59338c5efa6f7285e168
+SIZE (bash-completion-2.14.0.tar.xz) = 428980
diff --git a/shells/bash-completion/pkg-plist b/shells/bash-completion/pkg-plist
@@ -1,8 +1,4 @@
 etc/bash_completion.d/000_bash_completion_compat.bash
-etc/bash_completion.d/make
-etc/bash_completion.d/mandoc
-etc/bash_completion.d/pkg
-etc/bash_completion.d/service
 libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/bash_completion
 %%DATADIR%%/bash_completion.sh
@@ -25,6 +21,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/_ansible-pull
 %%DATADIR%%/completions/_ansible-vault
 %%DATADIR%%/completions/_arduino-cli
+%%DATADIR%%/completions/_bao
 %%DATADIR%%/completions/_black
 %%DATADIR%%/completions/_blackd
 %%DATADIR%%/completions/_buf
@@ -43,6 +40,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/_datree
 %%DATADIR%%/completions/_deno
 %%DATADIR%%/completions/_diesel
+%%DATADIR%%/completions/_dlv
 %%DATADIR%%/completions/_dmesg
 %%DATADIR%%/completions/_docker
 %%DATADIR%%/completions/_dprint
@@ -60,12 +58,14 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/_gopherjs
 %%DATADIR%%/completions/_goreleaser
 %%DATADIR%%/completions/_gsctl
+%%DATADIR%%/completions/_gup
 %%DATADIR%%/completions/_helm
 %%DATADIR%%/completions/_hexdump
 %%DATADIR%%/completions/_httpx
 %%DATADIR%%/completions/_hugo
 %%DATADIR%%/completions/_hwclock
 %%DATADIR%%/completions/_ignite
+%%DATADIR%%/completions/_incus
 %%DATADIR%%/completions/_infracost
 %%DATADIR%%/completions/_ionice
 %%DATADIR%%/completions/_istioctl
@@ -139,6 +139,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/_terraform
 %%DATADIR%%/completions/_tkn
 %%DATADIR%%/completions/_tkn-pac
+%%DATADIR%%/completions/_tofu
 %%DATADIR%%/completions/_tokio-console
 %%DATADIR%%/completions/_trivy
 %%DATADIR%%/completions/_udevadm
@@ -153,6 +154,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/_xm
 %%DATADIR%%/completions/_yq
 %%DATADIR%%/completions/_yum
+%%DATADIR%%/completions/_zarf
 %%DATADIR%%/completions/_zitadel
 %%DATADIR%%/completions/a2x
 %%DATADIR%%/completions/abook
@@ -304,6 +306,7 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/ebtables
 %%DATADIR%%/completions/ecryptfs-migrate-home
 %%DATADIR%%/completions/edquota
+%%DATADIR%%/completions/env
 %%DATADIR%%/completions/eog
 %%DATADIR%%/completions/ether-wake
 %%DATADIR%%/completions/etherwake