6 files changed, 49 insertions, 51 deletions

diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
index e97bfb21f917..c264d0fc144a 100644
--- a/multimedia/gstreamer-plugins-bad/Makefile
+++ b/multimedia/gstreamer-plugins-bad/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.2 2006/02/26 19:23:20 marcus Exp $
+#    $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.4 2006/06/08 01:14:30 ahze Exp $
 #
 
 PORTREVISION=	0
@@ -19,9 +19,7 @@ MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
 RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
 
-EXTRACT_ONLY=	${BAD_DISTFILE}
-WRKSRC=	${WRKDIR}/${BAD_DISTNAME}
-
+DIST=	bad
 BAD_GST_DIRS=	gst sys
 PLIST_SUB=	VERSION="${GST_VERSION}"
 NO_GSTREAMER_COMMON=	yes
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
index 1adc16ef8e9b..83df947d7d8a 100644
--- a/multimedia/gstreamer-plugins-good/Makefile
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.5 2006/04/02 07:33:41 marcus Exp $
+#    $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.7 2006/06/08 01:14:31 ahze Exp $
 #
 
 PORTREVISION=	4
@@ -19,15 +19,14 @@ MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
 RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
 
-EXTRACT_ONLY=	${GOOD_DISTFILE}
-WRKSRC=	${WRKDIR}/${GOOD_DISTNAME}
-
+DIST=	good
 GOOD_GST_DIRS=	gst sys
 PLIST_SUB=	VERSION="${GST_VERSION}"
-NO_GSTREAMER_COMMON=	yes
+
 PLIST=	${.CURDIR}/pkg-plist
 FILESDIR=${.CURDIR}/files
 PATCHDIR=${.CURDIR}/files
+NO_GSTREAMER_COMMON=	yes
 
 do-build:
 .for dir in ${GOOD_GST_DIRS}
diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile
index f165480d1ffd..0d36fc97881e 100644
--- a/multimedia/gstreamer-plugins-ugly/Makefile
+++ b/multimedia/gstreamer-plugins-ugly/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.3 2006/04/16 08:42:06 marcus Exp $
+#    $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.5 2006/06/08 01:14:31 ahze Exp $
 #
 
 PORTREVISION=	2
@@ -19,9 +19,7 @@ MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
 RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
 
-EXTRACT_ONLY=	${UGLY_DISTFILE}
-WRKSRC=	${WRKDIR}/${UGLY_DISTNAME}
-
+DIST=	ugly
 UGLY_GST_DIRS=	gst
 PLIST_SUB=	VERSION="${GST_VERSION}"
 NO_GSTREAMER_COMMON=	yes
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 2b50b11d3feb..fdd1ac65ec5b 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -3,12 +3,13 @@
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.80 2006/04/28 12:00:14 ahze Exp $
+#   $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.86 2006/06/09 18:13:48 ahze Exp $
 #
 
 PORTNAME=	gstreamer
-PORTVERSION?=	0.10.7
-## SET BACK TO PORTREVISION?= when we reset PORTREVISION in all the gst plugin ports
+PORTVERSION?=	${BASE_PORTVERSION}
+PORTREVISION?=	0
+PORTEPOCH=	1
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
 		http://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \
@@ -17,17 +18,8 @@ MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
 		${MASTER_SITE_LOCAL:S|$|ahze/:base|} \
 		${MASTER_SITE_LOCAL:S|$|ahze/:good|} \
 		${MASTER_SITE_LOCAL:S|$|ahze/:bad|} \
-		${MASTER_SITE_LOCAL:S|$|ahze/:ugly|} \
-		http://people.freebsd.org/~ahze/distfiles/:good \
-		http://people.freebsd.org/~ahze/distfiles/:bad \
-		http://people.freebsd.org/~ahze/distfiles/:ugly \
-		http://people.freebsd.org/~ahze/distfiles/:base
+		${MASTER_SITE_LOCAL:S|$|ahze/:ugly|}
 PKGNAMESUFFIX=	-plugins${GST_PLUGIN_SUFFIX}
-DISTFILES=	${BASE_DISTFILE}:base \
-		${BAD_DISTFILE}:bad \
-		${GOOD_DISTFILE}:good \
-		${UGLY_DISTFILE}:ugly
-DIST_SUBDIR=	gnome2
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	GStreamer written collection of plugins handling several media types
@@ -36,7 +28,7 @@ LIB_DEPENDS+=	gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt \
 		oil-0.3.1:${PORTSDIR}/devel/liboil
 
-BASE_PORTVERSION=	${PORTVERSION}
+BASE_PORTVERSION=	0.10.8
 BASE_DISTNAME=		gst-plugins-base-${BASE_PORTVERSION}
 BASE_DISTFILE=		${BASE_DISTNAME}${EXTRACT_SUFX}
 BAD_PORTVERSION=	0.10.3
@@ -48,6 +40,7 @@ GOOD_DISTFILE=		${GOOD_DISTNAME}${EXTRACT_SUFX}
 UGLY_PORTVERSION=	0.10.3
 UGLY_DISTNAME=		gst-plugins-ugly-${UGLY_PORTVERSION}
 UGLY_DISTFILE=		${UGLY_DISTNAME}${EXTRACT_SUFX}
+DIST?=		good
 
 SHLIB_VERSION=	1
 USE_GETTEXT=	yes
@@ -56,7 +49,7 @@ WANT_GSTREAMER=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME+=	gnomehack gnomeprefix gnometarget pkgconfig ltverhack
+USE_GNOME+=	gnomehack gnometarget pkgconfig ltverhack
 USE_AUTOTOOLS=	libtool:15
 GST_PLUGIN?=	base
 
