From owner-svn-ports-all@FreeBSD.ORG Sat Dec 28 16:38:12 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E23DC87; Sat, 28 Dec 2013 16:38:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2E73F18F0; Sat, 28 Dec 2013 16:38:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSGcCVI057152; Sat, 28 Dec 2013 16:38:12 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSGcBQS057150; Sat, 28 Dec 2013 16:38:11 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201312281638.rBSGcBQS057150@svn.freebsd.org> From: John Marino Date: Sat, 28 Dec 2013 16:38:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337881 - in head/shells/bash-completion: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 16:38:12 -0000 Author: marino Date: Sat Dec 28 16:38:11 2013 New Revision: 337881 URL: http://svnweb.freebsd.org/changeset/ports/337881 Log: 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) Modified: head/shells/bash-completion/Makefile head/shells/bash-completion/files/patch-Makefile.am Modified: head/shells/bash-completion/Makefile ============================================================================== --- head/shells/bash-completion/Makefile Sat Dec 28 16:37:41 2013 (r337880) +++ head/shells/bash-completion/Makefile Sat Dec 28 16:38:11 2013 (r337881) @@ -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 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: Modified: head/shells/bash-completion/files/patch-Makefile.am ============================================================================== --- head/shells/bash-completion/files/patch-Makefile.am Sat Dec 28 16:37:41 2013 (r337880) +++ head/shells/bash-completion/files/patch-Makefile.am Sat Dec 28 16:38:11 2013 (r337881) @@ -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: