Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Feb 2014 22:41:10 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344637 - head/multimedia/handbrake
Message-ID:  <201402162241.s1GMfANx087706@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402162241.s1GMfANx087706>