diff -uNr dis45-v1.36.orig/Imakefile dis45-v1.36/Imakefile --- dis45-v1.36.orig/Imakefile Mon Jun 14 14:00:14 1999 +++ dis45-v1.36/Imakefile Fri Jan 19 03:33:43 2001 @@ -50,7 +50,7 @@ SYS_LIB = -lm -ldld #endif -#if defined(PowerPCArchitecture) +#if defined(PowerPCArchitecture) || defined(DarwinArchitecture) LD = g77 #if defined(MAKE_SHARED) LDFLAGS = @@ -157,9 +157,9 @@ CleanSubdirs($(SUBDIRS)) -dis45comand.f : comand.tbl Imakefile.def +dis45comand.f : comand.tbl.tmpl Imakefile.def rm -f comand.TBL - $(CPP) comand.tbl > comand.TBL + $(CPP) comand.tbl.tmpl > comand.TBL rm -f dis45comand.f ./gencomand comand.TBL > dis45comand.f diff -uNr dis45-v1.36.orig/cli/Imakefile dis45-v1.36/cli/Imakefile --- dis45-v1.36.orig/cli/Imakefile Mon Jun 14 14:12:50 1999 +++ dis45-v1.36/cli/Imakefile Fri Jan 19 02:40:12 2001 @@ -41,7 +41,7 @@ CLI_SYS_OBJ = sysunix.o #endif -#if defined(PowerPCArchitecture) +#if defined(PowerPCArchitecture) || defined(DarwinArchitecture) CLI_SYS_OBJ = sysunix.o #endif diff -uNr dis45-v1.36.orig/cli/clopen.F dis45-v1.36/cli/clopen.F --- dis45-v1.36.orig/cli/clopen.F Mon Jun 14 14:17:36 1999 +++ dis45-v1.36/cli/clopen.F Fri Jan 19 02:54:58 2001 @@ -48,7 +48,7 @@ If( Cmode .eq. 'R' ) Then INQUIRE( FILE=FULNAM(1:L),EXIST=LEXIST,ERR=901 ) If( .not. LEXIST ) Goto 901 -#ifndef linux +#if !defined(linux) && !defined(__ppc__) Open( UNIT=LUN,FILE=FULNAM(1:L),ERR=901,STATUS='OLD', & READONLY ) #else diff -uNr dis45-v1.36.orig/cli/iopen.F dis45-v1.36/cli/iopen.F --- dis45-v1.36.orig/cli/iopen.F Mon Jun 14 14:17:22 1999 +++ dis45-v1.36/cli/iopen.F Fri Jan 19 02:57:27 2001 @@ -54,7 +54,7 @@ OPEN (LU,FILE=RFILE(1:LZ),STATUS=Status,FORM=FORM, & ACCESS=ACCESS,ERR=99) Else If(Status(1:3).eq.'OLD') Then -#ifndef linux +#if !defined(linux) && !defined(__ppc__) OPEN (LU,FILE=RFILE(1:LZ),STATUS=Status,FORM=FORM, & ACCESS=ACCESS,READONLY,ERR=99) #else @@ -75,7 +75,7 @@ & ACCESS=ACCESS,ERR=99) Else If(Status(1:3).eq.'OLD' .and. & Access(1:6).ne.'DIRECT') Then -#ifndef linux +#if !defined(linux) && !defined(__ppc__) OPEN (LU,FILE=FILE(1:LZ),STATUS='OLD',FORM=FORM, & ACCESS=ACCESS,READONLY,ERR=99) #else diff -uNr dis45-v1.36.orig/cli/qopen.F dis45-v1.36/cli/qopen.F --- dis45-v1.36.orig/cli/qopen.F Mon Jun 14 14:18:59 1999 +++ dis45-v1.36/cli/qopen.F Fri Jan 19 02:59:20 2001 @@ -371,7 +371,7 @@ INQUIRE( FILE=DSNAME(:LDSN),EXIST=LEXIST,ERR=9000 ) If( .not.LEXIST ) Goto 9000 If( Lun.gt.0 ) Then -#ifndef linux +#if !defined(linux) && !defined(__ppc__) OPEN( UNIT=LUN,FILE=DSNAME(:LDSN), & READONLY,FORM=KFRM,STATUS=KSTS,ERR=9000 ) #else @@ -394,7 +394,7 @@ End If Else If( KFRM(1:1).eq.'F' ) Then If( Lun.gt.0 ) Then -#ifndef linux +#if !defined(linux) && !defined(__ppc__) OPEN( UNIT=LUN,FILE=DSNAME(:LDSN),Form=KFRM, & STATUS=KSTS,Carriagecontrol=CC,ERR=9000 ) #else diff -uNr dis45-v1.36.orig/comand.tbl.tmpl dis45-v1.36/comand.tbl.tmpl --- dis45-v1.36.orig/comand.tbl.tmpl Thu Jan 1 09:00:00 1970 +++ dis45-v1.36/comand.tbl.tmpl Fri Jan 19 03:32:53 2001 @@ -0,0 +1,121 @@ +#include "Imakefile.def" +EXIT: +GLOBAL: +REPEAT: +MINUIT: +ADD:Hlarith('+',error) +ALIAS:HLalias(error) +AREA:HLarea(error) +AVX:HLavx(error) +AVY:HLavy(error) +AXTITLE:HLaxtitl(error) +B:HLback(error) +BANX:Hlbanx(error) +BANY:Hlbany(error) +BINOPER:HLbinoper(error) +BLOW:HLblow(error) +BOOK:HL_book(id,error) +BT:HLbt(error) +CD:HLcdir(error) +CHBIN:HLchbn(error) +CHEDGE:HLchedge(error) +CHTIT:HLchtit(error) +CHWIN:HLchwin(error) +CLOSE:HLclose(error) +CONTOUR:HLcntr(error) +COPY:HLcopy(error) +CWD:HLcwd(error) +DELETE:HLdel(error) +DISTRIB:HLdist(error) +DIV:Hlarith('/',error) +DOFFT:HLdofft(error) +DUPL:HLdupl(error) +ECHO:HLecho(error) +ER:HLerro(error) +EXPAND:HLexp(error) +EXTERR:HLexte(error) +EXTFUN:HLextfun(error) +FETC:HLfetc(option, error) +FETX:HLfetx(option, error) +FETC3:HLfetc3(option, error) +FETMEM:HLfetm(error) +FFTW:HLfftw(error) +FIT:HLfit(error) +GDEL:HLgdel(error) +GPL:HLgpl(error) +GTITLE:HLgtit(error) +H:HLmove(error) +HELP:HLhelp('DISPLAY',error) +HIGZ:HLhigz(error) +I:HLindx(error) +INCLUDE:HLinclude(error) +INTEGRAL:HLinteg(error) +JOIN:HLjoin(error) +LEGO:HLlego(error) +LIN:DIS45_setopt(0,'LINY') +LINX:DIS45_setopt(0,'LINX') +LINY:DIS45_setopt(0,'LINY') +LOCATE:HLlocate(error) +LOG:DIS45_setopt(0,'LOGY') +LOGX:DIS45_setopt(0,'LOGX') +LOGY:DIS45_setopt(0,'LOGY') +LS:HLldir(error) +MAMI:HLmami(error) +MULT:HLarith('*',error) +N:HLnext(error) +NOER:HLnoer(error) +NOFN:HLpfun(0,error) +NTPLOT:HLntplot(error) +OPEN:HLopen(error) +OPER:HLoper(error) +P:HLplotP(error) +PACKERR:HLpake(error) +PACKFUN:HLpackfun (error) +PLOT:HLmark(error) +PRINT:HLprint(error) +PROX:HLprox(error) +PROJ1:HLproj1(error) +PROJ2:HLproj2(error) +PROY:HLproy(error) +SCALE:HLscales(error) +SMOOTH:HLsmooth(error) +SORT:HLsort(error) +SPLINE:HLspline(error) +SPLOT:HLsplot(error) +STAT:HLstat(error) +STDIFF:Hlstdiff(error) +STORE:HLstore(error) +T:HLplot(error) +TC:HLtc(error) +TITLE:HLtitle(error) +TS:HLts(error) +TSC:HLtsc(error) +NT:HLnt(error) +OPT:Hlopt(error) +PDEF:Hlpdef(error) +PS:HLdevi(error) +REBIN:HLrebin(error) +RERROR:HLrerro(error) +RESET:HLreset(error) +RESIDUAL:HLresi(error) +RENUM:HLrenum(error) +RANDOM:HLrandom(error) +SET:Hlset(error) +SUB:HLarith('-',error) +SURF:HLsurf(error) +SLIX:HLslix(error) +SLIY:HLsliy(error) +TABLE:HLtable(error) +USER:HLuser(error) +VALUE:HLvals(error) +WINDOW:HLwindow(error) +W:HLw(error) +WKTY:HLwkty +#ifdef USE_HANDYPAK +HPKA:HLhpk(0) +HPKC:HLhpk(1) +HPKX:HLhpk(2) +#endif +#ifdef USE_FITS +FITSOUT:HLfitsout(error) +#endif diff -uNr dis45-v1.36.orig/min45/dis45_min_punch.F dis45-v1.36/min45/dis45_min_punch.F --- dis45-v1.36.orig/min45/dis45_min_punch.F Mon Jun 14 14:23:26 1999 +++ dis45-v1.36/min45/dis45_min_punch.F Fri Jan 19 03:01:38 2001 @@ -33,7 +33,7 @@ Call Txtrd('Output file name',minfile) C Call LIB$get_lun (lunout) Call DIS45_GETLUN (lunout) -#ifndef linux +#if !defined(linux) && !defined(__ppc__) Open (Unit=lunout,name=minfile,type='NEW', & CarriageControl='LIST',Err=998) #else diff -uNr dis45-v1.36.orig/src/Imakefile dis45-v1.36/src/Imakefile --- dis45-v1.36.orig/src/Imakefile Mon Jun 14 13:59:51 1999 +++ dis45-v1.36/src/Imakefile Fri Jan 19 02:41:04 2001 @@ -69,7 +69,7 @@ SYS_OBJS = hpkdummy.o fdynlink_osf1.o #endif -#if defined(PowerPCArchitecture) +#if defined(PowerPCArchitecture) || defined(DarwinArchitecture) SYS_OBJS = hpkdummy.o fdynlinkdummy.o #endif diff -uNr dis45-v1.36.orig/src/hlpackfun.F dis45-v1.36/src/hlpackfun.F --- dis45-v1.36.orig/src/hlpackfun.F Mon Jun 14 14:25:59 1999 +++ dis45-v1.36/src/hlpackfun.F Fri Jan 19 02:51:23 2001 @@ -348,7 +348,7 @@ Call Txtrd('Output file name',minfile) Call DIS45_GETLUN (lunout) -#ifndef linux +#if !defined(linux) && !defined(__ppc__) Open (Unit=lunout,name=minfile,type='NEW', & CarriageControl='LIST',Err=998) #else diff -uNr dis45-v1.36.orig/src/hlplotfun.F dis45-v1.36/src/hlplotfun.F --- dis45-v1.36.orig/src/hlplotfun.F Mon Jun 14 14:26:26 1999 +++ dis45-v1.36/src/hlplotfun.F Fri Jan 19 02:50:55 2001 @@ -262,7 +262,7 @@ Call Txtrd('Output file name',minfile) Call DIS45_GETLUN (lunout) -#ifndef linux +#if !defined(linux) && !defined(__ppc__) Open (Unit=lunout,name=minfile,type='NEW', & CarriageControl='LIST',Err=998) #else diff -uNr dis45-v1.36.orig/Imakefile.def dis45-v1.36/Imakefile.def --- dis45-v1.36.orig/Imakefile.def Mon Jun 14 14:07:07 1999 +++ dis45-v1.36/Imakefile.def Wed Feb 28 09:11:15 2001 @@ -38,10 +38,19 @@ #define CliUseReadline #endif +#if defined(DarwinArchitecture) +#define CliUseReadline +#endif + /* path where the libraries for readline is placed */ #if defined(CliUseReadline) +#if defined(DarwinArchitecture) +READLINE_LIB = -L/usr/local/lib -lreadline -lncurses +READLINE_INCLUDE_PATH = /usr/local/include/realine +#else READLINE_LIB = -L/usr/lib -lreadline -lcurses -ltermcap READLINE_INCLUDE_PATH = /usr/include/realine +#endif READLINE_INCLUDE=-I$(READLINE_INCLUDE_PATH) #endif @@ -57,8 +66,12 @@ FTOOL_PATH = /asca/ftools/ftools/host #endif -#if defined(PowerPCArchitecture) +#if defined(PowerPCArchitecture) || defined(DarwinArchitecture) +#if defined(DarwinArchitecture) +FC = g77 -fPIC +#else FC = g77 +#endif CC = cc LDOPTIONS = -L$(USRLIBDIR) #if defined(MAKE_SHARED)