Upgrade to cdrtools-1.11a21.

5 files changed, 19 insertions, 40 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 5528f39fd43e..191f148516c3 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	cdrtools
-PORTVERSION?=	1.10
-PORTREVISION?=	1
+PORTVERSION?=	1.11.a21
+PORTREVISION?=	0
 CATEGORIES?=	sysutils audio
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
-		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/
-DISTNAME=	cdrtools-1.10
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/alpha/
+DISTNAME=	cdrtools-1.11a21
 
 MAINTAINER=	dirk@FreeBSD.org
 
@@ -25,6 +25,7 @@ MAN1=		cdda2wav.1 cdrecord.1 readcd.1
 USE_GMAKE=	yes
 MAKE_ENV=	COPTX="-DBSD_SCSI_SENSE_BUG"
 SLAVEDIRS=	sysutils/mkisofs
+WRKSRC=		${WRKDIR}/cdrtools-1.11
 
 .if ${MACHINE_ARCH} == "alpha"
 post-extract:
@@ -55,11 +56,11 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${ARCH}-freebsd-cc/cdda2wav \
 	 ${PREFIX}/bin
 	@${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks
-	@${INSTALL_PROGRAM} ${WRKSRC}/misc/OBJ/${ARCH}-freebsd-cc/readcd \
+	@${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${ARCH}-freebsd-cc/readcd \
 	 ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1
 	@${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1
-	@${INSTALL_MAN} ${WRKSRC}/misc/readcd.1 ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${PREFIX}/man/man1
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 939d8a19f451..e2755c53f649 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1 +1 @@
-MD5 (cdrtools-1.10.tar.gz) = 3a7c452738eb9f58c738908d8146601d
+MD5 (cdrtools-1.11a21.tar.gz) = aaeb92afbec25e3cf36522b3ef37227e
diff --git a/sysutils/cdrtools/files/patch-aa b/sysutils/cdrtools/files/patch-aa
deleted file mode 100644
index fb4c76019dea..000000000000
--- a/sysutils/cdrtools/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdda2wav/ioctl.c.orig	Sat Dec  9 23:39:59 2000
-+++ cdda2wav/ioctl.c	Sun Nov 18 10:38:23 2001
-@@ -162,7 +162,7 @@
- 	exit( -1 );
-     }
-     for (i = 0; i < tracks; i++) {
--        toc[i].dwStartSector = entry[i].cdte_addr.lba;
-+        toc[i].dwStartSector = ntohl(entry[i].cdte_addr.lba);
-     }
-     bufferTOC[0] = '\0';
-     bufferTOC[1] = '\0';
diff --git a/sysutils/cdrtools/files/patch-ai b/sysutils/cdrtools/files/patch-ai
index 86abda3cc0fe..4d3b61bc72cc 100644
--- a/sysutils/cdrtools/files/patch-ai
+++ b/sysutils/cdrtools/files/patch-ai
@@ -1,14 +1,14 @@
---- cdrecord/drv_philips.c.orig	Tue Feb 20 23:56:44 2001
-+++ cdrecord/drv_philips.c	Tue Sep 18 17:42:51 2001
-@@ -505,12 +505,15 @@
- 	 * READ BUFFER SCSI cmd which is meant to be used for
- 	 * something totally else, and which would only jam the
- 	 * Plasmon due to the incorrect parameters used.
-+	 *
-+	 * We need to return some !0 value, otherwise the upper
-+	 * layer would still issue a READ BUFFER, sigh.
+--- cdrecord/drv_philips.c.orig	Tue Nov 27 02:08:49 2001
++++ cdrecord/drv_philips.c	Sun Dec 16 13:05:46 2001
+@@ -542,10 +542,15 @@
+ 	 * expects different parameters.
  	 */
  
++	/*
++	 * We need to return some !0 value, otherwise the upper
++	 * layer would still issue a READ BUFFER, sigh.
++	 */
++
  	if (sp)
 -		*sp = 0L;
 +		*sp = 1L * 1024 * 1024;
diff --git a/sysutils/cdrtools/files/patch-ak b/sysutils/cdrtools/files/patch-ak
deleted file mode 100644
index 04afa2fa7f52..000000000000
--- a/sysutils/cdrtools/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- scgcheck/Makefile.orig	Mon Mar 19 00:19:43 2001
-+++ scgcheck/Makefile	Sun Jul 29 10:46:48 2001
-@@ -13,7 +13,7 @@
- 
- HFILES=		scgcheck.h 
- #LIBS=		-lschily $(LIB_SOCKET)
--LIBS=		-lrscg -lscg -lschily $(LIB_SOCKET)
-+LIBS=		-lrscg -lscg -lschily $(SCSILIB) $(LIB_SOCKET)
- XMK_FILE=	Makefile.man
- 
- ###########################################################################