Attachment #23930 for bug #41024

View | Details | Raw Unified | Return to bug 41024
Collapse All | Expand All

Lines 6-12 Link Here

(-)astro/saoimage/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= saoimage	8	PORTNAME= saoimage
9	PORTVERSION= 1.29.3	9	PORTVERSION= 1.31.1
10	CATEGORIES= astro	10	CATEGORIES= astro
11	MASTER_SITES= http://tdc-www.harvard.edu/software/saoimage/	11	MASTER_SITES= http://tdc-www.harvard.edu/software/saoimage/
12		12

Line 1 Link Here

(-)astro/saoimage/distinfo (-1 / +1 lines)
1	MD5 (saoimage-1.29.3.tar.gz) = abfbafb808112b41305ce8c9720c9e69	1	MD5 (saoimage-1.31.1.tar.gz) = 4c2934a3a650f5e6e37ec26def90b277




--- 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.)

 #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

Lines 1-10 Link Here

(-)astro/saoimage/files/patch-af (-6 / +6 lines)
1	--- lin.c.orig Tue Dec 21 03:58:46 1999	1	--- lin.c.orig Thu May 9 04:35:06 2002
2	+++ lin.c Mon Jun 19 21:57:26 2000	2	+++ lin.c Wed Jul 24 00:52:50 2002
3	@@ -161,7 +161,7 @@	3	@@ -163,7 +163,7 @@
4	"PC matrix is singular"};	4	* $Id: lin.c,v 2.8 2002/01/30 06:04:03 mcalabre Exp $
		5	===========================================================================/
5		6
6		7	-#if defined(__convexc__) \|\| defined(__APPLE__)
7	-#ifdef __convexc__
8	+#if defined(__convexc__) \|\| defined(__STDC__)	8	+#if defined(__convexc__) \|\| defined(__STDC__)
9	#include <stdlib.h>	9	#include <stdlib.h>
10	#else	10	#else

Return to bug 41024

Lines 1-5 Link Here

(-)astro/saoimage/files/patch-aa (-2 / +22 lines)
1	--- makefile.FreeBSD.orig Sat Nov 6 06:57:30 1999	1	--- makefile.FreeBSD.orig Thu Sep 20 06:27:49 2001
2	+++ makefile.FreeBSD Sat Apr 22 02:58:08 2000	2	+++ makefile.FreeBSD Wed Jul 24 01:12:35 2002
3	@@ -36,9 +36,9 @@	3	@@ -36,9 +36,9 @@
4	# FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of	4	# FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of
5	# the CFLAGS macro below.)	5	# the CFLAGS macro below.)
Lines 46-48 Link Here
46	#XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users...	46	#XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users...
47	#F77LIB = -lF77 -lI77 -lU77	47	#F77LIB = -lF77 -lI77 -lU77
48	F77LIB = -lf2c	48	F77LIB = -lf2c
		49	@@ -307,7 +307,7 @@
		50	$(MAKE) ARCFILE=$(TAPEDEV) tar
		51
		52
		53	-XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/Xutil.h
		54	+XLIBH = ${X11BASE}/include/X11/Xlib.h ${X11BASE}/include/X11/Xutil.h
		55	STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \
		56	hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h
		57	WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH)
		58	@@ -419,8 +419,8 @@
		59	defs/dispbox.def defs/magnibox.def defs/panbox.def \
		60	defs/btnbox.def defs/colorbox.def defs/graphbox.def \
		61	defs/desktop.def defs/cursor.def
		62	-mainkey.o : $(WORKS) /usr/include/X11/keysym.h \
		63	- /usr/include/X11/keysymdef.h
		64	+mainkey.o : $(WORKS) ${X11BASE}/include/X11/keysym.h \
		65	+ ${X11BASE}/include/X11/keysymdef.h
		66	#mainkey.o : $(WORKS) # for OpenWindows
		67	mainslct.o : $(WORKS)
		68	mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h