- Fix complete on [BUILD|RUN]_DEPENDS by follow tovid-init and

  http://tovid.wikia.com/wiki/Tovid_dependencies . I am following the order
  of dependencies in tovid-init to make it easier to be follow in the next
  update.
- Add INSTALLS_ICONS=yes.
- Fix the MAN1.
- Remove post-build and post-install, these are not need.
- Update the WWW.
- Fix the plist. [1]
- A bit misc of clean up in pkg-descr and Makefile to make readable.
- Bump the PORTREVISION.

Reported by:	krismail [1]

3 files changed, 111 insertions, 143 deletions

diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index ce34dbb1406b..3df0ddce20b3 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tovid
 PORTVERSION=	0.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tovid
@@ -19,63 +19,34 @@ PATCH_DIST_STRIP=-p1
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A collection of video disc authoring tools
 
-BUILD_DEPENDS=	\
-		sox:${PORTSDIR}/audio/sox \
-		composite:${PORTSDIR}/graphics/ImageMagick \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		spumux:${PORTSDIR}/multimedia/dvdauthor \
-		ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
-		mp2enc:${PORTSDIR}/multimedia/mjpegtools \
-		mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
+BUILD_DEPENDS=	txt2tags:${PORTSDIR}/textproc/txt2tags
+RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer \
 		mplex:${PORTSDIR}/multimedia/mjpegtools \
-		ppmtoy4m:${PORTSDIR}/multimedia/mjpegtools \
-		yuvdenoise:${PORTSDIR}/multimedia/mjpegtools \
-		yuvfps:${PORTSDIR}/multimedia/mjpegtools \
-		mencoder:${PORTSDIR}/multimedia/mplayer \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		tcprobe:${PORTSDIR}/multimedia/transcode \
-		tcrequant:${PORTSDIR}/multimedia/transcode \
-		vcdxbuild:${PORTSDIR}/multimedia/vcdimager \
-		cdrdao:${PORTSDIR}/sysutils/cdrdao \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		txt2tags:${PORTSDIR}/textproc/txt2tags
-RUN_DEPENDS=	\
-		sox:${PORTSDIR}/audio/sox \
+		ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
 		composite:${PORTSDIR}/graphics/ImageMagick \
-		convert:${PORTSDIR}/graphics/ImageMagick \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		spumux:${PORTSDIR}/multimedia/dvdauthor \
-		ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
-		mp2enc:${PORTSDIR}/multimedia/mjpegtools \
-		mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
-		mplex:${PORTSDIR}/multimedia/mjpegtools \
-		ppmtoy4m:${PORTSDIR}/multimedia/mjpegtools \
-		yuvdenoise:${PORTSDIR}/multimedia/mjpegtools \
-		yuvfps:${PORTSDIR}/multimedia/mjpegtools \
-		mencoder:${PORTSDIR}/multimedia/mplayer \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		tcprobe:${PORTSDIR}/multimedia/transcode \
-		tcrequant:${PORTSDIR}/multimedia/transcode \
+		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		vcdxbuild:${PORTSDIR}/multimedia/vcdimager \
 		cdrdao:${PORTSDIR}/sysutils/cdrdao \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		txt2tags:${PORTSDIR}/textproc/txt2tags \
