From 70f9b83ee4897eb5c2a3257de84a702de14a5e62 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 6 Mar 2021 15:10:35 +0100 Subject: [PATCH] shells/bash-completion: sync with upstream Taken from: HardenedBSD --- shells/bash-completion/Makefile | 6 ------ .../bash-completion/files/patch-Makefile.am | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 shells/bash-completion/files/patch-Makefile.am diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index 2347ceba5f4..6fe00e78aa6 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -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' \ diff --git a/shells/bash-completion/files/patch-Makefile.am b/shells/bash-completion/files/patch-Makefile.am new file mode 100644 index 00000000000..84c71f593e5 --- /dev/null +++ b/shells/bash-completion/files/patch-Makefile.am @@ -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 +