Index: head/science/gnudatalanguage/Makefile =================================================================== --- head/science/gnudatalanguage/Makefile (revision 441255) +++ head/science/gnudatalanguage/Makefile (revision 441256) @@ -1,136 +1,136 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= gnudatalanguage DISTVERSION= 0.9.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${PORTVERSION} .if defined(BUILD_PYTHON_MODULE) PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} .endif DISTNAME= gdl-${DISTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT?= GDL, a free IDL compatible incremental compiler LICENSE= GPLv2 LIB_DEPENDS+= libplplot.so:math/plplot \ libpng.so:graphics/png \ libsz.so:science/szip \ libps.so:print/pslib \ libgsl.so:math/gsl -USE_WX= 2.8 +USE_WX= 3.0+ USE_XORG= x11 sm ice xext USES= cmake:outsource compiler:gcc-c++11-lib dos2unix ncurses pkgconfig readline tar:tgz # Disable ncurses and readline from ports # Disable ImageMagick (does'nt work with plplot because dynamic drivers # are enabled by default) # TODO: add a slave port for mpich # TODO: create a port for Cmsvlib http://cow.physics.wisc.edu/~craigm/idl/down/cmsvlib.tar.gz # TODO: create a port for Astron http://idlastro.gsfc.nasa.gov/ftp/astron.tar.gz # TODO: create a port for TexToIdl http://physics.mnstate.edu/mcraig/textoidl/textoidl-2-1-2.tar CMAKE_ARGS= -DREADLINEDIR:STRING="/usr" \ -DNCURSESDIR:STRING="/usr" \ -DMPICH:BOOL=NO \ -DMAGICK:BOOL=NO CPPFLAGS+= ${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION LDFLAGS+= -lpthread -L${LOCALBASE}/lib SLAVEDIRS= science/py-gnudatalanguage OPTIONS_DEFINE= EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NETCDF PYTHON QHULL UDUNITS OPTIONS_DEFAULT=EIGEN FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS EIGEN_DESC= Eigen3 support (boost performance) EIGEN_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 EIGEN_CMAKE_ON= -DEIGEN3:BOOL=YES EIGEN_CMAKE_OFF= -DEIGEN3:BOOL=NO FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float FFTW_CMAKE_ON= -DFFTW:BOOL=YES FFTW_CMAKE_OFF= -DFFTW:BOOL=NO GRAPHICSMAGICK_DESC= Support GraphicsMagick GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick GRAPHICSMAGICK_CMAKE_ON= -DGRAPHICSMAGICK:BOOL=YES GRAPHICSMAGICK_CMAKE_OFF= -DGRAPHICSMAGICK:BOOL=NO GRIB_DESC= Support GRIB messages GRIB_LIB_DEPENDS= libgrib_api.so:science/grib_api GRIB_CMAKE_ON= -DGRIB:BOOL=YES GRIB_CMAKE_OFF= -DGRIB:BOOL=NO HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 HDF5_CMAKE_ON= -DHDF5:BOOL=YES HDF5_CMAKE_OFF= -DHDF5:BOOL=NO -DHDF:BOOL=NO LIBPROJ4_DESC= Support cartographic processes LIBPROJ4_LIB_DEPENDS= libproj.so:graphics/proj LIBPROJ4_CMAKE_ON= -DLIBPROJ4:BOOL=YES LIBPROJ4_CMAKE_OFF= -DLIBPROJ4:BOOL=NO MPICH2_LIB_DEPENDS= libmpich.so.8:net/mpich2 MPICH2_CMAKE_ON= -DMPICH:BOOL=YES MPICH2_CMAKE_OFF= -DMPICH:BOOL=NO NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf NETCDF_CMAKE_ON= -DNETCDF:BOOL=YES -DHDF:BOOL=NO NETCDF_CMAKE_OFF= -DNETCDF:BOOL=NO PYTHON_USES= python PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib PYTHON_CMAKE_ON= -DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}" PYTHON_CMAKE_OFF= -DPYTHON:BOOL=NO QHULL_DESC= Enable Qhull support QHULL_LIB_DEPENDS= libqhull.so:math/qhull QHULL_CMAKE_ON= -DQHULL:BOOL=YES QHULL_CMAKE_OFF= -DQHULL:BOOL=NO UDUNITS_LIB_DEPENDS= libudunits2.so:science/udunits UDUNITS_CMAKE_ON= -DUDUNITS:BOOL=YES UDUNITS_CMAKE_OFF= -DUDUNITS:BOOL=NO .if defined(BUILD_PYTHON_MODULE) CATEGORIES+= python CMAKE_ARGS+= -DPYTHON_MODULE:BOOL=YES -DOPENMP:BOOL=NO PLIST= pkg-plist.pymod .else CMAKE_ARGS+= -DPYTHON_MODULE:BOOL=NO .endif .if defined(BUILD_PYTHON_MODULE) do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libgdl.so ${STAGEDIR}${PYTHON_SITELIBDIR}/GDL.so .endif .if !defined(BUILD_PYTHON_MODULE) post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite (cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/) .endif .if defined(MAINTAINER_MODE) regression-test: install . if defined(BUILD_PYTHON_MODULE) @${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py @${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py ${PYTHON_CMD} ${WRKDIR}/testgdl.py . else @${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro" \ > ${WRKDIR}/testgdl @${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl ${PREFIX}/bin/gdl < ${WRKDIR}/testgdl . endif .endif .include Index: head/science/gnudatalanguage/files/patch-src_gdlgstream.hpp =================================================================== --- head/science/gnudatalanguage/files/patch-src_gdlgstream.hpp (nonexistent) +++ head/science/gnudatalanguage/files/patch-src_gdlgstream.hpp (revision 441256) @@ -0,0 +1,11 @@ +--- src/gdlgstream.hpp.orig 2017-05-19 17:32:58 UTC ++++ src/gdlgstream.hpp +@@ -199,7 +199,7 @@ public: + const char **devnames = NULL; + #endif + +- static vector devNames; ++ static std::vector devNames; + + // do only once + if( devNames.empty()) Property changes on: head/science/gnudatalanguage/files/patch-src_gdlgstream.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/gnudatalanguage/files/patch-src_gdlwidget.cpp =================================================================== --- head/science/gnudatalanguage/files/patch-src_gdlwidget.cpp (nonexistent) +++ head/science/gnudatalanguage/files/patch-src_gdlwidget.cpp (revision 441256) @@ -0,0 +1,11 @@ +--- src/gdlwidget.cpp.orig 2017-05-19 17:32:58 UTC ++++ src/gdlwidget.cpp +@@ -2455,7 +2455,7 @@ BaseGDL* GDLWidgetTable::GetTableValuesA + } + else { //use the wxWidget selection or the passed selection, mode-dependent: + if (disjointSelection) { //pairs lists +- vector list; ++ std::vector list; + if (selection->Rank()==0) { //use current wxWidgets selection. Result is a STRUCT + list=grid->GetSelectedDisjointCellsList(); + } else { //make equivalent vector. Property changes on: head/science/gnudatalanguage/files/patch-src_gdlwidget.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/gnudatalanguage/files/patch-src_gdlwidget.hpp =================================================================== --- head/science/gnudatalanguage/files/patch-src_gdlwidget.hpp (nonexistent) +++ head/science/gnudatalanguage/files/patch-src_gdlwidget.hpp (revision 441256) @@ -0,0 +1,22 @@ +--- src/gdlwidget.hpp.orig 2017-05-19 17:32:58 UTC ++++ src/gdlwidget.hpp +@@ -275,7 +275,7 @@ protected: + long alignment; //alignment of the widget + long widgetStyle; //style (alignment code + other specific codes used as option to widgetsizer) + int dynamicResize; //for some widgets, will enable resizing: -1: not resizable, 0/1 resizable +- vector followers; //all the widgets that use me as group_leader ++ std::vector followers; //all the widgets that use me as group_leader + + + private: +@@ -1256,8 +1256,8 @@ public: + if ( selectionCol.GetCount() > 0 ) return TRUE; + return FALSE; + } +- vector GetSelectedDisjointCellsList(){ +- vector list; ++ std::vector GetSelectedDisjointCellsList(){ ++ std::vector list; + wxGridCellCoordsArray cellSelection=this->GetSelectedCells(); + for( int i=0; i