KDE/FreeBSD team presents long awaited KDE SC 4.8.3!

kdeaccessibility4 and kdeutils4 are now meta ports. deskutils/kdepim4 updated
to match KDE SC version, old kdepim preserved in deskutils/kdepim44.

Follow UPDATING instruction!

New ports:
- accessibility/kaccessible
- accessibility/kmag
- accessibility/kmousetool
- accessibility/kmouth
- archivers/ark
- comms/kremotecontrol
- deskutils/kcharselect
- deskutils/kdepim44
- deskutils/kdepim44-runtime
- deskutils/superkaramba
- devel/kdebindings4-perl-perlkde
- devel/kdebindings4-perl-perlqt
- math/analitza
- math/kcalc
- misc/kde4-l10n-fa
- security/kgpg-kde4
- security/kwallet
- sysutils/kdf
- sysutils/kfloppy
- sysutils/sweeper
- vietnamese/kde4-l10n
- x11-clocks/ktimer
- x11/kactivities
- x11/libkonq

Removed ports:
- devel/kdebindings4-kross-interpreters
- devel/kdebindings4-python
- devel/kdebindings4-ruby
- devel/kdebindings4-smoke

6 files changed, 93 insertions, 14 deletions

diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 05f35ba74d73..c93bdd4e97c0 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	marble
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -24,9 +23,10 @@ USE_QT_VER=	4
 QT_COMPONENTS=	dbus declarative gui network \
 		phonon script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
+CMAKE_ARGS=	-DMOBILE:BOOL=FALSE
 
 OPTIONS=	GPS "Support for GPS position provider" on
 
diff --git a/astro/marble/distinfo b/astro/marble/distinfo
index 178c19a889e4..594d34c926cf 100644
--- a/astro/marble/distinfo
+++ b/astro/marble/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/marble-4.7.4.tar.bz2) = e6a735cceca8cb2df9bff7c79b7af35dca4c3f2a5f5d3cff2847e34acd95d40b
-SIZE (KDE/marble-4.7.4.tar.bz2) = 21068089
+SHA256 (KDE/marble-4.8.3.tar.xz) = 1aae47e3c5365fc922d0c0e50aded329930f43be43c19d35345c8c20c8aff9a8
+SIZE (KDE/marble-4.8.3.tar.xz) = 19899712
diff --git a/astro/marble/files/patch-src__CMakeLists.txt b/astro/marble/files/patch-src__CMakeLists.txt
new file mode 100644
index 000000000000..55364f663298
--- /dev/null
+++ b/astro/marble/files/patch-src__CMakeLists.txt
@@ -0,0 +1,23 @@
+--- ./src/CMakeLists.txt.orig	2012-02-29 22:57:03.966438000 +0000
++++ ./src/CMakeLists.txt	2012-05-22 15:24:05.892577235 +0000
+@@ -8,7 +8,7 @@
+ add_definitions(-DMARBLE_DBUS)
+ endif(BUILD_WITH_DBUS)
+ 
+-if( QT_QTDECLARATIVE_FOUND )
++if( MOBILE AND QT_QTDECLARATIVE_FOUND )
+   OPTION(IGNORE_CMAKE_INSTALL_PREFIX_FOR_DECLARATIVE_PLUGINS "Install Marble Qt Declarative plugins to QT_IMPORTS_DIR even if that is out of the CMAKE_INSTALL_PREFIX")
+   IF(DEFINED QT_IMPORTS_DIR)
+     SET(MARBLE_QT_IMPORTS_DIR ${QT_IMPORTS_DIR})
+@@ -44,9 +44,9 @@
+ add_subdirectory( plugins )
+ add_subdirectory( bindings )
+ 
+-if( QT_QTDECLARATIVE_FOUND )
++if( MOBILE AND QT_QTDECLARATIVE_FOUND )
+     add_subdirectory( qt-components )
+-endif( QT_QTDECLARATIVE_FOUND )
++endif( MOBILE AND QT_QTDECLARATIVE_FOUND )
+ 
+ if( NOT QTONLY AND KDE4_PLASMA_LIBS )   # don't try to build this against kdelibs < 4.2
+    add_subdirectory( plasmoid )
diff --git a/astro/marble/files/patch-src__plugins__CMakeLists.txt b/astro/marble/files/patch-src__plugins__CMakeLists.txt
new file mode 100644
index 000000000000..8638849b2523
--- /dev/null
+++ b/astro/marble/files/patch-src__plugins__CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./src/plugins/CMakeLists.txt.orig	2011-12-20 19:19:11.000000000 +0000
++++ ./src/plugins/CMakeLists.txt	2012-05-22 15:24:05.930574748 +0000
+@@ -6,6 +6,6 @@
+ add_subdirectory( templates )
+ add_subdirectory( positionprovider )
+ 
+-if( QT_QTDECLARATIVE_FOUND )
++if( MOBILE AND QT_QTDECLARATIVE_FOUND )
+     add_subdirectory( qt-components )
+-endif( QT_QTDECLARATIVE_FOUND )
++endif( MOBILE AND QT_QTDECLARATIVE_FOUND )
diff --git a/astro/marble/files/patch-src__plugins__declarative__CMakeLists.txt b/astro/marble/files/patch-src__plugins__declarative__CMakeLists.txt
new file mode 100644
index 000000000000..ba2ddfabf7e9
--- /dev/null
+++ b/astro/marble/files/patch-src__plugins__declarative__CMakeLists.txt
@@ -0,0 +1,14 @@
+--- ./src/plugins/declarative/CMakeLists.txt.orig	2011-12-20 19:19:11.000000000 +0000
++++ ./src/plugins/declarative/CMakeLists.txt	2012-05-22 15:24:05.905573771 +0000
+@@ -1,4 +1,4 @@
+-if( QT_QTDECLARATIVE_FOUND )
++if( MOBILE AND QT_QTDECLARATIVE_FOUND )
+ 
+ PROJECT( MarbleDeclarativePlugin )
+ 
+@@ -41,4 +41,4 @@
+ ENDIF()
+ INSTALL( FILES qmldir MarbleSettings.qml DESTINATION ${MARBLE_QT_IMPORTS_DIR}/org/kde/edu/marble )
+ 
+-endif( QT_QTDECLARATIVE_FOUND )
++endif( MOBILE AND QT_QTDECLARATIVE_FOUND )
diff --git a/astro/marble/pkg-plist b/astro/marble/pkg-plist
index c7a25e99ae9a..5646928877d5 100644
--- a/astro/marble/pkg-plist
+++ b/astro/marble/pkg-plist
@@ -1,4 +1,3 @@
-bin/geodatatest
 bin/marble
 bin/routing-instructions
 bin/tilecreator
