From owner-svn-ports-head@FreeBSD.ORG  Tue Dec 17 20:14:25 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 81795F95;
 Tue, 17 Dec 2013 20:14:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6DFF71709;
 Tue, 17 Dec 2013 20:14:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKEPmM027511;
 Tue, 17 Dec 2013 20:14:25 GMT (envelope-from mva@svn.freebsd.org)
Received: (from mva@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKEPqx027509;
 Tue, 17 Dec 2013 20:14:25 GMT (envelope-from mva@svn.freebsd.org)
Message-Id: <201312172014.rBHKEPqx027509@svn.freebsd.org>
From: Marcus von Appen <mva@FreeBSD.org>
Date: Tue, 17 Dec 2013 20:14:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336760 - in head/multimedia/libav: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Dec 2013 20:14:25 -0000

Author: mva
Date: Tue Dec 17 20:14:24 2013
New Revision: 336760
URL: http://svnweb.freebsd.org/changeset/ports/336760

Log:
  - Unbreak the build for most environments after graphics/opencv changed
    its library flags for pkg-config

Added:
  head/multimedia/libav/files/patch-configure   (contents, props changed)
Modified:
  head/multimedia/libav/Makefile

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Tue Dec 17 20:01:48 2013	(r336759)
+++ head/multimedia/libav/Makefile	Tue Dec 17 20:14:24 2013	(r336760)
@@ -205,7 +205,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
 		${WRKSRC}/configure \
 		${WRKSRC}/libavcodec/libgsm.c
-	${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
+	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/library.mak
 
 .include <bsd.port.post.mk>

Added: head/multimedia/libav/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libav/files/patch-configure	Tue Dec 17 20:14:24 2013	(r336760)
@@ -0,0 +1,13 @@
+--- configure.orig	2013-12-17 19:12:24.000000000 +0100
++++ configure	2013-12-17 19:12:49.000000000 +0100
+@@ -730,8 +730,8 @@
+ 
+ check_ld(){
+     log check_ld "$@"
+-    flags=$(filter_out '-l*' "$@")
+-    libs=$(filter '-l*' "$@")
++    flags=$(filter_out '-l*|*.so' "$@")
++    libs=$(filter '-l*|*.so' "$@")
+     check_cc $($cflags_filter $flags) || return
+     flags=$($ldflags_filter $flags)
+     libs=$($ldflags_filter $libs)