update to 0.12.2

New features: variable stars, re-packed star catalogs (Hipparcos and
Tycho-2), improvements for plugins, scripting engine and search tool.
New version of the Satellites plug-in.
Sound support (needs qt4-phonon, not enabled in pkgsrc yet)

6 files changed, 72 insertions, 37 deletions

diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile
index acb45f77bb1..898eca962f8 100644
--- a/misc/stellarium/Makefile
+++ b/misc/stellarium/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2013/06/12 15:29:37 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2013/08/09 11:47:57 drochner Exp $
 
-DISTNAME=	stellarium-0.12.1
-PKGREVISION=	5
+DISTNAME=	stellarium-0.12.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stellarium/}
 
@@ -29,6 +28,9 @@ BUILDLINK_TRANSFORM+=	rm:-Wno-unused-but-set-parameter
 BUILDLINK_TRANSFORM+=	rm:-Wno-unused-but-set-variable
 .endif
 
+# needs phonon
+CMAKE_ARGS+=	-DENABLE_SOUND:BOOL=FALSE
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/misc/stellarium/PLIST b/misc/stellarium/PLIST
index b65fdf47628..eaf497af9f4 100644
--- a/misc/stellarium/PLIST
+++ b/misc/stellarium/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2013/05/03 16:23:53 drochner Exp $
+@comment $NetBSD: PLIST,v 1.22 2013/08/09 11:47:57 drochner Exp $
 bin/stellarium
 man/man1/stellarium.1
 share/applications/stellarium.desktop
@@ -270,6 +270,7 @@ share/stellarium/landscapes/garching/description.fr.utf8
 share/stellarium/landscapes/garching/description.nb.utf8
 share/stellarium/landscapes/garching/description.pt_BR.utf8
 share/stellarium/landscapes/garching/description.ru.utf8
+share/stellarium/landscapes/garching/description.uk.utf8
 share/stellarium/landscapes/garching/garching-gl1.png
 share/stellarium/landscapes/garching/garching-gl2.png
 share/stellarium/landscapes/garching/garching-gl3.png
@@ -285,6 +286,7 @@ share/stellarium/landscapes/guereins/description.fr.utf8
 share/stellarium/landscapes/guereins/description.nb.utf8
 share/stellarium/landscapes/guereins/description.pt_BR.utf8
 share/stellarium/landscapes/guereins/description.ru.utf8
+share/stellarium/landscapes/guereins/description.uk.utf8
 share/stellarium/landscapes/guereins/guereins1.png
 share/stellarium/landscapes/guereins/guereins2.png
 share/stellarium/landscapes/guereins/guereins3.png
@@ -304,6 +306,7 @@ share/stellarium/landscapes/hurricane/description.fr.utf8
 share/stellarium/landscapes/hurricane/description.nb.utf8
 share/stellarium/landscapes/hurricane/description.pt_BR.utf8
 share/stellarium/landscapes/hurricane/description.ru.utf8
+share/stellarium/landscapes/hurricane/description.uk.utf8
 share/stellarium/landscapes/hurricane/hurricane1.png
 share/stellarium/landscapes/hurricane/hurricane2.png
 share/stellarium/landscapes/hurricane/hurricane3.png
@@ -323,6 +326,7 @@ share/stellarium/landscapes/mars/description.fr.utf8
 share/stellarium/landscapes/mars/description.nb.utf8
 share/stellarium/landscapes/mars/description.pt_BR.utf8
 share/stellarium/landscapes/mars/description.ru.utf8
+share/stellarium/landscapes/mars/description.uk.utf8
 share/stellarium/landscapes/mars/landscape.ini
 share/stellarium/landscapes/mars/mars.png
 share/stellarium/landscapes/moon/apollo17.png
@@ -335,6 +339,7 @@ share/stellarium/landscapes/moon/description.fr.utf8
 share/stellarium/landscapes/moon/description.nb.utf8
 share/stellarium/landscapes/moon/description.pt_BR.utf8
 share/stellarium/landscapes/moon/description.ru.utf8
+share/stellarium/landscapes/moon/description.uk.utf8
 share/stellarium/landscapes/moon/landscape.ini
 share/stellarium/landscapes/ocean/description.ar.utf8
 share/stellarium/landscapes/ocean/description.be.utf8
@@ -345,6 +350,7 @@ share/stellarium/landscapes/ocean/description.fr.utf8
 share/stellarium/landscapes/ocean/description.nb.utf8
 share/stellarium/landscapes/ocean/description.pt_BR.utf8
 share/stellarium/landscapes/ocean/description.ru.utf8
