remove -Lxxx/.libs workarounds required with GNU libtool

avsm · Sep 26, 2010 · 6e05cd6 · 6e05cd6
1 parent cbb4020
commit 6e05cd6
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 188 deletions.
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2010/09/23 19:15:51 naddy Exp $
+# $OpenBSD: Makefile,v 1.50 2010/09/26 13:40:11 naddy Exp $
 
 COMMENT=	fast console MPEG audio player and decoder library
 
@@ -29,7 +29,7 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} --enable-static \
 		--with-audio=sndio \
 		--with-optimization=0
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${WRKBUILD}/src/libmpg123/.libs -L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build
 
 .if ${MACHINE_ARCH} == "arm"

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2009/11/08 14:56:33 naddy Exp $
+# $OpenBSD: Makefile,v 1.44 2010/09/26 13:40:11 naddy Exp $
 
 COMMENT=	Sound eXchange, the Swiss Army knife of audio manipulation
 
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--without-sndfile \
 
 CONFIGURE_ENV= \
 	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
-	LDFLAGS="-L${WRKBUILD}/src/.libs -L${LOCALBASE}/lib"
+	LDFLAGS="-L${LOCALBASE}/lib"
 
 do-regress:
 	@cd ${WRKSRC}/src && ./tests.sh && ./testall.sh

diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2009/12/26 20:42:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2010/09/26 13:40:11 naddy Exp $
 
 COMMENT =		audio codec for lossless, lossy and hybrid compression
 
@@ -28,6 +28,6 @@ CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
 			--with-libiconv-prefix="${LOCALBASE}"
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${WRKBUILD}/src/.libs -L${LOCALBASE}/lib"
+			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2010/03/30 11:59:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2010/09/26 13:40:11 naddy Exp $
 
 COMMENT=		high-performance CORBA Object Request Broker
 
@@ -31,8 +31,6 @@ CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION=	2.63
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${WRKBUILD}/src/services/name/.libs \
-			-L${WRKBUILD}/src/services/imodule/.libs \
-			-L${WRKBUILD}/src/orb/.libs -L${LOCALBASE}/lib"
+			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/mpfr/Makefile b/devel/mpfr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2008/10/27 20:45:54 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2010/09/26 13:40:11 naddy Exp $
 
 COMMENT=	library for multiple-precision floating-point computations
 
@@ -28,10 +28,6 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-gmp=${LOCALBASE}
 REORDER_DEPENDENCIES=${PORTSDIR}/infrastructure/mk/automake.dep
 
-# make sure we do not pick up an installed version of libmpfr
-REGRESS_FLAGS=	LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" ${_lt_libs} \
-		LDFLAGS="-L${WRKBUILD}/.libs -L${LOCALBASE}/lib"
-
 # needed on sparc64 at least: the mpfr tests are insufficient without 
 # gmp's internals
 

diff --git a/graphics/gd/patches/patch-Makefile_in b/graphics/gd/patches/patch-Makefile_in
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/05/11 09:56:26 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.26 2010/09/26 13:40:11 naddy Exp $
 
 COMMENT=	image manipulation library
 
@@ -34,6 +34,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --disable-mmx
 .endif
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
-		LDFLAGS="-L${WRKBUILD}/src/lib/.libs -L${X11BASE}/lib -L${LOCALBASE}/lib"
+		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2009/05/14 08:13:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.20 2010/09/26 13:40:11 naddy Exp $
 
 COMMENT =	color management library
 
@@ -23,7 +23,7 @@ USE_LIBTOOL =		Yes
 CONFIGURE_STYLE = 	gnu
 CONFIGURE_ARGS += 	${CONFIGURE_SHARED}
 CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${WRKBUILD}/src/.libs -L${LOCALBASE}/lib"
+			LDFLAGS="-L${LOCALBASE}/lib"
 
 WRKDIST =		${WRKDIR}/lcms-1.18
 

diff --git a/graphics/libmpeg2/Makefile b/graphics/libmpeg2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2009/08/10 06:31:45 kili Exp $
+# $OpenBSD: Makefile,v 1.14 2010/09/26 13:40:11 naddy Exp $
 
 COMMENT=	free MPEG-2 video stream decoder
 
@@ -23,7 +23,7 @@ USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.61
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${WRKBUILD}/libmpeg2/.libs -L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
 		--disable-sdl
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/.auto

diff --git a/net/curl/patches/patch-docs_examples_Makefile_in b/net/curl/patches/patch-docs_examples_Makefile_in
diff --git a/net/curl/patches/patch-src_Makefile_in b/net/curl/patches/patch-src_Makefile_in
diff --git a/net/curl/patches/patch-tests_libtest_Makefile_in b/net/curl/patches/patch-tests_libtest_Makefile_in
diff --git a/net/curl/patches/patch-tests_server_Makefile_in b/net/curl/patches/patch-tests_server_Makefile_in
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2010/09/21 13:18:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.54 2010/09/26 13:40:11 naddy Exp $
 
 COMMENT=		virus scanner
 DISTNAME=		clamav-0.96.3
