Changes 1.0.6:

* fixed a bug where markers on the far side of a planet were being drawn
  when they shouldn't have been
* fixed a bug where satellite were not drawn for some locales
* added -projection random; this picks a random projection

4 files changed, 57 insertions, 50 deletions

diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 792e110d648..004e253fc30 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,34 +1,33 @@
-# $NetBSD: Makefile,v 1.15 2004/03/08 20:27:17 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/26 14:56:01 adam Exp $
 #
 
-DISTNAME=		xplanet-1.0.1
-PKGREVISION=		1
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xplanet/}
+DISTNAME=	xplanet-1.0.6
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xplanet/}
 
-MAINTAINER=		atatat@NetBSD.org
-HOMEPAGE=		http://xplanet.sourceforge.net/
-COMMENT=		Rotating rendered map of the Earth in X11 root window
+MAINTAINER=	atatat@NetBSD.org
+HOMEPAGE=	http://xplanet.sourceforge.net/
+COMMENT=	Rotating rendered map of the Earth in X11 root window
 
-USE_BUILDLINK2=		yes
-USE_GCC_SHLIB=		yes
-USE_X11=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
-
+USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gl-dir=${BUILDLINK_PREFIX.Mesa}
-CONFIGURE_ARGS+=	--with-glut-dir=${BUILDLINK_PREFIX.Mesa}
 
-LIBS=			-lXext -lpbm -lppm -lpgm
-MAKE_ENV+=		LIBS="${LIBS}"
+# directory creation should be fixed in the future release of xplanet
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xplanet
+.for dir in arcs config fonts images markers origin satellites \
+		scripts spice stars
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xplanet/${dir}
+.endfor
 
-.include "../../graphics/Mesa/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/netpbm/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../x11/tk83/buildlink2.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/netpbm/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xplanet/PLIST b/x11/xplanet/PLIST
index 8354935de93..5328b9fae7b 100644
--- a/x11/xplanet/PLIST
+++ b/x11/xplanet/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2003/07/05 09:07:55 wulf Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/26 14:56:01 adam Exp $
 bin/xplanet
 man/man1/xplanet.1
 share/xplanet/rgb.txt
 share/xplanet/arcs/README
+share/xplanet/arcs/constellations
+share/xplanet/config/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/fonts/FreeMonoBold.ttf
 share/xplanet/images/README
 share/xplanet/images/earth.jpg
 share/xplanet/images/night.jpg
@@ -16,21 +18,41 @@ share/xplanet/images/hubble.png
 share/xplanet/images/shuttle.png
 share/xplanet/images/sublunar.png
 share/xplanet/images/iss.png
+share/xplanet/images/mgs.png
+share/xplanet/images/odyssey.png
 share/xplanet/images/smile.png
 share/xplanet/images/subsolar.png
+share/xplanet/markers/README
+share/xplanet/markers/brightStars
 share/xplanet/markers/earth
+share/xplanet/markers/mars
+share/xplanet/markers/moon
 share/xplanet/origin/README
 share/xplanet/origin/cassini
 share/xplanet/origin/galileo
+share/xplanet/satellites/README
 share/xplanet/satellites/iss
 share/xplanet/satellites/iss.tle
+share/xplanet/spice/README
+share/xplanet/spice/asteroids
+share/xplanet/spice/asteroids.krn
+share/xplanet/spice/cassini
+share/xplanet/spice/cassini.krn
+share/xplanet/spice/mgs
+share/xplanet/spice/mgs.krn
+share/xplanet/spice/voyager
+share/xplanet/spice/voyager.krn
+share/xplanet/scripts/convertCassini.perl
+share/xplanet/scripts/convertCassini2.perl
 share/xplanet/stars/BSC
-@dirrm share/xplanet/arcs
-@dirrm share/xplanet/config
-@dirrm share/xplanet/fonts
-@dirrm share/xplanet/images
-@dirrm share/xplanet/markers
-@dirrm share/xplanet/origin
-@dirrm share/xplanet/satellites
 @dirrm share/xplanet/stars
+@dirrm share/xplanet/spice
+@dirrm share/xplanet/scripts
+@dirrm share/xplanet/satellites
+@dirrm share/xplanet/origin
+@dirrm share/xplanet/markers
+@dirrm share/xplanet/images
+@dirrm share/xplanet/fonts
+@dirrm share/xplanet/config
+@dirrm share/xplanet/arcs
 @dirrm share/xplanet
diff --git a/x11/xplanet/distinfo b/x11/xplanet/distinfo
index 281806b0c9d..35e05cf8376 100644
--- a/x11/xplanet/distinfo
+++ b/x11/xplanet/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/07/05 09:07:55 wulf Exp $
+$NetBSD: distinfo,v 1.4 2004/04/26 14:56:01 adam Exp $
 
-SHA1 (xplanet-1.0.1.tar.gz) = 611f076e99724b0991440bf78189756968342d98
-Size (xplanet-1.0.1.tar.gz) = 951540 bytes
-SHA1 (patch-ai) = 3d579f0362bc902c03fff806e393791617a843b2
+SHA1 (xplanet-1.0.6.tar.gz) = 4eed87bf0b528dc06561d9b6e5fd818948dbc730
+Size (xplanet-1.0.6.tar.gz) = 1169998 bytes
diff --git a/x11/xplanet/patches/patch-ai b/x11/xplanet/patches/patch-ai
deleted file mode 100644
index 86389714959..00000000000
--- a/x11/xplanet/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$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_))