3 files changed, 59 insertions, 31 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 0d83ec8c9204..f21a5ccd0698 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -22,7 +22,7 @@
 ###########################################################################
 
 PORTNAME=	cdrtools
-PORTVERSION=	2.01.01a53
+PORTVERSION=	2.01.01a55
 PORTEPOCH=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
@@ -75,7 +75,7 @@ PKGNAMESUFFIX?=	-devel
 .include <bsd.port.pre.mk>
 
 CCOM!=		${BASENAME} ${CC}
-MAKE_ENV=	CCOM=${CCOM} LANG=C INS_BASE=${LOCALBASE}
+MAKE_ENV=	CCOM=${CCOM} LANG=C INS_BASE=${LOCALBASE} INS_RBASE=${LOCALBASE}
 CDRTLSTARGET=	${ARCH}-freebsd-${CCOM}
 
 .if exists(${LOCALBASE}/lib/libiconv.a) || \
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index 2821b9c58969..10342c8a027c 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdrtools-2.01.01a53.tar.bz2) = 9a17ad56fa96ceabddea55b15d1a4457
-SHA256 (cdrtools-2.01.01a53.tar.bz2) = f0b1d2e69d2ae1e3ae63e22b9a511d1fab4959b44974557f8857e168550c187b
-SIZE (cdrtools-2.01.01a53.tar.bz2) = 1767998
+MD5 (cdrtools-2.01.01a55.tar.bz2) = 057396580ec073ad5eecd05857303f1d
+SHA256 (cdrtools-2.01.01a55.tar.bz2) = 5c654f511d9b45819649905839a4381fcba6ab8ce7ab2cbab9af6aab0dc7abc4
+SIZE (cdrtools-2.01.01a55.tar.bz2) = 1769457
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl b/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl
index 63cd300715e8..859f92768c34 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl
@@ -1,36 +1,64 @@
 --- cdrecord/cdrecord.dfl.orig	Mon Aug 18 19:45:45 2003
 +++ cdrecord/cdrecord.dfl	Mon Aug 18 19:46:32 2003
-@@ -6,8 +6,7 @@
- # 
+@@ -3,7 +3,7 @@
+ # This file is /etc/default/cdrecord
+ # It contains defaults that are used if no command line option
+ # or environment is present.
+-# 
++#
  # The default device, if not specified elswhere
+ # Note that since Sommer 2006, cdrecord by default searches for a
+ # single CD-ROM device. You should set CDR_DEVICE= together with
+@@ -11,15 +11,14 @@
+ # one CR-ROM drive in your system.
  #
--#CDR_DEVICE=yamaha
--CDR_DEVICE=default
-+#CDR_DEVICE=default
+ #CDR_DEVICE=yamaha
+-#CDR_DEVICE=default
  
- # 
+-# 
++#
  # The default speed (speed=), if not specified elswhere
-@@ -39,13 +38,13 @@
  #
- # drive name	device	speed	fifosize driveropts	transfersize
+ # Note that newer cdrecord versions do not default
+ # to speed=1. For MMC compliant drives, the default
+ # is to write at maximum speed, so it in general does
+-# not make sense to set up a default speed in /etc/default/cdrecord 
++# not make sense to set up a default speed in /etc/default/cdrecord
  #
--default=	USCSI:1,0,0	-1	-1	burnfree
+ #CDR_SPEED=40
+ 
+@@ -34,7 +33,7 @@
+ # Linux and Solaris have problems with bigger transfer sizes.
+ # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k
+ #
+-#CDR_TRANSFERSIZE=32k
++CDR_TRANSFERSIZE=126k
+ 
+ #
+ # The following definitions allow abstract device names.
+@@ -56,14 +55,14 @@
+ #
+ # drive name	device		speed	fifosize driveropts	transfersize
+ #
+-my-default=	1,0,0		-1	-1	burnfree	63k
+-sol-default=	USCSI:1,0,0	-1	-1	burnfree
 -ricoh-u=	USCSI:0,2,0	-1	-1	burnfree
--teac=		1,3,0	-1	-1	""
--teac-max-ts=	1,3,0	-1	-1	""			32k
--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
+-teac=		1,3,0		-1	-1	""
+-teac-max-ts=	1,3,0		-1	-1	""		32k
+-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
++#my-default=	1,0,0		-1	-1	burnfree	63k
++#sol-default=	USCSI:1,0,0	-1	-1	burnfree
 +#ricoh-u=	USCSI:0,2,0	-1	-1	burnfree
-+#teac=		1,3,0	-1	-1	""
-+#teac-max-ts=	1,3,0	-1	-1	""			32k
-+#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
++#teac=		1,3,0		-1	-1	""
++#teac-max-ts=	1,3,0		-1	-1	""		32k
++#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