Update xephem to 3.2.3, from Thilo Manske in PR 9454, munged slightly

by myself.

Changes since previous version:

Numerous bug fixes, new fast zoom and panning modes on skyview, add
zenith angle to table in dataview, add live dragging in earth and sky
view, and many other features.

8 files changed, 65 insertions, 73 deletions

diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 2351ee654f1..2d9ec38ebcf 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.5 1999/06/29 12:22:16 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/03/08 12:01:49 agc Exp $
 
-DISTNAME=	xephem-3.1
+DISTNAME=	xephem-3.2.3
 CATEGORIES=	x11
-MASTER_SITES=	ftp://iraf.noao.edu/contrib/xephem/xephem-3.1/ \
-		ftp://gastro23.physics.uiowa.edu/pub/xephem/ \
+MASTER_SITES=	http://www.clearskyinstitute.com/xephem/xephem/ \
+		ftp://iraf.noao.edu/contrib/xephem/ \
+		ftp://star.rl.ac.uk/pub/iraf/contrib/xephem/ \
 		ftp://iphcip1.physik.uni-mainz.de/pub/xephem/ \
-		ftp://wolf.ifj.edu.pl/mirror/xephem/
+		ftp://ecf.hq.eso.org/iraf/contrib/xephem/ \
+		ftp://sinobu.mtk.nao.ac.jp/NOAO/contrib/xephem/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.clearskyinstitute.com/xephem/xephem.html
-
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
+HOMEPAGE=	http://www.clearskyinstitute.com/xephem/
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 LIBSRC=		${WRKDIR}/${DISTNAME}/libastro
@@ -28,24 +28,26 @@ pre-build:
 	@(cd ${LIBSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
 		-f ${MAKEFILE} ${ALL_TARGET})
 
-PERL_SCRIPTS= astorb2edb.pl encke2edb.pl yeomans.pl
+PERL_SCRIPTS= astorb2edb.pl mpcorb2edb.pl tle2edb.pl
 
 post-install:
 	@${SED} s,@PREFIX@,${PREFIX}, ${WRKSRC}/XEphem.ad > ${WRKDIR}/XEphem
 	${INSTALL_DATA} ${WRKDIR}/XEphem ${PREFIX}/lib/X11/app-defaults
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/xephem/auxil \
+	@${MKDIR} ${PREFIX}/share/xephem/auxil \
 		${PREFIX}/share/xephem/catalogs \
 		${PREFIX}/share/xephem/tools \
 		${PREFIX}/share/doc/xephem
-	(cd ${WRKSRC}/auxil; ${INSTALL_DATA} README mars_db marsmap.fts \
-		moon.fts moon_db xephem.hlp xephem_sites \
+	(cd ${WRKSRC}/auxil; ${INSTALL_DATA} README jupiter.9910 logo.gif \
+		mars.9910 mars_db marsmap.fts \
+		moon.fts moon_db saturne.9910 uranus.9910 \
+		xephem.hlp xephem_sites \
 		${PREFIX}/share/xephem/auxil)
-	(cd ${WRKSRC}/catalogs; ${INSTALL_DATA} Messier.edb NGC.edb SAC.edb \
-		YBS.edb asteroids.edb comets.edb mir.edb \
+	(cd ${WRKSRC}/catalogs; ${INSTALL_DATA} ISS.edb Messier.edb NGC.edb \
+		SAC.edb YBS.edb asteroids.edb comets.edb hickson.edb \
 		${PREFIX}/share/xephem/catalogs)
-	(cd ${WRKSRC}/tools; ${INSTALL_DATA} README gps.awk jost2edb.nawk \
+	(cd ${WRKSRC}/tools; ${INSTALL_DATA} README \
 			${PREFIX}/share/xephem/tools; \
-		${INSTALL_SCRIPT} extract.awk tle2edb.awk \
+		${INSTALL_SCRIPT} extract.awk jost2edb.awk\
 			${PREFIX}/share/xephem/tools)
 	@(cd ${WRKSRC}/tools; for file in ${PERL_SCRIPTS}; do \
 		${SED} 1s,@LOCALBASE@,${LOCALBASE}, $$file \
diff --git a/x11/xephem/files/md5 b/x11/xephem/files/md5
index db6e440b827..5c3674a0ac9 100644
--- a/x11/xephem/files/md5
+++ b/x11/xephem/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/09/02 06:42:00 tron Exp $
+$NetBSD: md5,v 1.3 2000/03/08 12:01:50 agc Exp $
 
-MD5 (xephem-3.1.tar.gz) = 5b84de23348f08a3b979ddd11bdc7cc4
+MD5 (xephem-3.2.3.tar.gz) = ab6d188f650dc1f97532fd5077a5578d
diff --git a/x11/xephem/files/patch-sum b/x11/xephem/files/patch-sum
index 4d3669f0092..cbc30e08100 100644
--- a/x11/xephem/files/patch-sum
+++ b/x11/xephem/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:35 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/03/08 12:01:50 agc Exp $
 
-MD5 (patch-aa) = 09675b285253dc90882ab9bf2afd25be
-MD5 (patch-ab) = 3d670b090c783fd0ebdde1860d042f24
+MD5 (patch-aa) = 039c49dee2309252cff49c783dd78f78
+MD5 (patch-ab) = 9b359f85fee9ef5971b1d2f14066a76d
 MD5 (patch-ac) = 51ab1f2049836dbabd112a1e55257e4e
-MD5 (patch-ad) = 0df74a16f576ee837a38a37cb32447e0
-MD5 (patch-ae) = 3bfb0fd28c962e11c326f7b102b394e0
+MD5 (patch-ad) = 1b5ccaae6a5be8e2b62566237365809f
+MD5 (patch-ae) = 365150ca1d0d5f5013dfbecaba880f1b
diff --git a/x11/xephem/patches/patch-aa b/x11/xephem/patches/patch-aa
index 9af27ee7515..b260f090f18 100644
--- a/x11/xephem/patches/patch-aa
+++ b/x11/xephem/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/09/02 06:42:13 tron Exp $
+$NetBSD: patch-aa,v 1.3 2000/03/08 12:01:50 agc Exp $
 
---- Imakefile.orig	Wed Mar  4 09:36:44 1998
-+++ Imakefile	Sat Aug 29 11:08:05 1998
-@@ -55,7 +55,7 @@
- 
+--- Imakefile.orig	Wed Oct  6 21:50:21 1999
++++ Imakefile	Sun Feb 20 18:14:49 2000
+@@ -63,7 +63,7 @@
  SRCS = 	$(OBJS:.o=.c)
  
--          XMLIB = -lXm -lXpm
-+          XMLIB = ${MOTIFLIB} -lXpm
+ XCOMM Sometimes you need -lXp after -lXm
+-          XMLIB = -lXm
++          XMLIB = ${MOTIFLIB}
          DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
   EXTRA_INCLUDES = -I../../libastro
    LOCAL_LDFLAGS = -L../../libastro
diff --git a/x11/xephem/patches/patch-ab b/x11/xephem/patches/patch-ab
index 917f7dea575..761e5a9601b 100644
--- a/x11/xephem/patches/patch-ab
+++ b/x11/xephem/patches/patch-ab
@@ -1,27 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1998/09/02 06:42:13 tron Exp $
+$NetBSD: patch-ab,v 1.3 2000/03/08 12:01:50 agc Exp $
 
---- XEphem.ad.orig	Fri Mar 13 17:45:06 1998
-+++ XEphem.ad	Sat Aug 29 12:04:56 1998
-@@ -166,7 +166,7 @@
- ! system-wide directory for xephem support files
- ! N.B. under this are auxil/, fifos/, and catalogs/
+--- XEphem.ad.orig	Sun Feb 20 18:20:06 2000
++++ XEphem.ad	Sun Feb 20 18:23:40 2000
+@@ -170,7 +170,7 @@
+ ! system-wide directory for xephem support files. Shared r-o among all users.
+ ! N.B. under this are auxil/, fifos/, fits/, and catalogs/.
  ! N.B. if present, ppm.xe and the gsc base directory must be under catalogs/
--XEphem.BaseDir: .
-+XEphem.BaseDir: @PREFIX@/share/xephem
+-XEphem.ShareDir: .
++XEphem.ShareDir: @PREFIX@/share/xephem
  
- ! mount point for CDROM device
- ! only used if have access to ASP GSC CDROM
-@@ -198,11 +198,11 @@
  ! *************************************************************************
- ! default PPM and GSC Field stars and Network setup choices
- XEphem*FieldStars*GSCCD.set: False
--XEphem*FieldStars*GSCCache.set: True
-+XEphem*FieldStars*GSCCache.set: False
- XEphem*FieldStars*XEphemdbdNet.set: False
- XEphem*FieldStars*XEphemdbdURL.value: /iro.physics.uiowa.edu/cgi-bin/xephemdbd/xephemdbd.pl
- XEphem*FieldStars*ESONet.set: False
--XEphem*FieldStars*PPM.set: True
-+XEphem*FieldStars*PPM.set: False
- XEphem*FieldStars*NoDups.set: True
- XEphem*FieldStars*SAOHD.set: True
- XEphem*FieldStars*Proxy.set: False
+ ! default FITS info
diff --git a/x11/xephem/patches/patch-ad b/x11/xephem/patches/patch-ad
index 9046a348e3c..3eeb9238d55 100644
--- a/x11/xephem/patches/patch-ad
+++ b/x11/xephem/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.2 1998/09/02 06:42:13 tron Exp $
+$NetBSD: patch-ad,v 1.3 2000/03/08 12:01:50 agc Exp $
 
---- tools/encke2edb.pl.orig	Fri Oct 11 08:47:17 1996
-+++ tools/encke2edb.pl	Sat Aug 29 11:03:36 1998
+--- tools/tle2edb.pl.orig	Wed Oct  6 21:50:21 1999
++++ tools/tle2edb.pl	Sun Feb 20 18:35:40 2000
 @@ -1,4 +1,4 @@
--#!/usr/bin/perl
+-#!/usr/bin/perl -w
 +#!@LOCALBASE@/bin/perl
- # convert elements appearing in http://encke.jpl.nasa.gov/eph to xephem format.
- # we need to scan the entire ephemeris so we can dig out the various values
- #   which are sprinkled near the beginning and end of the file.
+ # tle2edb.pl: perl script to convert NASA "2-line" geocentric orbital elements
+ # to XEphem .edb. we crack everything that looks reasonable. we allow the TLE
+ # to be embedded in other text, just so long as it stands on three successive
diff --git a/x11/xephem/patches/patch-ae b/x11/xephem/patches/patch-ae
index f1cb9c0f42a..3eda801a027 100644
--- a/x11/xephem/patches/patch-ae
+++ b/x11/xephem/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.2 1998/09/02 06:42:13 tron Exp $
+$NetBSD: patch-ae,v 1.3 2000/03/08 12:01:50 agc Exp $
 
---- tools/yeomans.pl.orig	Mon Dec  9 11:21:04 1996
-+++ tools/yeomans.pl	Sat Aug 29 11:04:18 1998
+--- tools/mpcorb2edb.pl.orig	Wed Oct  6 21:50:21 1999
++++ tools/mpcorb2edb.pl	Sun Feb 20 18:37:27 2000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
 +#!@LOCALBASE@/bin/perl
- # convert elements posted by Don Yeomans to http://encke.jpl.nasa.gov/eph to
- # xephem format.
- # we need to scan the entire ephemeris so we can dig out the various values
+ # convert mpcorb.dat on stdin to minorpl.edb on stdout.
+ #
+ # actually, only those asteroids that might ever be brighter than dimmag are
diff --git a/x11/xephem/pkg/PLIST b/x11/xephem/pkg/PLIST
index 520d4c10bc5..9814add4419 100644
--- a/x11/xephem/pkg/PLIST
+++ b/x11/xephem/pkg/PLIST
@@ -1,29 +1,33 @@
-@comment $NetBSD: PLIST,v 1.2 1998/09/02 06:42:27 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/03/08 12:01:51 agc Exp $
 bin/xephem
 man/cat1/xephem.0
 lib/X11/app-defaults/XEphem
 share/xephem/auxil/README
+share/xephem/auxil/jupiter.9910
+share/xephem/auxil/logo.gif
+share/xephem/auxil/mars.9910
 share/xephem/auxil/mars_db
 share/xephem/auxil/marsmap.fts
 share/xephem/auxil/moon.fts
 share/xephem/auxil/moon_db
+share/xephem/auxil/saturne.9910
+share/xephem/auxil/uranus.9910
 share/xephem/auxil/xephem.hlp
 share/xephem/auxil/xephem_sites
+share/xephem/catalogs/ISS.edb
 share/xephem/catalogs/Messier.edb
 share/xephem/catalogs/NGC.edb
 share/xephem/catalogs/SAC.edb
 share/xephem/catalogs/YBS.edb
 share/xephem/catalogs/asteroids.edb
 share/xephem/catalogs/comets.edb
-share/xephem/catalogs/mir.edb
+share/xephem/catalogs/hickson.edb
 share/xephem/tools/README
-share/xephem/tools/gps.awk
-share/xephem/tools/jost2edb.nawk
 share/xephem/tools/extract.awk
-share/xephem/tools/tle2edb.awk
+share/xephem/tools/jost2edb.awk
 share/xephem/tools/astorb2edb.pl
-share/xephem/tools/encke2edb.pl
-share/xephem/tools/yeomans.pl
+share/xephem/tools/mpcorb2edb.pl
+share/xephem/tools/tle2edb.pl
 share/doc/xephem/Copyright
 share/doc/xephem/README
 @dirrm share/xephem/tools