From 0f2a51b0e9e419520c8ee647d953820b8d320ad9 Mon Sep 17 00:00:00 2001 From: drochner Date: Sat, 19 Jan 2002 11:39:43 +0000 Subject: update to 3.5.2 major changes: -additional data format support -GUI fixes and enhancements -image analysis, fits -cross-platform compatibility -improved telescope control --- x11/xephem/Makefile | 21 +++++++-------------- x11/xephem/PLIST | 10 ++-------- x11/xephem/distinfo | 11 +++++------ x11/xephem/patches/patch-aa | 12 ++++++------ x11/xephem/patches/patch-ac | 8 ++++---- x11/xephem/patches/patch-ad | 10 ---------- 6 files changed, 24 insertions(+), 48 deletions(-) delete mode 100644 x11/xephem/patches/patch-ad (limited to 'x11/xephem') diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile index c56f556cf65..530a1f3a351 100644 --- a/x11/xephem/Makefile +++ b/x11/xephem/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2001/09/12 02:36:28 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/01/19 11:39:43 drochner Exp $ -DISTNAME= xephem-3.4 +DISTNAME= xephem-3.5.2 CATEGORIES= x11 MASTER_SITES= http://www.clearskyinstitute.com/xephem/ \ ftp://iphcip1.physik.uni-mainz.de/pub/xephem/ @@ -10,21 +10,18 @@ HOMEPAGE= http://www.clearskyinstitute.com/xephem/ COMMENT= Interactive astronomical ephemeris program WRKSRC= ${WRKDIR}/${DISTNAME}/GUI/xephem -LIBSRC= ${WRKDIR}/${DISTNAME}/libastro +LIBSRC1= ${WRKDIR}/${DISTNAME}/libastro +LIBSRC2= ${WRKDIR}/${DISTNAME}/libip USE_PERL5= yes USE_IMAKE= yes LICENSE= no-commercial-use -pre-configure: - @(cd ${LIBSRC} && ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} \ - ${XMKMF}) - pre-build: - @(cd ${LIBSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \ - -f ${MAKEFILE} ${ALL_TARGET}) + (cd ${LIBSRC1}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}) + (cd ${LIBSRC2}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}) -PERL_SCRIPTS= astorb2edb.pl mpcorb2edb.pl tle2edb.pl +PERL_SCRIPTS= astorb2edb.pl mpcorb2edb.pl post-install: ${SED} s,@PREFIX@,${PREFIX}, ${FILESDIR}/XEphem.ad > ${WRKDIR}/XEphem @@ -32,10 +29,6 @@ post-install: ${INSTALL_DATA_DIR} ${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 \ ${SED} 1s,@LOCALBASE@,${LOCALBASE}, $$file \ > ${WRKDIR}/$$file; \ diff --git a/x11/xephem/PLIST b/x11/xephem/PLIST index 554b146afa1..f5df720dc39 100644 --- a/x11/xephem/PLIST +++ b/x11/xephem/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:07 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/01/19 11:39:43 drochner Exp $ bin/xephem man/cat1/xephem.0 lib/X11/app-defaults/XEphem @@ -19,20 +19,14 @@ share/xephem/auxil/uranus.9910 share/xephem/auxil/xephem.hlp 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/README share/xephem/catalogs/YBS.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/fits/horsehead.fts share/xephem/tools/astorb2edb.pl share/xephem/tools/mpcorb2edb.pl -share/xephem/tools/tle2edb.pl @dirrm share/xephem/tools @dirrm share/xephem/catalogs @dirrm share/xephem/auxil diff --git a/x11/xephem/distinfo b/x11/xephem/distinfo index f219c704231..9675e282cdb 100644 --- a/x11/xephem/distinfo +++ b/x11/xephem/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:07:53 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/01/19 11:39:43 drochner Exp $ -SHA1 (xephem-3.4.tar.gz) = 4dbee068242022ab077d9516f99374095a23c238 -Size (xephem-3.4.tar.gz) = 2329501 bytes -SHA1 (patch-aa) = 4f27922e46d18486e9d0931f4107ededb0c46b1b -SHA1 (patch-ac) = c53bd1e08396eef2240f2e4c26d0961de80d2ebb -SHA1 (patch-ad) = f61619f628a0dc47b8c6e50e454e270a788ba9d4 +SHA1 (xephem-3.5.2.tar.gz) = ec3bee509b9fa2679c4a80e52c2c8763ad1f4f24 +Size (xephem-3.5.2.tar.gz) = 2523508 bytes +SHA1 (patch-aa) = dd2564928714170a365747a93c5565b1122aa9a0 +SHA1 (patch-ac) = 103263121d64924f190ac072194ef16ac597a07f SHA1 (patch-ae) = ede7fae621127ce381f144f3a56fe47b98ebb95e diff --git a/x11/xephem/patches/patch-aa b/x11/xephem/patches/patch-aa index b260f090f18..8790dcd89b4 100644 --- a/x11/xephem/patches/patch-aa +++ b/x11/xephem/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2000/03/08 12:01:50 agc Exp $ +$NetBSD: patch-aa,v 1.4 2002/01/19 11:39:44 drochner Exp $ ---- Imakefile.orig Wed Oct 6 21:50:21 1999 -+++ Imakefile Sun Feb 20 18:14:49 2000 -@@ -63,7 +63,7 @@ +--- Imakefile.orig Wed Oct 10 08:07:58 2001 ++++ Imakefile Mon Jan 14 16:01:25 2002 +@@ -71,7 +71,7 @@ SRCS = $(OBJS:.o=.c) XCOMM Sometimes you need -lXp after -lXm - XMLIB = -lXm + XMLIB = ${MOTIFLIB} DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) - EXTRA_INCLUDES = -I../../libastro - LOCAL_LDFLAGS = -L../../libastro + EXTRA_INCLUDES = -I../../libastro -I../../libip + LOCAL_LDFLAGS = -L../../libastro -L../../libip diff --git a/x11/xephem/patches/patch-ac b/x11/xephem/patches/patch-ac index 69cdbda1360..1071cf3cda8 100644 --- a/x11/xephem/patches/patch-ac +++ b/x11/xephem/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.3 2000/12/12 17:29:52 drochner Exp $ +$NetBSD: patch-ac,v 1.4 2002/01/19 11:39:44 drochner Exp $ ---- tools/astorb2edb.pl.orig Sat Dec 2 09:35:53 2000 -+++ tools/astorb2edb.pl Sun Dec 10 17:18:41 2000 +--- tools/astorb2edb.pl.orig Wed Aug 15 07:35:25 2001 ++++ tools/astorb2edb.pl Mon Jan 14 16:03:05 2002 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!@LOCALBASE@/bin/perl # convert astorb.txt to 2 .edb files. # Usage: [-f] - # if -f then use ftp to get the script from harvard, else read it from stdin. + # if -f then use ftp to get the script from lowell, else read it from stdin. diff --git a/x11/xephem/patches/patch-ad b/x11/xephem/patches/patch-ad deleted file mode 100644 index 3eeb9238d55..00000000000 --- a/x11/xephem/patches/patch-ad +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2000/03/08 12:01:50 agc Exp $ - ---- 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 -w -+#!@LOCALBASE@/bin/perl - # 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 -- cgit v1.2.3