xcdroast: update to 1.18

23.12.17:
	* RELEASED X-CD-Roast 1.18
	* Bugfix in configure script
22.12.17:
	* RELEASED X-CD-Roast 1.17
14.12.17:
	* Update desktop icon
29.10.17:
	* Fix crash when deleting exactly 50 or a multiple of 50 tracks.
08.10.17:
	* Change code to use g_io_channels. (Prepare for GTK3)
07.10.17:
	* More GTK3 migration.
	* Remove of Mac OS X code since there have been no working cdrtools for
	  more than a decade and thus X-CD-Roast cannot be programmed for OS X.
01.10.17:
	* Rewrite child processing.
17.09.17:
	* More GTK3 migration.
03.09.17:
	* Rewrite dialog window placement.
20.08.17:
	* Modernize code to display the xcdroast logo (cairo instead of
	  pixbuf). Also improve the logo quality.
	* Add About-dialog.
23.07.17:
	  by Mathias Büttner:
	* Disabled the write mode selector for DVD (and BD) media in "Create"
	  and in "Duplicate" menu.
	* Disabled "Do not fixate" for multisession writes (not just a warning).
	* Added fixed settings for nofixate and multisession in "Duplicate" menu
	  as they can't be changed there.
	* Updated write mode settings and write options for cdrecord.
	* Fixed displaying wrong Disc size if no Audio CD or Mixed Mode CD.
	* Added notification if CD-Text will not be written.
	* Placed a small logo on top of the sidespace buttons.
	* Amended some of the old tooltips.
30.06.17:
	* All terms talking about a CD (Compact Disc) are changed simply to
	  the word Disc or CD/DVD/BD where meaningful. (by Mathias Büttner)
17.06.17:
	* Resized Dialog windows
14.06.17:
	* Removed checks for older cdrecord features
05.06.17:
	* Replaced all GtkText by GtkTextView (modernize design)
04.06.17:
	* Convert all translation files to UTF-8
31.05.17:
	* Replace GtkFileSelection by GtkFileChooser (modernize design)
19.05.17:
	* Code cleanup/formatting by Mathias Büttner
06.05.17:
	* rename non-root-mode to user-host-mode, as we now always allow
	  non-root users to start X-CD-Roast. The user-host-mode just allows to
	  configure which user on which host can use X-CD-Roast.
	  (e.g. for computer science labs or server installations)
01.05.17:
	* detect the suid-bit settings on the cdrtools or the X-CD-Roast wrapper
	  and offer a dialog to fix this automatically
26.04.17:
	* Changed JEDEC prefixes to decimal and binary prefixes according to
	  IEC 60027-2 (January 1999) to avoid confusion. (by Mathias Büttner)
17.04.17:
	* Paranoia mode: auto setup of lowest read ahead buffer for each drive
	  when scanning for new devices (by Mathias Büttner)
16.04.17:
	* wrong cdrtool versions are now reported in a dialog window
	  (not just as a warning in the terminal)
	* set suid bit on xcdrwrap on 'make install'
15.04.17:
	* Fix various gdk-assertion failures
	* Fix resize of Read/Write progress window
09.04.17:
	* Added new checkbox "audio deemphasis" (by Mathias Büttner)
04.04.17:
	* Updated gettext to 0.19.7
	* Updated to autoconf 2.69
	* Update to autmake 1.14.1
	* use cddb protocol 6 instead of 1, this fixes also charset problems
03.04.17:
	* Compile by default without non-root-mode. Currently I rely on
	  that the cdrtools have the suid bit already set.
	* charset conversion from ISO8859-1 to UTF-8 on Album or Track titles.
02.04.17:
	* merged in all patches I received and published on my webpage
	  since X-CD-Roast 0.98alpha16. - Many thanks to all contributors!
	  (parse_version.patch, change_norwegian_locale.txt, io_compile.patch,
	  cdda2wav_version.patch, fix_cddb_hidden_tracks.patch, io_progressbar
	  _fix.patch, format-security.patch, suid-perms.patch)
	* removed --enable-gtk2 option, this is enabled by default now.
	* Renamed norwegian translation file from "no" to "nb".
	* Updated galician translation.
