Update to 2.01.01a35. Install more programs and documentation.

Changes since 2.01.01a28:

NEW features of cdrtools-2.01.01a28:

All:

-	Support for SunStudio 12 on Linux was added.
	Call "make CCOM=suncc", but note that you then
	will not be able to compile Linux specific functions like
	support for ext2 file flags. This does not work because the
	related include files are not written in clean C.

	Note that nearly all programs from cdrtools depend on libscg
	which uses platform speficic code for every OS. As the Linux
	kernel include files are not written in clean C, you cannot
	compile libscg using Sun Studio. If someone from the Linux kernel
	team would rewrite the Linux kernel include files to only use clean
	C based constructs, cdrecord could be compiled with Sun Studio
	compilers.

-	Added a workaround to config.guess to get correct
	platform names from "configure" even thogh suncc
	does not #define __ELF__

-	Linux specific autoconf tests are not only executed on Linux
	based platforms

-	Some make rule definitions for Cygwin restructured to allow
	compilation with more Cygwin releases. The -D_WIN32_WINNT=
	definitions are now only in effect if the selected compiler
	is the Microsoft compiler.

-	New include file schily/ioctl.h


-	Added Support to create Blastwave SVr4 packages.
	To create a Blastwave package, call:

		.clean
		smake -f Mcsw

	You need the program "fakeroot" and will find the results
	in packages/<arch-dir>

	Note that this source tree will allow you to create the package
	CSWcdrtools but not the packages CSWschilybase and CSWschilyutils
	on which CSWcdrtools depends.

	WARNING: libsiconv.a and it's character translation tables (located in
	/opt/*/lib/siconv) are not part of CSWcdrtools but of CSWschilybase.
	If you do not update CSWschilybase to include the character translation
	tables used by libsiconv, mkisofs will not work correctly.

	NOTE: the SVr4 package specific rules are approx. 10 lines of make rules.
	It should be simple to create rule definitions for other package systems
	found on platforms other than Solaris. Volunteers who like to help
	to deveop support for other packaging systems are welcome!


Libparanoia (Ported/enhanced by Jörg Schilling, originated by Monty xiphmont@mit.edu):

-	"make install" now also installs the READMEs and other docukmentation to
	..../share/doc/libparanoia/


Libsiconv:

-	New library libsiconv replaces libunls.
	Libsiconv saves ~ 130 kB of executable space in mkisofs and allows to use
	iconv() if it is present on the current polatform.

Rscsi:

-	"make install" now also installs the READMEs and other docukmentation to
	..../share/doc/rscsi/

Cdrecord:

-	"make install" now also installs the READMEs and other docukmentation to
	..../share/doc/cdrecord/

-	New function verify() in high level code.

Cdda2wav (Maintained/enhanced by Jörg Schilling, originated by Heiko Eißfeldt heiko@hexco.de):

-	"make install" now also installs the READMEs and other docukmentation to
	..../share/doc/cdda2wav/

Scgskeleton:

-	New merged code from the "sformat" and "cdrecord" consolidation.

-	Bumped to version 1.2

Mkisofs (Maintained/enhanced by Jörg Schilling since 1997, originated my Eric Youngdale):

-	"make install" now also installs the READMEs and other docukmentation to
	..../share/doc/mkisofs/

-	The change from libunls to libsiconv fixes a lot of bugs in the
	character translation tables. libsiconv now uses the official tables
	from Unicode.org. Any other "single char" -> UNICODE table from
	Unicode.org may be taken unmodified and copied to /opt/schily/lib/libsiconv
	to become usable by libsiconv.

	If you use the same character set names as with old mkisofs, you get
	the character translations from the tables in /opt/schily/lib/libsiconv,
	if you use ICONV based locale names and iconv() is available on your
	platform, then mkisofs used iconv() to translate the character encodings.

	If you like to force to use the iconv() code, use something like:

	mkisofs -input-charset iconv:8859-1

	****** IMPORTANT ********

	You need to install the table files from libsiconv to make mkisofs
	behave correctly.

-	Thanks to the new libsiconv, mkisofs now supports to run in a UTF-8 locale.
	As long as no automatic locale support is present, call

	mkisofs -input-charset UTF-8

-	Completed the Symlink implementation for UDF. The code was 20% ready
	from Helios.de from the includes from the Helios variant of mkisofs.

-	New option -no-udfsymlinks to turn off support for UDF symlinks.
	The UDF standards requires any OS to implement symlink support, but
	you never know...

-	New option -UDF implements non-anonymous UDF support.
	The relation between -UDF vs. -udf is the same as with -R vs. -r

-	Integrated a larger code drop from Helios.de, thanks to Helmut Tschemernjak
	from helios.de. We did integrate the following new features from Helios.de:

	-	Support for UID/GID in the UDF file meta data

	-	Support for permissions in the UDF file meta data

	-	Support for Mac OS X "/..namedfork/rsrc"

	-	Avoid Mac OS X syslog entries when "/rsrc" is used.

	-	Support for UDF based Mac OS extensions (type/creator and
		resource forks).

	-	New option -no-hfs allows to turn off creating a ISO9660/HFS hybrid
		when UDF based Mac OS extensions are used.

	-	Do not chache resorce fork files in the inode cache anymore.

	We did not include the following code from the Helios.de code drop:

	-	Helios UNICODE unification (always tries to create "complete"
		characters if e.g. a 'ö' is written as 'o'+'"', this is translated
		into a 'ö'.

		The reason for not integrating this code is that it did violate
		constraints from mkisofs. The translation was done based on UTF-8
		regardless of the current locale of the user. It could only work
		in a UTF-8 based locale but mkisofs did not yet support UTF-8 an
		based locale. The correct implementation would be in most cases
		based on UCS-2 characters as used by Joliet and UDF.

	-	Helios code that did prevent mkisofs to abort on certain kind of
		read errors.

		The reason for not integrating this code is that it did not work
		as expected for all possible cases and that such code should use
		a similar mechanism as "star"s error control feature.

	-	The Helios option -nolimit-pathtables has not been included as the
		implementation did cause the PATH table to contain random data in
		case that a PATH table overflow was allowed.

	-	The Helios code drop did modify the libfind callback function to
		implement Mac OS extensions. This is not correct as all the Mac OS
		related stuff should already in the functions that are called
		by the unmodified libfind callback.

		Another problem with this code is that it would introduce an
		otherwise non-existent path length limitation with "mkisofs -find "

	-	Helios did remove the artificial limit for UDF files > 2 GB.
		This is currently not done for consistency between ISO-9660 and
		UDF. Mkisofs will implement multi-extent files soon and then
		the UDF file size limitation will be removed.


NEW features of cdrtools-2.01.01a29:


All:

-	Added a note to README.compile on how to work around a problem
	in /usr/include/linux/types.h that prevents to compile cdrtools
	on Linux using the Sun Studio compiler.

-	A workaround against non autoconf friendly code in Cygwin has been
	fixed in include/schily/iconv.h (a typo).

-	Compilations with static configuration are now also possible on HP-UX

-	All profiles libraries now have the same name as the non-profiled variants.
	To create a profiled version of a command, do something like this:

	cd cdrecord
	smake clean
	smake COPTX=-xpg LXOPTX=-xpg LINKMODE=profiled

	For GCC use:

	cd cdrecord
	smake clean
	smake COPTX=-pg LXOPTX=-pg LINKMODE=profiled


Libschily:

-	getargs() enhanced to fully support POSIX Command line rules

-	snprintf() is again compiled into libschily in case that the function
	is missing on the current platform.

Libsiconv:

-	sic_open() now allows to be called with a NULL pointer argument

-	sic_list() now returns the number of listed translations

Cdrecord:

-	Some small typo fixes in the man page

-	Speed values are now also displayed as multiple of Blu Ray 1x

-	First hacky "support" for Blu Ray media. Note that this support
	is based on the assumption that
		"cdrecord driver=drv_dvdplusrw driveropts=burnfree" -force
	works for BD-RE.

	There was no write testing for this new yet but several of the
	parameters have been verified and several modifications have been applied
	to make some of the commands work for Blu Ray.

	The code is fully experimental!

-	The read disk structure command has been enhanced to support the
	media type field for Blu ray.

-	Speed values are now also displayed as multiple of Blu Ray 1x

-	Cdrecord now aborts with DVD+R if -dummy has been specified as there is
	no -dummy mode for DVD+R. This has been forgotten for years....


Cdda2wav (Maintained/enhanced by Jörg Schilling, originated by Heiko Eißfeldt heiko@hexco.de):

-	Added some casts to interface.c and ioctl.c in order to prevent warnings
	from the Sun Studio 12 compiler.

-	The man page has been restructured to correctly use bold and italic
	with option descriptions.

Readcd:

-	Speed values are now also displayed as multiple of Blu Ray 1x

-	readcd -factor meshpoints=100 now also displays the speed as multiple
	of Blu Ray speed if the medium is a BD

Mkisofs (Maintained/enhanced by Jörg Schilling since 1997, originated my Eric Youngdale):

-	Avoid a core dump with mkisofs -new-dir-mode XXXX caused by a bad
	getargs() option format string. Thanks to Thomas Flock <tf-mkisofs-200611@online.de>
	for reporting.

-	Some small typo fixes in the man page

-	Fix mkisofs to no longer dump core in case that a non-existing locale
	is used. Thanks to Dirk Paehl for reporting.

-	mkisofs now warns in case that /opt/schily/libsiconv/ is missing
	or not populated.

-	mkisofs no longer requires the Mac OS extension related locale
	translations to be present in case that no Mac extensions are requested.

-	diag/isoinfo also has been fixed to correctly use iconv.
	Thanks to Kai Raphahn <kai.raphahn@laburec.de> for reporting.


NEW features of cdrtools-2.01.01a30:
All:

-	More locale related autoconf tests (see mkisofs)

Libscg:

-	Detect & correctly handle SCSI send permission problems with USCSI and Solaris

Cdrecord:

-	cdrecord -pad cue=file now works as people expect.
	Thanks to to Bernd Eggink for reporting

-	Workaround for new Solaris behavor for Console users if hald
	is active. Give error message and abort instead of useless messages.

-	Print Linux 2.6.8 warnings only if there really was a problem.

-	Blu Ray driver now supports "cdrecord -atip" to read manufacturer IDs.

-	DVD writing works again. Introducing Blu Ray with 2.01.01a29 did cause
	problems with DVDs.

-	Several MMC-3+ Text strings for profiles and media codes have been added.


Cdda2wav (Maintained/enhanced by Jörg Schilling, originated by Heiko Eißfeldt heiko@hexco.de):

-	Workaround for new Solaris behavor for Console users if hald
	is active. Give error message and abort instead of useless messages.

Btcflash:

-	Workaround for new Solaris behavor for Console users if hald
	is active. Give error message and abort instead of useless messages.

Mkisofs (Maintained/enhanced by Jörg Schilling since 1997, originated my Eric Youngdale):

-	mkisofs now sets up -input-charset to the locale read from the
	environment in case that no -input-charset has been specified.
	To disable this automatic set up, use -input-charset "".

NEW features of cdrtools-2.01.01a31:

Cdrecord:

-	New code to better print speed performance values
	with cdrecord -prcap
	Note: The 'MATSHITA' 'BD-MLT SW-5582  ' seems for unknown
	reason not to support to retrieve the current read/write speed
	values via get_performance.

-	cdrecord -minfo now prints "Mounted media class" and
	"Mounted media type" name.

-	Fixed a bug in auto-target mode introduced with 2.01.01a30
	Cdrecord now again is able to work wihtout a dev= parameter.


Cdda2wav (Maintained/enhanced by Jörg Schilling, originated by Heiko Eißfeldt heiko@hexco.de):

-	Fixed a bug in auto-target mode introduced with 2.01.01a30
	Cdda2wav now again is able to work wihtout a dev= parameter.

Readcd:

-	Fixed a bug in auto-target mode introduced with 2.01.01a30
	Readcd now again is able to work wihtout a dev= parameter.

Mkisofs (Maintained/enhanced by Jörg Schilling since 1997, originated my Eric Youngdale):

-	New option -no-limit-pathtables allows to create filesystems with
	more than 65535 parent directories. Note that this makes the filesystem
	violating ISO9660 and the filesystem will not be usable on DOS.

-	New option errctl=name or errctl=control-spec similar as in star.

	This option allows e.g. to tell mkisofs not to abort if a file
	did grow or shrink while mkisofs was reading it.

	Currently only OPEN, READ, GROW, SHRINK are implemented more to come
	later...

NEW features of cdrtools-2.01.01a32:

All:

-	Handling non-large file aware systems is now more correct

Libparanoia (Ported/enhanced by Jörg Schilling, originated by Monty xiphmont@mit.edu):

-	Fixed some minor problems with K&R compilers


Libedc (Optimized by Jörg Schilling, originated by Heiko Eißfeldt heiko@hexco.de):

-	#define memmove() to movebyted for libedc_dec if memmove is missing.

Libsiconv:

-	Deactivate TAB_SIZE check for K&R compilers. They cannot
	do complex math in cpp.

Cdda2wav (Maintained/enhanced by Jörg Schilling, originated by Heiko Eißfeldt heiko@hexco.de):

-	cdda2wav now includes a copyright message and a year number
	with the -version output.

-	Add a workaround for a definition in <sundev/srreg.h> on SunOS-4.x

-	Fixed some minor problems with K&R compilers

Mkisofs (Maintained/enhanced by Jörg Schilling since 1997, originated my Eric Youngdale):

-	mkisofs now includes a copyright message and a year number
	with the -version output.

-	New option -no-limit-pathtables allows to create filesystems with
	more than 65535 parent directories. Note that this makes the filesystem
	violating ISO9660 and the filesystem will not be usable on DOS.

	With 2.01.01a32, this also applies to the Joliet PATH table.

-	Support for ISO-9660 multi extent files added, thanks to
	Frederick Bruckman for sending some experimental sample code
	that helped to find the right ideas for a final implementation.

	This allows mkisofs to support files > 4 GB.

	-	If you only use ISO-9660 (that may include Rock Ridge) or Joliet,
		mkisofs is able to support single files up to a size of 8 TB.

	-	If UDF is included, files > 190 GB will not appear in the UDF
		file tree.

	IMPORTANT: You need to specify mkisofs -iso-level 3 or
			mkisofs -iso-level 4 to allow mkisofs to archive
			files > 4 GB. Also note that if you specify -hfs,
			mkisofs will not archive fiiles larger than 2 GB.

	NOTE:

	Linux	currently does not allow to read the complete content of
		multi-extent files and will return EIO at some offset.

	Solaris	currently does not allow you to read multi-extent files at all.
		It will return EINVAL and print a kernel message

-	New options -hide-udf and -hide-udf-list allow to delectively exclude
	files from the UDF tree. Note that mkisofs currently still binds the
	UDF tree to the Joliet tree. All files that have been excluded from
	the Joliet tree currently are also excluded from the UDF tree.

-	Always hide the Trans table (from mkisofs -T) files from the UDF tree.

NEW features of cdrtools-2.01.01a33:

Cdrecord:

-	Added support to unlock the free firmware for the Plextor 755 and 760
	drives. Thanks to a hint from Alexander Noé.
	This makes the following features available again:

		GIGAREC SINGLESESSION HIDECDR

	Note: You need to install free firmware in the drive first to make this
	work.

	If you like, you may turn the feature off using "driveropts=plexdisable"


-	Added support for enhanced gigarec found in newer Plextor drives.
	The gigarec values 0.9 anf 1.1 are now supported. Cdrecord now supports:

	0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4

	Note that not all values are supported by all drives.


-	Added support for Yamaha AutioMaster in the Plextor Premium 2.
	Thanks to a hint from Paolo Saggese. Original Yamaha audiomaster
	is like gigarec 0.85, Plextor implemented 0.8666 which still looks
	like a useful additional intermdiate value.


-	Make the man page more obvious that gigarec with values < 1.0 is _very_
	similar to audiomaster except for pit sizes.

-	Code restructured from a CD/DVD only program to a program that
	writes multiple different similar media.

-	New simulation driver "bd_simul"

-	Trying to make the text in cdrecord.c that forbids incompatible changes
	to be published under the name "cdrecord" more user friendly.


Readcd:

-	Added support to read C1/C2/CU errors from Plextor and NEC/Optiarc drives.
	Thanks to Alexander Noé for the code.

	If you run the test with:

	readcd -cxscan

	you will only see summary output. If you add one -v, you see the error
	information for every second that does include errors. If you add -vv,
	you see information for every second in the data range.

	Note that the output format will change in future to support GNU plot.
	I am looking for suggestions for a useful output format.

-	Added support for pisum8 tests for DVDs on drives made by Plextor

	If you run the test with:

	readcd -pi8scan

-	Added support for pif tests for DVDs on drives made by Plextor

	If you run the test with:

	readcd -pifscan

	Fall all three new options, you will only see summary output. If you
	add one -v, you see the error information for every second (CD)
	8 * 32 KB (pisum8) or 32 KB (pif) that does include errors. If you add
	-vv, you see information for every interval in the data range.

	Note that the output format may change in future,
	I am looking for suggestions for a useful output format.

-	New option -plot allows to modify the outputformat for the options
	-cxscan, -pi8scan, -pifscan

	To plot a list of pisum8 and pif errors, call:

	readcd -pi8scan -plot > pisum8
	readcd -pifscan -plot > pif
	gnuplot
	gnuplot> plot "pisum8" w l
	gnuplot> replot "pif" w l

	To plot a list of C1/C2/CU errors call:

	readcd -cxscan > cx
	awk '{ print $1 " " $2 }' < cx > c1errs
	awk '{ print $1 " " $3 }' < cx > c2errs
	awk '{ print $1 " " $4 }' < cx > cuerrs
	gnuplot
	gnuplot> plot "c1errs" w l
	gnuplot> replot "c2errs" w l
	gnuplot> replot "cuerrs" w l

Mkisofs (Maintained/enhanced by Jörg Schilling since 1997, originated by Eric Youngdale):

-	Avoid warnings when compiling tree.c with some compilers.

-	Do no longer warn about violating ISO-9660 if -iso-level 4 has been specified.

NEW features of cdrtools-2.01.01a34:

Cdrecord:

Cdda2wav (Maintained/enhanced by Jörg Schilling, originated by Heiko Eißfeldt heiko@hexco.de):

-	Fixed a +- 1 problem in realloc() for TOC handling.
	Thanks to a report from Joshua Reuben Roys

Mkisofs (Maintained/enhanced by Jörg Schilling since 1997, originated by Eric Youngdale):

-	Fixed a double free problem caused by multi-extent files

-	New function e_strdup() checks return code from strdup() for all calls.

NEW features of cdrtools-2.01.01a35:

*******
NOTE: this is _not_ a release that starts a new aplha/beta series of
	distibutions. The only reason is to add certain new CD/DVD features
	that are important.

	So _please_ do not send any patches except when you like to fix
	extreme bugs. I am currently mainly working on stable incremental
	restore featurs for star-1.5-final.
	Once star-1.5-final is out, cdrtools will start a new developent cycle.
*******


Libschily:

-	Fixed a bug in checkerr.c that was caused by the fact that errflags()
	did try to modify it's string argument.


Libparanoia (Ported/enhanced by Jörg Schilling, originated by Monty xiphmont@mit.edu):

-	Set a useful default for the dynamic sector overlap start sector
	in case that the dynamic sector overlap limits are manually changed

Cdrecord:

-	Better code structure for dvd/bd driver recognition.


Cdda2wav (Maintained/enhanced by Jörg Schilling, originated by Heiko Eißfeldt heiko@hexco.de):

-	New option start-sector=sector allows to set an absolute sector number
	where to start audio extraction.

	This option has been added as a first step to allow to write a
	wrapper for cdda2wav to create a "GStreamer plugin". This helps
	to:

	-	avoid license problems in libcdio

	-	allows to call a privileged programs like cdda2wav from a GUI
		to grant full audio extraction quality that needs generic SCSI
		commands.

-	Cstyle indentation changes

-	Man page now includes some forgotten options

-	Man page now describes the paraopts= sub option list

-	Man page now describes the statistic output from the paranoia code

	HELIOS TODO:

	-	Add the HELIOS UNICODE mapping code. This needs to be done
		at UCS-2 level for Joliet and UDF (instead of UTF-8) and only
		for Rock Ridge (in case of a UTF-8 based target locale) using
		UTF-8 based translations.

	-	Make the Apple extensions work again with "mkisofs -find"

TODO:
	-	Support correct inode numbers for UDF hardlinks

	-	Support sockets, pipes, char/blk-dev specials with UDF

	-	read Joliet filenames with multi-session if no TRANS.TBL
		or RR is present. I am looking for a volunteer for this task!

		Note that this can never be 100% correct as there is no relation
		between the names on the master (UNIX) filesystem, the ISO-9660
		names and the Joliet names. Only the Rock Ridge names are
		untranslated with respect to the original files on the
		master (UNIX) filesystem.

	-	add libecc/edc for CDI and similar.

10 files changed, 179 insertions, 88 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index d79e96a6190..03640818fc6 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2007/08/07 19:26:22 he Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/18 23:07:26 wiz Exp $
 
-DISTNAME=	cdrtools-2.01.01a27
-PKGNAME=	cdrtools-2.01.01.27
-PKGREVISION=	1
+DISTNAME=	cdrtools-2.01.01a35
+PKGNAME=	cdrtools-2.01.01.35
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/
 EXTRACT_SUFX=	.tar.bz2
@@ -30,6 +29,7 @@ MAKE_ENV+=	ARCH=""
 MAKE_ENV+=	MAKEPROG="gmake"
 MAKE_ENV+=	COPTX=${CFLAGS:Q}
 MAKE_ENV+=	LDOPTX=${LDFLAGS:Q}
+MAKE_ENV+=	INS_BASE=${PREFIX:Q}
 
 # if we're using a gcc which is named gcc, we need to set CCOM=gcc
 # in MAKE_ENV so the make infrastructure picks the right options.
@@ -48,7 +48,10 @@ MESSAGE_SUBST+=	PKGNAME_NOREV=${PKGNAME_NOREV:Q}
 MESSAGE_SUBST+=	CDRECORD_CONF=${CDRECORD_CONF:Q}
 .endif
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
+INSTALLATION_DIRS=	bin lib/siconv ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \
+			share/doc/cdrtools/cdda2wav \
+			share/doc/cdrtools/cdrecord \
+			share/doc/cdrtools/mkisofs
 
 SUBST_CLASSES+=		fix
 SUBST_STAGE.fix=	post-patch
@@ -81,23 +84,35 @@ post-build:
 	done
 
 do-install:
-	cd ${WRKSRC}/cdda2wav;						\
-		${INSTALL_PROGRAM} OBJ/*/cdda2wav ${DESTDIR}${PREFIX}/bin;	\
-		${INSTALL_MAN} cdda2wav.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	cd ${WRKSRC}/cdrecord;						\
-		${INSTALL_PROGRAM} OBJ/*/cdrecord ${DESTDIR}${PREFIX}/bin;	\
-		${INSTALL_MAN} cdrecord.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	cd ${WRKSRC}/mkisofs;						\
-		${INSTALL_PROGRAM} OBJ/*/mkisofs ${DESTDIR}${PREFIX}/bin;		\
-		${INSTALL_MAN} mkisofs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	for program in btcflash cdda2wav cdrecord mkhybrid mkisofs 	\
+		readcd scgcheck scgskeleton; do				\
+	cd ${WRKSRC}/$${program};					\
+		${INSTALL_PROGRAM} OBJ/*/$${program} 			\
+			${DESTDIR}${PREFIX}/bin;			\
+	done
+	for program in btcflash cdda2wav cdrecord readcd scgcheck; do	\
+		${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.1 	\
+			${DESTDIR}${PREFIX}/${PKGMANDIR}/man1;		\
+	done
+	for program in mkhybrid mkisofs; do				\
+		${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.8 	\
+			${DESTDIR}${PREFIX}/${PKGMANDIR}/man8;		\
+	done
 	cd ${WRKSRC}/mkisofs/diag;					\
-		for f in devdump isodump isoinfo isovfy; do		\
-			${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin;	\
-			${INSTALL_MAN} isoinfo.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
+		for f in devdump isodebug isodump isoinfo isovfy; do	\
+			${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin; \
+			${INSTALL_MAN} $$f.8 \
+				${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
 		done
-	cd ${WRKSRC}/readcd;						\
-		${INSTALL_PROGRAM} OBJ/*/readcd ${DESTDIR}${PREFIX}/bin;		\
-		${INSTALL_MAN} readcd.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/[cik]* \
+		${PREFIX}/lib/siconv
+	${RM} ${PREFIX}/lib/siconv/*mk
+	${INSTALL_DATA} ${WRKSRC}/cdda2wav/README* \
+		${PREFIX}/share/doc/cdrtools/cdda2wav
+	${INSTALL_DATA} ${WRKSRC}/cdrecord/README* \
+		${PREFIX}/share/doc/cdrtools/cdrecord
+	${INSTALL_DATA} ${WRKSRC}/mkisofs/README* \
+		${PREFIX}/share/doc/cdrtools/mkisofs
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrtools/PLIST b/sysutils/cdrtools/PLIST
index f53cce8d274..4f584526eb2 100644
--- a/sysutils/cdrtools/PLIST
+++ b/sysutils/cdrtools/PLIST
@@ -1,17 +1,114 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/09/18 23:07:26 wiz Exp $
+bin/btcflash
 bin/cdda2wav
 bin/cdrecord
 bin/devdump
+bin/isodebug
 bin/isodump
 bin/isoinfo
 bin/isovfy
 bin/mkisofs
 bin/readcd
+bin/scgcheck
+bin/scgskeleton
+lib/siconv/cp10000
+lib/siconv/cp10006
+lib/siconv/cp10007
+lib/siconv/cp10029
+lib/siconv/cp10079
+lib/siconv/cp10081
+lib/siconv/cp1250
+lib/siconv/cp1251
+lib/siconv/cp1252
+lib/siconv/cp1253
+lib/siconv/cp1254
+lib/siconv/cp1255
+lib/siconv/cp1256
+lib/siconv/cp1257
+lib/siconv/cp1258
+lib/siconv/cp437
+lib/siconv/cp737
+lib/siconv/cp775
+lib/siconv/cp850
+lib/siconv/cp852
+lib/siconv/cp855
+lib/siconv/cp857
+lib/siconv/cp860
+lib/siconv/cp861
+lib/siconv/cp862
+lib/siconv/cp863
+lib/siconv/cp864
+lib/siconv/cp865
+lib/siconv/cp866
+lib/siconv/cp869
+lib/siconv/cp874
+lib/siconv/iso8859-1
+lib/siconv/iso8859-10
+lib/siconv/iso8859-11
+lib/siconv/iso8859-13
+lib/siconv/iso8859-14
+lib/siconv/iso8859-15
+lib/siconv/iso8859-16
+lib/siconv/iso8859-2
+lib/siconv/iso8859-3
+lib/siconv/iso8859-4
+lib/siconv/iso8859-5
+lib/siconv/iso8859-6
+lib/siconv/iso8859-7
+lib/siconv/iso8859-8
+lib/siconv/iso8859-9
+lib/siconv/koi8-r
+lib/siconv/koi8-u
+man/man1/btcflash.1
 man/man1/cdda2wav.1
 man/man1/cdrecord.1
 man/man1/readcd.1
+man/man1/scgcheck.1
 man/man8/devdump.8
+man/man8/isodebug.8
 man/man8/isodump.8
 man/man8/isoinfo.8
 man/man8/isovfy.8
 man/man8/mkisofs.8
+share/doc/cdrtools/cdda2wav/README
+share/doc/cdrtools/cdrecord/README
+share/doc/cdrtools/cdrecord/README.ATAPI
+share/doc/cdrtools/cdrecord/README.DiskT@2
+share/doc/cdrtools/cdrecord/README.WORM
+share/doc/cdrtools/cdrecord/README.audio
+share/doc/cdrtools/cdrecord/README.cdplus
+share/doc/cdrtools/cdrecord/README.cdrw
+share/doc/cdrtools/cdrecord/README.cdtext
+share/doc/cdrtools/cdrecord/README.clone
+share/doc/cdrtools/cdrecord/README.copy
+share/doc/cdrtools/cdrecord/README.multi
+share/doc/cdrtools/cdrecord/README.parallel
+share/doc/cdrtools/cdrecord/README.raw
+share/doc/cdrtools/cdrecord/README.rscsi
+share/doc/cdrtools/cdrecord/README.solaris-x86-ATAPI-DMA
+share/doc/cdrtools/cdrecord/README.solaris-x86-ata-DMA
+share/doc/cdrtools/cdrecord/README.sony
+share/doc/cdrtools/cdrecord/README.sun-lofi
+share/doc/cdrtools/cdrecord/README.verify
+share/doc/cdrtools/cdrecord/README.volmgt
+share/doc/cdrtools/mkisofs/README
+share/doc/cdrtools/mkisofs/README.compression
+share/doc/cdrtools/mkisofs/README.eltorito
+share/doc/cdrtools/mkisofs/README.graft_dirs
+share/doc/cdrtools/mkisofs/README.hfs_boot
+share/doc/cdrtools/mkisofs/README.hfs_magic
+share/doc/cdrtools/mkisofs/README.hide
+share/doc/cdrtools/mkisofs/README.joliet
+share/doc/cdrtools/mkisofs/README.macosx
+share/doc/cdrtools/mkisofs/README.mkhybrid
+share/doc/cdrtools/mkisofs/README.prep_boot
+share/doc/cdrtools/mkisofs/README.rootinfo
+share/doc/cdrtools/mkisofs/README.session
+share/doc/cdrtools/mkisofs/README.sort
+share/doc/cdrtools/mkisofs/README.sparcboot
+share/doc/cdrtools/mkisofs/README.sunx86boot
+@dirrm share/doc/cdrtools/mkisofs
+@dirrm share/doc/cdrtools/cdrecord
+@dirrm share/doc/cdrtools/cdda2wav
+@dirrm share/doc/cdrtools
+@dirrm lib/siconv
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 845cef9c692..4319e3016ef 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.9 2007/06/21 18:16:16 wiz Exp $
+$NetBSD: distinfo,v 1.10 2007/09/18 23:07:26 wiz Exp $
 
-SHA1 (cdrtools-2.01.01a27.tar.bz2) = fcb9bcdb697e474f2e60889fe64571b06442ffb4
-RMD160 (cdrtools-2.01.01a27.tar.bz2) = c009cf067318da565a66420009406265df12b645
-Size (cdrtools-2.01.01a27.tar.bz2) = 1594145 bytes
+SHA1 (cdrtools-2.01.01a35.tar.bz2) = 2ddeb48bbdab1310535f123a9fbb48fad9b5fb5c
+RMD160 (cdrtools-2.01.01a35.tar.bz2) = 80e21093f480cb45142b4443c918b3af959fe8d5
+Size (cdrtools-2.01.01a35.tar.bz2) = 1662039 bytes
 SHA1 (patch-aa) = fca9bcc4d4a7480cea9c9f6011f72afdf691a9ef
 SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f
 SHA1 (patch-ah) = fb6abfd0a2e92370f1fc8c00426852fb5f83ae18
-SHA1 (patch-ai) = d35a742531e22dbc507f9881a76e4db3c2b20f17
-SHA1 (patch-aj) = 8f5c57f7b5ebc4ae9188212c9599d0431f0ce785
-SHA1 (patch-ba) = 8a1d6b7703e0885fe080e4a71aeabd0bb4302381
-SHA1 (patch-bb) = d9a94fc48430988b86b6a4a08a01e6a7ed95669f
-SHA1 (patch-cf) = 73fc95f53b85f637d4eb81a8b79355863c539ba7
-SHA1 (patch-cg) = cf65297ee7736a140dd9dfc7f2f395a3471ac30e
+SHA1 (patch-ai) = 5d46fd425fdac880ea8037f8a2f18094d6765336
+SHA1 (patch-aj) = 28bc6a616647a895b6f42566080faf5c1173d698
+SHA1 (patch-ba) = 58b32b4b211fe620c57f510e1804f91d1b52fd28
+SHA1 (patch-bb) = 5d5f21b5d026df11245409c708534fe57886d3ff
+SHA1 (patch-cf) = a2b4f0dfe4a524451774ba2d29210f9cf7125d12
+SHA1 (patch-cg) = ff31244101639c8624b858e1404805205926a879
 SHA1 (patch-ch) = 65397614fe196709b26a789bdd34ed6776b4ef46
 SHA1 (patch-ci) = ff0d14544b0958f581a37c1b007fae581f871021
-SHA1 (patch-cj) = d1ebb5950ef434ff9b0e42d03e41e1bd247874d9
+SHA1 (patch-cj) = 6be6bb13345a5bfe8c2f9cce6090b40e7b44a258
diff --git a/sysutils/cdrtools/patches/patch-ai b/sysutils/cdrtools/patches/patch-ai
index 6ade4ee71df..6d19c903ee6 100644
--- a/sysutils/cdrtools/patches/patch-ai
+++ b/sysutils/cdrtools/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
+$NetBSD: patch-ai,v 1.5 2007/09/18 23:07:26 wiz Exp $
 
---- libscg/scsi-bsd.c.orig	2004-01-14 23:13:05.000000000 +0000
+--- libscg/scsi-bsd.c.orig	2007-03-25 20:18:56.000000000 +0000
 +++ libscg/scsi-bsd.c
-@@ -39,6 +39,7 @@ static	char __sccsid[] =
+@@ -44,6 +44,7 @@ static	char __sccsid[] =
  
  #undef	sense
  #include <sys/scsiio.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
  
  /*
   *	Warning: you may change this source, but if you do that
-@@ -47,7 +48,7 @@ static	char __sccsid[] =
+@@ -52,7 +53,7 @@ static	char __sccsid[] =
   *	Choose your name instead of "schily" and make clear that the version
   *	string is related to a modified source.
   */
@@ -19,7 +19,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
  
  #define	MAX_SCG		16	/* Max # of SCSI controllers */
  #define	MAX_TGT		16
-@@ -107,7 +108,7 @@ scgo_version(scgp, what)
+@@ -112,7 +113,7 @@ scgo_version(scgp, what)
  		 * return "schily" for the SCG_AUTHOR request.
  		 */
  		case SCG_AUTHOR:
@@ -28,7 +28,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
  		case SCG_SCCS_ID:
  			return (__sccsid);
  		}
-@@ -139,6 +140,10 @@ scgo_open(scgp, device)
+@@ -144,6 +145,10 @@ scgo_open(scgp, device)
  	register int	l;
  	register int	nopen = 0;
  	char		devname[64];
@@ -39,7 +39,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
  
  	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
  		errno = EINVAL;
-@@ -165,6 +170,60 @@ scgo_open(scgp, device)
+@@ -170,6 +175,60 @@ scgo_open(scgp, device)
  	if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
  		goto openbydev;
  
@@ -100,7 +100,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
  	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
  
  		js_snprintf(devname, sizeof (devname),
-@@ -201,6 +260,7 @@ scgo_open(scgp, device)
+@@ -206,6 +265,7 @@ scgo_open(scgp, device)
  			}
  		}
  	}
