>Number:         25433
>Category:       pkg
>Synopsis:       sysutils/dvd+rw-tools update to 5.19-1.4.9.7
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 02 14:19:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     FUKAUMI Naoki
>Release:        NetBSD 2.0E
>Organization:
	FUKAUMI Naoki
>Environment:
System: NetBSD ea65.naobsd.org 2.0E NetBSD 2.0E (EA65-MP) #0: Sun May 2 15:51:39 JST 2004 root@ea65.naobsd.org:/usr/obj/i386/sys/arch/i386/compile/EA65-MP i386
Architecture: i386
Machine: i386
>Description:
	- Update dvd+rw-tools to 5.19-1.4.9.7
	- Install growisofs(1) man page (diffs from Kouichirou Hiratsuka)
	- Add support for statfs -> statvfs change in NetBSD-current
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/sysutils/dvd+rw-tools/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	31 Mar 2004 08:50:25 -0000	1.8
+++ Makefile	2 May 2004 12:34:26 -0000
@@ -1,7 +1,8 @@
 # $NetBSD: Makefile,v 1.8 2004/03/31 08:50:25 wiz Exp $
 #
 
-DISTNAME=	dvd+rw-tools-5.17.4.8.6
+DISTNAME=	dvd+rw-tools-5.19-1.4.9.7
+PKGNAME=	dvd+rw-tools-5.19.4.9.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://fy.chalmers.se/~appro/linux/DVD+RW/tools/
 
@@ -11,11 +12,14 @@
 
 DEPENDS+=	{cdrecord-[1-9]*,cdrtools-ossdvd-[0-9]*}:../../sysutils/cdrecord
 
+WRKSRC=		${WRKDIR}/${PKGNAME}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/growisofs ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-booktype ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-format ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-mediainfo ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/dvd+rw-tools
 	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/doc/html/dvd+rw-tools
 
Index: PLIST
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/sysutils/dvd+rw-tools/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	4 Jun 2003 16:12:11 -0000	1.3
+++ PLIST	2 May 2004 07:49:59 -0000
@@ -3,5 +3,6 @@
 bin/dvd+rw-booktype
 bin/dvd+rw-format
 bin/dvd+rw-mediainfo
+man/man1/growisofs.1
 share/doc/html/dvd+rw-tools/index.html
 @dirrm share/doc/html/dvd+rw-tools
Index: distinfo
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/sysutils/dvd+rw-tools/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	30 Mar 2004 15:19:01 -0000	1.4
+++ distinfo	2 May 2004 12:22:17 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.4 2004/03/30 15:19:01 martin Exp $
 
-SHA1 (dvd+rw-tools-5.17.4.8.6.tar.gz) = 635b76e3d2b8b5702b179a57bd51086fce065c59
-Size (dvd+rw-tools-5.17.4.8.6.tar.gz) = 91908 bytes
-SHA1 (patch-aa) = 7371c4d10ec0b7c172936cd4b57e6140eb3e1f21
+SHA1 (dvd+rw-tools-5.19-1.4.9.7.tar.gz) = bb891ded04afbf058170466c18401b069851923c
+Size (dvd+rw-tools-5.19-1.4.9.7.tar.gz) = 97678 bytes
+SHA1 (patch-aa) = 414a1d9fb6dc7bfd652471d839a5053216763b21
Index: patches/patch-aa
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/sysutils/dvd+rw-tools/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- patches/patch-aa	10 Nov 2003 00:07:41 -0000	1.1
+++ patches/patch-aa	2 May 2004 12:22:12 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-aa,v 1.1 2003/11/10 00:07:41 wiz Exp $
 
---- transport.hxx.orig	Fri Sep 19 13:04:06 2003
-+++ transport.hxx
+--- transport.hxx.orig	2004-04-20 01:25:06.000000000 +0900
++++ transport.hxx	2004-05-02 21:20:28.000000000 +0900
 @@ -6,7 +6,7 @@
  // For further details see http://fy.chalmers.se/~appro/linux/DVD+RW/
  //
@@ -11,3 +11,37 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
+@@ -16,6 +16,9 @@
+ #include <fcntl.h>
+ #include <poll.h>
+ #include <sys/time.h>
++#if __NetBSD_Version__ >= 200040000
++#include <sys/statvfs.h>
++#endif
+ 
+ inline long getmsecs()
+ { struct timeval tv;
+@@ -407,7 +410,11 @@
+     // mounted, so that it could as well just return 0;
+     int umount(int f=-1)
+     { struct stat    fsb,msb;
++#if __NetBSD_Version__ >= 200040000
++      struct statvfs *mntbuf;
++#else
+       struct statfs *mntbuf;
++#endif
+       int            ret=0,mntsize,i;
+ 
+ 	if (f==-1) f=fd;
+@@ -603,7 +610,11 @@
+     }
+     int umount(int f=-1)
+     { struct stat    fsb,msb;
++#if __NetBSD_Version__ >= 200040000
++      struct statvfs *mntbuf;
++#else
+       struct statfs *mntbuf;
++#endif
+       int            ret=0,mntsize,i;
+ 
+ 	if (f==-1) f=fd;
>Release-Note:
>Audit-Trail:
>Unformatted: