This patch updates SAGA GIS from 2.1.0 to 2.1.1. Main new features are - support staging - OpenMP support now on 10.0 and HEAD - python not optional anymore - new option for PostgreSQL - Usage of x11-toolkits/wxgtk30 - many new features and bugfixes This PR makes ports/185559 to be unnecessary and should be closed after commit of version 2.1.1. Fix: This patch was tested on RedPorts with 8.4, 9.2, 10.0 and HEAD, all i386 and amd64. There are some problems so far with QATty and EXP1. The QATty build breaks building lang/gcc48 (iconv problem), the EXP1 build breaks with devel/glib20 (plist does not work with python33?). But I hope math/saga is mature enough now to be committed ;) Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->sunpoet sunpoet@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Author: sunpoet Date: Tue Mar 25 19:41:30 2014 New Revision: 349184 URL: http://svnweb.freebsd.org/changeset/ports/349184 QAT: https://qat.redports.org/buildarchive/r349184/ Log: - Update to 2.1.1 - While I'm here: - Convert to new options helper - Remove deprecated PTHREAD_* - No need to print PKGMESSAGE manually Changes: http://sourceforge.net/apps/trac/saga-gis/attachment/wiki/Changelog%202.1.1/changelog_saga_2.1.1.txt PR: ports/187795 Submitted by: Rainer Hurling <rhurlin@gwdg.de> (maintainer) Tested by: redports Added: head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv_nnet.cpp (contents, props changed) head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv_nnet.h (contents, props changed) Deleted: head/math/saga/files/patch-src-modules_images-modules_vigra-vigra-vigra_fft.cpp Modified: head/math/saga/Makefile head/math/saga/distinfo head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv.h head/math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp head/math/saga/pkg-plist Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Tue Mar 25 19:34:38 2014 (r349183) +++ head/math/saga/Makefile Tue Mar 25 19:41:30 2014 (r349184) @@ -2,121 +2,97 @@ # $FreeBSD$ PORTNAME= saga -PORTVERSION= 2.1.0 -PORTREVISION= 3 +PORTVERSION= 2.1.1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} -DISTNAME= ${PORTNAME}_${PORTVERSION}_src +DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= rhurlin@gwdg.de COMMENT= System for Automated Geoscientific Analyses LICENSE= GPLv2 +BUILD_DEPENDS= swig2.0:${PORTSDIR}/devel/swig20 LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \ libgdal.so:${PORTSDIR}/graphics/gdal \ libjasper.so:${PORTSDIR}/graphics/jasper \ libtiff.so:${PORTSDIR}/graphics/tiff \ libiodbc.so:${PORTSDIR}/databases/libiodbc \ liblas.so:${PORTSDIR}/devel/liblas \ - libopencv_core.so:${PORTSDIR}/graphics/opencv-core + libopencv_ml.so:${PORTSDIR}/graphics/opencv +RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= dos2unix zip compiler:features -DOS2UNIX_GLOB= dlg_about.cpp +CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + --enable-python +CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig2.0" +CFLAGS+= -I${LOCALBASE}/include +GNU_CONFIGURE= yes +LDFLAGS+= -L${LOCALBASE}/lib -lopencv_core +# Python no option any more, because it can't be turned off completely +USE_PYTHON= 2 +USE_LDCONFIG= yes USE_WX= 3.0 +USES= compiler:features iconv:wchar_t dos2unix +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} WX_UNICODE= yes -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf autoheader automake aclocal libtoolize -AUTOMAKE_ARGS= --add-missing DESKTOP_ENTRIES= "SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \ "saga_gui" "Science;Geoscience;Math;" true +DOS2UNIX_GLOB= *.cpp *.h -OPTIONS_DEFINE= PYTHON OPENMP HARU VIGRA -OPTIONS_DEFAULT= OPENMP HARU VIGRA -NO_OPTIONS_SORT= yes +OPTIONS_DEFINE= PGSQL OPENMP HARU VIGRA +OPTIONS_DEFAULT=PGSQL OPENMP HARU VIGRA +NO_OPTIONS_SORT=yes +OPTIONS_SUB= yes OPENMP_DESC= Enable Multiprocessing HARU_DESC= Enable Haru Free PDF Library VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library -.include <bsd.port.options.mk> - -LDFLAGS+= -L${LOCALBASE}/lib -lopencv_core -CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" - -.if ${PORT_OPTIONS:MPYTHON} -CONFIGURE_ARGS+= --enable-python -BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20 -RUN_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20 -CONFIGURE_ENV+= SWIG="${LOCALBASE}/bin/swig2.0" -USE_PYTHON= 2 -PLIST_SUB+= SAGA_PYTHON="" -.else -CONFIGURE_ARGS+= --disable-python -PLIST_SUB+= SAGA_PYTHON="@comment " -.endif - -.if ${PORT_OPTIONS:MOPENMP} -LDFLAGS+= ${PTHREAD_LIBS} -CONFIGURE_ARGS+= --enable-openmp -.else -CONFIGURE_ARGS+= --disable-openmp -.endif - -.if ${PORT_OPTIONS:MHARU} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu -RUN_DEPENDS+= ${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu -PLIST_SUB+= HARU="" -.else -CFLAGS+= -D_SAGA_DONOTUSE_HARU -PLIST_SUB+= HARU="@comment " -.endif - -.if ${PORT_OPTIONS:MVIGRA} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra -RUN_DEPENDS+= ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra -PLIST_SUB+= VIGRA="" -.else -PLIST_SUB+= VIGRA="@comment " -.endif +HARU_BUILD_DEPENDS= ${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu +# Haru docs are build nevertheless -> failure :-( +HARU_CFLAGS_OFF= -D_SAGA_DONOTUSE_HARU +HARU_RUN_DEPENDS= ${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu +OPENMP_CONFIGURE_ENABLE=openmp +OPENMP_LDFLAGS= -pthread +PGSQL_CONFIGURE_OFF= --with-postgresql=no +PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config +PGSQL_LIB_DEPENDS= libpq.so:${PORTSDIR}/databases/postgresql93-client +VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra +VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra .include <bsd.port.pre.mk> -# Late define USE_GCC (openmp support) -# and make g++ use libc++ is possible -USE_GCC= any - +# CLANG is not able to handle neither Fortran nor OpenMP +USE_GCC= 4.8+ .if ${COMPILER_FEATURES:Mlibc++} -LDFLAGS+= -L${LOCALBASE}/lib/c++ -CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++ -.else - +CFLAGS+= -isystem ${LOCALBASE}/include/c++/v1 +CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 +LDFLAGS+= -L${LOCALBASE}/lib/c++ .endif -post-extract: - @${REINPLACE_CMD} -e's|wx-config |${WX_CONFIG} |g' \ - ${WRKSRC}/configure.in \ - ${WRKSRC}/src/saga_core/saga_gui/Makefile.am \ - ${WRKSRC}/src/saga_core/saga_api/Makefile.am \ - ${WRKSRC}/src/saga_core/saga_cmd/Makefile.am \ - ${WRKSRC}/src/saga_core/saga_gdi/Makefile.am \ - ${WRKSRC}/src/modules_contrib/garden/garden_webservices/Makefile.am \ - ${WRKSRC}/src/modules_contrib/garden/garden_3d_viewer/Makefile.am \ - ${WRKSRC}/src/modules_io/shapes/io_shapes/Makefile.am \ - ${WRKSRC}/src/modules_io/grid/io_grid_image/Makefile.am \ - ${WRKSRC}/src/modules/pointcloud/pointcloud_tools/Makefile.am \ - ${WRKSRC}/src/modules/pointcloud/pointcloud_viewer/Makefile.am \ - ${WRKSRC}/src/modules/tin/tin_viewer/Makefile.am \ - ${WRKSRC}/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.am - post-patch: + @${REINPLACE_CMD} -e's|wx-config |${WX_CONFIG} |g' \ + ${WRKSRC}/configure \ + ${WRKSRC}/src/saga_core/saga_gui/Makefile.in \ + ${WRKSRC}/src/saga_core/saga_api/Makefile.in \ + ${WRKSRC}/src/saga_core/saga_cmd/Makefile.in \ + ${WRKSRC}/src/saga_core/saga_gdi/Makefile.in \ + ${WRKSRC}/src/modules_contrib/garden/garden_webservices/Makefile.in \ + ${WRKSRC}/src/modules_contrib/garden/garden_3d_viewer/Makefile.in \ + ${WRKSRC}/src/modules_io/shapes/io_shapes/Makefile.in \ + ${WRKSRC}/src/modules_io/grid/io_grid_image/Makefile.in \ + ${WRKSRC}/src/modules/pointcloud/pointcloud_tools/Makefile.in \ + ${WRKSRC}/src/modules/pointcloud/pointcloud_viewer/Makefile.in \ + ${WRKSRC}/src/modules/tin/tin_viewer/Makefile.in \ + ${WRKSRC}/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in @${REINPLACE_CMD} -e 's|-lcv|-lopencv_core -lopencv_imgproc|g' \ - ${WRKSRC}/src/modules_images/modules_opencv/opencv/Makefile.am - @${REINPLACE_CMD} -e 's|\[cv\]|\[opencv_core\]|' \ - ${WRKSRC}/configure.in - @${REINPLACE_CMD} -e 's|\\n"), SAGA_VERSION)| (rev. 1760)\\n"), SAGA_VERSION)|' \ + ${WRKSRC}/src/modules_images/modules_opencv/opencv/Makefile.in + @${REINPLACE_CMD} -e 's|lib_cv|lib_opencv_core|' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lcv |-lopencv_core |' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|\\n"), SAGA_VERSION)| (rev. 1998)\\n"), SAGA_VERSION)|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp .if ${ARCH} == "i386" || ${ARCH} == "powerpc" @${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \ @@ -127,8 +103,9 @@ post-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga_tip.txt ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR} -# library helper files are not needed and cripple some math/qgis extensions - @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la - @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.a + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_api-2.1.1.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_saga_api-2.1.1.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_gdi-2.1.1.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/saga/*.so .include <bsd.port.post.mk> Modified: head/math/saga/distinfo ============================================================================== --- head/math/saga/distinfo Tue Mar 25 19:34:38 2014 (r349183) +++ head/math/saga/distinfo Tue Mar 25 19:41:30 2014 (r349184) @@ -1,2 +1,2 @@ -SHA256 (saga_2.1.0_src.zip) = 34b6ca55f08f19dc80963dd109035b7fb3881f201dc6118e205e62a73becaf4d -SIZE (saga_2.1.0_src.zip) = 7848258 +SHA256 (saga_2.1.1.tar.gz) = 254fb0fb885ffe73aa2a024f774e05ee0fb1625d89754f70b6020a7d34bbd2fe +SIZE (saga_2.1.1.tar.gz) = 3691046 Modified: head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv.h ============================================================================== --- head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv.h Tue Mar 25 19:34:38 2014 (r349183) +++ head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv.h Tue Mar 25 19:41:30 2014 (r349184) @@ -1,5 +1,5 @@ ---- ./src/modules_images/modules_opencv/opencv/opencv.h.orig 2013-12-03 19:17:30.000000000 -0500 -+++ ./src/modules_images/modules_opencv/opencv/opencv.h 2013-12-03 19:19:37.000000000 -0500 +--- src/modules_images/modules_opencv/opencv/opencv.h.orig 2013-12-03 19:17:30.000000000 -0500 ++++ src/modules_images/modules_opencv/opencv/opencv.h 2013-12-03 19:19:37.000000000 -0500 @@ -73,7 +73,8 @@ #include "MLB_Interface.h" Added: head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv_nnet.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv_nnet.cpp Tue Mar 25 19:41:30 2014 (r349184) @@ -0,0 +1,13 @@ +--- src/modules_images/modules_opencv/opencv/opencv_nnet.cpp.orig 2014-03-17 15:20:31.000000000 +0100 ++++ src/modules_images/modules_opencv/opencv/opencv_nnet.cpp 2014-03-17 15:28:25.000000000 +0100 +@@ -60,8 +60,8 @@ + + //--------------------------------------------------------- + #include "opencv_nnet.h" +-#include "opencv\cxcore.h" +-#include "opencv\ml.h" ++#include <opencv/cxcore.h> ++#include <opencv/ml.h> + + /////////////////////////////////////////////////////////// + // // Added: head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv_nnet.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv_nnet.h Tue Mar 25 19:41:30 2014 (r349184) @@ -0,0 +1,13 @@ +--- src/modules_images/modules_opencv/opencv/opencv_nnet.h.orig 2014-03-17 15:06:15.000000000 +0100 ++++ src/modules_images/modules_opencv/opencv/opencv_nnet.h 2014-03-17 15:18:58.000000000 +0100 +@@ -64,8 +64,8 @@ + + //--------------------------------------------------------- + #include "MLB_Interface.h" +-#include "opencv\cxcore.h" +-#include "opencv\ml.h" ++#include <opencv/cxcore.h> ++#include <opencv/ml.h> + + /////////////////////////////////////////////////////////// + // // Modified: head/math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp ============================================================================== --- head/math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp Tue Mar 25 19:34:38 2014 (r349183) +++ head/math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp Tue Mar 25 19:41:30 2014 (r349184) @@ -1,5 +1,5 @@ ---- ./src/saga_core/saga_cmd/saga_cmd.cpp.orig 2013-07-01 16:16:32.000000000 +0200 -+++ ./src/saga_core/saga_cmd/saga_cmd.cpp 2014-03-24 16:05:03.000000000 +0100 +--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2013-07-01 16:16:32.000000000 +0200 ++++ src/saga_core/saga_cmd/saga_cmd.cpp 2014-03-24 16:05:03.000000000 +0100 @@ -64,6 +64,8 @@ #include <wx/app.h> #include <wx/utils.h> Modified: head/math/saga/pkg-plist ============================================================================== --- head/math/saga/pkg-plist Tue Mar 25 19:34:38 2014 (r349183) +++ head/math/saga/pkg-plist Tue Mar 25 19:41:30 2014 (r349184) @@ -1,22 +1,18 @@ bin/saga_cmd bin/saga_gui +lib/libsaga_api-2.1.1.so lib/libsaga_api.la -lib/libsaga_api-2.1.0.so lib/libsaga_api.so -lib/libsaga_gdi-2.1.0.so +lib/libsaga_gdi-2.1.1.so lib/libsaga_gdi.la lib/libsaga_gdi.so -lib/libsaga_odbc.a -lib/libsaga_odbc.la -lib/libsaga_odbc-2.1.0.so -lib/libsaga_odbc.so -%%SAGA_PYTHON%%%%PYTHON_SITELIBDIR%%/_saga_api-2.1.0.so -%%SAGA_PYTHON%%%%PYTHON_SITELIBDIR%%/_saga_api.a -%%SAGA_PYTHON%%%%PYTHON_SITELIBDIR%%/_saga_api.la -%%SAGA_PYTHON%%%%PYTHON_SITELIBDIR%%/_saga_api.so -%%SAGA_PYTHON%%%%PYTHON_SITELIBDIR%%/saga_api.py -%%SAGA_PYTHON%%%%PYTHON_SITELIBDIR%%/saga_api.pyc -%%SAGA_PYTHON%%%%PYTHON_SITELIBDIR%%/saga_api.pyo +%%PYTHON_SITELIBDIR%%/_saga_api-2.1.1.so +%%PYTHON_SITELIBDIR%%/_saga_api.a +%%PYTHON_SITELIBDIR%%/_saga_api.la +%%PYTHON_SITELIBDIR%%/_saga_api.so +%%PYTHON_SITELIBDIR%%/saga_api.py +%%PYTHON_SITELIBDIR%%/saga_api.pyc +%%PYTHON_SITELIBDIR%%/saga_api.pyo lib/saga/libclimate_tools.so lib/saga/libcontrib_a_perego.so lib/saga/libdocs_html.so @@ -48,16 +44,17 @@ lib/saga/libio_grid.so lib/saga/libio_grid_grib2.so lib/saga/libio_grid_image.so lib/saga/libio_odbc.so +lib/saga/libio_pgsql.so lib/saga/libio_shapes.so lib/saga/libio_shapes_dxf.so lib/saga/libio_shapes_las.so lib/saga/libio_table.so lib/saga/liblectures_introduction.so +lib/saga/libopencv.so lib/saga/libpj_georeference.so lib/saga/libpj_proj4.so lib/saga/libpointcloud_tools.so lib/saga/libpointcloud_viewer.so -lib/saga/libopencv.so lib/saga/librecreations_fractals.so lib/saga/librecreations_games.so lib/saga/libshapes_grid.so @@ -65,6 +62,7 @@ lib/saga/libshapes_lines.so lib/saga/libshapes_points.so lib/saga/libshapes_polygons.so lib/saga/libshapes_tools.so +lib/saga/libshapes_transect.so lib/saga/libsim_cellular_automata.so lib/saga/libsim_ecosystems_hugget.so lib/saga/libsim_erosion.so @@ -81,11 +79,11 @@ lib/saga/libtable_calculus.so lib/saga/libtable_tools.so lib/saga/libtin_tools.so lib/saga/libtin_viewer.so -lib/saga/libtransect.so +%%VIGRA%%lib/saga/libvigra.so man/man1/saga_cmd.1.gz man/man1/saga_gui.1.gz -%%VIGRA%%lib/saga/libvigra.so +share/applications/saga_gui.desktop %%DATADIR%%/saga.png %%DATADIR%%/saga_tip.txt -@dirrm share/saga -@dirrm lib/saga +@dirrmtry %%DATADIR%% +@dirrmtry lib/saga _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!