svn commit: r566543 - head/security/p11-kit

[Roman Bogorodskiy]

Author: novel
Date: Thu Feb 25 15:45:25 2021
New Revision: 566543
URL: https://svnweb.freebsd.org/changeset/ports/566543

Log:
  security/p11-kit: drop BASH option
  
   - Drop BASH option and install bash completion files unconditionally,
     but only add shells/bash-completion to BUILD_DEPENDS, not RUN_DEPENDS,
   - Improve formatting with portfmt(1),
   - Bump PORTREVISION for dependency changes.
  
  PR:		253843
  Submitted by:	swills
  Reported by:	Andras Farkas

Modified:
  head/security/p11-kit/Makefile
  head/security/p11-kit/pkg-plist

Modified: head/security/p11-kit/Makefile
==============================================================================
--- head/security/p11-kit/Makefile	Thu Feb 25 15:35:57 2021	(r566542)
+++ head/security/p11-kit/Makefile	Thu Feb 25 15:45:25 2021	(r566543)
@@ -3,6 +3,7 @@
 
 PORTNAME=	p11-kit
 DISTVERSION=	0.23.22
+PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	https://github.com/p11-glue/p11-kit/releases/download/${DISTVERSION}/
 
@@ -15,26 +16,25 @@ COMMENT=	Library for loading and enumerating of PKCS\#
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
+		bash-completion>=0:shells/bash-completion
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-LIB_DEPENDS=	libtasn1.so:security/libtasn1 \
-		libffi.so:devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi \
+		libtasn1.so:security/libtasn1
 
 USES=		localbase meson pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
-MESON_ARGS=	-Dlibffi=enabled -Dtrust_module=enabled \
-		-Dtrust_paths=${LOCALBASE}/share/certs/ca-root-nss.crt \
-		-Dnls=false
+MESON_ARGS=	-Dbash_completion=enabled \
+		-Dlibffi=enabled \
+		-Dnls=false \
+		-Dtrust_module=enabled \
+		-Dtrust_paths=${LOCALBASE}/share/certs/ca-root-nss.crt
 
-OPTIONS_DEFINE=	BASH DOCS MANPAGES TEST
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		DOCS MANPAGES TEST
+OPTIONS_SUB=		yes
 MANPAGES_IMPLIES=	DOCS
-OPTIONS_DEFAULT=	BASH MANPAGES
-
-BASH_BUILD_DEPENDS=	bash-completion>=0:shells/bash-completion
-BASH_RUN_DEPENDS=	bash-completion>=0:shells/bash-completion
-BASH_MESON_ENABLED=	bash_completion
+OPTIONS_DEFAULT=	MANPAGES
 
 DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc
 DOCS_USES=		gnome

Modified: head/security/p11-kit/pkg-plist
==============================================================================
--- head/security/p11-kit/pkg-plist	Thu Feb 25 15:35:57 2021	(r566542)
+++ head/security/p11-kit/pkg-plist	Thu Feb 25 15:45:25 2021	(r566543)
@@ -21,8 +21,8 @@ libexec/p11-kit/trust-extract-compat
 %%MANPAGES%%man/man1/trust.1.gz
 %%MANPAGES%%man/man5/pkcs11.conf.5.gz
 %%MANPAGES%%man/man8/p11-kit.8.gz
-%%BASH%%share/bash-completion/completions/p11-kit
-%%BASH%%share/bash-completion/completions/trust
+share/bash-completion/completions/p11-kit
+share/bash-completion/completions/trust
 %%DOCS%%share/gtk-doc/html/p11-kit/config-example.html
 %%DOCS%%share/gtk-doc/html/p11-kit/config-files.html
 %%DOCS%%share/gtk-doc/html/p11-kit/config.html