Update to 1.2.0 and fix two bugs:

- Only use index 1 as track boundary.  Previously, the first index was
  taken as the end of the previous track and the last index as the start
  of this track.  All sectors in between were silently dropped.

- Stop output of a track *before* the first sector of the next track.
  Previously, the first sector was output twice, once as the last
  sector of the previous track, once as the first sector of the
  current track.

Patches will be sent upstream shortly.


Take maintainership, ok pooka.

4 files changed, 29 insertions, 82 deletions

diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
index 433923d8e2c..504f908f967 100644
--- a/sysutils/bchunk/Makefile
+++ b/sysutils/bchunk/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:11 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/11/16 12:03:42 dillo Exp $
 
-DISTNAME=	bchunk-1.1.1
+DISTNAME=	bchunk-1.2.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://he.fi/bchunk/
 
-MAINTAINER=	pooka@NetBSD.org
+MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://he.fi/bchunk/
 COMMENT=	".bin/.cue" CD image converter
 
diff --git a/sysutils/bchunk/distinfo b/sysutils/bchunk/distinfo
index 5c419f300f0..d4eeab619e8 100644
--- a/sysutils/bchunk/distinfo
+++ b/sysutils/bchunk/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 13:40:51 agc Exp $
+$NetBSD: distinfo,v 1.7 2007/11/16 12:03:42 dillo Exp $
 
-SHA1 (bchunk-1.1.1.tar.gz) = a3d25cf8a53e2b4f1793f44b53569ffe587a6a2b
-RMD160 (bchunk-1.1.1.tar.gz) = 0b7b9d38aabc3c571ead38396ab17c4598d8e7b2
-Size (bchunk-1.1.1.tar.gz) = 14633 bytes
-SHA1 (patch-aa) = 26373282c599914ec869775802d209d6c1cc73a9
-SHA1 (patch-ab) = ae144230a5f7b62bc166e3f7ab1e20702d3a2129
+SHA1 (bchunk-1.2.0.tar.gz) = a328e4665eb5e51df63d8d27d1d75ecc74bdef9e
+RMD160 (bchunk-1.2.0.tar.gz) = 81dbbbd0162cbfde54eced4b0410044b72d92cb0
+Size (bchunk-1.2.0.tar.gz) = 15078 bytes
+SHA1 (patch-ab) = 19c0e44ab1f54ac2c0645e59a025e638b72a39fb
diff --git a/sysutils/bchunk/patches/patch-aa b/sysutils/bchunk/patches/patch-aa
deleted file mode 100644
index 36a87e4bc30..00000000000
--- a/sysutils/bchunk/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/09/01 10:17:37 cjep Exp $
---- bchunk.1.orig	2001-08-07 21:20:31.000000000 +1000
-+++ bchunk.1	2003-07-18 23:57:34.000000000 +1000
-@@ -2,7 +2,7 @@
- .SH NAME
- bchunk \- CD image format conversion from bin/cue to iso/cdr
- .SH SYNOPSIS
--.B bchunk [-v] [-p] [-w] [-s] <image.bin> <image.cue> <basename>
-+.B bchunk [-v] [-p] [-r] [-w] [-s] <image.bin> <image.cue> <basename>
- .SH DESCRIPTION
- .LP
- .B bchunk 
-@@ -41,6 +41,10 @@
- makes binchunker go into PSX mode and truncate MODE2/2352 tracks to
- 2336 bytes at offset 0 instead of normal 2048 bytes at offset 24.
- (untested, please let me know if this actually works)
-+.TP 10
-+.BI \-r
-+makes binchunker output MODE2/2352 tracks in raw format, from offset
-+0 for 2352 bytes.
- .SH FILES
- .LP
- .TP 5
diff --git a/sysutils/bchunk/patches/patch-ab b/sysutils/bchunk/patches/patch-ab
index 54f35ebb278..11605b77e67 100644
--- a/sysutils/bchunk/patches/patch-ab
+++ b/sysutils/bchunk/patches/patch-ab
@@ -1,50 +1,21 @@
-$NetBSD: patch-ab,v 1.2 2003/09/01 10:17:37 cjep Exp $
---- bchunk.c.orig	2001-08-07 21:18:29.000000000 +1000
-+++ bchunk.c	2003-07-18 23:56:09.000000000 +1000
-@@ -25,10 +25,11 @@
- #include <unistd.h>
- 
- #define VERSION "1.1.1"
--#define USAGE "Usage: bchunk [-v] [-p (PSX)] [-w (wav)] [-s (swabaudio)]\n" \
-+#define USAGE "Usage: bchunk [-v] [-r] [-p (PSX)] [-w (wav)] [-s (swabaudio)]\n" \
-         "         <image.bin> <image.cue> <basename>\n" \
- 	"Example: bchunk foo.bin foo.cue foo\n" \
- 	"  -v  Verbose mode\n" \
-+	"  -r  Raw mode\n" \
- 	"  -p  PSX mode: truncate MODE2/2352 to 2336 bytes instead of normal 2048\n" \
- 	"  -w  Output audio files in WAV format\n" \
- 	"  -s  swabaudio: swap byte order in audio tracks\n"
-@@ -88,6 +89,7 @@
- char *cuefile = NULL;
- int verbose = 0;
- int psxtruncate = 0;
-+int raw = 0;
- int swabaudio = 0;
- int towav = 0;
- 
-@@ -99,8 +101,11 @@
- {
- 	int s;
- 	
--	while ((s = getopt(argc, argv, "swvp?h")) != -1) {
-+	while ((s = getopt(argc, argv, "swvp?hr")) != -1) {
- 		switch (s) {
-+			case 'r':
-+				raw = 1;
-+				break;
- 			case 'v':
- 				verbose = 1;
- 				break;
-@@ -190,7 +195,11 @@
- 		
- 	} else if (!strcasecmp(modes, "MODE2/2352")) {
- 		track->extension = ext_iso;
--		if (psxtruncate) {
-+		if (raw) {
-+			/* Raw MODE2/2352 */
-+			track->bstart = 0;
-+			track->bsize = 2352;
-+		} else if (psxtruncate) {
- 			/* PSX: truncate from 2352 to 2336 byte tracks */
- 			track->bstart = 0;
- 			track->bsize = 2336;
+$NetBSD: patch-ab,v 1.3 2007/11/16 12:03:42 dillo Exp $
+
+--- bchunk.c.orig	2004-06-29 22:42:33.000000000 +0200
++++ bchunk.c
+@@ -470,13 +470,15 @@ int main(int argc, char **argv)
+ 			*t = '\0';
+ 			t++;
+ 			idx = atoi(p);
++			if (idx != 1)
++				continue;
+ 			printf(" %s %s", p, t);
+ 			track->startsect = time2frames(t);
+ 			track->start = track->startsect * SECTLEN;
+ 			if (verbose)
+ 				printf(" (startsect %ld ofs %ld)", track->startsect, track->start);
+ 			if ((prevtrack) && (prevtrack->stopsect < 0)) {
+-				prevtrack->stopsect = track->startsect;
++				prevtrack->stopsect = track->startsect - 1;
+ 				prevtrack->stop = track->start - 1;
+ 			}
+ 		}