3 files changed, 129 insertions, 71 deletions

diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 684be4d7e844..f60128eeb83f 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -3,11 +3,10 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/multimedia/pitivi/Makefile,v 1.8 2006/04/26 19:31:01 ahze Exp $
 
 PORTNAME=	pitivi
-PORTVERSION=	0.1.10
-PORTREVISION=	1
+PORTVERSION=	0.10.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,16 +14,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gstreamer based non-linear audio/video editor
 
-BUILD_DEPENDS=	gnonlin-config:${PORTSDIR}/multimedia/gnonlin \
-		${PYTHON_SITELIBDIR}/gst/_gst.so:${PORTSDIR}/multimedia/py-gstreamer
-RUN_DEPENDS=	gnonlin-config:${PORTSDIR}/multimedia/gnonlin \
-		${PYTHON_SITELIBDIR}/gst/_gst.so:${PORTSDIR}/multimedia/py-gstreamer
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 USE_GNOME=	gnometarget pygtk2 pkgconfig pygnome2
-USE_GSTREAMER=	yes
+USE_GSTREAMER=	gnonlin
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docs-build
diff --git a/multimedia/pitivi/distinfo b/multimedia/pitivi/distinfo
index 7db557f83837..7a7f57efcc75 100644
--- a/multimedia/pitivi/distinfo
+++ b/multimedia/pitivi/distinfo
@@ -1,3 +1,3 @@
-MD5 (pitivi-0.1.10.tar.bz2) = 9d9c0351e5d21a162c07baaaa56ec7b6
-SHA256 (pitivi-0.1.10.tar.bz2) = dcdbbff359cdb4b2070f39d465ac395c4a9f4f7f962e52993f7d7153f8b781ea
-SIZE (pitivi-0.1.10.tar.bz2) = 284126
+MD5 (pitivi-0.10.0.tar.bz2) = a03b026d0784659905519f59e7abd4e1
+SHA256 (pitivi-0.10.0.tar.bz2) = 73b0d9bf0bc6ff4dc4cbfa4eda3d3e5e2c6154b3d3ec7753650c1982fcf08ad3
+SIZE (pitivi-0.10.0.tar.bz2) = 268532
diff --git a/multimedia/pitivi/pkg-plist b/multimedia/pitivi/pkg-plist
index 3fa7118a60c5..7e2ac53b290d 100644
--- a/multimedia/pitivi/pkg-plist
+++ b/multimedia/pitivi/pkg-plist
@@ -1,62 +1,124 @@
 bin/pitivi
