- Fix versions on some gst plugins

Reported by:	sajd


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

2 files changed, 30 insertions, 30 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index bcf73f41b..4e419741b 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD: ports/multimedia/gstreamer-plugins/Makefile,v 1.102 2006/06/09 20:24:02 ahze Exp $
-#   $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.86 2006/06/09 18:13:48 ahze Exp $
+#   $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.88 2006/06/22 05:20:50 ahze Exp $
 #
 
 PORTNAME=	gstreamer
@@ -67,7 +67,7 @@ IGNORE=	many plugins don't build or even work on 4.x
 .endif
 
 .if ${GST_PLUGIN} == "base"
-DIST=	base
+base_DIST=	base
 NO_GSTREAMER_COMMON=	yes
 INSTALLS_SHLIB=	yes
 MAN1=		gst-visualise-0.10.1
@@ -79,6 +79,31 @@ USE_GSTREAMER=	yes
 
 .include "${MASTERDIR}/Makefile.common"
 
+.if ${DIST}=="base"
+EXTRACT_ONLY=${BASE_DISTFILE}
+WRKSRC=${WRKDIR}/${BASE_DISTNAME}
+PORTVERSION=	${BASE_PORTVERSION}
+DISTFILES+=	${BASE_DISTFILE}:base
+.elif ${DIST}=="bad"
+EXTRACT_ONLY=${BAD_DISTFILE}
+WRKSRC=${WRKDIR}/${BAD_DISTNAME}
+PORTVERSION=	${BAD_PORTVERSION}
+DISTFILES+=	${BAD_DISTFILE}:bad
+.elif ${DIST}=="ugly"
+EXTRACT_ONLY=${UGLY_DISTFILE}
+WRKSRC=${WRKDIR}/${UGLY_DISTNAME}
+PORTVERSION=	${UGLY_PORTVERSION}
+DISTFILES+=	${UGLY_DISTFILE}:ugly
+.elif ${DIST}=="makesum"
+DISTFILES+=	${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \
+		${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good
+.else
+EXTRACT_ONLY=${GOOD_DISTFILE}
+WRKSRC=${WRKDIR}/${GOOD_DISTNAME}
+PORTVERSION=	${GOOD_PORTVERSION}
+DISTFILES+=	${GOOD_DISTFILE}:good
+.endif
+
 # cdrom default device
 .ifdef(WITH_CDROM_DEVICE)
 DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index ab979748c..2a2c2b705 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.47 2006/06/08 20:53:40 ahze Exp $
+#    $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.49 2006/06/22 05:20:51 ahze Exp $
 # base
 BASE_GST_ALL_PLUGINS= \
 		alsa \
@@ -299,37 +299,13 @@ wavpack_DIST=	bad
 
 .endif # NO_GSTREAMER_COMMON
 
-.if ${DIST}=="base"
-EXTRACT_ONLY=${BASE_DISTFILE}
-WRKSRC=${WRKDIR}/${BASE_DISTNAME}
-PORTVERSION=	${BASE_PORTVERSION}
-DISTFILES+=	${BASE_DISTFILE}:base
-.elif ${DIST}=="bad"
-EXTRACT_ONLY=${BAD_DISTFILE}
-WRKSRC=${WRKDIR}/${BAD_DISTNAME}
-PORTVERSION=	${BAD_PORTVERSION}
-DISTFILES+=	${BAD_DISTFILE}:bad
-.elif ${DIST}=="ugly"
-EXTRACT_ONLY=${UGLY_DISTFILE}
-WRKSRC=${WRKDIR}/${UGLY_DISTNAME}
-PORTVERSION=	${UGLY_PORTVERSION}
-DISTFILES+=	${UGLY_DISTFILE}:ugly
-.elif ${DIST}=="makesum"
-DISTFILES+=	${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \
-		${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good
-.else
-EXTRACT_ONLY=${GOOD_DISTFILE}
-WRKSRC=${WRKDIR}/${GOOD_DISTNAME}
-PORTVERSION=	${GOOD_PORTVERSION}
-DISTFILES+=	${GOOD_DISTFILE}:good
-.endif
+${GST_PLUGIN}_DIST?=	good
+DIST=	${${GST_PLUGIN}_DIST}
 
 .if !defined(NO_GSTREAMER_COMMON)
-
 ${GST_PLUGIN}_BUILD_DEPENDS?=
 ${GST_PLUGIN}_LIB_DEPENDS?=
 ${GST_PLUGIN}_RUN_DEPENDS?=
-${GST_PLUGIN}_DIST?=	good
 ${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
@@ -345,7 +321,6 @@ ${GST_PLUGIN}_USE_GSTREAMER?=
 BUILD_DEPENDS+=	${${GST_PLUGIN}_BUILD_DEPENDS}
 LIB_DEPENDS+=	${${GST_PLUGIN}_LIB_DEPENDS}
 RUN_DEPENDS+=	${${GST_PLUGIN}_RUN_DEPENDS}
-DIST=	${${GST_PLUGIN}_DIST}
 PLIST_FILES=	${${GST_PLUGIN}_PLIST_FILES}
 EXTRA_LIBS+=	${${GST_PLUGIN}_EXTRA_LIBS}
 USE_GNOME+=	${${GST_PLUGIN}_USE_GNOME}