Date: Tue, 31 Aug 2010 17:46:07 GMT From: Rainer Hurling <rhurlin@gwdg.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/150157: [maintainer update] math/saga: update from 2.0.4 to 2.0.5 and bugfixes Message-ID: <201008311746.o7VHk7QJ036292@www.freebsd.org> Resent-Message-ID: <201008311750.o7VHo43V087016@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150157
>Category: ports
>Synopsis: [maintainer update] math/saga: update from 2.0.4 to 2.0.5 and bugfixes
>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: Tue Aug 31 17:50:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Rainer Hurling
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
FreeBSD x.x.x 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Wed Aug 25 20:12:41 CEST 2010 x@x.x.x:/usr/obj/usr/src/sys/CUSTOM amd64
>Description:
This is an update of the linux sources of SAGA GIS (2.0.4 to 2.0.5) with many new modules and features. Some minor bugfixes are also included.
The updated port now supports unicode (optional) and PDF output over libharu (optional). Since this version their are manpages (saga_gui and saga_cmd), a Freedesktop entry and so called 'saga tips'.
The port should remain in 'math', because many scientists use SAGA GIS through math/R with package RSAGA as a 'geoprocessor' for large geodata files (tables, grids, shapes etc.).
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Naur saga/Makefile saga/Makefile
--- saga/Makefile 2010-08-26 09:21:50.000000000 +0200
+++ saga/Makefile 2010-08-30 19:05:52.000000000 +0200
@@ -1,16 +1,16 @@
+
# Ports collection makefile for: saga
# Date created: 13 November 2009
-# Whom: rhurlin
+# Whom: Rainer Hurling <rhurlin@gwdg.de>
#
-# $FreeBSD: ports/math/saga/Makefile,v 1.5 2010/08/03 13:35:21 osa Exp $
+# $FreeBSD: ports/math/saga/Makefile,v 1.4 2010/03/28 06:39:47 dinoex Exp $
#
PORTNAME= saga
-PORTVERSION= 2.0.4
-PORTREVISION= 4
+PORTVERSION= 2.0.5
CATEGORIES= math
MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
-DISTNAME= ${PORTNAME}_${PORTVERSION}_src_linux
+DISTNAME= ${PORTNAME}_${PORTVERSION}_src
MAINTAINER= rhurlin@gwdg.de
COMMENT= System for Automated Geoscientific Analyses
@@ -20,24 +20,61 @@
jasper.4:${PORTSDIR}/graphics/jasper \
tiff.4:${PORTSDIR}/graphics/tiff
-WRKSRC= ${WRKDIR}/${PORTNAME}-2.0
+OPTIONS= UC "Enable Unicode Support" On \
+ HARU "Enable Haru Free PDF Library (optional)" Off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_HARU)
+BUILD_DEPENDS= ${LOCALBASE}/include/hpdf.h:${PORTSDIR}/print/libharu
+RUN_DEPENDS= ${BUILD_DEPENDS}
+.endif
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
+.if defined(WITH_UC)
+WITH_UNICODE= yes
+CONFIGURE_ARGS+= --enable-unicode
+.else
+CONFIGURE_ARGS+= --disable-unicode
+.endif
+
+.if defined(WITH_HARU)
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+.endif
+
USE_WX= 2.8
+MAN1= saga_cmd.1 saga_gui.1
+
+DESKTOP_ENTRIES="SAGA GIS" "${COMMENT}" "${DATADIR}/saga_icon_32.xpm" \
+ "saga_gui" "Application;Math;" true
+
post-patch:
@for f in `${FIND} '${WRKSRC}' -name Makefile.in` \
- ${WRKSRC}/configure; do \
+ ${WRKSRC}/configure \
+ ${WRKSRC}/configure.in; do \
${REINPLACE_CMD} -e's|wx-config |${WX_CONFIG} |g' "$$f"; \
done
@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
+ ${WRKSRC}/configure \
+ ${WRKSRC}/configure.in \
+ ${WRKSRC}/ltmain.sh \
+ ${WRKSRC}/src/saga_core/saga_api/api_core.h \
${WRKSRC}/src/saga_core/saga_api/api_memory.cpp \
+ ${WRKSRC}/src/modules_io/esri_e00/io_esri_e00/e00compr/cpl_port.h \
+ ${WRKSRC}/src/modules_io/grid/io_grid_grib2/g2clib-1.0.4/enc_png.c \
${WRKSRC}/src/modules_projection/pj_georeference/pj_georeference/lmdif0.c
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}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -Naur saga/distinfo saga/distinfo
--- saga/distinfo 2009-11-17 10:12:08.000000000 +0100
+++ saga/distinfo 2010-08-26 18:57:17.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (saga_2.0.4_src_linux.tar.gz) = 2f91cd0eb0c807de6e6e1f706d4b10ce
-SHA256 (saga_2.0.4_src_linux.tar.gz) = e0ac3c7f2ec52f41874c7dc1f0c873cf8d19f3f387151820abea9c7d68125ebe
-SIZE (saga_2.0.4_src_linux.tar.gz) = 2518635
+MD5 (saga_2.0.5_src.tar.gz) = 4a9d15db2cabc4ccb60946fda40eaf92
+SHA256 (saga_2.0.5_src.tar.gz) = 064fbf69f43038e2a6a4bfb349c20352eb4ed04b3f46fed5832519bf3145927f
+SIZE (saga_2.0.5_src.tar.gz) = 2960764
diff -Naur saga/files/patch-Makefile.am saga/files/patch-Makefile.am
--- saga/files/patch-Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ saga/files/patch-Makefile.am 2010-08-29 13:59:22.000000000 +0200
@@ -0,0 +1,14 @@
+--- src/saga_core/saga_cmd/Makefile.am
++++ src/saga_core/saga_cmd/Makefile.am
+@@ -6,9 +6,9 @@ DBGFLAGS = -g -DDEBUG
+ endif
+
+ MLIBPATH = "MODULE_LIBRARY_PATH=\"$(prefix)/lib/saga\""
+-BASEFLAGS = -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD $(DBGFLAGS) -I.. -D$(MLIBPATH)
++BASEFLAGS = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD $(DBGFLAGS) -I.. -D$(MLIBPATH)
+ if SAGA_UNICODE
+-AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags` $(BASEFLAGS)
++AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags` $(BASEFLAGS) -D_SAGA_UNICODE
+ AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs` -lm
+ else
+ AM_CXXFLAGS = -fPIC `wx-config --unicode=no --cxxflags` $(BASEFLAGS)
diff -Naur saga/files/patch-Makefile.in saga/files/patch-Makefile.in
--- saga/files/patch-Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ saga/files/patch-Makefile.in 2010-08-29 14:14:29.000000000 +0200
@@ -0,0 +1,14 @@
+--- src/saga_core/saga_cmd/Makefile.in 2010-08-18 14:28:14.000000000 +0200
++++ src/saga_core/saga_cmd/Makefile.in 2010-08-29 14:11:13.000000000 +0200
+@@ -239,9 +239,9 @@
+ #
+ @DEBUG_TRUE@DBGFLAGS = -g -DDEBUG
+ MLIBPATH = "MODULE_LIBRARY_PATH=\"$(prefix)/lib/saga\""
+-BASEFLAGS = -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD $(DBGFLAGS) -I.. -D$(MLIBPATH)
++BASEFLAGS = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD $(DBGFLAGS) -I.. -D$(MLIBPATH)
+ @SAGA_UNICODE_FALSE@AM_CXXFLAGS = -fPIC `wx-config --unicode=no --cxxflags` $(BASEFLAGS)
+-@SAGA_UNICODE_TRUE@AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags` $(BASEFLAGS)
++@SAGA_UNICODE_TRUE@AM_CXXFLAGS = -fPIC `wx-config --unicode=yes --cxxflags` $(BASEFLAGS) -D_SAGA_UNICODE
+ @SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC `wx-config --unicode=no --libs` -lm
+ @SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC `wx-config --unicode=yes --libs` -lm
+ saga_cmd_LDADD = ../saga_api/libsaga_api.la
diff -Naur saga/files/patch-dlg_about saga/files/patch-dlg_about
--- saga/files/patch-dlg_about 1970-01-01 01:00:00.000000000 +0100
+++ saga/files/patch-dlg_about 2010-08-30 19:16:55.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/saga_core/saga_gui/dlg_about.cpp 2009-10-01 18:18:30.000000000 +0200
++++ src/saga_core/saga_gui/dlg_about.cpp 2010-08-30 16:25:31.000000000 +0200
+@@ -256,7 +256,7 @@
+ );
+
+ s.Append(
+- CSG_Doc_PDF::Get_Version()
++ wxT("Haru Free PDF Library, Version 2.1.0")
+ );
+
+ s.Append(
diff -Naur saga/pkg-descr saga/pkg-descr
--- saga/pkg-descr 2009-11-17 10:12:08.000000000 +0100
+++ saga/pkg-descr 2010-07-23 20:05:02.000000000 +0200
@@ -1,9 +1,9 @@
SAGA - short hand for "System for Automated Geoscientific Analyses" - is a free,
hybrid, cross-platform GIS software.
-The heart of SAGA is it's C++ and thus object oriented Application Programming
+The heart of SAGA is its C++ and thus object oriented Application Programming
Interface (API), providing data object definitions and computational methods for
raster, vector and tabular data. As a normal user, you will not get into touch
with the API. But as an interested scientist or coder you will soon discover
-it's great flexibility.
+its great flexibility.
WWW: http://www.saga-gis.org/en/index.html
diff -Naur saga/pkg-plist saga/pkg-plist
--- saga/pkg-plist 2009-11-17 10:12:08.000000000 +0100
+++ saga/pkg-plist 2010-08-29 17:23:27.000000000 +0200
@@ -1,147 +1,118 @@
bin/saga_cmd
bin/saga_gui
+lib/libsaga_api-2.0.5.so
lib/libsaga_api.la
lib/libsaga_api.so
-lib/libsaga_api.so.0
+lib/libsaga_gdi-2.0.5.so
+lib/libsaga_gdi.la
+lib/libsaga_gdi.so
+lib/libsaga_odbc-2.0.5.so
+lib/libsaga_odbc.a
+lib/libsaga_odbc.la
+lib/libsaga_odbc.so
lib/saga/libcontrib_a_perego.la
lib/saga/libcontrib_a_perego.so
-lib/saga/libcontrib_a_perego.so.0
lib/saga/libgeostatistics_grid.la
lib/saga/libgeostatistics_grid.so
-lib/saga/libgeostatistics_grid.so.0
lib/saga/libgeostatistics_kriging.la
lib/saga/libgeostatistics_kriging.so
-lib/saga/libgeostatistics_kriging.so.0
lib/saga/libgeostatistics_points.la
lib/saga/libgeostatistics_points.so
-lib/saga/libgeostatistics_points.so.0
+lib/saga/libgeostatistics_regression.la
+lib/saga/libgeostatistics_regression.so
lib/saga/libgrid_analysis.la
lib/saga/libgrid_analysis.so
-lib/saga/libgrid_analysis.so.0
lib/saga/libgrid_calculus.la
lib/saga/libgrid_calculus.so
-lib/saga/libgrid_calculus.so.0
+lib/saga/libgrid_calculus_bsl.la
+lib/saga/libgrid_calculus_bsl.so
lib/saga/libgrid_discretisation.la
lib/saga/libgrid_discretisation.so
-lib/saga/libgrid_discretisation.so.0
lib/saga/libgrid_filter.la
lib/saga/libgrid_filter.so
-lib/saga/libgrid_filter.so.0
lib/saga/libgrid_gridding.la
lib/saga/libgrid_gridding.so
-lib/saga/libgrid_gridding.so.0
lib/saga/libgrid_spline.la
lib/saga/libgrid_spline.so
-lib/saga/libgrid_spline.so.0
lib/saga/libgrid_tools.la
lib/saga/libgrid_tools.so
-lib/saga/libgrid_tools.so.0
lib/saga/libgrid_visualisation.la
lib/saga/libgrid_visualisation.so
-lib/saga/libgrid_visualisation.so.0
+lib/saga/libihacres.la
+lib/saga/libihacres.so
lib/saga/libio_esri_e00.la
lib/saga/libio_esri_e00.so
-lib/saga/libio_esri_e00.so.0
lib/saga/libio_gdal.la
lib/saga/libio_gdal.so
-lib/saga/libio_gdal.so.0
lib/saga/libio_gps.la
lib/saga/libio_gps.so
-lib/saga/libio_gps.so.0
lib/saga/libio_grid.la
lib/saga/libio_grid.so
-lib/saga/libio_grid.so.0
lib/saga/libio_grid_grib2.la
lib/saga/libio_grid_grib2.so
-lib/saga/libio_grid_grib2.so.0
lib/saga/libio_grid_image.la
lib/saga/libio_grid_image.so
-lib/saga/libio_grid_image.so.0
+lib/saga/libio_odbc.a
+lib/saga/libio_odbc.la
+lib/saga/libio_odbc.so
lib/saga/libio_shapes.la
lib/saga/libio_shapes.so
-lib/saga/libio_shapes.so.0
lib/saga/libio_shapes_dxf.la
lib/saga/libio_shapes_dxf.so
-lib/saga/libio_shapes_dxf.so.0
lib/saga/libio_table.la
lib/saga/libio_table.so
-lib/saga/libio_table.so.0
lib/saga/liblectures_introduction.la
lib/saga/liblectures_introduction.so
-lib/saga/liblectures_introduction.so.0
lib/saga/libpj_georeference.la
lib/saga/libpj_georeference.so
-lib/saga/libpj_georeference.so.0
lib/saga/libpj_proj4.la
lib/saga/libpj_proj4.so
-lib/saga/libpj_proj4.so.0
lib/saga/libpointcloud_tools.la
lib/saga/libpointcloud_tools.so
-lib/saga/libpointcloud_tools.so.0
lib/saga/libpointcloud_viewer.la
lib/saga/libpointcloud_viewer.so
-lib/saga/libpointcloud_viewer.so.0
lib/saga/librecreations_fractals.la
lib/saga/librecreations_fractals.so
-lib/saga/librecreations_fractals.so.0
lib/saga/librecreations_games.la
lib/saga/librecreations_games.so
-lib/saga/librecreations_games.so.0
-lib/saga/libsaga_gdi.la
-lib/saga/libsaga_gdi.so
-lib/saga/libsaga_gdi.so.0
lib/saga/libshapes_grid.la
lib/saga/libshapes_grid.so
-lib/saga/libshapes_grid.so.0
lib/saga/libshapes_lines.la
lib/saga/libshapes_lines.so
-lib/saga/libshapes_lines.so.0
lib/saga/libshapes_points.la
lib/saga/libshapes_points.so
-lib/saga/libshapes_points.so.0
lib/saga/libshapes_polygons.la
lib/saga/libshapes_polygons.so
-lib/saga/libshapes_polygons.so.0
lib/saga/libshapes_tools.la
lib/saga/libshapes_tools.so
-lib/saga/libshapes_tools.so.0
lib/saga/libsim_cellular_automata.la
lib/saga/libsim_cellular_automata.so
-lib/saga/libsim_cellular_automata.so.0
lib/saga/libsim_ecosystems_hugget.la
lib/saga/libsim_ecosystems_hugget.so
-lib/saga/libsim_ecosystems_hugget.so.0
lib/saga/libsim_fire_spreading.la
lib/saga/libsim_fire_spreading.so
-lib/saga/libsim_fire_spreading.so.0
lib/saga/libsim_hydrology.la
lib/saga/libsim_hydrology.so
-lib/saga/libsim_hydrology.so.0
lib/saga/libta_channels.la
lib/saga/libta_channels.so
-lib/saga/libta_channels.so.0
+lib/saga/libta_compound.la
+lib/saga/libta_compound.so
lib/saga/libta_hydrology.la
lib/saga/libta_hydrology.so
-lib/saga/libta_hydrology.so.0
lib/saga/libta_lighting.la
lib/saga/libta_lighting.so
-lib/saga/libta_lighting.so.0
lib/saga/libta_morphometry.la
lib/saga/libta_morphometry.so
-lib/saga/libta_morphometry.so.0
lib/saga/libta_preprocessor.la
lib/saga/libta_preprocessor.so
-lib/saga/libta_preprocessor.so.0
lib/saga/libta_profiles.la
lib/saga/libta_profiles.so
-lib/saga/libta_profiles.so.0
lib/saga/libtable_calculus.la
lib/saga/libtable_calculus.so
-lib/saga/libtable_calculus.so.0
lib/saga/libtable_tools.la
lib/saga/libtable_tools.so
-lib/saga/libtable_tools.so.0
lib/saga/libtin_tools.la
lib/saga/libtin_tools.so
-lib/saga/libtin_tools.so.0
+lib/saga/libtransect.la
+lib/saga/libtransect.so
@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?201008311746.o7VHk7QJ036292>