6 files changed, 60 insertions, 15 deletions

diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 16fe33c75725..d5e1e88252cb 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -5,12 +5,13 @@ PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	astro kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 desktop planetarium
 
-LIB_DEPENDS=	cfitsio.0:${PORTSDIR}/astro/cfitsio
+LIB_DEPENDS=	cfitsio.0:${PORTSDIR}/astro/cfitsio \
+		wcs:${PORTSDIR}/astro/wcslib
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 \
 		xplanet:${PORTSDIR}/astro/xplanet
@@ -22,7 +23,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USES=		cmake:outsource
 USE_QT4=	opengl qmake_build moc_build rcc_build uic_build
-USE_XZ=	yes
+USE_XZ=		yes
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/astro/kstars/distinfo b/astro/kstars/distinfo
index 94c8ec81c6a7..0758d750b85a 100644
--- a/astro/kstars/distinfo
+++ b/astro/kstars/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kstars-4.9.5.tar.xz) = d3bb981bcbaffee81e42fbdca694d14c48dd26aab5942cef206b293a18aabf6e
-SIZE (KDE/kstars-4.9.5.tar.xz) = 12264044
+SHA256 (KDE/4.10.1/kstars-4.10.1.tar.xz) = 68c8cb35280504b67327a3b5b5b4a91ba06db6231ef326afb57fbf7ffd1e43e3
+SIZE (KDE/4.10.1/kstars-4.10.1.tar.xz) = 12463236
diff --git a/astro/kstars/pkg-plist b/astro/kstars/pkg-plist
index 116f1fb86d81..31f2a9bcb14a 100644
--- a/astro/kstars/pkg-plist
+++ b/astro/kstars/pkg-plist
@@ -316,6 +316,16 @@ share/apps/kstars/wzscope.png
 share/apps/kstars/wzstars.png
 share/config.kcfg/kstars.kcfg
 share/config/kstars.knsrc
+share/doc/HTML/en/kstars/Add_Object_to_Session_plan.png
+share/doc/HTML/en/kstars/Another_way4.png
+share/doc/HTML/en/kstars/Another_way5.png
+share/doc/HTML/en/kstars/Another_way6.png
+share/doc/HTML/en/kstars/Another_way_to_add.png
+share/doc/HTML/en/kstars/Another_way_to_add_part3.png
+share/doc/HTML/en/kstars/Delete_all_images.png
+share/doc/HTML/en/kstars/KStars_Neptune.png
+share/doc/HTML/en/kstars/Savin_session.png
+share/doc/HTML/en/kstars/WUT.png
 share/doc/HTML/en/kstars/aavso.png
 share/doc/HTML/en/kstars/ai-contents.docbook
 share/doc/HTML/en/kstars/alpha.png
@@ -353,6 +363,7 @@ share/doc/HTML/en/kstars/colorandtemp.docbook
 share/doc/HTML/en/kstars/commands.docbook
 share/doc/HTML/en/kstars/common
 share/doc/HTML/en/kstars/config.docbook
+share/doc/HTML/en/kstars/cosmicdist.docbook
 share/doc/HTML/en/kstars/cpoles.docbook
 share/doc/HTML/en/kstars/credits.docbook
 share/doc/HTML/en/kstars/csphere.docbook
@@ -360,10 +371,14 @@ share/doc/HTML/en/kstars/darkmatter.docbook
 share/doc/HTML/en/kstars/detaildialog.png
 share/doc/HTML/en/kstars/details.docbook
 share/doc/HTML/en/kstars/devicemanager.png
+share/doc/HTML/en/kstars/dss.png
 share/doc/HTML/en/kstars/dumpmode.docbook
 share/doc/HTML/en/kstars/ecliptic.docbook
 share/doc/HTML/en/kstars/ellipticalgalaxies.docbook
+share/doc/HTML/en/kstars/epoch.docbook
 share/doc/HTML/en/kstars/equinox.docbook
+share/doc/HTML/en/kstars/execute_session_nt.png
+share/doc/HTML/en/kstars/execute_session_the_nt.png
 share/doc/HTML/en/kstars/faq.docbook
 share/doc/HTML/en/kstars/find.png
 share/doc/HTML/en/kstars/fitsarea.png
@@ -401,8 +416,7 @@ share/doc/HTML/en/kstars/luminosity_ex.png
 share/doc/HTML/en/kstars/magnitude.docbook
 share/doc/HTML/en/kstars/meridian.docbook
 share/doc/HTML/en/kstars/newfov.png
