7 files changed, 45 insertions, 160 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 022322172536..604d3d0f2e0c 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cdrtools
-PORTVERSION=	2.01.01a04
+PORTVERSION=	2.01.01a07
 PORTEPOCH=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
@@ -17,7 +17,7 @@ COMMENT=	CD/CD-R[W] and ISO-9660 image creation and extraction tools
 
 CONFLICTS=	cdrtools-[0-9]*
 
-MAN1=		cdda2wav.1 cdrecord.1 readcd.1 scgcheck.1
+MAN1=		btcflash.1 cdda2wav.1 cdrecord.1 readcd.1 scgcheck.1
 MAN8=		isoinfo.8 mkisofs.8
 MLINKS=		isoinfo.8 devdump.8 isoinfo.8 isodump.8 isoinfo.8 isovfy.8 \
 		mkisofs.8 mkhybrid.8
@@ -94,10 +94,10 @@ post-patch:
 .if !defined(WITH_RSCSI)
 	@${RM} ${WRKSRC}/TARGETS/55rscsi
 .endif
-.for i in README.rscsi include/deflts.h cdda2wav/cdda2wav.1 \
+.for i in README.rscsi btcflash/btcflash.1 cdda2wav/cdda2wav.1 \
 	cdrecord/cdrecord.1 cdrecord/cdrecord.dfl cdrecord/defaults.c \
-	librscg/scsi-remote.c readcd/readcd.1 rscsi/rscsi.c rscsi/rscsi.dfl \
-	scgcheck/scgcheck.1
+	include/deflts.h librscg/scsi-remote.c readcd/readcd.1 \
+	rscsi/rscsi.c rscsi/rscsi.dfl scgcheck/scgcheck.1
 	@${REINPLACE_CMD} -e 's|\/opt\/schily|${PREFIX}|g; \
 		s|\/usr\/local|${PREFIX}|g; s|\/etc\/default|${PREFIX}\/etc|g; \
 		s|\/var\/adm\/messages|\/var\/run\/dmesg.boot|g' ${WRKSRC}/${i}
@@ -109,6 +109,8 @@ post-patch:
 		${WRKDIR}/pkg-message
 
 do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \
+		${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \
 		${PREFIX}/bin
 	@${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks
@@ -130,6 +132,7 @@ do-install:
 .endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \
 		${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 ${PREFIX}/man/man1
 	@${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1
 	@${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1
 	@${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${PREFIX}/man/man1
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index b5204277cbd3..5f6f7fc26302 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdrtools-2.01.01a04.tar.bz2) = 5736751b64dffc1d736c9851ced33fc1
-SHA256 (cdrtools-2.01.01a04.tar.bz2) = 7cf8088b090969ca11192aadbf799897683ae1abe6112caa4d3e71552a8a63e4
-SIZE (cdrtools-2.01.01a04.tar.bz2) = 1432078
+MD5 (cdrtools-2.01.01a07.tar.bz2) = df3acee3505c1305e9f6de104d513460
+SHA256 (cdrtools-2.01.01a07.tar.bz2) = cdc502320924c55ad884590844bb9b88bf60357fae8954bb7985777df552f8f5
+SIZE (cdrtools-2.01.01a07.tar.bz2) = 1441566
diff --git a/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1 b/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1
new file mode 100644
index 000000000000..c8b30d32f974
--- /dev/null
+++ b/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1
@@ -0,0 +1,10 @@
+--- btcflash/btcflash.1.orig	Wed Feb  8 23:13:24 2006
++++ btcflash/btcflash.1	Thu Feb 16 14:54:32 2006
+@@ -293,7 +293,6 @@
+ login shell.
+ .SH "SEE ALSO"
+ .BR cdrecord (1),
+-.BR scg (7),
+ .BR rcmd (3),
+ .BR ssh (1).
+ .SH NOTES
diff --git a/sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c b/sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c
index 3183cc7116cc..6b4ae583dabc 100644
--- a/sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c
+++ b/sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c
@@ -1,19 +1,13 @@
 --- cdda2wav/interface.c	Mon Dec 29 11:28:09 2003
 +++ cdda2wav/interface.c	Sun Jan 18 01:35:50 2004
-@@ -444,7 +444,15 @@
+@@ -452,6 +452,10 @@
      default:			/* for example ATAPI cds */
  #else
- #if defined (__FreeBSD__)
--    case 117:
-+#if __FreeBSD_version >= 501113
-+    case 4:	/* GEOM */
-+	if (memcmp(pdev_name, "/dev/acd", sizeof("/dev/acd") - 1) != 0) {
-+	    fprintf(stderr, "%s is not an ATAPI CDROM device\n", pdev_name);
-+	    exit(SYNTAX_ERROR);
-+	}
+ #if defined (__FreeBSD__) || defined(__DragonFly__)
++#if __FreeBSD_version >= 600021
++    case 0:	/* majors abandoned */
 +	/* FALLTHROUGH */
 +#endif
-+    case 117:	/* pre-GEOM atapi cd */
- 	if (!S_ISCHR(statstruct->st_mode)) {
- 	    fprintf(stderr, "%s is not a char device\n",pdev_name);
- 	    exit(SYNTAX_ERROR);
+ #if __FreeBSD_version >= 501113
+     case 4:	/* GEOM */
+ 	/* FALLTHROUGH */
diff --git a/sysutils/cdrtools-devel/files/patch-cdda2wav::ioctl.c b/sysutils/cdrtools-devel/files/patch-cdda2wav::ioctl.c
deleted file mode 100644
index 1c13170bf8b4..000000000000
--- a/sysutils/cdrtools-devel/files/patch-cdda2wav::ioctl.c
+++ /dev/null
@@ -1,88 +0,0 @@
---- cdda2wav/ioctl.c	Sat Dec 27 17:29:28 2003
-+++ cdda2wav/ioctl.c	Sun Jan 18 01:36:36 2004
-@@ -59,10 +59,14 @@
- #include <cdrecord.h>
- 
- #if defined (HAVE_IOCTL_INTERFACE)
--#if	!defined	sun	&& !defined	__sun
-+#if  !defined(sun) && !defined(__sun) && !(__FreeBSD_version >= 501112)
- static struct cdrom_read_audio arg;
- #endif
- 
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 400014
-+static unsigned sector_size = CD_FRAMESIZE;
-+#endif
-+
- static int err;
- 
- static void EnableCdda_cooked __PR((SCSI *scgp, int fAudioMode, unsigned uSectorsize));
-@@ -72,13 +76,23 @@
- 	int fAudioMode;
- 	unsigned uSectorsize;
- {
-+#if	defined(__FreeBSD__) && __FreeBSD_version >= 400014
-+	if (scgp && scgp->verbose)
-+		fprintf(stderr, "EnableCdda_cooked (CDRIOCSETBLOCKSIZE)...\n");
-+
-+	if (fAudioMode) {
-+		if (ioctl(global.cooked_fd, CDRIOCGETBLOCKSIZE, &sector_size) ==-1)
-+			sector_size = CD_FRAMESIZE;
-+        	ioctl(global.cooked_fd, CDRIOCSETBLOCKSIZE, &uSectorsize);
-+	} else
-+        	ioctl(global.cooked_fd, CDRIOCSETBLOCKSIZE, &sector_size);
-+#elif	defined	CDIOCSETCDDA
- 	if (scgp && scgp->verbose) {
- 		fprintf(stderr, "EnableCdda_cooked (CDIOCSETCDDA)...\n");
- 		if (uSectorsize != CD_FRAMESIZE_RAW)
- 			fprintf(stderr, "non audio sector size is ignored.\n");
- 	}
- 
--#if	defined	CDIOCSETCDDA
- 	ioctl(global.cooked_fd, CDIOCSETCDDA, &fAudioMode);
- #else
- 	fprintf(stderr, "EnableCdda_cooked (CDIOCSETCDDA) is not available...\n");
-@@ -197,6 +211,10 @@
-       /* trash the cache */
- 
- #if	defined __FreeBSD__
-+#if	__FreeBSD_version >= 501112
-+      pread(global.cooked_fd, (void *) &p[0], 3*CD_FRAMESIZE_RAW,
-+          find_an_off_sector(lSector, SectorBurstVal)*CD_FRAMESIZE_RAW);
-+#else
-       static struct cdrom_read_audio arg2;
- 
-       arg2.address.lba = find_an_off_sector(lSector, SectorBurstVal);
-@@ -206,6 +224,7 @@
- 
-       ioctl(global.cooked_fd, CDROMREADAUDIO, &arg2);
- #endif
-+#endif
- #if	defined __linux__
-       static struct cdrom_read_audio arg2;
- 
-@@ -267,6 +286,17 @@
- 
- /* read 2352 bytes audio data */
- #if	defined __FreeBSD__
-+#if	__FreeBSD_version >= 501112
-+    if (x && x->verbose) {
-+	fprintf(stderr, "ReadCdRom_cooked (pread)...\n");
-+    }
-+
-+  do {
-+    err = 0;
-+    if (pread(global.cooked_fd, (void *) &p[0], SectorBurstVal*CD_FRAMESIZE_RAW,
-+	lSector*CD_FRAMESIZE_RAW) == -1)
-+		err = -1;
-+#else
-   arg.address.lba = lSector;
-   arg.addr_format = CDROM_LBA;
-   arg.nframes = SectorBurstVal;
-@@ -278,6 +308,7 @@
- 
-   do {
-     err = ioctl(global.cooked_fd, CDROMREADAUDIO, &arg);
-+#endif
- #endif
- #if	defined __linux__
-   arg.addr.lba = lSector;
diff --git a/sysutils/cdrtools-devel/files/patch-cdda2wav::mycdrom.h b/sysutils/cdrtools-devel/files/patch-cdda2wav::mycdrom.h
index 49c7b484d701..dd77cab32744 100644
--- a/sysutils/cdrtools-devel/files/patch-cdda2wav::mycdrom.h
+++ b/sysutils/cdrtools-devel/files/patch-cdda2wav::mycdrom.h
@@ -1,24 +1,21 @@
---- cdda2wav/mycdrom.h	Wed Sep  4 14:07:16 2002
-+++ cdda2wav/mycdrom.h	Sat Jan 17 18:52:08 2004
-@@ -4,6 +4,12 @@
- #else
- # if defined HAVE_SYS_CDIO_H
- #  include <sys/cdio.h>
-+#  if defined(__FreeBSD__) && __FreeBSD__ >= 2
-+#   include <osreldate.h>
-+#   if __FreeBSD_version >= 400014
-+#    include <sys/cdrio.h>
-+#   endif
-+#  endif
- 
- #  if (defined (__sun) && defined (SVR4))
- #   if 0
-@@ -53,7 +59,7 @@
+--- cdda2wav/mycdrom.h  Wed Sep  4 14:07:16 2002
++++ cdda2wav/mycdrom.h  Sat Jan 17 18:52:08 2004
+@@ -59,9 +59,16 @@
  #   endif /* if 0 */
  #  else /* not Sun SVR4 */
- #   if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
--#    if !defined CDIOCREADAUDIO
-+#    if (!defined(__FreeBSD__) && !defined(CDIOCREADAUDIO)) || __FreeBSD_version < 228000
- #     undef HAVE_IOCTL_INTERFACE
+ #   if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __DragonFly__
+-#    if (defined(__FreeBSD__) && __FreeBSD_version < 228000) || !defined(CDIOCREADAUDIO)
+-#     undef HAVE_IOCTL_INTERFACE
++#    if defined __FreeBSD__  && !defined __DragonFly__ 
++#     if __FreeBSD_version < 228000
++#      undef HAVE_IOCTL_INTERFACE
++#     endif
  #    else
++#     if !defined CDIOCREADAUDIO 
++#      undef HAVE_IOCTL_INTERFACE
++#     endif
++#    endif
++#    if defined HAVE_IOCTL_INTERFACE 
  
+ #define CDROM_LBA	CD_LBA_FORMAT
+ #define CDROM_MSF	CD_MSF_FORMAT
diff --git a/sysutils/cdrtools-devel/files/patch-readcd::readcd.c b/sysutils/cdrtools-devel/files/patch-readcd::readcd.c
deleted file mode 100644
index f347a2299902..000000000000
--- a/sysutils/cdrtools-devel/files/patch-readcd::readcd.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- readcd/readcd.c.original	Sun Jan 15 17:14:03 2006
-+++ readcd/readcd.c	Sun Jan 15 17:24:47 2006
-@@ -370,6 +370,8 @@
- 			exit(err);
- 		}
- 	} else {
-+                char	errstr[80];
-+
- 		if (scsibus == -1 && target >= 0 && lun >= 0)
- 			scsibus = 0;
- 
-@@ -378,8 +380,17 @@
- 		scgp->kdebug = kdebug;
- 
- 		scg_settarget(scgp, scsibus, target, lun);
--		if (scg__open(scgp, NULL) <= 0)
--			comerr("Cannot open SCSI driver.\n");
-+
-+		scgp = scg_open(dev, errstr, sizeof(errstr), 0, 0);
-+
-+		if (scgp == NULL) { 
-+		         errmsg("%s%sCannot open SCSI driver.\n", errstr, errstr[0]?". ":"");
-+		         errmsgno(EX_BAD, "For possible targets try 'readcd -scanbus'.%s\n",
-+                                                geteuid() ? " Make sure you are root.":"");
-+			 errmsgno(EX_BAD, "For possible transport specifiers try 'readcd dev=help'.\n");
-+                        exit(EX_BAD);
-+		}
-+
- 	}
- 	scgp->silent = silent;
- 	scgp->verbose = verbose;