Changes 0.11.4:

Bug fix release with new features.

Added:
- New plugin: Exoplanets
- New plugin: Observability analysis
- Get geometric altitude and azimuth for script engine (LP: 1010617)
- Sky image loading with altitude/azimuth coordinates (LP: 1023548)
- New hotkey for star name labels (LP: 1032989)
- Option to activate/deactivate the Nebula Background Images button via GUI (LP: 925247)
- Return to user set location and landscape (LP: 981507)
- Display degrees and minutes for FOV of CCD (LP: 998761)
- Adding all possible satellites (LP: 1006495)
- Building a Windows x64 packages (LP: 1003041, 1027607)
- Apply atmosphere effect only on bodies with atmosphere (LP: 971875)

Fixed:
- Various Stellarium freezes and crashed (LP: 1005155, 1030913, 940638, 992267, 1033380, 951967, 1040054)
- Various plugins issues (LP: 751381, 892027, 1006134, 1040066, 1040085)
- Various issues for nebulae (LP: 1026021, 744517)
- Add/subtract one sidereal year jumps wrong amount (LP: 1006208)
- Various small issues, typos and mistakes (LP: 1022506, 1032469, 1019247, 985204)
- Various issues in Scripting Engine (LP: 1023934, 1017148, 1017154, 730180)

Changed:
- New tab in the configuration window to control the selected object information.
- Improvement Night Vision mode
- Extend list of default scripts

9 files changed, 133 insertions, 68 deletions

diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile
index d1774cb976b..6f9320eb86c 100644
--- a/misc/stellarium/Makefile
+++ b/misc/stellarium/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.56 2012/06/04 17:40:43 drochner Exp $
+# $NetBSD: Makefile,v 1.57 2012/08/27 09:07:37 adam Exp $
 
