update to 3.4

too many changes to list here, see HOMEPAGE for details
simplified installation a bit to save the need to list all the individual
support files in the Makefile

8 files changed, 43 insertions, 62 deletions

diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 2d9ec38ebcf..02da3691797 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2000/03/08 12:01:49 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/12/12 17:29:51 drochner Exp $
 
-DISTNAME=	xephem-3.2.3
+DISTNAME=	xephem-3.4
 CATEGORIES=	x11
-MASTER_SITES=	http://www.clearskyinstitute.com/xephem/xephem/ \
+MASTER_SITES=	http://www.clearskyinstitute.com/xephem/ \
 		ftp://iraf.noao.edu/contrib/xephem/ \
 		ftp://star.rl.ac.uk/pub/iraf/contrib/xephem/ \
 		ftp://iphcip1.physik.uni-mainz.de/pub/xephem/ \
@@ -31,33 +31,21 @@ pre-build:
 PERL_SCRIPTS= astorb2edb.pl mpcorb2edb.pl tle2edb.pl
 
 post-install:
-	@${SED} s,@PREFIX@,${PREFIX}, ${WRKSRC}/XEphem.ad > ${WRKDIR}/XEphem
+	${SED} s,@PREFIX@,${PREFIX}, ${FILESDIR}/XEphem.ad > ${WRKDIR}/XEphem
 	${INSTALL_DATA} ${WRKDIR}/XEphem ${PREFIX}/lib/X11/app-defaults
-	@${MKDIR} ${PREFIX}/share/xephem/auxil \
-		${PREFIX}/share/xephem/catalogs \
-		${PREFIX}/share/xephem/tools \
-		${PREFIX}/share/doc/xephem
-	(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} ISS.edb Messier.edb NGC.edb \
-		SAC.edb YBS.edb asteroids.edb comets.edb hickson.edb \
-		${PREFIX}/share/xephem/catalogs)
+	${MKDIR} ${PREFIX}/share/xephem/tools
+	(cd ${WRKSRC}; ${CP} -R auxil catalogs fifos fits \
+	 ${PREFIX}/share/xephem)
 	(cd ${WRKSRC}/tools; ${INSTALL_DATA} README \
 			${PREFIX}/share/xephem/tools; \
 		${INSTALL_SCRIPT} extract.awk jost2edb.awk\
 			${PREFIX}/share/xephem/tools)
-	@(cd ${WRKSRC}/tools; for file in ${PERL_SCRIPTS}; do \
+	(cd ${WRKSRC}/tools; for file in ${PERL_SCRIPTS}; do \
 		${SED} 1s,@LOCALBASE@,${LOCALBASE}, $$file \
 			> ${WRKDIR}/$$file; \
-	done)
-	for file in ${PERL_SCRIPTS}; do \
 		${INSTALL_SCRIPT} ${WRKDIR}/$$file \
 			${PREFIX}/share/xephem/tools; \
-	done
-	(cd ${WRKDIR}/${DISTNAME}; ${INSTALL_DATA} Copyright README \
-		${PREFIX}/share/doc/xephem)
+	done)
+	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/xephem
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xephem/files/XEphem.ad b/x11/xephem/files/XEphem.ad
new file mode 100644
index 00000000000..9e3f8d23d9f
--- /dev/null
+++ b/x11/xephem/files/XEphem.ad
@@ -0,0 +1,3 @@
+! $NetBSD: XEphem.ad,v 1.1 2000/12/12 17:29:51 drochner Exp $
+
+XEphem.ShareDir: @PREFIX@/share/xephem
diff --git a/x11/xephem/files/md5 b/x11/xephem/files/md5
index 9cfea876ed3..9023f5b3fdb 100644
--- a/x11/xephem/files/md5
+++ b/x11/xephem/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/05/03 14:58:27 rh Exp $
+$NetBSD: md5,v 1.5 2000/12/12 17:29:52 drochner Exp $
 
-MD5 (xephem-3.2.3.tar.gz) = f74362fa797fb7a788d47147f8e0972a
+MD5 (xephem-3.4.tar.gz) = e3525b1ef81f5032dcfad2d8e5d119ac
diff --git a/x11/xephem/files/patch-sum b/x11/xephem/files/patch-sum
index cbc30e08100..e489e1ab3da 100644
--- a/x11/xephem/files/patch-sum
+++ b/x11/xephem/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/03/08 12:01:50 agc Exp $
+$NetBSD: patch-sum,v 1.3 2000/12/12 17:29:52 drochner Exp $
 
 MD5 (patch-aa) = 039c49dee2309252cff49c783dd78f78
-MD5 (patch-ab) = 9b359f85fee9ef5971b1d2f14066a76d
-MD5 (patch-ac) = 51ab1f2049836dbabd112a1e55257e4e
+MD5 (patch-ac) = 03f364a7ca561c11b0f6898b35ae5c3f
 MD5 (patch-ad) = 1b5ccaae6a5be8e2b62566237365809f
-MD5 (patch-ae) = 365150ca1d0d5f5013dfbecaba880f1b
+MD5 (patch-ae) = 4d110253963c1a3f24d42d01a878e33a
diff --git a/x11/xephem/patches/patch-ab b/x11/xephem/patches/patch-ab
deleted file mode 100644
index 761e5a9601b..00000000000
--- a/x11/xephem/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/03/08 12:01:50 agc Exp $
-
---- 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.ShareDir: .
-+XEphem.ShareDir: @PREFIX@/share/xephem
- 
- ! *************************************************************************
- ! default FITS info
diff --git a/x11/xephem/patches/patch-ac b/x11/xephem/patches/patch-ac
index 2ddce54f751..69cdbda1360 100644
--- a/x11/xephem/patches/patch-ac
+++ b/x11/xephem/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.2 1998/09/02 06:42:13 tron Exp $
+$NetBSD: patch-ac,v 1.3 2000/12/12 17:29:52 drochner Exp $
 
---- tools/astorb2edb.pl.orig	Mon Sep 22 21:50:36 1997
-+++ tools/astorb2edb.pl	Sat Aug 29 11:02:58 1998
+--- tools/astorb2edb.pl.orig	Sat Dec  2 09:35:53 2000
++++ tools/astorb2edb.pl	Sun Dec 10 17:18:41 2000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
 +#!@LOCALBASE@/bin/perl
- # convert astorb.dat on stdin to asteroids.edb on stdout.
- #
- # actually, only those asteroids that might ever be brighter than dimmag are
+ # convert  astorb.txt to 2 .edb files.
+ # Usage: [-f] <base>
+ #   if -f then use ftp to get the script from harvard, else read it from stdin.
diff --git a/x11/xephem/patches/patch-ae b/x11/xephem/patches/patch-ae
index 3eda801a027..3f4d4f6b6df 100644
--- a/x11/xephem/patches/patch-ae
+++ b/x11/xephem/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.3 2000/03/08 12:01:50 agc Exp $
+$NetBSD: patch-ae,v 1.4 2000/12/12 17:29:52 drochner Exp $
 
---- tools/mpcorb2edb.pl.orig	Wed Oct  6 21:50:21 1999
-+++ tools/mpcorb2edb.pl	Sun Feb 20 18:37:27 2000
+--- tools/mpcorb2edb.pl.orig	Sat Dec  2 09:35:54 2000
++++ tools/mpcorb2edb.pl	Sun Dec 10 17:21:20 2000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
 +#!@LOCALBASE@/bin/perl
- # convert mpcorb.dat on stdin to minorpl.edb on stdout.
- #
- # actually, only those asteroids that might ever be brighter than dimmag are
+ # convert MPCORB.DAT to 2 .edb files.
+ # Usage: [-f] <base>
+ #   if -f then use ftp to get the script from harvard, else read it from stdin.
diff --git a/x11/xephem/pkg/PLIST b/x11/xephem/pkg/PLIST
index 9814add4419..035af028952 100644
--- a/x11/xephem/pkg/PLIST
+++ b/x11/xephem/pkg/PLIST
@@ -1,37 +1,41 @@
-@comment $NetBSD: PLIST,v 1.3 2000/03/08 12:01:51 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/12/12 17:29:52 drochner Exp $
 bin/xephem
 man/cat1/xephem.0
 lib/X11/app-defaults/XEphem
 share/xephem/auxil/README
+share/xephem/auxil/analemma.plt
 share/xephem/auxil/jupiter.9910
+share/xephem/auxil/jupitermap.gif
 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/sample.hzn
 share/xephem/auxil/saturne.9910
+share/xephem/auxil/starcensus.txt
 share/xephem/auxil/uranus.9910
 share/xephem/auxil/xephem.hlp
-share/xephem/auxil/xephem_sites
+share/xephem/auxil/xephem.sit
+share/xephem/auxil/xephem_skyhist
 share/xephem/catalogs/ISS.edb
 share/xephem/catalogs/Messier.edb
 share/xephem/catalogs/NGC.edb
-share/xephem/catalogs/SAC.edb
+share/xephem/catalogs/README
 share/xephem/catalogs/YBS.edb
-share/xephem/catalogs/asteroids.edb
-share/xephem/catalogs/comets.edb
-share/xephem/catalogs/hickson.edb
+share/xephem/fifos/Makefile
+share/xephem/fifos/README
+share/xephem/fits/Abell426.fts
 share/xephem/tools/README
 share/xephem/tools/extract.awk
 share/xephem/tools/jost2edb.awk
 share/xephem/tools/astorb2edb.pl
 share/xephem/tools/mpcorb2edb.pl
 share/xephem/tools/tle2edb.pl
-share/doc/xephem/Copyright
-share/doc/xephem/README
 @dirrm share/xephem/tools
 @dirrm share/xephem/catalogs
 @dirrm share/xephem/auxil
+@dirrm share/xephem/fifos
+@dirrm share/xephem/fits
 @dirrm share/xephem
-@dirrm share/doc/xephem