Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv23933

Modified Files:
        geant4.9-data.info geant4.9.info geant4.9.patch clhep2.info 
Log Message:
Latest upstream versions. Enable cernlib version for 64bit.

Index: geant4.9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geant4.9.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- geant4.9.info       27 Apr 2011 03:20:35 -0000      1.17
+++ geant4.9.info       29 Jul 2011 09:19:23 -0000      1.18
@@ -1,9 +1,15 @@
 Info3: <<
 Package: geant4.9%type_pkg[cernlib]
-Version: 4.9.3
-Revision: 22
-Type: cernlib (. -cernlib-gfortran -cernlib-g77)
-Architecture: ('%type_pkg[cernlib]' = '-cernlib-g77') powerpc, 
('%type_pkg[cernlib]' = '-cernlib-gfortran') powerpc, ('%type_pkg[cernlib]' = 
'-cernlib-gfortran') i386
+Version: 4.9.4
+Revision: 11
+Type: cernlib (. -cernlib-gfortran -cernlib-g77 -cernlib)
+Architecture: <<
+ ('%type_pkg[cernlib]' = '-cernlib-g77') powerpc,
+ ('%type_pkg[cernlib]' = '-cernlib-gfortran') powerpc,
+ ('%type_pkg[cernlib]' = '-cernlib-gfortran') i386,
+ ('%type_pkg[cernlib]' = '-cernlib') i386,
+ ('%type_pkg[cernlib]' = '-cernlib') x86_64
+<<
 Description: Simulation of particle-matter interaction
 DescDetail: <<
 Geant4 is a toolkit for the simulation of the passage of 
@@ -39,11 +45,14 @@
 BuildDepends: <<
  fink (>= 0.27.2),
  x11-dev,
- clhep2 (>= 2.0.3.1),
+ clhep2 (>= 2.1.0.1),
  openmotif3,
+ ('%type_pkg[cernlib]' = '-cernlib') cernlib2006-geant321,
+ ('%type_pkg[cernlib]' = '-cernlib') cernlib2006-dev,
+ ('%type_pkg[cernlib]' = '-cernlib') gcc46,
  ('%type_pkg[cernlib]' = '-cernlib-gfortran') cernlib2005-gfortran-geant321,
  ('%type_pkg[cernlib]' = '-cernlib-gfortran') cernlib2005-gfortran-dev,
- ('%type_pkg[cernlib]' = '-cernlib-gfortran') gcc44,
+ ('%type_pkg[cernlib]' = '-cernlib-gfortran') gcc45,
  ('%type_pkg[cernlib]' = '-cernlib-g77') cernlib2005-g77-dev,
  ('%type_pkg[cernlib]' = '-cernlib-g77') cernlib2005-g77-geant321,
  ('%type_pkg[cernlib]' = '-cernlib-g77') g77
@@ -56,7 +65,8 @@
  geant4.8-cernlib-g77,
  geant4.9,
  geant4.9-cernlib-gfortran,
- geant4.9-cernlib-g77
+ geant4.9-cernlib-g77,
+ geant4.9-cernlib
 <<
 Replaces: <<
  geant4 (<=4.7.1-51),
@@ -66,22 +76,23 @@
  geant4.8-cernlib-g77,
  geant4.9,
  geant4.9-cernlib-gfortran,
- geant4.9-cernlib-g77
+ geant4.9-cernlib-g77,
+ geant4.9-cernlib
 <<
 Provides: geant4
 Suggests: geant4.9-data
 GCC: 4.0
-Source: http://geant4.cern.ch/support/source/geant%v.p01.tar.gz
-Source-MD5: f8810467ab07ec8cab5f0e7c059f688a
+Source: http://geant4.cern.ch/support/source/geant%v.p02.tar.gz
+Source-MD5: d4e95badeb536d82278e690280633846
 PatchFile: geant4.9.patch
-PatchFile-MD5: 34117a250e0e686bdbfa8c19f1397abe
+PatchFile-MD5: 65f8dcf2e6977c071aed8dce5cd51708
 PatchScript: <<
   #!/bin/sh -ev
   if [[ '%type_pkg[cernlib]' == -cernlib-g77 ]]; then
     BUILDCERN='y'
     FORTRAN='g77'
     FORTRAN_LIBS='-lg2c -lc'
-  elif [[ '%type_pkg[cernlib]' == -cernlib-gfortran ]]; then
+  elif [[ '%type_pkg[cernlib]' == -cernlib-gfortran || '%type_pkg[cernlib]' == 
-cernlib ]]; then
     BUILDCERN='y'
     FORTRAN='gfortran -static-libgfortran -static-libgcc'
     FORTRAN_LIBS='-lc'
@@ -146,16 +157,18 @@
    Description: Shared libraries for GEANT4 9.2
    Depends: <<
      x11,
-     clhep2-shlibs (>= 2.0.3.1),
+     clhep2-shlibs (>= 2.1.0.1),
      openmotif3-shlibs
    <<
    Conflicts: <<
      geant4.9-shlibs,
+     geant4.9-cernlib-shlibs,
      geant4.9-cernlib-gfortran-shlibs,
      geant4.9-cernlib-g77-shlibs
    <<
    Replaces: <<
      geant4.9-shlibs,
+     geant4.9-cernlib-shlibs,
      geant4.9-cernlib-gfortran-shlibs,
      geant4.9-cernlib-g77-shlibs
    <<
@@ -209,6 +222,8 @@
      lib/geant4.9/Darwin-g++/libG4emhighenergy.4.9.dylib
      lib/geant4.9/Darwin-g++/libG4emlowenergy.%v.dylib
      lib/geant4.9/Darwin-g++/libG4emlowenergy.4.9.dylib
+     lib/geant4.9/Darwin-g++/libG4empii.%v.dylib
+     lib/geant4.9/Darwin-g++/libG4empii.4.9.dylib
      lib/geant4.9/Darwin-g++/libG4empolar.%v.dylib
      lib/geant4.9/Darwin-g++/libG4empolar.4.9.dylib
      lib/geant4.9/Darwin-g++/libG4emstandard.%v.dylib
@@ -311,8 +326,6 @@
      lib/geant4.9/Darwin-g++/libG4hadronic_interface_ci.4.9.dylib
      lib/geant4.9/Darwin-g++/libG4hadronic_iso.%v.dylib
      lib/geant4.9/Darwin-g++/libG4hadronic_iso.4.9.dylib
-     lib/geant4.9/Darwin-g++/libG4hadronic_leading_particle.%v.dylib
-     lib/geant4.9/Darwin-g++/libG4hadronic_leading_particle.4.9.dylib
      lib/geant4.9/Darwin-g++/libG4hadronic_mgt.%v.dylib
      lib/geant4.9/Darwin-g++/libG4hadronic_mgt.4.9.dylib
      lib/geant4.9/Darwin-g++/libG4hadronic_proc.%v.dylib
@@ -425,6 +438,7 @@
      %p/lib/geant4.9/Darwin-g++/libG4emadjoint.4.9.dylib                       
    4.9.0 %n (>=4.9.3-11)
      %p/lib/geant4.9/Darwin-g++/libG4emhighenergy.4.9.dylib                    
    4.9.0 %n (>=4.9.0-11)
      %p/lib/geant4.9/Darwin-g++/libG4emlowenergy.4.9.dylib                     
    4.9.0 %n (>=4.9.0-11)
+     %p/lib/geant4.9/Darwin-g++/libG4empii.4.9.dylib                           
    4.9.0 %n (>=4.9.4-11)
      %p/lib/geant4.9/Darwin-g++/libG4empolar.4.9.dylib                         
    4.9.0 %n (>=4.9.0-11)
      %p/lib/geant4.9/Darwin-g++/libG4emstandard.4.9.dylib                      
    4.9.0 %n (>=4.9.0-11)
      %p/lib/geant4.9/Darwin-g++/libG4emutils.4.9.dylib                         
    4.9.0 %n (>=4.9.0-11)
@@ -476,7 +490,6 @@
      %p/lib/geant4.9/Darwin-g++/libG4hadronic_incl_cascade.4.9.dylib           
    4.9.0 %n (>=4.9.1-11)
      %p/lib/geant4.9/Darwin-g++/libG4hadronic_interface_ci.4.9.dylib           
    4.9.0 %n (>=4.9.0-11)
      %p/lib/geant4.9/Darwin-g++/libG4hadronic_iso.4.9.dylib                    
    4.9.0 %n (>=4.9.0-11)
-     %p/lib/geant4.9/Darwin-g++/libG4hadronic_leading_particle.4.9.dylib       
    4.9.0 %n (>=4.9.0-11)
      %p/lib/geant4.9/Darwin-g++/libG4hadronic_mgt.4.9.dylib                    
    4.9.0 %n (>=4.9.0-11)
      %p/lib/geant4.9/Darwin-g++/libG4hadronic_proc.4.9.dylib                   
    4.9.0 %n (>=4.9.0-11)
      %p/lib/geant4.9/Darwin-g++/libG4hadronic_proc_ci.4.9.dylib                
    4.9.0 %n (>=4.9.3-11)

