Protect each of the new plug-in macros with a gst_ prefix. This prevents

conflicts with things like bsd.gnome.mk which manifested itself by
causing certain plug-ins to suck in GNOME 1 dependencies.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6482 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 117 insertions, 117 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index d02d6a190..da2a51931 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -1,5 +1,5 @@
 # $FreeBSD: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.34 2006/06/09 20:24:02 ahze Exp $
-#    $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.51 2006/06/24 16:18:14 marcus Exp $
+#    $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.52 2006/06/24 16:35:42 marcus Exp $
 # base
 BASE_GST_ALL_PLUGINS= \
 		alsa \
@@ -109,231 +109,231 @@ GST_LIB_DIR=		lib/gstreamer-${VERSION}
 PLIST=		${NONEXISTENT}
 
 # a52dec
-a52dec_LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
-a52dec_DIST=	ugly
+gst_a52dec_LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
+gst_a52dec_DIST=	ugly
 
 # aalib
-aalib_LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
-aalib_PLIST_FILES=	${GST_LIB_DIR}/libgstaasink.so \
+gst_aalib_LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
+gst_aalib_PLIST_FILES=	${GST_LIB_DIR}/libgstaasink.so \
 		${GST_LIB_DIR}/libgstaasink.a \
 		${GST_LIB_DIR}/libgstaasink.la
 
 # cairo
-cairo_LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+gst_cairo_LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 
 # cdparanoia
-cdparanoia_LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
-cdparanoia_EXTRA_LIBS+=	-lgstcdda-${VERSION}
-cdparanoia_DIST=	base
+gst_cdparanoia_LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
+gst_cdparanoia_EXTRA_LIBS+=	-lgstcdda-${VERSION}
+gst_cdparanoia_DIST=	base
 
 # dts
-dts_BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
-dts_PLIST_FILES=	${GST_LIB_DIR}/libgstdtsdec.a \
+gst_dts_BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
+gst_dts_PLIST_FILES=	${GST_LIB_DIR}/libgstdtsdec.a \
 		${GST_LIB_DIR}/libgstdtsdec.la \
 		${GST_LIB_DIR}/libgstdtsdec.so
-dts_DIST=	bad
+gst_dts_DIST=	bad
 
 # dv
-dv_LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
+gst_dv_LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
 
 # dvd
-dvd_EXTRA_LIBS+=	-ldvdnav
-dvd_LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
-dvd_GST_PLUGIN_DIR=	ext/dvdnav \
+gst_dvd_EXTRA_LIBS+=	-ldvdnav
+gst_dvd_LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
+gst_dvd_GST_PLUGIN_DIR=	ext/dvdnav \
 		ext/dvdread
-dvd_PLIST_FILES=	${GST_LIB_DIR}/libgstdvdnav.a \
+gst_dvd_PLIST_FILES=	${GST_LIB_DIR}/libgstdvdnav.a \
 		${GST_LIB_DIR}/libgstdvdnav.la \
 		${GST_LIB_DIR}/libgstdvdnav.so \
 		${GST_LIB_DIR}/libgstdvdread.a \
 		${GST_LIB_DIR}/libgstdvdread.la \
 		${GST_LIB_DIR}/libgstdvdread.so
-dvd_DIST=	ugly
+gst_dvd_DIST=	ugly
 
 
 # esound
-esound_USE_GNOME+=	esound
-esound_GST_PLUGIN_DIR=	ext/esd
-esound_CONFIGURE_ENV+=	ESD_CFLAGS="`pkg-config --cflags esound`" \
+gst_esound_USE_GNOME+=	esound
+gst_esound_GST_PLUGIN_DIR=	ext/esd
+gst_esound_CONFIGURE_ENV+=	ESD_CFLAGS="`pkg-config --cflags esound`" \
 		ESD_LIBS="`pkg-config --libs esound`"
-esound_PLIST_FILES=	${GST_LIB_DIR}/libgstesd.so \
+gst_esound_PLIST_FILES=	${GST_LIB_DIR}/libgstesd.so \
 		${GST_LIB_DIR}/libgstesd.a \
 		${GST_LIB_DIR}/libgstesd.la
 
 # faac
-faac_LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
-faac_DIST=	bad
+gst_faac_LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+gst_faac_DIST=	bad
 
 # faad
-faad_LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
-faad_DIST=	bad
+gst_faad_LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
+gst_faad_DIST=	bad
 
 # flac
-flac_LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+gst_flac_LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 
 # gconf
-gconf_USE_GNOME+=	gconf2
-gconf_GST_PLUGIN_DIR=	ext/gconf \
+gst_gconf_USE_GNOME+=	gconf2
+gst_gconf_GST_PLUGIN_DIR=	ext/gconf \
 		gconf
-gconf_GCONF_SCHEMAS=	gstreamer-${GST_VERSION}.schemas
-gconf_PLIST_FILES=	${GST_LIB_DIR}/libgstgconfelements.so \
+gst_gconf_GCONF_SCHEMAS=	gstreamer-${GST_VERSION}.schemas
+gst_gconf_PLIST_FILES=	${GST_LIB_DIR}/libgstgconfelements.so \
 		${GST_LIB_DIR}/libgstgconfelements.a \
 		${GST_LIB_DIR}/libgstgconfelements.la
 
 # gnomevfs
-gnomevfs_USE_GNOME+=	gnomevfs2
-gnomevfs_CONFIGURE_ARGS+=--enable-gnome_vfs
-gnomevfs_DIST=	base
+gst_gnomevfs_USE_GNOME+=	gnomevfs2
+gst_gnomevfs_CONFIGURE_ARGS+=--enable-gnome_vfs
+gst_gnomevfs_DIST=	base
 
 # gsm
-gsm_LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
-gsm_DIST=	bad
+gst_gsm_LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
+gst_gsm_DIST=	bad
 
 # ivorbis
-ivorbis_LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
-ivorbis_DIST=	bad
+gst_ivorbis_LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+gst_ivorbis_DIST=	bad
 
 # hal
-hal_LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
-hal_PLIST_FILES=	${GST_LIB_DIR}/libgsthalelements.a \
+gst_hal_LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+gst_hal_PLIST_FILES=	${GST_LIB_DIR}/libgsthalelements.a \
 		${GST_LIB_DIR}/libgsthalelements.la \
 		${GST_LIB_DIR}/libgsthalelements.so
 
 # jpeg
-jpeg_LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+gst_jpeg_LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 # ladspa
-ladspa_BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+gst_ladspa_BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
 # lame
-lame_LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-lame_DIST=	ugly
+gst_lame_LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+gst_lame_DIST=	ugly
 
 # libcaca
-libcaca_BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-libcaca_PLIST_FILES=	${GST_LIB_DIR}/libgstcacasink.so \
+gst_libcaca_BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+gst_libcaca_PLIST_FILES=	${GST_LIB_DIR}/libgstcacasink.so \
 		${GST_LIB_DIR}/libgstcacasink.a \
 		${GST_LIB_DIR}/libgstcacasink.la
 
 # libmms
-libmms_LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
-libmms_PLIST_FILES=	${GST_LIB_DIR}/libgstmms.so \
+gst_libmms_LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
+gst_libmms_PLIST_FILES=	${GST_LIB_DIR}/libgstmms.so \
 		${GST_LIB_DIR}/libgstmms.a \
 		${GST_LIB_DIR}/libgstmms.la
-libmms_DIST=	bad
+gst_libmms_DIST=	bad
 
 # libpng and the snapshot plugin
-libpng_LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
-libpng_GST_PLUGIN_DIR=	ext/libpng
-libpng_PLIST_FILES=	${GST_LIB_DIR}/libgstpng.so \
+gst_libpng_LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+gst_libpng_GST_PLUGIN_DIR=	ext/libpng
+gst_libpng_PLIST_FILES=	${GST_LIB_DIR}/libgstpng.so \
 		${GST_LIB_DIR}/libgstpng.a \
 		${GST_LIB_DIR}/libgstpng.la
 
 # libvisual
-libvisual_LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
-libvisual_DIST=	base
+gst_libvisual_LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
+gst_libvisual_DIST=	base
 
 # mad
-mad_LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
+gst_mad_LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
 		id3tag.0:${PORTSDIR}/audio/libid3tag
-mad_DIST=	ugly
+gst_mad_DIST=	ugly
 
 # mpeg2dec
-mpeg2dec_LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
-mpeg2dec_DIST=	ugly
+gst_mpeg2dec_LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+gst_mpeg2dec_DIST=	ugly
 
 # musepack
-musepack_LIB_DEPENDS+=	mpcdec.4:${PORTSDIR}/audio/libmpcdec
-musepack_DIST=	bad
+gst_musepack_LIB_DEPENDS+=	mpcdec.4:${PORTSDIR}/audio/libmpcdec
+gst_musepack_DIST=	bad
 
 # musicbrainz
-musicbrainz_LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-musicbrainz_PLIST_FILES=	${GST_LIB_DIR}/libgsttrm.so \
+gst_musicbrainz_LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
+gst_musicbrainz_PLIST_FILES=	${GST_LIB_DIR}/libgsttrm.so \
 		${GST_LIB_DIR}/libgsttrm.a \
 		${GST_LIB_DIR}/libgsttrm.la
-musicbrainz_DIST=	bad
+gst_musicbrainz_DIST=	bad
 
 # ogg
-ogg_LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
-ogg_EXTRA_LIBS+=	-lgstriff-${VERSION}
-ogg_DIST=	base
+gst_ogg_LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
+gst_ogg_EXTRA_LIBS+=	-lgstriff-${VERSION}
+gst_ogg_DIST=	base
 
 # pango
-pango_USE_GNOME+=	pango
-pango_DIST=	base
+gst_pango_USE_GNOME+=	pango
+gst_pango_DIST=	base
 
 # sdl
-sdl_USE_SDL+=	sdl
-sdl_GST_PLIST_SUFFIX=	videosink
-sdl_DIST=	bad
+gst_sdl_USE_SDL+=	sdl
+gst_sdl_GST_PLIST_SUFFIX=	videosink
+gst_sdl_DIST=	bad
 
 # shout2
-shout2_LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
+gst_shout2_LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
 
 # sidplay
-sidplay_LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
-sidplay_PLIST_FILES=	${GST_LIB_DIR}/libgstsid.so \
+gst_sidplay_LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
+gst_sidplay_PLIST_FILES=	${GST_LIB_DIR}/libgstsid.so \
 		${GST_LIB_DIR}/libgstsid.a \
 		${GST_LIB_DIR}/libgstsid.la
-sidplay_DIST=	ugly
+gst_sidplay_DIST=	ugly
 
 # speex
-speex_LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
+gst_speex_LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
 
 # theora
-theora_LIB_DEPENDS+=	theora.2:${PORTSDIR}/multimedia/libtheora
-theora_DIST=	base
+gst_theora_LIB_DEPENDS+=	theora.2:${PORTSDIR}/multimedia/libtheora
+gst_theora_DIST=	base
 
 # vorbis
-vorbis_USE_GSTREAMER+=	ogg
-vorbis_LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
-vorbis_EXTRA_LIBS+=	-lgsttag-${VERSION} -lgstaudio-${VERSION}
-vorbis_DIST=	base
+gst_vorbis_USE_GSTREAMER+=	ogg
+gst_vorbis_LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+gst_vorbis_EXTRA_LIBS+=	-lgsttag-${VERSION} -lgstaudio-${VERSION}
+gst_vorbis_DIST=	base
 
 # xvid
-xvid_LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
-xvid_DIST=	bad
+gst_xvid_LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
+gst_xvid_DIST=	bad
 
 # wavpack
-wavpack_LIB_DEPENDS+=	wavpack.0:${PORTSDIR}/audio/wavpack
-wavpack_DIST=	bad
+gst_wavpack_LIB_DEPENDS+=	wavpack.0:${PORTSDIR}/audio/wavpack
+gst_wavpack_DIST=	bad
 
 .endif # NO_GSTREAMER_COMMON
 
-${GST_PLUGIN}_DIST?=	good
-DIST=	${${GST_PLUGIN}_DIST}
+gst_${GST_PLUGIN}_DIST?=	good
+DIST=	${gst_${GST_PLUGIN}_DIST}
 
 .if !defined(NO_GSTREAMER_COMMON)
