diff -uNr src.orig/config/Imake.cf src/config/Imake.cf --- src.orig/config/Imake.cf Fri Sep 25 21:00:01 1998 +++ src/config/Imake.cf Tue Jan 16 16:14:59 2001 @@ -214,6 +214,13 @@ #define MacIIArchitecture #endif /* macII */ +#ifdef __APPLE__ +# define MacroIncludeFile +# define MacroFile MacOSX.cf +# define MacOSXArchitecture +# define DarwinArchitecture +#endif + #ifdef _CRAY #define MacroIncludeFile #define MacroFile cray.cf diff -uNr src.orig/config/MacOSX.cf src/config/MacOSX.cf --- src.orig/config/MacOSX.cf Thu Jan 1 09:00:00 1970 +++ src/config/MacOSX.cf Wed Jan 17 21:23:17 2001 @@ -0,0 +1,158 @@ +XCOMM platform: $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $ + +#define OSVendor Apple Computer, Inc. +#ifdef MacOSXArchitecture +#define OSName MacOSX +#define OSMajorVersion DefaultOSMajorVersion +#define OSMinorVersion DefaultOSMinorVersion +#define OSTeenyVersion 0 +#endif + +XCOMM #define ProjectRulesFile +XCOMM #define ProjectTmplFile + +#define InstKmemFlags -m 2755 -g kmem +/* #define ConstructMFLAGS NO */ + +#define HasNdbm YES +#define SetTtyGroup YES +#define HasBsearch YES +#ifdef MacOSXArchitecture +#define HasPutenv YES +#define MathLibrary /**/ +#define DBMLibrary /**/ +#define TermcapLibrary /**/ +#define HasBSD44Sockets YES +#define HAS_SNPRINTF YES +#endif + +#define NeedConstPrototypes YES +#define NeedVarargsPrototypes YES +#define NeedFunctionPrototypes YES +#define NeedWidePrototypes NO + +#define GzipFontCompression YES +#define CompressAllFonts YES + +#ifndef HasShm +# define HasShm YES +#endif +#ifndef BuildGlxExt +# define BuildGlxExt YES +# define GlxUseNSGL YES +#endif +#define BuildServer YES +#define BuildXprint NO +#define BuildFonts YES +#define BuildDPMS NO + +#define TenonServer YES +#define XprtServer NO +#define XVendorString "Tenon Intersystems Xtools" +#define XVendorRelease 1000 +#ifndef UseRgbTxt +#define UseRgbTxt YES +#endif + +#define BuildPexExt NO + +#ifndef BuildGLXLibrary +# define BuildGLXLibrary YES +#endif + +/* no direct graphics extension */ +#define BuildXF86DGA NO + +/* no extra tablets and weird input devices */ +#define BuildXInputExt NO + +/* Build Xinerama (aka panoramiX) extension */ +#define BuildXinerama YES + +/* no Display Power Management extension */ +#define BuildDPMSExt NO + +# define BuildXvExt NO +#define OptimizedCDebugFlags -O -pipe +#define ExtraLoadFlags -L/usr/X11R6/lib + +#define BuildExamples YES + +#define StandardDefines -DCERNLIB_LINUX -DCERNLIB_PPC -DCERNLIB_MACOSX \ + -Dunix=unix -D__powerpc__ -D__DARWIN__ +/* -DX_NOT_POSIX -DX_LOCALE */ + +#define HasVoidSignalReturn YES + +#ifndef DependFlags +#define DependFlags -I/usr/include/ansi -I/usr/include/bsd +#endif + +#define InstallCmd install /* unlink old */ + +/* #define ArCmd libtool -a -o */ +#define ArCmd ar -r + +#ifndef RanlibCmd +#define RanlibCmd ranlib -c -s +#endif + +/* see below for ServerDefines */ + +#define PrimaryScreenResolution 95 /* for 17 inch screen */ + +#define ServerCDebugFlags -O -g -pipe + +/* #define HasGcc YES */ + +#undef CcCmd +#undef CplusplusCmd +#ifdef MacOSXArchitecture +#define CcCmd cc -arch "ppc" -no-cpp-precomp +#define CplusplusCmd c++ -no-cpp-precomp +#endif +#ifndef CcCmd +#define CcCmd cc +#endif + +#define CppCmd /usr/bin/cpp + +#include +#include +#undef XFree86Server +/* #define GLX_DIRECT_RENDERING */ + +#define f2cFortran YES +#define FortranCmd g77 +#define XargsCmd xargs +#define FortranSaveFlags /* */ /* Everything static !? */ +#define OptimisedFortranFlags -O -funroll-loops -fomit-frame-pointer +#define DefaultFCOptions -fno-automatic \ + -fno-second-underscore \ + -fno-f90 -fugly-complex -fno-globals \ + -fugly-init -Wno-globals +#define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX \ + -DCERNLIB_PPC -DCERNLIB_QMGLIBC \ + -DCERNLIB_MACOSX + +/* #define CERNLIB_SHIFT NO */ +#define CERNLIB_LINUX +#define CERNLIB_UNIX +#define CERNLIB_LNX +#define CERNLIB_PPC +#define CERNLIB_QMGLIBC +#define CERNLIB_MACOSX + +#define X11Includes -I/usr/X11R6/include + +/* + * Create a Make Variable to allow building with/out Motif + */ +#undef MotifDependantMakeVar +#define MotifDependantMakeVar(variable,value) @@\ +ifneq ($(strip $(HAVE_MOTIF)),) @@\ + variable=value @@\ +endif @@\ +/* End CERNLIB changes */ + + diff -uNr src.orig/config/MacOSX.rules src/config/MacOSX.rules --- src.orig/config/MacOSX.rules Thu Jan 1 09:00:00 1970 +++ src/config/MacOSX.rules Mon Jan 15 21:21:01 2001 @@ -0,0 +1,117 @@ +XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $ + +/* + * MacOSX shared library rules + */ + +#define HasSharedLibraries YES + +#define ForceNormalLib NO + +#ifndef SharedDataSeparation +#define SharedDataSeparation YES +#endif +#ifndef SharedCodeDef +#define SharedCodeDef +#endif +#ifndef SharedLibraryDef +#define SharedLibraryDef -fno-common +#endif + +#define ShLibIncludeFile + +#ifndef SharedLibraryLoadFlags +#define SharedLibraryLoadFlags +#endif +#ifndef PositionIndependentCFlags +#define PositionIndependentCFlags +#endif + + + + +/* + * InstallSharedLibrary - generate rules to install the shared library. + */ +#ifndef InstallSharedLibrary +#define InstallSharedLibrary(libname,rev,dest) @@\ +install:: Concat(lib,libname.dylib) @@\ + MakeDir($(DESTDIR)dest) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.dylib) $(DESTDIR)dest +@@\ + +#endif /* InstallSharedLibrary */ + +/* + * NormalSharedLibraryTarget - generate rules to create a shared library; + * build it into a different name so that the we do not hose people by having + * the library gone for long periods. + */ +#ifndef SharedLibraryTarget +#define SharedLibraryTarget(libname,rev,solist,down,up) @@\ +AllTarget(Concat(lib,libname.dylib)) @@\ + @@\ +Concat(lib,libname.dylib): solist $(EXTRALIBRARYDEPS) @@\ + $(RM) $@~ @@\ + (cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\ + $(MV) $@~ $@ @@\ + LinkBuildLibrary($@) @@\ + @@\ +clean:: @@\ + $(RM) Concat(lib,libname.dylib) + +#endif /* SharedLibraryTarget */ + +/* + * SharedDepLibraryTarget - generate rules to create a shared library. + */ +#ifndef SharedDepLibraryTarget +#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ +AllTarget(Concat(lib,libname.dylib)) @@\ + @@\ +Concat(lib,libname.dylib): deplist $(EXTRALIBRARYDEPS) @@\ + $(RM) $@~ @@\ + (cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + LinkBuildLibrary($@) @@\ + @@\ +clean:: @@\ + $(RM) Concat(lib,libname.dylib) + +#endif /* SharedDepLibraryTarget */ + +/* + * SharedLibraryDataTarget - generate rules to create shlib data file; + */ +#ifndef SharedLibraryDataTarget +#define SharedLibraryDataTarget(libname,rev,salist) +#endif /* SharedLibraryDataTarget */ + +#ifndef InstallSharedLibraryData +#define InstallSharedLibraryData(libname,rev,dest) +#endif /* InstallSharedLibraryData */ + +/* + * SharedLibReferences - variables for shared libraries + */ +#ifndef SharedLibReferences +#define SharedLibReferences(varname,libname,libsource,revname,rev) @@\ +revname = rev @@\ +Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\ +Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ +LintLibReferences(varname,libname,libsource) +#endif + +/* + * SharedDSLibReferences - variables for shared libraries + */ +#ifndef SharedDSLibReferences +#define SharedDSLibReferences(varname,libname,libsource,revname,rev) @@\ +revname = rev @@\ +Concat3(DEP,varname,LIB) = SharedDSLibDependencies(libname,libsource,revname) @@\ +Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) Concat3(Shared,libname,Reqs) @@\ +LintLibReferences(varname,libname,libsource) +#endif + + diff -uNr src.orig/config/MacOSX.tmpl src/config/MacOSX.tmpl --- src.orig/config/MacOSX.tmpl Thu Jan 1 09:00:00 1970 +++ src/config/MacOSX.tmpl Sat Dec 16 06:37:34 2000 @@ -0,0 +1,67 @@ +XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $ + +/* + * Xnext shared library template + */ + + + +#ifndef SharedXtReqs +#define SharedXtReqs /**/ +#endif +#ifndef SharedXawReqs +#define SharedXawReqs /**/ +#endif +#ifndef SharedXmuReqs +#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) +#endif + +#define SharedLibX11 YES +#define SharedX11Rev F +SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) + +#define SharedLibXau NO /* don't need shared form */ +#define SharedLibXdmcp NO /* don't need shared form */ + +#define SharedLibXmu YES +#define SharedXmuRev F + +#define SharedOldXRev F + +#define SharedLibXext YES +#define SharedXextRev F + +#define SharedLibXt YES +#define SharedXtRev F +SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) + +#define SharedXawRev F + +#define SharedXtfRev A + +#define SharedLibXi YES +#define SharedXiRev F +SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) + +#define SharedLibXtst YES +#define SharedXtstRev F +SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) + + +#define SharedPexRev F +SharedLibReferences(PEX,PEX5,$(PEXLIBSRC),SOPEXREV,SharedPexRev) + +#define SharedLibXie YES +#define SharedXieRev F + +#define SharedLibICE YES +#define SharedICERev F +SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev) + +#define SharedLibSM YES +#define SharedSMRev F +SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev) + +#define SharedFSRev F +SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev) + diff -uNr src.orig/mathlib/gen/tests/c327m.F src/mathlib/gen/tests/c327m.F --- src.orig/mathlib/gen/tests/c327m.F Tue Apr 2 00:01:17 1996 +++ src/mathlib/gen/tests/c327m.F Fri Jan 19 01:08:02 2001 @@ -92,7 +92,11 @@ #endif ENDIF WRITE(Z,'(2D26.16)') H,T +#if defined(CERNLIB_MACOSX) + READ(Z,'(2(4X,D22.16))') H1,T1 +#else READ(Z,'(2(D22.16,4X))') H1,T1 +#endif IF(IDS .EQ. 1) THEN ERRMAX=MAX(ERRMAX,ABS(H1-T1)) LTEST= LTEST .AND. ERRMAX .LE. TSTERR diff -uNr src.orig/mathlib/gen/tests/c342m.F src/mathlib/gen/tests/c342m.F --- src.orig/mathlib/gen/tests/c342m.F Tue Apr 2 00:01:19 1996 +++ src/mathlib/gen/tests/c342m.F Fri Jan 19 01:10:29 2001 @@ -70,7 +70,11 @@ #endif END IF WRITE(Z,'(2D26.16)') R,T +#if defined(CERNLIB_MACOSX) + READ(Z,'(2(4X,D22.16))') R1,T1 +#else READ(Z,'(2(D22.16,4X))') R1,T1 +#endif ERMAX= MAX(ERMAX,ABS(R1-T1)) IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1) diff -uNr src.orig/mclibs/jetset/jetset/Imakefile src/mclibs/jetset/jetset/Imakefile --- src.orig/mclibs/jetset/jetset/Imakefile Fri Jan 19 13:30:51 2001 +++ src/mclibs/jetset/jetset/Imakefile Fri Jan 19 13:31:21 2001 @@ -11,7 +11,7 @@ FORTRANSAVEOPTION = FortranSaveFlags #if defined(CERNLIB_PPC) -FDEBUGFLAGS := $(FDEBUGFLAGS) -O0 +FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0 #endif SubdirLibraryTarget(NullParameter,NullParameter) diff -uNr src.orig/mclibs/jetset/pythia/Imakefile src/mclibs/jetset/pythia/Imakefile --- src.orig/mclibs/jetset/pythia/Imakefile Mon Apr 30 22:06:24 2001 +++ src/mclibs/jetset/pythia/Imakefile Tue Oct 23 04:40:52 2001 @@ -15,4 +15,8 @@ FDEBUGFLAGS := $(FDEBUGFLAGS) -Nn15000 #endif +#if defined(CERNLIB_PPC) +FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0 +#endif + SubdirLibraryTarget(NullParameter,NullParameter) diff -uNr src.orig/mclibs/pythia/code/Imakefile src/mclibs/pythia/code/Imakefile --- src.orig/mclibs/pythia/code/Imakefile Sat Apr 28 15:02:27 2001 +++ src/mclibs/pythia/code/Imakefile Sat Apr 28 15:01:27 2001 @@ -31,4 +31,9 @@ FDEBUGFLAGS := $(FDEBUGFLAGS) -Nn15000 #endif +#if defined(CERNLIB_PPC) +FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0 +#endif + SubdirLibraryTarget(NullParameter,NullParameter) + diff -uNr src.orig/packlib/cspack/sysreq/log.c src/packlib/cspack/sysreq/log.c --- src/packlib/cspack/sysreq/log.c~ Wed Jul 10 01:07:29 2002 +++ src/packlib/cspack/sysreq/log.c Tue Oct 1 19:45:23 2002 @@ -76,7 +76,7 @@ static int pid; /* process identifier */ static int logfd ; /* logging file descriptor */ #if !defined(SOLARIS) && !defined(linux) && !defined(_AIX) \ - && !defined(IRIX5) && !defined(apollo) + && !defined(IRIX5) && !defined(apollo) && !defined(__DARWIN__) extern int syslog(); #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */ extern char *getenv(); diff -uNr src.orig/packlib/cspack/tcpaw/tcpaw.c src/packlib/cspack/tcpaw/tcpaw.c --- src.orig/packlib/cspack/tcpaw/tcpaw.c Thu Sep 16 01:44:32 1999 +++ src/packlib/cspack/tcpaw/tcpaw.c Wed Jan 17 17:11:07 2001 @@ -2533,7 +2533,7 @@ #if !defined(IBM) && !defined(_WIN32) /* I provide "getpass" myself as standard version truncates to 8 characters */ #include -#ifdef CBREAK +#if defined(CBREAK) || defined(CERNLIB_MACOSX) #define BSDTTY /* First find out if BSD or SYSV terminal handling.. */ #endif @@ -2541,6 +2541,10 @@ #include #else #include +# if defined(CERNLIB_MACOSX) +# define gtty(x,y) ioctl(x,TIOCGETP,y) +# define stty(x,y) ioctl(x,TIOCSETP,y) +# endif #endif #ifndef __convexc__ diff -uNr src.orig/packlib/kernlib/kernbit/z268/systems.c src/packlib/kernlib/kernbit/z268/systems.c --- src.orig/packlib/kernlib/kernbit/z268/systems.c Mon Aug 31 18:26:22 1998 +++ src/packlib/kernlib/kernbit/z268/systems.c Wed Jan 17 18:18:11 2001 @@ -200,7 +200,7 @@ || defined(_IBMR2) \ || defined(__convexc__) \ || defined(_OSK) \ -|| defined(__linux) || defined(__FreeBSD__) +|| defined(__linux) || defined(__FreeBSD__) || defined(__DARWIN__) void systems_( command, buf, buflen, l, chars, rc, ovflw ) diff -uNr src.orig/packlib/kernlib/kernnum/d704fort/Imakefile src/packlib/kernlib/kernnum/d704fort/Imakefile --- src.orig/packlib/kernlib/kernnum/d704fort/Imakefile Wed Jun 12 19:03:53 1996 +++ src/packlib/kernlib/kernnum/d704fort/Imakefile Fri Jan 19 00:31:39 2001 @@ -4,6 +4,10 @@ FDEBUGFLAGS=NoOpFortranDebugFlags #endif +#if defined(CERNLIB_MACOSX) +FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0 +#endif + FORTRANSAVEOPTION=FortranSaveFlags SubdirLibraryTarget(NullParameter,NullParameter) diff -uNr src.orig/packlib/kernlib/kernnum/f002fort/Imakefile src/packlib/kernlib/kernnum/f002fort/Imakefile --- src.orig/packlib/kernlib/kernnum/f002fort/Imakefile Wed Jun 12 19:04:09 1996 +++ src/packlib/kernlib/kernnum/f002fort/Imakefile Fri Jan 19 00:32:01 2001 @@ -10,6 +10,10 @@ FDEBUGFLAGS=NoOpFortranDebugFlags #endif +#if defined(CERNLIB_MACOSX) +FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0 +#endif + FORTRANSAVEOPTION=FortranSaveFlags SubdirLibraryTarget(NullParameter,NullParameter) diff -uNr src.orig/packlib/kernlib/kernnum/f003fort/Imakefile src/packlib/kernlib/kernnum/f003fort/Imakefile --- src.orig/packlib/kernlib/kernnum/f003fort/Imakefile Wed Jun 12 19:04:12 1996 +++ src/packlib/kernlib/kernnum/f003fort/Imakefile Fri Jan 19 00:32:10 2001 @@ -11,6 +11,10 @@ FDEBUGFLAGS=NoOpFortranDebugFlags #endif +#if defined(CERNLIB_MACOSX) +FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0 +#endif + FORTRANSAVEOPTION=FortranSaveFlags SubdirLibraryTarget(NullParameter,NullParameter) diff -uNr src.orig/packlib/kernlib/kernnum/f004fort/Imakefile src/packlib/kernlib/kernnum/f004fort/Imakefile --- src.orig/packlib/kernlib/kernnum/f004fort/Imakefile Wed Jun 12 19:04:16 1996 +++ src/packlib/kernlib/kernnum/f004fort/Imakefile Fri Jan 19 00:32:20 2001 @@ -6,6 +6,10 @@ FDEBUGFLAGS=NoOpFortranDebugFlags #endif +#if defined(CERNLIB_MACOSX) +FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0 +#endif + FORTRANSAVEOPTION=FortranSaveFlags SubdirLibraryTarget(NullParameter,NullParameter) diff -uNr src.orig/packlib/kernlib/kernnum/f010fort/Imakefile src/packlib/kernlib/kernnum/f010fort/Imakefile --- src.orig/packlib/kernlib/kernnum/f010fort/Imakefile Wed Jun 12 19:04:19 1996 +++ src/packlib/kernlib/kernnum/f010fort/Imakefile Fri Jan 19 00:32:31 2001 @@ -7,6 +7,10 @@ FDEBUGFLAGS=NoOpFortranDebugFlags #endif +#if defined(CERNLIB_MACOSX) +FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0 +#endif + FORTRANSAVEOPTION=FortranSaveFlags diff -uNr src.orig/packlib/kernlib/kernnum/f011fort/Imakefile src/packlib/kernlib/kernnum/f011fort/Imakefile --- src.orig/packlib/kernlib/kernnum/f011fort/Imakefile Wed Jun 12 19:04:24 1996 +++ src/packlib/kernlib/kernnum/f011fort/Imakefile Fri Jan 19 00:32:41 2001 @@ -7,6 +7,10 @@ FDEBUGFLAGS=NoOpFortranDebugFlags #endif +#if defined(CERNLIB_MACOSX) +FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0 +#endif + FORTRANSAVEOPTION=FortranSaveFlags SubdirLibraryTarget(NullParameter,NullParameter) diff -uNr src.orig/packlib/kuip/kuip/ksys.h src/packlib/kuip/kuip/ksys.h --- src.orig/packlib/kuip/kuip/ksys.h Wed Sep 3 01:36:16 1997 +++ src/packlib/kuip/kuip/ksys.h Wed Jan 17 17:43:48 2001 @@ -188,6 +188,17 @@ #endif +#ifdef CERNLIB_MACOSX +# define MACOSX +# define MACHINE_NAME "MACOSX" +# define UNIX +# define HAVE_MEMMOVE +# define HAVE_STRCASECMP +# define HAVE_SELECT +# define MATCH_RE_COMP /* use re_comp/re_exec */ +#endif + + #ifdef MSDOS # define MACHINE_NAME "IBMPC" # define OS_NAME "MSDOS" diff -uNr src.orig/pawlib/paw/programs/Imakefile src/pawlib/paw/programs/Imakefile --- src.orig/pawlib/paw/programs/Imakefile Tue May 8 22:05:12 2001 +++ src/pawlib/paw/programs/Imakefile Mon Oct 22 21:13:10 2001 @@ -9,7 +9,7 @@ EXTRA_LDOPTIONS=-Wl,-E #endif -#if defined(CERNLIB_LINUX) +#if defined(CERNLIB_LINUX) && !defined(CERNLIB_MACOSX) EXTRA_LDOPTIONS=-Wl,-E #endif diff -uNr src.orig/scripts/cernlib src/scripts/cernlib --- src.orig/scripts/cernlib~ Mon Sep 16 16:12:24 2002 +++ src/scripts/cernlib Wed Oct 2 00:09:37 2002 @@ -116,6 +116,9 @@ [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11" [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm" ;; + Darwin) [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11" + [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11 -lSM -lICE -lXpm" + ;; NeXT) SYSGX11="/usr/lib/X11/libX11.r" ; SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;; OSF1) SYSGX11="-lX11 -ldnet_stub" ; @@ -213,6 +216,9 @@ fi if [ "$Msys" = "Linux" ] ; then CERNLIB="$CERNLIB -lnsl -lcrypt -ldl" + fi + if [ "$Msys" = "Darwin" ] ; then + CERNLIB="$CERNLIB -L/usr/local/lib/system -lcompat -ldl" fi fi diff -uNr src.ORIG/config/MacOSX.cf src/config/MacOSX.cf --- src/config/MacOSX.cf.orig Fri Jan 9 02:13:27 2004 +++ src/config/MacOSX.cf Fri Jan 9 02:17:31 2004 @@ -104,6 +104,9 @@ #define ServerCDebugFlags -O -g -pipe /* #define HasGcc YES */ +#ifndef HasGcc +#define HasGcc YES +#endif #undef CcCmd #undef CplusplusCmd diff -uNr src.ORIG/pawlib/comis/code/cscrexec.F src/pawlib/comis/code/cscrexec.F --- src.ORIG/pawlib/comis/code/cscrexec.F Mon Sep 25 23:16:36 2000 +++ src/pawlib/comis/code/cscrexec.F Sun Aug 17 16:07:28 2003 @@ -175,8 +175,13 @@ + // NAME(:LN) //'.sl '// NAME(:LN) //'.o' ENDIF #endif -#if defined(CERNLIB_LINUX) +#if defined(CERNLIB_LINUX) && !defined(CERNLIB_MACOSX) CHLINE= 'ld -shared -o ' + + // NAME(:LN) //'.sl '// NAME(:LN) //'.o' +#endif +#if defined(CERNLIB_MACOSX) + CHLINE= 'g77 -bundle -bundle_loader `/usr/bin/which pawX11` ' + + // ' -bind_at_load -o ' + // NAME(:LN) //'.sl '// NAME(:LN) //'.o' #endif #if defined(CERNLIB_ALPHA_OSF) diff -uNr src.ORIG/mclibs/lepto63/test/demo.F src/mclibs/lepto63/test/demo.F --- src.ORIG/mclibs/lepto63/test/demo.F Mon Dec 2 20:05:18 2002 +++ src/mclibs/lepto63/test/demo.F Wed Jan 14 22:20:23 2004 @@ -42,7 +42,7 @@ DATA PE/20*820.0/ DATA LE/20*-27.5/ C - EXTERNAL LUDATA,PYDATA + EXTERNAL LUDATA,PYDATA,LEPTOD C...Set cuts LST(3)=0 CUT(7)=100. diff -uNr src.ORIG/mclibs/lepto63/test/demo2.F src/mclibs/lepto63/test/demo2.F --- src.ORIG/mclibs/lepto63/test/demo2.F Mon Dec 2 20:05:19 2002 +++ src/mclibs/lepto63/test/demo2.F Wed Jan 14 22:20:36 2004 @@ -7,7 +7,7 @@ COMMON/LUJETS/N,K(4000,5),P(4000,5),V(4000,5) DATA NPRINT/10/,NEVENT/100/ C - EXTERNAL LUDATA,PYDATA + EXTERNAL LUDATA,PYDATA,LEPTOD C...Settings CUT(5)=10. CUT(7)=25.