- Update to 0.10.1

- Unbreak

PR:		131795
Submitted by:	myself
Approved by:	maintainer timeout

3 files changed, 251 insertions, 106 deletions

diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 5cf8fc41d505..c7501b70ff0d 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stellarium
-PORTVERSION=	0.9.0
-PORTREVISION=	4
+PORTVERSION=	0.10.1
 CATEGORIES=	astro
 MASTER_SITES=	SF
 
@@ -15,26 +14,22 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A 3D photo-realistic sky renderer
 
 LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost \
-		curl.5:${PORTSDIR}/ftp/curl \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2
 
-BROKEN=		does not compile
-
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc gui rcc uic opengl
+QT_COMPONENTS=	moc_build rcc_build uic_build qmake_build corelib gui opengl script network
 USE_GETTEXT=	yes
-USE_GL=		yes
-USE_SDL=	sdl mixer
-USE_GMAKE=	yes
+USE_ICONV=	yes
+USE_GL=		gl glu
 USE_CMAKE=	yes
-CMAKE_USE_PTHREAD=	yes
-CMAKE_ENV+=	QMAKESPEC=${QMAKESPEC}
-CMAKE_ARGS+=	-DFreeType2_INCLUDE_DIR=${LOCALBASE}/include/freetype2 \
-		-DQT_QMAKE_EXECUTABLE=${QMAKE}
+CMAKE_ARGS+=	-DFreeType2_INCLUDE_DIR="${LOCALBASE}/include/freetype2" \
+		-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib"
+
+PORTDOCS=	AUTHORS ChangeLog README
 
-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+MAN1=		stellarium.1
 
 DESKTOP_ENTRIES="Stellarium" \
 		"View the sky" \
@@ -43,12 +38,20 @@ DESKTOP_ENTRIES="Stellarium" \
 		"" \
 		false
 
