mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

shells/bash-completion: Fix installation

Browse Source 
The bash-completion.pc and bash_completion.sh files were not getting
installed in the correct location per pkg-plist, mainly because the
Makefile.in was modified *after* the configuration target was complete,
that is to say after Makefile has been generated.

By improving the Makefile.am patch, the post-configure target can be
simplified.

Approved by:	maintainer (adamw)
This commit is contained in:
John Marino 2013-12-28 16:38:11 +00:00
parent 84ff337b02
commit 6a1286cd58
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=337881
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shells/bash-completion/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= bash-completion
PORTVERSION= 2.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= shells
MASTER_SITES= http://bash-completion.alioth.debian.org/files/
@ -32,6 +33,9 @@ RUN_DEPENDS=bash:${PORTSDIR}/shells/bash-devel
RUN_DEPENDS=bash:${PORTSDIR}/shells/bash
.endif
post-patch:
@${REINPLACE_CMD} -e 's|FLAC|&\|flv\|FLV|;' ${WRKSRC}/bash_completion
post-configure:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \
s|/etc/bash_completion|${PREFIX}&|g; \
@ -40,12 +44,7 @@ post-configure:
s|/usr/share\(/ssl/openssl.cnf\)|/etc\1|g; \
s|/usr/ports|${PORTSDIR}|g; \
s|/usr/lib\(/aspell\)|${PREFIX}/share\1|g; \
s|/usr/share/info|&:${PREFIX}/info|g; \
s|\$$(sysconfdir)/profile.d|${PREFIX}/bin|g; \
s|FLAC|&\|flv\|FLV|; \
s|\(profiledir = \)${PREFIX}/bin|\1${DATADIR}|g; \
s|\$$(datadir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/bash_completion ${WRKSRC}/Makefile.in \
s|/usr/share/info|&:${PREFIX}/info|g;' \
${WRKSRC}/completions/*
post-install:

19
shells/bash-completion/files/patch-Makefile.am
View File

@ -1,6 +1,19 @@
--- Makefile.am.orig 2013-12-20 13:44:12.000000000 -0500
+++ Makefile.am 2013-12-20 13:44:17.000000000 -0500
@@ -20,8 +20,10 @@
--- Makefile.am.orig 2013-04-05 09:43:56.000000000 +0000
+++ Makefile.am
@@ -5,10 +5,10 @@ pkgdata_DATA = bash_completion
# Empty, but here just to get the compat dir created with install
compat_DATA =
-profiledir = $(sysconfdir)/profile.d
+profiledir = $(prefix)/share/bash-completion
profile_DATA = bash_completion.sh
-pkgconfigdir = $(datadir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = bash-completion.pc
bash_completion.sh: bash_completion.sh.in Makefile
@@ -20,8 +20,10 @@ EXTRA_DIST = CHANGES $(sysconf_DATA) $(p
.dir-locals.el
install-data-hook: