Use USES=pathfix where applicable.

PR:		213195
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D8093

36 files changed, 21 insertions, 154 deletions

diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index f52ed813c98b..81a942ac0f4e 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libsimage.so:graphics/simage
 
-USES=		openal:al libtool
+USES=		openal:al libtool pathfix
 USE_GL=		yes
 USE_XORG=	ice sm x11 xext xt
 GNU_CONFIGURE=	yes
diff --git a/graphics/Coin/files/patch-Makefile.in b/graphics/Coin/files/patch-Makefile.in
deleted file mode 100644
index 4c5b3a031e75..000000000000
--- a/graphics/Coin/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2010-03-02 13:20:09 UTC
-+++ Makefile.in
-@@ -1399,7 +1399,7 @@ BOOST_HEADER_FILES = \
- 	include/boost/version.hpp \
- 	include/boost/visit_each.hpp
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(exec_prefix)/libdata/pkgconfig
- pkgconfig_DATA = Coin.pc
- BUILT_SOURCES = \
- 	include/Inventor/C/basic.h \
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 528bab4e48c0..248ab5d8f8b0 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ENV=	PTHREAD_LIBS=-lpthread
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
-USES=		libtool localbase tar:bzip2
+USES=		libtool localbase pathfix tar:bzip2
 
 PORTDATA=	*
 PORTDOCS=	*
diff --git a/graphics/GraphicsMagick/files/patch-Makefile.in b/graphics/GraphicsMagick/files/patch-Makefile.in
index ea31500796d9..6478ffc15838 100644
--- a/graphics/GraphicsMagick/files/patch-Makefile.in
+++ b/graphics/GraphicsMagick/files/patch-Makefile.in
@@ -9,12 +9,3 @@
  MogrifyDelegate = @MogrifyDelegate@
  NM = @NM@
  NMEDIT = @NMEDIT@
-@@ -4381,7 +4381,7 @@ PERLMAGICK_MAINTAINER_TARGETS = $(top_sr
- @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick
- 
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- # Files to install in Pkgconfig directory
- pkgconfig_DATA = \
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 3840d8334250..9040b2ea8592 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -30,8 +30,4 @@ CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -I../include -L./
 
 BROKEN_sparc64=		Does not compile
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.am
-
 .include <bsd.port.mk>
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index acc504bf532c..933dd6213501 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -20,7 +20,6 @@ COMMENT=	Skeletal based 3D character animation library written in C++
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pathfix pkgconfig tar:bzip2
-PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 1f6482bffc07..c70458b6f95f 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -12,7 +12,7 @@ COMMENT=	open source implementation of the GLUT library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake
+USES=		cmake pathfix
 USE_LDCONFIG=	yes
 USE_XORG=	ice x11 xi xrandr
 USE_GL=		gl glu
diff --git a/graphics/freeglut/files/patch-CMakeLists.txt b/graphics/freeglut/files/patch-CMakeLists.txt
deleted file mode 100644
index cc41218f5bfc..000000000000
--- a/graphics/freeglut/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt.orig	2015-02-18 04:59:57 UTC
-+++ CMakeLists.txt
-@@ -522,6 +522,6 @@ IF(FREEGLUT_GLES)
-   SET(PC_FILENAME "freeglut-gles.pc")
- ENDIF()
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/freeglut.pc.in ${CMAKE_BINARY_DIR}/freeglut.pc @ONLY)
--INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ RENAME ${PC_FILENAME})
-+INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/ RENAME ${PC_FILENAME})
- # TODO: change the library and .pc name when building for GLES,
- # e.g. -lglut-GLES
diff --git a/graphics/iec16022/Makefile b/graphics/iec16022/Makefile
index de2c4eca10ea..8f551c999b2c 100644
--- a/graphics/iec16022/Makefile
+++ b/graphics/iec16022/Makefile
@@ -20,8 +20,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		autoreconf gmake libtool pathfix pkgconfig
 
-PATHFIX_MAKEFILEIN=	Makefile.am
-
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC
 
 INSTALL_TARGET=	install-strip
diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile
index c2f2b33b72be..a3af5c0b6d69 100644
--- a/graphics/leptonica/Makefile
+++ b/graphics/leptonica/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 
 CONFLICTS=	leptonlib-[0-9]*
 
-USES=		jpeg libtool
+USES=		jpeg libtool pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/leptonica/files/patch-Makefile.in b/graphics/leptonica/files/patch-Makefile.in
deleted file mode 100644
index 20ef65e2c447..000000000000
--- a/graphics/leptonica/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2015-04-26 20:30:38 UTC
-+++ Makefile.in
-@@ -270,7 +270,7 @@ top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
- AUTOMAKE_OPTIONS = foreign
- EXTRA_DIST = config README.html leptonica-license.txt moller52.jpg version-notes.html make-for-auto make-for-local autobuild
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = lept.pc
- SUBDIRS = src prog
- all: config_auto.h
diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile
index ec305d71b648..1ac945bdd9a1 100644
--- a/graphics/libepoxy/Makefile
+++ b/graphics/libepoxy/Makefile
@@ -19,6 +19,5 @@ USE_XORG=	xorg-macros x11
 USE_GL=		egl glesv2
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-PATHFIX_MAKEFILEIN=	Makefile.am
 
 .include <bsd.port.mk>
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 5fd1aeeb314d..fb3e698b86ec 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libpng16.so:graphics/png \
 
 USE_GNOME=	gtk20 glib20 pango atk
 
-USES=		autoreconf jpeg libtool
+USES=		autoreconf jpeg libtool pathfix
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include/gtk-2.0 \
 		-I${LOCALBASE}/include/glib-2.0 \
diff --git a/graphics/libpano13/files/patch-Makefile.am b/graphics/libpano13/files/patch-Makefile.am
index d45082c2cbf5..5adb1c6ea530 100644
--- a/graphics/libpano13/files/patch-Makefile.am
+++ b/graphics/libpano13/files/patch-Makefile.am
@@ -27,12 +27,3 @@
  libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
  
  pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)
-@@ -108,7 +118,7 @@
- noinst_HEADERS = $(INTERNAL_HDR) $(SYS_HDR) $(MAC_HDR)
- 
- # Pkg-config script.
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(exec_prefix)/libdata/pkgconfig
- pkgconfig_DATA = libpano13.pc
- DISTCLEANFILES = $(pkgconfig_DATA)
- 
diff --git a/graphics/libpgf/Makefile b/graphics/libpgf/Makefile
index f1b1a43eb950..a13ba3651733 100644
--- a/graphics/libpgf/Makefile
+++ b/graphics/libpgf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Progressive Graphics Format (PGF) library
 
 LICENSE=	LGPL21
 
-USES=		autoreconf dos2unix libtool zip
+USES=		autoreconf dos2unix libtool pathfix zip
 USE_LDCONFIG=	yes
 
 DOS2UNIX_FILES=	configure.ac
diff --git a/graphics/libpgf/files/patch-Makefile.am b/graphics/libpgf/files/patch-Makefile.am
index 4f39f63a0888..dbb96dabbb53 100644
--- a/graphics/libpgf/files/patch-Makefile.am
+++ b/graphics/libpgf/files/patch-Makefile.am
@@ -13,14 +13,3 @@
  
  PACKAGE		= @PACKAGE@
  VERSION		= @VERSION@