@@ -9,10 +8,12 @@ include/marble/AbstractFloatItem.h
 include/marble/AbstractMarbleGraphicsLayout.h
 include/marble/AbstractProjection.h
 include/marble/AbstractWorkerThread.h
+include/marble/AlternativeRoutesModel.h
 include/marble/BookmarkManager.h
 include/marble/ClipPainter.h
 include/marble/CurrentLocationWidget.h
 include/marble/DownloadRegionDialog.h
+include/marble/ElevationModel.h
 include/marble/EquirectProjection.h
 include/marble/FileViewWidget.h
 include/marble/FrameGraphicsItem.h
@@ -47,12 +48,14 @@ include/marble/GeoDataStyleMap.h
 include/marble/GeoDataStyleSelector.h
 include/marble/GeoDocument.h
 include/marble/GeoGraphicsItem.h
+include/marble/GeoGraphicsScene.h
 include/marble/GeoPainter.h
 include/marble/LabelGraphicsItem.h
 include/marble/LatLonBoxWidget.h
 include/marble/LatLonEdit.h
 include/marble/LayerInterface.h
 include/marble/LegendWidget.h
+include/marble/Maneuver.h
 include/marble/MapThemeManager.h
 include/marble/MapViewWidget.h
 include/marble/MapWizard.h
@@ -78,7 +81,12 @@ include/marble/QtMarbleConfigDialog.h
 include/marble/Quaternion.h
 include/marble/RenderPlugin.h
 include/marble/RenderPluginInterface.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/RoutingWidget.h
 include/marble/RunnerPlugin.h
 include/marble/ScreenGraphicsItem.h
@@ -90,7 +98,6 @@ include/marble/TileCreator.h
 include/marble/TileCreatorDialog.h
 include/marble/TileLevelRangeWidget.h
 include/marble/TinyWebBrowser.h
-include/marble/ViewParams.h
 include/marble/ViewportParams.h
 include/marble/WidgetGraphicsItem.h
 include/marble/geodata_export.h
@@ -98,14 +105,20 @@ include/marble/global.h
 include/marble/marble_export.h
 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/CachePlugin.so
 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/GpsInfo.so
 %%GPS%%lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
+lib/kde4/plugins/marble/GpxPlugin.so
 lib/kde4/plugins/marble/GraticulePlugin.so
 lib/kde4/plugins/marble/HostipPlugin.so
+lib/kde4/plugins/marble/KmlPlugin.so
 lib/kde4/plugins/marble/LatLonPlugin.so
 lib/kde4/plugins/marble/LocalDatabasePlugin.so
 lib/kde4/plugins/marble/LocalOsmSearchPlugin.so
@@ -115,22 +128,26 @@ 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/OsmPlugin.so
 lib/kde4/plugins/marble/OverviewMap.so
 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/ProgressFloatItem.so
 lib/kde4/plugins/marble/QNamNetworkPlugin.so
 lib/kde4/plugins/marble/RoutingPlugin.so
 lib/kde4/plugins/marble/RoutinoPlugin.so
+lib/kde4/plugins/marble/SatellitesPlugin.so
+lib/kde4/plugins/marble/Speedometer.so
 lib/kde4/plugins/marble/StarsPlugin.so
+lib/kde4/plugins/marble/SunPlugin.so
 lib/kde4/plugins/marble/Weather.so
 lib/kde4/plugins/marble/Wikipedia.so
 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.12.0
-lib/libmarblewidget.so.12
+lib/libmarblewidget.so.0.13.0
+lib/libmarblewidget.so.13
 share/applications/kde4/marble.desktop
 share/apps/cmake/modules/FindMarble.cmake
 share/apps/marble/data/LICENSE.txt
@@ -169,6 +186,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/flag.png
 share/apps/marble/data/bitmaps/folder.png
 share/apps/marble/data/bitmaps/hand.png
 share/apps/marble/data/bitmaps/lake.png
@@ -199,6 +217,16 @@ 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/place_of_worship_bahai3.p.16.png
+share/apps/marble/data/bitmaps/poi/place_of_worship_buddhist3.p.16.png
+share/apps/marble/data/bitmaps/poi/place_of_worship_christian3.p.16.png
+share/apps/marble/data/bitmaps/poi/place_of_worship_hindu3.p.16.png
+share/apps/marble/data/bitmaps/poi/place_of_worship_islamic3.p.16.png
+share/apps/marble/data/bitmaps/poi/place_of_worship_jain3.p.16.png
+share/apps/marble/data/bitmaps/poi/place_of_worship_jewish3.p.16.png
+share/apps/marble/data/bitmaps/poi/place_of_worship_shinto3.p.16.png
+share/apps/marble/data/bitmaps/poi/place_of_worship_sikh3.p.16.png
+share/apps/marble/data/bitmaps/poi/place_of_worship_unknown3.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
@@ -733,6 +761,9 @@ share/apps/marble/data/maps/earth/srtm/3/000007/000007_000014.jpg
 share/apps/marble/data/maps/earth/srtm/3/000007/000007_000015.jpg
 share/apps/marble/data/maps/earth/srtm/srtm-preview.png
 share/apps/marble/data/maps/earth/srtm/srtm.dgml
+share/apps/marble/data/maps/earth/srtm2/0/000000/000000_000000.png
+share/apps/marble/data/maps/earth/srtm2/0/000000/000000_000001.png
+share/apps/marble/data/maps/earth/srtm2/srtm2.dgml
 share/apps/marble/data/maps/earth/temp-dec/temp-dec-preview.png
 share/apps/marble/data/maps/earth/temp-dec/temp-dec.dgml
 share/apps/marble/data/maps/earth/temp-dec/temp-dec.jpg
@@ -840,6 +871,7 @@ share/icons/hicolor/48x48/apps/marble.png
 share/icons/hicolor/64x64/apps/marble.png
 share/kde4/services/marble_part.desktop
 share/kde4/services/plasma-applet-kworldclock.desktop
+share/kde4/services/plasma-runner-marble.desktop
 @dirrm share/doc/HTML/en/marble
 @dirrm share/apps/marble/data/weather
 @dirrm share/apps/marble/data/svg
@@ -850,6 +882,9 @@ share/kde4/services/plasma-applet-kworldclock.desktop
 @dirrm share/apps/marble/data/maps/moon
 @dirrm share/apps/marble/data/maps/earth/temp-july
 @dirrm share/apps/marble/data/maps/earth/temp-dec
+@dirrm share/apps/marble/data/maps/earth/srtm2/0/000000
+@dirrm share/apps/marble/data/maps/earth/srtm2/0
+@dirrm share/apps/marble/data/maps/earth/srtm2
 @dirrm share/apps/marble/data/maps/earth/srtm/3/000007
 @dirrm share/apps/marble/data/maps/earth/srtm/3/000006
 @dirrm share/apps/marble/data/maps/earth/srtm/3/000005
@@ -898,9 +933,5 @@ share/kde4/services/plasma-applet-kworldclock.desktop
 @dirrm share/apps/marble/data/audio
 @dirrm share/apps/marble/data
 @dirrm share/apps/marble
-@dirrm lib/kde4/plugins/marble/org/kde/edu/marble
-@dirrm lib/kde4/plugins/marble/org/kde/edu
-@dirrm lib/kde4/plugins/marble/org/kde
-@dirrm lib/kde4/plugins/marble/org
 @dirrm lib/kde4/plugins/marble
 @dirrm include/marble