-DISTNAME=	stellarium-0.11.2
+DISTNAME=	stellarium-0.11.4a
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stellarium/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.stellarium.org/
 COMMENT=	Generate photorealistic skies with OpenGL
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+# XXX remove on next update
+WRKSRC=		${WRKDIR}/${DISTNAME:S/a$//}
+
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		msgfmt perl pod2man
diff --git a/misc/stellarium/PLIST b/misc/stellarium/PLIST
index 9c44a037a98..ea838213e79 100644
--- a/misc/stellarium/PLIST
+++ b/misc/stellarium/PLIST
@@ -1,26 +1,55 @@
-@comment $NetBSD: PLIST,v 1.17 2012/04/11 12:10:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2012/08/27 09:07:37 adam Exp $
 bin/stellarium
 man/man1/stellarium.1
+share/locale/aa/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/aa/LC_MESSAGES/stellarium.mo
+share/locale/ab/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ab/LC_MESSAGES/stellarium.mo
+share/locale/ae/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ae/LC_MESSAGES/stellarium.mo
 share/locale/af/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/af/LC_MESSAGES/stellarium.mo
+share/locale/ak/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ak/LC_MESSAGES/stellarium.mo
+share/locale/am/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/am/LC_MESSAGES/stellarium.mo
+share/locale/an/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/an/LC_MESSAGES/stellarium.mo
 share/locale/ar/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/ar/LC_MESSAGES/stellarium.mo
+share/locale/as/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/as/LC_MESSAGES/stellarium.mo
+share/locale/ast/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ast/LC_MESSAGES/stellarium.mo
+share/locale/av/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/av/LC_MESSAGES/stellarium.mo
 share/locale/az/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/az/LC_MESSAGES/stellarium.mo
+share/locale/ba/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ba/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/bh/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/bh/LC_MESSAGES/stellarium.mo
+share/locale/bi/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/bi/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-skycultures.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
 share/locale/ca/LC_MESSAGES/stellarium.mo
+share/locale/ce/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ce/LC_MESSAGES/stellarium.mo
 share/locale/cs/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/cs/LC_MESSAGES/stellarium.mo
+share/locale/cv/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/cv/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
@@ -39,6 +68,8 @@ 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/en_US/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/en_US/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
@@ -53,13 +84,19 @@ 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/fj/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/fj/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/gd/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/gd/LC_MESSAGES/stellarium.mo
 share/locale/gl/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/gl/LC_MESSAGES/stellarium.mo
+share/locale/gn/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/gn/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
@@ -73,6 +110,8 @@ share/locale/hr/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/hr/LC_MESSAGES/stellarium.mo
 share/locale/hrx/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/hrx/LC_MESSAGES/stellarium.mo
+share/locale/ht/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ht/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
@@ -89,10 +128,22 @@ 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/kg/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/kg/LC_MESSAGES/stellarium.mo
+share/locale/kk/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/kk/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/ky/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/ky/LC_MESSAGES/stellarium.mo
+share/locale/la/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/la/LC_MESSAGES/stellarium.mo
+share/locale/lb/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/lb/LC_MESSAGES/stellarium.mo
+share/locale/lo/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/lo/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
@@ -103,6 +154,10 @@ 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/mn/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/mn/LC_MESSAGES/stellarium.mo
+share/locale/mo/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/mo/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
@@ -118,6 +173,10 @@ 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/os/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/os/LC_MESSAGES/stellarium.mo
+share/locale/pa/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/pa/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
@@ -128,6 +187,8 @@ 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/sah/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/sah/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
@@ -137,23 +198,36 @@ 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/sm/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/sm/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/su/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/su/LC_MESSAGES/stellarium.mo
 share/locale/sv/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/sv/LC_MESSAGES/stellarium.mo
+share/locale/sw/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/sw/LC_MESSAGES/stellarium.mo
+share/locale/ta/LC_MESSAGES/stellarium-skycultures.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/tg/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/tg/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/tt/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/tt/LC_MESSAGES/stellarium.mo
 share/locale/uk/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/uk/LC_MESSAGES/stellarium.mo
+share/locale/uz/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/uz/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
@@ -162,6 +236,8 @@ 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
+share/locale/zu/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/zu/LC_MESSAGES/stellarium.mo
 share/stellarium/data/DejaVuSans.ttf
 share/stellarium/data/DejaVuSansMono.ttf
 share/stellarium/data/base_locations.bin.gz
@@ -385,13 +461,26 @@ share/stellarium/nebulae/default/ngc2000.dat
 share/stellarium/nebulae/default/ngc2000names.dat
 share/stellarium/nebulae/default/pleiades.png
 share/stellarium/nebulae/default/textures.json
+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/landscapes.ssc
 share/stellarium/scripts/lunar_partial.ssc
 share/stellarium/scripts/lunar_total.ssc
+share/stellarium/scripts/phobos_phun_1.ssc
+share/stellarium/scripts/phobos_phun_2.ssc
+share/stellarium/scripts/phobos_phun_3.ssc
+share/stellarium/scripts/phobos_phun_4.ssc
+share/stellarium/scripts/phobos_phun_5.ssc
 share/stellarium/scripts/screensaver.ssc
 share/stellarium/scripts/solar_eclipse.ssc
+share/stellarium/scripts/solar_system_screensaver.ssc
 share/stellarium/scripts/startup.ssc
+share/stellarium/scripts/sun.ssc
+share/stellarium/scripts/supernova.ssc
+share/stellarium/scripts/transit_of_venus.ssc
+share/stellarium/scripts/triple_sunrise_and_sunsets.ssc
 share/stellarium/scripts/zodiac.ssc
 share/stellarium/skycultures/arabic/Bearer-of-the-Demons-Head.png
 share/stellarium/skycultures/arabic/Book_of_Fixed_Stars3.png
@@ -737,6 +826,7 @@ share/stellarium/textures/deimos.png
 share/stellarium/textures/dione.png
 share/stellarium/textures/earth-clouds.png
 share/stellarium/textures/earth-shadow.png
+share/stellarium/textures/earth_cmap.png
 share/stellarium/textures/earthmap.png
 share/stellarium/textures/enceladus.png
 share/stellarium/textures/europa.png
@@ -757,6 +847,7 @@ share/stellarium/textures/mercury.png
 share/stellarium/textures/milkyway.png
 share/stellarium/textures/mimas.png
 share/stellarium/textures/miranda.png
+share/stellarium/textures/moon.png
 share/stellarium/textures/neb.png
 share/stellarium/textures/neptune.png
 share/stellarium/textures/neptune_rings.png
@@ -765,6 +856,7 @@ share/stellarium/textures/oberon.png
 share/stellarium/textures/ocl.png
 share/stellarium/textures/phobos.png
 share/stellarium/textures/planet-indicator.png
+share/stellarium/textures/pluto.png
 share/stellarium/textures/pnb.png
 share/stellarium/textures/pointeur2.png
 share/stellarium/textures/pointeur4.png
diff --git a/misc/stellarium/distinfo b/misc/stellarium/distinfo
index 52d5b4fc57e..33f4e7f7f9a 100644
--- a/misc/stellarium/distinfo
+++ b/misc/stellarium/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.23 2012/06/03 10:08:37 wiz Exp $
+$NetBSD: distinfo,v 1.24 2012/08/27 09:07:37 adam Exp $
 
-SHA1 (stellarium-0.11.2.tar.gz) = ed77c612b53d74dc2264b1be05f19d05950a1771
-RMD160 (stellarium-0.11.2.tar.gz) = b36bb6d709c4c67e1483630523b8c423622eea20
-Size (stellarium-0.11.2.tar.gz) = 47131184 bytes
-SHA1 (patch-aa) = e5c3968a2d8bde8a651cf87d0b5d99a3f01680b0
-SHA1 (patch-ab) = e7e1042cb674462f43fbb7c6ad5b023e62b54a59
-SHA1 (patch-ac) = e9436d4f9f34127f176931dda4665ddc5d6f8bfa
-SHA1 (patch-ad) = 5e4912f60fd74a868933e4afe27a67ddb73514a8
-SHA1 (patch-ae) = b1b4d821dd71e9ef7cd8c9263b12331d6f369916
-SHA1 (patch-src_core_modules_Skybright.cpp) = 13d35ea979af856333b6c014d79ad8f555f8fc6e
+SHA1 (stellarium-0.11.4a.tar.gz) = 4b0cadde9d91ec7ab821f4db955dec6111dbb51a
+RMD160 (stellarium-0.11.4a.tar.gz) = ed89d1467218a7eb46eb72ede9cf51bae22af5b6
+Size (stellarium-0.11.4a.tar.gz) = 54863608 bytes
+SHA1 (patch-ab) = 5ecb4a06f44520ec3fb3f17816b1f84dd2bcd28c
+SHA1 (patch-ad) = 9a2b3ac3c07434e2d713eae0e40d016803edfe7a
+SHA1 (patch-ae) = 8279d3b569c1399c6ecc3c8abfc9917a5f2807e7
+SHA1 (patch-src_core_modules_Skybright.cpp) = 7b6369fce6fa77b7007023136d7e8aebafd5c627
diff --git a/misc/stellarium/patches/patch-aa b/misc/stellarium/patches/patch-aa
deleted file mode 100644
index 4b29991afc6..00000000000
--- a/misc/stellarium/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2010/12/06 21:03:19 adam Exp $
-
---- src/core/modules/ConstellationMgr.cpp.orig	2010-12-05 16:31:00.000000000 +0000
-+++ src/core/modules/ConstellationMgr.cpp
-@@ -411,7 +411,7 @@ void ConstellationMgr::loadLinesAndArt(c
- 				{
- 					texturePath = StelFileMgr::findFile(QString("textures/")+texfile);
- 				}
--				catch(exception& e2)
-+				catch (std::exception& e2)
- 				{
- 					qWarning() << "ERROR: could not find texture, " << texfile << ": " << e2.what();
- 				}
diff --git a/misc/stellarium/patches/patch-ab b/misc/stellarium/patches/patch-ab
index 74876359c99..b430ce6baad 100644
--- a/misc/stellarium/patches/patch-ab
+++ b/misc/stellarium/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2010/12/06 21:03:19 adam Exp $
+$NetBSD: patch-ab,v 1.4 2012/08/27 09:07:37 adam Exp $
 
---- doc/CMakeLists.txt.orig	2010-12-05 16:31:00.000000000 +0000
+--- doc/CMakeLists.txt.orig	2012-08-26 10:23:18.000000000 +0000
 +++ doc/CMakeLists.txt
-@@ -24,7 +24,7 @@ ADD_CUSTOM_COMMAND(
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1
- )
- 
--INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION share/man/man1)
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION man/man1)
+@@ -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-ac b/misc/stellarium/patches/patch-ac
deleted file mode 100644
index c94c967439f..00000000000
--- a/misc/stellarium/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2010/06/10 18:20:03 drochner Exp $
-
---- 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 */

- 

--	typedef void (*__GLXextFuncPtr)(void);

- 

- 	#ifndef GLX_ARB_get_proc_address 

- 	#define GLX_ARB_get_proc_address 1

-+	    typedef void (*__GLXextFuncPtr)(void);
- 	    extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);

- 	    extern void ( * glXGetProcAddressARB (const GLubyte *procName))(void);

- 	    typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName);

diff --git a/misc/stellarium/patches/patch-ad b/misc/stellarium/patches/patch-ad
index d6f7cb8e777..138866534e6 100644
--- a/misc/stellarium/patches/patch-ad
+++ b/misc/stellarium/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2010/12/06 21:03:19 adam Exp $
+$NetBSD: patch-ad,v 1.5 2012/08/27 09:07:37 adam Exp $
 
 --- data/ssystem.ini.orig	2010-12-06 20:51:50.000000000 +0000
 +++ data/ssystem.ini
-@@ -586,6 +586,26 @@ lighting = false
+@@ -1270,6 +1270,26 @@ lighting = false
  albedo = 1
  orbit_visualization_period = 365.25
  
diff --git a/misc/stellarium/patches/patch-ae b/misc/stellarium/patches/patch-ae
index 193522f7135..5c68aa0ccbc 100644
--- a/misc/stellarium/patches/patch-ae
+++ b/misc/stellarium/patches/patch-ae
@@ -1,16 +1,16 @@
-$NetBSD: patch-ae,v 1.2 2012/04/11 12:10:01 drochner Exp $
+$NetBSD: patch-ae,v 1.3 2012/08/27 09:07:37 adam Exp $
 
