Update to 0.98alpha16 (plus parse_version.patch). Changes:

* merged in all patches (compile warnings fixes, locale fixes, wav detection fixes, removed pcre dependency from configure, crash fixes and version detection fixes)
* merged in several of the patches RedHat created for RPM version.
* improved current cdrtools support.
* removed extra handling for ProDVD, as this is all now integrated into the current cdrecord without any need for a key.
* updated several translations.

Fixes PR 38238.

OK by wiz@.

5 files changed, 30 insertions, 117 deletions

diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index c339f75cb2d..351f0aa9d77 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,31 +1,34 @@
-# $NetBSD: Makefile,v 1.49 2008/09/25 14:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2009/02/11 21:48:39 shattered Exp $
 
 DISTNAME=	xcdroast-${DIST_VER}
 PKGNAME=	xcdroast-${DIST_VER:S/alpha/a/}
-PKGREVISION=	9
+#PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xcdroast/}
 
+PATCH_SITES=	http://www.xcdroast.org/xcdr098/patches/
+PATCHFILES=	parse_version.patch
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xcdroast.org/
 COMMENT=	Graphical user interface for the command-line cdrecord-tools
 
 DEPENDS+=		cdrtools>=2.01:../../sysutils/cdrtools
 
-DIST_VER=		0.98alpha15
+DIST_VER=		0.98alpha16
 
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--enable-gtk2
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${_OPSYS_HAS_OSSAUDIO} == "yes"
 CFLAGS+=	-DHAVE_OSS
-CONFIGURE_ENV+=	AUDIO_LIBS=${LIBOSSAUDIO:Q}
+CONFIGURE_ENV+=	AUDIO_LIBS=${LIBOSSAUDIO}
 .endif
 
 DOCDIR=		${PREFIX}/share/doc/xcdroast
@@ -33,12 +36,11 @@ DOCFILES=	DOCUMENTATION FAQ README.nonroot manual/xcdroast-manual.pdf
 HTMLDIR=	${PREFIX}/share/doc/html/xcdroast
 CONF_FILES=	/dev/null ${PKG_SYSCONFDIR}/xcdroast.conf
 
-pre-build:
-	cd ${WRKSRC}/src; for file in io.c wavplay.c; do		\
-		${SED} -e "s|@DEVOSSAUDIO@|${DEVOSSAUDIO}|g"		\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
+SUBST_CLASSES+=			devossaudio
+SUBST_STAGE.devossaudio=	pre-build
+SUBST_MESSAGE.devossaudio=	Fixing path to audio device.
+SUBST_FILES.devossaudio=	io.c wavplay.c
+SUBST_SED.devossaudio=		-e "s,@DEVOSSAUDIO@,${DEVOSSAUDIO},g"
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
index 601f14f89fb..57c24b0672c 100644
--- a/sysutils/xcdroast/distinfo
+++ b/sysutils/xcdroast/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.15 2007/08/15 18:34:59 plunky Exp $
+$NetBSD: distinfo,v 1.16 2009/02/11 21:48:39 shattered Exp $
 
-SHA1 (xcdroast-0.98alpha15.tar.gz) = f354ea9ffe918c4ec11312d5537e6e245730fecc
-RMD160 (xcdroast-0.98alpha15.tar.gz) = 9198f67659023ce8f508fa2c331df9d9c8b81a8f
-Size (xcdroast-0.98alpha15.tar.gz) = 3282794 bytes
+SHA1 (parse_version.patch) = b4f85e53d050f355a162e9ca94b6b928f10fc5a8
+RMD160 (parse_version.patch) = 4d1f14240657dbf58721727ea4e993d6bd3d3273
+Size (parse_version.patch) = 338 bytes
+SHA1 (xcdroast-0.98alpha16.tar.gz) = bbb3184a7e2bfd80d931698002dc9f74f136241d
+RMD160 (xcdroast-0.98alpha16.tar.gz) = d0d63b6387d9aeace5aaef8ee935b6c6d4836259
+Size (xcdroast-0.98alpha16.tar.gz) = 3563666 bytes
 SHA1 (patch-aa) = 0beee32a5550646cd360459d90281cb0ec9a826a
