diff options
38 files changed, 1163 insertions, 161 deletions
diff --git a/astro/libosmium/Makefile b/astro/libosmium/Makefile index a91f8f73f4d4..d3426b15d712 100644 --- a/astro/libosmium/Makefile +++ b/astro/libosmium/Makefile @@ -4,7 +4,7 @@ PORTNAME= libosmium PORTVERSION= 2.15.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro geography devel MAINTAINER= amdmi3@FreeBSD.org @@ -30,6 +30,7 @@ CMAKE_ARGS= -DBUILD_EXAMPLES:BOOL=OFF # if/when corresponding port appears in the tree, this will need to # be turned into dependency CMAKE_ARGS+= -DINSTALL_GDALCPP:BOOL=ON +CXXFLAGS+= "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" # although it builds tests the library itself is header-only NO_ARCH= yes diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile index df666e67db87..a46e444eb8a6 100644 --- a/astro/merkaartor/Makefile +++ b/astro/merkaartor/Makefile @@ -3,7 +3,7 @@ PORTNAME= merkaartor PORTVERSION= 0.18.2 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= astro MAINTAINER= dev2@heesakkers.info @@ -21,6 +21,8 @@ USE_GITHUB= yes GH_ACCOUNT= openstreetmap USE_LDCONFIG= yes +CFLAGS+= "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" + QMAKE_ARGS= SYSTEM_QUAZIP=1 USE_QT= buildtools_build \ concurrent core gui imageformats network printsupport svg \ diff --git a/cad/sumo/Makefile b/cad/sumo/Makefile index 994a746ab9aa..45992d253992 100644 --- a/cad/sumo/Makefile +++ b/cad/sumo/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sumo -DISTVERSION= 0.31.0 +DISTVERSION= 1.2.0 CATEGORIES= cad MASTER_SITES= http://www.dlr.de/ts/en/Portaldata/16/Resources/projekte/sumo/ DISTFILES= ${PORTNAME}-src-${DISTVERSIONFULL}${EXTRACT_SUFX} @@ -9,9 +9,6 @@ DISTFILES= ${PORTNAME}-src-${DISTVERSIONFULL}${EXTRACT_SUFX} MAINTAINER= enriquefynn@gmail.com COMMENT= Traffic simulation suite for road vehicles, public transportation, etc -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/COPYING - BROKEN_powerpc64= fails to configure: xerces-lib not found in /usr/local/lib LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ @@ -23,25 +20,17 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libtiff.so:graphics/tiff \ libxerces-c.so:textproc/xerces-c3 -USES= jpeg zip -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-proj-gdal=${LOCALBASE} \ - --with-xerces-libraries=${LOCALBASE}/lib \ - --disable-debug +USES= cmake jpeg python shebangfix zip +SHEBANG_FILES= tools/*.py tools/*/*.py \ + tools/*/*/*.py tools/*/*/*/*.py \ + tools/*/*/*/*/*/*.py \ + tools/game/A10KW/build.sh \ + tools/game/rebuild_networks.sh \ + tools/build/rebuild_cscope.sh \ + tools/build/dailyUpdateMakeGCC.sh + +python_OLD_CMD+="/usr/bin/env python" USE_GL= gl glu USE_XORG= x11 xcursor xext xfixes xft xi xrandr xrender -OPTIONS_DEFINE= DOCS # the GUI option is possible (--without-fox-config), but it is broken, and it doesn't seem important to have. https://github.com/DLR-TS/sumo/issues/3655 - -DOCS_DISTFILES= ${PORTNAME}-doc-${DISTVERSION}${EXTRACT_SUFX} -DOCS_USES= shebangfix -DOCS_VARS= SHEBANG_FILES=docs/tutorial/*/*.py - -PORTDOCS= * - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} - @${FIND} ${STAGEDIR}${DOCSDIR} -d -empty -delete - .include <bsd.port.mk> diff --git a/cad/sumo/distinfo b/cad/sumo/distinfo index f625c4b12b89..67197144b48b 100644 --- a/cad/sumo/distinfo +++ b/cad/sumo/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1512078820 -SHA256 (sumo-src-0.31.0.zip) = ae9d71079439d4fb2b97023d8d50003c3b0756b00a836a20abede8c77e5e213c -SIZE (sumo-src-0.31.0.zip) = 18515639 -SHA256 (sumo-doc-0.31.0.zip) = 25c0471461cf39fb38ab19f1db397969add088630470ea8ed6cc7685f88efcd4 -SIZE (sumo-doc-0.31.0.zip) = 72064786 +TIMESTAMP = 1558866258 +SHA256 (sumo-src-1.2.0.zip) = 0e4a592c29b5a186bb459c56cb888859c36ef7c8331b46343ffae665779002dd +SIZE (sumo-src-1.2.0.zip) = 20407395 diff --git a/cad/sumo/pkg-plist b/cad/sumo/pkg-plist index 7f3c7c4856e3..5501a0c54841 100644 --- a/cad/sumo/pkg-plist +++ b/cad/sumo/pkg-plist @@ -1,4 +1,3 @@ -bin/TraCITestClient bin/activitygen bin/dfrouter bin/duarouter @@ -13,3 +12,864 @@ bin/od2trips bin/polyconvert bin/sumo bin/sumo-gui +%%DATADIR%%/data/3D/car-microcargo-citrus.mtl +%%DATADIR%%/data/3D/car-microcargo-citrus.obj +%%DATADIR%%/data/3D/car-minibus-citrus.mtl +%%DATADIR%%/data/3D/car-minibus-citrus.obj +%%DATADIR%%/data/3D/car-normal-citrus.mtl +%%DATADIR%%/data/3D/car-normal-citrus.obj +%%DATADIR%%/data/3D/tl.obj.mtl +%%DATADIR%%/data/3D/tlg.obj +%%DATADIR%%/data/3D/tlr.obj +%%DATADIR%%/data/3D/tlu.obj +%%DATADIR%%/data/3D/tly.obj +%%DATADIR%%/data/emissions/PHEMlight/PC_D_EU4.PHEMLight.veh +%%DATADIR%%/data/emissions/PHEMlight/PC_D_EU4.csv +%%DATADIR%%/data/emissions/PHEMlight/PC_D_EU4_FC.csv +%%DATADIR%%/data/emissions/PHEMlight/PC_G_EU4.PHEMLight.veh +%%DATADIR%%/data/emissions/PHEMlight/PC_G_EU4.csv +%%DATADIR%%/data/emissions/PHEMlight/PC_G_EU4_FC.csv +%%DATADIR%%/data/font/Roboto-Medium.ttf +%%DATADIR%%/data/logo/netedit-application-icon.ico +%%DATADIR%%/data/logo/sumo-128x138.png +%%DATADIR%%/data/logo/sumo-145x50.png +%%DATADIR%%/data/logo/sumo-application-icon.ico +%%DATADIR%%/data/typemap/navteqPolyconvert.typ.xml +%%DATADIR%%/data/typemap/opendriveNetconvert.typ.xml +%%DATADIR%%/data/typemap/opendriveNetconvertBicycle.typ.xml +%%DATADIR%%/data/typemap/opendriveNetconvertPedestrians.typ.xml +%%DATADIR%%/data/typemap/osmNetconvert.typ.xml +%%DATADIR%%/data/typemap/osmNetconvertBicycle.typ.xml +%%DATADIR%%/data/typemap/osmNetconvertBidiRail.typ.xml +%%DATADIR%%/data/typemap/osmNetconvertExtraRail.typ.xml +%%DATADIR%%/data/typemap/osmNetconvertPedestrians.typ.xml +%%DATADIR%%/data/typemap/osmNetconvertShips.typ.xml +%%DATADIR%%/data/typemap/osmNetconvertUrbanDe.typ.xml +%%DATADIR%%/data/typemap/osmPolyconvert.typ.xml +%%DATADIR%%/data/typemap/visumPolyconvert.typ.xml +%%DATADIR%%/data/xsd/activitygenConfiguration.xsd +%%DATADIR%%/data/xsd/additional_file.xsd +%%DATADIR%%/data/xsd/amitran/linkdata.xsd +%%DATADIR%%/data/xsd/amitran/network.xsd +%%DATADIR%%/data/xsd/amitran/od.xsd +%%DATADIR%%/data/xsd/amitran/routes.xsd +%%DATADIR%%/data/xsd/amitran/trajectories.xsd +%%DATADIR%%/data/xsd/baseTypes.xsd +%%DATADIR%%/data/xsd/calibratorstats_file.xsd +%%DATADIR%%/data/xsd/connections_file.xsd +%%DATADIR%%/data/xsd/det_e1_file.xsd +%%DATADIR%%/data/xsd/det_e1meso_file.xsd +%%DATADIR%%/data/xsd/det_e2_file.xsd +%%DATADIR%%/data/xsd/det_e3_file.xsd +%%DATADIR%%/data/xsd/detectors_file.xsd +%%DATADIR%%/data/xsd/dfrouterConfiguration.xsd +%%DATADIR%%/data/xsd/duarouterConfiguration.xsd +%%DATADIR%%/data/xsd/edgediff_file.xsd +%%DATADIR%%/data/xsd/edges_file.xsd +%%DATADIR%%/data/xsd/emission_file.xsd +%%DATADIR%%/data/xsd/fcd_file.xsd +%%DATADIR%%/data/xsd/full_file.xsd +%%DATADIR%%/data/xsd/genericparameter_file.xsd +%%DATADIR%%/data/xsd/instant_e1_file.xsd +%%DATADIR%%/data/xsd/jtrrouterConfiguration.xsd +%%DATADIR%%/data/xsd/marouterConfiguration.xsd +%%DATADIR%%/data/xsd/meandataTypes.xsd +%%DATADIR%%/data/xsd/meandata_file.xsd +%%DATADIR%%/data/xsd/net_file.xsd +%%DATADIR%%/data/xsd/netconvertConfiguration.xsd +%%DATADIR%%/data/xsd/netgenerateConfiguration.xsd +%%DATADIR%%/data/xsd/netstate_file.xsd +%%DATADIR%%/data/xsd/nodes_file.xsd +%%DATADIR%%/data/xsd/od2tripsConfiguration.xsd +%%DATADIR%%/data/xsd/polyconvertConfiguration.xsd +%%DATADIR%%/data/xsd/queue_file.xsd +%%DATADIR%%/data/xsd/routeTypes.xsd +%%DATADIR%%/data/xsd/routes_file.xsd +%%DATADIR%%/data/xsd/state_file.xsd +%%DATADIR%%/data/xsd/stopinfo_file.xsd +%%DATADIR%%/data/xsd/summary_file.xsd +%%DATADIR%%/data/xsd/sumoConfiguration.xsd +%%DATADIR%%/data/xsd/taz_file.xsd +%%DATADIR%%/data/xsd/tllogic_file.xsd +%%DATADIR%%/data/xsd/tlsstates_file.xsd +%%DATADIR%%/data/xsd/tlsswitches_file.xsd +%%DATADIR%%/data/xsd/tripinfo_file.xsd +%%DATADIR%%/data/xsd/turns_file.xsd +%%DATADIR%%/data/xsd/types_file.xsd +%%DATADIR%%/data/xsd/vtypeprobe_file.xsd +%%DATADIR%%/tools/README_Contributing.md +%%DATADIR%%/tools/addStops2Routes.py +%%DATADIR%%/tools/assign/Assignment.py +%%DATADIR%%/tools/assign/assign.py +%%DATADIR%%/tools/assign/cadytsIterate.py +%%DATADIR%%/tools/assign/costFunctionChecker.py +%%DATADIR%%/tools/assign/costMemory.py +%%DATADIR%%/tools/assign/dijkstra.py +%%DATADIR%%/tools/assign/duaIterate.py +%%DATADIR%%/tools/assign/duaIterate_analysis.py +%%DATADIR%%/tools/assign/elements.py +%%DATADIR%%/tools/assign/inputs.py +%%DATADIR%%/tools/assign/matrixDailyToHourly.py +%%DATADIR%%/tools/assign/network.py +%%DATADIR%%/tools/assign/networkStatistics.py +%%DATADIR%%/tools/assign/one-shot.py +%%DATADIR%%/tools/assign/outputs.py +%%DATADIR%%/tools/assign/routeChoices.py +%%DATADIR%%/tools/assign/run.py +%%DATADIR%%/tools/assign/statisticsElements.py +%%DATADIR%%/tools/assign/tables.py +%%DATADIR%%/tools/averageRuns.py +%%DATADIR%%/tools/build/apply_astyle.py +%%DATADIR%%/tools/build/buildHTMLDocs.py +%%DATADIR%%/tools/build/checkAuthors.py +%%DATADIR%%/tools/build/checkImages.py +%%DATADIR%%/tools/build/checkStyle.py +%%DATADIR%%/tools/build/configTemplateToWiki.py +%%DATADIR%%/tools/build/dailyBuildMSVC.py +%%DATADIR%%/tools/build/dailyUpdateMakeGCC.sh +%%DATADIR%%/tools/build/history.py +%%DATADIR%%/tools/build/mirrorWiki.py +%%DATADIR%%/tools/build/rebuild_cscope.sh +%%DATADIR%%/tools/build/setup-libsumo.py +%%DATADIR%%/tools/build/setup-sumolib.py +%%DATADIR%%/tools/build/setup-traci.py +%%DATADIR%%/tools/build/status.py +%%DATADIR%%/tools/build/timing.py +%%DATADIR%%/tools/build/typemap.py +%%DATADIR%%/tools/build/version.py +%%DATADIR%%/tools/build/wix.py +%%DATADIR%%/tools/contributed/sumopy/__init__.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/__init__.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/__init__.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/arrayman.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/classman.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/geometry.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/logger.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/misc.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/processes.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/test_classman_classes.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/test_classman_misc.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/test_classman_save.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/test_classman_tables.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/test_polylines.xml +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_base/xmlman.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/__init__.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/Document_Export_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/Document_Import_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/arrow_cursor_drag_16px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/arrow_cursor_drag_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/arrow_cursor_drag_32px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/circle_empty_16px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/circle_empty_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk-zoom-fit.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2fit_zoom_16px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2fit_zoom_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2fit_zoom_32px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2fit_zoom_48px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2in_zoom_16px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2in_zoom_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2in_zoom_32px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2out_zoom_16px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2out_zoom_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_2out_zoom_32px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_configure_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_fit_zoom_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_in_zoom_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_out_zoom_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_print_16px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_print_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_sort_16px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_sort_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_sort_32px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_sortdown_16px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_sortdown_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/gtk_sortdown_32px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/icon_browse_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/icon_select_components.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/line_16px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/line_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/magnifier-zoom-in.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/move_vertex_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/polygon2_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/polygon_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/images/polyline_24px.png +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/mainframe.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/modulegui.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/objpanel.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/processdialog.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/test_app.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/test_glcanvas.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/test_notebook.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/test_polylines.xml +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/toolbox.py +%%DATADIR%%/tools/contributed/sumopy/agilepy/lib_wx/wxmisc.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/__init__.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/__init__.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/demand-o1-prefstar.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/demand.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/demandbase.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/fig_od_16px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/fig_od_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/fig_od_32px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/fig_public_transport_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/fig_public_transport_32px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/fig_turnflow_16px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/fig_turnflow_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/fig_turnflow_32px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/icon_virtualpopulation.jpg +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/route3_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/trip3_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/images/vehicle_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/origin_to_destination.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/origin_to_destination_wxgui-01.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/origin_to_destination_wxgui.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/publictransportservices.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/publictransportservices_wxgui.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/turnflows.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/turnflows_wxgui.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/vehicles.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/virtualpop.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/virtualpop_results.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/virtualpop_results_mpl.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/virtualpop_wxgui-01.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/virtualpop_wxgui.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/demand/wxgui.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/__init__.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/Files-Osm-icon_16px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/Files-Osm-icon_24.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/Files-Osm-icon_32px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/city-icon_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/fig_facility.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/fig_zone.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/fig_zone_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/fig_zone_green.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/fig_zone_green_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/gtk_configure_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/icon_sumo_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/icon_sumo_32px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/map_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/map_add_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/images/map_del_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/landuse.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/maps.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/landuse/wxgui.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/misc/__init__.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/misc/images/icon_mpl.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/misc/matplottools.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/misc/shapefile.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/misc/shapeformat.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/modules_common.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/__init__.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/Files-Osm-icon_16px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/Files-Osm-icon_24.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/Files-Osm-icon_32px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/fig_connection.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/fig_crossing.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/fig_crossing_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/fig_crossing_32px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/fig_link.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/fig_node.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/gtk_configure_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/icon_graph.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/icon_station.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/icon_sumo_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/icon_sumo_32px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/icon_turnratio.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/images/netedit.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/netconvert.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/netedit_config.xml +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/netgenerate.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/network.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/network_editor.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/networktools.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/osmnx_import.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/publictransportnet.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/publictransportnet_wxgui.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/routing.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/network/wxgui.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/scenario/__init__.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/scenario/images/city-icon_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/scenario/networkxtools.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/scenario/scenario.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/scenario/wxgui.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/__init__.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/images/icon_mpl.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/images/icon_results_24px.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/images/icon_sumo.png +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/result_oglviewer.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/results.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/results_mpl-01-preimportlib.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/results_mpl.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/simulation.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/simulationbase.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/sumo-01-oldsumo.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/sumo-02-oldtraci.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/sumo.py +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/sumo_guiconfig.xml +%%DATADIR%%/tools/contributed/sumopy/coremodules/simulation/wxgui.py +%%DATADIR%%/tools/contributed/sumopy/images/icon_sumopy.png +%%DATADIR%%/tools/contributed/sumopy/plugins/__init__.py +%%DATADIR%%/tools/contributed/sumopy/plugins/common/__init__.py +%%DATADIR%%/tools/contributed/sumopy/plugins/common/wxgui.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/__init__.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/images/icon_gps.png +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/images/icon_gps_large.png +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/images/icon_results_24px.png +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-01-brokesave.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-02-allprint.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-03-birgil-ok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-04-improveok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-05-ok-preinter.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-06-resultchaos.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-07-shortestpathok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-08-save_failed.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-09-result_desaster.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-10-preresults.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-11-shortestproblem.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-12-oldpointassign.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching-13-prespeedchange.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/mapmatching.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/results_mpl-01-mono.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/results_mpl-02-iddesaster.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/results_mpl.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/wxgui-01-brokesave.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/wxgui-02_stillbrokesave.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/wxgui-03-pre-inter.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/wxgui-04-resultchaos.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/wxgui-05-save_failed.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/wxgui-05-shortestpath_ok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/wxgui-06-result-desaster.py +%%DATADIR%%/tools/contributed/sumopy/plugins/mapmatching/wxgui.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/__init__.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/images/icon_compressor.png +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/images/icon_mpl.png +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/images/icon_prt.png +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/images/icon_results_24px.png +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/images/icon_sumo.png +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-01-alloc.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-02-alloc.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-03-forwarding.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-04-fbug.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-05-preperson.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-06-ok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-07-ok-preemptyman.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-08-emptyman.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-09-newsim.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-10.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-11-preboardingopt.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-12-berthoptok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-12-timingopt.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-13-newstartok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-14-progdelay.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-15-ok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-16-ok-preplatoon.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-17-prestoplanechange.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-18-prewaittime.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-19-premicromove.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-20-brokealloc.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-21-oldkd.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-22-badkd.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-23-newversionok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-24-mergemake.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-25-oldmergenode.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-26-stationproblem.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-27-simplemergeok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-28.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-29-plat-debug.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-30-platok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-31-decompok.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-32-decomptargetprob.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt-33-prenewenter.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/prt.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/results_mpl.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/wxgui-01.py +%%DATADIR%%/tools/contributed/sumopy/plugins/prt/wxgui.py +%%DATADIR%%/tools/contributed/sumopy/sumopy_gui.py +%%DATADIR%%/tools/contributed/sumopy/sumopy_userman_v01_contrib.pdf +%%DATADIR%%/tools/contributed/sumopy/typemap/osmBidiRailNetconvert.typ.xml +%%DATADIR%%/tools/contributed/sumopy/typemap/osmNetconvert.typ.xml +%%DATADIR%%/tools/contributed/sumopy/typemap/osmNetconvertBicycle.typ.xml +%%DATADIR%%/tools/contributed/sumopy/typemap/osmNetconvertPedestrians.typ.xml +%%DATADIR%%/tools/contributed/sumopy/typemap/osmNetconvertShips.typ.xml +%%DATADIR%%/tools/contributed/sumopy/typemap/osmNetconvertUrbanDe.typ.xml +%%DATADIR%%/tools/contributed/sumopy/typemap/osmPolyconvert.typ.xml +%%DATADIR%%/tools/createVehTypeDistribution.py +%%DATADIR%%/tools/detector/aggregateFlows.py +%%DATADIR%%/tools/detector/detector.py +%%DATADIR%%/tools/detector/filterFlows.py +%%DATADIR%%/tools/detector/flowFromEdgeData.py +%%DATADIR%%/tools/detector/flowFromRoutes.py +%%DATADIR%%/tools/detector/flowrouter.py +%%DATADIR%%/tools/detector/plotFlows.py +%%DATADIR%%/tools/detector/routeUsage.py +%%DATADIR%%/tools/detector/validate.py +%%DATADIR%%/tools/district/countConnectionsInDistricts.py +%%DATADIR%%/tools/district/districtMapper.py +%%DATADIR%%/tools/district/filterDistricts.py +%%DATADIR%%/tools/district/gridDistricts.py +%%DATADIR%%/tools/districts2poly.py +%%DATADIR%%/tools/edgesInDistricts.py +%%DATADIR%%/tools/emissions/findMinDiffModel.py +%%DATADIR%%/tools/emissions/nefz.py +%%DATADIR%%/tools/extractTest.py +%%DATADIR%%/tools/game/A10KW.sumocfg +%%DATADIR%%/tools/game/A10KW/build.sh +%%DATADIR%%/tools/game/A10KW/extra.rou.xml +%%DATADIR%%/tools/game/A10KW/osm.net.xml +%%DATADIR%%/tools/game/A10KW/osm.passenger.rou.xml +%%DATADIR%%/tools/game/A10KW/osm.passenger_mw.rou.xml +%%DATADIR%%/tools/game/A10KW/osm.passenger_mwb.rou.xml +%%DATADIR%%/tools/game/A10KW/osm.poly.xml +%%DATADIR%%/tools/game/A10KW/osm.truck.rou.xml +%%DATADIR%%/tools/game/A10KW/osm.truck_mw.rou.xml +%%DATADIR%%/tools/game/A10KW/osm.truck_mwb.rou.xml +%%DATADIR%%/tools/game/A10KW/osm.view.xml +%%DATADIR%%/tools/game/DRT/randomRides.py +%%DATADIR%%/tools/game/bs3Dosm.sumocfg +%%DATADIR%%/tools/game/bs3d.sumocfg +%%DATADIR%%/tools/game/bs3d/bs.net.xml +%%DATADIR%%/tools/game/bs3d/bs.netccfg +%%DATADIR%%/tools/game/bs3d/bs3.3ds +%%DATADIR%%/tools/game/bs3d/bs3d.rou.xml +%%DATADIR%%/tools/game/bs3d/bs3d.settings.xml +%%DATADIR%%/tools/game/bs3d/bsplain.con.xml +%%DATADIR%%/tools/game/bs3d/bsplain.edg.xml +%%DATADIR%%/tools/game/bs3d/bsplain.nod.xml +%%DATADIR%%/tools/game/bs3d/bsplain.tll.xml +%%DATADIR%%/tools/game/bs3d/view_B.xml +%%DATADIR%%/tools/game/corridor.sumocfg +%%DATADIR%%/tools/game/corridor/corridor.net.xml +%%DATADIR%%/tools/game/corridor/corridor.rou.xml +%%DATADIR%%/tools/game/corridor/corridor.settings.xml +%%DATADIR%%/tools/game/corridor/dlr.gif +%%DATADIR%%/tools/game/cross.sumocfg +%%DATADIR%%/tools/game/cross/cross.con.xml +%%DATADIR%%/tools/game/cross/cross.edg.xml +%%DATADIR%%/tools/game/cross/cross.gif +%%DATADIR%%/tools/game/cross/cross.net.xml +%%DATADIR%%/tools/game/cross/cross.netccfg +%%DATADIR%%/tools/game/cross/cross.nod.xml +%%DATADIR%%/tools/game/cross/cross.rou.xml +%%DATADIR%%/tools/game/cross/cross.settings.xml +%%DATADIR%%/tools/game/cross/cross.tls.add.xml +%%DATADIR%%/tools/game/cross/cross.tls_opt.add.xml +%%DATADIR%%/tools/game/cross/cross3d.settings.xml +%%DATADIR%%/tools/game/cross3d.sumocfg.disabled +%%DATADIR%%/tools/game/cross_demo.sumocfg +%%DATADIR%%/tools/game/cross_opt.sumocfg.disabled +%%DATADIR%%/tools/game/dlr.gif +%%DATADIR%%/tools/game/grid6.sumocfg +%%DATADIR%%/tools/game/grid6/dlr.gif +%%DATADIR%%/tools/game/grid6/grid6.con.xml +%%DATADIR%%/tools/game/grid6/grid6.edg.xml +%%DATADIR%%/tools/game/grid6/grid6.net.xml +%%DATADIR%%/tools/game/grid6/grid6.netgcfg +%%DATADIR%%/tools/game/grid6/grid6.nod.xml +%%DATADIR%%/tools/game/grid6/grid6.rou.xml +%%DATADIR%%/tools/game/grid6/grid6.tll.xml +%%DATADIR%%/tools/game/grid6/settings.xml +%%DATADIR%%/tools/game/highway/highway.net.xml +%%DATADIR%%/tools/game/highway/highway.rou.xml +%%DATADIR%%/tools/game/highway/highway_bremen.gif +%%DATADIR%%/tools/game/highway/settings.xml +%%DATADIR%%/tools/game/input_additional.add.xml +%%DATADIR%%/tools/game/kuehne.sumocfg.disabled +%%DATADIR%%/tools/game/kuehne/dlr.gif +%%DATADIR%%/tools/game/kuehne/kuehne.net.xml +%%DATADIR%%/tools/game/kuehne/kuehne.netgcfg +%%DATADIR%%/tools/game/kuehne/kuehne.rou.xml +%%DATADIR%%/tools/game/kuehne/settings.xml +%%DATADIR%%/tools/game/logo.gif +%%DATADIR%%/tools/game/patchTrafficLights.py +%%DATADIR%%/tools/game/qr_sumo.dlr.de.gif +%%DATADIR%%/tools/game/racing.py +%%DATADIR%%/tools/game/racing/racing.rou.xml +%%DATADIR%%/tools/game/racing/racing.sumocfg +%%DATADIR%%/tools/game/racing/racing.typ.xml +%%DATADIR%%/tools/game/racing/rerouter.add.xml +%%DATADIR%%/tools/game/racing/spreewaldring.edg.xml +%%DATADIR%%/tools/game/racing/spreewaldring.net.xml +%%DATADIR%%/tools/game/racing/spreewaldring.netccfg +%%DATADIR%%/tools/game/racing/spreewaldring.nod.xml +%%DATADIR%%/tools/game/racing/spreewaldring.osm +%%DATADIR%%/tools/game/racing/view.xml +%%DATADIR%%/tools/game/ramp.sumocfg +%%DATADIR%%/tools/game/ramp/ramp.net.xml +%%DATADIR%%/tools/game/ramp/ramp.rou.xml +%%DATADIR%%/tools/game/ramp/ramp_settings.xml +%%DATADIR%%/tools/game/rebuild_networks.sh +%%DATADIR%%/tools/game/runner.py +%%DATADIR%%/tools/game/setup.py +%%DATADIR%%/tools/game/sounds/car_horn1.wav +%%DATADIR%%/tools/game/sounds/car_horn2.wav +%%DATADIR%%/tools/game/sounds/car_horn3.wav +%%DATADIR%%/tools/game/sounds/license.txt +%%DATADIR%%/tools/game/square.sumocfg +%%DATADIR%%/tools/game/square/dlr.gif +%%DATADIR%%/tools/game/square/settings.xml +%%DATADIR%%/tools/game/square/square.net.xml +%%DATADIR%%/tools/game/square/square.netgcfg +%%DATADIR%%/tools/game/square/square.rou.xml +%%DATADIR%%/tools/generateBidiDistricts.py +%%DATADIR%%/tools/generateParkingAreaRerouters.py +%%DATADIR%%/tools/generateParkingLots.py +%%DATADIR%%/tools/generateStationEdges.py +%%DATADIR%%/tools/import/opendrive/signal_POIs_from_xodr.py +%%DATADIR%%/tools/import/osm/osmPopulationExtractor.py +%%DATADIR%%/tools/import/transportationTestProblems.py +%%DATADIR%%/tools/import/vissim/convert_detectors2SUMO.py +%%DATADIR%%/tools/import/vissim/convert_vissimXML_flows_statRoutes.py +%%DATADIR%%/tools/import/vissim/tls_vissimXML2SUMOnet_update.py +%%DATADIR%%/tools/import/vissim/vissim_parseBusStops.py +%%DATADIR%%/tools/import/vissim/vissim_parseRoutes.py +%%DATADIR%%/tools/import/visum/visum_convertEdgeTypes.py +%%DATADIR%%/tools/import/visum/visum_convertRoutes.py +%%DATADIR%%/tools/import/visum/visum_convertTurnPercentages.py +%%DATADIR%%/tools/import/visum/visum_parseZaehlstelle.py +%%DATADIR%%/tools/launcher.py +%%DATADIR%%/tools/lib/play.png +%%DATADIR%%/tools/lib/rmsd.py +%%DATADIR%%/tools/lib/stop.png +%%DATADIR%%/tools/lib/testUtil.py +%%DATADIR%%/tools/libsumo/__init__.py +%%DATADIR%%/tools/net/0103to0110.py +%%DATADIR%%/tools/net/0123to0130.py +%%DATADIR%%/tools/net/OrderedMultiSet.py +%%DATADIR%%/tools/net/batch0103to0110.py +%%DATADIR%%/tools/net/createRoundaboutConnections.py +%%DATADIR%%/tools/net/netcheck.py +%%DATADIR%%/tools/net/netdiff.py +%%DATADIR%%/tools/net/netduplicate.py +%%DATADIR%%/tools/net/netextract.py +%%DATADIR%%/tools/net/netextract_subPart.py +%%DATADIR%%/tools/net/netmatch.py +%%DATADIR%%/tools/net/netshiftadaptor.py +%%DATADIR%%/tools/net/netstats.py +%%DATADIR%%/tools/net/network_statistics.py +%%DATADIR%%/tools/net/odConnectionsCheck.py +%%DATADIR%%/tools/net/patchNetFiles.py +%%DATADIR%%/tools/net/prepareVISUM.py +%%DATADIR%%/tools/net/reprojectpolys.py +%%DATADIR%%/tools/net/visum_mapDistricts.py +%%DATADIR%%/tools/net/xmlconnections_mapEdges.py +%%DATADIR%%/tools/net/xmledges_applyOffset.py +%%DATADIR%%/tools/net/xmlnodes_applyOffset.py +%%DATADIR%%/tools/osmBuild.py +%%DATADIR%%/tools/osmGet.py +%%DATADIR%%/tools/osmWebWizard.py +%%DATADIR%%/tools/output/accelerations.py +%%DATADIR%%/tools/output/analyze_teleports.py +%%DATADIR%%/tools/output/attributeStats.py +%%DATADIR%%/tools/output/countLaneChanges.py +%%DATADIR%%/tools/output/edgeDataDiff.py +%%DATADIR%%/tools/output/generateITetrisIntersectionMetrics.py +%%DATADIR%%/tools/output/generateITetrisNetworkMetrics.py +%%DATADIR%%/tools/output/generateMeanDataDefinitions.py +%%DATADIR%%/tools/output/generateTLSE1Detectors.py +%%DATADIR%%/tools/output/generateTLSE2Detectors.py +%%DATADIR%%/tools/output/generateTLSE3Detectors.py +%%DATADIR%%/tools/output/netdumpdiff.py +%%DATADIR%%/tools/output/netdumpmean.py +%%DATADIR%%/tools/output/timingStats.py +%%DATADIR%%/tools/output/tripinfoByTAZ.py +%%DATADIR%%/tools/output/tripinfoDiff.py +%%DATADIR%%/tools/output/vehLanes.py +%%DATADIR%%/tools/output/vehroute2amitranOD.py +%%DATADIR%%/tools/output/vehrouteDiff.py +%%DATADIR%%/tools/output/walkFactor.py +%%DATADIR%%/tools/pedestrianFlow.py +%%DATADIR%%/tools/personGenerator.py +%%DATADIR%%/tools/plot_trajectories.py +%%DATADIR%%/tools/ptlines2flows.py +%%DATADIR%%/tools/randomTrips.py +%%DATADIR%%/tools/route/cutRoutes.py +%%DATADIR%%/tools/route/cutTrips.py +%%DATADIR%%/tools/route/implausibleRoutes.py +%%DATADIR%%/tools/route/route2alts.py +%%DATADIR%%/tools/route/route2poly.py +%%DATADIR%%/tools/route/routeStats.py +%%DATADIR%%/tools/route/route_1htoDay.py +%%DATADIR%%/tools/route/route_departOffset.py +%%DATADIR%%/tools/route/routecheck.py +%%DATADIR%%/tools/route/routecompare.py +%%DATADIR%%/tools/route/routes_Join.py +%%DATADIR%%/tools/route/sort_routes.py +%%DATADIR%%/tools/route/tracegenerator.py +%%DATADIR%%/tools/route/tracemapper.py +%%DATADIR%%/tools/route/vehicle2flow.py +%%DATADIR%%/tools/route2sel.py +%%DATADIR%%/tools/route2trips.py +%%DATADIR%%/tools/shapes/CSV2polyconvertXML.py +%%DATADIR%%/tools/shapes/circlePolygon.py +%%DATADIR%%/tools/shapes/debug2shapes.py +%%DATADIR%%/tools/shapes/poi_alongRoads.py +%%DATADIR%%/tools/shapes/poi_atTLS.py +%%DATADIR%%/tools/shapes/poi_at_stops.py +%%DATADIR%%/tools/shapes/pois2inductionLoops.py +%%DATADIR%%/tools/showDepartsAndArrivalsPerEdge.py +%%DATADIR%%/tools/simpla/__init__.py +%%DATADIR%%/tools/simpla/_config.py +%%DATADIR%%/tools/simpla/_platoon.py +%%DATADIR%%/tools/simpla/_platoonmanager.py +%%DATADIR%%/tools/simpla/_platoonmode.py +%%DATADIR%%/tools/simpla/_pvehicle.py +%%DATADIR%%/tools/simpla/_reporting.py +%%DATADIR%%/tools/simpla/_utils.py +%%DATADIR%%/tools/simpla/template.cfg.xml +%%DATADIR%%/tools/sumolib/__init__.py +%%DATADIR%%/tools/sumolib/color.py +%%DATADIR%%/tools/sumolib/files/__init__.py +%%DATADIR%%/tools/sumolib/files/additional.py +%%DATADIR%%/tools/sumolib/files/selection.py +%%DATADIR%%/tools/sumolib/geomhelper.py +%%DATADIR%%/tools/sumolib/miscutils.py +%%DATADIR%%/tools/sumolib/net/__init__.py +%%DATADIR%%/tools/sumolib/net/connection.py +%%DATADIR%%/tools/sumolib/net/edge.py +%%DATADIR%%/tools/sumolib/net/generator/__init__.py +%%DATADIR%%/tools/sumolib/net/generator/corridor.py +%%DATADIR%%/tools/sumolib/net/generator/cross.py +%%DATADIR%%/tools/sumolib/net/generator/demand.py +%%DATADIR%%/tools/sumolib/net/generator/grid.py +%%DATADIR%%/tools/sumolib/net/generator/network.py +%%DATADIR%%/tools/sumolib/net/generator/straight.py +%%DATADIR%%/tools/sumolib/net/lane.py +%%DATADIR%%/tools/sumolib/net/node.py +%%DATADIR%%/tools/sumolib/net/roundabout.py +%%DATADIR%%/tools/sumolib/options.py +%%DATADIR%%/tools/sumolib/output/__init__.py +%%DATADIR%%/tools/sumolib/output/convert/__init__.py +%%DATADIR%%/tools/sumolib/output/convert/fcdfilter.py +%%DATADIR%%/tools/sumolib/output/convert/gpsdat.py +%%DATADIR%%/tools/sumolib/output/convert/gpx.py +%%DATADIR%%/tools/sumolib/output/convert/ns2.py +%%DATADIR%%/tools/sumolib/output/convert/omnet.py +%%DATADIR%%/tools/sumolib/output/convert/phem.py +%%DATADIR%%/tools/sumolib/output/convert/poi.py +%%DATADIR%%/tools/sumolib/output/convert/shawn.py +%%DATADIR%%/tools/sumolib/output/dump.py +%%DATADIR%%/tools/sumolib/output/inductionloop.py +%%DATADIR%%/tools/sumolib/route.py +%%DATADIR%%/tools/sumolib/scenario/__init__.py +%%DATADIR%%/tools/sumolib/scenario/checkFlows.py +%%DATADIR%%/tools/sumolib/scenario/pop2.py +%%DATADIR%%/tools/sumolib/scenario/runsdb.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicCorridor/net.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicCorridor/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicCross/net.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicCross/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicCrossL/net.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicCrossL/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicNet/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicRiLSACorridor3/network.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicRiLSACorridor3/routes_BasicRiLSACorridor3(1-31).rou.alt.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicRiLSACorridor3/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicRiLSANet2x2/network.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/BasicRiLSANet2x2/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/genroutes.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/makeRoutes.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/measures.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/net.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/rilsa1.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/rilsa1_tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/routes.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/run.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example1/vtypes.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/genroutes.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/makeRoutes.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/net.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/rilsa2.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/rilsa2_tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/routes.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/run.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/tls_add.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example2/vtypes.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/genroutes.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/makeRoutes.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/net.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/rilsa3.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/rilsa3_tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/routes.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/run.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/tls_add.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example3/vtypes.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/genroutes.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/makeRoutes.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/net.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/rilsa4.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/rilsa4_tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/routes.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/run.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/tls_add.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/RiLSA_example4/vtypes.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/acosta.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/acosta_bus_stops.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/acosta_buslanes.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/acosta_busses.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/acosta_detectors.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/acosta_tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/acosta_vtypes.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/e1_output.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/meta.txt +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/run.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/acosta/sumo_log.txt +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/joined.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/joined_bus_stops.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/joined_buslanes.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/joined_busses.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/joined_detectors.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/joined_tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/joined_vtypes.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/meta.txt +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/run.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/joined/sumo_log.txt +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/meta.txt +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.phase.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.phase.tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.platoon.detectors.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.platoon.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.platoon.tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.platoon.tripinfo.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.request.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.rou.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.swarm.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio.swarm.tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio_bus_stops.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio_buslanes.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio_busses.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio_detectors.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio_tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio_tls_2.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/pasubio_vtypes.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/run.sumo.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RealWorld/pasubio/sumo_log.txt +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1/!rilsaTLSdef.txt +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1/build.netc.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1/input_connections.con.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1/input_edges.edg.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1/input_nodes.nod.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1/rilsa1.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1BothTLS/!rilsaTLSdef.txt +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1BothTLS/build.netc.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1BothTLS/input_connections.con.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1BothTLS/input_edges.edg.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1BothTLS/input_nodes.nod.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1BothTLS/rilsa1both.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1BothTLS/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1OutTLS/!rilsaTLSdef.txt +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1OutTLS/build.netc.cfg +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1OutTLS/input_connections.con.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1OutTLS/input_edges.edg.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1OutTLS/input_nodes.nod.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1OutTLS/rilsa1.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/RiLSA1OutTLS/tls.add.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/__init__.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/basic_corridor.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/basic_cross.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/basic_crossl.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/basic_net.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/basic_rilsacorridor3.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/basic_rilsanet.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/basic_rilsanet2x2.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/net.net.xml +%%DATADIR%%/tools/sumolib/scenario/scenarios/real_world.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/rilsa1.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/rilsa1_both_tls.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/rilsa1_both_tls24.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/rilsa1_out_tls.py +%%DATADIR%%/tools/sumolib/scenario/scenarios/rilsa1_out_tls24.py +%%DATADIR%%/tools/sumolib/scenario/vtypes/vtypes2010.add.xml +%%DATADIR%%/tools/sumolib/scenario/vtypes/vtypes2014.add.xml +%%DATADIR%%/tools/sumolib/scenario/vtypes/vtypes2020.add.xml +%%DATADIR%%/tools/sumolib/scenario/vtypes/vtypes2030.add.xml +%%DATADIR%%/tools/sumolib/scenario/vtypes/vtypes2040.add.xml +%%DATADIR%%/tools/sumolib/sensors/__init__.py +%%DATADIR%%/tools/sumolib/sensors/inductive_loop.py +%%DATADIR%%/tools/sumolib/shapes/__init__.py +%%DATADIR%%/tools/sumolib/shapes/poi.py +%%DATADIR%%/tools/sumolib/shapes/polygon.py +%%DATADIR%%/tools/sumolib/visualization/__init__.py +%%DATADIR%%/tools/sumolib/visualization/helpers.py +%%DATADIR%%/tools/sumolib/xml.py +%%DATADIR%%/tools/tls/createTlsCsv.py +%%DATADIR%%/tools/tls/tls_check.py +%%DATADIR%%/tools/tls/tls_csv2SUMO.py +%%DATADIR%%/tools/tls/tls_csvSignalGroups.py +%%DATADIR%%/tools/tlsCoordinator.py +%%DATADIR%%/tools/tlsCycleAdaptation.py +%%DATADIR%%/tools/traceExporter.py +%%DATADIR%%/tools/traci/__init__.py +%%DATADIR%%/tools/traci/_edge.py +%%DATADIR%%/tools/traci/_gui.py +%%DATADIR%%/tools/traci/_inductionloop.py +%%DATADIR%%/tools/traci/_junction.py +%%DATADIR%%/tools/traci/_lane.py +%%DATADIR%%/tools/traci/_lanearea.py +%%DATADIR%%/tools/traci/_multientryexit.py +%%DATADIR%%/tools/traci/_person.py +%%DATADIR%%/tools/traci/_poi.py +%%DATADIR%%/tools/traci/_polygon.py +%%DATADIR%%/tools/traci/_route.py +%%DATADIR%%/tools/traci/_simulation.py +%%DATADIR%%/tools/traci/_trafficlight.py +%%DATADIR%%/tools/traci/_vehicle.py +%%DATADIR%%/tools/traci/_vehicletype.py +%%DATADIR%%/tools/traci/connection.py +%%DATADIR%%/tools/traci/constants.py +%%DATADIR%%/tools/traci/domain.py +%%DATADIR%%/tools/traci/exceptions.py +%%DATADIR%%/tools/traci/rebuildConstants.py +%%DATADIR%%/tools/traci/storage.py +%%DATADIR%%/tools/traci/traciToHex.py +%%DATADIR%%/tools/trigger/csv2vss.py +%%DATADIR%%/tools/turn-defs/collectinghandler.py +%%DATADIR%%/tools/turn-defs/connections.py +%%DATADIR%%/tools/turn-defs/generateTurnDefs.py +%%DATADIR%%/tools/turn-defs/turndefinitions.py +%%DATADIR%%/tools/visualization/mpl_dump_onNet.py +%%DATADIR%%/tools/visualization/mpl_dump_timeline.py +%%DATADIR%%/tools/visualization/mpl_dump_twoAgainst.py +%%DATADIR%%/tools/visualization/mpl_tripinfos_twoAgainst.py +%%DATADIR%%/tools/visualization/plotXMLAttr.py +%%DATADIR%%/tools/visualization/plot_csv_bars.py +%%DATADIR%%/tools/visualization/plot_csv_pie.py +%%DATADIR%%/tools/visualization/plot_csv_timeline.py +%%DATADIR%%/tools/visualization/plot_net_dump.py +%%DATADIR%%/tools/visualization/plot_net_selection.py +%%DATADIR%%/tools/visualization/plot_net_speeds.py +%%DATADIR%%/tools/visualization/plot_net_trafficLights.py +%%DATADIR%%/tools/visualization/plot_summary.py +%%DATADIR%%/tools/visualization/plot_tripinfo_distributions.py +%%DATADIR%%/tools/webWizard/SimpleWebSocketServer.py +%%DATADIR%%/tools/webWizard/__init__.py +%%DATADIR%%/tools/webWizard/images/bicycle.png +%%DATADIR%%/tools/webWizard/images/bus.png +%%DATADIR%%/tools/webWizard/images/favicon.ico +%%DATADIR%%/tools/webWizard/images/generate.png +%%DATADIR%%/tools/webWizard/images/map.png +%%DATADIR%%/tools/webWizard/images/motorcycle.png +%%DATADIR%%/tools/webWizard/images/passenger.png +%%DATADIR%%/tools/webWizard/images/pedestrian.png +%%DATADIR%%/tools/webWizard/images/rail.png +%%DATADIR%%/tools/webWizard/images/rail_urban.png +%%DATADIR%%/tools/webWizard/images/ship.png +%%DATADIR%%/tools/webWizard/images/tram.png +%%DATADIR%%/tools/webWizard/images/truck.png +%%DATADIR%%/tools/webWizard/index.html +%%DATADIR%%/tools/webWizard/lib.js +%%DATADIR%%/tools/webWizard/script.js +%%DATADIR%%/tools/webWizard/style.css +%%DATADIR%%/tools/xml/addSchema.py +%%DATADIR%%/tools/xml/binary2plain.py +%%DATADIR%%/tools/xml/csv2xml.py +%%DATADIR%%/tools/xml/protobuf2xml.py +%%DATADIR%%/tools/xml/rebuildSchemata.py +%%DATADIR%%/tools/xml/schemaCheck.py +%%DATADIR%%/tools/xml/xml2csv.py +%%DATADIR%%/tools/xml/xml2protobuf.py +%%DATADIR%%/tools/xml/xsd.py +@dir %%DATADIR%%/tools/contributed/sumolib4matlab +@dir %%DATADIR%%/tools/contributed/traci4matlab diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index ea8fd355c226..ab61d3f28300 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -3,7 +3,7 @@ PORTNAME= osm2pgsql PORTVERSION= 0.96.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -21,6 +21,8 @@ GH_ACCOUNT= openstreetmap USES= cmake compiler:c++11-lang lua:53 pgsql +CXXFLAGS+= "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" + PLIST_FILES= bin/osm2pgsql \ man/man1/osm2pgsql.1.gz diff --git a/databases/spatialite/Makefile b/databases/spatialite/Makefile index fe74f785ba94..0838857d0c5c 100644 --- a/databases/spatialite/Makefile +++ b/databases/spatialite/Makefile @@ -3,6 +3,7 @@ PORTNAME= spatialite PORTVERSION= 4.3.0 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/libspatialite-sources/ DISTNAME= lib${PORTNAME}-${PORTVERSION} @@ -23,7 +24,9 @@ USE_GNOME= libxml2 CFLAGS+= -I${WRKSRC}/src/headers -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -CONFIGURE_ARGS+= --enable-gcp=yes --enable-libxml2=yes CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS+= --enable-gcp=yes --enable-libxml2=yes \ + CFLAGS="${CFLAGS} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \ + LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes OPTIONS_DEFINE=LWGEOM diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile index 9c01883edd48..77109e166e97 100644 --- a/databases/spatialite_gui/Makefile +++ b/databases/spatialite_gui/Makefile @@ -3,7 +3,7 @@ PORTNAME= spatialite_gui PORTVERSION= 1.7.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/ @@ -23,7 +23,7 @@ USE_WX= 2.8 GNU_CONFIGURE= yes USE_GNOME= libxml2 -CPPFLAGS+= `${WX_CONFIG} --cppflags` +CPPFLAGS+= `${WX_CONFIG} --cppflags` "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" LDFLAGS+= ${ICONV_LIB} `${WX_CONFIG} --libs` -lsqlite3 CONFIGURE_ARGS= CFLAGS="${CFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/databases/spatialite_gui/distinfo b/databases/spatialite_gui/distinfo index b9a1f0c5fa5f..0bea43d4b9b6 100644 --- a/databases/spatialite_gui/distinfo +++ b/databases/spatialite_gui/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1561512545 SHA256 (spatialite_gui-1.7.1.tar.gz) = cb9cb1ede7f83a5fc5f52c83437e556ab9cb54d6ace3c545d31b317fd36f05e4 SIZE (spatialite_gui-1.7.1.tar.gz) = 1090178 diff --git a/devel/libght/Makefile b/devel/libght/Makefile index c5cfce60ca24..80ce8df2e0b7 100644 --- a/devel/libght/Makefile +++ b/devel/libght/Makefile @@ -3,6 +3,7 @@ PORTNAME= libght PORTVERSION= 0.1.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel geography @@ -19,6 +20,7 @@ LIB_DEPENDS= libproj.so:graphics/proj \ USES= cmake USE_GNOME= libxml2 USE_LDCONFIG= yes +CFLAGS+= "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" USE_GITHUB= yes GH_ACCOUNT= pramsey diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile index 37615ece9534..41f872caa0cf 100644 --- a/graphics/R-cran-rgdal/Makefile +++ b/graphics/R-cran-rgdal/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rgdal -DISTVERSION= 1.3-6 -PORTREVISION= 1 +DISTVERSION= 1.4-4 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/graphics/R-cran-rgdal/distinfo b/graphics/R-cran-rgdal/distinfo index 47390c7da51c..9d757ed62f27 100644 --- a/graphics/R-cran-rgdal/distinfo +++ b/graphics/R-cran-rgdal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539770206 -SHA256 (rgdal_1.3-6.tar.gz) = b543b8ca8c2a241f8baf1d6227e0c77df2634a0e856c2042f21565f9d812d81f -SIZE (rgdal_1.3-6.tar.gz) = 1666975 +TIMESTAMP = 1561512866 +SHA256 (rgdal_1.4-4.tar.gz) = 2532e76e0af27d145f799d70006a5dbecb2d3be698e3d0bbf580f4c41a34c5d7 +SIZE (rgdal_1.4-4.tar.gz) = 1687518 diff --git a/graphics/libgeotiff/Makefile b/graphics/libgeotiff/Makefile index 1caf05031f68..a8f523ca7a5d 100644 --- a/graphics/libgeotiff/Makefile +++ b/graphics/libgeotiff/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libgeotiff -PORTVERSION= 1.4.3 +PORTVERSION= 1.5.1 CATEGORIES= graphics MASTER_SITES= https://download.osgeo.org/geotiff/libgeotiff/ \ LOCAL/sunpoet diff --git a/graphics/libgeotiff/distinfo b/graphics/libgeotiff/distinfo index 8f65a1c0dc99..34dd51b542d7 100644 --- a/graphics/libgeotiff/distinfo +++ b/graphics/libgeotiff/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546194150 -SHA256 (libgeotiff-1.4.3.tar.gz) = b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265 -SIZE (libgeotiff-1.4.3.tar.gz) = 1864829 +TIMESTAMP = 1561510414 +SHA256 (libgeotiff-1.5.1.tar.gz) = f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c +SIZE (libgeotiff-1.5.1.tar.gz) = 528083 diff --git a/graphics/libgeotiff/pkg-plist b/graphics/libgeotiff/pkg-plist index d7ee92ce0d73..6946c3963bb2 100644 --- a/graphics/libgeotiff/pkg-plist +++ b/graphics/libgeotiff/pkg-plist @@ -12,7 +12,6 @@ include/epsg_units.inc include/epsg_vertcs.inc include/geo_config.h include/geo_ctrans.inc -include/geo_incode_defs.h include/geo_keyp.h include/geo_normalize.h include/geo_simpletags.h @@ -26,43 +25,8 @@ include/geovalues.h include/xtiffio.h lib/libgeotiff.a lib/libgeotiff.so -lib/libgeotiff.so.2 -lib/libgeotiff.so.2.2.0 +lib/libgeotiff.so.5 +lib/libgeotiff.so.5.0.0 man/man1/applygeo.1.gz man/man1/geotifcp.1.gz man/man1/listgeo.1.gz -%%DATADIR%%/epsg_csv/alias.csv -%%DATADIR%%/epsg_csv/area.csv -%%DATADIR%%/epsg_csv/change.csv -%%DATADIR%%/epsg_csv/compdcs.csv -%%DATADIR%%/epsg_csv/coordinate_axis.csv -%%DATADIR%%/epsg_csv/coordinate_axis_name.csv -%%DATADIR%%/epsg_csv/coordinate_operation.csv -%%DATADIR%%/epsg_csv/coordinate_operation_method.csv -%%DATADIR%%/epsg_csv/coordinate_operation_parameter.csv -%%DATADIR%%/epsg_csv/coordinate_operation_parameter_value.csv -%%DATADIR%%/epsg_csv/coordinate_operation_path.csv -%%DATADIR%%/epsg_csv/coordinate_reference_system.csv -%%DATADIR%%/epsg_csv/coordinate_system.csv -%%DATADIR%%/epsg_csv/csv2c.py -%%DATADIR%%/epsg_csv/csv_tools.py -%%DATADIR%%/epsg_csv/datum.csv -%%DATADIR%%/epsg_csv/datum_shift.csv -%%DATADIR%%/epsg_csv/datum_shift_pref.csv -%%DATADIR%%/epsg_csv/deprecation.csv -%%DATADIR%%/epsg_csv/ellipsoid.csv -%%DATADIR%%/epsg_csv/esri_datum_override.csv -%%DATADIR%%/epsg_csv/gcs.csv -%%DATADIR%%/epsg_csv/gcs.override.csv -%%DATADIR%%/epsg_csv/geoccs.csv -%%DATADIR%%/epsg_csv/naming_system.csv -%%DATADIR%%/epsg_csv/pcs.csv -%%DATADIR%%/epsg_csv/pcs.override.csv -%%DATADIR%%/epsg_csv/prime_meridian.csv -%%DATADIR%%/epsg_csv/projop_wparm.csv -%%DATADIR%%/epsg_csv/stateplane.csv -%%DATADIR%%/epsg_csv/supersession.csv -%%DATADIR%%/epsg_csv/unit_of_measure.csv -%%DATADIR%%/epsg_csv/version_history.csv -%%DATADIR%%/epsg_csv/vertcs.csv -%%DATADIR%%/epsg_csv/vertcs.override.csv diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile index c196342a5a18..2d6793ba6fa2 100644 --- a/graphics/libreatlas/Makefile +++ b/graphics/libreatlas/Makefile @@ -3,7 +3,7 @@ PORTNAME= libreatlas PORTVERSION= 1.0.0a -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= graphics geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/ @@ -37,7 +37,7 @@ USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango USE_WX= 2.8 -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 LDFLAGS+= -L${LOCALBASE}/lib LIBS+= -lgeos_c -lsqlite3 diff --git a/graphics/libreatlas/distinfo b/graphics/libreatlas/distinfo index 3e05498658bf..462dd75f5c57 100644 --- a/graphics/libreatlas/distinfo +++ b/graphics/libreatlas/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1561510989 SHA256 (libreatlas-1.0.0a.tar.gz) = f8de0433455d2f033de7cec253f28aa7d2cf26e075234467a607feb1e68a417c SIZE (libreatlas-1.0.0a.tar.gz) = 814624 diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile index efb42134a5ed..3e0c72685f7f 100644 --- a/graphics/openorienteering-mapper/Makefile +++ b/graphics/openorienteering-mapper/Makefile @@ -4,7 +4,7 @@ PORTNAME= openorienteering-mapper PORTVERSION= 0.8.4 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MAINTAINER= sikmir@gmail.com @@ -27,6 +27,7 @@ GH_PROJECT= mapper CMAKE_ARGS+= -DLICENSING_PROVIDER=freebsd \ -DMapper_PACKAGE_NAME=${PORTNAME} \ -Wno-dev +CXXFLAGS+= "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" OPTIONS_DEFINE= DOCS EXAMPLES GDAL NLS POSITIONING TEST TIFF OPTIONS_DEFAULT= DOCS EXAMPLES GDAL NLS TIFF diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile index 2669db87bd1b..93fcae9bf5bc 100644 --- a/graphics/proj/Makefile +++ b/graphics/proj/Makefile @@ -2,36 +2,51 @@ # $FreeBSD$ PORTNAME= proj -PORTVERSION= 5.1.0 +PORTVERSION= 6.1.0 PORTEPOCH= 1 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/proj/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= fmysh@iijmio-mail.jp +MAINTAINER= wen@FreeBSD.org COMMENT= Cartographic Projections library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -DATUM_GRID_FILES= proj-datumgrid-1.7.zip +CONFLICTS_INSTALL= proj5-5.[0-9]*.[0-9]* -GNU_CONFIGURE= yes -USES= compiler gmake libtool pathfix +LIB_DEPENDS= libsqlite3.so:databases/sqlite3 + +USES= compiler:c++11-lang gmake libtool pathfix pkgconfig USE_LDCONFIG= yes +GNU_CONFIGURE= yes + +DATUM_GRID_FILES= proj-datumgrid-1.8.zip \ + proj-datumgrid-europe-1.3.zip \ + proj-datumgrid-north-america-1.2.zip \ + proj-datumgrid-oceania-1.0.zip \ + proj-datumgrid-world-1.0.zip + FMAN1= cs2cs.1 geod.1 proj.1 FMAN3= geodesic.3 pj_init.3 INSTALL_TARGET= install-strip +TEST_TARGET= check post-extract: - @${TAR} -xf ${DISTDIR}/${DATUM_GRID_FILES} -C ${WRKSRC}/nad + ${MKDIR} ${WRKSRC}/datum +.for f in ${DATUM_GRID_FILES} + @${TAR} -xf ${DISTDIR}/${f} -C ${WRKSRC}/datum +.endfor post-install: .for m in 1 3 (cd ${STAGEDIR}${MANPREFIX}/man/man${m} && ${GZIP_CMD} ${FMAN${m}}) .endfor + cd ${WRKSRC}/datum && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR} + .include <bsd.port.mk> diff --git a/graphics/proj/distinfo b/graphics/proj/distinfo index c1f91b2c2861..e61a23b9dfa2 100644 --- a/graphics/proj/distinfo +++ b/graphics/proj/distinfo @@ -1,5 +1,13 @@ -TIMESTAMP = 1527753974 -SHA256 (proj-5.1.0.tar.gz) = 6b1379a53317d9b5b8c723c1dc7bf2e3a8eb22ceb46b8807a1ce48ef65685bb3 -SIZE (proj-5.1.0.tar.gz) = 1006324 -SHA256 (proj-datumgrid-1.7.zip) = ffcad4453fac3b4a13ca678ef343e688496e18019f35709ef03c5f200e9fb85a -SIZE (proj-datumgrid-1.7.zip) = 6601627 +TIMESTAMP = 1559029341 +SHA256 (proj-6.1.0.tar.gz) = 676165c54319d2f03da4349cbd7344eb430b225fe867a90191d848dc64788008 +SIZE (proj-6.1.0.tar.gz) = 2453402 +SHA256 (proj-datumgrid-1.8.zip) = b9838ae7e5f27ee732fb0bfed618f85b36e8bb56d7afb287d506338e9f33861e +SIZE (proj-datumgrid-1.8.zip) = 6601640 +SHA256 (proj-datumgrid-europe-1.3.zip) = fec755e7e80f921b985cff76213e6e65949468f4482d329f09c8cf1d8dddfe52 +SIZE (proj-datumgrid-europe-1.3.zip) = 23249850 +SHA256 (proj-datumgrid-north-america-1.2.zip) = e827adbf62139095bc0029f35495dabb38351a77bd83583ecd3d2f15b362cfe5 +SIZE (proj-datumgrid-north-america-1.2.zip) = 73660220 +SHA256 (proj-datumgrid-oceania-1.0.zip) = 41c23f32712b2beaedcddb0e53542a4c15d2fda62f104d3e041760062bd70707 +SIZE (proj-datumgrid-oceania-1.0.zip) = 96907052 +SHA256 (proj-datumgrid-world-1.0.zip) = cbffb31faecb16f3f7acbfe7e85e81440aa8d6eae670de7ec2d19a13c02b4681 +SIZE (proj-datumgrid-world-1.0.zip) = 134375434 diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist index da0525421a0e..8cc6f575627a 100644 --- a/graphics/proj/pkg-plist +++ b/graphics/proj/pkg-plist @@ -4,55 +4,193 @@ bin/geod bin/gie bin/invgeod bin/invproj -bin/nad2bin bin/proj +bin/projinfo include/geodesic.h include/org_proj4_PJ.h include/proj.h +include/proj/common.hpp +include/proj/coordinateoperation.hpp +include/proj/coordinatesystem.hpp +include/proj/crs.hpp +include/proj/datum.hpp +include/proj/io.hpp +include/proj/metadata.hpp +include/proj/nn.hpp +include/proj/util.hpp include/proj_api.h -include/projects.h +include/proj_constants.h +include/proj_experimental.h +include/proj_symbol_rename.h lib/libproj.a lib/libproj.so -lib/libproj.so.13 -lib/libproj.so.13.1.0 +lib/libproj.so.15 +lib/libproj.so.15.1.0 libdata/pkgconfig/proj.pc man/man1/cct.1.gz man/man1/cs2cs.1.gz man/man1/geod.1.gz man/man1/gie.1.gz man/man1/proj.1.gz +man/man1/projinfo.1.gz man/man3/geodesic.3.gz man/man3/pj_init.3.gz -%%DATADIR%%/BETA2007.gsb %%DATADIR%%/CH -%%DATADIR%%/FL %%DATADIR%%/GL27 -%%DATADIR%%/IGNF %%DATADIR%%/ITRF2000 %%DATADIR%%/ITRF2008 %%DATADIR%%/ITRF2014 +%%DATADIR%%/nad.lst +%%DATADIR%%/nad27 +%%DATADIR%%/nad83 +%%DATADIR%%/null +%%DATADIR%%/other.extra +%%DATADIR%%/proj.db +%%DATADIR%%/world +%%DATADIR%%/A66_National_13_09_01.gsb +%%DATADIR%%/BETA2007.gsb +%%DATADIR%%/DK +%%DATADIR%%/DK_bornholm.pol +%%DATADIR%%/DK_bridges.pol +%%DATADIR%%/DK_general.pol +%%DATADIR%%/DK_jutland.pol +%%DATADIR%%/DK_zealand.pol +%%DATADIR%%/FL +%%DATADIR%%/FO +%%DATADIR%%/FO_fk89.pol +%%DATADIR%%/GDA94_GDA2020_conformal.gsb +%%DATADIR%%/GDA94_GDA2020_conformal_and_distortion.gsb +%%DATADIR%%/GL %%DATADIR%%/MD +%%DATADIR%%/NKG +%%DATADIR%%/National_84_02_07_01.gsb +%%DATADIR%%/OSGM15_Belfast.gtx +%%DATADIR%%/OSGM15_Malin.gtx +%%DATADIR%%/OSTN15_NTv2_OSGBtoETRS.gsb +%%DATADIR%%/RAC09.gtx +%%DATADIR%%/RAF09.gtx +%%DATADIR%%/RAF18.gtx +%%DATADIR%%/RAGTBT2016.gtx +%%DATADIR%%/RALD2016.gtx +%%DATADIR%%/RALDW842016.gtx +%%DATADIR%%/RALS2016.gtx +%%DATADIR%%/RAMART2016.gtx +%%DATADIR%%/RAMG2016.gtx +%%DATADIR%%/RAR07_bl.gtx +%%DATADIR%%/README.DATUMGRID +%%DATADIR%%/README.EUROPE +%%DATADIR%%/README.NORTHAMERICA +%%DATADIR%%/README.OCEANIA +%%DATADIR%%/README.WORLD +%%DATADIR%%/SWEN17_RH2000.gtx %%DATADIR%%/TN %%DATADIR%%/WI %%DATADIR%%/WO %%DATADIR%%/alaska +%%DATADIR%%/alhpgn.gsb +%%DATADIR%%/arhpgn.gsb +%%DATADIR%%/azhpgn.gsb +%%DATADIR%%/bd72lb72_etrs89lb08.gsb +%%DATADIR%%/c1hpgn.gsb +%%DATADIR%%/c2hpgn.gsb +%%DATADIR%%/cnhpgn.gsb +%%DATADIR%%/cohpgn.gsb %%DATADIR%%/conus +%%DATADIR%%/dnn.gtx +%%DATADIR%%/dvr90.gtx +%%DATADIR%%/egm08_25.gtx %%DATADIR%%/egm96_15.gtx -%%DATADIR%%/epsg -%%DATADIR%%/esri -%%DATADIR%%/esri.extra +%%DATADIR%%/emhpgn.gsb +%%DATADIR%%/ethpgn.gsb +%%DATADIR%%/flhpgn.gsb +%%DATADIR%%/fvr09.gtx +%%DATADIR%%/g2012ba0.gtx +%%DATADIR%%/g2012bg0.gtx +%%DATADIR%%/g2012bh0.gtx +%%DATADIR%%/g2012bp0.gtx +%%DATADIR%%/g2012bs0.gtx +%%DATADIR%%/g2012bu0.gtx +%%DATADIR%%/gahpgn.gsb +%%DATADIR%%/gg10_sbv2.gtx +%%DATADIR%%/gg10_smv2.gtx +%%DATADIR%%/ggg00_lsv2.gtx +%%DATADIR%%/ggg00_mgv2.gtx +%%DATADIR%%/ggg00_sbv2.gtx +%%DATADIR%%/ggg00_smv2.gtx +%%DATADIR%%/ggg00v2.gtx +%%DATADIR%%/ggguy15.gtx +%%DATADIR%%/ggker08v2.gtx +%%DATADIR%%/ggm00v2.gtx +%%DATADIR%%/ggm04v1.gtx +%%DATADIR%%/ggpf02-Bora.gtx +%%DATADIR%%/ggpf02-Huahine.gtx +%%DATADIR%%/ggpf02-Maiao.gtx +%%DATADIR%%/ggpf02-Maupiti.gtx +%%DATADIR%%/ggpf02-Raiatea.gtx +%%DATADIR%%/ggpf02-Tahaa.gtx +%%DATADIR%%/ggpf02-Tupai.gtx +%%DATADIR%%/ggpf05-HivaOa.gtx +%%DATADIR%%/ggpf05-Nuku.gtx +%%DATADIR%%/ggpf08-Fakarava.gtx +%%DATADIR%%/ggpf08-Gambier.gtx +%%DATADIR%%/ggpf08-Hao.gtx +%%DATADIR%%/ggpf08-Mataiva.gtx +%%DATADIR%%/ggpf08-Raivavae.gtx +%%DATADIR%%/ggpf08-Reao.gtx +%%DATADIR%%/ggpf08-Rurutu.gtx +%%DATADIR%%/ggpf08-Tikehau.gtx +%%DATADIR%%/ggpf08-Tubuai.gtx +%%DATADIR%%/ggpf10-Moorea.gtx +%%DATADIR%%/ggpf10-Tahiti.gtx +%%DATADIR%%/ggspm06v1.gtx +%%DATADIR%%/guhpgn.gsb +%%DATADIR%%/gvr2000.gtx +%%DATADIR%%/gvr2016.gtx %%DATADIR%%/hawaii -%%DATADIR%%/nad.lst -%%DATADIR%%/nad27 -%%DATADIR%%/nad83 +%%DATADIR%%/hihpgn.gsb +%%DATADIR%%/iahpgn.gsb +%%DATADIR%%/ilhpgn.gsb +%%DATADIR%%/inhpgn.gsb +%%DATADIR%%/kyhpgn.gsb +%%DATADIR%%/lahpgn.gsb +%%DATADIR%%/mdhpgn.gsb +%%DATADIR%%/mehpgn.gsb +%%DATADIR%%/mihpgn.gsb +%%DATADIR%%/mnhpgn.gsb +%%DATADIR%%/mohpgn.gsb +%%DATADIR%%/nbhpgn.gsb +%%DATADIR%%/nchpgn.gsb +%%DATADIR%%/ndhpgn.gsb +%%DATADIR%%/nehpgn.gsb +%%DATADIR%%/njhpgn.gsb +%%DATADIR%%/nkgrf03vel_realigned_xy.ct2 +%%DATADIR%%/nkgrf03vel_realigned_z.gtx +%%DATADIR%%/nmhpgn.gsb %%DATADIR%%/ntf_r93.gsb %%DATADIR%%/ntv1_can.dat -%%DATADIR%%/null +%%DATADIR%%/ntv2_0.gsb +%%DATADIR%%/nvhpgn.gsb +%%DATADIR%%/nyhpgn.gsb %%DATADIR%%/nzgd2kgrid0005.gsb -%%DATADIR%%/other.extra -%%DATADIR%%/proj_def.dat +%%DATADIR%%/ohhpgn.gsb +%%DATADIR%%/okhpgn.gsb +%%DATADIR%%/pahpgn.gsb %%DATADIR%%/prvi +%%DATADIR%%/pvhpgn.gsb +%%DATADIR%%/schpgn.gsb +%%DATADIR%%/sdhpgn.gsb %%DATADIR%%/stgeorge %%DATADIR%%/stlrnc %%DATADIR%%/stpaul -%%DATADIR%%/world +%%DATADIR%%/tnhpgn.gsb +%%DATADIR%%/uthpgn.gsb +%%DATADIR%%/vahpgn.gsb +%%DATADIR%%/vertconc.gtx +%%DATADIR%%/vertcone.gtx +%%DATADIR%%/vertconw.gtx +%%DATADIR%%/wihpgn.gsb +%%DATADIR%%/wmhpgn.gsb +%%DATADIR%%/wohpgn.gsb +%%DATADIR%%/wthpgn.gsb +%%DATADIR%%/wvhpgn.gsb +%%DATADIR%%/wyhpgn.gsb diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile index 09e6dc6945ce..41fd4dd9db43 100644 --- a/graphics/py-cartopy/Makefile +++ b/graphics/py-cartopy/Makefile @@ -3,7 +3,7 @@ PORTNAME= cartopy PORTVERSION= 0.17.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -28,4 +28,6 @@ RUN_DEPENDS= ${PYNUMPY} \ USES= python USE_PYTHON= autoplist concurrent cython distutils +CPPFLAGS+= -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 + .include <bsd.port.mk> diff --git a/graphics/py-pyproj/Makefile b/graphics/py-pyproj/Makefile index 3eb493ac930d..aedc476570a9 100644 --- a/graphics/py-pyproj/Makefile +++ b/graphics/py-pyproj/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pyproj -PORTVERSION= 1.9.6 +PORTVERSION= 2.1.3 CATEGORIES= graphics python geography MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,14 +16,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libproj.so:graphics/proj USES= python -USE_PYTHON= distutils autoplist concurrent +USE_PYTHON= autoplist concurrent cython distutils MAKE_ENV= PROJ_DIR=${LOCALBASE} PORTDOCS= * -PORTDOCS1= Changelog README.md docs/* -PORTEXAMPLES= datum_shift.py geodtest.py sample.out \ - test.py test2.py test_datum.py test_transform.py +PORTDOCS1= README.md docs/* +PORTEXAMPLES= sample.out \ + test.py test_awips221.py test_crs.py test_datadir.py \ + test_datum.py test_datum_shift.py test_doctest_wrapper.py \ + test_exception_logging.py test_geod.py test_pickle.py \ + test_transform.py test_transformer.py OPTIONS_DEFINE= DOCS EXAMPLES @@ -32,7 +35,9 @@ post-install: post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS1:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/docs/ && \ + ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} "! -name .buildinfo" ) post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/graphics/py-pyproj/distinfo b/graphics/py-pyproj/distinfo index f87e4943e698..349ae523a2ca 100644 --- a/graphics/py-pyproj/distinfo +++ b/graphics/py-pyproj/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550151151 -SHA256 (pyproj-1.9.6.tar.gz) = e0c02b1554b20c710d16d673817b2a89ff94738b0b537aead8ecb2edc4c4487b -SIZE (pyproj-1.9.6.tar.gz) = 2797999 +TIMESTAMP = 1558185597 +SHA256 (pyproj-2.1.3.tar.gz) = 99c52788b01a7bb9a88024bf4d40965c0a66a93d654600b5deacf644775f424d +SIZE (pyproj-2.1.3.tar.gz) = 521154 diff --git a/graphics/py-pyproj/pkg-descr b/graphics/py-pyproj/pkg-descr index fd9a16dbf203..caa05e40f95b 100644 --- a/graphics/py-pyproj/pkg-descr +++ b/graphics/py-pyproj/pkg-descr @@ -4,7 +4,7 @@ Performs cartographic transformations and geodetic computations. The Proj class can convert from geographic (longitude,latitude) to native map projection (x,y) coordinates and vice versa, or -from one map projection coordinate system directly to another. +from one map projection coordinate system directly to another. The module variable pj_list is a dictionary containing all the available projections and their descriptions. diff --git a/math/R-cran-sf/Makefile b/math/R-cran-sf/Makefile index 9083de792f28..52d18c467da8 100644 --- a/math/R-cran-sf/Makefile +++ b/math/R-cran-sf/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sf -DISTVERSION= 0.7-1 -PORTREVISION= 1 +DISTVERSION= 0.7-4 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -24,6 +23,8 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \ BUILD_DEPENDS= ${CRAN_DEPENDS} RUN_DEPENDS= ${CRAN_DEPENDS} -USES= compiler:c++11-lang cran:auto-plist,compiles +USES= compiler:c++11-lang cran:auto-plist,compiles pkgconfig + +CONFIGURE_ARGS+= "--with-proj-api=yes" .include <bsd.port.mk> diff --git a/math/R-cran-sf/distinfo b/math/R-cran-sf/distinfo index d6c2497b0542..8147c680725b 100644 --- a/math/R-cran-sf/distinfo +++ b/math/R-cran-sf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540460913 -SHA256 (sf_0.7-1.tar.gz) = 09d108e8324285d7cf96569a386f16d10f41edd74f57a174d1c128e85dd8ef76 -SIZE (sf_0.7-1.tar.gz) = 8330564 +TIMESTAMP = 1558945618 +SHA256 (sf_0.7-4.tar.gz) = 2112281803b2f87dfb33cf20825d960cb4e9084533acbc26128932e7fbc9de6e +SIZE (sf_0.7-4.tar.gz) = 8174060 diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile index ccf35fb32b2f..6552a272737f 100644 --- a/math/octave-forge-octproj/Makefile +++ b/math/octave-forge-octproj/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave-forge-octproj PORTVERSION= 1.1.5 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -22,6 +22,8 @@ WRKSRC= ${WRKDIR}/${OCTSRC}/src USES+= compiler:gcc-c++11-lib +CPPFLAGS+= -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 + .include "${.CURDIR}/../../Mk/bsd.octave.mk" post-patch: diff --git a/math/octave-forge-octproj/distinfo b/math/octave-forge-octproj/distinfo index 95ac438c6ef0..fd4b24ef9657 100644 --- a/math/octave-forge-octproj/distinfo +++ b/math/octave-forge-octproj/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1561536261 SHA256 (octave-forge/octproj-1.1.5.tar.gz) = ee25b03e66cca30ebedcf09b4303b3e05d8896c3054a69d8e5810492bd86b5d3 SIZE (octave-forge/octproj-1.1.5.tar.gz) = 224240 diff --git a/math/saga/Makefile b/math/saga/Makefile index b2798e6f1111..6187e089d092 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= saga -PORTVERSION= 7.2.0 +PORTVERSION= 7.3.0 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -12,7 +12,7 @@ COMMENT= System for Automated Geoscientific Analyses LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -BUILD_DEPENDS= clang70:devel/llvm70 \ +BUILD_DEPENDS= clang${LLVM_VER}:devel/llvm${LLVM_VER} \ swig3.0:devel/swig30 LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ @@ -30,7 +30,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ RUN_DEPENDS:= swig3.0:devel/swig30 USES= autoreconf compiler:c++11-lib desktop-file-utils dos2unix \ - iconv:wchar_t libtool localbase pkgconfig python:2.7 + iconv:wchar_t libtool localbase pkgconfig python USE_LDCONFIG= yes USE_WX= 3.0+ @@ -56,8 +56,8 @@ VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp OPENMP_LDFLAGS= -L${LOCALBASE}/lib -lm -# Use OpenMP from lang/llvm70 -OPENMP_LDFLAGS+= -L${LOCALBASE}/llvm70/lib -lomp +# Use OpenMP from lang/llvm${LLVM_VER} +OPENMP_LDFLAGS+= -L${LOCALBASE}/llvm${LLVM_VER}/lib -lomp PGSQL_CONFIGURE_OFF= --with-postgresql=no PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config PGSQL_USES= pgsql @@ -69,9 +69,10 @@ INSTALL_TARGET= install-strip .include <bsd.port.pre.mk> # make describe needs them here -CPP= clang-cpp70 -CC= clang70 -CXX= clang++70 +LLVM_VER= 80 +CPP= clang-cpp${LLVM_VER} +CC= clang${LLVM_VER} +CXX= clang++${LLVM_VER} SUB_FILES= pkg-message diff --git a/math/saga/distinfo b/math/saga/distinfo index dfcd593984b8..52fa4c13db84 100644 --- a/math/saga/distinfo +++ b/math/saga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550398605 -SHA256 (saga-7.2.0.tar.gz) = 56152aa39e90e60fb8bcd2b9ded30706176d3a7f50084505138fcfc26a61f281 -SIZE (saga-7.2.0.tar.gz) = 4676920 +TIMESTAMP = 1561394217 +SHA256 (saga-7.3.0.tar.gz) = f3c0f805bd48c3afbad56a35b6b0aa40e8e92799ed0ef0d682aea275fa36fbbc +SIZE (saga-7.3.0.tar.gz) = 4742356 diff --git a/math/saga/files/patch-configure.ac b/math/saga/files/patch-configure.ac index 56a5a7c9fd05..a356794aa747 100644 --- a/math/saga/files/patch-configure.ac +++ b/math/saga/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2018-11-22 07:53:05 UTC +--- configure.ac.orig 2019-04-09 17:14:15 UTC +++ configure.ac -@@ -20,13 +20,13 @@ AC_PROG_LIBTOOL +@@ -20,7 +20,7 @@ AC_PROG_LIBTOOL AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,) AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates]) AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,) @@ -8,7 +8,10 @@ +AC_CHECK_LIB([las12], [LAS_GetVersion], LASFOUND=1,,) AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,) AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found]) - AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,) + # PROJ4 has projects.h and old API function: +@@ -30,8 +30,8 @@ AC_CHECK_HEADER([projects.h],[AC_CHECK_HEADER([proj.h] + # PROJ6 has dropped projects.h in favour of proj.h and has new API function: + AC_CHECK_HEADER([proj.h],[AC_CHECK_LIB([proj], [proj_info], PROJ6FOUND=1,,)]) AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,) -AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,) -AC_CHECK_HEADER([libsvm/svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)]) diff --git a/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp b/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp index 683632ff3293..0996946f65bf 100644 --- a/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp +++ b/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp @@ -1,9 +1,9 @@ ---- src/tools/io/io_shapes_las/las_export.cpp.orig 2018-06-19 12:39:11 UTC +--- src/tools/io/io_shapes_las/las_export.cpp.orig 2019-06-24 16:41:27 UTC +++ src/tools/io/io_shapes_las/las_export.cpp -@@ -61,9 +61,9 @@ - //--------------------------------------------------------- - #include "las_export.h" +@@ -59,9 +59,9 @@ + /////////////////////////////////////////////////////////// + //--------------------------------------------------------- -#include <liblas/laspoint.hpp> -#include <liblas/laswriter.hpp> -#include <liblas/capi/las_version.h> @@ -13,4 +13,3 @@ #include <fstream> #include <iostream> #include <cstddef> - diff --git a/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp b/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp index f8b5d812a60c..13ef2b014a29 100644 --- a/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp +++ b/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp @@ -1,9 +1,9 @@ ---- src/tools/io/io_shapes_las/las_import.cpp.orig 2018-05-01 09:07:10 UTC +--- src/tools/io/io_shapes_las/las_import.cpp.orig 2019-06-24 16:44:36 UTC +++ src/tools/io/io_shapes_las/las_import.cpp -@@ -60,9 +60,9 @@ - //--------------------------------------------------------- - #include "las_import.h" +@@ -58,9 +58,9 @@ + /////////////////////////////////////////////////////////// + //--------------------------------------------------------- -#include <liblas/laspoint.hpp> -#include <liblas/lasreader.hpp> -#include <liblas/capi/las_version.h> diff --git a/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h b/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h index 1cad8c48fc8c..f89957d17365 100644 --- a/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h +++ b/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h @@ -1,9 +1,9 @@ ---- src/tools/io/io_shapes_las/las_info.h.orig 2018-05-01 09:07:11 UTC +--- src/tools/io/io_shapes_las/las_info.h.orig 2019-06-24 16:47:07 UTC +++ src/tools/io/io_shapes_las/las_info.h -@@ -76,9 +76,9 @@ - //--------------------------------------------------------- - #include "MLB_Interface.h" +@@ -74,9 +74,9 @@ + /////////////////////////////////////////////////////////// + //--------------------------------------------------------- -#include <liblas/laspoint.hpp> -#include <liblas/lasreader.hpp> -#include <liblas/capi/las_version.h> diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist index ad4444ac1059..ca4166cb6c20 100644 --- a/math/saga/pkg-plist +++ b/math/saga/pkg-plist @@ -31,12 +31,12 @@ lib/libsaga_api-%%PORTVERSION%%.so lib/libsaga_api.so lib/libsaga_gdi-%%PORTVERSION%%.so lib/libsaga_gdi.so +%%PYTHON_SITELIBDIR%%/__pycache__/saga_api.cpython-36.opt-1.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/saga_api.cpython-36.pyc %%PYTHON_SITELIBDIR%%/_saga_api-%%PORTVERSION%%.so %%PYTHON_SITELIBDIR%%/_saga_api.a %%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_perego.so lib/saga/libdb_odbc.so @@ -210,6 +210,7 @@ share/pixmaps/saga.png %%DATADIR%%/toolchains/polygons_remove_from_boundary.xml %%DATADIR%%/toolchains/shapes_select_delete.xml %%DATADIR%%/toolchains/sieve_and_clump.xml +%%DATADIR%%/toolchains/ta_flow_accumulation.xml %%DATADIR%%/toolchains/ta_summits.xml %%DATADIR%%/toolchains/temperature_downscaling.xml %%DATADIR%%/toolchains/temperature_downscaling_bulk.xml diff --git a/science/cdo/Makefile b/science/cdo/Makefile index d92dcb716780..22f328ea1cc8 100644 --- a/science/cdo/Makefile +++ b/science/cdo/Makefile @@ -3,6 +3,7 @@ PORTNAME= cdo PORTVERSION= 1.9.7 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/20101/ \ LOCAL/sunpoet @@ -42,6 +43,8 @@ TEST_TARGET= check USE_CXXSTD= c++11 USE_LDCONFIG= yes +CXXFLAGS+= "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" + CGRIBEX_CONFIGURE_WITH= cgribex CGRIBEX_LIB_DEPENDS= libcgribex.so:science/cgribex ECCODES_CONFIGURE_WITH= eccodes diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 9ed3ead3752c..5ecce572ae41 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -4,7 +4,7 @@ PORTNAME= gnudatalanguage PORTVERSION= 0.9.9 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science lang .if defined(BUILD_PYTHON_MODULE) PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -50,7 +50,7 @@ CMAKE_ARGS= -DREADLINEDIR:STRING="/usr" \ -DNCURSESDIR:STRING="/usr" \ -DMAGICK:BOOL=OFF CPPFLAGS+= ${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION -CXXFLAGS+= -std=gnu++11 +CXXFLAGS+= -std=gnu++11 -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 LDFLAGS+= -lpthread -L${LOCALBASE}/lib SLAVEDIRS= science/py-gnudatalanguage |