5 files changed, 22 insertions, 34 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 2f1a4361828f..022322172536 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cdrtools
-PORTVERSION=	2.01.01a03
-PORTREVISION=	2
+PORTVERSION=	2.01.01a04
 PORTEPOCH=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index 767a2d3ee5da..b5204277cbd3 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdrtools-2.01.01a03.tar.bz2) = 6c5683a6f85c89cc163307a5e434086c
-SHA256 (cdrtools-2.01.01a03.tar.bz2) = a65f9db99917753ae2b7db4ab01ff172efd8a128b7cd85c829df407840cd726e
-SIZE (cdrtools-2.01.01a03.tar.bz2) = 1423541
+MD5 (cdrtools-2.01.01a04.tar.bz2) = 5736751b64dffc1d736c9851ced33fc1
+SHA256 (cdrtools-2.01.01a04.tar.bz2) = 7cf8088b090969ca11192aadbf799897683ae1abe6112caa4d3e71552a8a63e4
+SIZE (cdrtools-2.01.01a04.tar.bz2) = 1432078
diff --git a/sysutils/cdrtools-devel/files/patch-ad b/sysutils/cdrtools-devel/files/patch-ad
index 8e7ac09a0fcb..9627dae9d485 100644
--- a/sysutils/cdrtools-devel/files/patch-ad
+++ b/sysutils/cdrtools-devel/files/patch-ad
@@ -10,7 +10,7 @@
  
  CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
  COPTS=
-@@ -57,14 +58,13 @@
+@@ -57,14 +58,14 @@
  
  FLOAT_OPTIONS=	
  
@@ -18,8 +18,9 @@
 -LDCC=		@echo "	==> LINKING \"$@\""; gcc
 -DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
 -RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
-+LDCC=		$(CCOM)
-+DYNLD=		$(CCOM)
++CCCOM=		$(CC)
++LDCC=		$(CCCOM)
++DYNLD=		$(CCCOM)
 +RANLIB=		ranlib
  ARFLAGS=	cr
  LORDER=		lorder
@@ -27,5 +28,5 @@
  
  RMDEP=		:
 -MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP=		$(CCOM) -M
++MKDEP=		$(CCCOM) -M
  MKDEP_OUT=
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl b/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl
index 3eebcb7bab92..1b47ab2d1699 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl
@@ -1,36 +1,34 @@
 --- cdrecord/cdrecord.dfl.orig	Mon Aug 18 19:45:45 2003
 +++ cdrecord/cdrecord.dfl	Mon Aug 18 19:46:32 2003
-@@ -6,7 +6,7 @@
+@@ -6,8 +6,7 @@
  # 
  # The default device, if not specified elswhere
  #
--CDR_DEVICE=yamaha
-+#CDR_DEVICE=yamaha
+-#CDR_DEVICE=yamaha
+-CDR_DEVICE=default
++#CDR_DEVICE=default
  
  # 
  # The default speed, if not specified elswhere
-@@ -21,7 +21,7 @@
- # 
- # The default FIFO size if, not specified elswhere
- #
--CDR_FIFOSIZE=4m
-+#CDR_FIFOSIZE=4m
- 
- #
- # The following definitions allow abstract device names.
-@@ -33,9 +33,9 @@
+@@ -39,12 +38,12 @@
  #
  # drive name	device	speed	fifosize driveropts
  #
+-default=	USCSI:1,0,0	-1	-1	burnfree
+-ricoh-u=	USCSI:0,2,0	-1	-1	burnfree
 -teac=		1,3,0	-1	-1	""
 -panasonic=	1,4,0	-1	-1	""
 -plextor=	1,4,0	-1	-1	""
 -sanyo=		1,4,0	-1	-1	burnfree
 -yamaha=		1,5,0	-1	-1	""
 -cdrom=		0,6,0	2	1m	""
+-remote=		REMOTE:rscsi@somehost:1,0,0	16	16m	burnfree
++#default=	USCSI:1,0,0	-1	-1	burnfree
++#ricoh-u=	USCSI:0,2,0	-1	-1	burnfree
 +#teac=		1,3,0	-1	-1	""
 +#panasonic=	1,4,0	-1	-1	""
 +#plextor=	1,4,0	-1	-1	""
 +#sanyo=		1,4,0	-1	-1	burnfree
-+#yamaha=	1,5,0	-1	-1	""
++#yamaha=		1,5,0	-1	-1	""
 +#cdrom=		0,6,0	2	1m	""
++#remote=		REMOTE:rscsi@somehost:1,0,0	16	16m	burnfree
diff --git a/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl b/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl
index 85eab6940d08..edbd1340c469 100644
--- a/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl
+++ b/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl
@@ -13,17 +13,7 @@
  # USER= entries are checked with a pattern matcher. USER=* matches all users.
  #
  USER=rscsi
--USER=joerg
+-#USER=joerg
  
  #
  # Each ACCESS= entry adds a target or group of targets to the list of visible
-@@ -52,6 +51,6 @@
- #	name	name
- #
- #ACCESS=rscsi	sparky	-1	-1	-1	-1
--ACCESS=rscsi	sparky	0	-1	6	-1
--ACCESS=rscsi	sparky	1	-1	3	-1
--ACCESS=rscsi	sparky	1	-1	4	-1
-+#ACCESS=rscsi	sparky	0	-1	6	-1
-+#ACCESS=rscsi	sparky	1	-1	3	-1
-+#ACCESS=rscsi	sparky	1	-1	4	-1