Ticket #23323: geant4-ryandesign1.diff

Portfile

@@ -90 +90 @@
     reinplace "s:\$(G4SYSTEM).gmk:Darwin-g++.gmk:g" ${workpath}/geant${version}/config/common.gmk
     reinplace "s:\$(G4SYSTEM).gmk:Darwin-g++.gmk:g" ${workpath}/geant${version}/examples/extended/eventgenerator/HepMC/HepMCEx01/external/GNUmakefile
 
-    # Copies some files to fix them
-    foreach file [list ${filespath}/env.sh ${filespath}/env.csh] {
-        file copy ${file} ${worksrcpath}
-    }
+    # Fixes paths in shell setup scripts
+    foreach filename {env.csh env.sh} {
+        file copy ${filespath}/${filename} ${worksrcpath}
+        set file ${worksrcpath}/${filename}
 
-    # Fixes some paths
-    foreach file [list ${worksrcpath}/env.sh ${worksrcpath}/env.csh] {
         reinplace "s:@PREFIX@:${prefix}:g" ${file}
         reinplace "s:@WORKSRCPATH@:${worksrcpath}:g" ${file}
         reinplace "s:@DESTROOT@:${destroot}:g" ${file}
@@ -198 +196 @@
 }
 
 destroot {
-    puts "Installing env scripts to ${prefix}/share/geant4/"
-
     xinstall -d ${destroot}${prefix}/share/geant4/
 
-    xinstall -m 755 -W ${worksrcpath} env.sh ${destroot}${prefix}/share/geant4/
-    xinstall -m 755 -W ${worksrcpath} env.csh ${destroot}${prefix}/share/geant4/
-
-    puts "Installing GEANT4 data to ${prefix}/share/geant4/data"
+    xinstall -W ${worksrcpath} env.csh env.sh ${destroot}${prefix}/share/geant4/
 
     xinstall -d ${destroot}${prefix}/share/geant4/data
 
-    foreach data [list G4NDL${G4NDL_v} G4EMLOW${G4EMLOW_v} PhotonEvaporation${PhotonEvaporation_v} RadioactiveDecay${RadioactiveDecay_v} G4ABLA${G4ABLA_v} RealSurface${RealSurface_v}] {
-        puts "-> Installing ${data} to ${prefix}/share/geant4/data"
+    foreach data "G4NDL${G4NDL_v} G4EMLOW${G4EMLOW_v} PhotonEvaporation${PhotonEvaporation_v} RadioactiveDecay${RadioactiveDecay_v} G4ABLA${G4ABLA_v} RealSurface${RealSurface_v}" {
         file copy ${workpath}/${data} ${destroot}${prefix}/share/geant4/data
     }
 
-    puts "Installing sources to ${prefix}/src/geant4/${version}"
-
     xinstall -d ${destroot}${prefix}/src/geant4/${version}
 
     foreach sources {config source environments examples} {
-        puts "-> Installing ${sources} to ${prefix}/src/geant4/${version}"
         file copy ${workpath}/geant${version}/${sources} ${destroot}${prefix}/src/geant4/${version}
     }
 
-    puts "Installing headers to ${prefix}/include/"
-
     fs-traverse file ${workpath}/geant${version}/include/ {
         file copy ${file} ${destroot}${prefix}/include/
     }
 
-    puts "Installing libs to ${prefix}/lib/geant4/${version}"
-
     xinstall -d ${destroot}${prefix}/lib/geant4/
 
     file copy ${workpath}/geant${version}/lib/${version}/ ${destroot}${prefix}/lib/geant4/
 
-    puts "Installing executables to ${prefix}/bin"
-
     fs-traverse file ${workpath}/geant${version}/bin/ {
         file copy ${file} ${destroot}${prefix}/bin/
     }