diff --git a/sysutils/cdrtools/patches/patch-aj b/sysutils/cdrtools/patches/patch-aj
index 27662919a73..7e3fe3cd80b 100644
--- a/sysutils/cdrtools/patches/patch-aj
+++ b/sysutils/cdrtools/patches/patch-aj
@@ -1,29 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-aj,v 1.3 2007/09/18 23:07:26 wiz Exp $
 
---- cdrecord/scsi_cdr.c.orig	2006-09-26 14:24:55.000000000 +0200
+--- cdrecord/scsi_cdr.c.orig	2007-09-01 12:09:48.000000000 +0000
 +++ cdrecord/scsi_cdr.c
-@@ -312,7 +312,11 @@ request_sense(scgp)
- 		char	sensebuf[CCS_SENSE_LEN];
- 	register struct	scg_cmd	*scmd = scgp->scmd;
- 
--
-+#ifdef __NetBSD__
-+	/* request sense already done by kernel */
-+	scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense,
-+	   scgp->scmd->sense_count);
-+#else
- 	fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
- 	scmd->addr = sensebuf;
- 	scmd->size = sizeof (sensebuf);
-@@ -328,6 +332,7 @@ request_sense(scgp)
- 	if (scg_cmd(scgp) < 0)
- 		return (-1);
- 	scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
-+#endif
- 	return (0);
- }
- 
-@@ -339,7 +344,11 @@ request_sense_b(scgp, bp, cnt)
+@@ -340,7 +340,11 @@ request_sense_b(scgp, bp, cnt)
  {
  	register struct	scg_cmd	*scmd = scgp->scmd;
  
@@ -31,12 +10,12 @@ $NetBSD: patch-aj,v 1.2 2007/03/16 22:04:54 bad Exp $
 +#ifdef __NetBSD__
 +	/* request sense already done by kernel */
 +	memcpy(bp, scgp->scmd->u_sense.cmd_sense,
-+	   (scgp->scmd->sense_count < cnt ? scgp->scmd->sense_count : cnt));
++	    (scgp->scmd->sense_count < cnt ? scgp->scmd->sense_count : cnt));
 +#else
  	fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
  	scmd->addr = bp;
  	scmd->size = cnt;
