- Update to 0.6.2

PR:		ports/76259
Submitted by:	Jean-Yves Lefort <jylefort@brutele.be> (maintainer)

6 files changed, 133 insertions, 46 deletions

diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index a3ca6d2bd6a6..75c1a5c852e9 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		stellarium
-PORTVERSION=		0.6.0
-PORTREVISION=		1
+PORTVERSION=		0.6.2
 CATEGORIES=		astro
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		A 3D photo-realistic sky renderer
 
-USE_GCC=		3.3
+USE_GCC=		3.4
 USE_GL=			yes
 USE_SDL=		sdl
 USE_X_PREFIX=		yes
diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo
index 1fcd54a6e005..30f529b3a319 100644
--- a/astro/stellarium/distinfo
+++ b/astro/stellarium/distinfo
@@ -1,2 +1,2 @@
-MD5 (stellarium-0.6.0.tar.gz) = 820a9246cb8c17c1ef6361100984ccbe
-SIZE (stellarium-0.6.0.tar.gz) = 5934058
+MD5 (stellarium-0.6.2.tar.gz) = f00e99b88f53273419683cf18905e39c
+SIZE (stellarium-0.6.2.tar.gz) = 9431913
diff --git a/astro/stellarium/files/patch-configure b/astro/stellarium/files/patch-configure
index 686b7425d65c..16c826959868 100644
--- a/astro/stellarium/files/patch-configure
+++ b/astro/stellarium/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Sat Jun 12 17:26:37 2004
-+++ configure	Sat Jun 12 17:27:52 2004
-@@ -3331,8 +3331,6 @@
+--- configure.orig	Sat Jan 15 03:12:45 2005
++++ configure	Sat Jan 15 03:12:59 2005
+@@ -3341,8 +3341,6 @@
  
  
  
--CFLAGS=" -Wall -s -O3"
--CXXFLAGS=" -Wall -s -O3"
+-CFLAGS=" -Wall  -O3"
+-CXXFLAGS=" -Wall -O3"
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
diff --git a/astro/stellarium/files/patch-src_observator.cpp b/astro/stellarium/files/patch-src_observator.cpp
index fb153fd3cdd1..775d984e5052 100644
--- a/astro/stellarium/files/patch-src_observator.cpp
+++ b/astro/stellarium/files/patch-src_observator.cpp
@@ -1,11 +1,13 @@
---- src/observator.cpp.orig	Sat Jun 12 17:53:26 2004
-+++ src/observator.cpp	Sat Jun 12 17:53:50 2004
-@@ -166,25 +166,21 @@
- // Fixed 31-05-2004 Now use the extern variables set by tzset()
- float Observator::get_GMT_shift_from_system(double JD) const
- {
--	return -(float)timezone/3600 + (daylight!=0);
+--- src/observator.cpp.orig	Sat Jan 15 03:19:14 2005
++++ src/observator.cpp	Sat Jan 15 03:20:57 2005
+@@ -174,27 +174,23 @@
+ 	// + (timeinfo->tm_isdst!=0);
+ 	// only tells if dst is in effect for actual time, not drawn time
+ #else
+-	return -(float)timezone/3600;
+ 	// no portable dst method implemented yet, so just standard time for all platforms
  
+ #endif
  	
 -/*	time_t rawtime = get_time_t_from_julian(JD);
 +	time_t rawtime = get_time_t_from_julian(JD);
diff --git a/astro/stellarium/files/patch-src_stel_sdl.cpp b/astro/stellarium/files/patch-src_stel_sdl.cpp
deleted file mode 100644
index f31053849c37..000000000000
--- a/astro/stellarium/files/patch-src_stel_sdl.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/stel_sdl.cpp.orig	Thu Jun 17 14:11:01 2004
-+++ src/stel_sdl.cpp	Thu Jun 17 14:16:40 2004
-@@ -60,9 +60,18 @@
-     Screen = SDL_SetVideoMode(core->get_screen_W(), core->get_screen_H(), core->get_bppMode(), Vflags);
- 	if(!Screen)
- 	{
--		printf("sdl: Couldn't set %dx%d video mode: %s!",
-+		printf("sdl: Couldn't set %dx%d video mode (%s), retrying with stencil size 0\n",
- 		core->get_screen_W(), core->get_screen_H(), SDL_GetError());
--		exit(-1);
-+
-+		SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE,0);
-+		Screen = SDL_SetVideoMode(core->get_screen_W(), core->get_screen_H(), core->get_bppMode(), Vflags);
-+
-+		if(!Screen)
-+		{
-+			printf("sdl: Couldn't set %dx%d video mode: %s!\n",
-+			core->get_screen_W(), core->get_screen_H(), SDL_GetError());
-+			exit(-1);
-+		}
- 	}
- 
- 	// Disable key repeat
diff --git a/astro/stellarium/pkg-plist b/astro/stellarium/pkg-plist
index 180b9add86a1..766607be6c35 100644
--- a/astro/stellarium/pkg-plist
+++ b/astro/stellarium/pkg-plist
@@ -2,8 +2,6 @@ bin/stellarium
 share/stellarium/config/default_config.ini
 share/stellarium/config/default_config_dome.ini
 share/stellarium/data/commonname.fab
-share/stellarium/data/constellationsart.fab
-share/stellarium/data/constellationship.fab
 share/stellarium/data/courierfont.txt
 share/stellarium/data/files_format.txt
 share/stellarium/data/hipparcos.fab
@@ -11,12 +9,27 @@ share/stellarium/data/icon.bmp
 share/stellarium/data/landscapes.ini
 share/stellarium/data/messier.fab
 share/stellarium/data/name.fab
-share/stellarium/data/script_load_config
-share/stellarium/data/script_save_config
-share/stellarium/data/script_set_locale
-share/stellarium/data/script_set_time_zone
+share/stellarium/data/planet_names.eng.fab
+share/stellarium/data/planet_names.esl.fab
+share/stellarium/data/planet_names.fra.fab
+share/stellarium/data/planet_names.haw.fab
+share/stellarium/data/sky_cultures/polynesian/constellation_names.eng.fab
+share/stellarium/data/sky_cultures/polynesian/constellation_names.haw.fab
+share/stellarium/data/sky_cultures/polynesian/constellationsart.fab
+share/stellarium/data/sky_cultures/polynesian/constellationship.fab
+share/stellarium/data/sky_cultures/western/constellation_names.eng.fab
+share/stellarium/data/sky_cultures/western/constellation_names.esl.fab
+share/stellarium/data/sky_cultures/western/constellation_names.fra.fab
+share/stellarium/data/sky_cultures/western/constellation_names.haw.fab
+share/stellarium/data/sky_cultures/western/constellationsart.fab
+share/stellarium/data/sky_cultures/western/constellationship.fab
+share/stellarium/data/skycultures.fab
 share/stellarium/data/spacefont.txt
 share/stellarium/data/ssystem.ini
+share/stellarium/data/star_names.eng.fab
+share/stellarium/data/star_names.esl.fab
+share/stellarium/data/star_names.fra.fab
+share/stellarium/data/star_names.haw.fab
 share/stellarium/data/stellarium.ico
 share/stellarium/data/zone.tab
 share/stellarium/textures/backmenu.png
@@ -25,6 +38,7 @@ share/stellarium/textures/bt_atmosphere.png
 share/stellarium/textures/bt_cardinal.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_follow.png
 share/stellarium/textures/bt_grid.png
@@ -34,8 +48,91 @@ share/stellarium/textures/bt_nebula.png
 share/stellarium/textures/bt_planet.png
 share/stellarium/textures/bt_quit.png
 share/stellarium/textures/callisto.png
+share/stellarium/textures/constellation-art/andromeda.png
+share/stellarium/textures/constellation-art/antlia.png
+share/stellarium/textures/constellation-art/apus.png
+share/stellarium/textures/constellation-art/aquarius.png
+share/stellarium/textures/constellation-art/aquila.png
+share/stellarium/textures/constellation-art/ara.png
+share/stellarium/textures/constellation-art/argonavis.png
+share/stellarium/textures/constellation-art/aries.png
+share/stellarium/textures/constellation-art/auriga.png
+share/stellarium/textures/constellation-art/bootes.png
+share/stellarium/textures/constellation-art/caelum.png
+share/stellarium/textures/constellation-art/camelopardalis.png
+share/stellarium/textures/constellation-art/cancer.png
+share/stellarium/textures/constellation-art/canes-venatici.png
+share/stellarium/textures/constellation-art/canis-major.png
+share/stellarium/textures/constellation-art/canis-minor.png
+share/stellarium/textures/constellation-art/capricornus.png
+share/stellarium/textures/constellation-art/cassiopeia.png
+share/stellarium/textures/constellation-art/centaurus.png
+share/stellarium/textures/constellation-art/cepheus.png
+share/stellarium/textures/constellation-art/cetus.png
+share/stellarium/textures/constellation-art/chamaeleon.png
+share/stellarium/textures/constellation-art/circinus.png
+share/stellarium/textures/constellation-art/columba.png
+share/stellarium/textures/constellation-art/coma-berenices.png
+share/stellarium/textures/constellation-art/corona-australis.png
+share/stellarium/textures/constellation-art/corona-borealis.png
+share/stellarium/textures/constellation-art/corvus.png
+share/stellarium/textures/constellation-art/crater.png
+share/stellarium/textures/constellation-art/crux.png
+share/stellarium/textures/constellation-art/cygnus.png
+share/stellarium/textures/constellation-art/delphinus.png
+share/stellarium/textures/constellation-art/dorado.png
+share/stellarium/textures/constellation-art/draco.png
+share/stellarium/textures/constellation-art/equuleus.png
+share/stellarium/textures/constellation-art/eridanus.png
+share/stellarium/textures/constellation-art/fornax.png
+share/stellarium/textures/constellation-art/gemini.png
+share/stellarium/textures/constellation-art/grus.png
+share/stellarium/textures/constellation-art/hercules.png
+share/stellarium/textures/constellation-art/horlogium.png
+share/stellarium/textures/constellation-art/hydra.png
+share/stellarium/textures/constellation-art/hydrus.png
+share/stellarium/textures/constellation-art/indus.png
+share/stellarium/textures/constellation-art/lacerta.png
+share/stellarium/textures/constellation-art/leo-minor.png
+share/stellarium/textures/constellation-art/leo.png
+share/stellarium/textures/constellation-art/lepus.png
+share/stellarium/textures/constellation-art/libra.png
+share/stellarium/textures/constellation-art/lupus.png
+share/stellarium/textures/constellation-art/lynx.png
+share/stellarium/textures/constellation-art/lyra.png
+share/stellarium/textures/constellation-art/mensa.png
+share/stellarium/textures/constellation-art/microscopium.png
+share/stellarium/textures/constellation-art/monoceros.png
+share/stellarium/textures/constellation-art/musca.png
+share/stellarium/textures/constellation-art/norma.png
+share/stellarium/textures/constellation-art/octans.png
+share/stellarium/textures/constellation-art/ophiuchus.png
+share/stellarium/textures/constellation-art/orion.png
+share/stellarium/textures/constellation-art/pavo.png
+share/stellarium/textures/constellation-art/pegasus.png
+share/stellarium/textures/constellation-art/perseus.png
+share/stellarium/textures/constellation-art/phoenix.png
+share/stellarium/textures/constellation-art/pictor.png
+share/stellarium/textures/constellation-art/pisces.png
+share/stellarium/textures/constellation-art/piscis-austrinus.png
+share/stellarium/textures/constellation-art/pyxis.png
+share/stellarium/textures/constellation-art/reticulum.png
+share/stellarium/textures/constellation-art/sagitta.png
+share/stellarium/textures/constellation-art/sagittarius.png
+share/stellarium/textures/constellation-art/scorpius.png
+share/stellarium/textures/constellation-art/sculptor.png
+share/stellarium/textures/constellation-art/scutum.png
+share/stellarium/textures/constellation-art/sextans.png
+share/stellarium/textures/constellation-art/taurus.png
+share/stellarium/textures/constellation-art/telescopium.png
+share/stellarium/textures/constellation-art/triangulum-australe.png
+share/stellarium/textures/constellation-art/triangulum.png
 share/stellarium/textures/constellation-art/tucana.png
 share/stellarium/textures/constellation-art/ursa-major.png
+share/stellarium/textures/constellation-art/ursa-minor.png
+share/stellarium/textures/constellation-art/virgo.png
+share/stellarium/textures/constellation-art/volans.png
+share/stellarium/textures/constellation-art/vulpecula.png
 share/stellarium/textures/courierfont.png
 share/stellarium/textures/down.png
 share/stellarium/textures/earthmap.png
@@ -47,6 +144,15 @@ share/stellarium/textures/headermenu.png
 share/stellarium/textures/io.png
 share/stellarium/textures/jupiter.png
 share/stellarium/textures/landscapes/forest.png
+share/stellarium/textures/landscapes/guereins1.png
+share/stellarium/textures/landscapes/guereins2.png
+share/stellarium/textures/landscapes/guereins3.png
+share/stellarium/textures/landscapes/guereins4.png
+share/stellarium/textures/landscapes/guereins5.png
+share/stellarium/textures/landscapes/guereins6.png
+share/stellarium/textures/landscapes/guereins7.png
+share/stellarium/textures/landscapes/guereins8.png
+share/stellarium/textures/landscapes/guereinsb.png
 share/stellarium/textures/landscapes/sea1.png
 share/stellarium/textures/landscapes/sea2.png
 share/stellarium/textures/landscapes/sea3.png
@@ -189,6 +295,9 @@ share/stellarium/textures/zenith.png
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 @dirrm share/stellarium/config
+@dirrm share/stellarium/data/sky_cultures/polynesian
+@dirrm share/stellarium/data/sky_cultures/western
+@dirrm share/stellarium/data/sky_cultures
 @dirrm share/stellarium/data
 @dirrm share/stellarium/textures/constellation-art
 @dirrm share/stellarium/textures/landscapes