@@ -68,21 +61,24 @@ DEFAULT_AUDIOSINK?=	osssink
 DEFAULT_AUDIOSRC?=	osssrc
 
 .include <bsd.port.pre.mk>
-.include "${MASTERDIR}/Makefile.common"
 
 .if ${OSVERSION} < 500000
 IGNORE=	many plugins don't build or even work on 4.x
 .endif
 
 .if ${GST_PLUGIN} == "base"
+DIST=	base
+NO_GSTREAMER_COMMON=	yes
 INSTALLS_SHLIB=	yes
 MAN1=		gst-visualise-0.10.1
-WRKSRC=${WRKDIR}/${BASE_DISTNAME}
-EXTRACT_ONLY=${BASE_DISTFILE}
 PLIST_SUB+=	VERSION="${VERSION}" \
 		SHLIB_VERSION="${SHLIB_VERSION}"
+.else
+USE_GSTREAMER=	yes
 .endif
 
+.include "${MASTERDIR}/Makefile.common"
+
 # 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 8c01dfee3ff6..d1a447ee245c 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#    $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.40 2006/04/23 21:40:21 marcus Exp $
+#    $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.47 2006/06/08 20:53:40 ahze Exp $
 # base
 BASE_GST_ALL_PLUGINS= \
 		alsa \
@@ -106,7 +106,7 @@ CONFIGURE_ARGS+=--disable-spc
 PLIST_SUB+=	SPC="@comment "
 #.endif
 
-.if ${GST_PLUGIN}!="base" && !defined(NO_GSTREAMER_COMMON)
+.if !defined(NO_GSTREAMER_COMMON)
 GST_PLUGIN_SUFFIX?=	-${GST_PLUGIN}
 
 COMMENT=	Gstreamer ${GST_PLUGIN} plugin
@@ -128,9 +128,6 @@ 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
 
-# hack around WRKSRC stuff near the top... fix me
-DIST?=	good
-
 # a52dec
 .if ${GST_PLUGIN}=="a52dec"
 LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
@@ -393,24 +390,34 @@ DIST=	bad
 LIB_DEPENDS+=	wavpack.0:${PORTSDIR}/audio/wavpack
 DIST=	bad
 .endif
+.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
 
-BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-
+.if !defined(NO_GSTREAMER_COMMON)
 .if !target(do-build)
 do-build:
 .for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR}
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 1a3636281772..4ec3815f3b2c 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,12 +1,12 @@
-MD5 (gnome2/gst-plugins-base-0.10.7.tar.bz2) = 21ec9c7ac4b02de019a6d8e8c2aaa2a3
-SHA256 (gnome2/gst-plugins-base-0.10.7.tar.bz2) = 7be5984162333dae48d8f7e58e6c7f4b43726c78e2ca13aca6618b1342af8d37
-SIZE (gnome2/gst-plugins-base-0.10.7.tar.bz2) = 1166071
-MD5 (gnome2/gst-plugins-bad-0.10.3.tar.bz2) = 8545a02c408976c5e9f0c2cf3c6a362e
-SHA256 (gnome2/gst-plugins-bad-0.10.3.tar.bz2) = 648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
-SIZE (gnome2/gst-plugins-bad-0.10.3.tar.bz2) = 953949
-MD5 (gnome2/gst-plugins-good-0.10.3.tar.bz2) = a58bb825bd4b22412764f2a8d2f98b1c
-SHA256 (gnome2/gst-plugins-good-0.10.3.tar.bz2) = 8c09374656aca4b8ffbe109a24dcdb98c5d519c4b05bf9eeeb3a34f16b26eaf5
-SIZE (gnome2/gst-plugins-good-0.10.3.tar.bz2) = 1165391
-MD5 (gnome2/gst-plugins-ugly-0.10.3.tar.bz2) = af6f238507b0040bf84fcbc6a241e559
-SHA256 (gnome2/gst-plugins-ugly-0.10.3.tar.bz2) = 0cd916b3f0c8867cea77243d20d8d56ed45b7ef5ec5c5dd1603860ece8e88a10
-SIZE (gnome2/gst-plugins-ugly-0.10.3.tar.bz2) = 605833
+MD5 (gst-plugins-base-0.10.8.tar.bz2) = 7c7acfdc7d2f7fddf12132b4b86abddb
+SHA256 (gst-plugins-base-0.10.8.tar.bz2) = 4e7c14f82b23f268ac053ad21a23cc637052eca72b8ea23d02c2e7a90521d74a
+SIZE (gst-plugins-base-0.10.8.tar.bz2) = 1234234
+MD5 (gst-plugins-bad-0.10.3.tar.bz2) = 8545a02c408976c5e9f0c2cf3c6a362e
+SHA256 (gst-plugins-bad-0.10.3.tar.bz2) = 648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
+SIZE (gst-plugins-bad-0.10.3.tar.bz2) = 953949
+MD5 (gst-plugins-ugly-0.10.3.tar.bz2) = af6f238507b0040bf84fcbc6a241e559
+SHA256 (gst-plugins-ugly-0.10.3.tar.bz2) = 0cd916b3f0c8867cea77243d20d8d56ed45b7ef5ec5c5dd1603860ece8e88a10
+SIZE (gst-plugins-ugly-0.10.3.tar.bz2) = 605833
+MD5 (gst-plugins-good-0.10.3.tar.bz2) = a58bb825bd4b22412764f2a8d2f98b1c
+SHA256 (gst-plugins-good-0.10.3.tar.bz2) = 8c09374656aca4b8ffbe109a24dcdb98c5d519c4b05bf9eeeb3a34f16b26eaf5
+SIZE (gst-plugins-good-0.10.3.tar.bz2) = 1165391