update to 1.2.2

changes: Man page cleanup

3 files changed, 24 insertions, 22 deletions

diff --git a/sysutils/cdrdao/patches/patch-aa b/sysutils/cdrdao/patches/patch-aa
index bb0deac3629..a608ef5eaca 100644
--- a/sysutils/cdrdao/patches/patch-aa
+++ b/sysutils/cdrdao/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2004/07/19 02:21:57 fredb Exp $
+$NetBSD: patch-aa,v 1.7 2006/12/11 12:28:36 drochner Exp $
 
---- dao/ScsiIf-lib.cc.orig	2004-04-13 13:38:58.000000000 -0500
+--- dao/ScsiIf-lib.cc.orig	2006-09-19 11:07:11.000000000 +0200
 +++ dao/ScsiIf-lib.cc
-@@ -289,6 +289,12 @@
+@@ -289,6 +289,12 @@ int ScsiIf::inquiry()
      revision_[i] = 0;
    }
  
@@ -15,3 +15,18 @@ $NetBSD: patch-aa,v 1.6 2004/07/19 02:21:57 fredb Exp $
    return 0;
  }
  
+@@ -430,6 +436,7 @@ const int ScsiIf::lun ()
+ #include "ScsiIf-common.cc"
+ //<<<<<<< ScsiIf-lib.cc
+ 
++#if 0
+ #ifndef linux
+ 
+ /* Function for mapping any SCSI device to the corresponding SG device.
+@@ -576,5 +583,6 @@ const char *ScsiIfImpl::openScsiDevAsSg(
+ }
+ 
+ #endif /* linux */
++#endif
+ //=======
+ //>>>>>>> 1.6
diff --git a/sysutils/cdrdao/patches/patch-ab b/sysutils/cdrdao/patches/patch-ab
index c29474c3821..2a6530d7aa8 100644
--- a/sysutils/cdrdao/patches/patch-ab
+++ b/sysutils/cdrdao/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.5 2005/10/10 21:36:56 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2006/12/11 12:28:36 drochner Exp $
 
---- dao/main.cc.orig	2005-05-09 15:48:40.000000000 +0000
+--- dao/main.cc.orig	2006-09-19 11:07:11.000000000 +0200
 +++ dao/main.cc
-@@ -108,7 +108,7 @@ static TrackData::SubChannelMode READ_SU
- 
- static Settings *SETTINGS = NULL; // settings read from $HOME/.cdrdao
+@@ -129,7 +129,7 @@ static HANDLE fh = NULL;
+ static char devstr[10];
+ #endif
  
 -#if defined(__FreeBSD__)
 +#if defined(__FreeBSD__) || defined(__DragonFly__)
  
  #  ifdef USE_SCGLIB
  static const char *SCSI_DEVICE = "0,0,0";
-@@ -124,7 +124,11 @@ static int FIFO_BUFFERS = 32;
+@@ -145,7 +145,11 @@ static int FIFO_BUFFERS = 32;
  
  #else
  
diff --git a/sysutils/cdrdao/patches/patch-ap b/sysutils/cdrdao/patches/patch-ap
deleted file mode 100644
index edc77413cc4..00000000000
--- a/sysutils/cdrdao/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/05/29 15:22:29 drochner Exp $
-
---- xdao/ProgressDialog.h.orig	2006-05-29 10:39:33.000000000 +0200
-+++ xdao/ProgressDialog.h
-@@ -62,7 +62,7 @@ private:
-   bool leadTimeFilled_;
- 
-   struct timeval time_;
--  bool ProgressDialog::time();
-+  bool time();
- 
-   Gtk::Button *cancelButton_;
-   Gtk::Button *closeButton_;