diff options
| author | marino <marino@FreeBSD.org> | 2013-12-29 00:38:11 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2013-12-29 00:38:11 +0800 |
| commit | 29cd7eedabbd89ed960258a6c27d782419616132 (patch) | |
| tree | d44913e2cf683b55f81557c1f3e71ee058aae4c8 /shells | |
| parent | a9b2bbf4431d3bf4d6cffab1782cd37e6a9b1472 (diff) | |
| download | freebsd-ports-graphics-29cd7eedabbd89ed960258a6c27d782419616132.tar.gz freebsd-ports-graphics-29cd7eedabbd89ed960258a6c27d782419616132.tar.zst freebsd-ports-graphics-29cd7eedabbd89ed960258a6c27d782419616132.zip | |
shells/bash-completion: Fix installation
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)
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash-completion/Makefile | 11 | ||||
| -rw-r--r-- | shells/bash-completion/files/patch-Makefile.am | 19 |
2 files changed, 21 insertions, 9 deletions
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index ed40ff6ec68..39531cfe646 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -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: diff --git a/shells/bash-completion/files/patch-Makefile.am b/shells/bash-completion/files/patch-Makefile.am index 007eb00a36f..73fe3ca79f9 100644 --- a/shells/bash-completion/files/patch-Makefile.am +++ b/shells/bash-completion/files/patch-Makefile.am @@ -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: |