Make gconf support optional in multimedia/gst-plugins0.10-good. Index: multimedia/gst-plugins0.10-good/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.10-good/Makefile,v retrieving revision 1.30 diff -p -u -r1.30 Makefile --- multimedia/gst-plugins0.10-good/Makefile 6 Apr 2013 03:45:19 -0000 1.30 +++ multimedia/gst-plugins0.10-good/Makefile 23 Apr 2013 13:29:19 -0000 @@ -2,21 +2,17 @@ # .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" Index: multimedia/gst-plugins0.10-good/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.10-good/PLIST,v retrieving revision 1.25 diff -p -u -r1.25 PLIST --- multimedia/gst-plugins0.10-good/PLIST 28 Feb 2012 18:31:00 -0000 1.25 +++ multimedia/gst-plugins0.10-good/PLIST 23 Apr 2013 13:29:19 -0000 @@ -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 Index: multimedia/gst-plugins0.10-good/options.mk =================================================================== RCS file: multimedia/gst-plugins0.10-good/options.mk diff -N multimedia/gst-plugins0.10-good/options.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multimedia/gst-plugins0.10-good/options.mk 23 Apr 2013 13:29:19 -0000 @@ -0,0 +1,15 @@ +# $NetBSD$ + +PKG_OPTIONS_VAR= PKG_OPTIONS.gst-plugins0.10-good +PKG_SUPPORTED_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