update to 0.98alpha11.

There is a major restructuring of the sources, more than to be expected
from the subminor version change.
Still needs some finetuning...
Most notable change: multisession support.

5 files changed, 100 insertions, 133 deletions

diff --git a/sysutils/xcdroast/patches/patch-aa b/sysutils/xcdroast/patches/patch-aa
index 21bf181d0a7..8b4188402a2 100644
--- a/sysutils/xcdroast/patches/patch-aa
+++ b/sysutils/xcdroast/patches/patch-aa
@@ -1,39 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2002/09/26 12:29:56 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2002/12/02 20:29:49 drochner Exp $
 
---- Makefile.orig	Tue Jul 17 14:46:26 2001
-+++ Makefile
-@@ -6,7 +6,7 @@
- # Installation prefix directory:
+--- src/gettext.h.orig	Mon Dec  2 11:48:41 2002
++++ src/gettext.h	Mon Dec  2 11:49:25 2002
+@@ -24,6 +24,7 @@
  
- #PREFIX=/usr
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- PRE_LIBDIR=$(PREFIX)/lib/xcdroast-0.98
+ /* Get declarations of GNU message catalog functions.  */
+ # include <libintl.h>
++# include <locale.h>
  
- # put here the prefix where you want xcdroast to look for 
-@@ -23,9 +23,9 @@ INSTALL=/usr/bin/install -c
+ #else
  
- #---
- 
--CFLAGS=-Wall `gtk-config --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
--CFLAGS2=-Wall `glib-config --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
--LIBS=`gtk-config --libs` `imlib-config --libs` -lgdk_imlib 
-+CFLAGS=${X_CFLAGS} -Wall `gtk-config --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
-+CFLAGS2=${X_CFLAGS} -Wall `glib-config --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
-+LIBS=${X_LDFLAGS} `gtk-config --libs` `imlib-config --libs` -lgdk_imlib
- TOOLLIBS=`gtk-config --libs`
- CC=gcc
- 
-@@ -48,10 +48,10 @@ all: xcdroast wavplay rmtool vrfytool cd
- 	$(CC) $(CFLAGS) -c $<
- 
- xcdroast: $(OBJ)  
--	$(CC) $(OBJ) $(LIBS) -o xcdroast 
-+	$(CC) $(OBJ) $(LIBS) $(LIBOSSAUDIO) -o xcdroast 
- 
- wavplay: wavplay.o wav_id.o tools.o 
--	$(CC) wavplay.o wav_id.o tools.o $(TOOLLIBS) -o wavplay 
-+	$(CC) wavplay.o wav_id.o tools.o $(TOOLLIBS) $(LIBOSSAUDIO) -o wavplay 
- 	cp wavplay lib/bin 
- 
- rmtool: rmtool.o
diff --git a/sysutils/xcdroast/patches/patch-ab b/sysutils/xcdroast/patches/patch-ab
index ce00c84bee4..62afd5fec86 100644
--- a/sysutils/xcdroast/patches/patch-ab
+++ b/sysutils/xcdroast/patches/patch-ab
@@ -1,21 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2002/09/26 12:29:56 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2002/12/02 20:29:49 drochner Exp $
 
---- xcdroast.h.orig	Tue Jul 17 12:40:54 2001
-+++ xcdroast.h
-@@ -89,14 +89,14 @@
- #define SAVEMASTERTRACK "mkisofs.out"
- 
- /* default paths/configfile */
--#define PREFIX "/usr/local"
-+#define PREFIX "@PREFIX@"
- #define LIBDIR "lib/xcdroast-0.98"
- #define CONFIGDIR "~/.xcdroast"
- #define CONFFILE "xcdr098.cfg"
- #define LOGFILE "xcdr098.log"
- #define ISOOPTFILE "isoopt.cfg"
- #define ISOHEADERFILE "isoheader.cfg"
--#define ROOTCONFIG "/etc/xcdroast.conf"
-+#define ROOTCONFIG "@PKG_SYSCONFDIR@/xcdroast.conf"
- 
- /* language stuff*/
- #define MAXENTRIES 512 
+--- src/xcdroast.h.orig	Mon Dec  2 18:45:24 2002
++++ src/xcdroast.h	Mon Dec  2 18:50:33 2002
+@@ -83,7 +83,7 @@
+ #define UNAME "/bin/uname -a"
+ #define UNAME2 "/usr/bin/uname -a"
+ #define CHOWN "/bin/chown"
+-#define CHOWN2 "/usr/bin/chown"
++#define CHOWN2 "/usr/sbin/chown"
+ #define CHGRP "/bin/chgrp"
+ #define CHGRP2 "/usr/bin/chgrp"
+ #define CHMOD "/bin/chmod"
diff --git a/sysutils/xcdroast/patches/patch-ac b/sysutils/xcdroast/patches/patch-ac
index b510dfde93a..d7502e1e691 100644
--- a/sysutils/xcdroast/patches/patch-ac
+++ b/sysutils/xcdroast/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2002/10/27 21:46:12 martin Exp $
+$NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
 
---- io.c.orig	Tue Jul 17 12:39:11 2001
-+++ io.c
-@@ -16,6 +16,14 @@
+--- src/io.c.orig	Sun Nov 24 20:02:58 2002
++++ src/io.c	Mon Dec  2 20:21:20 2002
+@@ -19,6 +19,14 @@
  #include <sys/wait.h>
  #include <signal.h>
  #include <time.h>
@@ -17,12 +17,12 @@ $NetBSD: patch-ac,v 1.6 2002/10/27 21:46:12 martin Exp $
  #if defined(linux) || defined(__FreeBSD__)
  # include <sys/soundcard.h>
  # include <sys/ioctl.h>
-@@ -996,22 +1004,22 @@ GList *get_dsp_devices() {
- GList *dsp;
- GList *loop;
+@@ -1200,22 +1208,22 @@
  struct stat buf;
--#ifdef sun
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
+ #endif
+ 
+-#if defined(sun) || defined(aix) || defined(__OpenBSD__)
++#if defined(sun) || defined(aix) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
  gchar *audiodev;
  #endif
  	dsp = NULL;
@@ -40,15 +40,15 @@ $NetBSD: patch-ac,v 1.6 2002/10/27 21:46:12 martin Exp $
  		dsp = g_list_append(dsp,"/dev/dsp1");
  	}
  #endif
--#ifdef sun
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
+-#if defined(sun) || defined(__OpenBSD__)
++#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
  	/* check if the user has any special audio-hardware running,
  	   which set the AUDIODEV-environment-variable */
  	audiodev = getenv("AUDIODEV");
-@@ -1066,15 +1074,15 @@ gchar *audiodev;
- gchar *gen_mix_from_dspdev(gchar *dsp, gchar *ret) {
- gchar tmp[MAXLINE];
+@@ -1297,15 +1305,15 @@
  struct stat buf;
+ # endif
+ #endif
 -#if defined(linux) || defined(__FreeBSD__)
 +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
  gchar tmp2[MAXLINE];
@@ -64,29 +64,29 @@ $NetBSD: patch-ac,v 1.6 2002/10/27 21:46:12 martin Exp $
  		strcpy(tmp,dsp+8);
  		g_snprintf(tmp2,MAXLINE,"/dev/mixer%s",tmp);
  
-@@ -1084,7 +1092,7 @@ gchar tmp2[MAXLINE];
+@@ -1315,7 +1323,7 @@
  		}	
  	}	
  #endif
--#ifdef sun
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
+-#if defined(sun) || defined(__OpenBSD__)
++#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
  
  	g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl");
  
-@@ -2362,10 +2370,10 @@ gint count;
- 
- gint query_mixer() {
+@@ -2795,10 +2803,10 @@
+ #if !(defined(__MACH__) && defined(__APPLE__)) 
  gint mix;
+ #endif
 -#if defined(linux) || defined(__FreeBSD__)
 +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
  gint val;
  #endif
--#ifdef sun
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
+-#if defined(sun) || defined(__OpenBSD__)
++#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
  audio_info_t ainfo;
  #endif
  #ifdef hpux
-@@ -2380,7 +2388,7 @@ struct audio_gains again;
+@@ -2813,7 +2821,7 @@
  		return -1;
  	}
  
@@ -95,25 +95,25 @@ $NetBSD: patch-ac,v 1.6 2002/10/27 21:46:12 martin Exp $
  
  	dodebug(10,"quering mixer %s\n", setupdata.mix_device);
  	mix = open(setupdata.mix_device, O_RDWR);
-@@ -2400,7 +2408,7 @@ struct audio_gains again;
+@@ -2833,7 +2841,7 @@
  	return ((val & 0x7f) + ((val >> 8) & 0x7f))/2;
  
  #endif
--#ifdef sun
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
+-#if defined(sun) || defined(__OpenBSD__)
++#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
  
  	dodebug(10,"quering mixer %s\n", setupdata.mix_device);
  	mix = open(setupdata.mix_device, O_RDONLY);
-@@ -2450,7 +2458,7 @@ struct audio_gains again;
- 
- gint set_mixer(gint val) {
+@@ -2921,7 +2929,7 @@
+ #if !(defined(__MACH__) && defined(__APPLE__)) 
  gint mix;
--#ifdef sun
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
+ #endif
+-#if defined(sun) || defined(__OpenBSD__)
++#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
  audio_info_t ainfo;
  #endif
- #ifdef hpux
-@@ -2464,7 +2472,7 @@ struct audio_gains again;
+ #ifdef aix
+@@ -2939,7 +2947,7 @@
  		return -1;
  	}
  
@@ -122,22 +122,12 @@ $NetBSD: patch-ac,v 1.6 2002/10/27 21:46:12 martin Exp $
  
  	dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
  	mix = open(setupdata.mix_device, O_RDWR);
-@@ -2482,7 +2490,7 @@ struct audio_gains again;
+@@ -2957,7 +2965,7 @@
  	close(mix);
  
  #endif 
--#ifdef sun
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
+-#if defined(sun) || defined(__OpenBSD__)
++#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
  
  	dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
  	mix = open(setupdata.mix_device, O_WRONLY);
-@@ -3275,6 +3283,9 @@ gint ret,found;
- 		/* got the message that no medium is present?
- 		   in this case, ignore return code */ 
- 		if (strstr(line,"medium not present")) {
-+			found = 1;
-+		}
-+		if (strstr(line,"Device not ready")) {
- 			found = 1;
- 		}
- 	}
diff --git a/sysutils/xcdroast/patches/patch-ad b/sysutils/xcdroast/patches/patch-ad
index fbcfb4f2a00..0afd3ab2c37 100644
--- a/sysutils/xcdroast/patches/patch-ad
+++ b/sysutils/xcdroast/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2002/09/26 12:29:56 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2002/12/02 20:29:49 drochner Exp $
 
---- wavplay.c.orig	Tue Jul 17 12:39:14 2001
-+++ wavplay.c
-@@ -14,6 +14,14 @@
+--- src/wavplay.c.orig	Mon Dec  2 20:48:24 2002
++++ src/wavplay.c	Mon Dec  2 20:52:36 2002
+@@ -19,6 +19,14 @@
  #include <unistd.h>
  #include <fcntl.h>
  #include <string.h>
@@ -15,20 +15,11 @@ $NetBSD: patch-ad,v 1.2 2002/09/26 12:29:56 jlam Exp $
 +# endif
 +#endif
  #if defined(linux) || defined(__CYGWIN32__)
- #include <getopt.h>
+ # include <getopt.h>
  #endif
-@@ -22,7 +30,7 @@
- #include <sys/soundcard.h>
- #include <sys/ioctl.h>
- #endif
--#ifdef sun 
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- #include <sys/audioio.h>
- #endif
- #ifdef hpux
-@@ -48,8 +56,8 @@ guchar waveHdr[44];
+@@ -64,8 +72,8 @@
  gint abuf_size;
- gchar *audiobuf;
+ guchar *audiobuf;
  
 -#if defined(linux) || defined(__FreeBSD__)
 -#define DEFAULT_AUDIO_DEVICE "/dev/dsp"
@@ -37,8 +28,8 @@ $NetBSD: patch-ad,v 1.2 2002/09/26 12:29:56 jlam Exp $
  #elif defined (aix)
  #define DEFAULT_AUDIO_DEVICE ""
  #else
-@@ -59,7 +67,7 @@ gchar *audiobuf;
- #define DEFAULT_BUFFER_SIZE 32768
+@@ -299,7 +307,7 @@
+ #endif
  
  
 -#if defined(linux) || defined(__FreeBSD__)
@@ -46,35 +37,34 @@ $NetBSD: patch-ad,v 1.2 2002/09/26 12:29:56 jlam Exp $
  
  /* open the sound-device of linux and set cd-quality */
  
-@@ -110,7 +118,7 @@ gint flags;
+@@ -350,7 +358,7 @@
  
  #endif
  
--#ifdef sun
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
+-#if defined(sun) || defined(__OpenBSD__)
++#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
  
  /* open the sound-device of solaris and set cd-quality */
  
-@@ -137,7 +145,9 @@ gint flags;
+@@ -377,7 +385,7 @@
  	info.play.precision = 16;
  	info.play.encoding = AUDIO_ENCODING_LINEAR;
  	info.play.buffer_size = abuf_size;
-+#ifndef __NetBSD__
+-#ifndef __OpenBSD__
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
  	info.output_muted = 0;
-+#endif
+ #endif
+ 
+@@ -678,10 +686,10 @@
  
- 	if (ioctl(audio, AUDIO_SETINFO, &info) == -1) {
- 		g_warning("Unable to set audio parameters\n");
-@@ -332,10 +342,10 @@ gchar tmpswap;
- 	}
+ 	/* the open sets also the global abuf_size-variable */
  
- 	/* this sets also the global abuf_size-variable */
 -#if defined(linux) || defined(__FreeBSD__)
 +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
  	audio = open_linux_audio(audio_dev);
  #endif
--#ifdef sun
-+#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS))
+-#if defined(sun) || defined(__OpenBSD__)
++#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
  	audio = open_solaris_audio(audio_dev);
  #endif
- #ifdef hpux
+ #ifdef aix
diff --git a/sysutils/xcdroast/patches/patch-ae b/sysutils/xcdroast/patches/patch-ae
new file mode 100644
index 00000000000..5ea0194ca1d
--- /dev/null
+++ b/sysutils/xcdroast/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2002/12/02 20:29:49 drochner Exp $
+
+--- src/Makefile.in.orig	Mon Dec  2 21:06:43 2002
++++ src/Makefile.in	Mon Dec  2 21:08:06 2002
+@@ -162,7 +162,7 @@
+ 
+ xcdroast_CFLAGS = $(GNUCFLAGS) $(GDK_PIXBUF_CFLAGS) $(EXTRA_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\""
+ xcdroast_LDFLAGS = $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(EXTRA_LDFLAGS)
+-xcdroast_LDADD = @LIBINTL@ @ALLOCA@
++xcdroast_LDADD = @LIBINTL@ @ALLOCA@ $(LIBOSSAUDIO)
+ 
+ wavplay_SOURCES = wavplay.c wav_id.c tools.c largefile.h xcdroast.h
+ wavplay_CFLAGS = $(GNUCFLAGS) $(EXTRA_CFLAGS)
+@@ -207,7 +207,7 @@
+ am_wavplay_OBJECTS = wavplay-wavplay.$(OBJEXT) wavplay-wav_id.$(OBJEXT) \
+ 	wavplay-tools.$(OBJEXT)
+ wavplay_OBJECTS = $(am_wavplay_OBJECTS)
+-wavplay_LDADD = $(LDADD)
++wavplay_LDADD = $(LDADD) $(LIBOSSAUDIO)
+ wavplay_DEPENDENCIES =
+ am_xcdroast_OBJECTS = xcdroast-main.$(OBJEXT) xcdroast-init.$(OBJEXT) \
+ 	xcdroast-tools.$(OBJEXT) xcdroast-xtools.$(OBJEXT) \