diff -urN miriad_orig/MIRRC.darwin miriad_patches/MIRRC.darwin --- miriad_orig/MIRRC.darwin Wed Dec 31 14:00:00 1969 +++ miriad_patches/MIRRC.darwin Mon Aug 18 01:24:56 2003 @@ -0,0 +1,88 @@ +# ------------------------------------------------------------- +# Skeleton MIRRC file ... to be put in the local MIRIAD's +# home directory. It is essential that "standard" system +# directories be in the user's search path (eg, to find +# "awk"). +# ------------------------------------------------------------- +# Environment variables to be locally specified: +# +# $MIR ....... location of MIRIAD's home directory +# $MIRHOST ... "sun3", "sun4", "sun4sol", "mips", or "convex" +# $MIRXINC ... include directory that contains the X11 and Xm +# directories. If you don't have the Motif libraries, +# then this is the directory that contains just the +# X11 directory. If these reside in different +# directories or additional directories need to be +# specified, include them in a space separated list, +# eg, "/usr/include/X11 /usr/dt/include" +# would search for X11 and Xm include directories +# first /usr/include/X11 and then +# /usr/dt/include. +# $MIRXLIB ... directory that contains the X11 libraries (set to +# null string if -X11 is not installed). Note that +# additional directories can be specified in a +# space separated list, eg, +# "/usr/X11R6/lib /usr/tmp/lib/X11" will cause the +# linker to search first /usr/X11R6/lib and then +# /usr/tmp/lib/X11 to resolve external references. +# ------------------------------------------------------------- +# The example shown below is for a sun4sol (solaris) installation. +# Modification for a convex or sun3 installation is +# straightforward. +# ------------------------------------------------------------- +if ($?MIR == 0) then + setenv MIR "$HOME/MIRIAD/miriad" +endif +setenv MIRHOST "darwin" +setenv MIRXINC "/usr/X11R6/include" +setenv MIRXLIB "/usr/X11R6/lib" +setenv AIPSTV "XASIN" +setenv MIRBIN $MIR/bin/$MIRHOST +setenv MIRCAT $MIR/cat +setenv MIRDEF . +setenv MIRDOC $MIR/doc +setenv MIRINC $MIR/src/inc +setenv MIRLIB $MIR/lib/$MIRHOST +setenv MIRNEWS $MIR/news +setenv MIRPAGER "doc" +setenv MIRPDOC $MIR/doc/prog +setenv MIRPROG $MIR/src/prog +setenv MIRSDOC $MIR/doc/subs +setenv MIRSRC $MIR/src +setenv MIRSUBS $MIR/src/subs + +if (`echo ":${PATH}:" | grep -c ":\.:"` > 0) then + set path = (`echo ":${PATH}:"|sed "s&:.:&:.:${MIRBIN}:&"|sed 's/:/ /g'`) +else + set path = ($MIRBIN $path) +endif + +alias mirfind mir.find +alias mirhelp mir.help +alias mirindex mir.index +alias mirbug mir.bug.csh bug +alias mirfeedback mir.bug.csh feedback +# ------------------------------------------------------------- +# +# If the file $MIR/MIRRC.local exists, execute it now. +# +if (-e $MIR/MIRRC.local) then + source $MIR/MIRRC.local +endif +# +# If the user's file $HOME/.mirrc exists, execute it now. +# +if (-e $HOME/.mirrc) then + source $HOME/.mirrc +endif + +# ------------------------------------------------------------- +# special additions +if ($?LD_LIBRARY_PATH) then + setenv LD_LIBRARY_PATH ${MIRLIB}:${LD_LIBRARY_PATH} +else + setenv LD_LIBRARY_PATH $MIRLIB +endif +# pgplot=1 +setenv PGPLOT_DIR $MIRLIB +setenv WIPHELP $MIR/borrow/wip/wiphelp.dat diff -urN miriad_orig/borrow/dtm/libsrc/makefile miriad_patches/borrow/dtm/libsrc/makefile --- miriad_orig/borrow/dtm/libsrc/makefile Thu Nov 11 09:15:23 1993 +++ miriad_patches/borrow/dtm/libsrc/makefile Mon Aug 18 01:34:55 2003 @@ -78,7 +78,7 @@ "ARCHIVE = ar cr" ranlib libdtm.a hp : - make internal_hp "CFLAGS = -O -I/usr/include/X11R5" \ + make internal_hp "CFLAGS = -O -I/usr/X11R6/include" \ "OBJECTS = $(OBJ) mdd.o convert.o" "ARCHIVE = ar cr" dec : make internal "CFLAGS = -DDEC" "OBJECTS = $(OBJ) mdd.o deccvt.o" \ diff -urN miriad_orig/borrow/pgplot/sys_macosx/g77_cc.conf miriad_patches/borrow/pgplot/sys_macosx/g77_cc.conf --- miriad_orig/borrow/pgplot/sys_macosx/g77_cc.conf Wed Dec 31 14:00:00 1969 +++ miriad_patches/borrow/pgplot/sys_macosx/g77_cc.conf Mon Aug 18 01:20:15 2003 @@ -0,0 +1,144 @@ +# MacOS X using g77 and cc. +#----------------------------------------------------------------------- + +# Optional: Needed by XWDRIV (/xwindow and /xserve) and +# X2DRIV (/xdisp and /figdisp). +# The arguments needed by the C compiler to locate X-window include files. + + XINCL="-I/usr/X11R6/include" + +# Optional: Needed by XMDRIV (/xmotif). +# The arguments needed by the C compiler to locate Motif, Xt and +# X-window include files. + +# MOTIF_INCL="-I//include" + +# Optional: Needed by XADRIV (/xathena). +# The arguments needed by the C compiler to locate Xaw, Xt and +# X-window include files. + +# ATHENA_INCL="$XINCL" + +# Optional: Needed by TKDRIV (/xtk). +# The arguments needed by the C compiler to locate Tcl, Tk and +# X-window include files. + +# TK_INCL="-I/include " + +# Optional: Needed by RVDRIV (/xrv). +# The arguments needed by the C compiler to locate Rivet, Tcl, Tk and +# X-window include files. + +# RV_INCL="" + +# Mandatory. +# The FORTRAN compiler to use. + + FCOMPL="g77" + +# Mandatory. +# The FORTRAN compiler flags to use when compiling the pgplot library. +# (NB. makemake prepends -c to $FFLAGC where needed) + + FFLAGC="-O" + +# Mandatory. +# The FORTRAN compiler flags to use when compiling fortran demo programs. +# This may need to include a flag to tell the compiler not to treat +# backslash characters as C-style escape sequences + + FFLAGD="-fno-backslash" + +# Mandatory. +# The C compiler to use. + + CCOMPL="cc" + +# Mandatory. +# The C compiler flags to use when compiling the pgplot library. + + CFLAGC="-DPG_PPU -O2" + +# Mandatory. +# The C compiler flags to use when compiling C demo programs. + + CFLAGD="-O2" + +# Optional: Only needed if the cpgplot library is to be compiled. +# The flags to use when running pgbind to create the C pgplot wrapper +# library. (See pgplot/cpg/pgbind.usage) + + PGBIND_FLAGS="bsd" + +# Mandatory. +# The library-specification flags to use when linking normal pgplot +# demo programs. + + LIBS="-L/usr/X11R6/lib -lX11 -lm -framework Foundation -framework AppKit" + + +# Optional: Needed by XMDRIV (/xmotif). +# The library-specification flags to use when linking motif +# demo programs. + +# MOTIF_LIBS="-lXm -lXt $LIBS" + +# Optional: Needed by XADRIV (/xathena). +# The library-specification flags to use when linking athena +# demo programs. + +# ATHENA_LIBS="-lXaw -lXt -lXmu -lXext $LIBS" + +# Optional: Needed by TKDRIV (/xtk). +# The library-specification flags to use when linking Tk demo programs. +# Note that you may need to append version numbers to -ltk and -ltcl. + +# TK_LIBS="-L/lib -ltk -ltcl $LIBS -ldl" + +# Mandatory. +# On systems that have a ranlib utility, put "ranlib" here. On other +# systems put ":" here (Colon is the Bourne-shell do-nothing command). + + RANLIB="ranlib" + +# Optional: Needed on systems that support shared libraries. +# The name to give the shared pgplot library. + + SHARED_LIB="" + +# Optional: Needed if SHARED_LIB is set. +# How to create a shared library from a trailing list of object files. + + SHARED_LD="" + +# Optional: +# On systems such as Solaris 2.x, that allow specification of the +# libraries that a shared library needs to be linked with when a +# program that uses it is run, this variable should contain the +# library-specification flags used to specify these libraries to +# $SHARED_LD + + SHARED_LIB_LIBS="" + +# Optional: +# Compiler name used on Next systems to compile objective-C files. + + MCOMPL="cc" + +# Optional: +# Compiler flags used with MCOMPL when compiling objective-C files. + + MFLAGC="-DPG_PPU -O2 -I." + +# Optional: (Actually mandatory, but already defined by makemake). +# Where to look for any system-specific versions of the files in +# pgplot/sys. Before evaluating this script, makemake sets SYSDIR to +# /wherever/pgplot/sys_$OS, where $OS is the operating-system name +# given by the second command-line argument of makemake. If the +# present configuration is one of many for this OS, and it needs +# different modifications to files in pgplot/sys than the other +# configurations, then you should create a subdirectory of SYSDIR, +# place the modified files in it and change the following line to +# $SYSDIR="$SYSDIR/subdirectory_name". + + SYSDIR="$SYSDIR" diff -urN miriad_orig/src/spec/xcorf/Makefile miriad_patches/src/spec/xcorf/Makefile --- miriad_orig/src/spec/xcorf/Makefile Wed Dec 11 07:44:21 1996 +++ miriad_patches/src/spec/xcorf/Makefile Mon Aug 18 03:54:19 2003 @@ -2,19 +2,21 @@ # 26-feb-94 jm # 22-nov-96 jm Modified for X11R5/6 +DESTDIR = $(MIRBIN) XBIN = xcorf CFLAGS = -g INC5 = -I/usr/openwin/include -I/usr/dt/include INC6 = -I/usr/include +INCOSX = -I/usr/X11R6/include -I/sw/include RFLAGS5 = -R /usr/openwin/lib:/usr/dt/lib LFLAGS5 = -L/usr/openwin/lib -L/usr/dt/lib LDFLAG5 = $(RFLAGS5) $(LFLAGS5) -RFLAGS6 = -R /usr/Local/lib/X11R6:/local/lib/X11R6 -LFLAGS6 = -L/usr/Local/lib/X11R6 -L/local/lib/X11R6 -LDFLAG6 = $(RFLAGS6) $(LFLAGS6) +RFLAGS6 = -R /usr/X11R6/lib +LFLAGS6 = -L/usr/X11R6/lib -L/sw/lib +LDFLAG6 = $(LFLAGS6) XLIBS5 = -lXm -lXmu -lXt -lXext -lX11 -lm XLIBS6 = -lXm -lXmu -lXt -lSM -lICE -lXext -lX11 -lm @@ -42,7 +44,7 @@ @echo " make sol CFLAGS='-g $$(INC6)'" .c.o: - $(CC) $(CFLAGS) -c $< + $(CC) $(CFLAGS) $(INCOSX) -c $< cleanup: rm -f *.o $(XBIN) @@ -74,6 +76,10 @@ Sol6: $(SUBS) $(CC) $(CFLAGS) -o $(XBIN) -Bstatic $(SUBS) $(LDFLAG6) $(XLIBS6) \ -Bdynamic $(SOLARISLIBS) + +darwin: $(SUBS) + $(CC) $(CFLAGS) $(INCOSX) -o $(DESTDIR)/$(XBIN) $(SUBS) \ + $(LDFLAG6) $(XLIBS6) # # Include file dependancies. diff -urN miriad_orig/src/spec/xmtv/Makefile miriad_patches/src/spec/xmtv/Makefile --- miriad_orig/src/spec/xmtv/Makefile Wed Jun 21 09:39:09 1995 +++ miriad_patches/src/spec/xmtv/Makefile Mon Aug 18 01:22:28 2003 @@ -28,14 +28,14 @@ # Unix directory /usr/include. The include directories should # be listed here, each preceded by -I. # CPU baboon: INCDIRS = -I/local/include -INCDIRS = -I/local/pkg/X11R5/include +INCDIRS = -I/usr/X11R6/include # # Library search path. Standard Unix libraries are usually # found in /usr/lib; some X Window System implementations # place their libraries in other locations. These should # be listed here, each preceded by -L. # CPU baboon: LIBDIRS = -L/local/lib -LIBDIRS = -L/local/pkg/X11R5/lib/$(HOSTTYPE) +LIBDIRS = -L/usr/X11R6/lib # # Add local compiler/linker options here. For example Sun 3s # will require a -f option to specify the floating point diff -urN miriad_orig/src/sys/bin/compile.darwin miriad_patches/src/sys/bin/compile.darwin --- miriad_orig/src/sys/bin/compile.darwin Wed Sep 4 11:09:04 2002 +++ miriad_patches/src/sys/bin/compile.darwin Mon Aug 18 01:20:15 2003 @@ -13,14 +13,14 @@ setenv Foptions "-O -fno-globals -fno-common" setenv FoptionsN "-fno-globals" setenv Flinkdir "-L`echo $mmir/lib/$mhost $MIRXLIB | sed 's/ / -L/g'`" -setenv Flinklib "-lmir -llinpack -lpgplot -lX11 -lm" +setenv Flinklib "-lmir -llinpack -lpgplot -lX11 -lm -framework Foundation -framework AppKit" setenv Finclude "-I`echo $mmir/src/inc $MIRXINC | sed 's/ / -I/g'`" # the gnu compiler actually adds -Dlinux, so we don't need it here setenv Ccompile "cc" setenv Coptions "-O -fno-common -DWORDS_BIGENDIAN -Ddarwin" setenv CoptionsN "-DWORDS_BIGENDIAN -Ddarwin" setenv Clinkdir "-L`echo $mmir/lib/$mhost $MIRXLIB | sed 's/ / -L/g'`" -setenv Clinklib "-lmir -llinpack -lpgplot -lX11 -lf2c -lm" +setenv Clinklib "-lmir -llinpack -lpgplot -lX11 -lf2c -lm -framework Foundation -framework AppKit" setenv Cinclude "-I`echo $mmir/src/inc $mhost | sed 's/ / -I/g'`" # setenv Ratty "$mmir/bin/$mhost/ratty -s f2c -b -D linux" diff -urN miriad_orig/src/sys/bin/lib.pgplot miriad_patches/src/sys/bin/lib.pgplot --- miriad_orig/src/sys/bin/lib.pgplot Sun Sep 23 05:42:12 2001 +++ miriad_patches/src/sys/bin/lib.pgplot Mon Aug 18 01:20:15 2003 @@ -47,7 +47,7 @@ set pgsys = linux breaksw case darwin: - set pgsys = darwin + set pgsys = macosx breaksw default: echo "Miriad's PGPLOT not installed on $host - exiting." @@ -96,9 +96,9 @@ exit 1 endif # Do some sed magic to turn on (select) the ps/tt/xw/gi/pp drivers... - if ($pgsys == linux) then + if ($pgsys == macosx) then sed -e '/^\! PSDRIV/s/^\!/ /' $srcdir/drivers.list | \ - sed -e '/^\! GIDRIV/s/^\!/ /' | \ + sed -e '/^\! AQDRIV/s/^\!/ /' | \ sed -e '/^\! TTDRIV/s/^\!/ /' | \ sed -e '/^\! XWDRIV/s/^\!/ /' > $driverfile else diff -urN miriad_orig/src/sys/bin/mir.mkdirs miriad_patches/src/sys/bin/mir.mkdirs --- miriad_orig/src/sys/bin/mir.mkdirs Sun Jan 26 16:08:32 2003 +++ miriad_patches/src/sys/bin/mir.mkdirs Mon Aug 18 01:37:37 2003 @@ -61,7 +61,7 @@ stub.mkdirs1 $1/manuals/$i end # -stub.mkdirs1 $1/news +#stub.mkdirs1 $1/news # stub.mkdirs1 $1/oldsrc # diff -urN miriad_orig/src/sys/bin/pgm.wip miriad_patches/src/sys/bin/pgm.wip --- miriad_orig/src/sys/bin/pgm.wip Thu Jan 23 11:58:28 2003 +++ miriad_patches/src/sys/bin/pgm.wip Mon Aug 18 01:20:15 2003 @@ -43,6 +43,9 @@ if (`echo $Coptions | grep -c "ansi"` > 0) then set copts = "$copts -ansi" endif +if (`echo $Clinklibs | grep -c "framework"` > 0) then + set linkopts = "-framework Foundation -framework AppKit" +endif if (-e $libdir/libreadline.a) set options = ( $options -readline "$libdir" ) if ($?MIRDEBUG != 0) set options = ( $options -debug ) #