- update to release 0.6.0

- update README.FreeBSD

5 files changed, 43 insertions, 24 deletions

diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index cee7798fb60a..d7e0a86f8d8c 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dvdauthor
-PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +14,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pb@FreeBSD.org
 COMMENT=	Makes a DVD file structure from one or more MPEG2 streams
 
+BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
 LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread \
-		png.5:${PORTSDIR}/graphics/png
+		png.5:${PORTSDIR}/graphics/png \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	LDFLAGS="-L${LOCALBASE}/lib"
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/multimedia/dvdauthor/distinfo b/multimedia/dvdauthor/distinfo
index 964aadf98958..e52a1b97cad5 100644
--- a/multimedia/dvdauthor/distinfo
+++ b/multimedia/dvdauthor/distinfo
@@ -1 +1 @@
-MD5 (dvdauthor-0.5.4.tar.gz) = 1ff3e7044a9507f50538b40796f1afd2
+MD5 (dvdauthor-0.6.0.tar.gz) = 30e961898e8a1e540c518ee42891c168
diff --git a/multimedia/dvdauthor/files/README.FreeBSD b/multimedia/dvdauthor/files/README.FreeBSD
index 64c131e9f6c9..aa1c3115c390 100644
--- a/multimedia/dvdauthor/files/README.FreeBSD
+++ b/multimedia/dvdauthor/files/README.FreeBSD
@@ -1,14 +1,43 @@
 To create mpeg files suitable for a DVD, you can use the
 multimedia/transcode port.
 
-I use the following options:
-	transcode -i .... -y mpeg -F d -E 48000 -b 224 -o output
+To encode video, use the following:
+	transcode -i .... -y mpeg2enc,null -w 9500 -F '8,-q6 -N -P' -o output
+
+This creates output.m2v, MPEG2 video at 9500Kbps (peak bitrate).
+Please refer to the man page of mpeg2desc for various encoder options
+(to be put after "-F '8,"), and to the MJPEG Tools Howto for useful
+hints.
+
+You can add "-J yuvdenoise" to reduce video noise before encoding,
+this yields very substantial gains in required bit rate.
 
-This creates the following files:
-	output.m2v: video, bitrate 10Mbps (use -w to change that rate)
-	output.mpa: MPEG 1 Layer II audio, 48KHz, bitrate 224Kbps
+For audio:
+	transcode -i .... -y null,toolame -E 48000 -b 224 -o output
+This creates output.mp2, MPEG 1 Layer II audio, 48KHz, bitrate 224Kbps.
 
 Then multiplex the streams:
-	tcmplex -i output.m2v -p output.mpa -m d -o output.mpeg
+	mplex -f 8 -o output.mpeg output.m2v output.mp2
 
 You can then use the resulting output.mpeg file with dvdauthor.
+
+Alternatively, you can use the bbmpeg codec which is faster but not
+as good in terms of quality, especially at low birates:
+	transcode -i .... -y mpeg -F d -E 48000 -b 224 -o output
+	tcmplex -i output.m2v -p output.mpa -m d -o output.mpeg
+
+Once your DVD is ready, you can use sysutils/dvd+rw-tools to burn
+it, or burncd(8) if it is a DVD+RW or DVD-RW.
+
+	Pierre Beyssac (pb@freebsd.org)
+
+Recommended reading:
+- mjpegtools home page
+	http://mjpeg.sourceforge.net/
+- mjpegtools howto
+	https://sourceforge.net/docman/display_doc.php?docid=3456&group_id=5776
+- transcode examples
+	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/html/index.html
+- "some thoughts on DVD authoring"
+	http://www.tappin.me.uk/Linux/dvd.html
+
diff --git a/multimedia/dvdauthor/files/patch-Makefile.in b/multimedia/dvdauthor/files/patch-Makefile.in
deleted file mode 100644
index 74a040794b3c..000000000000
--- a/multimedia/dvdauthor/files/patch-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	Sat Jun  7 03:31:46 2003
-+++ Makefile.in	Sun Oct  5 12:51:37 2003
-@@ -16,7 +16,8 @@
- IBINDIR = $(RPM_BUILD_ROOT)$(BINDIR)
- sysconfdir = @sysconfdir@
- 
--CPPFLAGS += -DSYSCONFDIR="\"$(sysconfdir)\""
-+CPPFLAGS += -DSYSCONFDIR="\"$(sysconfdir)\"" -I${prefix}/include
-+LDFLAGS += -L${prefix}/lib
- LIBS += @LIBS@
- 
- edit = sed \
diff --git a/multimedia/dvdauthor/pkg-plist b/multimedia/dvdauthor/pkg-plist
index 2561200f5f3d..8d670b4330d2 100644
--- a/multimedia/dvdauthor/pkg-plist
+++ b/multimedia/dvdauthor/pkg-plist
@@ -1,8 +1,8 @@
 bin/dvdauthor
 bin/dvddirgen
 bin/mpeg2desc
-bin/submux
-bin/vob_dump
+bin/spumux
+man/man1/spumux.1
 %%PORTDOCS%%share/doc/dvdauthor/README
 %%PORTDOCS%%share/doc/dvdauthor/README.FreeBSD
 %%PORTDOCS%%share/doc/dvdauthor/iso639.txt