Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16127

Modified Files:
        geant4-data.info geant4.info geant4.patch 
Log Message:
Update to latest upstream release, use g++ 4.0

Index: geant4.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/geant4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- geant4.patch        27 Apr 2005 03:26:22 -0000      1.1
+++ geant4.patch        25 Sep 2005 16:08:07 -0000      1.2
@@ -44,7 +44,7 @@
 +g4vis_build_raytracer_driver='y'
 +g4vis_build_vrml_driver='y'
 +g4vis_build_vrmlfile_driver='y'
-+g4vis_oglhome='/usr/X11R6'
++g4vis_oglhome='/usr/X11R6/'
 +g4vis_use_asciitree='y'
 +g4vis_use_dawn='y'
 +g4vis_use_dawnfile='y'
@@ -66,41 +66,76 @@
 +g4wanalysis_use_lab=''
 +g4wanalysis_use_lizard=''
 +g4wlib_build_g3tog4='n'
---- geant4.orig/config/sys/Darwin-g++.gmk      Sun Oct 24 23:48:28 2004
-+++ /fink_packaging/Darwin-g++.gmk     Sun Dec 12 21:37:32 2004
-@@ -40,10 +40,10 @@
+--- geant4.7.1.orig/Configure  2005-06-20 12:34:18.000000000 -0500
++++ geant4.7.1.new/Configure   2005-09-22 11:56:05.000000000 -0500
+@@ -3136,7 +3136,7 @@
+       y*|Y*) 
+               g4lib_build_dyn=y
+               g4lib_build_shared=n
+-              g4lib_build_static=n
++              g4lib_build_static=y
+ 
+ #             g4lib_build_static=""
+ #             g4lib_use_shared=1
+--- geant4.7.1.orig/config/binmake.gmk 2005-06-15 08:59:59.000000000 -0500
++++ geant4.7.1.new/config/binmake.gmk  2005-09-23 22:09:23.000000000 -0500
+@@ -145,7 +145,7 @@
+ endif
+ 
+ CPPFLAGS += $(INCFLAGS)
+-LDFLAGS += -L$(G4LIBDIR)
++LDFLAGS += -L$(G4LIBDIR) -bind_at_load -multiply_defined suppress
+ 
+ G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(G4TARGET)
+ G4BINDIR := $(G4BIN)/$(G4SYSTEM)
+--- geant4.7.1.orig/config/sys/Darwin-g++.gmk  2005-05-17 03:07:27.000000000 
-0500
++++ geant4.7.1.new/config/sys/Darwin-g++.gmk   2005-09-24 23:47:11.000000000 
-0500
+@@ -34,12 +34,10 @@
    FCLIBS := -lg2c -lnsl
    ECHO    := /bin/echo -n
    SHEXT   := dylib
 -  X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
 +  X11FLAGS  := -I/usr/X11R6/include
-   X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+   X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
 -  XMFLAGS   := -I/sw/include
+-#  XMFLAGS   := -I/usr/X11R6/include          ##### some installations.
 -  XMLIBS    := -L/sw/lib -lXm -lXpm
+-#  XMLIBS    := -L/usr/X11R6/lib -lXm -lXpm   ##### some installations.
 +  XMFLAGS   := [EMAIL PROTECTED]@/include
 +  XMLIBS    := [EMAIL PROTECTED]@/lib -lXm -lXpm
    DLDLIBS   := -ldl
    ifndef OGLHOME
      OGLHOME  := /usr/X11R6
-@@ -56,20 +56,34 @@
-   endif
+@@ -66,37 +64,35 @@
+ #   G.Barrand (16/07/2004)
+ #
+ ####  G4_MACOSX_TWO_LEVEL_NAMESPACE = 1
+-ifdef G4_MACOSX_TWO_LEVEL_NAMESPACE
    define build-granular-shared-lib
      @libdir=`(cd $(@D);/bin/pwd)`; \
 +     libname=`(echo $(@F) | /usr/bin/sed 's/\.dylib/[EMAIL 
PROTECTED]@.dylib/')`; \
 +     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 -twolevel_namespace -undefined error -dynamic \
+-     g++ -dynamiclib -twolevel_namespace -undefined define_a_way -dynamic \
 -         -single_module -o $$libdir/$(@F) *.o -L$(G4LIB)/$(G4SYSTEM) \
