From 8d07663180db789bc0efe8f433894501fe2d728f Mon Sep 17 00:00:00 2001 From: naddy Date: Sun, 26 Sep 2010 13:40:11 +0000 Subject: [PATCH] remove -Lxxx/.libs workarounds required with GNU libtool --- audio/mpg123/Makefile | 4 ++-- audio/sox/Makefile | 4 ++-- audio/wavpack/Makefile | 4 ++-- devel/ORBit2/Makefile | 6 ++---- devel/mpfr/Makefile | 6 +----- graphics/gd/patches/patch-Makefile_in | 12 ------------ graphics/imlib2/Makefile | 4 ++-- graphics/lcms/Makefile | 4 ++-- graphics/libmpeg2/Makefile | 4 ++-- net/curl/patches/patch-docs_examples_Makefile_in | 12 ------------ net/curl/patches/patch-src_Makefile_in | 12 ------------ net/curl/patches/patch-tests_libtest_Makefile_in | 12 ------------ net/curl/patches/patch-tests_server_Makefile_in | 12 ------------ security/clamav/Makefile | 4 ++-- x11/gnome/nautilus/Makefile | 7 ++----- .../patch-mpeglib_example_cddaplay_Makefile_in | 11 +---------- .../patch-mpeglib_example_mpgplay_Makefile_in | 11 +---------- .../patches/patch-mpeglib_example_splay_Makefile_in | 11 +---------- .../patches/patch-mpeglib_example_tplay_Makefile_in | 11 +---------- .../patch-mpeglib_example_yaf_yafcdda_Makefile_in | 11 +---------- .../patch-mpeglib_example_yaf_yafmpgplay_Makefile_in | 11 +---------- .../patch-mpeglib_example_yaf_yafsplay_Makefile_in | 11 +---------- .../patch-mpeglib_example_yaf_yaftplay_Makefile_in | 11 +---------- .../patch-mpeglib_example_yaf_yafvorbis_Makefile_in | 11 +---------- .../patch-mpeglib_example_yaf_yafyuv_Makefile_in | 11 +---------- 25 files changed, 29 insertions(+), 188 deletions(-) delete mode 100644 graphics/gd/patches/patch-Makefile_in delete mode 100644 net/curl/patches/patch-docs_examples_Makefile_in delete mode 100644 net/curl/patches/patch-src_Makefile_in delete mode 100644 net/curl/patches/patch-tests_libtest_Makefile_in delete mode 100644 net/curl/patches/patch-tests_server_Makefile_in diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index fdea8d4ccc6..a7a7a72ae95 100644 --- 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 index 90f7a9d7417..5d308a54999 100644 --- 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 index 52b7e926f5c..1da5a580fb5 100644 --- 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 diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 0fcafed4527..fe24bce8c5d 100644 --- 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 diff --git a/devel/mpfr/Makefile b/devel/mpfr/Makefile index a7007f05189..57b65894792 100644 --- 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 deleted file mode 100644 index e83b7cc3e33..00000000000 --- a/graphics/gd/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2007/02/17 16:30:11 bernd Exp $ ---- Makefile.in.orig Wed Feb 7 11:02:50 2007 -+++ Makefile.in Wed Feb 7 11:03:36 2007 -@@ -256,7 +256,7 @@ INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = -L./.libs @LDFLAGS@ - LIBICONV = @LIBICONV@ - LIBOBJS = @LIBOBJS@ - LIBPNG12_CONFIG = @LIBPNG12_CONFIG@ diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index f1a3d01e3f1..9e9d4b76208 100644 --- 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 diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile index 33f3cdd6ce8..a2fcb46ff41 100644 --- 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 index 7e829cc7076..d6e2774e244 100644 --- 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 deleted file mode 100644 index fbb91a69c89..00000000000 --- a/net/curl/patches/patch-docs_examples_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-docs_examples_Makefile_in,v 1.6 2010/09/19 16:30:26 naddy Exp $ ---- docs/examples/Makefile.in.orig Wed Aug 11 19:03:30 2010 -+++ docs/examples/Makefile.in Fri Sep 17 17:44:53 2010 -@@ -208,7 +208,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) -L../../lib/.libs $(LDFLAGS) -o $@ - SOURCES = 10-at-a-time.c anyauthput.c certinfo.c chkspeed.c \ - cookie_interface.c debug.c fileupload.c fopen.c ftp-wildcard.c \ - ftpget.c ftpgetinfo.c ftpgetresp.c ftpupload.c getinfo.c \ diff --git a/net/curl/patches/patch-src_Makefile_in b/net/curl/patches/patch-src_Makefile_in deleted file mode 100644 index ac3fa878606..00000000000 --- a/net/curl/patches/patch-src_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.6 2010/09/19 16:30:26 naddy Exp $ ---- src/Makefile.in.orig Wed Aug 11 19:03:31 2010 -+++ src/Makefile.in Fri Sep 17 17:44:53 2010 -@@ -86,7 +86,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) -L../lib/.libs $(LDFLAGS) -o $@ - SOURCES = $(curl_SOURCES) - DIST_SOURCES = $(curl_SOURCES) - ETAGS = etags diff --git a/net/curl/patches/patch-tests_libtest_Makefile_in b/net/curl/patches/patch-tests_libtest_Makefile_in deleted file mode 100644 index e37ab083928..00000000000 --- a/net/curl/patches/patch-tests_libtest_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-tests_libtest_Makefile_in,v 1.8 2010/09/19 16:30:26 naddy Exp $ ---- tests/libtest/Makefile.in.orig Wed Aug 11 19:03:32 2010 -+++ tests/libtest/Makefile.in Fri Sep 17 17:45:30 2010 -@@ -384,7 +384,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) -L../../lib/.libs $(LDFLAGS) -o $@ - SOURCES = $(libhostname_la_SOURCES) $(chkhostname_SOURCES) \ - $(lib500_SOURCES) $(lib501_SOURCES) $(lib502_SOURCES) \ - $(lib503_SOURCES) $(lib504_SOURCES) $(lib505_SOURCES) \ diff --git a/net/curl/patches/patch-tests_server_Makefile_in b/net/curl/patches/patch-tests_server_Makefile_in deleted file mode 100644 index e1e2c443f0a..00000000000 --- a/net/curl/patches/patch-tests_server_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-tests_server_Makefile_in,v 1.7 2010/09/19 16:30:26 naddy Exp $ ---- tests/server/Makefile.in.orig Wed Aug 11 19:03:32 2010 -+++ tests/server/Makefile.in Fri Sep 17 17:44:53 2010 -@@ -131,7 +131,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) -L../../lib/.libs $(LDFLAGS) -o $@ - SOURCES = $(getpart_SOURCES) $(resolve_SOURCES) $(rtspd_SOURCES) \ - $(sockfilt_SOURCES) $(sws_SOURCES) $(tftpd_SOURCES) - DIST_SOURCES = $(getpart_SOURCES) $(resolve_SOURCES) $(rtspd_SOURCES) \ diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 35610cc5198..935df3d565c 100644 --- 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 index a921dd535b9..760bcaae9ae 100644 --- 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 index f50921d38c0..e59dae50c6d 100644 --- 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 index 9fb3c69dd91..5c1f6be8450 100644 --- 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 index 47535cd85bd..ea334d76e60 100644 --- 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 index c280a8923f8..317194c2054 100644 --- 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 index ca9e3f8f4b5..ed9dece37fc 100644 --- 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 index d654d2f8249..450c91f62b7 100644 --- 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 index 5c145e6e1a0..74b843a5d91 100644 --- 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 index 02adb06224f..6b5c51efc56 100644 --- 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 index 0ec6495a3e1..b85fcb060ad 100644 --- 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 index 30721418914..bf9ef3efa51 100644 --- 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