-@@ -22,8 +22,8 @@ RPMRELEASE=$(PACKAGE_RELEASE)
- ACLOCAL_AMFLAGS = -I m4
- 
- install-data-local:: $(PACKAGE).pc
--	$(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
--	$(INSTALL) -m 644 $(PACKAGE).pc $(DESTDIR)$(libdir)/pkgconfig/$(PACKAGE).pc
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/libdata/pkgconfig
-+	$(INSTALL) -m 644 $(PACKAGE).pc $(DESTDIR)$(prefix)/libdata/pkgconfig/$(PACKAGE).pc
- 
- 
- .PHONY: ChangeLog
diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile
index bb33edac29e7..2915a1542522 100644
--- a/graphics/libreatlas/Makefile
+++ b/graphics/libreatlas/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS=	libmspack.so:archivers/libmspack \
 		libfontconfig.so:x11-fonts/fontconfig
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake iconv jpeg pkgconfig
+USES=		gettext gmake iconv jpeg pathfix pkgconfig
 USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender xxf86vm
 USE_GNOME=	atk gdkpixbuf2 glib20 gtk20 pango
@@ -49,7 +49,5 @@ DESKTOP_ENTRIES="LibreAtlas" "${COMMENT}" "" "LibreAtlas" \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|wx-config|$${WX_CONFIG}|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/graphics/libspiro/Makefile b/graphics/libspiro/Makefile
index 898b7d401c45..38f7a7e92009 100644
--- a/graphics/libspiro/Makefile
+++ b/graphics/libspiro/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USE_GITHUB=	yes
 GH_ACCOUNT=	fontforge
 
-USES=		gmake libtool autoreconf
+USES=		autoreconf gmake libtool pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/graphics/libspiro/files/patch-Makefile.am b/graphics/libspiro/files/patch-Makefile.am
index 6d1690dc35bb..b34d9f18f3ce 100644
--- a/graphics/libspiro/files/patch-Makefile.am
+++ b/graphics/libspiro/files/patch-Makefile.am
@@ -1,16 +1,13 @@
---- Makefile.am.orig	2015-07-02 13:50:20 UTC
+--- Makefile.am.orig	2016-10-03 14:37:13 UTC
 +++ Makefile.am
-@@ -1,8 +1,8 @@
+@@ -1,6 +1,6 @@
  # Makefile.am - Top level automakefile for libspiro
  
 -SUBDIRS = . tests
 +SUBDIRS = .
  
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${PREFIX}/libdata/pkgconfig
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libspiro.pc
- 
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 @@ -13,7 +13,7 @@ AM_LDFLAGS = $(WLSLIB) $(LS_LIB) -no-und
  LIBTOOL_DEPS = @LIBTOOL_DEPS@
  
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 847db720dfed..9e47488ea20f 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -29,7 +29,6 @@ CONFIGURE_ARGS=	--includedir=${PREFIX}/include/ming
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
 USES=		autoreconf bison gmake libtool localbase pathfix shebangfix
 
diff --git a/graphics/opengtl/Makefile b/graphics/opengtl/Makefile
index 5def09e49b50..11949137265b 100644
--- a/graphics/opengtl/Makefile
+++ b/graphics/opengtl/Makefile
@@ -18,7 +18,7 @@ LICENSE=	LGPL20
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libLLVM-3.3.so:devel/llvm33
 
-USES=		cmake perl5 tar:bzip2
+USES=		cmake pathfix perl5 tar:bzip2
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config33
 
@@ -38,10 +38,5 @@ post-patch:
 pre-configure:
 	${REINPLACE_CMD} -e 's|set(OPENGTL_LIB_SOVERSION.*|set(OPENGTL_LIB_SOVERSION "0")|' \
 		${PATCH_WRKSRC}/CMakeLists.txt
-	${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		${PATCH_WRKSRC}/OpenCTL/OpenCTL/CMakeLists.txt \
-		${PATCH_WRKSRC}/OpenGTL/GTLCore/CMakeLists.txt \
-		${PATCH_WRKSRC}/OpenGTL/GTLImageIO/CMakeLists.txt \
-		${PATCH_WRKSRC}/OpenShiva/OpenShiva/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 4364948a18bd..616e6475c7b4 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS+=	bash:shells/bash
 PFS_BUILD=	${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB+=	PFS_BASE=${PREFIX}
 
-USES=		gmake pkgconfig libtool
+USES=		gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	${PFS_BUILD}
 CONFIGURE_ARGS+=	--disable-jpeghdr --disable-matlab \
diff --git a/graphics/pfstools/files/patch-src-pfs-Makefile.in b/graphics/pfstools/files/patch-src-pfs-Makefile.in
deleted file mode 100644
index 2dd5716a3b1a..000000000000
--- a/graphics/pfstools/files/patch-src-pfs-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pfs/Makefile.in.orig	2011-10-27 08:40:30 UTC
-+++ src/pfs/Makefile.in
-@@ -259,7 +259,7 @@ libpfs_1_2_la_SOURCES = pfs.cpp pfsutils
- library_includedir = $(includedir)/pfs-1.2
- library_include_HEADERS = pfs.h array2d.h
- #INCLUDES = 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = pfs.pc
- all: all-am
- 
diff --git a/graphics/qtgtl/Makefile b/graphics/qtgtl/Makefile
index b06b6ec88fab..10ccf9fe7c92 100644
--- a/graphics/qtgtl/Makefile
+++ b/graphics/qtgtl/Makefile
@@ -14,7 +14,7 @@ LICENSE=	LGPL20
 LIB_DEPENDS=	libGTLCore.so:graphics/opengtl
 
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
-USES=		cmake:outsource pkgconfig tar:bzip2
+USES=		cmake:outsource pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR:H:H}/graphics/opengtl/pkg-descr
@@ -26,9 +26,6 @@ OPTIONS_DEFINE=	EXAMPLES
 pre-configure:
 	@${REINPLACE_CMD} -e 's,set(QTGTL_LIB_SOVERSION.*,set(QTGTL_LIB_SOVERSION "0"),' \
 		${PATCH_WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's,$${LIB_INSTALL_DIR}/pkgconfig,${PREFIX}/libdata/pkgconfig,g' \
-		${PATCH_WRKSRC}/QtGTL/CMakeLists.txt \
-		${PATCH_WRKSRC}/QtShiva/CMakeLists.txt
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/graphics/s2tc/Makefile b/graphics/s2tc/Makefile
index 9a3920244e91..01833a950988 100644
--- a/graphics/s2tc/Makefile
+++ b/graphics/s2tc/Makefile
@@ -24,7 +24,6 @@ GH_ACCOUNT=	divVerent
 GH_TAGNAME=	f6ec862
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-PATHFIX_MAKEFILEIN=Makefile.am
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index 0278d65b06d3..b07dc47d6eb3 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -14,7 +14,6 @@ COMMENT=	SDL graphics drawing primitives and other support functions
 LICENSE=	ZLIB
 
 USES=		autoreconf gmake libtool pathfix
-PATHFIX_MAKEFILEIN=	Makefile.am
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include
diff --git a/graphics/sekrit-twc-zimg/Makefile b/graphics/sekrit-twc-zimg/Makefile
index b22dcba37ff8..78ad8beaaa4d 100644
--- a/graphics/sekrit-twc-zimg/Makefile
+++ b/graphics/sekrit-twc-zimg/Makefile
@@ -21,7 +21,6 @@ CONFLICTS_INSTALL=	zimg-[0-9]* # include/zimg.h
 
 USES=		autoreconf compiler:c++11-lib gmake libtool pathfix
 EXTRACT_AFTER_ARGS=	--exclude test/extra
-PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index c93b51d03700..2e211c9ccb12 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS=	liblept.so:graphics/leptonica
 
-USES=		localbase libtool
+USES=		localbase libtool pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -39,9 +39,6 @@ TOOLS_USE=	GNOME=cairo,glib20,pango
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3 -DNDEBUG||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
 
 post-build-TOOLS-on:
 	@cd ${WRKSRC} && ${MAKE} training
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index c366e74fb66d..045df636bd17 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libjbig.so:graphics/jbigkit
 
-USES=		cpe jpeg libtool
+USES=		cpe jpeg libtool pathfix
 CPE_PRODUCT=	libtiff
 CPE_VERSION=	${DISTVERSION:C/[a-z]+//}
 CPE_UPDATE=	${DISTVERSION:C/[0-9.]+//}
diff --git a/graphics/tiff/files/patch-Makefile.in b/graphics/tiff/files/patch-Makefile.in
index 93f54c1e6532..8da105dfde58 100644
--- a/graphics/tiff/files/patch-Makefile.in
+++ b/graphics/tiff/files/patch-Makefile.in
@@ -1,14 +1,5 @@
 --- Makefile.in.orig	2015-09-12 19:48:44 UTC
 +++ Makefile.in
-@@ -436,7 +436,7 @@ EXTRA_DIST = \
- 
- dist_doc_DATA = $(docfiles)
- SUBDIRS = port libtiff tools build contrib test man html
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libtiff-4.pc
- 
- # Special rules to assist with Coverity submissions.
 @@ -494,19 +494,6 @@ distclean-libtool:
  	-rm -f libtool config.lt
  install-dist_docDATA: $(dist_doc_DATA)
diff --git a/graphics/tiffgt/Makefile b/graphics/tiffgt/Makefile
index e7261ba9833b..b75b0b44c133 100644
--- a/graphics/tiffgt/Makefile
+++ b/graphics/tiffgt/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LIB_DEPENDS=	libjbig.so:graphics/jbigkit \
 		libtiff.so:graphics/tiff
 
-USES=		cpe jpeg libtool
+USES=		cpe jpeg libtool pathfix
 CPE_PRODUCT=	libtiff
 CPE_VERSION=	${DISTVERSION:C/[a-z]+//}
 CPE_UPDATE=	${DISTVERSION:C/[0-9.]+//}
diff --git a/graphics/tiffgt/files/patch-Makefile.in b/graphics/tiffgt/files/patch-Makefile.in
index 3e417c6525a4..23fda48cef41 100644
--- a/graphics/tiffgt/files/patch-Makefile.in
+++ b/graphics/tiffgt/files/patch-Makefile.in
@@ -1,14 +1,5 @@
 --- Makefile.in.orig	2015-06-21 19:07:53 UTC
 +++ Makefile.in
-@@ -434,7 +434,7 @@ EXTRA_DIST = \
- 
- dist_doc_DATA = $(docfiles)
- SUBDIRS = port libtiff tools build contrib test man html
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libtiff-4.pc
- all: all-recursive
- 
 @@ -485,19 +485,6 @@ distclean-libtool:
  	-rm -f libtool config.lt
  install-dist_docDATA: $(dist_doc_DATA)
diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile
index 592863a66adc..89777b28006a 100644
--- a/graphics/waffle/Makefile
+++ b/graphics/waffle/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library that allows to defer selection of an OpenGL API until runtime
 
 LICENSE=	BSD2CLAUSE
 
-USES=		cmake:outsource compiler:c11 localbase ninja pkgconfig tar:xz
+USES=		cmake:outsource compiler:c11 localbase ninja pathfix pkgconfig tar:xz
 USE_GL=		egl gl
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xcb
diff --git a/graphics/waffle/files/patch-CMakeLists.txt b/graphics/waffle/files/patch-CMakeLists.txt
deleted file mode 100644
index 3f7ae4c311ef..000000000000
--- a/graphics/waffle/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2015-01-22 20:00:17 UTC
-+++ CMakeLists.txt
-@@ -136,7 +136,7 @@ configure_file(waffle.pc.in ${waffle_lib
- 
- install(
-     FILES ${CMAKE_BINARY_DIR}/${waffle_libname}.pc
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-+    DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig
-     COMPONENT pkgconfig
-     )
- 
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index 3fde4bc43d98..741bcc4dea16 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	libcairo.so:graphics/cairo \
 BUILD_DEPENDS+=	rst2html:textproc/py-docutils
 
 USE_GNOME=	glib20 gtk30 gdkpixbuf2
-USES=		compiler:c11 gmake pkgconfig
+USES=		compiler:c11 gmake pathfix pkgconfig
+PATHFIX_MAKEFILEIN=	Makefile
 MAKE_ENV=	SFLAGS="${STRIP}" \
 		RSTTOMAN=${LOCALBASE}/bin/rst2man \
 		ZLIB_INC= \
@@ -39,7 +40,6 @@ NLS_USES=		gettext
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|man[15]|man/&|g' \
-		-e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g'\
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\
 		${WRKSRC}/config.mk
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index a981df8aeb2c..b1017ea9ed34 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -14,7 +14,7 @@ LICENSE=	LGPL21
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		iconv jpeg libtool gmake pkgconfig
+USES=		iconv jpeg libtool gmake pathfix pkgconfig
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--with-jpeg=yes
@@ -52,10 +52,6 @@ QT4_CONFIGURE_OFF=	--with-qt=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-post-patch:
-	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
-
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \
 		${WRKSRC}/Makefile.in