10 files changed, 30 insertions, 15 deletions

diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index c764d3e4b50e..08e4b989e8f7 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -22,8 +22,10 @@ LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
 		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
 		libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 
-USES=		gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index ba88962f2f87..6b9afa81a621 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -21,12 +21,12 @@ LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libtag.so:${PORTSDIR}/audio/taglib
 
-USES=		gmake pkgconfig pathfix desktop-file-utils tar:xz
+USES=		desktop-file-utils gmake pkgconfig tar:xz
 USE_GNOME=	glib20 intltool intlhack libxslt
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GTK
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--disable-appdata-validate \
 	--without-help-dir \
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index b09977a6bc22..7e47db455eb0 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -15,7 +15,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake gettext libtool pkgconfig
 USE_GNOME=	glib20 gtk20 intltool
-USES=		gmake gettext libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index 11a2add99047..ed6bfa991bef 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -16,7 +16,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	glib20 gtk20 intltool libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index 79817adb40ef..959c246b0e78 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -17,7 +17,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	glib20 gtk20 intltool libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index dc496672b358..e64574933f8b 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -15,7 +15,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	intltool glib20 gtk20 libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index a0a282a05835..db49a0b6d9b7 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -16,7 +16,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	intltool glib20 gtk20 libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index 470550490aec..6a514cf5ae52 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -18,7 +18,9 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc \
 		ogg123:${PORTSDIR}/audio/vorbis-tools
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	intltool glib20 gtk20 libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gvolwheel/Makefile b/audio/gvolwheel/Makefile
index b1b86b2475e4..89d3ff756485 100644
--- a/audio/gvolwheel/Makefile
+++ b/audio/gvolwheel/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Volume mixer
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	intltoolize:${PORTSDIR}/textproc/intltool
-
 CONFIGURE_ARGS+=--enable-oss
 GNU_CONFIGURE=	yes
-USES=		gmake iconv pathfix pkgconfig
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake iconv pkgconfig
 USE_GNOME=	gtk30
 
 PORTDOCS=	AUTHORS ChangeLog README
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index b1593a3a58e3..5fcf58849e5b 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -11,12 +11,13 @@ MAINTAINER=	romain@FreeBSD.org
 COMMENT=	GTK configuration dialog for PulseAudio
 
 LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio
 
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig
-USE_GNOME=	gnomeprefix intltool
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake pkgconfig
+USE_GNOME=	gconfmm26 gnomeprefix
 
 CONFIGURE_ARGS=	--disable-lynx