+post-patch:
+# _assert conflicts with some macros on 6.x
+	@${REINPLACE_CMD} -e 's|_assert|_&_|' ${WRKSRC}/src/tests/*.cpp
+	@${REINPLACE_CMD} -e '/typedef.*void.*__GLXextFuncPtr/ d' \
+		${WRKSRC}/src/external/GLee.h
+	@${REINPLACE_CMD} -e '/SET(CMAKE_BUILD_TYPE/ 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 installs one that
 # doesn't handle FontChange)
-post-patch:
-	@${FIND} ${WRKSRC} -type f -print0 | \
+	@${FIND} ${WRKSRC}/src -type f -print0 | \
 		${XARGS} -0 ${REINPLACE_CMD} -i '' -e 's/fixx11h.h/fixx11qt4h.h/'
-	@${MV} ${WRKSRC}/src/stelutils/fixx11h.h ${WRKSRC}/src/stelutils/fixx11qt4h.h
+	@${MV} ${WRKSRC}/src/external/fixx11h.h ${WRKSRC}/src/external/fixx11qt4h.h
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo
index 5c48bad7cc36..995827a6df33 100644
--- a/astro/stellarium/distinfo
+++ b/astro/stellarium/distinfo
@@ -1,3 +1,3 @@
-MD5 (stellarium-0.9.0.tar.gz) = 781a5171705c72e4dd3d08c9b1e4c15c
-SHA256 (stellarium-0.9.0.tar.gz) = a1d4e009d16d745ff1bd03b4fcaa772fe607a255295964171d241cac519d9242
-SIZE (stellarium-0.9.0.tar.gz) = 33759482
+MD5 (stellarium-0.10.1.tar.gz) = 5361e1db3bbce38bb6b4208bd4a2e556
+SHA256 (stellarium-0.10.1.tar.gz) = 6b811d93448b421191579f4f30ee5651890063622f5be8ceeb6c80d38f4c6e79
+SIZE (stellarium-0.10.1.tar.gz) = 35242343
diff --git a/astro/stellarium/pkg-plist b/astro/stellarium/pkg-plist
index e263d188c9a8..18dd106e58ef 100644
--- a/astro/stellarium/pkg-plist
+++ b/astro/stellarium/pkg-plist
@@ -1,18 +1,161 @@
 bin/stellarium
+share/locale/af/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/af/LC_MESSAGES/stellarium.mo
+share/locale/ar/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ar/LC_MESSAGES/stellarium.mo
+share/locale/az/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/az/LC_MESSAGES/stellarium.mo
+share/locale/be/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/be/LC_MESSAGES/stellarium.mo
+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/bs/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/bs/LC_MESSAGES/stellarium.mo
+share/locale/ca/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ca/LC_MESSAGES/stellarium.mo
+share/locale/cs/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/cs/LC_MESSAGES/stellarium.mo
+share/locale/cy/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/cy/LC_MESSAGES/stellarium.mo
+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/el/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/el/LC_MESSAGES/stellarium.mo
+share/locale/en/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/en/LC_MESSAGES/stellarium.mo
+share/locale/en_AU/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/en_AU/LC_MESSAGES/stellarium.mo
+share/locale/en_CA/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/en_CA/LC_MESSAGES/stellarium.mo
+share/locale/en_GB/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/en_GB/LC_MESSAGES/stellarium.mo
+share/locale/eo/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/eo/LC_MESSAGES/stellarium.mo
+share/locale/es/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/es/LC_MESSAGES/stellarium.mo
+share/locale/et/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/et/LC_MESSAGES/stellarium.mo
+share/locale/eu/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/eu/LC_MESSAGES/stellarium.mo
+share/locale/fa/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/fa/LC_MESSAGES/stellarium.mo
+share/locale/fi/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/fi/LC_MESSAGES/stellarium.mo
+share/locale/fil/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/fil/LC_MESSAGES/stellarium.mo
+share/locale/fr/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/fr/LC_MESSAGES/stellarium.mo
+share/locale/fy/LC_MESSAGES/stellarium.mo
+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/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/hr/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/hr/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.mo
+share/locale/id/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/id/LC_MESSAGES/stellarium.mo
+share/locale/is/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/is/LC_MESSAGES/stellarium.mo
+share/locale/it/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/it/LC_MESSAGES/stellarium.mo
+share/locale/ja/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ja/LC_MESSAGES/stellarium.mo
+share/locale/ka/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ka/LC_MESSAGES/stellarium.mo
+share/locale/kn/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/kn/LC_MESSAGES/stellarium.mo
+share/locale/ko/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ko/LC_MESSAGES/stellarium.mo
+share/locale/lt/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/lt/LC_MESSAGES/stellarium.mo
+share/locale/lv/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/lv/LC_MESSAGES/stellarium.mo
+share/locale/mk/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/mk/LC_MESSAGES/stellarium.mo
+share/locale/ml/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ml/LC_MESSAGES/stellarium.mo
+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.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/pl/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/pl/LC_MESSAGES/stellarium.mo
+share/locale/pt/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/pt/LC_MESSAGES/stellarium.mo
+share/locale/pt_BR/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/pt_BR/LC_MESSAGES/stellarium.mo
+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/se/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/se/LC_MESSAGES/stellarium.mo
+share/locale/si/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/sk/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/sk/LC_MESSAGES/stellarium.mo
+share/locale/sl/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/sl/LC_MESSAGES/stellarium.mo
+share/locale/sq/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/sq/LC_MESSAGES/stellarium.mo
+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/te/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/te/LC_MESSAGES/stellarium.mo
+share/locale/th/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/th/LC_MESSAGES/stellarium.mo
+share/locale/tl/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/tl/LC_MESSAGES/stellarium.mo
+share/locale/tr/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/tr/LC_MESSAGES/stellarium.mo
+share/locale/uk/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/uk/LC_MESSAGES/stellarium.mo
+share/locale/vi/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/vi/LC_MESSAGES/stellarium.mo
+share/locale/zh_CN/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/zh_CN/LC_MESSAGES/stellarium.mo
+share/locale/zh_HK/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/zh_HK/LC_MESSAGES/stellarium.mo
+share/locale/zh_TW/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/zh_TW/LC_MESSAGES/stellarium.mo
 %%DATADIR%%/data/DejaVuSans.ttf
 %%DATADIR%%/data/DejaVuSansMono.ttf
-%%DATADIR%%/data/cities_Earth.fab
-%%DATADIR%%/data/cities_Moon.fab
+%%DATADIR%%/data/base_locations.txt
 %%DATADIR%%/data/constellations_boundaries.dat
+%%DATADIR%%/data/countryCodes.dat
 %%DATADIR%%/data/default_config.ini
-%%DATADIR%%/data/double_txt.dat
 %%DATADIR%%/data/fontmap.dat
-%%DATADIR%%/data/icon.bmp
+%%DATADIR%%/data/gui/nightHtml.css
+%%DATADIR%%/data/gui/nightStyle.css
+%%DATADIR%%/data/gui/normalHtml.css
+%%DATADIR%%/data/gui/normalStyle.css
+%%DATADIR%%/data/gui/world.png
 %%DATADIR%%/data/iso639-1.utf8
-%%DATADIR%%/data/landscapes.ini
 %%DATADIR%%/data/ssystem.ini
 %%DATADIR%%/data/stellarium.ico
-%%DATADIR%%/data/variable_txt.dat
 %%DATADIR%%/data/zone.tab
 %%DATADIR%%/landscapes/garching/garching-gl1.png
 %%DATADIR%%/landscapes/garching/garching-gl2.png
@@ -40,6 +183,8 @@ bin/stellarium
 %%DATADIR%%/landscapes/hurricane/hurricane8.png
 %%DATADIR%%/landscapes/hurricane/hurricaneb.png
 %%DATADIR%%/landscapes/hurricane/landscape.ini
+%%DATADIR%%/landscapes/mars/landscape.ini
+%%DATADIR%%/landscapes/mars/mars.png
 %%DATADIR%%/landscapes/moon/apollo17.png
 %%DATADIR%%/landscapes/moon/landscape.ini
 %%DATADIR%%/landscapes/ocean/landscape.ini
@@ -166,15 +311,22 @@ bin/stellarium
 %%DATADIR%%/nebulae/default/ngc2000.dat
 %%DATADIR%%/nebulae/default/ngc2000names.dat
 %%DATADIR%%/nebulae/default/pleiades.png
-%%DATADIR%%/scripts/lunar_eclipse_partial.sts
-%%DATADIR%%/scripts/lunar_eclipse_total.sts
-%%DATADIR%%/scripts/startup.sts
+%%DATADIR%%/nebulae/default/textures.json
+%%DATADIR%%/scripts/landscapes.ssc
+%%DATADIR%%/scripts/lunar_partial.ssc
+%%DATADIR%%/scripts/lunar_total.ssc
+%%DATADIR%%/scripts/screensaver.ssc
+%%DATADIR%%/scripts/solar_eclipse.ssc
+%%DATADIR%%/scripts/startup.ssc
+%%DATADIR%%/scripts/zodiac.ssc
 %%DATADIR%%/skycultures/chinese/constellation_names.eng.fab
 %%DATADIR%%/skycultures/chinese/constellationship.fab
+%%DATADIR%%/skycultures/chinese/description.en.utf8
 %%DATADIR%%/skycultures/chinese/info.ini
 %%DATADIR%%/skycultures/chinese/star_names.fab
 %%DATADIR%%/skycultures/egyptian/constellation_names.eng.fab
 %%DATADIR%%/skycultures/egyptian/constellationship.fab
+%%DATADIR%%/skycultures/egyptian/description.en.utf8
 %%DATADIR%%/skycultures/egyptian/info.ini
 %%DATADIR%%/skycultures/egyptian/star_names.fab
 %%DATADIR%%/skycultures/inuit/blubber-container.png
@@ -184,6 +336,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/inuit/constellation_names.eng.fab
 %%DATADIR%%/skycultures/inuit/constellationsart.fab
 %%DATADIR%%/skycultures/inuit/constellationship.fab
+%%DATADIR%%/skycultures/inuit/description.en.utf8
 %%DATADIR%%/skycultures/inuit/dogs.png
 %%DATADIR%%/skycultures/inuit/info.ini
 %%DATADIR%%/skycultures/inuit/lamp-stand.png
@@ -197,22 +350,42 @@ bin/stellarium
 %%DATADIR%%/skycultures/korean/constellation_names.exp.fab
 %%DATADIR%%/skycultures/korean/constellationsart.fab
 %%DATADIR%%/skycultures/korean/constellationship.fab
+%%DATADIR%%/skycultures/korean/description.en.utf8
 %%DATADIR%%/skycultures/korean/info.ini
 %%DATADIR%%/skycultures/korean/on_korea_constellations.txt
 %%DATADIR%%/skycultures/korean/star_names.fab
 %%DATADIR%%/skycultures/lakota/constellation_names.eng.fab
 %%DATADIR%%/skycultures/lakota/constellationship.fab
+%%DATADIR%%/skycultures/lakota/description.en.utf8
 %%DATADIR%%/skycultures/lakota/info.ini
 %%DATADIR%%/skycultures/lakota/star_names.fab
+%%DATADIR%%/skycultures/maori/constellation_names.eng.fab
+%%DATADIR%%/skycultures/maori/constellationship.fab
+%%DATADIR%%/skycultures/maori/description.en.utf8
+%%DATADIR%%/skycultures/maori/info.ini
+%%DATADIR%%/skycultures/maori/references.txt
+%%DATADIR%%/skycultures/maori/star_names.fab
 %%DATADIR%%/skycultures/navajo/constellation_names.eng.fab
 %%DATADIR%%/skycultures/navajo/constellationship.fab
+%%DATADIR%%/skycultures/navajo/description.en.utf8
 %%DATADIR%%/skycultures/navajo/info.ini
 %%DATADIR%%/skycultures/navajo/star_names.fab
+%%DATADIR%%/skycultures/norse/constellation_names.eng.fab
+%%DATADIR%%/skycultures/norse/constellationship.fab
+%%DATADIR%%/skycultures/norse/description.en.utf8
+%%DATADIR%%/skycultures/norse/info.ini
+%%DATADIR%%/skycultures/norse/star_names.fab
 %%DATADIR%%/skycultures/polynesian/constellation_names.eng.fab
 %%DATADIR%%/skycultures/polynesian/constellationsart.fab
 %%DATADIR%%/skycultures/polynesian/constellationship.fab
+%%DATADIR%%/skycultures/polynesian/description.en.utf8
 %%DATADIR%%/skycultures/polynesian/info.ini
 %%DATADIR%%/skycultures/polynesian/star_names.fab
+%%DATADIR%%/skycultures/tupi/constellation_names.eng.fab
+%%DATADIR%%/skycultures/tupi/constellationship.fab
+%%DATADIR%%/skycultures/tupi/description.en.utf8
+%%DATADIR%%/skycultures/tupi/info.ini
+%%DATADIR%%/skycultures/tupi/star_names.fab
 %%DATADIR%%/skycultures/western/andromeda.png
 %%DATADIR%%/skycultures/western/antlia.png
 %%DATADIR%%/skycultures/western/apus.png
@@ -248,6 +421,7 @@ bin/stellarium
 %%DATADIR%%/skycultures/western/crux.png
 %%DATADIR%%/skycultures/western/cygnus.png
 %%DATADIR%%/skycultures/western/delphinus.png
+%%DATADIR%%/skycultures/western/description.en.utf8
 %%DATADIR%%/skycultures/western/dorado.png
 %%DATADIR%%/skycultures/western/draco.png
 %%DATADIR%%/skycultures/western/equuleus.png
@@ -305,15 +479,13 @@ bin/stellarium
 %%DATADIR%%/skycultures/western/vulpecula.png
 %%DATADIR%%/stars/default/name.fab
 %%DATADIR%%/stars/default/stars.ini
-%%DATADIR%%/stars/default/stars_0_0v0_0.cat
-%%DATADIR%%/stars/default/stars_1_0v0_0.cat
-%%DATADIR%%/stars/default/stars_2_0v0_0.cat
-%%DATADIR%%/stars/default/stars_3_0v0_0.cat
+%%DATADIR%%/stars/default/stars_0_0v0_1.cat
+%%DATADIR%%/stars/default/stars_1_0v0_1.cat
+%%DATADIR%%/stars/default/stars_2_0v0_1.cat
+%%DATADIR%%/stars/default/stars_3_1v0_0.cat
 %%DATADIR%%/stars/default/stars_hip_cids_0v0_0.cat
 %%DATADIR%%/stars/default/stars_hip_sp_0v0_0.cat
 %%DATADIR%%/textures/ariel.png
-%%DATADIR%%/textures/backmenu.png
-%%DATADIR%%/textures/backmenu_flip.png
 %%DATADIR%%/textures/bt_alert.png
 %%DATADIR%%/textures/bt_atmosphere.png
 %%DATADIR%%/textures/bt_azgrid.png
@@ -347,7 +519,6 @@ bin/stellarium
 %%DATADIR%%/textures/city.png
 %%DATADIR%%/textures/deimos.png
 %%DATADIR%%/textures/dione.png
-%%DATADIR%%/textures/down.png
 %%DATADIR%%/textures/earth-clouds.jpg
 %%DATADIR%%/textures/earth-shadow.png
 %%DATADIR%%/textures/earthmap.png
@@ -376,7 +547,7 @@ bin/stellarium
 %%DATADIR%%/textures/nomap.png
 %%DATADIR%%/textures/oberon.png
 %%DATADIR%%/textures/phobos.png
-%%DATADIR%%/textures/pointeur1.png
+%%DATADIR%%/textures/planet-indicator.png
 %%DATADIR%%/textures/pointeur2.png
 %%DATADIR%%/textures/pointeur4.png
 %%DATADIR%%/textures/pointeur5.png
@@ -384,86 +555,57 @@ bin/stellarium
 %%DATADIR%%/textures/saturn.png
 %%DATADIR%%/textures/saturn_rings_radial.png
 %%DATADIR%%/textures/star16x16.png
-%%DATADIR%%/textures/starc64x64.png
 %%DATADIR%%/textures/sun.png
 %%DATADIR%%/textures/telescope.png
 %%DATADIR%%/textures/tethys.png
 %%DATADIR%%/textures/titan.png
 %%DATADIR%%/textures/titania.png
 %%DATADIR%%/textures/umbriel.png
-%%DATADIR%%/textures/up.png
 %%DATADIR%%/textures/uranus.png
 %%DATADIR%%/textures/venus.png
 %%DATADIR%%/textures/zenith.png
-share/locale/ar/LC_MESSAGES/stellarium.mo
-share/locale/az/LC_MESSAGES/stellarium.mo
-share/locale/bg/LC_MESSAGES/stellarium.mo
-share/locale/ca/LC_MESSAGES/stellarium.mo
-share/locale/cs/LC_MESSAGES/stellarium.mo
-share/locale/da/LC_MESSAGES/stellarium.mo
-share/locale/de/LC_MESSAGES/stellarium.mo
-share/locale/el/LC_MESSAGES/stellarium.mo
-share/locale/en/LC_MESSAGES/stellarium.mo
-share/locale/en_GB/LC_MESSAGES/stellarium.mo
-share/locale/es/LC_MESSAGES/stellarium.mo
-share/locale/et/LC_MESSAGES/stellarium.mo
-share/locale/fa/LC_MESSAGES/stellarium.mo
-share/locale/fi/LC_MESSAGES/stellarium.mo
-share/locale/fr/LC_MESSAGES/stellarium.mo
-share/locale/ga/LC_MESSAGES/stellarium.mo
-share/locale/hr/LC_MESSAGES/stellarium.mo
-share/locale/hu/LC_MESSAGES/stellarium.mo
-share/locale/hw/LC_MESSAGES/stellarium.mo
-share/locale/id/LC_MESSAGES/stellarium.mo
-share/locale/it/LC_MESSAGES/stellarium.mo
-share/locale/ja/LC_MESSAGES/stellarium.mo
-share/locale/kn/LC_MESSAGES/stellarium.mo
-share/locale/ko/LC_MESSAGES/stellarium.mo
-share/locale/lv/LC_MESSAGES/stellarium.mo
-share/locale/mt/LC_MESSAGES/stellarium.mo
-share/locale/nb/LC_MESSAGES/stellarium.mo
-share/locale/nl/LC_MESSAGES/stellarium.mo
-share/locale/nn/LC_MESSAGES/stellarium.mo
-share/locale/pl/LC_MESSAGES/stellarium.mo
-share/locale/pt/LC_MESSAGES/stellarium.mo
-share/locale/pt_BR/LC_MESSAGES/stellarium.mo
-share/locale/ro/LC_MESSAGES/stellarium.mo
-share/locale/ru/LC_MESSAGES/stellarium.mo
-share/locale/sk/LC_MESSAGES/stellarium.mo
-share/locale/sl/LC_MESSAGES/stellarium.mo
-share/locale/sr/LC_MESSAGES/stellarium.mo
-share/locale/sv/LC_MESSAGES/stellarium.mo
-share/locale/tr/LC_MESSAGES/stellarium.mo
-share/locale/uk/LC_MESSAGES/stellarium.mo
-share/locale/vi/LC_MESSAGES/stellarium.mo
-share/locale/zh_CN/LC_MESSAGES/stellarium.mo
-share/locale/zh_HK/LC_MESSAGES/stellarium.mo
-share/locale/zh_TW/LC_MESSAGES/stellarium.mo
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/landscapes/garching
-@dirrm %%DATADIR%%/landscapes/guereins
-@dirrm %%DATADIR%%/landscapes/hurricane
-@dirrm %%DATADIR%%/landscapes/moon
-@dirrm %%DATADIR%%/landscapes/ocean
-@dirrm %%DATADIR%%/landscapes/trees
-@dirrm %%DATADIR%%/landscapes
-@dirrm %%DATADIR%%/nebulae/default
-@dirrm %%DATADIR%%/nebulae
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/skycultures/chinese
-@dirrm %%DATADIR%%/skycultures/egyptian
-@dirrm %%DATADIR%%/skycultures/inuit
-@dirrm %%DATADIR%%/skycultures/korean
-@dirrm %%DATADIR%%/skycultures/lakota
-@dirrm %%DATADIR%%/skycultures/navajo
-@dirrm %%DATADIR%%/skycultures/polynesian
-@dirrm %%DATADIR%%/skycultures/western
-@dirrm %%DATADIR%%/skycultures
+@dirrm %%DATADIR%%/textures
 @dirrm %%DATADIR%%/stars/default
 @dirrm %%DATADIR%%/stars
-@dirrm %%DATADIR%%/textures
+@dirrm %%DATADIR%%/skycultures/western
+@dirrm %%DATADIR%%/skycultures/tupi
+@dirrm %%DATADIR%%/skycultures/polynesian
+@dirrm %%DATADIR%%/skycultures/norse
+@dirrm %%DATADIR%%/skycultures/navajo
+@dirrm %%DATADIR%%/skycultures/maori
+@dirrm %%DATADIR%%/skycultures/lakota
+@dirrm %%DATADIR%%/skycultures/korean
+@dirrm %%DATADIR%%/skycultures/inuit
+@dirrm %%DATADIR%%/skycultures/egyptian
+@dirrm %%DATADIR%%/skycultures/chinese
+@dirrm %%DATADIR%%/skycultures
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/nebulae/default
+@dirrm %%DATADIR%%/nebulae
+@dirrm %%DATADIR%%/landscapes/trees
+@dirrm %%DATADIR%%/landscapes/ocean
+@dirrm %%DATADIR%%/landscapes/moon
+@dirrm %%DATADIR%%/landscapes/mars
+@dirrm %%DATADIR%%/landscapes/hurricane
+@dirrm %%DATADIR%%/landscapes/guereins
+@dirrm %%DATADIR%%/landscapes/garching
+@dirrm %%DATADIR%%/landscapes
+@dirrm %%DATADIR%%/data/gui
+@dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/hw/LC_MESSAGES
-@dirrmtry share/locale/hw
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/se/LC_MESSAGES
+@dirrmtry share/locale/se
+@dirrmtry share/locale/nan/LC_MESSAGES
+@dirrmtry share/locale/nan
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia
+@dirrmtry share/locale/hw/LC_MESSAGES
+@dirrmtry share/locale/hw
+@dirrmtry share/locale/haw/LC_MESSAGES
+@dirrmtry share/locale/haw
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
+@dirrmtry share/locale/fil/LC_MESSAGES
+@dirrmtry share/locale/fil