3 files changed, 50 insertions, 20 deletions

diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index a86b2a02fbdf..d7eb3b0b3be5 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -6,42 +6,34 @@
 #
 
 PORTNAME=	stellarium
-PORTVERSION=	0.10.5
+PORTVERSION=	0.10.6
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/Stellarium-sources/${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A 3D photo-realistic sky renderer
 
-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2
+LICENSE=	GPLv2
 
 USE_CMAKE=	yes
-CMAKE_ARGS+=	-DFreeType2_INCLUDE_DIR="${LOCALBASE}/include/freetype2" \
-		-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib"
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build rcc_build uic_build qmake_build \
-		corelib gui opengl script network svg qtestlib sql
+		corelib gui network opengl script
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		stellarium.1
 PORTDOCS=	AUTHORS ChangeLog README
 
-DESKTOP_ENTRIES="Stellarium" \
-		"View the sky" \
-		"${DATADIR}/data/stellarium.ico" \
-		"stellarium" \
-		"Application;Astronomy;Education;Science;" \
-		false
+DESKTOP_ENTRIES="Stellarium" "View the sky" \
+		"${DATADIR}/data/stellarium.ico" "${PORTNAME}" \
+		"Application;Astronomy;Education;Science;" ${FALSE}
 
 post-patch:
-# `_assert' conflicts with some macros on FreeBSD 6.x
-	@${REINPLACE_CMD} -e 's|_assert|_&_|' ${WRKSRC}/src/tests/*.cpp
-	@${REINPLACE_CMD} -e '/typedef.*void.*__GLXextFuncPtr/ d' \
+	@${REINPLACE_CMD} -e '/typedef.*void.*__GLXextFuncPtr/d' \
 		${WRKSRC}/src/core/external/GLee.h
+	@${REINPLACE_CMD} -e '/QTTEST/d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
 		${WRKSRC}/doc/CMakeLists.txt
 # avoid picking up the wrong `fixx11h.h' (x11/kdelibs3 port installs one that
diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo
index 7966bd6a9187..36f45ddac1b3 100644
--- a/astro/stellarium/distinfo
+++ b/astro/stellarium/distinfo
@@ -1,3 +1,2 @@
-MD5 (stellarium-0.10.5.tar.gz) = 4038585e3554febde92f2166d52bc8a8
-SHA256 (stellarium-0.10.5.tar.gz) = 81ae7cd121b0e31becd4af0b48acc5c1dc2d2d849caf0ca3cf969c1c1c3e8cfe
-SIZE (stellarium-0.10.5.tar.gz) = 36703797
+SHA256 (stellarium-0.10.6.tar.gz) = 4654316b488f56a9af8cdc2d0f57596fec2d9e450f020db22b5175030848171d
+SIZE (stellarium-0.10.6.tar.gz) = 37523469
diff --git a/astro/stellarium/pkg-plist b/astro/stellarium/pkg-plist
index d29c5fbf03f9..bac51f0775df 100644
--- a/astro/stellarium/pkg-plist
+++ b/astro/stellarium/pkg-plist
@@ -189,12 +189,14 @@ bin/stellarium
 %%DATADIR%%/skycultures/aztec/description.ar.utf8
 %%DATADIR%%/skycultures/aztec/description.en.utf8
 %%DATADIR%%/skycultures/aztec/description.es.utf8
+%%DATADIR%%/skycultures/aztec/description.ru.utf8
 %%DATADIR%%/skycultures/aztec/edificios.png
 %%DATADIR%%/skycultures/aztec/info.ini
 %%DATADIR%%/skycultures/aztec/mamalhuaztli.png
 %%DATADIR%%/skycultures/aztec/mamalhuaztli_image.png
 %%DATADIR%%/skycultures/aztec/mamalhuaztli_t.png
 %%DATADIR%%/skycultures/aztec/nanahuatzin.png
+%%DATADIR%%/skycultures/aztec/star_names.fab
 %%DATADIR%%/skycultures/aztec/tianquiztli.png
 %%DATADIR%%/skycultures/aztec/tiaquitztli_image.png
 %%DATADIR%%/skycultures/aztec/xonecuilli.png
@@ -205,6 +207,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/chinese/description.ar.utf8
 %%DATADIR%%/skycultures/chinese/description.en.utf8
 %%DATADIR%%/skycultures/chinese/description.it.utf8
+%%DATADIR%%/skycultures/chinese/description.ru.utf8
 %%DATADIR%%/skycultures/chinese/info.ini
 %%DATADIR%%/skycultures/chinese/star_names.fab
 %%DATADIR%%/skycultures/egyptian/constellation_names.eng.fab
@@ -212,6 +215,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/egyptian/description.ar.utf8
 %%DATADIR%%/skycultures/egyptian/description.en.utf8
 %%DATADIR%%/skycultures/egyptian/description.it.utf8
+%%DATADIR%%/skycultures/egyptian/description.ru.utf8
 %%DATADIR%%/skycultures/egyptian/info.ini
 %%DATADIR%%/skycultures/egyptian/star_names.fab
 %%DATADIR%%/skycultures/inuit/blubber-container.png
@@ -224,6 +228,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/inuit/description.ar.utf8
 %%DATADIR%%/skycultures/inuit/description.en.utf8
 %%DATADIR%%/skycultures/inuit/description.it.utf8
+%%DATADIR%%/skycultures/inuit/description.ru.utf8
 %%DATADIR%%/skycultures/inuit/dogs.png
 %%DATADIR%%/skycultures/inuit/info.ini
 %%DATADIR%%/skycultures/inuit/lamp-stand.png
@@ -240,6 +245,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/korean/description.ar.utf8
 %%DATADIR%%/skycultures/korean/description.en.utf8
 %%DATADIR%%/skycultures/korean/description.it.utf8
+%%DATADIR%%/skycultures/korean/description.ru.utf8
 %%DATADIR%%/skycultures/korean/info.ini
 %%DATADIR%%/skycultures/korean/on_korea_constellations.txt
 %%DATADIR%%/skycultures/korean/star_names.fab
@@ -248,6 +254,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/lakota/description.ar.utf8
 %%DATADIR%%/skycultures/lakota/description.en.utf8
 %%DATADIR%%/skycultures/lakota/description.it.utf8
+%%DATADIR%%/skycultures/lakota/description.ru.utf8
 %%DATADIR%%/skycultures/lakota/info.ini
 %%DATADIR%%/skycultures/lakota/star_names.fab
 %%DATADIR%%/skycultures/maori/constellation_names.eng.fab
@@ -255,6 +262,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/maori/description.ar.utf8
 %%DATADIR%%/skycultures/maori/description.en.utf8
 %%DATADIR%%/skycultures/maori/description.it.utf8
+%%DATADIR%%/skycultures/maori/description.ru.utf8
 %%DATADIR%%/skycultures/maori/info.ini
 %%DATADIR%%/skycultures/maori/references.txt
 %%DATADIR%%/skycultures/maori/star_names.fab
@@ -263,6 +271,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/navajo/description.ar.utf8
 %%DATADIR%%/skycultures/navajo/description.en.utf8
 %%DATADIR%%/skycultures/navajo/description.it.utf8
+%%DATADIR%%/skycultures/navajo/description.ru.utf8
 %%DATADIR%%/skycultures/navajo/info.ini
 %%DATADIR%%/skycultures/navajo/star_names.fab
 %%DATADIR%%/skycultures/norse/constellation_names.eng.fab
@@ -270,6 +279,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/norse/description.ar.utf8
 %%DATADIR%%/skycultures/norse/description.en.utf8
 %%DATADIR%%/skycultures/norse/description.it.utf8
+%%DATADIR%%/skycultures/norse/description.ru.utf8
 %%DATADIR%%/skycultures/norse/info.ini
 %%DATADIR%%/skycultures/norse/star_names.fab
 %%DATADIR%%/skycultures/polynesian/constellation_names.eng.fab
@@ -278,18 +288,22 @@ bin/stellarium
 %%DATADIR%%/skycultures/polynesian/description.ar.utf8
 %%DATADIR%%/skycultures/polynesian/description.en.utf8
 %%DATADIR%%/skycultures/polynesian/description.it.utf8
+%%DATADIR%%/skycultures/polynesian/description.ru.utf8
 %%DATADIR%%/skycultures/polynesian/info.ini
 %%DATADIR%%/skycultures/polynesian/star_names.fab
 %%DATADIR%%/skycultures/sami/constellation_names.eng.fab
 %%DATADIR%%/skycultures/sami/constellationship.fab
 %%DATADIR%%/skycultures/sami/description.ar.utf8
 %%DATADIR%%/skycultures/sami/description.en.utf8
+%%DATADIR%%/skycultures/sami/description.ru.utf8
 %%DATADIR%%/skycultures/sami/info.ini
+%%DATADIR%%/skycultures/sami/star_names.fab
 %%DATADIR%%/skycultures/tupi/constellation_names.eng.fab
 %%DATADIR%%/skycultures/tupi/constellationship.fab
 %%DATADIR%%/skycultures/tupi/description.ar.utf8
 %%DATADIR%%/skycultures/tupi/description.en.utf8
 %%DATADIR%%/skycultures/tupi/description.it.utf8
+%%DATADIR%%/skycultures/tupi/description.ru.utf8
 %%DATADIR%%/skycultures/tupi/info.ini
 %%DATADIR%%/skycultures/tupi/star_names.fab
 %%DATADIR%%/skycultures/western/andromeda.png
@@ -330,6 +344,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/western/description.ar.utf8
 %%DATADIR%%/skycultures/western/description.en.utf8
 %%DATADIR%%/skycultures/western/description.it.utf8
+%%DATADIR%%/skycultures/western/description.ru.utf8
 %%DATADIR%%/skycultures/western/dorado.png
 %%DATADIR%%/skycultures/western/draco.png
 %%DATADIR%%/skycultures/western/equuleus.png
@@ -481,6 +496,7 @@ share/locale/bg/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/bg/LC_MESSAGES/stellarium.mo
 share/locale/bn/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/bn/LC_MESSAGES/stellarium.mo
+share/locale/bo/LC_MESSAGES/stellarium.mo
 share/locale/br/LC_MESSAGES/stellarium.mo
 share/locale/bs/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/bs/LC_MESSAGES/stellarium.mo
@@ -494,6 +510,8 @@ share/locale/da/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/da/LC_MESSAGES/stellarium.mo
 share/locale/de/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/de/LC_MESSAGES/stellarium.mo
+share/locale/dv/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/dv/LC_MESSAGES/stellarium.mo
 share/locale/el/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/el/LC_MESSAGES/stellarium.mo
 share/locale/en/LC_MESSAGES/stellarium-skycultures.mo
@@ -525,17 +543,23 @@ share/locale/ga/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/ga/LC_MESSAGES/stellarium.mo
 share/locale/gl/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/gl/LC_MESSAGES/stellarium.mo
+share/locale/gu/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/gu/LC_MESSAGES/stellarium.mo
+share/locale/gv/LC_MESSAGES/stellarium.mo
 share/locale/haw/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/haw/LC_MESSAGES/stellarium.mo
 share/locale/he/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/he/LC_MESSAGES/stellarium.mo
 share/locale/hi/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/hi/LC_MESSAGES/stellarium.mo
 share/locale/hr/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/hr/LC_MESSAGES/stellarium.mo
+share/locale/hrx/LC_MESSAGES/stellarium.mo
 share/locale/hu/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/hu/LC_MESSAGES/stellarium.mo
 share/locale/hy/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/hy/LC_MESSAGES/stellarium.mo
+share/locale/ia/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/ia/LC_MESSAGES/stellarium.mo
 share/locale/id/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/id/LC_MESSAGES/stellarium.mo
@@ -565,12 +589,15 @@ share/locale/ms/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/ms/LC_MESSAGES/stellarium.mo
 share/locale/mt/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/mt/LC_MESSAGES/stellarium.mo
+share/locale/nan/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/nan/LC_MESSAGES/stellarium.mo
 share/locale/nb/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/nb/LC_MESSAGES/stellarium.mo
 share/locale/nl/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/nl/LC_MESSAGES/stellarium.mo
 share/locale/nn/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/nn/LC_MESSAGES/stellarium.mo
+share/locale/oc/LC_MESSAGES/stellarium.mo
 share/locale/pl/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/pl/LC_MESSAGES/stellarium.mo
 share/locale/pt/LC_MESSAGES/stellarium-skycultures.mo
@@ -581,6 +608,7 @@ share/locale/ro/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/ro/LC_MESSAGES/stellarium.mo
 share/locale/ru/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/ru/LC_MESSAGES/stellarium.mo
+share/locale/sco/LC_MESSAGES/stellarium.mo
 share/locale/se/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/se/LC_MESSAGES/stellarium.mo
 share/locale/si/LC_MESSAGES/stellarium-skycultures.mo
@@ -595,6 +623,7 @@ share/locale/sr/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/sr/LC_MESSAGES/stellarium.mo
 share/locale/sv/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/sv/LC_MESSAGES/stellarium.mo
+share/locale/ta/LC_MESSAGES/stellarium.mo
 share/locale/te/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/te/LC_MESSAGES/stellarium.mo
 share/locale/th/LC_MESSAGES/stellarium-skycultures.mo
@@ -623,6 +652,8 @@ share/locale/zh_TW/LC_MESSAGES/stellarium.mo
 @dirrmtry share/locale/si
 @dirrmtry share/locale/se/LC_MESSAGES
 @dirrmtry share/locale/se
+@dirrmtry share/locale/sco/LC_MESSAGES
+@dirrmtry share/locale/sco
 @dirrmtry share/locale/nan/LC_MESSAGES
 @dirrmtry share/locale/nan
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -633,9 +664,17 @@ share/locale/zh_TW/LC_MESSAGES/stellarium.mo
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/hw/LC_MESSAGES
 @dirrmtry share/locale/hw
+@dirrmtry share/locale/hrx/LC_MESSAGES
+@dirrmtry share/locale/hrx
 @dirrmtry share/locale/haw/LC_MESSAGES
 @dirrmtry share/locale/haw
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
 @dirrmtry share/locale/fy/LC_MESSAGES
 @dirrmtry share/locale/fy
 @dirrmtry share/locale/fil/LC_MESSAGES
 @dirrmtry share/locale/fil
+@dirrmtry share/locale/dv/LC_MESSAGES
+@dirrmtry share/locale/dv
+@dirrmtry share/locale/bo/LC_MESSAGES
+@dirrmtry share/locale/bo