From owner-svn-ports-all@freebsd.org Thu Jun 25 08:36:43 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98AAB98D52A; Thu, 25 Jun 2015 08:36:43 +0000 (UTC) (envelope-from avilla@FreeBSD.org) 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 89CF71C50; Thu, 25 Jun 2015 08:36:43 +0000 (UTC) (envelope-from avilla@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P8ahvA032139; Thu, 25 Jun 2015 08:36:43 GMT (envelope-from avilla@FreeBSD.org) Received: (from avilla@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P8ahth032138; Thu, 25 Jun 2015 08:36:43 GMT (envelope-from avilla@FreeBSD.org) Message-Id: <201506250836.t5P8ahth032138@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avilla set sender to avilla@FreeBSD.org using -f From: Alberto Villa Date: Thu, 25 Jun 2015 08:36:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390539 - 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-all@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 25 Jun 2015 08:36:43 -0000 Author: avilla Date: Thu Jun 25 08:36:42 2015 New Revision: 390539 URL: https://svnweb.freebsd.org/changeset/ports/390539 Log: graphics/opencv: fix configure when EIGEN is off When EIGEN option is off, CMAKE_ARGS is reset, thus enabling build of tests and docs (causing some leftovers), and, should it be installed, linking against libdc1394 even when option DC1394 is off. PORTREVISION bump is needed to address the latter case. Meanwhile, re-enable make jobs. Differential Revision: https://reviews.freebsd.org/D2893 Reviewed by: jhale (maintainer) Approved by: jhale (maintainer) MFH: 2015Q2 Modified: head/graphics/opencv/Makefile Modified: head/graphics/opencv/Makefile ============================================================================== --- head/graphics/opencv/Makefile Thu Jun 25 08:14:42 2015 (r390538) +++ head/graphics/opencv/Makefile Thu Jun 25 08:36:42 2015 (r390539) @@ -3,7 +3,7 @@ PORTNAME?= opencv PORTVERSION= 2.4.9 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION} @@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake pkgconfig zip USE_LDCONFIG= yes WANT_GSTREAMER= yes -MAKE_JOBS_UNSAFE= yes NOT_FOR_ARCHS= sparc64 NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64 @@ -76,7 +75,7 @@ CMAKE_ARGS+= -DWITH_1394:BOOL=Off BUILD_DEPENDS+= ${LOCALBASE}/include/eigen3/Eigen/Eigen:${PORTSDIR}/math/eigen3 CMAKE_ARGS+= -DWITH_EIGEN:BOOL=On .else -CMAKE_ARGS= -DWITH_EIGEN:BOOL=Off +CMAKE_ARGS+= -DWITH_EIGEN:BOOL=Off .endif .if ${PORT_OPTIONS:MEXAMPLES}