Updated to xplanet-1.0.1, rewrite of older version

12 files changed, 43 insertions, 447 deletions

diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 2de631b38ed..5369a4ad740 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/05/29 23:14:12 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/05 09:07:55 wulf Exp $
 #
 
-DISTNAME=		xplanet-0.93
-PKGREVISION=		3
+DISTNAME=		xplanet-1.0.1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xplanet/}
 
@@ -22,12 +21,6 @@ CONFIGURE_ARGS+=	--with-glut-dir=${BUILDLINK_PREFIX.Mesa}
 LIBS=			-lXext -lpbm -lppm -lpgm
 MAKE_ENV+=		LIBS="${LIBS}"
 
-pre-configure:
-	cd ${WRKSRC} ; \
-	f=xplanet.1 ; \
-	[ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
-	${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f
-
 .include "../../graphics/Mesa/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
diff --git a/x11/xplanet/PLIST b/x11/xplanet/PLIST
index 6421a81b69a..8354935de93 100644
--- a/x11/xplanet/PLIST
+++ b/x11/xplanet/PLIST
@@ -1,46 +1,36 @@
-@comment $NetBSD: PLIST,v 1.1 2002/03/25 16:08:07 atatat Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/05 09:07:55 wulf Exp $
 bin/xplanet
-bin/xplanetbg
-bin/tkxplanet
-bin/tzcoord.pl
-man/man1/tkxplanet.1
-man/man1/tzcoord.pl.1
 man/man1/xplanet.1
-man/man1/xplanetbg.1
-share/xplanet/satellites/science
-share/xplanet/satellites/iss
-share/xplanet/satellites/science.tle
-share/xplanet/satellites/iss.tle
-share/xplanet/markers/locale/ru_RU/earth
-share/xplanet/markers/locale/el_GR/earth
-share/xplanet/markers/locale/ja_JP/earth
-share/xplanet/markers/locale/ko_KR/earth
-share/xplanet/markers/locale/zh_CN/earth
-share/xplanet/markers/locale/zh_TW/earth
-share/xplanet/markers/earth
-share/xplanet/markers/moon
-share/xplanet/markers/mars
+share/xplanet/rgb.txt
+share/xplanet/arcs/README
+share/xplanet/config/default
+share/xplanet/config/earth_markers
+share/xplanet/config/moon_orbit
+share/xplanet/config/overlay_clouds
+share/xplanet/fonts/README
+share/xplanet/fonts/FreeSans.ttf
+share/xplanet/images/README
+share/xplanet/images/earth.jpg
 share/xplanet/images/night.jpg
-share/xplanet/images/iss.png
-share/xplanet/images/smile.png
 share/xplanet/images/hubble.png
 share/xplanet/images/shuttle.png
 share/xplanet/images/sublunar.png
+share/xplanet/images/iss.png
+share/xplanet/images/smile.png
 share/xplanet/images/subsolar.png
-share/xplanet/images/earth.jpg
-share/xplanet/images/README
-share/xplanet/fonts/helr____.ttf
-share/xplanet/fonts/README
-share/xplanet/rgb.txt
+share/xplanet/markers/earth
+share/xplanet/origin/README
+share/xplanet/origin/cassini
+share/xplanet/origin/galileo
+share/xplanet/satellites/iss
+share/xplanet/satellites/iss.tle
+share/xplanet/stars/BSC
+@dirrm share/xplanet/arcs
+@dirrm share/xplanet/config
 @dirrm share/xplanet/fonts
 @dirrm share/xplanet/images
-@dirrm share/xplanet/markers/locale/el_GR
-@dirrm share/xplanet/markers/locale/ja_JP
-@dirrm share/xplanet/markers/locale/ko_KR
-@dirrm share/xplanet/markers/locale/ru_RU
-@dirrm share/xplanet/markers/locale/zh_CN
-@dirrm share/xplanet/markers/locale/zh_TW
-@dirrm share/xplanet/markers/locale
 @dirrm share/xplanet/markers
+@dirrm share/xplanet/origin
 @dirrm share/xplanet/satellites
+@dirrm share/xplanet/stars
 @dirrm share/xplanet
diff --git a/x11/xplanet/distinfo b/x11/xplanet/distinfo
index d6ea5b2dc2a..281806b0c9d 100644
--- a/x11/xplanet/distinfo
+++ b/x11/xplanet/distinfo
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/04/04 16:47:54 atatat Exp $
+$NetBSD: distinfo,v 1.3 2003/07/05 09:07:55 wulf Exp $
 
-SHA1 (xplanet-0.93.tar.gz) = 5071bcaa203b340ca2f6e5099c7f3891d103258f
-Size (xplanet-0.93.tar.gz) = 1164083 bytes
-SHA1 (patch-aa) = 3081b5a31e998211a87b1f61c28c0600d6285d9e
-SHA1 (patch-ab) = 2d51e109df7cdff79d2cd5ae3fcb3adfddfd02ea
-SHA1 (patch-ac) = a66c8105bf1e31991fadeb3f53774375cc6200cc
-SHA1 (patch-ad) = 95c0ec0f7ee99f4cbf6d5509e7bea25de0653ba6
-SHA1 (patch-ae) = b4a000a9f47b8f735427ff5ae809503d325d43e7
-SHA1 (patch-af) = bcfea356988ba96479f11a456e13e55950431dfa
-SHA1 (patch-ag) = 55720da3e95587fdd22a534e6422f7376724d820
-SHA1 (patch-ah) = 5042d454143b9c92e8555c0f19f24dde4e6ea81c
+SHA1 (xplanet-1.0.1.tar.gz) = 611f076e99724b0991440bf78189756968342d98
+Size (xplanet-1.0.1.tar.gz) = 951540 bytes
+SHA1 (patch-ai) = 3d579f0362bc902c03fff806e393791617a843b2
diff --git a/x11/xplanet/patches/patch-aa b/x11/xplanet/patches/patch-aa
deleted file mode 100644
index c6787a2e27b..00000000000
--- a/x11/xplanet/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/04/04 16:47:55 atatat Exp $
-
-Make freetype2 work with xplanet.
-
---- aclocal.m4.orig	Tue Jan 22 21:07:42 2002
-+++ aclocal.m4	Wed Apr  3 00:10:53 2002
-@@ -9,7 +9,7 @@
-     AC_MSG_WARN(*** Xplanet will be built without freetype support ***)
-     with_freetype='no'
-   else
--    FREETYPE_CFLAGS="-I`$FREETYPE_CONFIG --prefix`/include `$FREETYPE_CONFIG --cflags`"
-+    FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags` -I`$FREETYPE_CONFIG --prefix`/include"
-     FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
-     AC_SUBST(FREETYPE_CFLAGS)
-     AC_SUBST(FREETYPE_LIBS)
diff --git a/x11/xplanet/patches/patch-ab b/x11/xplanet/patches/patch-ab
deleted file mode 100644
index fa7e4e1adc3..00000000000
--- a/x11/xplanet/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/04/04 16:47:55 atatat Exp $
-
-Make freetype2 work with xplanet.
-
---- configure.orig	Tue Jan 22 21:07:42 2002
-+++ configure	Wed Apr  3 00:11:22 2002
-@@ -2725,7 +2725,7 @@
-     echo "configure: warning: *** Xplanet will be built without freetype support ***" 1>&2
-     with_freetype='no'
-   else
--    FREETYPE_CFLAGS="-I`$FREETYPE_CONFIG --prefix`/include `$FREETYPE_CONFIG --cflags`"
-+    FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags` -I`$FREETYPE_CONFIG --prefix`/include"
-     FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
-     
-     
diff --git a/x11/xplanet/patches/patch-ac b/x11/xplanet/patches/patch-ac
deleted file mode 100644
index 0b6e8c4b2fa..00000000000
--- a/x11/xplanet/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/04/04 16:47:55 atatat Exp $
-
-Add support for $XPLANET/images and $HOME/.xplanet/images images, etc.
-
---- xplanet.cc.orig	Tue Jan 22 21:07:42 2002
-+++ xplanet.cc	Tue Apr  2 22:43:04 2002
-@@ -231,6 +231,8 @@
-         }
- 
-         cerr << "the current directory\nthe images subdirectory\n" 
-+             << "$XPLANET" << separator << "images\n"
-+             << "$HOME" << separator << ".xplanet" << separator << "images\n"
-              << prefix << separator << "images\n";
-         
-         if (opts.mapdir.size() == 0)
diff --git a/x11/xplanet/patches/patch-ad b/x11/xplanet/patches/patch-ad
deleted file mode 100644
index e3b4c16c493..00000000000
--- a/x11/xplanet/patches/patch-ad
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/04/04 16:47:55 atatat Exp $
-
-Add support for $XPLANET/images and $HOME/.xplanet/images images, etc.
-
---- util.cc.orig	Tue Jan 22 21:07:42 2002
-+++ util.cc	Tue Apr  2 22:43:04 2002
-@@ -28,6 +28,7 @@
- using namespace std;
- 
- #include <errno.h>
-+#include <stdlib.h>
- #include <sys/time.h>
- 
- #include "auxfiles.h"
-@@ -339,7 +340,41 @@
-         filename = newname;
-         return(true);
-     }            
--    
-+
-+    char *xplanet = getenv("XPLANET");
-+    if (xplanet != NULL)
-+    {
-+        newname = xplanet;
-+        newname += separator;
-+        newname += "images";
-+        newname += separator;
-+        newname += filename;
-+
-+        if (fileExists(newname))
-+        {
-+            filename = newname;
-+            return(true);
-+        }
-+    }
-+
-+    char *home = getenv("HOME");
-+    if (home != NULL)
-+    {
-+        newname = home;
-+        newname += separator;
-+        newname += ".xplanet";
-+        newname += separator;
-+        newname += "images";
-+        newname += separator;
-+        newname += filename;
-+
-+        if (fileExists(newname))
-+        {
-+            filename = newname;
-+            return(true);
-+        }
-+    }
-+
-     newname = prefix;
-     newname += separator;
-     newname += "images";
diff --git a/x11/xplanet/patches/patch-ae b/x11/xplanet/patches/patch-ae
deleted file mode 100644
index db076ba2746..00000000000
--- a/x11/xplanet/patches/patch-ae
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/04/04 16:47:55 atatat Exp $
-
-Add support for $XPLANET/images and $HOME/.xplanet/images images, etc.
-
---- libannotate/drawSatellite.cc.orig	Tue Jan 22 21:07:42 2002
-+++ libannotate/drawSatellite.cc	Tue Apr  2 22:43:04 2002
-@@ -56,6 +56,40 @@
-         return(true);
-     }
- 
-+    char *xplanet = getenv("XPLANET");
-+    if (xplanet != NULL)
-+    {
-+        satellite_file = xplanet;
-+        satellite_file += separator;
-+        satellite_file += "satellites";
-+        satellite_file += separator;
-+        satellite_file += filename;
-+
-+        if (fileExists(satellite_file))
-+        {
-+            filename = satellite_file;
-+            return(true);
-+        }
-+    }
-+
-+    char *home = getenv("HOME");
-+    if (home != NULL)
-+    {
-+        satellite_file = home;
-+        satellite_file += separator;
-+        satellite_file += ".xplanet";
-+        satellite_file += separator;
-+        satellite_file += "satellites";
-+        satellite_file += separator;
-+        satellite_file += filename;
-+
-+        if (fileExists(satellite_file))
-+        {
-+            filename = satellite_file;
-+            return(true);
-+        }
-+    }
-+
-     satellite_file = prefix;
-     satellite_file += separator;
-     satellite_file += "satellites";
diff --git a/x11/xplanet/patches/patch-af b/x11/xplanet/patches/patch-af
deleted file mode 100644
index d0da71f300c..00000000000
--- a/x11/xplanet/patches/patch-af
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/04/04 16:47:55 atatat Exp $
-
-Add support for $XPLANET/images and $HOME/.xplanet/images images, etc.
-
---- libannotate/drawMarkers.cc.orig	Tue Jan 22 21:07:42 2002
-+++ libannotate/drawMarkers.cc	Tue Apr  2 22:43:04 2002
-@@ -92,6 +92,74 @@
-         return(true);
-     }
- 
-+    char *xplanet = getenv("XPLANET");
-+    if (xplanet != NULL)
-+    {
-+        if (locale)
-+        {
-+            markerfile = xplanet;
-+            markerfile += separator;
-+            markerfile += "markers";
-+            markerfile += separator;
-+            markerfile += locale_string;
-+            markerfile += filename;
-+    
-+            if (fileExists(markerfile))
-+            {
-+                filename = markerfile;
-+                return(true);
-+            }
-+        }
-+
-+        markerfile = xplanet;
-+        markerfile += separator;
-+        markerfile += "markers";
-+        markerfile += separator;
-+        markerfile += filename;
-+
-+        if (fileExists(markerfile))
-+        {
-+            filename = markerfile;
-+            return(true);
-+        }
-+    }
-+
-+    char *home = getenv("HOME");
-+    if (home != NULL)
-+    {
-+        if (locale)
-+        {
-+            markerfile = home;
-+            markerfile += separator;
-+            markerfile += ".xplanet";
-+            markerfile += separator;
-+            markerfile += "markers";
-+            markerfile += separator;
-+            markerfile += locale_string;
-+            markerfile += filename;
-+    
-+            if (fileExists(markerfile))
-+            {
-+                filename = markerfile;
-+                return(true);
-+            }
-+        }
-+
-+        markerfile = home;
-+        markerfile += separator;
-+        markerfile += ".xplanet";
-+        markerfile += separator;
-+        markerfile += "markers";
-+        markerfile += separator;
-+        markerfile += filename;
-+
-+        if (fileExists(markerfile))
-+        {
-+            filename = markerfile;
-+            return(true);
-+        }
-+    }
-+
-     // Check for the input filename in $prefix/markers
-     // Check for the input filename in the "markers" subdirectory
-     if (locale)
diff --git a/x11/xplanet/patches/patch-ag b/x11/xplanet/patches/patch-ag
deleted file mode 100644
index a45ee12e3fe..00000000000
--- a/x11/xplanet/patches/patch-ag
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/04/04 16:47:55 atatat Exp $
-
-Add support for $XPLANET/images and $HOME/.xplanet/images images, etc.
-
---- libdisplay/DisplayBase.cc.orig	Tue Jan 22 21:07:42 2002
-+++ libdisplay/DisplayBase.cc	Tue Apr  2 22:43:04 2002
-@@ -208,6 +208,40 @@
-         return(1);
-     }
- 
-+    char *xplanet = getenv("XPLANET");
-+    if (xplanet != NULL)
-+    {
-+        newfont = xplanet;
-+        newfont += separator;
-+        newfont += "fonts";
-+        newfont += separator;
-+        newfont += fontname;
-+
-+        if (fileExists(newfont))
-+        {
-+            fontname = newfont;
-+            return(true);
-+        }
-+    }
-+
-+    char *home = getenv("HOME");
-+    if (home != NULL)
-+    {
-+        newfont = home;
-+        newfont += separator;
-+        newfont += ".xplanet";
-+        newfont += separator;
-+        newfont += "fonts";
-+        newfont += separator;
-+        newfont += fontname;
-+
-+        if (fileExists(newfont))
-+        {
-+            fontname = newfont;
-+            return(true);
-+        }
-+    }
-+
-     newfont = prefix;
-     newfont += separator;
-     newfont += "fonts";
-@@ -533,6 +567,32 @@
-     string rgbfile = "rgb.txt";
- 
-     ifstream infile(rgbfile.c_str());
-+    if (infile.bad())
-+    {
-+        char *xplanet = getenv("XPLANET");
-+        if (xplanet != NULL)
-+        {
-+            infile.close();
-+            rgbfile = xplanet;
-+            rgbfile += separator;
-+            rgbfile += "rgb.txt";
-+            infile.open(rgbfile.c_str());
-+        }
-+    }
-+    if (infile.bad())
-+    {
-+        char *home = getenv("HOME");
-+        if (home != NULL)
-+        {
-+            infile.close();
-+            rgbfile = home;
-+            rgbfile += separator;
-+            rgbfile += ".xplanet";
-+            rgbfile += separator;
-+            rgbfile += "rgb.txt";
-+            infile.open(rgbfile.c_str());
-+        }
-+    }
-     if (infile.bad()) 
-     {
-         infile.close();
diff --git a/x11/xplanet/patches/patch-ah b/x11/xplanet/patches/patch-ah
deleted file mode 100644
index daf33b2e44a..00000000000
--- a/x11/xplanet/patches/patch-ah
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/04/04 16:47:55 atatat Exp $
-
-Add support for $XPLANET/images and $HOME/.xplanet/images images, etc.
-
---- xplanet.1.orig	Tue Jan 22 21:07:42 2002
-+++ xplanet.1	Wed Apr  3 10:05:01 2002
-@@ -621,7 +621,8 @@
- TrueType fonts: 
- First look in fontdir (if the -fontdir option is used), then in the
- current directory, then in a subdirectory "fonts" of the current
--directory, and finally in $PREFIX/fonts.  The default font is
-+directory, in $XPLANET/fonts, in $HOME/.xplanet/fonts, and finally
-+in $PREFIX/fonts.  The default font is
- helr____.ttf.  Note that TrueType fonts are only used if an X11
- display is not available, a TrueType font is specified with the -font
- option, or the -truetype option is specified.
-@@ -629,22 +630,25 @@
- image files:
- First look in mapdir (if the -mapdir option is used), then in the
- current directory, then in a subdirectory "images" of the current
--directory, and finally in $PREFIX/images.  The default name is
-+directory, in $XPLANET/images, in $HOME/.xplanet/images, and finally
-+in $PREFIX/images.  The default name is
- body.jpg (e.g. earth.jpg, neptune.jpg).  The extension of the file by
- default is jpg but this can also be set at compilation time.
- 
- marker files:
- First look in the current directory, then in a subdirectory "markers"
--of the current directory, and finally in $PREFIX/markers.  The default
-+of the current directory, in $XPLANET/markers, in $HOME/.xplanet/markers,
-+and finally in $PREFIX/markers.  The default
- marker file name is body (e.g. earth, neptune).
- 
- satellite files:
- First look in the current directory, then in a subdirectory
--"satellites" of the current directory, and finally in
-+"satellites" of the current directory, in $XPLANET/satellites, in
-+$HOME/.xplanet/satellites, and finally in
- $PREFIX/satellites.
- 
- The value of $PREFIX is set at compilation time in auxfiles.h.  On a
--Unix system it is usually /usr/local/share/xplanet, and on Windows it
-+NetBSD system it is usually @PREFIX@/share/xplanet, and on Windows it
- is usually C:\\WINDOWS\\Desktop.  See the INSTALL file for more details
- on the configuration options.
- 
-@@ -704,23 +708,23 @@
- .SH FILES
- .nf
- .sp
--/usr/local/bin/xplanet
--/usr/local/bin/xplanetbg
--/usr/local/bin/tkxplanet
--/usr/local/bin/tzcoord.pl
--/usr/local/man/man1/xplanet.1
--/usr/local/man/man1/xplanetbg.1
--/usr/local/man/man1/tkxplanet.1
--/usr/local/man/man1/tzcoord.pl.1
--/usr/local/share/xplanet/rgb.txt
--/usr/local/share/xplanet/fonts/helr____.ttf
--/usr/local/share/xplanet/images/body.jpg
--/usr/local/share/xplanet/markers/body
-+@PREFIX@/bin/xplanet
-+@PREFIX@/bin/xplanetbg
-+@PREFIX@/bin/tkxplanet
-+@PREFIX@/bin/tzcoord.pl
-+@PREFIX@/man/man1/xplanet.1
-+@PREFIX@/man/man1/xplanetbg.1
-+@PREFIX@/man/man1/tkxplanet.1
-+@PREFIX@/man/man1/tzcoord.pl.1
-+@PREFIX@/share/xplanet/rgb.txt
-+@PREFIX@/share/xplanet/fonts/helr____.ttf
-+@PREFIX@/share/xplanet/images/body.jpg
-+@PREFIX@/share/xplanet/markers/body
- where body is the name of the appropriate body, specified in the -body
- option. 
- .sp
- .fi
--The default prefix /usr/local/share/xplanet is set in auxfiles.h and
-+The default prefix @PREFIX@/share/xplanet is set in auxfiles.h and
- may be changed if desired.
- .SH AUTHOR
- xplanet was written by
diff --git a/x11/xplanet/patches/patch-ai b/x11/xplanet/patches/patch-ai
new file mode 100644
index 00000000000..86389714959
--- /dev/null
+++ b/x11/xplanet/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2003/07/05 09:07:58 wulf Exp $
+
+--- src/libannotate/Text.cpp.orig	2003-07-03 09:54:46.000000000 +0930
++++ src/libannotate/Text.cpp	2003-07-03 09:55:01.000000000 +0930
+@@ -187,7 +187,7 @@
+     string markerBounds(options->MarkerBounds());
+     if (!markerBounds.empty())
+     {
+-	ofstream outfile(markerBounds.c_str(), ios_base::app);
++	ofstream outfile(markerBounds.c_str(), ios::app);
+ 	if (outfile.is_open())
+ 	{
+ 	    if (x_ < display->Width() && x_ > -(lrx_ - ulx_))