-lib/pitivi/__init__.py
-lib/pitivi/__init__.pyc
-lib/pitivi/__init__.pyo
-lib/pitivi/bin.py
-lib/pitivi/bin.pyc
-lib/pitivi/bin.pyo
-lib/pitivi/configure.py
-lib/pitivi/configure.pyc
-lib/pitivi/configure.pyo
-lib/pitivi/discoverer.py
-lib/pitivi/discoverer.pyc
-lib/pitivi/discoverer.pyo
-lib/pitivi/dnd.py
-lib/pitivi/dnd.pyc
-lib/pitivi/dnd.pyo
-lib/pitivi/effects.py
-lib/pitivi/effects.pyc
-lib/pitivi/effects.pyo
-lib/pitivi/objectfactory.py
-lib/pitivi/objectfactory.pyc
-lib/pitivi/objectfactory.pyo
-lib/pitivi/pitivi.py
-lib/pitivi/pitivi.pyc
-lib/pitivi/pitivi.pyo
-lib/pitivi/playground.py
-lib/pitivi/playground.pyc
-lib/pitivi/playground.pyo
-lib/pitivi/project.py
-lib/pitivi/project.pyc
-lib/pitivi/project.pyo
-lib/pitivi/settings.py
-lib/pitivi/settings.pyc
-lib/pitivi/settings.pyo
-lib/pitivi/sourcelist.py
-lib/pitivi/sourcelist.pyc
-lib/pitivi/sourcelist.pyo
-lib/pitivi/timeline.py
-lib/pitivi/timeline.pyc
-lib/pitivi/timeline.pyo
-lib/pitivi/ui/__init__.py
-lib/pitivi/ui/actions.xml
-lib/pitivi/ui/encodingdialog.glade
-lib/pitivi/ui/elementsettingsdialog.glade
-lib/pitivi/ui/exportsettingswidget.glade
-lib/pitivi/ui/exportsettingswidget.py
-lib/pitivi/ui/glade.py
-lib/pitivi/ui/gstwidget.py
-lib/pitivi/ui/mainwindow.py
-lib/pitivi/ui/projectsettings.glade
-lib/pitivi/ui/projectsettings.py
-lib/pitivi/ui/sourcefactories.py
-lib/pitivi/ui/timeline.py
-lib/pitivi/ui/timelineobjects.py
-lib/pitivi/ui/viewer.py
-share/pitivi/pixmaps/pitivi-file.png
-share/pitivi/pixmaps/pitivi-sound.png
-share/pitivi/pixmaps/pitivi-video.png
-@dirrm share/pitivi/pixmaps
+lib/pitivi/python/pitivi/__init__.py
+lib/pitivi/python/pitivi/__init__.pyc
+lib/pitivi/python/pitivi/__init__.pyo
+lib/pitivi/python/pitivi/bin.py
+lib/pitivi/python/pitivi/bin.pyc
+lib/pitivi/python/pitivi/bin.pyo
+lib/pitivi/python/pitivi/check.py
+lib/pitivi/python/pitivi/check.pyc
+lib/pitivi/python/pitivi/check.pyo
+lib/pitivi/python/pitivi/configure.py
+lib/pitivi/python/pitivi/configure.pyc
+lib/pitivi/python/pitivi/configure.pyo
+lib/pitivi/python/pitivi/discoverer.py
+lib/pitivi/python/pitivi/discoverer.pyc
+lib/pitivi/python/pitivi/discoverer.pyo
+lib/pitivi/python/pitivi/dnd.py
+lib/pitivi/python/pitivi/dnd.pyc
+lib/pitivi/python/pitivi/dnd.pyo
+lib/pitivi/python/pitivi/effects.py
+lib/pitivi/python/pitivi/effects.pyc
+lib/pitivi/python/pitivi/effects.pyo
+lib/pitivi/python/pitivi/instance.py
+lib/pitivi/python/pitivi/instance.pyc
+lib/pitivi/python/pitivi/instance.pyo
+lib/pitivi/python/pitivi/objectfactory.py
+lib/pitivi/python/pitivi/objectfactory.pyc
+lib/pitivi/python/pitivi/objectfactory.pyo
+lib/pitivi/python/pitivi/pitivi.py
+lib/pitivi/python/pitivi/pitivi.pyc
+lib/pitivi/python/pitivi/pitivi.pyo
+lib/pitivi/python/pitivi/playground.py
+lib/pitivi/python/pitivi/playground.pyc
+lib/pitivi/python/pitivi/playground.pyo
+lib/pitivi/python/pitivi/project.py
+lib/pitivi/python/pitivi/project.pyc
+lib/pitivi/python/pitivi/project.pyo
+lib/pitivi/python/pitivi/settings.py
+lib/pitivi/python/pitivi/settings.pyc
+lib/pitivi/python/pitivi/settings.pyo
+lib/pitivi/python/pitivi/sourcelist.py
+lib/pitivi/python/pitivi/sourcelist.pyc
+lib/pitivi/python/pitivi/sourcelist.pyo
+lib/pitivi/python/pitivi/timeline.py
+lib/pitivi/python/pitivi/timeline.pyc
+lib/pitivi/python/pitivi/timeline.pyo
+lib/pitivi/python/pitivi/ui/__init__.py
+lib/pitivi/python/pitivi/ui/__init__.pyc
+lib/pitivi/python/pitivi/ui/__init__.pyo
+lib/pitivi/python/pitivi/ui/actions.xml
+lib/pitivi/python/pitivi/ui/complexinterface.py
+lib/pitivi/python/pitivi/ui/complexinterface.pyc
+lib/pitivi/python/pitivi/ui/complexinterface.pyo
+lib/pitivi/python/pitivi/ui/complexlayer.py
+lib/pitivi/python/pitivi/ui/complexlayer.pyc
+lib/pitivi/python/pitivi/ui/complexlayer.pyo
+lib/pitivi/python/pitivi/ui/complexsource.py
+lib/pitivi/python/pitivi/ui/complexsource.pyc
+lib/pitivi/python/pitivi/ui/complexsource.pyo
+lib/pitivi/python/pitivi/ui/complextimeline.py
+lib/pitivi/python/pitivi/ui/complextimeline.pyc
+lib/pitivi/python/pitivi/ui/complextimeline.pyo
+lib/pitivi/python/pitivi/ui/discoverererrordialog.glade
+lib/pitivi/python/pitivi/ui/elementsettingsdialog.glade
+lib/pitivi/python/pitivi/ui/encodingdialog.glade
+lib/pitivi/python/pitivi/ui/exportsettingswidget.glade
+lib/pitivi/python/pitivi/ui/exportsettingswidget.py
+lib/pitivi/python/pitivi/ui/exportsettingswidget.pyc
+lib/pitivi/python/pitivi/ui/exportsettingswidget.pyo
+lib/pitivi/python/pitivi/ui/glade.py
+lib/pitivi/python/pitivi/ui/glade.pyc
+lib/pitivi/python/pitivi/ui/glade.pyo
+lib/pitivi/python/pitivi/ui/gstwidget.py
+lib/pitivi/python/pitivi/ui/gstwidget.pyc
+lib/pitivi/python/pitivi/ui/gstwidget.pyo
+lib/pitivi/python/pitivi/ui/infolayer.py
+lib/pitivi/python/pitivi/ui/infolayer.pyc
+lib/pitivi/python/pitivi/ui/infolayer.pyo
+lib/pitivi/python/pitivi/ui/layerwidgets.py
+lib/pitivi/python/pitivi/ui/layerwidgets.pyc
+lib/pitivi/python/pitivi/ui/layerwidgets.pyo
+lib/pitivi/python/pitivi/ui/mainwindow.py
+lib/pitivi/python/pitivi/ui/mainwindow.pyc
+lib/pitivi/python/pitivi/ui/mainwindow.pyo
+lib/pitivi/python/pitivi/ui/plumber.py
+lib/pitivi/python/pitivi/ui/plumber.pyc
+lib/pitivi/python/pitivi/ui/plumber.pyo
+lib/pitivi/python/pitivi/ui/projectsettings.glade
+lib/pitivi/python/pitivi/ui/projectsettings.py
+lib/pitivi/python/pitivi/ui/projectsettings.pyc
+lib/pitivi/python/pitivi/ui/projectsettings.pyo
+lib/pitivi/python/pitivi/ui/ruler.py
+lib/pitivi/python/pitivi/ui/ruler.pyc
+lib/pitivi/python/pitivi/ui/ruler.pyo
+lib/pitivi/python/pitivi/ui/sourcefactories.py
+lib/pitivi/python/pitivi/ui/sourcefactories.pyc
+lib/pitivi/python/pitivi/ui/sourcefactories.pyo
+lib/pitivi/python/pitivi/ui/timeline.py
+lib/pitivi/python/pitivi/ui/timeline.pyc
+lib/pitivi/python/pitivi/ui/timeline.pyo
+lib/pitivi/python/pitivi/ui/timelineobjects.py
+lib/pitivi/python/pitivi/ui/timelineobjects.pyc
+lib/pitivi/python/pitivi/ui/timelineobjects.pyo
+lib/pitivi/python/pitivi/ui/tracklayer.py
+lib/pitivi/python/pitivi/ui/tracklayer.pyc
+lib/pitivi/python/pitivi/ui/tracklayer.pyo
+lib/pitivi/python/pitivi/ui/viewer.py
+lib/pitivi/python/pitivi/ui/viewer.pyc
+lib/pitivi/python/pitivi/ui/viewer.pyo
+lib/pitivi/python/pitivi/utils.py
+lib/pitivi/python/pitivi/utils.pyc
+lib/pitivi/python/pitivi/utils.pyo
+share/applications/pitivi.desktop
+%%DATADIR%%/pixmaps/pitivi-file.png
+%%DATADIR%%/pixmaps/pitivi-sound.png
+%%DATADIR%%/pixmaps/pitivi-video.png
+share/pixmaps/pitivi.png
+@dirrmtry share/pixmaps
+@dirrm %%DATADIR%%/pixmaps
 @dirrm share/pitivi
-@dirrm lib/pitivi/ui
+@dirrm lib/pitivi/python/pitivi/ui
+@dirrm lib/pitivi/python/pitivi
+@dirrm lib/pitivi/python
 @dirrm lib/pitivi