Updated to version 0.70.6

Maintainer update by Sergey Svishchev (small changes by Klaus Heinz)

Pkgsrc changes:
  - Required version of GTK2 is now 2.6.0 and up.
  - Many pkgsrc patches related to NetBSD support (scsi-netbsd.c, patch-ab,
    patch-ac, patch-ae and part of patch-ad) were committed to the stable
    branch of dvdisaster (0.70.x). The rest (except for patch-ah) was
    integrated into the unstable branch (0.71.x).

Changes since version 0.70.4:
=============================
NOTE to downstream maintainers:
 - Keep up the good work! Thanks :-)
 - GTK+ dependency has been bumped up to >= 2.6.0 (was formerly 2.0)

0.70 (pl6) 04-03-2008
	- rolled back the Windows filename encoding fixes;
	  they caused large file support to be broken
	  Thanks to Markus G. for bringing this to my attention!

0.70 (pl5) 24-02-2008 various backports from 0.71.24:
	- enlarged scsi timeout for Linux as newer Kernels seem
          to freeze on timeout
	- Windows filename encoding fixes

6 files changed, 9 insertions, 236 deletions

diff --git a/sysutils/dvdisaster/patches/patch-ab b/sysutils/dvdisaster/patches/patch-ab
deleted file mode 100644
index ebba75fe7ac..00000000000
--- a/sysutils/dvdisaster/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $
-
-  make it work with NetBSD's SCSI layer
-
---- scsi-layer.h.orig	2007-01-20 15:44:49.000000000 +0000
-+++ scsi-layer.h	2007-01-27 17:36:15.000000000 +0000
-@@ -117,7 +117,7 @@
- } Sense;
- #endif
- 
--#ifdef SYS_UNKNOWN
-+#if defined(SYS_UNKNOWN) || defined(SYS_NETBSD)
- #define MAX_CDB_SIZE 16   /* longest possible SCSI command */
- 
- /* This is actually the little endian version of the
-@@ -177,7 +177,7 @@
- 
- typedef struct _DeviceHandle
- {
--#ifdef SYS_LINUX
-+#if defined(SYS_LINUX) || defined(SYS_NETBSD)
-    int fd;                    /* device file descriptor */
- #endif
- #ifdef SYS_FREEBSD
diff --git a/sysutils/dvdisaster/patches/patch-ac b/sysutils/dvdisaster/patches/patch-ac
deleted file mode 100644
index 098a8261563..00000000000
--- a/sysutils/dvdisaster/patches/patch-ac
+++ /dev/null
@@ -1,136 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $
-
-  - Add system type SYS_NETBSD
-
-  - Process "--with*" options before "--*dir=*". Since the latter is a more
-    general expression it catches "--with-*dir" when it should not.
-
-  - Allow several "-" characters in options (provided by upstream author)
-
---- scripts/bash-based-configure.orig	2006-04-18 20:14:45.000000000 +0200
-+++ scripts/bash-based-configure
-@@ -60,7 +60,7 @@
- # WITH_OPTION name default  adds -DWITH_OPTION_VALUE for -with-option=value args
- #			    to CFG_WITH_OPTIONS,
- 
--CONFIGURE_VERSION="0.51"
-+CONFIGURE_VERSION="0.51nb2"
- 
- echo "Bash based configure V$CONFIGURE_VERSION"
- echo
-@@ -129,6 +129,15 @@ case "$cfg_uname" in
- 	}
- 	;;
- 
-+  NetBSD*) cfg_system=netbsd
-+        CFG_SYS_OPTIONS="-DSYS_NETBSD"
-+        CFG_EXE_SUFFIX=""
-+	CFG_SYS_LDFLAGS="-lutil"
-+	function add_linker_flags()
-+	{  lflags_return="-L$1 -Wl,-rpath,$1 $2"
-+	}
-+	;;
-+
-   *) cfg_system=unknown-system
-         CFG_SYS_OPTIONS="-DSYS_UNKNOWN"
-         CFG_EXE_SUFFIX=""
-@@ -188,6 +197,18 @@ do
-   -buildroot=* | --buildroot=*)
-     cfg_buildroot=$cfg_optarg ;;
- 
-+  # process the -with-foo=bar into $cfg_with_foo=bar
-+
-+  -with-*=* | --with-*=*)
-+    eval `echo "$cfg_opt" | sed -e 's/[-]*with-/cfg_with_/' -e 'y/-/_/'` ;;
-+
-+  # process -with-foo into $cfg_with_foo=yes
-+
-+  -with-* | --with-*)
-+    cfg_eval=`echo "$cfg_opt" | sed -e 's/[-]*with-/cfg_with_/' -e 'y/-/_/'`
-+    cfg_eval="$cfg_eval=yes"
-+    eval "$cfg_eval" ;;
-+
-   -*dir=* | --*dir=*)
-     eval `echo "$cfg_opt" | sed -e 's/[-]*/cfg_/' ` ;;
- 
-@@ -201,18 +222,6 @@ do
-   -*-libraries=*)
-     eval `echo "$cfg_opt" | sed -e 's/[-]*/cfg_/' -e 's/-libraries/_lib/'` ;;
- 
--  # process the -with-foo=bar into $cfg_with_foo=bar
--
--  -with-*=* | --with-*=*)
--    eval `echo "$cfg_opt" | sed -e 's/[-]*with-/cfg_with_/' -e 's/-/_/'` ;;
--
--  # process -with-foo into $cfg_with_foo=yes
--
--  -with-* | --with-*)
--    cfg_eval=`echo "$cfg_opt" | sed -e 's/[-]*with-/cfg_with_/' -e 's/-/_/'`
--    cfg_eval="$cfg_eval=yes"
--    eval "$cfg_eval" ;;
--
-   -version | --version)
-     exit 0 ;;
- 
-@@ -342,15 +351,16 @@ function REQUIRE_GCC()
- # in one sweep at the Makefile.config generation.
- 
- function WITH_OPTION()
--{  local option_name=`echo $1 | sed -e 's/-/_/'`
-+{  local option_name=$1
-+   local cooked_name=`echo $1 | sed -e 'y/-/_/'`
-    local default="$2"
-    local description="$3"
- 
-    # first check number of arguments and deal with help mode
- 
--   if test -z "$option_name" || test -z "$default"; then 
-+   if test -z "$cooked_name" || test -z "$default"; then 
-       echo "WITH_OPTION needs at last two arguments"
--      return option_name
-+      return cooked_name
-    fi
- 
-    if test -n "$cfg_help_mode"; then
-@@ -362,31 +372,31 @@ function WITH_OPTION()
- 
-    echo -n " with $option_name: "
- 
--   eval "cfg_forced_arg=\$cfg_force_with_$option_name"
-+   eval "cfg_forced_arg=\$cfg_force_with_$cooked_name"
-    if test -n "$cfg_forced_arg"; then
-       echo "$cfg_forced_arg (forced by previous tests)"
--      CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${option_name}_$cfg_forced_arg"
--      eval "cfg_with_$option_name=\$cfg_forced_arg"
--      export "cfg_with_$option_name"
-+      CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${cooked_name}_$cfg_forced_arg"
-+      eval "cfg_with_$cooked_name=\$cfg_forced_arg"
-+      export "cfg_with_$cooked_name"
-       return 0
-    fi
- 
-    # now start the real processing
--   # if $cfg_with_$option_name is unset, we set it to the default value
-+   # if $cfg_with_$cooked_name is unset, we set it to the default value
-    # so that the programmer can write custom shell functions depending on it.
- 
--   eval "cfg_user_arg=\$cfg_with_$option_name"
-+   eval "cfg_user_arg=\$cfg_with_$cooked_name"
- 
-    if test -z "$cfg_user_arg"; then
- 	echo "$default"
--	CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${option_name}_$default"
--	eval "cfg_with_$option_name=\$default"
-+	CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${cooked_name}_$default"
-+	eval "cfg_with_$cooked_name=\$default"
-    else
- 	echo "$cfg_user_arg (user supplied)"
--	CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${option_name}_$cfg_user_arg"
-+	CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${cooked_name}_$cfg_user_arg"
-    fi
- 
--   export "cfg_with_$option_name"
-+   export "cfg_with_$cooked_name"
-    return 0
- }
- 
diff --git a/sysutils/dvdisaster/patches/patch-ad b/sysutils/dvdisaster/patches/patch-ad
index a3c54c5f7d3..561102ed778 100644
--- a/sysutils/dvdisaster/patches/patch-ad
+++ b/sysutils/dvdisaster/patches/patch-ad
@@ -1,11 +1,9 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $
+$NetBSD: patch-ad,v 1.2 2008/11/23 23:40:12 heinz Exp $
 
   - Honor configure option --with-embedded-src-path
+    (already committed in unstable version upstream)
 
-  - Unification of SYS_(LINUX|FREEBSD|DARWIN|UNKNOWN) to "ifndef SYS_MINGW"
-    taken from upstream CVS sources.
-
---- closure.c.orig	2007-01-20 16:44:59.000000000 +0100
+--- closure.c.orig	2008-03-04 10:01:15.000000000 +0000
 +++ closure.c
 @@ -174,10 +174,13 @@ static void get_base_dirs()
     char *appdata;
@@ -22,28 +20,12 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $
  #ifndef SYS_MINGW
     if(!stat(SRCDIR, &mystat))
     {  Closure->binDir = g_strdup(SRCDIR);
-@@ -187,12 +190,14 @@ static void get_base_dirs()
+@@ -187,6 +190,8 @@ static void get_base_dirs()
     } 
  #endif
  
 +#endif /* WITH_EMBEDDED_SRC_PATH_YES */
 +
     /*** Otherwise try the installation directory. 
- 	On Linux this is a hardcoded directory.
+ 	On Unices this is a hardcoded directory.
  	Windows has binary distributions with no prior known installation place,
- 	but luckily it provides a way for figuring out that location. */
- 
--#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN) || defined(SYS_UNKNOWN)
-+#ifndef SYS_MINGW
-    if(!stat(BINDIR, &mystat))
-      Closure->binDir = g_strdup(BINDIR);
- 
-@@ -212,7 +217,7 @@ static void get_base_dirs()
-    /*** The location of the dotfile depends on the operating system. 
- 	Under Unix the users home directory is used. */
- 
--#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN) || defined(SYS_UNKNOWN)
-+#ifndef SYS_MINGW
- find_dotfile:
- 
-    Closure->dotFile = g_strdup_printf("%s/.dvdisaster", g_getenv("HOME"));
diff --git a/sysutils/dvdisaster/patches/patch-ae b/sysutils/dvdisaster/patches/patch-ae
deleted file mode 100644
index b6093793f52..00000000000
--- a/sysutils/dvdisaster/patches/patch-ae
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $
-
-  On NetBSD behave similar to other UN*X variants regarding the browser.
-
---- show-manual.c.orig	2007-01-20 16:44:59.000000000 +0100
-+++ show-manual.c
-@@ -21,7 +21,7 @@
- 
- #include "dvdisaster.h"
- 
--#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN)
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN)
- #include <sys/wait.h>
- #endif
- 
-@@ -34,7 +34,7 @@
-  *** Ask user to specify his browser
-  ***/
- 
--#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN)
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN)
- #define SEARCH_BUTTON 1
- 
- typedef struct
-@@ -172,7 +172,7 @@ static void msg_destroy_cb(GtkWidget *wi
-    bi->msg = NULL; 
- }
- 
--#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN)
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN)
- 
- /* 
-  * The following list of browsers and html wrappers
-@@ -270,7 +270,7 @@ static gboolean browser_timeout_func(gpo
-  * Invoke the browser
-  */
- 
--#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN)
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN)
- static void try_browser(browser_info *bi)
- {  pid_t pid;
- 
-@@ -390,7 +390,7 @@ void ShowHTML(char *target)
-    g_timeout_add(1000, browser_timeout_func, (gpointer)bi);
- #endif
- 
--#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN)
-+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN)
-    /* Try the first browser */
- 
-    browser_index = 0;
diff --git a/sysutils/dvdisaster/patches/patch-af b/sysutils/dvdisaster/patches/patch-af
index bdfb7615a52..9ec2582e2ea 100644
--- a/sysutils/dvdisaster/patches/patch-af
+++ b/sysutils/dvdisaster/patches/patch-af
@@ -1,7 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $
+$NetBSD: patch-af,v 1.2 2008/11/23 23:40:12 heinz Exp $
 
   - Add option "--with-embedded-src-path", default value is "yes" to keep
     the current behaviour.
+    (already committed in unstable version upstream)
 
 --- configure.orig	2007-01-20 13:30:22.000000000 +0100
 +++ configure
diff --git a/sysutils/dvdisaster/patches/patch-ag b/sysutils/dvdisaster/patches/patch-ag
index fa683b88e4a..c7336444a6f 100644
--- a/sysutils/dvdisaster/patches/patch-ag
+++ b/sysutils/dvdisaster/patches/patch-ag
@@ -1,7 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $
+$NetBSD: patch-ag,v 1.2 2008/11/23 23:40:12 heinz Exp $
 
   - Use SRCDIR only when configure option --with-embedded-src-path is set
     to yes.
+    (already committed in unstable version upstream)
 
 --- dvdisaster.c.orig	2007-01-20 16:44:59.000000000 +0100
 +++ dvdisaster.c