Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Sep 2014 18:09:55 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368055 - in head/graphics: opencolorio opencolorio-tools
Message-ID:  <201409121809.s8CI9tkf076295@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Fri Sep 12 18:09:55 2014
New Revision: 368055
URL: http://svnweb.freebsd.org/changeset/ports/368055
QAT: https://qat.redports.org/buildarchive/r368055/

Log:
  Fix opencolorio-tools build. Now that opencolorio has a post-patch,
  opencolorio-tools can't have one.
  
  opencolorio-tools fails stage-qa, though, due to some stray files
  in STAGEDIR that are probably simplest to just list as @comment inside
  pkg-plist-tools:
  
  ===> Checking for items in STAGEDIR missing from pkg-plist
  Error: Orphaned: include/OpenColorIO/OpenColorABI.h
  Error: Orphaned: include/OpenColorIO/OpenColorIO.h
  Error: Orphaned: include/OpenColorIO/OpenColorTransforms.h
  Error: Orphaned: include/OpenColorIO/OpenColorTypes.h
  Error: Orphaned: libdata/pkgconfig/OpenColorIO.pc

Modified:
  head/graphics/opencolorio-tools/Makefile
  head/graphics/opencolorio/Makefile

Modified: head/graphics/opencolorio-tools/Makefile
==============================================================================
--- head/graphics/opencolorio-tools/Makefile	Fri Sep 12 18:06:17 2014	(r368054)
+++ head/graphics/opencolorio-tools/Makefile	Fri Sep 12 18:09:55 2014	(r368055)
@@ -12,8 +12,4 @@ USE_GL=		glew glut
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-CMakeLists.txt
 
-post-patch:
-	@${FIND} ${WRKSRC}/src/apps -name main.cpp | ${XARGS} \
-		${REINPLACE_CMD} '/namespace OIIO/d'
-
 .include "${MASTERDIR}/Makefile"

Modified: head/graphics/opencolorio/Makefile
==============================================================================
--- head/graphics/opencolorio/Makefile	Fri Sep 12 18:06:17 2014	(r368054)
+++ head/graphics/opencolorio/Makefile	Fri Sep 12 18:09:55 2014	(r368055)
@@ -64,5 +64,9 @@ post-patch:
 	@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.h
+.if ${SLAVE_PORT} == yes
+	@${FIND} ${WRKSRC}/src/apps -name main.cpp | ${XARGS} \
+		${REINPLACE_CMD} '/namespace OIIO/d'
+.endif
 
 .include <bsd.port.mk>



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