-@@ -354,6 +363,7 @@ request_sense_b(scgp, bp, cnt)
+@@ -355,6 +359,7 @@ request_sense_b(scgp, bp, cnt)
  
  	if (scg_cmd(scgp) < 0)
  		return (-1);
diff --git a/sysutils/cdrtools/patches/patch-ba b/sysutils/cdrtools/patches/patch-ba
index 6cb7bef0ad6..6ccabcd8ef5 100644
--- a/sysutils/cdrtools/patches/patch-ba
+++ b/sysutils/cdrtools/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-ba,v 1.3 2007/09/18 23:07:26 wiz Exp $
 
---- readcd/readcd.c.orig	2007-02-26 16:46:48.000000000 +0100
+--- readcd/readcd.c.orig	2007-08-12 20:45:39.000000000 +0000
 +++ readcd/readcd.c
-@@ -431,12 +431,12 @@ main(ac, av)
+@@ -497,12 +497,12 @@ main(ac, av)
  	/*
  	 * We don't need root privilleges anymore.
  	 */
diff --git a/sysutils/cdrtools/patches/patch-bb b/sysutils/cdrtools/patches/patch-bb
index 8511e5f9aba..4e39eb14166 100644
--- a/sysutils/cdrtools/patches/patch-bb
+++ b/sysutils/cdrtools/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-bb,v 1.3 2007/09/18 23:07:27 wiz Exp $
 