+share/stellarium/landscapes/ocean/description.uk.utf8
 share/stellarium/landscapes/ocean/landscape.ini
 share/stellarium/landscapes/ocean/ocean1.png
 share/stellarium/landscapes/ocean/ocean2.png
@@ -364,6 +370,7 @@ share/stellarium/landscapes/saturn/description.fr.utf8
 share/stellarium/landscapes/saturn/description.nb.utf8
 share/stellarium/landscapes/saturn/description.pt_BR.utf8
 share/stellarium/landscapes/saturn/description.ru.utf8
+share/stellarium/landscapes/saturn/description.uk.utf8
 share/stellarium/landscapes/saturn/landscape.ini
 share/stellarium/landscapes/saturn/saturn-256.png
 share/stellarium/landscapes/trees/description.ar.utf8
@@ -375,6 +382,7 @@ share/stellarium/landscapes/trees/description.fr.utf8
 share/stellarium/landscapes/trees/description.nb.utf8
 share/stellarium/landscapes/trees/description.pt_BR.utf8
 share/stellarium/landscapes/trees/description.ru.utf8
+share/stellarium/landscapes/trees/description.uk.utf8
 share/stellarium/landscapes/trees/landscape.ini
 share/stellarium/landscapes/trees/trees_512.png
 share/stellarium/nebulae/default/etaCarinae_gzotti.png
@@ -548,6 +556,11 @@ share/stellarium/scripts/analemma.ssc
 share/stellarium/scripts/common_objects.inc
 share/stellarium/scripts/constellations_tour.ssc
 share/stellarium/scripts/earth_1.ssc
+share/stellarium/scripts/earth_2.ssc
+share/stellarium/scripts/earth_3.ssc
+share/stellarium/scripts/earth_4.ssc
+share/stellarium/scripts/earth_5.ssc
+share/stellarium/scripts/earth_6.ssc
 share/stellarium/scripts/landscapes.ssc
 share/stellarium/scripts/lunar_partial.ssc
 share/stellarium/scripts/lunar_total.ssc
@@ -623,6 +636,7 @@ share/stellarium/skycultures/arabic/description.ar.utf8
 share/stellarium/skycultures/arabic/description.be.utf8
 share/stellarium/skycultures/arabic/description.en.utf8
 share/stellarium/skycultures/arabic/description.fr.utf8
+share/stellarium/skycultures/arabic/description.hu.utf8
 share/stellarium/skycultures/arabic/description.pt_BR.utf8
 share/stellarium/skycultures/arabic/description.ru.utf8
 share/stellarium/skycultures/arabic/description.uk.utf8
@@ -679,6 +693,7 @@ share/stellarium/skycultures/egyptian/constellations_boundaries.dat
 share/stellarium/skycultures/egyptian/constellationship.fab
 share/stellarium/skycultures/egyptian/description.ar.utf8
 share/stellarium/skycultures/egyptian/description.be.utf8
+share/stellarium/skycultures/egyptian/description.bs.utf8
 share/stellarium/skycultures/egyptian/description.en.utf8
 share/stellarium/skycultures/egyptian/description.fr.utf8
 share/stellarium/skycultures/egyptian/description.it.utf8
@@ -688,6 +703,33 @@ share/stellarium/skycultures/egyptian/description.ru.utf8
 share/stellarium/skycultures/egyptian/description.uk.utf8
 share/stellarium/skycultures/egyptian/info.ini
 share/stellarium/skycultures/egyptian/star_names.fab
+share/stellarium/skycultures/indian/aquarius.png
+share/stellarium/skycultures/indian/aries.png
+share/stellarium/skycultures/indian/cancer.png
+share/stellarium/skycultures/indian/canis-major.png
+share/stellarium/skycultures/indian/capricornus.png
+share/stellarium/skycultures/indian/constellation_names.eng.fab
+share/stellarium/skycultures/indian/constellations_boundaries.dat
+share/stellarium/skycultures/indian/constellationsart.fab
+share/stellarium/skycultures/indian/constellationship.fab
+share/stellarium/skycultures/indian/description.ar.utf8
+share/stellarium/skycultures/indian/description.bs.utf8
+share/stellarium/skycultures/indian/description.en.utf8
+share/stellarium/skycultures/indian/description.fr.utf8
+share/stellarium/skycultures/indian/description.pt_BR.utf8
+share/stellarium/skycultures/indian/description.ru.utf8
+share/stellarium/skycultures/indian/description.uk.utf8
+share/stellarium/skycultures/indian/gemini.png
+share/stellarium/skycultures/indian/info.ini
+share/stellarium/skycultures/indian/leo.png
+share/stellarium/skycultures/indian/libra.png
+share/stellarium/skycultures/indian/orion.png
+share/stellarium/skycultures/indian/pisces.png
+share/stellarium/skycultures/indian/sagittarius.png
+share/stellarium/skycultures/indian/scorpius.png
+share/stellarium/skycultures/indian/star_names.fab
+share/stellarium/skycultures/indian/taurus.png
+share/stellarium/skycultures/indian/virgo.png
 share/stellarium/skycultures/inuit/blubber-container.png
 share/stellarium/skycultures/inuit/breastbone.png
 share/stellarium/skycultures/inuit/caribou.png