01.04.17:
	* Lots of input and patches and motivation for an updated xcdroast version
	  by Mathias Büttner from southwestern Germany:
	* updated CD/DVD writer/reader default settings in setup menu.
	* removed the outdated slider "sectorburst" and added instead
	  "size of read ahead buffer" and "minimum overlap of sectors"
	  for paranoia mode in the setup menu.
	* added new checkbox "suppress a hidden audio track"
	* fixed info output and track increment in GTK-window
	  'Reading audio tracks' for cdda2wav in paranoia mode.
	* changed cdrtools version check to allow only v3.02a09 or higher
	  because v3.00a01 - v3.02a07 contain a bug and v2.01 is very outdated
	  and may even not compile nowadays.
	* fixed xcdroast's mkisofs version detection since v3.02a01.
	* changed german translation to new orthography.

6 files changed, 65 insertions, 61 deletions

diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 290e41e010e..8c16da90b1b 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,22 +1,16 @@
-# $NetBSD: Makefile,v 1.77 2018/03/12 11:17:38 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2018/03/17 09:09:12 tnn Exp $
 
-DISTNAME=	xcdroast-${DIST_VER}
-PKGNAME=	xcdroast-${DIST_VER:S/alpha/a/}
-PKGREVISION=	26
+DISTNAME=	xcdroast-1.18
 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
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=		cdrtools>=2.01:../../sysutils/cdrtools
 
-DIST_VER=		0.98alpha16
-
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -33,7 +27,6 @@ CONFIGURE_ENV+=	AUDIO_LIBS=${LIBOSSAUDIO}
 
 DOCDIR=		${PREFIX}/share/doc/xcdroast
 DOCFILES=	DOCUMENTATION FAQ README.nonroot manual/xcdroast-manual.pdf
-HTMLDIR=	${PREFIX}/share/doc/html/xcdroast
 CONF_FILES=	/dev/null ${PKG_SYSCONFDIR}/xcdroast.conf
 
 SUBST_CLASSES+=			devossaudio
@@ -43,6 +36,7 @@ SUBST_FILES.devossaudio=	io.c wavplay.c
 SUBST_SED.devossaudio=		-e "s,@DEVOSSAUDIO@,${DEVOSSAUDIO},g"
 
 INSTALLATION_DIRS=	${DOCDIR}
