update to 0.7.1

changes:
-build system fix
-Allow format specification at top level of dvdauthor control file
-mpeg2desc now reports more details about video frames
-More explanatory XML-parsing errors

5 files changed, 8 insertions, 69 deletions

diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 14fbee766e4..b3f5731460f 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2013/02/16 11:23:31 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/04/17 17:30:14 drochner Exp $
 
-DISTNAME=		dvdauthor-0.7.0
-PKGREVISION=		9
+DISTNAME=		dvdauthor-0.7.1
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
 
diff --git a/multimedia/dvdauthor/PLIST b/multimedia/dvdauthor/PLIST
index c98c2d47a0d..71140bbaf6b 100644
--- a/multimedia/dvdauthor/PLIST
+++ b/multimedia/dvdauthor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:08:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/04/17 17:30:14 drochner Exp $
 bin/dvdauthor
 bin/dvddirdel
 bin/dvdunauthor
@@ -11,5 +11,6 @@ man/man1/dvdunauthor.1
 man/man1/mpeg2desc.1
 man/man1/spumux.1
 man/man1/spuunmux.1
+share/dvdauthor/common.xsd
 share/dvdauthor/dvdauthor.xsd
 share/dvdauthor/spumux.xsd
diff --git a/multimedia/dvdauthor/distinfo b/multimedia/dvdauthor/distinfo
index bad5002b32e..48d8f125feb 100644
--- a/multimedia/dvdauthor/distinfo
+++ b/multimedia/dvdauthor/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.12 2011/02/16 20:20:14 gls Exp $
+$NetBSD: distinfo,v 1.13 2013/04/17 17:30:14 drochner Exp $
 
-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) = aa475337a3b6b94b09f1d53919638f54ca83bb46
+SHA1 (dvdauthor-0.7.1.tar.gz) = a9636d165bf546e3e2b25b7397c33dbfa2895e6a
+RMD160 (dvdauthor-0.7.1.tar.gz) = 71bdee2048a45ea15b7d0e62e75675f9132006ca
+Size (dvdauthor-0.7.1.tar.gz) = 421324 bytes
 SHA1 (patch-configure) = 410993b755cdcd1989b12b6c31b99f64ee7472e0
diff --git a/multimedia/dvdauthor/patches/patch-aa b/multimedia/dvdauthor/patches/patch-aa
deleted file mode 100644
index ecc36924421..00000000000
--- a/multimedia/dvdauthor/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2011/01/27 00:00:58 wiz Exp $
-
-times(3) argument is not optional.
-Accepted upstream in
-https://github.com/ldo/dvdauthor/commit/1c1c707a44fe6959fb9d1b9713ba996f462ffbce
-
---- src/dvdunauthor.c.orig	2010-03-05 04:20:47.000000000 +0000
-+++ src/dvdunauthor.c
-@@ -1033,6 +1033,7 @@ static void getVobs(dvd_reader_t *dvd, c
-     const cell_adr_t *cells;
-     int numcells,i,j,totalsect,numsect;
-     clock_t start,now,clkpsec;
-+    struct tms unused_tms;
- 
-     cptr = titlef ? ifo->vts_c_adt : ifo->menu_c_adt;
-     if (cptr)
-@@ -1054,7 +1055,7 @@ static void getVobs(dvd_reader_t *dvd, c
-     for (i = 0; i < numcells; i++)
-         totalsect += cells[i].last_sector - cells[i].start_sector + 1;
-     clkpsec = sysconf(_SC_CLK_TCK);
--    start = times(NULL);
-+    start = times(&unused_tms);
-     
-     for (i = 0; i < numcells; i++)
-       {
-@@ -1106,7 +1107,7 @@ static void getVobs(dvd_reader_t *dvd, c
-             int rl = cells[i].last_sector + 1 - b;
-             if (rl > BIGBLOCKSECT)
-                 rl = BIGBLOCKSECT;
--            now = times(NULL);
-+            now = times(&unused_tms);
-             if (now-start > 3 * clkpsec && numsect > 0)
-               {
-                 const int rmn = (totalsect - numsect) * (now - start) / (numsect * clkpsec);
diff --git a/multimedia/dvdauthor/patches/patch-ab b/multimedia/dvdauthor/patches/patch-ab
deleted file mode 100644
index d2f20983660..00000000000
--- a/multimedia/dvdauthor/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$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-05-10 07:27:55.000000000 +0000
-+++ src/spuunmux.c
-@@ -39,6 +39,7 @@
- #include <netinet/in.h>
- 
- #include <png.h>
-+#include <zlib.h>
- 
- #include "rgb.h"
- #include "common.h"
-@@ -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);