Upgrade to 3.5.

4 files changed, 8 insertions, 40 deletions

diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 2d5eda6de1be..84d094a85515 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xephem
-PORTVERSION=	3.4
-PORTREVISION=	1
+PORTVERSION=	3.5
+#PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://www.clearskyinstitute.com/xephem/ \
 		ftp://iraf.noao.edu/contrib/xephem/ \
@@ -21,13 +21,12 @@ USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		xephem.1
 
-LIBSRC=		${WRKDIR}/${DISTNAME}/libastro
-
-pre-configure:
-	@(cd ${LIBSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF})
+LIBASTROSRC=	${WRKDIR}/${DISTNAME}/libastro
+LIBIPSRC=	${WRKDIR}/${DISTNAME}/libip
 
 pre-build:
-	@(cd ${LIBSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+	@cd ${LIBASTROSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
+	@cd ${LIBIPSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
 	@${ECHO} 'XEphem.ShareDir: ${PREFIX}/lib/X11/xephem' > ${WRKSRC}/XEphem.ad
 
 post-install:
diff --git a/astro/xephem/distinfo b/astro/xephem/distinfo
index 3d050ccf9397..6b00f07542e0 100644
--- a/astro/xephem/distinfo
+++ b/astro/xephem/distinfo
@@ -1 +1 @@
-MD5 (xephem-3.4.tar.gz) = 9ec29999d081caabbf21cba941734c6c
+MD5 (xephem-3.5.tar.gz) = 485ee6c412d7c2b8919843502c3b0704
diff --git a/astro/xephem/files/patch-saveres.c b/astro/xephem/files/patch-saveres.c
deleted file mode 100644
index 8f7616a6e909..000000000000
--- a/astro/xephem/files/patch-saveres.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- saveres.c.orig	Thu Nov 30 07:01:20 2000
-+++ saveres.c	Sat Dec 30 16:07:54 2000
-@@ -1026,6 +1026,7 @@
- 	    /* try mdovride else use default */
- 	    FILE *ofp = fopenh (mdovride, "r");
- 	    char *vp = NULL;
-+	    char *vph;
- 	    char nam[MRNAM], val[MRVAL], buf[MLL];
- 
- 	    if (ofp) {
-@@ -1043,7 +1044,8 @@
- 	    }
- 	    if (!vp)
- 		vp = mydirdef;
--	    mydir = XtNewString (expand_home(vp));
-+	    vph = expand_home(vp);
-+	    mydir = XtNewString (vph);
- 	    if (access (mydir, X_OK) < 0 && mkdir (mydir, 0744) < 0) {
- 		sprintf (buf, "%s: %s", mydir, syserrstr());
- 		xe_msg (buf, 1);
diff --git a/astro/xephem/pkg-plist b/astro/xephem/pkg-plist
index 2793ed7e1597..1abf9cb9d1e1 100644
--- a/astro/xephem/pkg-plist
+++ b/astro/xephem/pkg-plist
@@ -17,22 +17,13 @@ lib/X11/xephem/auxil/uranus.9910
 lib/X11/xephem/auxil/xephem.hlp
 lib/X11/xephem/auxil/xephem.sit
 lib/X11/xephem/auxil/xephem_skyhist
-lib/X11/xephem/catalogs/ISS.edb
 lib/X11/xephem/catalogs/Messier.edb
-lib/X11/xephem/catalogs/NGC.edb
-lib/X11/xephem/catalogs/README
 lib/X11/xephem/catalogs/YBS.edb
 lib/X11/xephem/fifos/Makefile
 lib/X11/xephem/fifos/README
 lib/X11/xephem/fits/Abell426.fts
-lib/X11/xephem/tools/README
+lib/X11/xephem/fits/horsehead.fts
 lib/X11/xephem/tools/astorb2edb.pl
-lib/X11/xephem/tools/extract.awk
-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.awk
 lib/X11/xephem/tools/lx200xed/GPL
 lib/X11/xephem/tools/lx200xed/Makefile
 lib/X11/xephem/tools/lx200xed/README
@@ -40,7 +31,6 @@ lib/X11/xephem/tools/lx200xed/liblx200.c
 lib/X11/xephem/tools/lx200xed/liblx200.h
 lib/X11/xephem/tools/lx200xed/lx200xed.c
 lib/X11/xephem/tools/mpcorb2edb.pl
-lib/X11/xephem/tools/tle2edb.pl
 lib/X11/xephem/tools/xephemdbd/INSTALL
 lib/X11/xephem/tools/xephemdbd/Makefile
 lib/X11/xephem/tools/xephemdbd/README
@@ -54,7 +44,6 @@ lib/X11/xephem/tools/xephemdbd/xephemdbd.html
 lib/X11/xephem/tools/xephemdbd/xephemdbd.pl
 @dirrm lib/X11/xephem/tools/xephemdbd
 @dirrm lib/X11/xephem/tools/lx200xed
-@dirrm lib/X11/xephem/tools/gsc
 @dirrm lib/X11/xephem/tools
 @dirrm lib/X11/xephem/fits
 @dirrm lib/X11/xephem/fifos