Update to 6.1:

This is essentially minor bug-fix release, which most notably works
around "unable to anonymously mmap" failure at startup and fixes
typo in -speed interpretation code.  Besides bug-fixes this version
attempts to obtain exclusive lock on block device under Linux. This
opens possibility for safe deployment of automounting/autoplaying
facility under Linux 2.6. Keep in mind that it takes two to dance
tango, automounters/autoplayers has to play along as well.

6 files changed, 39 insertions, 43 deletions

diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index 87fee628218..d0e4e79b1c4 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2006/05/08 17:07:57 hira Exp $
+# $NetBSD: Makefile,v 1.22 2006/06/11 15:22:21 wiz Exp $
 #
 
-DISTNAME=	dvd+rw-tools-6.0
-PKGREVISION=	2
+DISTNAME=	dvd+rw-tools-6.1
 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 c80b5959a64..b0f298a095b 100644
--- a/sysutils/dvd+rw-tools/distinfo
+++ b/sysutils/dvd+rw-tools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2006/03/22 15:26:30 joerg Exp $
+$NetBSD: distinfo,v 1.15 2006/06/11 15:22:21 wiz Exp $
 
-SHA1 (dvd+rw-tools-6.0.tar.gz) = 964bae317a047cb8a7f311333b3cec5266f417e6
-RMD160 (dvd+rw-tools-6.0.tar.gz) = f4762e342b910867655f20858be8945ae7054f0b
-Size (dvd+rw-tools-6.0.tar.gz) = 118804 bytes
-SHA1 (patch-aa) = 36de21da2761352c6cf60498a4165ee7040bac2e
-SHA1 (patch-ab) = d6721684b65df62b348063bd680e9beb2d5ddc92
-SHA1 (patch-ac) = 9cf2a92037ab20ca567647aeff907e973d19b0bc
-SHA1 (patch-ad) = 2f585dbdb9dd657d34e92e77f3347c00c742a32e
+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 (patch-ad) = 222a820f0e4b9c96918c45141e9e550805ae6c55
diff --git a/sysutils/dvd+rw-tools/patches/patch-aa b/sysutils/dvd+rw-tools/patches/patch-aa
index 2db31445b8c..34d8a268900 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.5 2005/10/18 15:31:57 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2006/06/11 15:22:21 wiz Exp $
 
---- transport.hxx.orig	2004-08-25 01:36:29.000000000 +0200
+--- transport.hxx.orig	2006-01-26 08:02:32.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.5 2005/10/18 15:31:57 joerg Exp $
  
  inline long getmsecs()
  { struct timeval tv;
-@@ -413,7 +416,11 @@ public:
+@@ -442,7 +445,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.5 2005/10/18 15:31:57 joerg Exp $
        int            ret=0,mntsize,i;
  
  	if (f==-1) f=fd;
-@@ -442,7 +449,7 @@ public:
+@@ -471,7 +478,7 @@ public:
      {	return 1;   }
  };
  
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.5 2005/10/18 15:31:57 joerg Exp $
  
  #include <sys/ioctl.h>
  #include <camlib.h>
-@@ -609,7 +616,11 @@ public:
+@@ -638,7 +645,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 e101fbc8331..e3fe86a97d8 100644
--- a/sysutils/dvd+rw-tools/patches/patch-ab
+++ b/sysutils/dvd+rw-tools/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2006/02/01 12:51:27 xtraeme Exp $
+$NetBSD: patch-ab,v 1.5 2006/06/11 15:22:21 wiz Exp $
 
