Attachment 175622 Details for Bug 213195 – v3

[patch] v3

pathfix.diff (text/plain), 220.17 KB, created by Mathieu Arnold on 2016-10-11 13:35:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2016-10-11 13:35:13 UTC

Size: 220.17 KB

patch

obsolete

>diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk
>index c120b6f..0306f6d 100644
>--- a/Mk/Uses/pathfix.mk
>+++ b/Mk/Uses/pathfix.mk
>@@ -17,7 +17,11 @@ IGNORE=	USES=pathfix does not require args
> .endif
> 
> PATHFIX_CMAKELISTSTXT?=	CMakeLists.txt
>+.if ${USES:Mautoreconf*}
>+PATHFIX_MAKEFILEIN?=	Makefile.am
>+.else
> PATHFIX_MAKEFILEIN?=	Makefile.in
>+.endif
> PATHFIX_WRKSRC?=	${WRKSRC}
> 
> _USES_patch+=	190:pathfix
>@@ -39,10 +43,14 @@ pathfix:
> 		's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
> 		s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
> 		s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
>+		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|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
>+		s|[{]datadir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
> 		s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
>+		s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \
> 		s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
> 		s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
> .endif
>diff --git a/archivers/lhasa/Makefile b/archivers/lhasa/Makefile
>index 96901aa..14de1c0 100644
>--- a/archivers/lhasa/Makefile
>+++ b/archivers/lhasa/Makefile
>@@ -14,7 +14,6 @@ LICENSE=	ISCL
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		autoreconf pathfix libtool
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> CONFIGURE_ARGS=	--program-suffix=sa
>diff --git a/archivers/liblz4/Makefile b/archivers/liblz4/Makefile
>index d9b20fc..0686c51 100644
>--- a/archivers/liblz4/Makefile
>+++ b/archivers/liblz4/Makefile
>@@ -16,20 +16,19 @@ LICENSE_COMB=	multi
> USE_GITHUB=	yes
> GH_ACCOUNT=	Cyan4973
> 
>-USES=		gmake pkgconfig
>+USES=		gmake pathfix pkgconfig
> USE_LDCONFIG=	yes
>+PATHFIX_MAKEFILEIN=	Makefile
> 
> ALL_TARGET=	default		# don't remove this
> SO_VER=		1.7.1
> PLIST_SUB+=	SO_VER=${SO_VER} SO_VER_MAJ=${SO_VER:R:R}
>+LIBDIR=		${PREFIX}/lib
> 
> post-patch:
> 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
>-		-e 's/LIBDIR?=/LOCALLIBDIR=/; s/$$(LIBDIR)/$$(LOCALLIBDIR)/g' \
>-		-e 's|$$(LOCALLIBDIR)/pkgconfig|$$(PREFIX)/libdata/pkgconfig|' \
> 		-e '/^MANDIR :=/s|share/||' \
>-		-e 's/kFreeBSD/& FreeBSD/' \
>-		-e 's|$$(MAKE)|${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}|'
>+		-e 's/kFreeBSD/& FreeBSD/'
> 	@${REINPLACE_CMD} -e '/^all:/s/$$/ liblz4.pc/' \
> 		${WRKSRC}/lib/Makefile
> 	@${REINPLACE_CMD} -e '/^all:/s|fullbench.*||' \
>diff --git a/archivers/minizip/Makefile b/archivers/minizip/Makefile
>index 76678a4..af42e54 100644
>--- a/archivers/minizip/Makefile
>+++ b/archivers/minizip/Makefile
>@@ -14,7 +14,6 @@ COMMENT=	Zip library and programs from Zlib distribution
> LICENSE=	ZLIB
> 
> USES=		autoreconf libtool pathfix tar:xz
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-demos
> INSTALL_TARGET=	install-strip
>diff --git a/archivers/unadf/Makefile b/archivers/unadf/Makefile
>index 86fb3e0..a2fb04c 100644
>--- a/archivers/unadf/Makefile
>+++ b/archivers/unadf/Makefile
>@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--includedir=${PREFIX}/include/adflib
> INSTALL_TARGET=	install-strip
> USES=		autoreconf libtool pathfix tar:bzip2
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
>index 2141d44..96819c4 100644
>--- a/audio/libaacplus/Makefile
>+++ b/audio/libaacplus/Makefile
>@@ -28,7 +28,6 @@ CONFLICTS=	aacplusenc-0*
> USE_CSTD=	gnu89
> USES=		autoreconf pathfix pkgconfig libtool
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
> INSTALL_TARGET=	install-strip
>diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
>index 2f4ed41..88eef05 100644
>--- a/audio/libadplug/Makefile
>+++ b/audio/libadplug/Makefile
>@@ -15,7 +15,7 @@ LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libbinio.so:devel/libbinio
> 
>-USES=		pkgconfig libtool makeinfo
>+USES=		libtool makeinfo pathfix pkgconfig
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> USE_CSTD=	gnu89
>@@ -38,9 +38,6 @@ post-patch:
> 		${WRKSRC}/src/fprovide.cpp \
> 		${WRKSRC}/src/database.cpp \
> 		${WRKSRC}/src/dmo.cpp
>-	@${REINPLACE_CMD} -e 's|^$pkgconfigdir\ =$.*|\1 $$(prefix)/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.in \
>-		${WRKSRC}/Makefile.am
> 	@${REINPLACE_CMD} -e 's/-lstdc++//g' ${WRKSRC}/configure
> 
> .include <bsd.port.mk>
>diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
>index 0d5b4c4..551822f 100644
>--- a/audio/libmikmod/Makefile
>+++ b/audio/libmikmod/Makefile
>@@ -11,7 +11,7 @@ COMMENT=	MikMod Sound Library
> 
> LICENSE=	LGPL21
> 
>-USES=		cpe gmake libtool pkgconfig
>+USES=		cpe gmake libtool pathfix pkgconfig
> CPE_VENDOR=	raphael_assenat
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-esd
>diff --git a/audio/libmikmod/files/patch-Makefile.in b/audio/libmikmod/files/patch-Makefile.in
>deleted file mode 100644
>index 5ba9285..0000000
>--- a/audio/libmikmod/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2015-11-11 10:02:02 UTC
>-+++ Makefile.in
>-@@ -372,7 +372,7 @@ EXTRA_DIST = libmikmod-config.in libmikm
>- 
>- m4datadir = $(datadir)/aclocal
>- m4data_DATA = libmikmod.m4
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = libmikmod.pc
>- ACLOCAL_AMFLAGS = -I m4
>- 
>diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
>index 8fc094b..c5d9d8d 100644
>--- a/audio/libtremor/Makefile
>+++ b/audio/libtremor/Makefile
>@@ -16,7 +16,6 @@ LIB_DEPENDS=	libogg.so:audio/libogg
> 
> GIT_COMMIT=	b56ffc
> USES=		autoreconf libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
>diff --git a/audio/libxmp/Makefile b/audio/libxmp/Makefile
>index 81e8f1b..d8a7bbe 100644
>--- a/audio/libxmp/Makefile
>+++ b/audio/libxmp/Makefile
>@@ -9,7 +9,7 @@ MASTER_SITES=	SF/xmp/${PORTNAME}/${PORTVERSION}
> MAINTAINER=	ehaupt@FreeBSD.org
> COMMENT=	Module rendering library for xmp
> 
>-USES=		gmake
>+USES=		gmake pathfix
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>diff --git a/audio/libxmp/files/patch-Makefile.in b/audio/libxmp/files/patch-Makefile.in
>deleted file mode 100644
>index 4947192..0000000
>--- a/audio/libxmp/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- Makefile.in.orig	2016-07-16 11:29:48 UTC
>-+++ Makefile.in
>-@@ -146,8 +146,8 @@ install: all
>- 	@echo "Installing xmp.h..."
>- 	@$(INSTALL) -m644 include/xmp.h $(DESTDIR)$(INCLUDEDIR)
>- 	@echo "Installing libxmp.pc..."
>--	@mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
>--	@$(INSTALL) -m644 libxmp.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
>-+	@mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
>-+	@$(INSTALL) -m644 libxmp.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
>- 
>- depend:
>- 	@echo Building dependencies...
>diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
>index d2f3661..52c590e 100644
>--- a/audio/opusfile/Makefile
>+++ b/audio/opusfile/Makefile
>@@ -19,7 +19,6 @@ USES=		autoreconf gmake libtool pathfix pkgconfig ssl
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> PORTDOCS=	AUTHORS README.txt
> 
>diff --git a/audio/rubberband/Makefile b/audio/rubberband/Makefile
>index 9363733..a0fc1d8 100644
>--- a/audio/rubberband/Makefile
>+++ b/audio/rubberband/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
> 		libfftw3.so:math/fftw3
> RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
> 
>-USES=		gmake pkgconfig tar:bzip2
>+USES=		gmake pathfix pkgconfig tar:bzip2
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>diff --git a/audio/rubberband/files/patch-Makefile.in b/audio/rubberband/files/patch-Makefile.in
>deleted file mode 100644
>index 1042756..0000000
>--- a/audio/rubberband/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2012-10-28 10:30:09 UTC
>-+++ Makefile.in
>-@@ -32,7 +32,7 @@ INSTALL_LIBDIR		:= @prefix@/lib
>- INSTALL_VAMPDIR		:= @prefix@/lib/vamp
>- INSTALL_LADSPADIR	:= @prefix@/lib/ladspa
>- INSTALL_LRDFDIR		:= @prefix@/share/ladspa/rdf
>--INSTALL_PKGDIR		:= @prefix@/lib/pkgconfig
>-+INSTALL_PKGDIR		:= @prefix@/libdata/pkgconfig
>- 
>- all:	bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
>- 
>diff --git a/audio/shout-idjc/Makefile b/audio/shout-idjc/Makefile
>index a14afc1..a0362eb 100644
>--- a/audio/shout-idjc/Makefile
>+++ b/audio/shout-idjc/Makefile
>@@ -20,7 +20,6 @@ LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
> 
> GNU_CONFIGURE=	yes
> USES=		libtool pathfix pkgconfig autoreconf
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile
>index 7c03f11..309a31b 100644
>--- a/audio/soundtouch/Makefile
>+++ b/audio/soundtouch/Makefile
>@@ -17,7 +17,6 @@ GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
> USES=			autoreconf libtool pathfix
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> OPTIONS_DEFINE=	INTEGER_SAMPLES DOCS OPENMP
> OPTIONS_DEFAULT=	${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/}
>diff --git a/audio/vamp-plugin-sdk/Makefile b/audio/vamp-plugin-sdk/Makefile
>index 98f292c..885a360 100644
>--- a/audio/vamp-plugin-sdk/Makefile
>+++ b/audio/vamp-plugin-sdk/Makefile
>@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libsndfile.so:audio/libsndfile
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake pkgconfig
>+USES=		gmake pathfix pkgconfig
> USE_LDCONFIG=	yes
> 
> post-install:
>diff --git a/audio/vamp-plugin-sdk/files/patch-Makefile.in b/audio/vamp-plugin-sdk/files/patch-Makefile.in
>index aa7d079..6418823 100644
>--- a/audio/vamp-plugin-sdk/files/patch-Makefile.in
>+++ b/audio/vamp-plugin-sdk/files/patch-Makefile.in
>@@ -1,11 +1,6 @@
> --- Makefile.in.orig	2015-06-22 08:28:58 UTC
> +++ Makefile.in
>-@@ -90,11 +90,11 @@ INSTALL_HOSTSDK_LINK_DEV  = libvamp-host
>- INSTALL_HOSTSDK_STATIC    = libvamp-hostsdk.a
>- INSTALL_HOSTSDK_LA        = libvamp-hostsdk.la
>- 
>--INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/lib/pkgconfig
>-+INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/libdata/pkgconfig
>+@@ -94,7 +94,7 @@ INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/
>  
>  # Flags required to tell the compiler to create a dynamically loadable object
>  #
>diff --git a/biology/htslib/Makefile b/biology/htslib/Makefile
>index d906a34..1a080d9 100644
>--- a/biology/htslib/Makefile
>+++ b/biology/htslib/Makefile
>@@ -17,10 +17,11 @@ TEST_DEPENDS=	bash:shells/bash
> USE_GITHUB=	yes
> GH_ACCOUNT=	samtools
> 
>-USES=		autoreconf gmake perl5 shebangfix
>+USES=		autoreconf gmake pathfix perl5 shebangfix
> USE_PERL5=	test
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>+PATHFIX_MAKEFILEIN=	Makefile
> SHEBANG_FILES=	test/compare_sam.pl test/test.pl
> 
> OPTIONS_DEFINE=		CURL
>diff --git a/biology/htslib/files/patch-Makefile b/biology/htslib/files/patch-Makefile
>index cb35c2f..3a2b195 100644
>--- a/biology/htslib/files/patch-Makefile
>+++ b/biology/htslib/files/patch-Makefile
>@@ -1,4 +1,4 @@
>---- Makefile.orig	2015-12-15 16:34:33 UTC
>+--- Makefile.orig	2016-04-22 08:45:12 UTC
> +++ Makefile
> @@ -22,16 +22,7 @@
>  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>@@ -17,7 +17,7 @@
>  
>  # For now these don't work too well as samtools also needs to know to
>  # add -lbz2 and -llzma if linking against the static libhts.a library.
>-@@ -58,16 +49,10 @@ includedir  = $(prefix)/include
>+@@ -58,17 +49,11 @@ includedir  = $(prefix)/include
>  libdir      = $(exec_prefix)/lib
>  libexecdir  = $(exec_prefix)/libexec
>  datarootdir = $(prefix)/share
>@@ -25,17 +25,17 @@
> +mandir      = $(prefix)/man
>  man1dir     = $(mandir)/man1
>  man5dir     = $(mandir)/man5
>--pkgconfigdir= $(libdir)/pkgconfig
>--
>+ pkgconfigdir= $(prefix)/libdata/pkgconfig
>+ 
> -MKDIR_P = mkdir -p
> -INSTALL = install -p
> -INSTALL_PROGRAM = $(INSTALL)
> -INSTALL_DATA    = $(INSTALL) -m 644
> -INSTALL_DIR     = $(MKDIR_P) -m 755
>-+pkgconfigdir= $(exec_prefix)/libdata/pkgconfig
>- 
>+-
>  # Set by config.mk if plugins are enabled
>  plugindir =
>+ 
> @@ -86,7 +71,7 @@ BUILT_TEST_PROGRAMS = \
>  	test/test-vcf-api \
>  	test/test-vcf-sweep
>@@ -45,7 +45,7 @@
>  
>  HTSPREFIX =
>  include htslib_vars.mk
>-@@ -361,7 +346,7 @@ installdirs:
>+@@ -360,7 +345,7 @@ installdirs:
>  # and libhts.so.NN (used by client executables at runtime).
>  
>  install-so: libhts.so installdirs
>diff --git a/biology/jellyfish/Makefile b/biology/jellyfish/Makefile
>index 92c3e8e..835189d 100644
>--- a/biology/jellyfish/Makefile
>+++ b/biology/jellyfish/Makefile
>@@ -17,7 +17,7 @@ BUILD_DEPENDS=	yaggo:devel/yaggo
> GNU_CONFIGURE=	yes
> 
> USES=		autoreconf compiler:c++11-lib gmake \
>-		libtool pkgconfig
>+		libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> 
> USE_GITHUB=	yes
>@@ -35,10 +35,4 @@ BROKEN_FreeBSD_9_i386=	multiple code issues on i386 < 10.0-RELEASE
> CONFIGURE_ARGS+=--without-sse
> .endif
> 
>-# configure does not support --with-pkgconfigdir
>-post-patch:
>-	@${REINPLACE_CMD} \
>-		-e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.am
>-
> .include <bsd.port.post.mk>
>diff --git a/biology/libgtextutils/Makefile b/biology/libgtextutils/Makefile
>index 1cc106e..04037d5 100644
>--- a/biology/libgtextutils/Makefile
>+++ b/biology/libgtextutils/Makefile
>@@ -10,7 +10,7 @@ COMMENT=	Gordon's text utilities
> 
> LICENSE=	AGPLv3
> 
>-USES=		autoreconf libtool pkgconfig
>+USES=		autoreconf libtool pathfix pkgconfig
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>@@ -19,9 +19,4 @@ GH_ACCOUNT=	agordon
> 
> INSTALL_TARGET=	install-strip
> 
>-post-patch:
>-	@${REINPLACE_CMD} \
>-		's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.am
>-
> .include <bsd.port.mk>
>diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile
>index 75f9a70..bf17914 100644
>--- a/chinese/librime/Makefile
>+++ b/chinese/librime/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
> 		libopencc.so:chinese/opencc \
> 		libyaml-cpp.so:devel/yaml-cpp
> 
>-USES=		cmake compiler:c++11-lib pkgconfig gettext perl5
>+USES=		cmake compiler:c++11-lib pathfix pkgconfig gettext perl5
> USE_PERL5=	build patch
> USE_LDCONFIG=	yes
> USE_XORG=	xproto
>diff --git a/chinese/librime/files/patch-CMakeLists.txt b/chinese/librime/files/patch-CMakeLists.txt
>index be56ba2..301102a 100644
>--- a/chinese/librime/files/patch-CMakeLists.txt
>+++ b/chinese/librime/files/patch-CMakeLists.txt
>@@ -9,15 +9,6 @@
>    # uninstall target
>    configure_file(
>      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
>-@@ -142,7 +142,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
>-       ${PROJECT_BINARY_DIR}/rime.pc
>-       @ONLY)
>-   install(FILES include/rime_api.h DESTINATION include)
>--  install(FILES ${PROJECT_BINARY_DIR}/rime.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
>-+  install(FILES ${PROJECT_BINARY_DIR}/rime.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
>-   install(FILES cmake/RimeConfig.cmake DESTINATION share/cmake/rime)
>-   if(BUILD_DATA)
>-     install(FILES ${PROJECT_SOURCE_DIR}/data/default.yaml DESTINATION ${pkgdatadir})
> @@ -153,7 +153,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
>      file(GLOB supplement_schema ${PROJECT_SOURCE_DIR}/data/supplement/*.yaml)
>      install(FILES ${supplement_schema} DESTINATION ${pkgdatadir})
>diff --git a/chinese/pyzy/Makefile b/chinese/pyzy/Makefile
>index e83c030..19315c7 100644
>--- a/chinese/pyzy/Makefile
>+++ b/chinese/pyzy/Makefile
>@@ -18,7 +18,7 @@ BROKEN=		Unfetchable (google code has gone away)
> 
> LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
> 
>-USES=		compiler:c++11-lib gettext-runtime gmake libtool pkgconfig python:build shebangfix
>+USES=		compiler:c++11-lib gettext-runtime gmake libtool pathfix pkgconfig python:build shebangfix
> SHEBANG_FILES=	data/db/android/create_db.py
> USE_GNOME=	glib20
> USE_LDCONFIG=	yes
>@@ -47,9 +47,6 @@ OPENCC_LIB_DEPENDS=		libopencc.so:chinese/opencc
> post-extract-OPENPHRASE_DB-on:
> 	@${CP} ${DISTDIR}/${OPENPHRASE_DBFILE} ${WRKSRC}/data/db/open-phrase
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
>-
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-1.0.so
> 
>diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
>index 9501904..bbd8df2 100644
>--- a/comms/hamlib/Makefile
>+++ b/comms/hamlib/Makefile
>@@ -15,7 +15,7 @@ BUILD_DEPENDS=	swig:devel/swig13
> LIB_DEPENDS=	libltdl.so:devel/libltdl
> 
> INFO=		hamlib
>-USES=		autoreconf libtool:keepla pathfix perl5 pkgconfig python shebangfix tcl
>+USES=		autoreconf libtool:keepla pathfix perl5 pathfix pkgconfig python shebangfix tcl
> USE_PYTHON=	py3kplist
> SHEBANG_FILES=	bindings/perltest.pl
> USE_PERL5=	build run
>diff --git a/comms/hamlib/files/patch-Makefile.am b/comms/hamlib/files/patch-Makefile.am
>deleted file mode 100644
>index 85ed516..0000000
>--- a/comms/hamlib/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.am.orig	2015-09-19 12:08:54 UTC
>-+++ Makefile.am
>-@@ -3,7 +3,7 @@
>- aclocaldir = $(datadir)/aclocal
>- aclocal_DATA = hamlib.m4
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = hamlib.pc
>- 
>- EXTRA_DIST = PLAN TODO LICENSE hamlib.m4 hamlib.pc.in README.developer \
>diff --git a/comms/libirman/Makefile b/comms/libirman/Makefile
>index 8304dc7..08562e3 100644
>--- a/comms/libirman/Makefile
>+++ b/comms/libirman/Makefile
>@@ -11,7 +11,7 @@ COMMENT=	Library for Evation's Irman infrared receiver
> 
> LICENSE=	LGPL20
> 
>-USES=		gmake libtool tar:bzip2
>+USES=		gmake libtool pathfix tar:bzip2
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>diff --git a/comms/libirman/files/patch-Makefile.in b/comms/libirman/files/patch-Makefile.in
>index 5e57722..5a9d392 100644
>--- a/comms/libirman/files/patch-Makefile.in
>+++ b/comms/libirman/files/patch-Makefile.in
>@@ -1,14 +1,5 @@
> --- Makefile.in.orig	2015-08-18 19:51:04 UTC
> +++ Makefile.in
>-@@ -399,7 +399,7 @@ top_srcdir = @top_srcdir@
>- AUTOMAKE_OPTIONS = foreign dist-bzip2
>- ACLOCAL_AMFLAGS = -I m4
>- dist_doc_DATA = README TECHNICAL
>--pkgconfigdir = @libdir@/pkgconfig
>-+pkgconfigdir = @prefix@/libdata/pkgconfig
>- dist_pkgconfig_DATA = libirman.pc
>- EXTRA_DIST = COPYING.lib TECHNICAL libirman.pc.in
>- EXTRA_LTLIBRARIES = libirman_sw.la
> @@ -778,7 +778,7 @@ install-dist_sysconfDATA: $(dist_sysconf
>  	done | $(am__base_list) | \
>  	while read files; do \
>diff --git a/comms/rtl-sdr/Makefile b/comms/rtl-sdr/Makefile
>index eabb26d..741c227 100644
>--- a/comms/rtl-sdr/Makefile
>+++ b/comms/rtl-sdr/Makefile
>@@ -13,7 +13,7 @@ COMMENT=	Commandline tool that performs SDR with RTL2832-based USB sticks
> 
> LICENSE=	GPLv2
> 
>-USES=		autoreconf gmake pkgconfig libtool tar:tgz
>+USES=		autoreconf gmake pkgconfig libtool pathfix tar:tgz
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -31,7 +31,5 @@ DOXYGEN_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile.am
> post-patch:
> 	@${REINPLACE_CMD} 's|^pkgdocdir=.*|pkgdocdir=${DOCSDIR}|' \
> 		${WRKSRC}/Makefile.am
>-	@${REINPLACE_CMD} 's|^pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.am
> 
> .include <bsd.port.mk>
>diff --git a/comms/unixcw/Makefile b/comms/unixcw/Makefile
>index 00fb3b2..1866fc6 100644
>--- a/comms/unixcw/Makefile
>+++ b/comms/unixcw/Makefile
>@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--includedir="${LOCALBASE}/include" \
> 			--disable-alsa --disable-pulseaudio
> 
> USE_LDCONFIG=	yes
>-USES+=		gmake libtool ncurses pkgconfig
>+USES+=		gmake libtool ncurses pathfix pkgconfig
> USE_CSTD=	gnu99
> WRKSRC=		${WRKDIR}/unixcw-${PORTVERSION}
> MAJOR_LIB_VER=	6
>diff --git a/comms/unixcw/files/patch-src_libcw_Makefile.in b/comms/unixcw/files/patch-src_libcw_Makefile.in
>deleted file mode 100644
>index 62f8fe4..0000000
>--- a/comms/unixcw/files/patch-src_libcw_Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/libcw/Makefile.in.orig	2015-10-06 17:17:18 UTC
>-+++ src/libcw/Makefile.in
>-@@ -676,7 +676,7 @@ libcw_test_internal_LDADD = -lm -lpthrea
>- libcw_test_internal_CFLAGS = -rdynamic
>- 
>- # target: libcw.pc
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = ${prefix}/libdata/pkgconfig
>- 
>- # CLEANFILES extends list of files that need to be removed when
>- # calling "make clean"
>diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
>index cc41907..f51f3ca 100644
>--- a/databases/akonadi/Makefile
>+++ b/databases/akonadi/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
> BUILD_DEPENDS=	xsltproc:textproc/libxslt
> 
> USES=		cmake:outsource execinfo kde:4 shared-mime-info \
>-		compiler:c++11-lang tar:bzip2
>+		compiler:c++11-lang pathfix tar:bzip2
> USE_KDE=	automoc4 soprano
> USE_QT4=	corelib dbus gui network qtestlib_build sql xml \
> 		moc_build qmake_build rcc_build uic_build
>@@ -48,8 +48,6 @@ SQLITE_CMAKE_OFF=	-DAKONADI_BUILD_QSQLITE=off
> OPTIONS_DEFAULT=	MYSQL
> 
> post-patch:
>-	${REINPLACE_CMD} -e '/akonadi.pc/ s|pkgconfig|../libdata/pkgconfig|' \
>-		${PATCH_WRKSRC}/CMakeLists.txt
> 	${REINPLACE_CMD} -e '/find_program/ s|mysqld|mysqld_safe ${LOCALBASE}/bin|g' \
> 		${PATCH_WRKSRC}/server/CMakeLists.txt
> 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>diff --git a/databases/libdrizzle/Makefile b/databases/libdrizzle/Makefile
>index 6c7396e..8b592b6 100644
>--- a/databases/libdrizzle/Makefile
>+++ b/databases/libdrizzle/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
> OPTIONS_DEFINE=	DOXYGEN EXAMPLES DOCS
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake libtool
>+USES=		gmake libtool pathfix
> CONFIGURE_ARGS+=--enable-libsqlite3
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
>diff --git a/databases/libdrizzle/files/patch-Makefile.in b/databases/libdrizzle/files/patch-Makefile.in
>deleted file mode 100644
>index 4a44232..0000000
>--- a/databases/libdrizzle/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- ./Makefile.in.orig	2010-03-12 12:09:51.000000000 -0500
>-+++ ./Makefile.in	2010-03-12 12:10:03.000000000 -0500
>-@@ -526,7 +526,7 @@
>- 	docs/doxygen.h \
>- 	tests/run.sh
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = support/libdrizzle.pc
>- TESTS_ENVIRONMENT = ${top_srcdir}/tests/run.sh
>- TESTS = $(check_PROGRAMS)
>diff --git a/databases/libmongo-client/Makefile b/databases/libmongo-client/Makefile
>index 6e8a572..8d20b9c 100644
>--- a/databases/libmongo-client/Makefile
>+++ b/databases/libmongo-client/Makefile
>@@ -19,6 +19,5 @@ GNU_CONFIGURE=	yes
> USES=		autoreconf libtool pkgconfig gmake pathfix
> USE_GNOME=	glib20
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=Makefile.am
> 
> .include <bsd.port.mk>
>diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
>index 7690c8b..e415624 100644
>--- a/databases/mdbtools/Makefile
>+++ b/databases/mdbtools/Makefile
>@@ -22,7 +22,6 @@ OPTIONS_SUB=	yes
> USES=		autoreconf bison iconv libtool pathfix pkgconfig
> USE_GITHUB=	yes
> GH_ACCOUNT=	brianb
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_LDCONFIG=	yes
> USE_GNOME=	glib20
> GNU_CONFIGURE=	yes
>diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
>index fa0f147..a3b3aa3 100644
>--- a/databases/opendbx/Makefile
>+++ b/databases/opendbx/Makefile
>@@ -12,7 +12,7 @@ COMMENT=	C library for accessing databases with a single API
> 
> LICENSE=	LGPL21
> 
>-USES=		gmake libtool readline
>+USES=		gmake libtool pathfix readline
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-lpthread -L${WRKSRC}/lib -L${LOCALBASE}/lib
>diff --git a/databases/opendbx/files/patch-Makefile.in b/databases/opendbx/files/patch-Makefile.in
>deleted file mode 100644
>index 0e25f1e1..0000000
>--- a/databases/opendbx/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- ./Makefile.in.orig	2012-06-10 18:33:53.000000000 -0300
>-+++ ./Makefile.in	2014-01-19 00:08:50.000000000 -0200
>-@@ -308,7 +308,7 @@
>- 	opendbx.spec \
>- 	ABOUT-NLS
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(exec_prefix)/libdata/pkgconfig
>- pkgconfig_DATA = opendbx.pc opendbxplus.pc
>- all: config.h
>- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
>diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
>index ed9ed98..89228c5 100644
>--- a/databases/postgresql-libpqxx/Makefile
>+++ b/databases/postgresql-libpqxx/Makefile
>@@ -17,7 +17,7 @@ LICENSE=	BSD3CLAUSE
> CONFLICTS=	postgresql-libpqxx-3.* postgresql-libpqxx3-3.*
> PORTSCOUT=	limit:^2\.
> 
>-USES+=		gmake libtool pgsql python:build shebangfix
>+USES+=		gmake libtool pathfix pgsql python:build shebangfix
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
>diff --git a/databases/postgresql-libpqxx/files/patch-Makefile.in b/databases/postgresql-libpqxx/files/patch-Makefile.in
>deleted file mode 100644
>index 3d2b02a..0000000
>--- a/databases/postgresql-libpqxx/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2011-09-12 11:39:56.000000000 +0200
>-+++ Makefile.in	2011-09-12 11:40:48.000000000 +0200
>-@@ -270,7 +270,7 @@
>- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \
>- 	stamp-h.in
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = libpqxx.pc
>- bin_SCRIPTS = pqxx-config
>- all: all-recursive
>diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
>index 9acfb01..591a12c 100644
>--- a/databases/postgresql-libpqxx3/Makefile
>+++ b/databases/postgresql-libpqxx3/Makefile
>@@ -16,7 +16,7 @@ COMMENT=	New C++ interface for PostgreSQL
> CONFLICTS=	postgresql-libpqxx-[2-4].*
> PORTSCOUT=	limit:^2\.
> 
>-USES+=		gmake libtool pgsql pkgconfig python:build shebangfix
>+USES+=		gmake libtool pathfix pgsql pkgconfig python:build shebangfix
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
>diff --git a/databases/postgresql-libpqxx3/files/patch-Makefile.in b/databases/postgresql-libpqxx3/files/patch-Makefile.in
>deleted file mode 100644
>index 3d2b02a..0000000
>--- a/databases/postgresql-libpqxx3/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2011-09-12 11:39:56.000000000 +0200
>-+++ Makefile.in	2011-09-12 11:40:48.000000000 +0200
>-@@ -270,7 +270,7 @@
>- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \
>- 	stamp-h.in
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = libpqxx.pc
>- bin_SCRIPTS = pqxx-config
>- all: all-recursive
>diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
>index 8933b8c..6fd3199 100644
>--- a/databases/sqlite2/Makefile
>+++ b/databases/sqlite2/Makefile
>@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
> COMMENT=	SQL database engine in a C library
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake libtool pkgconfig readline
>+USES=		gmake libtool pathfix pkgconfig readline
> USE_LDCONFIG=	yes
> 
> CONFIGURE_ARGS=	--with-hints=freebsd.hints
>diff --git a/databases/sqlite2/files/patch-Makefile.in b/databases/sqlite2/files/patch-Makefile.in
>index 59f1598..64cb2b0 100644
>--- a/databases/sqlite2/files/patch-Makefile.in
>+++ b/databases/sqlite2/files/patch-Makefile.in
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2005-04-23 18:43:23.000000000 -0400
>-+++ Makefile.in	2015-03-26 18:36:07.358178000 -0400
>-@@ -38,7 +38,7 @@
>+--- Makefile.in.orig	2005-04-23 22:43:23 UTC
>++++ Makefile.in
>+@@ -38,7 +38,7 @@ RELEASE = @ALLOWRELEASE@
>  
>  # libtool compile/link/install
>  LTCOMPILE = $(LIBTOOL) --mode=compile $(TCC)
>@@ -9,18 +9,14 @@
>  LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
>  
>  # Compiler options needed for programs that use the TCL library.
>-@@ -471,8 +471,12 @@
>- 	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
>- 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
>- 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
>--	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
>--	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
>-+	$(INSTALL) -d $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig
>-+	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig
>-+
>+@@ -474,6 +474,10 @@ install:	sqlite libsqlite.la sqlite.h
>+ 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
>+ 	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
>+ 
> +install-tcl:	libtclsqlite.la
> +	$(INSTALL) -d $(DESTDIR)$(prefix)/lib/sqlite
> +	$(LTINSTALL) libtclsqlite.la $(DESTDIR)$(prefix)/lib/sqlite
>- 
>++
>  clean:	
>  	rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
>+ 	rm -rf .libs .deps 
>diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
>index 4f43829..51562be 100644
>--- a/databases/sqlrelay/Makefile
>+++ b/databases/sqlrelay/Makefile
>@@ -14,7 +14,8 @@ LICENSE=	LGPL20
> LIB_DEPENDS=	librudiments.so:devel/rudiments
> 
> WANT_GNOME=	yes
>-USES=		gmake libtool python
>+USES=		gmake libtool pathfix python
>+PATHFIX_MAKEFILEIN=	Makefile
> CPPFLAGS+=	-I${LOCALBASE}/include
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
>diff --git a/databases/sqlrelay/files/patch-Makefile b/databases/sqlrelay/files/patch-Makefile
>index d6de735..1647709 100644
>--- a/databases/sqlrelay/files/patch-Makefile
>+++ b/databases/sqlrelay/files/patch-Makefile
>@@ -1,6 +1,6 @@
> --- Makefile.orig	2016-01-17 07:20:04 UTC
> +++ Makefile
>-@@ -30,16 +30,13 @@ install-doc:
>+@@ -30,9 +30,6 @@ install-doc:
>  	cd doc $(AND) $(MAKE) install
>  
>  install-license:
>@@ -9,19 +9,7 @@
> -	$(CHMOD) 0644 $(licensedir)/COPYING
>  
>  install-pkgconfig:
>--	$(MKINSTALLDIRS) $(libdir)/pkgconfig
>--	$(CP) sqlrelay-c.pc $(libdir)/pkgconfig/$(SQLRELAY)-c.pc
>--	$(CHMOD) 0644 $(libdir)/pkgconfig/$(SQLRELAY)-c.pc
>--	$(CP) sqlrelay-c++.pc $(libdir)/pkgconfig/$(SQLRELAY)-c++.pc
>--	$(CHMOD) 0644 $(libdir)/pkgconfig/$(SQLRELAY)-c++.pc
>-+	$(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
>-+	$(CP) sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc
>-+	$(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c.pc
>-+	$(CP) sqlrelay-c++.pc $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc
>-+	$(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc
>- 
>- uninstall: $(UNINSTALLSUBDIRS)
>- 	$(RMTREE) $(libexecdir)
>+ 	$(MKINSTALLDIRS) $(libdir)/pkgconfig
> @@ -63,7 +60,6 @@ uninstall-doc:
>  	cd doc $(AND) $(MAKE) uninstall
>  
>diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
>index 297382d..d62b1d2 100644
>--- a/databases/tokyocabinet/Makefile
>+++ b/databases/tokyocabinet/Makefile
>@@ -14,7 +14,7 @@ LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake
>+USES=		pathfix gmake
> USE_LDCONFIG=	yes
> 
> PORTDOCS=	*
>@@ -66,11 +66,8 @@ SHLIB_VER_MAJ=	9
> 
> PLIST_SUB+=	SHLIB_VER=${SHLIB_VER} SHLIB_VER_MAJ=${SHLIB_VER_MAJ}
> 
>-# Because gnomehack will search "(libdir)" and it doesn't work, we need
>-# to patch it manually.
> post-patch:
>-	${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
>-		-e 's|@datarootdir@|@datarootdir@/doc|' \
>+	${REINPLACE_CMD} -e 's|@datarootdir@|@datarootdir@/doc|' \
> 		${WRKSRC}/Makefile.in
> 
> post-patch-FASTEST-on:
>diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
>index 6e818ad..4bc6432 100644
>--- a/databases/tokyotyrant/Makefile
>+++ b/databases/tokyotyrant/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
> 
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-USES=		gmake
>+USES=		gmake pathfix
> USE_RC_SUBR=	ttserver
> 
> OPTIONS_DEFINE=	LUA
>@@ -29,11 +29,7 @@ LUA_CFLAGS+=	-I${LUA_INCDIR}
> LUA_CPPFLAGS+=	-I${LUA_INCDIR}
> LUA_USES=		lua
> 
>-# Since gnomehack only works for "(libdir)" case, we need to patch it
>-# manually.
> post-patch:
>-	${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.in
> 	${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g' ${WRKSRC}/configure
> 
> post-install:
>diff --git a/devel/babeltrace/Makefile b/devel/babeltrace/Makefile
>index de16e88..d92eaad 100644
>--- a/devel/babeltrace/Makefile
>+++ b/devel/babeltrace/Makefile
>@@ -22,7 +22,7 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
> USE_GITHUB=	yes
> GH_ACCOUNT=	efficios
> 
>-USES=		autoreconf:build bison gettext-runtime gmake libtool pkgconfig
>+USES=		autoreconf:build bison gettext-runtime gmake libtool pathfix pkgconfig
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-debug-info
> USE_GNOME=	glib20
>@@ -41,8 +41,6 @@ BUILD_DEPENDS+=	flex>=2.5.35:textproc/flex
> post-patch:
> 	@${REINPLACE_CMD} -e 's|LICENSE mit-license.txt gpl-2.0.txt||' \
> 		${WRKSRC}/Makefile.am
>-	@${REINPLACE_CMD} -e 's|/pkgconfig|/../libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.am
> 	@${REINPLACE_CMD} -e 's|machine\/endian|sys\/endian|' \
> 		${WRKSRC}/include/babeltrace/endian.h
> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
>diff --git a/devel/c-unit/Makefile b/devel/c-unit/Makefile
>index b992cee..a42cc3f 100644
>--- a/devel/c-unit/Makefile
>+++ b/devel/c-unit/Makefile
>@@ -24,8 +24,6 @@ INSTALL_TARGET=	install-strip
> DATADIR=	${PREFIX}/share/CUnit
> EXAMPLESDIR=	${PREFIX}/share/examples/CUnit
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
>-
> OPTIONS_DEFINE=		AUT BAS CON CUR DEB EXA ITE MEM
> OPTIONS_DEFAULT=	AUT BAS CON
> OPTIONS_SUB=		yes
>diff --git a/devel/cld/Makefile b/devel/cld/Makefile
>index 0d26654..bf657b5 100644
>--- a/devel/cld/Makefile
>+++ b/devel/cld/Makefile
>@@ -14,7 +14,7 @@ COMMENT=	Chromium compact language detector library
> 
> BROKEN=		Unfetchable (google code has gone away)
> 
>-USES=		libtool
>+USES=		libtool pathfix
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>diff --git a/devel/cld/files/patch-Makefile.in b/devel/cld/files/patch-Makefile.in
>deleted file mode 100644
>index 54ccb25..0000000
>--- a/devel/cld/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2012-05-23 14:35:00.000000000 +0400
>-+++ Makefile.in	2013-02-08 15:37:27.000000000 +0400
>-@@ -282,7 +282,7 @@
>- 
>- # autogen.sh and cleanrepo.sh are script for maintainance use. Not for distribution.
>- # dist_noinst_SCRIPTS = autogen.sh
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = ${exec_prefix}/libdata/pkgconfig
>- pkgconfig_DATA = cld.pc
>- basic_test_SOURCES = tests/basic_test.cc
>- basic_test_CXXFLAGS = -Wall -fPIC -Isrc/ -I../src -O2 -DCLD_WINDOWS
>diff --git a/devel/codeblocks/files/patch-Makefile.am b/devel/codeblocks/files/patch-Makefile.am
>deleted file mode 100644
>index aef89ad..0000000
>--- a/devel/codeblocks/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.am.orig	2016-01-23 16:43:26 UTC
>-+++ Makefile.am
>-@@ -10,7 +10,7 @@ endif
>- 
>- am__tar = @am__tar@ $(ADDITIONAL_MAKE_DIST_OPTIONS)
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconfig_DATA = codeblocks.pc
>- 
>- EXTRA_DIST = bootstrap \
>diff --git a/devel/codeblocks/files/patch-Makefile.in b/devel/codeblocks/files/patch-Makefile.in
>deleted file mode 100644
>index 202b29b..0000000
>--- a/devel/codeblocks/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2016-05-06 22:17:30 UTC
>-+++ Makefile.in
>-@@ -455,7 +455,7 @@ SUBDIRS = src
>- ACLOCAL_AMFLAGS = -I m4
>- @KEEP_DLLS_FALSE@ADDITIONAL_MAKE_DIST_OPTIONS = --exclude=".svn" --exclude="*.dll"
>- @KEEP_DLLS_TRUE@ADDITIONAL_MAKE_DIST_OPTIONS = --exclude=".svn"
>--pkgconfigdir = $(prefix)/libdata/pkgconfig
>-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconfig_DATA = codeblocks.pc
>- EXTRA_DIST = bootstrap \
>- 		codeblocks.spec \
>diff --git a/devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.am b/devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.am
>deleted file mode 100644
>index 4f74983..0000000
>--- a/devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/plugins/contrib/SpellChecker/hunspell/Makefile.am.orig	2016-05-06 22:18:30 UTC
>-+++ src/plugins/contrib/SpellChecker/hunspell/Makefile.am
>-@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
>- 
>- SUBDIRS= intl po src man m4 tests
>- 
>--pkgconfdir = $(libdir)/pkgconfig
>-+pkgconfdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconf_DATA = hunspell.pc
>- 
>- EXTRA_DIST = BUGS README.myspell AUTHORS.myspell license.myspell license.hunspell \
>diff --git a/devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.in.org b/devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.in.org
>deleted file mode 100644
>index db1f956..0000000
>--- a/devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.in.org
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/plugins/contrib/SpellChecker/hunspell/Makefile.in.org.orig	2016-05-06 22:19:18 UTC
>-+++ src/plugins/contrib/SpellChecker/hunspell/Makefile.in.org
>-@@ -429,7 +429,7 @@ top_builddir = @top_builddir@
>- top_srcdir = @top_srcdir@
>- ACLOCAL_AMFLAGS = -I m4
>- SUBDIRS = intl po src man m4 tests
>--pkgconfdir = $(libdir)/pkgconfig
>-+pkgconfdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconf_DATA = hunspell.pc
>- EXTRA_DIST = BUGS README.myspell AUTHORS.myspell license.myspell license.hunspell \
>-         ChangeLog.O COPYING.MPL COPYING.LGPL hunspell.pc.in
>diff --git a/devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.am b/devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.am
>deleted file mode 100644
>index 7820d20..0000000
>--- a/devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.am
>+++ /dev/null
>@@ -1,9 +0,0 @@
>---- src/plugins/contrib/wxContribItems/Makefile.am.orig	2016-05-06 22:22:42 UTC
>-+++ src/plugins/contrib/wxContribItems/Makefile.am
>-@@ -9,5 +9,5 @@ SUBDIRS = wxchart wxFlatNotebook wxthing
>- 
>- EXTRA_DIST = $(srcdir)/*.cbp $(TREELIST_DIST)
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconfig_DATA = wxsmith-contrib.pc cb_wxcontrib.pc cb_wxchartctrl.pc cb_wxcustombutton.pc cb_wxflatnotebook.pc cb_wximagepanel.pc cb_wxspeedbutton.pc cb_wxKWIC.pc $(TREELIST_PC) cb_wxled.pc cb_wxmathplot.pc
>diff --git a/devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.in b/devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.in
>deleted file mode 100644
>index 1e90a48..0000000
>--- a/devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/plugins/contrib/wxContribItems/Makefile.in.orig	2016-05-06 22:22:44 UTC
>-+++ src/plugins/contrib/wxContribItems/Makefile.in
>-@@ -444,7 +444,7 @@ top_srcdir = @top_srcdir@
>- @HAVE_WX29_TRUE@TREELIST_DIST = $(srcdir)/wxTreeList/src/treelistctrl.cpp $(srcdir)/wxTreeList/include/wx/treelistctrl.h
>- SUBDIRS = wxchart wxFlatNotebook wxthings wxImagePanel wxSpeedButton KWIC $(TREELIST_DIR) wxled wxmathplot .
>- EXTRA_DIST = $(srcdir)/*.cbp $(TREELIST_DIST)
>--pkgconfigdir = $(prefix)/libdata/pkgconfig
>-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconfig_DATA = wxsmith-contrib.pc cb_wxcontrib.pc cb_wxchartctrl.pc cb_wxcustombutton.pc cb_wxflatnotebook.pc cb_wximagepanel.pc cb_wxspeedbutton.pc cb_wxKWIC.pc $(TREELIST_PC) cb_wxled.pc cb_wxmathplot.pc
>- all: all-recursive
>- 
>diff --git a/devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.am b/devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.am
>deleted file mode 100644
>index 283b124..0000000
>--- a/devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/plugins/contrib/wxSmithAui/Makefile.am.orig	2016-05-06 22:24:09 UTC
>-+++ src/plugins/contrib/wxSmithAui/Makefile.am
>-@@ -45,7 +45,7 @@ libwxSmithAui_la_SOURCES = \
>- ./wxAuiToolBar/wxSmithAuiToolBar.cpp \
>- ./wxSmithAui.cpp
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconfig_DATA = wxsmithaui.pc
>- 
>- noinst_HEADERS = \
>diff --git a/devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.in b/devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.in
>deleted file mode 100644
>index 0111ca3..0000000
>--- a/devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/plugins/contrib/wxSmithAui/Makefile.in.orig	2016-05-06 22:24:06 UTC
>-+++ src/plugins/contrib/wxSmithAui/Makefile.in
>-@@ -478,7 +478,7 @@ libwxSmithAui_la_SOURCES = \
>- ./wxAuiToolBar/wxSmithAuiToolBar.cpp \
>- ./wxSmithAui.cpp
>- 
>--pkgconfigdir = $(prefix)/libdata/pkgconfig
>-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconfig_DATA = wxsmithaui.pc
>- noinst_HEADERS = \
>- ./wxAuiManager/wxsAuiManager.h \
>diff --git a/devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.am b/devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.am
>deleted file mode 100644
>index b9cedaff..0000000
>--- a/devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/plugins/contrib/wxSmith/Makefile.am.orig	2016-05-06 22:22:03 UTC
>-+++ src/plugins/contrib/wxSmith/Makefile.am
>-@@ -70,7 +70,7 @@ noinst_HEADERS = \
>- ./wxsversionconverter.h \
>- ./wxssettings.h
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconfig_DATA = wxsmith.pc
>- 
>- EXTRA_DIST = \
>diff --git a/devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.in b/devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.in
>deleted file mode 100644
>index b59ec4b..0000000
>--- a/devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/plugins/contrib/wxSmith/Makefile.in.orig	2016-05-06 22:20:29 UTC
>-+++ src/plugins/contrib/wxSmith/Makefile.in
>-@@ -546,7 +546,7 @@ noinst_HEADERS = \
>- ./wxsversionconverter.h \
>- ./wxssettings.h
>- 
>--pkgconfigdir = $(prefix)/libdata/pkgconfig
>-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>- pkgconfig_DATA = wxsmith.pc
>- EXTRA_DIST = \
>- $(srcdir)/*.cbp \
>diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
>index 098d310..5004290 100644
>--- a/devel/compiz-bcop/Makefile
>+++ b/devel/compiz-bcop/Makefile
>@@ -15,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
> 
> GNU_CONFIGURE=	yes
> 
>-USES=		pkgconfig tar:bzip2
>+USES=		pathfix pkgconfig tar:bzip2
> USE_GNOME=	libxslt
> 
> post-patch:
>@@ -23,8 +23,5 @@ post-patch:
> 		-e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
> 		-e 's|getopt|${LOCALBASE}/bin/getopt|' \
> 		${WRKSRC}/src/bcop.in
>-	@${REINPLACE_CMD} -e \
>-		's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.in
> 
> .include <bsd.port.mk>
>diff --git a/devel/cpputest/Makefile b/devel/cpputest/Makefile
>index 4df7ef7..a792729 100644
>--- a/devel/cpputest/Makefile
>+++ b/devel/cpputest/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
> 
> USE_GITHUB=	yes
> 
>-USES=		autoreconf libtool
>+USES=		autoreconf libtool pathfix
> GNU_CONFIGURE=	yes
> 
> .include <bsd.port.mk>
>diff --git a/devel/cpputest/files/patch-Makefile.am b/devel/cpputest/files/patch-Makefile.am
>deleted file mode 100644
>index 56a9819..0000000
>--- a/devel/cpputest/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.am.orig	2015-05-04 05:36:02 UTC
>-+++ Makefile.am
>-@@ -21,7 +21,7 @@ endif
>- 
>- TESTS = $(check_PROGRAMS)
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = cpputest.pc
>- 
>- EXTRA_DIST = \
>diff --git a/devel/cunit/Makefile b/devel/cunit/Makefile
>index 12ce0d2..36e3480 100644
>--- a/devel/cunit/Makefile
>+++ b/devel/cunit/Makefile
>@@ -40,8 +40,6 @@ PORTDATA=	*
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
>-
> AUTOMATED_CONFIGURE_ENABLE=	automated
> BASIC_CONFIGURE_ENABLE=	basic
> CONSOLE_CONFIGURE_ENABLE=	console
>diff --git a/devel/dbus-c++/Makefile b/devel/dbus-c++/Makefile
>index deea24d..de58a06 100644
>--- a/devel/dbus-c++/Makefile
>+++ b/devel/dbus-c++/Makefile
>@@ -20,7 +20,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	andreas-volz
> GH_PROJECT=	dbus-cplusplus
> 
>-USES=		autoreconf compiler:c++11-lib gettext gmake libtool localbase pkgconfig
>+USES=		autoreconf compiler:c++11-lib gettext gmake libtool localbase pathfix pkgconfig
> GNU_CONFIGURE=	yes
> USE_GNOME=	glib20
> USE_LDCONFIG=	yes
>@@ -32,9 +32,6 @@ CONFIGURE_ARGS=	--prefix=${LOCALBASE} \
> 		--disable-examples \
> 		--disable-doxygen-docs
> 
>-post-patch:
>-	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir=$${prefix}/libdata/pkgconfig|' ${WRKSRC}/Makefile.am
>-
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdbus-c++-1.so
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdbus-c++-glib-1.so
>diff --git a/devel/ding-libs/Makefile b/devel/ding-libs/Makefile
>index 7256d7e..d3e3098 100644
>--- a/devel/ding-libs/Makefile
>+++ b/devel/ding-libs/Makefile
>@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -lintl
> 
>-USES=		autoreconf iconv gettext libtool pkgconfig
>+USES=		autoreconf iconv gettext libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
> 
>@@ -26,7 +26,6 @@ CONFIGURE_ENV+=	DOXYGEN=""
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am
> 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/collection/collection_tools.c \
> 		${WRKSRC}/refarray/ref_array.c
> 	@${REINPLACE_CMD} -e 's|git log -1 &>/dev/null|true|g' \
>diff --git a/devel/editline/Makefile b/devel/editline/Makefile
>index 7afe096..8d35a02 100644
>--- a/devel/editline/Makefile
>+++ b/devel/editline/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	Minix editline: A free readline() for UNIX
> 
> LICENSE=	BSD4CLAUSE
> 
>-USES=		autoreconf libtool ncurses
>+USES=		autoreconf libtool ncurses pathfix
> USE_GITHUB=	yes
> GH_ACCOUNT=	troglobit
> 
>@@ -20,8 +20,6 @@ INSTALL_TARGET=	install-strip
> PORTDOCS=	*
> 
> post-patch:
>-	${REINPLACE_CMD} '/^pkgconfigdir/s|=.*|= ${PREFIX}/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.am
> 	# rename to libeditline.3 to avoid conflict with libedit
> 	${REINPLACE_CMD} 's|editline.3|lib&|' ${WRKSRC}/man/Makefile.am
> 	cd ${WRKSRC}/man; ${MV} editline.3 libeditline.3
>diff --git a/devel/efl/Makefile b/devel/efl/Makefile
>index 3083b22..9852eda 100644
>--- a/devel/efl/Makefile
>+++ b/devel/efl/Makefile
>@@ -152,11 +152,6 @@ LIB_DEPENDS+=			libluajit-5.1.so:lang/luajit
> PLIST_SUB+=			ELUA=""
> .endif
> 
>-pre-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.am
>-
> post-stage:
> 	${RM} -rf ${STAGEDIR}${PREFIX}/share/gdb
> 	for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \
>diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
>index 6cef50b..b95d9cd 100644
>--- a/devel/flatzebra/Makefile
>+++ b/devel/flatzebra/Makefile
>@@ -13,7 +13,7 @@ COMMENT=	Generic game engine for 2D double-buffering animation
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--includedir=${PREFIX}/include
> 
>-USES=		pkgconfig libtool
>+USES=		pathfix pkgconfig libtool
> USE_SDL=	sdl mixer image
> 
> USE_LDCONFIG=	yes
>diff --git a/devel/flatzebra/files/patch-Makefile.in b/devel/flatzebra/files/patch-Makefile.in
>deleted file mode 100644
>index a638e4e..0000000
>--- a/devel/flatzebra/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2009-08-21 08:55:05.575153056 +0000
>-+++ Makefile.in	2009-08-21 08:56:07.604907117 +0000
>-@@ -204,7 +204,7 @@
>- top_builddir = @top_builddir@
>- top_srcdir = @top_srcdir@
>- SUBDIRS = src
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = $(PACKAGE)-$(API).pc
>- doc_DATA = \
>- 	AUTHORS \
>diff --git a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile
>index 96889c4..3e9806d 100644
>--- a/devel/google-gdata/Makefile
>+++ b/devel/google-gdata/Makefile
>@@ -16,7 +16,8 @@ BROKEN=		Unfetchable (google code has gone away)
> 
> BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:devel/newtonsoft-json
> 
>-USES=		dos2unix gmake mono
>+USES=		dos2unix gmake mono pathfix
>+PATHFIX_MAKEFILEIN=	Makefile
> DOS2UNIX_FILES=	Makefile misc/gdata-sharp-core.pc.in
> MAKE_ARGS=	CSC=${LOCALBASE}/bin/mcs
> 
>diff --git a/devel/google-gdata/files/patch-Makefile b/devel/google-gdata/files/patch-Makefile
>index 57997bd..ab114a2 100644
>--- a/devel/google-gdata/files/patch-Makefile
>+++ b/devel/google-gdata/files/patch-Makefile
>@@ -1,15 +1,6 @@
>---- Makefile.orig	2014-10-03 03:48:04.991079598 +0600
>-+++ Makefile	2014-10-03 03:48:20.722118155 +0600
>-@@ -5,7 +5,7 @@
>- 
>- VERSION=$(shell egrep AssemblyVersion version/AssemblyVersion.cs | egrep -o $[[:digit:]]\.$+[[:digit:]]+)
>- PREFIX=/usr/local
>--PKGCONFIGDIR = $(PREFIX)/lib/pkgconfig
>-+PKGCONFIGDIR = $(PREFIX)/libdata/pkgconfig
>- 
>- CORELIBS= \
>-   Google.GData.Client.dll \
>-@@ -33,7 +33,7 @@
>+--- Makefile.orig	2016-09-30 14:59:09 UTC
>++++ Makefile
>+@@ -33,7 +33,7 @@ ALLLIBS = \
>  
>  UNINSTALLLIBS = $(basename $(ALLLIBS))
>  
>@@ -18,7 +9,7 @@
>  
>  PKGCONFIG_FILES = $(patsubst %.pc.in,%.pc,$(wildcard misc/*.pc.in))
>  
>-@@ -112,7 +112,7 @@
>+@@ -112,7 +112,7 @@ clean:
>  install: all
>  	for i in $(ALLLIBS); do gacutil -i $$i -package GData-Sharp -root "$(DESTDIR)$(PREFIX)/lib"; done
>  	install -d "$(DESTDIR)$(PKGCONFIGDIR)"
>diff --git a/devel/gumbo/Makefile b/devel/gumbo/Makefile
>index 0db215e..066e32e 100644
>--- a/devel/gumbo/Makefile
>+++ b/devel/gumbo/Makefile
>@@ -18,7 +18,6 @@ USES=		autoreconf gmake pathfix libtool
> INSTALL_TARGET=	install-strip
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=Makefile.am
> 
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgumbo.so.1.0.0
>diff --git a/devel/hyperscan/Makefile b/devel/hyperscan/Makefile
>index 44232ad..1a1b8e4 100644
>--- a/devel/hyperscan/Makefile
>+++ b/devel/hyperscan/Makefile
>@@ -16,7 +16,7 @@ BUILD_DEPENDS=	ragel:devel/ragel
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	01org
>-USES=	compiler:c++11-lib cmake:outsource python:build pkgconfig
>+USES=	compiler:c++11-lib cmake:outsource pathfix python:build pkgconfig
> ONLY_FOR_ARCHS=	amd64
> ONLY_FOR_ARCHS_REASON=	SSSE3 is required for work
> 
>@@ -52,9 +52,4 @@ PLIST_SUB+=	SHARED="" \
> PLIST_SUB+=	SHARED="@comment "
> .endif
> 
>-post-stage:
>-	${MV} ${STAGEDIR}/${PREFIX}/lib/pkgconfig/libhs.pc \
>-		${STAGEDIR}/${PREFIX}/libdata/pkgconfig/
>-	${RMDIR} ${STAGEDIR}/${PREFIX}/lib/pkgconfig/
>-
> .include <bsd.port.mk>
>diff --git a/devel/isl/Makefile b/devel/isl/Makefile
>index c0844bd..ba99d12 100644
>--- a/devel/isl/Makefile
>+++ b/devel/isl/Makefile
>@@ -17,10 +17,8 @@ LIB_DEPENDS=	libgmp.so:math/gmp
> CONFIGURE_ARGS=	--with-gmp-prefix=${LOCALBASE}
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-USES=		libtool tar:xz
>+USES=		libtool pathfix tar:xz
>+PATHFIX_MAKEFILEIN=	configure
> USE_LDCONFIG=	yes
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's@pkgconfig_libdir=.*@pkgconfig_libdir=$${prefix}/libdata/pkgconfig@' ${WRKSRC}/configure
>-
> .include <bsd.port.mk>
>diff --git a/devel/ivykis/Makefile b/devel/ivykis/Makefile
>index 93da438..d9a1c56 100644
>--- a/devel/ivykis/Makefile
>+++ b/devel/ivykis/Makefile
>@@ -10,7 +10,7 @@ COMMENT=	Asynchronous I/O readiness notification library
> 
> LICENSE=	LGPL21
> 
>-USES=		libtool pkgconfig
>+USES=		libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> 
>@@ -18,9 +18,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	buytenh
> 
> post-stage:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>-	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/ivykis.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ivykis.pc
>-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libivykis.so.0.4.2
> 
> .include <bsd.port.mk>
>diff --git a/devel/ivykis/files/patch-misc_Makefile.am b/devel/ivykis/files/patch-misc_Makefile.am
>deleted file mode 100644
>index 1121367..0000000
>--- a/devel/ivykis/files/patch-misc_Makefile.am
>+++ /dev/null
>@@ -1,7 +0,0 @@
>---- misc/Makefile.am.orig	2015-10-17 19:07:02 UTC
>-+++ misc/Makefile.am
>-@@ -1,3 +1,3 @@
>--pkgconfigdir		= $(libdir)/pkgconfig
>-+pkgconfigdir		= $(libdatadir)/pkgconfig
>- 
>- pkgconfig_DATA		= ivykis.pc
>diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
>index adfecab..7c5169b 100644
>--- a/devel/lasi/Makefile
>+++ b/devel/lasi/Makefile
>@@ -16,7 +16,8 @@ LIB_DEPENDS=	libltdl.so:devel/libltdl
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-USES=		cmake pkgconfig
>+USES=		cmake pathfix pkgconfig
>+PATHFIX_CMAKELISTSTXT=	pkg-config.cmake
> USE_GNOME=	pango
> PKG_CONFIG_PATH=	${PREFIX}/libdata/pkgconfig
> CONFIGURE_ENV+=	PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
>diff --git a/devel/lasi/files/patch-cmake+modules+pkg-config.cmake b/devel/lasi/files/patch-cmake+modules+pkg-config.cmake
>deleted file mode 100644
>index 7235702..0000000
>--- a/devel/lasi/files/patch-cmake+modules+pkg-config.cmake
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- cmake/modules/pkg-config.cmake.orig	2008-12-31 14:38:25.000000000 -0500
>-+++ cmake/modules/pkg-config.cmake	2008-12-31 14:42:58.000000000 -0500
>-@@ -6,7 +6,7 @@
>- if(PKG_CONFIG_EXECUTABLE)
>-   message(STATUS "Looking for pkg-config - found")
>-   set(pkg_config_true "")
>--  set(PKG_CONFIG_DIR ${libdir}/pkgconfig)
>-+  set(PKG_CONFIG_DIR ${exec_prefix}/libdata/pkgconfig)
>- else(PKG_CONFIG_EXECUTABLE)
>-   message(STATUS "Looking for pkg-config - not found")
>-   set(pkg_config_true "#")
>diff --git a/devel/liballium/Makefile b/devel/liballium/Makefile
>index 108385a..08fd759 100644
>--- a/devel/liballium/Makefile
>+++ b/devel/liballium/Makefile
>@@ -14,7 +14,6 @@ GH_TAGNAME=	0c9b50f
> 
> GNU_CONFIGURE=	yes
> USES=		autoreconf libtool pathfix pkgconfig tar:bzip2
>-PATHFIX_MAKEFILEIN=Makefile.am
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> 
>diff --git a/devel/libbrotli/Makefile b/devel/libbrotli/Makefile
>index f410c58..b2d38dc 100644
>--- a/devel/libbrotli/Makefile
>+++ b/devel/libbrotli/Makefile
>@@ -21,7 +21,7 @@ GH_PROJECT=	brotli:brotli
> GH_TAGNAME=	${BROTLI_VERSION}:brotli
> GH_SUBDIR=	brotli:brotli
> 
>-USES=		pkgconfig autoreconf libtool compiler:c++0x
>+USES=		pkgconfig autoreconf libtool compiler:c++0x pathfix
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
>diff --git a/devel/libbrotli/files/patch-Makefile.am b/devel/libbrotli/files/patch-Makefile.am
>deleted file mode 100644
>index 17fb3aa..0000000
>--- a/devel/libbrotli/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.am.orig	2016-04-16 19:40:04.016418000 -0400
>-+++ Makefile.am	2016-04-16 19:40:13.154082000 -0400
>-@@ -41,7 +41,7 @@
>- # install headers in $(includedir) with subdirs
>- nobase_include_HEADERS = $(DECODEHEADERS) $(ENCODEHEADERS)
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(libdir)/../libdata/pkgconfig
>- pkgconfig_DATA = libbrotlienc.pc libbrotlidec.pc
>- pkgincludedir= $(includedir)/brotli
>- pkginclude_HEADERS = 
>diff --git a/devel/libcfu/Makefile b/devel/libcfu/Makefile
>index 05ab05b..f9e6b74 100644
>--- a/devel/libcfu/Makefile
>+++ b/devel/libcfu/Makefile
>@@ -15,7 +15,6 @@ GH_ACCOUNT=	crees
> GH_TAGNAME=	947dba4
> 
> USES=		autoreconf makeinfo pkgconfig pathfix libtool
>-PATHFIX_MAKEFILEIN=	Makefile.am
> INSTALL_TARGET=	install-strip
> 
> GNU_CONFIGURE=	yes
>diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile
>index 2cc1059..e2f3c29 100644
>--- a/devel/libdlna/Makefile
>+++ b/devel/libdlna/Makefile
>@@ -17,7 +17,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
> 
> HAS_CONFIGURE=	yes
>-USES=		gmake localbase pkgconfig tar:bzip2
>+USES=		gmake localbase pathfix pkgconfig tar:bzip2
>+PATHFIX_MAKEFILEIN=	Makefile
> USE_LDCONFIG=	yes
> MAKE_JOBS_UNSAFE=	yes
> 
>diff --git a/devel/libdlna/files/patch-Makefile b/devel/libdlna/files/patch-Makefile
>index 6cefb4d..a28e8fc 100644
>--- a/devel/libdlna/files/patch-Makefile
>+++ b/devel/libdlna/files/patch-Makefile
>@@ -1,14 +1,5 @@
> --- Makefile.orig	2007-11-26 20:47:43 UTC
> +++ Makefile
>-@@ -4,7 +4,7 @@ endif
>- include config.mak
>- 
>- DISTFILE = libdlna-$(VERSION).tar.bz2
>--PKGCONFIG_DIR = $(libdir)/pkgconfig
>-+PKGCONFIG_DIR = $(prefix)/libdata/pkgconfig
>- PKGCONFIG_FILE = libdlna.pc
>- 
>- LIBTEST = test-libdlna
> @@ -19,7 +19,7 @@ EXTRADIST = AUTHORS \
>  SUBDIRS = src \
>  
>diff --git a/devel/libee/Makefile b/devel/libee/Makefile
>index 924285e..db35b0b 100644
>--- a/devel/libee/Makefile
>+++ b/devel/libee/Makefile
>@@ -16,7 +16,7 @@ MAKE_JOBS_UNSAFE=	yes
> 
> USE_LDCONFIG=	yes
> 
>-USES=		libtool
>+USES=		libtool pathfix
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	LIBESTR_CFLAGS="-I${LOCALBASE}/include" LIBESTR_LIBS="-L${LOCALBASE}/lib -lestr"
> CONFIGURE_ARGS+=	--prefix="${PREFIX}" --disable-testbench
>diff --git a/devel/libee/files/patch-Makefile.in b/devel/libee/files/patch-Makefile.in
>deleted file mode 100644
>index ebc4f17..0000000
>--- a/devel/libee/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2011-06-20 14:08:32.835431092 -0500
>-+++ Makefile.in	2011-06-20 14:08:56.609771691 -0500
>-@@ -257,7 +257,7 @@
>- top_builddir = @top_builddir@
>- top_srcdir = @top_srcdir@
>- SUBDIRS = tests include src
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = libee.pc
>- ACLOCAL_AMFLAGS = -I m4
>- all: config.h
>diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
>index 6d37b88..af7738f 100644
>--- a/devel/libelf/Makefile
>+++ b/devel/libelf/Makefile
>@@ -22,7 +22,7 @@ SANITY_DESC=	Avoid loading invalid ELF files
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=	--enable-shared --disable-compat
> USE_LDCONFIG=	yes
>-USES=		desthack
>+USES=		desthack pathfix
> 
> .if ${PORT_OPTIONS:MNLS}
> CPPFLAGS+=	-I${LOCALBASE}/include
>diff --git a/devel/libelf/files/patch-Makefile.in b/devel/libelf/files/patch-Makefile.in
>deleted file mode 100644
>index 44fa804..0000000
>--- a/devel/libelf/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-Description: Fix the pkgconfig data directory path.
>-Forwarded: not-needed
>-Author: Peter Pentchev <roam@FreeBSD.org>
>-Last-Update: 2009-11-20
>-
>---- Makefile.in.orig
>-+++ Makefile.in
>-@@ -23,7 +23,7 @@
>- exec_prefix = @exec_prefix@
>- libdir = @libdir@
>- 
>--pkgdir = $(libdir)/pkgconfig
>-+pkgdir = $(prefix)/libdata/pkgconfig
>- 
>- MV = mv -f
>- RM = rm -f
>diff --git a/devel/libestr/Makefile b/devel/libestr/Makefile
>index ec2360d..2807923 100644
>--- a/devel/libestr/Makefile
>+++ b/devel/libestr/Makefile
>@@ -10,7 +10,7 @@ MASTER_SITES=	http://libestr.adiscon.com/files/download/
> MAINTAINER=	matthew@FreeBSD.org
> COMMENT=	Library for some string essentials
> 
>-USES=		libtool
>+USES=		libtool pathfix
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix="${PREFIX}" \
>diff --git a/devel/libestr/files/patch-Makefile.in b/devel/libestr/files/patch-Makefile.in
>deleted file mode 100644
>index b1c6253..0000000
>--- a/devel/libestr/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in..orig	2011-06-20 13:31:12.833335470 -0500
>-+++ Makefile.in	2011-06-20 13:31:27.073909538 -0500
>-@@ -251,7 +251,7 @@
>- top_builddir = .
>- top_srcdir = .
>- SUBDIRS = include src
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = libestr.pc
>- ACLOCAL_AMFLAGS = -I m4
>- all: config.h
>diff --git a/devel/libevent2/Makefile b/devel/libevent2/Makefile
>index 635b2f9..36c08fd 100644
>--- a/devel/libevent2/Makefile
>+++ b/devel/libevent2/Makefile
>@@ -20,7 +20,6 @@ GH_PROJECT=	${PORTNAME:S/2$//}
> 
> GNU_CONFIGURE=	yes
> USES=		autoreconf libtool pathfix
>-PATHFIX_MAKEFILEIN=Makefile.am
> USE_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	OPENSSL THREADS
>diff --git a/devel/libfastjson/Makefile b/devel/libfastjson/Makefile
>index 64b2ab2..12781e6 100644
>--- a/devel/libfastjson/Makefile
>+++ b/devel/libfastjson/Makefile
>@@ -16,7 +16,6 @@ GH_ACCOUNT=	rsyslog
> 
> GNU_CONFIGURE=	yes
> USES=		autoreconf gmake libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> INSTALL_TARGET=	install-strip
> 
> .include <bsd.port.mk>
>diff --git a/devel/libfirm/Makefile b/devel/libfirm/Makefile
>index 27171ba..9052caa 100644
>--- a/devel/libfirm/Makefile
>+++ b/devel/libfirm/Makefile
>@@ -14,7 +14,6 @@ LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
> USES=		autoreconf gmake libtool pathfix pkgconfig tar:bzip2
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
>diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile
>index 89fad80b..9896351 100644
>--- a/devel/libgit2/Makefile
>+++ b/devel/libgit2/Makefile
>@@ -13,7 +13,7 @@ LICENSE=	GPLv2
> USE_GITHUB=	yes
> GH_ACCOUNT=	libgit2
> 
>-USES=		cmake pkgconfig python:build
>+USES=		cmake pathfix pkgconfig python:build
> USE_LDCONFIG=	yes
> USE_OPENSSL=	yes
> 
>@@ -38,8 +38,7 @@ BROKEN_sparc64=	does not install: thread-local storage not supported
> .include <bsd.port.pre.mk>
> 
> post-patch:
>-	@${REINPLACE_CMD} -e "s|/pkgconfig|/../libdata/pkgconfig|; \
>-		/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
>+	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
> .if ${SSL_DEFAULT} == base
> 	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
> 		${WRKSRC}/CMakeLists.txt
>diff --git a/devel/libhtp/Makefile b/devel/libhtp/Makefile
>index 7a211a3..1747650 100644
>--- a/devel/libhtp/Makefile
>+++ b/devel/libhtp/Makefile
>@@ -22,8 +22,6 @@ CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
> MAKE_ARGS=	LIBS="-lz ${ICONV_LIB}"
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
>-
> INSTALL_TARGET=		install-strip
> TEST_TARGET=		check
> 
>diff --git a/devel/liblouis/Makefile b/devel/liblouis/Makefile
>index 07c095f..74c88ef 100644
>--- a/devel/liblouis/Makefile
>+++ b/devel/liblouis/Makefile
>@@ -17,7 +17,6 @@ USES=		autoreconf gmake libtool pathfix
> USE_GITHUB=	yes
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> INSTALL_TARGET=	install-strip
> 
> .include <bsd.port.mk>
>diff --git a/devel/libmowgli/Makefile b/devel/libmowgli/Makefile
>index 7443678..4b21b7b 100644
>--- a/devel/libmowgli/Makefile
>+++ b/devel/libmowgli/Makefile
>@@ -14,12 +14,9 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	atheme-legacy
> GH_TAGNAME=	5ab559e3af5b11767ada53d4401fb1c4443f3723
> 
>-USES=		gmake tar:bzip2
>+USES=		gmake pathfix tar:bzip2
>+PATHFIX_MAKEFILEIN=	Makefile
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>-post-patch:
>-	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile
>-
> .include <bsd.port.mk>
>diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
>index d3cb4bc..6f56338 100644
>--- a/devel/liboil/Makefile
>+++ b/devel/liboil/Makefile
>@@ -16,7 +16,8 @@ LICENSE_COMB=	multi
> 
> BROKEN_powerpc64=	fails to compile vec_memcpy.S
> 
>-USES=		libtool pkgconfig
>+USES=		libtool pathfix pkgconfig
>+PATHFIX_MAKEFILEIN=	configure
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> CONFIGURE_ARGS=	--disable-gtk-doc \
>@@ -24,8 +25,4 @@ CONFIGURE_ARGS=	--disable-gtk-doc \
> INSTALL_TARGET=	install-strip
> CFLAGS:=	${CFLAGS:N-O*} -O2
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|\\$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
>-		${WRKSRC}/configure
>-
> .include <bsd.port.mk>
>diff --git a/devel/libopkele/Makefile b/devel/libopkele/Makefile
>index e92551a..ff5875f 100644
>--- a/devel/libopkele/Makefile
>+++ b/devel/libopkele/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
> 		libxslt.so:textproc/libxslt
> 
> USE_LDCONFIG=	yes
>-USES=		libtool gmake pkgconfig compiler:c++11-lang ssl
>+USES=		libtool gmake pathfix pkgconfig compiler:c++11-lang ssl
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	"OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \
> 		OPENSSL_LIBS=-L${OPENSSLLIB}
>@@ -33,10 +33,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> # by design, we need to remove the openssl dependency
> # in pkgconfig/libopkele.pc.
> 
>-post-patch:
>-	@ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \
>-	    ${WRKSRC}/Makefile.in
> .if ${SSL_DEFAULT} == base
>+post-patch:
> 	@ ${REINPLACE_CMD} -e "s|Requires: openssl|Requires:|" ${WRKSRC}/libopkele.pc.in
> .endif
> 
>diff --git a/devel/libosmo-abis/Makefile b/devel/libosmo-abis/Makefile
>index 301f77c..cbe1cd7 100644
>--- a/devel/libosmo-abis/Makefile
>+++ b/devel/libosmo-abis/Makefile
>@@ -17,7 +17,6 @@ LIB_DEPENDS=	libosmocore.so:devel/libosmocore \
> 		libortp.so:net/ortp
> 
> USES=		autoreconf gmake libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=Makefile.am
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>diff --git a/devel/libosmo-netif/Makefile b/devel/libosmo-netif/Makefile
>index 38dd91f..1681aa9 100644
>--- a/devel/libosmo-netif/Makefile
>+++ b/devel/libosmo-netif/Makefile
>@@ -21,7 +21,6 @@ BROKEN_powerpc64=	Does not build
> BROKEN_sparc64=	Does not build: undefined reference to __bswap_16
> 
> USES=		autoreconf libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=Makefile.am
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>diff --git a/devel/libosmo-sccp/Makefile b/devel/libosmo-sccp/Makefile
>index 2bc9636..f32698d 100644
>--- a/devel/libosmo-sccp/Makefile
>+++ b/devel/libosmo-sccp/Makefile
>@@ -17,7 +17,6 @@ LIB_DEPENDS=	libosmocore.so:devel/libosmocore
> CONFLICTS_INSTALL=libmtp-[0-9]* # lib/libmtp.a
> 
> USES=		autoreconf gmake pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=Makefile.am
> GNU_CONFIGURE=	yes
> 
> post-patch:
>diff --git a/devel/libosmocore/Makefile b/devel/libosmocore/Makefile
>index de35400..3a63d2c 100644
>--- a/devel/libosmocore/Makefile
>+++ b/devel/libosmocore/Makefile
>@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
> 
> USES=		alias autoreconf execinfo gmake libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=Makefile.am
> GNU_CONFIGURE=	yes
> LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
> USE_LDCONFIG=	yes
>diff --git a/devel/libr3/Makefile b/devel/libr3/Makefile
>index a25a146..779c682 100644
>--- a/devel/libr3/Makefile
>+++ b/devel/libr3/Makefile
>@@ -16,15 +16,11 @@ LIB_DEPENDS=	libcheck.so:devel/libcheck \
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-graphviz
>-USES=		autoreconf libtool pkgconfig
>+USES=		autoreconf libtool pathfix pkgconfig
> INSTALL_TARGET=	install-strip
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	c9s
> GH_PROJECT=	r3
> 
>-post-patch:
>-	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' \
>-		${WRKSRC}/Makefile.am
>-
> .include <bsd.port.mk>
>diff --git a/devel/libsearpc/Makefile b/devel/libsearpc/Makefile
>index d56d91e..fd1ba5f 100644
>--- a/devel/libsearpc/Makefile
>+++ b/devel/libsearpc/Makefile
>@@ -20,7 +20,6 @@ GH_TAGNAME=	v3.0-latest
> 
> USES=		autoreconf gettext libtool pathfix pkgconfig python:2
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>diff --git a/devel/libsmpp34/Makefile b/devel/libsmpp34/Makefile
>index ec664a2..dc60435 100644
>--- a/devel/libsmpp34/Makefile
>+++ b/devel/libsmpp34/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libxml2.so:textproc/libxml2
> 
>-USES=		autoreconf libtool gmake
>+USES=		autoreconf libtool gmake pathfix
> 
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>@@ -22,8 +22,6 @@ INSTALL_TARGET=	install-strip
> MAKE_JOBS_UNSAFE=yes
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.am
> 	${REINPLACE_CMD} -e 's|AC_CONFIG_AUX_DIR.*|AC_CONFIG_AUX_DIR([.])|g' \
> 		${WRKSRC}/configure.ac
> 	${REINPLACE_CMD} -e 's|AM_CONFIG_HEADER.*|AM_CONFIG_HEADER([./config.h])|g' \
>diff --git a/devel/libtermkey/Makefile b/devel/libtermkey/Makefile
>index 1849c7e..17ad615 100644
>--- a/devel/libtermkey/Makefile
>+++ b/devel/libtermkey/Makefile
>@@ -11,14 +11,12 @@ COMMENT=	Easy processing of keyboard entry from terminal-based programs
> 
> LICENSE=	MIT
> 
>-USES=		gmake libtool:build ncurses pkgconfig
>+USES=		gmake libtool:build ncurses pathfix pkgconfig
>+PATHFIX_MAKEFILEIN=	Makefile
> LIB_DEPENDS=	libunibilium.so:devel/unibilium
> USE_LDCONFIG=	yes
> MAKE_ARGS=	MANDIR=${MANPREFIX}/man
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/Makefile
>-
> post-stage:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtermkey.so.1.12.0
> 
>diff --git a/devel/libunwind/Makefile b/devel/libunwind/Makefile
>index 78c7c77..8ccf26d 100644
>--- a/devel/libunwind/Makefile
>+++ b/devel/libunwind/Makefile
>@@ -17,7 +17,6 @@ ONLY_FOR_ARCHS=	i386 amd64
> 
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_LDCONFIG=	yes
> USES=		autoreconf libtool pathfix pkgconfig
> 
>diff --git a/devel/libuv/Makefile b/devel/libuv/Makefile
>index 95bbcdd..855a52c 100644
>--- a/devel/libuv/Makefile
>+++ b/devel/libuv/Makefile
>@@ -20,7 +20,6 @@ TEST_DEPENDS=	gyp:devel/py-gyp \
> 
> USES=		autoreconf libtool pathfix pkgconfig
> GNU_CONFIGURE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
> 
>diff --git a/devel/libxs/Makefile b/devel/libxs/Makefile
>index 4c3becd..a8768f5 100644
>--- a/devel/libxs/Makefile
>+++ b/devel/libxs/Makefile
>@@ -18,8 +18,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	crossroads-io
> USE_LDCONFIG=	yes
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
>-
> OPTIONS_DEFINE=	DEBUG DOCS PLUGINS ZMQ
> EXTERNAL_DESC=	PGM extension from ports
> INTERNAL_DESC=	PGM extension
>diff --git a/devel/lightning/Makefile b/devel/lightning/Makefile
>index 4c49665..0bfa61b 100644
>--- a/devel/lightning/Makefile
>+++ b/devel/lightning/Makefile
>@@ -12,7 +12,7 @@ COMMENT=	Generates assembly language code at run-time
> LICENSE=	GPLv3 LGPL3
> LICENSE_COMB=	multi
> 
>-USES=		libtool
>+USES=		libtool pathfix
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-disassembler=no
> INSTALL_TARGET=	install-strip
>diff --git a/devel/lightning/files/patch-Makefile.in b/devel/lightning/files/patch-Makefile.in
>deleted file mode 100644
>index 5c0d76e..0000000
>--- a/devel/lightning/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2015-02-08 17:45:49.524068441 +0600
>-+++ Makefile.in	2015-02-08 17:49:09.021055899 +0600
>-@@ -407,7 +407,7 @@
>- 	include		\
>- 	lib
>- 
>--pkgconfiglibdir = $(libdir)/pkgconfig
>-+pkgconfiglibdir = $(prefix)/libdata/pkgconfig
>- pkgconfiglib_DATA = lightning.pc
>- @get_jit_size_TRUE@JIT_SIZE_PATH = "$(top_builddir)/jit_$(cpu)-sz.c"
>- @get_jit_size_TRUE@AM_CPPFLAGS = -DGET_JIT_SIZE=1 -DJIT_SIZE_PATH='$(JIT_SIZE_PATH)'
>diff --git a/devel/m17n-db/Makefile b/devel/m17n-db/Makefile
>index 2f769a2..a711676 100644
>--- a/devel/m17n-db/Makefile
>+++ b/devel/m17n-db/Makefile
>@@ -35,8 +35,6 @@ post-extract:
> 	cd ${WRKSRC}; ${TAR} xjf ${DISTDIR}/${GLIBC_DISTFILE} ${CHARMAPSDIR}
> 
> post-patch:
>-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|$${datadir}/pkgconfig|$${prefix}/libdata/pkgconfig|g'
> 	@${REINPLACE_CMD} -E 's|(m17n_scriptdir = ).*|\1${PREFIX}/bin|' \
> 		${WRKSRC}/Makefile.in
> 
>diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
>index 7fd1c73..065015a 100644
>--- a/devel/m17n-lib/Makefile
>+++ b/devel/m17n-lib/Makefile
>@@ -21,7 +21,7 @@ RUN_DEPENDS=	m17n-db>=1.6.4:devel/m17n-db
> 
> MAKE_JOBS_UNSAFE=	yes
> 
>-USES=		autoreconf gettext-tools libtool pkgconfig
>+USES=		autoreconf gettext-tools libtool pathfix pkgconfig
> USE_XORG=	ice sm x11 xaw xft xt
> USE_GNOME=	libxml2
> USE_LDCONFIG=	yes
>@@ -47,8 +47,6 @@ THAI_LIB_DEPENDS=	libthai.so:devel/libthai
> THAI_CONFIGURE_OFF=	--without-libthai
> 
> post-patch:
>-	@${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|libdir}/pkgconfig|prefix}/libdata/pkgconfig|g ; \
>-		 s|-ldl||g'
>+	@${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e 's|-ldl||g'
> 
> .include <bsd.port.mk>
>diff --git a/devel/marisa-trie/Makefile b/devel/marisa-trie/Makefile
>index d183ece..1f987f4 100644
>--- a/devel/marisa-trie/Makefile
>+++ b/devel/marisa-trie/Makefile
>@@ -19,7 +19,7 @@ GH_ACCOUNT=	s-yata
> GH_PROJECT=	marisa-trie
> GH_TAGNAME=	961ed33
> 
>-USES=	autoreconf libtool:build
>+USES=	autoreconf libtool:build pathfix
> USE_LDCONFIG=	yes
> 
> GNU_CONFIGURE=	yes
>diff --git a/devel/marisa-trie/files/patch-Makefile.am b/devel/marisa-trie/files/patch-Makefile.am
>deleted file mode 100644
>index df60ebf..0000000
>--- a/devel/marisa-trie/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.am.orig	2016-07-03 09:34:09 UTC
>-+++ Makefile.am
>-@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
>- 
>- SUBDIRS = include lib tools tests
>- 
>--pkgconfigdir = ${libdir}/pkgconfig
>-+pkgconfigdir = ${prefix}/libdata/pkgconfig
>- pkgconfig_DATA = marisa.pc
>- 
>- EXTRA_DIST = \
>diff --git a/devel/msgpack/Makefile b/devel/msgpack/Makefile
>index 02f99f1..cc34d7d 100644
>--- a/devel/msgpack/Makefile
>+++ b/devel/msgpack/Makefile
>@@ -13,7 +13,7 @@ LICENSE=	APACHE20
> USE_GITHUB=	yes
> GH_PROJECT=	msgpack-c
> 
>-USES=		libtool:build autoreconf:build
>+USES=		libtool:build autoreconf:build pathfix
> 
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>diff --git a/devel/msgpack/files/patch-Makefile.am b/devel/msgpack/files/patch-Makefile.am
>deleted file mode 100644
>index a74e43d..0000000
>--- a/devel/msgpack/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.am.orig	2016-05-27 09:08:08 UTC
>-+++ Makefile.am
>-@@ -11,7 +11,7 @@ DOC_FILES = \
>- EXTRA_DIST = \
>- 		$(DOC_FILES) CMakeLists.txt test/CMakeLists.txt example
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = msgpack.pc
>- 
>- doxygen:
>diff --git a/devel/ois/Makefile b/devel/ois/Makefile
>index 2d1b4e8..fff678e 100644
>--- a/devel/ois/Makefile
>+++ b/devel/ois/Makefile
>@@ -16,7 +16,6 @@ LICENSE=	ZLIB
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> USES=		autoreconf gmake libtool pathfix
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_XORG=	x11 xaw
> USE_LDCONFIG=	yes
> 
>diff --git a/devel/oniguruma5/Makefile b/devel/oniguruma5/Makefile
>index 8b41c99..052eec2 100644
>--- a/devel/oniguruma5/Makefile
>+++ b/devel/oniguruma5/Makefile
>@@ -24,7 +24,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	kkos
> 
> USES=		pathfix autoreconf libtool
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile
>index 5f91d29..4a1310b 100644
>--- a/devel/opendht/Makefile
>+++ b/devel/opendht/Makefile
>@@ -23,13 +23,11 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=--disable-python
> USE_LDCONFIG=	yes
> 
>-USES=		autoreconf compiler:c++11-lib libtool pkgconfig
>+USES=		autoreconf compiler:c++11-lib libtool pathfix pkgconfig
> CFLAGS+=	-I${LOCALBASE}/include
> CXXFLAGS+=	-I${LOCALBASE}/include
> 
> post-stage:
>-	@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/opendht.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
>-	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopendht.so.0.0.0
> 
> .include <bsd.port.mk>
>diff --git a/devel/orc/Makefile b/devel/orc/Makefile
>index a89011b..7843f6b 100644
>--- a/devel/orc/Makefile
>+++ b/devel/orc/Makefile
>@@ -13,7 +13,8 @@ LICENSE=	BSD2CLAUSE BSD3CLAUSE
> LICENSE_COMB=	multi
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gmake libtool pkgconfig tar:xz
>+USES=		gmake libtool pathfix pkgconfig tar:xz
>+PATHFIX_MAKEFILEIN=	configure
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> CONFIGURE_ARGS+=--disable-gtk-doc
>@@ -42,7 +43,6 @@ MAKE_ARGS+=	SUBDIRS="${SUBDIRS}"
> post-patch:
> 	@${REINPLACE_CMD} \
> 		-E -e '/LIBS/s/-lrt(\ )*//; /LIBRT/s/-lrt//' \
>-		-e 's|pkgconfigdir=.*|pkgconfigdir=\"\\$$(prefix)/libdata/pkgconfig\"|g' \
> 		${WRKSRC}/configure
> 
> post-install:
>diff --git a/devel/papi/Makefile b/devel/papi/Makefile
>index 5ae895c..3adf8ae 100644
>--- a/devel/papi/Makefile
>+++ b/devel/papi/Makefile
>@@ -23,7 +23,8 @@ NO_PACKAGE=	Needs to be compiled for specific CPU
> STRIP=		# empty
> USE_LDCONFIG=	yes
> LIB_DEPENDS+=	libopa.so:net/mpich2
>-USES=		fortran gmake pkgconfig
>+USES=		fortran gmake pathfix pkgconfig
>+PATHFIX_MAKEFILEIN=	Makefile.inc
> GNU_CONFIGURE=	yes
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
> WRKMAN=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/man
>diff --git a/devel/papi/files/patch-Makefile.inc b/devel/papi/files/patch-Makefile.inc
>deleted file mode 100644
>index 40c24ac..0000000
>--- a/devel/papi/files/patch-Makefile.inc
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.inc.orig	2015-12-09 12:02:38 UTC
>-+++ Makefile.inc
>-@@ -18,7 +18,7 @@ HEADERS   = $(MISCHDRS) $(OSFILESHDR) pa
>- LIBCFLAGS += -I. $(CFLAGS) -DOSLOCK=\"$(OSLOCK)\" -DOSCONTEXT=\"$(OSCONTEXT)\"
>- FHEADERS = fpapi.h f77papi.h f90papi.h
>- # pkgconfig directory
>--LIBPC = $(LIBDIR)/pkgconfig
>-+LIBPC = $(prefix)/libdata/pkgconfig
>- 
>- all: $(SHOW_CONF) $(LIBS) utils tests cuda_sampling 
>- .PHONY : all test fulltest tests testlib utils ctests ftests comp_tests null
>diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
>index 8c3a629..4b73bb2 100644
>--- a/devel/protobuf/Makefile
>+++ b/devel/protobuf/Makefile
>@@ -15,7 +15,6 @@ CFLAGS+=	-DGOOGLE_PROTOBUF_NO_RTTI
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> ONLY_FOR_ARCHS=	amd64 armv6 i386
>-PATHFIX_MAKEFILEIN=	Makefile.am
> TEST_TARGET=	check
> USE_CSTD=	c99	# for audio/clementine-player support
> USE_LDCONFIG=	yes
>diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
>index 9dacfee..fa604a7 100644
>--- a/devel/ptlib/Makefile
>+++ b/devel/ptlib/Makefile
>@@ -15,7 +15,8 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2
> 
> CONFLICTS=	pwlib-1.*
> 
>-USES=		autoreconf:build bison gmake pkgconfig ssl tar:xz
>+USES=		autoreconf:build bison gmake pathfix pkgconfig ssl tar:xz
>+PATHFIX_MAKEFILEIN=	Makefile.in
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> CPPFLAGS+=	-I${OPENSSLINC} -I${LOCALBASE}/include
>diff --git a/devel/ptlib/files/patch-Makefile.in b/devel/ptlib/files/patch-Makefile.in
>index 72d2e4b..9cc0283 100644
>--- a/devel/ptlib/files/patch-Makefile.in
>+++ b/devel/ptlib/files/patch-Makefile.in
>@@ -11,25 +11,3 @@
>            do \
>  	  ( if test -e $$lib ; then \
>  		$(INSTALL) -m 444 $$lib $(DESTDIR)$(LIBDIR); \
>-@@ -160,9 +158,9 @@
>- 	$(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
>- 	(cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
>- 
>--	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
>--	chmod 755 $(DESTDIR)$(LIBDIR)/pkgconfig
>--	$(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
>-+	mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
>-+	chmod 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig
>-+	$(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
>- 
>- uninstall:
>- 	rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
>-@@ -171,7 +169,7 @@
>- 	       $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
>- 	       $(DESTDIR)$(PREFIX)/share/ptlib \
>- 	       $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
>--	       $(DESTDIR)$(LIBDIR)/pkgconfig/ptlib.pc
>-+	       $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc
>- 	rm -f $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a \
>- 	      $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) \
>- 	      $(DESTDIR)$(LIBDIR)/$(LIB_SONAME)
>diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
>index 7042a17..a6645cd 100644
>--- a/devel/qjson/Makefile
>+++ b/devel/qjson/Makefile
>@@ -11,7 +11,7 @@ COMMENT=	Library to manage JSON objects with Qt
> LICENSE=	LGPL21
> 
> USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
>-USES=		cmake tar:bzip2
>+USES=		cmake pathfix tar:bzip2
> USE_LDCONFIG=	yes
> 
> PORTDOCS=	*
>@@ -24,10 +24,6 @@ OPTIONS_DEFINE=	DOCS
> BUILD_DEPENDS+=	doxygen:devel/doxygen
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's,/pkgconfig,/../libdata/pkgconfig,' \
>-		${WRKSRC}/CMakeLists.txt
>-
> post-build:
> .if ${PORT_OPTIONS:MDOCS}
> 	cd ${WRKSRC}/doc && doxygen
>diff --git a/devel/radare2/Makefile b/devel/radare2/Makefile
>index 3d86d55..2d6ffac 100644
>--- a/devel/radare2/Makefile
>+++ b/devel/radare2/Makefile
>@@ -19,7 +19,8 @@ LIB_DEPENDS+=		libcapstone.so:devel/capstone4
> 
> CONFIGURE_ARGS+=	--with-syscapstone
> 
>-USES=		gmake pkgconfig tar:xz
>+USES=		gmake pathfix pkgconfig tar:xz
>+PATHFIX_MAKEFILEIN=	Makefile
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>@@ -29,8 +30,6 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|..LIBDIR./pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
>-		${WRKSRC}/libr/Makefile
> 	${ECHO_CMD} 'CFLAGS+=-I${LOCALBASE}/include' >> ${WRKSRC}/libr/anal/Makefile
> 	${ECHO_CMD} 'CFLAGS+=-I${LOCALBASE}/include' >> ${WRKSRC}/libr/asm/Makefile
> 
>diff --git a/devel/rapidjson/Makefile b/devel/rapidjson/Makefile
>index 22b5a2a..9b4f705 100644
>--- a/devel/rapidjson/Makefile
>+++ b/devel/rapidjson/Makefile
>@@ -21,7 +21,7 @@ DOXYGEN_BUILD_DEPENDS+=	doxygen:devel/doxygen
> USE_GITHUB=	yes
> GH_ACCOUNT=	miloyip
> 
>-USES=		cmake compiler:c++11-lang gmake
>+USES=		cmake compiler:c++11-lang gmake pathfix
> 
> OPTIONS_DEFINE=	DOXYGEN EXAMPLES
> OPTIONS_DEFAULT=${OPTIONS_DEFINE}
>@@ -40,7 +40,6 @@ DATADIR=	${PREFIX}/share/doc/RapidJSON
> PORTDATA=	*
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|LIB_INSTALL_DIR}/pkgconfig"|CMAKE_INSTALL_PREFIX}/libdata/pkgconfig"|' ${WRKSRC}/CMakeLists.txt
> 	@${REINPLACE_CMD} -e 's|DOC_INSTALL_DIR}/examples"|CMAKE_INSTALL_PREFIX}/share/examples/${PORTNAME}"|' ${WRKSRC}/CMakeLists.txt
> 	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/example/CMakeLists.txt ${WRKSRC}/test/unittest/CMakeLists.txt
> 	@${REINPLACE_CMD} -e 's|.*travis.*||' ${WRKSRC}/CMakeLists.txt   # travis_doc breaks cmake, see https://github.com/miloyip/rapidjson/issues/715
>diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
>index 0f3751e..174286e 100644
>--- a/devel/rudiments/Makefile
>+++ b/devel/rudiments/Makefile
>@@ -12,7 +12,8 @@ COMMENT=	C++ class library for daemons, clients, servers, and more
> LICENSE=	LGPL20
> 
> GNU_CONFIGURE=	yes
>-USES=		libtool pkgconfig shebangfix
>+USES=		libtool pathfix pkgconfig shebangfix
>+PATHFIX_MAKEFILEIN=	Makefile
> SHEBANG_FILES=	doc/programming/insert.pl
> USE_LDCONFIG=	yes
> 
>diff --git a/devel/rudiments/files/patch-Makefile b/devel/rudiments/files/patch-Makefile
>index 9cfc45f..242e3b0 100644
>--- a/devel/rudiments/files/patch-Makefile
>+++ b/devel/rudiments/files/patch-Makefile
>@@ -1,28 +1,20 @@
>---- Makefile.orig	2015-08-05 23:06:25.000000000 +0200
>-+++ Makefile	2015-08-08 12:40:43.305908000 +0200
>-@@ -16,12 +16,9 @@
>+--- Makefile.orig	2016-10-03 12:37:06 UTC
>++++ Makefile
>+@@ -17,9 +17,6 @@ install:
>  	cd bin $(AND) $(MAKE) install
>  	cd doc $(AND) $(MAKE) install
>  	cd man $(AND) $(MAKE) install
> -	$(MKINSTALLDIRS) $(licensedir)
> -	$(CP) COPYING $(licensedir)
> -	$(CHMOD) 0644 $(licensedir)/COPYING
>--	$(MKINSTALLDIRS) $(libdir)/pkgconfig
>--	$(CP) rudiments.pc $(libdir)/pkgconfig
>--	$(CHMOD) 644 $(libdir)/pkgconfig/rudiments.pc
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/libdata/pkgconfig
>-+	$(CP) rudiments.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
>-+	$(CHMOD) 644 $(DESTDIR)$(prefix)/libdata/pkgconfig/rudiments.pc
>- 
>- uninstall:
>- 	cd src $(AND) $(MAKE) uninstall
>-@@ -29,8 +26,7 @@
>+ 	$(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
>+ 	$(CP) rudiments.pc $(prefix)/libdata/pkgconfig
>+ 	$(CHMOD) 644 $(prefix)/libdata/pkgconfig/rudiments.pc
>+@@ -30,7 +27,6 @@ uninstall:
>  	cd bin $(AND) $(MAKE) uninstall
>  	cd doc $(AND) $(MAKE) uninstall
>  	cd man $(AND) $(MAKE) uninstall
> -	$(RMTREE) $(licensedir)
>--	$(RM) $(libdir)/pkgconfig/rudiments.pc
>-+	$(RM) $(DESTDIR)$(prefix)/libdata/pkgconfig/rudiments.pc
>+ 	$(RM) $(prefix)/libdata/pkgconfig/rudiments.pc
>  
>  distclean: clean
>- 	$(RM) config.mk config.cache config.h config.log config.status features.mk libtool rudiments.pc include/Makefile include/rudiments/private/config.h include/rudiments/private/config.h.in~ bin/rudiments-config src/Makefile msvc/rudiments.opensdf msvc/rudiments.sdf msvc/rudiments.suo
>diff --git a/devel/rudiments/files/patch-bin_Makefile b/devel/rudiments/files/patch-bin_Makefile
>deleted file mode 100644
>index dff40e4..0000000
>--- a/devel/rudiments/files/patch-bin_Makefile
>+++ /dev/null
>@@ -1,16 +0,0 @@
>---- bin/Makefile.orig	2015-01-13 22:38:32 UTC
>-+++ bin/Makefile
>-@@ -3,9 +3,9 @@ top_builddir = ..
>- include ../config.mk
>- 
>- install:
>--	$(MKINSTALLDIRS) $(bindir)
>--	$(CP) rudiments-config $(bindir)
>--	$(CHMOD) 755 $(bindir)/rudiments-config
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
>-+	$(CP) rudiments-config $(DESTDIR)$(bindir)
>-+	$(CHMOD) 755 $(DESTDIR)$(bindir)/rudiments-config
>- 
>- uninstall:
>--	$(RM) $(bindir)/rudiments-config
>-+	$(RM) $(DESTDIR)$(bindir)/rudiments-config
>diff --git a/devel/rudiments/files/patch-configure b/devel/rudiments/files/patch-configure
>index d47d7e2..0f73640 100644
>--- a/devel/rudiments/files/patch-configure
>+++ b/devel/rudiments/files/patch-configure
>@@ -1,6 +1,6 @@
>---- configure.orig	2015-04-11 01:05:36 UTC
>+--- configure.orig	2016-03-26 17:20:08 UTC
> +++ configure
>-@@ -9216,7 +9216,7 @@ $as_echo_n "checking whether the $compil
>+@@ -9284,7 +9284,7 @@ $as_echo_n "checking whether the $compil
>    hardcode_minus_L=no
>    hardcode_shlibpath_var=unsupported
>    inherit_rpath=no
>@@ -28,62 +28,3 @@
>  	*)
>  		;;
>  esac
>-@@ -31537,47 +31540,47 @@ fi
>- # prepend DESTDIR where appropriate
>- if ( test "`echo $ac_default_prefix | cut -c1`" = "/" )
>- then
>--	ac_default_prefix='${DESTDIR}'"$ac_default_prefix"
>-+	ac_default_prefix="$ac_default_prefix"
>- fi
>- if ( test "`echo $prefix | cut -c1`" = "/" )
>- then
>--	prefix='${DESTDIR}'"$prefix"
>-+	prefix="$prefix"
>- fi
>- if ( test "`echo $exec_prefix | cut -c1`" = "/" )
>- then
>--	exec_prefix='${DESTDIR}'"$exec_prefix"
>-+	exec_prefix="$exec_prefix"
>- fi
>- if ( test "`echo $includedir | cut -c1`" = "/" )
>- then
>--	includedir='${DESTDIR}'"$includedir"
>-+	includedir="$includedir"
>- fi
>- if ( test "`echo $libdir | cut -c1`" = "/" )
>- then
>--	libdir='${DESTDIR}'"$libdir"
>-+	libdir="$libdir"
>- fi
>- if ( test "`echo $libexecdir | cut -c1`" = "/" )
>- then
>--	libexecdir='${DESTDIR}'"$libexecdir"
>-+	libexecdir="$libexecdir"
>- fi
>- if ( test "`echo $bindir | cut -c1`" = "/" )
>- then
>--	bindir='${DESTDIR}'"$bindir"
>-+	bindir="$bindir"
>- fi
>- if ( test "`echo $localstatedir | cut -c1`" = "/" )
>- then
>--	localstatedir='${DESTDIR}'"$localstatedir"
>-+	localstatedir="$localstatedir"
>- fi
>- if ( test "`echo $sysconfdir | cut -c1`" = "/" )
>- then
>--	sysconfdir='${DESTDIR}'"$sysconfdir"
>-+	sysconfdir="$sysconfdir"
>- fi
>- if ( test "`echo $mandir | cut -c1`" = "/" )
>- then
>--	mandir='${DESTDIR}'"$mandir"
>-+	mandir="$mandir"
>- fi
>- if ( test "`echo $datadir | cut -c1`" = "/" )
>- then
>--	datadir='${DESTDIR}'"$datadir"
>-+	datadir="$datadir"
>- fi
>- 
>- 
>diff --git a/devel/rudiments/files/patch-doc_Makefile b/devel/rudiments/files/patch-doc_Makefile
>deleted file mode 100644
>index d4856a1..0000000
>--- a/devel/rudiments/files/patch-doc_Makefile
>+++ /dev/null
>@@ -1,90 +0,0 @@
>---- doc/Makefile.orig	2015-09-02 20:19:17 UTC
>-+++ doc/Makefile
>-@@ -5,46 +5,46 @@ include ../config.mk
>- all:
>- 
>- install:
>--	$(MKINSTALLDIRS) $(docdir)
>--	$(MKINSTALLDIRS) $(docdir)/css
>--	$(MKINSTALLDIRS) $(docdir)/classes/html
>--	$(MKINSTALLDIRS) $(docdir)/features
>--	$(MKINSTALLDIRS) $(docdir)/programming
>--	$(CP) installing.html $(docdir)
>--	$(CP) index.html $(docdir)
>--	$(CP) css/styles.css $(docdir)/css
>--	$(CP) classes/html/*.html $(docdir)/classes/html
>--	$(CP) classes/html/*.png $(docdir)/classes/html
>--	$(CP) classes/html/*.css $(docdir)/classes/html
>--	$(CP) classes/html/*.js $(docdir)/classes/html
>--	$(CP) features/*.html $(docdir)/features
>--	$(CP) programming/*.html $(docdir)/programming
>--	$(CHMOD) 644 $(docdir)/*.html
>--	$(CHMOD) 644 $(docdir)/css/*
>--	$(CHMOD) 644 $(docdir)/classes/html/a*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/b*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/c*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/d*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/e*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/f*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/g*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/h*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/i*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/l*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/m*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/n*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/p*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/r*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/s*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/t*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/u*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/w*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/x*.html
>--	$(CHMOD) 644 $(docdir)/classes/html/*.png
>--	$(CHMOD) 644 $(docdir)/classes/html/*.css
>--	$(CHMOD) 644 $(docdir)/classes/html/*.js
>--	$(CHMOD) 644 $(docdir)/features/*.html
>--	$(CHMOD) 644 $(docdir)/programming/*.html
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(docdir)
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/css
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/classes/html
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/features
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/programming
>-+	$(CP) installing.html $(DESTDIR)$(docdir)
>-+	$(CP) index.html $(DESTDIR)$(docdir)
>-+	$(CP) css/styles.css $(DESTDIR)$(docdir)/css
>-+	$(CP) classes/html/*.html $(DESTDIR)$(docdir)/classes/html
>-+	$(CP) classes/html/*.png $(DESTDIR)$(docdir)/classes/html
>-+	$(CP) classes/html/*.css $(DESTDIR)$(docdir)/classes/html
>-+	$(CP) classes/html/*.js $(DESTDIR)$(docdir)/classes/html
>-+	$(CP) features/*.html $(DESTDIR)$(docdir)/features
>-+	$(CP) programming/*.html $(DESTDIR)$(docdir)/programming
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/css/*
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/a*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/b*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/c*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/d*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/e*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/f*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/g*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/h*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/i*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/l*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/m*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/n*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/p*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/r*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/s*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/t*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/u*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/w*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/x*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/*.png
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/*.css
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/*.js
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/features/*.html
>-+	$(CHMOD) 644 $(DESTDIR)$(docdir)/programming/*.html
>- 
>- uninstall:
>--	$(RMTREE) $(docdir)
>-+	$(RMTREE) $(DESTDIR)$(docdir)
>diff --git a/devel/rudiments/files/patch-include_Makefile.in b/devel/rudiments/files/patch-include_Makefile.in
>deleted file mode 100644
>index 267f615..0000000
>--- a/devel/rudiments/files/patch-include_Makefile.in
>+++ /dev/null
>@@ -1,39 +0,0 @@
>---- include/Makefile.in.orig	2015-02-08 07:07:44 UTC
>-+++ include/Makefile.in
>-@@ -18,21 +18,21 @@ PRIVATEHEADERS7 = @PRIVATEHEADERS7@
>- all:
>- 
>- install:
>--	$(MKINSTALLDIRS) $(includedir)/rudiments
>--	$(MKINSTALLDIRS) $(includedir)/rudiments/private
>--	cd rudiments $(AND) $(CP) $(HEADERS0) $(includedir)/rudiments
>--	cd rudiments $(AND) $(CP) $(HEADERS1) $(includedir)/rudiments
>--	cd rudiments $(AND) $(CP) $(HEADERS2) $(includedir)/rudiments
>--	cd rudiments $(AND) $(CP) $(HEADERS3) $(includedir)/rudiments
>--	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS0) $(includedir)/rudiments/private
>--	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS1) $(includedir)/rudiments/private
>--	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS2) $(includedir)/rudiments/private
>--	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS3) $(includedir)/rudiments/private
>--	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS4) $(includedir)/rudiments/private
>--	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS5) $(includedir)/rudiments/private
>--	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS6) $(includedir)/rudiments/private
>--	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS7) $(includedir)/rudiments/private
>--	$(CHMOD) 644 $(includedir)/rudiments/*.h $(includedir)/rudiments/private/*.h
>-+	$(MKINSTALLDIRS) ${DESTDIR}$(includedir)/rudiments
>-+	$(MKINSTALLDIRS) ${DESTDIR}$(includedir)/rudiments/private
>-+	cd rudiments $(AND) $(CP) $(HEADERS0) ${DESTDIR}$(includedir)/rudiments
>-+	cd rudiments $(AND) $(CP) $(HEADERS1) ${DESTDIR}$(includedir)/rudiments
>-+	cd rudiments $(AND) $(CP) $(HEADERS2) ${DESTDIR}$(includedir)/rudiments
>-+	cd rudiments $(AND) $(CP) $(HEADERS3) ${DESTDIR}$(includedir)/rudiments
>-+	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS0) ${DESTDIR}$(includedir)/rudiments/private
>-+	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS1) ${DESTDIR}$(includedir)/rudiments/private
>-+	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS2) ${DESTDIR}$(includedir)/rudiments/private
>-+	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS3) ${DESTDIR}$(includedir)/rudiments/private
>-+	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS4) ${DESTDIR}$(includedir)/rudiments/private
>-+	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS5) ${DESTDIR}$(includedir)/rudiments/private
>-+	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS6) ${DESTDIR}$(includedir)/rudiments/private
>-+	cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS7) ${DESTDIR}$(includedir)/rudiments/private
>-+	$(CHMOD) 644 ${DESTDIR}$(includedir)/rudiments/*.h ${DESTDIR}$(includedir)/rudiments/private/*.h
>- 
>- uninstall:
>- 	$(RMTREE) $(includedir)/rudiments
>diff --git a/devel/rudiments/files/patch-man_Makefile b/devel/rudiments/files/patch-man_Makefile
>deleted file mode 100644
>index 4869b86..0000000
>--- a/devel/rudiments/files/patch-man_Makefile
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- man/Makefile.orig	2015-01-13 22:38:32 UTC
>-+++ man/Makefile
>-@@ -3,10 +3,10 @@ top_builddir = ..
>- include ../config.mk
>- 
>- install:
>--	$(MKINSTALLDIRS) $(mandir)
>--	$(MKINSTALLDIRS) $(mandir)/man1
>--	$(CP) rudiments-config.1 $(mandir)/man1
>--	$(CHMOD) 644 $(mandir)/man1/rudiments-config.1
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
>-+	$(CP) rudiments-config.1 $(DESTDIR)$(mandir)/man1
>-+	$(CHMOD) 644 $(DESTDIR)$(mandir)/man1/rudiments-config.1
>- 
>- uninstall:
>--	$(RM) $(mandir)/man1/rudiments-config.1
>-+	$(RM) $(DESTDIR)$(mandir)/man1/rudiments-config.1
>diff --git a/devel/rudiments/files/patch-src_Makefile.in b/devel/rudiments/files/patch-src_Makefile.in
>index 8a23a18..a27afe5 100644
>--- a/devel/rudiments/files/patch-src_Makefile.in
>+++ b/devel/rudiments/files/patch-src_Makefile.in
>@@ -1,4 +1,4 @@
>---- src/Makefile.in.orig	2015-02-06 03:20:27 UTC
>+--- src/Makefile.in.orig	2016-02-06 03:58:09 UTC
> +++ src/Makefile.in
> @@ -11,7 +11,7 @@ LOBJS = @LOBJS@
>  .SUFFIXES: .lo
>@@ -9,7 +9,7 @@
>  
>  .cpp.obj:
>  	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(COMPILE) $<
>-@@ -22,26 +22,26 @@ clean:
>+@@ -22,7 +22,7 @@ clean:
>  	$(LTCLEAN) $(RM) *.lo *.o *.obj *.$(LIBEXT) *.lib *.exp *.idb *.pdb *.manifest
>  
>  librudiments.$(LIBEXT): $(SRCS) $(LOBJS)
>@@ -18,32 +18,3 @@
>  
>  install: $(INSTALLLIB)
>  
>- installdll:
>--	$(MKINSTALLDIRS) $(bindir)
>--	$(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(bindir)
>--	$(MKINSTALLDIRS) $(libdir)
>--	$(LTINSTALL) $(CP) librudiments.lib $(libdir)
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
>-+	$(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(DESTDIR)$(bindir)
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
>-+	$(LTINSTALL) $(CP) librudiments.lib $(DESTDIR)$(libdir)
>- 
>- installlib:
>--	$(MKINSTALLDIRS) $(libdir)
>--	$(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(libdir)
>--	$(LTFINISH) $(libdir)
>-+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
>-+	$(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(DESTDIR)$(libdir)
>-+	$(LTFINISH) $(DESTDIR)$(libdir)
>- 
>- uninstall: $(UNINSTALLLIB)
>- 
>- uninstalldll:
>--	$(LTUNINSTALL) $(RM) $(bindir)/librudiments.$(LIBEXT)
>--	$(LTUNINSTALL) $(RM) $(libdir)/librudiments.lib
>-+	$(LTUNINSTALL) $(RM) $(DESTDIR)$(bindir)/librudiments.$(LIBEXT)
>-+	$(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/librudiments.lib
>- 
>- uninstalllib:
>--	$(LTUNINSTALL) $(RM) $(libdir)/librudiments.$(LIBEXT)
>-+	$(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/librudiments.$(LIBEXT)
>diff --git a/devel/simavr/Makefile b/devel/simavr/Makefile
>index 6050ee1..d2d7e59 100644
>--- a/devel/simavr/Makefile
>+++ b/devel/simavr/Makefile
>@@ -20,7 +20,8 @@ BUILD_DEPENDS=	avr-gcc:devel/avr-gcc \
> USE_GITHUB=	yes
> GH_ACCOUNT=	buserror
> 
>-USES=		gmake pkgconfig
>+USES=		gmake pathfix pkgconfig
>+PATHFIX_MAKEFILEIN=	Makefile
> ALL_TARGET=	build-simavr
> MAKE_ARGS=	"RELEASE=1 PREFIX=${PREFIX} DESTDIR=${STAGEDIR}${PREFIX}"
> 
>diff --git a/devel/simavr/files/patch-simavr_Makefile b/devel/simavr/files/patch-simavr_Makefile
>index a6d8798..ba4b038 100644
>--- a/devel/simavr/files/patch-simavr_Makefile
>+++ b/devel/simavr/files/patch-simavr_Makefile
>@@ -1,4 +1,4 @@
>---- simavr/Makefile.orig	2016-01-19 09:41:55 UTC
>+--- simavr/Makefile.orig	2016-10-03 12:42:39 UTC
> +++ simavr/Makefile
> @@ -73,12 +73,9 @@ ${OBJ}/libsimavr.so		: ${OBJ}/libsimavr.
>  	ln -sf libsimavr.so.1 $@
>@@ -14,19 +14,11 @@
>  
>  ${target}	: ${OBJ}/${target}.elf
>  
>-@@ -103,15 +100,13 @@ install : all
>- 	$(INSTALL) -m644 sim/avr/*.h $(DESTDIR)/include/simavr/avr/
>- 	$(MKDIR) $(DESTDIR)/lib
>- 	$(INSTALL) ${OBJ}/libsimavr.a $(DESTDIR)/lib/
>--	$(MKDIR) $(DESTDIR)/lib/pkgconfig/
>-+	$(MKDIR) $(DESTDIR)/libdata/pkgconfig/
>+@@ -108,10 +105,8 @@ install : all
>+ 		simavr-avr.pc >$(DESTDIR)/libdata/pkgconfig/simavr-avr.pc
>  	sed -e "s|PREFIX|${PREFIX}|g" -e "s|VERSION|${SIMAVR_VERSION}|g" \
>--		simavr-avr.pc >$(DESTDIR)/lib/pkgconfig/simavr-avr.pc
>-+		simavr-avr.pc >$(DESTDIR)/libdata/pkgconfig/simavr-avr.pc
>- 	sed -e "s|PREFIX|${PREFIX}|g" -e "s|VERSION|${SIMAVR_VERSION}|g" \
>--		simavr.pc >$(DESTDIR)/lib/pkgconfig/simavr.pc
>+ 		simavr.pc >$(DESTDIR)/libdata/pkgconfig/simavr.pc
> -ifeq (${shell uname}, Linux)
>-+		simavr.pc >$(DESTDIR)/libdata/pkgconfig/simavr.pc
>  	$(INSTALL) ${OBJ}/libsimavr.so.1 $(DESTDIR)/lib/
>  	ln -sf libsimavr.so.1 $(DESTDIR)/lib/libsimavr.so
> -endif
>diff --git a/devel/sparsehash/Makefile b/devel/sparsehash/Makefile
>index 404e824..8046441 100644
>--- a/devel/sparsehash/Makefile
>+++ b/devel/sparsehash/Makefile
>@@ -11,6 +11,7 @@ COMMENT=	Extremely memory-efficient hash_map implementation
> 
> LICENSE=	BSD3CLAUSE
> 
>+USES=		pathfix
> USE_GITHUB=	yes
> GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
> 
>@@ -18,11 +19,6 @@ GNU_CONFIGURE=	yes
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	${REINPLACE_CMD} -e \
>-		's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.in
>-
> post-patch-DOCS-on:
> 	${REINPLACE_CMD} -e \
> 		's|^docdir = .*|docdir = ${DOCSDIR}|' \
>diff --git a/devel/tex-kpathsea/Makefile b/devel/tex-kpathsea/Makefile
>index 68a4b7f..cd181ca 100644
>--- a/devel/tex-kpathsea/Makefile
>+++ b/devel/tex-kpathsea/Makefile
>@@ -12,7 +12,7 @@ DIST_SUBDIR=	TeX
> MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Path searching library for TeX
> 
>-USES=		libtool tar:xz
>+USES=		libtool pathfix tar:xz
> USE_LDCONFIG=	yes
> USE_TEX=	yes
> EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
>diff --git a/devel/tex-kpathsea/files/patch-Makefile.in b/devel/tex-kpathsea/files/patch-Makefile.in
>index ec7b01f..22f3020 100644
>--- a/devel/tex-kpathsea/files/patch-Makefile.in
>+++ b/devel/tex-kpathsea/files/patch-Makefile.in
>@@ -40,8 +40,7 @@
>  	xopendir.h \
>  	xstat.h
>  
>--pkgconfigdir = ${libdir}/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>+ pkgconfigdir = $(prefix)/libdata/pkgconfig
>  pkgconfig_DATA = kpathsea.pc
>  DISTCLEANFILES = paths.h stamp-paths kpathsea.h
>  kpseaccess_SOURCES = access.c
>diff --git a/devel/tex-libtexlua/Makefile b/devel/tex-libtexlua/Makefile
>index dcf84c1..9cc70b6 100644
>--- a/devel/tex-libtexlua/Makefile
>+++ b/devel/tex-libtexlua/Makefile
>@@ -14,7 +14,7 @@ COMMENT=	Lua library for TeXLive
> LICENSE=	MIT
> LICENSE_FILE=	${WRKDIR}/LICENSE.MIT
> 
>-USES=		tar:xz libtool pkgconfig
>+USES=		tar:xz libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
> EXTRACT_FILES=		build-aux libs/lua52
>diff --git a/devel/tex-libtexlua/files/patch-Makefile.in b/devel/tex-libtexlua/files/patch-Makefile.in
>deleted file mode 100644
>index 450a29e..0000000
>--- a/devel/tex-libtexlua/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2015-02-16 14:32:53 UTC
>-+++ Makefile.in
>-@@ -675,7 +675,7 @@ lua52include_HEADERS = \
>- 	$(LUA52_TREE)/src/lua.hpp \
>- 	$(LUA52_TREE)/src/lualib.h
>- 
>--pkgconfigdir = ${libdir}/pkgconfig
>-+pkgconfigdir = ${prefix}/libdata/pkgconfig
>- pkgconfig_DATA = texlua52.pc
>- @build_TRUE@dist_check_SCRIPTS = lua52.test luaerror.test
>- @build_TRUE@TESTS = lua52.test luaerror.test
>diff --git a/devel/tex-libtexluajit/Makefile b/devel/tex-libtexluajit/Makefile
>index a7f6599..8fd183e 100644
>--- a/devel/tex-libtexluajit/Makefile
>+++ b/devel/tex-libtexluajit/Makefile
>@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LuaJIT-2.0.3/COPYRIGHT
> 
> BROKEN_powerpc64=	Does not build
> 
>-USES=		tar:xz libtool pkgconfig
>+USES=		tar:xz libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
> EXTRACT_FILES=		build-aux libs/luajit
>diff --git a/devel/tex-libtexluajit/files/patch-Makefile.in b/devel/tex-libtexluajit/files/patch-Makefile.in
>deleted file mode 100644
>index facb0b0..0000000
>--- a/devel/tex-libtexluajit/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2015-02-16 14:32:53 UTC
>-+++ Makefile.in
>-@@ -728,7 +728,7 @@ luajitinclude_HEADERS = \
>- 	$(LUAJIT_TREE)/src/lua.hpp \
>- 	$(LUAJIT_TREE)/src/lualib.h
>- 
>--pkgconfigdir = ${libdir}/pkgconfig
>-+pkgconfigdir = ${prefix}/libdata/pkgconfig
>- pkgconfig_DATA = texluajit.pc
>- @build_TRUE@dist_check_SCRIPTS = luajit.test luajiterr.test
>- @build_TRUE@TESTS = luajit.test luajiterr.test
>diff --git a/devel/tex-synctex/Makefile b/devel/tex-synctex/Makefile
>index 9181627..ef9e920 100644
>--- a/devel/tex-synctex/Makefile
>+++ b/devel/tex-synctex/Makefile
>@@ -16,7 +16,7 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/synctexdir/README.txt
> 
> CONFLICTS=	tex-web2c-20150521
>-USES=		libtool pkgconfig tar:xz
>+USES=		libtool pathfix pkgconfig tar:xz
> USE_TEX=	kpathsea
> USE_LDCONFIG=	yes
> EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
>diff --git a/devel/tex-synctex/files/patch-Makefile.in b/devel/tex-synctex/files/patch-Makefile.in
>index 9eecbff..fd92892 100644
>--- a/devel/tex-synctex/files/patch-Makefile.in
>+++ b/devel/tex-synctex/files/patch-Makefile.in
>@@ -29,12 +29,3 @@
>  proglib = lib/lib.a
>  EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
>  	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
>-@@ -3557,7 +3557,7 @@
>- 
>- nodist_libsynctex_a_SOURCES = $(libsynctex_la_SOURCES)
>- syncincludedir = ${includedir}/synctex
>--pkgconfigdir = ${libdir}/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- @SYNCTEX_TRUE@syncinclude_HEADERS = \
>- @SYNCTEX_TRUE@	synctexdir/synctex_parser.h \
>- @SYNCTEX_TRUE@	synctexdir/synctex_parser_utils.h
>diff --git a/devel/tex-web2c/Makefile b/devel/tex-web2c/Makefile
>index d6e04e4..651148c 100644
>--- a/devel/tex-web2c/Makefile
>+++ b/devel/tex-web2c/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15 \
> 		libzzip.so:devel/zziplib \
> 		libmpfr.so:math/mpfr
> 
>-USES=		pkgconfig libtool tar:xz
>+USES=		pathfix pkgconfig libtool tar:xz
> USE_TEX=	kpathsea ptexenc
> USE_XORG=	pixman
> USE_GNOME=	cairo
>diff --git a/devel/tex-web2c/files/patch-Makefile.in b/devel/tex-web2c/files/patch-Makefile.in
>index 57fac22..da071e3 100644
>--- a/devel/tex-web2c/files/patch-Makefile.in
>+++ b/devel/tex-web2c/files/patch-Makefile.in
>@@ -15,12 +15,3 @@
>  nodist_man_MANS = 
>  EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
>  	triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
>-@@ -3557,7 +3557,7 @@
>- 
>- nodist_libsynctex_a_SOURCES = $(libsynctex_la_SOURCES)
>- syncincludedir = ${includedir}/synctex
>--pkgconfigdir = ${libdir}/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- @SYNCTEX_TRUE@syncinclude_HEADERS = \
>- @SYNCTEX_TRUE@	synctexdir/synctex_parser.h \
>- @SYNCTEX_TRUE@	synctexdir/synctex_parser_utils.h
>diff --git a/devel/thrift-c_glib/Makefile b/devel/thrift-c_glib/Makefile
>index 74e33d5..f07db4c 100644
>--- a/devel/thrift-c_glib/Makefile
>+++ b/devel/thrift-c_glib/Makefile
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libglib-2.0.so:devel/glib20
> 
> DISTINFO_FILE=	${.CURDIR}/../thrift/distinfo
> 
>-USES=		autoreconf pkgconfig gmake libtool
>+USES=		autoreconf pathfix pkgconfig gmake libtool
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> MAKE_JOBS_UNSAFE=	yes
>@@ -43,7 +43,4 @@ CONFIGURE_ARGS+=        \
> 		--without-ruby \
> 		--without-go
> 
>-post-patch:
>-	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/c_glib/Makefile.am
>-
> .include <bsd.port.mk>
>diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
>index 8a2652d..366e1f4 100644
>--- a/devel/thrift-cpp/Makefile
>+++ b/devel/thrift-cpp/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
> 		libevent.so:devel/libevent2
> 
> USES=			autoreconf pkgconfig gmake compiler:c++11-lang \
>-			libtool ssl
>+			libtool pathfix ssl
> GNU_CONFIGURE=		yes
> USE_LDCONFIG=		yes
> MAKE_JOBS_UNSAFE=	yes
>@@ -60,9 +60,6 @@ BROKEN_FreeBSD_9=	does not build with 9.x base OpenSSL
> USE_CXXSTD=	c++11
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am
>-
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so
> 	${LN} -sf libthrift-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthrift.so.0
>diff --git a/devel/unibilium/Makefile b/devel/unibilium/Makefile
>index db97238..3e2bd8f 100644
>--- a/devel/unibilium/Makefile
>+++ b/devel/unibilium/Makefile
>@@ -15,14 +15,12 @@ LICENSE_FILE=	${WRKSRC}/LGPLv3
> USE_GITHUB=	yes
> GH_ACCOUNT=	mauke
> 
>-USES=		gmake libtool:build perl5 pkgconfig
>+USES=		gmake libtool:build pathfix perl5 pkgconfig
>+PATHFIX_MAKEFILEIN=	Makefile
> USE_PERL5=	build
> USE_LDCONFIG=	yes
> MAKE_ARGS=	MANDIR=${MANPREFIX}/man
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/Makefile
>-
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libunibilium.so
> 
>diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
>index 0e117c6..a21bd39 100644
>--- a/devel/valgrind-devel/Makefile
>+++ b/devel/valgrind-devel/Makefile
>@@ -44,7 +44,6 @@ MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
> 
> OPTIONS_SUB=	yes
> USES=		pathfix pkgconfig gmake perl5 shebangfix autoreconf
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_PERL5=	build
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
>index 74fcc36..cdc4975 100644
>--- a/devel/valgrind/Makefile
>+++ b/devel/valgrind/Makefile
>@@ -42,7 +42,6 @@ MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
> 
> OPTIONS_SUB=	yes
> USES=		pathfix pkgconfig gmake perl5 shebangfix autoreconf
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_PERL5=	build
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>diff --git a/dns/bundy/Makefile b/dns/bundy/Makefile
>index ccca8c7..d757f31 100644
>--- a/dns/bundy/Makefile
>+++ b/dns/bundy/Makefile
>@@ -36,7 +36,6 @@ USE_OPENSSL=	yes
> USES=	compiler:c++11-lang pathfix pkgconfig libtool python:3 autoreconf
> 
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--localstatedir=/var	\
> 		--without-werror \
>diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile
>index 03f7a75..4219764 100644
>--- a/dns/getdns/Makefile
>+++ b/dns/getdns/Makefile
>@@ -21,7 +21,7 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2 \
> 		libldns.so:dns/ldns \
> 		libunbound.so:dns/unbound
> 
>-USES=		libtool
>+USES=		libtool pathfix
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-libidn=${LOCALBASE} --docdir=${DOCSDIR} \
>@@ -53,8 +53,6 @@ CONFIGURE_ARGS+=	--disable-gost
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.in
> 	${REINPLACE_CMD} -Ee 's,^(sharedoc = ).*,\1${WRKDIR}/doc,' \
> 		-e '/echo .\*\*\*/d' ${WRKSRC}/Makefile.in
> 
>diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile
>index 4b8e2bb..f3049cf 100644
>--- a/dns/libpsl/Makefile
>+++ b/dns/libpsl/Makefile
>@@ -29,7 +29,6 @@ CONFIGURE_ARGS=	--enable-man \
> 		--with-psl-testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_LDCONFIG=	yes
> USES=		autoreconf libtool pathfix pkgconfig python:build shebangfix
> 
>diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
>index b654819..6a4e27b 100644
>--- a/emulators/open-vm-tools/Makefile
>+++ b/emulators/open-vm-tools/Makefile
>@@ -42,7 +42,7 @@ ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
> 
> WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
> GNU_CONFIGURE=		yes
>-USES=			pkgconfig kmod libtool
>+USES=			pathfix pkgconfig kmod libtool
> USE_GNOME=		glib20
> USE_LDCONFIG=		yes
> CPPFLAGS+=		-Wno-deprecated-declarations
>diff --git a/emulators/open-vm-tools/files/patch-libguestlib-Makefile b/emulators/open-vm-tools/files/patch-libguestlib-Makefile
>deleted file mode 100644
>index 7fd8c0c..0000000
>--- a/emulators/open-vm-tools/files/patch-libguestlib-Makefile
>+++ /dev/null
>@@ -1,22 +0,0 @@
>---- ./libguestlib/Makefile.am.orig	2010-04-28 03:17:28.000000000 +0900
>-+++ ./libguestlib/Makefile.am	2010-11-11 22:21:38.000000000 +0900
>-@@ -41,7 +41,7 @@
>- 
>- EXTRA_DIST = vmguestlib.pc.in
>- 
>--pkgconfigdir   = $(libdir)/pkgconfig
>-+pkgconfigdir   = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = vmguestlib.pc
>- 
>- $(pkgconfig_DATA): $(top_builddir)/config.status
>---- ./libguestlib/Makefile.in.orig	2010-04-28 03:18:19.000000000 +0900
>-+++ ./libguestlib/Makefile.in	2010-11-11 22:22:04.000000000 +0900
>-@@ -298,7 +298,7 @@
>- 	$(top_srcdir)/lib/include/vmSessionId.h \
>- 	$(top_srcdir)/lib/include/vm_basic_types.h
>- EXTRA_DIST = vmguestlib.pc.in
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = vmguestlib.pc
>- all: all-am
>- 
>diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
>index 60fa37f..6302109 100644
>--- a/ftp/curl/Makefile
>+++ b/ftp/curl/Makefile
>@@ -158,7 +158,7 @@ IGNORE=		unsupported TLS-SRP in LibreSSL
> 
> post-patch:
> 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /cd docs &&/d' ${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e 's|$flags_dbg_off=$".*"|\1""|; s|$flags_opt_off=$".*"|\1""|; s|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|$flags_dbg_off=$".*"|\1""|; s|$flags_opt_off=$".*"|\1""|' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|include <gssapi.h>|include <gssapi/gssapi.h>|' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h
> 
> .if !defined(BUILDING_HIPHOP)
>diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure
>index be10172..86d89fe 100644
>--- a/ftp/curl/files/patch-configure
>+++ b/ftp/curl/files/patch-configure
>@@ -70,16 +70,6 @@ Last-Update: 2010-12-19
>  
>        if test "$want_optimize" = "yes"; then
>          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
>-@@ -21417,7 +21425,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg
>-         PKGTEST="no"
>-     PREFIX_OPENSSL=$OPT_SSL
>- 
>--                OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
>-+                # Use the FreeBSD location of the pkgconf libdir
>-+                OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"
>-     { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
>- $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
>-     if test -f "$OPENSSL_PCDIR/openssl.pc"; then
> @@ -25050,29 +25059,30 @@ $as_echo "found" >&6; }
>      ;;
>    off)
>diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
>index 6fd218c..f5cd649 100644
>--- a/ftp/curlpp/Makefile
>+++ b/ftp/curlpp/Makefile
>@@ -20,7 +20,6 @@ OPTIONS_DEFINE=	BOOST DOCS EXAMPLES
> CONFIGURE_ARGS=	--disable-ewarning
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_LDCONFIG=	yes
> USES=		autoreconf libtool localbase pathfix
> 
>diff --git a/games/liblcf/Makefile b/games/liblcf/Makefile
>index 72fa56d..19861dd 100644
>--- a/games/liblcf/Makefile
>+++ b/games/liblcf/Makefile
>@@ -18,7 +18,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	EasyRPG
> 
> USES=		autoreconf compiler:c++11-lib libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile
>index 31b8414..d39083c 100644
>--- a/games/poker-engine/Makefile
>+++ b/games/poker-engine/Makefile
>@@ -22,14 +22,9 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync \
> 		${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
> 		${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt
> 
>-USES=		gettext gmake pkgconfig python:2
>+USES=		gettext gmake pathfix pkgconfig python:2
> GNU_CONFIGURE=	yes
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|{datadir}/pkgconfig|(prefix)/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.in
>-
> test:
> 	@cd ${WRKSRC} && ${MAKE_CMD} check
> 
>diff --git a/games/py-poker-eval/Makefile b/games/py-poker-eval/Makefile
>index 137db62..8c54a82 100644
>--- a/games/py-poker-eval/Makefile
>+++ b/games/py-poker-eval/Makefile
>@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libpoker-eval.so:games/poker-eval
> 
>-USES=		autoreconf libtool pkgconfig python:2
>+USES=		autoreconf libtool pathfix pkgconfig python:2
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	PYTHON=""
> 
>diff --git a/games/py-poker-eval/files/patch-Makefile.am b/games/py-poker-eval/files/patch-Makefile.am
>index fa26c19..914e0ad 100644
>--- a/games/py-poker-eval/files/patch-Makefile.am
>+++ b/games/py-poker-eval/files/patch-Makefile.am
>@@ -15,12 +15,3 @@
>  if PYTHON_2_6
>  py2_6exec_LTLIBRARIES = _pokereval_2_6.la
>  _pokereval_2_6_la_SOURCES = pypokereval.c
>-@@ -64,7 +72,7 @@
>- _pokereval_2_3_la_CFLAGS = ${PYTHON2_3_CFLAGS} ${POKER_EVAL_CFLAGS} -DPYTHON_VERSION=\"2_3\" -D'VERSION_NAME(w)=w\#\#2_3'
>- endif
>- 
>--pkgconfigdir = ${libdir}/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = pypoker-eval.pc
>- 
>- EXTRA_DIST = config/python.m4 config/ccpython.m4 \
>diff --git a/games/qqwing/Makefile b/games/qqwing/Makefile
>index f716ad4..09b8e9d 100644
>--- a/games/qqwing/Makefile
>+++ b/games/qqwing/Makefile
>@@ -17,7 +17,6 @@ USES=		autoreconf gmake libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_OUTSOURCE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> AUTORECONF_WRKSRC=	${WRKSRC}/build
> CONFIGURE_CMD=	${AUTORECONF_WRKSRC}/configure
> INSTALL_TARGET=	install-strip
>diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
>index f52ed81..81a942a 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 4c5b3a0..0000000
>--- 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 528bab4..248ab5d 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 ea31500..6478ffc 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 3840d83..9040b2e 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 acc504b..933dd62 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 1f6482b..c70458b 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 cc41218..0000000
>--- 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/leptonica/Makefile b/graphics/leptonica/Makefile
>index c2f2b33..a3af5c0 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 20ef65e..0000000
>--- 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 ec305d7..1ac945b 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 5fd1aee..fb3e698 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 d45082c..5adb1c6 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 f1b1a43e..a13ba36 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 4f39f63..dbb96da 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 bb33eda..2915a15 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 898b7d4..38f7a7e 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 6d1690d..b34d9f1 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 847db72..9e47488 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 5def09e..1194913 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 4364948..616e647 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 2dd5716..0000000
>--- 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 b06b6ec..10ccf9f 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 9a39202..01833a9 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 0278d65..b07dc47 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 b22dcba..78ad8be 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 c93b51d..2e211c9 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 c366e74..045df63 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 93f54c1..8da105d 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 e7261ba..b75b0b4 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 3e417c6..23fda48 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 592863a..89777b2 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 3f7ae4c..0000000
>--- 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 6396832..db5d2da 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 a981df8..b1017ea 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
>diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile
>index 75a9af4..edc8e4c 100644
>--- a/irc/ctrlproxy/Makefile
>+++ b/irc/ctrlproxy/Makefile
>@@ -16,7 +16,8 @@ LIB_DEPENDS=	libgnutls.so:security/gnutls
> USE_GNOME=	glib20
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-USES=		pkgconfig gmake
>+USES=		gmake pathfix pkgconfig
>+PATHFIX_MAKEFILEIN=	Makefile
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>diff --git a/irc/ctrlproxy/files/patch-Makefile b/irc/ctrlproxy/files/patch-Makefile
>index ea05159..1ad8753 100644
>--- a/irc/ctrlproxy/files/patch-Makefile
>+++ b/irc/ctrlproxy/files/patch-Makefile
>@@ -1,7 +1,7 @@
>---- Makefile.orig	Sun Apr 15 14:17:58 2007
>-+++ Makefile	Sat Jun 16 12:00:33 2007
>-@@ -108,7 +108,7 @@
>- ctrlproxy.pc Makefile.settings: configure Makefile.settings.in ctrlproxy.pc.in
>+--- Makefile.orig	2008-12-06 17:36:33 UTC
>++++ Makefile
>+@@ -145,7 +145,7 @@ endif
>+ ctrlproxy.pc Makefile.settings config.h: configure Makefile.settings.in ctrlproxy.pc.in
>  	./$<
>  
> -install: all install-dirs install-bin install-header install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS)
>@@ -9,7 +9,7 @@
>  install-dirs:
>  	$(INSTALL) -d $(DESTDIR)$(modulesdir)
>  
>-@@ -133,7 +133,6 @@
>+@@ -177,7 +177,6 @@ doc::
>  
>  install-doc:: doc
>  	$(INSTALL) -d $(DESTDIR)$(docdir)
>@@ -17,14 +17,3 @@
>  
>  uninstall-doc: 
>  	$(MAKE) -C doc uninstall
>-@@ -156,8 +154,8 @@
>-	$(INSTALL) -m 0644 config.admin $(DESTDIR)$(DEFAULT_CONFIG_DIR)/networks/admin
>- 
>- install-pkgconfig:
>--	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
>--	$(INSTALL) -m 0644 ctrlproxy.pc $(DESTDIR)$(libdir)/pkgconfig
>-+	$(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
>-+	$(INSTALL) -m 0644 ctrlproxy.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
>- 
>- uninstall-pkgconfig:
>- 	-rm -f $(DESTDIR)$(libdir)/pkgconfig/ctrlproxy.pc
>diff --git a/irc/znc/Makefile b/irc/znc/Makefile
>index c10e204..6d7aa0a 100644
>--- a/irc/znc/Makefile
>+++ b/irc/znc/Makefile
>@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> GNU_CONFIGURE=	yes
> USE_RC_SUBR=	znc
>-USES=		compiler:c++11-lib cpe gmake iconv pkgconfig
>+USES=		compiler:c++11-lib cpe gmake iconv pathfix pkgconfig
> MAKE_ENV=	V=1
> 
> PORTDOCS=	README.md
>@@ -66,9 +66,6 @@ pre-configure-PYTHON-on:
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		's#$$(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#' \
>-		${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e \
> 		's#/usr/local#${LOCALBASE}#' ${WRKSRC}/configure
> 
> post-install-DOCS-on:
>diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile
>index 95c4b22..970b5b85 100644
>--- a/korean/libhangul/Makefile
>+++ b/korean/libhangul/Makefile
>@@ -19,7 +19,6 @@ GH_TAGNAME=	9fe2d4e
> USE_GITHUB=	yes
> 
> GNU_CONFIGURE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> TEST_TARGET=	test
> TEST_WRKSRC=	${WRKSRC}/test
> USE_LDCONFIG=	yes
>diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
>index c31c7f1..47c346b5 100644
>--- a/lang/cjs/Makefile
>+++ b/lang/cjs/Makefile
>@@ -21,7 +21,6 @@ USE_GNOME=	cairo glib20 gnomeprefix introspection:build
> USE_GITHUB=	yes
> GH_ACCOUNT=	linuxmint
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> CFLAGS+=	-I${LOCALBASE}/include
> CPPFLAGS+=	-I${LOCALBASE}/include
>diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
>index 551be77..e4519d5 100644
>--- a/lang/gcc/Makefile
>+++ b/lang/gcc/Makefile
>@@ -32,7 +32,7 @@ DISTVERSION=	${PORTVERSION}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
> ONLY_FOR_ARCHS=	amd64 armv6 armv6hf i386 powerpc powerpc64 sparc64
>-USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>@@ -128,7 +128,6 @@ ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
> BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
> 		zip:archivers/zip
> RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
>-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
> CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
> LANGUAGES:=	${LANGUAGES},java
> INFO+=		gcc${SUFFIX}/cp-tools \
>diff --git a/lang/gcc/files/java-patch-hier b/lang/gcc/files/java-patch-hier
>deleted file mode 100644
>index edb122b..0000000
>--- a/lang/gcc/files/java-patch-hier
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-Index: libjava/Makefile.in
>-===================================================================
>---- libjava/Makefile.in	(revision 117734)
>-+++ libjava/Makefile.in	(working copy)
>-@@ -712,7 +712,7 @@
>- 	$(am__append_2) $(am__append_3)
>- toolexecmainlib_DATA = libgcj.spec
>- dbexec_LTLIBRARIES = libjvm.la
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- jardir = $(datadir)/java
>- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
>- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
>diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
>index 5171b9a..3940ad5 100644
>--- a/lang/gcc46/Makefile
>+++ b/lang/gcc46/Makefile
>@@ -33,7 +33,7 @@ DISTVERSION=	${PORTVERSION}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
> ONLY_FOR_ARCHS=	amd64 i386 ia64 powerpc sparc64
>-USES=		cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>@@ -96,7 +96,6 @@ ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
> BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
> 		zip:archivers/zip
> RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
>-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
> CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
> LANGUAGES:=	${LANGUAGES},java
> INFO+=		gcc${SUFFIX}/cp-tools \
>diff --git a/lang/gcc46/files/java-patch-hier b/lang/gcc46/files/java-patch-hier
>deleted file mode 100644
>index edb122b..0000000
>--- a/lang/gcc46/files/java-patch-hier
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-Index: libjava/Makefile.in
>-===================================================================
>---- libjava/Makefile.in	(revision 117734)
>-+++ libjava/Makefile.in	(working copy)
>-@@ -712,7 +712,7 @@
>- 	$(am__append_2) $(am__append_3)
>- toolexecmainlib_DATA = libgcj.spec
>- dbexec_LTLIBRARIES = libjvm.la
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- jardir = $(datadir)/java
>- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
>- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
>diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
>index 063b89f..e99ec4a 100644
>--- a/lang/gcc47/Makefile
>+++ b/lang/gcc47/Makefile
>@@ -33,7 +33,7 @@ DISTVERSION=	${PORTVERSION}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
> ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
>-USES=		cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>@@ -104,7 +104,6 @@ ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
> BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
> 		zip:archivers/zip
> RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
>-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
> CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
> LANGUAGES:=	${LANGUAGES},java
> INFO+=		gcc${SUFFIX}/cp-tools \
>diff --git a/lang/gcc47/files/java-patch-hier b/lang/gcc47/files/java-patch-hier
>deleted file mode 100644
>index edb122b..0000000
>--- a/lang/gcc47/files/java-patch-hier
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-Index: libjava/Makefile.in
>-===================================================================
>---- libjava/Makefile.in	(revision 117734)
>-+++ libjava/Makefile.in	(working copy)
>-@@ -712,7 +712,7 @@
>- 	$(am__append_2) $(am__append_3)
>- toolexecmainlib_DATA = libgcj.spec
>- dbexec_LTLIBRARIES = libjvm.la
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- jardir = $(datadir)/java
>- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
>- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
>diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
>index bc23ed3..bc7d33b 100644
>--- a/lang/gcc48/Makefile
>+++ b/lang/gcc48/Makefile
>@@ -34,7 +34,7 @@ DISTVERSION=	${PORTVERSION}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
> ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
>-USES=		cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>@@ -118,7 +118,6 @@ ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
> BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
> 		zip:archivers/zip
> RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
>-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
> CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
> LANGUAGES:=	${LANGUAGES},java
> INFO+=		gcc${SUFFIX}/cp-tools \
>diff --git a/lang/gcc48/files/java-patch-hier b/lang/gcc48/files/java-patch-hier
>deleted file mode 100644
>index edb122b..0000000
>--- a/lang/gcc48/files/java-patch-hier
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-Index: libjava/Makefile.in
>-===================================================================
>---- libjava/Makefile.in	(revision 117734)
>-+++ libjava/Makefile.in	(working copy)
>-@@ -712,7 +712,7 @@
>- 	$(am__append_2) $(am__append_3)
>- toolexecmainlib_DATA = libgcj.spec
>- dbexec_LTLIBRARIES = libjvm.la
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- jardir = $(datadir)/java
>- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
>- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
>diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
>index 5bfab9b..0bb227a 100644
>--- a/lang/gcc49/Makefile
>+++ b/lang/gcc49/Makefile
>@@ -32,7 +32,7 @@ DISTVERSION=	${PORTVERSION}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
> ONLY_FOR_ARCHS=	amd64 armv6 armv6hf i386 powerpc powerpc64 sparc64
>-USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>@@ -132,7 +132,6 @@ ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
> BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
> 		zip:archivers/zip
> RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
>-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
> CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
> LANGUAGES:=	${LANGUAGES},java
> INFO+=		gcc${SUFFIX}/cp-tools \
>diff --git a/lang/gcc49/files/java-patch-hier b/lang/gcc49/files/java-patch-hier
>deleted file mode 100644
>index e34a869..0000000
>--- a/lang/gcc49/files/java-patch-hier
>+++ /dev/null
>@@ -1,12 +0,0 @@
>---- UTC
>---- libjava/Makefile.in	2013-05-26 22:33:07.000000000 +0000
>-+++ libjava/Makefile.in	2013-05-31 21:19:23.000000000 +0000
>-@@ -941,7 +941,7 @@
>- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
>- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
>- dbexec_LTLIBRARIES = libjvm.la
>--pkgconfigdir = $(toolexeclibdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- jardir = $(datadir)/java
>- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
>- 	$(am__append_5)
>diff --git a/lang/gcc5-devel/Makefile b/lang/gcc5-devel/Makefile
>index fa29989..2f4577e 100644
>--- a/lang/gcc5-devel/Makefile
>+++ b/lang/gcc5-devel/Makefile
>@@ -34,7 +34,7 @@ DISTVERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
> ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
>-USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>@@ -135,7 +135,6 @@ ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
> BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
> 		zip:archivers/zip
> RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
>-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
> CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
> LANGUAGES:=	${LANGUAGES},java
> INFO+=		gcc${SUFFIX}/cp-tools \
>diff --git a/lang/gcc5-devel/files/java-patch-hier b/lang/gcc5-devel/files/java-patch-hier
>deleted file mode 100644
>index 8dd7f46..0000000
>--- a/lang/gcc5-devel/files/java-patch-hier
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- libjava/Makefile.in	2013-05-26 22:33:07.000000000 +0000
>-+++ libjava/Makefile.in	2013-05-31 21:19:23.000000000 +0000
>-@@ -941,7 +941,7 @@
>- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
>- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
>- dbexec_LTLIBRARIES = libjvm.la
>--pkgconfigdir = $(toolexeclibdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- jardir = $(datadir)/java
>- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
>- 	$(am__append_5)
>diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
>index 2542712..2662a8f 100644
>--- a/lang/gcc5/Makefile
>+++ b/lang/gcc5/Makefile
>@@ -34,7 +34,7 @@ DISTVERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
> ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
>-USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>@@ -135,7 +135,6 @@ ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
> BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
> 		zip:archivers/zip
> RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
>-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
> CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
> LANGUAGES:=	${LANGUAGES},java
> INFO+=		gcc${SUFFIX}/cp-tools \
>diff --git a/lang/gcc5/files/java-patch-hier b/lang/gcc5/files/java-patch-hier
>deleted file mode 100644
>index 8dd7f46..0000000
>--- a/lang/gcc5/files/java-patch-hier
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- libjava/Makefile.in	2013-05-26 22:33:07.000000000 +0000
>-+++ libjava/Makefile.in	2013-05-31 21:19:23.000000000 +0000
>-@@ -941,7 +941,7 @@
>- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
>- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
>- dbexec_LTLIBRARIES = libjvm.la
>--pkgconfigdir = $(toolexeclibdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- jardir = $(datadir)/java
>- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
>- 	$(am__append_5)
>diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile
>index be1acf0..9085008 100644
>--- a/lang/gcc6-devel/Makefile
>+++ b/lang/gcc6-devel/Makefile
>@@ -36,7 +36,7 @@ DISTVERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
> ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
>-USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>@@ -138,7 +138,6 @@ ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
> BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
> 		zip:archivers/zip
> RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
>-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
> CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
> LANGUAGES:=	${LANGUAGES},java
> INFO+=		gcc${SUFFIX}/cp-tools \
>diff --git a/lang/gcc6-devel/files/java-patch-hier b/lang/gcc6-devel/files/java-patch-hier
>deleted file mode 100644
>index 8dd7f46..0000000
>--- a/lang/gcc6-devel/files/java-patch-hier
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- libjava/Makefile.in	2013-05-26 22:33:07.000000000 +0000
>-+++ libjava/Makefile.in	2013-05-31 21:19:23.000000000 +0000
>-@@ -941,7 +941,7 @@
>- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
>- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
>- dbexec_LTLIBRARIES = libjvm.la
>--pkgconfigdir = $(toolexeclibdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- jardir = $(datadir)/java
>- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
>- 	$(am__append_5)
>diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile
>index 4aec349..734dc71 100644
>--- a/lang/gcc6/Makefile
>+++ b/lang/gcc6/Makefile
>@@ -36,7 +36,7 @@ DISTVERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
> ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
>-USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>@@ -139,7 +139,6 @@ ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
> BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
> 		zip:archivers/zip
> RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
>-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
> CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
> LANGUAGES:=	${LANGUAGES},java
> INFO+=		gcc${SUFFIX}/cp-tools \
>diff --git a/lang/gcc6/files/java-patch-hier b/lang/gcc6/files/java-patch-hier
>deleted file mode 100644
>index 8dd7f46..0000000
>--- a/lang/gcc6/files/java-patch-hier
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- libjava/Makefile.in	2013-05-26 22:33:07.000000000 +0000
>-+++ libjava/Makefile.in	2013-05-31 21:19:23.000000000 +0000
>-@@ -941,7 +941,7 @@
>- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
>- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
>- dbexec_LTLIBRARIES = libjvm.la
>--pkgconfigdir = $(toolexeclibdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- jardir = $(datadir)/java
>- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
>- 	$(am__append_5)
>diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile
>index 697fd81..aaddb76 100644
>--- a/lang/gcc7-devel/Makefile
>+++ b/lang/gcc7-devel/Makefile
>@@ -34,7 +34,7 @@ DISTVERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
> GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
> SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
> ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
>-USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
>+USES=		compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
> USE_BINUTILS=	yes
> USE_PERL5=	build
> SSP_UNSAFE=	yes
>diff --git a/lang/python27/Makefile b/lang/python27/Makefile
>index 76fa9e6..b6319cd 100644
>--- a/lang/python27/Makefile
>+++ b/lang/python27/Makefile
>@@ -12,7 +12,8 @@ COMMENT=	Interpreted object-oriented programming language
> 
> LICENSE=	PSFL
> 
>-USES=		cpe ncurses pkgconfig readline ssl tar:xz
>+USES=		cpe ncurses pathfix pkgconfig readline ssl tar:xz
>+PATHFIX_MAKEFILEIN=	Makefile.pre.in
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> 
>@@ -28,7 +29,6 @@ TEST_TARGET=		buildbottest
> TEST_ARGS=		TESTOPTS=-j${MAKE_JOBS_NUMBER}
> 
> MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
>-MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
> MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
> 
> PLIST_SUB=		ABI=${ABIFLAGS} \
>diff --git a/lang/python33/Makefile b/lang/python33/Makefile
>index 09e0384..0ad1514 100644
>--- a/lang/python33/Makefile
>+++ b/lang/python33/Makefile
>@@ -16,7 +16,8 @@ LICENSE=	PSFL
> DEPRECATED=	No longer receives bug fixes, only security updates. Please update to Python 3.5
> EXPIRATION_DATE=	2017-09-01
> 
>-USES=		cpe ncurses pkgconfig readline ssl tar:xz
>+USES=		cpe ncurses pathfix pkgconfig readline ssl tar:xz
>+PATHFIX_MAKEFILEIN=	Makefile.pre.in
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> 
>@@ -28,7 +29,6 @@ CONFIGURE_ENV+=		OPT=""							# Null out OPT to respect user CFLAGS and remove o
> 
> INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
> MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
>-MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
> MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
> 
> TEST_TARGET=		buildbottest
>diff --git a/lang/python34/Makefile b/lang/python34/Makefile
>index e883505..aeafd9d 100644
>--- a/lang/python34/Makefile
>+++ b/lang/python34/Makefile
>@@ -13,7 +13,8 @@ COMMENT=	Interpreted object-oriented programming language
> 
> LICENSE=	PSFL
> 
>-USES=		cpe ncurses pkgconfig readline ssl tar:xz
>+USES=		cpe ncurses pathfix pkgconfig readline ssl tar:xz
>+PATHFIX_MAKEFILEIN=	Makefile.pre.in
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> 
>@@ -30,7 +31,6 @@ TEST_TARGET=		buildbottest
> TEST_ARGS=		TESTOPTS=-j${MAKE_JOBS_NUMBER}
> 
> MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
>-MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
> MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
> 
> SUB_FILES=		pkg-message
>diff --git a/lang/python35/Makefile b/lang/python35/Makefile
>index dac754e6..9570c55 100644
>--- a/lang/python35/Makefile
>+++ b/lang/python35/Makefile
>@@ -14,7 +14,8 @@ COMMENT=	Interpreted object-oriented programming language
> 
> LICENSE=	PSFL
> 
>-USES=		cpe ncurses pkgconfig readline ssl tar:xz
>+USES=		cpe ncurses pathfix pkgconfig readline ssl tar:xz
>+PATHFIX_MAKEFILEIN=	Makefile.pre.in
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> 
>@@ -37,7 +38,6 @@ TEST_TARGET=		buildbottest
> TEST_ARGS=		TESTOPTS=-j${MAKE_JOBS_NUMBER}
> 
> MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
>-MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
> MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
> 
> SUB_FILES=		pkg-message
>diff --git a/lang/qore/Makefile b/lang/qore/Makefile
>index cef5a3c..e46d6b2 100644
>--- a/lang/qore/Makefile
>+++ b/lang/qore/Makefile
>@@ -42,6 +42,5 @@ pre-configure:
> 
> post-configure:
> 	${REINPLACE_CMD} -e 's|; make|; $${MAKE}|g' ${WRKSRC}/Makefile.in
>-	${REINPLACE_CMD} -e 's#$$(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#g' ${WRKSRC}/Makefile.in
> 
> .include <bsd.port.post.mk>
>diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
>index 3cd29fa..66c7fb8 100644
>--- a/lang/smalltalk/Makefile
>+++ b/lang/smalltalk/Makefile
>@@ -23,7 +23,7 @@ TK_CONFIGURE_WITH=tcl=${LOCALBASE}/lib/tcl8.4 tk=${LOCALBASE}/lib/tk8.4
> PGSQL_USES=	pgsql
> SDL_USE=	SDL=image,mixer,sdl,sound,ttf
> 
>-USES=		execinfo gmake iconv libtool localbase makeinfo pkgconfig \
>+USES=		execinfo gmake iconv libtool localbase makeinfo pathfix pkgconfig \
> 		shebangfix sqlite tar:xz
> USE_GNOME=	pango
> USE_XORG=	ice xi xmu
>@@ -56,8 +56,6 @@ post-patch:
> 		${WRKSRC}/libgst/prims.inl
> 	@${REINPLACE_CMD} -e '/^ac_include/s/\\$$/#include <wctype.h> \\/' \
> 		${WRKSRC}/snprintfv/configure
>-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
> 
> post-build:
> 	@${SED} -e 's|@bindir@|${PREFIX}/bin|g' \
>diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
>index aa58864..d62c4b8 100644
>--- a/mail/dspam/Makefile
>+++ b/mail/dspam/Makefile
>@@ -76,7 +76,7 @@ LIGHTTPD_DESC=		RUN_DEPEND on Lighttpd instead of Apache
> SETUID_DESC=		Run as root:mail with setuid (insecure)
> 
> MAKE_JOBS_UNSAFE=	yes
>-USES=		perl5 libtool shebangfix
>+USES=		perl5 libtool pathfix shebangfix
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -512,13 +512,6 @@ pre-configure:
> .endif
> 
> post-install:
>-########
>-# stupid hack until I figure out where/how to patch
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>-	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/dspam.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dspam.pc
>-	${TEST} `ls -1 ${STAGEDIR}${PREFIX}/lib/pkgconfig | wc -l` -eq 0 && \
>-		${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig || true
>-
> .if ${PORT_OPTIONS:MEXAMPLES}
> .if ${PORT_OPTIONS:MMYSQL}
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mysql
>diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
>index c643887..631da55 100644
>--- a/mail/evolution-mapi/Makefile
>+++ b/mail/evolution-mapi/Makefile
>@@ -17,7 +17,7 @@ RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
> 
> PORTSCOUT=	limitw:1,even
> 
>-USES=		gettext gmake gnome libtool pkgconfig tar:xz
>+USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
> USE_GNOME=	intltool
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>@@ -28,8 +28,6 @@ CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/
> INSTALL_TARGET=	install-strip
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
>-		${WRKSRC}/src/libexchangemapi/Makefile.in
> 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
> 		-e 's|$$(prefix)/$$(DATADIRNAME)/|$$(prefix)/share/|g' \
> 		${WRKSRC}/configure
>diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
>index b82f342..8f9aca0 100644
>--- a/mail/libmapi/Makefile
>+++ b/mail/libmapi/Makefile
>@@ -29,6 +29,7 @@ WRKSRC=		${WRKDIR}/openchange-openchange-${PORTVERSION}-${CODENAME}
> USE_MYSQL=	yes
> USES=		autoreconf:build bison compiler:c++11-lib gmake pathfix \
> 		pkgconfig python shebangfix sqlite
>+PATHFIX_MAKEFILEIN=	Makefile
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -44,7 +45,6 @@ SHEBANG_FILES=	libmapi/conf/mparse.pl \
> 		setup/openchange_neworganization \
> 		setup/openchange_newuser \
> 		setup/openchange_provision
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> OPTIONS_SUB=	yes
> OPTIONS_DEFINE=	BOOST DOXYGEN
>@@ -71,8 +71,7 @@ PLIST_SUB+=	SAMBA=samba42
> #  --enable-openchange-qt4 Compile OpenChange Qt4 wrapper.
> 
> post-patch:
>-	@${REINPLACE_CMD} -e "s/mkdir --parent/mkdir -p/g; \
>-		s,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,g" \
>+	@${REINPLACE_CMD} -e "s/mkdir --parent/mkdir -p/g" \
> 		${WRKSRC}/Makefile
> 	@${REINPLACE_CMD} -e 's|<endian.h>|<sys/endian.h>|g' \
> 		${WRKSRC}/configure.ac
>diff --git a/math/R/Makefile b/math/R/Makefile
>index 3624ef7..0de59e0 100644
>--- a/math/R/Makefile
>+++ b/math/R/Makefile
>@@ -35,7 +35,7 @@ CONFIGURE_ARGS=		--disable-java \
> GNU_CONFIGURE=		yes
> INSTALL_TARGET=		install-strip
> ONLY_FOR_ARCHS=		i386 amd64
>-USES=			fortran iconv libtool localbase objc:compiler perl5 \
>+USES=			fortran iconv libtool localbase objc:compiler pathfix perl5 \
> 			readline
> USE_PERL5=		build
> 
>@@ -147,9 +147,6 @@ USE_LDCONFIG=		${PREFIX}/lib/R/lib
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g'\
>-		${WRKSRC}/src/nmath/standalone/Makefile.in \
>-		${WRKSRC}/src/unix/Makefile.in
> 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" \
> 		${WRKSRC}/configure
> 
>diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile
>index 5b1cae6..fb64d26 100644
>--- a/math/coinmp/Makefile
>+++ b/math/coinmp/Makefile
>@@ -18,7 +18,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> CONFLICTS=	clp-[0-9]* ogdf-[0-9]*
> 
> GNU_CONFIGURE=	yes
>-USES=	libtool pkgconfig tar:tgz
>+USES=	libtool pathfix pkgconfig tar:tgz
> USE_LDCONFIG=	yes
> CONFIGURE_ARGS+=	PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig
> CXXFLAGS+=	-ffast-math
>@@ -40,8 +40,7 @@ STRIP_FILES=	libCoinUtils libOsi libOsiClp libOsiCommonTests libClp libClpSolver
> 		libCgl libCbc libCbcSolver libOsiCbc libCoinMP
> 
> post-patch::
>-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
>+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
> 		-e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \
> 		-e 's|addlibs_DATA = examples/Makefile examples/example.c||g' \
> 		-e 's|DocInstallDir = $$(datadir)/coin/doc/$$(PACKAGE_NAME)|DocInstallDir = $$(datadir)/doc/CoinMP/$$(PACKAGE_NAME)|' \
>diff --git a/math/cvc3/Makefile b/math/cvc3/Makefile
>index 4c880d8..712c33b 100644
>--- a/math/cvc3/Makefile
>+++ b/math/cvc3/Makefile
>@@ -18,14 +18,14 @@ CONFIGURE_ARGS=	--enable-dynamic \
> 		--with-extra-libs=${LOCALBASE}/lib
> CXXFLAGS+=	-fPIC
> GNU_CONFIGURE=	yes
>-USES=		bison gmake perl5
>+USES=		bison gmake pathfix perl5
>+PATHFIX_MAKEFILEIN=	Makefile
> USE_GCC=	any
> USE_LDCONFIG=	yes
> 
> post-patch:
> 	${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' ${WRKSRC}/Makefile.std
> 	${REINPLACE_CMD} -e 's,.*$$(LDCONFIG).*,,' ${WRKSRC}/src/Makefile
>-	${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' ${WRKSRC}/src/Makefile
> 
> post-install:
> 	${INSTALL_PROGRAM} `readlink ${WRKSRC}/bin/cvc3` ${STAGEDIR}${PREFIX}/bin
>diff --git a/math/cvc3/files/patch-src-Makefile b/math/cvc3/files/patch-src-Makefile
>index 14e0cd1..2543b3b 100644
>--- a/math/cvc3/files/patch-src-Makefile
>+++ b/math/cvc3/files/patch-src-Makefile
>@@ -32,12 +32,12 @@
>  endif
> -	mkdir -p $(bindir)
> -	$(INSTALL) $(INSTALL_FLAGS) -m 755 $(CVC_EXE) $(bindir)
>--	mkdir -p $(libdir)/pkgconfig
>--	$(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(libdir)/pkgconfig
>+-	mkdir -p $(prefix)/libdata/pkgconfig
>+-	$(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(prefix)/libdata/pkgconfig
> +	mkdir -p $(DESTDIR)$(bindir)
> +	$(INSTALL) $(INSTALL_FLAGS) -m 755 $(CVC_EXE) $(DESTDIR)$(bindir)
>-+	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
>-+	$(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(DESTDIR)$(libdir)/pkgconfig
>++	mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
>++	$(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
>  
>  ifndef FILELIST
>  FILELIST = /dev/null
>diff --git a/math/fann/Makefile b/math/fann/Makefile
>index 383bedb..eae3be7 100644
>--- a/math/fann/Makefile
>+++ b/math/fann/Makefile
>@@ -12,10 +12,7 @@ COMMENT=	Free open source neural network library
> 
> WRKSRC=		${WRKDIR}/FANN-2.2.0-Source
> 
>-USES=		cmake zip
>+USES=		cmake pathfix zip
> USE_LDCONFIG=	yes
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|/lib/pkgconfig|/libdata/pkgconfig|g' ${WRKSRC}/CMakeLists.txt
>-
> .include <bsd.port.mk>
>diff --git a/math/hfst/Makefile b/math/hfst/Makefile
>index 8437499..7c2f14b 100644
>--- a/math/hfst/Makefile
>+++ b/math/hfst/Makefile
>@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/source
> MAINTAINER=	demon@FreeBSD.org
> COMMENT=	A toolkit for for processing natural language morphologies
> 
>-USES=		libtool pkgconfig python:2 readline shebangfix
>+USES=		libtool pathfix pkgconfig python:2 readline shebangfix
> USE_GNOME=	glib20 libxml2
> USE_GCC=	yes
> GNU_CONFIGURE=	yes
>diff --git a/math/hfst/files/patch-libhfst-Makefile.in b/math/hfst/files/patch-libhfst-Makefile.in
>deleted file mode 100644
>index 19bc380..0000000
>--- a/math/hfst/files/patch-libhfst-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- libhfst/Makefile.in.orig	2014-07-05 18:38:21.000000000 +0400
>-+++ libhfst/Makefile.in	2014-07-05 18:39:40.000000000 +0400
>-@@ -287,7 +287,7 @@
>- top_builddir = @top_builddir@
>- top_srcdir = @top_srcdir@
>- SUBDIRS = src
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = hfst.pc
>- all: all-recursive
>- 
>diff --git a/math/igraph/Makefile b/math/igraph/Makefile
>index 2c4fb1b..22afb82 100644
>--- a/math/igraph/Makefile
>+++ b/math/igraph/Makefile
>@@ -14,7 +14,7 @@ LICENSE=	GPLv2
> LIB_DEPENDS=	libgmp.so:math/gmp
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake libtool
>+USES=		gmake libtool pathfix
> USE_GNOME=	libxml2
> CONFIGURE_ARGS+=	--enable-gmp
> CFLAGS+=	-I${LOCALBASE}/include
>@@ -22,10 +22,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> CONFIGURE_ARGS+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
> USE_LDCONFIG=	yes
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.in
>-
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "sparc64"
>diff --git a/math/ipopt/Makefile b/math/ipopt/Makefile
>index ed1b16a..7b6a508 100644
>--- a/math/ipopt/Makefile
>+++ b/math/ipopt/Makefile
>@@ -16,12 +16,12 @@ COMMENT=	Software package for large-scale nonlinear optimization
> 
> LICENSE=	EPL
> 
>-USES=		blaslapack fortran libtool pkgconfig tar:tgz
>+USES=		blaslapack fortran libtool pathfix pkgconfig tar:tgz
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
> 
>-CONFIGURE_ENV+=	PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig \
>+CONFIGURE_ENV+=	PKG_CONFIG_PATH=${PREFIX}/libdata/pkgconfig \
> 		CXX="${CXX} -B${LOCALBASE}/bin"
> CONFIGURE_ARGS=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib"	\
> 		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib"
>@@ -33,11 +33,6 @@ PORTDOCS=	*
> 
> DEBUG_CXXFLAGS=	-fomit-frame-pointer
> 
>-post-patch::
>-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
>-		-e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g'
>-
> post-extract:
> 	@(${ECHO} "Extracting Metis and Mumps ThirdParty libraries ..." )
> 	@(cd ${WRKSRC}/ThirdParty/Metis && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/metis-4.0.3.tar.gz ${EXTRACT_AFTER_ARGS});
>diff --git a/math/jags/Makefile b/math/jags/Makefile
>index 1e04492..5b6f6e4 100644
>--- a/math/jags/Makefile
>+++ b/math/jags/Makefile
>@@ -19,7 +19,7 @@ COMMENT=	Just Another Gibbs Sampler
> LICENSE=	GPLv2
> 
> GNU_CONFIGURE=	yes
>-USES=		bison compiler:features fortran gmake libtool localbase
>+USES=		bison compiler:features fortran gmake libtool localbase pathfix
> USE_GCC=	yes
> USE_LDCONFIG=	yes
> 
>@@ -58,8 +58,6 @@ PORTEXAMPLES=	*
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
>-		${WRKSRC}/etc/Makefile.in
> 	@${REINPLACE_CMD} \
> 		-e '/@WINDOWS_FALSE@bin_SCRIPTS =/s/jags/mcmc-&/' \
> 		-e '/CLEANFILES =/s/jags/mcmc-&/' \
>diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile
>index dd5afb8..c1d09e1 100644
>--- a/math/nlopt/Makefile
>+++ b/math/nlopt/Makefile
>@@ -28,8 +28,6 @@ USES=		autoreconf compiler:features libtool pathfix \
> 		pkgconfig python:2
> USE_LDCONFIG=	yes
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
>-
> INSTALL_TARGET=	install-strip
> 
> .include <bsd.port.mk>
>diff --git a/math/ufc/Makefile b/math/ufc/Makefile
>index e19453f..96a611e 100644
>--- a/math/ufc/Makefile
>+++ b/math/ufc/Makefile
>@@ -22,8 +22,6 @@ CMAKE_ARGS+=	-DUFC_PKGCONFIG_DIR=${PREFIX}/libdata/pkgconfig
> MMVERSION=	2.2
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
>-		${WRKSRC}/CMakeLists.txt
> 	${REINPLACE_CMD} -i '' -e 's|os.path.join(os.path.sep, "usr")|os.path.normpath("${PREFIX}")|' ${WRKSRC}/src/utils/python/ufc_utils/build.py
> 
> .include <bsd.port.mk>
>diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile
>index e222196..fa717bc 100644
>--- a/misc/talkfilters/Makefile
>+++ b/misc/talkfilters/Makefile
>@@ -15,7 +15,7 @@ LICENSE=	GPLv2
> 
> CONFLICTS=	jive* chef* filters-*
> 
>-USES=		libtool
>+USES=		libtool pathfix
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>@@ -29,10 +29,6 @@ post-extract:
> 
> post-patch:
> 	@${RM} -f ${WRKSRC}/*.info*
>-	@${REINPLACE_CMD} -e \
>-		's|^$pkgconfigdir\ =\ $.*|\1$$(prefix)/libdata/pkgconfig|' \
>-			${WRKSRC}/Makefile.am \
>-			${WRKSRC}/Makefile.in
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalkfilters.so*
>diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile
>index 0334472..9476f5b 100644
>--- a/multimedia/gstreamer-qt4/Makefile
>+++ b/multimedia/gstreamer-qt4/Makefile
>@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
> 
>-USES=		bison cmake gmake kde:4 pkgconfig tar:bzip2
>+USES=		bison cmake gmake kde:4 pathfix pkgconfig tar:bzip2
> USE_LDCONFIG=	yes
> USE_GSTREAMER=	yes
> USE_GNOME=	glib20
>@@ -32,8 +32,4 @@ GST_VERSION=	${PORTVERSION:C/..$//}
> CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include"
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-post-extract:
>-	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' \
>-		${WRKSRC}/CMakeLists.txt
>-
> .include <bsd.port.mk>
>diff --git a/multimedia/gstreamer1-vaapi/Makefile b/multimedia/gstreamer1-vaapi/Makefile
>index dc916e3..139b070 100644
>--- a/multimedia/gstreamer1-vaapi/Makefile
>+++ b/multimedia/gstreamer1-vaapi/Makefile
>@@ -26,9 +26,4 @@ USE_XORG=	x11 xrandr xrender xproto:build
> # drm backend needs libudev so disable it for now.
> CONFIGURE_ARGS+=--disable-drm
> 
>-# manual since pathfix doesn't work.
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|[{]libdir[}]/pkgconfig|{prefix}/libdata/pkgconfig|g' \
>-		${WRKSRC}/configure
>-
> .include <bsd.port.mk>
>diff --git a/multimedia/kvazaar/Makefile b/multimedia/kvazaar/Makefile
>index aa46a7e..6d5f99f 100644
>--- a/multimedia/kvazaar/Makefile
>+++ b/multimedia/kvazaar/Makefile
>@@ -20,7 +20,6 @@ GH_SUBDIR=	greatest:greatest
> CONFLICTS_INSTALL?=	${PORTNAME}-devel
> 
> USES=		autoreconf compiler:c11 libtool pathfix
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> TEST_TARGET=	check
> INSTALL_TARGET=	install-strip
>diff --git a/multimedia/libass/Makefile b/multimedia/libass/Makefile
>index 2c8f10c..a58e755 100644
>--- a/multimedia/libass/Makefile
>+++ b/multimedia/libass/Makefile
>@@ -19,7 +19,6 @@ USE_GITHUB=	yes
> USES=		autoreconf iconv libtool pathfix pkgconfig
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=Makefile.am
> INSTALL_TARGET=	install-strip
> 
> OPTIONS_DEFINE=	HARFBUZZ
>diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
>index 70f3b83..5733e2a 100644
>--- a/multimedia/libav/Makefile
>+++ b/multimedia/libav/Makefile
>@@ -15,7 +15,8 @@ LIB_DEPENDS=	libopencv_core.so:graphics/opencv2-core \
> 		libvdpau.so:multimedia/libvdpau \
> 		libhogweed.so:security/nettle
> 
>-USES=		cpe gmake perl5 pkgconfig tar:xz
>+USES=		cpe gmake perl5 pathfix pkgconfig tar:xz
>+PATHFIX_MAKEFILEIN=	library.mak
> USE_XORG=	x11
> HAS_CONFIGURE=	yes
> USE_PERL5=	build
>@@ -215,8 +216,6 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
> 		${WRKSRC}/configure \
> 		${WRKSRC}/libavcodec/libgsmdec.c
>-	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
>-		${WRKSRC}/library.mak
> 
> post-configure-DOCS-off:
> 	@${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak
>diff --git a/multimedia/libav/files/patch-library.mak b/multimedia/libav/files/patch-library.mak
>index 18b9080..62d7ac3 100644
>--- a/multimedia/libav/files/patch-library.mak
>+++ b/multimedia/libav/files/patch-library.mak
>@@ -6,6 +6,6 @@
>  
> -install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
> +install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)-libav.pc
>- 	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
>- 	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
>+ 	$(Q)mkdir -p "$(PREFIX)/libdata/pkgconfig"
>+ 	$$(INSTALL) -m 644 $$^ "$(PREFIX)/libdata/pkgconfig"
>  
>diff --git a/multimedia/libde265/Makefile b/multimedia/libde265/Makefile
>index e819b28..07d5cce 100644
>--- a/multimedia/libde265/Makefile
>+++ b/multimedia/libde265/Makefile
>@@ -16,6 +16,4 @@ USES=		autoreconf compiler:c++11-lib libtool pathfix pkgconfig
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-sherlock265 --disable-dec265
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
>-
> .include <bsd.port.mk>
>diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
>index 1754c18..c5c7c14 100644
>--- a/multimedia/libkate/Makefile
>+++ b/multimedia/libkate/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libogg.so:audio/libogg \
> 		libpng.so:graphics/png
> 
> GNU_CONFIGURE=	yes
>-USES=		pkgconfig gmake libtool
>+USES=		pathfix pkgconfig gmake libtool
> USE_LDCONFIG=	yes
> 
> CFLAGS+=	"-I${LOCALBASE}/include"
>@@ -51,10 +51,6 @@ PLIST_SUB+=	KATEDJ="@comment "
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -E -e \
>-		"s|^(katepcdir =).*|\1 ${PREFIX}/libdata/pkgconfig|" \
>-		${WRKSRC}/Makefile.in
>-
> .if ! ${PORT_OPTIONS:MKATEDJ}
> 	@${REINPLACE_CMD} -e \
> 		"s|  HAVE_PYTHON_TRUE=$$|  HAVE_PYTHON_TRUE='#'|; \
>diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
>index de52ae9..2f8ebf2 100644
>--- a/multimedia/libtheora/Makefile
>+++ b/multimedia/libtheora/Makefile
>@@ -19,7 +19,7 @@ CONFIGURE_ARGS=	--disable-sdltest \
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>-USES=		libtool tar:bzip2
>+USES=		libtool pathfix tar:bzip2
> USE_LDCONFIG=	yes
> 
> .include <bsd.port.options.mk>
>diff --git a/multimedia/libtheora/files/patch-Makefile.in b/multimedia/libtheora/files/patch-Makefile.in
>index 9d72772..cff2df8 100644
>--- a/multimedia/libtheora/files/patch-Makefile.in
>+++ b/multimedia/libtheora/files/patch-Makefile.in
>@@ -1,14 +1,5 @@
> --- Makefile.in.orig	2009-10-01 18:04:07.000000000 +0000
> +++ Makefile.in	2009-12-21 01:17:02.000000000 +0000
>-@@ -177,7 +177,7 @@
>- 	theora-uninstalled.pc.in
>- 
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = theora.pc theoradec.pc theoraenc.pc
>- subdir = .
>- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> @@ -200,7 +200,7 @@
>  	missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \
>  	theoradec-uninstalled.pc.in theoradec.pc.in \
>diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
>index 0977d9a..aed19c2 100644
>--- a/multimedia/mlt/Makefile
>+++ b/multimedia/mlt/Makefile
>@@ -23,6 +23,7 @@ USE_GNOME=	libxml2
> USE_SDL=	image
> USE_XORG=	x11
> USES=		alias gmake iconv pathfix pkgconfig
>+PATHFIX_MAKEFILEIN=	Makefile
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-gpl --enable-gpl3 --target-os=FreeBSD
> USE_LDCONFIG=	yes
>@@ -120,8 +121,6 @@ pre-configure:
> 		${WRKSRC}/src/framework/Makefile \
> 		${WRKSRC}/src/melt/Makefile \
> 		${WRKSRC}/src/modules/*/Makefile
>-	@${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
>-		${WRKSRC}/Makefile
> 
> post-install:
> 	${INSTALL_MAN} ${WRKSRC}/docs/melt.1 ${STAGEDIR}${MANPREFIX}/man/man1/melt.1
>diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile
>index 7ad50be..de3adf3 100644
>--- a/multimedia/vapoursynth/Makefile
>+++ b/multimedia/vapoursynth/Makefile
>@@ -12,7 +12,6 @@ LICENSE=	LGPL21+
> USE_GITHUB=	yes
> 
> USES=		autoreconf gmake libtool localbase pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
> INSTALL_TARGET=	install-strip
>diff --git a/net-im/libaccounts-glib/Makefile b/net-im/libaccounts-glib/Makefile
>index cc3ff1b..fd4c74d 100644
>--- a/net-im/libaccounts-glib/Makefile
>+++ b/net-im/libaccounts-glib/Makefile
>@@ -23,7 +23,6 @@ INSTALL_TARGET=	install-strip
> 
> USES=		autoreconf gmake libtool pathfix pkgconfig python sqlite:3
> USE_GNOME=	pygobject3 introspection libxml2
>-PATHFIX_MAKEFILEIN=Makefile.am
> 
> # GitLab variables.
> GL_ACCOUNT=	accounts-sso
>diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile
>index 6f8dc6e..de3d371 100644
>--- a/net-im/telepathy-farstream/Makefile
>+++ b/net-im/telepathy-farstream/Makefile
>@@ -23,8 +23,4 @@ CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|$^pkgconfigdir =$.*|\1 ${PREFIX}/libdata/pkgconfig|' \
>-		${WRKSRC}/telepathy-farstream/Makefile.in
>-
> .include <bsd.port.mk>
>diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
>index 845de8e..a18fc15 100644
>--- a/net-im/tox/Makefile
>+++ b/net-im/tox/Makefile
>@@ -23,7 +23,6 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-tests
> USES=		autoreconf compiler:c11 libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> INSTALL_TARGET=		install-strip
> 
> OPTIONS_DEFINE=		DAEMON
>diff --git a/net-mgmt/ccnet/Makefile b/net-mgmt/ccnet/Makefile
>index 8682f1b..b17213d 100644
>--- a/net-mgmt/ccnet/Makefile
>+++ b/net-mgmt/ccnet/Makefile
>@@ -29,7 +29,6 @@ USES=		autoreconf gettext libtool localbase pathfix pkgconfig \
> 		python:-2.7 shebangfix ssl
> USE_LDCONFIG=	yes
> SHEBANG_FILES=	tools/*.py
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
> GNU_CONFIGURE=	yes
>diff --git a/net-mgmt/seafile/Makefile b/net-mgmt/seafile/Makefile
>index 9987725..b1252ac 100644
>--- a/net-mgmt/seafile/Makefile
>+++ b/net-mgmt/seafile/Makefile
>@@ -40,8 +40,6 @@ GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
>-
> CONFIGURE_ARGS=	--enable-server
> INSTALL_TARGET=	install-strip
> CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/evhtp
>diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
>index c53e2f6..07612d7 100644
>--- a/net/GeoIP/Makefile
>+++ b/net/GeoIP/Makefile
>@@ -16,7 +16,6 @@ GH_ACCOUNT=	maxmind
> GH_PROJECT=	geoip-api-c
> 
> USES=		autoreconf libtool pathfix
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile
>index 420da52..97aaa9d1 100644
>--- a/net/geoipupdate/Makefile
>+++ b/net/geoipupdate/Makefile
>@@ -18,7 +18,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	maxmind
> 
> USES=		libtool localbase pathfix autoreconf
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> 
> .include <bsd.port.mk>
>diff --git a/net/kea/Makefile b/net/kea/Makefile
>index a0c734b..9762ad7 100644
>--- a/net/kea/Makefile
>+++ b/net/kea/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	liblog4cplus.so:devel/log4cplus \
> 		libboost_system.so:devel/boost-libs
> 
>-USES=		libtool python:3.3+ autoreconf
>+USES=		autoreconf libtool pathfix python:3.3+
> USE_LDCONFIG=	yes
> USE_OPENSSL=	yes
> USE_RC_SUBR=	${PORTNAME}
>diff --git a/net/kea/files/patch-Makefile.am b/net/kea/files/patch-Makefile.am
>index bcab670..cb0af6b 100644
>--- a/net/kea/files/patch-Makefile.am
>+++ b/net/kea/files/patch-Makefile.am
>@@ -9,12 +9,3 @@
>  
>  EXTRA_DIST  = tools/path_replacer.sh
>  EXTRA_DIST += tools/mk_cfgrpt.sh
>-@@ -114,7 +114,7 @@ EXTRA_DIST += tools/mk_cfgrpt.sh
>- #### include external sources in the distributed tarball:
>- EXTRA_DIST += ext/coroutine/coroutine.h
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = dns++.pc
>- 
>- CLEANFILES = $(abs_top_builddir)/logger_lockfile
>diff --git a/net/libilbc/Makefile b/net/libilbc/Makefile
>index e64a6c5..2ca256d 100644
>--- a/net/libilbc/Makefile
>+++ b/net/libilbc/Makefile
>@@ -21,7 +21,7 @@ CONFLICTS=	ilbc-r[0-9]*
> USE_GITHUB=	yes
> GH_ACCOUNT=	TimothyGu
> 
>-USES=		cmake
>+USES=		cmake pathfix
> USE_LDCONFIG=	yes
> 
> .include <bsd.port.mk>
>diff --git a/net/libilbc/files/patch-CMakeLists.txt b/net/libilbc/files/patch-CMakeLists.txt
>index 533a8fe..5716e79 100644
>--- a/net/libilbc/files/patch-CMakeLists.txt
>+++ b/net/libilbc/files/patch-CMakeLists.txt
>@@ -1,4 +1,4 @@
>---- CMakeLists.txt.orig	2014-12-14 19:34:22 UTC
>+--- CMakeLists.txt.orig	2016-10-04 12:45:35 UTC
> +++ CMakeLists.txt
> @@ -50,7 +50,6 @@ else()
>  endif()
>@@ -20,7 +20,7 @@
>  endif()
>  
>  ###################################################################################################
>-@@ -186,18 +186,15 @@ endif()
>+@@ -186,12 +186,7 @@ endif()
>  set(prefix "${CMAKE_INSTALL_PREFIX}")
>  set(exec_prefix "${prefix}")
>  set(includedir "${prefix}/include")
>@@ -33,11 +33,8 @@
> +set(libdir "${exec_prefix}/lib")
>  
>  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libilbc.pc
>--        DESTINATION ${libdir}/pkgconfig)
>-+        DESTINATION ${prefix}/libdata/pkgconfig)
>- install(FILES ilbc/interface/ilbc.h
>-         DESTINATION ${includedir})
>- install(TARGETS ilbc
>+         DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
>+@@ -201,3 +196,5 @@ install(TARGETS ilbc
>          ARCHIVE DESTINATION ${libdir}
>          LIBRARY DESTINATION ${libdir}
>          RUNTIME DESTINATION bin)
>diff --git a/net/librdkafka/Makefile b/net/librdkafka/Makefile
>index 322eb93..9fa1bfb 100644
>--- a/net/librdkafka/Makefile
>+++ b/net/librdkafka/Makefile
>@@ -23,7 +23,7 @@ GH_ACCOUNT=	edenhill
> USES=		gmake perl5 python shebangfix ssl
> SHEBANG_FILES=	lds-gen.py
> GNU_CONFIGURE=	yes
>-MAKE_ENV=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
>+MAKE_ARGS=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
> 
> USE_LDCONFIG=	yes
> 
>diff --git a/net/librdkafka/files/patch-mklove_Makefile.base b/net/librdkafka/files/patch-mklove_Makefile.base
>deleted file mode 100644
>index 4cb7fc9..0000000
>--- a/net/librdkafka/files/patch-mklove_Makefile.base
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- mklove/Makefile.base.orig	2016-06-16 02:56:41 UTC
>-+++ mklove/Makefile.base
>-@@ -54,7 +54,7 @@ docdir?=	$(datarootdir)/doc/$(PKGNAME)
>- infodir?=	$(datarootdir)/info
>- libdir?=	$(prefix)/lib
>- localedir?=	$(datarootdir)/locale
>--pkgconfigdir?=	$(libdir)/pkgconfig
>-+pkgconfigdir?=	$(prefix)/libdata/pkgconfig
>- mandir?=	$(datarootdir)/man
>- man1dir?=	$(mandir)/man1
>- man2dir?=	$(mandir)/man2
>diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
>index 9c76c8f..4ca273e 100644
>--- a/net/libvncserver/Makefile
>+++ b/net/libvncserver/Makefile
>@@ -18,7 +18,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	LibVNC
> 
> USES=		autoreconf jpeg libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>diff --git a/net/mobile-broadband-provider-info/Makefile b/net/mobile-broadband-provider-info/Makefile
>index 294f0dd..b61a557 100644
>--- a/net/mobile-broadband-provider-info/Makefile
>+++ b/net/mobile-broadband-provider-info/Makefile
>@@ -12,7 +12,6 @@ LICENSE=	PD
> 
> USES=		autoreconf pathfix tar:xz
> GNU_CONFIGURE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> PLIST_FILES=	${DATADIR}/serviceproviders.2.dtd \
> 		${DATADIR}/serviceproviders.xml \
>diff --git a/net/openbsc/Makefile b/net/openbsc/Makefile
>index 6dea19c..0cdf432 100644
>--- a/net/openbsc/Makefile
>+++ b/net/openbsc/Makefile
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libdbi.so:databases/libdbi \
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
> 
>-USES=		autoreconf compiler:c11 gmake pkgconfig
>+USES=		autoreconf compiler:c11 gmake pathfix pkgconfig
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
> AUTOMAKE_ARGS=	--gnu --add-missing --copy
>@@ -44,8 +44,6 @@ NAT_RUN_DEPENDS=	${LOCALBASE}/lib/libsccp.a:devel/libosmo-sccp
> SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.am
> 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
> 
> .include <bsd.port.mk>
>diff --git a/net/openggsn/Makefile b/net/openggsn/Makefile
>index c712f57..6c59c25 100644
>--- a/net/openggsn/Makefile
>+++ b/net/openggsn/Makefile
>@@ -15,13 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=    libosmocore.so:devel/libosmocore
> 
> GNU_CONFIGURE=	yes
>-USES=		autoreconf gmake libtool pkgconfig
>+USES=		autoreconf gmake libtool pathfix pkgconfig
> 
> USE_LDCONFIG=	yes
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.am
> 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
> 
> post-stage:
>diff --git a/net/openpgm/Makefile b/net/openpgm/Makefile
>index 7b42a4a..c971266 100644
>--- a/net/openpgm/Makefile
>+++ b/net/openpgm/Makefile
>@@ -18,7 +18,6 @@ GH_ACCOUNT=	steve-o
> 
> GNU_CONFIGURE=	yes
> USES=		autoreconf pathfix perl5 libtool python:build
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_LDCONFIG=	yes
> WRKSRC_SUBDIR=	openpgm/pgm
> INSTALL_TARGET=	install-strip
>diff --git a/net/pacemaker/Makefile b/net/pacemaker/Makefile
>index 92788f5..06d1137 100644
>--- a/net/pacemaker/Makefile
>+++ b/net/pacemaker/Makefile
>@@ -43,8 +43,6 @@ CONFIGURE_ARGS=	--disable-fatal-warnings \
> 		--without-heartbeat
> INSTALL_TARGET=	install-strip
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
>-
> SHEBANG_LANG=	sh
> sh_OLD_CMD=	${SH}
> sh_CMD=		${LOCALBASE}/bin/bash
>diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
>index 0886273..09d88e9 100644
>--- a/net/rabbitmq-c-devel/Makefile
>+++ b/net/rabbitmq-c-devel/Makefile
>@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson
> 
> CONFLICTS=	rabbitmq-c-[0-9]*
> 
>-USES=		cmake python tar:bzip2
>+USES=		cmake pathfix python tar:bzip2
> USE_GITHUB=	yes
> USE_LDCONFIG=	yes
> GH_ACCOUNT=	alanxz
>@@ -29,9 +29,4 @@ POPT_LIB_DEPENDS=	libpopt.so:devel/popt
> POPT_CFLAGS=	-I${LOCALBASE}/include
> POPT_LDFLAGS=	-L${LOCALBASE}/lib
> 
>-post-stage:
>-	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/librabbitmq.pc \
>-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/librabbitmq.pc
>-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
>-
> .include <bsd.port.mk>
>diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile
>index a1d0e95..eb26f40 100644
>--- a/net/shadowsocks-libev/Makefile
>+++ b/net/shadowsocks-libev/Makefile
>@@ -16,7 +16,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	madeye
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake libtool:keepla ssl
>+USES=		gmake libtool:keepla pathfix ssl
> CPPFLAGS+=	-I${OPENSSLINC}
> CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
> 
>@@ -26,8 +26,6 @@ CFLAGS+=	-fstack-protector
> USE_RC_SUBR=	shadowsocks_libev
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|^pkgconfiglibdir.*|pkgconfiglibdir = ${PREFIX}/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.in
> 	${REINPLACE_CMD} -e 's|^#ifdef TCP_FASTOPEN|#if defined(TCP_FASTOPEN) \&\& defined(__linux)|' \
> 		${WRKSRC}/src/local.c ${WRKSRC}/src/server.c
> 
>diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
>index da72c81..38fca8e 100644
>--- a/polish/gnugadu2/Makefile
>+++ b/polish/gnugadu2/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libgadu.so:polish/libgadu \
> 
> GNU_CONFIGURE=	yes
> INSTALLS_ICONS=	yes
>-USES=		gettext gmake perl5 pkgconfig tar:bzip2 libtool
>+USES=		gettext gmake pathfix perl5 pkgconfig tar:bzip2 libtool
> USE_GNOME=	gtk20
> USE_LDCONFIG=	yes
> USE_XORG=	x11 xaw ice xscrnsaver
>@@ -80,7 +80,7 @@ XOSD_CONFIGURE_WITH=	xosd
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's,=.*},=${PREFIX},' ${WRKSRC}/src/plugins/dbus/org.freedesktop.im.GG.service
>-	@${REINPLACE_CMD} -e 's, -ldl,, ; s,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' ${WRKSRC}/lib/Makefile.in
>+	@${REINPLACE_CMD} -e 's, -ldl,,' ${WRKSRC}/lib/Makefile.in
> 	@${REINPLACE_CMD} -e 's,(datadir)/pixmaps,(datadir)/icons/hicolor/48x48/apps,' ${WRKSRC}/pixmaps/Makefile.in
> 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/plugins/GUI/gtkimhtml.c
> 
>diff --git a/polish/libgadu/Makefile b/polish/libgadu/Makefile
>index 6f871dd..f9076b0 100644
>--- a/polish/libgadu/Makefile
>+++ b/polish/libgadu/Makefile
>@@ -20,7 +20,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	wojtekka
> 
> USES=		autoreconf gmake libtool localbase pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-shared --disable-static --with-pthread \
> 		--disable-tests --without-gnutls
>diff --git a/print/libijs/Makefile b/print/libijs/Makefile
>index ad7dd1b..4ccce37 100644
>--- a/print/libijs/Makefile
>+++ b/print/libijs/Makefile
>@@ -13,7 +13,7 @@ COMMENT=	C library that supports plugin printer driver for Ghostscript
> 
> LICENSE=	MIT
> 
>-USES=		gmake libtool pkgconfig tar:bzip2
>+USES=		gmake libtool pathfix pkgconfig tar:bzip2
> USE_LDCONFIG=	yes
> 
> GNU_CONFIGURE=	yes
>diff --git a/print/libijs/files/patch-Makefile.in b/print/libijs/files/patch-Makefile.in
>index d201c89..65cee42 100644
>--- a/print/libijs/files/patch-Makefile.in
>+++ b/print/libijs/files/patch-Makefile.in
>@@ -1,14 +1,5 @@
> --- Makefile.in.orig	Wed Feb 11 20:51:54 2004
> +++ Makefile.in	Thu Mar 11 13:37:51 2004
>-@@ -117,7 +117,7 @@
>- 
>- MAINT_CHARSET = latin1
>- m4datadir = $(datadir)/aclocal
>--pkgconfigdatadir = $(prefix)/lib/pkgconfig
>-+pkgconfigdatadir = $(prefix)/libdata/pkgconfig
>- 
>- lib_LTLIBRARIES = libijs.la
>- 
> @@ -143,12 +143,12 @@
>  @SYSDEPS_WINDOWS_TRUE@libijs_la_LIBADD = ijs_exec_win.lo $(IJS_DEPLIBS)
>  @SYSDEPS_WINDOWS_FALSE@libijs_la_LIBADD = ijs_exec_unix.lo $(IJS_DEPLIBS)
>diff --git a/print/panda/Makefile b/print/panda/Makefile
>index 385e4f6..197a469 100644
>--- a/print/panda/Makefile
>+++ b/print/panda/Makefile
>@@ -25,7 +25,6 @@ LIBS+=		-L${BDB_LIB_DIR} -L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> USES=		autoreconf bdb dos2unix gmake jpeg libtool pathfix pkgconfig tar:bzip2
> DOS2UNIX_GLOB=	*.c
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
>diff --git a/print/tex-ptexenc/Makefile b/print/tex-ptexenc/Makefile
>index 39ce4ef..06dda75 100644
>--- a/print/tex-ptexenc/Makefile
>+++ b/print/tex-ptexenc/Makefile
>@@ -15,7 +15,7 @@ COMMENT=	Library for Japanese pTeX and its tools
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYRIGHT
> 
>-USES=		iconv libtool pkgconfig tar:xz
>+USES=		iconv libtool pathfix pkgconfig tar:xz
> USE_TEX=	kpathsea
> USE_LDCONFIG=	yes
> WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ptexenc
>diff --git a/print/tex-ptexenc/files/patch-Makefile.in b/print/tex-ptexenc/files/patch-Makefile.in
>index 142d316..785533d 100644
>--- a/print/tex-ptexenc/files/patch-Makefile.in
>+++ b/print/tex-ptexenc/files/patch-Makefile.in
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2015-03-12 14:42:02 UTC
>+--- Makefile.in.orig	2016-10-04 13:42:08 UTC
> +++ Makefile.in
>-@@ -396,9 +396,10 @@ libptexenc_la_SOURCES = \
>+@@ -396,7 +396,8 @@ libptexenc_la_SOURCES = \
>  libptexenc_la_LIBADD = $(KPATHSEA_LIBS)
>  nobase_include_HEADERS = \
>  	ptexenc/ptexenc.h \
>@@ -8,8 +8,5 @@
> +	ptexenc/unicode.h \
> +	ptexenc/unicode-jp.h
>  
>--pkgconfigdir = ${libdir}/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>+ pkgconfigdir = $(prefix)/libdata/pkgconfig
>  pkgconfig_DATA = ptexenc.pc
>- EXTRA_DIST = COPYRIGHT ChangeLog.jp
>- 
>diff --git a/science/chemical-mime-data/Makefile b/science/chemical-mime-data/Makefile
>index 53179ad..09fec2e 100644
>--- a/science/chemical-mime-data/Makefile
>+++ b/science/chemical-mime-data/Makefile
>@@ -12,7 +12,7 @@ COMMENT=	Collection of chemical MIME types for UNIX desktops
> 
> BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:graphics/librsvg2
> 
>-USES=		gettext-tools gmake pkgconfig tar:bzip2 shared-mime-info
>+USES=		gettext-tools gmake pathfix pkgconfig tar:bzip2 shared-mime-info
> USE_GNOME=	gnomemimedata intlhack libxslt:build
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-update-database
>@@ -22,7 +22,6 @@ INSTALLS_ICONS=	yes
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|*-*-solaris*|*| ; s|rsvg|rsvg-convert|g' ${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e 's|(datadir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} -e 's|-f png $$< |-f png $$< > |' ${WRKSRC}/icons/hicolor/Makefile.in
> 
> .include <bsd.port.mk>
>diff --git a/security/clamav/Makefile b/security/clamav/Makefile
>index 0dcb6b2..2ce5067 100644
>--- a/security/clamav/Makefile
>+++ b/security/clamav/Makefile
>@@ -56,7 +56,7 @@ DMG_XAR_USE=		GNOME=libxml2
> 
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-USES=		cpe gmake libtool ncurses
>+USES=		cpe gmake libtool ncurses pathfix
> INSTALL_TARGET=	install-strip
> USE_RC_SUBR=	clamav-clamd clamav-freshclam
> 
>@@ -177,8 +177,6 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lthr|g' \
> 			  -e 's|LC_REVISION=22|LC_REVISION=24|' \
> 		${WRKSRC}/${CONFIGURE_SCRIPT}
>-	@${REINPLACE_CMD} -e 's,^$pkgconfigdir = $.*$$,\1$$$prefix$/libdata/pkgconfig,g' \
>-		${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} ${SED_CONF} \
> 		${WRKSRC}/etc/clamd.conf.sample \
> 		${WRKSRC}/etc/freshclam.conf.sample \
>diff --git a/security/d0_blind_id/Makefile b/security/d0_blind_id/Makefile
>index 62a03a1..936fce9 100644
>--- a/security/d0_blind_id/Makefile
>+++ b/security/d0_blind_id/Makefile
>@@ -15,7 +15,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	divVerent
> GH_TAGNAME=	ff1ce7e
> 
>-USES=		autoreconf libtool ssl
>+USES=		autoreconf libtool pathfix ssl
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-openssl
> USE_LDCONFIG=	yes
>diff --git a/security/d0_blind_id/files/patch-Makefile.am b/security/d0_blind_id/files/patch-Makefile.am
>deleted file mode 100644
>index d9401ff..0000000
>--- a/security/d0_blind_id/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- ./Makefile.am.orig	2014-03-17 06:18:23.208622713 +0000
>-+++ ./Makefile.am	2014-03-17 06:18:59.472680831 +0000
>-@@ -33,7 +33,7 @@
>- libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
>- library_includedir = $(includedir)/d0_blind_id
>- library_include_HEADERS = d0_blind_id.h d0.h
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_HEADERS = d0_blind_id.pc
>- 
>- if ENABLE_RIJNDAEL
>diff --git a/security/sssd/Makefile b/security/sssd/Makefile
>index d9bc069..080e349 100644
>--- a/security/sssd/Makefile
>+++ b/security/sssd/Makefile
>@@ -55,7 +55,6 @@ USE_LDCONFIG=	yes
> USE_OPENLDAP=	yes
> USES=		autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
> 		python:2 shebangfix gssapi:mit
>-PATHFIX_MAKEFILEIN=	Makefile.am
> INSTALL_TARGET=	install-strip
> CPE_VENDOR=	fedoraproject
> 
>diff --git a/security/suricata/Makefile b/security/suricata/Makefile
>index 002c15b..f831840 100644
>--- a/security/suricata/Makefile
>+++ b/security/suricata/Makefile
>@@ -28,8 +28,6 @@ CPE_VENDOR=	openinfosecfoundation
> INSTALL_TARGET=		install-strip
> TEST_TARGET=		check
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
>-
> OPTIONS_DEFINE=		GEOIP HTP_PORT IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE SC TESTS
> OPTIONS_DEFAULT=	HTP_PORT IPFW JSON NETMAP PRELUDE
> OPTIONS_SUB=		yes
>diff --git a/security/yara/Makefile b/security/yara/Makefile
>index 5fe790a..84311d2 100644
>--- a/security/yara/Makefile
>+++ b/security/yara/Makefile
>@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> USES=		alias autoreconf libtool pathfix ssl
> USE_LDCONFIG=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> CPPFLAGS+=	-isystem ${OPENSSLINC}
> LIBS+=		-L${OPENSSLLIB}
> 
>diff --git a/security/ykpers/Makefile b/security/ykpers/Makefile
>index 1f1df7d..2f06f77 100644
>--- a/security/ykpers/Makefile
>+++ b/security/ykpers/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libyubikey.so:security/libyubikey
> 
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-USES=		libtool pkgconfig
>+USES=		libtool pathfix pkgconfig
> 
> PLIST_FILES=	bin/ykchalresp \
> 		bin/ykinfo \
>@@ -42,10 +42,6 @@ MAKE_JOBS_UNSAFE=	yes
> 
> LDFLAGS+=	-L/usr/lib
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|^pkgconfigdir = .*|pkgconfigdir = /usr/local/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.in
>-
> regression-test: build
> 	@(cd ${WRKSRC}; ${MAKE} check)
> 
>diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
>index a11f55e..d3444bc 100644
>--- a/shells/bash-completion/Makefile
>+++ b/shells/bash-completion/Makefile
>@@ -17,7 +17,8 @@ RUN_DEPENDS=	bash:shells/bash
> 
> USE_AUTOTOOLS=	aclocal automake
> GNU_CONFIGURE=	yes
>-USES=		gmake tar:bzip2
>+USES=		gmake pathfix tar:bzip2
>+PATHFIX_MAKEFILEIN=	Makefile.am
> 
> SUB_FILES=	pkg-message
> SUB_LIST+=	RUNFILE=${DATADIR}/bash_completion.sh
>diff --git a/shells/bash-completion/files/patch-Makefile.am b/shells/bash-completion/files/patch-Makefile.am
>index 73fe3ca..40771d0 100644
>--- a/shells/bash-completion/files/patch-Makefile.am
>+++ b/shells/bash-completion/files/patch-Makefile.am
>@@ -1,6 +1,6 @@
>---- Makefile.am.orig	2013-04-05 09:43:56.000000000 +0000
>+--- Makefile.am.orig	2016-10-04 13:52:42 UTC
> +++ Makefile.am
>-@@ -5,10 +5,10 @@ pkgdata_DATA = bash_completion
>+@@ -5,7 +5,7 @@ pkgdata_DATA = bash_completion
>  # Empty, but here just to get the compat dir created with install
>  compat_DATA =
>  
>@@ -8,11 +8,7 @@
> +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
>+ pkgconfigdir = $(prefix)/libdata/pkgconfig
> @@ -20,8 +20,10 @@ EXTRA_DIST = CHANGES $(sysconf_DATA) $(p
>          .dir-locals.el
>  
>diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
>index 6787dcd..ad6310b 100644
>--- a/sysutils/afflib/Makefile
>+++ b/sysutils/afflib/Makefile
>@@ -21,7 +21,6 @@ GH_PROJECT=	AFFLIBv3
> USE_LDCONFIG=	yes
> USE_OPENSSL=	yes
> USES=		autoreconf fuse libtool pathfix
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-s3=yes
> INSTALL_TARGET=	install-strip
>diff --git a/sysutils/cinnamon-control-center/files/patch-shell_Makefile.am b/sysutils/cinnamon-control-center/files/patch-shell_Makefile.am
>deleted file mode 100644
>index a25e591..0000000
>--- a/sysutils/cinnamon-control-center/files/patch-shell_Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- shell/Makefile.orig.am	2013-03-01 11:03:35.043140465 +0100
>-+++ shell/Makefile.am	2013-03-01 11:03:42.973113146 +0100
>-@@ -67,7 +67,7 @@
>- 
>- libcinnamon_control_center_includedir = $(includedir)/cinnamon-control-center-1/libcinnamon-control-center
>- 
>--pkgconfigdir=$(libdir)/pkgconfig
>-+pkgconfigdir=$(prefix)/libdata/pkgconfig
>- pkgconfig_DATA=libcinnamon-control-center.pc
>- 
>- AM_CPPFLAGS =							\
>diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
>index 3b49066..ef9008c 100644
>--- a/sysutils/cinnamon-settings-daemon/Makefile
>+++ b/sysutils/cinnamon-settings-daemon/Makefile
>@@ -35,7 +35,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	linuxmint
> USE_XORG=	xxf86misc
> GNU_CONFIGURE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> INSTALLS_ICONS=	yes
> USE_LDCONFIG=	yes
> CONFIGURE_ARGS=	--disable-gudev \
>diff --git a/sysutils/dateutils/Makefile b/sysutils/dateutils/Makefile
>index 5cdd0e4..bc1155b 100644
>--- a/sysutils/dateutils/Makefile
>+++ b/sysutils/dateutils/Makefile
>@@ -12,15 +12,11 @@ LICENSE=	BSD3CLAUSE
> 
> BUILD_DEPENDS=	help2man:misc/help2man
> 
>-USES=		tar:xz
>+USES=		pathfix tar:xz
> GNU_CONFIGURE=	yes
> 
> INFO=		dateutils
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.in
>-
> .include <bsd.port.mk>
>diff --git a/sysutils/usbutils/Makefile b/sysutils/usbutils/Makefile
>index 6ff4f54..4a4369d 100644
>--- a/sysutils/usbutils/Makefile
>+++ b/sysutils/usbutils/Makefile
>@@ -15,7 +15,7 @@ COMMENT=	Utility for listing USB devices
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gmake pkgconfig
>+USES=		gmake pathfix pkgconfig
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>diff --git a/sysutils/usbutils/files/patch-Makefile.am b/sysutils/usbutils/files/patch-Makefile.am
>deleted file mode 100644
>index cfa74ee..0000000
>--- a/sysutils/usbutils/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.am.orig	2010-07-13 21:30:02.000000000 +0200
>-+++ Makefile.am	2010-07-13 21:30:21.000000000 +0200
>-@@ -56,7 +56,7 @@ lsusb.8: $(srcdir)/lsusb.8.in
>- usb-devices.1: $(srcdir)/usb-devices.1.in
>- 	sed 's|VERSION|$(VERSION)|g' $< >$@
>- 
>--pkgconfigdir = $(datadir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = usbutils.pc
>- 
>- usbutils.pc: $(srcdir)/usbutils.pc.in
>diff --git a/sysutils/usbutils/files/patch-Makefile.in b/sysutils/usbutils/files/patch-Makefile.in
>deleted file mode 100644
>index 6752d01..0000000
>--- a/sysutils/usbutils/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2010-07-13 21:50:47.000000000 +0200
>-+++ Makefile.in	2010-07-13 21:51:39.000000000 +0200
>-@@ -223,7 +223,7 @@ EXTRA_DIST = \
>- 	usb-devices \
>- 	usbutils.pc.in
>- 
>--pkgconfigdir = $(datadir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = usbutils.pc
>- DISTCLEANFILES = \
>- 	usb.ids.gz \
>diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
>index 9619514..f121988 100644
>--- a/textproc/apertium/Makefile
>+++ b/textproc/apertium/Makefile
>@@ -23,7 +23,6 @@ GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
> MAKE_JOBS_UNSAFE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
>index e00eafd..e62b584 100644
>--- a/textproc/augeas/Makefile
>+++ b/textproc/augeas/Makefile
>@@ -15,7 +15,7 @@ TEST_DEPENDS=	bash:shells/bash \
> 		gsed:textproc/gsed
> 
> GNU_CONFIGURE=	yes
>-USES=		autoreconf cpe gmake libtool pkgconfig readline
>+USES=		autoreconf cpe gmake libtool pathfix pkgconfig readline
> USE_GNOME=	libxml2
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
>@@ -23,7 +23,6 @@ INSTALL_TARGET=	install-strip
> LENSESDIR=	${PREFIX}/share/augeas/lenses
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's:$$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig:' ${WRKSRC}/Makefile.am
> 	@${REINPLACE_CMD} -e 's:/bin/bash:/usr/bin/env bash:' ${WRKSRC}/tests/*.sh
> 	@${REINPLACE_CMD} -e 's:sed:gsed:' ${WRKSRC}/tests/test-augtool.sh
> 	@${REINPLACE_CMD} -e 's:/usr/local:${LOCALBASE}:' \
>diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile
>index 596c957..d439b79 100644
>--- a/textproc/btparse/Makefile
>+++ b/textproc/btparse/Makefile
>@@ -13,7 +13,7 @@ COMMENT=	C library for parsing and processing BibTeX data files
> 
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-USES=		perl5 libtool
>+USES=		perl5 libtool pathfix
> USE_PERL5=	build
> 
> .include <bsd.port.mk>
>diff --git a/textproc/btparse/files/patch-Makefile.in b/textproc/btparse/files/patch-Makefile.in
>deleted file mode 100644
>index c160ea8..0000000
>--- a/textproc/btparse/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	Sun Mar 19 11:21:45 2006
>-+++ Makefile.in	Sun Mar 19 11:22:15 2006
>-@@ -139,7 +139,7 @@
>- SUBDIRS = src tests progs doc
>- EXTRA_DIST = $(wildcard pccts/*.[ch]) btparse.pc.in
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(libdir)/../libdata/pkgconfig
>- pkgconfig_DATA = btparse.pc
>- subdir = .
>- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile
>index 4f57c68..0dd159f 100644
>--- a/textproc/hyperestraier/Makefile
>+++ b/textproc/hyperestraier/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libqdbm.so.14:databases/qdbm
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		iconv
>+USES=		iconv pathfix
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-bzip2 --disable-zlib
>@@ -38,8 +38,7 @@ MECAB_LIB_DEPENDS=	libmecab.so:japanese/mecab
> MECAB_RUN_DEPENDS=	${LOCALBASE}/lib/mecab/dic/ipadic/matrix.bin:japanese/mecab-ipadic
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
>-		-e 's/@MYCFLAGS@/@CFLAGS@ -Wall -fPIC -fsigned-char/' \
>+	@${REINPLACE_CMD} -e 's/@MYCFLAGS@/@CFLAGS@ -Wall -fPIC -fsigned-char/' \
> 		${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
> 	@${RM} -f ${WRKSRC}/doc/intro-en.html~ ${WRKSRC}/doc/intro-ja.html~
>diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile
>index 2db4563..c591d23 100644
>--- a/textproc/ibus-table/Makefile
>+++ b/textproc/ibus-table/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libibus-1.0.so:textproc/ibus
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
> 
> USE_GNOME=	pygtk2
>-USES=		gmake pkgconfig python
>+USES=		gmake pathfix pkgconfig python
> 
> GNU_CONFIGURE=	yes
> 
>@@ -36,8 +36,6 @@ PLIST_SUB+=	NLS="@comment "
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} -e "s|/usr/|${PREFIX}/|g" ${WRKSRC}/engine/*.py
> 
> .include <bsd.port.mk>
>diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
>index 233176d..66d79f7 100644
>--- a/textproc/iksemel/Makefile
>+++ b/textproc/iksemel/Makefile
>@@ -19,7 +19,6 @@ GH_ACCOUNT=	meduketto
> GH_TAGNAME=	6cddfef
> 
> USES=		autoreconf libtool makeinfo pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>diff --git a/textproc/libcue/Makefile b/textproc/libcue/Makefile
>index d841aba..7af62b6 100644
>--- a/textproc/libcue/Makefile
>+++ b/textproc/libcue/Makefile
>@@ -18,6 +18,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	lipnitsk
> 
> USE_LDCONFIG=	yes
>-USES=		bison cmake:outsource
>+USES=		bison cmake:outsource pathfix
> 
> .include <bsd.port.mk>
>diff --git a/textproc/libcue/files/patch-CMakeLists.txt b/textproc/libcue/files/patch-CMakeLists.txt
>deleted file mode 100644
>index 623ed7a..0000000
>--- a/textproc/libcue/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- CMakeLists.txt.orig	2016-02-25 08:42:19 UTC
>-+++ CMakeLists.txt
>-@@ -19,7 +19,7 @@ SET (CUE_SOURCES
>- 
>- CONFIGURE_FILE(libcue.pc.in libcue.pc @ONLY)
>- INSTALL(FILES ${CMAKE_BINARY_DIR}/libcue.pc
>--	DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
>-+	DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
>- 
>- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
>- INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) # for generated files
>diff --git a/textproc/libfo/files/patch-Makefile.am b/textproc/libfo/files/patch-Makefile.am
>index 76df939..1054349 100644
>--- a/textproc/libfo/files/patch-Makefile.am
>+++ b/textproc/libfo/files/patch-Makefile.am
>@@ -9,12 +9,3 @@
>  
>  if PLATFORM_WIN32
>  no_undefined = -no-undefined
>-@@ -19,7 +19,7 @@ INCLUDES = \
>- 	-Ilibfo
>- 
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = ${LOCALBASE}/libdata/pkgconfig
>- pkgconfig_DATA = libfo-0.6.pc
>- 
>- xmldir = $(datadir)/xml/libfo-@VERSION@
>diff --git a/textproc/libguess/Makefile b/textproc/libguess/Makefile
>index 61466a6..83d5f24 100644
>--- a/textproc/libguess/Makefile
>+++ b/textproc/libguess/Makefile
>@@ -12,13 +12,10 @@ COMMENT=	High-speed character set detection library
> LIB_DEPENDS=	libmowgli.so:devel/libmowgli
> 
> USES=		gmake pathfix pkgconfig
>+PATHFIX_MAKEFILEIN=	Makefile
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
> MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}"
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|$${DESTDIR}$${libdir}/pkgconfig|$${PREFIX}/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile
>-
> .include <bsd.port.mk>
>diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
>index d0c9ed2..27c809d 100644
>--- a/textproc/liblrdf/Makefile
>+++ b/textproc/liblrdf/Makefile
>@@ -24,7 +24,6 @@ USES=		autoreconf iconv libtool pathfix pkgconfig
> USE_GNOME=	libxml2 libxslt
> USE_LDCONFIG=	yes
> USE_OPENSSL=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> INSTALL_TARGET=	install-strip
> 
> CFLAGS+=	-I${OPENSSLINC}
>diff --git a/textproc/libucl/Makefile b/textproc/libucl/Makefile
>index a8e7ed9..01f49ca 100644
>--- a/textproc/libucl/Makefile
>+++ b/textproc/libucl/Makefile
>@@ -44,7 +44,6 @@ GNU_CONFIGURE=	yes
> 
> GH_ACCOUNT=	vstakhov
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
> CONFLICTS_INSTALL=	ucl
> 
> INSTALL_TARGET=	install-strip
>diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile
>index 9bceaa7..fc02f67 100644
>--- a/textproc/m17n-im-config/Makefile
>+++ b/textproc/m17n-im-config/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libm17n.so:devel/m17n-lib
> MAKE_JOBS_UNSAFE=	yes
> 
> USE_GNOME=	gtk20 intltool intlhack glib20
>-USES=		gettext pkgconfig libtool
>+USES=		gettext pathfix pkgconfig libtool
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>@@ -41,8 +41,4 @@ CONFIGURE_ARGS+=	--disable-nls
> PLIST_SUB+=	NLS="@comment "
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|^pkgconfigdir = $${libdir}/pkgconfig|pkgconfigdir = $${prefix}/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.in
>-
> .include <bsd.port.mk>
>diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
>index 002b011..4c7f6f3 100644
>--- a/textproc/ots/Makefile
>+++ b/textproc/ots/Makefile
>@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libpopt.so:devel/popt
> 
> USES=		autoreconf gettext libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_GNOME=	glib20 libxml2
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>diff --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile
>index 2838a2b..3f9bfd2 100644
>--- a/textproc/tokyodystopia/Makefile
>+++ b/textproc/tokyodystopia/Makefile
>@@ -14,7 +14,7 @@ LICENSE=	LGPL21
> LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake
>+USES=		gmake pathfix
> USE_LDCONFIG=	yes
> CONFIGURE_ARGS=	--libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include
> 
>@@ -29,8 +29,7 @@ post-extract:
> 	@${RM} ${WRKSRC}/doc/index.html~
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
>-		-e 's|DATADIR =.*|DATADIR = ${DOCSDIR}|' \
>+	@${REINPLACE_CMD} -e 's|DATADIR =.*|DATADIR = ${DOCSDIR}|' \
> 		${WRKSRC}/Makefile.in
> 
> .include <bsd.port.mk>
>diff --git a/textproc/turboxsl/Makefile b/textproc/turboxsl/Makefile
>index 660c3ab..49ae157 100644
>--- a/textproc/turboxsl/Makefile
>+++ b/textproc/turboxsl/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libck.so:devel/concurrencykit \
> 
> BROKEN_powerpc64=	Does not build
> ONLY_FOR_ARCHS=	amd64 ia64 powerpc64 sparc64
>-USES=		autoreconf libtool pkgconfig
>+USES=		autoreconf libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	Litres
>diff --git a/textproc/turboxsl/files/patch-Makefile.am b/textproc/turboxsl/files/patch-Makefile.am
>deleted file mode 100644
>index e028727..0000000
>--- a/textproc/turboxsl/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- Makefile.am.orig	2015-07-02 18:01:10 UTC
>-+++ Makefile.am
>-@@ -8,6 +8,6 @@ ACLOCAL_AMFLAGS = -I m4
>- 
>- bin_SCRIPTS = turboxsl-config
>- 
>--pkgconfigdir=$(libdir)/pkgconfig
>-+pkgconfigdir=$(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = libturboxsl.pc
>- 
>diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
>index d728442..d065d70 100644
>--- a/textproc/uim/Makefile
>+++ b/textproc/uim/Makefile
>@@ -16,7 +16,7 @@ COMMENT?=	Input method library
> USE_LDCONFIG=	yes
> WANT_GNOME=	yes
> USE_GNOME+=	glib20 intltool
>-USES+=		gettext gmake iconv libedit libtool pkgconfig perl5 tar:bzip2
>+USES+=		gettext gmake iconv libedit libtool pathfix pkgconfig perl5 tar:bzip2
> USE_PERL5=	build
> GNU_CONFIGURE=	yes
> 
>diff --git a/textproc/uim/files/patch-Makefile.in b/textproc/uim/files/patch-Makefile.in
>deleted file mode 100644
>index f7281be..0000000
>--- a/textproc/uim/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2007-03-15 05:37:43.000000000 +0900
>-+++ Makefile.in	2007-09-25 00:15:31.000000000 +0900
>-@@ -316,7 +316,7 @@
>- 	uim.pc.in uim.desktop uim.spec.in uim.spec \
>- 	intltool-extract.in intltool-merge.in intltool-update.in
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = uim.pc
>- desktopdir = $(datadir)/applications
>- desktop_in_files = uim.desktop.in
>diff --git a/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in b/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
>deleted file mode 100644
>index bbdc406..0000000
>--- a/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- sigscheme/libgcroots/Makefile.in.orig	2007-09-25 01:58:25.000000000 +0900
>-+++ sigscheme/libgcroots/Makefile.in	2007-09-25 01:59:00.000000000 +0900
>-@@ -345,7 +345,7 @@
>- 	include/gc_config_macros.h include/private/gc_hdrs.h \
>- 	include/private/gc_locks.h include/private/gc_priv.h \
>- 	include/private/gcconfig.h
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = gcroots.pc
>- libgcroots_la_SOURCES = mark.c gcroots.c
>- 
>diff --git a/www/libhtp-suricata/Makefile b/www/libhtp-suricata/Makefile
>index 680277f..0896838 100644
>--- a/www/libhtp-suricata/Makefile
>+++ b/www/libhtp-suricata/Makefile
>@@ -18,7 +18,6 @@ USE_LDCONFIG=	yes
> 
> CONFLICTS_INSTALL=	libhtp-[0-9]*
> 
>-PATHFIX_MAKEFILEIN=	Makefile.am
> INSTALL_TARGET=	install-strip
> 
> .include <bsd.port.mk>
>diff --git a/www/mod_webauth/Makefile b/www/mod_webauth/Makefile
>index ee4fb78..22f29c9 100644
>--- a/www/mod_webauth/Makefile
>+++ b/www/mod_webauth/Makefile
>@@ -13,7 +13,7 @@ COMMENT=	Apache module for authenticating users with Kerberos v5
> LIB_DEPENDS=	libcurl.so:ftp/curl \
> 		libsasl2.so:security/cyrus-sasl2
> 
>-USES=		libtool pkgconfig ssl
>+USES=		libtool pathfix pkgconfig ssl
> USE_APACHE=	22+
> USE_OPENLDAP=	yes
> USE_LDCONFIG=	yes
>@@ -25,8 +25,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am
> 	@${REINPLACE_CMD} -e '/typedef int sig_atomic_t/d' \
> 		${WRKSRC}/portable/system.h
> 
>diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
>index 49a68a6..3c19d29 100644
>--- a/www/nghttp2/Makefile
>+++ b/www/nghttp2/Makefile
>@@ -28,7 +28,6 @@ CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
> 		ZLIB_LIBS="-L${LIBDIR} -lz"
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_CXXSTD=	c++11
> USE_LDCONFIG=	yes
> USES=		autoreconf compiler:c++11-lib gmake libtool localbase pathfix pkgconfig ssl
>diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
>index 1f9c6b3..5ebc29d 100644
>--- a/www/trafficserver/Makefile
>+++ b/www/trafficserver/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
> 
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-USES=		cpe execinfo gmake libtool perl5 pkgconfig sqlite ssl tar:bzip2 tcl
>+USES=		cpe execinfo gmake libtool pathfix perl5 pkgconfig sqlite ssl tar:bzip2 tcl
> CPE_VENDOR=	apache
> CPE_PRODUCT=	traffic_server
> USE_PERL5=	build run
>diff --git a/www/trafficserver/files/patch-tools_Makefile.in b/www/trafficserver/files/patch-tools_Makefile.in
>deleted file mode 100644
>index 482621c..0000000
>--- a/www/trafficserver/files/patch-tools_Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- tools/Makefile.in.orig	2015-06-30 04:11:56 UTC
>-+++ tools/Makefile.in
>-@@ -614,7 +614,7 @@ valuesh = @valuesh@
>- waith = @waith@
>- zlibh = @zlibh@
>- bin_SCRIPTS = tsxs tspush
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = trafficserver.pc
>- AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
>- AM_CPPFLAGS = $(iocore_include_dirs) \
>diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile
>index 1816249..c59681d 100644
>--- a/www/varnish4/Makefile
>+++ b/www/varnish4/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre
> CONFLICTS=	varnish-2.* varnish-3.*
> BROKEN_arm=	does not configure
> 
>-USES=		autoreconf cpe gmake libedit libtool pkgconfig python:2,build \
>+USES=		autoreconf cpe gmake libedit libtool pathfix pkgconfig python:2,build \
> 		readline shebangfix
> SHEBANG_FILES=	lib/libvcc/vmodtool.py
> CPE_VENDOR=	varnish-cache
>@@ -39,8 +39,6 @@ EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
>-		${WRKSRC}/Makefile.am
> .if defined(BAD_TESTS)
> 	${RM} -f ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
> .endif
>diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
>index c828c07..5c4d86e 100644
>--- a/www/webkit-gtk2/Makefile
>+++ b/www/webkit-gtk2/Makefile
>@@ -29,7 +29,8 @@ PORTSCOUT=	limit:^2\.4\.
> USE_GSTREAMER1=	yes
> USE_XORG=	xt xdamage xcomposite
> USES=		bison compiler:c++11-lib gettext gmake gperf libtool localbase \
>-		perl5 pkgconfig shebangfix sqlite tar:xz
>+		pathfix perl5 pkgconfig shebangfix sqlite tar:xz
>+PATHFIX_MAKEFILEIN=	GNUmakefile.in
> USE_RUBY=	yes
> RUBY_NO_RUN_DEPENDS=yes
> USE_GNOME=	cairo gtk20 introspection:build libxslt
>@@ -100,8 +101,6 @@ post-patch:
> # Since ruby 2.2 there is no ruby symlink
> 	@${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \
> 		${WRKSRC}/configure
>-	@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
> 
> post-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \
>diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
>index 36d615d..88263a2 100644
>--- a/www/webkit-gtk3/Makefile
>+++ b/www/webkit-gtk3/Makefile
>@@ -29,7 +29,8 @@ PORTSCOUT=	limit:^2\.4\.
> USE_GSTREAMER1=	yes
> USE_XORG=	xt xdamage xcomposite
> USES=		bison compiler:c++11-lib gettext gmake gperf libtool localbase \
>-		perl5 pkgconfig shebangfix sqlite tar:xz
>+		pathfix perl5 pkgconfig shebangfix sqlite tar:xz
>+PATHFIX_MAKEFILEIN=	GNUmakefile.in
> USE_RUBY=	yes
> RUBY_NO_RUN_DEPENDS=yes
> USE_GNOME=	cairo gtk20 gtk30 introspection:build libxslt
>@@ -107,8 +108,6 @@ post-patch:
> # Since ruby 2.2 there is no ruby symlink
> 	@${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \
> 		${WRKSRC}/configure
>-	@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
> 
> post-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \
>diff --git a/www/webkit-sharp/Makefile b/www/webkit-sharp/Makefile
>index 07e9c96..d7b9129 100644
>--- a/www/webkit-sharp/Makefile
>+++ b/www/webkit-sharp/Makefile
>@@ -19,6 +19,5 @@ PLIST_SUB+=	ASSEMBLY_VERSION=1.1.15
> GNU_CONFIGURE=	yes
> USES=		autoreconf gmake mono pathfix pkgconfig
> USE_GNOME=	gtksharp20
>-PATHFIX_MAKEFILEIN=	Makefile.am
> 
> .include <bsd.port.mk>
>diff --git a/www/yaws/Makefile b/www/yaws/Makefile
>index 8a7f307..f9266b2 100644
>--- a/www/yaws/Makefile
>+++ b/www/yaws/Makefile
>@@ -29,7 +29,6 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--localstatedir=/var
> CONFIGURE_ENV=	wwwdir=${WWWDIR} yawsdir=${APPDIR}
> INSTALL_TARGET=	install-strip
>-PATHFIX_MAKEFILEIN=Makefile.am
> 
> .include <bsd.port.options.mk>
> 
>diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
>index 52bb4c5..1ac00b3 100644
>--- a/x11-drivers/xf86-input-joystick/Makefile
>+++ b/x11-drivers/xf86-input-joystick/Makefile
>@@ -10,8 +10,6 @@ COMMENT=	X.Org joystick input driver
> 
> XORG_CAT=	driver
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.in
>+USES=		pathfix
> 
> .include <bsd.port.mk>
>diff --git a/x11-fm/nemo/files/patch-libnemo-extensions_Makefile.am b/x11-fm/nemo/files/patch-libnemo-extensions_Makefile.am
>deleted file mode 100644
>index 73a6761..0000000
>--- a/x11-fm/nemo/files/patch-libnemo-extensions_Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- libnemo-extension/Makefile.orig.am	2013-03-02 09:00:45.222570308 +0100
>-+++ libnemo-extension/Makefile.am	2013-03-02 09:02:01.279567955 +0100
>-@@ -52,7 +52,7 @@
>- 	nemo-menu.c                                 \
>- 	$(NULL)
>- 
>--pkgconfigdir=$(libdir)/pkgconfig
>-+pkgconfigdir=$(prefix)/libdata/pkgconfig
>- pkgconfig_DATA=libnemo-extension.pc
>- 
>- EXTRA_DIST = \
>diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
>index 57e6d37..9907a77 100644
>--- a/x11-toolkits/gai/Makefile
>+++ b/x11-toolkits/gai/Makefile
>@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LIB
> 
> LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
> 
>-USES=		gettext-tools pkgconfig tar:bzip2
>+USES=		gettext-tools pathfix pkgconfig tar:bzip2
> USE_GL=		gl
> USE_SDL=	sdl
> USE_GNOME=	libgnomeui
>diff --git a/x11-toolkits/gai/files/patch-gai_Makefile.in b/x11-toolkits/gai/files/patch-gai_Makefile.in
>index 047c61c..d5906dd 100644
>--- a/x11-toolkits/gai/files/patch-gai_Makefile.in
>+++ b/x11-toolkits/gai/files/patch-gai_Makefile.in
>@@ -1,5 +1,5 @@
>---- gai/Makefile.in.orig	Thu Oct 27 15:00:22 2005
>-+++ gai/Makefile.in	Thu Oct 27 15:02:47 2005
>+--- gai/Makefile.in.orig	2016-10-04 15:54:42 UTC
>++++ gai/Makefile.in
> @@ -1,9 +1,9 @@
>  
>  # Makefile for the General Applet Interface Library
>@@ -12,7 +12,7 @@
>  LDFLAGS += @GNOME_LIBS@ @GL_LIBS@ @SDL_LIBS@ @GTHREAD_LIBS@ @PANGO_LIBS@
>  
>  CC = @CC@
>-@@ -23,13 +23,13 @@
>+@@ -23,13 +23,13 @@ libgai@LIB_END@: $(OBJS)
>  
>  install: libgai@LIB_END@
>  	mkdir -p $(DESTDIR)$(PREFIX)/include/gai
>@@ -23,9 +23,8 @@
> +	$(BSD_INSTALL_PROGRAM) libgai@LIB_END@ $(DESTDIR)$(LIBDIR)/libgai@LIB_START@.@GAI_MAJOR@.@GAI_MINOR@.@GAI_MICRO@@LIB_DARWIN@
>  	ln -sf libgai@LIB_START@.@GAI_MAJOR@.@GAI_MINOR@.@GAI_MICRO@@LIB_DARWIN@ $(DESTDIR)$(LIBDIR)/libgai@LIB_START@.@GAI_MAJOR@@LIB_DARWIN@
>  	ln -sf libgai@LIB_START@.@GAI_MAJOR@@LIB_DARWIN@ $(DESTDIR)$(LIBDIR)/libgai@LIB_END@
>--	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
>--	cp ../gai.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
>-+	mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
>+ 	mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
>+-	cp ../gai.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
> +	$(BSD_INSTALL_DATA) ../gai.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
>  uninstall:
>  	rm -f $(DESTDIR)$(PREFIX)/include/gai/gai.h
>diff --git a/x11-toolkits/girara/Makefile b/x11-toolkits/girara/Makefile
>index d88d728..57fb81d 100644
>--- a/x11-toolkits/girara/Makefile
>+++ b/x11-toolkits/girara/Makefile
>@@ -10,7 +10,8 @@ MAINTAINER=	madpilot@FreeBSD.org
> COMMENT=	GTK3 Interface Library for Zathura PDF Viewer
> 
> USE_GNOME=	glib20 gtk30
>-USES=		compiler:c11 gmake pkgconfig
>+USES=		compiler:c11 gmake pathfix pkgconfig
>+PATHFIX_MAKEFILEIN=	Makefile
> USE_LDCONFIG=	yes
> LIBDIR=		${PREFIX}/lib
> MAKE_ENV+=	SFLAGS=${STRIP}
>@@ -20,10 +21,6 @@ OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
> NLS_USES=	gettext
> 
>-post-patch:	.SILENT
>-	${REINPLACE_CMD} -e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g'\
>-		${WRKSRC}/Makefile
>-
> post-patch-NLS-off: .SILENT
> 	${REINPLACE_CMD} -e '/-C po/d'\
> 		${WRKSRC}/Makefile
>diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
>index bfd7224..a4704b3 100644
>--- a/x11-wm/muffin/Makefile
>+++ b/x11-wm/muffin/Makefile
>@@ -31,7 +31,6 @@ GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=unused-function
> CFLAGS+=	-I${LOCALBASE}/include -Wno-error=unused-function
> LDFLAGS+=	-L${LOCALBASE}/lib
>-PATHFIX_MAKEFILEIN=	Makefile.am
> CONFIGURE_ENV=	LIBS="-lexecinfo"
> CONFIGURE_ARGS=	--enable-compile-warnings=maximum
> MAKE_ARGS=	V=1
>diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
>index 64ebfcf..2b73905 100644
>--- a/x11/cinnamon-desktop/Makefile
>+++ b/x11/cinnamon-desktop/Makefile
>@@ -26,7 +26,6 @@ SHEBANG_FILES=	files/usr/bin/cinnamon-desktop-migrate-mediakeys
> python_OLD_CMD=	/usr/bin/python2
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project"
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
>index d88f454..f8a45da 100644
>--- a/x11/cinnamon-menus/Makefile
>+++ b/x11/cinnamon-menus/Makefile
>@@ -22,7 +22,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	linuxmint
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
>index 56d059d..b02f109 100644
>--- a/x11/cinnamon-screensaver/Makefile
>+++ b/x11/cinnamon-screensaver/Makefile
>@@ -24,7 +24,6 @@ GH_ACCOUNT=	linuxmint
> USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
> USE_GNOME=	gnomedesktop3 gnomeprefix intlhack intlhack libgnomekbd libxml2
> GNU_CONFIGURE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> CPPFLAGS+=	-I${LOCALBASE}/include
> CFLAGS=		-I${LOCALBASE}/include -Wno-error=format-nonliteral
> LDFLAGS+=	-L${LOCALBASE}/lib
>diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
>index 7e11a13..db4b8ab 100644
>--- a/x11/cinnamon-session/Makefile
>+++ b/x11/cinnamon-session/Makefile
>@@ -27,7 +27,6 @@ USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
> USE_GL=		gl
> INSTALLS_ICONS=	yes
> GNU_CONFIGURE=	yes
>-PATHFIX_MAKEFILEIN=	Makefile.am
> CONFIGURE_ARGS=	--disable-docbook-docs
> CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
> CFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
>diff --git a/x11/keybinder-gtk3/Makefile b/x11/keybinder-gtk3/Makefile
>index f7f2f19..6f277e5 100644
>--- a/x11/keybinder-gtk3/Makefile
>+++ b/x11/keybinder-gtk3/Makefile
>@@ -18,7 +18,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	engla
> 
> USES=		autoreconf gmake libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_GNOME=	gtk30 introspection:build
> USE_XORG=	x11 xext xrender
> GNU_CONFIGURE=	yes
>diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
>index 94957d6..fd5ff43 100644
>--- a/x11/keybinder/Makefile
>+++ b/x11/keybinder/Makefile
>@@ -17,7 +17,6 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	engla
> 
> USES=		autoreconf gmake libtool pathfix pkgconfig
>-PATHFIX_MAKEFILEIN=	Makefile.am
> USE_GNOME=	gtk20 introspection:build
> USE_XORG=	x11 xext xrender
> GNU_CONFIGURE=	yes
>diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
>index 1c14331..1ddb60c 100644
>--- a/x11/libSM/Makefile
>+++ b/x11/libSM/Makefile
>@@ -12,6 +12,7 @@ COMMENT=	Session Management library for X11
> 
> LICENSE=	MIT
> 
>+USES=		pathfix
> XORG_CAT=	lib
> USE_XORG=	ice xproto:both xtrans
> 
>diff --git a/x11/libSM/files/patch-Makefile.am b/x11/libSM/files/patch-Makefile.am
>deleted file mode 100644
>index 696cf1d..0000000
>--- a/x11/libSM/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- ./Makefile.am.orig	2009-02-23 19:42:34.000000000 +0300
>-+++ ./Makefile.am	2009-02-23 19:43:19.000000000 +0300
>-@@ -1,6 +1,6 @@
>- SUBDIRS=src
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = sm.pc
>- 
>- EXTRA_DIST=sm.pc.in

Actions: View | Diff

Attachments on bug 213195: 175419 | 175599 | 175622 | 175761 | 175857