pass down CFLAGS too.

4 files changed, 22 insertions, 11 deletions

diff --git a/audio/vorbis/Makefile b/audio/vorbis/Makefile
index a72f98e912a..2ddfa2aee8c 100644
--- a/audio/vorbis/Makefile
+++ b/audio/vorbis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/08/18 14:48:35 itojun Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/18 16:31:24 itojun Exp $
 #
 
 DISTNAME=       vorbis_nightly_cvs-20000818
@@ -14,7 +14,8 @@ HOMEPAGE=	http://www.vorbis.com/
 
 WRKSRC=		${WRKDIR}/vorbis
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	LIBS="${LDFLAGS} ${LIBS} -lossaudio"
+CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LIBS="${LDFLAGS} ${LIBS} -lossaudio"
 
 post-build:
 	(cd ${WRKSRC}/vorbis-tools; ${MAKE})
diff --git a/audio/vorbis/files/patch-sum b/audio/vorbis/files/patch-sum
index 2279d0bd5b6..69a08167568 100644
--- a/audio/vorbis/files/patch-sum
+++ b/audio/vorbis/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2000/08/18 14:48:37 itojun Exp $
+$NetBSD: patch-sum,v 1.3 2000/08/18 16:31:24 itojun Exp $
 
 MD5 (patch-aa) = 5e7630fde5544c3b338f06f1eada4d2b
 MD5 (patch-ab) = 6aab3996a1f1d4ce5ba98adbd598b006
 MD5 (patch-ac) = 991c84a4ec6f1569f49cde6eda4dc00e
-MD5 (patch-ae) = 0b089f3fe16533e75abb1eccbd5873b0
-MD5 (patch-af) = 54805115d5081eba845eb60cc111f104
+MD5 (patch-ae) = 9f19ec346c10bbc7918bbbf7caedce18
+MD5 (patch-af) = 8629ab5dfe631b255bcd7a0e3dc9bcf9
diff --git a/audio/vorbis/patches/patch-ae b/audio/vorbis/patches/patch-ae
index fbaa370da2d..04fa0aaa484 100644
--- a/audio/vorbis/patches/patch-ae
+++ b/audio/vorbis/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2000/08/18 14:48:37 itojun Exp $
---- configure.in-	Fri Aug 18 23:41:48 2000
-+++ configure.in	Fri Aug 18 23:42:35 2000
+$NetBSD: patch-ae,v 1.2 2000/08/18 16:31:24 itojun Exp $
+--- configure.in.orig	Tue Aug 15 18:09:31 2000
++++ configure.in	Sat Aug 19 01:27:39 2000
 @@ -36,5 +36,5 @@
  #not everyone uses libm (eg, BeOS)
 -#AC_CHECK_LIB(m, cos, LIBS="-lm"; AC_DEFINE(HAVE_LIBM), LIBS="")
@@ -9,3 +9,8 @@ $NetBSD: patch-ae,v 1.1 2000/08/18 14:48:37 itojun Exp $
 -AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
 +AC_CHECK_LIB(m, cos, LIBS="$LIBS -lm")
  
+@@ -120,3 +120,3 @@
+ 
+-CFLAGS=""
++#CFLAGS=""
+ 
diff --git a/audio/vorbis/patches/patch-af b/audio/vorbis/patches/patch-af
index 8453549de55..78bdf89b8e4 100644
--- a/audio/vorbis/patches/patch-af
+++ b/audio/vorbis/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2000/08/18 14:48:37 itojun Exp $
---- configure-	Fri Aug 18 23:41:46 2000
-+++ configure	Fri Aug 18 23:42:46 2000
+$NetBSD: patch-af,v 1.2 2000/08/18 16:31:24 itojun Exp $
+--- configure.orig	Sat Jul 22 11:03:45 2000
++++ configure	Sat Aug 19 01:27:56 2000
 @@ -1030,3 +1030,3 @@
  #not everyone uses libm (eg, BeOS)
 -#AC_CHECK_LIB(m, cos, LIBS="-lm"; AC_DEFINE(HAVE_LIBM), LIBS="")
@@ -14,3 +14,8 @@ $NetBSD: patch-af,v 1.1 2000/08/18 14:48:37 itojun Exp $
    echo "$ac_t""no" 1>&6
 -LIBS=""
  fi
+@@ -1286,3 +1285,3 @@
+ 
+-CFLAGS=""
++#CFLAGS=""
+