svn commit: r350694 - head/Mk/Uses

[Kubilay Kocak]

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 ; \