Honor CFLAGS passed in from the environment.

4 files changed, 64 insertions, 13 deletions

diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index 1d94414ddc8..690971adb5e 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+# $NetBSD: Makefile,v 1.2 2000/10/06 06:40:33 jlam Exp $
 
 DISTNAME=	cdparanoia-III-alpha9.7
 PKGNAME=	cdparanoia-3.a9.7
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.xiph.org/paranoia/
 
 GNU_CONFIGURE=	YES
 ALL_TARGET=	static
+MAKE_ENV+=	GCC=yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cdparanoia ${PREFIX}/bin
diff --git a/audio/cdparanoia/files/patch-sum b/audio/cdparanoia/files/patch-sum
index 76d40f5cf94..673b4214bd3 100644
--- a/audio/cdparanoia/files/patch-sum
+++ b/audio/cdparanoia/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.7 2000/07/24 05:05:45 itohy Exp $
+$NetBSD: patch-sum,v 1.8 2000/10/06 06:40:35 jlam Exp $
 
-MD5 (patch-aa) = 598f4761b68407f819fa9b8c67ba627c
+MD5 (patch-aa) = 07f944781b9efc51fd6e7be6523ab4e6
 MD5 (patch-ab) = c3ef67eeb817732c2f29c11dd7048ba4
-MD5 (patch-ac) = 3bcd421fb561a7b5abdf217f7b264f90
+MD5 (patch-ac) = 2736b5d8dd9fb52fb7db4fe5b426bfbc
 MD5 (patch-ad) = 7af44261fb32ba66253c5f7f8bf8f5bf
 MD5 (patch-ae) = 78b208d6bd9606af8bc8042d4b4b823a
 MD5 (patch-ba) = 316c91a58bd361d96d86910ace6ba66a
diff --git a/audio/cdparanoia/patches/patch-aa b/audio/cdparanoia/patches/patch-aa
index 11fd1fa5340..b96a75a5c6d 100644
--- a/audio/cdparanoia/patches/patch-aa
+++ b/audio/cdparanoia/patches/patch-aa
@@ -1,8 +1,33 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-aa,v 1.2 2000/10/06 06:40:35 jlam Exp $
 
---- configure.in.orig	Mon Aug 16 07:29:43 1999
-+++ configure.in	Mon Jan 17 23:05:41 2000
-@@ -63,11 +63,14 @@
+--- configure.in.orig	Sun Aug 15 18:29:43 1999
++++ configure.in
+@@ -20,6 +20,12 @@
+ 	i?86-*-linux*)
+ 		DEBUG="-g -Wall -fsigned-char"
+ 		OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
++	i?86-*-netbsd*)
++		DEBUG="-g -Wall -fsigned-char"
++		OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
++	*-netbsd*)
++		DEBUG="-g -Wall"
++		OPT="-O";;
+ 	*)
+ 		DEBUG="-g -Wall -fsigned-char"
+ 		OPT="-O20 -fsigned-char";;
+@@ -28,7 +34,10 @@
+ 
+ AC_HEADER_STDC
+ 
+-CFLAGS=""
++dnl Uncomment the following if you don't want to honor CFLAGS passed in from
++dnl the environment.
++dnl
++dnl CFLAGS=""
+ 
+ TYPESIZES="" 
+ 
+@@ -63,11 +72,14 @@
  AC_CHECK_HEADERS(linux/sbpcd.h, SBPCD_H="-DSBPCD_H='1' ")
  AC_CHECK_HEADERS(linux/ucdrom.h, UCDROM_H="-DUCDROM_H='1' ")
  
diff --git a/audio/cdparanoia/patches/patch-ac b/audio/cdparanoia/patches/patch-ac
index 6d6b5373375..8a919a7445f 100644
--- a/audio/cdparanoia/patches/patch-ac
+++ b/audio/cdparanoia/patches/patch-ac
@@ -1,8 +1,33 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-ac,v 1.2 2000/10/06 06:40:35 jlam Exp $
 
---- configure.orig	Mon Aug 16 07:29:42 1999
-+++ configure	Mon Jan 17 23:05:54 2000
-@@ -1272,6 +1272,62 @@
+--- configure.orig	Sun Aug 15 18:29:42 1999
++++ configure
+@@ -835,6 +835,12 @@
+ 	i?86-*-linux*)
+ 		DEBUG="-g -Wall -fsigned-char"
+ 		OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
++	i?86-*-netbsd*)
++		DEBUG="-g -Wall -fsigned-char"
++		OPT="-O2 -ffast-math -fsigned-char -finline-functions";; 
++	*-netbsd*)
++		DEBUG="-g -Wall"
++		OPT="-O";;
+ 	*)
+ 		DEBUG="-g -Wall -fsigned-char"
+ 		OPT="-O20 -fsigned-char";;
+@@ -1007,7 +1013,10 @@
+ fi
+ 
+ 
+-CFLAGS=""
++# Uncomment the following if you don't want to honor CFLAGS passed in from
++# the environment.
++#
++# CFLAGS=""
+ 
+ TYPESIZES="" 
+ 
+@@ -1272,6 +1281,62 @@
  done
  
  
@@ -65,7 +90,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
  echo "configure:1277: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-@@ -1537,6 +1593,7 @@
+@@ -1537,6 +1602,7 @@
  s%@SET_MAKE@%$SET_MAKE%g
  s%@SBPCD_H@%$SBPCD_H%g
  s%@UCDROM_H@%$UCDROM_H%g