4 files changed, 61 insertions, 16 deletions

diff --git a/multimedia/gstreamer-editor/Makefile b/multimedia/gstreamer-editor/Makefile
index 49d06d55476f..5e22dcf33b65 100644
--- a/multimedia/gstreamer-editor/Makefile
+++ b/multimedia/gstreamer-editor/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTVERSION=	0.7.0
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-editor/
 PKGNAMESUFFIX=	-editor
 DISTNAME=	gst-editor-${PORTVERSION}
 
@@ -20,8 +18,9 @@ COMMENT=	Provide View and Controller counterparts to GStreamer's Model
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	gstreamer-0.8.1:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt
-RUN_DEPENDS=	gst-visualise:${PORTSDIR}/multimedia/gstreamer-plugins
+RUN_DEPENDS=	gst-visualise-0.8:${PORTSDIR}/multimedia/gstreamer-plugins
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack \
 		gnomehier \
@@ -29,9 +28,7 @@ USE_GNOME=	gnomehack \
 		gconf2 \
 		libglade2 \
 		libgnomeui
-USE_LIBTOOL_VER=13
-USE_SIZE=	yes
-CONFIGURE_ARGS=	--program-transform-name=''
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG}
 PLIST_SUB=	\
 	VERSION="${PORTVERSION}"
@@ -41,6 +38,4 @@ MAN1=		gst-editor.1 gst-inspect-gui.1 gst-launch-gui.1
 
 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 
-BROKEN=	"Needs update for gstreamer-0.8"
-
 .include <bsd.port.mk>
diff --git a/multimedia/gstreamer-editor/distinfo b/multimedia/gstreamer-editor/distinfo
index 7bfaa821de10..bc90c5ff0c1c 100644
--- a/multimedia/gstreamer-editor/distinfo
+++ b/multimedia/gstreamer-editor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gst-editor-0.5.0.tar.gz) = 53bc099fd0cdc2007cd61f6145ab03e1
-SIZE (gst-editor-0.5.0.tar.gz) = 333915
+MD5 (gst-editor-0.7.0.tar.bz2) = 4a00e603b7a94a560fafee65162092ad
+SIZE (gst-editor-0.7.0.tar.bz2) = 340490
diff --git a/multimedia/gstreamer-editor/files/patch-ltmain.sh b/multimedia/gstreamer-editor/files/patch-ltmain.sh
new file mode 100644
index 000000000000..9b5b1ec3b9aa
--- /dev/null
+++ b/multimedia/gstreamer-editor/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Tue Oct 28 09:26:50 2003
++++ ltmain.sh	Sat Feb 21 15:30:25 2004
+@@ -1280,7 +1280,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/multimedia/gstreamer-editor/pkg-plist b/multimedia/gstreamer-editor/pkg-plist
index 0cccdc94d42f..b4707eb4b1b4 100644
--- a/multimedia/gstreamer-editor/pkg-plist
+++ b/multimedia/gstreamer-editor/pkg-plist
@@ -16,19 +16,15 @@ include/gst-editor-%%VERSION%%/gst/element-browser/element-tree.h
 include/gst-editor-%%VERSION%%/gst/element-ui/gst-element-ui-prop-view.h
 include/gst-editor-%%VERSION%%/gst/element-ui/gst-element-ui.h
 lib/libgstdebugui.a
-lib/libgstdebugui.la
 lib/libgstdebugui.so
 lib/libgstdebugui.so.0
 lib/libgsteditor.a
-lib/libgsteditor.la
 lib/libgsteditor.so
 lib/libgsteditor.so.0
 lib/libgstelementbrowser.a
-lib/libgstelementbrowser.la
 lib/libgstelementbrowser.so
 lib/libgstelementbrowser.so.0
 lib/libgstelementui.a
-lib/libgstelementui.la
 lib/libgstelementui.so
 lib/libgstelementui.so.0
 share/gnome/applications/gst-editor.desktop
@@ -38,8 +34,10 @@ share/gnome/gst-editor/editor.glade2
 share/gnome/gst-editor/editorelement.glade2
 share/gnome/gst-editor/gnome/help/gst-editor/C/gst-editor-manual.xml
 share/gnome/gst-editor/gnome/help/gst-editor/C/legal.xml
+share/gnome/gst-editor/gst-debug-ui.glade2
 share/gnome/gst-editor/gst-editor.png
 share/gnome/omf/gst-editor/gst-editor-manual-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gst-editor/gst-editor-manual-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gst-editor.png
 share/gnome/pixmaps/gst-inspect.png
 share/gnome/pixmaps/gst-launch.png
@@ -55,3 +53,4 @@ share/gnome/pixmaps/gst-launch.png
 @dirrm include/gst-editor-%%VERSION%%/gst/debug-ui
 @dirrm include/gst-editor-%%VERSION%%/gst
 @dirrm include/gst-editor-%%VERSION%%
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gst-editor/gst-editor-manual-C.omf 2>/dev/null || /usr/bin/true