+-         -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB) $(INTYLIBS)
+-  endef
+-else
+-  define build-granular-shared-lib
+-    @libdir=`(cd $(@D);/bin/pwd)`; \
+-     cd $(G4TMPDIR); \
+-     g++ -dynamiclib -flat_namespace -undefined suppress  -dynamic 
-single_module -o $$libdir/$(@F) $(INTYLIBS) *.o
++     g++ -dynamiclib -twolevel_namespace -undefined error -dynamic \
 +         -install_name @PREFIX@/lib/`echo $$libname | /usr/bin/cut -d'.' 
-f1-3`".dylib" \
 +         -compatibility_version $$compversion -current_version @VERSION@ \
 +         -single_module -o $$libdir/$$libname *.o -L$(G4LIB)/$(G4SYSTEM) 
$$libs \
-          $(patsubst lib%,-l%,$(patsubst %.lib,%,$(GLOBLIBS))) \
--         -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB) $(INTYLIBS)
 +         -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB) $(INTYLIBS); \
 +     /bin/ln -s $$libname $$libdir/`echo $$libname | /usr/bin/cut -d'.' 
-f1-3`".dylib"; \
 +     /bin/ln -s $$libname $$libdir/`echo $$libname | /usr/bin/cut -d'.' 
-f1`".dylib"
    endef
+-endif
+-ifdef G4_MACOSX_TWO_LEVEL_NAMESPACE
    define build-global-shared-lib
      @libdir=`(cd $(@D);/bin/pwd)`; \
 +     libname=`(echo $(@F) | /usr/bin/sed 's/\.dylib/[EMAIL 
PROTECTED]@.dylib/')`; \
@@ -119,16 +154,12 @@
 +     /bin/ln -s $$libname $$libdir/`echo $$libname | /usr/bin/cut -d'.' 
-f1-3`".dylib"; \
 +     /bin/ln -s $$libname $$libdir/`echo $$libname | /usr/bin/cut -d'.' 
-f1`".dylib"
    endef
