Update to 0.6.0.

Submitted by:	lioux


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

5 files changed, 108 insertions, 136 deletions

diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index f569949d0..d6a3230b3 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,6 +34,9 @@ CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_TARGET=
+PLIST_SUB=	\
+		VERSION="${PORTVERSION:C/..$//}" \
+		SHLIB_VERSION="${SHLIB_VERSION}"
 INSTALLS_SHLIB=	yes
 
 MAN1=	gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
@@ -43,32 +45,17 @@ MAN1=	gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
 
 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 
+# library minor number
+SHLIB_VERSION=	0
+
+post-install:
+# register plugins
+	@${PREFIX}/bin/gst-register 2>/dev/null
+
 .include <bsd.port.pre.mk>
 
 .if exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)
 LIB_DEPENDS+=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 .endif
 
-post-patch:
-# use proper dir
-# remove version number from include dir name
-	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -E \
-		's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|'
-# remove version number from include dir name AND
-# help dependent ports find popt.h
-	@${REINPLACE_CMD} -E -e \
-		's|-@VERSION@||; \
-		s|(-I\$${includedir})|\1 -I${LOCALBASE}/include|' \
-		${WRKSRC}/gstreamer.pc.in
-
-post-configure:
-# remove version number postfix from library names
-	@${REINPLACE_CMD} -E -e 's|-release ${PORTVERSION}||' \
-		${WRKSRC}/gst/Makefile ${WRKSRC}/libs/gst/control/Makefile
-
-post-install:
-# register plugins
-	@${PREFIX}/bin/gst-register 2>/dev/null
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index 9740078f1..e747bb091 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1 +1 @@
-MD5 (gstreamer-0.5.2.tar.bz2) = 29e0a16a4bbb2f96d8bd493bc90a0fc8
+MD5 (gstreamer-0.6.0.tar.bz2) = 3d0dec37678b33bbcb23cb2e20a83fe4
diff --git a/multimedia/gstreamer/files/patch-gst::cothreads.c b/multimedia/gstreamer/files/patch-gst::cothreads.c
index 124e37d54..3519fb0e7 100644
--- a/multimedia/gstreamer/files/patch-gst::cothreads.c
+++ b/multimedia/gstreamer/files/patch-gst::cothreads.c
@@ -1,8 +1,8 @@
---- gst/cothreads.c.orig	Tue Dec 31 23:28:32 2002
-+++ gst/cothreads.c	Mon Jan 13 19:31:54 2003
-@@ -37,16 +37,20 @@
- #include "gstlog.h"
- #include "gstutils.h"
+--- gst/cothreads.c.orig	Sat Feb  1 19:09:00 2003
++++ gst/cothreads.c	Mon Feb  3 10:57:44 2003
+@@ -41,12 +41,16 @@
+ #include <ucontext.h>
+ #endif
  
 +#ifdef HAVE_MAKECONTEXT
 +#include <ucontext.h>
@@ -18,8 +18,3 @@
  
  #define COTHREAD_MAGIC_NUMBER 0xabcdef
  
--#define COTHREAD_MAXTHREADS 16
-+#define COTHREAD_MAXTHREADS 16
- #define COTHREAD_STACKSIZE (STACK_SIZE/COTHREAD_MAXTHREADS)
- 
- static void 	cothread_destroy 	(cothread_state *cothread);
diff --git a/multimedia/gstreamer/files/patch-gst_gstthreaddummy.c b/multimedia/gstreamer/files/patch-gst_gstthreaddummy.c
deleted file mode 100644
index 36343fdba..000000000
--- a/multimedia/gstreamer/files/patch-gst_gstthreaddummy.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gst/gstthreaddummy.c.orig	Sat Jan 25 18:06:11 2003
-+++ gst/gstthreaddummy.c	Sat Jan 25 18:06:36 2003
-@@ -17,7 +17,9 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include <sys/types.h>
- #include <sys/time.h>
-+#include <unistd.h>
- #include <glib.h>
- #include "gstlog.h"
- 
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index ed855d086..b42f950ed 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %D/bin/gst-register 2>/dev/null
+@unexec %D/bin/gst-register 2>/dev/null || true
 bin/gst-complete
 bin/gst-compprep
 bin/gst-feedback
