Update multimedia/dvdauthor to 0.7.0

Pkgsrc changes:
- Add LICENSE

Upstream changes:
0.7.0: 2010 October 23

* Reworked subtitle file reading so it can now deal with encodings like UTF-16
* Default encoding for subtitle files is no longer ISO-8859-1, but taken from
user's locale
* Add fontconfig support following a patch by Nicolas George
* Remove dvdauthor config files and make command line -o option take precedence
over XML dest attribute.
* Video format no longer has hard-coded default to NTSC, unless you invoke
configure with --enable-default-video-format=NTSC. You can also configure with
--enable-default-video-format=PAL to default to PAL.
* Implement configuration of default video format as per the proposal at
<http://create.freedesktop.org/wiki/Video_Format_Pref>.
* File names are no longer converted to locale encoding, unless you invoke
configure with --enable-localize-filenames.
* You can now specify fill and outline colours and outline thickness for text
subtitles.
Colours can be specified in additional ways, including by name and in HSV space.
* You can now also specify a shadow offset and colour for text subtitles
* Allow non-title PGCs in a titleset
* The VM language now allows C-style comments, as well as CDATA sections
* Add --nomux and --nodvdauthor-data options to spumux (thanks to TED for
sponsoring this)

4 files changed, 44 insertions, 20 deletions

diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index c928bfebaf2..161d6d4b444 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,19 +1,22 @@
-# $NetBSD: Makefile,v 1.25 2011/01/13 13:38:53 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2011/02/16 20:20:14 gls Exp $
 
-DISTNAME=		dvdauthor-0.6.18
-PKGREVISION=		2
+DISTNAME=		dvdauthor-0.7.0
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
 
 MAINTAINER=		sekiya@NetBSD.org
 HOMEPAGE=		http://dvdauthor.sourceforge.net/
 COMMENT=		Tools to assist DVD authoring
+LICENSE=		gnu-gpl-v2
+
 WRKSRC=			${WRKDIR}/dvdauthor
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		flex gmake yacc pkg-config
+# To keep a consistent behavior with previous releases
+CONFIGURE_ARGS+=	--enable-default-video-format=ntsc
 
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
diff --git a/multimedia/dvdauthor/distinfo b/multimedia/dvdauthor/distinfo
index cbb57afbeec..bad5002b32e 100644
--- a/multimedia/dvdauthor/distinfo
+++ b/multimedia/dvdauthor/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2011/01/27 00:00:58 wiz Exp $
+$NetBSD: distinfo,v 1.12 2011/02/16 20:20:14 gls Exp $
 
-SHA1 (dvdauthor-0.6.18.tar.gz) = 7b6e190a3903f617d08368e3cc5e6fd80677e2fb
-RMD160 (dvdauthor-0.6.18.tar.gz) = d7571a8371305aefb283f433440b3be2264e9e34
-Size (dvdauthor-0.6.18.tar.gz) = 392809 bytes
+SHA1 (dvdauthor-0.7.0.tar.gz) = 39501f826ae9cc6b334160ebb9c01ce9c91b31d4
+RMD160 (dvdauthor-0.7.0.tar.gz) = fa45f92cfc18a9f3327abd3c5b94fae6d4de22d0
+Size (dvdauthor-0.7.0.tar.gz) = 414191 bytes
 SHA1 (patch-aa) = 7087685affd5765dbb402200c40712c0a5130fd7
-SHA1 (patch-ab) = 04b994775facf8f3d33b34716c8be0e255043736
+SHA1 (patch-ab) = aa475337a3b6b94b09f1d53919638f54ca83bb46
+SHA1 (patch-configure) = 410993b755cdcd1989b12b6c31b99f64ee7472e0
diff --git a/multimedia/dvdauthor/patches/patch-ab b/multimedia/dvdauthor/patches/patch-ab
index d2341873693..d2f20983660 100644
--- a/multimedia/dvdauthor/patches/patch-ab
+++ b/multimedia/dvdauthor/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2011/01/27 00:00:58 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2011/02/16 20:20:14 gls Exp $
 
 Fix build with png-1.5.
 Accepted upstream in
 https://github.com/ldo/dvdauthor/commit/c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5
 
---- src/spuunmux.c.orig	2010-03-05 06:37:06.000000000 +0000
+--- src/spuunmux.c.orig	2010-05-10 07:27:55.000000000 +0000
 +++ src/spuunmux.c
-@@ -38,6 +38,7 @@
+@@ -39,6 +39,7 @@
  #include <netinet/in.h>
  
  #include <png.h>
@@ -14,12 +14,12 @@ https://github.com/ldo/dvdauthor/commit/c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5
  
  #include "rgb.h"
  #include "common.h"
-@@ -483,7 +484,7 @@ static int write_png(char *file_name,str
-     return -1;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-     png_destroy_write_struct(&png_ptr, &info_ptr);
-     fclose(fp);
-     return -1;
+@@ -610,7 +611,7 @@ static int write_png
+         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+         return -1;
+       } /*if*/
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+       {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         fclose(fp);
diff --git a/multimedia/dvdauthor/patches/patch-configure b/multimedia/dvdauthor/patches/patch-configure
new file mode 100644
index 00000000000..d0f1734fe66
--- /dev/null
+++ b/multimedia/dvdauthor/patches/patch-configure
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.1 2011/02/16 20:20:14 gls Exp $
+
+Portability fix
+
+--- configure.orig	2010-10-23 02:30:40.000000000 +0000
++++ configure
+@@ -5191,11 +5191,11 @@ fi
+ # Check whether --enable-default-video-format was given.
+ if test "${enable_default_video_format+set}" = set; then :
+   enableval=$enable_default_video_format;
+-if test "$enable_default_video_format" == "PAL" -o "$enable_default_video_format" == "pal"; then
++if test "$enable_default_video_format" = "PAL" -o "$enable_default_video_format" = "pal"; then
+ 
+ $as_echo "#define DEFAULT_VIDEO_FORMAT 2" >>confdefs.h
+ 
+-elif test "$enable_default_video_format" == "NTSC" -o "$enable_default_video_format" == "ntsc"; then
++elif test "$enable_default_video_format" = "NTSC" -o "$enable_default_video_format" = "ntsc"; then
+ 
+ $as_echo "#define DEFAULT_VIDEO_FORMAT 1" >>confdefs.h
+