From owner-svn-ports-all@FreeBSD.ORG Sat Aug 10 20:35:11 2013 Return-Path: Delivered-To: svn-ports-all@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 ESMTP id 3B2B214E; Sat, 10 Aug 2013 20:35:11 +0000 (UTC) (envelope-from marino@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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 27D602F3B; Sat, 10 Aug 2013 20:35:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7AKZB3F068914; Sat, 10 Aug 2013 20:35:11 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7AKZBBW068913; Sat, 10 Aug 2013 20:35:11 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201308102035.r7AKZBBW068913@svn.freebsd.org> From: John Marino Date: Sat, 10 Aug 2013 20:35:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324558 - 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.14 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: Sat, 10 Aug 2013 20:35:11 -0000 Author: marino Date: Sat Aug 10 20:35:10 2013 New Revision: 324558 URL: http://svnweb.freebsd.org/changeset/ports/324558 Log: graphics/opencv: continue recent binutils fix This cleans up the previous commit, and combines the LDFLAGS. It's more logical this way, right after opencv_core is specified in LIB_DEPENDS. Approved by: bapt/culot (mentors, implicit) Modified: head/graphics/opencv/Makefile Modified: head/graphics/opencv/Makefile ============================================================================== --- head/graphics/opencv/Makefile Sat Aug 10 17:04:02 2013 (r324557) +++ head/graphics/opencv/Makefile Sat Aug 10 20:35:10 2013 (r324558) @@ -32,7 +32,7 @@ PLIST_SUB+= VERSION=${DISTVERSION} .if !defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-opencv LIB_DEPENDS+= opencv_core.2:${PORTSDIR}/graphics/opencv-core -LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib -lopencv_core PORTDOCS= * @@ -43,8 +43,6 @@ GTK_DESC= GTK+ support OPENEXR_DESC= OpenEXR support TBB_DESC= TBB support -LDFLAGS+= -lopencv_core - OPTIONS_DEFAULT= EIGEN2 JASPER JPEG PNG TIFF V4L .include