Make gconf an option (default enabled) for gst-plugins0.10-good.

3 files changed, 26 insertions, 12 deletions

diff --git a/multimedia/gst-plugins0.10-good/Makefile b/multimedia/gst-plugins0.10-good/Makefile
index 9de28a3a43d..2960b4f863c 100644
--- a/multimedia/gst-plugins0.10-good/Makefile
+++ b/multimedia/gst-plugins0.10-good/Makefile
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile,v 1.30 2013/04/06 03:45:19 rodent Exp $
+# $NetBSD: Makefile,v 1.31 2013/05/11 19:17:49 riastradh Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=		3
+PKGREVISION=		4
 
 COMMENT+=		Good plugins
 
 # some plugins were moved from bad to good
 CONFLICTS+=		gst-plugins0.10-bad<0.10.18
 
-CONFIGURE_ARGS+=	--enable-gconf
-CONFIGURE_ARGS+=	--enable-gconftool
-CONFIGURE_ARGS+=	--enable-zlib
+.include "options.mk"
 
-# We depend on libxml anyway (indirectly through GConf), so this
-# doesn't hurt. Just make it explicite.
+CONFIGURE_ARGS+=	--enable-zlib
 CONFIGURE_ARGS+=	--enable-annodex
-.include "../../textproc/libxml2/buildlink3.mk"
 
 GCONF_SCHEMAS=		gstreamer-0.10.schemas
 
@@ -24,10 +20,12 @@ GCONF_SCHEMAS=		gstreamer-0.10.schemas
 TEST_TARGET=		check-torture
 
 post-install:
+.if !empty(PKG_OPTIONS:Mgconf)
 	${INSTALL_DATA} ${WRKSRC}/gconf/gstreamer-0.10.schemas \
 		${DESTDIR}${GCONF_SCHEMAS_DIR}
+.endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/GConf/schemas.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins0.10-good/PLIST b/multimedia/gst-plugins0.10-good/PLIST
index fa28cf7e832..7f00c667cf1 100644
--- a/multimedia/gst-plugins0.10-good/PLIST
+++ b/multimedia/gst-plugins0.10-good/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2012/02/28 18:31:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.26 2013/05/11 19:17:49 riastradh Exp $
 lib/gstreamer-0.10/libgstalaw.la
 lib/gstreamer-0.10/libgstalpha.la
 lib/gstreamer-0.10/libgstalphacolor.la
@@ -17,7 +17,7 @@ lib/gstreamer-0.10/libgsteffectv.la
 lib/gstreamer-0.10/libgstequalizer.la
 lib/gstreamer-0.10/libgstflv.la
 lib/gstreamer-0.10/libgstflxdec.la
-lib/gstreamer-0.10/libgstgconfelements.la
+${PLIST.gconf}lib/gstreamer-0.10/libgstgconfelements.la
 lib/gstreamer-0.10/libgstgoom.la
 lib/gstreamer-0.10/libgstgoom2k1.la
 lib/gstreamer-0.10/libgsticydemux.la
@@ -46,7 +46,7 @@ lib/gstreamer-0.10/libgstvideomixer.la
 lib/gstreamer-0.10/libgstwavenc.la
 lib/gstreamer-0.10/libgstwavparse.la
 lib/gstreamer-0.10/libgsty4menc.la
-share/gconf/schemas/gstreamer-0.10.schemas
+${PLIST.gconf}share/gconf/schemas/gstreamer-0.10.schemas
 share/gstreamer-0.10/presets/GstIirEqualizer10Bands.prs
 share/gstreamer-0.10/presets/GstIirEqualizer3Bands.prs
 share/locale/af/LC_MESSAGES/gst-plugins-good-0.10.mo
diff --git a/multimedia/gst-plugins0.10-good/options.mk b/multimedia/gst-plugins0.10-good/options.mk
new file mode 100644
index 00000000000..826905c7c51
--- /dev/null
+++ b/multimedia/gst-plugins0.10-good/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2013/05/11 19:17:49 riastradh Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gst-plugins0.10-good
+PKG_SUPPORTED_OPTIONS=	gconf
+PKG_SUGGESTED_OPTIONS=	gconf
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		gconf
+
+.if !empty(PKG_OPTIONS:Mgconf)
+PLIST.gconf=		yes
+CONFIGURE_ARGS+=	--enable-gconf
+CONFIGURE_ARGS+=	--enable-gconftool
+.include "../../devel/GConf/schemas.mk"
+.endif