3 files changed, 45 insertions, 22 deletions

diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 0fdd2ca5eb83..077619f582a0 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	marble
-# Date created:		2010-05-30
-# Whom:			Max Brazhnikov <makc@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	marble
 PORTVERSION=	${KDE4_VERSION}
@@ -27,11 +22,13 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 CMAKE_ARGS=	-DMOBILE:BOOL=FALSE
 
-OPTIONS=	GPS "Support for GPS position provider" on
+OPTIONS_DEFINE=	GPS
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+GPS_DESC=	Support for GPS position provider
 
 .include <bsd.port.options.mk>
 
-.ifndef(WITHOUT_GPS)
+.if ${PORT_OPTIONS:MGPS}
 LIB_DEPENDS+=	gps.20:${PORTSDIR}/astro/gpsd
 PLIST_SUB+=	GPS=""
 .else
diff --git a/astro/marble/distinfo b/astro/marble/distinfo
index de5fd38e5b4c..d5fd5ab64762 100644
--- a/astro/marble/distinfo
+++ b/astro/marble/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/marble-4.8.4.tar.xz) = 3e5e7db5b69b3cdebcb0b76bded572a6e824b5a770f16b5b9f7f193f1e0df026
-SIZE (KDE/marble-4.8.4.tar.xz) = 19899160
+SHA256 (KDE/marble-4.9.5.tar.xz) = f9c5dba318050d771b174b1f76cd006da3d87a93647ab1220cc573905ad24ede
+SIZE (KDE/marble-4.9.5.tar.xz) = 19931340
diff --git a/astro/marble/pkg-plist b/astro/marble/pkg-plist
index 5646928877d5..383ec6f87fc5 100644
--- a/astro/marble/pkg-plist
+++ b/astro/marble/pkg-plist
@@ -9,9 +9,12 @@ include/marble/AbstractMarbleGraphicsLayout.h
 include/marble/AbstractProjection.h
 include/marble/AbstractWorkerThread.h
 include/marble/AlternativeRoutesModel.h
+include/marble/AutoNavigation.h
 include/marble/BookmarkManager.h
 include/marble/ClipPainter.h
 include/marble/CurrentLocationWidget.h
+include/marble/DialogConfigurationInterface.h
+include/marble/DownloadRegion.h
 include/marble/DownloadRegionDialog.h
 include/marble/ElevationModel.h
 include/marble/EquirectProjection.h
@@ -26,6 +29,7 @@ include/marble/GeoDataDocument.h
 include/marble/GeoDataFeature.h
 include/marble/GeoDataFolder.h
 include/marble/GeoDataGeometry.h
+include/marble/GeoDataGroundOverlay.h
 include/marble/GeoDataHotSpot.h
 include/marble/GeoDataIconStyle.h
 include/marble/GeoDataLabelStyle.h
@@ -38,6 +42,7 @@ include/marble/GeoDataLod.h
 include/marble/GeoDataLookAt.h
 include/marble/GeoDataMultiGeometry.h
 include/marble/GeoDataObject.h
+include/marble/GeoDataOverlay.h
 include/marble/GeoDataPlacemark.h
 include/marble/GeoDataPoint.h
 include/marble/GeoDataPolyStyle.h
@@ -46,10 +51,13 @@ include/marble/GeoDataRegion.h
 include/marble/GeoDataStyle.h
 include/marble/GeoDataStyleMap.h
 include/marble/GeoDataStyleSelector.h
+include/marble/GeoDataTrack.h
+include/marble/GeoDataTreeModel.h
 include/marble/GeoDocument.h
 include/marble/GeoGraphicsItem.h
 include/marble/GeoGraphicsScene.h
 include/marble/GeoPainter.h
+include/marble/GeoWriter.h
 include/marble/LabelGraphicsItem.h
 include/marble/LatLonBoxWidget.h
 include/marble/LatLonEdit.h
@@ -63,6 +71,7 @@ include/marble/MarbleAboutDialog.h
 include/marble/MarbleAbstractRunner.h
 include/marble/MarbleControlBox.h
 include/marble/MarbleDirs.h
+include/marble/MarbleGlobal.h
 include/marble/MarbleGraphicsGridLayout.h
 include/marble/MarbleGraphicsItem.h
 include/marble/MarbleMap.h
@@ -73,23 +82,27 @@ include/marble/MarbleWidget.h
 include/marble/MarbleWidgetInputHandler.h
 include/marble/MercatorProjection.h
 include/marble/NavigationWidget.h
+include/marble/ParseRunnerPlugin.h
 include/marble/Planet.h
 include/marble/PluginAboutDialog.h
 include/marble/PluginInterface.h
+include/marble/PositionProviderPluginInterface.h
 include/marble/PositionTracking.h
 include/marble/QtMarbleConfigDialog.h
 include/marble/Quaternion.h
 include/marble/RenderPlugin.h
 include/marble/RenderPluginInterface.h
+include/marble/ReverseGeocodingRunnerPlugin.h
 include/marble/Route.h
 include/marble/RouteRequest.h
 include/marble/RouteSegment.h
 include/marble/RoutingManager.h
 include/marble/RoutingModel.h
 include/marble/RoutingProfile.h
+include/marble/RoutingRunnerPlugin.h
 include/marble/RoutingWidget.h
-include/marble/RunnerPlugin.h
 include/marble/ScreenGraphicsItem.h
+include/marble/SearchRunnerPlugin.h
 include/marble/Serializable.h
 include/marble/SphericalProjection.h
 include/marble/SunLocator.h