---- CMakeLists.txt.orig	2012-03-10 06:01:05.000000000 +0000
+--- CMakeLists.txt.orig	2012-08-26 10:23:19.000000000 +0000
 +++ CMakeLists.txt
-@@ -28,7 +28,6 @@ IF(NOT CMAKE_BUILD_TYPE)
- ENDIF()
+@@ -46,7 +46,6 @@ ENDIF()
+ ADD_DEFINITIONS(-DSTELLARIUM_SPLASH="${STELLARIUM_SPLASH}")
  
  IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 -  SET(APPLE 1)
  ENDIF()
  
- 
-@@ -234,14 +233,10 @@ ENDIF()
+ IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+@@ -294,14 +293,10 @@ ENDIF()
  
  ########### Set some global variables ###########
  IF(UNIX AND NOT WIN32)
@@ -21,11 +21,11 @@ $NetBSD: patch-ae,v 1.2 2012/04/11 12:10:01 drochner Exp $
    ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale")
    # Used in generating the documentation (doc/stellarium.pod.cmake):
    SET(INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share/stellarium")
--ENDIF()
- ELSE()
+-ENDIF(APPLE)
+ ELSE(UNIX AND NOT WIN32)
    ADD_DEFINITIONS(-DINSTALL_DATADIR=".")
    ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="./locale")
-@@ -310,9 +305,6 @@ IF(GENERATE_PACKAGE_TARGET)
+@@ -401,9 +396,6 @@ IF(GENERATE_PACKAGE_TARGET)
  ENDIF()
  
  ########### Macosx Bundling ###############
diff --git a/misc/stellarium/patches/patch-src_core_modules_Skybright.cpp b/misc/stellarium/patches/patch-src_core_modules_Skybright.cpp
index a16e60a85ec..fc73840385c 100644
--- a/misc/stellarium/patches/patch-src_core_modules_Skybright.cpp
+++ b/misc/stellarium/patches/patch-src_core_modules_Skybright.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_core_modules_Skybright.cpp,v 1.2 2012/06/03 10:08:37 wiz Exp $
+$NetBSD: patch-src_core_modules_Skybright.cpp,v 1.3 2012/08/27 09:07:37 adam Exp $
 
---- src/core/modules/Skybright.cpp.orig	2011-07-02 15:22:18.000000000 +0200
-+++ src/core/modules/Skybright.cpp	2011-11-01 17:14:24.676826514 +0100
-@@ -29,6 +29,8 @@
- #include "Skybright.hpp"
- #include "StelUtils.hpp"
+--- src/core/modules/Skybright.cpp.orig	2012-08-26 10:23:18.000000000 +0000
++++ src/core/modules/Skybright.cpp
+@@ -33,6 +33,8 @@
+ #undef FS
+ #endif
  
 +#undef FS
 +