Update to 2.01a20. For a list of changes see:

ftp://ftp.berlios.de/pub/cdrecord/alpha/AN-2.01a20

Submitted by:	maintainer

3 files changed, 8 insertions, 46 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index a0660dcda7e1..f8516bd31943 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME?=	cdrtools
-PORTVERSION?=	2.01a19
-#PORTREVISION?=	0
-PORTREVISION?=	1
+PORTVERSION?=	2.01a20
+PORTREVISION?=	0
 CATEGORIES?=	sysutils audio
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
 		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/
-DISTNAME=	cdrtools-2.01a19
+DISTNAME=	cdrtools-2.01a20
 
 .if defined(WITH_DVDHACK) && !defined(MKISOFS)
-PATCH_SITES=	http://people.mandrakesoft.com/~warly/files/cdrtools/archives/
-PATCHFILES=	cdrtools-2.01a16-dvd.patch.bz2
+#PATCH_SITES=	http://people.mandrakesoft.com/~warly/files/cdrtools/archives/
+PATCH_SITES=	ftp://ftp.zeist.de/pub/distfiles/
+PATCHFILES=	cdrtools-2.01a20-dvd.patch.bz2
 PATCH_DIST_STRIP=	-p1
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-drv_mmc.c
 .endif
 
 MAINTAINER=	marius@alchemy.franken.de
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index c51c18e7a347..9d670d5c08ef 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (cdrtools-2.01a19.tar.bz2) = d35cbd5af1b2a375656db66e9bd79739
-MD5 (cdrtools-2.01a16-dvd.patch.bz2) = 01ad227cc3b700fd5f19a6a043c1b847
+MD5 (cdrtools-2.01a20.tar.bz2) = fbbea6fce9c20e836234f8b892971a5c
+MD5 (cdrtools-2.01a20-dvd.patch.bz2) = 938bd1f459165e733880116fd1833b08
diff --git a/sysutils/cdrtools-devel/files/extra-patch-drv_mmc.c b/sysutils/cdrtools-devel/files/extra-patch-drv_mmc.c
deleted file mode 100644
index 9dee2f41a62a..000000000000
--- a/sysutils/cdrtools-devel/files/extra-patch-drv_mmc.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- cdrecord/drv_mmc.c.orig	Thu Oct  9 01:10:41 2003
-+++ cdrecord/drv_mmc.c	Thu Oct  9 01:31:28 2003
-@@ -224,13 +224,13 @@
-          scsi_unload,
-          read_buff_cap,
-          cmd_dummy,                              /* recovery_needed      */
--         (int(*)__PR((SCSI *, int)))cmd_dummy,   /* recover              */
-+         (int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy, /* recover	*/
-          speed_select_mdvd,
-          select_secsize,
-          next_wr_addr_mdvd,
-          (int(*)__PR((SCSI *, Ulong)))cmd_ill,   /* reserve_track        */
-          scsi_cdr_write,
--         (int(*)__PR((SCSI *scgp, int, track_t *)))cmd_dummy, /* gen_cue */
-+         (int(*)__PR((track_t *, void *, BOOL)))cmd_dummy, /* gen_cue */
- 	 (int(*)__PR((SCSI *scgp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */
-  	 write_leadin_mmc,
-          open_track_mdvd,
-@@ -702,8 +702,7 @@
- #endif
- 	}
- 	if (is_dvd) {
--	        errmsgno(EX_BAD, 
--                "Found DVD media: using cdr_mdvd.\n");  
-+		printf("Found DVD media: using cdr_mdvd.\n");  
-                 dp = &cdr_mdvd; 
- 	}
- 	return (dp);
-@@ -1083,7 +1082,7 @@
- 	return (0);
- }
- 
--LOCAL int
-+EXPORT int
- check_writemodes_mdvd(scgp, dp)
- 	SCSI	*scgp;
- 	cdr_t	*dp;