pass LDFLAGS down to the build tree, so that it can find esound and

other sound drivers in /usr/pkg.
From: Lennart Augustsson <lennart@augustsson.net>

5 files changed, 32 insertions, 12 deletions

diff --git a/audio/vorbis/Makefile b/audio/vorbis/Makefile
index 98a14a4d22a..a72f98e912a 100644
--- a/audio/vorbis/Makefile
+++ b/audio/vorbis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/08/17 16:56:18 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/18 14:48:35 itojun Exp $
 #
 
 DISTNAME=       vorbis_nightly_cvs-20000818
@@ -14,7 +14,7 @@ HOMEPAGE=	http://www.vorbis.com/
 
 WRKSRC=		${WRKDIR}/vorbis
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	LIBS="${LIBS} -lossaudio"
+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 7e00ba0fcbe..2279d0bd5b6 100644
--- a/audio/vorbis/files/patch-sum
+++ b/audio/vorbis/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/08/17 16:56:18 itojun Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/18 14:48:37 itojun Exp $
 
 MD5 (patch-aa) = 5e7630fde5544c3b338f06f1eada4d2b
 MD5 (patch-ab) = 6aab3996a1f1d4ce5ba98adbd598b006
 MD5 (patch-ac) = 991c84a4ec6f1569f49cde6eda4dc00e
-MD5 (patch-ad) = 97478f99eaefa6644e1cc7c06894fefa
+MD5 (patch-ae) = 0b089f3fe16533e75abb1eccbd5873b0
+MD5 (patch-af) = 54805115d5081eba845eb60cc111f104
diff --git a/audio/vorbis/patches/patch-ad b/audio/vorbis/patches/patch-ad
deleted file mode 100644
index 4cc54bd00ac..00000000000
--- a/audio/vorbis/patches/patch-ad
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/08/17 16:56:18 itojun Exp $
---- vorbis-tools/Makefile.in-	Fri Aug 18 01:37:11 2000
-+++ vorbis-tools/Makefile.in	Fri Aug 18 01:37:18 2000
-@@ -31,3 +31,3 @@
- RANLIB=@RANLIB@
--LIBS=@LIBS@ $(LIBAO_LIBS) ../lib/vorbisfile.a ../lib/libvorbis.a
-+LIBS=@LIBS@ $(LIBAO_LIBS) ../lib/vorbisfile.a ../lib/libvorbis.a -lossaudio
- 
diff --git a/audio/vorbis/patches/patch-ae b/audio/vorbis/patches/patch-ae
new file mode 100644
index 00000000000..fbaa370da2d
--- /dev/null
+++ b/audio/vorbis/patches/patch-ae
@@ -0,0 +1,11 @@
+$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
+@@ -36,5 +36,5 @@
+ #not everyone uses libm (eg, BeOS)
+-#AC_CHECK_LIB(m, cos, LIBS="-lm"; AC_DEFINE(HAVE_LIBM), LIBS="")
++#AC_CHECK_LIB(m, cos, LIBS="$LIBS -lm"; AC_DEFINE(HAVE_LIBM))
+ # We no longer use config.h
+-AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
++AC_CHECK_LIB(m, cos, LIBS="$LIBS -lm")
+ 
diff --git a/audio/vorbis/patches/patch-af b/audio/vorbis/patches/patch-af
new file mode 100644
index 00000000000..8453549de55
--- /dev/null
+++ b/audio/vorbis/patches/patch-af
@@ -0,0 +1,16 @@
+$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
+@@ -1030,3 +1030,3 @@
+ #not everyone uses libm (eg, BeOS)
+-#AC_CHECK_LIB(m, cos, LIBS="-lm"; AC_DEFINE(HAVE_LIBM), LIBS="")
++#AC_CHECK_LIB(m, cos, LIBS="$LIBS -lm"; AC_DEFINE(HAVE_LIBM))
+ # We no longer use config.h
+@@ -1067,6 +1067,5 @@
+   echo "$ac_t""yes" 1>&6
+-  LIBS="-lm"
++  LIBS="$LIBS -lm"
+ else
+   echo "$ac_t""no" 1>&6
+-LIBS=""
+ fi