git: b070f178f6fd - main - shells/bash-completion: Fix cmake files location

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Wed, 10 Apr 2024 07:20:43 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b070f178f6fd21153d0ff9802ac6bbb7ab0560e8

commit b070f178f6fd21153d0ff9802ac6bbb7ab0560e8
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-04-10 07:12:06 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-04-10 07:20:04 +0000

    shells/bash-completion: Fix cmake files location
    
    - Bump PORTREVISION for package change
    
    PR:             272708
    Submitted by:   yuri
---
 shells/bash-completion/Makefile                |  1 +
 shells/bash-completion/files/patch-Makefile.am | 11 ++---------
 shells/bash-completion/pkg-plist               |  4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index 91bd45755309..ff45944d8b3a 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bash-completion
 PORTVERSION=	2.13.0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	shells
 
diff --git a/shells/bash-completion/files/patch-Makefile.am b/shells/bash-completion/files/patch-Makefile.am
index 84c71f593e50..5fbf573b21da 100644
--- a/shells/bash-completion/files/patch-Makefile.am
+++ b/shells/bash-completion/files/patch-Makefile.am
@@ -1,8 +1,8 @@
-Note that line 12 (pkgconfigdir) has been changed by USES=pathfix.
+Note that the pkgconfigdir line 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
+@@ -6,7 +6,7 @@ pkgdata_DATA = bash_completion
  compatdir = $(sysconfdir)/bash_completion.d
  compat_DATA =
  
@@ -11,10 +11,3 @@ Note that line 12 (pkgconfigdir) has been changed by USES=pathfix.
  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
- 
diff --git a/shells/bash-completion/pkg-plist b/shells/bash-completion/pkg-plist
index de8184058c78..3b22b1a73f09 100644
--- a/shells/bash-completion/pkg-plist
+++ b/shells/bash-completion/pkg-plist
@@ -918,5 +918,5 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/helpers/make-extract-targets.awk
 %%DATADIR%%/helpers/perl
 %%DATADIR%%/helpers/python
-%%CMAKE_MODULES%%share/cmake/Modules/bash-completion/bash-completion-config-version.cmake
-%%CMAKE_MODULES%%share/cmake/Modules/bash-completion/bash-completion-config.cmake
+%%CMAKE_MODULES%%share/cmake/bash-completion/bash-completion-config-version.cmake
+%%CMAKE_MODULES%%share/cmake/bash-completion/bash-completion-config.cmake