Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv6876

Modified Files:
        xephem.info xephem.patch 
Log Message:
move to stable, with maintainer's permission


Index: xephem.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/xephem.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xephem.info 31 May 2006 14:26:48 -0000      1.2
+++ xephem.info 5 Aug 2007 11:12:30 -0000       1.3
@@ -1,28 +1,14 @@
 Package: xephem
-Version: 3.6
-Revision: 1
-BuildDepends: openmotif3, x11-dev
-Depends: x11-shlibs, openmotif3-shlibs
-Source: mirror:custom:%n-%v.tar.gz
-CustomMirror: <<
- First: http://clearskyinstitute.com/xephem/
- Second: http://www.pogma.com/fink/
-<<
+Version: 3.7.2
+Revision: 3
+BuildDepends: libjpeg, libpng3, openmotif3, x11-dev
+Depends: libjpeg-shlibs, libpng3-shlibs, openmotif3-shlibs, x11-shlibs
+Source: http://clearskyinstitute.com/xephem/%n-%v.tar.gz
+Source-MD5: 1074e04b9a89302d9f2bad7107674311
+
 PatchScript: sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | patch -p1
-CompileScript: <<
-#! /bin/sh -ev
-cd libastro
-make
-cd ../libip
-make
-cd ../liblilxml
-make
-cd ../libjpegd
-make
-cd ../GUI/xephem
-xmkmf
-make
-<<
+CompileScript: make -C GUI/xephem
+
 InstallScript: <<
 #! /bin/sh -ev
 mkdir %i/bin
@@ -34,9 +20,14 @@
 cp -R catalogs %i/lib/xephem
 cp -R fifos %i/lib/xephem
 cp -R fits %i/lib/xephem
-cp -R help %i/lib/xephem
 cp -R gallery %i/lib/xephem
+cp -R help %i/lib/xephem
+cp -R lo %i/lib/xephem
+cp -R tools %i/lib/xephem
+mkdir -p %i/share/man/man1
+install -c -m 755 xephem.1 %i/share/man/man1
 <<
+
 DocFiles: Copyright
 Description: Astronomical Software Ephemeris
 DescDetail: <<
@@ -44,6 +35,7 @@
 sky-simulating, ephemeris-generating celestial virtuoso that can do just about
 everything ...
 <<
+
 PostInstScript: <<
 cat %p/share/doc/xephem/Copyright
 echo ""
@@ -51,7 +43,7 @@
 echo "A Full version of xephem is available for Mac OS X"
 echo "Go to http://www.clearskyinstitute.com for more information"
 <<
+
 License: Restrictive/Distributable
-Maintainer: None <[EMAIL PROTECTED]>
+Maintainer: Kevin Horton <[EMAIL PROTECTED]>
 Homepage: http://www.clearskyinstitute.com/xephem/
-Source-MD5: 7ee5d9e1b4c089036643c9d931ca30ed