-		bash:${PORTSDIR}/shells/bash
+		tcprobe:${PORTSDIR}/multimedia/transcode \
+		sox:${PORTSDIR}/audio/sox \
+		normalize:${PORTSDIR}/audio/normalize \
+		bash:${PORTSDIR}/shells/bash \
+		${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
 
-USE_PYTHON=	yes
-#USE_PYDISTUTILS=	yes
-USE_CDRTOOLS=	yes
 USE_WX=		2.6
 WX_COMPS=	python
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 NO_BUILD=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget
+USE_PYTHON=	yes
+USE_CDRTOOLS=	yes
+INSTALLS_ICONS=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man/
-
-MAN1=	idvid.1 makedvd.1 makemenu.1 makeslides.1 makevcd.1 makexml.1 \
-	postproc.1 todisc.1 tovid.1 tovid-stats.1
+MAN1=		idvid.1 makedvd.1 makemenu.1 makeslides.1 makevcd.1 makexml.1 \
+		postproc.1 pymakexml.1 todisc.1 tovid-stats.1 tovid.1
 
 post-patch:
 	@${REINPLACE_CMD} -E \
@@ -112,13 +83,6 @@ post-patch:
 	${REINPLACE_CMD} -E \
 		-e 's|/usr/bin/env[[:space:]]+python|${PYTHON_CMD}|'
 .endfor
-
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
-post-build:
-	@cd ${WRKSRC} && ${MAKE}
-
-post-install:
-	@cd ${WRKSRC} && ${MAKE} install
-
 .include <bsd.port.mk>
diff --git a/multimedia/tovid/pkg-descr b/multimedia/tovid/pkg-descr
index 35427f94cb0e..6650c2ba386a 100644
--- a/multimedia/tovid/pkg-descr
+++ b/multimedia/tovid/pkg-descr
@@ -1,5 +1,3 @@
-[ excerpt from developer's www site with modifications ]
-
 tovid is a collection of video disc authoring tools; it can help
 you create your own DVDs, VCDs, and SVCDs for playback on your home
 DVD player. It has a command-line interface as well as a graphical
@@ -13,6 +11,4 @@ You may find tovid useful if:
 - your video files are eating up too much hard drive space, and you
   want to back them up onto a portable medium
 
-WWW: http://tovid.berlios.de/
-
--- lioux@FreeBSD.org
+WWW: http://tovid.wikia.com/
diff --git a/multimedia/tovid/pkg-plist b/multimedia/tovid/pkg-plist
index 1264d213bfc4..75983dac22b0 100644
--- a/multimedia/tovid/pkg-plist
+++ b/multimedia/tovid/pkg-plist
@@ -1,3 +1,4 @@
+bin/genvid
 bin/idvid
 bin/makedvd
 bin/makemenu
@@ -6,138 +7,145 @@ bin/makevcd
 bin/makexml
 bin/postproc
 bin/previd
+bin/pyidvid
+bin/pymakemenu
+bin/pymakexml
+bin/pytovid
+bin/ripframes
 bin/todisc
 bin/todisc-fade-routine
+bin/todiscgui
+bin/todraw
 bin/tovid
 bin/tovid-batch
 bin/tovid-init
 bin/tovid-interactive
+bin/tovid-stats
 bin/tovid-test
-bin/genvid
-bin/pyidvid
-bin/pytovid
-bin/pymakemenu
-bin/pymakexml
-bin/ripframes
-bin/todiscgui
 bin/tovidgui
-bin/tovid-stats
-bin/todraw
 %%PYTHON_SITELIBDIR%%/libtovid/__init__.py
 %%PYTHON_SITELIBDIR%%/libtovid/__init__.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/author.py
+%%PYTHON_SITELIBDIR%%/libtovid/author.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/author.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/cli.py
+%%PYTHON_SITELIBDIR%%/libtovid/cli.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/cli.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/deps.py
+%%PYTHON_SITELIBDIR%%/libtovid/deps.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/deps.pyo
 %%PYTHON_SITELIBDIR%%/libtovid/gui/__init__.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/configs.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/constants.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/controls.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/dialogs.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/frames.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/icons.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/meta.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/options.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/panels.py
-%%PYTHON_SITELIBDIR%%/libtovid/gui/util.py
 %%PYTHON_SITELIBDIR%%/libtovid/gui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/configs.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/constants.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/controls.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/dialogs.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/frames.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/icons.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/meta.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/options.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/panels.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/gui/util.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/configs.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/configs.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/configs.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/constants.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/constants.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/constants.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/controls.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/controls.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/controls.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/dialogs.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/dialogs.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/dialogs.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/frames.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/frames.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/frames.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/icons.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/icons.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/icons.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/meta.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/meta.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/meta.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/options.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/options.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/options.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/panels.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/panels.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/panels.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/gui/util.py
+%%PYTHON_SITELIBDIR%%/libtovid/gui/util.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/gui/util.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/author.py
-%%PYTHON_SITELIBDIR%%/libtovid/cli.py
-%%PYTHON_SITELIBDIR%%/libtovid/deps.py
 %%PYTHON_SITELIBDIR%%/libtovid/media.py
-%%PYTHON_SITELIBDIR%%/libtovid/opts.py
-%%PYTHON_SITELIBDIR%%/libtovid/output.py
-%%PYTHON_SITELIBDIR%%/libtovid/runtest.py
-%%PYTHON_SITELIBDIR%%/libtovid/spumux.py
-%%PYTHON_SITELIBDIR%%/libtovid/standard.py
-%%PYTHON_SITELIBDIR%%/libtovid/stats.py
-%%PYTHON_SITELIBDIR%%/libtovid/testvid.py
-%%PYTHON_SITELIBDIR%%/libtovid/utils.py
-%%PYTHON_SITELIBDIR%%/libtovid/xml.py
-%%PYTHON_SITELIBDIR%%/libtovid/author.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/cli.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/deps.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/media.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/opts.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/output.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/runtest.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/spumux.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/standard.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/stats.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/testvid.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/utils.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/xml.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/author.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/cli.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/deps.pyo
 %%PYTHON_SITELIBDIR%%/libtovid/media.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/opts.py
+%%PYTHON_SITELIBDIR%%/libtovid/opts.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/opts.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/output.py
+%%PYTHON_SITELIBDIR%%/libtovid/output.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/output.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/runtest.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/spumux.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/standard.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/stats.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/testvid.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/utils.pyo
-%%PYTHON_SITELIBDIR%%/libtovid/xml.pyo
 %%PYTHON_SITELIBDIR%%/libtovid/render/__init__.py
-%%PYTHON_SITELIBDIR%%/libtovid/render/animation.py
-%%PYTHON_SITELIBDIR%%/libtovid/render/drawing.py
-%%PYTHON_SITELIBDIR%%/libtovid/render/effect.py
-%%PYTHON_SITELIBDIR%%/libtovid/render/flipbook.py
-%%PYTHON_SITELIBDIR%%/libtovid/render/layer.py
 %%PYTHON_SITELIBDIR%%/libtovid/render/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/render/animation.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/render/drawing.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/render/effect.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/render/flipbook.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/render/layer.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/render/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/render/animation.py
+%%PYTHON_SITELIBDIR%%/libtovid/render/animation.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/render/animation.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/render/drawing.py
+%%PYTHON_SITELIBDIR%%/libtovid/render/drawing.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/render/drawing.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/render/effect.py
+%%PYTHON_SITELIBDIR%%/libtovid/render/effect.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/render/effect.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/render/flipbook.py
+%%PYTHON_SITELIBDIR%%/libtovid/render/flipbook.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/render/flipbook.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/render/layer.py
+%%PYTHON_SITELIBDIR%%/libtovid/render/layer.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/render/layer.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/runtest.py
+%%PYTHON_SITELIBDIR%%/libtovid/runtest.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/runtest.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/spumux.py
+%%PYTHON_SITELIBDIR%%/libtovid/spumux.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/spumux.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/standard.py
+%%PYTHON_SITELIBDIR%%/libtovid/standard.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/standard.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/stats.py
+%%PYTHON_SITELIBDIR%%/libtovid/stats.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/stats.pyo
 %%PYTHON_SITELIBDIR%%/libtovid/template/__init__.py
-%%PYTHON_SITELIBDIR%%/libtovid/template/textmenu.py
-%%PYTHON_SITELIBDIR%%/libtovid/template/thumbmenu.py
 %%PYTHON_SITELIBDIR%%/libtovid/template/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/template/textmenu.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/template/thumbmenu.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/template/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/template/textmenu.py
+%%PYTHON_SITELIBDIR%%/libtovid/template/textmenu.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/template/textmenu.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/template/thumbmenu.py
+%%PYTHON_SITELIBDIR%%/libtovid/template/thumbmenu.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/template/thumbmenu.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/testvid.py
+%%PYTHON_SITELIBDIR%%/libtovid/testvid.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/testvid.pyo
 %%PYTHON_SITELIBDIR%%/libtovid/transcode/__init__.py
-%%PYTHON_SITELIBDIR%%/libtovid/transcode/encode.py
-%%PYTHON_SITELIBDIR%%/libtovid/transcode/rip.py
 %%PYTHON_SITELIBDIR%%/libtovid/transcode/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/transcode/encode.pyc
-%%PYTHON_SITELIBDIR%%/libtovid/transcode/rip.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/transcode/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/transcode/encode.py
+%%PYTHON_SITELIBDIR%%/libtovid/transcode/encode.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/transcode/encode.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/transcode/rip.py
+%%PYTHON_SITELIBDIR%%/libtovid/transcode/rip.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/transcode/rip.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/utils.py
+%%PYTHON_SITELIBDIR%%/libtovid/utils.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/utils.pyo
+%%PYTHON_SITELIBDIR%%/libtovid/xml.py
+%%PYTHON_SITELIBDIR%%/libtovid/xml.pyc
+%%PYTHON_SITELIBDIR%%/libtovid/xml.pyo
+share/applications/todiscgui.desktop
+share/applications/tovidgui.desktop
+share/icons/hicolor/128x128/apps/tovid_icon_128.png
+share/icons/hicolor/32x32/apps/tovid_icon_32.png
+share/icons/hicolor/48x48/apps/tovid_icon_48.png
+share/icons/hicolor/64x64/apps/tovid_icon_64.png
+share/icons/hicolor/scalable/apps/cd.svg
+share/icons/hicolor/scalable/apps/disc.svg
+share/icons/hicolor/scalable/apps/tovid.svg
+@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/libtovid/transcode
 @dirrm %%PYTHON_SITELIBDIR%%/libtovid/template
 @dirrm %%PYTHON_SITELIBDIR%%/libtovid/render
 @dirrm %%PYTHON_SITELIBDIR%%/libtovid/gui
 @dirrm %%PYTHON_SITELIBDIR%%/libtovid
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%