Add optional dependency on pkg-config, fix build on bento.

Reported by:	kris/bento
Approved by:	arved (Mentor)

2 files changed, 20 insertions, 4 deletions

diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 34eda0501b5f..0773f8de2562 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -22,7 +22,23 @@ CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+WANT_GNOME=	yes
+USE_LIBTOOL_VER=13
 CONFLICTS=	libshout-1.0.7
+USE_REINPLACE=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mpkgconfig}!=""
+USE_GNOME+=	pkgconfig
+PLIST_SUB+=	WITH_PKGCONFIG=""
+.else
+CONFIGURE_ARGS+=--disable-pkgconfig
+PLIST_SUB+=	WITH_PKGCONFIG="@comment "
+.endif
+
+post-configure:
+	@ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \
+		${WRKSRC}/Makefile
+
+.include <bsd.port.post.mk>
diff --git a/audio/libshout2/pkg-plist b/audio/libshout2/pkg-plist
index 3c645e13a793..808328cf78dd 100644
--- a/audio/libshout2/pkg-plist
+++ b/audio/libshout2/pkg-plist
@@ -3,11 +3,11 @@ lib/libshout.a
 lib/libshout.la
 lib/libshout.so
 lib/libshout.so.3
-lib/pkgconfig/shout.pc
+%%WITH_PKGCONFIG%%libdata/pkgconfig/shout.pc
 share/aclocal/shout.m4
 share/doc/libshout/COPYING
 share/doc/libshout/README
 share/doc/libshout/example.c
 @dirrm share/doc/libshout
-@dirrm lib/pkgconfig
+%%WITH_PKGCONFIG%%@dirrm libdata/pkgconfig
 @dirrm include/shout