[147160] trunk/dports/science/geant4

[mojca at macports.org]

Revision: 147160
          https://trac.macports.org/changeset/147160
Author:   mojca at macports.org
Date:     2016-03-30 01:30:04 -0700 (Wed, 30 Mar 2016)
Log Message:
-----------
geant4: upgrade to 4.10.1.p03 & 4.10.2.p02, fix install name (closes #50426)

Modified Paths:
--------------
    trunk/dports/science/geant4/Portfile
    trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff

Modified: trunk/dports/science/geant4/Portfile
===================================================================
--- trunk/dports/science/geant4/Portfile	2016-03-30 06:42:58 UTC (rev 147159)
+++ trunk/dports/science/geant4/Portfile	2016-03-30 08:30:04 UTC (rev 147160)
@@ -34,8 +34,8 @@
 set geant.versions_info {
      9.6  1  0  4  4.9.6.p04    3dd8f6ac2e79929d26519e83fce113691a670788  997220a5386a43ac8f533fc7d5a8360aa1fd6338244d17deeaa583fb3a0f39fd
     10.0  1  0  4  4.10.00.p04  bfd11977b55f316f5c38d82f09dc37e7c0f60ea7  f4e1fc6d5ea4d9761ba44fd7e50921ff6276e25c2f640c7615460235d8c77d74
-    10.1  0  0  2  4.10.01.p02  e42f15d9a30acfa6cee2e659f36bf3ec014ea996  ee7917f6a4fe4c714cc9c68abaa3a2c32628d328186d8514d7cdecd7c639143f
-    10.2  0  0  0  4.10.02      8739912899f36530c8de48df2de102bb11593882  633ca2df88b03ba818c7eb09ba21d0667a94e342f7d6d6ff3c695d83583b8aa3
+    10.1  0  0  3  4.10.01.p03  0b141adfceb4203f4855e0c6fb0d4c17036776ca  b198943b5bc4fd7968ef4eaa5bbe2fb094b8df1d907a05486dc05f4c92bbb174
+    10.2  0  0  1  4.10.02.p01  ac4e0d9314c41ac186bee82ca51dedfd62171541  b81f7082a15f6a34b720b6f15c6289cfe4ddbbbdcef0dc52719f71fac95f7f1c
 }
 
 #   NAME               VERS  FILENAME             ENVVAR             md5                               rmd160                                    sha256
@@ -53,6 +53,9 @@
 }
 #   optional
 #   G4TENDL?           1.0   G4TENDL              G4TENDL?           bd6f381f995e1bf570c0b7cef3e40a78  88c97495862c24cf661828aaee4583fd768eb4eb  81ab22cb51f804f5c57a528e3ac3d15f0230a48b53c4443f0ddea833a4c4eb1d
+#   broken
+#   RadioactiveDecay   4.3.1 G4RadioactiveDecay   G4RADIOACTIVEDATA  e4a1a08a1c26000ffd32f17c38309c6d  81718f13428708c2a10c31748754b4bd1c8206ad  efa12e05db94f0fd93011821e27d672a07d9494b2b3313f86fd0229a50ee7185
+#   G4ENSDFSTATE       1.2.1 G4ENSDFSTATE         G4ENSDFSTATEDATA   55eba9a1fc69626ac8eb0eb40330acf9  e6e13d05b09f53330f3282772dbdbc7c42f00c14  284807de9387fe24d49753041e9c32ca8e2f3f61eef0038f2585603ce283a1a0
 
 set geant.data_versions_10.1 {
     G4NDL              4.5   G4NDL                G4NEUTRONHPDATA    fd29c45fe2de432f1f67232707b654c0  5c03cd810e590e48bae8b52e44e0ba218fcfc5ec  cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e
@@ -221,11 +224,16 @@
         }
         # 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-delete -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
+                              -DCMAKE_INSTALL_RPATH=${prefix}/lib
+                            # -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
         configure.args-append -DGEANT4_INSTALL_DATA=OFF \
                               -DCMAKE_INSTALL_BINDIR=${prefix}/libexec/Geant4/Geant${geant.version_simple} \
                               -DCMAKE_INSTALL_DATAROOTDIR=${prefix}/share/Geant4 \
                               -DCMAKE_INSTALL_INCLUDEDIR=${prefix}/include/Geant4/Geant${geant.version_simple} \
-                              -DCMAKE_INSTALL_LIBDIR=${prefix}/lib/Geant4/Geant${geant.version_simple}
+                              -DCMAKE_INSTALL_LIBDIR=${prefix}/lib/Geant4/Geant${geant.version_simple} \
+                              -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/Geant4/Geant${geant.version_simple} \
+                              -DCMAKE_INSTALL_RPATH=${prefix}/lib/Geant4/Geant${geant.version_simple}
 
         if {${geant.version} != "9.5"} {
             configure.args-append -DGEANT4_INSTALL_DATADIR=${geant.datadir} \

Modified: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff
===================================================================
--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff	2016-03-30 06:42:58 UTC (rev 147159)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff	2016-03-30 08:30:04 UTC (rev 147160)
@@ -1,6 +1,6 @@
 --- cmake/Modules/Geant4BuildProjectConfig.cmake.orig
 +++ cmake/Modules/Geant4BuildProjectConfig.cmake
-@@ -188,7 +188,7 @@ configure_file(
+@@ -185,7 +185,7 @@ configure_file(
  # - Generate Install Tree Configuration Files
  #-----------------------------------------------------------------------
  # Set needed variables for the install tree
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160330/512ca4c6/attachment.html>