shells/bash-completion: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2021-03-06 15:10:35 +01:00
parent 3073533bf7
commit 70f9b83ee4
2 changed files with 20 additions and 6 deletions

View File

@ -50,12 +50,6 @@ BASH_STATIC_RUN_DEPENDS=bash:shells/bash-static
# See PR 248829 for details
MAKE_CMD= ${LOCALBASE}/bin/gmake
post-patch:
@${REINPLACE_CMD} \
-e '/^profiledir =/ s|(sysconfdir)/profile.d|(prefix)/share/bash-completion|' \
-e 's|\((datadir)/cmake\)|\1/Modules|' \
${WRKSRC}/Makefile.am
post-configure:
@${REINPLACE_CMD} \
-e 's|/etc/ssl/openssl.cnf|${PREFIX}& &|g' \

View File

@ -0,0 +1,20 @@
Note that line 12 (pkgconfigdir) has been changed by USES=pathfix.
--- Makefile.am.orig 2020-07-25 08:25:49 UTC
+++ Makefile.am
@@ -6,13 +6,13 @@ pkgdata_DATA = bash_completion
compatdir = $(sysconfdir)/bash_completion.d
compat_DATA =
-profiledir = $(sysconfdir)/profile.d
+profiledir = $(prefix)/share/bash-completion
profile_DATA = bash_completion.sh
pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = bash-completion.pc
-cmakeconfigdir = $(datadir)/cmake/$(PACKAGE)/
+cmakeconfigdir = $(datadir)/cmake/Modules/$(PACKAGE)/
cmakeconfig_DATA = bash-completion-config.cmake \
bash-completion-config-version.cmake