@@ -55,7 +55,7 @@ MODULES=	lang/python converters/libiconv
 MODPY_RUNDEP=	no
 
 CPPFLAGS+=	-I/usr/include -I${LOCALBASE}/include
-LDFLAGS+=	-pthread -L/usr/lib -L${WRKSRC}/libclamav/.libs \
+LDFLAGS+=	-pthread -L/usr/lib \
 		-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}"

diff --git a/x11/gnome/nautilus/Makefile b/x11/gnome/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2010/09/10 13:55:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.68 2010/09/26 13:40:12 naddy Exp $
 
 COMMENT=		GNOME shell and file manager
 
@@ -66,10 +66,7 @@ CONFIGURE_ARGS+= 	${CONFIGURE_SHARED} \
 CONFIGURE_ARGS+=	--enable-xmp=no
 
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${WRKBUILD}/libnautilus/.libs \
-				-L${WRKBUILD}/libnautilus-adapter/.libs \
-				-L${WRKBUILD}/libnautilus-private/.libs \
-				-L${LOCALBASE}/lib"
+			LDFLAGS="-L${LOCALBASE}/lib"
 
 REGRESS_IS_INTERACTIVE=x11
 

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_cddaplay_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_cddaplay_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/cddaplay/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/cddaplay/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -177,7 +177,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -398,7 +398,7 @@ xdg_menudir = @xdg_menudir@
  INCLUDES = -I../../include $(all_includes)
  cddaplay_SOURCES = cddaplay.cpp

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_mpgplay_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_mpgplay_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/mpgplay/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/mpgplay/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -177,7 +177,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -399,7 +399,7 @@ INCLUDES = $(all_includes)
  EXTRA_DIST = 
  mpgplay_SOURCES = mpgplay.cpp

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_splay_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_splay_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/splay/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/splay/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -189,7 +189,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -412,11 +412,11 @@ EXTRA_DIST = 
  splay_SOURCES = splay.cpp
  mp3framing_SOURCES = mp3framing.cpp

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_tplay_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_tplay_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/tplay/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/tplay/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -177,7 +177,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -399,7 +399,7 @@ INCLUDES = -I../../include $(all_includes)
  EXTRA_DIST = 
  tplay_SOURCES = tplay.cpp

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafcdda_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafcdda_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/yaf/yafcdda/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/yaf/yafcdda/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -181,7 +181,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -402,7 +402,7 @@ xdg_menudir = @xdg_menudir@
  INCLUDES = -I../../include $(all_includes)
  yaf_cdda_SOURCES = cdda_control.cpp

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafmpgplay_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafmpgplay_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/yaf/yafmpgplay/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/yaf/yafmpgplay/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -181,7 +181,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -403,7 +403,7 @@ INCLUDES = -I../../include $(all_includes)
  EXTRA_DIST = stresstest
  yaf_mpgplay_SOURCES = mpg_control.cpp

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafsplay_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafsplay_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/yaf/yafsplay/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/yaf/yafsplay/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -181,7 +181,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -403,7 +403,7 @@ INCLUDES = -I../../include $(all_includes)
  EXTRA_DIST = stresstest
  yaf_splay_SOURCES = splay_control.cpp

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_yaf_yaftplay_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yaftplay_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/yaf/yaftplay/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/yaf/yaftplay/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -181,7 +181,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -402,7 +402,7 @@ xdg_menudir = @xdg_menudir@
  INCLUDES = -I../../include $(all_includes)
  yaf_tplay_SOURCES = tplay_control.cpp

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafvorbis_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafvorbis_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/yaf/yafvorbis/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/yaf/yafvorbis/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -181,7 +181,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -403,7 +403,7 @@ INCLUDES = -I../../include -I../../include/vorbis/incl
  EXTRA_DIST = 
  yaf_vorbis_SOURCES = vorbis_control.cpp

diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in
@@ -1,15 +1,6 @@
-$OpenBSD: patch-mpeglib_example_yaf_yafyuv_Makefile_in,v 1.16 2007/10/24 21:52:18 espie Exp $
+$OpenBSD: patch-mpeglib_example_yaf_yafyuv_Makefile_in,v 1.17 2010/09/26 13:40:12 naddy Exp $
 --- mpeglib/example/yaf/yafyuv/Makefile.in.orig	Mon Oct  8 16:27:13 2007
 +++ mpeglib/example/yaf/yafyuv/Makefile.in	Wed Oct 24 11:55:37 2007
-@@ -181,7 +181,7 @@ KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- LAME_LIBS = @LAME_LIBS@
- LDADD_GST = @LDADD_GST@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../../../lib/.libs
- LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
- LDFLAGS_GST = @LDFLAGS_GST@
- LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
 @@ -403,7 +403,7 @@ INCLUDES = -I../../include $(all_includes)
  EXTRA_DIST = 
  yaf_yuv_SOURCES = yuv_control.cpp