From owner-svn-ports-head@FreeBSD.ORG  Sun Dec  8 10:55:58 2013
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 44EB1E14;
 Sun,  8 Dec 2013 10:55:58 +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 30ACE1A7A;
 Sun,  8 Dec 2013 10:55:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8AtwSv024093;
 Sun, 8 Dec 2013 10:55:58 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8Atv7M024092;
 Sun, 8 Dec 2013 10:55:57 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201312081055.rB8Atv7M024092@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Sun, 8 Dec 2013 10:55:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335874 - head/graphics/opencv
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, 08 Dec 2013 10:55:58 -0000

Author: jhale
Date: Sun Dec  8 10:55:57 2013
New Revision: 335874
URL: http://svnweb.freebsd.org/changeset/ports/335874

Log:
  - Move CFLAGS to python block.  They are causing build errors by picking
    up old headers if a previous version is installed and are not needed for
    the main build
  
  Reported by:	Andrzej Tobola <ato@iem.pw.edu.pl>, Kevin Oberman <rkoberman@gmail.com>

Modified:
  head/graphics/opencv/Makefile

Modified: head/graphics/opencv/Makefile
==============================================================================
--- head/graphics/opencv/Makefile	Sun Dec  8 09:55:41 2013	(r335873)
+++ head/graphics/opencv/Makefile	Sun Dec  8 10:55:57 2013	(r335874)
@@ -30,7 +30,6 @@ CMAKE_ARGS+=	-DWITH_CUDA:BOOL=Off \
 		-DBUILD_TESTS:BOOL=Off \
 		-DBUILD_DOCS:BOOL=Off \
 		-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD}
-CFLAGS+=	-I${LOCALBASE}/include
 
 SUB_FILES=	FindOpenCVCore.cmake
 SUB_LIST=	OCV_VERSION=${PORTVERSION}
@@ -193,6 +192,7 @@ LIB_DEPENDS+=	libopencv_legacy.so:${PORT
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
 USE_PYTHON=	yes
+CFLAGS+=	-I${LOCALBASE}/include
 CMAKE_ARGS+=	-DBUILD_opencv_python:BOOL=On
 . for module in ${OCV_MODS} ${OCV_CORE_MODS} ${OCV_JAVA_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off