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

9 files changed, 575 insertions, 84 deletions

diff --git a/astro/Makefile b/astro/Makefile
index a6f83440a9d3..a0fa9d31e6ab 100644
--- a/astro/Makefile
+++ b/astro/Makefile
@@ -32,6 +32,7 @@
     SUBDIR += gpxloggerd
     SUBDIR += jday
     SUBDIR += josm
+    SUBDIR += kstars
     SUBDIR += libgal
     SUBDIR += libnova
     SUBDIR += libroadnav
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
new file mode 100644
index 000000000000..b6544abad548
--- /dev/null
+++ b/astro/kstars/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	kstars
+# Date created:				6 September 2011
+# Whom:					Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kstars
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	astro kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE 4 desktop planetarium
+
+LIB_DEPENDS=	cfitsio.0:${PORTSDIR}/astro/cfitsio
+
+BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2 \
+		xplanet:${PORTSDIR}/astro/xplanet
+
+RUN_DEPENDS=	xplanet:${PORTSDIR}/astro/xplanet
+
+CONFLICTS=	kdeedu-4.[0-6].*
+
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	opengl qmake_build moc_build rcc_build uic_build
+USE_BZIP2=	yes
+MAKE_JOBS_SAFE=	yes
+
+.include <bsd.port.mk>
diff --git a/astro/kstars/distinfo b/astro/kstars/distinfo
new file mode 100644
index 000000000000..f1e1373c97ee
--- /dev/null
+++ b/astro/kstars/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/kstars-4.7.2.tar.bz2) = dd27e35642710dc34d59c4f12635f628243cf280e573cf7cf24ce6035f5cad8f
+SIZE (KDE/kstars-4.7.2.tar.bz2) = 13123677
diff --git a/astro/kstars/pkg-descr b/astro/kstars/pkg-descr
new file mode 100644
index 000000000000..da47f58db6b9
--- /dev/null
+++ b/astro/kstars/pkg-descr
@@ -0,0 +1,7 @@
+KStars is a desktop planetarium for KDE. It provides an accurate
+graphical simulation of the night sky, from any location on Earth, at
+any date and time. The display includes up to 100 million stars,
+13,000 deep-sky objects, all 8 planets, the Sun and Moon, and
+thousands of comets and asteroids.
+
+WWW:	http://edu.kde.org/kstars
diff --git a/astro/kstars/pkg-plist b/astro/kstars/pkg-plist
new file mode 100644
index 000000000000..7c550ed3be6a
--- /dev/null
+++ b/astro/kstars/pkg-plist
@@ -0,0 +1,440 @@
+bin/kstars
+lib/libhtmesh.a
+share/applications/kde4/kstars.desktop
+share/apps/kstars/Cities.dat
+share/apps/kstars/TZrules.dat
+share/apps/kstars/advinterface.dat
+share/apps/kstars/asteroids.dat
+share/apps/kstars/cbounds-3.idx
+share/apps/kstars/cbounds-4.idx
+share/apps/kstars/cbounds-5.idx
+share/apps/kstars/cbounds-6.idx
+share/apps/kstars/cbounds.dat
+share/apps/kstars/chart.colors
+share/apps/kstars/classic.colors
+share/apps/kstars/clines.dat
+share/apps/kstars/cnames.dat
+share/apps/kstars/comets.dat
+share/apps/kstars/defaultflag.gif
+share/apps/kstars/earth.B0.vsop
+share/apps/kstars/earth.B1.vsop
+share/apps/kstars/earth.B2.vsop
+share/apps/kstars/earth.B3.vsop
+share/apps/kstars/earth.B4.vsop
+share/apps/kstars/earth.L0.vsop
+share/apps/kstars/earth.L1.vsop
+share/apps/kstars/earth.L2.vsop
+share/apps/kstars/earth.L3.vsop
+share/apps/kstars/earth.L4.vsop
+share/apps/kstars/earth.L5.vsop
+share/apps/kstars/earth.R0.vsop
+share/apps/kstars/earth.R1.vsop
+share/apps/kstars/earth.R2.vsop
+share/apps/kstars/earth.R3.vsop
+share/apps/kstars/earth.R4.vsop
+share/apps/kstars/earth.R5.vsop
+share/apps/kstars/earth.orbit
+share/apps/kstars/fitsviewer.rc
+share/apps/kstars/geomap.png
+share/apps/kstars/glossary.xml
+share/apps/kstars/histogram.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_cbound.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_clines.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_cnames.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_deepsky.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_flag.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_grid.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_horizon.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_mw.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_planets.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_satellites.png
+share/apps/kstars/icons/hicolor/22x22/actions/kstars_stars.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_clines.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_cnames.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_deepsky.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_flag.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_grid.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_horizon.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_mw.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_planets.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_satellites.png
+share/apps/kstars/icons/hicolor/32x32/actions/kstars_stars.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_clines.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_cnames.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_deepsky.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_flag.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_grid.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_horizon.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_mw.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_planets.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_satellites.png
+share/apps/kstars/icons/hicolor/48x48/actions/kstars_stars.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_advanced.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_catalog.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_cbound.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_clines.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_cnames.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_colors.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_deepsky.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_flag.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_grid.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_guides.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_horizon.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_mw.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_planets.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_satellites.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_solarsystem.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_stars.png
+share/apps/kstars/icons/hicolor/64x64/actions/kstars_xplanet.png
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_cbound.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_clines.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_cnames.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_deepsky.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_grid.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_horizon.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_mw.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_planets.svgz
+share/apps/kstars/icons/hicolor/scalable/actions/kstars_stars.svgz
+share/apps/kstars/image_url.dat
+share/apps/kstars/info_url.dat
+share/apps/kstars/jupiter.B0.vsop
+share/apps/kstars/jupiter.B1.vsop
+share/apps/kstars/jupiter.B2.vsop
+share/apps/kstars/jupiter.B3.vsop
+share/apps/kstars/jupiter.B4.vsop
+share/apps/kstars/jupiter.B5.vsop
+share/apps/kstars/jupiter.L0.vsop
+share/apps/kstars/jupiter.L1.vsop
+share/apps/kstars/jupiter.L2.vsop
+share/apps/kstars/jupiter.L3.vsop
+share/apps/kstars/jupiter.L4.vsop
+share/apps/kstars/jupiter.L5.vsop
+share/apps/kstars/jupiter.R0.vsop
+share/apps/kstars/jupiter.R1.vsop
+share/apps/kstars/jupiter.R2.vsop
+share/apps/kstars/jupiter.R3.vsop
+share/apps/kstars/jupiter.R4.vsop
+share/apps/kstars/jupiter.R5.vsop
+share/apps/kstars/jupiter.orbit
+share/apps/kstars/kstars.png
+share/apps/kstars/kstarsui.rc
+share/apps/kstars/lmc.dat
+share/apps/kstars/mars.B0.vsop
+share/apps/kstars/mars.B1.vsop
+share/apps/kstars/mars.B2.vsop
+share/apps/kstars/mars.B3.vsop
+share/apps/kstars/mars.B4.vsop
+share/apps/kstars/mars.B5.vsop
+share/apps/kstars/mars.L0.vsop
+share/apps/kstars/mars.L1.vsop
+share/apps/kstars/mars.L2.vsop
+share/apps/kstars/mars.L3.vsop
+share/apps/kstars/mars.L4.vsop
+share/apps/kstars/mars.L5.vsop
+share/apps/kstars/mars.R0.vsop
+share/apps/kstars/mars.R1.vsop
+share/apps/kstars/mars.R2.vsop
+share/apps/kstars/mars.R3.vsop
+share/apps/kstars/mars.R4.vsop
+share/apps/kstars/mars.R5.vsop
+share/apps/kstars/mars.orbit
+share/apps/kstars/mercury.B0.vsop
+share/apps/kstars/mercury.B1.vsop
+share/apps/kstars/mercury.B2.vsop
+share/apps/kstars/mercury.B3.vsop
+share/apps/kstars/mercury.B4.vsop
+share/apps/kstars/mercury.B5.vsop
+share/apps/kstars/mercury.L0.vsop
+share/apps/kstars/mercury.L1.vsop
+share/apps/kstars/mercury.L2.vsop
+share/apps/kstars/mercury.L3.vsop
+share/apps/kstars/mercury.L4.vsop
+share/apps/kstars/mercury.L5.vsop
+share/apps/kstars/mercury.R0.vsop
+share/apps/kstars/mercury.R1.vsop
+share/apps/kstars/mercury.R2.vsop
+share/apps/kstars/mercury.R3.vsop
+share/apps/kstars/mercury.R4.vsop
+share/apps/kstars/mercury.R5.vsop
+share/apps/kstars/mercury.orbit
+share/apps/kstars/milkyway.dat
+share/apps/kstars/moonB.dat
+share/apps/kstars/moonLR.dat
+share/apps/kstars/moonless-night.colors
+share/apps/kstars/namedstars.dat
+share/apps/kstars/neptune.B0.vsop
+share/apps/kstars/neptune.B1.vsop
+share/apps/kstars/neptune.B2.vsop
+share/apps/kstars/neptune.B3.vsop
+share/apps/kstars/neptune.B4.vsop
+share/apps/kstars/neptune.B5.vsop
+share/apps/kstars/neptune.L0.vsop
+share/apps/kstars/neptune.L1.vsop
+share/apps/kstars/neptune.L2.vsop
+share/apps/kstars/neptune.L3.vsop
+share/apps/kstars/neptune.L4.vsop
+share/apps/kstars/neptune.L5.vsop
+share/apps/kstars/neptune.R0.vsop
+share/apps/kstars/neptune.R1.vsop
+share/apps/kstars/neptune.R2.vsop
+share/apps/kstars/neptune.R3.vsop
+share/apps/kstars/neptune.R4.vsop
+share/apps/kstars/neptune.orbit
+share/apps/kstars/ngcic.dat
+share/apps/kstars/night.colors
+share/apps/kstars/noimage.png
+share/apps/kstars/pluto.orbit
+share/apps/kstars/satellites.dat
+share/apps/kstars/saturn.B0.vsop
+share/apps/kstars/saturn.B1.vsop
+share/apps/kstars/saturn.B2.vsop
+share/apps/kstars/saturn.B3.vsop
+share/apps/kstars/saturn.B4.vsop
+share/apps/kstars/saturn.B5.vsop
+share/apps/kstars/saturn.L0.vsop
+share/apps/kstars/saturn.L1.vsop
+share/apps/kstars/saturn.L2.vsop
+share/apps/kstars/saturn.L3.vsop
+share/apps/kstars/saturn.L4.vsop
+share/apps/kstars/saturn.L5.vsop
+share/apps/kstars/saturn.R0.vsop
+share/apps/kstars/saturn.R1.vsop
+share/apps/kstars/saturn.R2.vsop
+share/apps/kstars/saturn.R3.vsop
+share/apps/kstars/saturn.R4.vsop
+share/apps/kstars/saturn.R5.vsop
+share/apps/kstars/saturn.orbit
+share/apps/kstars/smc.dat
+share/apps/kstars/starlnum.idx
+share/apps/kstars/starnames.dat
+share/apps/kstars/stars.dat
+share/apps/kstars/textures/defaultflag.png
+share/apps/kstars/textures/galaxy-cluster.png
+share/apps/kstars/textures/galaxy.png
+share/apps/kstars/textures/gaseous-nebula.png
+share/apps/kstars/textures/globular-cluster.png
+share/apps/kstars/textures/jupiter.png
+share/apps/kstars/textures/mars.png
+share/apps/kstars/textures/mercury.png
+share/apps/kstars/textures/moon00.png
+share/apps/kstars/textures/moon01.png
+share/apps/kstars/textures/moon02.png
+share/apps/kstars/textures/moon03.png
+share/apps/kstars/textures/moon04.png
+share/apps/kstars/textures/moon05.png
+share/apps/kstars/textures/moon06.png
+share/apps/kstars/textures/moon07.png
+share/apps/kstars/textures/moon08.png
+share/apps/kstars/textures/moon09.png
+share/apps/kstars/textures/moon10.png
+share/apps/kstars/textures/moon11.png
+share/apps/kstars/textures/moon12.png
+share/apps/kstars/textures/moon13.png
+share/apps/kstars/textures/moon14.png
+share/apps/kstars/textures/moon15.png
+share/apps/kstars/textures/moon16.png
+share/apps/kstars/textures/moon17.png
+share/apps/kstars/textures/moon18.png
+share/apps/kstars/textures/moon19.png
+share/apps/kstars/textures/moon20.png
+share/apps/kstars/textures/moon21.png
+share/apps/kstars/textures/moon22.png
+share/apps/kstars/textures/moon23.png
+share/apps/kstars/textures/moon24.png
+share/apps/kstars/textures/moon25.png
+share/apps/kstars/textures/moon26.png
+share/apps/kstars/textures/moon27.png
+share/apps/kstars/textures/moon28.png
+share/apps/kstars/textures/moon29.png
+share/apps/kstars/textures/moon30.png
+share/apps/kstars/textures/moon31.png
+share/apps/kstars/textures/moon32.png
+share/apps/kstars/textures/moon33.png
+share/apps/kstars/textures/moon34.png
+share/apps/kstars/textures/moon35.png
+share/apps/kstars/textures/neptune.png
+share/apps/kstars/textures/obslistsymbol.png
+share/apps/kstars/textures/open-cluster.png
+share/apps/kstars/textures/planetary-nebula.png
+share/apps/kstars/textures/pluto.png
+share/apps/kstars/textures/saturn.png
+share/apps/kstars/textures/star.png
+share/apps/kstars/textures/sun.png
+share/apps/kstars/textures/uranus.png
+share/apps/kstars/textures/venus.png
+share/apps/kstars/tips
+share/apps/kstars/unnamedstars.dat
+share/apps/kstars/uranus.B0.vsop
+share/apps/kstars/uranus.B1.vsop
+share/apps/kstars/uranus.B2.vsop
+share/apps/kstars/uranus.B3.vsop
+share/apps/kstars/uranus.B4.vsop
+share/apps/kstars/uranus.L0.vsop
+share/apps/kstars/uranus.L1.vsop
+share/apps/kstars/uranus.L2.vsop
+share/apps/kstars/uranus.L3.vsop
+share/apps/kstars/uranus.L4.vsop
+share/apps/kstars/uranus.L5.vsop
+share/apps/kstars/uranus.R0.vsop
+share/apps/kstars/uranus.R1.vsop
+share/apps/kstars/uranus.R2.vsop
+share/apps/kstars/uranus.R3.vsop
+share/apps/kstars/uranus.R4.vsop
+share/apps/kstars/uranus.orbit
+share/apps/kstars/valaav.txt
+share/apps/kstars/venus.B0.vsop
+share/apps/kstars/venus.B1.vsop
+share/apps/kstars/venus.B2.vsop
+share/apps/kstars/venus.B3.vsop
+share/apps/kstars/venus.B4.vsop
+share/apps/kstars/venus.B5.vsop
+share/apps/kstars/venus.L0.vsop
+share/apps/kstars/venus.L1.vsop
+share/apps/kstars/venus.L2.vsop
+share/apps/kstars/venus.L3.vsop
+share/apps/kstars/venus.L4.vsop
+share/apps/kstars/venus.L5.vsop
+share/apps/kstars/venus.R0.vsop
+share/apps/kstars/venus.R1.vsop
+share/apps/kstars/venus.R2.vsop
+share/apps/kstars/venus.R3.vsop
+share/apps/kstars/venus.R4.vsop
+share/apps/kstars/venus.R5.vsop
+share/apps/kstars/venus.orbit
+share/apps/kstars/wzdownload.png
+share/apps/kstars/wzgeo.png
+share/apps/kstars/wzscope.png
+share/apps/kstars/wzstars.png
+share/config.kcfg/kstars.kcfg
+share/config/kstars.knsrc
+share/doc/HTML/en/kstars/aavso.png
+share/doc/HTML/en/kstars/ai-contents.docbook
+share/doc/HTML/en/kstars/alpha.png
+share/doc/HTML/en/kstars/altvstime.docbook
+share/doc/HTML/en/kstars/altvstime.png
+share/doc/HTML/en/kstars/astroinfo.docbook
+share/doc/HTML/en/kstars/blackbody.docbook
+share/doc/HTML/en/kstars/blackbody.png
+share/doc/HTML/en/kstars/calc-angdist.docbook
+share/doc/HTML/en/kstars/calc-angdist.png
+share/doc/HTML/en/kstars/calc-apcoords.docbook
+share/doc/HTML/en/kstars/calc-apcoords.png
+share/doc/HTML/en/kstars/calc-dayduration.docbook
+share/doc/HTML/en/kstars/calc-daylength.png
+share/doc/HTML/en/kstars/calc-ecliptic.docbook
+share/doc/HTML/en/kstars/calc-ecliptic.png
+share/doc/HTML/en/kstars/calc-eqgal.docbook
+share/doc/HTML/en/kstars/calc-eqgal.png
+share/doc/HTML/en/kstars/calc-equinox.docbook
+share/doc/HTML/en/kstars/calc-equinox.png
+share/doc/HTML/en/kstars/calc-geodetic.docbook
+share/doc/HTML/en/kstars/calc-geodetic.png
+share/doc/HTML/en/kstars/calc-horizontal.docbook
+share/doc/HTML/en/kstars/calc-horizontal.png
+share/doc/HTML/en/kstars/calc-julian.png
+share/doc/HTML/en/kstars/calc-julianday.docbook
+share/doc/HTML/en/kstars/calc-planetcoords.docbook
+share/doc/HTML/en/kstars/calc-planetcoords.png
+share/doc/HTML/en/kstars/calc-sidereal.docbook
+share/doc/HTML/en/kstars/calc-sidereal.png
+share/doc/HTML/en/kstars/calculator.docbook
+share/doc/HTML/en/kstars/cequator.docbook
+share/doc/HTML/en/kstars/color_indices.png
+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/cpoles.docbook
+share/doc/HTML/en/kstars/credits.docbook
+share/doc/HTML/en/kstars/csphere.docbook
+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/dumpmode.docbook
+share/doc/HTML/en/kstars/ecliptic.docbook
+share/doc/HTML/en/kstars/ellipticalgalaxies.docbook
+share/doc/HTML/en/kstars/equinox.docbook
+share/doc/HTML/en/kstars/faq.docbook
+share/doc/HTML/en/kstars/find.png
+share/doc/HTML/en/kstars/fitsarea.png
+share/doc/HTML/en/kstars/fitsviewer.docbook
+share/doc/HTML/en/kstars/flux.docbook
+share/doc/HTML/en/kstars/flux.png
+share/doc/HTML/en/kstars/flux1.png
+share/doc/HTML/en/kstars/flux2.png
+share/doc/HTML/en/kstars/fovdialog.png
+share/doc/HTML/en/kstars/geocoords.docbook
+share/doc/HTML/en/kstars/geolocator.png
+share/doc/HTML/en/kstars/greatcircle.docbook
+share/doc/HTML/en/kstars/horizon.docbook
+share/doc/HTML/en/kstars/hourangle.docbook
+share/doc/HTML/en/kstars/index.cache.bz2
+share/doc/HTML/en/kstars/index.docbook
+share/doc/HTML/en/kstars/indi.docbook
+share/doc/HTML/en/kstars/indicapture.png
+share/doc/HTML/en/kstars/indiclient.png
+share/doc/HTML/en/kstars/indicontrolpanel.png
+share/doc/HTML/en/kstars/install.docbook
+share/doc/HTML/en/kstars/jmoons.docbook
+share/doc/HTML/en/kstars/jmoons.png
+share/doc/HTML/en/kstars/julianday.docbook
+share/doc/HTML/en/kstars/kepler2nd.png
+share/doc/HTML/en/kstars/kepler3d.png
+share/doc/HTML/en/kstars/lambda_ex.png
+share/doc/HTML/en/kstars/lambda_max.png
+share/doc/HTML/en/kstars/leapyear.docbook
+share/doc/HTML/en/kstars/lightcurve.png
+share/doc/HTML/en/kstars/lightcurves.docbook
+share/doc/HTML/en/kstars/luminosity.docbook
+share/doc/HTML/en/kstars/luminosity.png
+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/parallax.docbook
+share/doc/HTML/en/kstars/popup.png
+share/doc/HTML/en/kstars/precession.docbook
+share/doc/HTML/en/kstars/quicktour.docbook
+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/sidereal.docbook
+share/doc/HTML/en/kstars/skycoords.docbook
+share/doc/HTML/en/kstars/skymapdevice.png
+share/doc/HTML/en/kstars/solarsys.docbook
+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/timezones.docbook
+share/doc/HTML/en/kstars/tools.docbook
+share/doc/HTML/en/kstars/utime.docbook
+share/doc/HTML/en/kstars/viewops.png
+share/doc/HTML/en/kstars/wut.docbook
+share/doc/HTML/en/kstars/wut.png
+share/doc/HTML/en/kstars/zenith.docbook
+share/icons/hicolor/128x128/apps/kstars.png
+share/icons/hicolor/16x16/apps/kstars.png
+share/icons/hicolor/32x32/apps/kstars.png
+share/icons/hicolor/48x48/apps/kstars.png
+share/icons/hicolor/64x64/apps/kstars.png
+share/icons/hicolor/scalable/apps/kstars.svgz
+@dirrm share/doc/HTML/en/kstars
+@dirrm share/apps/kstars/textures
+@dirrm share/apps/kstars/icons/hicolor/scalable/actions
+@dirrm share/apps/kstars/icons/hicolor/scalable
+@dirrm share/apps/kstars/icons/hicolor/64x64/actions
+@dirrm share/apps/kstars/icons/hicolor/64x64
+@dirrm share/apps/kstars/icons/hicolor/48x48/actions
+@dirrm share/apps/kstars/icons/hicolor/48x48
+@dirrm share/apps/kstars/icons/hicolor/32x32/actions
+@dirrm share/apps/kstars/icons/hicolor/32x32
+@dirrm share/apps/kstars/icons/hicolor/22x22/actions
+@dirrm share/apps/kstars/icons/hicolor/22x22
+@dirrm share/apps/kstars/icons/hicolor
+@dirrm share/apps/kstars/icons
+@dirrm share/apps/kstars
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