Index: geant4.9.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geant4.9.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- geant4.9.patch      20 Jul 2010 14:34:02 -0000      1.9
+++ geant4.9.patch      29 Jul 2011 09:19:23 -0000      1.10
@@ -1,7 +1,7 @@
 diff -Naur geant4.9.3.orig/config/sys/Darwin-g++.gmk 
geant4.9.3.new/config/sys/Darwin-g++.gmk
 --- geant4.9.3.orig/config/sys/Darwin-g++.gmk  2009-12-18 18:23:02.000000000 
+0100
 +++ geant4.9.3.new/config/sys/Darwin-g++.gmk   2010-01-27 09:53:59.000000000 
+0100
-@@ -35,13 +35,13 @@
+@@ -33,13 +33,13 @@
      FCFLAGS   += -O2 -g
      CCFLAGS   += -O2 -g
    endif
@@ -18,16 +18,7 @@
    endif
    ifndef X11LIBS
      X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
-@@ -79,7 +79,7 @@
- 
- # ---- QT Setup block -------------------------------------------------------
-   ifndef QTHOME
--    QTHOME   := $(shell test -f 
/Library/Frameworks/Qt3Support.framework/Qt3Support && echo  
"/Library/Frameworks" || echo "/sw")
-+    QTHOME   := $(shell test -f 
/Library/Frameworks/Qt3Support.framework/Qt3Support && echo  
"/Library/Frameworks" || echo "@PREFIX@")
-   endif
-   ifndef QTMOC
-    ifeq ($(QTHOME),/Library/Frameworks)
-@@ -135,15 +135,32 @@
+@@ -126,15 +126,32 @@
  
    define build-granular-shared-lib
      @libdir=`(cd $(@D);/bin/pwd)`; \
@@ -158,7 +149,7 @@
  libc : $(G4LIBDIR)/lib$(name).$(SHEXT)
 --- geant4.9.3.orig/Configure  2009-12-18 18:23:01.000000000 +0100
 +++ geant4.9.3.new/Configure   2010-01-26 11:42:43.000000000 +0100
-@@ -650,19 +650,6 @@
+@@ -657,19 +657,6 @@
        ;;
  esac
  
@@ -178,17 +169,3 @@
  exec 4>&1
  case "$silent" in
  true) exec 1>/dev/null;;
-@@ -3167,11 +3167,11 @@
- 
-       if [ X$g4lib_build_shared = Xy ] ; then
-               #
--              # Ask about g4lib_build_static - default "n". 
-+              # Ask about g4lib_build_static - default "y". 
-               #
-               while test 1 = 1  ; do
-                       g4message="Do you want to build static libraries too?"
--                      dflt=n
-+                      dflt=y
-                       rp=$g4message
-                       . ./myread
-                       gans=$ans

Index: geant4.9-data.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geant4.9-data.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- geant4.9-data.info  29 Jan 2010 16:13:02 -0000      1.5
+++ geant4.9-data.info  29 Jul 2011 09:19:23 -0000      1.6
@@ -1,5 +1,5 @@
 Package: geant4.9-data
-Version: 4.9.3
+Version: 4.9.4
 Revision: 11
 Description: Optional datafiles for GEANT4 9
 DescDetail: <<
@@ -12,18 +12,22 @@
 Replaces: geant4-data (<=4.8.0-11), geant4.7-data, geant4.8-data
 Provides: geant4-data
 Recommends: geant4.9
-Source:  http://geant4.cern.ch/support/source/G4NDL.3.13.tar.gz
-Source2: http://geant4.cern.ch/support/source/G4EMLOW.6.9.tar.gz
-Source3: http://geant4.cern.ch/support/source/PhotonEvaporation.2.0.tar.gz
-Source4: http://geant4.cern.ch/support/source/G4RadioactiveDecay.3.2.tar.gz
+Source:  http://geant4.cern.ch/support/source/G4NDL.3.14.tar.gz
+Source2: http://geant4.cern.ch/support/source/G4EMLOW.6.19.tar.gz
+Source3: http://geant4.cern.ch/support/source/G4PhotonEvaporation.2.1.tar.gz
+Source4: http://geant4.cern.ch/support/source/G4RadioactiveDecay.3.3.tar.gz
 Source5: http://geant4.cern.ch/support/source/G4ABLA.3.0.tar.gz
