From owner-svn-ports-all@FreeBSD.ORG Fri Sep 12 18:09:56 2014 Return-Path: Delivered-To: svn-ports-all@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 2157784C; Fri, 12 Sep 2014 18:09:56 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E653D356; Fri, 12 Sep 2014 18:09:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CI9tnE076297; Fri, 12 Sep 2014 18:09:55 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CI9tkf076295; Fri, 12 Sep 2014 18:09:55 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201409121809.s8CI9tkf076295@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Fri, 12 Sep 2014 18:09:55 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 18:09:56 -0000 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