-share/doc/HTML/en/kstars/observinglist.docbook
-share/doc/HTML/en/kstars/observinglist.png
+share/doc/HTML/en/kstars/obsplanner.docbook
 share/doc/HTML/en/kstars/parallax.docbook
 share/doc/HTML/en/kstars/popup.png
 share/doc/HTML/en/kstars/precession.docbook
@@ -411,6 +425,7 @@ share/doc/HTML/en/kstars/retrograde.docbook
 share/doc/HTML/en/kstars/screen1.png
 share/doc/HTML/en/kstars/scriptbuilder.docbook
 share/doc/HTML/en/kstars/scriptbuilder.png
+share/doc/HTML/en/kstars/sds.png
 share/doc/HTML/en/kstars/sidereal.docbook
 share/doc/HTML/en/kstars/skycoords.docbook
 share/doc/HTML/en/kstars/skymapdevice.png
@@ -419,6 +434,7 @@ share/doc/HTML/en/kstars/solarsystem.png
 share/doc/HTML/en/kstars/spiralgalaxies.docbook
 share/doc/HTML/en/kstars/star_colors.png
 share/doc/HTML/en/kstars/stars.docbook
+share/doc/HTML/en/kstars/telescopes.docbook
 share/doc/HTML/en/kstars/timezones.docbook
 share/doc/HTML/en/kstars/tools.docbook
 share/doc/HTML/en/kstars/utime.docbook
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index bc441595638b..190262de5c06 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	astro kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Virtual globe and world atlas for KDE
@@ -14,10 +14,10 @@ CONFLICTS=	kdeedu-4.4.[0-4]
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USES=		cmake:outsource
-USE_QT4=	dbus declarative gui network \
-		phonon script sql svg webkit xml \
+USE_QT4=	corelib dbus declarative designer_build gui network phonon \
+		qtestlib script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
-USE_XZ=	yes
+USE_XZ=		yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/astro/marble/distinfo b/astro/marble/distinfo
index d5fd5ab64762..3fe5138c7328 100644
--- a/astro/marble/distinfo
+++ b/astro/marble/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/marble-4.9.5.tar.xz) = f9c5dba318050d771b174b1f76cd006da3d87a93647ab1220cc573905ad24ede
-SIZE (KDE/marble-4.9.5.tar.xz) = 19931340
+SHA256 (KDE/4.10.1/marble-4.10.1.tar.xz) = 112d09761052650498e114534312f234b241cf81f2283322f6d55728d27b6c72
+SIZE (KDE/4.10.1/marble-4.10.1.tar.xz) = 19462736
diff --git a/astro/marble/pkg-plist b/astro/marble/pkg-plist
index 383ec6f87fc5..bf1e4a2a865f 100644
--- a/astro/marble/pkg-plist
+++ b/astro/marble/pkg-plist
@@ -10,9 +10,11 @@ include/marble/AbstractProjection.h
 include/marble/AbstractWorkerThread.h
 include/marble/AlternativeRoutesModel.h
 include/marble/AutoNavigation.h
+include/marble/BillboardGraphicsItem.h
 include/marble/BookmarkManager.h
 include/marble/ClipPainter.h
 include/marble/CurrentLocationWidget.h
+include/marble/CylindricalProjection.h
 include/marble/DialogConfigurationInterface.h
 include/marble/DownloadRegion.h
 include/marble/DownloadRegionDialog.h
@@ -109,6 +111,7 @@ include/marble/SunLocator.h
 include/marble/TileCoordsPyramid.h
 include/marble/TileCreator.h
 include/marble/TileCreatorDialog.h
+include/marble/TileId.h
 include/marble/TileLevelRangeWidget.h
 include/marble/TinyWebBrowser.h
 include/marble/ViewportParams.h
@@ -120,6 +123,7 @@ lib/kde4/libmarble_part.so
 lib/kde4/plasma_applet_worldclock.so
 lib/kde4/plasma_runner_marble.so
 lib/kde4/plugins/marble/AprsPlugin.so
+lib/kde4/plugins/marble/AtmospherePlugin.so
 lib/kde4/plugins/marble/CachePlugin.so
 lib/kde4/plugins/marble/CompassFloatItem.so
 lib/kde4/plugins/marble/CrosshairsPlugin.so
@@ -127,6 +131,7 @@ lib/kde4/plugins/marble/EarthquakePlugin.so
 lib/kde4/plugins/marble/ElevationProfileFloatItem.so
 lib/kde4/plugins/marble/ElevationProfileMarker.so
 lib/kde4/plugins/marble/FlightGearPositionProviderPlugin.so
