Upgrade to xephem 3.2.2

PR:		ports/10951
Submitted by:	Michael Haro <mharo@area51.fremont.ca.us>

5 files changed, 75 insertions, 37 deletions

diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 6294914ab692..4f4f4d312397 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Thu Aug  1 09:10:22 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1998/09/17 00:32:26 asami Exp $
+# $Id: Makefile,v 1.11 1998/09/26 23:40:12 steve Exp $
 #
 
-DISTNAME=	xephem-3.1
+DISTNAME=	xephem-3.2.2
 CATEGORIES=	astro
-MASTER_SITES=	ftp://iraf.noao.edu/contrib/xephem/xephem-3.1/ \
+MASTER_SITES=	ftp://iraf.noao.edu/contrib/xephem/xephem-3.2/ \
 		ftp://gastro23.physics.uiowa.edu/pub/xephem/ \
 		ftp://iphcip1.physik.uni-mainz.de/pub/xephem/ \
 		ftp://wolf.ifj.edu.pl/mirror/xephem/
@@ -19,16 +19,61 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
+MANCOMPRESSED=	no
 WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 
 LIBSRC=		${WRKDIR}/${DISTNAME}/libastro
 
 MAN1=		xephem.1
 
+AUXIL=		README jupiter.9910 logo.gif mars.9910 mars_db marsmap.fts \
+		moon.fts moon_db saturne.9910 uranus.9910 xephem.hlp \
+		xephem_sites
+
+CATALOGS=	ISS.edb Messier.edb NGC.edb README SAC.edb YBS.edb comets.edb \
+		minorpl.edb
+
+TOOLS=		README extract.awk jost2edb.awk mpcorb2edb.pl tle2edb.pl
+
+GSC=		Makefile README gscload.c support.c
+
+XEPHEMDBD=	INSTALL Makefile README cgi-lib.pl db.c fsfetch.c request.c \
+		stubs.c xephemdbd.c xephemdbd.html xephemdbd.pl
+
 pre-configure:
 	@(cd ${LIBSRC} && ${XMKMF})
 
 pre-build:
 	@(cd ${LIBSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/xephem ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xephem.man ${PREFIX}/man/man1/xephem.1
+	${MKDIR} ${PREFIX}/lib/X11/xephem
+
+	${MKDIR} ${PREFIX}/lib/X11/xephem/auxil
+.for file in ${AUXIL}
+	${INSTALL_DATA} ${WRKSRC}/auxil/${file} ${PREFIX}/lib/X11/xephem/auxil/${file}
+.endfor
+
+	${MKDIR} ${PREFIX}/lib/X11/xephem/catalogs
+.for file in ${CATALOGS}
+	${INSTALL_DATA} ${WRKSRC}/catalogs/${file} ${PREFIX}/lib/X11/xephem/catalogs/${file}
+.endfor
+
+	${MKDIR} ${PREFIX}/lib/X11/xephem/tools
+.for file in ${TOOLS}
+	${INSTALL_DATA} ${WRKSRC}/tools/${file} ${PREFIX}/lib/X11/xephem/tools/${file}
+.endfor
+
+	${MKDIR} ${PREFIX}/lib/X11/xephem/tools/gsc
+.for file in ${GSC}
+	${INSTALL_DATA} ${WRKSRC}/tools/gsc/${file} ${PREFIX}/lib/X11/xephem/tools/gsc/${file}
+.endfor
+
+	${MKDIR} ${PREFIX}/lib/X11/xephem/tools/xephemdbd
+.for file in ${XEPHEMDBD}
+	${INSTALL_DATA} ${WRKSRC}/tools/xephemdbd/${file} ${PREFIX}/lib/X11/xephem/tools/xephemdbd/${file}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/astro/xephem/distinfo b/astro/xephem/distinfo
index 99f579094a48..e170a3250697 100644
--- a/astro/xephem/distinfo
+++ b/astro/xephem/distinfo
@@ -1 +1 @@
-MD5 (xephem-3.1.tar.gz) = 5b84de23348f08a3b979ddd11bdc7cc4
+MD5 (xephem-3.2.2.tar.gz) = b4d18453721225c494a0edb6dbd17161
diff --git a/astro/xephem/files/patch-aa b/astro/xephem/files/patch-aa
index 91d8b7cdcad7..d3acea157fd8 100644
--- a/astro/xephem/files/patch-aa
+++ b/astro/xephem/files/patch-aa
@@ -1,20 +1,11 @@
---- Imakefile.orig	Wed Mar  4 17:36:44 1998
-+++ Imakefile	Wed Apr 22 13:21:12 1998
-@@ -55,7 +55,7 @@
- 
+--- Imakefile.orig	Tue Mar 16 09:00:21 1999
++++ Imakefile	Sun Apr  4 15:06:31 1999
+@@ -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} -lXm
          DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
   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 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 e432089700e2..e1ec6f802005 100644
--- a/astro/xephem/files/patch-ab
+++ b/astro/xephem/files/patch-ab
@@ -1,11 +1,11 @@
---- 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/
+--- XEphem.ad.orig	Wed Mar 10 11:20:24 1999
++++ XEphem.ad	Wed Mar 10 11:20:50 1999
+@@ -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@/lib/X11/xephem
+-XEphem.ShareDir: .
++XEphem.ShareDir: @PREFIX@/lib/X11/xephem
  
- ! mount point for CDROM device
- ! only used if have access to ASP GSC CDROM
+ ! *************************************************************************
+ ! default FITS info
diff --git a/astro/xephem/pkg-plist b/astro/xephem/pkg-plist
index 840aec436713..180ad162e87e 100644
--- a/astro/xephem/pkg-plist
+++ b/astro/xephem/pkg-plist
@@ -1,5 +1,4 @@
 bin/xephem
-lib/X11/app-defaults/XEphem
 lib/X11/xephem/auxil/README
 lib/X11/xephem/auxil/mars_db
 lib/X11/xephem/auxil/marsmap.fts
@@ -7,24 +6,28 @@ 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/auxil/jupiter.9910
+lib/X11/xephem/auxil/logo.gif
+lib/X11/xephem/auxil/mars.9910
+lib/X11/xephem/auxil/saturne.9910
+lib/X11/xephem/auxil/uranus.9910
 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/ISS.edb
+lib/X11/xephem/catalogs/README
 lib/X11/xephem/catalogs/comets.edb
-lib/X11/xephem/catalogs/mir.edb
+lib/X11/xephem/catalogs/minorpl.edb
 lib/X11/xephem/tools/README
-lib/X11/xephem/tools/astorb2edb.pl
-lib/X11/xephem/tools/encke2edb.pl
 lib/X11/xephem/tools/extract.awk
-lib/X11/xephem/tools/gps.awk
+lib/X11/xephem/tools/jost2edb.awk
+lib/X11/xephem/tools/mpcorb2edb.pl
+lib/X11/xephem/tools/tle2edb.pl
 lib/X11/xephem/tools/gsc/Makefile
 lib/X11/xephem/tools/gsc/README
 lib/X11/xephem/tools/gsc/gscload.c
 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
@@ -36,7 +39,6 @@ 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
 @dirrm lib/X11/xephem/tools/xephemdbd
 @dirrm lib/X11/xephem/tools/gsc
 @dirrm lib/X11/xephem/tools