-SHA1 (patch-ab) = 085da3b440ba1d6a0e305626e1ac3fba49d2f546
-SHA1 (patch-ad) = 417a82344e14ae2a9f602254b152337c33afae4a
-SHA1 (patch-ae) = 773d1a5b2b2ce5ef0a947cb5d7f67f83985b6e5e
+SHA1 (patch-ad) = 501a40eeac05ba96483e6399880b5cf2bd629695
diff --git a/sysutils/xcdroast/patches/patch-ab b/sysutils/xcdroast/patches/patch-ab
deleted file mode 100644
index 2d9050811f4..00000000000
--- a/sysutils/xcdroast/patches/patch-ab
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/03/23 18:02:48 reed Exp $
-
---- configure.orig	2003-10-25 15:51:45.000000000 -0700
-+++ configure
-@@ -4361,55 +4361,6 @@ echo "$as_me: error: Library requirement
- 	LIBS="$LIBS $PKGCONFIG_LIBS"
- 	CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS"
- 
--	# Extract the first word of "pcre-config", so it can be a program name with args.
--set dummy pcre-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PCRE_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $PCRE_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PCRE_CONFIG="$PCRE_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_PCRE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--  test -z "$ac_cv_path_PCRE_CONFIG" && ac_cv_path_PCRE_CONFIG="no"
--  ;;
--esac
--fi
--PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG
--
--if test -n "$PCRE_CONFIG"; then
--  echo "$as_me:$LINENO: result: $PCRE_CONFIG" >&5
--echo "${ECHO_T}$PCRE_CONFIG" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--	if test "x$PCRE_CONFIG" = "xno" ; then
--        	{ { echo "$as_me:$LINENO: error: pcre-config not found please install libpcre3-dev or similar" >&5
--echo "$as_me: error: pcre-config not found please install libpcre3-dev or similar" >&2;}
--   { (exit 1); exit 1; }; }
--	else
--        	LIBS="$LIBS `$PCRE_CONFIG --libs`"
--        	CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`"
--	fi
--
- else
- 
- 
-@@ -9249,7 +9200,6 @@ s,@ENABLE_GTK2@,$ENABLE_GTK2,;t t
- s,@PKG_CONFIG@,$PKG_CONFIG,;t t
- s,@PKGCONFIG_CFLAGS@,$PKGCONFIG_CFLAGS,;t t
- s,@PKGCONFIG_LIBS@,$PKGCONFIG_LIBS,;t t
--s,@PCRE_CONFIG@,$PCRE_CONFIG,;t t
- s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t
- s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
- s,@GLIB_LIBS@,$GLIB_LIBS,;t t
diff --git a/sysutils/xcdroast/patches/patch-ad b/sysutils/xcdroast/patches/patch-ad
index d741bd4818f..01e4ddbef0f 100644
--- a/sysutils/xcdroast/patches/patch-ad
+++ b/sysutils/xcdroast/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.4 2003/06/05 16:15:48 drochner Exp $
+$NetBSD: patch-ad,v 1.5 2009/02/11 21:48:39 shattered Exp $
 
---- src/wavplay.c.orig	2003-04-22 22:28:05.000000000 +0200
-+++ src/wavplay.c	2003-06-04 13:32:27.000000000 +0200
+--- src/wavplay.c.orig	2008-08-20 15:34:02.000000000 +0000
++++ src/wavplay.c
 @@ -23,6 +23,14 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -17,8 +17,8 @@ $NetBSD: patch-ad,v 1.4 2003/06/05 16:15:48 drochner Exp $
  #if defined(linux) || defined(__CYGWIN32__)
  # include <getopt.h>
  #endif
-@@ -73,8 +81,8 @@
- gint is_in_cd_quality(guchar *hdr);
+@@ -72,8 +80,8 @@ gint read_line(gint fd, gchar *ptr, gint
+ off_t is_std_wav_file(int f, off_t *offset);
  
  
 -#if defined(linux) || defined(__FreeBSD__)
@@ -28,7 +28,7 @@ $NetBSD: patch-ad,v 1.4 2003/06/05 16:15:48 drochner Exp $
  #elif defined (aix)
  #define DEFAULT_AUDIO_DEVICE ""
  #elif defined(__sgi)
-@@ -310,7 +318,7 @@
+@@ -309,7 +317,7 @@ int audio_write( void *buffer, int buf_s
  #endif
  
  
@@ -37,7 +37,7 @@ $NetBSD: patch-ad,v 1.4 2003/06/05 16:15:48 drochner Exp $
  
  /* open the sound-device of linux and set cd-quality */
  
-@@ -361,7 +369,7 @@
+@@ -360,7 +368,7 @@ gint flags;
  
  #endif
  
@@ -46,7 +46,7 @@ $NetBSD: patch-ad,v 1.4 2003/06/05 16:15:48 drochner Exp $
  
  /* open the sound-device of solaris and set cd-quality */
  
-@@ -388,7 +396,7 @@
+@@ -387,7 +395,7 @@ gint flags;
  	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.4 2003/06/05 16:15:48 drochner Exp $
  	info.output_muted = 0;
  #endif
  
-@@ -789,10 +797,10 @@
+@@ -787,10 +795,10 @@ gchar keybuffer[MAXLINE];
  
  	/* 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 056488cb138..00000000000
--- a/sysutils/xcdroast/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2007/08/15 18:34:59 plunky Exp $
-
---- src/io.c.orig	2007-08-15 17:45:55.000000000 +0100
-+++ src/io.c	2007-08-15 17:45:16.000000000 +0100
-@@ -9026,7 +9026,7 @@
- 		strcat(tmp2,"-D ");
- 	}
- 	if (masterparam.opt[7]) {
--		strcat(tmp2,"-L ");
-+		strcat(tmp2,"-allow-leading-dots ");
- 	}
- 	if (masterparam.opt[8]) {
- 		strcat(tmp2,"-d ");
-@@ -9160,7 +9160,7 @@
- 	}	
- 	if (masterparam.publisher) {
- 		strcpy(tmptmp, masterparam.publisher);
--		g_snprintf(tmp5,MAXLINE,"-P \"%s\" ",
-+		g_snprintf(tmp5,MAXLINE,"-publisher \"%s\" ",
- 			convert_escape(tmptmp));
- 		strcat(tmp4,tmp5);
- 	}