From owner-svn-ports-branches@freebsd.org  Fri Jun 26 18:26:46 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@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 A40CD98CD86;
 Fri, 26 Jun 2015 18:26:46 +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 8C8241256;
 Fri, 26 Jun 2015 18:26:46 +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 t5QIQkDI089691;
 Fri, 26 Jun 2015 18:26:46 GMT (envelope-from avilla@FreeBSD.org)
Received: (from avilla@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QIQk09089690;
 Fri, 26 Jun 2015 18:26:46 GMT (envelope-from avilla@FreeBSD.org)
Message-Id: <201506261826.t5QIQk09089690@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: avilla set sender to
 avilla@FreeBSD.org using -f
From: Alberto Villa <avilla@FreeBSD.org>
Date: Fri, 26 Jun 2015 18:26:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r390659 - branches/2015Q2/graphics/opencv
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jun 2015 18:26:46 -0000

Author: avilla
Date: Fri Jun 26 18:26:45 2015
New Revision: 390659
URL: https://svnweb.freebsd.org/changeset/ports/390659

Log:
  MFH: r390539
  
  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)
  Approved by:	portmgr

Modified:
  branches/2015Q2/graphics/opencv/Makefile
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/graphics/opencv/Makefile
==============================================================================
--- branches/2015Q2/graphics/opencv/Makefile	Fri Jun 26 18:21:45 2015	(r390658)
+++ branches/2015Q2/graphics/opencv/Makefile	Fri Jun 26 18:26:45 2015	(r390659)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	opencv
 PORTVERSION=	2.4.9
-PORTREVISION?=	3
+PORTREVISION?=	4
 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}