Update to 2.01.01a48:

NEW features of cdrtools-2.01.01a46:

All:

-	New autoconf test AC_CHECK_DLIB() checks for lib members while using
	specified include files. This is a workaround for the autoconf hostile
	gettext() and iconv() implementations on Linux.

-	THe gettext()/iconv() tests have been rewritten to use AC_CHECK_DLIB()

-	The autoconf test AC_FUNC_VFORK from Paul Eggert was not written in
	clean C and thus failed on a ANSI-C compiler, asuming that vfork()
	is not available in the ANSI case.

-	README.compile fixed to refer to READMEs/README.gmake instead of
	README.gmake

-	Symlink support in RULES/MKLINKS added for ia64-hp-ux-cc.rul and
	ia64-hp-ux-gcc.rul, thanks to a hint from Steven M. Schweda

Cdda2wav (Maintained/enhanced by J

-	The new -interactive option has now been stabilized for a first integration that
	allows to replace libcdio for sound-juicer to come to an implementation without
	license violations.

Mkisofs (Maintained/enhanced by J

-	Mkisofs now correctly limits filenames with non-ISO-8859-1 characters
	to 127 chars max.

-	Mkisofs now correctly sets the permissions for "invented" unreal
	directories in UDF instread of using mode 000.

NEW features of cdrtools-2.01.01a47:

All:

-	DEFAULTS*/Defaults.dragonfly added
	Thanks to a hint from Thomas Klausner

-	Added a workaround for a Sun make bug

Mkisofs (Maintained/enhanced by J

-	Mkisofs now correctly sets the permissions for "invented" unreal
	directories in UDF instread of using mode 000. The last version
	intruced a bug during the code cleanup phase.

-	Mkisofs now correctly mixes multi-extent-File directory entries from
	old sessions made by mkisofs. This is only related to multi-session
	with files >= 4 GB.

-	isoinfo now extracts files using 10 sectors at a time to speed up
	operation

[pkgsrc note: this is based on patch-cj]

NEW features of cdrtools-2.01.01a48:

All:

-	Next attempt to work around the non-autoconf friendly implementation
	of GNU gettext and GNU libiconv.

-	A new autoconf test allows to check whether the installed system shell
	(/bin/sh) properly aborts with failed commands in "sh -ce 'cmd'".

	If failed simple commands in "sh -ce 'cmd'" do not abort complex
	commands, "make" will not stop on errors in the build process.
	Note that this is a definite POSIX incompatibility.

	The most well known defective shell with respect to this problem is "bash"
	but /bin/sh on HP-UX-10.x (a Korn Shell modification) does not work
	correctly either. If your system (Linux, HP-HX, ...) suffers from this
	problem, I recommend to fetch the Schily Source consolidation from
		ftp://ftp.berlios.de/pub/schily/
	Use a version that has been published past September 1st 2008, compile
	and install the contained Bourne Shell as "/bin/bosh". Then call
	"./.clean" and compile again. The resulting "smake" will then
	automatically call "/bin/bosh" instead of "/bin/sh" in order to
	execute commands.

Libfind:

-	& before some functions removed

Cdrecord:

-	cdrecord now correctly writes DVD+R/DL media with all drives.
	Before, there have been problems at the layer break with some
	drives.

3 files changed, 7 insertions, 49 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 152ab875ba7..55229b728bb 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2008/08/23 20:41:09 tnn Exp $
+# $NetBSD: Makefile,v 1.42 2008/09/06 13:31:07 wiz Exp $
 
-DISTNAME=	cdrtools-2.01.01a45
-PKGNAME=	cdrtools-2.01.01.45
-PKGREVISION=	3
+DISTNAME=	cdrtools-2.01.01a48
+PKGNAME=	cdrtools-2.01.01.48
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/
 EXTRACT_SUFX=	.tar.bz2
@@ -72,10 +71,6 @@ SUBST_FILES.oss=	cdda2wav/local.cnf.in
 SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSSOUND},g"
 SUBST_MESSAGE.oss=	Fixing OSS sound device path.
 
-post-extract:
-	ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS/Defaults.dragonfly
-	ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS_ENG/Defaults.dragonfly
-
 do-configure:
 	cd ${WRKSRC}/RULES;						\
 	for suffix in netbsd-cc.rul netbsd-gcc.rul; do			\
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index a5750635065..4dbca31252c 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2008/08/23 15:33:04 wiz Exp $
+$NetBSD: distinfo,v 1.24 2008/09/06 13:31:07 wiz Exp $
 
-SHA1 (cdrtools-2.01.01a45.tar.bz2) = c79ea5c87b48b2cb697e20c0efd9e11f752cfcb3
-RMD160 (cdrtools-2.01.01a45.tar.bz2) = e6e12fdae5ab98ba66f42eae27fb6e452f52eff1
-Size (cdrtools-2.01.01a45.tar.bz2) = 1680541 bytes
+SHA1 (cdrtools-2.01.01a48.tar.bz2) = 94286b7771d53b2a0033fcb969446f468b969c1c
+RMD160 (cdrtools-2.01.01a48.tar.bz2) = ab86959f919cd5e6bdd250e36e860cce4b671796
+Size (cdrtools-2.01.01a48.tar.bz2) = 1684221 bytes
 SHA1 (patch-aa) = 1f3461ae34071c20672025575bbb0abe7b128ef8
 SHA1 (patch-ab) = 5352fee446483e2a5e7917ebf9a84e7c7fd65bb7
 SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f
@@ -10,4 +10,3 @@ SHA1 (patch-ad) = 06f33c8b995e7f6edb53d78164cb8fbcd0cdefa8
 SHA1 (patch-ai) = 5d46fd425fdac880ea8037f8a2f18094d6765336
 SHA1 (patch-ch) = 65397614fe196709b26a789bdd34ed6776b4ef46
 SHA1 (patch-ci) = ff0d14544b0958f581a37c1b007fae581f871021
-SHA1 (patch-cj) = 6be6bb13345a5bfe8c2f9cce6090b40e7b44a258
diff --git a/sysutils/cdrtools/patches/patch-cj b/sysutils/cdrtools/patches/patch-cj
deleted file mode 100644
index aa4331b2f20..00000000000
--- a/sysutils/cdrtools/patches/patch-cj
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-cj,v 1.3 2007/09/18 23:07:27 wiz Exp $
-
-isoinfo extracts files at the painful rate of 1 sector at a time.  This patch
-speeds up file extraction significantly by using a much larger buffer.
-
---- mkisofs/diag/isoinfo.c.orig	2007-07-29 22:33:21.000000000 +0000
-+++ mkisofs/diag/isoinfo.c
-@@ -648,7 +648,7 @@ extract_file(idr)
- 	struct iso_directory_record *idr;
- {
- 	int		extent, len, tlen;
--	unsigned char	buff[2048];
-+	unsigned char	buff[204800];
- 
- #if	defined(__CYGWIN32__) || defined(__CYGWIN__) || defined(__EMX__) || defined(__DJGPP__)
- 	setmode(fileno(stdout), O_BINARY);
-@@ -658,16 +658,15 @@ extract_file(idr)
- 	len = isonum_733((unsigned char *)idr->size);
- 
- 	while (len > 0) {
--#ifdef	USE_SCG
--		readsecs(extent - sector_offset, buff, ISO_BLOCKS(sizeof (buff)));
- 		tlen = (len > sizeof (buff) ? sizeof (buff) : len);
-+#ifdef	USE_SCG
-+		readsecs(extent - sector_offset, buff, ISO_BLOCKS(tlen));
- #else
- 		lseek(fileno(infile), ((off_t)(extent - sector_offset)) << 11, SEEK_SET);
--		tlen = (len > sizeof (buff) ? sizeof (buff) : len);
- 		read(fileno(infile), buff, tlen);
- #endif
- 		len -= tlen;
--		extent++;
-+		extent += ISO_BLOCKS(tlen);
- 		write(STDOUT_FILENO, buff, tlen);
- 	}
- }