[108782] users/mojca/ports/science/geant
mojca at macports.org
mojca at macports.org
Thu Aug 1 14:02:09 PDT 2013
Revision: 108782
https://trac.macports.org/changeset/108782
Author: mojca at macports.org
Date: 2013-08-01 14:02:09 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
mojca/geant4: link against mesa, not /usr/x11
Modified Paths:
--------------
users/mojca/ports/science/geant/Portfile
users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.diff
Added Paths:
-----------
users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff
users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff
users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff
Modified: users/mojca/ports/science/geant/Portfile
===================================================================
--- users/mojca/ports/science/geant/Portfile 2013-08-01 20:35:18 UTC (rev 108781)
+++ users/mojca/ports/science/geant/Portfile 2013-08-01 21:02:09 UTC (rev 108782)
@@ -173,24 +173,36 @@
# GEANT4_USE_SYSTEM_CLHEP=OFF
- # - patch-source-interfaces-common-src-G4Qt.cc.diff: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
- # - patch-examples-advanced-xray_fluorescence.4100.diff: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501
+ # - patch-source-interfaces-common-src-G4Qt.cc:
+ # http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
+ # - patch-examples-advanced-xray_fluorescence:
+ # http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501
+ # - patch-cmake-Modules-Geant4InterfaceOptions.cmake:
+ # prevents linking against X11 in /usr (maybe less aggressive patch would also work)
+ # - patch-cmake-Modules-Geant4BuildProjectConfig.cmake:
+ # allows placing *.cmake files to a different location than LIBDIR
if {${geant.version} == "10.0"} {
patchfiles patch-source-interfaces-common-src-G4Qt.cc.diff \
patch-examples-advanced-xray_fluorescence.diff \
+ patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff \
patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4100.diff
}
if {${geant.version} == "9.6"} {
patchfiles patch-source-interfaces-common-src-G4Qt.cc.diff \
patch-examples-advanced-xray_fluorescence.diff \
+ patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff \
patch-cmake-Modules-Geant4BuildProjectConfig.cmake.496.diff
}
if {${geant.version} == "9.5"} {
patchfiles patch-source-interfaces-common-src-G4Qt.cc.495.diff \
patch-examples-advanced-xray_fluorescence.diff \
+ patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff \
patch-cmake-Modules-Geant4BuildProjectConfig.cmake.495.diff
}
+ post-patch {
+ reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/cmake/Modules/Geant4InterfaceOptions.cmake
+ }
# arguments to -DCMAKE_INSTALL_* could be written without ${prefix}
# however the ${prefix} triggers the NON_RELOCATABLE flag which has some advantages like less cryptic path names
configure.args-append -DGEANT4_INSTALL_DATA=OFF \
@@ -237,7 +249,8 @@
# or simply x11? The option name in geant4-config is opengl-x11
variant opengl_x11 description {Build with X11 visualisation drivers} {
# dependencies were determined experimentally (by checking which libraries were linked against)
- depends_lib-append port:xorg-libice \
+ depends_lib-append port:mesa \
+ port:xorg-libice \
port:xorg-libsm \
port:xorg-libX11 \
port:xorg-libXext \
Added: users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff
===================================================================
--- users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff (rev 0)
+++ users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff 2013-08-01 21:02:09 UTC (rev 108782)
@@ -0,0 +1,47 @@
+--- a/cmake/Modules/Geant4InterfaceOptions.cmake.orig
++++ b/cmake/Modules/Geant4InterfaceOptions.cmake
+@@ -139,20 +139,11 @@ if(UNIX)
+ set(CMAKE_FIND_FRAMEWORK NEVER)
+
+ set(X11_INC_SEARCH_PATH
+- /usr/pkg/xorg/include
+- /usr/X11R6/include
+- /usr/X11R7/include
+- /usr/include/X11
+- /usr/openwin/include
+- /usr/openwin/share/include
+- /opt/graphics/OpenGL/include
+- )
++ @PREFIX@/include
++ )
+
+ set(X11_LIB_SEARCH_PATH
+- /usr/pkg/xorg/lib
+- /usr/X11R6/lib
+- /usr/X11R7/lib
+- /usr/openwin/lib
++ @PREFIX@/lib
+ )
+
+ find_path(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h ${X11_INC_SEARCH_PATH})
+@@ -195,17 +186,17 @@ if(UNIX)
+ set(CMAKE_FIND_FRAMEWORK NEVER)
+
+ find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
+- PATHS /usr/X11R6/include
++ PATHS @PREFIX@/include
+ NO_DEFAULT_PATH
+ )
+
+ find_library(OPENGL_X11_gl_LIBRARY GL
+- PATHS /usr/X11R6/lib
++ PATHS @PREFIX@/lib
+ NO_DEFAULT_PATH
+ )
+
+ find_library(OPENGL_X11_glu_LIBRARY GLU
+- PATHS /usr/X11R6/lib
++ PATHS @PREFIX@/lib
+ NO_DEFAULT_PATH
+ )
+
Added: users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff
===================================================================
--- users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff (rev 0)
+++ users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff 2013-08-01 21:02:09 UTC (rev 108782)
@@ -0,0 +1,47 @@
+--- cmake/Modules/Geant4InterfaceOptions.cmake.orig
++++ cmake/Modules/Geant4InterfaceOptions.cmake
+@@ -140,20 +140,11 @@ if(UNIX)
+ set(CMAKE_FIND_FRAMEWORK NEVER)
+
+ set(X11_INC_SEARCH_PATH
+- /usr/pkg/xorg/include
+- /usr/X11R6/include
+- /usr/X11R7/include
+- /usr/include/X11
+- /usr/openwin/include
+- /usr/openwin/share/include
+- /opt/graphics/OpenGL/include
+- )
++ @PREFIX@/include
++ )
+
+ set(X11_LIB_SEARCH_PATH
+- /usr/pkg/xorg/lib
+- /usr/X11R6/lib
+- /usr/X11R7/lib
+- /usr/openwin/lib
++ @PREFIX@/lib
+ )
+
+ find_path(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h ${X11_INC_SEARCH_PATH})
+@@ -194,17 +185,17 @@ if(UNIX)
+ set(CMAKE_FIND_FRAMEWORK NEVER)
+
+ find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
+- PATHS /usr/X11R6/include
++ PATHS @PREFIX@/include
+ NO_DEFAULT_PATH
+ )
+
+ find_library(OPENGL_X11_gl_LIBRARY GL
+- PATHS /usr/X11R6/lib
++ PATHS @PREFIX@/lib
+ NO_DEFAULT_PATH
+ )
+
+ find_library(OPENGL_X11_glu_LIBRARY GLU
+- PATHS /usr/X11R6/lib
++ PATHS @PREFIX@/lib
+ NO_DEFAULT_PATH
+ )
+
Added: users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff
===================================================================
--- users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff (rev 0)
+++ users/mojca/ports/science/geant/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff 2013-08-01 21:02:09 UTC (rev 108782)
@@ -0,0 +1,47 @@
+--- cmake/Modules/Geant4InterfaceOptions.cmake.orig
++++ cmake/Modules/Geant4InterfaceOptions.cmake
+@@ -141,20 +141,11 @@ if(UNIX)
+ set(CMAKE_FIND_FRAMEWORK NEVER)
+
+ set(X11_INC_SEARCH_PATH
+- /usr/pkg/xorg/include
+- /usr/X11R6/include
+- /usr/X11R7/include
+- /usr/include/X11
+- /usr/openwin/include
+- /usr/openwin/share/include
+- /opt/graphics/OpenGL/include
+- )
++ @PREFIX@/include
++ )
+
+ set(X11_LIB_SEARCH_PATH
+- /usr/pkg/xorg/lib
+- /usr/X11R6/lib
+- /usr/X11R7/lib
+- /usr/openwin/lib
++ @PREFIX@/lib
+ )
+
+ find_path(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h ${X11_INC_SEARCH_PATH})
+@@ -197,17 +188,17 @@ if(UNIX)
+ set(CMAKE_FIND_FRAMEWORK NEVER)
+
+ find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
+- PATHS /usr/X11R6/include
++ PATHS @PREFIX@/include
+ NO_DEFAULT_PATH
+ )
+
+ find_library(OPENGL_X11_gl_LIBRARY GL
+- PATHS /usr/X11R6/lib
++ PATHS @PREFIX@/lib
+ NO_DEFAULT_PATH
+ )
+
+ find_library(OPENGL_X11_glu_LIBRARY GLU
+- PATHS /usr/X11R6/lib
++ PATHS @PREFIX@/lib
+ NO_DEFAULT_PATH
+ )
+
Modified: users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.diff
===================================================================
--- users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.diff 2013-08-01 20:35:18 UTC (rev 108781)
+++ users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.diff 2013-08-01 21:02:09 UTC (rev 108782)
@@ -1,4 +1,4 @@
---- examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
+--- examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc.orig
+++ examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
@@ -41,6 +41,7 @@
// -------------------------------------------------------------------
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130801/70c23898/attachment-0001.html>
More information about the macports-changes
mailing list