The KDE/FreeBSD team is pleased to announce KDE Software Compilation

4.7.2. The official release notes can be found at:
http://kde.org/announcements/announce-4.7.2.php
This release ships with many improvements. Read more about them here:
http://FreeBSD.kde.org/news.php#itemKDESC472availableinports

We'd like to say thanks to all testers and contributors, especially to
lwhsu@ for his effort on hosting our test packages.

PR:		156293 [1]
		159219 [2]
		160164 [3]
Submitted by:	Oleg Sidorkin <osidorkin@gmail.com> [1]
		Alvaro Castillo <gobledb@gmail.com> [2]
		dkeav04@gmail.com [3]
Tested by:	exp-run via pav

4 files changed, 91 insertions, 84 deletions

diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index f95ef669831e..f11434898e7b 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -10,25 +10,36 @@ PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	astro kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DISTNAME=	kdeedu-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Virtual globe and world atlas for KDE
 
-LIB_DEPENDS=	gps.20:${PORTSDIR}/astro/gpsd
+CONFLICTS=	kdeedu-4.4.[0-4]
 
-CONFLICTS=	kdeedu-4.5.[0-5]
-
-USE_BZIP2=	yes
-USE_CMAKE=	yes
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
-USE_LDCONFIG=	yes
-DISTINFO_FILE=	${PORTSDIR}/misc/kdeedu4/distinfo
+QT_COMPONENTS=	dbus declarative gui network \
+		phonon script sql svg webkit xml \
+		qmake_build moc_build rcc_build uic_build
+USE_BZIP2=	yes
+MAKE_JOBS_SAFE=	yes
+
+OPTIONS=	GPS "Support for GPS position provider" on
+
+.include <bsd.port.options.mk>
+
+.ifndef(WITHOUT_GPS)
+LIB_DEPENDS+=	gps.20:${PORTSDIR}/astro/gpsd
+PLIST_SUB+=	GPS=""
+.else
+CMAKE_ARGS+=	-DWITH_libgps:BOOL=FALSE
+PLIST_SUB+=	GPS="@comment "
+.endif
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/marble
-CMAKE_OUTSOURCE=	yes
+pre-configure:
+	${REINPLACE_CMD} -e '/libgps/ s/FIND_PACKAGE/macro_optional_find_package/' \
+		${WRKSRC}/src/plugins/positionprovider/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/astro/marble/distinfo b/astro/marble/distinfo
new file mode 100644
index 000000000000..52b07a10df31
--- /dev/null
+++ b/astro/marble/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/marble-4.7.2.tar.bz2) = d9d9d8f522f6fead4c2a13afd1f76ec03ee87a37d4b8d35a6b20cf6fa11633c4
+SIZE (KDE/marble-4.7.2.tar.bz2) = 21066804
diff --git a/astro/marble/files/patch-src-plugins-positionprovider-gpsd-GpsdConnection.cpp b/astro/marble/files/patch-src-plugins-positionprovider-gpsd-GpsdConnection.cpp
deleted file mode 100644
index 58546cdcdd21..000000000000
--- a/astro/marble/files/patch-src-plugins-positionprovider-gpsd-GpsdConnection.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
---- ./src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig	2011-03-22 18:32:49.000000000 +0300
-+++ ./src/plugins/positionprovider/gpsd/GpsdConnection.cpp	2011-03-22 19:24:18.000000000 +0300
-@@ -18,7 +18,8 @@
- 
- GpsdConnection::GpsdConnection( QObject* parent )
-     : QObject( parent ),
--      m_timer( 0 )
-+      m_timer( 0 ),
-+      m_gpsd("localhost", DEFAULT_GPSD_PORT)
- {
-     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
- }
-@@ -26,15 +27,15 @@
- void GpsdConnection::initialize()
- {
-     m_timer.stop();
--    gps_data_t* data = m_gpsd.open();
--    if ( data ) {
-+#if 0	/* I don't see error handling in the new libgpsmm API */
-+    if ( m_gpsd.to_user != NULL ) {
-+#endif
-         m_status = PositionProviderStatusAcquiring;
-         emit statusChanged( m_status );
- 
--#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( WATCH_ENABLE )
-         m_gpsd.stream( WATCH_ENABLE );
--#endif
-         m_timer.start( 1000 );
-+#if 0
-     }
-     else {
-         // There is also gps_errstr() for libgps version >= 2.90,
-@@ -68,28 +69,17 @@
- 
-         mDebug() << "Connection to gpsd failed, no position info available: " << m_error;
-     }
-+#endif
- }
- 
- void GpsdConnection::update()
- {
--#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
--    if ( m_gpsd.waiting() ) {
--        gps_data_t* data = m_gpsd.poll();
-+    if ( m_gpsd.waiting(5000000) ) {
-+        gps_data_t* data = m_gpsd.read();
-         if ( data && data->set & PACKET_SET ) {
-             emit gpsdInfo( *data );
-         }
-     }
--#else
--    gps_data_t* data = m_gpsd.query( "o" );
--
--    if ( data ) {
--        emit gpsdInfo( *data );
--    }
--    else if ( m_status != PositionProviderStatusAcquiring ) {
--        mDebug() << "Lost connection to gpsd, trying to re-open.";
--        initialize();
--    }
--#endif
- }
- 
- QString GpsdConnection::error() const
diff --git a/astro/marble/pkg-plist b/astro/marble/pkg-plist
index 9129eb205ad7..c7a25e99ae9a 100644
--- a/astro/marble/pkg-plist
+++ b/astro/marble/pkg-plist
@@ -9,6 +9,7 @@ include/marble/AbstractFloatItem.h
 include/marble/AbstractMarbleGraphicsLayout.h
 include/marble/AbstractProjection.h
 include/marble/AbstractWorkerThread.h
+include/marble/BookmarkManager.h
 include/marble/ClipPainter.h
 include/marble/CurrentLocationWidget.h
 include/marble/DownloadRegionDialog.h
@@ -54,16 +55,17 @@ include/marble/LayerInterface.h
 include/marble/LegendWidget.h
 include/marble/MapThemeManager.h
 include/marble/MapViewWidget.h
+include/marble/MapWizard.h
 include/marble/MarbleAboutDialog.h
 include/marble/MarbleAbstractRunner.h
 include/marble/MarbleControlBox.h
-include/marble/MarbleDataFacade.h
 include/marble/MarbleDirs.h
 include/marble/MarbleGraphicsGridLayout.h
 include/marble/MarbleGraphicsItem.h
 include/marble/MarbleMap.h
 include/marble/MarbleModel.h
 include/marble/MarbleNavigator.h
+include/marble/MarbleRunnerManager.h
 include/marble/MarbleWidget.h
 include/marble/MarbleWidgetInputHandler.h
 include/marble/MercatorProjection.h
@@ -99,16 +101,19 @@ lib/kde4/plasma_applet_worldclock.so
 lib/kde4/plugins/marble/AprsPlugin.so
 lib/kde4/plugins/marble/CompassFloatItem.so
 lib/kde4/plugins/marble/CrosshairsPlugin.so
+lib/kde4/plugins/marble/EarthquakePlugin.so
 lib/kde4/plugins/marble/GosmorePlugin.so
-lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
+%%GPS%%lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
 lib/kde4/plugins/marble/GraticulePlugin.so
 lib/kde4/plugins/marble/HostipPlugin.so
 lib/kde4/plugins/marble/LatLonPlugin.so
 lib/kde4/plugins/marble/LocalDatabasePlugin.so
+lib/kde4/plugins/marble/LocalOsmSearchPlugin.so
 lib/kde4/plugins/marble/MapScaleFloatItem.so
 lib/kde4/plugins/marble/MonavPlugin.so
 lib/kde4/plugins/marble/NavigationFloatItem.so
 lib/kde4/plugins/marble/NominatimPlugin.so
+lib/kde4/plugins/marble/OpenDesktopPlugin.so
 lib/kde4/plugins/marble/OpenRouteServicePlugin.so
 lib/kde4/plugins/marble/OverviewMap.so
 lib/kde4/plugins/marble/Photo.so
@@ -124,13 +129,16 @@ lib/kde4/plugins/marble/YoursPlugin.so
 lib/kde4/plugins/marble/org/kde/edu/marble/libMarbleDeclarativePlugin.so
 lib/kde4/plugins/marble/org/kde/edu/marble/qmldir
 lib/libmarblewidget.so
-lib/libmarblewidget.so.0.11.0
-lib/libmarblewidget.so.11
+lib/libmarblewidget.so.0.12.0
+lib/libmarblewidget.so.12
 share/applications/kde4/marble.desktop
 share/apps/cmake/modules/FindMarble.cmake
 share/apps/marble/data/LICENSE.txt
+share/apps/marble/data/audio/KDE-Sys-App-Positive.ogg
+share/apps/marble/data/audio/KDE-Sys-List-End.ogg
 share/apps/marble/data/bitmaps/airport.png
 share/apps/marble/data/bitmaps/annotation.png
+share/apps/marble/data/bitmaps/bookmark.png
 share/apps/marble/data/bitmaps/border_1.png
 share/apps/marble/data/bitmaps/border_2.png
 share/apps/marble/data/bitmaps/city_1_orange.png
@@ -161,6 +169,7 @@ share/apps/marble/data/bitmaps/cursor_tl.xpm
 share/apps/marble/data/bitmaps/cursor_tr.xpm
 share/apps/marble/data/bitmaps/default_location.png
 share/apps/marble/data/bitmaps/earth_apollo.jpg
+share/apps/marble/data/bitmaps/folder.png
 share/apps/marble/data/bitmaps/hand.png
 share/apps/marble/data/bitmaps/lake.png
 share/apps/marble/data/bitmaps/manned_landing.png
@@ -170,6 +179,51 @@ share/apps/marble/data/bitmaps/observatory.png
 share/apps/marble/data/bitmaps/ocean.png
 share/apps/marble/data/bitmaps/osm.png
 share/apps/marble/data/bitmaps/other.png
+share/apps/marble/data/bitmaps/poi/accommodation_camping.p.16.png
+share/apps/marble/data/bitmaps/poi/accommodation_hostel.p.16.png
+share/apps/marble/data/bitmaps/poi/accommodation_hotel2.p.16.png
+share/apps/marble/data/bitmaps/poi/accommodation_motel.p.16.png
+share/apps/marble/data/bitmaps/poi/accommodation_youth_hostel.p.16.png
+share/apps/marble/data/bitmaps/poi/amenity_library.p.16.png
+share/apps/marble/data/bitmaps/poi/education_college.p.16.png
+share/apps/marble/data/bitmaps/poi/education_school.p.16.png
+share/apps/marble/data/bitmaps/poi/education_university.p.16.png
+share/apps/marble/data/bitmaps/poi/food_bar.p.16.png
+share/apps/marble/data/bitmaps/poi/food_biergarten.p.16.png
+share/apps/marble/data/bitmaps/poi/food_cafe.p.16.png
+share/apps/marble/data/bitmaps/poi/food_fastfood2.p.16.png
+share/apps/marble/data/bitmaps/poi/food_pub.p.16.png
+share/apps/marble/data/bitmaps/poi/food_restaurant.p.16.png
+share/apps/marble/data/bitmaps/poi/health_doctors2.p.16.png
+share/apps/marble/data/bitmaps/poi/health_hospital.p.16.png
+share/apps/marble/data/bitmaps/poi/health_pharmacy.p.16.png
+share/apps/marble/data/bitmaps/poi/money_atm2.p.16.png
+share/apps/marble/data/bitmaps/poi/money_bank2.p.16.png
+share/apps/marble/data/bitmaps/poi/shopping_alcohol.p.16.png
+share/apps/marble/data/bitmaps/poi/shopping_hifi.p.16.png
+share/apps/marble/data/bitmaps/poi/shopping_supermarket.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_attraction.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_castle2.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_cinema.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_monument.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_museum.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_ruin.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_theatre.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_theme_park.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_view_point.p.16.png
+share/apps/marble/data/bitmaps/poi/tourist_zoo.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_aerodrome.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_airport_terminal.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_bus_station.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_bus_stop.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_car_share.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_fuel.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_parking.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_rental_bicycle.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_rental_car.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_taxi_rank.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_train_station.p.16.png
+share/apps/marble/data/bitmaps/poi/transport_tram_stop.p.16.png
 share/apps/marble/data/bitmaps/pole_1.png
 share/apps/marble/data/bitmaps/pole_2.png
 share/apps/marble/data/bitmaps/river.png
@@ -462,6 +516,7 @@ share/apps/marble/data/maps/earth/citylights/legend/lightterrain.png
 share/apps/marble/data/maps/earth/citylights/legend/water.png
 share/apps/marble/data/maps/earth/clouds/0/000000/000000_000000.jpg
 share/apps/marble/data/maps/earth/clouds/0/000000/000000_000001.jpg
+share/apps/marble/data/maps/earth/hillshading/0/0/0.png
 share/apps/marble/data/maps/earth/openstreetmap/0/0/0.png
 share/apps/marble/data/maps/earth/openstreetmap/legend.html
 share/apps/marble/data/maps/earth/openstreetmap/legend/airportapron.png
@@ -700,7 +755,6 @@ share/apps/marble/data/mwdbii/RIVER.PNT
 share/apps/marble/data/placemarks/baseplacemarks.cache
 share/apps/marble/data/placemarks/boundaryplacemarks.cache
 share/apps/marble/data/placemarks/cityplacemarks.cache
-share/apps/marble/data/placemarks/cityplacemarks_large_population.cache
 share/apps/marble/data/placemarks/elevplacemarks.cache
 share/apps/marble/data/placemarks/moonlandingsites.cache
 share/apps/marble/data/placemarks/moonterrain.cache
@@ -711,7 +765,6 @@ share/apps/marble/data/stars/stars.dat
 share/apps/marble/data/svg/application-x-marble-gray.png
 share/apps/marble/data/svg/application-x-marble.png
 share/apps/marble/data/svg/application-x-marble.svg
-share/apps/marble/data/svg/compass.svg
 share/apps/marble/data/svg/coordinate.svg
 share/apps/marble/data/svg/lunarmap.svg
 share/apps/marble/data/svg/marble-logo-32dpi.png
@@ -721,6 +774,7 @@ 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/sunshine.png
+share/apps/marble/data/svg/track_turtle.svg
 share/apps/marble/data/svg/wikipedia.svg
 share/apps/marble/data/svg/wikipedia_shadow.svg
 share/apps/marble/data/svg/worldmap.svg
@@ -752,8 +806,8 @@ share/apps/marble/data/weather/weather-storm-night.png
 share/apps/marble/data/weather/weather-storm.png
 share/apps/marble/data/weather/wind-arrows.svgz
 share/apps/marble/marble.knsrc
+share/apps/marble/marble_part.rc
 share/apps/marble/marbleui.rc
-share/apps/marble_part/marble_part.rc
 share/config.kcfg/marble.kcfg
 share/doc/HTML/en/marble/common
 share/doc/HTML/en/marble/configure-cacheproxy.png
@@ -787,7 +841,6 @@ share/icons/hicolor/64x64/apps/marble.png
 share/kde4/services/marble_part.desktop
 share/kde4/services/plasma-applet-kworldclock.desktop
 @dirrm share/doc/HTML/en/marble
-@dirrm share/apps/marble_part
 @dirrm share/apps/marble/data/weather
 @dirrm share/apps/marble/data/svg
 @dirrm share/apps/marble/data/stars
@@ -826,6 +879,9 @@ share/kde4/services/plasma-applet-kworldclock.desktop
 @dirrm share/apps/marble/data/maps/earth/openstreetmap/0/0
 @dirrm share/apps/marble/data/maps/earth/openstreetmap/0
 @dirrm share/apps/marble/data/maps/earth/openstreetmap
+@dirrm share/apps/marble/data/maps/earth/hillshading/0/0
+@dirrm share/apps/marble/data/maps/earth/hillshading/0
+@dirrm share/apps/marble/data/maps/earth/hillshading
 @dirrm share/apps/marble/data/maps/earth/clouds/0/000000
 @dirrm share/apps/marble/data/maps/earth/clouds/0
 @dirrm share/apps/marble/data/maps/earth/clouds
@@ -837,7 +893,9 @@ share/kde4/services/plasma-applet-kworldclock.desktop
 @dirrm share/apps/marble/data/maps
 @dirrm share/apps/marble/data/licenses
 @dirrm share/apps/marble/data/flags
+@dirrm share/apps/marble/data/bitmaps/poi
 @dirrm share/apps/marble/data/bitmaps
+@dirrm share/apps/marble/data/audio
 @dirrm share/apps/marble/data
 @dirrm share/apps/marble
 @dirrm lib/kde4/plugins/marble/org/kde/edu/marble