-${GST_PLUGIN}_BUILD_DEPENDS?=
-${GST_PLUGIN}_LIB_DEPENDS?=
-${GST_PLUGIN}_RUN_DEPENDS?=
-${GST_PLUGIN}_PLIST_FILES?=${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \
+gst_${GST_PLUGIN}_BUILD_DEPENDS?=
+gst_${GST_PLUGIN}_LIB_DEPENDS?=
+gst_${GST_PLUGIN}_RUN_DEPENDS?=
+gst_${GST_PLUGIN}_PLIST_FILES?=${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \
 			${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \
 			${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la
-${GST_PLUGIN}_EXTRA_LIBS?=
-${GST_PLUGIN}_PREBUILD_DIR?=
-${GST_PLUGIN}_GST_PLUGIN_DIR?=	ext/${GST_PLUGIN}
-${GST_PLUGIN}_POSTBUILD_DIR?=
-${GST_PLUGIN}_USE_GNOME?=
-${GST_PLUGIN}_CONFIGURE_ENV?=
-${GST_PLUGIN}_GCONF_SCHEMAS?=
-${GST_PLUGIN}_CONFIGURE_ARGS?=
-${GST_PLUGIN}_USE_SDL?=
-${GST_PLUGIN}_USE_GSTREAMER?=
-
-BUILD_DEPENDS+=	${${GST_PLUGIN}_BUILD_DEPENDS}
-LIB_DEPENDS+=	${${GST_PLUGIN}_LIB_DEPENDS}
-RUN_DEPENDS+=	${${GST_PLUGIN}_RUN_DEPENDS}
-PLIST_FILES=	${${GST_PLUGIN}_PLIST_FILES}
-EXTRA_LIBS+=	${${GST_PLUGIN}_EXTRA_LIBS}
-USE_GNOME+=	${${GST_PLUGIN}_USE_GNOME}
-CONFIGURE_ENV+=	${${GST_PLUGIN}_CONFIGURE_ENV}
-GCONF_SCHEMAS=	${${GST_PLUGIN}_GCONF_SCHEMAS}
-CONFIGURE_ARGS+=${${GST_PLUGIN}_CONFIGURE_ARGS}
-USE_SDL=	${${GST_PLUGIN}_USE_SDL}
-USE_GSTREAMER+=	${${GST_PLUGIN}_USE_GSTREAMER}
-GST_PREBUILD_DIR=${${GST_PLUGIN}_GST_PREBUILD_DIR}
-GST_PLUGIN_DIR=	${${GST_PLUGIN}_GST_PLUGIN_DIR}
-GST_POSTBUILD_DIR=${${GST_PLUGIN}_GST_POSTBUILD_DIR}
+gst_${GST_PLUGIN}_EXTRA_LIBS?=
+gst_${GST_PLUGIN}_PREBUILD_DIR?=
+gst_${GST_PLUGIN}_GST_PLUGIN_DIR?=	ext/${GST_PLUGIN}
+gst_${GST_PLUGIN}_POSTBUILD_DIR?=
+gst_${GST_PLUGIN}_USE_GNOME?=
+gst_${GST_PLUGIN}_CONFIGURE_ENV?=
+gst_${GST_PLUGIN}_GCONF_SCHEMAS?=
+gst_${GST_PLUGIN}_CONFIGURE_ARGS?=
+gst_${GST_PLUGIN}_USE_SDL?=
+gst_${GST_PLUGIN}_USE_GSTREAMER?=
+
+BUILD_DEPENDS+=	${gst_${GST_PLUGIN}_BUILD_DEPENDS}
+LIB_DEPENDS+=	${gst_${GST_PLUGIN}_LIB_DEPENDS}
+RUN_DEPENDS+=	${gst_${GST_PLUGIN}_RUN_DEPENDS}
+PLIST_FILES=	${gst_${GST_PLUGIN}_PLIST_FILES}
+EXTRA_LIBS+=	${gst_${GST_PLUGIN}_EXTRA_LIBS}
+USE_GNOME+=	${gst_${GST_PLUGIN}_USE_GNOME}
+CONFIGURE_ENV+=	${gst_${GST_PLUGIN}_CONFIGURE_ENV}
+GCONF_SCHEMAS=	${gst_${GST_PLUGIN}_GCONF_SCHEMAS}
+CONFIGURE_ARGS+=${gst_${GST_PLUGIN}_CONFIGURE_ARGS}
+USE_SDL=	${gst_${GST_PLUGIN}_USE_SDL}
+USE_GSTREAMER+=	${gst_${GST_PLUGIN}_USE_GSTREAMER}
+GST_PREBUILD_DIR=${gst_${GST_PLUGIN}_GST_PREBUILD_DIR}
+GST_PLUGIN_DIR=	${gst_${GST_PLUGIN}_GST_PLUGIN_DIR}
+GST_POSTBUILD_DIR=${gst_${GST_PLUGIN}_GST_POSTBUILD_DIR}
 
 .if !target(do-build)
 do-build: