update to 0.98a14

changes:
full drag&drop support (rearrange tracks or add files to master from KDE/Gnome).
completely new non-root-mode which does not require any group or a change of
 modes on the cdrtools.
complete rewrite of internal device handling. Up to 64 devices can be
 independently configured and used. Devices are no longer scanned at each
 startup, support for remote-scsi (networked devices), Linux kernel-2.5.x
 devices and any other cdrecord supports.
improved Mac OS X support with automatic autodiskmount daemon handling.
support copy of audio-CDs on-the-fly.
save window positions and sizes.
display progress of reading/writing in window title.
even more integration of cdrecord-ProDVD.
Full support of DVD-R/RW and DVD+R/RW with newest ProDVD-versions.
added greek and ukrainian translations, updated most others.
a helpful HTML-manual in doc/manual (online: http://www.xcdroast.org/manual)
numerous usage improvements and bug fixes.

6 files changed, 119 insertions, 68 deletions

diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 0a6340f4c1e..981cf82b7eb 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/05/02 11:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/06/05 16:15:47 drochner Exp $
 
-DISTNAME=	xcdroast-0.98alpha13
-PKGREVISION=	1
-PKGNAME=	xcdroast-0.98a13
+DISTNAME=	xcdroast-0.98alpha14
+PKGNAME=	xcdroast-0.98a14
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xcdroast/}
 
@@ -20,12 +19,17 @@ USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+USE_GMAKE=	yes
 
 .if ${_OPSYS_HAS_OSSAUDIO} == "yes"
 CFLAGS+=	-DHAVE_OSS
+AUDIO_LIBS=	-lossaudio
+CONFIGURE_ENV+=	AUDIO_LIBS=${AUDIO_LIBS}
 .endif
 
 DOCDIR=		${PREFIX}/share/doc/xcdroast
+DOCFILES=	DOCUMENTATION FAQ README.nonroot
+HTMLDIR=	${PREFIX}/share/doc/html/xcdroast
 SUPPORT_FILES=	/dev/null ${PKG_SYSCONFDIR}/xcdroast.conf
 
 pre-build:
@@ -37,10 +41,12 @@ pre-build:
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC};							\
-	for file in ${WRKSRC}/doc/*; do	\
+	(cd ${WRKSRC}/doc;						\
+	for file in ${DOCFILES}; do	\
 		${INSTALL_DATA} $${file} ${DOCDIR};			\
-	done
+	done)
+	${INSTALL_DATA_DIR} ${HTMLDIR}
+	${CP} -r ${WRKSRC}/doc/manual/* ${HTMLDIR}
 
 # gdk-pixbuf implies gtk, glib, gettext-lib
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
diff --git a/sysutils/xcdroast/PLIST b/sysutils/xcdroast/PLIST
index fcce3220ab8..77fcf7d3488 100644
--- a/sysutils/xcdroast/PLIST
+++ b/sysutils/xcdroast/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/02 20:29:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/05 16:15:48 drochner Exp $
 bin/xcdroast
 lib/xcdroast-0.98/bin/cddbtool
 lib/xcdroast-0.98/bin/rmtool
@@ -17,21 +17,53 @@ lib/xcdroast-0.98/icons/xcdricon.png
 lib/xcdroast-0.98/icons/xcdrlogo.gif
 lib/xcdroast-0.98/sound/test.wav
 man/man1/xcdroast.1
+share/doc/html/xcdroast/README.txt
+share/doc/html/xcdroast/create.html
+share/doc/html/xcdroast/createaudio.html
+share/doc/html/xcdroast/de.staerk.css
+share/doc/html/xcdroast/duplicate.html
+share/doc/html/xcdroast/dvd.html
+share/doc/html/xcdroast/fdl.html
+share/doc/html/xcdroast/first.html
+share/doc/html/xcdroast/glossary.html
+share/doc/html/xcdroast/img/bootable.gif
+share/doc/html/xcdroast/img/createaudiolayout.gif
+share/doc/html/xcdroast/img/createcd.gif
+share/doc/html/xcdroast/img/duplicatecd.gif
+share/doc/html/xcdroast/img/error-redslash.gif
+share/doc/html/xcdroast/img/errorcalculating.gif
+share/doc/html/xcdroast/img/errordiskspace.gif
+share/doc/html/xcdroast/img/initial.gif
+share/doc/html/xcdroast/img/layouttracks.gif
+share/doc/html/xcdroast/img/links.gif
+share/doc/html/xcdroast/img/mainmenu.gif
+share/doc/html/xcdroast/img/oben.gif
+share/doc/html/xcdroast/img/ordner.gif
+share/doc/html/xcdroast/img/punkt.gif
+share/doc/html/xcdroast/img/readtracks.gif
+share/doc/html/xcdroast/img/rechts.gif
+share/doc/html/xcdroast/img/setup.gif
+share/doc/html/xcdroast/img/tooltip.gif
+share/doc/html/xcdroast/img/unten.gif
+share/doc/html/xcdroast/img/warningnodvdkey.gif
+share/doc/html/xcdroast/img/warningnot9660.gif
+share/doc/html/xcdroast/img/writecd.gif
+share/doc/html/xcdroast/img/writeonthefly.gif
+share/doc/html/xcdroast/img/xcdrlogo.gif
+share/doc/html/xcdroast/index.html
+share/doc/html/xcdroast/model.html
+share/doc/html/xcdroast/prolog.html
+share/doc/html/xcdroast/ripcd.html
+share/doc/html/xcdroast/xcdroast-reference.html
 share/doc/xcdroast/DOCUMENTATION
 share/doc/xcdroast/FAQ
-share/doc/xcdroast/README.AIX
-share/doc/xcdroast/README.HPUX
-share/doc/xcdroast/README.MacOSX
-share/doc/xcdroast/README.ProDVD
-share/doc/xcdroast/README.atapi
 share/doc/xcdroast/README.nonroot
-share/doc/xcdroast/README.setup-bulgarian.html
-share/doc/xcdroast/TRANSLATION.HOWTO
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xcdroast.mo
+${PKGLOCALEDIR}/locale/el_GR/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xcdroast.mo
@@ -50,8 +82,11 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xcdroast.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/xcdroast.mo
 ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
 @dirrm share/doc/xcdroast
+@dirrm share/doc/html/xcdroast/img
+@dirrm share/doc/html/xcdroast
 @dirrm lib/xcdroast-0.98/sound
 @dirrm lib/xcdroast-0.98/icons
diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
index ea9968f95d3..76d4b9fb493 100644
--- a/sysutils/xcdroast/distinfo
+++ b/sysutils/xcdroast/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2003/01/10 11:24:52 drochner Exp $
+$NetBSD: distinfo,v 1.9 2003/06/05 16:15:48 drochner Exp $
 
-SHA1 (xcdroast-0.98alpha13.tar.gz) = c73eadd0bd1958eb99c2c2908e27e3aea79dd66b
-Size (xcdroast-0.98alpha13.tar.gz) = 2124714 bytes
+SHA1 (xcdroast-0.98alpha14.tar.gz) = 7055f281ed7b9d9d0854df245a9e136bb5dd622a
+Size (xcdroast-0.98alpha14.tar.gz) = 2870727 bytes
 SHA1 (patch-aa) = 0beee32a5550646cd360459d90281cb0ec9a826a
-SHA1 (patch-ac) = 577977e962fd13c2bbc22ac43a35829c2f103739
-SHA1 (patch-ad) = c1aa3ac7ac96e02337bec0144044517867395708
-SHA1 (patch-ae) = 5c4048961f8507dda2eb29b3acd6f8ab831bf08c
+SHA1 (patch-ac) = e43e996872b766885ab1bea2fc5fcbf50cecc90b
+SHA1 (patch-ad) = 417a82344e14ae2a9f602254b152337c33afae4a
diff --git a/sysutils/xcdroast/patches/patch-ac b/sysutils/xcdroast/patches/patch-ac
index d7502e1e691..ecdf1a16961 100644
--- a/sysutils/xcdroast/patches/patch-ac
+++ b/sysutils/xcdroast/patches/patch-ac
@@ -1,8 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
-
---- 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 @@
+--- src/io.c.orig	2003-05-29 15:14:42.000000000 +0200
++++ src/io.c	2003-06-05 17:56:20.000000000 +0200
+@@ -24,6 +24,14 @@
  #include <sys/wait.h>
  #include <signal.h>
  #include <time.h>
@@ -17,7 +15,7 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  #if defined(linux) || defined(__FreeBSD__)
  # include <sys/soundcard.h>
  # include <sys/ioctl.h>
-@@ -1200,22 +1208,22 @@
+@@ -1690,22 +1698,22 @@
  struct stat buf;
  #endif
  
@@ -45,7 +43,7 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  	/* check if the user has any special audio-hardware running,
  	   which set the AUDIODEV-environment-variable */
  	audiodev = getenv("AUDIODEV");
-@@ -1297,15 +1305,15 @@
+@@ -1814,15 +1822,15 @@
  struct stat buf;
  # endif
  #endif
@@ -64,7 +62,7 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  		strcpy(tmp,dsp+8);
  		g_snprintf(tmp2,MAXLINE,"/dev/mixer%s",tmp);
  
-@@ -1315,7 +1323,7 @@
+@@ -1832,7 +1840,7 @@
  		}	
  	}	
  #endif
@@ -73,7 +71,7 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  
  	g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl");
  
-@@ -2795,10 +2803,10 @@
+@@ -3573,10 +3581,10 @@
  #if !(defined(__MACH__) && defined(__APPLE__)) 
  gint mix;
  #endif
@@ -86,7 +84,7 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  audio_info_t ainfo;
  #endif
  #ifdef hpux
-@@ -2813,7 +2821,7 @@
+@@ -3591,7 +3599,7 @@
  		return -1;
  	}
  
@@ -95,7 +93,7 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  
  	dodebug(10,"quering mixer %s\n", setupdata.mix_device);
  	mix = open(setupdata.mix_device, O_RDWR);
-@@ -2833,7 +2841,7 @@
+@@ -3611,7 +3619,7 @@
  	return ((val & 0x7f) + ((val >> 8) & 0x7f))/2;
  
  #endif
@@ -104,7 +102,7 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  
  	dodebug(10,"quering mixer %s\n", setupdata.mix_device);
  	mix = open(setupdata.mix_device, O_RDONLY);
-@@ -2921,7 +2929,7 @@
+@@ -3699,7 +3707,7 @@
  #if !(defined(__MACH__) && defined(__APPLE__)) 
  gint mix;
  #endif
@@ -113,7 +111,7 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  audio_info_t ainfo;
  #endif
  #ifdef aix
-@@ -2939,7 +2947,7 @@
+@@ -3717,7 +3725,7 @@
  		return -1;
  	}
  
@@ -122,7 +120,7 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  
  	dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
  	mix = open(setupdata.mix_device, O_RDWR);
-@@ -2957,7 +2965,7 @@
+@@ -3735,7 +3743,7 @@
  	close(mix);
  
  #endif 
@@ -131,3 +129,37 @@ $NetBSD: patch-ac,v 1.7 2002/12/02 20:29:49 drochner Exp $
  
  	dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
  	mix = open(setupdata.mix_device, O_WRONLY);
+@@ -5507,7 +5515,11 @@
+ 	}
+ 
+ 	/* build command line */
+-	get_wrap_path_cdrecord(tmp3);
++	if (curset.isProDVD) {
++		get_wrap_path("CDRECORDPRODVD", tmp3);
++	} else {
++		get_wrap_path("CDRECORD", tmp3);
++	}
+ 	g_snprintf(line,MAXLINE,"%s %s -atip 2>&1",
+ 		tmp3,tmp);
+ 
+@@ -5518,6 +5530,11 @@
+                 g_error("popen error\n");
+         }
+ 
++	/* syntax for dvd-atip is different */
++	if (is_dvdwriter(curset.writer_devnr)) {
++		found_atip = 1;
++	}
++
+ 	errcount = 0;
+         for (;;) {
+                 if (fgets(line,MAXLINE,fpin) == NULL) 
+@@ -6605,7 +6622,7 @@
+ 				read_output_ctrl = 4;
+ 			} 
+ 			/* check Medium error/buffer underrun */
+-			if (strncmp(tmp2,"Input/output error",18)) {
++			if (strncmp(tmp2,"Input/output error",18) == 0) {
+ 				read_output_ctrl = 5;
+ 			}
+ 		}
diff --git a/sysutils/xcdroast/patches/patch-ad b/sysutils/xcdroast/patches/patch-ad
index 0afd3ab2c37..d741bd4818f 100644
--- a/sysutils/xcdroast/patches/patch-ad
+++ b/sysutils/xcdroast/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2002/12/02 20:29:49 drochner Exp $
+$NetBSD: patch-ad,v 1.4 2003/06/05 16:15:48 drochner Exp $
 
---- 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 @@
+--- src/wavplay.c.orig	2003-04-22 22:28:05.000000000 +0200
++++ src/wavplay.c	2003-06-04 13:32:27.000000000 +0200
+@@ -23,6 +23,14 @@
  #include <unistd.h>
  #include <fcntl.h>
  #include <string.h>
@@ -17,9 +17,9 @@ $NetBSD: patch-ad,v 1.3 2002/12/02 20:29:49 drochner Exp $
  #if defined(linux) || defined(__CYGWIN32__)
  # include <getopt.h>
  #endif
-@@ -64,8 +72,8 @@
- gint abuf_size;
- guchar *audiobuf;
+@@ -73,8 +81,8 @@
+ gint is_in_cd_quality(guchar *hdr);
+ 
  
 -#if defined(linux) || defined(__FreeBSD__)
 -#define DEFAULT_AUDIO_DEVICE "/dev/dsp"
@@ -27,8 +27,8 @@ $NetBSD: patch-ad,v 1.3 2002/12/02 20:29:49 drochner Exp $
 +#define DEFAULT_AUDIO_DEVICE "@DEVOSSAUDIO@"
  #elif defined (aix)
  #define DEFAULT_AUDIO_DEVICE ""
- #else
-@@ -299,7 +307,7 @@
+ #elif defined(__sgi)
+@@ -310,7 +318,7 @@
  #endif
  
  
@@ -37,7 +37,7 @@ $NetBSD: patch-ad,v 1.3 2002/12/02 20:29:49 drochner Exp $
  
  /* open the sound-device of linux and set cd-quality */
  
-@@ -350,7 +358,7 @@
+@@ -361,7 +369,7 @@
  
  #endif
  
@@ -46,7 +46,7 @@ $NetBSD: patch-ad,v 1.3 2002/12/02 20:29:49 drochner Exp $
  
  /* open the sound-device of solaris and set cd-quality */
  
-@@ -377,7 +385,7 @@
+@@ -388,7 +396,7 @@
  	info.play.precision = 16;
  	info.play.encoding = AUDIO_ENCODING_LINEAR;
  	info.play.buffer_size = abuf_size;
@@ -55,7 +55,7 @@ $NetBSD: patch-ad,v 1.3 2002/12/02 20:29:49 drochner Exp $
  	info.output_muted = 0;
  #endif
  
-@@ -678,10 +686,10 @@
+@@ -789,10 +797,10 @@
  
  	/* the open sets also the global abuf_size-variable */
  
diff --git a/sysutils/xcdroast/patches/patch-ae b/sysutils/xcdroast/patches/patch-ae
deleted file mode 100644
index 35a44597491..00000000000
--- a/sysutils/xcdroast/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/04/21 20:29:14 cjep Exp $
---- src/Makefile.in.orig	Wed Jan  1 15:18:45 2003
-+++ src/Makefile.in	Thu Jan  9 11:49:34 2003
-@@ -163,7 +163,7 @@
- 
- xcdroast_CFLAGS = $(GNUCFLAGS) $(GDK_PIXBUF_CFLAGS) $(EXTRA_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)"
- 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)
-@@ -208,7 +208,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) \