Date: Sun, 19 Dec 1999 15:54:48 +0100 (CET) From: alex@big.endian.de To: FreeBSD-gnats-submit@freebsd.org Subject: ports/15559: update astro/saoimage to 1.26 Message-ID: <199912191454.PAA05442@cichlids.cichlids.com>
next in thread | raw e-mail | index | archive | help
>Number: 15559 >Category: ports >Synopsis: update astro/soaimage to 1.26 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Dec 19 07:00:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Alexander Langer >Release: FreeBSD 4.0-CURRENT i386 >Organization: no >Environment: Tested under: -current from today. >Description: * Update port to new version 1.26.10 * Change Mastersite-directory * remove pre-patch target * remove unneeded patches (patch-ad and -ae) * add a new patch against a compile-error >How-To-Repeat: >Fix: diff -rNu saoimage.old/Makefile saoimage/Makefile --- saoimage.old/Makefile Wed Aug 25 06:22:41 1999 +++ saoimage/Makefile Sun Dec 19 14:49:19 1999 @@ -1,14 +1,14 @@ # New ports collection makefile for: saoimage -# Version required: 1.22 +# Version required: 1.26.10 # Date created: 21 Feb 1998 # Whom: giffunip@asme.org # # $FreeBSD: ports/astro/saoimage/Makefile,v 1.6 1999/08/25 04:22:41 obrien Exp $ # -DISTNAME= saoimage-1.22 +DISTNAME= saoimage-1.26.10 CATEGORIES= astro -MASTER_SITES= ftp://cfa-ftp.harvard.edu/pub/gsc/SAOimage/Old/ +MASTER_SITES= ftp://cfa-ftp.harvard.edu/pub/gsc/SAOimage/ MAINTAINER= giffunip@asme.org @@ -19,8 +19,6 @@ MANL= saoimage.l USE_X_PREFIX= yes -pre-patch: - $(CP) $(WRKSRC)/makefile.sun $(WRKSRC)/makefile.$(ALL_TARGET) pre-build: @(cd ${WRKSRC}/btnlib; ${MAKE}) post-install: diff -rNu saoimage.old/files/md5 saoimage/files/md5 --- saoimage.old/files/md5 Sun Sep 27 01:29:02 1998 +++ saoimage/files/md5 Sun Dec 19 14:51:36 1999 @@ -1 +1 @@ -MD5 (saoimage-1.22.tar.gz) = f1a6725d609f98ddeb51cbb96811ddf0 +MD5 (saoimage-1.26.10.tar.gz) = 48160a31760aef33be756c14b1df2f9d diff -rNu saoimage.old/patches/patch-aa saoimage/patches/patch-aa --- saoimage.old/patches/patch-aa Sun Jan 3 10:24:49 1999 +++ saoimage/patches/patch-aa Sun Dec 19 14:55:55 1999 @@ -1,196 +1,15 @@ -*** makefile.FreeBSD.orig Sun Jan 3 17:42:56 1999 ---- makefile.FreeBSD Sun Jan 3 18:15:02 1999 -*************** -*** 1,5 **** - # -! # makefile.sun for SAOimage # Sun workstations using SunOS 4.* and MIT Xlib - # - # To build: - # % make (or `make all') # build libs/program as necessary ---- 1,5 ---- - # -! # makefile.FreeBSD for SAOimage # x86 workstations using FreeBSD and MIT Xlib - # - # To build: - # % make (or `make all') # build libs/program as necessary -*************** -*** 36,44 **** - # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of - # the CFLAGS macro below.) - -! SAOBINDIR = $(ROOT)/usr/local/bin/ -! SAOMANDIR = $(ROOT)/usr/man/manl/ -! IMTRCDIR = $(ROOT)/usr/local/lib/ - - IMTOOLRC = $(IMTRCDIR)imtoolrc - FIFO_I = $(ROOT)/dev/imt1i ---- 36,44 ---- - # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of - # the CFLAGS macro below.) - -! SAOBINDIR = $(ROOT)$(PREFIX)/bin/ -! SAOMANDIR = $(ROOT)$(PREFIX)/man/manl/ -! IMTRCDIR = $(ROOT)$(PREFIX)/lib/ - - IMTOOLRC = $(IMTRCDIR)imtoolrc - FIFO_I = $(ROOT)/dev/imt1i -*************** -*** 46,52 **** - FIFO_LN = $(ROOT)/dev/imt1 - - # Compiler specification. -! CC = cc - # Uncomment these two lines to compile with gcc (add any optimizers you wish). - #CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce - # Delayed branches could win big on RISC: many inner loops have branches ---- 46,52 ---- - FIFO_LN = $(ROOT)/dev/imt1 - - # Compiler specification. -! #CC = cc - # Uncomment these two lines to compile with gcc (add any optimizers you wish). - #CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce - # Delayed branches could win big on RISC: many inner loops have branches -*************** -*** 62,86 **** - # fired up on a system where the fifos are absent. Other than this, the - # standalone operation is unhindered. - -! IFLAGS = -DFITS -DOIF -DIMTOOL - - # MFLAGS: machine or library specific code. - # -DSUN - SunOS temp file name, IEEE floating point debug, and Sun keyboard - # -DLSB - byte swap for FITS (VAX and DECstations) - # -DSYSV - substitutes for getdtablesize() and setrlimit() not widely known - # -DPSCRIPT - hard copy output to a PostScript printer (else no hardcopy) - -! MFLAGS = -DSUN -DPSCRIPT -DQUIT - - # OFLAGS: compiler optimization/debug options. - -! OFLAGS = -g -DDEBUG -! #OFLAGS = -O - - # ADFLAGS: architecture-dependent floating point flags, etc. - - #ADFLAGS = -I/usr/openwin/share/include # ATTENTION: OpenWindows users... -! ADFLAGS = - - # Libraries that move about or may require special specification. - # ---- 62,90 ---- - # fired up on a system where the fifos are absent. Other than this, the - # standalone operation is unhindered. - -! IFLAGS = -DFITS -DOIF #-DIMTOOL - - # MFLAGS: machine or library specific code. - # -DSUN - SunOS temp file name, IEEE floating point debug, and Sun keyboard - # -DLSB - byte swap for FITS (VAX and DECstations) - # -DSYSV - substitutes for getdtablesize() and setrlimit() not widely known - # -DPSCRIPT - hard copy output to a PostScript printer (else no hardcopy) -+ # -DMIRIAD - extras - -! MFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT -! .if ${MACHINE_ARCH} == "alpha" -! MFLAGS += -DLONG64 -! .endif - - # OFLAGS: compiler optimization/debug options. - -! #OFLAGS = -g -DDEBUG -! #OFLAGS = -O2 -m486 -pipe - - # ADFLAGS: architecture-dependent floating point flags, etc. - - #ADFLAGS = -I/usr/openwin/share/include # ATTENTION: OpenWindows users... -! ADFLAGS = -I$(X11BASE)/include - - # Libraries that move about or may require special specification. - # -*************** -*** 88,110 **** - # usual link search path, i.e., it is not in /usr/lib, it may be necessary - # to specify its path fully in XLIB. - -! XLIB = -lX11 -! #XLIB = -L/usr/openwin/lib -lX11 # ATTENTION: OpenWindows users... - #F77LIB = -lF77 -lI77 -lU77 - #LDFLAGS = -Bstatic - - # END OF INSTALLATION DEPENDENT SETUP. ======================================== - # It should not be necessary to edit anything below this line. - -! ARCH = sun - LINT = lint -b -! MKNOD = /etc/mknod - MV = mv -f - RANLIB = ranlib - RM = rm -f - SHELL = /bin/sh - -! CFLAGS = $(OFLAGS) $(ADFLAGS) $(MFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\" - - # SAOimage libraries that live in subdirectories with their own makefiles. - # This definition must be kept in correspondence with the DEPLIBS target. ---- 92,115 ---- - # usual link search path, i.e., it is not in /usr/lib, it may be necessary - # to specify its path fully in XLIB. - -! XLIB = -L$(X11BASE)/lib -lX11 -! #XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users... - #F77LIB = -lF77 -lI77 -lU77 -+ F77LIB = -lf2c - #LDFLAGS = -Bstatic - - # END OF INSTALLATION DEPENDENT SETUP. ======================================== - # It should not be necessary to edit anything below this line. - -! ARCH = FreeBSD - LINT = lint -b -! MKNOD = /sbin/mknod - MV = mv -f - RANLIB = ranlib - RM = rm -f - SHELL = /bin/sh - -! CFLAGS += $(ADFLAGS) $(MFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\" - - # SAOimage libraries that live in subdirectories with their own makefiles. - # This definition must be kept in correspondence with the DEPLIBS target. -*************** -*** 306,312 **** - $(MAKE) ARCFILE=$(TAPEDEV) tar - - -! XLIBH = /usr/include/X11/Xlib.h /usr/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 hfiles/wcs.h ---- 311,317 ---- - $(MAKE) ARCFILE=$(TAPEDEV) tar - - -! XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/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 hfiles/wcs.h -*************** -*** 415,422 **** - 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 - mainslct.o : $(WORKS) - mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h - menuctrl.o : $(WORKS) btnlib/buttons.h ---- 420,427 ---- - 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/X11R6/include/X11/keysym.h \ -! /usr/X11R6/include/X11/keysymdef.h - mainslct.o : $(WORKS) - mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h - menuctrl.o : $(WORKS) btnlib/buttons.h +--- makefile.FreeBSD.orig Fri Nov 5 22:57:30 1999 ++++ makefile.FreeBSD Sun Dec 19 14:55:37 1999 +@@ -36,9 +36,9 @@ + # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of + # the CFLAGS macro below.) + +-SAOBINDIR = $(ROOT)/usr/local/bin/ +-SAOMANDIR = $(ROOT)/usr/local/man/manl/ +-IMTRCDIR = $(ROOT)/usr/local/lib/ ++SAOBINDIR = $(ROOT)$(PREFIX)/bin/ ++SAOMANDIR = $(ROOT)$(PREFIX)/man/manl/ ++IMTRCDIR = $(ROOT)$(PREFIX)/lib/ + + IMTOOLRC = $(IMTRCDIR)imtoolrc + FIFO_I = $(ROOT)/dev/imt1i diff -rNu saoimage.old/patches/patch-ac saoimage/patches/patch-ac --- saoimage.old/patches/patch-ac Fri Apr 17 23:27:32 1998 +++ saoimage/patches/patch-ac Sun Dec 19 15:45:20 1999 @@ -1,13 +1,11 @@ -*** makefile.orig Fri Feb 20 00:02:47 1998 ---- makefile Fri Feb 20 01:10:24 1998 -*************** -*** 108,113 **** ---- 108,115 ---- - apollo_m68k: - $(MAKE) apollo_68882 - -+ FreeBSD: # FreeBSD on Intel chip -+ $(MAKE) -f makefile.FreeBSD $(SAOIMAGE) ARCH=$@ - - hp: # Hewlett-Packard (HPUX) - $(MAKE) -f makefile.hp $(SAOIMAGE) ARCH=$@ +--- imhfile.c.old Sun Dec 19 15:00:35 1999 ++++ imhfile.c Sun Dec 19 15:42:50 1999 +@@ -1637,7 +1637,7 @@ + + /* Subtract minutes westward from UTC */ + ltm = localtime (&utc); +- lt = utc - timezone; ++ lt = ltm->tm_gmtoff; + + /* Correct for daylight savings time, if in effect */ + if (ltm->tm_isdst) diff -rNu saoimage.old/patches/patch-ad saoimage/patches/patch-ad --- saoimage.old/patches/patch-ad Fri Apr 17 23:27:32 1998 +++ saoimage/patches/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,22 +0,0 @@ -*** ctrldisk.c.orig Fri Feb 20 00:37:18 1998 ---- ctrldisk.c Fri Feb 20 00:38:56 1998 -*************** -*** 157,164 **** - int nbytes; - char *filename; /* [i]: name of file being accessed */ - { - long lseek(); /* type not declared in <sys/file.h> */ -! - if( lseek(fd, (long)nbytes, L_SET) < 0 ) { - perror("lseek"); - (void)fprintf(stderr, "Can't lseek %d bytes", nbytes); ---- 157,165 ---- - int nbytes; - char *filename; /* [i]: name of file being accessed */ - { -+ #ifndef __FreeBSD__ - long lseek(); /* type not declared in <sys/file.h> */ -! #endif - if( lseek(fd, (long)nbytes, L_SET) < 0 ) { - perror("lseek"); - (void)fprintf(stderr, "Can't lseek %d bytes", nbytes); diff -rNu saoimage.old/patches/patch-ae saoimage/patches/patch-ae --- saoimage.old/patches/patch-ae Sun Jan 3 10:24:49 1999 +++ saoimage/patches/patch-ae Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- disppsct.c.orig Thu May 4 06:18:00 1995 -+++ disppsct.c Sun Jan 3 17:50:42 1999 -@@ -589,7 +589,7 @@ - char *getenv(); - #endif - --#ifdef SUN -+#if defined(SUN) && defined(sun) - long time(); /* should be in time.h, but not in SunOS */ - #endif - long clock; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199912191454.PAA05442>