---- Makefile.m4.orig	2006-01-16 11:23:53.000000000 +0100
-+++ Makefile.m4	2006-02-01 12:35:14.000000000 +0100
-@@ -14,6 +14,7 @@
+--- Makefile.m4.orig	2006-01-20 08:08:22.000000000 +0000
++++ Makefile.m4
+@@ -14,6 +14,7 @@ ifelse(substr(OS,0,7),[MINGW32],[define(
  ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix])
  ifelse(OS,OpenBSD,[define([OS],[BSD])])
  ifelse(OS,FreeBSD,[define([OS],[BSD])LDLIBS=-lcam])
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.4 2006/02/01 12:51:27 xtraeme Exp $
  ifelse(OS,IRIX64,[define([OS],[IRIX])])
  
  ifelse(OS,MINGW32,[
-@@ -34,7 +35,7 @@
+@@ -34,7 +35,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 c3bb47ce659..08de5faffbf 100644
--- a/sysutils/dvd+rw-tools/patches/patch-ac
+++ b/sysutils/dvd+rw-tools/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2006/03/22 15:26:30 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2006/06/11 15:22:21 wiz Exp $
 
---- growisofs.c.orig	2006-01-16 12:09:41.000000000 +0100
-+++ growisofs.c	2006-02-01 12:34:24.000000000 +0100
-@@ -358,7 +358,7 @@
+--- growisofs.c.orig	2006-01-26 21:16:54.000000000 +0000
++++ growisofs.c
+@@ -372,7 +372,7 @@
  # ifndef _GNU_SOURCE
  #  define _GNU_SOURCE
  # endif
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2006/03/22 15:26:30 joerg Exp $
  # define off64_t	off_t
  # define stat64		stat
  # define fstat64	fstat
-@@ -804,7 +804,7 @@
+@@ -856,7 +856,7 @@ char *setup_fds (char *device)
      goto open_rw;
  }
  
@@ -20,16 +20,13 @@ $NetBSD: patch-ac,v 1.4 2006/03/22 15:26:30 joerg Exp $
  
  #include <sys/cdio.h>
  #include <camlib.h>
-@@ -2194,9 +2194,12 @@
-     nice(-20);
-     /* I'd rather do it right after I allocate ring buffer and fire off
-      * threads, but I'll be running without extra privileges by then:-( */
-+#if !defined(__NetBSD__) && !defined(__DragonFly__)
-     mlockall(MCL_CURRENT|MCL_FUTURE);
+@@ -2266,7 +2266,9 @@ int main (int argc, char *argv[])
+ # ifdef __FreeBSD__
+ 	syscall(SYS_mlockall,3);
+ # else
++#  if !defined(__NetBSD__) && !defined(__DragonFly__)
+ 	mlockall(MCL_CURRENT|MCL_FUTURE);
++#  endif
+ # endif
+     } while (0);
  #endif
- 
-+#endif
-+
-     mkisofs_argv = malloc ((argc+3)*sizeof(char *));
-     if (mkisofs_argv == NULL)
-         fprintf (stderr,":-( unable to allocate %lu bytes: ",
diff --git a/sysutils/dvd+rw-tools/patches/patch-ad b/sysutils/dvd+rw-tools/patches/patch-ad
index d5bcc7ad8a8..eeb972121ce 100644
--- a/sysutils/dvd+rw-tools/patches/patch-ad
+++ b/sysutils/dvd+rw-tools/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.1 2006/01/31 19:01:28 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2006/06/11 15:22:21 wiz Exp $
 
---- mp.h.orig	2006-01-31 19:44:51.000000000 +0100
-+++ mp.h	2006-01-31 19:47:56.000000000 +0100
-@@ -39,7 +39,9 @@
-   pthread_attr_t attr;
+--- mp.h.orig	2006-01-26 13:13:32.000000000 +0000
++++ mp.h
+@@ -40,7 +40,9 @@ static void *__thread_create(int (*func)
  
      if (pthread_attr_init(&attr)==0 &&
+ 	pthread_attr_setstacksize(&attr,64*1024)==0 &&
 +#ifndef __NetBSD__
  	pthread_attr_setscope(&attr,PTHREAD_SCOPE_SYSTEM)==0 &&
 +#endif