Upgrade to 3.1.

5 files changed, 61 insertions, 132 deletions

diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 1c3ef33f5031..8ebf49b9fd82 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -1,20 +1,30 @@
 # New ports collection makefile for:    xephem
-# Version required:     3.0
+# Version required:     3.1
 # Date created:         Thu Aug  1 09:10:22 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.4 1996/11/18 09:52:05 asami Exp $
+# $Id: Makefile,v 1.5 1997/03/27 23:44:44 erich Exp $
 #
 
-DISTNAME=	xephem_3.0
-PKGNAME=	xephem-3.0
+DISTNAME=	xephem-3.1
 CATEGORIES=	astro
-MASTER_SITES=	ftp://iraf.noao.edu/contrib/xephem/xephem_3.0/
+MASTER_SITES=	ftp://iraf.noao.edu/contrib/xephem/xephem-3.1/ \
+		ftp://gastro23.physics.uiowa.edu/pub/xephem/ \
+		ftp://iphcip1.physik.uni-mainz.de/pub/xephem/ \
+		ftp://wolf.ifj.edu.pl/mirror/xephem/
 
 MAINTAINER=	erich@FreeBSD.org
 
 REQUIRES_MOTIF=	yes
-
 USE_IMAKE=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
+
+LIBSRC=		${WRKDIR}/${DISTNAME}/libastro
+
+pre-configure:
+	@(cd ${LIBSRC} && ${XMKMF})
+
+pre-build:
+	@(cd ${LIBSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 
 .include <bsd.port.mk>
diff --git a/astro/xephem/distinfo b/astro/xephem/distinfo
index 45993ea8d671..99f579094a48 100644
--- a/astro/xephem/distinfo
+++ b/astro/xephem/distinfo
@@ -1 +1 @@
-MD5 (xephem_3.0.tar.gz) = 9ca5767bf2d754ed248ec13b449d246d
+MD5 (xephem-3.1.tar.gz) = 5b84de23348f08a3b979ddd11bdc7cc4
diff --git a/astro/xephem/files/patch-aa b/astro/xephem/files/patch-aa
index b38fff7fc263..91d8b7cdcad7 100644
--- a/astro/xephem/files/patch-aa
+++ b/astro/xephem/files/patch-aa
@@ -1,19 +1,20 @@
---- Imakefile~	Thu Mar 27 15:23:53 1997
-+++ Imakefile	Thu Mar 27 16:25:24 1997
-@@ -15,10 +15,15 @@
+--- Imakefile.orig	Wed Mar  4 17:36:44 1998
++++ Imakefile	Wed Apr 22 13:21:12 1998
+@@ -55,7 +55,7 @@
  
- OBJS = 	$(SRCS:.c=.o)
+ SRCS = 	$(OBJS:.o=.c)
  
--          XMLIB = -lXm
-+          XMLIB = ${MOTIFLIB}
+-          XMLIB = -lXm -lXpm
++          XMLIB = ${MOTIFLIB} -lXpm
          DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
- LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XLIB)
-   SYS_LIBRARIES = -lm
+  EXTRA_INCLUDES = -I../../libastro
+   LOCAL_LDFLAGS = -L../../libastro
+@@ -64,3 +64,8 @@
         PROGRAMS = xephem
  
  ComplexProgramTarget(xephem)
 +
 +install::
 +	mkdir -p ${PREFIX}/lib/X11/xephem
-+	tar -cf - auxil edb tools work |(cd ${PREFIX}/lib/X11/xephem; tar -xf -)
++	tar -cf - auxil catalogs tools |(cd ${PREFIX}/lib/X11/xephem; tar -xf -)
 +	sed s,@PREFIX@,${PREFIX}, XEphem.ad > ${PREFIX}/lib/X11/app-defaults/XEphem
diff --git a/astro/xephem/files/patch-ab b/astro/xephem/files/patch-ab
index 275eabf80ca6..e432089700e2 100644
--- a/astro/xephem/files/patch-ab
+++ b/astro/xephem/files/patch-ab
@@ -1,87 +1,11 @@
---- XEphem.ad~	Mon Jul 14 12:22:05 1997
-+++ XEphem.ad	Mon Jul 14 12:29:54 1997
-@@ -147,17 +147,17 @@
- ! N.B. in most cases a leading ~/ refers to $HOME
- 
- ! default plot and listing filenames
--XEphem*Plot*Filename.value: work/ephem.plt
--XEphem*List*Filename.value: work/ephem.lst
-+XEphem*Plot*Filename.value: @PREFIX@/lib/X11/xephem/work/ephem.plt
-+XEphem*List*Filename.value: @PREFIX@/lib/X11/xephem/work/ephem.lst
- 
- ! default sky list filename
--XEphem*SkyList*textString: work/skylist.txt
-+XEphem*SkyList*textString: @PREFIX@/lib/X11/xephem/work/skylist.txt
- 
- ! default extern driver file
--XEphem*ExtFile*textString: work/external.txt
-+XEphem*ExtFile*textString: @PREFIX@/lib/X11/xephem/work/external.txt
- 
- ! default name of postscript file, whether to save (or print) and Color or Gray
--XEphem*Print*Filename.value: work/xephem.ps
-+XEphem*Print*Filename.value: @PREFIX@/lib/X11/xephem/work/xephem.ps
- XEphem*Print*Save.set: True
- XEphem*Print*Grayscale.set: True
- 
-@@ -165,28 +165,28 @@
- XEphem*Print*PrintCmd.value: lpr
- 
- ! default close list filename
--XEphem*CloseList*textString: work/closelist.txt
-+XEphem*CloseList*textString: @PREFIX@/lib/X11/xephem/work/closelist.txt
- 
- ! default data table filename
--XEphem*DataTbl*textString: work/datatbl.txt
-+XEphem*DataTbl*textString: @PREFIX@/lib/X11/xephem/work/datatbl.txt
- 
- ! default help file name
--XEphem.HELPFILE: auxil/xephem.hlp
-+XEphem.HELPFILE: @PREFIX@/lib/X11/xephem/auxil/xephem.hlp
- 
- ! default Earth menu sites file name
--XEphem.SITESFILE: auxil/xephem_sites
-+XEphem.SITESFILE: @PREFIX@/lib/X11/xephem/auxil/xephem_sites
- 
- ! default Moon image file name
--XEphem.MoonFile: auxil/moon.fts
-+XEphem.MoonFile: @PREFIX@/lib/X11/xephem/auxil/moon.fts
- 
- ! default Moon database file name
--XEphem.MoonDB: auxil/moon_db
-+XEphem.MoonDB: @PREFIX@/lib/X11/xephem/auxil/moon_db
- 
- ! default Mars image file name
--XEphem.MarsFile: auxil/marsmap.fts
-+XEphem.MarsFile: @PREFIX@/lib/X11/xephem/auxil/marsmap.fts
- 
- ! default Mars database file name
--XEphem.MarsDB: auxil/mars_db
-+XEphem.MarsDB: @PREFIX@/lib/X11/xephem/auxil/mars_db
- 
- ! default database fifo name
- XEphem.DBFIFO: fifos/xephem_db_fifo
-@@ -201,7 +201,7 @@
- XEphem.SKYLOCFIFO: fifos/xephem_loc_fifo
- 
- ! default initial database directory and file name pattern.
--XEphem.DBdirectory: edb
-+XEphem.DBdirectory: @PREFIX@/lib/X11/xephem/edb
- XEphem.DBpattern:  *.edb
- 
- ! *************************************************************************
-@@ -223,13 +223,13 @@
- XEphem*FieldStars*GSCCD.set: False
- XEphem*FieldStars*GSCCDDirectory.value: /cdrom
- XEphem*FieldStars*GSCCache.set: False
--XEphem*FieldStars*GSCCacheDirectory.value: auxil/gsccache
-+XEphem*FieldStars*GSCCacheDirectory.value: @PREFIX@/lib/X11/xephem/auxil/gsccache
- XEphem*FieldStars*GSCNet.set: False
- XEphem*FieldStars*GSCNetHost.value: gastro23.physics.uiowa.edu
- XEphem*FieldStars*ESONet.set: False
- XEphem*FieldStars*ESONetHost.value: archive.eso.org
- XEphem*FieldStars*PPM.set: False
--XEphem*FieldStars*PPMFilename.value: auxil/ppm.xe
-+XEphem*FieldStars*PPMFilename.value: @PREFIX@/lib/X11/xephem/auxil/ppm.xe
- XEphem*FieldStars*NoDups.set: True
- XEphem*FieldStars*SAOHD.set: True
- 
+--- XEphem.ad.orig	Sat Mar 14 01:45:06 1998
++++ XEphem.ad	Wed Apr 22 13:19:37 1998
+@@ -166,7 +166,7 @@
+ ! system-wide directory for xephem support files
+ ! N.B. under this are auxil/, fifos/, and catalogs/
+ ! N.B. if present, ppm.xe and the gsc base directory must be under catalogs/
+-XEphem.BaseDir: .
++XEphem.BaseDir: @PREFIX@/lib/X11/xephem
+ 
+ ! mount point for CDROM device
+ ! only used if have access to ASP GSC CDROM
diff --git a/astro/xephem/pkg-plist b/astro/xephem/pkg-plist
index 216a1c758622..d77fa5a2658c 100644
--- a/astro/xephem/pkg-plist
+++ b/astro/xephem/pkg-plist
@@ -2,29 +2,19 @@ bin/xephem
 man/man1/xephem.1.gz
 lib/X11/app-defaults/XEphem
 lib/X11/xephem/auxil/README
-lib/X11/xephem/auxil/moon.fts
-lib/X11/xephem/auxil/gsccache/README
-lib/X11/xephem/auxil/marsmap.fts
 lib/X11/xephem/auxil/mars_db
+lib/X11/xephem/auxil/marsmap.fts
+lib/X11/xephem/auxil/moon.fts
 lib/X11/xephem/auxil/moon_db
 lib/X11/xephem/auxil/xephem.hlp
 lib/X11/xephem/auxil/xephem_sites
-lib/X11/xephem/edb/README
-lib/X11/xephem/edb/Messier.edb
-lib/X11/xephem/edb/NGC.edb
-lib/X11/xephem/edb/SAC.edb
-lib/X11/xephem/edb/YBS.edb
-lib/X11/xephem/edb/astorb.edb
-lib/X11/xephem/edb/comets.edb
-lib/X11/xephem/edb/gps.edb
-lib/X11/xephem/edb/mir.edb
-lib/X11/xephem/edb/pulsars.edb
-lib/X11/xephem/edb/spacecraft.edb
-lib/X11/xephem/edb/vla2cm.edb
-lib/X11/xephem/edb/vla20cm.edb
-lib/X11/xephem/edb/vla3.7cm.edb
-lib/X11/xephem/edb/vla6cm.edb
-lib/X11/xephem/edb/vla90cm.edb
+lib/X11/xephem/catalogs/Messier.edb
+lib/X11/xephem/catalogs/NGC.edb
+lib/X11/xephem/catalogs/SAC.edb
+lib/X11/xephem/catalogs/YBS.edb
+lib/X11/xephem/catalogs/asteroids.edb
+lib/X11/xephem/catalogs/comets.edb
+lib/X11/xephem/catalogs/mir.edb
 lib/X11/xephem/tools/README
 lib/X11/xephem/tools/astorb2edb.pl
 lib/X11/xephem/tools/encke2edb.pl
@@ -32,21 +22,25 @@ lib/X11/xephem/tools/extract.awk
 lib/X11/xephem/tools/gps.awk
 lib/X11/xephem/tools/gsc/Makefile
 lib/X11/xephem/tools/gsc/README
-lib/X11/xephem/tools/gsc/gscd.c
 lib/X11/xephem/tools/gsc/gscload.c
-lib/X11/xephem/tools/gsc/gsclogstats.pl
 lib/X11/xephem/tools/gsc/support.c
 lib/X11/xephem/tools/jost2edb.nawk
 lib/X11/xephem/tools/tle2edb.awk
+lib/X11/xephem/tools/xephemdbd/INSTALL
+lib/X11/xephem/tools/xephemdbd/Makefile
+lib/X11/xephem/tools/xephemdbd/README
+lib/X11/xephem/tools/xephemdbd/cgi-lib.pl
+lib/X11/xephem/tools/xephemdbd/db.c
+lib/X11/xephem/tools/xephemdbd/fsfetch.c
+lib/X11/xephem/tools/xephemdbd/request.c
+lib/X11/xephem/tools/xephemdbd/stubs.c
+lib/X11/xephem/tools/xephemdbd/xephemdbd.c
+lib/X11/xephem/tools/xephemdbd/xephemdbd.html
+lib/X11/xephem/tools/xephemdbd/xephemdbd.pl
 lib/X11/xephem/tools/yeomans.pl
-lib/X11/xephem/work/README
-lib/X11/xephem/work/ephem.plt
-@dirrm lib/X11/xephem/auxil/gsccache
-@dirrm lib/X11/xephem/auxil
-@dirrm lib/X11/xephem/edb
-@dirrm lib/X11/xephem/gscdbd/cache
-@dirrm lib/X11/xephem/gscdbd
+@dirrm lib/X11/xephem/tools/xephemdbd
 @dirrm lib/X11/xephem/tools/gsc
 @dirrm lib/X11/xephem/tools
-@dirrm lib/X11/xephem/work
+@dirrm lib/X11/xephem/catalogs
+@dirrm lib/X11/xephem/auxil
 @dirrm lib/X11/xephem