Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8676
Modified Files:
geant4.8.info geant4.9-data.info geant4.9.info geant4.9.patch
Log Message:
Latest version to stable.
Index: geant4.9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/geant4.9.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- geant4.9.info 26 Aug 2009 04:27:09 -0000 1.7
+++ geant4.9.info 25 Jan 2010 14:14:37 -0000 1.8
@@ -1,10 +1,9 @@
Info3: <<
Package: geant4.9%type_pkg[cernlib]
-Version: 4.9.1
+Version: 4.9.2
Revision: 23
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
-Distribution: ('%type_pkg[cernlib]' = '-cernlib-gfortran') 10.4,
('%type_pkg[cernlib]' = '-cernlib-gfortran') 10.5
Description: Simulation of particle-matter interaction
DescDetail: <<
Geant4 is a toolkit for the simulation of the passage of
@@ -33,8 +32,7 @@
BuildDependsOnly: true
Depends: <<
%n-shlibs (=%v-%r),
- openmotif3-bin,
- ('%type_pkg[cernlib]' = '-cernlib-gfortran') gcc43-shlibs
+ openmotif3-bin
<<
BuildDepends: <<
fink (>= 0.27.2),
@@ -43,7 +41,7 @@
openmotif3,
('%type_pkg[cernlib]' = '-cernlib-gfortran') cernlib2005-gfortran-geant321,
('%type_pkg[cernlib]' = '-cernlib-gfortran') cernlib2005-gfortran-dev,
- ('%type_pkg[cernlib]' = '-cernlib-gfortran') gcc43,
+ ('%type_pkg[cernlib]' = '-cernlib-gfortran') gcc44,
('%type_pkg[cernlib]' = '-cernlib-g77') cernlib2005-g77-dev,
('%type_pkg[cernlib]' = '-cernlib-g77') cernlib2005-g77-geant321,
('%type_pkg[cernlib]' = '-cernlib-g77') g77
@@ -71,10 +69,10 @@
Provides: geant4
Suggests: geant4.9-data
GCC: 4.0
-Source: http://geant4.cern.ch/support/source/geant%v.p03.tar.gz
-Source-MD5: 194b33dd55243e9ea5873f339d052bab
+Source: http://geant4.cern.ch/support/source/geant%v.p02.tar.gz
+Source-MD5: d5935ca6ee0805fccca7c82c3167d65b
PatchFile: geant4.9.patch
-PatchFile-MD5: bee30fc18de234aa2287ce1138b2551e
+PatchFile-MD5: 4194acca26c7b1cb01d44ba05aa75a26
PatchScript: <<
#!/bin/sh -ev
if [[ '%type_pkg[cernlib]' == -cernlib-g77 ]]; then
@@ -83,16 +81,25 @@
FORTRAN_LIBS='-lg2c -lc'
elif [[ '%type_pkg[cernlib]' == -cernlib-gfortran ]]; then
BUILDCERN='y'
- FORTRAN='gfortran'
+ FORTRAN='gfortran -static-libgfortran -static-libgcc'
FORTRAN_LIBS='-lc'
else
BUILDCERN='n'
FORTRAN='echo'
FORTRAN_LIBS=''
fi
- sed 's|@PREFIX@|%p|g' < %{PatchFile} | sed 's|@BUILDDIR@|%b|g' | sed
's|@VERSION@|%v|g' | \
- sed "s|@BUILDCERN@|$BUILDCERN|g" | sed "s|@FORTRAN@|$FORTRAN|g" | \
- sed "s|@FORTRAN_LIBS@|$FORTRAN_LIBS|g" | patch -p1
+ cat %{PatchFile} | \
+ /usr/bin/sed -e '{
+ s|@PREFIX@|%p|g ;
+ s|@BUILDDIR@|%b|g ;
+ s|@VERSION@|%v|g ;
+ s|@BUILDCERN@|$BUILDCERN|g ;
+ s|@FORTRAN@|$FORTRAN|g ;
+ s|@FORTRAN_LIBS@|$FORTRAN_LIBS|g
+ }' | \
+ patch -p1
+ /usr/bin/sed -i".bak" "s|/sw/|%p/|g" Configure
+ /bin/rm -f Configure.bak
<<
CompileScript: <<
#!/bin/sh -ev
@@ -133,7 +140,7 @@
<<
SplitOff: <<
Package: %N-shlibs
- Description: Shared libraries for GEANT4 9.1
+ Description: Shared libraries for GEANT4 9.2
Depends: <<
x11,
clhep2-shlibs (>= 2.0.3.1),
@@ -213,6 +220,8 @@
lib/geant4.9/Darwin-g++/libG4geomdivision.4.9.dylib
lib/geant4.9/Darwin-g++/libG4geometrymng.%v.dylib
lib/geant4.9/Darwin-g++/libG4geometrymng.4.9.dylib
+ lib/geant4.9/Darwin-g++/libG4geomtext.%v.dylib
+ lib/geant4.9/Darwin-g++/libG4geomtext.4.9.dylib
lib/geant4.9/Darwin-g++/libG4gflash.%v.dylib
lib/geant4.9/Darwin-g++/libG4gflash.4.9.dylib
lib/geant4.9/Darwin-g++/libG4globman.%v.dylib
@@ -335,6 +344,8 @@
lib/geant4.9/Darwin-g++/libG4optical.4.9.dylib
lib/geant4.9/Darwin-g++/libG4parameterisation.%v.dylib
lib/geant4.9/Darwin-g++/libG4parameterisation.4.9.dylib
+ lib/geant4.9/Darwin-g++/libG4partadj.%v.dylib
+ lib/geant4.9/Darwin-g++/libG4partadj.4.9.dylib
lib/geant4.9/Darwin-g++/libG4partman.%v.dylib
lib/geant4.9/Darwin-g++/libG4partman.4.9.dylib
lib/geant4.9/Darwin-g++/libG4partutils.%v.dylib
@@ -406,6 +417,7 @@
%p/lib/geant4.9/Darwin-g++/libG4geombias.4.9.dylib
4.9.0 %n (>=4.9.0-11)
%p/lib/geant4.9/Darwin-g++/libG4geomdivision.4.9.dylib
4.9.0 %n (>=4.9.0-11)
%p/lib/geant4.9/Darwin-g++/libG4geometrymng.4.9.dylib
4.9.0 %n (>=4.9.0-11)
+ %p/lib/geant4.9/Darwin-g++/libG4geomtext.4.9.dylib
4.9.0 %n (>=4.9.2-11)
%p/lib/geant4.9/Darwin-g++/libG4gflash.4.9.dylib
4.9.0 %n (>=4.9.0-11)
%p/lib/geant4.9/Darwin-g++/libG4globman.4.9.dylib
4.9.0 %n (>=4.9.0-11)
%p/lib/geant4.9/Darwin-g++/libG4graphics_reps.4.9.dylib
4.9.0 %n (>=4.9.0-11)
@@ -467,6 +479,7 @@
%p/lib/geant4.9/Darwin-g++/libG4navigation.4.9.dylib
4.9.0 %n (>=4.9.0-11)
%p/lib/geant4.9/Darwin-g++/libG4optical.4.9.dylib
4.9.0 %n (>=4.9.0-11)
%p/lib/geant4.9/Darwin-g++/libG4parameterisation.4.9.dylib
4.9.0 %n (>=4.9.0-11)
+ %p/lib/geant4.9/Darwin-g++/libG4partadj.4.9.dylib
4.9.0 %n (>=4.9.2-11)
%p/lib/geant4.9/Darwin-g++/libG4partman.4.9.dylib
4.9.0 %n (>=4.9.0-11)
%p/lib/geant4.9/Darwin-g++/libG4partutils.4.9.dylib
4.9.0 %n (>=4.9.0-11)
%p/lib/geant4.9/Darwin-g++/libG4phys_builders.4.9.dylib
4.9.0 %n (>=4.9.0-11)
Index: geant4.8.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/geant4.8.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- geant4.8.info 26 Aug 2009 04:27:09 -0000 1.11
+++ geant4.8.info 25 Jan 2010 14:14:37 -0000 1.12
@@ -1,10 +1,9 @@
Info3: <<
Package: geant4.8%type_pkg[cernlib]
Version: 4.8.3
-Revision: 63
+Revision: 64
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
-Distribution: ('%type_pkg[cernlib]' = '-cernlib-gfortran') 10.4,
('%type_pkg[cernlib]' = '-cernlib-gfortran') 10.5
Description: Simulation of particle-matter interaction
DescDetail: <<
Geant4 is a toolkit for the simulation of the passage of
@@ -34,7 +33,7 @@
Depends: <<
%n-shlibs (=%v-%r),
openmotif3-bin,
- ('%type_pkg[cernlib]' = '-cernlib-gfortran') gcc43-shlibs
+ ('%type_pkg[cernlib]' = '-cernlib-gfortran') gcc44-shlibs
<<
BuildDepends: <<
fink (>= 0.27.2),
@@ -43,7 +42,7 @@
openmotif3,
('%type_pkg[cernlib]' = '-cernlib-gfortran') cernlib2005-gfortran-geant321,
('%type_pkg[cernlib]' = '-cernlib-gfortran') cernlib2005-gfortran-dev,
- ('%type_pkg[cernlib]' = '-cernlib-gfortran') gcc43,
+ ('%type_pkg[cernlib]' = '-cernlib-gfortran') gcc44,
('%type_pkg[cernlib]' = '-cernlib-g77') cernlib2005-g77-dev,
('%type_pkg[cernlib]' = '-cernlib-g77') cernlib2005-g77-geant321,
('%type_pkg[cernlib]' = '-cernlib-g77') g77
@@ -90,9 +89,18 @@
FORTRAN='echo'
FORTRAN_LIBS=''
fi
- sed 's|@PREFIX@|%p|g' < %{PatchFile} | sed 's|@BUILDDIR@|%b|g' | sed
's|@VERSION@|%v|g' | \
- sed "s|@BUILDCERN@|$BUILDCERN|g" | sed "s|@FORTRAN@|$FORTRAN|g" | \
- sed "s|@FORTRAN_LIBS@|$FORTRAN_LIBS|g" | patch -p1
+ cat %{PatchFile} | \
+ /usr/bin/sed -e '{
+ s|@PREFIX@|%p|g ;
+ s|@BUILDDIR@|%b|g ;
+ s|@VERSION@|%v|g ;
+ s|@BUILDCERN@|$BUILDCERN|g ;
+ s|@FORTRAN@|$FORTRAN|g ;
+ s|@FORTRAN_LIBS@|$FORTRAN_LIBS|g
+ }' | \
+ patch -p1
+ /usr/bin/sed -i".bak" "s|/sw/|%p/|g" Configure
+ /bin/rm -f Configure.bak
<<
CompileScript: <<
#!/bin/sh -ev
Index: geant4.9.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/geant4.9.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- geant4.9.patch 6 Oct 2008 10:00:36 -0000 1.4
+++ geant4.9.patch 25 Jan 2010 14:14:37 -0000 1.5
@@ -69,14 +69,14 @@
+g4wlib_build_g3tog4='@BUILDCERN@'
--- geant4.9.orig/config/sys/Darwin-g++.gmk 2006-12-15 05:16:27.000000000
-0600
+++ geant4.9.new/config/sys/Darwin-g++.gmk 2006-12-22 10:26:22.000000000
-0600
-@@ -27,40 +27,40 @@
+@@ -30,27 +30,27 @@
FCFLAGS += -pg
CCFLAGS += -pg
endif
- FC := gfortran
+ FC := @FORTRAN@
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
- LDFLAGS += -bind_at_load
+ LDFLAGS += -bind_at_load -arch_multiple
- FCLIBS := -lg2c -lnsl
+ FCLIBS := @FORTRAN_LIBS@
SHEXT := dylib
@@ -97,38 +97,22 @@
+ XMLIBS := -...@prefix@/lib -lXm -lXpm
# XMLIBS := -L/usr/X11R6/lib -lXm -lXpm ##### some installations.
endif
- ifndef QTHOME
-- QTHOME := /sw
-+ QTHOME := @PREFIX@
- endif
- ifndef QTFLAGS
- QTFLAGS := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
- MOC := $(QTHOME)/bin/moc
- endif
- ifndef QTLIBS
- QT3LIBS := -L$(QTHOME)/lib -lqt-mt -lqui
- QT4LIBS := -F$(QTHOME)/lib -framework QtCore -framework QtGui
- QT4LIBS += -framework QtOpenGL -framework QtSql -framework QtXml
- QTLIBS := $(shell test -f
$(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo
$(QT3LIBS))
- endif
ifndef XAWFLAGS
- XAWFLAGS := -I/sw/include
+ XAWFLAGS := -...@prefix@/include
# XAWFLAGS := -I/usr/X11R6/include ##### some installations.
endif
ifndef XAWLIBS
-@@ -74,24 +74,40 @@
- OGLFLAGS := -I$(OGLHOME)/include
- endif
- ifndef OGLLIBS
- OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
- # Uncomment the following lines for building on MacOSX 10.5 "Leopard"
--# OGLLIBS += -dylib_file \
--#
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\
--#
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-+ OGLLIBS += -dylib_file \
-+
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+@@ -74,7 +74,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)
+@@ -129,15 +129,32 @@
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
@@ -136,7 +120,7 @@
+ compversion=`(echo @VERSION@ | /usr/bin/cut -d'.' -f1-2)`; \
+ libs=`(/bin/ls -1 $$libdir/*$$compversion.dylib | /usr/bin/xargs -IFILE
/usr/bin/basename FILE .$$compversion.dylib | /usr/bin/sed -n 's|^lib|-l|p')`; \
cd $(G4TMPDIR); \
- g++ -dynamiclib -single_module -undefined dynamic_lookup \
+ $(CXX) -dynamiclib -single_module -lgcov -undefined dynamic_lookup \
- -o $$libdir/$(@F) $(INTYLIBS) *.o
+ -install_name @PREFIX@/lib/geant4.9/Darwin-g++/`echo $$libname |
/usr/bin/cut -d'.' -f1-3`".dylib" \
+ -compatibility_version $$compversion -current_version @VERSION@ \
@@ -151,7 +135,7 @@
+ compversion=`(echo @VERSION@ | /usr/bin/cut -d'.' -f1-2)`; \
+ libs=`(/bin/ls -1 $$libdir/*$$compversion.dylib | /usr/bin/xargs -IFILE
/usr/bin/basename FILE .$$compversion.dylib | /usr/bin/sed -n 's|^lib|-l|p')`; \
cd $(G4TMP)/$(G4SYSTEM); \
- g++ -dynamiclib -single_module -undefined dynamic_lookup \
+ $(CXX) -dynamiclib -single_module -lgcov -undefined dynamic_lookup \
- -o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
+ -install_name @PREFIX@/lib/geant4.9/Darwin-g++/`echo $$libname |
/usr/bin/cut -d'.' -f1-3`".dylib" \
+ -compatibility_version $$compversion -current_version @VERSION@ \
@@ -165,7 +149,7 @@
endif
--- geant4.9.orig/Configure 2006-12-23 11:40:51.000000000 -0600
+++ geant4.9.new/Configure 2006-12-23 11:41:25.000000000 -0600
-@@ -3335,8 +3335,8 @@
+@@ -3887,8 +3887,8 @@
Do you want to build 'static' (.a) libraries too?
EOM`
Index: geant4.9-data.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/geant4.9-data.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- geant4.9-data.info 14 Oct 2008 07:52:54 -0000 1.3
+++ geant4.9-data.info 25 Jan 2010 14:14:37 -0000 1.4
@@ -1,6 +1,6 @@
Package: geant4.9-data
-Version: 4.9.1
-Revision: 12
+Version: 4.9.2
+Revision: 11
Description: Optional datafiles for GEANT4 9
DescDetail: <<
Datafiles for specific (optional) physics processes.
@@ -12,13 +12,13 @@
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.12.tar.gz
-Source2: http://geant4.cern.ch/support/source/G4EMLOW.5.1.tar.gz
+Source: http://geant4.cern.ch/support/source/G4NDL.3.13.tar.gz
+Source2: http://geant4.cern.ch/support/source/G4EMLOW.6.2.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
Source5: http://geant4.cern.ch/support/source/G4ABLA.3.0.tar.gz
-Source-MD5: 09f4d4f4601e9c8349109dee22be1c4a
-Source2-MD5: 96dadb966dad09f59e1eba0a5002c0a5
+Source-MD5: 3aeb08f8532fc1d445b020ff9985b4e0
+Source2-MD5: 0cab7a4b75fa9cd429606a66ed521696
Source3-MD5: 097fa94e2ec361cbfe3477ed5886a423
Source4-MD5: 45e7ab756038e4ebac16f7d65e4227cc
Source5-MD5: d2d4e99b14f7a5057f4c10d9c2d647dd
@@ -30,8 +30,8 @@
/bin/mv * %i/share/geant4.9/data/
<<
RuntimeVars: <<
- G4NEUTRONHPDATA: %p/share/geant4.9/data/G4NDL3.12
- G4LEDATA: %p/share/geant4.9/data/G4EMLOW5.1
+ G4NEUTRONHPDATA: %p/share/geant4.9/data/G4NDL3.13
+ G4LEDATA: %p/share/geant4.9/data/G4EMLOW6.2
G4LEVELGAMMADATA: %p/share/geant4.9/data/PhotonEvaporation2.0
G4RADIOACTIVEDATA: %p/share/geant4.9/data/RadioactiveDecay3.2
G4ABLADATA: %p/share/geant4.9/data/G4ABLA3.0
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
