Changes 1.4.0

* New stars.dat format with HD catalog numbers and parallax errors omitted
* Added catalog cross indexes for HD and SAO catalogs
* Fixed bugs in parsing catalog numbers
* Added white dwarf temperatures and  spectral types DA, DB, DC, DO, DQ, and DZ
* Added handling for partial spectral types where one or both of the subclass
  and luminosity class are unknown
* Permit extended star attributes in .stc files: mesh, texture, rotation
  elements, semiaxes
* Support multiple star systems of any complexity with orbits and barycenters
* Changed .stc loader so that a star definition with a duplicate catalog
  number replaces the previous definition
* Made catalog numbers optional in .stc files; stars can be defined without
  having to create fake catalog numbers
* Star colors now chosen based on temperature; either 'classic' and black body
  colors may be selected
* Bound % key to toggle between star color tables
* Fixed black holes: infinite radius bug gone, rendered just as a plain black
  sphere
* Added comprehensive catalog of all knows stars within 25 light years of the
  Sun, including orbits for multiple star systems
[More]

Changes 1.4.1
* Changed maximum number of eclipse shadows in OpenGL 2.0 path from two to
  three; if max is exceeded, clamp to three rather than not rendering the
  shadows at all.
* Corrected a bad calculation in ring shadow shaders that caused ring shadows
  to be drawn in the wrong place.
* Windows: Fixed the minimum feature size slider in the locations dialog so it
  updates in response to all the standard controls.
* Added a correct InfoURL for the Moon
* Windows: added splash screen with a progress indicator
* Corrected a local flashing of the Milky Way brightness.
* Now the distance to the galaxy center is displayed, if the observer is
  located inside the galaxy (Milky Way...).
* Eliminated various incorrect Hubble type acronyms in deepsky.dsc that had
  penetrated the PERL filter.
* Updated  Titan and Iapetus textures in lores directory
* Added lunar elevation map, using Clementine laser altimeter data, merged
  in the polar regions, with topographic data  from Clementine 750 nm
  oblique and nadir images.
* Updated/added Tethys textures in lores, medres and hires directories.
* Added locations on Phoebe in satmoons2.ssc, as extracted from USGS/IAU
  official data.
* Added Mesh for Phoebe texture.
* Updated Iapetus texture.
* Moved locations files from extras into data directory for inclusion in
  standard package.
* Fixed bug where displayed time scale differed from actual time scale after
  clicking a cel URL.
[More]

Pkgsrc:
* Use options.mk framework to build GLUT, GTK, GNOME, or KDE user interface.

8 files changed, 127 insertions, 105 deletions

diff --git a/misc/celestia/patches/patch-aa b/misc/celestia/patches/patch-aa
index fb472996de6..367461c55b2 100644
--- a/misc/celestia/patches/patch-aa
+++ b/misc/celestia/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/11/10 16:38:51 adam Exp $
+$NetBSD: patch-aa,v 1.4 2006/02/17 23:46:39 adam Exp $
 
---- configure.orig	2004-08-23 07:15:43.000000000 +0000
+--- configure.orig	2006-02-15 22:53:09.000000000 +0100
 +++ configure
-@@ -14591,8 +14591,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -21716,8 +21716,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  
  
  CELESTIA_CPPFLAGS=""
@@ -11,5 +11,70 @@ $NetBSD: patch-aa,v 1.3 2004/11/10 16:38:51 adam Exp $
 +CELESTIA_CFLAGS="-Wall -ffast-math -fexpensive-optimizations"
 +CELESTIA_CXXFLAGS="-Wall -ffast-math -fexpensive-optimizations"
  
- 
  echo "$as_me:$LINENO: checking whether to include debugging code" >&5
+ echo $ECHO_N "checking whether to include debugging code... $ECHO_C" >&6
+@@ -37346,19 +37346,19 @@ else
+ if test "$ac_use_path_checking" = "default"; then
+ 
+   if test -z "$kde_htmldir"; then
+-    kde_htmldir='\${datadir}/doc/HTML'
++    kde_htmldir='\${datadir}/doc/kde/HTML'
+   fi
+   if test -z "$kde_appsdir"; then
+-    kde_appsdir='\${datadir}/applnk'
++    kde_appsdir='\${datadir}/kde/applnk'
+   fi
+   if test -z "$kde_icondir"; then
+-    kde_icondir='\${datadir}/icons'
++    kde_icondir='\${datadir}/kde/icons'
+   fi
+   if test -z "$kde_sounddir"; then
+-    kde_sounddir='\${datadir}/sounds'
++    kde_sounddir='\${datadir}/kde/sounds'
+   fi
+   if test -z "$kde_datadir"; then
+-    kde_datadir='\${datadir}/apps'
++    kde_datadir='\${datadir}/kde/apps'
+   fi
+   if test -z "$kde_locale"; then
+     kde_locale='\${datadir}/locale'
+@@ -37367,31 +37367,31 @@ if test "$ac_use_path_checking" = "defau
+     kde_cgidir='\${exec_prefix}/cgi-bin'
+   fi
+   if test -z "$kde_confdir"; then
+-    kde_confdir='\${datadir}/config'
++    kde_confdir='\${datadir}/kde/config'
+   fi
+   if test -z "$kde_kcfgdir"; then
+-    kde_kcfgdir='\${datadir}/config.kcfg'
++    kde_kcfgdir='\${datadir}/kde/config.kcfg'
+   fi
+   if test -z "$kde_mimedir"; then
+-    kde_mimedir='\${datadir}/mimelnk'
++    kde_mimedir='\${datadir}/kde/mimelnk'
+   fi
+   if test -z "$kde_toolbardir"; then
+-    kde_toolbardir='\${datadir}/toolbar'
++    kde_toolbardir='\${datadir}/kde/toolbar'
+   fi
+   if test -z "$kde_wallpaperdir"; then
+-    kde_wallpaperdir='\${datadir}/wallpapers'
++    kde_wallpaperdir='\${datadir}/kde/wallpapers'
+   fi
+   if test -z "$kde_templatesdir"; then
+-    kde_templatesdir='\${datadir}/templates'
++    kde_templatesdir='\${datadir}/kde/templates'
+   fi
+   if test -z "$kde_bindir"; then
+     kde_bindir='\${exec_prefix}/bin'
+   fi
+   if test -z "$kde_servicesdir"; then
+-    kde_servicesdir='\${datadir}/services'
++    kde_servicesdir='\${datadir}/kde/services'
+   fi
+   if test -z "$kde_servicetypesdir"; then
+-    kde_servicetypesdir='\${datadir}/servicetypes'
++    kde_servicetypesdir='\${datadir}/kde/servicetypes'
+   fi
+   if test -z "$kde_moduledir"; then
+     if test "$kde_qtver" = "2"; then
diff --git a/misc/celestia/patches/patch-ab b/misc/celestia/patches/patch-ab
deleted file mode 100644
index 7d957019121..00000000000
--- a/misc/celestia/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/11/10 16:38:27 adam Exp $
-
---- manual/Makefile.in.orig	2004-08-23 07:22:06.000000000 +0000
-+++ manual/Makefile.in
-@@ -69,7 +69,7 @@ target_triplet = @target@
- EXEEXT = @EXEEXT@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
--pkgdatadir = @datadir@/@PACKAGE@/manual
-+pkgdatadir = @datadir@/doc/html/@PACKAGE@/manual
- AMTAR = @AMTAR@
- ARTSCCONFIG = @ARTSCCONFIG@
- AS = @AS@
diff --git a/misc/celestia/patches/patch-ac b/misc/celestia/patches/patch-ac
index 0f33db57dbb..b89e3c01547 100644
--- a/misc/celestia/patches/patch-ac
+++ b/misc/celestia/patches/patch-ac
@@ -1,31 +1,22 @@
-$NetBSD: patch-ac,v 1.3 2004/11/16 14:34:39 adam Exp $
+$NetBSD: patch-ac,v 1.4 2006/02/17 23:46:39 adam Exp $
 
---- src/celestia/kde/celestialbrowser.cpp.orig	2004-11-15 17:03:29.000000000 +0000
-+++ src/celestia/kde/celestialbrowser.cpp
-@@ -138,7 +138,7 @@ void CelestialBrowser::slotRefresh()
-         QString starClass(buf);
+--- config.h.in.orig	2006-02-15 22:53:21.000000000 +0100
++++ config.h.in
+@@ -248,7 +248,7 @@ int res_init(void);
  
