[121601] trunk/dports/science/geant4/Portfile

mojca at macports.org mojca at macports.org
Tue Jul 1 13:38:34 PDT 2014


Revision: 121601
          https://trac.macports.org/changeset/121601
Author:   mojca at macports.org
Date:     2014-07-01 13:38:34 -0700 (Tue, 01 Jul 2014)
Log Message:
-----------
geant4: fix dependencies for x11 (part of #23490)

Modified Paths:
--------------
    trunk/dports/science/geant4/Portfile

Modified: trunk/dports/science/geant4/Portfile
===================================================================
--- trunk/dports/science/geant4/Portfile	2014-07-01 19:41:00 UTC (rev 121600)
+++ trunk/dports/science/geant4/Portfile	2014-07-01 20:38:34 UTC (rev 121601)
@@ -271,32 +271,38 @@
         # also that on Mac you can only pick Qt4 OR X11/Motif interfaces. This is due
         # to incompatibilities between Apple's native OpenGL Framework and the OpenGL
         # supplied with X11 on this platform.
+        #
+        # (The variants opengl_x11/motif_x11 actually end up linking both against mesa's OpenGL
+        # and system's OpenGL libraries which seems like a problem on its own.)
 
         # or simply x11? The option name in geant4-config is opengl-x11
         variant opengl_x11 description {Build with X11 visualisation drivers} {
-            depends_lib-append    port:mesa \
-                                  port:xorg-libice \
-                                  port:xorg-libsm \
-                                  port:xorg-libX11 \
-                                  port:xorg-libXext \
-                                  port:xorg-libXmu
-            # configure.args-delete -DGEANT4_USE_OPENGL_X11=OFF
+        #   configure.args-delete -DGEANT4_USE_OPENGL_X11=OFF
             configure.args-append -DGEANT4_USE_OPENGL_X11=ON
         }
         ## This could belong to x11 (opengl_x11 & motif_x11 combined into a single option), but see also the comment above
         ## previous name (geant4 9.4): motif; name in geant4-config: motif
         variant motif_x11 description {Build with Motif (X11) user interface and visualization driver} {
-            depends_lib-append    port:mesa \
-                                  port:openmotif
-            # configure.args-delete -DGEANT4_USE_XM=OFF
+            depends_lib-append    port:openmotif
+        #   configure.args-delete -DGEANT4_USE_XM=OFF
             configure.args-append -DGEANT4_USE_XM=ON
         }
         ## previous name (geant4 9.4): raytracerx; name in geant4-config: raytracer-x11
         variant raytracer_x11 description {Build with Raytracer (X11) visualization driver} {
-            depends_lib-append    port:mesa
-            # configure.args-delete -DGEANT4_USE_RAYTRACER_X11=OFF
+        #   configure.args-delete -DGEANT4_USE_RAYTRACER_X11=OFF
             configure.args-append -DGEANT4_USE_RAYTRACER_X11=ON
         }
+        if {[variant_isset opengl_x11] || [variant_isset motif_x11]} {
+            depends_lib-append    port:mesa \
+                                  port:xorg-libXmu
+        }
+        if {[variant_isset opengl_x11] || [variant_isset motif_x11] || [variant_isset raytracer_x11]} {
+            depends_lib-append    port:xorg-libice \
+                                  port:xorg-libsm \
+                                  port:xorg-libX11 \
+                                  port:xorg-libXext
+        }
+
         variant gdml description {Build with Geometry Description Markup Language (GDML)} {
             depends_lib-append    port:xercesc3
             # configure.args-delete -DGEANT4_USE_GDML=OFF
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140701/3f51dd4a/attachment-0001.html>


More information about the macports-changes mailing list