@@ -7,92 +7,94 @@ bin/gst-launch
 bin/gst-md5sum
 bin/gst-register
 bin/gst-xmllaunch
-include/gstreamer-0.5/gst/bytestream/bytestream.h
-include/gstreamer-0.5/gst/control/control.h
-include/gstreamer-0.5/gst/control/dparam.h
-include/gstreamer-0.5/gst/control/dparam_smooth.h
-include/gstreamer-0.5/gst/control/dparamcommon.h
-include/gstreamer-0.5/gst/control/dparammanager.h
-include/gstreamer-0.5/gst/control/dplinearinterp.h
-include/gstreamer-0.5/gst/control/unitconvert.h
-include/gstreamer-0.5/gst/getbits/getbits.h
-include/gstreamer-0.5/gst/gst.h
-include/gstreamer-0.5/gst/gstatomic.h
-include/gstreamer-0.5/gst/gstautoplug.h
-include/gstreamer-0.5/gst/gstbin.h
-include/gstreamer-0.5/gst/gstbuffer.h
-include/gstreamer-0.5/gst/gstbufferpool-default.h
-include/gstreamer-0.5/gst/gstcaps.h
-include/gstreamer-0.5/gst/gstclock.h
-include/gstreamer-0.5/gst/gstcompat.h
-include/gstreamer-0.5/gst/gstconfig.h
-include/gstreamer-0.5/gst/gstcpu.h
-include/gstreamer-0.5/gst/gstdata.h
-include/gstreamer-0.5/gst/gstelement.h
-include/gstreamer-0.5/gst/gstenumtypes.h
-include/gstreamer-0.5/gst/gstevent.h
-include/gstreamer-0.5/gst/gstextratypes.h
-include/gstreamer-0.5/gst/gstformat.h
-include/gstreamer-0.5/gst/gstindex.h
-include/gstreamer-0.5/gst/gstinfo.h
-include/gstreamer-0.5/gst/gstlog.h
-include/gstreamer-0.5/gst/gstmacros.h
-include/gstreamer-0.5/gst/gstmarshal.h
-include/gstreamer-0.5/gst/gstmemchunk.h
-include/gstreamer-0.5/gst/gstobject.h
-include/gstreamer-0.5/gst/gstpad.h
-include/gstreamer-0.5/gst/gstparse.h
-include/gstreamer-0.5/gst/gstpipeline.h
-include/gstreamer-0.5/gst/gstplugin.h
-include/gstreamer-0.5/gst/gstpluginfeature.h
-include/gstreamer-0.5/gst/gstprobe.h
-include/gstreamer-0.5/gst/gstprops.h
-include/gstreamer-0.5/gst/gstquery.h
-include/gstreamer-0.5/gst/gstqueue.h
-include/gstreamer-0.5/gst/gstregistry.h
-include/gstreamer-0.5/gst/gstscheduler.h
-include/gstreamer-0.5/gst/gstsystemclock.h
-include/gstreamer-0.5/gst/gstthread.h
-include/gstreamer-0.5/gst/gsttrace.h
-include/gstreamer-0.5/gst/gsttrashstack.h
-include/gstreamer-0.5/gst/gsttype.h
-include/gstreamer-0.5/gst/gsttypefind.h
-include/gstreamer-0.5/gst/gsttypes.h
-include/gstreamer-0.5/gst/gsturi.h
-include/gstreamer-0.5/gst/gstutils.h
-include/gstreamer-0.5/gst/gstversion.h
-include/gstreamer-0.5/gst/gstxml.h
-include/gstreamer-0.5/gst/putbits/putbits.h
-lib/gstreamer-0.5/libgstautoplugcache.so
-lib/gstreamer-0.5/libgstautoplugger.so
-lib/gstreamer-0.5/libgstbasicomegascheduler.so
-lib/gstreamer-0.5/libgstbasicwingoscheduler.so
-lib/gstreamer-0.5/libgstbytestream.so
-lib/gstreamer-0.5/libgstelements.so
-lib/gstreamer-0.5/libgstgetbits.so
-lib/gstreamer-0.5/libgstindexers.so
-lib/gstreamer-0.5/libgstoptomegascheduler.so
-lib/gstreamer-0.5/libgstoptscheduler.so
-lib/gstreamer-0.5/libgstoptwingoscheduler.so
-lib/gstreamer-0.5/libgstputbits.so
-lib/gstreamer-0.5/libgstspider.so
-lib/gstreamer-0.5/libgststaticautoplug.so
-lib/gstreamer-0.5/libgststaticautoplugrender.so
-lib/gstreamer-0.5/libgsttypes.so
-lib/libgstcontrol-0.5.a
-lib/libgstcontrol-0.5.so
-lib/libgstcontrol-0.5.so.3
-lib/libgstreamer-0.5.a
-lib/libgstreamer-0.5.so
-lib/libgstreamer-0.5.so.3
-libdata/pkgconfig/gstreamer-0.5.pc
-@exec %D/bin/gst-register 2>/dev/null
-@unexec rm %D/share/gnome/cache/gstreamer-0.5/registry.xml 2>/dev/null || true
-@unexec rmdir %D/share/gnome/cache/gstreamer-0.5 2>/dev/null || echo "There are some configuration files left in ${PKG_PREFIX}/etc/gstreamer, do not forget to remove them if you are permanently removing gstreamer port."
+include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h
+include/gstreamer-%%VERSION%%/gst/control/control.h
+include/gstreamer-%%VERSION%%/gst/control/dparam.h
+include/gstreamer-%%VERSION%%/gst/control/dparam_smooth.h
+include/gstreamer-%%VERSION%%/gst/control/dparamcommon.h
+include/gstreamer-%%VERSION%%/gst/control/dparammanager.h
+include/gstreamer-%%VERSION%%/gst/control/dplinearinterp.h
+include/gstreamer-%%VERSION%%/gst/control/unitconvert.h
+include/gstreamer-%%VERSION%%/gst/getbits/getbits.h
+include/gstreamer-%%VERSION%%/gst/gst.h
+include/gstreamer-%%VERSION%%/gst/gstatomic.h
+include/gstreamer-%%VERSION%%/gst/gstautoplug.h
+include/gstreamer-%%VERSION%%/gst/gstbin.h
+include/gstreamer-%%VERSION%%/gst/gstbuffer.h
+include/gstreamer-%%VERSION%%/gst/gstbufferpool-default.h
+include/gstreamer-%%VERSION%%/gst/gstcaps.h
+include/gstreamer-%%VERSION%%/gst/gstclock.h
+include/gstreamer-%%VERSION%%/gst/gstcompat.h
+include/gstreamer-%%VERSION%%/gst/gstconfig.h
+include/gstreamer-%%VERSION%%/gst/gstcpu.h
+include/gstreamer-%%VERSION%%/gst/gstdata.h
+include/gstreamer-%%VERSION%%/gst/gstelement.h
+include/gstreamer-%%VERSION%%/gst/gstenumtypes.h
+include/gstreamer-%%VERSION%%/gst/gstevent.h
+include/gstreamer-%%VERSION%%/gst/gstextratypes.h
+include/gstreamer-%%VERSION%%/gst/gstformat.h
+include/gstreamer-%%VERSION%%/gst/gstindex.h
+include/gstreamer-%%VERSION%%/gst/gstinfo.h
+include/gstreamer-%%VERSION%%/gst/gstlog.h
+include/gstreamer-%%VERSION%%/gst/gstmacros.h
+include/gstreamer-%%VERSION%%/gst/gstmarshal.h
+include/gstreamer-%%VERSION%%/gst/gstmemchunk.h
+include/gstreamer-%%VERSION%%/gst/gstobject.h
+include/gstreamer-%%VERSION%%/gst/gstpad.h
+include/gstreamer-%%VERSION%%/gst/gstparse.h
+include/gstreamer-%%VERSION%%/gst/gstpipeline.h
+include/gstreamer-%%VERSION%%/gst/gstplugin.h
+include/gstreamer-%%VERSION%%/gst/gstpluginfeature.h
+include/gstreamer-%%VERSION%%/gst/gstprobe.h
+include/gstreamer-%%VERSION%%/gst/gstprops.h
+include/gstreamer-%%VERSION%%/gst/gstquery.h
+include/gstreamer-%%VERSION%%/gst/gstqueue.h
+include/gstreamer-%%VERSION%%/gst/gstregistry.h
+include/gstreamer-%%VERSION%%/gst/gstscheduler.h
+include/gstreamer-%%VERSION%%/gst/gstsystemclock.h
+include/gstreamer-%%VERSION%%/gst/gstthread.h
+include/gstreamer-%%VERSION%%/gst/gsttrace.h
+include/gstreamer-%%VERSION%%/gst/gsttrashstack.h
+include/gstreamer-%%VERSION%%/gst/gsttype.h
+include/gstreamer-%%VERSION%%/gst/gsttypefind.h
+include/gstreamer-%%VERSION%%/gst/gsttypes.h
+include/gstreamer-%%VERSION%%/gst/gsturi.h
+include/gstreamer-%%VERSION%%/gst/gstutils.h
+include/gstreamer-%%VERSION%%/gst/gstversion.h
+include/gstreamer-%%VERSION%%/gst/gstxml.h
+include/gstreamer-%%VERSION%%/gst/putbits/putbits.h
+lib/gstreamer-%%VERSION%%/libgstautoplugcache.so
+lib/gstreamer-%%VERSION%%/libgstautoplugger.so
+lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstbasicwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstbytestream.so
+lib/gstreamer-%%VERSION%%/libgstelements.so
+lib/gstreamer-%%VERSION%%/libgstgetbits.so
+lib/gstreamer-%%VERSION%%/libgstindexers.so
+lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptscheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstputbits.so
+lib/gstreamer-%%VERSION%%/libgstspider.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplug.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplugrender.so
+lib/gstreamer-%%VERSION%%/libgsttypes.so
+lib/libgstcontrol-%%VERSION%%.a
+lib/libgstcontrol-%%VERSION%%.so
+lib/libgstcontrol-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstreamer-%%VERSION%%.a
+lib/libgstreamer-%%VERSION%%.so
+lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/gstreamer-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
+@unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrm share/gnome/cache/gstreamer-%%VERSION%%
 @unexec rmdir %D/share/gnome/cache 2>/dev/null || true
-@dirrm include/gstreamer-0.5/gst/putbits
-@dirrm include/gstreamer-0.5/gst/getbits
-@dirrm include/gstreamer-0.5/gst/control
-@dirrm include/gstreamer-0.5/gst/bytestream
-@dirrm include/gstreamer-0.5/gst
-@dirrm include/gstreamer-0.5
+@dirrm lib/gstreamer-%%VERSION%%
+@dirrm include/gstreamer-%%VERSION%%/gst/putbits
+@dirrm include/gstreamer-%%VERSION%%/gst/getbits
+@dirrm include/gstreamer-%%VERSION%%/gst/control
+@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
+@dirrm include/gstreamer-%%VERSION%%/gst
+@dirrm include/gstreamer-%%VERSION%%
+@exec %D/bin/gst-register 2>/dev/null || true