From owner-svn-ports-head@FreeBSD.ORG  Sun Feb 16 22:41:10 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CAACDC09;
 Sun, 16 Feb 2014 22:41:10 +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 A0963160F;
 Sun, 16 Feb 2014 22:41:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1GMfAiA087707;
 Sun, 16 Feb 2014 22:41:10 GMT (envelope-from riggs@svn.freebsd.org)
Received: (from riggs@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1GMfANx087706;
 Sun, 16 Feb 2014 22:41:10 GMT (envelope-from riggs@svn.freebsd.org)
Message-Id: <201402162241.s1GMfANx087706@svn.freebsd.org>
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sun, 16 Feb 2014 22:41:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r344637 - head/multimedia/handbrake
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: Sun, 16 Feb 2014 22:41:10 -0000

Author: riggs
Date: Sun Feb 16 22:41:10 2014
New Revision: 344637
URL: http://svnweb.freebsd.org/changeset/ports/344637
QAT: https://qat.redports.org/buildarchive/r344637/

Log:
  Fix include order that could lead to build failures when conflicting
  versions of bundled libraries are already installed
  
  Approved by:	thierry (mentor)

Modified:
  head/multimedia/handbrake/Makefile

Modified: head/multimedia/handbrake/Makefile
==============================================================================
--- head/multimedia/handbrake/Makefile	Sun Feb 16 22:31:13 2014	(r344636)
+++ head/multimedia/handbrake/Makefile	Sun Feb 16 22:41:10 2014	(r344637)
@@ -147,9 +147,9 @@ post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|%%REP_CC%%|${CC}|g' \
 		-e 's|%%REP_CXX%%|${CXX}|g' \
-		-e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \
-		-e 's|%%REP_I%%|-I${LOCALBASE}/include|g' \
+		-e 's|%%REP_I%%|-I./contrib/include -I${LOCALBASE}/include|g' \
 		-e 's|%%REP_L%%|-L${LOCALBASE}/lib|g' \
+		-e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \
 		-e 's|%%REP_ICONV%%|${ICONV_LIB:S/-l//}|g' \
 		${WRKSRC}/custom.defs