[63241] trunk/dports/science/geant4
ryandesign at macports.org
ryandesign at macports.org
Sat Jan 30 07:09:35 PST 2010
Revision: 63241
http://trac.macports.org/changeset/63241
Author: ryandesign at macports.org
Date: 2010-01-30 07:09:30 -0800 (Sat, 30 Jan 2010)
Log Message:
-----------
geant4: various cleanup and changes from #23323
Modified Paths:
--------------
trunk/dports/science/geant4/Portfile
trunk/dports/science/geant4/files/env.csh
trunk/dports/science/geant4/files/env.sh
Modified: trunk/dports/science/geant4/Portfile
===================================================================
--- trunk/dports/science/geant4/Portfile 2010-01-30 14:54:51 UTC (rev 63240)
+++ trunk/dports/science/geant4/Portfile 2010-01-30 15:09:30 UTC (rev 63241)
@@ -4,6 +4,7 @@
name geant4
version 4.9.3
+revision 1
categories science
maintainers pd.infn.it:cristiano.fontana
license Geant4
@@ -13,7 +14,7 @@
The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, \
and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
homepage http://geant4.web.cern.ch/
-notes GEANT4 needs some environment variables to run, they can be set using either ${prefix}/share/geant4/env.sh or ${prefix}/share/geant4/env.csh
+notes GEANT4 needs some environment variables to run, they can be set using either ${prefix}/src/geant4/env.sh or ${prefix}/src/geant4/env.csh
platforms darwin
# Data files versions
@@ -66,37 +67,133 @@
worksrcdir geant${version}/source
depends_lib port:clhep \
- port:openmotif \
- port:xercesc3 \
port:zlib
+default_variants +global +motif +shared +gdml +raytracerx +aida
+
+
+variant debug description {Compile with debug flags on} {
+ build.env-append G4DEBUG=1
+}
+
+variant global description {Build with global libraries} conflicts granular {
+ build.target global
+}
+
+variant granular description {Build with granular libraries} conflicts global {
+ build.env-append G4LIB_USE_GRANULAR=1
+
+ build.target
+}
+
+variant shared description {Build shared libraries} conflicts static {
+ build.env-append G4LIB_BUILD_SHARED=1
+}
+
+variant static description {Build static libraries} conflicts shared {
+ build.env-append G4LIB_BUILD_STATIC=1
+}
+
+variant aida description {Enable the use with AIDA} {
+ depends_lib-append port:iAIDA
+
+ build.env-append G4ANALYSIS_USE=1
+}
+
+variant no_ui description {Build without user interface nor visualizzation driver} conflicts motif athena raytracerx {
+ build.env-append G4UI_NONE=1
+ build.env-append G4VIS_NONE=1
+}
+
+variant motif description {Build with Motif user interface and visualizzation driver} {
+ depends_lib-append port:mesa \
+ port:openmotif
+
+ build.env-append XMFLAGS=-I${prefix}/include
+ build.env-append XMLIBS='-L${prefix}/lib -lXm -lXpm'
+
+ build.env-append G4VIS_USE_OPENGLX=1
+ build.env-append G4VIS_BUILD_OPENGLX_DRIVER=1
+
+ build.env-append G4VIS_USE_OPENGLXM=1
+ build.env-append G4VIS_BUILD_OPENGLXM_DRIVER=1
+
+ build.env-append G4UI_USE_XM=1
+ build.env-append G4UI_BUILD_XM_SESSION=1
+}
+
+variant athena description {Build with Athena user interface} {
+ depends_lib-append port:mesa
+
+ build.env-append G4UI_BUILD_XAW_SESSION=1
+ build.env-append G4UI_USE_XAW=1
+
+ build.env-append XAWFLAGS=
+ build.env-append XAWLIBS=
+}
+
+variant raytracerx description {Build with Raytracer visualization driver} {
+ depends_lib-append port:mesa
+
+ build.env-append G4VIS_USE_OPENGLX=1
+ build.env-append G4VIS_BUILD_OPENGLX_DRIVER=1
+
+ build.env-append G4VIS_USE_RAYTRACERX=1
+ build.env-append G4VIS_BUILD_RAYTRACERX_DRIVER=1
+}
+
+variant gdml description {Build with Geometry Description Markup Language (GDML)} {
+ depends_lib-append port:xercesc3
+
+ build.env-append XERCESCROOT=${prefix}
+
+ build.env-append G4LIB_BUILD_GDML=1
+}
+
+
post-patch {
# Propagate user's flags and compiler settings
reinplace "s/-o/\$(LDFLAGS) -o/g" ${worksrcpath}/GNUmakefile
- # Replaces g++ with standard compiler
+ reinplace "/\\\$(G4LIB)\\\/\\\$(G4SYSTEM)/d" ${workpath}/geant${version}/config/architecture.gmk
+
+ # Replaces g++ with standard compiler and fixes some paths
fs-traverse file ${workpath}/geant${version}/config {
if {".gmk" == [file extension ${file}]} {
reinplace "s:g++:${configure.cxx}:g" ${file}
reinplace "s:gfortran:${configure.fc}:g" ${file}
+ reinplace "s:CXXFLAGS += \$(INCFLAGS):CXXFLAGS += \$(INCFLAGS) -I\$(CLHEP_INCLUDE_DIR):g" ${file}
+ reinplace "s:CPPFLAGS += \$(INCFLAGS):CXXFLAGS += \$(INCFLAGS) -I\$(CLHEP_INCLUDE_DIR):g" ${file}
+
+ reinplace "s:\$(G4LIB)/\$(G4SYSTEM):\$(G4LIB):g" ${file}
+ reinplace "s:\$(G4BIN)/\$(G4SYSTEM):\$(G4BIN):g" ${file}
+ reinplace "s:\$(G4TMP)/\$(G4SYSTEM):\$(G4TMP):g" ${file}
}
}
# Fix an error message in build phase (I hope that it will not cause any problems)
reinplace "s:LDFLAGS += -bind_at_load -arch_multiple:LDFLAGS += -bind_at_load:g" ${workpath}/geant${version}/config/sys/Darwin-g++.gmk
- # Forces build phase to lookf for Darwin-g++.gmk and not $(G4SYSTEM).gmk
- reinplace "s:\$(G4SYSTEM).gmk:Darwin-g++.gmk:g" ${workpath}/geant${version}/config/architecture.gmk
- 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
+ reinplace "s:Darwin-${configure.cxx}:Darwin-g++:g" ${workpath}/geant${version}/config/sys/Darwin-g++.gmk
- # Copies some files to fix them
- foreach file [list ${filespath}/env.sh ${filespath}/env.csh] {
- file copy ${file} ${worksrcpath}
+ reinplace "s:\$(G4LIB)/\$(G4SYSTEM):\$(G4LIB):g" ${workpath}/geant${version}/source/GNUmakefile
+ reinplace "s:\$(G4BIN)/\$(G4SYSTEM):\$(G4BIN):g" ${workpath}/geant${version}/source/GNUmakefile
+ reinplace "s:\$(G4TMP)/\$(G4SYSTEM):\$(G4TMP):g" ${workpath}/geant${version}/source/GNUmakefile
+
+ fs-traverse file ${workpath}/geant${version}/examples {
+ if [string match {/GNUmakefile$} ${file}] {
+ reinplace "s:\$(G4LIB)/\$(G4SYSTEM):\$(G4LIB):g" ${file}
+ reinplace "s:\$(G4BIN)/\$(G4SYSTEM):\$(G4BIN):g" ${file}
+ reinplace "s:\$(G4TMP)/\$(G4SYSTEM):\$(G4TMP):g" ${file}
+ }
}
- # Fixes some paths
- foreach file [list ${worksrcpath}/env.sh ${worksrcpath}/env.csh] {
+ # Fixes paths in shell setup scripts
+ foreach fileextension {sh csh} {
+ file copy ${filespath}/env.${fileextension} ${worksrcpath}
+
+ set file ${worksrcpath}/env.${fileextension}
+
reinplace "s:@PREFIX@:${prefix}:g" ${file}
reinplace "s:@WORKSRCPATH@:${worksrcpath}:g" ${file}
reinplace "s:@DESTROOT@:${destroot}:g" ${file}
@@ -108,15 +205,88 @@
reinplace "s:@RADIOACTIVEDECAY_V@:${RadioactiveDecay_v}:g" ${file}
reinplace "s:@G4ABLA_V@:${G4ABLA_v}:g" ${file}
reinplace "s:@REALSURFACE_V@:${RealSurface_v}:g" ${file}
+
+ if {${fileextension} == "sh"} {
+ set export "export"
+ } else {
+ set export "setenv"
+ }
+
+ set env_file_stream [open ${file} "a"]
+
+ if {[variant_isset aida]} {
+ puts ${env_file_stream} "${export} G4ANALYSIS_USE=1"
+ }
+
+ if {[variant_isset athena]} {
+ puts ${env_file_stream} "${export} G4UI_BUILD_XAW_SESSION=1"
+ puts ${env_file_stream} "${export} G4UI_USE_XAW=1"
+
+ puts ${env_file_stream} "${export} XAWFLAGS="
+ puts ${env_file_stream} "${export} XAWLIBS="
+ }
+
+ if {[variant_isset debug]} {
+ puts ${env_file_stream} "${export} G4DEBUG=1"
+ }
+
+ if {[variant_isset gdml]} {
+ puts ${env_file_stream} "${export} XERCESCROOT=${prefix}"
+ puts ${env_file_stream} "${export} G4LIB_BUILD_GDML=1"
+ }
+
+ if {[variant_isset granular]} {
+ puts ${env_file_stream} "${export} G4LIB_USE_GRANULAR=1"
+ }
+
+ if {[variant_isset motif]} {
+ puts ${env_file_stream} "${export} XMFLAGS=-I${prefix}/include"
+ puts ${env_file_stream} "${export} XMLIBS='-L${prefix}/lib -lXm -lXpm'"
+
+ puts ${env_file_stream} "${export} G4VIS_USE_OPENGLX=1"
+ puts ${env_file_stream} "${export} G4VIS_BUILD_OPENGLX_DRIVER=1"
+
+ puts ${env_file_stream} "${export} G4VIS_USE_OPENGLXM=1"
+ puts ${env_file_stream} "${export} G4VIS_BUILD_OPENGLXM_DRIVER=1"
+
+ puts ${env_file_stream} "${export} G4UI_USE_XM=1"
+ puts ${env_file_stream} "${export} G4UI_BUILD_XM_SESSION=1"
+ }
+
+ if {[variant_isset noui]} {
+ puts ${env_file_stream} "${export} G4UI_NONE=1"
+ puts ${env_file_stream} "${export} G4VIS_NONE=1"
+ }
+
+ if {[variant_isset raytracerx]} {
+ puts ${env_file_stream} "${export} G4VIS_USE_OPENGLX=1"
+ puts ${env_file_stream} "${export} G4VIS_BUILD_OPENGLX_DRIVER=1"
+
+ puts ${env_file_stream} "${export} G4VIS_USE_RAYTRACERX=1"
+ puts ${env_file_stream} "${export} G4VIS_BUILD_RAYTRACERX_DRIVER=1"
+ }
+
+ if {[variant_isset shared]} {
+ puts ${env_file_stream} "${export} G4LIB_BUILD_SHARED=1"
+ }
+
+ if {[variant_isset static]} {
+ puts ${env_file_stream} "${export} G4LIB_BUILD_STATIC=1"
+ }
+
+ flush ${env_file_stream}
+ close ${env_file_stream}
}
}
use_configure no
-build.env G4SYSTEM=${version}
+build.env-append CXX=${configure.cxx}
+build.env-append CC=${configure.cc}
+build.env-append G4SYSTEM=Darwin-g++
build.env-append G4INSTALL=${workpath}/geant${version}
-#G4INCLUDE=
-build.env-append G4TMP=\$G4INSTALL/tmp
+build.env-append G4INCLUDE=${workpath}/geant${version}/include
+build.env-append G4TMP=${workpath}/geant${version}/tmp
build.env-append G4LIB=${workpath}/geant${version}/lib
build.env-append G4BIN=${workpath}/geant${version}/bin
@@ -125,119 +295,100 @@
build.env-append G4LEDATA=${prefix}/share/geant4/data/G4EMLOW${G4EMLOW_v}
build.env-append G4NEUTRONHPDATA=${prefix}/share/geant4/data/G4NDL${G4NDL_v}
build.env-append G4ABLADATA=${prefix}/share/geant4/data/G4ABLA${G4ABLA_v}
-#G4ELASTICDATA=
+#build.env-append G4ELASTICDATA=
build.env-append CLHEP_BASE_DIR=${prefix}
build.env-append CLHEP_INCLUDE_DIR=${prefix}/include
build.env-append CLHEP_LIB_DIR=${prefix}/lib
build.env-append CLHEP_LIB=CLHEP
-#build.env-append G4DEBUG=1
+# Next variables need more work to be put in a variant...
-#build.env-append G4UI_NONE=1 # Sets no user interface
-#build.env-append G4UI_BUILD_XAW_SESSION=1 # Uses Xaw
-#build.env-append G4UI_USE_XAW=1
-build.env-append G4UI_BUILD_XM_SESSION=1 #Uses Motif
-build.env-append G4UI_USE_XM=1
-#build.env-append G4UI_BUILD_QT_SESSION=1 #Uses Qt
+# I do not know what is this for.
+#build.env-append OGLHOME=
+
+# These are needed to include Qt interfaces
+#build.env-append QTFLAGS=
+#build.env-append QTLIBS=
+#build.env-append QTMOC=
#build.env-append G4UI_USE_QT=1
-# END OF G4UI_NONE block
+#build.env-append G4UI_BUILD_QT_SESSION=1
+#build.env-append G4VIS_USE_OPENGLQT=1
+#build.env-append G4VIS_BUILD_OPENGLQT_DRIVER=1
-#build.env-append G4VIS_NONE=1 #Sets no viasualizzation driver
-#build.env-append G4VIS_BUILD_DAWN_DRIVER=1 #Uses DAWN
-build.env-append G4VIS_BUILD_OPENGLX_DRIVER=1 #Uses OpenGLX
-build.env-append G4VIS_BUILD_OPENGLXM_DRIVER=1
-#build.env-append G4VIS_BUILD_OIX_DRIVER=1
-#build.env-append G4VIS_BUILD_RAYTRACERX_DRIVER=1
-#build.env-append G4VIS_BUILD_VRML_DRIVER=1
-#build.env-append G4VIS_BUILD_OPENGLQT_DRIVER=1
+# These are needed to include DAWN interfaces, but I can not find DAWN
#build.env-append G4VIS_USE_DAWN=1
-build.env-append G4VIS_USE_OPENGLX=1
-build.env-append G4VIS_USE_OPENGLXM=1 #Uses OpenGLX with Motif
-#build.env-append G4VIS_USE_OIX=1
-#build.env-append G4VIS_USE_RAYTRACERX=1
-#build.env-append G4VIS_USE_VRML=1
-#build.env-append G4VIS_USE_OPENGLQT=1
-# End of G4VIS_NONE block
+#build.env-append G4VIS_BUILD_DAWN_DRIVER=1
-#build.env-append OGLHOME=
+# To be used with DAWN
+#build.env-append G4LIB_USE_ZLIB=1
+#build.env-append G4LIB_BUILD_ZLIB=1
+
+# These are needed to include OpenInventor, but its Portfile does not exist
#build.env-append OIVHOME=
+#build.env-append G4VIS_USE_OIX=1
+#build.env-append G4VIS_BUILD_OIX_DRIVER=1
-build.env-append XMFLAGS= -I${prefix}/include
-build.env-append XMLIBS= -L${prefix}/lib -lXm -lXpm
-#build.env-append XMFLAGS= -I${prefix}/include
-#build.env-append XMLIBS= -L${prefix}/lib -lXm -lXpm
-#build.env-append XAWFLAGS=
-#build.env-append XAWLIBS=
-#build.env-append QTFLAGS=
-#build.env-append QTLIBS=
-#build.env-append QTMOC=
+# These are needed to include VRML
+#build.env-append G4VIS_USE_VRML=1
+#build.env-append G4VIS_BUILD_VRML_DRIVER=1
-build.env-append G4LIB_BUILD_GDML=1 # Use GDML for detector construction
-build.env-append XERCESCROOT=${prefix}
-
+# These are needed to include a converter from GEANT3 to GEANT4, but require CERNlib
#build.env-append G4LIB_BUILD_G3TOG4=1
#build.env-append G4LIB_USE_G3TOG4=1
-#build.env-append G4LIB_BUILD_ZLIB=1
-#build.env-append G4LIB_USE_ZLIB=1
+build.args
-build.env-append G4LIB_BUILD_SHARED=1
-#build.env-append G4LIB_BUILD_STATIC=1
-build.env-append G4LIB_USE_GRANULAR=1
+build {
+ ui_debug "Preparing make database"
+ system "cd ${worksrcpath} && env ${build.env} ${build.cmd} -n -p -f ${workpath}/geant${version}/config/scripts/GNUmakefile > ${workpath}/geant${version}/source/GNUmakefile.db"
-#pre-build {
- #system "/usr/bin/make -n -p -f \$G4INSTALL/config/scripts/GNUmakefile > \$G4LIB/\$G4SYSTEM/GNUmakefile.db"
-#}
+ if {[variant_isset global]} {
+ # In Gentoo's mailing list they say that a rebuild is needed
+ ui_debug "Building global libraries"
+ system "cd ${worksrcpath} && env ${build.env} ${build.cmd} global"
+ }
-build.args
-build.target
+ ui_debug "Building libraries"
+ system "cd ${worksrcpath} && env ${build.env} ${build.cmd}"
-post-build {
- system "cd ${worksrcpath} && make includes"
+ ui_debug "Preparing header files"
+ system "cd ${worksrcpath} && env ${build.env} ${build.cmd} includes dependencies=\"\""
}
destroot {
- puts "Installing env scripts to ${prefix}/share/geant4/"
+ ui_debug "Installing env scripts to ${prefix}/src/geant4"
- xinstall -d ${destroot}${prefix}/share/geant4/
+ xinstall -d ${destroot}${prefix}/src/geant4
- xinstall -m 755 -W ${worksrcpath} env.sh ${destroot}${prefix}/share/geant4/
- xinstall -m 755 -W ${worksrcpath} env.csh ${destroot}${prefix}/share/geant4/
+ xinstall -m 755 -W ${worksrcpath} env.sh env.csh ${destroot}${prefix}/src/geant4
- puts "Installing GEANT4 data to ${prefix}/share/geant4/data"
+ ui_debug "Installing GEANT4 data to ${prefix}/share/geant4/data"
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}" {
+ ui_debug "Installing ${data} to ${prefix}/share/geant4/data"
file copy ${workpath}/${data} ${destroot}${prefix}/share/geant4/data
}
- puts "Installing sources to ${prefix}/src/geant4/${version}"
+ ui_debug "Installing sources to ${prefix}/src/geant4"
- 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}
+ ui_debug "Installing ${sources} to ${prefix}/src/geant4"
+ file copy ${workpath}/geant${version}/${sources} ${destroot}${prefix}/src/geant4
}
- puts "Installing headers to ${prefix}/include/"
-
- fs-traverse file ${workpath}/geant${version}/include/ {
- file copy ${file} ${destroot}${prefix}/include/
+ foreach sources {include lib bin} {
+ ui_debug "Installing ${sources} to ${prefix}/${sources}"
+ fs-traverse file ${workpath}/geant${version}/${sources} {
+ switch -exact [file type ${file}] {
+ directory {
+ set stripped [string map {${workpath}/geant${version}/ ""} ${file}]
+ xinstall -d -m 755 ${destroot}${prefix}/${stripped}
+ }
+ file { xinstall ${file} ${destroot}${prefix}/${sources} }
+ }
+ }
}
-
- 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/
- }
}
Modified: trunk/dports/science/geant4/files/env.csh
===================================================================
--- trunk/dports/science/geant4/files/env.csh 2010-01-30 14:54:51 UTC (rev 63240)
+++ trunk/dports/science/geant4/files/env.csh 2010-01-30 15:09:30 UTC (rev 63241)
@@ -1,5 +1,3 @@
-######################################
-#
# Clean all G4 envs
unsetenv CLHEP_BASE_DIR
unsetenv CLHEP_INCLUDE_DIR
@@ -39,7 +37,6 @@
unsetenv G4UI_USE_XM
unsetenv G4UI_USE_QT
-
unsetenv G4VIS_NONE
unsetenv G4VIS_BUILD_DAWN_DRIVER
unsetenv G4VIS_BUILD_OIWIN32_DRIVER
@@ -61,40 +58,43 @@
unsetenv G4VIS_USE_VRML
unsetenv G4VIS_USE_OPENGLQT
-setenv G4SYSTEM "@VERSION@"
+setenv G4SYSTEM "Darwin-g++"
setenv G4INSTALL "@PREFIX@/src/geant4"
-setenv G4INCLUDE "@PREFIX@/include/geant4"
+setenv G4INCLUDE "@PREFIX@/include"
#setenv G4BASE "@PREFIX@/include/geant4/source"
-setenv G4LIB "@PREFIX@/lib/geant4"
+setenv G4LIB "@PREFIX@/lib"
+
setenv G4LEVELGAMMADATA "@PREFIX@/share/geant4/data/PhotonEvaporation at PHOTONEVAPORATION_V@"
setenv G4RADIOACTIVEDATA "@PREFIX@/share/geant4/data/RadioactiveDecay at RADIOACTIVEDECAY_V@"
setenv G4LEDATA "@PREFIX@/share/geant4/data/G4EMLOW at G4EMLOW_V@"
setenv G4NEUTRONHPDATA "@PREFIX@/share/geant4/data/G4NDL at G4NDL_V@"
setenv G4ABLADATA "@PREFIX@/share/geant4/data/G4ABLA at G4ABLA_V@"
setenv G4REALSURFACEDATA "@PREFIX@/share/geant4/data/RealSurface at REALSURFACE_V@"
+
setenv CLHEP_BASE_DIR "@PREFIX@"
-setenv CLHEP_INCLUDE_DIR "@PREFIX@/include"
+setenv CLHEP_INCLUDE_DIR "@PREFIX@/include/CLHEP"
setenv CLHEP_LIB_DIR "@PREFIX@/lib"
setenv CLHEP_LIB "CLHEP"
-setenv G4DEBUG 1
+
+#setenv G4DEBUG 1
#setenv G4UI_NONE 1
#setenv G4UI_BUILD_XAW_SESSION 1
#setenv G4UI_USE_XAW 1
-setenv G4UI_BUILD_XM_SESSION 1
-setenv G4UI_USE_XM 1
+#setenv G4UI_BUILD_XM_SESSION 1
+#setenv G4UI_USE_XM 1
#setenv G4UI_BUILD_QT_SESSION 1
#setenv G4UI_USE_QT 1
#setenv G4VIS_NONE 1
#setenv G4VIS_BUILD_DAWN_DRIVER 1
-setenv G4VIS_BUILD_OPENGLX_DRIVER 1
-setenv G4VIS_BUILD_OPENGLXM_DRIVER 1
+#setenv G4VIS_BUILD_OPENGLX_DRIVER 1
+#setenv G4VIS_BUILD_OPENGLXM_DRIVER 1
#setenv G4VIS_BUILD_OIX_DRIVER 1
#setenv G4VIS_BUILD_RAYTRACERX_DRIVER 1
#setenv G4VIS_BUILD_VRML_DRIVER 1
#setenv G4VIS_BUILD_OPENGLQT_DRIVER 1
#setenv G4VIS_USE_DAWN 1
-setenv G4VIS_USE_OPENGLX 1
-setenv G4VIS_USE_OPENGLXM 1
+#setenv G4VIS_USE_OPENGLX 1
+#setenv G4VIS_USE_OPENGLXM 1
#setenv G4VIS_USE_OIX 1
#setenv G4VIS_USE_RAYTRACERX 1
#setenv G4VIS_USE_VRML 1
@@ -108,42 +108,20 @@
#setenv QTFLAGS ""
#setenv QTLIBS ""
#setenv QTMOC ""
-setenv G4LIB_BUILD_GDML 1
-setenv XERCESCROOT @PREFIX@
+#setenv G4LIB_BUILD_GDML 1
+#setenv XERCESCROOT @PREFIX@
#setenv G4LIB_BUILD_G3TOG4 1
#setenv G4LIB_USE_G3TOG4 1
#setenv G4LIB_BUILD_ZLIB 1
#setenv G4LIB_USE_ZLIB 1
-setenv G4LIB_BUILD_SHARED 1
+#setenv G4LIB_BUILD_SHARED 1
#setenv G4LIB_BUILD_STATIC 1
-setenv G4LIB_USE_GRANULAR 1
+#setenv G4LIB_USE_GRANULAR 1
#
# G4WORKDIR
#
-if [ "X""$G4WORKDIR" = "X" ] ; then
- setenv G4WORKDIR $HOME/geant4
-fi
-
-#
-# Shared Libraries
-#
-
-if [ $G4LIB_BUILD_SHARED ] ; then
- if [ $DYLD_LIBRARY_PATH ] ; then
- DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
- else
- DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
- fi
-
- export DYLD_LIBRARY_PATH
-fi
-
-#
-# G4WORKDIR
-#
-
if ( !${?G4WORKDIR} ) then
setenv G4WORKDIR $HOME/geant4
endif
@@ -153,9 +131,18 @@
#
if ( ${?G4LIB_BUILD_SHARED} ) then
- if ( ${?DYLD_LIBRARY_PATH} ) then
- setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
+ if ( ${?DYLD_FALLBACK_LIBRARY_PATH} ) then
+ setenv DYLD_FALLBACK_LIBRARY_PATH ${DYLD_FALLBACK_LIBRARY_PATH}:${G4LIB}
else
- setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
+ setenv DYLD_FALLBACK_LIBRARY_PATH ${G4LIB}
endif
endif
+
+#
+# Bin
+#
+
+setenv PATH ${PATH}:${G4WORKDIR}/bin
+
+# Variables set by MacPorts:
+
Modified: trunk/dports/science/geant4/files/env.sh
===================================================================
--- trunk/dports/science/geant4/files/env.sh 2010-01-30 14:54:51 UTC (rev 63240)
+++ trunk/dports/science/geant4/files/env.sh 2010-01-30 15:09:30 UTC (rev 63241)
@@ -1,5 +1,3 @@
-######################################
-#
# Clean all G4 envs
unset CLHEP_BASE_DIR
unset CLHEP_INCLUDE_DIR
@@ -61,40 +59,43 @@
unset G4VIS_USE_VRML
unset G4VIS_USE_OPENGLQT
-export G4SYSTEM="@VERSION@"
+export G4SYSTEM="Darwin-g++"
export G4INSTALL="@PREFIX@/src/geant4"
-export G4INCLUDE="@PREFIX@/include/geant4"
+export G4INCLUDE="@PREFIX@/include"
#export G4BASE="@PREFIX@/include/geant4/source"
-export G4LIB="@PREFIX@/lib/geant4"
+export G4LIB="@PREFIX@/lib"
+
export G4LEVELGAMMADATA="@PREFIX@/share/geant4/data/PhotonEvaporation at PHOTONEVAPORATION_V@"
export G4RADIOACTIVEDATA="@PREFIX@/share/geant4/data/RadioactiveDecay at RADIOACTIVEDECAY_V@"
export G4LEDATA="@PREFIX@/share/geant4/data/G4EMLOW at G4EMLOW_V@"
export G4NEUTRONHPDATA="@PREFIX@/share/geant4/data/G4NDL at G4NDL_V@"
export G4ABLADATA="@PREFIX@/share/geant4/data/G4ABLA at G4ABLA_V@"
export G4REALSURFACEDATA="@PREFIX@/share/geant4/data/RealSurface at REALSURFACE_V@"
+
export CLHEP_BASE_DIR="@PREFIX@"
-export CLHEP_INCLUDE_DIR="@PREFIX@/include"
+export CLHEP_INCLUDE_DIR="@PREFIX@/include/CLHEP"
export CLHEP_LIB_DIR="@PREFIX@/lib"
export CLHEP_LIB="CLHEP"
-export G4DEBUG=1
+
+#export G4DEBUG=1
#export G4UI_NONE=1
#export G4UI_BUILD_XAW_SESSION=1
#export G4UI_USE_XAW=1
-export G4UI_BUILD_XM_SESSION=1
-export G4UI_USE_XM=1
+#export G4UI_BUILD_XM_SESSION=1
+#export G4UI_USE_XM=1
#export G4UI_BUILD_QT_SESSION=1
#export G4UI_USE_QT=1
#export G4VIS_NONE=1
#export G4VIS_BUILD_DAWN_DRIVER=1
-export G4VIS_BUILD_OPENGLX_DRIVER=1
-export G4VIS_BUILD_OPENGLXM_DRIVER=1
+#export G4VIS_BUILD_OPENGLX_DRIVER=1
+#export G4VIS_BUILD_OPENGLXM_DRIVER=1
#export G4VIS_BUILD_OIX_DRIVER=1
#export G4VIS_BUILD_RAYTRACERX_DRIVER=1
#export G4VIS_BUILD_VRML_DRIVER=1
#export G4VIS_BUILD_OPENGLQT_DRIVER=1
#export G4VIS_USE_DAWN=1
-export G4VIS_USE_OPENGLX=1
-export G4VIS_USE_OPENGLXM=1
+#export G4VIS_USE_OPENGLX=1
+#export G4VIS_USE_OPENGLXM=1
#export G4VIS_USE_OIX=1
#export G4VIS_USE_RAYTRACERX=1
#export G4VIS_USE_VRML=1
@@ -108,15 +109,15 @@
#export QTFLAGS=""
#export QTLIBS=""
#export QTMOC=""
-export G4LIB_BUILD_GDML=1
-export XERCESCROOT=@PREFIX@
+#export G4LIB_BUILD_GDML=1
+#export XERCESCROOT=@PREFIX@
#export G4LIB_BUILD_G3TOG4=1
#export G4LIB_USE_G3TOG4=1
#export G4LIB_BUILD_ZLIB=1
#export G4LIB_USE_ZLIB=1
-export G4LIB_BUILD_SHARED=1
+#export G4LIB_BUILD_SHARED=1
#export G4LIB_BUILD_STATIC=1
-export G4LIB_USE_GRANULAR=1
+#export G4LIB_USE_GRANULAR=1
#
# G4WORKDIR
@@ -131,11 +132,20 @@
#
if [ $G4LIB_BUILD_SHARED ] ; then
- if [ $DYLD_LIBRARY_PATH ] ; then
- DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
+ if [ $DYLD_FALLBACK_LIBRARY_PATH ] ; then
+ DYLD_FALLBACK_LIBRARY_PATH=${DYLD_FALLBACK_LIBRARY_PATH}:${G4LIB}
else
- DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
+ DYLD_FALLBACK_LIBRARY_PATH=${G4LIB}
fi
- export DYLD_LIBRARY_PATH
+ export DYLD_FALLBACK_LIBRARY_PATH
fi
+
+#
+# Bin
+#
+
+export PATH=${PATH}:${G4WORKDIR}/bin
+
+# Variables set by MacPorts:
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100130/b5ffe8fb/attachment-0001.html>
More information about the macports-changes
mailing list