+-else
+-  define build-global-shared-lib
+-    @libdir=`(cd $(@D);/bin/pwd)`; \
+-     cd $(G4TMP)/$(G4SYSTEM); \
+-     g++ -dynamiclib -flat_namespace -undefined suppress  -dynamic 
-single_module -o $$libdir/$(@F) $(INTYLIBS) $(foreach 
dir,$(SUBLIBS),$(dir)/*.o);
+-  endef
+-endif
  
  endif
---- geant4.orig/Configure      Sun Oct 24 23:48:27 2004
-+++ geant4.new/Configure       Sun Dec 12 10:49:23 2004
-@@ -2998,7 +2998,7 @@
-       y*|Y*) 
-               g4lib_build_dyn=y
-               g4lib_build_shared=n
--              g4lib_build_static=n
-+              g4lib_build_static=y
- 
- #             g4lib_build_static=""
- #             g4lib_use_shared=1

Index: geant4-data.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/geant4-data.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- geant4-data.info    27 Apr 2005 03:26:22 -0000      1.1
+++ geant4-data.info    25 Sep 2005 16:08:07 -0000      1.2
@@ -1,5 +1,5 @@
 Package: geant4-data
-Version: 4.6.2 
+Version: 4.7.1 
 Revision: 11
 Description: Optional datafiles for GEANT4
 DescDetail: <<
@@ -8,24 +8,25 @@
 Homepage: http://cern.ch/geant4/
 Maintainer: Remi Mommsen <[EMAIL PROTECTED]>
 License: BSD
-Depends: geant4
-Source:  http://geant4.web.cern.ch/geant4/source/source/G4NDL3.7.tar.gz
-Source2: http://geant4.web.cern.ch/geant4/source/source/G4EMLOW2.3.tar.gz
+Recommends: geant4
+Source:  http://geant4.web.cern.ch/geant4/source/source/G4NDL.3.7.tar.gz
+Source2: http://geant4.web.cern.ch/geant4/source/source/G4EMLOW.3.0.tar.gz
 Source3: 
http://geant4.web.cern.ch/geant4/source/source/PhotonEvaporation.2.0.tar.gz
 Source4: 
http://geant4.web.cern.ch/geant4/source/source/RadiativeDecay.3.0.tar.gz
-Source5: http://geant4.web.cern.ch/geant4/source/source/Elastic.1.0.tar.gz
+Source5: http://geant4.web.cern.ch/geant4/source/source/G4ELASTIC.1.1.tar.gz
 Source-MD5:  4ad8f5ef02e11a176e603cac29a51b5a
-Source2-MD5: 36b44ec925ac3d838adeca76b7d5f351
-Source3-MD5: f7e3cd6c1e4dbffa2e79b290e8a67500
-Source4-MD5: a902f97d3e3b72705cc153e4f9742a1e
-Source5-MD5: bae28fcba3fa033424d8f55f8c45889b
+Source2-MD5: 9e696c88953a631033f613bf1c82cd14
+Source3-MD5: bbeecf4303db7fa50b129c2a0d3ee500
+Source4-MD5: 9fff446948c1f80910865c67276e1a27
+Source5-MD5: 8d9984fea7ad900bc7976e4528750a18
+NoSourceDirectory: true
 CompileScript: <<
 <<
 InstallScript: <<
   /usr/bin/install -d -m 755 %i/share/geant4/data
-  /bin/cp -PR ../G4NDL3.7 %i/share/geant4/data
-  /bin/cp -PR ../G4EMLOW2.3 %i/share/geant4/data
-  /bin/cp -PR ../PhotonEvaporation %i/share/geant4/data
-  /bin/cp -PR ../RadiativeDecay %i/share/geant4/data
-  /bin/cp -PR ../Elastic %i/share/geant4/data
+  /bin/mv G4ELASTIC1.1         %i/share/geant4/data/
+  /bin/mv G4EMLOW3.0           %i/share/geant4/data/
+  /bin/mv G4NDL3.7             %i/share/geant4/data/
+  /bin/mv PhotonEvaporation2.0 %i/share/geant4/data/PhotonEvaporation
+  /bin/mv RadiativeDecay3.0    %i/share/geant4/data/RadiativeDecay
 <<

Index: geant4.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/geant4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- geant4.info 27 Apr 2005 03:26:22 -0000      1.1
+++ geant4.info 25 Sep 2005 16:08:07 -0000      1.2
@@ -1,6 +1,6 @@
 Package: geant4
-Version: 4.6.2
-Revision: 11
+Version: 4.7.1
+Revision: 51
 Description: Toolkit for simulation of particles passing through matter
 DescDetail: <<
 Its application areas include high energy physics and nuclear 
@@ -35,16 +35,18 @@
 Depends: %n-shlibs (=%v-%r), openmotif3-bin
 BuildDepends: <<
  x11-dev,
- clhep (>= 1.9.1.1),
+ clhep (>= 1.9.2.1),
  openmotif3
 <<
 Suggests: geant4-data
-GCC: 3.3
-Source: http://geant4.web.cern.ch/geant4/source/source/geant%v.p02.tar.gz
-Source-MD5: 5db3cfcb9afa0b2737daf47963fdb051
+GCC: 4.0
+NoSetPATH: true
+Source: http://geant4.web.cern.ch/geant4/source/source/geant%v.tar.gz
+Source-MD5: 80605376e0476fa44afde9dffd96612c
 PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | sed 's|@BUILDDIR@|%b|g' | 
sed 's|@VERSION@|%v|g' | patch -p1
 CompileScript: <<
  ./Configure -install -d -e -f fink.sh
+ ./Configure -build -d -e -f fink.sh
 <<
 InstallScript: <<
   /usr/bin/install -d -m 755 %i/lib
@@ -77,86 +79,86 @@
    Description: Shared libraries for GEANT4
    Depends: <<
      x11,
-     clhep-shlibs (>= 1.9.1.1),
+     clhep-shlibs (>= 1.9.2.1),
      openmotif3-shlibs
    <<
    Files: <<
      lib/libG4FR.%v.dylib
-     lib/libG4FR.4.6.dylib
+     lib/libG4FR.4.7.dylib
      lib/libG4OpenGL.%v.dylib
-     lib/libG4OpenGL.4.6.dylib
+     lib/libG4OpenGL.4.7.dylib
      lib/libG4RayTracer.%v.dylib
-     lib/libG4RayTracer.4.6.dylib
+     lib/libG4RayTracer.4.7.dylib
      lib/libG4Tree.%v.dylib
-     lib/libG4Tree.4.6.dylib
+     lib/libG4Tree.4.7.dylib
      lib/libG4VRML.%v.dylib
-     lib/libG4VRML.4.6.dylib
+     lib/libG4VRML.4.7.dylib
      lib/libG4digits_hits.%v.dylib
-     lib/libG4digits_hits.4.6.dylib
+     lib/libG4digits_hits.4.7.dylib
      lib/libG4event.%v.dylib
-     lib/libG4event.4.6.dylib
+     lib/libG4event.4.7.dylib
      lib/libG4geometry.%v.dylib
-     lib/libG4geometry.4.6.dylib
+     lib/libG4geometry.4.7.dylib
      lib/libG4global.%v.dylib
-     lib/libG4global.4.6.dylib
+     lib/libG4global.4.7.dylib
      lib/libG4graphics_reps.%v.dylib
-     lib/libG4graphics_reps.4.6.dylib
+     lib/libG4graphics_reps.4.7.dylib
      lib/libG4intercoms.%v.dylib
-     lib/libG4intercoms.4.6.dylib
+     lib/libG4intercoms.4.7.dylib
      lib/libG4interfaces.%v.dylib
-     lib/libG4interfaces.4.6.dylib
+     lib/libG4interfaces.4.7.dylib
      lib/libG4materials.%v.dylib
-     lib/libG4materials.4.6.dylib
+     lib/libG4materials.4.7.dylib
      lib/libG4modeling.%v.dylib
-     lib/libG4modeling.4.6.dylib
+     lib/libG4modeling.4.7.dylib
      lib/libG4parmodels.%v.dylib
-     lib/libG4parmodels.4.6.dylib
+     lib/libG4parmodels.4.7.dylib
      lib/libG4particles.%v.dylib
-     lib/libG4particles.4.6.dylib
+     lib/libG4particles.4.7.dylib
      lib/libG4persistency.%v.dylib
-     lib/libG4persistency.4.6.dylib
+     lib/libG4persistency.4.7.dylib
      lib/libG4processes.%v.dylib
-     lib/libG4processes.4.6.dylib
+     lib/libG4processes.4.7.dylib
      lib/libG4readout.%v.dylib
-     lib/libG4readout.4.6.dylib
+     lib/libG4readout.4.7.dylib
      lib/libG4run.%v.dylib
-     lib/libG4run.4.6.dylib
+     lib/libG4run.4.7.dylib
      lib/libG4track.%v.dylib
-     lib/libG4track.4.6.dylib
+     lib/libG4track.4.7.dylib
      lib/libG4tracking.%v.dylib
-     lib/libG4tracking.4.6.dylib
+     lib/libG4tracking.4.7.dylib
      lib/libG4visHepRep.%v.dylib
-     lib/libG4visHepRep.4.6.dylib
+     lib/libG4visHepRep.4.7.dylib
      lib/libG4visXXX.%v.dylib
-     lib/libG4visXXX.4.6.dylib
+     lib/libG4visXXX.4.7.dylib
      lib/libG4vis_management.%v.dylib
-     lib/libG4vis_management.4.6.dylib
+     lib/libG4vis_management.4.7.dylib
    <<
    Shlibs: <<
-     %p/lib/libG4FR.4.6.dylib                                   4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4OpenGL.4.6.dylib                               4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4RayTracer.4.6.dylib                            4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4Tree.4.6.dylib                                 4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4VRML.4.6.dylib                                 4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4digits_hits.4.6.dylib                          4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4event.4.6.dylib                                4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4geometry.4.6.dylib                             4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4global.4.6.dylib                               4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4graphics_reps.4.6.dylib                        4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4intercoms.4.6.dylib                            4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4interfaces.4.6.dylib                                   4.6.0 
geant4 (>=4.6.2-11)
-     %p/lib/libG4materials.4.6.dylib                            4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4modeling.4.6.dylib                             4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4parmodels.4.6.dylib                            4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4particles.4.6.dylib                            4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4persistency.4.6.dylib                          4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4processes.4.6.dylib                            4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4readout.4.6.dylib                              4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4run.4.6.dylib                                  4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4track.4.6.dylib                                4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4tracking.4.6.dylib                             4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4visHepRep.4.6.dylib                            4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4visXXX.4.6.dylib                               4.6.0 geant4 
(>=4.6.2-11)
-     %p/lib/libG4vis_management.4.6.dylib                       4.6.0 geant4 
(>=4.6.2-11)
+     %p/lib/libG4FR.4.7.dylib                                   4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4OpenGL.4.7.dylib                               4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4RayTracer.4.7.dylib                            4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4Tree.4.7.dylib                                 4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4VRML.4.7.dylib                                 4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4digits_hits.4.7.dylib                          4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4event.4.7.dylib                                4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4geometry.4.7.dylib                             4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4global.4.7.dylib                               4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4graphics_reps.4.7.dylib                        4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4intercoms.4.7.dylib                            4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4interfaces.4.7.dylib                                   4.7.0 
geant4 (>=4.7.2-11)
+     %p/lib/libG4materials.4.7.dylib                            4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4modeling.4.7.dylib                             4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4parmodels.4.7.dylib                            4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4particles.4.7.dylib                            4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4persistency.4.7.dylib                          4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4processes.4.7.dylib                            4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4readout.4.7.dylib                              4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4run.4.7.dylib                                  4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4track.4.7.dylib                                4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4tracking.4.7.dylib                             4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4visHepRep.4.7.dylib                            4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4visXXX.4.7.dylib                               4.7.0 geant4 
(>=4.7.2-11)
+     %p/lib/libG4vis_management.4.7.dylib                       4.7.0 geant4 
(>=4.7.2-11)
    <<
 <<



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. 
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to