14 files changed, 6 insertions, 54 deletions

diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index 2141d44dbf2b..96819c484a8f 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 2f4ed41a8023..88eef0542d35 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 0d5b4c4fba41..551822f605d5 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 5ba9285a199b..000000000000
--- 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 8fc094b99049..c5d9d8db03b3 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 1a421dcf2923..317ea1d61cc1 100644
--- a/audio/libxmp/Makefile
+++ b/audio/libxmp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Module rendering library for xmp
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.LIB
 
-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 4947192cf865..000000000000
--- 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 e8efa65bda50..f0e50eacd031 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 9363733052ef..a0fc1d8239b4 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 1042756d0796..000000000000
--- 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 a14afc140139..a0362eb17879 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 7c03f11ceb8a..309a31b00624 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 98f292c88f76..885a360a693a 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 aa7d079f8ffa..64188239a5fc 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
  #