update to 3.1; depends upon Xm (lesstif OK) instead of motif

This commit is contained in:
marc 1998-08-05 06:00:00 +00:00
parent 8cfe1c4489
commit 1359225b43
6 changed files with 127 additions and 187 deletions

View File

@ -3,19 +3,74 @@
# Date created: Thu Aug 1 09:10:22 CDT 1996
# Whom: Angelos D. Keromytis
#
# $OpenBSD: Makefile,v 1.2 1998/04/10 02:40:17 marc Exp $
# $OpenBSD: Makefile,v 1.3 1998/08/05 06:00:00 marc Exp $
#
DISTNAME= xephem_3.0
PKGNAME= xephem-3.0
DISTNAME= xephem-3.1
CATEGORIES= astro
NO_CDROM= "NOFEE: Can not sell"
MASTER_SITES= ftp://iraf.noao.edu/contrib/xephem/xephem_3.0/
MASTER_SITES= ftp://iraf.noao.edu/contrib/xephem/xephem-3.1/
MAINTAINER= angelos@openbsd.org
REQUIRES_MOTIF= yes
LIB_DEPENDS= Xm\\.1\\.:${PORTSDIR}/x11/lesstif
USE_IMAKE= yes
do-configure:
@(cd ${WRKSRC}/libastro && ${SETENV} ${XMKMF})
@(cd ${WRKSRC}/GUI/xephem && ${SETENV} ${XMKMF})
do-build:
@(cd ${WRKSRC}/libastro && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
@(cd ${WRKSRC}/GUI/xephem && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
do-install:
@(cd ${WRKSRC}/GUI/xephem && \
${SETENV} ${MAKE_ENV} \
${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
@(cd ${WRKSRC}/GUI/xephem && \
${SETENV} ${MAKE_ENV} \
${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
@(cd ${WRKSRC}/GUI/xephem && \
${SED} -e 's,: .$$,: ${PREFIX}/lib/X11/xephem,' XEphem.ad > XEphem && \
${INSTALL_DATA} XEphem ${PREFIX}/lib/X11/app-defaults)
@(cd ${WRKSRC}/GUI/xephem && \
${SED} -e 's,: .$$,: ${PREFIX}/lib/X11/xephem,' XEphem.bw.ad > XEphem.bw && \
${INSTALL_DATA} XEphem.bw ${PREFIX}/lib/X11/app-defaults)
@${MKDIR} ${PREFIX}/lib/X11/xephem
@${MKDIR} ${PREFIX}/lib/X11/xephem/auxil
@( cd ${WRKSRC}/GUI/xephem/auxil; \
for f in *; do \
${INSTALL_DATA} $$f ${PREFIX}/lib/X11/xephem/auxil; \
done )
@${MKDIR} ${PREFIX}/lib/X11/xephem/catalogs
@( cd ${WRKSRC}/GUI/xephem/catalogs; \
for f in *; do \
${INSTALL_DATA} $$f ${PREFIX}/lib/X11/xephem/catalogs; \
done )
@${MKDIR} ${PREFIX}/lib/X11/xephem/tools
@( cd ${WRKSRC}/GUI/xephem/tools; \
for f in *; do \
if [ -d $$f ]; then \
${MKDIR} ${PREFIX}/lib/X11/xephem/tools/$$f; \
( cd $$f; \
for i in *; do \
${INSTALL_DATA} $$i ${PREFIX}/lib/X11/xephem/tools/$$f; \
done ) \
else \
${INSTALL_DATA} $$f ${PREFIX}/lib/X11/xephem/tools; \
fi; \
done )
@${ECHO} ""
@${ECHO} "*** The initial auxil, catalogs, and tools files have"
@${ECHO} "*** been placed in ${PREFIX}/lib/X11/xephem. Move them"
@${ECHO} "*** where you will. Once moved you MUST modify"
@${ECHO} "*** ${PREFIX}/lib/X11/app-defaults/XEphem and"
@${ECHO} "*** ${PREFIX}/lib/X11/app-defaults/XEphem.bw."
@${ECHO} "*** At a minimum you must change XEphem.BaseDir."
@${ECHO} ""
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (xephem_3.0.tar.gz) = 9ca5767bf2d754ed248ec13b449d246d
MD5 (xephem-3.1.tar.gz) = 5b84de23348f08a3b979ddd11bdc7cc4

View File

@ -1,19 +0,0 @@
--- Imakefile~ Thu Mar 27 15:23:53 1997
+++ Imakefile Thu Mar 27 16:25:24 1997
@@ -15,10 +15,15 @@
OBJS = $(SRCS:.c=.o)
- XMLIB = -lXm
+ XMLIB = ${MOTIFLIB}
DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XLIB)
SYS_LIBRARIES = -lm
PROGRAMS = xephem
ComplexProgramTarget(xephem)
+
+install::
+ mkdir -p ${PREFIX}/lib/X11/xephem
+ tar -cf - auxil edb tools work |(cd ${PREFIX}/lib/X11/xephem; tar -xf -)
+ sed s,@PREFIX@,${PREFIX}, XEphem.ad > ${PREFIX}/lib/X11/app-defaults/XEphem

View File

@ -1,87 +0,0 @@
--- 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

View File

@ -1,46 +1,29 @@
*** ps.c.orig Mon Dec 1 20:11:03 1997
--- ps.c Mon Dec 1 20:15:42 1997
***************
*** 1560,1576 ****
if (wantp) {
/* print */
char name[1024];
! (void) tmpnam (name);
/* VMS tmpnam() doesn't always include the required '.' */
if (!strchr (name, '.'))
(void) strcat (name, ".ps");
xpsc.prfile = XtNewString (name);
! if (XPSOpen (xpsc.prfile) == 0)
call_go();
!
} else {
/* save to file -- ask whether to clobber if it already exits */
char *name = XmTextFieldGetString (filename_w);
--- 1560,1583 ----
if (wantp) {
/* print */
char name[1024];
+ int fd;
! strcpy(name, "/tmp/xeXXXXXXXX");
!
! /*(void) tmpnam (name);*/
! fd = mkstemp(name);
/* VMS tmpnam() doesn't always include the required '.' */
if (!strchr (name, '.'))
(void) strcat (name, ".ps");
xpsc.prfile = XtNewString (name);
! if (XPSOpen (xpsc.prfile) == 0) {
! close(fd);
call_go();
! }
! else
! close(fd);
} else {
/* save to file -- ask whether to clobber if it already exits */
char *name = XmTextFieldGetString (filename_w);
--- GUI/xephem/ps.c.~1~ Fri Nov 28 20:12:15 1997
+++ GUI/xephem/ps.c Tue Aug 4 21:13:53 1998
@@ -1657,16 +1657,24 @@
if (wantp) {
/* print */
char name[1024];
+ int fd;
- (void) tmpnam (name);
+ strcpy(name, "/tmp/xeXXXXXXXX");
+
+ /*(void) tmpnam (name);*/
+ fd = mkstemp(name);
/* VMS tmpnam() doesn't always include the required '.' */
if (!strchr (name, '.'))
(void) strcat (name, ".ps");
xpsc.prfile = XtNewString (name);
- if (XPSOpen (xpsc.prfile) == 0)
+ if (XPSOpen (xpsc.prfile) == 0) {
+ close(fd);
call_go();
+ }
+ else
+ close(fd);
} else {
/* save to file -- ask whether to clobber if it already exits */

View File

@ -1,30 +1,22 @@
bin/xephem
man/cat1/xephem.0
@cwd /usr/X11R6
@name xephem-3.1
@pkgdep lesstif-0.85.3
lib/X11/app-defaults/XEphem
lib/X11/app-defaults/XEphem.bw
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,19 +24,35 @@ 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
bin/xephem
man/cat1/xephem.0
@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
@exec echo ""
@exec echo "*** The initial auxil, catalogs, and tools files have"
@exec echo "*** been placed in %D/lib/X11/xephem. Move them"
@exec echo "*** where you will. Once moved you MUST modify"
@exec echo "*** %D/lib/X11/app-defaults/XEphem and"
@exec echo "*** %D/lib/X11/app-defaults/XEphem.bw."
@exec echo "*** At a minimum you must change XEphem.BaseDir."
@exec echo ""