---- mkisofs/mkisofs.c.orig	2007-02-26 16:01:09.000000000 +0100
+--- mkisofs/mkisofs.c.orig	2007-08-20 16:18:07.000000000 +0000
 +++ mkisofs/mkisofs.c
-@@ -2126,12 +2126,12 @@ args_ok:
+@@ -2239,12 +2239,12 @@ setcharset:
  		}
  	}
  	/* We don't need root privilleges anymore. */
diff --git a/sysutils/cdrtools/patches/patch-cf b/sysutils/cdrtools/patches/patch-cf
index 1654768ee0d..a888f81d3d3 100644
--- a/sysutils/cdrtools/patches/patch-cf
+++ b/sysutils/cdrtools/patches/patch-cf
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-cf,v 1.3 2007/09/18 23:07:27 wiz Exp $
 
---- mkisofs/tree.c.orig	2006-11-25 16:49:32.000000000 +0100
+--- mkisofs/tree.c.orig	2007-08-20 16:34:53.000000000 +0000
 +++ mkisofs/tree.c
-@@ -1562,7 +1562,7 @@ insert_file_entry(this_dir, whole_path, 
+@@ -1632,7 +1632,7 @@ insert_file_entry(this_dir, whole_path, 
  	/*
  	 * >= is required by the large file summit standard.
  	 */
diff --git a/sysutils/cdrtools/patches/patch-cg b/sysutils/cdrtools/patches/patch-cg
index caea480e7ef..5b112245aca 100644
--- a/sysutils/cdrtools/patches/patch-cg
+++ b/sysutils/cdrtools/patches/patch-cg
@@ -1,17 +1,17 @@
-$NetBSD: patch-cg,v 1.3 2007/06/08 23:04:35 wiz Exp $
+$NetBSD: patch-cg,v 1.4 2007/09/18 23:07:27 wiz Exp $
 
---- mkisofs/write.c.orig	2006-10-08 13:49:17.000000000 +0000
+--- mkisofs/write.c.orig	2007-08-20 16:35:48.000000000 +0000
 +++ mkisofs/write.c
-@@ -362,7 +362,7 @@ write_one_file(filename, size, outfile)
+@@ -372,7 +372,7 @@ write_one_file(filename, size, outfile)
  static	char		buffer[SECTOR_SIZE * NSECT];
  	FILE		*infile;
  	off_t		remain;
 -	int	use;
 +	off_t	use;
- 
- 
- 	if ((infile = fopen(filename, "rb")) == NULL) {
-@@ -428,7 +428,10 @@ static	char		buffer[SECTOR_SIZE * NSECT]
+ 	int	unroundeduse;
+ 	int	bytestowrite = 0;	/* Dummy init. to serve GCC bug */
+ 	int	correctedsize = 0;
+@@ -499,7 +499,10 @@ static	char		buffer[SECTOR_SIZE * NSECT]
  			fflush(stderr);
  		}
  #endif
@@ -21,5 +21,5 @@ $NetBSD: patch-cg,v 1.3 2007/06/08 23:04:35 wiz Exp $
 +		else
 +			remain -= use;
  	}
- 	fclose(infile);
- } /* write_one_file(... */
+ #ifdef APPLE_HYB
+ #if defined(INSERTMACRESFORK) && defined(UDF)
diff --git a/sysutils/cdrtools/patches/patch-cj b/sysutils/cdrtools/patches/patch-cj
index 7e1d5237b9d..aa4331b2f20 100644
--- a/sysutils/cdrtools/patches/patch-cj
+++ b/sysutils/cdrtools/patches/patch-cj
@@ -1,11 +1,11 @@
-$NetBSD: patch-cj,v 1.2 2007/03/16 22:04:55 bad Exp $
+$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	2006-10-19 12:31:36.000000000 +0200
+--- mkisofs/diag/isoinfo.c.orig	2007-07-29 22:33:21.000000000 +0000
 +++ mkisofs/diag/isoinfo.c
-@@ -649,7 +649,7 @@ extract_file(idr)
+@@ -648,7 +648,7 @@ extract_file(idr)
  	struct iso_directory_record *idr;
  {
  	int		extent, len, tlen;
@@ -14,7 +14,7 @@ speeds up file extraction significantly by using a much larger buffer.
  
  #if	defined(__CYGWIN32__) || defined(__CYGWIN__) || defined(__EMX__) || defined(__DJGPP__)
  	setmode(fileno(stdout), O_BINARY);
-@@ -659,16 +659,15 @@ extract_file(idr)
+@@ -658,16 +658,15 @@ extract_file(idr)
  	len = isonum_733((unsigned char *)idr->size);
  
  	while (len > 0) {