rpms/cernlib/EL-5 cernlib-212-print-test-results.dpatch, NONE, 1.1 cernlib-213-fix-test-suite-build.dpatch, NONE, 1.1 cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch, NONE, 1.1 cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch, NONE, 1.1 cernlib-217-abend-on-mathlib-test-failure.dpatch, NONE, 1.1 cernlib-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 geant321-213-fix-test-suite-build.dpatch, NONE, 1.1 geant321-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 mclibs-213-fix-test-suite-build.dpatch, NONE, 1.1 mclibs-220-compile-isajet-with-isarun.dpatch, NONE, 1.1 mclibs-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 .cvsignore, 1.5, 1.6 210-improve-cfortran-header-files.dpatch, 1.1, 1.2 315-fixes-for-MacOSX.dpatch, 1.4, 1.5 700-remove-kernlib-from-packlib-Imakefile.dpatch, 1.1, 1.2 702-patch-Imakefiles-for-packlib-mathlib.dpatch, 1.1, 1.2 802-create-shared-libraries.dpatch, 1.2, 1.3 cernlib-102-dont-optimize-some-code.dpatch, 1.1, 1.2 cernlib-211-support-amd64-and-itanium.dpatch, 1.1, 1.2 cernlib-211-support-digital-alpha.dpatch, 1.2, 1.3 cernlib-303-shadow-passwords-supported.dpatch, 1.1, 1.2 cernlib-304-update-Imake-config-files.dpatch, 1.2, 1.3 cernlib-308-use-canonical-cfortran-location.dpatch, 1.1, 1.2 cernlib-321-support-gfortran.dpatch, 1.2, 1.3 cernlib-600-use-host.def-config-file.dpatch, 1.1, 1.2 cernlib-800-implement-shared-library-rules-in-Imake.dpatch, 1.2, 1.3 cernlib-803-link-binaries-dynamically.dpatch, 1.2, 1.3 cernlib.spec, 1.40, 1.41 geant321-001-fix-missing-fluka.dpatch, 1.2, 1.3 geant321-003-geant-dummy-functions.dpatch, 1.1, 1.2 geant321-203-compile-geant-with-ertrak.dpatch, 1.1, 1.2 geant321-806-bump-mathlib-and-dependents-sonames.dpatch, 1.1, 1.2 mclibs-321-support-gfortran.dpatch, 1.1, 1.2 paw-108-quote-protect-comis-script.dpatch, 1.1, 1.2 paw-200-comis-allow-special-chars-in-path.dpatch, 1.1, 1.2 paw-211-support-amd64-and-itanium.dpatch, 1.1, 1.2 paw-308-use-canonical-cfortran-location.dpatch, 1.1, 1.2 paw-320-support-ifort-and-gfortran.dpatch, 1.1, 1.2 paw-803-link-binaries-dynamically.dpatch, 1.1, 1.2 paw-804-workaround-for-comis-mdpool-struct-location.dpatch, 1.1, 1.2 sources, 1.6, 1.7 cernlib-64test.patch, 1.1, NONE cernlib-segf_eudtest.patch, 1.1, NONE cernlib-test.patch, 1.1, NONE

Patrice Dumas (pertusus) fedora-extras-commits at redhat.com
Mon Mar 10 10:32:03 UTC 2008


Author: pertusus

Update of /cvs/extras/rpms/cernlib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3297

Modified Files:
	.cvsignore 210-improve-cfortran-header-files.dpatch 
	315-fixes-for-MacOSX.dpatch 
	700-remove-kernlib-from-packlib-Imakefile.dpatch 
	702-patch-Imakefiles-for-packlib-mathlib.dpatch 
	802-create-shared-libraries.dpatch 
	cernlib-102-dont-optimize-some-code.dpatch 
	cernlib-211-support-amd64-and-itanium.dpatch 
	cernlib-211-support-digital-alpha.dpatch 
	cernlib-303-shadow-passwords-supported.dpatch 
	cernlib-304-update-Imake-config-files.dpatch 
	cernlib-308-use-canonical-cfortran-location.dpatch 
	cernlib-321-support-gfortran.dpatch 
	cernlib-600-use-host.def-config-file.dpatch 
	cernlib-800-implement-shared-library-rules-in-Imake.dpatch 
	cernlib-803-link-binaries-dynamically.dpatch cernlib.spec 
	geant321-001-fix-missing-fluka.dpatch 
	geant321-003-geant-dummy-functions.dpatch 
	geant321-203-compile-geant-with-ertrak.dpatch 
	geant321-806-bump-mathlib-and-dependents-sonames.dpatch 
	mclibs-321-support-gfortran.dpatch 
	paw-108-quote-protect-comis-script.dpatch 
	paw-200-comis-allow-special-chars-in-path.dpatch 
	paw-211-support-amd64-and-itanium.dpatch 
	paw-308-use-canonical-cfortran-location.dpatch 
	paw-320-support-ifort-and-gfortran.dpatch 
	paw-803-link-binaries-dynamically.dpatch 
	paw-804-workaround-for-comis-mdpool-struct-location.dpatch 
	sources 
Added Files:
	cernlib-212-print-test-results.dpatch 
	cernlib-213-fix-test-suite-build.dpatch 
	cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch 
	cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch 
	cernlib-217-abend-on-mathlib-test-failure.dpatch 
	cernlib-807-static-link-some-tests-on-64-bit.dpatch 
	geant321-213-fix-test-suite-build.dpatch 
	geant321-807-static-link-some-tests-on-64-bit.dpatch 
	mclibs-213-fix-test-suite-build.dpatch 
	mclibs-220-compile-isajet-with-isarun.dpatch 
	mclibs-807-static-link-some-tests-on-64-bit.dpatch 
Removed Files:
	cernlib-64test.patch cernlib-segf_eudtest.patch 
	cernlib-test.patch 
Log Message:
sync with devel, without ABI incompatible changes


--- NEW FILE cernlib-212-print-test-results.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 212-print-test-results.dpatch by  <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Explicitly output test program exit codes.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.rules cernlib-2006.dfsg.2/src/config/Imake.rules
--- cernlib-2006.dfsg.2~/src/config/Imake.rules	2005-04-18 15:39:25.000000000 +0000
+++ cernlib-2006.dfsg.2/src/config/Imake.rules	2007-12-13 18:52:12.000000000 +0000
@@ -2373,13 +2373,15 @@
 test:: ProgramTargetName(program) data inputdata			@@\
 	@echo Testing $(PACKAGE_NAME)					@@\
 	@echo "  ... using" program						@@\
-	@Concat(.,$(PATHSEP))ProgramTargetName(program)			@@\
+	@Concat(.,$(PATHSEP))ProgramTargetName(program)	; \		@@\
+	result="$$?" ; echo "Test result = $$result" ; exit "$$result"	@@\
 									@@\
 else									@@\
 test:: ProgramTargetName(program) data inputdata			@@\
 	@echo Testing $(PACKAGE_NAME)					@@\
 	@echo "  ... using" program					@@\
-	@Concat(.,$(PATHSEP))ProgramTargetName(program) < inputdata	@@\
+	@Concat(.,$(PATHSEP))ProgramTargetName(program) < inputdata ; \	@@\
+	result="$$?" ; echo "Test result = $$result" ; exit "$$result"	@@\
 									@@\
 endif									@@\
 									@@\


--- NEW FILE cernlib-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas <pertusus at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/bvsl/test/Imakefile cernlib-2006.dfsg.2/src/mathlib/bvsl/test/Imakefile
--- cernlib-2006.dfsg.2~/src/mathlib/bvsl/test/Imakefile	1996-03-21 17:19:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/mathlib/bvsl/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -6,7 +6,7 @@
 
 DefinePackageLibrary(bvsltst)
 
