summaryrefslogtreecommitdiff
path: root/astro
diff options
context:
space:
mode:
authorPatrick Li <pat@FreeBSD.org>2002-07-27 02:36:06 +0000
committerPatrick Li <pat@FreeBSD.org>2002-07-27 02:36:06 +0000
commit58fbd71d1288839420fd005900951dbd1ae8f0b5 (patch)
tree9711b14d27956f77eb26cf4311d56285cadf56e8 /astro
parentUpdate to 1.1.9 (diff)
Update to 1.31.1
PR: ports/41024 Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes: svn path=/head/; revision=63618
Diffstat (limited to 'astro')
-rw-r--r--astro/saoimage/Makefile2
-rw-r--r--astro/saoimage/distinfo2
-rw-r--r--astro/saoimage/files/patch-aa24
-rw-r--r--astro/saoimage/files/patch-af12
4 files changed, 30 insertions, 10 deletions
diff --git a/astro/saoimage/Makefile b/astro/saoimage/Makefile
index 0933e91c0a33..728dd48593eb 100644
--- a/astro/saoimage/Makefile
+++ b/astro/saoimage/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= saoimage
-PORTVERSION= 1.29.3
+PORTVERSION= 1.31.1
CATEGORIES= astro
MASTER_SITES= http://tdc-www.harvard.edu/software/saoimage/
diff --git a/astro/saoimage/distinfo b/astro/saoimage/distinfo
index f4a7de6f1996..d633248f5947 100644
--- a/astro/saoimage/distinfo
+++ b/astro/saoimage/distinfo
@@ -1 +1 @@
-MD5 (saoimage-1.29.3.tar.gz) = abfbafb808112b41305ce8c9720c9e69
+MD5 (saoimage-1.31.1.tar.gz) = 4c2934a3a650f5e6e37ec26def90b277
diff --git a/astro/saoimage/files/patch-aa b/astro/saoimage/files/patch-aa
index ef396b170318..5cf2b36a7dd2 100644
--- a/astro/saoimage/files/patch-aa
+++ b/astro/saoimage/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.FreeBSD.orig Sat Nov 6 06:57:30 1999
-+++ makefile.FreeBSD Sat Apr 22 02:58:08 2000
+--- makefile.FreeBSD.orig Thu Sep 20 06:27:49 2001
++++ makefile.FreeBSD Wed Jul 24 01:12:35 2002
@@ -36,9 +36,9 @@
# FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of
# the CFLAGS macro below.)
@@ -46,3 +46,23 @@
#XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users...
#F77LIB = -lF77 -lI77 -lU77
F77LIB = -lf2c
+@@ -307,7 +307,7 @@
+ $(MAKE) ARCFILE=$(TAPEDEV) tar
+
+
+-XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/Xutil.h
++XLIBH = ${X11BASE}/include/X11/Xlib.h ${X11BASE}/include/X11/Xutil.h
+ STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \
+ hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h
+ WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH)
+@@ -419,8 +419,8 @@
+ defs/dispbox.def defs/magnibox.def defs/panbox.def \
+ defs/btnbox.def defs/colorbox.def defs/graphbox.def \
+ defs/desktop.def defs/cursor.def
+-mainkey.o : $(WORKS) /usr/include/X11/keysym.h \
+- /usr/include/X11/keysymdef.h
++mainkey.o : $(WORKS) ${X11BASE}/include/X11/keysym.h \
++ ${X11BASE}/include/X11/keysymdef.h
+ #mainkey.o : $(WORKS) # for OpenWindows
+ mainslct.o : $(WORKS)
+ mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h
diff --git a/astro/saoimage/files/patch-af b/astro/saoimage/files/patch-af
index b37693a420bf..fa0bd0db2d0c 100644
--- a/astro/saoimage/files/patch-af
+++ b/astro/saoimage/files/patch-af
@@ -1,10 +1,10 @@
---- lin.c.orig Tue Dec 21 03:58:46 1999
-+++ lin.c Mon Jun 19 21:57:26 2000
-@@ -161,7 +161,7 @@
- "PC matrix is singular"};
+--- lin.c.orig Thu May 9 04:35:06 2002
++++ lin.c Wed Jul 24 00:52:50 2002
+@@ -163,7 +163,7 @@
+ * $Id: lin.c,v 2.8 2002/01/30 06:04:03 mcalabre Exp $
+ *===========================================================================*/
-
--#ifdef __convexc__
+-#if defined(__convexc__) || defined(__APPLE__)
+#if defined(__convexc__) || defined(__STDC__)
#include <stdlib.h>
#else