sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update from 2.1.1 to 2.1.2

Browse source 
- Fix LICENSE
- Fix build on i386
- Install language and desktop files

PR:		ports/191491
Submitted by:	Rainer Hurling <rhurlin@gwdg.de>
This commit is contained in:
Danilo Egea Gondolfo 2014-07-03 01:56:05 +00:00
parent ff2fb4488e
commit a0c438c082
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=360336
7 changed files with 112 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
math/saga/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= saga
PORTVERSION= 2.1.1
PORTREVISION= 3
PORTVERSION= 2.1.2
CATEGORIES= math
MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
@ -11,11 +10,13 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= rhurlin@gwdg.de
COMMENT= System for Automated Geoscientific Analyses
LICENSE= GPLv2
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
BUILD_DEPENDS= swig2.0:${PORTSDIR}/devel/swig20
LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \
libgdal.so:${PORTSDIR}/graphics/gdal \
libhpdf.so:${PORTSDIR}/print/libharu \
libjasper.so:${PORTSDIR}/graphics/jasper \
libtiff.so:${PORTSDIR}/graphics/tiff \
libodbc.so:${PORTSDIR}/databases/unixODBC \
@ -28,11 +29,11 @@ CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig2.0"
CFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib -lopencv_core
LDFLAGS+= -L${LOCALBASE}/lib -lopencv_contrib
# Python no option any more, because it can't be turned off completely
USE_PYTHON= 2
USE_LDCONFIG= yes
USE_WX= 3.0
USE_WX= 3.0+
USES= compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WX_UNICODE= yes
@ -42,18 +43,13 @@ DESKTOP_ENTRIES= "SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \
DOS2UNIX_GLOB= *.cpp *.h
PLIST_SUB= PORTVERSION=${PORTVERSION}
OPTIONS_DEFINE= PGSQL OPENMP HARU VIGRA
OPTIONS_DEFAULT=PGSQL OPENMP HARU VIGRA
OPTIONS_DEFINE= PGSQL OPENMP VIGRA
OPTIONS_DEFAULT= PGSQL OPENMP 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
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
@ -71,34 +67,52 @@ post-patch:
${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/garden/garden_webservices/Makefile.in \
${WRKSRC}/src/modules/garden/garden_3d_viewer/Makefile.in \
${WRKSRC}/src/modules/io/io_shapes/Makefile.in \
${WRKSRC}/src/modules/io/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
${WRKSRC}/src/modules/statistics/statistics_kriging/Makefile.in
@${REINPLACE_CMD} -e 's|-lcv|-lopencv_core -lopencv_imgproc|g' \
${WRKSRC}/src/modules_images/modules_opencv/opencv/Makefile.in
${WRKSRC}/src/modules/imagery/imagery_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)|' \
@${REINPLACE_CMD} -e 's|\\n"), SAGA_VERSION)| (rev. 2121)\\n"), SAGA_VERSION)|' \
${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
.if ${ARCH} == "i386" || ${ARCH} == "powerpc"
.if ${ARCH} == "powerpc"
@${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \
${WRKSRC}/src/saga_core/saga_api/api_core.h
.endif
post-configure:
@${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \
${WRKSRC}/src/saga_core/saga_gui/Makefile
@${REINPLACE_CMD} -e 's|mv saga_srs.txt saga_prj.srs|mv \
${STAGEDIR}${DATADIR}/saga_srs.txt \
${STAGEDIR}${DATADIR}/saga_prj.srs|g' \
${WRKSRC}/src/saga_core/saga_gui/Makefile
@${REINPLACE_CMD} -e 's|mv saga_dic.txt saga_prj.dic|mv \
${STAGEDIR}${DATADIR}/saga_dic.txt \
${STAGEDIR}${DATADIR}/saga_prj.dic|g' \
${WRKSRC}/src/saga_core/saga_gui/Makefile
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.lng.txt ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.ger.txt ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR}
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_api-${PORTVERSION}.so
@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_saga_api-${PORTVERSION}.so
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_gdi-${PORTVERSION}.so
${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \
${STAGEDIR}${PREFIX}/share/applications/
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/saga/*.so
# library helper files are not needed and cripple some math/qgis extensions
@${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la
.include <bsd.port.post.mk>

4
math/saga/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (saga_2.1.1.tar.gz) = 254fb0fb885ffe73aa2a024f774e05ee0fb1625d89754f70b6020a7d34bbd2fe
SIZE (saga_2.1.1.tar.gz) = 3691046
SHA256 (saga_2.1.2.tar.gz) = 51885446f717191210c4b13f0c35a1c5194c9d696d4f9b8f594bc1014809b2f5
SIZE (saga_2.1.2.tar.gz) = 3910510

4
math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv.h → math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h
View file

@ -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/imagery/imagery_opencv/opencv.h.orig 2014-01-14 11:27:53.000000000 +0100
+++ src/modules/imagery/imagery_opencv/opencv.h 2014-01-14 11:28:44.000000000 +0100
@@ -73,7 +73,8 @@
#include "MLB_Interface.h"

4
math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv_nnet.cpp → math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.cpp
View file

@ -1,5 +1,5 @@
--- 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
--- src/modules/imagery/imagery_opencv/opencv_nnet.cpp.orig 2013-10-24 19:04:27.000000000 +0200
+++ src/modules/imagery/imagery_opencv/opencv_nnet.cpp 2013-10-24 19:06:05.000000000 +0200
@@ -60,8 +60,8 @@
//---------------------------------------------------------

4
math/saga/files/patch-src__modules_images__modules_opencv__opencv__opencv_nnet.h → math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.h
View file

@ -1,5 +1,5 @@
--- 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
--- src/modules/imagery/imagery_opencv/opencv_nnet.h.orig 2013-10-24 19:07:03.000000000 +0200
+++ src/modules/imagery/imagery_opencv/opencv_nnet.h 2013-10-24 19:08:34.000000000 +0200
@@ -64,8 +64,8 @@
//---------------------------------------------------------

20
math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp
View file

@ -1,11 +1,19 @@
--- 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 @@
--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2014-03-28 16:06:55.000000000 +0100
+++ src/saga_core/saga_cmd/saga_cmd.cpp 2014-03-28 16:09:04.000000000 +0100
@@ -65,6 +65,7 @@
#include <wx/app.h>
#include <wx/utils.h>
+#include <clocale>
+#include <locale.h>
+
#include "callback.h"
#include "module_library.h"
@@ -164,7 +165,7 @@
//---------------------------------------------------------
bool Run(int argc, char *argv[])
{
- setlocale(LC_NUMERIC, "C");
+ std::setlocale(LC_NUMERIC, "C");
SG_Set_UI_Callback(CMD_Get_Callback());

68
math/saga/pkg-plist
View file

@ -1,5 +1,31 @@
bin/saga_cmd
bin/saga_gui
include/saga/saga_core/saga_api/api_core.h
include/saga/saga_core/saga_api/compatibility.h
include/saga/saga_core/saga_api/data_manager.h
include/saga/saga_core/saga_api/dataobject.h
include/saga/saga_core/saga_api/geo_tools.h
include/saga/saga_core/saga_api/grid.h
include/saga/saga_core/saga_api/grid_pyramid.h
include/saga/saga_core/saga_api/mat_tools.h
include/saga/saga_core/saga_api/metadata.h
include/saga/saga_core/saga_api/module.h
include/saga/saga_core/saga_api/module_library.h
include/saga/saga_core/saga_api/parameters.h
include/saga/saga_core/saga_api/pointcloud.h
include/saga/saga_core/saga_api/saga_api.h
include/saga/saga_core/saga_api/shapes.h
include/saga/saga_core/saga_api/table.h
include/saga/saga_core/saga_api/table_dbase.h
include/saga/saga_core/saga_api/table_value.h
include/saga/saga_core/saga_api/tin.h
include/saga/saga_core/saga_gdi/3d_view.h
include/saga/saga_core/saga_gdi/3d_view_tools.h
include/saga/saga_core/saga_gdi/saga_gdi.h
include/saga/saga_core/saga_gdi/sgdi_core.h
include/saga/saga_core/saga_gdi/sgdi_diagram.h
include/saga/saga_core/saga_gdi/sgdi_dialog.h
include/saga/saga_core/saga_gdi/sgdi_helper.h
lib/libsaga_api-%%PORTVERSION%%.so
lib/libsaga_api.so
lib/libsaga_gdi-%%PORTVERSION%%.so
@ -11,15 +37,16 @@ lib/libsaga_gdi.so
%%PYTHON_SITELIBDIR%%/saga_api.pyc
%%PYTHON_SITELIBDIR%%/saga_api.pyo
lib/saga/libclimate_tools.so
lib/saga/libcontrib_a_perego.so
lib/saga/libcontrib_perego.so
lib/saga/libdb_odbc.so
%%PGSQL%%lib/saga/libdb_pgsql.so
lib/saga/libdocs_html.so
lib/saga/libdocs_pdf.so
lib/saga/libgarden_3d_viewer.so
lib/saga/libgarden_fractals.so
lib/saga/libgarden_games.so
lib/saga/libgarden_learn_to_program.so
lib/saga/libgarden_webservices.so
lib/saga/libgeostatistics_grid.so
lib/saga/libgeostatistics_kriging.so
lib/saga/libgeostatistics_points.so
lib/saga/libgeostatistics_regression.so
lib/saga/libgrid_analysis.so
lib/saga/libgrid_calculus.so
lib/saga/libgrid_calculus_bsl.so
@ -28,32 +55,28 @@ lib/saga/libgrid_gridding.so
lib/saga/libgrid_spline.so
lib/saga/libgrid_tools.so
lib/saga/libgrid_visualisation.so
lib/saga/libihacres.so
lib/saga/libimagery_classification.so
lib/saga/libimagery_opencv.so
lib/saga/libimagery_rga.so
lib/saga/libimagery_segmentation.so
lib/saga/libimagery_svm.so
lib/saga/libimagery_tools.so
%%VIGRA%%lib/saga/libimagery_vigra.so
lib/saga/libio_esri_e00.so
lib/saga/libio_gdal.so
lib/saga/libio_gps.so
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/libio_virtual.so
lib/saga/libpj_georeference.so
lib/saga/libpj_proj4.so
lib/saga/libpointcloud_tools.so
lib/saga/libpointcloud_viewer.so
lib/saga/librecreations_fractals.so
lib/saga/librecreations_games.so
lib/saga/libshapes_grid.so
lib/saga/libshapes_lines.so
lib/saga/libshapes_points.so
@ -65,6 +88,11 @@ lib/saga/libsim_ecosystems_hugget.so
lib/saga/libsim_erosion.so
lib/saga/libsim_fire_spreading.so
lib/saga/libsim_hydrology.so
lib/saga/libsim_ihacres.so
lib/saga/libstatistics_grid.so
lib/saga/libstatistics_kriging.so
lib/saga/libstatistics_points.so
lib/saga/libstatistics_regression.so
lib/saga/libta_channels.so
lib/saga/libta_compound.so
lib/saga/libta_hydrology.so
@ -72,14 +100,26 @@ lib/saga/libta_lighting.so
lib/saga/libta_morphometry.so
lib/saga/libta_preprocessor.so
lib/saga/libta_profiles.so
lib/saga/libta_slope_stability.so
lib/saga/libtable_calculus.so
lib/saga/libtable_tools.so
lib/saga/libtin_tools.so
lib/saga/libtin_viewer.so
%%VIGRA%%lib/saga/libvigra.so
man/man1/saga_cmd.1.gz
man/man1/saga_gui.1.gz
share/applications/saga.desktop
share/pixmaps/saga.png
%%DATADIR%%/saga.ger.txt
%%DATADIR%%/saga.lng.txt
%%DATADIR%%/saga.png
%%DATADIR%%/saga_prj.dic
%%DATADIR%%/saga_prj.srs
%%DATADIR%%/saga_tip.txt
@dirrmtry %%DATADIR%%
@dirrmtry include/saga/saga_core/saga_api
@dirrmtry include/saga/saga_core/saga_gdi
@dirrmtry include/saga/saga_core
@dirrmtry include/saga
@dirrmtry lib/saga
@dirrmtry %%DATADIR%%
@dirrmtry %%PYTHON_SITELIBDIR%%
@dirrmtry %%PYTHON_LIBDIR%%