-CernlibFortranProgramTarget(bvslt,tsbvsl.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib kernlib)
+CernlibFortranProgramTarget(bvslt,tsbvsl.o,libbvsltst.a,libbvsltst.a,mathlib kernlib)
 
 TestTarget(bvslt,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/tests/Imakefile
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/Imakefile	2005-03-24 16:40:10.000000000 +0000
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -63,7 +63,7 @@
 
 DefinePackageLibrary(gentest)
 
-CernlibFortranProgramTarget(gent,main.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(gent,main.o,libgentest.a,libgentest.a,packlib mathlib)
 
 
 TestTarget(gent,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest1/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest1/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest1/Imakefile	1996-03-08 15:21:45.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest1/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -11,9 +11,9 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ptest1_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest1_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
-CernlibFortranProgramTarget(ptest1_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest1_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ptest1_32,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest2/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest2/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest2/Imakefile	1996-03-08 15:21:45.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest2/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -10,9 +10,9 @@
 SpecialFortranObjectRule(main_32,main,NullParameter,-DCERNLIB_PH32BIT)
 SpecialFortranObjectRule(test2_32,test2,NullParameter,-DCERNLIB_PH32BIT)
 
-CernlibFortranProgramTarget(ptest2_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest2_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
-CernlibFortranProgramTarget(ptest2_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest2_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ptest2_32,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest3/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest3/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest3/Imakefile	1996-03-08 15:21:46.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest3/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -12,9 +12,9 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ptest3_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest3_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
-CernlibFortranProgramTarget(ptest3_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest3_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ptest3_32,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile	1996-10-02 15:36:27.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -2,7 +2,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ffread,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ffread,NullParameter,test.input)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile	1996-02-20 15:46:21.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -5,11 +5,11 @@
 
 DefinePackageLibrary(hbtlib)
 
-CernlibFortranProgramTarget(hbtest,hexam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(hbtest,hexam.o,libhbtlib.a,libhbtlib.a,packlib)
 
-CernlibFortranProgramTarget(hbdiff,htdiffb.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(hbdiff,htdiffb.o,libhbtlib.a,libhbtlib.a,mathlib)
 
-CernlibFortranProgramTarget(hmerge,hmerg.o hmergin.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(hmerge,hmerg.o hmergin.o,libhbtlib.a,libhbtlib.a,mathlib)
 
 TestTarget(hbtest,NullParameter,NullParameter)
 TestTarget(hbdiff,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/tests/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/tests/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/tests/Imakefile	1996-02-20 15:46:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/tests/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -1,6 +1,6 @@
 #if 0
 /* this is not yet understood */
-CernlibFortranProgramTarget(hbtest,test_fp.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(hbtest,test_fp.o,NullParameter,NullParameter,packlib)
 
 
 TestTarget(hbtest)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kapack/test/Imakefile cernlib-2006.dfsg.2/src/packlib/kapack/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kapack/test/Imakefile	1996-12-02 15:29:51.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kapack/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -1,7 +1,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(kapack,test1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(kapack,test1.o,NullParameter,NullParameter,kernlib packlib)
 
 /* the kapack test, or better kamake asks for a file name only in unix.
  *  on VMS, the file is opened on unit 11, resulting in for011.dat
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile	1996-10-02 15:37:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -5,7 +5,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ktest,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib kernlib)
+CernlibFortranProgramTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
 
 TestTarget(ktest,NullParameter,ktest.inp)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/minuit/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/minuit/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/minuit/examples/Imakefile	1997-10-23 17:04:15.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/minuit/examples/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -9,6 +9,6 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
-CernlibFortranProgramTarget(minuit,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(minuit,$(OBJS),NullParameter,NullParameter,packlib)
 
 TestTarget(minuit,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile	1996-03-12 08:13:30.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -5,6 +5,6 @@
 
 SubdirLibraryTarget(zbookt,NullParameter)
 
-CernlibFortranProgramTarget(zexam,zexam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
 
 TestTarget(zexam,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile	1997-08-29 13:33:57.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -41,27 +41,27 @@
 
 testrz: zebrz1 zebrz2 zebrz3
 
-CernlibFortranProgramTarget(zebmz1,zebmz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebmz1,zebmz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebfz1,zebfz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz2,zebfz2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz3,zebfz3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz4,zebfz4.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz5,zebfz5.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz6,zebfz6.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz7,zebfz7.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz8,zebfz8.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz9,zebfz9.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebfz1,zebfz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz2,zebfz2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz3,zebfz3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz4,zebfz4.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz5,zebfz5.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz6,zebfz6.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz7,zebfz7.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz8,zebfz8.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz9,zebfz9.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebfc1,zebfc1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfc2,zebfc2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfc3,zebfc3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebfc1,zebfc1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfc2,zebfc2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfc3,zebfc3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebjz1,zebjz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebjz1,zebjz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebrz1,zebrz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebrz2,zebrz2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebrz3,zebrz3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebrz1,zebrz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebrz2,zebrz2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebrz3,zebrz3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
 TestTarget(zebmz1,zxtest.dat,NullParameter)
 


--- NEW FILE cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 214-fix-kernnum-funcs-on-64-bit.dpatch by  <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Attempt to fix kernnum use of pointer differences on 64-bit arches.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cxj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cxj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JX  =  (IADDR(X2) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cyj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/czj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/czj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/czj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/czj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dxj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dxj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JX  =  (IADDR(X2) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dyj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dzj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rxj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rxj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JX  =   (IADDR(X2) - IADDR(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =   IPTRDIFF(X2, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/ryj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/ryj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/ryj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/ryj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =   (IADDR(Y2) - IADDR(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =   IPTRDIFF(Y2, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rzj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =   (IADDR(Z2) - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =   IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cdi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cdi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cdi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cdi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           ID  =  (IADDR(D2)  - IADDR(D)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          ID  =  IPTRDIFF(D2, D) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cujk.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cujk.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           JU  =  (IADDR(U12) - IADDR(U)) / 8
           KU  =  (IADDR(U22) - IADDR(U)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JU  =  IPTRDIFF(U12, U) / 8
+          KU  =  IPTRDIFF(U22, U) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IX  =  (IADDR(X2)  - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IX  =  (IADDR(X21) - IADDR(X)) / 8
           JX  =  (IADDR(X12) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X21, X) / 8
+          JX  =  IPTRDIFF(X12, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IY  =  (IADDR(Y21) - IADDR(Y)) / 8
           JY  =  (IADDR(Y12) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IY  =  IPTRDIFF(Y21, Y) / 8
+          JY  =  IPTRDIFF(Y12, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyj.inc	1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czi.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IZ  =  (IADDR(Z2)  - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IZ  =  (IADDR(Z21) - IADDR(Z)) / 8
           JZ  =  (IADDR(Z12) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z21, Z) / 8
+          JZ  =  IPTRDIFF(Z12, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czj.inc	1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ddi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ddi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ddi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ddi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           ID  =  (IADDR(D2)  - IADDR(D)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          ID  =  IPTRDIFF(D2, D) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dujk.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dujk.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           JU  =  (IADDR(U12) - IADDR(U)) / 8
           KU  =  (IADDR(U22) - IADDR(U)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JU  =  IPTRDIFF(U12, U) / 8
+          KU  =  IPTRDIFF(U22, U) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IX  =  (IADDR(X2)  - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IX  =  (IADDR(X21) - IADDR(X)) / 8
           JX  =  (IADDR(X12) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X21, X) / 8
+          JX  =  IPTRDIFF(X12, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IY  =  (IADDR(Y21) - IADDR(Y)) / 8
           JY  =  (IADDR(Y12) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IY  =  IPTRDIFF(Y21, Y) / 8
+          JY  =  IPTRDIFF(Y12, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyj.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzi.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IZ  =  (IADDR(Z2)  - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IZ  =  (IADDR(Z21) - IADDR(Z)) / 8
           JZ  =  (IADDR(Z12) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z21, Z) / 8
+          JZ  =  IPTRDIFF(Z12, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzj.inc	1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rdi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rdi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rdi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rdi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           ID  =  (IADDR(D2)  - IADDR(D)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          ID  =  IPTRDIFF(D2, D) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rujk.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rujk.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           JU  =  (IADDR(U12) - IADDR(U)) / 4
           KU  =  (IADDR(U22) - IADDR(U)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JU  =  IPTRDIFF(U12, U) / 4
+          KU  =  IPTRDIFF(U22, U) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IX  =  (IADDR(X2)  - IADDR(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X2, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IX  =  (IADDR(X21) - IADDR(X)) / 4
           JX  =  (IADDR(X12) - IADDR(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X21, X) / 4
+          JX  =  IPTRDIFF(X12, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IY  =  (IADDR(Y21) - IADDR(Y)) / 4
           JY  =  (IADDR(Y12) - IADDR(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IY  =  IPTRDIFF(Y21, Y) / 4
+          JY  =  IPTRDIFF(Y12, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryj.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =   (IADDR(Y2) - IADDR(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =   IPTRDIFF(Y2, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IZ  =  (IADDR(Z2)  - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IZ  =  (IADDR(Z21) - IADDR(Z)) / 4
           JZ  =  (IADDR(Z12) - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z21, Z) / 4
+          JZ  =  IPTRDIFF(Z12, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzj.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =   (IADDR(Z2) - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =   IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/dlocf.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/dlocf.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/dlocf.inc	1996-02-15 17:49:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/dlocf.inc	2008-01-02 20:02:31.000000000 +0000
@@ -57,3 +57,12 @@
           IZ  =  (IADDR(Z21(1)) - LOCZ) / 8
           LZ  =  (IADDR(Z12(1)) - LOCZ) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IF(MIN0(M,N,K) .LE. 0)  RETURN
+          IX  =  IPTRDIFF(X21(1), X(1)) / 8
+          JX  =  IPTRDIFF(X12(1), X(1)) / 8
+          JY  =  IPTRDIFF(Y21(1), Y(1)) / 8
+          LY  =  IPTRDIFF(Y12(1), Y(1)) / 8
+          IZ  =  IPTRDIFF(Z21(1), Z(1)) / 8
+          LZ  =  IPTRDIFF(Z12(1), Z(1)) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/rlocf.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/rlocf.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/rlocf.inc	1996-02-15 17:49:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/rlocf.inc	2008-01-02 20:02:31.000000000 +0000
@@ -57,3 +57,12 @@
           IZ  =  (IADDR(Z21(1)) - LOCZ) / 4
           LZ  =  (IADDR(Z12(1)) - LOCZ) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IF(MIN0(M,N,K) .LE. 0)  RETURN
+          IX  =  IPTRDIFF(X21(1), X(1)) / 4
+          JX  =  IPTRDIFF(X12(1), X(1)) / 4
+          JY  =  IPTRDIFF(Y21(1), Y(1)) / 4
+          LY  =  IPTRDIFF(Y12(1), Y(1)) / 4
+          IZ  =  IPTRDIFF(Z21(1), Z(1)) / 4
+          LZ  =  IPTRDIFF(Z12(1), Z(1)) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/zisxy.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/zisxy.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/zisxy.inc	1996-02-15 17:49:01.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/zisxy.inc	2008-01-02 20:02:31.000000000 +0000
@@ -9,9 +9,15 @@
 *
 * zisxy.inc
 *
+#ifdef CERNLIB_NUM64
+	  IF(IPTRSAME(Z(1), X(1)) .EQ. 1)  GOTO 30
+	  IF(IPTRSAME(Z(1), Y(1)) .EQ. 1)  GOTO 40
+	  IF(IPTRSAME(X(1), Y(1)) .EQ. 1)  GOTO 20
+#else
           IF(LOCZ .EQ. LOCX)  GOTO 30
           IF(LOCZ .EQ. LOCY)  GOTO 40
           IF(LOCX .EQ. LOCY)  GOTO 20
+#endif
   10      LY1L  =  1
           LZ1L  =  1
           DO 13     L  =  1, K
@@ -68,7 +74,11 @@
              LZII  =  LZII + IZ + LZ
   24         CONTINUE
           RETURN
+#ifdef CERNLIB_NUM64
+  30      IF(IPTRSAME(X(1), Y(1)) .EQ. 1)  GOTO 50
+#else
   30      IF(LOCX .EQ. LOCY)  GOTO 50
+#endif
           LXI1  =  1
           DO 34     I  =  1, M
              LY1L  =  1
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/kernnum/pilot.h cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/kernnum/pilot.h
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/kernnum/pilot.h	1997-02-04 17:36:48.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/kernnum/pilot.h	2008-01-02 20:02:31.000000000 +0000
@@ -19,7 +19,7 @@
 #endif
 #endif
 
-#if defined(CERNLIB_LINUX)||defined(CERNLIB_MSDOS) && !defined(CERNLIB_WINNT)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_QMLXIA64) || defined(CERNLIB_MSDOS) && !defined(CERNLIB_WINNT)
 #ifndef CERNLIB_NUMIB2
 #define CERNLIB_NUMIB2
 #endif
@@ -31,6 +31,18 @@
 #endif
 #endif
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#ifndef CERNLIB_NUM64
+#define CERNLIB_NUM64
+#endif
+#ifdef CERNLIB_NUMD38
+#undef CERNLIB_NUMD38
+#endif
+#ifndef CERNLIB_NUMD279
+#define CERNLIB_NUMD279
+#endif
+#endif
+
 #if defined(CERNLIB_VAXVMS)
 #ifndef CERNLIB_NUMDE
 #define CERNLIB_NUMDE
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h	1997-02-04 17:36:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h	2008-01-02 20:02:31.000000000 +0000
@@ -44,6 +44,11 @@
 #ifndef CERNLIB_NUMLN
 #define CERNLIB_NUMLN
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#ifndef CERNLIB_NUM64
+#define CERNLIB_NUM64
+#endif
+#endif
 #endif
 
 #if defined(CERNLIB_MSDOS)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F	1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F	2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
           IF(N .LE. 0)  RETURN
           CVDIST  =  DISTF(X(1),Y(1))
           IF(N .LE. 1)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
@@ -26,6 +26,10 @@
           JX  =  (%LOC(X2) - %LOC(X)) / 8
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LX  =  1
           LY  =  1
           DO 10     J  =  2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F	1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F	2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
           IF(N .LE. 0)  RETURN
           DVDIST  =  DISTF(X(1),Y(1))
           IF(N .LE. 1)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
@@ -26,6 +26,10 @@
           JX  =  (%LOC(X2) - %LOC(X)) / 8
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LX  =  1
           LY  =  1
           DO 10     J  =  2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F	1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F	2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
           IF(N .LE. 0)  RETURN
           RVDIST  =  DISTF(X(1),Y(1))
           IF(N .LE. 1)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
           JY  =  LOCF(Y2) - LOCF(Y)
 #endif
@@ -26,6 +26,10 @@
           JX  =  (%LOC(X2) - %LOC(X)) / 4
           JY  =  (%LOC(Y2) - %LOC(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+          JY  =  IPTRDIFF(Y2, Y) / 4
+#endif
           LX  =  1
           LY  =  1
           DO 10     J  =  2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/check3.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/check3.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/check3.F	1996-03-21 17:16:07.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/check3.F	2008-01-02 20:02:31.000000000 +0000
@@ -343,7 +343,7 @@
           I  =  1
           IF(N .EQ. 1)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -352,6 +352,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+#endif
           DO 10     J  =  2, N
              LXJ  =  LXJ + JX
              T    =  ABSF(X(LXJ))
@@ -373,7 +376,7 @@
           I  =  1
           IF(N .EQ. 1)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -382,6 +385,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  2, N
              LXJ  =  LXJ + JX
              T    =  ABSF(X(LXJ))
@@ -403,7 +409,7 @@
           I  =  1
           IF(N .EQ. 1)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -412,6 +418,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  2, N
              LXJ  =  LXJ + JX
              T    =  ABSF(X(LXJ))
@@ -441,7 +450,7 @@
           RVSUMA  =  0.
           IF(N .LE. 0)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -450,6 +459,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+#endif
           DO 10     J  =  1, N
              RVSUMA  =  RVSUMA + ABS(X(LXJ))
              LXJ  =  LXJ + JX
@@ -461,7 +473,7 @@
           DVSUMA  =  0.
           IF(N .LE. 0)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -470,6 +482,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  1, N
              DVSUMA  =  DVSUMA + ABS(SNGL(X(LXJ)))
              LXJ  =  LXJ + JX
@@ -481,7 +496,7 @@
           CVSUMA  =  0.
           IF(N .LE. 0)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -490,6 +505,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  1, N
           CVSUMA = CVSUMA + AMAX1(ABS(REAL(X(LXJ))),ABS(AIMAG(X(LXJ))))
           LXJ  =  LXJ + JX
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F	1996-03-21 17:16:08.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F	2008-01-02 20:02:31.000000000 +0000
@@ -329,7 +329,7 @@
           IF(.NOT. OK)  WRITE(IOUNIT,1000) N, IFAIL
           IF(N .LE. 0) RETURN
           KFAIL  =  IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JY  =  LOCF(Y2) - LOCF(Y)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -338,6 +338,9 @@
 #if defined(CERNLIB_NUMDE)
           JY  =  (%LOC(Y2) - %LOC(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 4
+#endif
           LY     =  (KFAIL - 1)*JY + 1
           S      =  Y(LY)
           Y(LY)  =  ZERO
@@ -366,7 +369,7 @@
           IF(.NOT. OK)  WRITE(IOUNIT,1000) N, IFAIL
           IF(N .LE. 0) RETURN
           KFAIL  =  IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -375,6 +378,9 @@
 #if defined(CERNLIB_NUMDE)
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LY     =  (KFAIL - 1)*JY + 1
           S      =  Y(LY)
           Y(LY)  =  ZERO
@@ -403,7 +409,7 @@
           IF(.NOT. OK)  WRITE(IOUNIT,1000) N, IFAIL
           IF(N .LE. 0) RETURN
           KFAIL  =  IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -412,6 +418,9 @@
 #if defined(CERNLIB_NUMDE)
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LY     =  (KFAIL - 1)*JY + 1
           S      =  Y(LY)
           Y(LY)  =  ZERO
@@ -1139,7 +1148,7 @@
           XS2  =  ZERO
           XM2  =  ZERO
           IF(N .LE. 0)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -1148,6 +1157,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+#endif
           LX  =  1
           S1  =  ZERO
           S2  =  ZERO
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F	1996-03-21 17:16:10.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F	2008-01-02 20:03:24.000000000 +0000
@@ -251,7 +251,8 @@
      +           3X,7H IDIM =,I5, 3X, 4H E =,1PE12.3)
           END
           SUBROUTINE TSING(N,A,R,OK,FACT,SETEX,RABS,VXCH)
-          REAL      A(*),     R(*),     DET(2)
+          REAL      A(*),     R(*)
+          DOUBLE PRECISION    DET(2)
           LOGICAL   OK,       OKDET
 #include "kernnumt/sysdat.inc"
 #include "ch3dat.inc"


--- NEW FILE cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 216-use-cernlib-gamma-not-intrinsic.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Force use of mathlib gamma function in mathlib tests.
## DP: Built-in libc gamma function may not be sufficiently precise,
## DP: see, e.g., http://gcc.gnu.org/ml/fortran/2007-10/msg00096.html etc.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/algama.F cernlib-2006.dfsg.2/src/mathlib/gen/c/algama.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/algama.F	1996-04-01 07:01:54.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/algama.F	2008-01-29 10:02:41.000000000 -0800
@@ -10,6 +10,7 @@
 #if (defined(CERNLIB_DOUBLE))&&(!defined(CERNLIB_IBM))
       FUNCTION ALGAMA(X)
       DOUBLE PRECISION DLGAMA,D
+      EXTERNAL DLGAMA
 
       ENTRY ALOGAM(X)
 
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/alogam.F cernlib-2006.dfsg.2/src/mathlib/gen/c/alogam.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/alogam.F	1996-04-01 07:01:54.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/alogam.F	2008-01-29 10:03:54.000000000 -0800
@@ -9,6 +9,7 @@
 #include "gen/pilot.h"
 #if (defined(CERNLIB_DOUBLE))&&(defined(CERNLIB_IBM))
       FUNCTION ALOGAM(X)
+      EXTERNAL ALGAMA
       ALOGAM = ALGAMA(X)
       END
 #endif
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/bsja64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/bsja64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/bsja64.F	1996-04-01 07:02:08.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/bsja64.F	2008-01-29 10:00:11.000000000 -0800
@@ -21,9 +21,11 @@
 #if defined(CERNLIB_DOUBLE)
       PARAMETER (NAMEJ = 'BSJA/DBSJA',
      1           NAMEI = 'BSIA/DBSIA')
+      EXTERNAL DGAMMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       PARAMETER (NAMEJ = 'BSJA', NAMEI = 'BSIA')
+      EXTERNAL GAMMA
 #endif
       LOGICAL LJA,LIA,LEV,LER
       DIMENSION B(0:*),BA(0:100),RR(0:100)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/cbsja64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/cbsja64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/cbsja64.F	1996-04-01 07:02:09.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/cbsja64.F	2008-01-29 10:00:11.000000000 -0800
@@ -21,9 +21,11 @@
       CHARACTER NAME*(*)
 #if defined(CERNLIB_DOUBLE)
       PARAMETER (NAME = 'CBSJA/WBSJA')
+      EXTERNAL DGAMMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       PARAMETER (NAME = 'CBSJA')
+      EXTERNAL GAMMA
 #endif
       LOGICAL LER
       DIMENSION CB(0:*),CBA(0:100),RR(0:100)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/dlogam.F cernlib-2006.dfsg.2/src/mathlib/gen/c/dlogam.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/dlogam.F	1996-04-01 07:01:55.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/dlogam.F	2008-01-29 10:04:25.000000000 -0800
@@ -9,6 +9,7 @@
 #include "gen/pilot.h"
 #if defined(CERNLIB_IBM)
       FUNCTION DLOGAM(X)
+      EXTERNAL DLGAMA
 #include "gen/imp64.inc"
       DLOGAM = DLGAMA(X)
       END
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/gagnc64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/gagnc64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/gagnc64.F	1996-04-01 07:02:05.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/gagnc64.F	2008-01-29 10:04:48.000000000 -0800
@@ -25,9 +25,11 @@
       CHARACTER NAME*(*)
       CHARACTER*80 ERRTXT
 #if !defined(CERNLIB_DOUBLE)
+      EXTERNAL ALGAMA
       PARAMETER (NAME = 'RGAGNC')
 #endif
 #if defined(CERNLIB_DOUBLE)
+      EXTERNAL DLGAMA
       PARAMETER (NAME = 'RGAGNC/DGAGNC')
 #endif
 
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/gapnc64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/gapnc64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/gapnc64.F	1996-04-01 07:02:05.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/gapnc64.F	2008-01-29 10:03:35.000000000 -0800
@@ -24,9 +24,11 @@
       CHARACTER NAME*(*)
       CHARACTER*80 ERRTXT
 #if !defined(CERNLIB_DOUBLE)
+      EXTERNAL ALGAMA
       PARAMETER (NAME = 'RGAPNC')
 #endif
 #if defined(CERNLIB_DOUBLE)
+      EXTERNAL DLGAMA
       PARAMETER (NAME = 'RGAPNC/DGAPNC')
 #endif
       PARAMETER (EPS = 5D-14)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rrizet64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rrizet64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rrizet64.F	1996-04-01 07:02:00.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rrizet64.F	2008-01-29 10:00:11.000000000 -0800
@@ -14,12 +14,14 @@
 C
       CHARACTER*(*) NAME
       PARAMETER(NAME='RRIZET/DRIZET')
+      EXTERNAL DGAMMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       FUNCTION RRIZET(X)
 C
       CHARACTER*(*) NAME
       PARAMETER(NAME='RRIZET')
+      EXTERNAL GAMMA
 #endif
 C
       DIMENSION P1(0:8),P2(0:8),P3(0:9),P4(0:8)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/g/gamdis.F cernlib-2006.dfsg.2/src/mathlib/gen/g/gamdis.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/g/gamdis.F	1996-04-01 07:02:43.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/g/gamdis.F	2008-01-29 10:00:11.000000000 -0800
@@ -28,6 +28,8 @@
       PARAMETER (Z1 = 1, HALF = Z1/2, QUAR = Z1/4)
       PARAMETER (C1 = 3*Z1/2, KMAX = 300)
 
+      EXTERNAL GAMMA
+
       DATA C
      1/ 0.5772157,-0.6558781,-0.0420026, 0.1665386,-0.0421977,
      2 -0.0096220, 0.0072189,-0.0011652,-0.0002152, 0.0001281,
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c302m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/c302m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c302m.F	1996-04-01 07:01:13.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/c302m.F	2008-01-29 10:00:11.000000000 -0800
@@ -36,6 +36,7 @@
 #include "gen/imp64.inc"
 
       REAL GAMMA
+      EXTERNAL GAMMA, DGAMMA
       CHARACTER*6 TFUNC(2)
 #include "iorc.inc"
 C
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c310m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/c310m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c310m.F	1996-04-01 07:01:14.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/c310m.F	2008-01-29 10:02:19.000000000 -0800
@@ -36,6 +36,7 @@
 
 #include "imp64r.inc"
       REAL  ALGAMA
+      EXTERNAL ALGAMA
 C     Set maximum error allowed for test to be considered successful
       DIMENSION TOL(2),TOLIBM(2)
 
@@ -50,6 +51,7 @@
 #if defined(CERNLIB_DOUBLE)
       DIMENSION  Y(7),T(7)
       REAL            RT(7)
+      EXTERNAL DLGAMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       REAL       Y(7),T(7)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/e408m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/e408m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/e408m.F	1998-11-05 02:41:34.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/e408m.F	2008-01-29 10:00:11.000000000 -0800
@@ -44,6 +44,12 @@
       DATA TXT(2) /'EXP(-X**2)  (-1 <= X <= 1)  LUKE 3.2.2(8)'/
       DATA TXT(3) /'J_1(X)      (-1 <= X <= 1)  LUKE 9.7(7)'/
 
+#if defined(CERNLIB_DOUBLE)
+      EXTERNAL DGAMMA
+#else
+      EXTERNAL GAMMA
+#endif
+
 #if !defined(CERNLIB_WINNT) && !defined(CERNLIB_LINUX)
 # if defined(CERNLIB_DOUBLE)
       GVSUM(N,B,C) = DVSUM(N,B,C)


--- NEW FILE cernlib-217-abend-on-mathlib-test-failure.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 217-abend-on-mathlib-test-failure.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Force mathlib test program to exit non-zero if any test fails.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/main.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/main.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/main.F	1996-09-17 01:53:22.000000000 -0700
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/main.F	2008-02-22 12:24:43.000000000 -0800
@@ -332,5 +332,7 @@
 #endif
 C     Close output streams
       IF (LOUT .NE. 6) CLOSE(UNIT=LOUT)
+C     Exit non-zero if any test failed           
+      IF (NFAIL .NE. 0) CALL EXITF(1)
       STOP
       END


--- NEW FILE cernlib-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by  <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -2,7 +2,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
+#else
 CernlibFortranProgramTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
+#endif
 
 TestTarget(ffread,NullParameter,test.input)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile	2007-12-17 17:55:51.000000000 +0000
@@ -5,6 +5,12 @@
 
 DefinePackageLibrary(hbtlib)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#undef CernlibFortranProgramTarget
+#define CernlibFortranProgramTarget(a,b,c,d,e) \
+	CernlibFortranStaticTarget(a,b,c,d,e)
+#endif
+
 CernlibFortranProgramTarget(hbtest,hexam.o,libhbtlib.a,libhbtlib.a,packlib)
 
 CernlibFortranProgramTarget(hbdiff,htdiffb.o,libhbtlib.a,libhbtlib.a,mathlib)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -5,7 +5,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
+#else
 CernlibFortranProgramTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
+#endif
 
 TestTarget(ktest,NullParameter,ktest.inp)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -5,6 +5,10 @@
 
 SubdirLibraryTarget(zbookt,NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
+#else
 CernlibFortranProgramTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
+#endif
 
 TestTarget(zexam,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -41,6 +41,12 @@
 
 testrz: zebrz1 zebrz2 zebrz3
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#undef CernlibFortranProgramTarget
+#define CernlibFortranProgramTarget(a,b,c,d,e) \
+	CernlibFortranStaticTarget(a,b,c,d,e)
+#endif
+
 CernlibFortranProgramTarget(zebmz1,zebmz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
 CernlibFortranProgramTarget(zebfz1,zebfz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)


--- NEW FILE geant321-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas <pertusus at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.

@DPATCH@
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile	1997-04-10 08:33:14.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam1,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam1,gexam1.dat,gexam1.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile	1997-04-10 08:33:20.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -13,7 +13,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam2,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam2,gexam2.dat,gexam2.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile	1997-04-10 08:33:34.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam3,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam3,gexam3.dat,gexam3.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile	1997-04-10 08:33:37.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -14,7 +14,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam4,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam4,gexam4.dat,gexam4.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile	1997-04-10 08:33:38.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam5,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam5,gexam5.dat,gexam5.input)
 


--- NEW FILE geant321-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.

@DPATCH@
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile	2008-01-04 17:05:50.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile	2008-01-04 17:10:09.000000000 -0800
@@ -3,7 +3,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam1,gexam1.dat,gexam1.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile	2008-01-04 17:10:55.000000000 -0800
@@ -13,7 +13,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam2,gexam2.dat,gexam2.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile	2008-01-04 17:11:26.000000000 -0800
@@ -3,7 +3,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam3,gexam3.dat,gexam3.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile	2008-01-04 17:11:57.000000000 -0800
@@ -14,7 +14,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam4,gexam4.dat,gexam4.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile	2008-01-04 17:12:26.000000000 -0800
@@ -3,7 +3,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam5,gexam5.dat,gexam5.input)
 


--- NEW FILE mclibs-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas <pertusus at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/cojets/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/cojets/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/cojets/test/Imakefile	1996-03-27 09:32:16.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/cojets/test/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(cojetst,test.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib kernlib)
+CernlibFortranProgramTarget(cojetst,test.o,NullParameter,NullParameter,mathlib kernlib cojets)
 
 CopyFile(test.input,test.in)
 
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile	1997-03-14 17:32:14.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -4,11 +4,10 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
-CernlibFortranProgramTarget(eudtest,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
 
 TestTarget(eudtest,eurodec.dat,eutitle.dat)
 
 CopyFile(eutitle.data,eutitle.dat)
 
 LinkFileFromDir($(TOP)$(PACKAGETOP),eurodec.dat)
-
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/herwig/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/herwig/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/herwig/test/Imakefile	1997-01-06 17:06:42.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/herwig/test/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -4,6 +4,6 @@
 DefinePackageLibrary(NullParameter)
 
 
-CernlibFortranProgramTarget(herwigt,test.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(herwigt,test.o,NullParameter,NullParameter,kernlib herwig)
 
 TestTarget(herwigt,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/isajet/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/isajet/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/isajet/test/Imakefile	2000-07-25 16:21:34.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/isajet/test/Imakefile	2008-01-04 18:59:02.000000000 +0000
@@ -6,6 +6,6 @@
 
 LinkFileFromDir($(TOP)$(PACKAGETOP),isajet.dat)
 
-CernlibFortranProgramTarget(isajett,isajett.o,$(PACKAGE_LIB),$(PACKAGE_LIB),pdflib804 mathlib kernlib)
+CernlibFortranProgramTarget(isajett,isajett.o,NullParameter,NullParameter,pdflib804 mathlib kernlib isajet)
 
 TestTarget(isajett,isajet.dat,test.input)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/pdf/tpdf/Imakefile mclibs-2006.dfsg.2/src/mclibs/pdf/tpdf/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/pdf/tpdf/Imakefile	2000-04-19 13:52:13.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/pdf/tpdf/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -13,13 +13,13 @@
 DefinePackageLibrary(NullParameter)
 
 
-CernlibFortranProgramTarget(testpdf,testpdf.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testpdf,testpdf.o,NullParameter,NullParameter,mathlib pdflib)
 
-CernlibFortranProgramTarget(testpdg,testpdg.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testpdg,testpdg.o,NullParameter,NullParameter,mathlib pdflib)
 
-CernlibFortranProgramTarget(testgam,testgam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testgam,testgam.o,NullParameter,NullParameter,mathlib pdflib)
 
-CernlibFortranProgramTarget(test_npdf,test_npdf.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(test_npdf,test_npdf.o,NullParameter,NullParameter,mathlib pdflib)
 
 TestTarget(testpdf,NullParameter,NullParameter)
 TestTarget(testpdg,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/photos/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/photos/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/photos/test/Imakefile	1999-03-26 10:53:26.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/photos/test/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -2,6 +2,6 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(photost,phodem.o pseudo_jetset.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(photost,phodem.o pseudo_jetset.o,NullParameter,NullParameter,kernlib photos)
 
 TestTarget(photost,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/phtools/wicoexam/Imakefile mclibs-2006.dfsg.2/src/phtools/wicoexam/Imakefile
--- mclibs-2006.dfsg.2~/src/phtools/wicoexam/Imakefile	1996-03-22 16:42:50.000000000 +0000
+++ mclibs-2006.dfsg.2/src/phtools/wicoexam/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -1,5 +1,5 @@
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(wicot,wicoex.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(wicot,wicoex.o,NullParameter,NullParameter,packlib phtools)
 
 TestTarget(wicot,NullParameter,NullParameter)


--- NEW FILE mclibs-220-compile-isajet-with-isarun.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 220-compile-isajet-with-isarun.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Compile isajet library including isaset() function.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/pilot.h mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/pilot.h
--- mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/pilot.h	2001-10-08 06:16:58.000000000 -0700
+++ mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/pilot.h	2008-02-06 12:52:46.000000000 -0800
@@ -41,3 +41,6 @@
 #ifndef CERNLIB_MOVEFTN
 #define CERNLIB_MOVEFTN
 #endif
+#ifndef CERNLIB_INTERACT
+#define CERNLIB_INTERACT
+#endif


--- NEW FILE mclibs-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile	2008-01-08 09:47:10.000000000 -0800
+++ mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile	2008-01-08 09:48:35.000000000 -0800
@@ -4,7 +4,11 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
+#else
 CernlibFortranProgramTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
+#endif
 
 TestTarget(eudtest,eurodec.dat,eutitle.dat)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2007 23:27:43 -0000	1.5
+++ .cvsignore	10 Mar 2008 10:31:30 -0000	1.6
@@ -1,6 +1,6 @@
 2006_src-free.tar.gz
 patchy.tar.gz
-geant321_3.21.14.dfsg-5.diff.gz
-mclibs_2006.dfsg.2-1.diff.gz
-paw_2.14.04.dfsg.2-1.diff.gz
-cernlib_2006.dfsg.2-2.diff.gz
+geant321_3.21.14.dfsg-7.diff.gz
+mclibs_2006.dfsg.2-5.diff.gz
+paw_2.14.04.dfsg.2-2.diff.gz
+cernlib_2006.dfsg.2-11.diff.gz


Index: 210-improve-cfortran-header-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/210-improve-cfortran-header-files.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 210-improve-cfortran-header-files.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 210-improve-cfortran-header-files.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -3,7 +3,7 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Protect against multiple inclusion and add explicit dependency on
-## DP: cfortran.h to the Cernlib C headers.
+## DP: cfortran.h to the CERNLIB C headers.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/cfortran/comis.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h


Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 315-fixes-for-MacOSX.dpatch	19 Dec 2007 23:27:43 -0000	1.4
+++ 315-fixes-for-MacOSX.dpatch	10 Mar 2008 10:31:30 -0000	1.5
@@ -2,7 +2,7 @@
 ## 315-fixes-for-MacOSX.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch set (mostly due to Keisuke Fujii) to allow Cernlib to compile
+## DP: Patch set (mostly due to Keisuke Fujii) to allow CERNLIB to compile
 ## DP: and run on OS X.
 
 @DPATCH@


Index: 700-remove-kernlib-from-packlib-Imakefile.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/700-remove-kernlib-from-packlib-Imakefile.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 700-remove-kernlib-from-packlib-Imakefile.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 700-remove-kernlib-from-packlib-Imakefile.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch packlib Imakefile after moving kernlib out of tree.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile


Index: 702-patch-Imakefiles-for-packlib-mathlib.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/702-patch-Imakefiles-for-packlib-mathlib.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 702-patch-Imakefiles-for-packlib-mathlib.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 702-patch-Imakefiles-for-packlib-mathlib.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -83,7 +83,7 @@
 -LIBDIRS= gen bvsl
 +LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
  
- /* Lapack is independent of Cernlib and should be installed as one of
+ /* Lapack is independent of CERNLIB and should be installed as one of
     the build dependencies.
 diff -urNad cernlib-2005.05.09/src/packlib/hbook/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile
 --- cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	1969-12-31 19:00:00.000000000 -0500


Index: 802-create-shared-libraries.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/802-create-shared-libraries.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 802-create-shared-libraries.dpatch	2 Dec 2005 09:57:41 -0000	1.2
+++ 802-create-shared-libraries.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -42,7 +42,7 @@
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
 +InstallSharedLibrary(geant321,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */
  /*
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000


Index: cernlib-102-dont-optimize-some-code.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-102-dont-optimize-some-code.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-102-dont-optimize-some-code.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ cernlib-102-dont-optimize-some-code.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -6,9 +6,21 @@
 ## DP: (either compiler crash or broken code generation).
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	1996-06-12 11:25:38.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-09 11:14:52.470486750 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/c/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/Imakefile	1999-09-24 07:27:41.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/Imakefile	2008-02-22 12:06:26.000000000 -0800
+@@ -117,3 +117,8 @@
+ SpecialFortranLibObjectRule(nzerfz64,nzerfz64,-O,NullParameter)
+ SpecialFortranLibObjectRule(wclbes,wclbes,-O,NullParameter)
+ #endif
++
++#if defined(CERNLIB_GFORTRAN) && ! defined(CERNLIB_IBM)
++/* -O3 optimization causes minor floating point inaccuracies in gfortran 4.2 */
++SpecialFortranLibObjectRule(gamma64,gamma64,-O0,NullParameter)
++#endif
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/d/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/d/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/d/Imakefile	1996-06-12 08:25:38.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/d/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -19,6 +19,11 @@
  SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
  	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
@@ -38,9 +50,9 @@
  FORTRANSAVEOPTION = FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/e/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	1996-05-01 09:21:54.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	2005-06-09 11:16:07.058731880 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/e/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/e/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/e/Imakefile	1996-05-01 06:21:54.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/e/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -12,6 +12,11 @@
  
  #if defined(CERNLIB_DOUBLE)
@@ -53,9 +65,22 @@
  #else
  SRCS_F:= $(SRCS_F) chsum128.F rchebn.F rcspln128.F
  #endif
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 06:20:57.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	2005-06-09 11:09:34.621022534 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/tcgen/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/tcgen/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/tcgen/Imakefile	1997-02-04 09:36:14.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/tcgen/Imakefile	2008-02-22 12:08:44.000000000 -0800
+@@ -63,4 +63,9 @@
+ SRCS_F := $(SRCS_F) chtoi.F itoch.F
+ #endif
+ 
++#if defined(CERNLIB_GFORTRAN)
++/* -O2 optimization causes miscompiled code in gfortran 4.3 on ia64 */
++SpecialFortranLibObjectRule(tlsc,tlsc,-O0,NullParameter)
++#endif
++
+ SubdirLibraryTarget(NullParameter,NullParameter)
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/c204fort/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/c204fort/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 03:20:57.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/c204fort/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -14,6 +14,11 @@
  FDEBUGFLAGS=+O1
  #endif
@@ -68,9 +93,9 @@
  FORTRANSAVEOPTION = FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 06:04:36.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	2005-06-09 11:10:40.068274255 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/g900fort/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/g900fort/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 03:04:36.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/g900fort/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -4,6 +4,11 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif


Index: cernlib-211-support-amd64-and-itanium.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-211-support-amd64-and-itanium.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-211-support-amd64-and-itanium.dpatch	19 Dec 2007 23:27:43 -0000	1.1
+++ cernlib-211-support-amd64-and-itanium.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,16 +2,16 @@
 ## 211-support-amd64-and-itanium.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Large patch from Harald Vogt <hvogt at ifh.de> to make Cernlib work better
+## DP: Large patch from Harald Vogt <hvogt at ifh.de> to make CERNLIB work better
 ## DP: (at least when statically linked) on 64-bit architectures.
 ## DP: Slightly modified in an attempt to keep ABI compatibility of the
 ## DP: dynamic libraries; not that it matters much as they don't work well
 ## DP: when dynamically linked on 64-bit anyway.
 
 @DPATCH@
-diff -urNad cernlib-2005.dfsg~/src/cfortran/hbook.h cernlib-2005.dfsg/src/cfortran/hbook.h
---- cernlib-2005.dfsg~/src/cfortran/hbook.h	1999-11-15 12:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/cfortran/hbook.h	2006-09-20 20:12:21.887676289 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/cfortran/hbook.h cernlib-2006.dfsg.2/src/cfortran/hbook.h
+--- cernlib-2006.dfsg.2~/src/cfortran/hbook.h	1999-11-15 17:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/cfortran/hbook.h	2007-12-14 21:41:27.000000000 +0000
 @@ -489,6 +489,10 @@
  #define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
          CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
@@ -37,9 +37,9 @@
  PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
  #define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.dfsg/src/packlib/cspack/cspack/hcntpar.inc
---- cernlib-2005.dfsg~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 10:44:16.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/cspack/cspack/hcntpar.inc	2006-09-20 20:12:21.887676289 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2006.dfsg.2/src/packlib/cspack/cspack/hcntpar.inc
+--- cernlib-2006.dfsg.2~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 15:44:16.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/cspack/cspack/hcntpar.inc	2007-12-14 21:41:27.000000000 +0000
 @@ -22,7 +22,7 @@
       +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
       +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
@@ -49,9 +49,9 @@
  *
  
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c	2006-09-20 20:12:20.249025177 -0400
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c	2006-09-20 20:12:22.046642443 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/cspack/sysreq/netreq.c cernlib-2006.dfsg.2/src/packlib/cspack/sysreq/netreq.c
+--- cernlib-2006.dfsg.2~/src/packlib/cspack/sysreq/netreq.c	2007-12-14 21:41:17.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/cspack/sysreq/netreq.c	2007-12-14 21:41:27.000000000 +0000
 @@ -341,7 +341,7 @@
                  return(-errno);
          }
@@ -61,9 +61,9 @@
  		TRACE(2, "sysreq", "RecvStr(RepLen): (errno=%d)", errno);
                  (void) close(s);
  		END_TRACE();
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.dfsg/src/packlib/hbook/hbook/hcntpar.inc
---- cernlib-2005.dfsg~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 12:07:52.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hbook/hcntpar.inc	2006-09-20 20:12:22.104630097 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2006.dfsg.2/src/packlib/hbook/hbook/hcntpar.inc
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 17:07:52.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hbook/hcntpar.inc	2007-12-14 21:41:27.000000000 +0000
 @@ -24,7 +24,7 @@
       +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
       +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
@@ -73,9 +73,9 @@
  *
  
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hcreatem.F cernlib-2005.dfsg/src/packlib/hbook/hmmap/hcreatem.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hcreatem.F	1996-03-13 05:13:20.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hmmap/hcreatem.F	2006-09-20 20:12:22.326582841 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hcreatem.F cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hcreatem.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hcreatem.F	1996-03-13 10:13:20.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hcreatem.F	2007-12-14 21:41:27.000000000 +0000
 @@ -39,11 +39,11 @@
  ************************************************************************
  *
@@ -101,9 +101,9 @@
  #if (defined(CERNLIB_DECS))&&(!defined(CERNLIB_ALPHA))
        ICOMAD(1) = 4*LOCF(ICOMAD(1)) + MFEN
        ICOMAD(1) = ((ICOMAD(1)+4095)/4096)*4096
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hmapm.F cernlib-2005.dfsg/src/packlib/hbook/hmmap/hmapm.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hmapm.F	2001-10-02 05:06:15.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/hbook/hmmap/hmapm.F	2006-09-20 20:12:22.343579222 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hmapm.F cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hmapm.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hmapm.F	2001-10-02 09:06:15.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hmapm.F	2007-12-14 21:41:27.000000000 +0000
 @@ -54,11 +54,11 @@
  ************************************************************************
  *
@@ -129,9 +129,9 @@
  #if defined(CERNLIB_DECS)
        ICOMAD(1) = 4*LOCF(ICOMAD(1)) + MFEN
        ICOMAD(1) = ((ICOMAD(1)+4095)/4096)*4096
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hballoc.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 12:07:56.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hballoc.F	2006-09-20 20:12:22.343579222 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hballoc.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hballoc.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 17:07:56.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hballoc.F	2007-12-14 21:41:27.000000000 +0000
 @@ -42,3 +42,26 @@
        ENDIF
  *
@@ -159,9 +159,9 @@
 +      ENDIF
 +*
 +      END
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hbnt.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 12:07:56.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hbnt.F	2006-09-20 20:12:22.344579009 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hbnt.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hbnt.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 17:07:56.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hbnt.F	2007-12-14 21:41:27.000000000 +0000
 @@ -269,11 +269,13 @@
   ************************************************************************
   *      *         *                                                     *
@@ -177,9 +177,9 @@
   ************************************************************************
  #endif
  *
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgnt2.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 10:42:35.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgnt2.F	2006-09-20 20:12:22.344579009 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgnt2.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgnt2.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 15:42:35.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgnt2.F	2007-12-14 21:41:27.000000000 +0000
 @@ -34,7 +34,13 @@
  #include "hbook/hcrecv.inc"
  *
@@ -218,9 +218,9 @@
           ENDIF
           LQ(LTMP1-IQ(LTMP1+1)) = LBLOK
  *
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntbf.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 12:07:57.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntbf.F	2006-09-20 20:12:22.345578796 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntbf.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntbf.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 17:07:57.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntbf.F	2007-12-14 21:41:27.000000000 +0000
 @@ -26,3 +26,13 @@
        CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
  *
@@ -235,9 +235,9 @@
 +      CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
 +*
 +      END
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntf.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 10:42:35.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntf.F	2006-09-20 20:14:51.026922890 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntf.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntf.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 15:42:35.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntf.F	2007-12-14 21:41:27.000000000 +0000
 @@ -37,6 +37,13 @@
        INTEGER       ILOGIC
        LOGICAL       LOGIC, INDVAR, USEBUF
@@ -289,9 +289,9 @@
           ENDIF
  *
     40 CONTINUE
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 12:44:52.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile	2006-09-20 20:12:22.345578796 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 16:44:52.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/Imakefile	2007-12-14 21:41:27.000000000 +0000
 @@ -11,6 +11,10 @@
  	sleepf.c signalf.c sigprnt.c sigunbl.c stati.c systei.c \ @@\
  	tminit.c unlini.c tmread.c
@@ -303,9 +303,9 @@
  #ifndef CERNLIB_OS9
  SRCS_C += timel.c lstati.c
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/chkloc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/chkloc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/chkloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/chkloc.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/chkloc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/chkloc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/chkloc.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/chkloc.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,10 @@
 +/*
 + * Utility routine for locf and locb 
@@ -317,9 +317,9 @@
 +#include "lp64gs/chkloc.c"
 +#endif
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumptn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumptn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2004-07-29 10:07:43.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumptn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumptn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2004-07-29 14:07:43.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -20,8 +20,10 @@
   */
  #include "kerngen/pilot.h"
@@ -333,9 +333,9 @@
  #else
  /*>    ROUTINE JUMPTN
    CERN PROGLIB# Z043    JUMPTN          .VERSION KERNFOR  4.40  940929
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumpxn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2004-07-29 10:07:43.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumpxn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2004-07-29 14:07:43.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -20,8 +20,10 @@
   */
  #include "kerngen/pilot.h"
@@ -348,9 +348,9 @@
  #else
  /*>    ROUTINE JUMPXN
    CERN PROGLIB# Z042    JUMPXN          .VERSION KERNFOR  4.40  940929
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lenocc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lenocc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lenocc.c	1997-10-23 12:25:11.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lenocc.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lenocc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lenocc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lenocc.c	1997-10-23 16:25:11.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lenocc.c	2007-12-14 21:41:27.000000000 +0000
 @@ -46,7 +46,7 @@
  
  /*        look at the last ntail characters   */
@@ -360,9 +360,9 @@
        for (i = ntail; i > 0; i--)
          { if (*--chcur != ' ')       goto exit; }
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 10:26:37.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c	2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locb.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locb.c	2007-12-14 21:41:27.000000000 +0000
 @@ -26,6 +26,9 @@
  # define DummyDef
  #endif
@@ -382,9 +382,9 @@
  #undef CERNLIB_TCGEN_LOCB
  #endif
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locf.c	2004-07-29 10:06:07.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locf.c	2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locf.c	2004-07-29 14:06:07.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locf.c	2007-12-14 21:41:27.000000000 +0000
 @@ -50,6 +50,8 @@
  #include "irtdgs/locf.c"
  #elif defined(CERNLIB_QMVAOS)
@@ -420,9 +420,9 @@
  }
  #undef Dummy2LocPar
  #undef DummyDef
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,58 @@
 +/*
 + *
@@ -482,16 +482,16 @@
 +}
 +/*> END <----------------------------------------------------------*/
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,83 @@
 +/*
 + * $Id$
 + *
 + * $Log$
-+ * Revision 1.1  2007/12/19 23:27:43  pertusus
-+ * sync with devel
++ * Revision 1.2  2008/03/10 10:31:30  pertusus
++ * sync with devel, without ABI incompatible changes
 + *
 + * Revision 1.1.1.1  1996/02/15 17:49:32  mclareni
 + * Kernlib
@@ -572,16 +572,16 @@
 +    return;
 +}
 +/*> END <----------------------------------------------------------*/
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,92 @@
 +/*
 + * $Id$
 + *
 + * $Log$
-+ * Revision 1.1  2007/12/19 23:27:43  pertusus
-+ * sync with devel
++ * Revision 1.2  2008/03/10 10:31:30  pertusus
++ * sync with devel, without ABI incompatible changes
 + *
 + * Revision 1.1.1.1  1996/02/15 17:49:32  mclareni
 + * Kernlib
@@ -671,10 +671,10 @@
 +    return;
 +}
 +/*> END <----------------------------------------------------------*/
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	2006-09-20 20:12:22.584527921 -0400
-@@ -0,0 +1,12 @@
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	2007-12-14 21:52:38.000000000 +0000
+@@ -0,0 +1,37 @@
 +/*>    ROUTINE LOCB
 +  CERN PROGLIB# N101    LOCB            .VERSION KERNFOR  4.36  930602
 +*/
@@ -687,9 +687,34 @@
 +   return (chkloc(iadr));
 +}
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	2006-09-20 20:12:22.584527921 -0400
++#include <stdint.h>    /* for ptrdiff_t, size_t */
++#include <stdio.h>     /* for fprintf */
++#include <stdlib.h>    /* for exit    */
++
++int iptrdiff_(iadr1, iadr2)
++   char * iadr1, * iadr2;
++{
++  long diff = (long)iadr1 - (long)iadr2;
++  if (diff < (long)INT32_MIN || diff > (long)INT32_MAX) {
++      fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
++      fprintf(stderr, "IPTRDIFF: difference of addresses %p and %p\n", iadr1, iadr2);
++      fprintf(stderr, "cannot be stored in 32-bit signed integer!\n");
++      fprintf(stderr, "This may result in program crash or incorrect results\n");
++      fprintf(stderr, "Therefore we will stop here\n");
++      fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
++      exit (999);
++  }
++  else return (int)diff;
++}
++
++int iptrsame_(iadr1, iadr2)
++   char * iadr1, * iadr2;
++{
++  return (size_t)iadr1 == (size_t)iadr2 ? 1 : 0;
++}
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,10 @@
 +/*>    ROUTINE LOCF
 +  CERN PROGLIB# N100    LOCF            .VERSION KERNFOR  4.36  930602
@@ -701,9 +726,9 @@
 +{
 +   return ( (chkloc(iadr)) >> 2 );
 +}
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/signalf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/signalf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/signalf.c	1999-10-06 10:17:01.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/signalf.c	2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/signalf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/signalf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/signalf.c	1999-10-06 14:17:01.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/signalf.c	2007-12-14 21:41:27.000000000 +0000
 @@ -45,6 +45,7 @@
  C-        function value = adr of previous handler
  */
@@ -742,9 +767,9 @@
  #ifndef __GNUC__
        if (oldhand == SIG_ERR)  istat = -1;
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/kkern.c cernlib-2005.dfsg/src/packlib/kuip/code_kuip/kkern.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/kkern.c	1996-05-01 08:08:38.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_kuip/kkern.c	2006-09-20 20:12:22.585527708 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_kuip/kkern.c cernlib-2006.dfsg.2/src/packlib/kuip/code_kuip/kkern.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_kuip/kkern.c	1996-05-01 12:08:38.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_kuip/kkern.c	2007-12-14 21:41:27.000000000 +0000
 @@ -39,7 +39,8 @@
    if( len >= (sizeof blanks) * 4 ) {
  
@@ -755,9 +780,9 @@
      case 7:
        if( str[--len] != ' ' ) return len + 1;
      case 6:
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kmbrow.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/kmbrow.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kmbrow.c	1996-03-08 10:33:08.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/kmbrow.c	2006-09-20 20:12:22.586527495 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kmbrow.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kmbrow.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kmbrow.c	1996-03-08 15:33:08.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kmbrow.c	2007-12-14 21:41:27.000000000 +0000
 @@ -278,7 +278,7 @@
     char         *path, *title;
     char          cval[MAX_string], cval1[MAX_string];
@@ -767,9 +792,9 @@
  
     BrObject *brobj;
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kuxxt.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/kuxxt.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kuxxt.c	1996-03-08 10:33:11.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/kuxxt.c	2006-09-20 20:12:22.587527283 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kuxxt.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kuxxt.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kuxxt.c	1996-03-08 15:33:11.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kuxxt.c	2007-12-14 21:41:27.000000000 +0000
 @@ -340,7 +340,7 @@
  {
          (void) XDeleteContext( XtDisplay( UxTopLevel ),
@@ -788,9 +813,9 @@
  
          return ( UX_NO_ERROR );
  }
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdcmp.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdcmp.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdcmp.c	1996-03-15 10:54:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdcmp.c	2006-09-20 20:12:22.587527283 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdcmp.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdcmp.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdcmp.c	1996-03-15 15:54:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdcmp.c	2007-12-14 21:41:27.000000000 +0000
 @@ -1541,7 +1541,11 @@
  
     Widget cpanel = stag->command_panel;
@@ -804,9 +829,9 @@
     KmParameter *par   = cmd->par[ipar];
     KmParFile   *pfil  = par->ptype;
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdgra.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdgra.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdgra.c	1996-03-08 10:33:07.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdgra.c	2006-09-20 20:12:22.588527070 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdgra.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdgra.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdgra.c	1996-03-08 15:33:07.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdgra.c	2007-12-14 21:41:27.000000000 +0000
 @@ -289,11 +289,12 @@
     km_graph_init_callbacks (km_graphicsDraw, graph_widget, wkid, 0);
  }
@@ -822,9 +847,9 @@
     if (flag == 0) {
         XtAddCallback(draw, XmNexposeCallback,
                       (XtCallbackProc)drawing_area_callback, graph_widget);
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkuip.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkuip.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkuip.c	2006-09-20 20:12:20.148046676 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkuip.c	2006-09-20 20:12:22.589526857 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkuip.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkuip.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkuip.c	2007-12-14 21:41:17.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkuip.c	2007-12-14 21:41:27.000000000 +0000
 @@ -1687,7 +1687,7 @@
              XmStringFree(xmstr);
         } /* end for ... */
@@ -852,9 +877,9 @@
             XtManageChild(PdMenu);
          }
      }
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/help.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/help.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/help.c	1996-03-08 10:33:04.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/help.c	2006-09-20 20:12:22.590526644 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/help.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/help.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/help.c	1996-03-08 15:33:04.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/help.c	2007-12-14 21:41:27.000000000 +0000
 @@ -309,7 +309,7 @@
      int     *type;
      XmAnyCallbackStruct *call_data;
@@ -864,9 +889,9 @@
  
     if (help[t])
        XRaiseWindow(XtDisplay(help[t]), XtWindow(help[t]));
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/kxterm.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/kxterm.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/kxterm.c	2005-04-18 11:40:49.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/kxterm.c	2006-09-20 20:12:22.591526431 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/kxterm.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/kxterm.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/kxterm.c	2005-04-18 15:40:49.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/kxterm.c	2007-12-14 21:41:27.000000000 +0000
 @@ -1533,7 +1533,7 @@
       XtPointer cbs;
  {
@@ -876,9 +901,9 @@
     Boolean result = True;
  
     text_w = get_selection_owner(widget);
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/uxxt.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/uxxt.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/uxxt.c	1996-03-08 10:33:04.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/uxxt.c	2006-09-20 20:12:22.591526431 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/uxxt.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/uxxt.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/uxxt.c	1996-03-08 15:33:04.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/uxxt.c	2007-12-14 21:41:27.000000000 +0000
 @@ -340,7 +340,7 @@
  {
          (void) XDeleteContext( XtDisplay( UxTopLevel ),
@@ -897,9 +922,9 @@
  
          return ( UX_NO_ERROR );
  }
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/zerror.F cernlib-2005.dfsg/src/packlib/zbook/code/zerror.F
---- cernlib-2005.dfsg~/src/packlib/zbook/code/zerror.F	1996-03-08 07:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/zerror.F	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/zerror.F cernlib-2006.dfsg.2/src/packlib/zbook/code/zerror.F
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/zerror.F	1996-03-08 12:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/zerror.F	2007-12-14 21:41:27.000000000 +0000
 @@ -16,6 +16,10 @@
  C     ******************************************************************
  C
@@ -934,9 +959,9 @@
  C
        IF (NEWERR.LE.0)RETURN
  C
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.dfsg/src/packlib/zbook/code/zjump.c
---- cernlib-2005.dfsg~/src/packlib/zbook/code/zjump.c	1996-03-08 07:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/zjump.c	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/zjump.c cernlib-2006.dfsg.2/src/packlib/zbook/code/zjump.c
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/zjump.c	2007-12-14 21:41:27.000000000 +0000
 @@ -7,6 +7,9 @@
   *
   */
@@ -971,9 +996,9 @@
  }
  #endif
 +#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/ztrap.F cernlib-2005.dfsg/src/packlib/zbook/code/ztrap.F
---- cernlib-2005.dfsg~/src/packlib/zbook/code/ztrap.F	1996-03-08 07:01:13.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/ztrap.F	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/ztrap.F cernlib-2006.dfsg.2/src/packlib/zbook/code/ztrap.F
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/ztrap.F	1996-03-08 12:01:13.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/ztrap.F	2007-12-14 21:41:27.000000000 +0000
 @@ -48,8 +48,10 @@
  #if defined(CERNLIB_BESM6)
        IZ(JZ+19) = LOCF(IUSER)
@@ -986,9 +1011,9 @@
  #endif
        END
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.dfsg/src/packlib/zebra/test/brztest/btest2.F
---- cernlib-2005.dfsg~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 11:16:16.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/zebra/test/brztest/btest2.F	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/brztest/btest2.F cernlib-2006.dfsg.2/src/packlib/zebra/test/brztest/btest2.F
+--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zebra/test/brztest/btest2.F	2007-12-14 21:41:27.000000000 +0000
 @@ -29,6 +29,15 @@
  ********************************************************************************
  *


Index: cernlib-211-support-digital-alpha.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-211-support-digital-alpha.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-211-support-digital-alpha.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-211-support-digital-alpha.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -27,7 +27,7 @@
      if ( jadr != 0x6000000000000000) {
 +#elif defined (__alpha__)
 +    if ( jadr != 0x0000000100000000) {
-+#else  /* amd64 */
++#else  /* amd64 or ppc64 */
 +    if ( jadr != 0) {
  #endif
        fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");


Index: cernlib-303-shadow-passwords-supported.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-303-shadow-passwords-supported.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-303-shadow-passwords-supported.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ cernlib-303-shadow-passwords-supported.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 303-shadow-passwords-supported.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow Cern's server code to read from /etc/shadow.
+## DP: Allow CERN's server code to read from /etc/shadow.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c


Index: cernlib-304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-304-update-Imake-config-files.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-304-update-Imake-config-files.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-304-update-Imake-config-files.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -3,19 +3,19 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Use Imake.cf stolen from recent XFree86 code, as it is much more
-## DP: up-to-date than the Imake.cf in Cernlib source.  Also update linux.cf
+## DP: up-to-date than the Imake.cf in CERNLIB source.  Also update linux.cf
 ## DP: to support most Linux architectures.
 
 @DPATCH@
-diff -urNad cernlib-2006.dfsg~/src/config/Imake.cf cernlib-2006.dfsg/src/config/Imake.cf
---- cernlib-2006.dfsg~/src/config/Imake.cf	2006-09-15 05:34:47.000000000 -0400
-+++ cernlib-2006.dfsg/src/config/Imake.cf	2007-01-09 19:03:04.701920749 -0500
-@@ -1,27 +1,10 @@
+diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.cf cernlib-2006.dfsg.2/src/config/Imake.cf
+--- cernlib-2006.dfsg.2~/src/config/Imake.cf	2006-09-15 02:34:47.000000000 -0700
++++ cernlib-2006.dfsg.2/src/config/Imake.cf	2008-01-11 09:52:56.000000000 -0800
+@@ -1,27 +1,5 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.2  2007/12/19 23:27:43  pertusus
-- * sync with devel
+- * Revision 1.3  2008/03/10 10:31:30  pertusus
+- * sync with devel, without ABI incompatible changes
 - *
 - * Revision 1.6  2006/09/15 09:34:47  mclareni
 - * Submitted mods for gcc4/gfortran and MacOSX, corrected to work also on slc4 with gcc3.4 and 4.1
@@ -36,22 +36,46 @@
 - * X11R6 config files unmodified
 - *
 - *
-+/* This is the Imake.cf file stolen from XFree86 4.3.0, patched for Debian
-+   (version 4.3.0.dfsg.1-4).  It is a major improvement (several years ahead)
-+   of the Imake.cf file originally packed with Cernlib.
-+   -- Kevin McCarty, for Debian
-  */
+- */
 -XCOMM $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $
-+
++XCOMM $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
 +XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
  /*
   * To add support for another platform:
   * 
-@@ -40,184 +23,358 @@
+@@ -40,257 +18,586 @@
   *
   *     4.  Create a .cf file with the name given by MacroFile.
   */
-+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.81 2003/02/18 16:51:45 tsi Exp $
++XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
+ 
+-#ifdef ultrix
+-#define MacroIncludeFile <ultrix.cf>
+-#define MacroFile ultrix.cf
+-#ifdef vax
+-#undef vax
+-#define VaxArchitecture
+-#endif
+-#ifdef mips
+-#undef mips
+-#define MipsArchitecture
++#if defined(__APPLE__)
++# undef __APPLE__
++# define MacroIncludeFile <MacOSX.cf>
++# define MacroFile MacOSX.cf
++# define MacOSXArchitecture
++# define DarwinArchitecture
++# ifdef __ppc__
++#  define PpcDarwinArchitecture
++#  undef __ppc__
++# endif
++# ifdef __i386__
++#  define i386DarwinArchitecture
++#  undef __i386__
++# endif
+ #endif
+-#undef ultrix
+-#define UltrixArchitecture
 +
 +#if defined(clipper) || defined(__clipper__)
 +# undef clipper
@@ -73,20 +97,8 @@
 +#undef _X86_
 +#undef __CYGWIN__
 +#endif /* CYGWIN */
- 
- #ifdef ultrix
--#define MacroIncludeFile <ultrix.cf>
--#define MacroFile ultrix.cf
--#ifdef vax
--#undef vax
--#define VaxArchitecture
--#endif
--#ifdef mips
--#undef mips
--#define MipsArchitecture
--#endif
--#undef ultrix
--#define UltrixArchitecture
++
++#ifdef ultrix
 +# define MacroIncludeFile <ultrix.cf>
 +# define MacroFile ultrix.cf
 +# ifdef vax
@@ -102,12 +114,13 @@
 +# define UltrixArchitecture
  #endif /* ultrix */
  
- #if defined(vax) && !defined(UltrixArchitecture)
+-#if defined(vax) && !defined(UltrixArchitecture)
 -#define MacroIncludeFile <bsd.cf>
 -#define MacroFile bsd.cf
 -#undef vax
 -#define BSDArchitecture
 -#define VaxArchitecture
++#if defined(vax) && !defined(UltrixArchitecture) && !defined(__OpenBSD__)
 +# define MacroIncludeFile <bsd.cf>
 +# define MacroFile bsd.cf
 +# undef vax
@@ -115,16 +128,20 @@
 +# define VaxArchitecture
  #endif /* vax */
  
- #ifdef bsdi
+-#ifdef bsdi
 -#define MacroIncludeFile <bsdi.cf>
 -#define MacroFile bsdi.cf
 -#undef bsdi
 -#define BSD386Architecture
 -#define i386BsdArchitecture
 -#define i386Architecture
++#ifdef __bsdi__
 +# define MacroIncludeFile <bsdi.cf>
 +# define MacroFile bsdi.cf
-+# undef bsdi
++# undef __bsdi__
++# ifdef bsdi
++#  undef bsdi
++# endif
 +# define BSDOSArchitecture
 +# if defined(__i386__) || defined(i386)
 +#  define i386BsdArchitecture
@@ -132,7 +149,14 @@
 +#  undef i386
 +#  undef __i386__
 +# endif
++# if defined(__ppc__) || defined(ppc)
++#  define PpcBsdArchitecture
++#  define PpcArchitecture
++#  undef ppc
++#  undef __ppc__
++# endif
 +# if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc)
++#  define SparcBsdArchitecture
 +#  define SparcArchitecture
 +#  undef sparc
 +#  undef __sparc__
@@ -140,10 +164,23 @@
 +# endif
  #endif /* bsdi */
  
+-#ifdef __NetBSD__
+-#define MacroIncludeFile <NetBSD.cf>
+-#define MacroFile NetBSD.cf
+-#undef __NetBSD__
+-#define NetBSDArchitecture
+-#ifdef __i386__
+-#define i386BsdArchitecture
+-#define i386Architecture
+-#endif
+-#if defined(__sparc__) || defined(sparc)
+-#define SparcArchitecture
+-#undef sparc
 +#ifdef __OpenBSD__
 +# undef __OpenBSD__
 +# undef __NetBSD__
 +# define OpenBSDArchitecture
++# define KOpenBSDArchitecture
 +# define MacroIncludeFile <OpenBSD.cf>
 +# define MacroFile OpenBSD.cf
 +# ifdef __i386__
@@ -159,7 +196,7 @@
 +#  endif
 +#  undef sparc
 +# endif
-+# ifdef mips
++# if defined(__mips__) || defined(mips)
 +#   define MipsArchitecture
 +#   ifdef arc
 +#     define ArcArchitecture
@@ -176,7 +213,13 @@
 +#   undef __alpha__
 +#   undef alpha
 +# endif
-+# ifdef mc68020
++# if defined(__amd64__) || defined(__x86_64__)
++#   define AMD64Architecture
++#   undef __amd64__
++#   undef __x86_64__
++#   undef amd64
++# endif
++# if defined(__mc68020__) || defined(mc68020)
 +#  define Mc68020Architecture
 +#  if defined(amiga)
 +#   define AmigaArchitecture
@@ -201,30 +244,35 @@
 +#  undef mc68000
 +# endif
 +# ifdef __powerpc__
-+#  define PPCArchitecture
++#  define PpcArchitecture
 +#  undef __powerpc__
 +#  undef __macppc__
 +#  undef macppc
 +# endif
++# ifdef __vax__
++#  undef vax
++#  undef __vax__
++#  define VaxArchitecture
++# endif
++# ifdef __hppa__
++#  ifndef HPArchitecture
++#   define HPArchitecture
++#  endif
++#  undef __hppa__
++# endif /* __hppa__ */
 +#endif /* OpenBSD */
 +
- #ifdef __NetBSD__
--#define MacroIncludeFile <NetBSD.cf>
--#define MacroFile NetBSD.cf
--#undef __NetBSD__
--#define NetBSDArchitecture
--#ifdef __i386__
--#define i386BsdArchitecture
--#define i386Architecture
--#endif
--#if defined(__sparc__) || defined(sparc)
--#define SparcArchitecture
--#undef sparc
--#endif
++/* Systems based on kernel of OpenBSD */
++#if defined(__OpenBSD_kernel__)
++#define KOpenBSDArchitecture
+ #endif
++
++#ifdef __NetBSD__
 +# define MacroIncludeFile <NetBSD.cf>
 +# define MacroFile NetBSD.cf
 +# undef __NetBSD__
 +# define NetBSDArchitecture
++# define KNetBSDArchitecture
 +# ifdef __i386__
 +#  define i386BsdArchitecture
 +#  define i386Architecture
@@ -262,7 +310,7 @@
 +#   undef __vax__
 +# endif
 +# ifdef __powerpc__
-+#   define PPCArchitecture
++#   define PpcArchitecture
 +#   undef __powerpc__
 +# endif
  #endif /* NetBSD */
@@ -275,17 +323,44 @@
 -#ifdef __i386__
 -#define i386BsdArchitecture
 -#define i386Architecture
-+#ifdef __GNU_FreeBSD__
-+#define MacroIncludeFile <gnu-freebsd.cf>
-+#define MacroFile gnu-freebsd.cf
-+#define GNUFreeBSDArchitecture
++/* Systems based on kernel of NetBSD */
++#if defined(__NetBSD_kernel__)
++#define KNetBSDArchitecture
  #endif
 +
++#ifdef __DragonFly__
++# define MacroIncludeFile <DragonFly.cf>
++# define MacroFile DragonFly.cf
++# undef __DragonFly__
++# undef __FreeBSD__
++# define DragonFlyArchitecture
++# define FreeBSDArchitecture
++# ifdef __i386__
++#  define i386BsdArchitecture
++#  define i386Architecture
++#  undef i386
++# endif
++# ifdef __sparc64__
++#  define Sparc64Architecture
++#  undef __sparc64__
++# endif
++# ifdef __ia64__
++#  define ia64Architecture
++#  undef __ia64__
++# endif
++# ifdef __amd64__
++#  define x86_64Architecture
++#  undef __amd64__
++#  undef __x86_64__
++# endif
++#endif /* __DragonFly__ */
++
 +#ifdef __FreeBSD__
 +# define MacroIncludeFile <FreeBSD.cf>
 +# define MacroFile FreeBSD.cf
 +# undef __FreeBSD__
 +# define FreeBSDArchitecture
++# define KFreeBSDArchitecture
 +# ifdef __i386__
 +#  define i386BsdArchitecture
 +#  define i386Architecture
@@ -300,9 +375,22 @@
 +#  define Sparc64Architecture
 +#  undef __sparc64__
 +# endif
++# ifdef __ia64__
++#  define ia64Architecture
++#  undef __ia64__
++# endif
++# ifdef __amd64__
++#  define AMD64Architecture
++#  undef __amd64__
++#  undef __x86_64__
++# endif
++# ifdef __powerpc__
++#  define PpcArchitecture
++#  undef __powerpc__
++# endif
  #endif /* __FreeBSD__ */
  
- #ifdef AMOEBA
+-#ifdef AMOEBA
 -/* Should be before the 'sun' entry because we may be cross-compiling */
 -#define MacroIncludeFile <Amoeba.cf>
 -#define MacroFile Amoeba.cf
@@ -318,11 +406,16 @@
 -#define SunArchitecture
 -#endif
 -#endif
--#endif
++/* Systems based on kernel of FreeBSD */
++#if defined(__FreeBSD_kernel__)
++#define KFreeBSDArchitecture
+ #endif
 -#undef i80386
 -#undef mc68000
 -#undef sparc
 -#undef sun
++
++#ifdef AMOEBA
 + /* Should be before the 'sun' entry because we may be cross-compiling */
 +# define MacroIncludeFile <Amoeba.cf>
 +# define MacroFile Amoeba.cf
@@ -374,11 +467,22 @@
 +# endif
 +# ifdef sparc
 +#  undef sparc
-+# define SparcArchitecture
++#  define SparcArchitecture
++# endif
++# ifdef __sparcv9
++#  undef __sparcv9
++#  define Sparc64Architecture
 +# endif
 +# ifdef mc68000
 +#  undef mc68000
-+# define Sun3Architecture
++#  define Sun3Architecture
++# endif
++# if defined(__amd64) || defined(__x86_64)
++#  undef __amd64
++#  undef __x86_64
++#  undef amd64
++#  undef i386
++#  define AMD64Architecture
 +# endif
 +# ifdef i386
 +#  undef i386
@@ -399,9 +503,18 @@
 +# define HPArchitecture
  #endif /* hpux */
  
-+#ifdef sco
+-#ifdef USL
+-#define MacroIncludeFile <usl.cf>
+-#define MacroFile usl.cf
+-#undef USL
+-#undef SVR4
+-#define SVR4Architecture
+-#define i386Architecture
+-#endif /* USL */
++#ifdef __SCO__
 +# define MacroIncludeFile <sco5.cf>
 +# define MacroFile sco5.cf
++# undef __SCO__
 +# undef sco
 +# undef USL
 +# undef SYSV
@@ -414,24 +527,60 @@
 +# define SVR3Architecture
 +# define i386ScoArchitecture
 +# define i386Sco325Architecture
-+#endif /* sco - SCO Open Server 5 */
++# undef i386
++# undef i486
++# undef i586
++# undef i686
++# undef k6
++# undef __i386__
++# undef __i486__
++# undef __i586__
++# undef __i686__
++# undef __k6__
++# undef __i386
++# undef __i486
++# undef __i586
++# undef __i686
++# undef __k6
++# undef pentium
++# undef __pentium
++# undef pentiumpro
++# undef __pentiumpro
++#endif /* __SCO__ - SCO Open Server 5 */
 +
- #ifdef USL
--#define MacroIncludeFile <usl.cf>
--#define MacroFile usl.cf
--#undef USL
--#undef SVR4
--#define SVR4Architecture
--#define i386Architecture
++#ifdef __UNIXWARE__
 +# define MacroIncludeFile <usl.cf>
 +# define MacroFile usl.cf
++# undef __UNIXWARE__
 +# undef USL
 +# undef SVR4
 +# undef i386
++# undef SVR5
++# undef SYSV5
 +# define SVR4Architecture
 +# define i386Architecture
 +# define USLArchitecture
- #endif /* USL */
++# define UnixWareArchitecture
++# undef i386
++# undef i486
++# undef i586
++# undef i686
++# undef k6
++# undef __i386__
++# undef __i486__
++# undef __i586__
++# undef __i686__
++# undef __k6__
++# undef __i386
++# undef __i486
++# undef __i586
++# undef __i686
++# undef __k6
++# undef pentium
++# undef __pentium
++# undef pentiumpro
++# undef __pentiumpro
++#endif /* __UNIXWARE__ */
  
  #ifdef NCR
 -#define MacroIncludeFile <ncr.cf>
@@ -539,21 +688,13 @@
 +# define MacIIArchitecture
  #endif /* macII */
  
- #ifdef __APPLE__
-@@ -225,72 +382,89 @@
- # define MacroFile MacOSX.cf
- # define MacOSXArchitecture
- # define DarwinArchitecture
-+# ifdef __ppc__
-+#  define PpcDarwinArchitecture
-+#  undef __ppc__
-+# endif
-+# ifdef __i386__
-+#  define i386DarwinArchitecture
-+#  undef __i386__
-+# endif
- #endif
- 
+-#ifdef __APPLE__
+-# define MacroIncludeFile <MacOSX.cf>
+-# define MacroFile MacOSX.cf
+-# define MacOSXArchitecture
+-# define DarwinArchitecture
+-#endif
+-
  #ifdef _CRAY
 -#define MacroIncludeFile <cray.cf>
 -#define MacroFile cray.cf
@@ -651,7 +792,11 @@
 +# endif
 +# ifdef _IBMR2
 +#  undef _IBMR2
-+#  define RsArchitecture
++#  if (DefaultOSMajorVersion < 5)
++#   define RsArchitecture
++#  else
++#   define PpcArchitecture
++#  endif
 +# endif
  #endif /* ibm */
  
@@ -681,7 +826,7 @@
  #endif /* luna */
  
  #ifdef Mips
-@@ -317,9 +491,14 @@
+@@ -317,9 +624,14 @@
  # endif
  #endif /* MOTOROLA */
  
@@ -697,7 +842,7 @@
  # endif
  # define SVR4Architecture
  # define MacroIncludeFile <svr4.cf>
-@@ -329,13 +508,42 @@
+@@ -329,13 +641,42 @@
  
  #ifdef SYSV
  # ifdef i386
@@ -744,7 +889,7 @@
  # ifdef SVR4
  #  define i386Architecture
  #  define SVR4Architecture
-@@ -343,18 +551,46 @@
+@@ -343,18 +684,46 @@
  #  define MacroIncludeFile <svr4.cf>
  #  define MacroFile svr4.cf
  #  undef SVR4
@@ -800,7 +945,7 @@
  #endif /* DGUX */
  
  #ifdef __convex__
-@@ -366,101 +602,405 @@
+@@ -366,101 +735,446 @@
  # define ConvexArchitecture
  #endif /* _convex_ */
  
@@ -847,16 +992,17 @@
 +# undef SVR4
  #endif /* Oki */
  
- #ifdef WIN32
+-#ifdef WIN32
 -#define MacroIncludeFile <Win32.cf>
 -#define MacroFile Win32.cf
 -#define Win32Architecture
++#if defined(WIN32) && !defined(__GNUC__)
 +# define MacroIncludeFile <Win32.cf>
 +# define MacroFile Win32.cf
 +# define Win32Architecture
  #endif /* WIN32 */
  
- #ifdef linux 
+-#ifdef linux 
 -#ifdef  PPC
 -#define MacroIncludeFile <linux-pmac.cf>
 -#define MacroFile       linux-pmac.cf
@@ -875,12 +1021,33 @@
 -#define MacroFile linux.cf
 -#undef linux
 -#define LinuxArchitecture
--#define i386Architecture
++#if defined(WIN32) && defined(__GNUC__)
++#define MacroIncludeFile <mingw.cf>
++#define MacroFile mingw.cf
++#define Win32Architecture
++#define mingwArchitecture
+ #define i386Architecture
 -#endif
+-#endif /* linux */
++#undef i386
++#undef i486
++#undef i586
++#undef i686
++#undef __i386__
++#undef _X86_
++#undef __MINGW32__
++#endif /* CYGWIN */
++
++#if defined(linux) || defined(__GLIBC__)
 +# define MacroIncludeFile <linux.cf>
 +# define MacroFile linux.cf
 +# undef linux
-+# define LinuxArchitecture
++# ifdef __linux__
++#  define LinuxArchitecture
++# endif
++# ifdef __GLIBC__
++#  define GNUArchitecture
++# endif
 +# ifdef i386
 +#  ifndef i386Architecture
 +#   define i386Architecture
@@ -997,21 +1164,31 @@
 +#  undef arm
 +#  undef __arm
 +#  undef __arm__
++#  if defined(__ARMEB__)
++#   define Arm32ebArchitecture
++#  endif
++#  undef __ARMEB__
 +# endif
 +# ifdef mc68000
 +#  define Mc68020Architecture
 +#  undef mc68000
 +# endif /* mc68000 */
-+# ifdef powerpc
-+#  define PPCArchitecture
++# if defined (powerpc) && !defined(__powerpc64__) && !defined (powerpc64)
++#  define PpcArchitecture
 +#  undef powerpc
 +# endif
-+# ifdef __powerpc__
-+#  ifndef PPCArchitecture
-+#   define PPCArchitecture
++# if defined (__powerpc__) && !defined(__powerpc64__) && !defined (powerpc64)
++#  ifndef PpcArchitecture
++#   define PpcArchitecture
 +#  endif
 +#  undef __powerpc__
 +# endif
++# ifdef __powerpc64__
++#  ifndef Ppc64Architecture
++#   define Ppc64Architecture
++#  endif
++#  undef __powerpc64__
++# endif
 +# ifdef sparc
 +#  define SparcArchitecture
 +#  undef sparc
@@ -1080,25 +1257,27 @@
 +#  undef __SH4__
 +# endif /* __SH4__ */
 +/* for compatibility with 3.3.x */
-+# ifdef PPCArchitecture
++# ifdef PpcArchitecture
 +#  define PowerPCArchitecture
 +# endif
 +# if defined(__s390x__)
 +#  define s390xArchitecture
 +#  undef __s390x__
 +# endif
-+# if defined(__x86_64__)
++# if defined(__amd64__) || defined (__x86_64__)
++#  undef __amd64__
 +#  undef __x86_64__
-+#  define x86_64Architecture
++#  define AMD64Architecture
 +# endif
-+# if defined(x86_64__)
++# if defined(amd64__) || defined (x86_64__)
++#  undef amd64__
 +#  undef x86_64__
-+#  ifndef x86_64Architecture
-+#   define x86_64Architecture
++#  ifndef AMD64Architecture
++#   define AMD64Architecture
 +#  endif
 +# endif
- #endif /* linux */
- 
++#endif /* linux || __GLIBC__ */
++
 +#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
 +# define MacroIncludeFile <lynx.cf>
 +# define MacroFile lynx.cf
@@ -1113,7 +1292,7 @@
 +#  undef __x86__
 +# endif
 +# ifdef __powerpc__
-+#  define PPCArchitecture
++#  define PpcArchitecture
 +#  undef __powerpc__
 +# endif
 +# if defined(sparc) || defined(__sparc__)
@@ -1122,11 +1301,11 @@
 +#  undef __sparc__
 +# endif
 +/* for compatibility with 3.3.x */
-+# ifdef PPCArchitecture
++# ifdef PpcArchitecture
 +#  define PowerPCArchitecture
 +# endif
 +#endif /* LynxOS AT/PPC/microSPARC */
-+
+ 
  #ifdef __uxp__
 -#define MacroIncludeFile <fujitsu.cf>
 -#define MacroFile fujitsu.cf
@@ -1188,10 +1367,7 @@
 +# define MacroIncludeFile <nec.cf>
 +# define MacroFile nec.cf
 +# define NecArchitecture
- #endif
--#define MacroIncludeFile <nec.cf>
--#define MacroFile nec.cf
--#define NecArchitecture
++#endif
 +
 +#ifdef minix 
 +#define MacroIncludeFile <minix.cf>
@@ -1201,15 +1377,27 @@
 +#define i386Architecture
 +#endif /* minix */
 +
-+#ifdef MACH
-+#ifdef __GNU__
++/* Systems with GNU libc and userland */
++#if defined(__GNU__)
++#define GNUArchitecture
 +#define MacroIncludeFile <gnu.cf>
 +#define MacroFile gnu.cf
++#ifdef __i386__
++#define i386Architecture
+ #endif
+-#define MacroIncludeFile <nec.cf>
+-#define MacroFile nec.cf
+-#define NecArchitecture
+ #endif
+ 
++#ifdef MACH
++#ifdef __GNU__
++/* Mach-based GNU system */
 +#define GNUMachArchitecture
 +#else
 +#define MacroIncludeFile <mach.cf>
 +#define MacroFile mach.cf
- #endif
++#endif
 +#undef MACH
 +#ifdef	i386
 +#define i386MachArchitecture
@@ -1217,7 +1405,7 @@
 +#endif	/* i386 */
 +#undef i386
 +#endif /* MACH */
- 
++
 +/* On NetBSD, `unix' is not defined, and cpp emits a warning every time
 + * it sees a test using the `unix' symbol */
 +#if !defined(NetBSDArchitecture) || (defined(NetBSDArchitecture) && DefaultOSMajorVersion == 1 && DefaultOSMinorVersion <= 3)
@@ -1273,9 +1461,21 @@
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2006.dfsg~/src/config/linux.cf cernlib-2006.dfsg/src/config/linux.cf
---- cernlib-2006.dfsg~/src/config/linux.cf	2006-09-15 05:34:48.000000000 -0400
-+++ cernlib-2006.dfsg/src/config/linux.cf	2007-01-09 19:17:01.559270079 -0500
+diff -urNad cernlib-2006.dfsg.2~/src/config/linux-lp64.cf cernlib-2006.dfsg.2/src/config/linux-lp64.cf
+--- cernlib-2006.dfsg.2~/src/config/linux-lp64.cf	2006-12-20 06:21:03.000000000 -0800
++++ cernlib-2006.dfsg.2/src/config/linux-lp64.cf	2008-01-11 09:36:29.000000000 -0800
+@@ -153,7 +153,7 @@
+ # define XargsCmd               xargs
+ # define FortranSaveFlags       -fno-automatic
+ # define OptimisedFortranFlags  -O0 -g -funroll-loops -fomit-frame-pointer
+-# define DefaultFCOptions       -fno-second-underscore
++# define DefaultFCOptions       -fno-automatic -fno-second-underscore
+ # define NoOpFortranDebugFlags  -O0
+ # define CernlibSystem          -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_GFORTRAN -DCERNLIB_QMLXIA64
+ 
+diff -urNad cernlib-2006.dfsg.2~/src/config/linux.cf cernlib-2006.dfsg.2/src/config/linux.cf
+--- cernlib-2006.dfsg.2~/src/config/linux.cf	2006-09-15 02:34:48.000000000 -0700
++++ cernlib-2006.dfsg.2/src/config/linux.cf	2008-01-11 10:00:21.000000000 -0800
 @@ -68,20 +68,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1301,7 +1501,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -97,38 +97,302 @@
+@@ -97,38 +97,307 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1372,11 +1572,11 @@
 +   Debian patched (version 4.3.0.dfsg.1-4), plus additional
 +   OptimizationLevel macro.
 +   
-+   Additional Cernlib-specific per-architecture flags also added.
++   Additional CERNLIB-specific per-architecture flags also added.
 +   --Kevin McCarty */
 +
 +/* Note: we are now using CERNLIB_PPC as an endianness test (which is about
-+   all that the Cernlib source uses it for); I introduced a new define
++   all that the CERNLIB source uses it for); I introduced a new define
 +   CERNLIB_POWERPC for the three occasions when we specifically want to
 +   test for powerpc chips.
 +*/
@@ -1478,7 +1678,7 @@
 +# endif
 +# define DefaultCCOptions       -malign-int
 +# define DefaultFCOptions       -malign-int -fno-automatic \
-+                                -fno-second-underscore -fugly-complex
++                                -fno-second-underscore
 +# define LinuxMachineDefines    -D__mc68000__
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
@@ -1488,7 +1688,7 @@
 +/* # define PositionIndependentCplusplusFlags -fpic */
 +#endif /* Mc68020Architecture */
 +
-+#ifdef PPCArchitecture
++#if defined(PpcArchitecture) || defined(Ppc64Architecture)
 +# define DefaultCCOptions       -fsigned-char
 +# ifndef OptimizationLevel
 +#  define OptimizationLevel	-O3
@@ -1498,11 +1698,18 @@
 +# endif
 +# define LinuxMachineDefines    -D__powerpc__
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
-+# define CernlibMachineDefines	-DCERNLIB_PPC -DCERNLIB_POWERPC
++# ifdef Ppc64Architecture
++#  define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#  define CernlibMachineDefines	-DCERNLIB_PPC -DCERNLIB_POWERPC \
++				-DCERNLIB_QMLXIA64
++#  define CERNLIB_QMLXIA64
++# else
++#  define CernlibMachineDefines	-DCERNLIB_PPC -DCERNLIB_POWERPC
++#  define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines
++# endif
 +# define CERNLIB_PPC
 +# define CERNLIB_POWERPC
-+#endif /* PPCArchitecture */
++#endif /* PpcArchitecture || Ppc64Architecture */
 +
 +#ifdef SparcArchitecture
 +# ifndef OptimizationLevel
@@ -1584,7 +1791,7 @@
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
 +#endif
 +
-+#ifdef x86_64Architecture
++#ifdef AMD64Architecture
 +# ifndef OptimizationLevel
 +#  define OptimizationLevel	-O3
 +# endif
@@ -1592,13 +1799,11 @@
 +#  define OptimizedCDebugFlags  OptimizationLevel
 +# endif
 +# define LinuxMachineDefines    -D__x86_64__
-+# define DefaultFCOptions       -fno-automatic \
-+                                -fno-second-underscore -fugly-complex
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 +# define CernlibMachineDefines  -DCERNLIB_QMLXIA64
 +# define CERNLIB_QMLXIA64
-+#endif /* x86_64Architecture */
++#endif /* AMD64Architecture */
 +
 +#ifndef StandardDefines
 +# define StandardDefines        -Dlinux LinuxMachineDefines LinuxSourceDefines
@@ -1618,7 +1823,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -163,7 +427,7 @@
+@@ -163,7 +432,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1627,7 +1832,7 @@
  
  #else
  
-@@ -174,19 +438,18 @@
+@@ -174,19 +443,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1659,7 +1864,7 @@
   
  #else
  
-@@ -197,19 +460,18 @@
+@@ -197,19 +465,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1691,7 +1896,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -222,25 +484,28 @@
+@@ -222,25 +489,30 @@
  #else
  
  # ifdef Hasgfortran
@@ -1719,9 +1924,12 @@
  # define XargsCmd               xargs
  # define FortranSaveFlags       -fno-automatic
 -# define OptimisedFortranFlags  -O0 -g -funroll-loops -fomit-frame-pointer
-+# define OptimisedFortranFlags  OptimizedCDebugFlags -funroll-loops
+-# define DefaultFCOptions       -fno-second-underscore
++# define OptimisedFortranFlags  OptimizedCDebugFlags /* -funroll-loops */
 +/* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */
- # define DefaultFCOptions       -fno-second-underscore
++# ifndef DefaultFCOptions
++# define DefaultFCOptions       -fno-range-check -fno-automatic -fno-second-underscore
++# endif
  # define NoOpFortranDebugFlags  -O0
 -# define CernlibSystem          -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_GFORTRAN
 +# define CernlibSystem          CernlibDefaultDefines CernlibMachineDefines \
@@ -1729,7 +1937,7 @@
  
  #define CERNLIB_GFORTRAN
   
-@@ -249,17 +514,32 @@
+@@ -249,17 +521,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1765,7 +1973,7 @@
  
  # endif
  # endif
-@@ -280,7 +560,7 @@
+@@ -280,7 +567,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: cernlib-308-use-canonical-cfortran-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-308-use-canonical-cfortran-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-308-use-canonical-cfortran-location.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ cernlib-308-use-canonical-cfortran-location.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 308-use-canonical-cfortran-location.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: All code compiled at Cernlib build-time should look for cfortran.h
+## DP: All code compiled at CERNLIB build-time should look for cfortran.h
 ## DP: at <cfortran/cfortran.h>.
 
 @DPATCH@


Index: cernlib-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-321-support-gfortran.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-321-support-gfortran.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-321-support-gfortran.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -2,12 +2,15 @@
 ## 321-support-gfortran.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support compilation with gfortran.  Patch thanks to Harald Vogt
+## DP: Support compilation with gfortran.  Patch thanks to Harald Vogt, plus:
+## DP: - Extra hack to IOSTAT EOF return value to support gfortran-4.3.
+## DP: - Work around gfortran's refusal to initialize 4-byte integer with
+## DP:   unsigned constant > 0x7fffffff.
 
 @DPATCH@
 diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F
---- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F	1996-04-01 10:01:53.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F	2007-04-21 19:45:12.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F	1996-04-01 07:01:53.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F	2008-02-11 15:40:44.000000000 -0800
 @@ -45,7 +45,16 @@
           MT=3
           Z(1)=SQRT(SQRT(-D))
@@ -48,8 +51,8 @@
        W3=0
        IF(W1*W2 .NE. 0) W3=-Q/(8*W1*W2)
 diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F
---- cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F	1996-04-01 10:02:54.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F	2007-04-21 19:45:12.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F	1996-04-01 07:02:54.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F	2008-02-11 15:40:44.000000000 -0800
 @@ -14,10 +14,12 @@
        VECTOR(I) = RNDM(I)
    100 CONTINUE
@@ -66,8 +69,8 @@
        RETURN
        END
 diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile
---- cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile	1999-11-15 08:25:58.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile	2007-04-21 19:45:12.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile	1999-11-15 05:25:58.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile	2008-02-11 15:40:44.000000000 -0800
 @@ -13,7 +13,19 @@
  #endif
  
@@ -89,33 +92,33 @@
  
  SubdirLibraryTarget(NullParameter,NullParameter)
 diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile
---- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2006-09-04 08:32:59.000000000 -0400
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2007-04-21 19:45:41.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2006-09-04 05:32:59.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2008-02-11 15:40:44.000000000 -0800
 @@ -1,6 +1,6 @@
  
 -SRCS_F= irndm.F qnext.F rdmin.F
-+SRCS_F= irndm.F qnext.F rdmin.F getarg.F
++SRCS_F= irndm.F qnext.F rdmin.F kernlibgetarg.F
  
 -SRCS_C= lshift.c ishftr.c getarg.c
 +SRCS_C= lshift.c ishftr.c /* getarg.c */
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F
---- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F	2007-04-21 19:48:39.000000000 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F	1969-12-31 16:00:00.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F	2008-02-11 15:40:44.000000000 -0800
 @@ -0,0 +1,19 @@
 +*     Wrapper GETARG routine for gfortran,
 +*     originally written by Harald Vogt <hvogt at ifh.de>
 +*
-+      SUBROUTINE GETARG (JARG, CHARG)
++*     SUBROUTINE GETARG (JARG, CHARG)
 +*     The following stuff is required to use gfortrans inline routine GETARG
 +*     It is required to avoid the calling GETARG here which conflicts
 +*     to the Fortran rules
-+      CHARACTER    CHARG*(*)
-+      CALL MYGETARG (JARG, CHARG)
-+      END
++*     CHARACTER    CHARG*(*)
++*     CALL MYGETARG (JARG, CHARG)
++*     END
 +
-+      SUBROUTINE MYGETARG (JARG, CHARG)
++      SUBROUTINE KERNLIBGETARG (JARG, CHARG)
 +      CHARACTER    CHARG*(*)
 +*     gfortran translates the following line to a call
 +*     to its library routine _gfortran_getarg_i4
@@ -123,3 +126,32 @@
 +      CALL GETARG (JARG, CHARG)
 +      END
 + 
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h	2006-09-15 02:35:30.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h	2008-02-11 15:40:44.000000000 -0800
+@@ -1031,7 +1031,7 @@
+ #if !defined(CERNLIB_GFORTRAN)
+ #define  Getarg           F77_NAME(getarg,GETARG)
+ #else
+-#define  Getarg           _gfortran_getarg_i4
++#define  Getarg           F77_NAME(kernlibgetarg,KERNLIBGETARG)
+ #endif
+                  extern SUBROUTINE Getarg;
+ #define  Goparm           F77_NAME(goparm,GOPARM)
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc
+--- cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc	2006-09-15 02:35:31.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc	2008-02-11 15:40:44.000000000 -0800
+@@ -46,8 +46,12 @@
+ #elif defined(CERNLIB_WINDOWS)
+ *    only valid for dec fortran (e.g. not f2c + microsoft c)
+       PARAMETER    (IOSEOF = 36)
+-#elif defined(CERNLIB_GFORTRAN)
++#elif defined(CERNLIB_GFORTRAN) && defined(__GNUC__) && defined(__GNUC_MINOR__)
++# if (__GNUC__ > 4 || __GNUC_MINOR__ >= 3)
++      PARAMETER    (IOSEOF = 5002)
++# else
+       PARAMETER    (IOSEOF = 3)
++# endif
+ #elif 1
+       PARAMETER    (IOSEOF = -1)
+ #endif


Index: cernlib-600-use-host.def-config-file.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-600-use-host.def-config-file.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-600-use-host.def-config-file.dpatch	19 Dec 2007 23:27:43 -0000	1.1
+++ cernlib-600-use-host.def-config-file.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 600-use-host.def-config-file.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Use host.def for Debian-specific CERNLIB build options.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def


Index: cernlib-800-implement-shared-library-rules-in-Imake.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-800-implement-shared-library-rules-in-Imake.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-800-implement-shared-library-rules-in-Imake.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-800-implement-shared-library-rules-in-Imake.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -84,7 +84,7 @@
 +#elif defined(LinuxArchitecture) /* added by Kevin McCarty
 +				    for Debian, 15 May 2002 */
 +#ifndef SharedLibraryTargetName
-+#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME).$(CERN_LEVEL))
++#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME)$(TOOL_NAME).$(CERN_LEVEL))
 +#endif
 +
 +#ifndef SharedLibrarySonameName


Index: cernlib-803-link-binaries-dynamically.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-803-link-binaries-dynamically.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-803-link-binaries-dynamically.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-803-link-binaries-dynamically.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -2,13 +2,13 @@
 ## 803-link-binaries-dynamically.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link binaries dynamically against Cern libraries.
+## DP: Link binaries dynamically against CERN libraries.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules
---- cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:19.991403858 -0400
-+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:23.699609849 -0400
-@@ -189,13 +189,13 @@
+diff -urNad cernlib-2006.dfsg.2~/src/config/fortran.rules cernlib-2006.dfsg.2/src/config/fortran.rules
+--- cernlib-2006.dfsg.2~/src/config/fortran.rules	2007-12-14 01:25:54.000000000 +0000
++++ cernlib-2006.dfsg.2/src/config/fortran.rules	2007-12-14 01:34:31.000000000 +0000
+@@ -189,7 +189,7 @@
   */
  #ifndef CernlibDependLibrary
  #define CernlibDependLibrary(cernlibs)\
@@ -17,23 +17,33 @@
  #endif
  
  /* Helper to use cernlib command
+@@ -202,17 +202,22 @@
+  *   cernlib utility to find give all required libraries ( ie. no extra
+  *   syslibs needed.
   */
- #ifndef CernlibCmd
--#define CernlibCmd(libraries)cernlib libraries
-+#define CernlibCmd(libraries)cernlib -dy libraries
- #endif
- /*
-  * CernlibFortranProgramTarget - rule to link fortran program using
-@@ -207,7 +207,7 @@
+-#ifndef CernlibFortranProgramTarget
+-#define CernlibFortranProgramTarget(program,objects,deplibs,locallibs,cernlibs)\
++#ifndef CernlibFortranStaticTarget
++#define CernlibFortranStaticTarget(program,objects,deplibs,locallibs,cernlibs)\
  ProgramTargetName(program): SetWin32ObjSuffix(objects) deplibs CernlibDependLibrary(cernlibs)	@@\
  	RemoveTargetProgram($@)						@@\
  	@echo "Linking with cern libraries"				@@\
 -	@cernlib cernlibs						@@\
-+	@cernlib -dy cernlibs						@@\
++	@CernlibCmd(cernlibs)						@@\
  	CernlibFortranLinkRule($@,$(FCLDOPTIONS),objects,locallibs $(LDLIBS),CernlibCmd(cernlibs)) @@\
  									@@\
  clean::									@@\
-@@ -233,8 +233,8 @@
+ 	RemoveFile(ProgramTargetName(program))				@@\
+ 
++#endif /*CernlibFortranStaticTarget */
++
++#ifndef CernlibFortranProgramTarget
++#define CernlibFortranProgramTarget(program,objects,deplibs,locallibs,cernlibs)\
++CernlibFortranStaticTarget(program,objects,deplibs,locallibs,-dy cernlibs)
+ #endif /*CernlibFortranProgramTarget */
+ 
+ /*
+@@ -233,8 +238,8 @@
  ProgramTargetName(program): objects deplibs CernlibDependLibrary(cernlibs) @@\
  	RemoveTargetProgram($@)						@@\
  	@echo "Linking with cern libraries"				@@\
@@ -44,9 +54,9 @@
  									@@\
  clean::									@@\
  	RemoveFile(ProgramTargetName(program))				@@\
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
---- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:18.903636773 -0400
-+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:23.699609849 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/Imakefile	2007-12-14 01:25:53.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/Imakefile	2007-12-14 01:25:57.000000000 +0000
 @@ -13,14 +13,14 @@
  DefinePackageLibrary(kxtlib)
  


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cernlib.spec	1 Jan 2008 00:41:14 -0000	1.40
+++ cernlib.spec	10 Mar 2008 10:31:30 -0000	1.41
@@ -55,7 +55,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       21%{?dist}
+Release:       27%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -138,10 +138,10 @@
 Source204: cernlib-debian-copyright.in
 
 # debian patchsets
-Patch100001: http://ftp.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-2.diff.gz
-Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-1.diff.gz
-Patch100003: http://ftp.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-1.diff.gz
-Patch100004: http://ftp.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-5.diff.gz
+Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-11.diff.gz
+Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-2.diff.gz
+Patch100003: http://ftp.de.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-5.diff.gz
+Patch100004: http://ftp.de.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-7.diff.gz
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: geant321-001-fix-missing-fluka.dpatch
@@ -210,6 +210,16 @@
 Patch21101: cernlib-211-support-amd64-and-itanium.dpatch
 Patch21102: paw-211-support-amd64-and-itanium.dpatch
 Patch2111: cernlib-211-support-digital-alpha.dpatch
+Patch212: cernlib-212-print-test-results.dpatch
+Patch21301: cernlib-213-fix-test-suite-build.dpatch
+Patch21302: geant321-213-fix-test-suite-build.dpatch
+Patch21303: mclibs-213-fix-test-suite-build.dpatch
+Patch214: cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch
+# not in latest debian cernlib and doesn't seems to be useful on fedora
+#Patch215: cernlib-215-work-around-g77-bug-on-ia64.dpatch
+Patch216: cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch
+Patch217: cernlib-217-abend-on-mathlib-test-failure.dpatch
+Patch220: mclibs-220-compile-isajet-with-isarun.dpatch
 Patch300: cernlib-300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -289,6 +299,9 @@
 Patch80602: paw-806-bump-mathlib-and-dependents-sonames.dpatch
 Patch80603: geant321-806-bump-mathlib-and-dependents-sonames.dpatch
 Patch80604: mclibs-806-bump-mathlib-and-dependents-sonames.dpatch
+Patch80701: cernlib-807-static-link-some-tests-on-64-bit.dpatch
+Patch80702: geant321-807-static-link-some-tests-on-64-bit.dpatch
+Patch80703: mclibs-807-static-link-some-tests-on-64-bit.dpatch
 
 # change the cernlib script such that -llapack -lblas is used instead of 
 # cernlib lapack
@@ -300,21 +313,10 @@
 Patch1200: cernlib-script.patch
 # don't stop if the CERN variable isn't defined
 Patch1201: cernlib-gxint-script.diff
-# not needed in 2006
-#Patch1203: cernlib-hwuli2_use_dimag.diff 
-#Patch1204: cernlib-hwhiga_use_dimag.diff
 # modify the cernlib man page to fit with the distribution
 Patch1206: cernlib-man_static.patch
 # modify the debian cernlib paw desktop file icon name
 Patch1207: cernlib-fedora_desktop.patch
-# fix tests Imakefiles
-Patch1208: cernlib-test.patch
-# don't recurse in eurodec for tests because the testcase segfaults
-Patch1210: cernlib-segf_eudtest.patch
-# kernlib/kernnum packlib/{ffread hbook kuip zbook zebra} test error on 64 bit
-# packlib/{ffread hbook kuip} segfaults on ppc64
-Patch1211: cernlib-64test.patch
-
 
 # patchy 4
 # not applied as it has allready been done by the sed one-liner in 
@@ -610,6 +612,15 @@
 %patch -P 21101 -p1
 %patch -P 21102 -p1
 %patch -P 2111 -p1
+%patch -P 212 -p1
+%patch -P 21301 -p1
+%patch -P 21302 -p1
+%patch -P 21303 -p1
+%patch -P 214 -p1
+#%patch -P 215 -p1
+%patch -P 216 -p1
+%patch -P 217 -p1
+%patch -P 220 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -752,20 +763,15 @@
 %patch -P 80602 -p1
 %patch -P 80603 -p1
 %patch -P 80604 -p1
+%patch -P 80701 -p1
+%patch -P 80702 -p1
+%patch -P 80703 -p1
 
 %patch -P 1504 -p2 -b .np_flags
 #%patch -P 1505 -p1
 %patch -P 1506 -p2 -b .curdir
 
 %patch -P 1201
-#%patch -P 1203
-#%patch -P 1204
-%patch -P 1208 -p2 -b .test
-%patch -P 1210 -p2 -b .segf_eudtest
-
-%ifarch x86_64 ppc64
-%patch -P 1211 -p2 -b .64test
-%endif
 
 # remove CVS directories
 find . -depth -type d -name CVS -exec rm -rf {} ';' 
@@ -799,7 +805,9 @@
 # incompatible for functions.
 %if %{with gfortran}
 TOOL_SONAME=_gfortran
+TOOL_NAME=_gfortran
 export TOOL_SONAME
+export TOOL_NAME
 %endif
 
 # set the CERN and CERN_LEVEL environment variables in shell scripts
@@ -825,11 +833,18 @@
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    ../patchy/ylist ../patchy/yindex
 
+%if %{with gfortran}
+FC_COMPILER=gfortran
+%else
+FC_COMPILER=g77
+%endif
+
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
 # and substitue the name of the cernlib link script
 sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' \
   -e 's/`cernlib /`cernlib%{?compiler} /' \
+  -e 's/"f77"/"'$FC_COMPILER'"/' \
   src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
@@ -850,7 +865,7 @@
 
 # use the debian cernlib script for dynamic libraries support.
 # remove -lg2c to the link commands, because libg2c.so isn't available, 
-# it is found by g77/gfortran if needed.
+# it is found by g77/gfortran if needed, and similar with -lgfortran.
 # don't add %{_libdir} to the directory searched in for libraries, 
 # since it is already in the list.
 sed -e 's:@PREFIX@:%{_prefix}:g' \
@@ -858,6 +873,7 @@
   -e 's:@VERSION@:%{verdir}:g' \
   -e 's:@LIBPREFIX@::g' \
   -e 's/-lg2c//' \
+  -e 's/-lgfortran//' \
   ../cernlib.in > src/scripts/cernlib
 # to remove reference to monolithic X directories
 #  -e 's/-L\$XDIR\(64\)\? //' \
@@ -1135,7 +1151,7 @@
 %{__install} -d -m755 %{buildroot}/%{_datadir}/X11/app-defaults
 %{__install} -p -m644 ../../*/debian/add-ons/app-defaults/* %{buildroot}/%{_datadir}/X11/app-defaults/
 
-sed -e 's/Exec=paw++/Exec=paw++%{?compiler_string}/' -e 's/PAW++/PAW++%{?compiler_string}/' \
+sed -e 's/Exec=paw++/Exec=paw++%{?compiler_string}/' -e 's/Paw++/Paw++%{?compiler_string}/' \
  ../../paw*/debian/add-ons/misc/paw++.desktop > paw++%{?compiler_string}.desktop
 desktop-file-install --vendor="fedora"               \
   --dir=%{buildroot}/%{_datadir}/applications         \
@@ -1177,16 +1193,22 @@
 cd $CERN_ROOT/build
 
 # no test in code_motif paw_motif scripts patchy pawlib
-test_dirs='graflib mclibs kernlib mathlib packlib phtools'
+test_dirs='graflib mclibs kernlib mathlib packlib phtools geant321'
 
-%ifnarch x86_64 ppc64
-test_dirs="$test_dirs geant321"
-%endif
+#%ifnarch x86_64 ppc64
+#test_dirs="$test_dirs geant321"
+#%endif
+rm -f __dist_failed_builds
 
 for dir in $test_dirs; do
-make -C $dir test
+make -C $dir test || echo $dir >> __dist_failed_builds
 done
 
+if [ -f __dist_failed_builds ]; then
+echo "DIST TESTS FAILED"
+cat __dist_failed_builds
+fi
+
 
 %clean
 rm -rf %{buildroot}
@@ -1418,6 +1440,18 @@
 %endif
 
 %changelog
+* Tue Feb 26 2008 Patrice Dumas <pertusus at free.fr> 2006-27
+- new mclibs and geant321 patchsets
+
+* Sun Feb 24 2008 Patrice Dumas <pertusus at free.fr> 2006-25
+- new cernlib and paw patchsets
+
+* Sun Jan 13 2008 Patrice Dumas <pertusus at free.fr> 2006-23
+- new cernlib debian patcheset
+
+* Tue Jan  8 2008 Patrice Dumas <pertusus at free.fr> 2006-22
+- new debian patchesets
+
 * Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 2006-21
 - no --build-id for EL-5
 


Index: geant321-001-fix-missing-fluka.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/geant321-001-fix-missing-fluka.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geant321-001-fix-missing-fluka.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ geant321-001-fix-missing-fluka.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -2,18 +2,18 @@
 ## 001-fix-missing-fluka.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.
+## DP: Deal with FLUKA code having been purged from Debian's CERNLIB source.
 
 @DPATCH@
-diff -urNad geant321-3.21.14~/src/geant321/Imakefile geant321-3.21.14/src/geant321/Imakefile
---- geant321-3.21.14~/src/geant321/Imakefile	1998-03-05 06:20:07.000000000 -0500
-+++ geant321-3.21.14/src/geant321/Imakefile	2007-01-30 17:37:26.209615233 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/Imakefile geant321-3.21.14.dfsg/src/geant321/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/Imakefile	1998-03-05 03:20:07.000000000 -0800
++++ geant321-3.21.14.dfsg/src/geant321/Imakefile	2008-01-04 17:00:47.000000000 -0800
 @@ -4,10 +4,11 @@
  
  AllTarget(geant321)
  
 -LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
-+/* Fluka removed from Debian source package for copyright reasons. */
++/* FLUKA removed from Debian source package for copyright reasons. */
 +LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
  	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
@@ -26,7 +26,7 @@
  InstallLibrary(geant321,$(CERN_LIBDIR))
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
  
-+/* Fluka removed from Debian source package for copyright reasons. */
++/* FLUKA removed from Debian source package for copyright reasons. */
 +/*
  SubdirDataFile($(LIBRARY),flukaaf.dat,data)
  
@@ -35,9 +35,23 @@
  
  /* This will install the correct link for xsneut95.dat at CERN;
   * If you want a local copy of the file, just copy it there
-diff -urNad geant321-3.21.14~/src/geant321/geant321/gcnmec.inc geant321-3.21.14/src/geant321/geant321/gcnmec.inc
---- geant321-3.21.14~/src/geant321/geant321/gcnmec.inc	1995-10-24 06:20:31.000000000 -0400
-+++ geant321-3.21.14/src/geant321/geant321/gcnmec.inc	2007-01-30 17:39:15.301513801 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile	1996-03-06 09:31:38.000000000 -0800
++++ geant321-3.21.14.dfsg/src/geant321/examples/Imakefile	2008-01-04 17:01:20.000000000 -0800
+@@ -1,7 +1,10 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' /* for NamedMakeSubdirs */
+ 
++/* gexam4 needs fluka
+ SUBDIRS= gexam1 gexam2 gexam3 gexam4 gexam5
++*/
++SUBDIRS= gexam1 gexam2 gexam3 gexam5
+ 
+ TestSubdirs($(SUBDIRS))
+ 
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc
+--- geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc	1995-10-24 03:20:31.000000000 -0700
++++ geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc	2008-01-04 17:00:47.000000000 -0800
 @@ -16,13 +16,14 @@
        PARAMETER(NMECA=45,IBLOWN=23)
        CHARACTER*4 CHNMEC(NMECA)
@@ -55,9 +69,9 @@
       +     'HADG',  'INEG',  'ELAG',  'FISG',  'CAPG',
       +     'LOSS',  'PHOT',  'ANNI',  'COMP',  'BREM',
       +     'PAIR',  'DRAY',  'PFIS',  'RAYL',  'MUNU',
-diff -urNad geant321-3.21.14~/src/geant321/miface/Imakefile geant321-3.21.14/src/geant321/miface/Imakefile
---- geant321-3.21.14~/src/geant321/miface/Imakefile	1995-10-24 06:21:53.000000000 -0400
-+++ geant321-3.21.14/src/geant321/miface/Imakefile	2007-01-30 17:37:26.319591944 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile geant321-3.21.14.dfsg/src/geant321/miface/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile	1995-10-24 03:21:53.000000000 -0700
++++ geant321-3.21.14.dfsg/src/geant321/miface/Imakefile	2008-01-04 17:00:47.000000000 -0800
 @@ -1,5 +1,5 @@
  SRCS_F= \ @@\
 -	 gfmdis.F gfmfin.F gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F


Index: geant321-003-geant-dummy-functions.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/geant321-003-geant-dummy-functions.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-003-geant-dummy-functions.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ geant321-003-geant-dummy-functions.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 003-geant-dummy-functions.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add stub Geant functions to avoid missing symbols due to Fluka removal.
+## DP: Add stub GEANT functions to avoid missing symbols due to FLUKA removal.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile
@@ -12,7 +12,7 @@
  SRCS_F= gfkine.F gfvert.F gludky.F glund.F glundi.F gpkine.F \ @@\
  	gpkinx.F gpvert.F gskine.F gskinu.F gsvert.F gsveru.F gtau.F
  
-+/* Dummy file containing stubs for deleted Fluka and mclibs functions: */
++/* Dummy file containing stubs for deleted FLUKA and mclibs functions: */
 +SRCS_C= dummy.c
 +
  #ifdef CERNLIB_QMVAOS
@@ -47,7 +47,7 @@
 +
 +static void print_dummy(const char *domain, const char *function)
 +{
-+  fprintf(stderr, "Geant321: Now in dummy %s routine.\n", function);
++  fprintf(stderr, "GEANT 3.21: Now in dummy %s routine.\n", function);
 +  fprintf(stderr,
 +"If you see this message, you are presumably trying to call (possibly\n"
 +"indirectly) the %s routine");
@@ -64,7 +64,7 @@
 +  else if (strcmp(domain, "Fluka") == 0)
 +    fprintf(stderr,
 +" in the FLUKA library.\n"
-+"FLUKA is unfortunately not available in this distribution of Cernlib for\n"
++"FLUKA is unfortunately not available in this distribution of CERNLIB for\n"
 +"licensing reasons"
 +#if defined (CERNLIB_DEBIAN)
 +"; please see the file /usr/share/doc/geant321/README.Debian\n"
@@ -75,7 +75,7 @@
 +    );
 +  
 +  else if (strcmp(domain, "User") == 0)
-+    fprintf(stderr, ".  This routine is not built into Geant;\n"
++    fprintf(stderr, ".  This routine is not built into GEANT;\n"
 +"you must write code for it yourself.  Please see the documentation"
 +#if defined (CERNLIB_DEBIAN)
 +"\n(for instance in the geant321-doc package)"
@@ -118,7 +118,7 @@
 +WEAKDUMMY(Fluka, SITSAO, sitsao_, double);
 +
 +/* The following dummy functions are added due to the removal
-+ * of the corresponding code from Geant (it is also part of FLUKA).
++ * of the corresponding code from GEANT (it is also part of FLUKA).
 + * We are constrained to keep the ABI for the dynamic library, so
 + * these dummy functions must be kept until next time the libgeant321
 + * soversion is changed. */


Index: geant321-203-compile-geant-with-ertrak.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/geant321-203-compile-geant-with-ertrak.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-203-compile-geant-with-ertrak.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ geant321-203-compile-geant-with-ertrak.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -11,7 +11,7 @@
 @@ -5,11 +5,12 @@
  AllTarget(geant321)
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */
 +/* Ertrak added to Debian since I saw no reason to leave it out. */
  LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\


Index: geant321-806-bump-mathlib-and-dependents-sonames.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/geant321-806-bump-mathlib-and-dependents-sonames.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-806-bump-mathlib-and-dependents-sonames.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ geant321-806-bump-mathlib-and-dependents-sonames.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -17,4 +17,4 @@
 +
  AllTarget(geant321)
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */


Index: mclibs-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/mclibs-321-support-gfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mclibs-321-support-gfortran.dpatch	19 Dec 2007 23:27:43 -0000	1.1
+++ mclibs-321-support-gfortran.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -21,11 +21,13 @@
 diff -urNad mclibs-2005.dfsg~/src/mclibs/isajet/test/Imakefile mclibs-2005.dfsg/src/mclibs/isajet/test/Imakefile
 --- mclibs-2005.dfsg~/src/mclibs/isajet/test/Imakefile	2000-07-25 12:21:34.000000000 -0400
 +++ mclibs-2005.dfsg/src/mclibs/isajet/test/Imakefile	2006-09-27 13:49:49.783806148 -0400
-@@ -8,4 +8,7 @@
+@@ -8,4 +8,9 @@
  
- CernlibFortranProgramTarget(isajett,isajett.o,$(PACKAGE_LIB),$(PACKAGE_LIB),pdflib804 mathlib kernlib)
+ CernlibFortranProgramTarget(isajett,isajett.o,NullParameter,NullParameter,pdflib804 mathlib kernlib isajet)
  
 +#if !defined(CERNLIB_GFORTRAN)
 +/* breaks on 'STOP 99' if compiled with gfortran */
  TestTarget(isajett,isajet.dat,test.input)
++#else
++test::
 +#endif


Index: paw-108-quote-protect-comis-script.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-108-quote-protect-comis-script.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-108-quote-protect-comis-script.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-108-quote-protect-comis-script.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 108-quote-protect-comis-script.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Try to be whitespace-safe in script generated at runtime by COMIS.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F


Index: paw-200-comis-allow-special-chars-in-path.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-200-comis-allow-special-chars-in-path.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-200-comis-allow-special-chars-in-path.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-200-comis-allow-special-chars-in-path.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 200-comis-allow-special-chars-in-path.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Allow certain additional characters in paths to COMIS macros.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F


Index: paw-211-support-amd64-and-itanium.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-211-support-amd64-and-itanium.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-211-support-amd64-and-itanium.dpatch	19 Dec 2007 23:27:43 -0000	1.1
+++ paw-211-support-amd64-and-itanium.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -166,7 +166,7 @@
 --- paw-2.14.04~/src/pawlib/comis/code/csitgpl.F	1969-12-31 19:00:00.000000000 -0500
 +++ paw-2.14.04/src/pawlib/comis/code/csitgpl.F	2006-09-08 14:44:11.808264160 -0400
 @@ -0,0 +1,32 @@
-+* Comis
++* COMIS
 +*
 +*
 +#if (defined(CERNLIB_QMLXIA64))
@@ -306,7 +306,7 @@
 --- paw-2.14.04~/src/pawlib/comis/code/csrtgpl.F	1969-12-31 19:00:00.000000000 -0500
 +++ paw-2.14.04/src/pawlib/comis/code/csrtgpl.F	2006-09-08 14:44:11.808264160 -0400
 @@ -0,0 +1,31 @@
-+* Comis
++* COMIS
 +*
 +*
 +#if (defined(CERNLIB_QMLXIA64))


Index: paw-308-use-canonical-cfortran-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-308-use-canonical-cfortran-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-308-use-canonical-cfortran-location.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-308-use-canonical-cfortran-location.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 308-use-canonical-cfortran-location.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: All code compiled at Cernlib build-time should look for cfortran.h
+## DP: All code compiled at CERNLIB build-time should look for cfortran.h
 ## DP: at <cfortran/cfortran.h>.
 
 @DPATCH@


Index: paw-320-support-ifort-and-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-320-support-ifort-and-gfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-320-support-ifort-and-gfortran.dpatch	11 Sep 2006 22:32:35 -0000	1.1
+++ paw-320-support-ifort-and-gfortran.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -5,9 +5,9 @@
 ## DP: Support use of ifort, icc and/or gfortran as default compilers.
 
 @DPATCH@
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/csinit.F paw-2.14.04/src/pawlib/comis/code/csinit.F
---- paw-2.14.04~/src/pawlib/comis/code/csinit.F	2006-09-07 17:57:19.881356063 -0400
-+++ paw-2.14.04/src/pawlib/comis/code/csinit.F	2006-09-07 18:04:23.085153626 -0400
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/code/csinit.F paw-2.14.04.dfsg.2/src/pawlib/comis/code/csinit.F
+--- paw-2.14.04.dfsg.2~/src/pawlib/comis/code/csinit.F	2007-12-12 23:52:57.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/comis/code/csinit.F	2007-12-12 23:52:59.000000000 +0000
 @@ -217,8 +217,18 @@
  #endif
  #if (defined(CERNLIB_LINUX))
@@ -27,9 +27,57 @@
  #endif
  #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
        ITMPLEN=CSTMPD(CHPATH, 256)
-diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/Imakefile paw-2.14.04/src/pawlib/paw/ntuple/Imakefile
---- paw-2.14.04~/src/pawlib/paw/ntuple/Imakefile	2006-09-07 17:57:19.916348611 -0400
-+++ paw-2.14.04/src/pawlib/paw/ntuple/Imakefile	2006-09-07 17:57:35.628002463 -0400
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/deccc/Imakefile paw-2.14.04.dfsg.2/src/pawlib/comis/deccc/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/comis/deccc/Imakefile	2005-04-18 15:41:06.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/comis/deccc/Imakefile	2007-12-12 23:55:32.000000000 +0000
+@@ -45,8 +45,12 @@
+ #endif
+ 
+ #if defined(CERNLIB_LINUX)
++#if defined(CERNLIB_GFORTRAN)
++EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
++#else
+ EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+ #endif
++#endif
+ 
+ #if defined(CERNLIB_SUN) && !defined(CERNLIB_SOLARIS)
+ CCOPTIONS=
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/cpaw/Imakefile paw-2.14.04.dfsg.2/src/pawlib/paw/cpaw/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/cpaw/Imakefile	1999-06-28 15:28:22.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/cpaw/Imakefile	2007-12-12 23:56:19.000000000 +0000
+@@ -15,8 +15,12 @@
+ #endif
+ 
+ #if defined(CERNLIB_LINUX)
++#if defined(CERNLIB_GFORTRAN)
++EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
++#else
+ EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+ #endif
++#endif
+ 
+ #if defined(CERNLIB_BUGREPORT)
+ SRCS_C := $(SRCS_C) bugrep.c
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/mlpfit/Imakefile paw-2.14.04.dfsg.2/src/pawlib/paw/mlpfit/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/mlpfit/Imakefile	2000-04-28 14:12:13.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/mlpfit/Imakefile	2007-12-12 23:57:04.000000000 +0000
+@@ -9,8 +9,12 @@
+ #endif
+ 
+ #if defined(CERNLIB_LINUX)
++#if defined(CERNLIB_GFORTRAN)
++EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
++#else
+ EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+ #endif
++#endif
+ 
+ #ifndef CERNLIB_VAXVMS
+ EXTRA_INCLUDES := $(EXTRA_INCLUDES) -I$(VPATH)
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/ntuple/Imakefile paw-2.14.04.dfsg.2/src/pawlib/paw/ntuple/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/ntuple/Imakefile	2007-12-12 23:52:58.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/ntuple/Imakefile	2007-12-12 23:52:59.000000000 +0000
 @@ -16,9 +16,17 @@
  EXTRA_DEFINES := $(EXTRA_DEFINES) -Dextname
  #endif


Index: paw-803-link-binaries-dynamically.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-803-link-binaries-dynamically.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-803-link-binaries-dynamically.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-803-link-binaries-dynamically.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 803-link-binaries-dynamically.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link binaries dynamically against Cern libraries.
+## DP: Link binaries dynamically against CERN libraries.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile


Index: paw-804-workaround-for-comis-mdpool-struct-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-804-workaround-for-comis-mdpool-struct-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-804-workaround-for-comis-mdpool-struct-location.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-804-workaround-for-comis-mdpool-struct-location.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 804-workaround-for-comis-mdpool-struct-location.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Hack to workaround Comis not liking it when code has a negative
+## DP: Hack to workaround COMIS not liking it when code has a negative
 ## DP: offset from the mdpool struct (as is the case when using shared
 ## DP: libraries on some arches).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Dec 2007 23:27:43 -0000	1.6
+++ sources	10 Mar 2008 10:31:30 -0000	1.7
@@ -1,6 +1,6 @@
 fe71a3f6b95ff2151c5a4690116a0358  2006_src-free.tar.gz
 b1f550eedc545a02f0ab58eb7d550480  patchy.tar.gz
-c3133b7a5885bd1ee7e47d4f4e76beca  geant321_3.21.14.dfsg-5.diff.gz
-3978b81499f205062b540aa58bb79193  mclibs_2006.dfsg.2-1.diff.gz
-90982e80623338cf2d4b4a9efb445f8c  paw_2.14.04.dfsg.2-1.diff.gz
-2a9795aed7895477a2759dc34e7f9b96  cernlib_2006.dfsg.2-2.diff.gz
+9a19d3bd4bd63c0ee2431c8d28f308b9  geant321_3.21.14.dfsg-7.diff.gz
+c65e057e938076f73645a193d497aaf4  mclibs_2006.dfsg.2-5.diff.gz
+5e99d1d8d0e632475879e12afe6ad748  paw_2.14.04.dfsg.2-2.diff.gz
+f8628a35f2a422dfaf09edc526d448e9  cernlib_2006.dfsg.2-11.diff.gz


--- cernlib-64test.patch DELETED ---


--- cernlib-segf_eudtest.patch DELETED ---


--- cernlib-test.patch DELETED ---




More information about the fedora-extras-commits mailing list