Date: Sun, 7 Jul 2013 16:52:40 GMT From: Rainer Hurling <rhurlin@gwdg.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180366: [maintainer update] math/saga: update to version 2.1.0 Message-ID: <201307071652.r67Gqeg7066615@oldred.freebsd.org> Resent-Message-ID: <201307071700.r67H02uC036449@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180366
>Category: ports
>Synopsis: [maintainer update] math/saga: update to version 2.1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 07 17:00:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Rainer Hurling
>Release: 10.0-CURRENT (amd64)
>Organization:
>Environment:
FreeBSD xxx.xxx.xxx 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r252779: Fri Jul 5 15:38:22 CEST 2013 xxx@xxx.xxx:/usr/obj/usr/src/sys/XXX amd64
>Description:
This patch updates SAGA GIS from 2.0.8 to 2.1.0.
Main new features are
- Usage of wxGTK2-2.9.4
- Better Unicode support
- Multiprocessor support via OpenMP
- New GIS modules
- many bugfixes
In particular the multiprocessor support speeds up some modules enormously.
>How-To-Repeat:
>Fix:
The attached patch should update to 2.1.0.
I am not sure if it is OK that option PYTHON can be selected while option OPENMP is enabled. Some own python scripts seem to work with SAGA modules so far.
Patch attached with submission follows:
diff -Naur saga.orig/Makefile saga/Makefile
--- saga.orig/Makefile 2013-06-20 17:55:21.000000000 +0200
+++ saga/Makefile 2013-07-06 20:10:36.000000000 +0200
@@ -1,12 +1,11 @@
# Created by: Rainer Hurling <rhurlin@gwdg.de>
-# $FreeBSD: head/math/saga/Makefile 310871 2013-01-23 15:00:18Z makc $
+# $FreeBSD$
PORTNAME= saga
-PORTVERSION= 2.0.8
-PORTREVISION= 4
+PORTVERSION= 2.1.0
CATEGORIES= math
MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
-DISTNAME= ${PORTNAME}_${PORTVERSION}
+DISTNAME= ${PORTNAME}_${PORTVERSION}_src
MAINTAINER= rhurlin@gwdg.de
COMMENT= System for Automated Geoscientific Analyses
@@ -21,24 +20,29 @@
las:${PORTSDIR}/devel/liblas \
opencv_legacy:${PORTSDIR}/graphics/opencv
-USE_WX= 2.8
+BUILD_DEPENDS= ${LOCALBASE}/bin/aclocal:${PORTSDIR}/devel/automake-wrapper
+
+USE_ZIP= yes
+USE_WX= 2.9
+WX_UNICODE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+USE_AUTOTOOLS= autoconf
+
+# CLANG is not able to handle neither Fortran nor OpenMP
USE_GCC= any
-USE_AUTOTOOLS= libtool
CFLAGS+= -I${LOCALBASE}/include
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_DOS2UNIX= dlg_about.cpp
MAN1= saga_cmd.1 saga_gui.1
-DESKTOP_ENTRIES= "SAGA GIS" "${COMMENT}" "${DATADIR}/saga_icon_32.xpm" \
+DESKTOP_ENTRIES= "SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \
"saga_gui" "Science;Geoscience;Math;" true
-OPTIONS_DEFINE= UNICODE PYTHON HARU VIGRA
-OPTIONS_DEFAULT= UNICODE PYTHON
+OPTIONS_DEFINE= PYTHON OPENMP HARU VIGRA
+OPTIONS_DEFAULT= OPENMP HARU VIGRA
NO_OPTIONS_SORT= yes
-UNICODE_DESC= Enable Unicode Support
+OPENMP_DESC= Enable Multiprocessing
HARU_DESC= Enable Haru Free PDF Library
VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library
@@ -47,16 +51,11 @@
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-.if ${PORT_OPTIONS:MUNICODE}
-WITH_UNICODE= yes
-CONFIGURE_ARGS+= --enable-unicode
-.else
-CONFIGURE_ARGS+= --disable-unicode
-.endif
-
.if ${PORT_OPTIONS:MPYTHON}
CONFIGURE_ARGS+= --enable-python
-BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20
+RUNLD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20
+CONFIGURE_ENV+= SWIG="${LOCALBASE}/bin/swig2.0"
USE_PYTHON= 2.6-2.7
PLIST_SUB+= SAGA_PYTHON=""
.else
@@ -64,11 +63,19 @@
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
@@ -82,14 +89,30 @@
.include <bsd.port.pre.mk>
+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/-lcv/-lopencv_legacy/g' \
+ ( cd ${WRKSRC}; \
+ ${AUTORECONF} -i)
+ @${REINPLACE_CMD} -e 's|-lcv|-lopencv_legacy|g' \
${WRKSRC}/configure \
${WRKSRC}/src/modules_images/modules_opencv/opencv/Makefile.in
- @for f in `${FIND} '${WRKSRC}' -name Makefile.in` \
- ${WRKSRC}/configure; do \
- ${REINPLACE_CMD} -e's|wx-config |${WX_CONFIG} |g' "$$f"; \
- done
+ @${REINPLACE_CMD} -e 's|\\n"), SAGA_VERSION)| (rev. 1760)\\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;|' \
${WRKSRC}/src/saga_core/saga_api/api_core.h
@@ -98,7 +121,7 @@
post-install:
${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga_tip.txt ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/xpm/saga_icon_32.xpm ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${DATADIR}
# library helper files are not needed and cripple some math/qgis extensions
@${RM} ${PREFIX}/lib/saga/*.la
@${RM} ${PREFIX}/lib/saga/*.a
diff -Naur saga.orig/distinfo saga/distinfo
--- saga.orig/distinfo 2013-06-20 17:55:21.000000000 +0200
+++ saga/distinfo 2013-07-06 14:40:41.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (saga_2.0.8.tar.gz) = 709e4f047e33599a77302c72bffa0d218f1013357292bf583c87761563403f2a
-SIZE (saga_2.0.8.tar.gz) = 3405112
+SHA256 (saga_2.1.0_src.zip) = 34b6ca55f08f19dc80963dd109035b7fb3881f201dc6118e205e62a73becaf4d
+SIZE (saga_2.1.0_src.zip) = 7848258
diff -Naur saga.orig/files/patch-src-modules_images-modules_vigra-vigra-vigra_fft.cpp saga/files/patch-src-modules_images-modules_vigra-vigra-vigra_fft.cpp
--- saga.orig/files/patch-src-modules_images-modules_vigra-vigra-vigra_fft.cpp 2013-06-20 17:55:21.000000000 +0200
+++ saga/files/patch-src-modules_images-modules_vigra-vigra-vigra_fft.cpp 2013-07-06 14:50:44.000000000 +0200
@@ -1,10 +1,10 @@
---- src/modules_images/modules_vigra/vigra/vigra_fft.cpp.orig 2011-11-24 15:24:43.000000000 +0100
-+++ src/modules_images/modules_vigra/vigra/vigra_fft.cpp 2012-01-18 23:21:38.000000000 +0100
+--- src/modules_images/modules_vigra/vigra/vigra_fft.cpp.orig 2013-07-01 16:16:34.000000000 +0200
++++ src/modules_images/modules_vigra/vigra/vigra_fft.cpp 2013-07-06 14:49:18.000000000 +0200
@@ -89,7 +89,7 @@
{
for(int x=0; x<Real.Get_NX(); x++)
{
-- Image(x, y) = FFTWComplex(Real.asDouble(x, y), Imag.asDouble(x, y));
+- Image(x, y) = FFTWComplex<>(Real.asDouble(x, y), Imag.asDouble(x, y));
+ Image(x, y) = FFTWComplex<double>(Real.asDouble(x, y), Imag.asDouble(x, y));
}
}
@@ -13,7 +13,7 @@
fourierTransformInverse(srcImageRange(tmp) , destImage(Output));
}
-- transformImage(srcImageRange(Output), destImage(Output), std::bind1st(std::multiplies<FFTWComplex>(), 1.0 / Get_NX() / Get_NY()));
+- transformImage(srcImageRange(Output), destImage(Output), std::bind1st(std::multiplies<FFTWComplex<> >(), 1.0 / Get_NX() / Get_NY()));
+ transformImage(srcImageRange(Output), destImage(Output), std::bind1st(std::multiplies<FFTWComplex<double> >(), 1.0 / Get_NX() / Get_NY()));
//-----------------------------------------------------
@@ -22,7 +22,7 @@
vigra::applyFourierFilter(srcImageRange(Input), srcImage(Filter_), destImage(Output));
-- transformImage(srcImageRange(Output), destImage(Output), std::bind1st(std::multiplies<FFTWComplex>(), 1.0 / Get_NX() / Get_NY()));
+- transformImage(srcImageRange(Output), destImage(Output), std::bind1st(std::multiplies<FFTWComplex<> >(), 1.0 / Get_NX() / Get_NY()));
+ transformImage(srcImageRange(Output), destImage(Output), std::bind1st(std::multiplies<FFTWComplex<double> >(), 1.0 / Get_NX() / Get_NY()));
//-----------------------------------------------------
diff -Naur saga.orig/pkg-message saga/pkg-message
--- saga.orig/pkg-message 2013-06-20 17:55:21.000000000 +0200
+++ saga/pkg-message 2013-04-23 19:47:02.000000000 +0200
@@ -20,16 +20,12 @@
######################################################################
-And don't forget, on Unix-like systems you will have to alter the
-module library name accordingly by adding "lib" to the module library
-name.
+Since version 2.1.0 it is not necessary any more, to use a leading
+"lib" for module library names on Unix-like systems. Now you will have
+to alter back your scripts by removing "lib" from the name (like it is
+on MS Windows).
e.g.:
- saga_cmd libta_morphometry instead of saga_cmd ta_morphometry
-
-For more information see
-
-http://sourceforge.net/apps/trac/saga-gis/wiki/\
-Executing%20Modules%20with%20SAGA%20CMD
+ saga_cmd ta_morphometry instead of saga_cmd libta_morphometry
######################################################################
diff -Naur saga.orig/pkg-plist saga/pkg-plist
--- saga.orig/pkg-plist 2013-06-20 17:55:21.000000000 +0200
+++ saga/pkg-plist 2013-01-17 11:53:41.000000000 +0100
@@ -1,25 +1,26 @@
bin/saga_cmd
bin/saga_gui
-lib/libsaga_api-2.0.8.so
lib/libsaga_api.la
+lib/libsaga_api-2.1.0.so
lib/libsaga_api.so
-lib/libsaga_gdi-2.0.8.so
+lib/libsaga_gdi-2.1.0.so
lib/libsaga_gdi.la
lib/libsaga_gdi.so
-lib/libsaga_odbc-2.0.8.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.0.8.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
+lib/saga/libclimate_tools.so
lib/saga/libcontrib_a_perego.so
lib/saga/libdocs_html.so
-%%HARU%%lib/saga/libdocs_pdf.so
+lib/saga/libdocs_pdf.so
lib/saga/libgarden_3d_viewer.so
lib/saga/libgarden_webservices.so
lib/saga/libgeostatistics_grid.so
@@ -38,6 +39,7 @@
lib/saga/libimagery_classification.so
lib/saga/libimagery_rga.so
lib/saga/libimagery_segmentation.so
+lib/saga/libimagery_svm.so
lib/saga/libimagery_tools.so
lib/saga/libio_esri_e00.so
lib/saga/libio_gdal.so
@@ -51,11 +53,11 @@
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 +67,7 @@
lib/saga/libshapes_tools.so
lib/saga/libsim_cellular_automata.so
lib/saga/libsim_ecosystems_hugget.so
+lib/saga/libsim_erosion.so
lib/saga/libsim_fire_spreading.so
lib/saga/libsim_hydrology.so
lib/saga/libta_channels.so
@@ -80,7 +83,7 @@
lib/saga/libtin_viewer.so
lib/saga/libtransect.so
%%VIGRA%%lib/saga/libvigra.so
-%%DATADIR%%/saga_icon_32.xpm
+%%DATADIR%%/saga.png
%%DATADIR%%/saga_tip.txt
@dirrm share/saga
@dirrm lib/saga
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307071652.r67Gqeg7066615>