svn commit: r567120 - in head/shells/bash-completion: . files

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Wed Mar 3 18:07:48 UTC 2021


Author: sunpoet
Date: Wed Mar  3 18:07:34 2021
New Revision: 567120
URL: https://svnweb.freebsd.org/changeset/ports/567120

Log:
  Convert REINPLACE_CMD to patch file

Added:
  head/shells/bash-completion/files/patch-Makefile.am   (contents, props changed)
Modified:
  head/shells/bash-completion/Makefile

Modified: head/shells/bash-completion/Makefile
==============================================================================
--- head/shells/bash-completion/Makefile	Wed Mar  3 18:07:29 2021	(r567119)
+++ head/shells/bash-completion/Makefile	Wed Mar  3 18:07:34 2021	(r567120)
@@ -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' \

Added: head/shells/bash-completion/files/patch-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/shells/bash-completion/files/patch-Makefile.am	Wed Mar  3 18:07:34 2021	(r567120)
@@ -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
+ 


More information about the svn-ports-all mailing list