-Source6: http://geant4.cern.ch/support/source/RealSurface.1.0.tar.gz
-Source-MD5:  3aeb08f8532fc1d445b020ff9985b4e0
-Source2-MD5: 90af6d45b5053e9e355df38231e2060c
-Source3-MD5: 097fa94e2ec361cbfe3477ed5886a423
-Source4-MD5: 45e7ab756038e4ebac16f7d65e4227cc
+Source6: http://geant4.cern.ch/support/source/G4NEUTRONXS.1.0.tar.gz
+Source7: http://geant4.cern.ch/support/source/G4PII.1.2.tar.gz
+Source8: http://geant4.cern.ch/support/source/RealSurface.1.0.tar.gz
+Source-MD5:  b9b6869bc28c83d9160f674785a9f09f
+Source2-MD5: c0fe7c8a59a2abde60d13e947f566718
+Source3-MD5: d1ee8ac49515109c34ae3714c22d59dd
+Source4-MD5: 2a1b24863d5c5a4d165303f189c5b08e
 Source5-MD5: d2d4e99b14f7a5057f4c10d9c2d647dd
-Source6-MD5: 0dde95e00fcd3bcd745804f870bb6884
+Source6-MD5: bc161c33f2e9488f252b8edce88b655f
+Source7-MD5: d02dbdf95e703b64651d1d4df526cff9
+Source8-MD5: 0dde95e00fcd3bcd745804f870bb6884
 NoSourceDirectory: true
 CompileScript: <<
 <<
@@ -32,10 +36,12 @@
   /bin/mv * %i/share/geant4.9/data/
 <<
 RuntimeVars: <<
-  G4NEUTRONHPDATA:         %p/share/geant4.9/data/G4NDL3.13
-  G4LEDATA:                %p/share/geant4.9/data/G4EMLOW6.9
-  G4LEVELGAMMADATA:        %p/share/geant4.9/data/PhotonEvaporation2.0
-  G4RADIOACTIVEDATA:       %p/share/geant4.9/data/RadioactiveDecay3.2
+  G4NEUTRONHPDATA:         %p/share/geant4.9/data/G4NDL3.14
+  G4LEDATA:                %p/share/geant4.9/data/G4EMLOW6.19
+  G4LEVELGAMMADATA:        %p/share/geant4.9/data/PhotonEvaporation2.1
+  G4RADIOACTIVEDATA:       %p/share/geant4.9/data/RadioactiveDecay3.3
   G4ABLADATA:              %p/share/geant4.9/data/G4ABLA3.0
+  G4NEUTRONXSDATA:         %p/share/geant4.9/data/G4NEUTRONXS.1.0
+  G4PIIDATA:               %p/share/geant4.9/data/G4PII.1.2
   G4REALSURFACEDATA:       %p/share/geant4.9/data/RealSurface.1.0
 <<

Index: clhep2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/clhep2.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- clhep2.info 27 Jan 2010 08:57:57 -0000      1.10
+++ clhep2.info 29 Jul 2011 09:19:23 -0000      1.11
@@ -1,11 +1,11 @@
 Package: clhep2
-Version: 2.0.4.5
-Revision: 51
+Version: 2.1.0.1
+Revision: 11
 BuildDependsOnly: true
 Description: Class library for high energy physics
 Maintainer: Remi Mommsen <remigius.momm...@cern.ch>
 Source: 
http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-%v.tgz
-Source-MD5: 0e29d9f8253ed61cd1b6fa5cb892c708
+Source-MD5: dadfbe2c94a3f644cd085489c36b1bfd
 SourceDirectory: %v/CLHEP
 GCC: 4.0
 NoSetMAKEFLAGS: true
@@ -23,7 +23,7 @@
   done
   for file in `/usr/bin/find . -name "configure" -print` ; do
     /usr/bin/sed -i '.bak' 's/++)/++*)/' $file
-    /usr/bin/sed -i '.bak' 's/-single_module/-single_module 
-compatibility_version 3 -current_version 3.0.2/' $file
+    /usr/bin/sed -i '.bak' 's/-single_module/-single_module 
-compatibility_version 3 -current_version 3.1.0/' $file
     /usr/bin/sed -i '.bak' 's=-Wl,-install_name,=-install_name %p/lib/=' $file
     /usr/bin/sed -i '.bak' 's/^      build_shared="no"/      
build_shared="yes"/' $file
   done 


------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to