From owner-svn-ports-all@FreeBSD.ORG  Wed Apr  9 12:45:55 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 103CCBE8;
 Wed,  9 Apr 2014 12:45:55 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F160812A7;
 Wed,  9 Apr 2014 12:45:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s39CjsYT028660;
 Wed, 9 Apr 2014 12:45:54 GMT (envelope-from koobs@svn.freebsd.org)
Received: (from koobs@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s39CjsTO028658;
 Wed, 9 Apr 2014 12:45:54 GMT (envelope-from koobs@svn.freebsd.org)
Message-Id: <201404091245.s39CjsTO028658@svn.freebsd.org>
From: Kubilay Kocak <koobs@FreeBSD.org>
Date: Wed, 9 Apr 2014 12:45:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350694 - head/Mk/Uses
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Apr 2014 12:45:55 -0000

Author: koobs
Date: Wed Apr  9 12:45:54 2014
New Revision: 350694
URL: http://svnweb.freebsd.org/changeset/ports/350694
QAT: https://qat.redports.org/buildarchive/r350694/

Log:
  Mk/pathfix.mk: Support more pkgconfig libdir matches
  
  Add support for matching additional pkgconfig libdir entries
  that were found in Python's Makefile.pre.in.
  
  It can also be used by other ports [1] by setting PATHFIX_MAKEFILEIN to the
  appropriate filename in ${WRKSRC}.
  
  If this file grows support for other pathfix'es beyond Makefile's and
  autoconf sources, it may be worth renaming PATHFIX_MAKEFILEIN in future
  to suit the broader scope.
  
  [1] Examples: devel/ptlib, graphics/zathura (thanks antoine)
  
  Reviewed by:	antoine
  Approved by:	antoine (exp-run)
  MFH:		2014Q2

Modified:
  head/Mk/Uses/pathfix.mk

Modified: head/Mk/Uses/pathfix.mk
==============================================================================
--- head/Mk/Uses/pathfix.mk	Wed Apr  9 12:41:57 2014	(r350693)
+++ head/Mk/Uses/pathfix.mk	Wed Apr  9 12:45:54 2014	(r350694)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 #
-# Lookup in Makefile.in and configure for common incorrect paths and set them
-# to respect FreeBSD hier
+# Lookup common paths in Makefile.in, configure and similar files, and replace
+# their values to respect FreeBSD hier(7) for file installation.
 #
 # Feature:	pathfix
 # Usage:	USES=pathfix
@@ -22,7 +22,9 @@ pathfix-pre-patch:
 	@${FIND} ${WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 		s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+		s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
 		s|[{]libdir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+		s|[{]LIBDIR[}]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
 		s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \