update to 0.10.5

changes:
-fixes
-startup speed increase
pkgsrc change: added data for C/2009 R1 (McNaught) which should be
 visible these days

6 files changed, 71 insertions, 59 deletions

diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile
index c0e511e7233..7f832facfa3 100644
--- a/misc/stellarium/Makefile
+++ b/misc/stellarium/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2010/03/11 11:15:17 adam Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/10 18:20:03 drochner Exp $
 
-DISTNAME=	stellarium-0.10.4
+DISTNAME=	stellarium-0.10.5
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stellarium/}
 
diff --git a/misc/stellarium/PLIST b/misc/stellarium/PLIST
index db603155500..253df314b9d 100644
--- a/misc/stellarium/PLIST
+++ b/misc/stellarium/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2010/03/11 11:15:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/06/10 18:20:03 drochner Exp $
 bin/stellarium
 man/man1/stellarium.1
 share/locale/af/LC_MESSAGES/stellarium-skycultures.mo
@@ -13,6 +13,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/br/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
@@ -56,7 +57,6 @@ 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
@@ -91,11 +91,12 @@ 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/mr/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/mr/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
@@ -115,6 +116,7 @@ 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/si/LC_MESSAGES/stellarium.mo
 share/locale/sk/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/sk/LC_MESSAGES/stellarium.mo
 share/locale/sl/LC_MESSAGES/stellarium-skycultures.mo
@@ -145,21 +147,14 @@ share/locale/zh_TW/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/zh_TW/LC_MESSAGES/stellarium.mo
 share/stellarium/data/DejaVuSans.ttf
 share/stellarium/data/DejaVuSansMono.ttf
-share/stellarium/data/base_locations.txt
+share/stellarium/data/base_locations.bin.gz
 share/stellarium/data/constellations_boundaries.dat
 share/stellarium/data/countryCodes.dat
 share/stellarium/data/default_config.ini
-share/stellarium/data/gui/nightHtml.css
-share/stellarium/data/gui/nightStyle.css
-share/stellarium/data/gui/normalHtml.css
-share/stellarium/data/gui/normalStyle.css
-share/stellarium/data/gui/world.png
 share/stellarium/data/iso3166-1-alpha-2.utf8
 share/stellarium/data/iso639-1.utf8
-share/stellarium/data/shaders/xyYToRGB.glsl
 share/stellarium/data/ssystem.ini
 share/stellarium/data/stellarium.ico
-share/stellarium/data/zone.tab
 share/stellarium/landscapes/garching/garching-gl1.png
 share/stellarium/landscapes/garching/garching-gl2.png
 share/stellarium/landscapes/garching/garching-gl3.png
@@ -200,6 +195,8 @@ share/stellarium/landscapes/ocean/ocean6.png
 share/stellarium/landscapes/ocean/ocean7.png
 share/stellarium/landscapes/ocean/ocean8.png
 share/stellarium/landscapes/ocean/ocean9.png
+share/stellarium/landscapes/saturn/landscape.ini
+share/stellarium/landscapes/saturn/saturn-256.png
 share/stellarium/landscapes/trees/landscape.ini
 share/stellarium/landscapes/trees/trees_512.png
 share/stellarium/nebulae/default/ic434bousquet.png
@@ -335,6 +332,7 @@ share/stellarium/skycultures/aztec/constellation_names.eng.fab
 share/stellarium/skycultures/aztec/constellation_names.esp.fab
 share/stellarium/skycultures/aztec/constellationsart.fab
 share/stellarium/skycultures/aztec/constellationship.fab
+share/stellarium/skycultures/aztec/description.ar.utf8
 share/stellarium/skycultures/aztec/description.en.utf8
 share/stellarium/skycultures/aztec/description.es.utf8
 share/stellarium/skycultures/aztec/edificios.png
@@ -350,12 +348,14 @@ share/stellarium/skycultures/aztec/xonecuilli_Glifo.png
 share/stellarium/skycultures/aztec/xonecuilli_t.png
 share/stellarium/skycultures/chinese/constellation_names.eng.fab
 share/stellarium/skycultures/chinese/constellationship.fab
+share/stellarium/skycultures/chinese/description.ar.utf8
 share/stellarium/skycultures/chinese/description.en.utf8
 share/stellarium/skycultures/chinese/description.it.utf8
 share/stellarium/skycultures/chinese/info.ini
 share/stellarium/skycultures/chinese/star_names.fab
 share/stellarium/skycultures/egyptian/constellation_names.eng.fab
 share/stellarium/skycultures/egyptian/constellationship.fab
+share/stellarium/skycultures/egyptian/description.ar.utf8
 share/stellarium/skycultures/egyptian/description.en.utf8
 share/stellarium/skycultures/egyptian/description.it.utf8
 share/stellarium/skycultures/egyptian/info.ini
@@ -367,6 +367,7 @@ share/stellarium/skycultures/inuit/collarbones.png
 share/stellarium/skycultures/inuit/constellation_names.eng.fab
 share/stellarium/skycultures/inuit/constellationsart.fab
 share/stellarium/skycultures/inuit/constellationship.fab
+share/stellarium/skycultures/inuit/description.ar.utf8
 share/stellarium/skycultures/inuit/description.en.utf8
 share/stellarium/skycultures/inuit/description.it.utf8
 share/stellarium/skycultures/inuit/dogs.png
@@ -382,6 +383,7 @@ share/stellarium/skycultures/korean/constellation_names.eng.fab
 share/stellarium/skycultures/korean/constellation_names.exp.fab
 share/stellarium/skycultures/korean/constellationsart.fab
 share/stellarium/skycultures/korean/constellationship.fab
+share/stellarium/skycultures/korean/description.ar.utf8
 share/stellarium/skycultures/korean/description.en.utf8
 share/stellarium/skycultures/korean/description.it.utf8
 share/stellarium/skycultures/korean/info.ini
@@ -389,12 +391,14 @@ share/stellarium/skycultures/korean/on_korea_constellations.txt
 share/stellarium/skycultures/korean/star_names.fab
 share/stellarium/skycultures/lakota/constellation_names.eng.fab
 share/stellarium/skycultures/lakota/constellationship.fab
+share/stellarium/skycultures/lakota/description.ar.utf8
 share/stellarium/skycultures/lakota/description.en.utf8
 share/stellarium/skycultures/lakota/description.it.utf8
 share/stellarium/skycultures/lakota/info.ini
 share/stellarium/skycultures/lakota/star_names.fab
 share/stellarium/skycultures/maori/constellation_names.eng.fab
 share/stellarium/skycultures/maori/constellationship.fab
+share/stellarium/skycultures/maori/description.ar.utf8
 share/stellarium/skycultures/maori/description.en.utf8
 share/stellarium/skycultures/maori/description.it.utf8
 share/stellarium/skycultures/maori/info.ini
@@ -402,12 +406,14 @@ share/stellarium/skycultures/maori/references.txt
 share/stellarium/skycultures/maori/star_names.fab
 share/stellarium/skycultures/navajo/constellation_names.eng.fab
 share/stellarium/skycultures/navajo/constellationship.fab
+share/stellarium/skycultures/navajo/description.ar.utf8
 share/stellarium/skycultures/navajo/description.en.utf8
 share/stellarium/skycultures/navajo/description.it.utf8
 share/stellarium/skycultures/navajo/info.ini
 share/stellarium/skycultures/navajo/star_names.fab
 share/stellarium/skycultures/norse/constellation_names.eng.fab
 share/stellarium/skycultures/norse/constellationship.fab
+share/stellarium/skycultures/norse/description.ar.utf8
 share/stellarium/skycultures/norse/description.en.utf8
 share/stellarium/skycultures/norse/description.it.utf8
 share/stellarium/skycultures/norse/info.ini
@@ -415,12 +421,19 @@ share/stellarium/skycultures/norse/star_names.fab
 share/stellarium/skycultures/polynesian/constellation_names.eng.fab
 share/stellarium/skycultures/polynesian/constellationsart.fab
 share/stellarium/skycultures/polynesian/constellationship.fab
+share/stellarium/skycultures/polynesian/description.ar.utf8
 share/stellarium/skycultures/polynesian/description.en.utf8
 share/stellarium/skycultures/polynesian/description.it.utf8
 share/stellarium/skycultures/polynesian/info.ini
 share/stellarium/skycultures/polynesian/star_names.fab
+share/stellarium/skycultures/sami/constellation_names.eng.fab
+share/stellarium/skycultures/sami/constellationship.fab
+share/stellarium/skycultures/sami/description.ar.utf8
+share/stellarium/skycultures/sami/description.en.utf8
+share/stellarium/skycultures/sami/info.ini
 share/stellarium/skycultures/tupi/constellation_names.eng.fab
 share/stellarium/skycultures/tupi/constellationship.fab
+share/stellarium/skycultures/tupi/description.ar.utf8
 share/stellarium/skycultures/tupi/description.en.utf8
 share/stellarium/skycultures/tupi/description.it.utf8
 share/stellarium/skycultures/tupi/info.ini
@@ -460,6 +473,7 @@ share/stellarium/skycultures/western/crater.png
 share/stellarium/skycultures/western/crux.png
 share/stellarium/skycultures/western/cygnus.png
 share/stellarium/skycultures/western/delphinus.png
+share/stellarium/skycultures/western/description.ar.utf8
 share/stellarium/skycultures/western/description.en.utf8
 share/stellarium/skycultures/western/description.it.utf8
 share/stellarium/skycultures/western/dorado.png
@@ -526,37 +540,7 @@ share/stellarium/stars/default/stars_3_1v0_0.cat
 share/stellarium/stars/default/stars_hip_cids_0v0_0.cat
 share/stellarium/stars/default/stars_hip_sp_0v0_0.cat
 share/stellarium/textures/ariel.png
-share/stellarium/textures/bt_alert.png
-share/stellarium/textures/bt_atmosphere.png
-share/stellarium/textures/bt_azgrid.png
-share/stellarium/textures/bt_blank.png
-share/stellarium/textures/bt_cardinal.png
-share/stellarium/textures/bt_chart.png
-share/stellarium/textures/bt_config.png
-share/stellarium/textures/bt_const_names.png
-share/stellarium/textures/bt_constart.png
-share/stellarium/textures/bt_constellations.png
-share/stellarium/textures/bt_eqgrid.png
-share/stellarium/textures/bt_flip_horz.png
-share/stellarium/textures/bt_flip_vert.png
-share/stellarium/textures/bt_follow.png
-share/stellarium/textures/bt_fwd.png
-share/stellarium/textures/bt_goto.png
-share/stellarium/textures/bt_ground.png
-share/stellarium/textures/bt_help.png
-share/stellarium/textures/bt_nebula.png
-share/stellarium/textures/bt_night.png
-share/stellarium/textures/bt_nightview.png
-share/stellarium/textures/bt_now.png
-share/stellarium/textures/bt_planet.png
-share/stellarium/textures/bt_question.png
-share/stellarium/textures/bt_quit.png
-share/stellarium/textures/bt_realtime.png
-share/stellarium/textures/bt_rwd.png
-share/stellarium/textures/bt_search.png
-share/stellarium/textures/bt_track.png
 share/stellarium/textures/callisto.png
-share/stellarium/textures/city.png
 share/stellarium/textures/deimos.png
 share/stellarium/textures/dione.png
 share/stellarium/textures/earth-clouds.png
@@ -569,7 +553,6 @@ share/stellarium/textures/fogridge.png
 share/stellarium/textures/ganymede.png
 share/stellarium/textures/halo.png
 share/stellarium/textures/haloLune.png
-share/stellarium/textures/headermenu.png
 share/stellarium/textures/hyperion.png
 share/stellarium/textures/iapetus.png
 share/stellarium/textures/io.png
@@ -579,7 +562,6 @@ share/stellarium/textures/lune.png
 share/stellarium/textures/mars.png
 share/stellarium/textures/mercury.png
 share/stellarium/textures/milkyway.png
-share/stellarium/textures/milkyway_chart.png
 share/stellarium/textures/mimas.png
 share/stellarium/textures/miranda.png
 share/stellarium/textures/neb.png
@@ -596,11 +578,9 @@ share/stellarium/textures/saturn.png
 share/stellarium/textures/saturn_rings_radial.png
 share/stellarium/textures/star16x16.png
 share/stellarium/textures/sun.png
-share/stellarium/textures/telescope.png
 share/stellarium/textures/tethys.png
 share/stellarium/textures/titan.png
 share/stellarium/textures/titania.png
 share/stellarium/textures/umbriel.png
 share/stellarium/textures/uranus.png
 share/stellarium/textures/venus.png
-share/stellarium/textures/zenith.png
diff --git a/misc/stellarium/distinfo b/misc/stellarium/distinfo
index 0a873d5728e..29f36ac4963 100644
--- a/misc/stellarium/distinfo
+++ b/misc/stellarium/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2010/03/11 11:15:17 adam Exp $
+$NetBSD: distinfo,v 1.15 2010/06/10 18:20:03 drochner Exp $
 
