From 957d478a920ea4420d7e0595df562f19cf4825dd Mon Sep 17 00:00:00 2001
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 18 Feb 2006 15:55:40 +0000
Subject: - Replace the fix to make `readcd -scanbus` work which was added in  
 2.01_2 with the "official" version from cdrtools 2.01.01a06. - Patch
 i386-freebsd-cc.rul to allow compilation with CC set to a   compiler other
 than the default (as long as it doesn't include a   path component, which
 requires considerably changes to make work). - Make the direct ATAPI
 transport of cdda2wav work again with FreeBSD   after device major numbers
 were abandoned; bump PORTREVISION for   this.

Approved by:	netchild
---
 sysutils/cdrtools/files/patch-ad | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'sysutils/cdrtools/files/patch-ad')

diff --git a/sysutils/cdrtools/files/patch-ad b/sysutils/cdrtools/files/patch-ad
index 8e7ac09a0fcb..9627dae9d485 100644
--- a/sysutils/cdrtools/files/patch-ad
+++ b/sysutils/cdrtools/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=
-- 
cgit v1.2.3