update to 0.6.18

changes:
-implement link-subset jumps
-implement audio and subpicture content attributes
-misc fixes and improvements

3 files changed, 31 insertions, 31 deletions

diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 552bd573a8e..ba50e461484 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/05/08 16:11:06 drochner Exp $
 
-DISTNAME=		dvdauthor-0.6.14
-PKGREVISION=		7
+DISTNAME=		dvdauthor-0.6.18
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
 
 MAINTAINER=		sekiya@NetBSD.org
 HOMEPAGE=		http://dvdauthor.sourceforge.net/
 COMMENT=		Tools to assist DVD authoring
+WRKSRC=			${WRKDIR}/dvdauthor
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		flex gmake yacc
+USE_TOOLS+=		flex gmake yacc pkg-config
 
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
diff --git a/multimedia/dvdauthor/distinfo b/multimedia/dvdauthor/distinfo
index 7bc49a6b6d4..c135958e2df 100644
--- a/multimedia/dvdauthor/distinfo
+++ b/multimedia/dvdauthor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/09/07 18:25:20 drochner Exp $
+$NetBSD: distinfo,v 1.9 2010/05/08 16:11:06 drochner Exp $
 
-SHA1 (dvdauthor-0.6.14.tar.gz) = 493412bf103069b9261af3be1bc23da56d7d112a
-RMD160 (dvdauthor-0.6.14.tar.gz) = b5d75b613c3be1e41ea5c3f247a993723430977a
-Size (dvdauthor-0.6.14.tar.gz) = 319371 bytes
-SHA1 (patch-aa) = cb9ef061b2384c434d7c6b166b1fdb812d2999e2
+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 (patch-aa) = b8daa292a38786f7da2a6dcba9d03cd00260086c
diff --git a/multimedia/dvdauthor/patches/patch-aa b/multimedia/dvdauthor/patches/patch-aa
index 73613de9c35..6bed76f2aa5 100644
--- a/multimedia/dvdauthor/patches/patch-aa
+++ b/multimedia/dvdauthor/patches/patch-aa
@@ -1,30 +1,30 @@
-$NetBSD: patch-aa,v 1.3 2009/09/07 18:25:20 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2010/05/08 16:11:06 drochner Exp $
 
---- src/dvdunauthor.c.orig	2009-09-05 13:45:16.000000000 +0200
+--- src/dvdunauthor.c.orig	2010-03-05 04:20:47.000000000 +0000
 +++ src/dvdunauthor.c
-@@ -818,6 +818,7 @@ static void getVobs( dvd_reader_t *dvd, 
-     cell_adr_t *cells;
+@@ -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 ) {
-@@ -836,7 +837,7 @@ static void getVobs( dvd_reader_t *dvd, 
-     for( i=0; i<numcells; i++ )
+     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);
+     clkpsec = sysconf(_SC_CLK_TCK);
+-    start = times(NULL);
++    start = times(&unused_tms);
      
-     for( i=0; i<numcells; i++ ) {
-         int h,b,plen;
-@@ -874,7 +875,7 @@ static void getVobs( dvd_reader_t *dvd, 
-         for( b=cells[i].start_sector; b<=cells[i].last_sector; b+=BIGBLOCKSECT ) {
-             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 ) {
-                 int rmn=(totalsect-numsect)*(now-start)/(numsect*clkpsec);
-                 fprintf(stderr,"STAT: [%d] VOB %d, Cell %d (%d%%, %d:%02d remain)\r",i,cells[i].vob_id,cells[i].cell_id,(numsect*100+totalsect/2)/totalsect,rmn/60,rmn%60);
+     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);