+lib/kde4/plugins/marble/FoursquarePlugin.so
 lib/kde4/plugins/marble/GosmoreReverseGeocodingPlugin.so
 lib/kde4/plugins/marble/GosmoreRoutingPlugin.so
 lib/kde4/plugins/marble/GpsInfo.so
@@ -134,6 +139,7 @@ lib/kde4/plugins/marble/GpsInfo.so
 lib/kde4/plugins/marble/GpxPlugin.so
 lib/kde4/plugins/marble/GraticulePlugin.so
 lib/kde4/plugins/marble/HostipPlugin.so
+lib/kde4/plugins/marble/JsonPlugin.so
 lib/kde4/plugins/marble/KmlPlugin.so
 lib/kde4/plugins/marble/LatLonPlugin.so
 lib/kde4/plugins/marble/LocalDatabasePlugin.so
@@ -169,9 +175,12 @@ 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.14.0
-lib/libmarblewidget.so.14
+lib/libmarblewidget.so.0.15.0
+lib/libmarblewidget.so.15
 share/applications/kde4/marble.desktop
+share/applications/kde4/marble_gpx.desktop
+share/applications/kde4/marble_kml.desktop
+share/applications/kde4/marble_osm.desktop
 share/apps/cmake/modules/FindMarble.cmake
 share/apps/marble/data/LICENSE.txt
 share/apps/marble/data/audio/KDE-Sys-App-Positive.ogg
@@ -212,6 +221,15 @@ share/apps/marble/data/bitmaps/earth_apollo.jpg
 share/apps/marble/data/bitmaps/flag.png
 share/apps/marble/data/bitmaps/folder.png
 share/apps/marble/data/bitmaps/hand.png
+share/apps/marble/data/bitmaps/highway_footway.png
+share/apps/marble/data/bitmaps/highway_motorway.png
+share/apps/marble/data/bitmaps/highway_path.png
+share/apps/marble/data/bitmaps/highway_primary.png
+share/apps/marble/data/bitmaps/highway_secondary.png
+share/apps/marble/data/bitmaps/highway_tertiary.png
+share/apps/marble/data/bitmaps/highway_track.png
+share/apps/marble/data/bitmaps/highway_trunk.png
+share/apps/marble/data/bitmaps/highway_unclassified.png
 share/apps/marble/data/bitmaps/lake.png
 share/apps/marble/data/bitmaps/manned_landing.png
 share/apps/marble/data/bitmaps/mountain_1.png
@@ -282,6 +300,7 @@ share/apps/marble/data/bitmaps/robotic_rover.png
 share/apps/marble/data/bitmaps/routing_pick.png
 share/apps/marble/data/bitmaps/routing_remove.png
 share/apps/marble/data/bitmaps/routing_step.png
+share/apps/marble/data/bitmaps/satellite.png
 share/apps/marble/data/bitmaps/shipwreck.png
 share/apps/marble/data/bitmaps/turn-around.png
 share/apps/marble/data/bitmaps/turn-continue.png
@@ -830,6 +849,7 @@ share/apps/marble/data/svg/marble-logo-inverted-32dpi.png
 share/apps/marble/data/svg/marble-logo-inverted-72dpi.png
 share/apps/marble/data/svg/marble-logo.png
 share/apps/marble/data/svg/marble-logo.svg
+share/apps/marble/data/svg/sun.png
 share/apps/marble/data/svg/sunshine.png
 share/apps/marble/data/svg/track_turtle.svg
 share/apps/marble/data/svg/wikipedia.svg
@@ -896,8 +916,16 @@ share/icons/hicolor/32x32/apps/marble.png
 share/icons/hicolor/48x48/apps/marble.png
 share/icons/hicolor/64x64/apps/marble.png
 share/kde4/services/marble_part.desktop
+share/kde4/services/marble_part_gpx.desktop
+share/kde4/services/marble_part_kml.desktop
+share/kde4/services/marble_part_osm.desktop
 share/kde4/services/plasma-applet-kworldclock.desktop
 share/kde4/services/plasma-runner-marble.desktop
+share/mime/application/x-esri-shape-index.xml
+share/mime/application/x-esri-shape.xml
+share/mime/application/x-gpx+xml.xml
+share/mime/application/x-osm+xml.xml
+share/mime/packages/geo.xml
 @dirrm share/doc/HTML/en/marble
 @dirrm share/apps/marble/data/weather
 @dirrm share/apps/marble/data/svg