@@ -734,6 +776,7 @@ share/stellarium/skycultures/lakota/constellationsart.fab
 share/stellarium/skycultures/lakota/constellationship.fab
 share/stellarium/skycultures/lakota/description.ar.utf8
 share/stellarium/skycultures/lakota/description.be.utf8
+share/stellarium/skycultures/lakota/description.bs.utf8
 share/stellarium/skycultures/lakota/description.en.utf8
 share/stellarium/skycultures/lakota/description.fr.utf8
 share/stellarium/skycultures/lakota/description.it.utf8
@@ -761,6 +804,7 @@ share/stellarium/skycultures/navajo/constellations_boundaries.dat
 share/stellarium/skycultures/navajo/constellationship.fab
 share/stellarium/skycultures/navajo/description.ar.utf8
 share/stellarium/skycultures/navajo/description.be.utf8
+share/stellarium/skycultures/navajo/description.bs.utf8
 share/stellarium/skycultures/navajo/description.en.utf8
 share/stellarium/skycultures/navajo/description.fr.utf8
 share/stellarium/skycultures/navajo/description.it.utf8
@@ -774,6 +818,7 @@ share/stellarium/skycultures/norse/constellations_boundaries.dat
 share/stellarium/skycultures/norse/constellationship.fab
 share/stellarium/skycultures/norse/description.ar.utf8
 share/stellarium/skycultures/norse/description.be.utf8
+share/stellarium/skycultures/norse/description.bs.utf8
 share/stellarium/skycultures/norse/description.en.utf8
 share/stellarium/skycultures/norse/description.fr.utf8
 share/stellarium/skycultures/norse/description.it.utf8
@@ -819,6 +864,7 @@ share/stellarium/skycultures/tongan/description.en.utf8
 share/stellarium/skycultures/tongan/description.fr.utf8
 share/stellarium/skycultures/tongan/description.pt_BR.utf8
 share/stellarium/skycultures/tongan/description.ru.utf8
+share/stellarium/skycultures/tongan/description.uk.utf8
 share/stellarium/skycultures/tongan/info.ini
 share/stellarium/skycultures/tongan/star_names.fab
 share/stellarium/skycultures/tupi/constellation_names.eng.fab
@@ -937,11 +983,12 @@ share/stellarium/skycultures/western/virgo.png
 share/stellarium/skycultures/western/volans.png
 share/stellarium/skycultures/western/vulpecula.png
 share/stellarium/stars/default/defaultStarsConfig.json
+share/stellarium/stars/default/gcvs_hip_part.dat
 share/stellarium/stars/default/name.fab
-share/stellarium/stars/default/stars_0_0v0_2.cat
-share/stellarium/stars/default/stars_1_0v0_2.cat
-share/stellarium/stars/default/stars_2_0v0_2.cat
-share/stellarium/stars/default/stars_3_1v0_1.cat
+share/stellarium/stars/default/stars_0_0v0_3.cat
+share/stellarium/stars/default/stars_1_0v0_3.cat
+share/stellarium/stars/default/stars_2_0v0_3.cat
+share/stellarium/stars/default/stars_3_1v0_2.cat
 share/stellarium/stars/default/stars_hip_cids_0v0_0.cat
 share/stellarium/stars/default/stars_hip_sp_0v0_0.cat
 share/stellarium/textures/amalthea.png
diff --git a/misc/stellarium/distinfo b/misc/stellarium/distinfo
index ad2b2e28d70..488621bed4c 100644
--- a/misc/stellarium/distinfo
+++ b/misc/stellarium/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.29 2013/06/12 15:29:13 wiz Exp $
+$NetBSD: distinfo,v 1.30 2013/08/09 11:47:57 drochner Exp $
 
-SHA1 (stellarium-0.12.1.tar.gz) = 0a7fbe913d4e37e6ff281f81e67dc7831796b41c
-RMD160 (stellarium-0.12.1.tar.gz) = 5b0d181388d3e37b285fc2be8953832498d7b8ca
-Size (stellarium-0.12.1.tar.gz) = 74127605 bytes
-SHA1 (patch-ab) = 5ecb4a06f44520ec3fb3f17816b1f84dd2bcd28c
+SHA1 (stellarium-0.12.2.tar.gz) = 35752a24bdeb461b9c16e8533b13689b05a87105
+RMD160 (stellarium-0.12.2.tar.gz) = 6c8b622c026fba234d4b834faa896fbd82486c48
+Size (stellarium-0.12.2.tar.gz) = 78979347 bytes
 SHA1 (patch-ad) = 8257570ab31b25e4b90714125d5b8c7bfebd7240
 SHA1 (patch-ae) = e6ee27b2b0914eb25a7e35b58dcadefb0fd349e0
 SHA1 (patch-doc_stellarium.pod.cmake) = 654973a21459f86857aa674000cdba42ae2b8e01
-SHA1 (patch-src_StelMainGraphicsView.cpp) = 4428ce8676784116b39a2e2ea692940f5b2c8f97
+SHA1 (patch-src_StelMainGraphicsView.cpp) = fa53b202e2ed392e1a7906db698faa1401b0dc87
 SHA1 (patch-src_core_StelUtils.cpp) = 0693cd4832eb06f25413b76bb4d00a681b992a88
 SHA1 (patch-src_core_modules_Skybright.cpp) = 7b6369fce6fa77b7007023136d7e8aebafd5c627
 SHA1 (patch-src_core_renderer_StelQGLArrayVertexBufferBackend.cpp) = 8e3ec2e3a279d45aa5175f87780c15bbd8abfdee
 SHA1 (patch-src_core_renderer_StelQGLInterleavedArrayVertexBufferBackend.cpp) = 26ac644af6fe577a9187dc33b574bbf132593ede
-SHA1 (patch-src_main.cpp) = 12f7685cb5672c226576223ee2c86b416864ecc3
+SHA1 (patch-src_main.cpp) = 02b39f57ba19b947d76a051d5d0f914d27cac1c8
diff --git a/misc/stellarium/patches/patch-ab b/misc/stellarium/patches/patch-ab
deleted file mode 100644
index b430ce6baad..00000000000
--- a/misc/stellarium/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2012/08/27 09:07:37 adam Exp $
-
---- doc/CMakeLists.txt.orig	2012-08-26 10:23:18.000000000 +0000
-+++ doc/CMakeLists.txt
-@@ -27,7 +27,7 @@ ADD_CUSTOM_COMMAND(
- IF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD|OpenBSD)")
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION man/man1)
- ELSE(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD|OpenBSD)")
--  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION share/man/man1)
-+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION man/man1)
- ENDIF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD|OpenBSD)")
- 
- ENDIF(UNIX AND NOT WIN32)
diff --git a/misc/stellarium/patches/patch-src_StelMainGraphicsView.cpp b/misc/stellarium/patches/patch-src_StelMainGraphicsView.cpp
index ac096b04160..2bfa43185e5 100644
--- a/misc/stellarium/patches/patch-src_StelMainGraphicsView.cpp
+++ b/misc/stellarium/patches/patch-src_StelMainGraphicsView.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_StelMainGraphicsView.cpp,v 1.1 2013/05/04 12:59:47 joerg Exp $
+$NetBSD: patch-src_StelMainGraphicsView.cpp,v 1.2 2013/08/09 11:47:57 drochner Exp $
 
---- src/StelMainGraphicsView.cpp.orig	2013-05-04 00:38:40.000000000 +0000
+--- src/StelMainGraphicsView.cpp.orig	2013-08-04 06:20:27.000000000 +0000
 +++ src/StelMainGraphicsView.cpp
-@@ -41,6 +41,7 @@
- #include <QtPlugin>
+@@ -42,6 +42,7 @@
  #include <QThread>
  #include <QTimer>
+ #include <QDir>
 +#include <clocale>
  
  #ifndef DISABLE_SCRIPTING
diff --git a/misc/stellarium/patches/patch-src_main.cpp b/misc/stellarium/patches/patch-src_main.cpp
index bafa59e076c..8532a85655b 100644
--- a/misc/stellarium/patches/patch-src_main.cpp
+++ b/misc/stellarium/patches/patch-src_main.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_main.cpp,v 1.1 2013/05/04 12:59:47 joerg Exp $
+$NetBSD: patch-src_main.cpp,v 1.2 2013/08/09 11:47:57 drochner Exp $
 
---- src/main.cpp.orig	2013-05-04 00:38:57.000000000 +0000
+--- src/main.cpp.orig	2013-08-04 06:20:27.000000000 +0000
 +++ src/main.cpp
-@@ -36,6 +36,7 @@
- #ifdef Q_OS_WIN
- #include <windows.h>
+@@ -41,6 +41,7 @@
+ 	#pragma comment(lib,"Winmm.lib")
+ #endif
  #endif //Q_OS_WIN
 +#include <clocale>