From acce644c16643b31a3db93ea5ad1c1025ed10ce1 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Mon, 7 Sep 2009 18:25:20 +0000
Subject: fix non-portable times(NULL) invocation which made "dvdunauthor"
 crash on NetBSD, bump PKGREVISION

---
 multimedia/dvdauthor/Makefile         |  4 ++--
 multimedia/dvdauthor/distinfo         |  3 ++-
 multimedia/dvdauthor/patches/patch-aa | 30 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 multimedia/dvdauthor/patches/patch-aa

(limited to 'multimedia')

diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index bbbff6b396d..b08ecada25f 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 21:20:14 sno Exp $
+# $NetBSD: Makefile,v 1.19 2009/09/07 18:25:20 drochner Exp $
 
 DISTNAME=		dvdauthor-0.6.14
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
 
diff --git a/multimedia/dvdauthor/distinfo b/multimedia/dvdauthor/distinfo
index 85ede1bc0b3..7bc49a6b6d4 100644
--- a/multimedia/dvdauthor/distinfo
+++ b/multimedia/dvdauthor/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2007/11/11 16:59:26 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/09/07 18:25:20 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
diff --git a/multimedia/dvdauthor/patches/patch-aa b/multimedia/dvdauthor/patches/patch-aa
new file mode 100644
index 00000000000..73613de9c35
--- /dev/null
+++ b/multimedia/dvdauthor/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.3 2009/09/07 18:25:20 drochner Exp $
+
+--- src/dvdunauthor.c.orig	2009-09-05 13:45:16.000000000 +0200
++++ src/dvdunauthor.c
+@@ -818,6 +818,7 @@ static void getVobs( dvd_reader_t *dvd, 
+     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++ )
+         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++ ) {
+         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);
-- 
cgit v1.2.3