9 files changed, 129 insertions, 1 deletions
diff --git a/sysutils/cdrdao/files/patch-configure b/sysutils/cdrdao/files/patch-configure
index 15c0ed8..92025f7 100644
--- a/sysutils/cdrdao/files/patch-configure
+++ b/sysutils/cdrdao/files/patch-configure
@@ -1,5 +1,14 @@
 --- configure.orig	Mon Oct  7 03:53:55 2002
 +++ configure	Sat Oct 12 18:06:18 2002
+@@ -5640,7 +5640,7 @@
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-  min_gtkmm_version=1.2.9
++  min_gtkmm_version=1.2.8
+ 
+   echo "$as_me:5645: checking for GTK-- - version >= $min_gtkmm_version" >&5
+ echo $ECHO_N "checking for GTK-- - version >= $min_gtkmm_version... $ECHO_C" >&6
 @@ -6107,7 +6107,7 @@
    scsi_if_src=ScsiIf-lib.cc
  
diff --git a/sysutils/cdrdao/files/patch-dao::cdrdao.man b/sysutils/cdrdao/files/patch-dao::cdrdao.man
new file mode 100644
index 0000000..2dd0502
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-dao::cdrdao.man
@@ -0,0 +1,16 @@
+--- dao/cdrdao.man.orig	Sat Dec 28 03:05:59 2002
++++ dao/cdrdao.man	Sat Dec 28 03:08:17 2002
+@@ -762,11 +762,9 @@
+ .I cdrdao
+ in that order:
+ 
+-1. /etc/cdrdao.conf
++1. %%LOCALBASE%%/etc/cdrdao.conf
+ 
+-2. /etc/defaults/cdrdao
+-
+-3. $HOME/.cdrdao
++2. $HOME/.cdrdao
+ 
+ 
+ Command line options will overwrite the loaded settings.
diff --git a/sysutils/cdrdao/files/patch-dao::main.cc b/sysutils/cdrdao/files/patch-dao::main.cc
new file mode 100644
index 0000000..8b15de0
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-dao::main.cc
@@ -0,0 +1,15 @@
+--- dao/main.cc.orig	Sat Dec 28 03:01:20 2002
++++ dao/main.cc	Sat Dec 28 03:04:38 2002
+@@ -1890,11 +1890,7 @@
+ 
+   SETTINGS = new Settings;
+ 
+-  settingsPath = "/etc/cdrdao.conf";
+-  if (SETTINGS->read(settingsPath) == 0)
+-    message(3, "Read settings from \"%s\".", settingsPath);
+-
+-  settingsPath = "/etc/defaults/cdrdao";
++  settingsPath = "%%LOCALBASE%%/etc/cdrdao.conf";
+   if (SETTINGS->read(settingsPath) == 0)
+     message(3, "Read settings from \"%s\".", settingsPath);
+ 
diff --git a/sysutils/cdrdao/files/patch-paranoia::configure b/sysutils/cdrdao/files/patch-paranoia::configure
new file mode 100644
index 0000000..6f997e1
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-paranoia::configure
@@ -0,0 +1,32 @@
+--- paranoia/configure.orig	Fri Dec 27 17:09:38 2002
++++ paranoia/configure	Fri Dec 27 17:11:47 2002
+@@ -2052,16 +2052,16 @@
+ 
+ if test -z "$GCC"; then
+ 	DEBUG="-g"
+-	OPT="-O"
++	OPT="${CFLAGS}"
+ else
+ 	case $host in
+-	i?86-*-linux*)
++	i?86-*-*)
+ 		DEBUG="-g -Wall -fsigned-char"
+-		OPT="-O20 -ffast-math -fsigned-char -finline-functions"
++		OPT="${CFLAGS} -ffast-math -fsigned-char -finline-functions"
+                 ;;
+ 	*)
+ 		DEBUG="-g -Wall -fsigned-char"
+-		OPT="-O20 -fsigned-char"
++		OPT="${CFLAGS} -fsigned-char"
+                 ;;
+         esac
+ fi
+@@ -2404,7 +2404,7 @@
+ 
+ fi
+ 
+-CFLAGS=""
++#CFLAGS=""
+ 
+ TYPESIZES=""
+ 
diff --git a/sysutils/cdrdao/files/patch-paranoia::isort.c b/sysutils/cdrdao/files/patch-paranoia::isort.c
new file mode 100644
index 0000000..c7f82b7
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-paranoia::isort.c
@@ -0,0 +1,14 @@
+--- paranoia/isort.c.orig	Sun Oct  6 20:53:56 2002
++++ paranoia/isort.c	Fri Dec 27 18:54:38 2002
+@@ -22,9 +22,9 @@
+   ret->size=-1;
+   ret->maxsize=size;
+ 
+-  ret->head=calloc(65536,sizeof(sort_link **));
++  ret->head=calloc(65536,sizeof(sort_link *));
+   ret->bucketusage=malloc(65536*sizeof(long));
+-  ret->revindex=calloc(size,sizeof(sort_link *));
++  ret->revindex=calloc(size,sizeof(sort_link));
+   ret->lastbucket=0;
+ 
+   return(ret);
diff --git a/sysutils/cdrdao/files/patch-trackdb::Track.cc b/sysutils/cdrdao/files/patch-trackdb::Track.cc
new file mode 100644
index 0000000..663a61f
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-trackdb::Track.cc
@@ -0,0 +1,20 @@
+--- trackdb/Track.cc.orig	Sun Nov 17 02:32:03 2002
++++ trackdb/Track.cc	Sun Nov 17 02:32:26 2002
+@@ -41,7 +41,7 @@
+   subTracks_ = lastSubTrack_ = NULL;
+ 
+   nofIndices_ = 0;
+-  index_ = new Msf[98](0);
++  index_ = new Msf[98];
+ 
+   isrcValid_ = 0;
+ 
+@@ -75,7 +75,7 @@
+   }
+ 
+   nofIndices_ = obj.nofIndices_;
+-  index_ = new Msf[98](0);
++  index_ = new Msf[98];
+   for (i = 0; i < nofIndices_; i++) {
+     index_[i] = obj.index_[i];
+   }
diff --git a/sysutils/cdrdao/files/patch-xdao::AudioCDView.cc b/sysutils/cdrdao/files/patch-xdao::AudioCDView.cc
new file mode 100644
index 0000000..757613b
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-xdao::AudioCDView.cc
@@ -0,0 +1,11 @@
+--- xdao/AudioCDView.cc.orig	Sat Nov 16 23:13:42 2002
++++ xdao/AudioCDView.cc	Sat Nov 16 23:13:54 2002
+@@ -17,7 +17,7 @@
+  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "xcdrdao.h"
+ #include "guiUpdate.h"
diff --git a/sysutils/cdrdao/files/patch-xdao::CdDevice.cc b/sysutils/cdrdao/files/patch-xdao::CdDevice.cc
new file mode 100644
index 0000000..287bbe7
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-xdao::CdDevice.cc
@@ -0,0 +1,11 @@
+--- xdao/CdDevice.cc.orig	Sat Nov 16 23:14:19 2002
++++ xdao/CdDevice.cc	Sat Nov 16 23:14:54 2002
+@@ -22,7 +22,7 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <ctype.h>
+ #include <assert.h>
diff --git a/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc b/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc
index ab7b04f..f73ba39 100644
--- a/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc
+++ b/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc
@@ -7,7 +7,7 @@
 +# if defined(__FreeBSD__)
 +#include <sys/soundcard.h>
 +# if !defined(SNDCTL_DSP_CHANNELS)
-+#   define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
++#   define	SNDCTL_DSP_CHANNELS SOUND_PCM_WRITE_CHANNELS
 +# endif
 +# else 
  #include <linux/soundcard.h>