From owner-svn-ports-head@FreeBSD.ORG Wed Apr 22 17:15:00 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC85A32E; Wed, 22 Apr 2015 17:15:00 +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 A149A1B4A; Wed, 22 Apr 2015 17:15:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3MHF0N7059892; Wed, 22 Apr 2015 17:15:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3MHF0n0059879; Wed, 22 Apr 2015 17:15:00 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201504221715.t3MHF0n0059879@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 22 Apr 2015 17:15:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384500 - in head/math/saga: . files 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2015 17:15:00 -0000 Author: jbeich Date: Wed Apr 22 17:14:59 2015 New Revision: 384500 URL: https://svnweb.freebsd.org/changeset/ports/384500 Log: Unbreak build on platforms using libstdc++ after r383466 Force C++11 mode and fix incompatibility with NULL being defined as nullptr on FreeBSD. PR: 199600 Reported by: pkg-fallout, DPorts Approved by: Rainer Hurling (maintainer) Added: head/math/saga/files/patch-src__modules__io__io_shapes_las__las_export.cpp (contents, props changed) Modified: head/math/saga/Makefile Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Wed Apr 22 16:55:51 2015 (r384499) +++ head/math/saga/Makefile Wed Apr 22 17:14:59 2015 (r384500) @@ -31,6 +31,7 @@ CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib -lopencv_contrib USE_LDCONFIG= yes +USE_CXXSTD= c++11 USE_WX= 3.0+ USES= autoreconf compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool python:2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Added: head/math/saga/files/patch-src__modules__io__io_shapes_las__las_export.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src__modules__io__io_shapes_las__las_export.cpp Wed Apr 22 17:14:59 2015 (r384500) @@ -0,0 +1,21 @@ +--- src/modules/io/io_shapes_las/las_export.cpp.orig 2014-01-09 10:24:11 UTC ++++ src/modules/io/io_shapes_las/las_export.cpp +@@ -333,12 +333,12 @@ bool CLAS_Export::On_Execute(void) + y = pPoints->Get_Y(i); + z = pPoints->Get_Z(i); + +- x < xmin ? xmin = x : NULL; +- x > xmax ? xmax = x : NULL; +- y < ymin ? ymin = y : NULL; +- y > ymax ? ymax = y : NULL; +- z < zmin ? zmin = z : NULL; +- z > zmax ? zmax = z : NULL; ++ x < xmin ? xmin = x : 0.0; ++ x > xmax ? xmax = x : 0.0; ++ y < ymin ? ymin = y : 0.0; ++ y > ymax ? ymax = y : 0.0; ++ z < zmin ? zmin = z : 0.0; ++ z > zmax ? zmax = z : 0.0; + + point.SetCoordinates(x, y, z); +