Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Dec 2025 16:04:08 +0000
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8b991fe2c9bb - main - shells/bash-completion: Remove USES=pathfix
Message-ID:  <694182f8.45466.668e2afa@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by sunpoet:

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

commit 8b991fe2c9bb37e6485773b58fc90b741534f88f
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-12-16 15:59:24 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-12-16 15:59:24 +0000

    shells/bash-completion: Remove USES=pathfix
    
    - Fix *_DEPENDS of dependent ports
    - Bump PORTREVISION for package change
---
 devel/dconf/Makefile                           |  2 +-
 shells/bash-completion/Makefile                |  3 ++-
 shells/bash-completion/files/patch-Makefile.am | 10 ++++------
 shells/bash-completion/pkg-plist               |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 9594bca467e1..cee81577421c 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -12,7 +12,7 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
-		${LOCALBASE}/libdata/pkgconfig/bash-completion.pc:shells/bash-completion
+		bash-completion>=0:shells/bash-completion
 LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 USES=		gettext gnome localbase meson pkgconfig python:build \
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index 51b6fd924096..e456f723ada0 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bash-completion
 PORTVERSION=	2.17.0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	shells
 MASTER_SITES=	https://github.com/scop/bash-completion/releases/download/${PORTVERSION}/
@@ -14,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 TEST_DEPENDS=	runtest:misc/dejagnu \
 		${LOCALBASE}/lib/tcllib/cmdline/cmdline.tcl:devel/tcllib
 
-USES=		autoreconf gmake pathfix tar:xz
+USES=		autoreconf gmake tar:xz
 
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes
diff --git a/shells/bash-completion/files/patch-Makefile.am b/shells/bash-completion/files/patch-Makefile.am
index 5fbf573b21da..84f9aec9ddaf 100644
--- a/shells/bash-completion/files/patch-Makefile.am
+++ b/shells/bash-completion/files/patch-Makefile.am
@@ -1,13 +1,11 @@
-Note that the pkgconfigdir line has been changed by USES=pathfix.
-
---- Makefile.am.orig	2020-07-25 08:25:49 UTC
+--- Makefile.am.orig	2025-10-31 14:03:32 UTC
 +++ Makefile.am
-@@ -6,7 +6,7 @@ pkgdata_DATA = bash_completion
+@@ -6,7 +6,7 @@ compat_DATA = bash_completion.d/000_bash_completion_co
  compatdir = $(sysconfdir)/bash_completion.d
- compat_DATA =
+ compat_DATA = bash_completion.d/000_bash_completion_compat.bash
  
 -profiledir = $(sysconfdir)/profile.d
 +profiledir = $(prefix)/share/bash-completion
  profile_DATA = bash_completion.sh
  
- pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfigdir = $(datadir)/pkgconfig
diff --git a/shells/bash-completion/pkg-plist b/shells/bash-completion/pkg-plist
index 1fa2e4d34de5..6fbd915f4faf 100644
--- a/shells/bash-completion/pkg-plist
+++ b/shells/bash-completion/pkg-plist
@@ -1,5 +1,4 @@
 etc/bash_completion.d/000_bash_completion_compat.bash
-libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/bash_completion
 %%DATADIR%%/bash_completion.sh
 %%DATADIR%%/completions/2to3
@@ -1079,3 +1078,4 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/helpers/python
 %%CMAKE_MODULES%%share/cmake/bash-completion/bash-completion-config-version.cmake
 %%CMAKE_MODULES%%share/cmake/bash-completion/bash-completion-config.cmake
+share/pkgconfig/bash-completion.pc


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?694182f8.45466.668e2afa>