+SPECIAL_PERMS+=		lib/xcdroast/bin/xcdrwrap {REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4711
 
 post-install:
 	(cd ${WRKSRC}/doc;						\
diff --git a/sysutils/xcdroast/PLIST b/sysutils/xcdroast/PLIST
index b7942694b81..670f2ea65be 100644
--- a/sysutils/xcdroast/PLIST
+++ b/sysutils/xcdroast/PLIST
@@ -1,25 +1,24 @@
-@comment $NetBSD: PLIST,v 1.9 2018/01/01 22:29:58 rillig Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/03/17 09:09:12 tnn Exp $
 bin/xcdroast
-lib/xcdroast-0.98/bin/cddbtool
-lib/xcdroast-0.98/bin/rmtool
-lib/xcdroast-0.98/bin/vrfytool
-lib/xcdroast-0.98/bin/wavplay
-lib/xcdroast-0.98/bin/xcdrwrap
-lib/xcdroast-0.98/icons/burnproof.gif
-lib/xcdroast-0.98/icons/cddblogo.gif
-lib/xcdroast-0.98/icons/dialog_default.png
-lib/xcdroast-0.98/icons/dialog_error.png
-lib/xcdroast-0.98/icons/dialog_information.png
-lib/xcdroast-0.98/icons/dialog_question.png
-lib/xcdroast-0.98/icons/dialog_warning.png
-lib/xcdroast-0.98/icons/xcdricon.gif
-lib/xcdroast-0.98/icons/xcdricon.png
-lib/xcdroast-0.98/icons/xcdrlogo.gif
-lib/xcdroast-0.98/sound/test.wav
+lib/xcdroast/bin/cddbtool
+lib/xcdroast/bin/rmtool
+lib/xcdroast/bin/vrfytool
+lib/xcdroast/bin/wavplay
+lib/xcdroast/bin/xcdrwrap
+lib/xcdroast/icons/cddblogo.png
+lib/xcdroast/icons/dialog_default.png
+lib/xcdroast/icons/dialog_error.png
+lib/xcdroast/icons/dialog_information.png
+lib/xcdroast/icons/dialog_question.png
+lib/xcdroast/icons/dialog_warning.png
+lib/xcdroast/icons/xcdrlogo.png
+lib/xcdroast/icons/xcdrlogo_icon.png
+lib/xcdroast/icons/xcdrlogo_middle.png
+lib/xcdroast/icons/xcdrlogo_small.png
+lib/xcdroast/sound/test.wav
 man/man1/xcdroast.1
 share/doc/xcdroast/DOCUMENTATION
 share/doc/xcdroast/FAQ
-share/doc/xcdroast/README.nonroot
 share/doc/xcdroast/xcdroast-manual.pdf
 share/locale/bg/LC_MESSAGES/xcdroast.mo
 share/locale/ca/LC_MESSAGES/xcdroast.mo
@@ -38,8 +37,8 @@ share/locale/id/LC_MESSAGES/xcdroast.mo
 share/locale/it/LC_MESSAGES/xcdroast.mo
 share/locale/ja/LC_MESSAGES/xcdroast.mo
 share/locale/lv/LC_MESSAGES/xcdroast.mo
+share/locale/nb/LC_MESSAGES/xcdroast.mo
 share/locale/nl/LC_MESSAGES/xcdroast.mo
-share/locale/no/LC_MESSAGES/xcdroast.mo
 share/locale/pl/LC_MESSAGES/xcdroast.mo
 share/locale/pt_BR/LC_MESSAGES/xcdroast.mo
 share/locale/ro/LC_MESSAGES/xcdroast.mo
@@ -49,7 +48,5 @@ share/locale/sq_AL/LC_MESSAGES/xcdroast.mo
 share/locale/sv/LC_MESSAGES/xcdroast.mo
 share/locale/tr/LC_MESSAGES/xcdroast.mo
 share/locale/uk/LC_MESSAGES/xcdroast.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/xcdroast.mo
 share/locale/zh_CN/LC_MESSAGES/xcdroast.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
 share/locale/zh_TW/LC_MESSAGES/xcdroast.mo
diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
index 28c1821f48a..1d218c54e1d 100644
--- a/sysutils/xcdroast/distinfo
+++ b/sysutils/xcdroast/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.17 2015/11/04 01:32:39 agc Exp $
+$NetBSD: distinfo,v 1.18 2018/03/17 09:09:12 tnn Exp $
 
-SHA1 (parse_version.patch) = b4f85e53d050f355a162e9ca94b6b928f10fc5a8
-RMD160 (parse_version.patch) = 4d1f14240657dbf58721727ea4e993d6bd3d3273
-SHA512 (parse_version.patch) = 053095ba699d0794b37be504fc836da336ca7754c613ce4b6f3a8fc7cfbc6db179d3c0e2e0ff9c8da7a255d7395dd92eb7410af09ce34d4769dd2b5d8e935909
-Size (parse_version.patch) = 338 bytes
-SHA1 (xcdroast-0.98alpha16.tar.gz) = bbb3184a7e2bfd80d931698002dc9f74f136241d
-RMD160 (xcdroast-0.98alpha16.tar.gz) = d0d63b6387d9aeace5aaef8ee935b6c6d4836259
-SHA512 (xcdroast-0.98alpha16.tar.gz) = dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7
-Size (xcdroast-0.98alpha16.tar.gz) = 3563666 bytes
-SHA1 (patch-aa) = 0beee32a5550646cd360459d90281cb0ec9a826a
-SHA1 (patch-ad) = 501a40eeac05ba96483e6399880b5cf2bd629695
+SHA1 (xcdroast-1.18.tar.gz) = a80b9d123809e1d84afec8c51601dd764540bdd0
+RMD160 (xcdroast-1.18.tar.gz) = f5eafcc9638700dc62b624d3829cc362c204a343
+SHA512 (xcdroast-1.18.tar.gz) = 77808052aab9ab2d579ce7edc6d863e885692815bedb4f84d716ab14246076a3dac0e8f4a57fb46f65b1417be698c32cae80992afc808b6e52e9fd41625b8443
+Size (xcdroast-1.18.tar.gz) = 3403570 bytes
+SHA1 (patch-aa) = ad87f5ba86210105e9f66aea2f43ef16e86cf5ed
+SHA1 (patch-ad) = d72f44e998d132d8cb21fcaeeafe09a7546d72e1
+SHA1 (patch-src_Makefile.in) = 5d6b8a679bc2babadb49a5884a892187b2bff28f
diff --git a/sysutils/xcdroast/patches/patch-aa b/sysutils/xcdroast/patches/patch-aa
index 8b4188402a2..8f8efe8f954 100644
--- a/sysutils/xcdroast/patches/patch-aa
+++ b/sysutils/xcdroast/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.4 2002/12/02 20:29:49 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2018/03/17 09:09:12 tnn Exp $
 
---- 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 @@
+--- src/gettext.h.orig	2017-04-15 09:30:57.000000000 +0000
++++ src/gettext.h
+@@ -23,6 +23,7 @@
  
  /* Get declarations of GNU message catalog functions.  */
  # include <libintl.h>
 +# include <locale.h>
  
- #else
- 
+ /* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
+    the gettext() and ngettext() macros.  This is an alternative to calling
diff --git a/sysutils/xcdroast/patches/patch-ad b/sysutils/xcdroast/patches/patch-ad
index 01e4ddbef0f..0dc6f62299c 100644
--- a/sysutils/xcdroast/patches/patch-ad
+++ b/sysutils/xcdroast/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2009/02/11 21:48:39 shattered Exp $
+$NetBSD: patch-ad,v 1.6 2018/03/17 09:09:12 tnn Exp $
 
---- src/wavplay.c.orig	2008-08-20 15:34:02.000000000 +0000
+--- src/wavplay.c.orig	2017-11-15 17:56:45.000000000 +0000
 +++ src/wavplay.c
-@@ -23,6 +23,14 @@
+@@ -39,6 +39,14 @@
  #include <unistd.h>
  #include <fcntl.h>
  #include <string.h>
@@ -17,7 +17,7 @@ $NetBSD: patch-ad,v 1.5 2009/02/11 21:48:39 shattered Exp $
  #if defined(linux) || defined(__CYGWIN32__)
  # include <getopt.h>
  #endif
-@@ -72,8 +80,8 @@ gint read_line(gint fd, gchar *ptr, gint
+@@ -82,8 +90,8 @@ gint read_line(gint fd, gchar *ptr, gint
  off_t is_std_wav_file(int f, off_t *offset);
  
  
@@ -28,25 +28,26 @@ $NetBSD: patch-ad,v 1.5 2009/02/11 21:48:39 shattered Exp $
  #elif defined (aix)
  #define DEFAULT_AUDIO_DEVICE ""
  #elif defined(__sgi)
-@@ -309,7 +317,7 @@ int audio_write( void *buffer, int buf_s
- #endif
+@@ -95,7 +103,7 @@ off_t is_std_wav_file(int f, off_t *offs
+ #define DEFAULT_BUFFER_SIZE 22050 
  
  
 -#if defined(linux) || defined(__FreeBSD__)
 +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
  
- /* open the sound-device of linux and set cd-quality */
- 
-@@ -360,7 +368,7 @@ gint flags;
+ /*
+  * open the sound-device of linux and set cd-quality
+@@ -147,7 +155,8 @@ gint flags;
  
  #endif
  
 -#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 */
- 
-@@ -387,7 +395,7 @@ gint flags;
+ /*
+  * open the sound-device of solaris and set cd-quality
+@@ -175,7 +184,7 @@ gint flags;
  	info.play.precision = 16;
  	info.play.encoding = AUDIO_ENCODING_LINEAR;
  	info.play.buffer_size = abuf_size;
@@ -55,7 +56,7 @@ $NetBSD: patch-ad,v 1.5 2009/02/11 21:48:39 shattered Exp $
  	info.output_muted = 0;
  #endif
  
-@@ -787,10 +795,10 @@ gchar keybuffer[MAXLINE];
+@@ -579,10 +588,10 @@ gchar keybuffer[MAXLINE];
  
  	/* the open sets also the global abuf_size-variable */
  
diff --git a/sysutils/xcdroast/patches/patch-src_Makefile.in b/sysutils/xcdroast/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..da4057d2a48
--- /dev/null
+++ b/sysutils/xcdroast/patches/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2018/03/17 09:09:12 tnn Exp $
+
+Support user destdir.
+
+--- src/Makefile.in.orig	2018-03-17 08:53:29.502672918 +0000
++++ src/Makefile.in
+@@ -1172,7 +1172,7 @@ install-data-local:
+ 
+ # set suid bit on xcdrwrap
+ install-data-hook:
+-	chmod 4711 $(XCDRLIB_PREFIX)/bin/xcdrwrap
++#	chmod 4711 $(XCDRLIB_PREFIX)/bin/xcdrwrap
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.