bleah, libtool.

Make sure we get our own mpeglib, and not something installed in /usr/local/lib.

x11/kde/multimedia3/patches/patch-configure_in

@@ -1,38 +1,6 @@
-$OpenBSD: patch-configure_in,v 1.13 2004/02/07 01:46:24 espie Exp $
+$OpenBSD: patch-configure_in,v 1.14 2004/02/19 22:40:42 espie Exp $
 --- configure.in.orig	2004-01-25 20:07:55.000000000 +0100
-+++ configure.in	2004-02-06 19:44:51.000000000 +0100
++++ configure.in	2004-02-06 19:51:43.000000000 +0100
-@@ -40,7 +40,7 @@ dnl Perform program name transformation
- AC_ARG_PROGRAM
- 
- dnl Automake doc recommends to do this only here. (Janos)
--AM_INIT_AUTOMAKE(kdemultimedia, "3.2.0") dnl searches for some needed programs
-+AM_INIT_AUTOMAKE(kdemultimedia-3.1.95, "3.2.0") dnl searches for some needed programs
- 
- KDE_SET_PREFIX
- 
-@@ -169,11 +169,11 @@ AC_CHECK_HEADER(vorbis/vorbisfile.h,
- 
- AC_CHECK_LIB(vorbisfile, ov_open,
- 	[USELESS_VAR=1],
--	[HAVE_VORBIS=""], -lvorbis -logg)
-+	[HAVE_VORBIS=""], -lvorbis -logg -lm)
- 
- AC_CHECK_LIB(vorbis, vorbis_info_init,
- 	[USELESS_VAR=1],
--	[HAVE_VORBIS=""])
-+	[HAVE_VORBIS=""], -logg -lm)
- 
- AC_CHECK_LIB(ogg, ogg_page_version,
- 	[USELESS_VAR=1],
-@@ -591,7 +591,7 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
-   AC_LANG_SAVE
-   AC_LANG_C
-   kde_has_flac_lib=no
--  AC_CHECK_HEADER(FLAC/metadata.h,
-+  KDE_CHECK_HEADER(FLAC/metadata.h,
-   [ 
-      kde_has_flac_lib=yes
-     ])
 @@ -1411,6 +1411,9 @@ case "$OS_TYPE" in
    NetBSD)
      kde_mpeglib_compiles=yes

x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_cddaplay_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_cddaplay_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/cddaplay/Makefile.in.orig	2004-01-31 23:19:37.000000000 +0100
+--- mpeglib/example/cddaplay/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/cddaplay/Makefile.in	2004-01-31 23:19:45.000000000 +0100
++++ mpeglib/example/cddaplay/Makefile.in	2004-02-19 22:18:41.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -387,7 +387,7 @@ cddaplay_SOURCES = cddaplay.cpp
  
  noinst_HEADERS = 

x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_mpgplay_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_mpgplay_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/mpgplay/Makefile.in.orig	2004-01-31 23:12:46.000000000 +0100
+--- mpeglib/example/mpgplay/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/mpgplay/Makefile.in	2004-01-31 23:13:03.000000000 +0100
++++ mpeglib/example/mpgplay/Makefile.in	2004-02-19 22:13:58.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -387,7 +387,7 @@ mpgplay_SOURCES = mpgplay.cpp
  
  noinst_HEADERS = 

x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_splay_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_splay_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/splay/Makefile.in.orig	2004-01-31 23:13:08.000000000 +0100
+--- mpeglib/example/splay/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/splay/Makefile.in	2004-01-31 23:14:47.000000000 +0100
++++ mpeglib/example/splay/Makefile.in	2004-02-19 22:15:59.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -389,13 +389,13 @@ mp3framing_SOURCES = mp3framing.cpp
  
  noinst_HEADERS = 

x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_tplay_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_tplay_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/tplay/Makefile.in.orig	2004-01-31 23:15:32.000000000 +0100
+--- mpeglib/example/tplay/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/tplay/Makefile.in	2004-01-31 23:15:44.000000000 +0100
++++ mpeglib/example/tplay/Makefile.in	2004-02-19 22:16:33.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -387,7 +387,7 @@ tplay_SOURCES = tplay.cpp
  
  noinst_HEADERS = 

x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafcdda_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafcdda_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/yaf/yafcdda/Makefile.in.orig	2004-01-31 23:25:12.000000000 +0100
+--- mpeglib/example/yaf/yafcdda/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/yaf/yafcdda/Makefile.in	2004-01-31 23:25:20.000000000 +0100
++++ mpeglib/example/yaf/yafcdda/Makefile.in	2004-02-19 22:25:55.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -385,7 +385,7 @@ yaf_cdda_SOURCES = cdda_control.cpp
  
  noinst_HEADERS = 

x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafmpgplay_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafmpgplay_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/yaf/yafmpgplay/Makefile.in.orig	2004-01-31 23:25:12.000000000 +0100
+--- mpeglib/example/yaf/yafmpgplay/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/yaf/yafmpgplay/Makefile.in	2004-01-31 23:25:26.000000000 +0100
++++ mpeglib/example/yaf/yafmpgplay/Makefile.in	2004-02-19 22:22:34.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -387,7 +387,7 @@ yaf_mpgplay_SOURCES = mpg_control.cpp
  
  noinst_HEADERS = 

x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafsplay_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafsplay_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/yaf/yafsplay/Makefile.in.orig	2004-01-31 23:25:12.000000000 +0100
+--- mpeglib/example/yaf/yafsplay/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/yaf/yafsplay/Makefile.in	2004-01-31 23:25:31.000000000 +0100
++++ mpeglib/example/yaf/yafsplay/Makefile.in	2004-02-19 22:21:45.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -387,7 +387,7 @@ yaf_splay_SOURCES = splay_control.cpp
  
  noinst_HEADERS = 

x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_yaf_yaftplay_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yaftplay_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/yaf/yaftplay/Makefile.in.orig	2004-01-31 23:25:12.000000000 +0100
+--- mpeglib/example/yaf/yaftplay/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/yaf/yaftplay/Makefile.in	2004-01-31 23:25:37.000000000 +0100
++++ mpeglib/example/yaf/yaftplay/Makefile.in	2004-02-19 22:23:22.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -385,7 +385,7 @@ yaf_tplay_SOURCES = tplay_control.cpp
  
  noinst_HEADERS = 

x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafvorbis_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafvorbis_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/yaf/yafvorbis/Makefile.in.orig	2004-01-31 23:25:12.000000000 +0100
+--- mpeglib/example/yaf/yafvorbis/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/yaf/yafvorbis/Makefile.in	2004-01-31 23:25:42.000000000 +0100
++++ mpeglib/example/yaf/yafvorbis/Makefile.in	2004-02-19 22:24:16.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -387,7 +387,7 @@ yaf_vorbis_SOURCES = vorbis_control.cpp
  
  noinst_HEADERS = 

x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafyuv_Makefile_in,v 1.8 2004/02/01 23:59:17 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafyuv_Makefile_in,v 1.9 2004/02/19 22:40:42 espie Exp $
---- mpeglib/example/yaf/yafyuv/Makefile.in.orig	2004-01-31 23:25:12.000000000 +0100
+--- mpeglib/example/yaf/yafyuv/Makefile.in.orig	2004-01-25 20:08:31.000000000 +0100
-+++ mpeglib/example/yaf/yafyuv/Makefile.in	2004-01-31 23:25:49.000000000 +0100
++++ mpeglib/example/yaf/yafyuv/Makefile.in	2004-02-19 22:25:13.000000000 +0100
+@@ -120,7 +120,7 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
 @@ -387,7 +387,7 @@ yaf_yuv_SOURCES = yuv_control.cpp
  
  noinst_HEADERS =