Update to 7.0:

This release adds Blu-ray Disc support and Mac OS X 10>=2 support.

5 files changed, 26 insertions, 27 deletions

diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index c8ff113952d..e283f3d2e69 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2007/01/07 09:14:11 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2007/06/08 08:07:04 wiz Exp $
 #
 
-DISTNAME=	dvd+rw-tools-6.1
-PKGREVISION=	1
+DISTNAME=	dvd+rw-tools-7.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://fy.chalmers.se/~appro/linux/DVD+RW/tools/
 
diff --git a/sysutils/dvd+rw-tools/distinfo b/sysutils/dvd+rw-tools/distinfo
index c3592e11109..4d812ac1183 100644
--- a/sysutils/dvd+rw-tools/distinfo
+++ b/sysutils/dvd+rw-tools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2006/06/21 23:30:49 joerg Exp $
+$NetBSD: distinfo,v 1.17 2007/06/08 08:07:05 wiz Exp $
 
-SHA1 (dvd+rw-tools-6.1.tar.gz) = ff63b6c6ee33cd777164d5ad72ab5c1c12430916
-RMD160 (dvd+rw-tools-6.1.tar.gz) = d06eb401fc53bf11df39ba89d508b67f3a0b915f
-Size (dvd+rw-tools-6.1.tar.gz) = 121425 bytes
-SHA1 (patch-aa) = bbb7e4506145ca171c1248d5240ab02f430b70fd
-SHA1 (patch-ab) = 68fefa16dc1e2d7dec40b7ab41df5fc59476ad23
-SHA1 (patch-ac) = bb682b017636734d3e9b9509f9889bb45ef44ba5
+SHA1 (dvd+rw-tools-7.0.tar.gz) = 623fd1c2264a5dfaa721449cc8cc7be4ac2824ba
+RMD160 (dvd+rw-tools-7.0.tar.gz) = d522ba5345eb74705e6e3970328034a3d01de75e
+Size (dvd+rw-tools-7.0.tar.gz) = 131259 bytes
+SHA1 (patch-aa) = fe1382ff484651bc54b0729f182ec31c6e0b84b9
+SHA1 (patch-ab) = aa138938229a5c6f899fbbfe04242cda415b4e4b
+SHA1 (patch-ac) = 98ee05cc689974fc3d31a29e2541f4e2ccffdb92
 SHA1 (patch-ad) = cc4cb726b91f6317d928a8a0c1fef81ad6de44e2
diff --git a/sysutils/dvd+rw-tools/patches/patch-aa b/sysutils/dvd+rw-tools/patches/patch-aa
index 34d8a268900..dcb9715553d 100644
--- a/sysutils/dvd+rw-tools/patches/patch-aa
+++ b/sysutils/dvd+rw-tools/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2006/06/11 15:22:21 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2007/06/08 08:07:05 wiz Exp $
 
---- transport.hxx.orig	2006-01-26 08:02:32.000000000 +0000
+--- transport.hxx.orig	2006-09-23 11:29:07.000000000 +0000
 +++ transport.hxx
 @@ -6,7 +6,7 @@
  // For further details see http://fy.chalmers.se/~appro/linux/DVD+RW/
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.6 2006/06/11 15:22:21 wiz Exp $
  
  inline long getmsecs()
  { struct timeval tv;
-@@ -442,7 +445,11 @@ public:
+@@ -446,7 +449,11 @@ public:
      // mounted, so that it could as well just return 0;
      int umount(int f=-1)
      { struct stat    fsb,msb;
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.6 2006/06/11 15:22:21 wiz Exp $
        int            ret=0,mntsize,i;
  
  	if (f==-1) f=fd;
-@@ -471,7 +478,7 @@ public:
+@@ -475,7 +482,7 @@ public:
      {	return 1;   }
  };
  
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.6 2006/06/11 15:22:21 wiz Exp $
  
  #include <sys/ioctl.h>
  #include <camlib.h>
-@@ -638,7 +645,11 @@ public:
+@@ -642,7 +649,11 @@ public:
      }
      int umount(int f=-1)
      { struct stat    fsb,msb;
diff --git a/sysutils/dvd+rw-tools/patches/patch-ab b/sysutils/dvd+rw-tools/patches/patch-ab
index e3fe86a97d8..840a475d604 100644
--- a/sysutils/dvd+rw-tools/patches/patch-ab
+++ b/sysutils/dvd+rw-tools/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2006/06/11 15:22:21 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2007/06/08 08:07:05 wiz Exp $
 
---- Makefile.m4.orig	2006-01-20 08:08:22.000000000 +0000
+--- Makefile.m4.orig	2006-09-24 17:55:19.000000000 +0000
 +++ Makefile.m4
 @@ -14,6 +14,7 @@ ifelse(substr(OS,0,7),[MINGW32],[define(
  ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix])
@@ -9,8 +9,8 @@ $NetBSD: patch-ab,v 1.5 2006/06/11 15:22:21 wiz Exp $
 +ifelse(OS,DragonFly,[define([OS],[BSD])LDLIBS=-lcam])
  ifelse(OS,IRIX64,[define([OS],[IRIX])])
  
- ifelse(OS,MINGW32,[
-@@ -34,7 +35,7 @@ ifelse(OS,BSD,[
+ ifelse(OS,Darwin,[
+@@ -52,7 +53,7 @@ ifelse(OS,BSD,[
  CC	?=gcc
  CFLAGS	+=$(WARN) -O2 -pthread -D_THREAD_SAFE -D_REENTRANT
  CXX	?=g++
diff --git a/sysutils/dvd+rw-tools/patches/patch-ac b/sysutils/dvd+rw-tools/patches/patch-ac
index 08de5faffbf..75924e685df 100644
--- a/sysutils/dvd+rw-tools/patches/patch-ac
+++ b/sysutils/dvd+rw-tools/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.5 2006/06/11 15:22:21 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2007/06/08 08:07:05 wiz Exp $
 
---- growisofs.c.orig	2006-01-26 21:16:54.000000000 +0000
+--- growisofs.c.orig	2006-09-24 17:28:53.000000000 +0000
 +++ growisofs.c
-@@ -372,7 +372,7 @@
- # ifndef _GNU_SOURCE
+@@ -388,7 +388,7 @@
  #  define _GNU_SOURCE
  # endif
--#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || \
+-      (defined(__APPLE__) && defined(__MACH__))
++      (defined(__APPLE__) && defined(__MACH__)) || defined(__DragonFly__)
  # define off64_t	off_t
  # define stat64		stat
  # define fstat64	fstat
-@@ -856,7 +856,7 @@ char *setup_fds (char *device)
+@@ -895,7 +895,7 @@ char *setup_fds (char *device)
      goto open_rw;
  }
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.5 2006/06/11 15:22:21 wiz Exp $
  
  #include <sys/cdio.h>
  #include <camlib.h>
-@@ -2266,7 +2266,9 @@ int main (int argc, char *argv[])
+@@ -2710,7 +2710,9 @@ int main (int argc, char *argv[])
  # ifdef __FreeBSD__
  	syscall(SYS_mlockall,3);
  # else