Update to 1.2.1. Set LICENSE. Split off options into options.mk.

Version 1.2.1 (released 18 Apr 2009)

	* Remove signbit() from ProjectionIcosagnomonic.cpp

	* Add shadows from satellites on Saturn's rings, let brightness of
	rings go to zero as Saturn approaches equinox.

	* Add trail_output option to satellite files to print out
	satellite positions.

	* Calculate eclipse shadows a little past the terminator so they
	don't get cut off sharply.

	* Reload satellite files in case TLE files are updated between
	renderings.  Suggested by Lutz M

	* Added Lambert Equal Area projection

	* Check that -origin above or below is not specified for the Sun.

	* Added a definition for signbit() in ProjectionIcosagnomonic.cpp

	* Add patch from Doug Hawkins to support marker_* keywords in
	config file.

	* Added the -label_body option.  This is useful in conjunction
	with -separation to specify which body the label should apply to.

	* Added the -separation option.  This places the observer at a
	point in space where two bodies have the specified separation.

	* Allow -glare 0 to remove sun glare.

	* Fixed a bug where arcs were sometimes not drawn if they were
	vertical or horizontal lines.

	* A thickness value may now be specified for arcs.

	* Added max_radius and min_radius keywords to marker files.  This
	disables drawing of the marker if the planet radius is larger than
	or smaller than the specified value, respectively.

	* Fixed a bug where the arc color was not reset to the default
	color for subsequent arcs in the file.

3 files changed, 28 insertions, 27 deletions

diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 3b8c2fc5331..15c66805973 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.41 2007/10/23 20:17:58 heinz Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/22 13:37:05 wiz Exp $
 
-DISTNAME=	xplanet-1.2.0
-PKGREVISION=	5
+DISTNAME=	xplanet-1.2.1
 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
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -22,26 +22,7 @@ XPLANET_DIRS=		arcs config ephemeris fonts images markers origin
 XPLANET_DIRS+=		satellites scripts spice stars
 INSTALLATION_DIRS+=	${XPLANET_DIRS:C,.*,share/xplanet/&,g}
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xplanet
-PKG_SUPPORTED_OPTIONS=	x11
-PKG_SUGGESTED_OPTIONS=	x11
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mx11)
-USE_TOOLS+=	pkg-config
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../devel/pango/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-pango
-CONFIGURE_ARGS+=	--without-x
-CONFIGURE_ARGS+=	--without-xscreensaver
-.endif
-
+.include "options.mk"
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/x11/xplanet/distinfo b/x11/xplanet/distinfo
index 2a69beec5e2..aa480b16f25 100644
--- a/x11/xplanet/distinfo
+++ b/x11/xplanet/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/06/30 15:06:24 adam Exp $
+$NetBSD: distinfo,v 1.13 2009/07/22 13:37:06 wiz Exp $
 
-SHA1 (xplanet-1.2.0.tar.gz) = e002711f90f502565613ab17a273175cc035b52c
-RMD160 (xplanet-1.2.0.tar.gz) = 68079629e82194f483caa0c06d73672544efbcbb
-Size (xplanet-1.2.0.tar.gz) = 1196496 bytes
+SHA1 (xplanet-1.2.1.tar.gz) = c3810c303af8f0cb40520112d9cd1f24fa8b42b5
+RMD160 (xplanet-1.2.1.tar.gz) = 06c5031ea702bca9cc6ed5ad8c81454a223f508e
+Size (xplanet-1.2.1.tar.gz) = 1211663 bytes
diff --git a/x11/xplanet/options.mk b/x11/xplanet/options.mk
new file mode 100644
index 00000000000..fc7ac95ac63
--- /dev/null
+++ b/x11/xplanet/options.mk
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2009/07/22 13:37:06 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xplanet
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+USE_TOOLS+=	pkg-config
+
+.include "../../devel/pango/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
+.include "../../x11/libXt/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-pango
+CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS+=	--without-xscreensaver
+.endif