svn commit: r344637 - head/multimedia/handbrake

Thomas Zander riggs at FreeBSD.org
Sun Feb 16 22:41:10 UTC 2014


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
 


More information about the svn-ports-all mailing list