Index: xephem.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/xephem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xephem.patch        20 Jan 2006 20:12:58 -0000      1.1
+++ xephem.patch        5 Aug 2007 11:12:30 -0000       1.2
@@ -1,32 +1,61 @@
-diff -urN xephem-3.6/GUI/xephem/Imakefile xephem-3.6.new/GUI/xephem/Imakefile
---- xephem-3.6/GUI/xephem/Imakefile    Sun Apr 18 16:00:57 2004
-+++ xephem-3.6.new/GUI/xephem/Imakefile        Thu Jun 10 07:54:10 2004
-@@ -80,8 +80,8 @@
- XCOMM Sometimes you need -lXp after -lXm
-           XMLIB = -lXm
-         DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
-- EXTRA_INCLUDES = -I../../libastro -I../../libip -I../../liblilxml 
-I../../libjpegd
--  LOCAL_LDFLAGS = -L../../libastro -L../../libip -L../../liblilxml 
-L../../libjpegd
-+ EXTRA_INCLUDES = -I../../libastro -I../../libip -I../../liblilxml 
-I../../libjpegd  [EMAIL PROTECTED]@/include
-+  LOCAL_LDFLAGS = -L../../libastro -L../../libip -L../../liblilxml 
-L../../libjpegd [EMAIL PROTECTED]@/lib
- LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XLIB) -lastro -lip -llilxml -ljpegd
-   SYS_LIBRARIES = -lm
-        PROGRAMS = xephem
-diff -urN xephem-3.6/xephem xephem-3.6.new/xephem
---- xephem-3.6/xephem  Thu Jan  1 09:00:00 1970
-+++ xephem-3.6.new/xephem      Thu Jun 10 08:00:29 2004
-@@ -0,0 +1,2 @@
-+#!/bin/sh
[EMAIL PROTECTED]@/lib/xephem/xephem -env [EMAIL PROTECTED]@/lib
---- xephem-3.6.4/GUI/xephem/patchlevel.c~      2005-02-27 12:58:56.000000000 
+0900
-+++ xephem-3.6.4/GUI/xephem/patchlevel.c       2005-06-29 08:28:35.000000000 
+0900
+diff -Nurd -x'*~' xephem-3.7.2.orig/GUI/xephem/Makefile 
xephem-3.7.2/GUI/xephem/Makefile
+--- xephem-3.7.2.orig/GUI/xephem/Makefile      2006-05-13 19:06:06.000000000 
-0400
++++ xephem-3.7.2/GUI/xephem/Makefile   2007-06-15 00:34:30.000000000 -0400
+@@ -10,9 +10,9 @@
+ # back here and compile and link all the *.c files into one executable, 
xephem.
+ 
+ # -I and -L flags to find required supporting XEphem libraries
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd 
-I../../libpng -I../../libz
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd 
-L../../libpng -L../../libz
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBINC = -I../../libastro -I../../libip -I../../liblilxml
++LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng12 -lz
+ 
+ # MOTIFI is the directory containing the Xm directory of include files.
+ # MOTIFL is the directory containing the libXm.a library.
+@@ -33,8 +33,8 @@
+ CC = gcc
+ CLDFLAGS = -g
+ CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
+-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
++AM_LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
++XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
+ LIBS = $(XLIBS) $(LIBLIB) -lm
+ 
+ # for ppc Apple OS X to make universal (i386 and ppc binary), requires
+@@ -179,7 +179,7 @@
+ all: libs xephem xephem.1
+ 
+ xephem: $(INCS) $(OBJS)
+-      $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++      $(CC) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ xephem.1: xephem.man
+       nroff -man $? > $@
+@@ -187,10 +187,7 @@
+ libs:
+       cd ../../libastro; make
+       cd ../../libip; make
+-      cd ../../libjpegd; make
+       cd ../../liblilxml; make
+-      cd ../../libpng; make
+-      cd ../../libz; make
+ 
+ clean:
+       touch x.o
+diff -Nurd -x'*~' xephem-3.7.2.orig/GUI/xephem/patchlevel.c 
xephem-3.7.2/GUI/xephem/patchlevel.c
+--- xephem-3.7.2.orig/GUI/xephem/patchlevel.c  2006-11-12 21:22:26.000000000 
-0500
++++ xephem-3.7.2/GUI/xephem/patchlevel.c       2007-06-15 00:14:19.000000000 
-0400
 @@ -1,3 +1,4 @@
 +#include <sys/types.h>
  #include <stdio.h>
  
- #include "xephem.h"
---- xephem-3.6.4/GUI/xephem/time.c~    2005-02-27 11:32:46.000000000 +0900
-+++ xephem-3.6.4/GUI/xephem/time.c     2005-06-29 08:37:15.000000000 +0900
+ #include <Xm/Xm.h>
+diff -Nurd -x'*~' xephem-3.7.2.orig/GUI/xephem/time.c 
xephem-3.7.2/GUI/xephem/time.c
+--- xephem-3.7.2.orig/GUI/xephem/time.c        2005-07-08 22:12:10.000000000 
-0400
++++ xephem-3.7.2/GUI/xephem/time.c     2007-06-15 00:14:19.000000000 -0400
 @@ -1,6 +1,6 @@
  /* get the time from the os.
   */
@@ -35,3 +64,9 @@
  #include <stdio.h>
  #include <time.h>
  #include <math.h>
+diff -Nurd -x'*~' xephem-3.7.2.orig/xephem xephem-3.7.2/xephem
+--- xephem-3.7.2.orig/xephem   1969-12-31 19:00:00.000000000 -0500
++++ xephem-3.7.2/xephem        2007-06-15 00:14:19.000000000 -0400
+@@ -0,0 +1,2 @@
++#!/bin/sh
[EMAIL PROTECTED]@/lib/xephem/xephem -env [EMAIL PROTECTED]@/lib


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to