@@ -112,7 +125,10 @@ lib/kde4/plugins/marble/CompassFloatItem.so
 lib/kde4/plugins/marble/CrosshairsPlugin.so
 lib/kde4/plugins/marble/EarthquakePlugin.so
 lib/kde4/plugins/marble/ElevationProfileFloatItem.so
-lib/kde4/plugins/marble/GosmorePlugin.so
+lib/kde4/plugins/marble/ElevationProfileMarker.so
+lib/kde4/plugins/marble/FlightGearPositionProviderPlugin.so
+lib/kde4/plugins/marble/GosmoreReverseGeocodingPlugin.so
+lib/kde4/plugins/marble/GosmoreRoutingPlugin.so
 lib/kde4/plugins/marble/GpsInfo.so
 %%GPS%%lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
 lib/kde4/plugins/marble/GpxPlugin.so
@@ -122,10 +138,15 @@ lib/kde4/plugins/marble/KmlPlugin.so
 lib/kde4/plugins/marble/LatLonPlugin.so
 lib/kde4/plugins/marble/LocalDatabasePlugin.so
 lib/kde4/plugins/marble/LocalOsmSearchPlugin.so
+lib/kde4/plugins/marble/LogPlugin.so
+lib/kde4/plugins/marble/MapQuestPlugin.so
 lib/kde4/plugins/marble/MapScaleFloatItem.so
+lib/kde4/plugins/marble/MeasureTool.so
 lib/kde4/plugins/marble/MonavPlugin.so
 lib/kde4/plugins/marble/NavigationFloatItem.so
-lib/kde4/plugins/marble/NominatimPlugin.so
+lib/kde4/plugins/marble/NominatimReverseGeocodingPlugin.so
+lib/kde4/plugins/marble/NominatimSearchPlugin.so
+lib/kde4/plugins/marble/OSRMPlugin.so
 lib/kde4/plugins/marble/OpenDesktopPlugin.so
 lib/kde4/plugins/marble/OpenRouteServicePlugin.so
 lib/kde4/plugins/marble/OsmPlugin.so
@@ -134,8 +155,10 @@ lib/kde4/plugins/marble/Photo.so
 lib/kde4/plugins/marble/PlacemarkPositionProviderPlugin.so
 lib/kde4/plugins/marble/PntPlugin.so
 lib/kde4/plugins/marble/PositionMarker.so
+lib/kde4/plugins/marble/PostalCode.so
 lib/kde4/plugins/marble/ProgressFloatItem.so
 lib/kde4/plugins/marble/QNamNetworkPlugin.so
+lib/kde4/plugins/marble/RouteSimulationPositionProviderPlugin.so
 lib/kde4/plugins/marble/RoutingPlugin.so
 lib/kde4/plugins/marble/RoutinoPlugin.so
 lib/kde4/plugins/marble/SatellitesPlugin.so
@@ -146,8 +169,8 @@ lib/kde4/plugins/marble/Weather.so
 lib/kde4/plugins/marble/Wikipedia.so
 lib/kde4/plugins/marble/YoursPlugin.so
 lib/libmarblewidget.so
-lib/libmarblewidget.so.0.13.0
-lib/libmarblewidget.so.13
+lib/libmarblewidget.so.0.14.0
+lib/libmarblewidget.so.14
 share/applications/kde4/marble.desktop
 share/apps/cmake/modules/FindMarble.cmake
 share/apps/marble/data/LICENSE.txt
@@ -176,14 +199,14 @@ share/apps/marble/data/bitmaps/city_4_white.png
 share/apps/marble/data/bitmaps/city_4_yellow.png
 share/apps/marble/data/bitmaps/coordinate.png
 share/apps/marble/data/bitmaps/crater.png
-share/apps/marble/data/bitmaps/cursor_bc.xpm
-share/apps/marble/data/bitmaps/cursor_bl.xpm
-share/apps/marble/data/bitmaps/cursor_br.xpm
-share/apps/marble/data/bitmaps/cursor_cl.xpm
-share/apps/marble/data/bitmaps/cursor_cr.xpm
-share/apps/marble/data/bitmaps/cursor_tc.xpm
-share/apps/marble/data/bitmaps/cursor_tl.xpm
-share/apps/marble/data/bitmaps/cursor_tr.xpm
+share/apps/marble/data/bitmaps/cursor_bc.png
+share/apps/marble/data/bitmaps/cursor_bl.png
+share/apps/marble/data/bitmaps/cursor_br.png
+share/apps/marble/data/bitmaps/cursor_cl.png
+share/apps/marble/data/bitmaps/cursor_cr.png
+share/apps/marble/data/bitmaps/cursor_tc.png
+share/apps/marble/data/bitmaps/cursor_tl.png
+share/apps/marble/data/bitmaps/cursor_tr.png
 share/apps/marble/data/bitmaps/default_location.png
 share/apps/marble/data/bitmaps/earth_apollo.jpg
 share/apps/marble/data/bitmaps/flag.png
@@ -262,7 +285,10 @@ share/apps/marble/data/bitmaps/routing_step.png
 share/apps/marble/data/bitmaps/shipwreck.png
 share/apps/marble/data/bitmaps/turn-around.png
 share/apps/marble/data/bitmaps/turn-continue.png
+share/apps/marble/data/bitmaps/turn-exit-left.png
+share/apps/marble/data/bitmaps/turn-exit-right.png
 share/apps/marble/data/bitmaps/turn-left.png
+share/apps/marble/data/bitmaps/turn-merge.png
 share/apps/marble/data/bitmaps/turn-right.png
 share/apps/marble/data/bitmaps/turn-roundabout-far.png
 share/apps/marble/data/bitmaps/turn-roundabout-first.png