-SHA1 (stellarium-0.10.4.tar.gz) = 8a9f22da5a0049ea10b19b24d28490dc15dea1a8
-RMD160 (stellarium-0.10.4.tar.gz) = ed2ea67c905adb211266df29dca2f8ed1626ad8e
-Size (stellarium-0.10.4.tar.gz) = 36129866 bytes
-SHA1 (patch-aa) = de6b97a0933d32ee77f9f94845ad1bc83ff695c5
+SHA1 (stellarium-0.10.5.tar.gz) = 584ab8e3618bf9a0b15619260fbe240843a8f5e1
+RMD160 (stellarium-0.10.5.tar.gz) = dc4e942a4767e7afac62e766f4c11888fafe1c45
+Size (stellarium-0.10.5.tar.gz) = 36703797 bytes
+SHA1 (patch-aa) = c5dd787300d4bdc5ec33cafc06131b2765f7f761
 SHA1 (patch-ab) = d94f54f6945d19b340748fbfd2a9187c543aed2a
-SHA1 (patch-ac) = 8d4db22a7ae457bd0b0fba25899ada5d62be7742
+SHA1 (patch-ac) = e9436d4f9f34127f176931dda4665ddc5d6f8bfa
+SHA1 (patch-ad) = ee49689dbec75b96f7187b349f2830ff2c4deef8
diff --git a/misc/stellarium/patches/patch-aa b/misc/stellarium/patches/patch-aa
index d1dfe7cd734..17e39f45296 100644
--- a/misc/stellarium/patches/patch-aa
+++ b/misc/stellarium/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2010/03/11 11:15:17 adam Exp $
+$NetBSD: patch-aa,v 1.4 2010/06/10 18:20:03 drochner Exp $
 
---- src/modules/ConstellationMgr.cpp.orig	2010-02-22 11:22:31.000000000 +0000
-+++ src/modules/ConstellationMgr.cpp
+--- src/core/modules/ConstellationMgr.cpp.orig	2010-02-22 11:22:31.000000000 +0000
++++ src/core/modules/ConstellationMgr.cpp
 @@ -396,7 +396,7 @@ void ConstellationMgr::loadLinesAndArt(c
  				{
  					texturePath = StelFileMgr::findFile(QString("textures/")+texfile);
diff --git a/misc/stellarium/patches/patch-ac b/misc/stellarium/patches/patch-ac
index ab96c4de01d..c94c967439f 100644
--- a/misc/stellarium/patches/patch-ac
+++ b/misc/stellarium/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2010/03/11 11:15:17 adam Exp $
+$NetBSD: patch-ac,v 1.5 2010/06/10 18:20:03 drochner Exp $
 
---- src/external/GLee.h.orig	2010-02-22 11:22:31.000000000 +0000
-+++ src/external/GLee.h
+--- src/core/external/GLee.h.orig	2010-02-22 11:22:31.000000000 +0000
++++ src/core/external/GLee.h
 @@ -814,10 +814,10 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture
  

  	/* GLX */

diff --git a/misc/stellarium/patches/patch-ad b/misc/stellarium/patches/patch-ad
new file mode 100644
index 00000000000..88fb598f1dc
--- /dev/null
+++ b/misc/stellarium/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.3 2010/06/10 18:20:03 drochner Exp $
+
+--- data/ssystem.ini.orig	2010-06-10 17:45:19.000000000 +0000
++++ data/ssystem.ini
+@@ -586,6 +586,26 @@ lighting = false
+ albedo = 1
+ orbit_visualization_period = 365.25
+ 
++[mcnaught_2009R1]
++name = C/2009 R1 (McNaught)
++parent = Sun
++radius = 1000
++oblateness = 0.0
++halo = true
++color = 1.0,1.0,1.0
++tex_halo = vomit.png
++tex_map = nomap.png
++coord_func = comet_orbit
++orbit_TimeAtPericenter = 2455380.18520
++orbit_PericenterDistance = 0.40504
++orbit_Eccentricity = 1.0
++orbit_ArgOfPericenter = 130.62161
++orbit_AscendingNode = 322.62161
++orbit_Inclination = 77.0332
++lighting = false
++albedo = 0.015
++orbit_visualization_period = 100.0
++
+ [ceres]
+ name = Ceres
+ parent = Sun