Update of /cvsroot/fink/dists/10.2-gcc3.3/stable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32264
Modified Files:
cernlib.info cernlib.patch
Log Message:
Sync with unstable
Index: cernlib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.2-gcc3.3/stable/main/finkinfo/sci/cernlib.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cernlib.info 31 Dec 2003 16:37:43 -0000 1.3
+++ cernlib.info 28 Feb 2004 15:48:09 -0000 1.4
@@ -1,65 +1,101 @@
Package: cernlib
-Version: 2002
-Revision: 12
+Version: 2003
+Revision: 2
GCC: 3.3
-Description: Paw and other executables of CERNLIB
-Depends: x11
-BuildDepends: g77 (>= 3.4-20030827), atlas, dlcompat-dev, x11-dev
+Description: Paw and other basic executables
+Depends: <<
+ x11,
+ dlcompat-shlibs
+<<
+BuildDepends: <<
+ g77 (>= 3.4-20030827),
+ atlas,
+ dlcompat-dev,
+ x11-dev,
+ openmotif3 | lesstif
+<<
CustomMirror: <<
Primary: http://wwwinfo.cern.ch/asd/cernlib/download/
<<
Source: mirror:custom:%v_source/tar/src_Imakefile.tar.gz
+SourceRename: cernlib-%v_Imakefile.tar.gz
Source2: mirror:custom:%v_source/tar/src_config.tar.gz
+Source2Rename: cernlib-%v_config.tar.gz
Source3: mirror:custom:%v_source/tar/src_include.tar.gz
+Source3Rename: cernlib-%v_include.tar.gz
Source4: mirror:custom:%v_source/tar/src_cfortran.tar.gz
+Source4Rename: cernlib-%v_cfortran.tar.gz
Source5: mirror:custom:%v_source/tar/src_scripts.tar.gz
+Source5Rename: cernlib-%v_scripts.tar.gz
Source6: mirror:custom:%v_source/tar/src_packlib.tar.gz
+Source6Rename: cernlib-%v_packlib.tar.gz
Source7: mirror:custom:%v_source/tar/src_pawlib.tar.gz
+Source7Rename: cernlib-%v_pawlib.tar.gz
Source8: mirror:custom:%v_source/tar/src_phtools.tar.gz
+Source8Rename: cernlib-%v_phtools.tar.gz
Source9: mirror:custom:%v_source/tar/src_mclibs.tar.gz
+Source9Rename: cernlib-%v_mclibs.tar.gz
Source10: mirror:custom:%v_source/tar/src_mathlib.tar.gz
+Source10Rename: cernlib-%v_mathlib.tar.gz
Source11: mirror:custom:%v_source/tar/src_graflib.tar.gz
+Source11Rename: cernlib-%v_graflib.tar.gz
Source12: mirror:custom:%v_source/tar/src_geant321.tar.gz
-Source-MD5: 086556e4310073261a2393863d81a684
-Source2-MD5: 7ac4211c3ac97740c3fc24de20fdd37a
-Source3-MD5: 2af7abe09c5674293b51a7b6620ad111
-Source4-MD5: 6d2789093ba2ee4c9974e2531c0630bc
-Source5-MD5: 6bf5f840d1485548d971b9fc1a8ee22d
-Source6-MD5: 62729ba20aa31860cb0aed0a5e89096a
-Source7-MD5: b4e8f92df8229d58dddefb3f6cd4df12
-Source8-MD5: 9daf25a54e6dfe1fbf002361cb4a03e6
-Source9-MD5: b896422240e7561ef170b53f725a847b
-Source10-MD5: 75671fb9fbe2ac501196a1cd6d484b63
-Source11-MD5: a4a6bb638248986ca97b08f39b251eca
-Source12-MD5: 685870b95aa2b6c6130eff2cff6bd1e4
+Source12Rename: cernlib-%v_geant321.tar.gz
+Source-MD5: d70e68ba8b12e98a3d3e64a1740e4ca1
+Source2-MD5: c2ce47d2d3b6dc3fcda459775fbdb5d0
+Source3-MD5: 814a4cb8596029d7fb84bb9e6f951648
+Source4-MD5: 3776a06ab59e71ecfce5b167fee6fa84
+Source5-MD5: 5de0a1466da374a6112470173a233418
+Source6-MD5: 0bcfcf874b0ed675d8e0054235c08647
+Source7-MD5: 9077b01351fbfb7ba1a11da573c7118a
+Source8-MD5: 93be3daecc67eda1cc57ce1fa45392cf
+Source9-MD5: 703f697a25ce062cc6942aaa7d8b5faf
+Source10-MD5: aa878415e16c7728ffba5087df5a709e
+Source11-MD5: 5b9b23b90161c7ef9abb988bbc10734b
+Source12-MD5: e5b9acafa125f224809d935054d111ac
SourceDirectory: %v/src
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
CompileScript: <<
-mkdir lib
-mkdir bin
-echo export CERN=%b/cernlib > compile
-echo export CERN_LEVEL=%v >> compile
-echo 'export CERN_ROOT=${CERN}/${CERN_LEVEL}' >> compile
-echo 'export PATH=${CERN_ROOT}/bin:${PATH}' >> compile
-echo export CVSCOSRC=%b >> compile
-echo '${CVSCOSRC}/config/imake_boot' >> compile
-echo make bin/kuipc >> compile
-echo make scripts/Makefile >> compile
-echo '(cd scripts; make install.bin)' >> compile
-echo make >> compile
-echo '(cd packlib; make install.bin)' >> compile
-echo '(cd graflib; make install.bin)' >> compile
-echo '(cd pawlib; make install.bin)' >> compile
-echo 'make install.include CERN_INCLUDEDIR=${CERN_ROOT}/include' >> compile
-chmod 755 compile
-./compile
+ #!/bin/sh
+ set -e
+ mkdir lib
+ mkdir bin
+ export CERN=%b/cernlib
+ export CERN_LEVEL=%v
+ export CERN_ROOT=${CERN}/${CERN_LEVEL}
+ export PATH=${CERN_ROOT}/bin:${PATH}
+ export CVSCOSRC=%b
+ export HAVE_MOTIF=yes
+ ${CVSCOSRC}/config/imake_boot
+ make bin/kuipc
+ make scripts/Makefile
+ (cd scripts; make install.bin)
+ make
+ (cd packlib; make install.bin)
+ (cd graflib; make install.bin)
+ (cd pawlib; make install.bin)
+ make install.include CERN_INCLUDEDIR=${CERN_ROOT}/include
<<
InstallScript: <<
install -d %i/bin
install -m 755 cernlib/%v/bin/* %i/bin
<<
SplitOff: <<
- Description: Basic libraries and include files for CERNLIB
+ Description: Paw++: Motif enhanced paw
+ Package: %N-paw++
+ Depends: <<
+ x11,
+ dlcompat-shlibs,
+ openmotif3-shlibs | lesstif-shlibs,
+ %N (=%v-%r)
+ <<
+ Files: <<
+ bin/paw++
+ bin/kxterm
+ <<
+<<
+SplitOff2: <<
+ Description: Basic libraries and include files
Package: %N-dev
Depends: %N (=%v-%r)
InstallScript: <<
@@ -103,8 +139,8 @@
cp -r cernlib/%v/include/zebra %i/include
<<
<<
-SplitOff2: <<
- Description: GEANT 3.2.1 files from CERNLIB
+SplitOff3: <<
+ Description: GEANT 3.2.1
Package: %N-geant321
Depends: %N-dev (=%v-%r)
InstallScript: <<
@@ -121,8 +157,8 @@
<<
Files: bin/gxint
<<
-SplitOff3: <<
- Description: Monte-carlo libraries and files from CERNLIB
+SplitOff4: <<
+ Description: Monte-carlo libraries and files
Package: %N-mclibs
Depends: %N-dev (=%v-%r)
InstallScript: <<
@@ -170,9 +206,9 @@
<<
<<
RuntimeVars: <<
-CERN: %p
-CERN_LEVEL: '.'
-CERN_ROOT: %p
+ CERN: %p
+ CERN_LEVEL: '.'
+ CERN_ROOT: %p
<<
License: GPL
DescDetail: <<
Index: cernlib.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.2-gcc3.3/stable/main/finkinfo/sci/cernlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cernlib.patch 22 Dec 2003 05:55:30 -0000 1.2
+++ cernlib.patch 28 Feb 2004 15:48:09 -0000 1.3
@@ -1,7 +1,7 @@
-diff -Naur cernlib.orig/Imakefile cernlib.new/Imakefile
---- cernlib.orig/Imakefile Mon Dec 16 07:08:41 1996
-+++ cernlib.new/Imakefile Fri Aug 29 18:11:00 2003
-@@ -7,7 +7,11 @@
+diff -Naur cernlib2003.orig/Imakefile cernlib2003.new/Imakefile
+--- cernlib2003.orig/Imakefile 1996-12-16 07:08:41.000000000 -0800
++++ cernlib2003.new/Imakefile 2003-12-29 11:21:25.000000000 -0800
+@@ -7,8 +7,12 @@
SUBDIRS= $(LIBDIRS) patchy cfortran
#ifdef CERNLIB_UNIX
@@ -9,13 +9,14 @@
+SUBDIRS:= $(SUBDIRS) scripts
+#else
SUBDIRS:= $(SUBDIRS) scripts mgr
-+#endif
#endif
++#endif
InstallLibSubdirs($(LIBDIRS))
-diff -Naur cernlib.orig/config/Imake.cf cernlib.new/config/Imake.cf
---- cernlib.orig/config/Imake.cf Fri Sep 25 02:23:38 1998
-+++ cernlib.new/config/Imake.cf Fri Aug 29 18:11:00 2003
+
+diff -Naur cernlib2003.orig/config/Imake.cf cernlib2003.new/config/Imake.cf
+--- cernlib2003.orig/config/Imake.cf 1998-09-25 02:23:38.000000000 -0700
++++ cernlib2003.new/config/Imake.cf 2003-12-29 11:21:25.000000000 -0800
@@ -214,6 +214,13 @@
#define MacIIArchitecture
#endif /* macII */
@@ -30,9 +31,9 @@
#ifdef _CRAY
#define MacroIncludeFile <cray.cf>
#define MacroFile cray.cf
-diff -Naur cernlib.orig/config/Imake.rules cernlib.new/config/Imake.rules
---- cernlib.orig/config/Imake.rules Wed Apr 19 08:00:31 2000
-+++ cernlib.new/config/Imake.rules Fri Aug 29 18:11:00 2003
+diff -Naur cernlib2003.orig/config/Imake.rules cernlib2003.new/config/Imake.rules
+--- cernlib2003.orig/config/Imake.rules 2000-04-19 03:51:00.000000000 -0700
++++ cernlib2003.new/config/Imake.rules 2003-12-29 11:21:25.000000000 -0800
@@ -2167,7 +2167,7 @@
#define CppScriptTarget(dst,src,defs,deplist) @@\
dst:: src deplist @@\
@@ -51,10 +52,10 @@
@@\
clean:: @@\
RemoveFiles(dst)
-diff -Naur cernlib.orig/config/MacOSX.cf cernlib.new/config/MacOSX.cf
---- cernlib.orig/config/MacOSX.cf Wed Dec 31 16:00:00 1969
-+++ cernlib.new/config/MacOSX.cf Fri Aug 29 18:11:00 2003
-@@ -0,0 +1,162 @@
+diff -Naur cernlib2003.orig/config/MacOSX.cf cernlib2003.new/config/MacOSX.cf
+--- cernlib2003.orig/config/MacOSX.cf 1969-12-31 16:00:00.000000000 -0800
++++ cernlib2003.new/config/MacOSX.cf 2003-12-29 11:21:25.000000000 -0800
+@@ -0,0 +1,160 @@
+XCOMM platform: $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
+
+#define OSVendor Apple Computer, Inc.
@@ -131,7 +132,7 @@
+
+# define BuildXvExt NO
+#define OptimizedCDebugFlags -O -fPIC -pipe
-+#define ExtraLoadFlags -L/usr/X11R6/lib [EMAIL PROTECTED]@/lib -L/usr/lib -lc
++#define ExtraLoadFlags -L/usr/X11R6/lib [EMAIL PROTECTED]@/lib
+
+#define BuildExamples YES
+
@@ -160,9 +161,7 @@
+
+#define PrimaryScreenResolution 95 /* for 17 inch screen */
+
-+#define ServerCDebugFlags -O -fPIC -g -pipe
-+
-+#define HasGcc YES
++#define ServerCDebugFlags -O -g -pipe
+
+#undef CcCmd
+#undef CplusplusCmd
@@ -186,7 +185,7 @@
+#define FortranCmd g77
+#define XargsCmd xargs
+#define FortranSaveFlags /* */ /* Everything static !? */
-+#define OptimisedFortranFlags -O -fPIC -funroll-loops -fomit-frame-pointer
++#define OptimisedFortranFlags -O -funroll-loops -fomit-frame-pointer
+#define DefaultFCOptions -fno-automatic \
+ -fno-second-underscore \
+ -fno-f90 -fugly-complex -fno-globals \
@@ -217,9 +216,9 @@
+/* End CERNLIB changes */
+
+
-diff -Naur cernlib.orig/config/MacOSX.rules cernlib.new/config/MacOSX.rules
---- cernlib.orig/config/MacOSX.rules Wed Dec 31 16:00:00 1969
-+++ cernlib.new/config/MacOSX.rules Fri Aug 29 18:11:00 2003
+diff -Naur cernlib2003.orig/config/MacOSX.rules cernlib2003.new/config/MacOSX.rules
+--- cernlib2003.orig/config/MacOSX.rules 1969-12-31 16:00:00.000000000 -0800
++++ cernlib2003.new/config/MacOSX.rules 2003-12-29 11:21:25.000000000 -0800
@@ -0,0 +1,117 @@
+XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
+
@@ -338,9 +337,9 @@
+#endif
+
+
-diff -Naur cernlib.orig/config/MacOSX.tmpl cernlib.new/config/MacOSX.tmpl
---- cernlib.orig/config/MacOSX.tmpl Wed Dec 31 16:00:00 1969
-+++ cernlib.new/config/MacOSX.tmpl Fri Aug 29 18:11:00 2003
+diff -Naur cernlib2003.orig/config/MacOSX.tmpl cernlib2003.new/config/MacOSX.tmpl
+--- cernlib2003.orig/config/MacOSX.tmpl 1969-12-31 16:00:00.000000000 -0800
++++ cernlib2003.new/config/MacOSX.tmpl 2003-12-29 11:21:25.000000000 -0800
@@ -0,0 +1,67 @@
+XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
+
@@ -409,9 +408,9 @@
+#define SharedFSRev F
+SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
+
-diff -Naur cernlib.orig/config/site.def cernlib.new/config/site.def
---- cernlib.orig/config/site.def Fri Apr 26 08:47:40 2002
-+++ cernlib.new/config/site.def Fri Aug 29 18:11:02 2003
+diff -Naur cernlib2003.orig/config/site.def cernlib2003.new/config/site.def
+--- cernlib2003.orig/config/site.def 2002-04-26 07:46:04.000000000 -0700
++++ cernlib2003.new/config/site.def 2003-12-29 11:21:25.000000000 -0800
@@ -99,9 +99,7 @@
/* if it is already defined and false, undef it! */
/* do not use shift by default
@@ -436,9 +435,9 @@
#define ConstructMFLAGS YES
#ifndef WIN32
-diff -Naur cernlib.orig/geant321/Imakefile cernlib.new/geant321/Imakefile
---- cernlib.orig/geant321/Imakefile Thu Mar 5 03:20:07 1998
-+++ cernlib.new/geant321/Imakefile Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/geant321/Imakefile cernlib2003.new/geant321/Imakefile
+--- cernlib2003.orig/geant321/Imakefile 1998-03-05 03:20:07.000000000 -0800
++++ cernlib2003.new/geant321/Imakefile 2003-12-29 11:21:25.000000000 -0800
@@ -37,7 +37,11 @@
install.lib:: $(CERN_LIBDIR)/xsneut95.dat
@@ -451,9 +450,9 @@
#endif
#if defined(CERNLIB_VAXVMS)
-diff -Naur cernlib.orig/geant321/gxint/Imakefile cernlib.new/geant321/gxint/Imakefile
---- cernlib.orig/geant321/gxint/Imakefile Wed Jan 29 08:37:40 1997
-+++ cernlib.new/geant321/gxint/Imakefile Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/geant321/gxint/Imakefile
cernlib2003.new/geant321/gxint/Imakefile
+--- cernlib2003.orig/geant321/gxint/Imakefile 1997-01-29 08:37:40.000000000 -0800
++++ cernlib2003.new/geant321/gxint/Imakefile 2003-12-29 11:21:25.000000000 -0800
@@ -30,7 +30,7 @@
gxint321.f: gxint.F
@@ -463,9 +462,9 @@
install.lib:: $(CERN_LIBDIR)/gxint.f
-diff -Naur cernlib.orig/mathlib/gen/tests/c327m.F
cernlib.new/mathlib/gen/tests/c327m.F
---- cernlib.orig/mathlib/gen/tests/c327m.F Mon Apr 1 07:01:17 1996
-+++ cernlib.new/mathlib/gen/tests/c327m.F Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/mathlib/gen/tests/c327m.F
cernlib2003.new/mathlib/gen/tests/c327m.F
+--- cernlib2003.orig/mathlib/gen/tests/c327m.F 1996-04-01 07:01:17.000000000 -0800
++++ cernlib2003.new/mathlib/gen/tests/c327m.F 2003-12-29 11:21:25.000000000 -0800
@@ -92,7 +92,11 @@
#endif
ENDIF
@@ -478,9 +477,9 @@
IF(IDS .EQ. 1) THEN
ERRMAX=MAX(ERRMAX,ABS(H1-T1))
LTEST= LTEST .AND. ERRMAX .LE. TSTERR
-diff -Naur cernlib.orig/mathlib/gen/tests/c342m.F
cernlib.new/mathlib/gen/tests/c342m.F
---- cernlib.orig/mathlib/gen/tests/c342m.F Mon Apr 1 07:01:19 1996
-+++ cernlib.new/mathlib/gen/tests/c342m.F Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/mathlib/gen/tests/c342m.F
cernlib2003.new/mathlib/gen/tests/c342m.F
+--- cernlib2003.orig/mathlib/gen/tests/c342m.F 1996-04-01 07:01:19.000000000 -0800
++++ cernlib2003.new/mathlib/gen/tests/c342m.F 2003-12-29 11:21:25.000000000 -0800
@@ -70,7 +70,11 @@
#endif
END IF
@@ -493,9 +492,9 @@
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 -Naur cernlib.orig/mclibs/cojets/data/Imakefile
cernlib.new/mclibs/cojets/data/Imakefile
---- cernlib.orig/mclibs/cojets/data/Imakefile Wed Mar 27 01:31:06 1996
-+++ cernlib.new/mclibs/cojets/data/Imakefile Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/mclibs/cojets/data/Imakefile
cernlib2003.new/mclibs/cojets/data/Imakefile
+--- cernlib2003.orig/mclibs/cojets/data/Imakefile 1996-03-27 01:31:06.000000000
-0800
++++ cernlib2003.new/mclibs/cojets/data/Imakefile 2003-12-29 11:21:25.000000000
-0800
@@ -1,11 +1,11 @@
.SUFFIXES:
@@ -510,9 +509,9 @@
PackageDirFileTarget(cojets.dat)
-diff -Naur cernlib.orig/mclibs/isajet/data/Imakefile
cernlib.new/mclibs/isajet/data/Imakefile
---- cernlib.orig/mclibs/isajet/data/Imakefile Wed Mar 27 01:33:19 1996
-+++ cernlib.new/mclibs/isajet/data/Imakefile Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/mclibs/isajet/data/Imakefile
cernlib2003.new/mclibs/isajet/data/Imakefile
+--- cernlib2003.orig/mclibs/isajet/data/Imakefile 1996-03-27 01:33:19.000000000
-0800
++++ cernlib2003.new/mclibs/isajet/data/Imakefile 2003-12-29 11:21:25.000000000
-0800
@@ -1,9 +1,9 @@
.SUFFIXES:
@@ -525,46 +524,34 @@
PackageDirFileTarget(isajet.dat)
-diff -Naur cernlib.orig/mclibs/jetset/jetset/Imakefile
cernlib.new/mclibs/jetset/jetset/Imakefile
---- cernlib.orig/mclibs/jetset/jetset/Imakefile Fri Sep 25 08:55:08 1998
-+++ cernlib.new/mclibs/jetset/jetset/Imakefile Fri Aug 29 18:11:01 2003
-@@ -11,7 +11,7 @@
- FORTRANSAVEOPTION = FortranSaveFlags
-
- #if defined(CERNLIB_PPC)
--FDEBUGFLAGS := $(FDEBUGFLAGS) -O0
-+FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0
- #endif
-
- SubdirLibraryTarget(NullParameter,NullParameter)
-diff -Naur cernlib.orig/mclibs/jetset/pythia/Imakefile
cernlib.new/mclibs/jetset/pythia/Imakefile
---- cernlib.orig/mclibs/jetset/pythia/Imakefile Mon Apr 30 06:06:24 2001
-+++ cernlib.new/mclibs/jetset/pythia/Imakefile Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/mclibs/jetset/pythia/Imakefile
cernlib2003.new/mclibs/jetset/pythia/Imakefile
+--- cernlib2003.orig/mclibs/jetset/pythia/Imakefile 2001-04-04 07:54:39.000000000
-0700
++++ cernlib2003.new/mclibs/jetset/pythia/Imakefile 2003-12-29 11:21:25.000000000
-0800
@@ -15,4 +15,8 @@
FDEBUGFLAGS := $(FDEBUGFLAGS) -Nn15000
#endif
+#if defined(CERNLIB_PPC)
-+FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0
++FDEBUGFLAGS := -O0 $(FDEBUGFLAGS)
+#endif
+
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -Naur cernlib.orig/mclibs/pythia/code/Imakefile
cernlib.new/mclibs/pythia/code/Imakefile
---- cernlib.orig/mclibs/pythia/code/Imakefile Fri Apr 12 01:32:45 2002
-+++ cernlib.new/mclibs/pythia/code/Imakefile Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/mclibs/pythia/code/Imakefile
cernlib2003.new/mclibs/pythia/code/Imakefile
+--- cernlib2003.orig/mclibs/pythia/code/Imakefile 2002-04-10 09:03:21.000000000
-0700
++++ cernlib2003.new/mclibs/pythia/code/Imakefile 2003-12-29 11:21:25.000000000
-0800
@@ -36,4 +36,9 @@
FDEBUGFLAGS := $(FDEBUGFLAGS) -Nn15000
#endif
+#if defined(CERNLIB_PPC)
-+FDEBUGFLAGS := -O0 $(FDEBUGFLAGS) -O0
++FDEBUGFLAGS := -O0 $(FDEBUGFLAGS)
+#endif
+
SubdirLibraryTarget(NullParameter,NullParameter)
+
-diff -Naur cernlib.orig/packlib/Imakefile cernlib.new/packlib/Imakefile
---- cernlib.orig/packlib/Imakefile Thu Oct 2 07:09:19 1997
-+++ cernlib.new/packlib/Imakefile Fri Aug 29 18:11:02 2003
+diff -Naur cernlib2003.orig/packlib/Imakefile cernlib2003.new/packlib/Imakefile
+--- cernlib2003.orig/packlib/Imakefile 1997-10-02 07:09:19.000000000 -0700
++++ cernlib2003.new/packlib/Imakefile 2003-12-29 11:21:25.000000000 -0800
@@ -6,11 +6,11 @@
LIBDIRS= cspack epio fatmen ffread hbook hepdb kapack kuip \ @@\
minuit zbook zebra kernlib
@@ -579,9 +566,24 @@
InstallLibrary(packlib,$(CERN_LIBDIR))
InstallLibraryAlias(packlib,packlib-shift,$(CERN_LIBDIR))
-diff -Naur cernlib.orig/packlib/cspack/tcpaw/tcpaw.c
cernlib.new/packlib/cspack/tcpaw/tcpaw.c
---- cernlib.orig/packlib/cspack/tcpaw/tcpaw.c Wed Sep 15 09:19:46 1999
-+++ cernlib.new/packlib/cspack/tcpaw/tcpaw.c Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/packlib/cspack/sysreq/log.c
cernlib2003.new/packlib/cspack/sysreq/log.c
+--- cernlib2003.orig/packlib/cspack/sysreq/log.c 2003-09-02 09:51:53.000000000
-0700
++++ cernlib2003.new/packlib/cspack/sysreq/log.c 2003-12-29 11:21:25.000000000
-0800
+@@ -80,9 +80,9 @@
+ 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 */
++#endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX && __DARWIN__ */
+ extern char *getenv();
+ #else /* VM */
+ static char *console="CONSOLE";/* VM default console userid */
+diff -Naur cernlib2003.orig/packlib/cspack/tcpaw/tcpaw.c
cernlib2003.new/packlib/cspack/tcpaw/tcpaw.c
+--- cernlib2003.orig/packlib/cspack/tcpaw/tcpaw.c 1999-09-15 09:19:46.000000000
-0700
++++ cernlib2003.new/packlib/cspack/tcpaw/tcpaw.c 2003-12-29 11:21:25.000000000
-0800
@@ -2533,7 +2533,7 @@
#if !defined(IBM) && !defined(_WIN32)
/* I provide "getpass" myself as standard version truncates to 8 characters */
@@ -602,16 +604,16 @@
#endif
#ifndef __convexc__
-diff -Naur cernlib.orig/packlib/cuserid/Imakefile
cernlib.new/packlib/cuserid/Imakefile
---- cernlib.orig/packlib/cuserid/Imakefile Wed Dec 31 16:00:00 1969
-+++ cernlib.new/packlib/cuserid/Imakefile Fri Aug 29 18:11:02 2003
+diff -Naur cernlib2003.orig/packlib/cuserid/Imakefile
cernlib2003.new/packlib/cuserid/Imakefile
+--- cernlib2003.orig/packlib/cuserid/Imakefile 1969-12-31 16:00:00.000000000 -0800
++++ cernlib2003.new/packlib/cuserid/Imakefile 2003-12-29 11:21:25.000000000 -0800
@@ -0,0 +1,3 @@
+SRCS_C= cuserid.c
+
+SubdirLibraryTarget(NullParameter,NullParameter)
-diff -Naur cernlib.orig/packlib/cuserid/cuserid.c
cernlib.new/packlib/cuserid/cuserid.c
---- cernlib.orig/packlib/cuserid/cuserid.c Wed Dec 31 16:00:00 1969
-+++ cernlib.new/packlib/cuserid/cuserid.c Fri Aug 29 18:11:02 2003
+diff -Naur cernlib2003.orig/packlib/cuserid/cuserid.c
cernlib2003.new/packlib/cuserid/cuserid.c
+--- cernlib2003.orig/packlib/cuserid/cuserid.c 1969-12-31 16:00:00.000000000 -0800
++++ cernlib2003.new/packlib/cuserid/cuserid.c 2003-12-29 11:21:25.000000000 -0800
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
@@ -692,9 +694,9 @@
+ }
+ return (pwd->pw_name);
+}
-diff -Naur cernlib.orig/packlib/kernlib/kernbit/z268/systems.c
cernlib.new/packlib/kernlib/kernbit/z268/systems.c
---- cernlib.orig/packlib/kernlib/kernbit/z268/systems.c Tue Aug 25 05:45:56
1998
-+++ cernlib.new/packlib/kernlib/kernbit/z268/systems.c Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/packlib/kernlib/kernbit/z268/systems.c
cernlib2003.new/packlib/kernlib/kernbit/z268/systems.c
+--- cernlib2003.orig/packlib/kernlib/kernbit/z268/systems.c 1998-08-25
05:45:56.000000000 -0700
++++ cernlib2003.new/packlib/kernlib/kernbit/z268/systems.c 2003-12-29
11:21:25.000000000 -0800
@@ -200,7 +200,7 @@
|| defined(_IBMR2) \
|| defined(__convexc__) \
@@ -704,93 +706,93 @@
void systems_( command, buf, buflen, l, chars, rc, ovflw )
-diff -Naur cernlib.orig/packlib/kernlib/kernnum/d704fort/Imakefile
cernlib.new/packlib/kernlib/kernnum/d704fort/Imakefile
---- cernlib.orig/packlib/kernlib/kernnum/d704fort/Imakefile Wed Jun 12 03:03:53
1996
-+++ cernlib.new/packlib/kernlib/kernnum/d704fort/Imakefile Fri Aug 29 18:11:01
2003
+diff -Naur cernlib2003.orig/packlib/kernlib/kernnum/d704fort/Imakefile
cernlib2003.new/packlib/kernlib/kernnum/d704fort/Imakefile
+--- cernlib2003.orig/packlib/kernlib/kernnum/d704fort/Imakefile 1996-06-12
03:03:53.000000000 -0700
++++ cernlib2003.new/packlib/kernlib/kernnum/d704fort/Imakefile 2003-12-29
11:21:25.000000000 -0800
@@ -4,6 +4,10 @@
FDEBUGFLAGS=NoOpFortranDebugFlags
#endif
+#if defined(CERNLIB_MACOSX)
-+FDEBUGFLAGS=-O0 -fPIC
++FDEBUGFLAGS := -O0 $(FDEBUGFLAGS)
+#endif
+
FORTRANSAVEOPTION=FortranSaveFlags
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -Naur cernlib.orig/packlib/kernlib/kernnum/f002fort/Imakefile
cernlib.new/packlib/kernlib/kernnum/f002fort/Imakefile
---- cernlib.orig/packlib/kernlib/kernnum/f002fort/Imakefile Wed Jun 12 03:04:09
1996
-+++ cernlib.new/packlib/kernlib/kernnum/f002fort/Imakefile Fri Aug 29 18:11:01
2003
+diff -Naur cernlib2003.orig/packlib/kernlib/kernnum/f002fort/Imakefile
cernlib2003.new/packlib/kernlib/kernnum/f002fort/Imakefile
+--- cernlib2003.orig/packlib/kernlib/kernnum/f002fort/Imakefile 1996-06-12
03:04:09.000000000 -0700
++++ cernlib2003.new/packlib/kernlib/kernnum/f002fort/Imakefile 2003-12-29
11:21:25.000000000 -0800
@@ -10,6 +10,10 @@
FDEBUGFLAGS=NoOpFortranDebugFlags
#endif
+#if defined(CERNLIB_MACOSX)
-+FDEBUGFLAGS=-O0 -fPIC
++FDEBUGFLAGS := -O0 $(FDEBUGFLAGS)
+#endif
+
FORTRANSAVEOPTION=FortranSaveFlags
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -Naur cernlib.orig/packlib/kernlib/kernnum/f003fort/Imakefile
cernlib.new/packlib/kernlib/kernnum/f003fort/Imakefile
---- cernlib.orig/packlib/kernlib/kernnum/f003fort/Imakefile Wed Jun 12 03:04:12
1996
-+++ cernlib.new/packlib/kernlib/kernnum/f003fort/Imakefile Fri Aug 29 18:11:01
2003
+diff -Naur cernlib2003.orig/packlib/kernlib/kernnum/f003fort/Imakefile
cernlib2003.new/packlib/kernlib/kernnum/f003fort/Imakefile
+--- cernlib2003.orig/packlib/kernlib/kernnum/f003fort/Imakefile 1996-06-12
03:04:12.000000000 -0700
++++ cernlib2003.new/packlib/kernlib/kernnum/f003fort/Imakefile 2003-12-29
11:21:25.000000000 -0800
@@ -11,6 +11,10 @@
FDEBUGFLAGS=NoOpFortranDebugFlags
#endif
+#if defined(CERNLIB_MACOSX)
-+FDEBUGFLAGS=-O0 -fPIC
++FDEBUGFLAGS := -O0 $(FDEBUGFLAGS)
+#endif
+
FORTRANSAVEOPTION=FortranSaveFlags
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -Naur cernlib.orig/packlib/kernlib/kernnum/f004fort/Imakefile
cernlib.new/packlib/kernlib/kernnum/f004fort/Imakefile
---- cernlib.orig/packlib/kernlib/kernnum/f004fort/Imakefile Wed Jun 12 03:04:16
1996
-+++ cernlib.new/packlib/kernlib/kernnum/f004fort/Imakefile Fri Aug 29 18:11:01
2003
+diff -Naur cernlib2003.orig/packlib/kernlib/kernnum/f004fort/Imakefile
cernlib2003.new/packlib/kernlib/kernnum/f004fort/Imakefile
+--- cernlib2003.orig/packlib/kernlib/kernnum/f004fort/Imakefile 1996-06-12
03:04:16.000000000 -0700
++++ cernlib2003.new/packlib/kernlib/kernnum/f004fort/Imakefile 2003-12-29
11:21:25.000000000 -0800
@@ -6,6 +6,10 @@
FDEBUGFLAGS=NoOpFortranDebugFlags
#endif
+#if defined(CERNLIB_MACOSX)
-+FDEBUGFLAGS=-O0 -fPIC
++FDEBUGFLAGS := -O0 $(FDEBUGFLAGS)
+#endif
+
FORTRANSAVEOPTION=FortranSaveFlags
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -Naur cernlib.orig/packlib/kernlib/kernnum/f010fort/Imakefile
cernlib.new/packlib/kernlib/kernnum/f010fort/Imakefile
---- cernlib.orig/packlib/kernlib/kernnum/f010fort/Imakefile Wed Jun 12 03:04:19
1996
-+++ cernlib.new/packlib/kernlib/kernnum/f010fort/Imakefile Fri Aug 29 18:11:01
2003
+diff -Naur cernlib2003.orig/packlib/kernlib/kernnum/f010fort/Imakefile
cernlib2003.new/packlib/kernlib/kernnum/f010fort/Imakefile
+--- cernlib2003.orig/packlib/kernlib/kernnum/f010fort/Imakefile 1996-06-12
03:04:19.000000000 -0700
++++ cernlib2003.new/packlib/kernlib/kernnum/f010fort/Imakefile 2003-12-29
11:21:25.000000000 -0800
@@ -7,6 +7,10 @@
FDEBUGFLAGS=NoOpFortranDebugFlags
#endif
+#if defined(CERNLIB_MACOSX)
-+FDEBUGFLAGS=-O0 -fPIC
++FDEBUGFLAGS := -O0 $(FDEBUGFLAGS)
+#endif
+
FORTRANSAVEOPTION=FortranSaveFlags
-diff -Naur cernlib.orig/packlib/kernlib/kernnum/f011fort/Imakefile
cernlib.new/packlib/kernlib/kernnum/f011fort/Imakefile
---- cernlib.orig/packlib/kernlib/kernnum/f011fort/Imakefile Wed Jun 12 03:04:24
1996
-+++ cernlib.new/packlib/kernlib/kernnum/f011fort/Imakefile Fri Aug 29 18:11:01
2003
+diff -Naur cernlib2003.orig/packlib/kernlib/kernnum/f011fort/Imakefile
cernlib2003.new/packlib/kernlib/kernnum/f011fort/Imakefile
+--- cernlib2003.orig/packlib/kernlib/kernnum/f011fort/Imakefile 1996-06-12
03:04:24.000000000 -0700
++++ cernlib2003.new/packlib/kernlib/kernnum/f011fort/Imakefile 2003-12-29
11:21:25.000000000 -0800
@@ -7,6 +7,10 @@
FDEBUGFLAGS=NoOpFortranDebugFlags
#endif
+#if defined(CERNLIB_MACOSX)
-+FDEBUGFLAGS=-O0 -fPIC
++FDEBUGFLAGS := -O0 $(FDEBUGFLAGS)
+#endif
+
FORTRANSAVEOPTION=FortranSaveFlags
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -Naur cernlib.orig/packlib/kuip/kuip/ksys.h cernlib.new/packlib/kuip/kuip/ksys.h
---- cernlib.orig/packlib/kuip/kuip/ksys.h Tue Sep 2 07:50:01 1997
-+++ cernlib.new/packlib/kuip/kuip/ksys.h Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/packlib/kuip/kuip/ksys.h
cernlib2003.new/packlib/kuip/kuip/ksys.h
+--- cernlib2003.orig/packlib/kuip/kuip/ksys.h 1997-09-02 07:50:01.000000000 -0700
++++ cernlib2003.new/packlib/kuip/kuip/ksys.h 2003-12-29 11:21:25.000000000 -0800
@@ -188,6 +188,17 @@
#endif
@@ -809,9 +811,57 @@
#ifdef MSDOS
# define MACHINE_NAME "IBMPC"
# define OS_NAME "MSDOS"
-diff -Naur cernlib.orig/pawlib/paw/programs/Imakefile
cernlib.new/pawlib/paw/programs/Imakefile
---- cernlib.orig/pawlib/paw/programs/Imakefile Fri Apr 26 08:27:23 2002
-+++ cernlib.new/pawlib/paw/programs/Imakefile Fri Aug 29 18:11:01 2003
+diff -Naur cernlib2003.orig/pawlib/comis/code/csaddr.F
cernlib2003.new/pawlib/comis/code/csaddr.F
+--- cernlib2003.orig/pawlib/comis/code/csaddr.F 1996-02-26 09:16:25.000000000
-0800
++++ cernlib2003.new/pawlib/comis/code/csaddr.F 2003-12-29 11:21:25.000000000 -0800
+@@ -26,7 +26,11 @@
+ I=CSLTGP(IPVS)
+ IF(I.GT.0)THEN
+ IF(IFCS.EQ.0)THEN
++#if defined(CERNLIB_MACOSX)
++ IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
++#else
+ IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
++#endif
+ IF(IADGP.NE.0)THEN
+ IFCS=-2
+ CALL CSRTGP(I)
+@@ -35,7 +39,11 @@
+ ENDIF
+ ENDIF
+ ELSE
++#if defined(CERNLIB_MACOSX)
++ IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
++#else
+ IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
++#endif
+ IF(IADGP.NE.0)THEN
+ IFCS=-2
+ ITYPGP=-2
+diff -Naur cernlib2003.orig/pawlib/comis/code/cscrexec.F
cernlib2003.new/pawlib/comis/code/cscrexec.F
+--- cernlib2003.orig/pawlib/comis/code/cscrexec.F 2000-09-25 07:16:36.000000000
-0700
++++ cernlib2003.new/pawlib/comis/code/cscrexec.F 2003-12-29 11:21:25.000000000
-0800
+@@ -175,10 +175,16 @@
+ + // 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 -o '
++ + // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
++ + // ' -bundle -bind_at_load'
++ + // ' -bundle_loader @PREFIX@/bin/pawX11'
++#endif
+ #if defined(CERNLIB_ALPHA_OSF)
+ CHLINE= 'ld -shared -o '
+ + // NAME(:LN) //'.sl '// NAME(:LN) //'.o \\'
+diff -Naur cernlib2003.orig/pawlib/paw/programs/Imakefile
cernlib2003.new/pawlib/paw/programs/Imakefile
+--- cernlib2003.orig/pawlib/paw/programs/Imakefile 2002-04-25 03:20:11.000000000
-0700
++++ cernlib2003.new/pawlib/paw/programs/Imakefile 2003-12-29 11:21:25.000000000
-0800
@@ -9,7 +9,7 @@
EXTRA_LDOPTIONS=-Wl,-E
#endif
@@ -821,9 +871,18 @@
EXTRA_LDOPTIONS=-Wl,-E
#endif
-diff -Naur cernlib.orig/scripts/cernlib cernlib.new/scripts/cernlib
---- cernlib.orig/scripts/cernlib Mon Sep 16 00:12:24 2002
-+++ cernlib.new/scripts/cernlib Fri Aug 29 18:11:02 2003
+diff -Naur cernlib2003.orig/scripts/cernlib cernlib2003.new/scripts/cernlib
+--- cernlib2003.orig/scripts/cernlib 2003-01-23 06:02:04.000000000 -0800
++++ cernlib2003.new/scripts/cernlib 2003-12-29 11:27:36.000000000 -0800
+@@ -31,7 +31,7 @@
+
+
+
+- CERNLIB=""
++ CERNLIB="-L${CERN_ROOT}/lib"
+
+ liblist=`echo $* | sed -e 's/,/ /g'`
+ for lib in $liblist
@@ -44,17 +44,16 @@
val=`echo $lib | sed -e "s?\/? ?g"`
set - $val
@@ -871,28 +930,19 @@
NeXT) SYSGX11="/usr/lib/X11/libX11.r" ;
SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;
OSF1) SYSGX11="-lX11 -ldnet_stub" ;
-@@ -167,7 +169,7 @@
-
- if [ $_u -eq 0 ] ; then
-
-- CERNLIB="$CERNLIB -L/usr/local/lib -lshift"
-+ CERNLIB="$CERNLIB -L${CERN_ROOT}/lib"
-
- # SGI needs -lsun, to see yellow pages
- # As of 5.x, the yp version is in libc, so -lsun is no longer needed.
-@@ -213,6 +215,9 @@
- fi
+@@ -209,6 +211,9 @@
if [ "$Msys" = "Linux" ] ; then
CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"
-+ fi
-+ if [ "$Msys" = "Darwin" ] ; then
-+ CERNLIB="$CERNLIB -latlas -ldl"
fi
++ if [ "$Msys" = "Darwin" ] ; then
++ CERNLIB="$CERNLIB -latlas -lSystem -lcc_dynamic -ldl"
++ fi
fi
-diff -Naur cernlib.orig/scripts/gxint cernlib.new/scripts/gxint
---- cernlib.orig/scripts/gxint Mon May 29 05:18:41 1995
-+++ cernlib.new/scripts/gxint Fri Aug 29 18:11:02 2003
+
+diff -Naur cernlib2003.orig/scripts/gxint cernlib2003.new/scripts/gxint
+--- cernlib2003.orig/scripts/gxint 1995-05-29 05:18:41.000000000 -0700
++++ cernlib2003.new/scripts/gxint 2003-12-29 11:21:25.000000000 -0800
@@ -78,7 +78,7 @@
fi
fi
@@ -902,171 +952,72 @@
gxint=""
while [ $# -gt 0 ]
-diff -Naur cernlib.orig/pawlib/comis/code/cscrexec.F
cernlib.new/pawlib/comis/code/cscrexec.F
---- cernlib.orig/pawlib/comis/code/cscrexec.F Thu Sep 28 02:47:36 2000
-+++ cernlib.new/pawlib/comis/code/cscrexec.F Sun Aug 31 12:04:02 2003
-@@ -175,9 +175,15 @@
- + // 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 -o '
-+ + // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
-+ + // ' -bundle -bind_at_load'
-+ + // ' -bundle_loader `which pawX11`'
- #endif
- #if defined(CERNLIB_ALPHA_OSF)
- CHLINE= 'ld -shared -o '
-diff -uNr cernlib.orig/pawlib/comis/code/csaddr.F
cernlib.new/pawlib/comis/code/csaddr.F
---- cernlib.orig/pawlib/comis/code/csaddr.F Tue Feb 27 02:16:25 1996
-+++ cernlib.new/pawlib/comis/code/csaddr.F Tue Aug 12 20:03:41 2003
-@@ -26,7 +26,11 @@
- I=CSLTGP(IPVS)
- IF(I.GT.0)THEN
- IF(IFCS.EQ.0)THEN
-+#if defined(CERNLIB_MACOSX)
-+ IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
-+#else
- IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
-+#endif
- IF(IADGP.NE.0)THEN
- IFCS=-2
- CALL CSRTGP(I)
-@@ -35,7 +39,11 @@
- ENDIF
- ENDIF
- ELSE
-+#if defined(CERNLIB_MACOSX)
-+ IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
-+#else
- IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
-+#endif
- IF(IADGP.NE.0)THEN
- IFCS=-2
- ITYPGP=-2
---- cernlib.orig/packlib/cspack/sysreq/trace.c Fri Mar 8 07:44:26 1996
-+++ cernlib.new/packlib/cspack/sysreq/trace.c Fri Oct 31 15:21:14 2003
-@@ -19,8 +19,12 @@
- /* trace.c General tracing facility */
-
- #include <stdio.h> /* standard input/output definitions */
-+#if !defined(__DARWIN__)
- #include <varargs.h> /* variable argument list definitions */
--#if defined(vms)
-+#else
-+#include <stdarg.h>
-+#endif /* __DARWIN__ */
-+#if defined(vms)
- #include <stdlib.h> /* General utility definitions */
- #endif /* vms */
-
-@@ -44,16 +48,25 @@
-
- /*VARARGS*/
-
-+#if !defined(__DARWIN__)
- void print_trace(va_alist) va_dcl
-+#else
-+void print_trace(int level, ...)
-+#endif /* !__DARWIN__ */
- {
- va_list args; /* arguments */
- register char *label; /* leading label */
- register char *format; /* print format string */
-- register int level; /* trace level */
- register int i; /* general purpose index */
-
-+#if !defined(__DARWIN__)
-+ register int level; /* trace level */
+diff -Naur cernlib2003.orig/packlib/kuip/code_kuip/Imakefile
cernlib2003.new/packlib/kuip/code_kuip/Imakefile
+--- cernlib2003.orig/packlib/kuip/code_kuip/Imakefile 1999-11-24 01:52:07.000000000
-0800
++++ cernlib2003.new/packlib/kuip/code_kuip/Imakefile 2004-01-31 17:31:27.000000000
-0800
+@@ -3,7 +3,7 @@
+ SRCS_C= getline.c kalias.c kbrow.c kedit.c kexec.c khash.c kicon.c \ @@\
+ kienbr.c kipiaf.c kkern.c kmacro.c kmath.c kmenu.c kmisc.c \ @@\
+ kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c kuwhag.c \ @@\
+- kuwhat.c kvect.c
++ kuwhat.c kvect.c re.c
+
+ #ifdef CERNLIB_WINNT
+ SRCS_C :=$(SRCS_C) kmutil0.c
+diff -Naur cernlib2003.orig/packlib/kuip/code_kuip/re.c
cernlib2003.new/packlib/kuip/code_kuip/re.c
+--- cernlib2003.orig/packlib/kuip/code_kuip/re.c 1969-12-31 16:00:00.000000000
-0800
++++ cernlib2003.new/packlib/kuip/code_kuip/re.c 2004-01-31 17:30:53.000000000 -0800
+@@ -0,0 +1,29 @@
++#include <sys/types.h>
++#include <regex.h>
+
- va_start(args); /* initialize to beginning of list */
- level = va_arg(args, int);
-+#else
-+ va_start(args, level);
-+#endif /* __DARWIN__ */
- if (trace_level < level) return;
- label = va_arg(args, char *);
- for (i=0; i< level+indent_level ; i++) {
---- cernlib.orig/packlib/cspack/sysreq/log.c Tue Jul 9 09:07:29 2002
-+++ cernlib.new/packlib/cspack/sysreq/log.c Fri Oct 31 15:28:38 2003
-@@ -53,12 +53,12 @@
- #define write DECC$WRITE
- #endif /* vms && __alpha && COMPILE_NOPREFIX */
-
--#if !defined(VM) && !defined(IRIX5)
-+#if !defined(VM) && !defined(IRIX5) && !defined(__DARWIN__)
- #include <varargs.h> /* variable argument list definitions */
- #else
- #include <stdarg.h> /* variable argument list definitions */
- #include <errno.h> /* standard error numbers & codes */
--#endif /* VM || IRIX5 */
-+#endif /* VM || IRIX5 || __DARWIN__ */
- #include <log.h> /* logging options and definitions */
-
-
-@@ -76,9 +76,9 @@
- 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 */
-+#endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX && __DARWIN__ */
- extern char *getenv();
- #else /* VM */
- static char *console="CONSOLE";/* VM default console userid */
-@@ -127,14 +127,14 @@
-
-
- #if !defined(VM)
--#if !defined(IRIX5)
-+#if !defined(IRIX5) && !defined(__DARWIN__)
- void logit();
- #else
- void logit(int level, ...);
- #endif
- #else
- int logit(int level, ...);
--#endif /* VM || IRIX5 */
-+#endif /* VM || IRIX5 || __DARWIN__ */
- void (*logfunc)()=(void (*)())logit;
-
- /*
-@@ -198,11 +198,11 @@
- * logit(LOG_LEVEL,format[,value,...]) ;
- */
- #if !defined(VM)
--#if !defined(IRIX5)
-+#if !defined(IRIX5) && !defined(__DARWIN__)
- void logit(va_alist) va_dcl
- #else
- void logit(int level, ...)
--#endif
-+#endif /* IRIX5 || __DARWIN__ */
- #else
- int logit(int level, ...)
- #endif /* VM */
-@@ -219,7 +219,7 @@
- #if !defined(VM)
- int fd; /* log file descriptor */
- #endif
--#if !defined(VM) && !defined(IRIX5)
-+#if !defined(VM) && !defined(IRIX5) && !defined(__DARWIN__)
- int level; /* Level of the message */
-
- va_start(args); /* initialize to beginning of list */
-@@ -227,7 +227,7 @@
- #else
-
- va_start(args, level);
--#endif /* VM || IRIX5 */
-+#endif /* VM || IRIX5 || __DARWIN__*/
- if (loglevel >= level) {
- format = va_arg(args, char *);
- (void) time(&clock);
++static regex_t reg;
++
++char *
++re_comp(s)
++char *s;
++{
++ int i;
++ static char errbuf[81];
++ i = regcomp(®, s, REG_BASIC|REG_NOSUB);
++
++ if (!i) return (char *)0;
++
++ regerror(i, ®, errbuf, sizeof(errbuf));
++ return errbuf;
++}
++
++int
++re_exec(s)
++char *s;
++{
++ int i;
++
++ i = regexec(®, s, (size_t) 0, (regmatch_t *)0, 0);
++
++ return !i;
++}
+diff -Naur cernlib2003.orig/mclibs/lepto63/test/demo.F
cernlib2003.new/mclibs/lepto63/test/demo.F
+--- cernlib2003.orig/mclibs/lepto63/test/demo.F Mon Dec 2 20:05:18 2002
++++ cernlib2003.new/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 -Naur cernlib2003.orig/mclibs/lepto63/test/demo2.F
cernlib2003.new/mclibs/lepto63/test/demo2.F
+--- cernlib2003.orig/mclibs/lepto63/test/demo2.F Mon Dec 2 20:05:19 2002
++++ cernlib2003.new/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.
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