-         CelListViewItem *starItem = new CelListViewItem(listStars, QString(name),
--                                    QString::fromUtf8(ReplaceGreekLetterAbbr(name).c_str()), dist, appMag, absMag, starClass);
-+                                    QString(name), dist, appMag, absMag, starClass);
-         
-         SolarSystemCatalog::iterator iter = solarSystemCatalog->find(star->getCatalogNumber());
-         if (iter != solarSystemCatalog->end())
-@@ -156,7 +156,7 @@ void CelestialBrowser::slotRefresh()
-                 sprintf(buf, " %.2f au", starBodyDist / KM_PER_AU);
-                 QString distStarBody(buf);
-                                                                              
--                CelListViewItem *planetItem = new CelListViewItem(starItem, QString(body->getName()), 
-+                CelListViewItem *planetItem = new CelListViewItem(starItem, QString(body->getName().c_str()), 
-                                             QString::fromUtf8(body->getName().c_str()),
-                                             distStarBody, "", "", getClassification(body->getClassification()));
-                 
-@@ -173,7 +173,7 @@ void CelestialBrowser::slotRefresh()
-                                 sprintf(buf, " %.0f km", bodySatDist);
-                                 QString distBodySat(buf);
-                                 
--                                new CelListViewItem(planetItem, QString(sat->getName()),
-+                                new CelListViewItem(planetItem, QString(sat->getName().c_str()),
-                                     QString::fromUtf8(sat->getName().c_str()),
-                                     distBodySat, "", "", getClassification(sat->getClassification()));
  
+ 
+-#if !defined(HAVE_STRLCAT_PROTO)
++#if !defined(HAVE_STRLCAT_PROTO) && defined(KDELIBSUFF)
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -260,7 +260,7 @@ unsigned long strlcat(char*, const char*
+ 
+ 
+ 
+-#if !defined(HAVE_STRLCPY_PROTO)
++#if !defined(HAVE_STRLCPY_PROTO) && defined(KDELIBSUFF)
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/misc/celestia/patches/patch-ad b/misc/celestia/patches/patch-ad
index 793414e74ab..45cd61c9a3e 100644
--- a/misc/celestia/patches/patch-ad
+++ b/misc/celestia/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2004/11/10 16:38:27 adam Exp $
+$NetBSD: patch-ad,v 1.3 2006/02/17 23:46:40 adam Exp $
 
---- src/celestia/celestiacore.cpp.orig	2004-07-30 07:10:10.000000000 +0000
+--- src/celestia/celestiacore.cpp.orig	2006-02-08 10:03:15.000000000 +0100
 +++ src/celestia/celestiacore.cpp
-@@ -3454,7 +3454,7 @@ bool CelestiaCore::initSimulation()
+@@ -3547,7 +3547,7 @@ bool CelestiaCore::initSimulation(const 
      }
- #endif
- 
--    config = ReadCelestiaConfig("celestia.cfg");
-+    config = ReadCelestiaConfig(PKG_SYSCONFDIR "/celestia.cfg");
-     if (config == NULL)
+     else
      {
-         fatalError("Error reading configuration file.");;
+-        config = ReadCelestiaConfig("celestia.cfg");
++        config = ReadCelestiaConfig(PKG_SYSCONFDIR "/celestia.cfg");
+ 
+         string localConfigFile = WordExp("~/.celestia.cfg");
+         if (localConfigFile != "")
diff --git a/misc/celestia/patches/patch-ae b/misc/celestia/patches/patch-ae
index 6215481fe49..8665bdbf545 100644
--- a/misc/celestia/patches/patch-ae
+++ b/misc/celestia/patches/patch-ae
@@ -1,13 +1,21 @@
-$NetBSD: patch-ae,v 1.3 2004/11/10 16:38:27 adam Exp $
+$NetBSD: patch-ae,v 1.4 2006/02/17 23:46:40 adam Exp $
 
---- Makefile.in.orig	2004-08-23 07:22:06.000000000 +0000
+--- Makefile.in.orig	2006-02-15 22:53:42.000000000 +0100
 +++ Makefile.in
-@@ -255,7 +255,7 @@ x_includes = @x_includes@
- x_libraries = @x_libraries@
- dosstuff = celestia.mak $(wildcard *.bat)
- noinst_DATA = devguide.txt $(dosstuff)
--pkgdata_DATA = celestia.cfg $(wildcard *.cel) controls.txt COPYING
-+pkgdata_DATA = $(wildcard *.cel) controls.txt COPYING
+@@ -307,7 +307,6 @@ noinst_DATA = \
  
- EXTRA_DIST = $(pkgdata_DATA) $(noinst_DATA) admin
  
+ pkgdata_DATA = \
+-	celestia.cfg \
+ 	controls.txt \
+ 	COPYING \
+ 	$(wildcard *.cel)
+@@ -848,7 +847,7 @@ dist-hook:
+ 
+ install-data-hook:
+ 	if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
+-		mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \
++		mv -f $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \
+ 		rmdir $(kde_datadir)/@PACKAGE@ ; \
+ 	fi
+ 	if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
diff --git a/misc/celestia/patches/patch-ah b/misc/celestia/patches/patch-ah
index fb348347626..e0220780003 100644
--- a/misc/celestia/patches/patch-ah
+++ b/misc/celestia/patches/patch-ah
@@ -1,19 +1,12 @@
-$NetBSD: patch-ah,v 1.1 2005/06/20 06:02:30 hira Exp $
+$NetBSD: patch-ah,v 1.2 2006/02/17 23:46:40 adam Exp $
 
---- src/celestia/gtk/data/Makefile.in.orig	2004-08-23 16:22:09.000000000 +0900
-+++ src/celestia/gtk/data/Makefile.in	2005-06-20 01:12:04.000000000 +0900
-@@ -253,11 +253,11 @@
- qt_libraries = @qt_libraries@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
--schemasdir = $(GCONF_SCHEMA_FILE_DIR)
--schemas_DATA = celestia.schemas
-+@ENABLE_GTK_TRUE@schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-+@ENABLE_GTK_TRUE@schemas_DATA = celestia.schemas
+--- src/celutil/util.h.orig	2006-01-17 21:28:30.000000000 +0100
++++ src/celutil/util.h
+@@ -28,6 +28,7 @@
+ #ifdef _WIN32
+ #define _(s) s
+ #else
++#include <libintl.h>
+ #define _(s) gettext(s)
+ #endif
  
- EXTRA_DIST = $(schemas_DATA) celestia.png celestia.desktop
--pkgdata_DATA = celestia.png
-+@ENABLE_GTK_FALSE@pkgdata_DATA = celestia.png
- 
- @ENABLE_GTK_TRUE@Applicationsdir = $(datadir)/applications
- @ENABLE_GTK_TRUE@Applications_DATA = celestia.desktop
diff --git a/misc/celestia/patches/patch-ai b/misc/celestia/patches/patch-ai
deleted file mode 100644
index 22cdf9a64ea..00000000000
--- a/misc/celestia/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/01/20 03:09:17 joerg Exp $
-
---- src/celutil/resmanager.h.orig	2006-01-20 02:31:51.000000000 +0000
-+++ src/celutil/resmanager.h
-@@ -72,7 +72,7 @@ template<class T> class ResourceManager
-         {
-             ResourceHandle h = handles.size();
-             resources.insert(resources.end(), info);
--            handles.insert(ResourceHandleMap::value_type(info, h));
-+            handles.insert(typename ResourceHandleMap::value_type(info, h));
-             return h;
-         }
-     }
-@@ -105,7 +105,7 @@ template<class T> class ResourceManager
-                     else
-                     {
-                         resources[h].state = ResourceLoaded;
--                        loadedResources.insert(NameMap::value_type(resources[h].resolvedName, resources[h].resource));
-+                        loadedResources.insert(typename NameMap::value_type(resources[h].resolvedName, resources[h].resource));
-                     }
-                 }
-             }
diff --git a/misc/celestia/patches/patch-aj b/misc/celestia/patches/patch-aj
index 0c3e13568ac..8528710b8d1 100644
--- a/misc/celestia/patches/patch-aj
+++ b/misc/celestia/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2006/01/20 03:09:17 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2006/02/17 23:46:40 adam Exp $
 
---- src/celestia/glutmain.cpp.orig	2006-01-20 02:46:31.000000000 +0000
+--- src/celestia/glutmain.cpp.orig	2005-07-19 22:30:59.000000000 +0200
 +++ src/celestia/glutmain.cpp
-@@ -511,7 +511,7 @@ int main(int argc, char* argv[])
+@@ -521,7 +521,7 @@ int main(int argc, char* argv[])
      // Set the simulation starting time to the current system time
      time_t curtime=time(NULL);
      appCore->start((double) curtime / 86400.0 + (double) astro::Date(1970, 1, 1));