4 files changed, 19 insertions, 47 deletions

diff --git a/multimedia/gstreamer-plugins-gnonlin/Makefile b/multimedia/gstreamer-plugins-gnonlin/Makefile
index 08de06e448ce..2fee7a539520 100644
--- a/multimedia/gstreamer-plugins-gnonlin/Makefile
+++ b/multimedia/gstreamer-plugins-gnonlin/Makefile
@@ -1,32 +1,25 @@
-# New ports collection makefile for:   gnonlin
-# Date created:			2 June 2005
-# Whom:				Koop Mast <kwm@FreeBSD.org>
+# New ports collection makefile for:	gstreamer-plugins-gnonlin
+# Date created:		2006-04-25
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/multimedia/gstreamer-plugins-gnonlin/Makefile,v 1.2 2006/04/25 20:54:56 ahze Exp $
 
-PORTNAME=	gnonlin
-PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTNAME=	gstreamer-plugins-gnonlin
+PORTVERSION=	0.10.3
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GStreamer extension library for non-linear editing
-
-LIB_DEPENDS=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer
+MASTER_SITES=	http://gstreamer.freedesktop.org/src/gnonlin/
+DISTNAME=	gnonlin-${PORTVERSION}
 
-CONFLICTS=	pitivi-0.1.1*
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Gstreamer lib for writing non-linear audio and video
 
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnometarget
-USE_GMAKE=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_GSTREAMER=	yes
 
-MAN1=		gnonlin-config.1
+PLIST_FILES=	lib/gstreamer-0.10/libgnl.a lib/gstreamer-0.10/libgnl.la \
+		lib/gstreamer-0.10/libgnl.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/gstreamer-plugins-gnonlin/distinfo b/multimedia/gstreamer-plugins-gnonlin/distinfo
index 352a11a6ada9..7f1671104c9f 100644
--- a/multimedia/gstreamer-plugins-gnonlin/distinfo
+++ b/multimedia/gstreamer-plugins-gnonlin/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnonlin-0.2.2.tar.bz2) = 7ff9f2e58463a3bb783a1c77445e9863
-SHA256 (gnonlin-0.2.2.tar.bz2) = 3ca192cf3eab186f5217d11a4e001564b515b08c5a3f9f79c77dcf329e75dc97
-SIZE (gnonlin-0.2.2.tar.bz2) = 284397
+MD5 (gnonlin-0.10.3.tar.bz2) = a33f00c73ac4fa4cd7722bfca25d04c7
+SHA256 (gnonlin-0.10.3.tar.bz2) = dec9a65c84703c133d057ae1decf8960805f84eb8d1f680bafc82d63e738b628
+SIZE (gnonlin-0.10.3.tar.bz2) = 344775
diff --git a/multimedia/gstreamer-plugins-gnonlin/pkg-descr b/multimedia/gstreamer-plugins-gnonlin/pkg-descr
index 21da31bd3b1c..d1db76f156b0 100644
--- a/multimedia/gstreamer-plugins-gnonlin/pkg-descr
+++ b/multimedia/gstreamer-plugins-gnonlin/pkg-descr
@@ -1,5 +1,3 @@
-Gnonlin is a library built on top of GStreamer (http://gstreamer.net) which
-provides support for writing non-linear audio and video editing applications.
-It introduces the concept of a timeline.
+Gstreamer library for writing non-linear audio and video
 
-WWW:   http://gnonlin.sf.net/
+WWW: http://gstreamer.net
diff --git a/multimedia/gstreamer-plugins-gnonlin/pkg-plist b/multimedia/gstreamer-plugins-gnonlin/pkg-plist
deleted file mode 100644
index c5f6a639ae91..000000000000
--- a/multimedia/gstreamer-plugins-gnonlin/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-bin/gnonlin-config
-include/gnl/gnl.h
-include/gnl/gnlcomposition.h
-include/gnl/gnlmarshal.h
-include/gnl/gnlobject.h
-include/gnl/gnloperation.h
-include/gnl/gnlsource.h
-include/gnl/gnltimeline.h
-include/gnl/gnltypes.h
-include/gnl/gnlversion.h
-lib/gstreamer-0.8/libgnl.a
-lib/gstreamer-0.8/libgnl.la
-lib/gstreamer-0.8/libgnl.so
-lib/gstreamer-0.8/libgnl.so.0
-libdata/pkgconfig/gnonlin.pc
-@dirrm include/gnl
-@unexec /bin/rmdir %D/share/gtk-doc/html/gnonlin 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/gtk-doc/html 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/gtk-doc 2>/dev/null || /usr/bin/true