Date: Wed, 22 Apr 2015 17:15:00 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384500 - in head/math/saga: . files Message-ID: <201504221715.t3MHF0n0059879@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <rhurlin@gwdg.de> (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); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504221715.t3MHF0n0059879>