diff options
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/cdrtools/Makefile | 55 | ||||
-rw-r--r-- | sysutils/cdrtools/PLIST | 99 | ||||
-rw-r--r-- | sysutils/cdrtools/distinfo | 22 | ||||
-rw-r--r-- | sysutils/cdrtools/patches/patch-ai | 16 | ||||
-rw-r--r-- | sysutils/cdrtools/patches/patch-aj | 31 | ||||
-rw-r--r-- | sysutils/cdrtools/patches/patch-ba | 6 | ||||
-rw-r--r-- | sysutils/cdrtools/patches/patch-bb | 6 | ||||
-rw-r--r-- | sysutils/cdrtools/patches/patch-cf | 6 | ||||
-rw-r--r-- | sysutils/cdrtools/patches/patch-cg | 18 | ||||
-rw-r--r-- | sysutils/cdrtools/patches/patch-cj | 8 |
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) { |