- Update to version 0.6.0

PR:		ports/67883
Submitted by:	maintainer

5 files changed, 148 insertions, 112 deletions

diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 2daf9bad2a20..c96f03e55199 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		stellarium
-PORTVERSION=		0.5.2
-PORTREVISION=	2
+PORTVERSION=		0.6.0
 CATEGORIES=		astro
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		A 3D photo-realistic sky renderer
 
+USE_GCC=		3.3
 USE_GL=			yes
 USE_SDL=		sdl
 USE_X_PREFIX=		yes
@@ -23,6 +23,8 @@ USE_GMAKE=		yes
 CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include" \
 			LDFLAGS="-L${X11BASE}/lib"
 
+MAN1=			stellarium.1
+
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${DOCSDIR}
diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo
index 017d86b84c8f..1fcd54a6e005 100644
--- a/astro/stellarium/distinfo
+++ b/astro/stellarium/distinfo
@@ -1,2 +1,2 @@
-MD5 (stellarium-0.5.2.tar.gz) = 3765a5ba8cb0e328ccccc282e21c875e
-SIZE (stellarium-0.5.2.tar.gz) = 3093149
+MD5 (stellarium-0.6.0.tar.gz) = 820a9246cb8c17c1ef6361100984ccbe
+SIZE (stellarium-0.6.0.tar.gz) = 5934058
diff --git a/astro/stellarium/files/patch-configure b/astro/stellarium/files/patch-configure
index ee031ad85cf9..686b7425d65c 100644
--- a/astro/stellarium/files/patch-configure
+++ b/astro/stellarium/files/patch-configure
@@ -1,71 +1,11 @@
---- configure.orig	Mon Jan 26 06:37:00 2004
-+++ configure	Mon Jan 26 07:02:35 2004
-@@ -1020,21 +1020,7 @@
- fi
+--- configure.orig	Sat Jun 12 17:26:37 2004
++++ configure	Sat Jun 12 17:27:52 2004
+@@ -3331,8 +3331,6 @@
  
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS="$ac_save_CFLAGS"
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
--  else
--    CFLAGS=
--  fi
--fi
-+CFLAGS="$ac_save_CFLAGS"
  
- for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
- do
-@@ -1163,26 +1149,9 @@
- fi
  
- echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
--if test "$ac_test_CXXFLAGS" = set; then
--  CXXFLAGS="$ac_save_CXXFLAGS"
--elif test $ac_cv_prog_cxx_g = yes; then
--  if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
--  else
--    CXXFLAGS="-g"
--  fi
--else
--  if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
--  else
--    CXXFLAGS=
--  fi
--fi
-+CXXFLAGS="$ac_save_CXXFLAGS"
+-CFLAGS=" -Wall -s -O3"
+-CXXFLAGS=" -Wall -s -O3"
  
- 
--CFLAGS="-s -Wall -O2 -ffast-math -fexpensive-optimizations"
--CXXFLAGS="-s -Wall -O2 -ffast-math -fexpensive-optimizations"
--LIBS="$LIBS"
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:1189: checking how to run the C preprocessor" >&5
-@@ -2387,7 +2356,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "SDL/SDL.h"
-+#include <SDL.h>
- 
- char*
- my_strdup (char *str)
-@@ -2480,7 +2449,7 @@
- #include "confdefs.h"
- 
- #include <stdio.h>
--#include "SDL/SDL.h"
-+#include <SDL.h>
- 
- int main() {
-  return 0; 
+ 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
new file mode 100644
index 000000000000..fb153fd3cdd1
--- /dev/null
+++ b/astro/stellarium/files/patch-src_observator.cpp
@@ -0,0 +1,29 @@
+--- 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);
+ 
+ 	
+-/*	time_t rawtime = get_time_t_from_julian(JD);
++	time_t rawtime = get_time_t_from_julian(JD);
+ 
+ 	struct tm * timeinfo;
+ 	timeinfo = localtime(&rawtime);
+ 	static char heure[20];
+ 	heure[0] = '\0';
+ 	my_strftime(heure, 19, "%z", timeinfo);
+-	cout << heure << endl;
+ 
+-	cout << timezone << endl;
+ 	
+ 	heure[5] = '\0';
+ 	float min = 1.f/60.f * atoi(&heure[3]);
+ 	heure[3] = '\0';
+ 	return min + atoi(heure);
+-	*/
+ }
+ 
+ // Return the time in ISO 8601 format that is : %Y-%m-%d %H:%M:%S
diff --git a/astro/stellarium/pkg-plist b/astro/stellarium/pkg-plist
index 105459a52043..180b9add86a1 100644
--- a/astro/stellarium/pkg-plist
+++ b/astro/stellarium/pkg-plist
@@ -1,52 +1,52 @@
 bin/stellarium
-share/stellarium/config/config.txt
-share/stellarium/config/config_no_3D_acceleration.txt
-share/stellarium/config/default_config.txt
-share/stellarium/config/default_location.txt
-share/stellarium/config/location.txt
-share/stellarium/config/location_examples.txt
+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
 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/spacefont.txt
+share/stellarium/data/ssystem.ini
 share/stellarium/data/stellarium.ico
-share/stellarium/textures/Bouton1.png
-share/stellarium/textures/Bouton10.png
-share/stellarium/textures/Bouton11.png
-share/stellarium/textures/Bouton12.png
-share/stellarium/textures/Bouton13.png
-share/stellarium/textures/Bouton14.png
-share/stellarium/textures/Bouton15.png
-share/stellarium/textures/Bouton16.png
-share/stellarium/textures/Bouton2.png
-share/stellarium/textures/Bouton3.png
-share/stellarium/textures/Bouton4.png
-share/stellarium/textures/Bouton5.png
-share/stellarium/textures/Bouton6.png
-share/stellarium/textures/Bouton7.png
-share/stellarium/textures/Bouton8.png
-share/stellarium/textures/Bouton9.png
+share/stellarium/data/zone.tab
 share/stellarium/textures/backmenu.png
-share/stellarium/textures/ciel.png
-share/stellarium/textures/e.png
+share/stellarium/textures/backmenu_flip.png
+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_constellations.png
+share/stellarium/textures/bt_follow.png
+share/stellarium/textures/bt_grid.png
+share/stellarium/textures/bt_ground.png
+share/stellarium/textures/bt_help.png
+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/tucana.png
+share/stellarium/textures/constellation-art/ursa-major.png
+share/stellarium/textures/courierfont.png
+share/stellarium/textures/down.png
 share/stellarium/textures/earthmap.png
-share/stellarium/textures/etoile16x16.png
-share/stellarium/textures/etoile16x162.png
-share/stellarium/textures/etoile16x16Aigrettes.png
-share/stellarium/textures/etoile32x32.png
+share/stellarium/textures/europa.png
 share/stellarium/textures/fog.png
+share/stellarium/textures/ganymede.png
 share/stellarium/textures/halo.png
-share/stellarium/textures/haloLune.png
 share/stellarium/textures/headermenu.png
+share/stellarium/textures/io.png
 share/stellarium/textures/jupiter.png
-share/stellarium/textures/landscapes/mountain1.png
-share/stellarium/textures/landscapes/mountain2.png
-share/stellarium/textures/landscapes/mountain3.png
-share/stellarium/textures/landscapes/mountain4.png
-share/stellarium/textures/landscapes/mountain5.png
+share/stellarium/textures/landscapes/forest.png
 share/stellarium/textures/landscapes/sea1.png
 share/stellarium/textures/landscapes/sea2.png
 share/stellarium/textures/landscapes/sea3.png
@@ -57,43 +57,107 @@ share/stellarium/textures/landscapes/snowy2.png
 share/stellarium/textures/landscapes/snowy3.png
 share/stellarium/textures/landscapes/snowy4.png
 share/stellarium/textures/landscapes/snowy5.png
+share/stellarium/textures/landscapes/trees_512.png
 share/stellarium/textures/lune.png
 share/stellarium/textures/m1.png
+share/stellarium/textures/m10.png
 share/stellarium/textures/m100.png
 share/stellarium/textures/m101.png
+share/stellarium/textures/m102.png
+share/stellarium/textures/m103.png
 share/stellarium/textures/m104.png
 share/stellarium/textures/m105.png
+share/stellarium/textures/m106.png
+share/stellarium/textures/m107.png
+share/stellarium/textures/m108.png
+share/stellarium/textures/m109.png
+share/stellarium/textures/m11.png
+share/stellarium/textures/m110.png
+share/stellarium/textures/m12.png
 share/stellarium/textures/m13.png
+share/stellarium/textures/m14.png
 share/stellarium/textures/m15.png
+share/stellarium/textures/m16.png
+share/stellarium/textures/m17.png
+share/stellarium/textures/m18.png
+share/stellarium/textures/m19.png
 share/stellarium/textures/m2.png
 share/stellarium/textures/m20.png
+share/stellarium/textures/m21.png
+share/stellarium/textures/m22.png
+share/stellarium/textures/m23.png
+share/stellarium/textures/m24.png
+share/stellarium/textures/m25.png
+share/stellarium/textures/m26.png
 share/stellarium/textures/m27.png
+share/stellarium/textures/m28.png
+share/stellarium/textures/m29.png
 share/stellarium/textures/m3.png
+share/stellarium/textures/m30.png
 share/stellarium/textures/m31.png
 share/stellarium/textures/m33.png
+share/stellarium/textures/m34.png
+share/stellarium/textures/m35.png
 share/stellarium/textures/m36.png
 share/stellarium/textures/m37.png
 share/stellarium/textures/m38.png
 share/stellarium/textures/m4.png
+share/stellarium/textures/m41.png
 share/stellarium/textures/m42.png
 share/stellarium/textures/m43.png
 share/stellarium/textures/m44.png
 share/stellarium/textures/m45.png
 share/stellarium/textures/m46.png
+share/stellarium/textures/m48.png
+share/stellarium/textures/m49.png
 share/stellarium/textures/m5.png
+share/stellarium/textures/m50.png
 share/stellarium/textures/m51.png
+share/stellarium/textures/m52.png
+share/stellarium/textures/m53.png
+share/stellarium/textures/m54.png
+share/stellarium/textures/m55.png
+share/stellarium/textures/m56.png
 share/stellarium/textures/m57.png
+share/stellarium/textures/m58.png
+share/stellarium/textures/m59.png
+share/stellarium/textures/m6.png
+share/stellarium/textures/m60.png
+share/stellarium/textures/m61.png
+share/stellarium/textures/m62.png
 share/stellarium/textures/m63.png
+share/stellarium/textures/m64.png
 share/stellarium/textures/m65.png
 share/stellarium/textures/m66.png
+share/stellarium/textures/m67.png
+share/stellarium/textures/m68.png
+share/stellarium/textures/m69.png
+share/stellarium/textures/m7.png
+share/stellarium/textures/m70.png
+share/stellarium/textures/m71.png
+share/stellarium/textures/m72.png
+share/stellarium/textures/m73.png
+share/stellarium/textures/m74.png
+share/stellarium/textures/m75.png
 share/stellarium/textures/m76.png
+share/stellarium/textures/m78.png
+share/stellarium/textures/m79.png
 share/stellarium/textures/m8.png
+share/stellarium/textures/m80.png
 share/stellarium/textures/m81.png
 share/stellarium/textures/m82.png
 share/stellarium/textures/m83.png
 share/stellarium/textures/m84.png
+share/stellarium/textures/m85.png
+share/stellarium/textures/m86.png
 share/stellarium/textures/m87.png
+share/stellarium/textures/m89.png
+share/stellarium/textures/m9.png
+share/stellarium/textures/m90.png
+share/stellarium/textures/m91.png
 share/stellarium/textures/m92.png
+share/stellarium/textures/m93.png
+share/stellarium/textures/m94.png
 share/stellarium/textures/m95.png
 share/stellarium/textures/m96.png
 share/stellarium/textures/m97.png
@@ -101,23 +165,23 @@ share/stellarium/textures/m98.png
 share/stellarium/textures/m99.png
 share/stellarium/textures/mars.png
 share/stellarium/textures/mercury.png
-share/stellarium/textures/n.png
-share/stellarium/textures/nadir.png
+share/stellarium/textures/milkyway.png
 share/stellarium/textures/neb.png
 share/stellarium/textures/neptune.png
+share/stellarium/textures/orion_neb.png
+share/stellarium/textures/pleiades.png
 share/stellarium/textures/pointeur2.png
-share/stellarium/textures/pointeur3.png
 share/stellarium/textures/pointeur4.png
 share/stellarium/textures/pointeur5.png
-share/stellarium/textures/s.png
 share/stellarium/textures/saturn.png
-share/stellarium/textures/saturneAnneaux128x128.png
+share/stellarium/textures/saturn_rings.png
 share/stellarium/textures/spacefont.png
+share/stellarium/textures/star16x16.png
 share/stellarium/textures/sun.png
+share/stellarium/textures/titan.png
+share/stellarium/textures/up.png
 share/stellarium/textures/uranus.png
 share/stellarium/textures/venus.png
-share/stellarium/textures/voielactee256x256.png
-share/stellarium/textures/w.png
 share/stellarium/textures/zenith.png
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -126,6 +190,7 @@ share/stellarium/textures/zenith.png
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 @dirrm share/stellarium/config
 @dirrm share/stellarium/data
+@dirrm share/stellarium/textures/constellation-art
 @dirrm share/stellarium/textures/landscapes
 @dirrm share/stellarium/textures
 @dirrm share/stellarium