[151271] trunk/dports/science/geant4

mojca at macports.org mojca at macports.org
Thu Aug 11 04:03:30 PDT 2016


Revision: 151271
          https://trac.macports.org/changeset/151271
Author:   mojca at macports.org
Date:     2016-08-11 04:03:30 -0700 (Thu, 11 Aug 2016)
Log Message:
-----------
geant4: upgrade to 4.10.2.p02, add preliminary support for 4.10.3

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

Added Paths:
-----------
    trunk/dports/science/geant4/files/geant4.10.3

Modified: trunk/dports/science/geant4/Portfile
===================================================================
--- trunk/dports/science/geant4/Portfile	2016-08-11 10:57:01 UTC (rev 151270)
+++ trunk/dports/science/geant4/Portfile	2016-08-11 11:03:30 UTC (rev 151271)
@@ -35,27 +35,40 @@
      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  3  4.10.01.p03  0b141adfceb4203f4855e0c6fb0d4c17036776ca  b198943b5bc4fd7968ef4eaa5bbe2fb094b8df1d907a05486dc05f4c92bbb174
-    10.2  0  0  1  4.10.02.p01  ac4e0d9314c41ac186bee82ca51dedfd62171541  b81f7082a15f6a34b720b6f15c6289cfe4ddbbbdcef0dc52719f71fac95f7f1c
+    10.2  0  1  2  4.10.02.p02  f4f84e4e0b5f4406ee3f577fde07f2e240014322  702fb0f7a78d4bdf1e3f14508de26e4db5e2df6a21a8066a92b7e6ce21f4eb2d
+    10.3  0  0  0  4.10.03.b01  74b5944fe50ace8650c28862967158e838ca1d6c  e1cca99d329cfca2b6f6cc7c3489fa0474b8e03462833239f4460bde58bd2e7a
 }
 
 #   NAME               VERS  FILENAME             ENVVAR             md5                               rmd160                                    sha256
+set geant.data_versions_10.3 {
+    G4NDL              4.5   G4NDL                G4NEUTRONHPDATA    fd29c45fe2de432f1f67232707b654c0  5c03cd810e590e48bae8b52e44e0ba218fcfc5ec  cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e
+    G4EMLOW            6.48  G4EMLOW              G4LEDATA           844064faa16a063a6a08406dc7895b68  13ef27c1a45cd908ccd7f9d76b9bd6d35681ef80  9815be88cbbcc4e8855b20244d586552a8b1819b8bf4e538c342b27c17dff1c7
+    PhotonEvaporation  3.2   G4PhotonEvaporation  G4LEVELGAMMADATA   01d5ba17f615d3def01f7c0c6b19bd69  6bfe26eae2bba76d48509d4f15ea95a6e216972a  35ed450a47aa610ce83c9095e17e43006e0da9557bf4433ac96ce19c730492d4
+    RadioactiveDecay   4.4.1 G4RadioactiveDecay   G4RADIOACTIVEDATA  0aa6c879c17b26f1ca85d3ac915fc30e  1346b5117bd1c201ed7f1f4e4b238d95dcc59f02  cd4a0bb6f5be563ffc08ab596b861687701e56c1507eb7cccf23d521cf336755
+    G4NEUTRONXS        1.4   G4NEUTRONXS          G4NEUTRONXSDATA    665a12771267e3b31a08c622ba1238a7  41278460f9c4a720f2b9e47dee878b9ec289ebd1  57b38868d7eb060ddd65b26283402d4f161db76ed2169437c266105cca73a8fd
+    G4PII              1.3   G4PII                G4PIIDATA          05f2471dbcdf1a2b17cbff84e8e83b37  313a2615903b0682b8aabc344bedde82c345704b  6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926
+    RealSurface        1.0   RealSurface          G4REALSURFACEDATA  0dde95e00fcd3bcd745804f870bb6884  030513fe340e0cccbfe0b9ae9acb3ba6b5291ebb  3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1
+    G4SAIDDATA         1.1   G4SAIDDATA           G4SAIDXSDATA       d88a31218fdf28455e5c5a3609f7216f  7f0c75c86eea3d227379d3dfe77e4600752f99a2  a38cd9a83db62311922850fe609ecd250d36adf264a88e88c82ba82b7da0ed7f
+    G4ABLA             3.0   G4ABLA               G4ABLADATA         d7049166ef74a592cb97df0ed4b757bd  656b10fc9d8022e89e99a728576d0b502161aa69  99fd4dcc9b4949778f14ed8364088e45fa4ff3148b3ea36f9f3103241d277014
+    G4ENSDFSTATE       1.3.1 G4ENSDFSTATE         G4ENSDFSTATEDATA   eddd153110184256a57ce6b753f0d527  f20a683acb2d9d902f6996adf47cf0fbdb63b17d  657c502a81f894382e6b08caaf7120a988a4e3f2dc8aaadbb604f91b053b5baf
+}
+# optional
+#   G4TENDL?           1.2   G4TENDL              G4TENDL?           8ba198ed5ef345f86c20cc657a1543bb  94a4b3f5f5c4ab7708a2a4ab5cf9272c4d42f82f  7b400807ae2e7e878a0536de3738e4454afd2a57e2f31188cd3e180442810ad8
+
 set geant.data_versions_10.2 {
     G4NDL              4.5   G4NDL                G4NEUTRONHPDATA    fd29c45fe2de432f1f67232707b654c0  5c03cd810e590e48bae8b52e44e0ba218fcfc5ec  cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e
     G4EMLOW            6.48  G4EMLOW              G4LEDATA           844064faa16a063a6a08406dc7895b68  13ef27c1a45cd908ccd7f9d76b9bd6d35681ef80  9815be88cbbcc4e8855b20244d586552a8b1819b8bf4e538c342b27c17dff1c7
     PhotonEvaporation  3.2   G4PhotonEvaporation  G4LEVELGAMMADATA   01d5ba17f615d3def01f7c0c6b19bd69  6bfe26eae2bba76d48509d4f15ea95a6e216972a  35ed450a47aa610ce83c9095e17e43006e0da9557bf4433ac96ce19c730492d4
-    RadioactiveDecay   4.3   G4RadioactiveDecay   G4RADIOACTIVEDATA  9f1630a5d9f00b4ba1ffc5f7df174827  ab9fc7b81338d93aa01d62c5c61d82696494e52c  0b1cb30bc339eccf7fee3cc2d7df73457b31187a5d473914d1183dd50f6611f0
+    RadioactiveDecay   4.3.2 G4RadioactiveDecay   G4RADIOACTIVEDATA  ed171641682cf8c10fc3f0266c8d482e  6c3123d57765d792605e88885f4fa6375632bc4c  43b558891f02b1f4796b913b89be607827995043cb678275c06a85e03b5b5c18
     G4NEUTRONXS        1.4   G4NEUTRONXS          G4NEUTRONXSDATA    665a12771267e3b31a08c622ba1238a7  41278460f9c4a720f2b9e47dee878b9ec289ebd1  57b38868d7eb060ddd65b26283402d4f161db76ed2169437c266105cca73a8fd
     G4PII              1.3   G4PII                G4PIIDATA          05f2471dbcdf1a2b17cbff84e8e83b37  313a2615903b0682b8aabc344bedde82c345704b  6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926
     RealSurface        1.0   RealSurface          G4REALSURFACEDATA  0dde95e00fcd3bcd745804f870bb6884  030513fe340e0cccbfe0b9ae9acb3ba6b5291ebb  3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1
     G4SAIDDATA         1.1   G4SAIDDATA           G4SAIDXSDATA       d88a31218fdf28455e5c5a3609f7216f  7f0c75c86eea3d227379d3dfe77e4600752f99a2  a38cd9a83db62311922850fe609ecd250d36adf264a88e88c82ba82b7da0ed7f
     G4ABLA             3.0   G4ABLA               G4ABLADATA         d7049166ef74a592cb97df0ed4b757bd  656b10fc9d8022e89e99a728576d0b502161aa69  99fd4dcc9b4949778f14ed8364088e45fa4ff3148b3ea36f9f3103241d277014
-    G4ENSDFSTATE       1.2   G4ENSDFSTATE         G4ENSDFSTATEDATA   a2e88f2c626141e4be4587c838832707  72c11106f1a37b92575763df5ecb2b1ee3134cdb  8944283285a66080d02bab5e1ad998711b584f4658e989dd3cf2726cd91a9015
+    G4ENSDFSTATE       1.2.3 G4ENSDFSTATE         G4ENSDFSTATEDATA   98fef898ea35df4010920ad7ad88f20b  04c0f845946eb52c8b8505fa2e06f6729ed2479f  15fb26d08a24f620f21566b5cddb7e07f0b06140899b03932d6cf76925130b75
 }
-#   optional
+# 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
@@ -110,6 +123,9 @@
 
 
         # TODO: use an array (hash) to implement this without if-else
+        if {${geant.version} == "10.3" } {
+            set geant.data_versions     ${geant.data_versions_10.3}
+        }
         if {${geant.version} == "10.2" } {
             set geant.data_versions     ${geant.data_versions_10.2}
         }
@@ -126,6 +142,15 @@
         distfiles
         foreach {data.name data.version data.filename data.envvariable data.md5 data.rmd160 data.sha256} ${geant.data_versions} {
             set filename ${data.filename}.${data.version}${extract.suffix}
+            # http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1849
+            # https://trac.macports.org/ticket/51603
+            # if {${geant.version} == "10.2" } {
+            #     if {${data.filename} == "G4RadioactiveDecay"} {
+            #         set filename ${data.filename}.4.4${extract.suffix}
+            #     } elseif {${data.filename} == "G4ENSDFSTATE"} {
+            #         set filename ${data.filename}.1.2.2${extract.suffix}
+            #     }
+            # }
             distfiles-append ${filename}
             checksums-append ${filename} md5 ${data.md5} rmd160 ${data.rmd160} sha256 ${data.sha256}
         }
@@ -133,6 +158,11 @@
             # only necessary for G4EMLOW 6.32
             # but G4NEUTRONXS 1.1, 1.2, 1.3 and PhotonEvaporation 2.2 also have some weird permissions
             system "find ${workpath} -type f -exec chmod 644 {} \\;"
+            # http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1849
+            # https://trac.macports.org/ticket/51603
+            # if {${geant.version} == "10.2" } {
+            #     move ${workpath}/RadioactiveDecay4.4 ${workpath}/RadioactiveDecay4.3.1
+            # }
         }
         use_configure no
         build {}
@@ -194,6 +224,16 @@
         #       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.3"} {
+#           PortGroup       cxx11 1.0
+            PortGroup       compiler_blacklist_versions 1.0
+            configure.cxx_stdlib libc++
+            # a bit of a guesswork (the list was not really tested)
+            compiler.blacklist-append *gcc* {clang < 500} macports-clang-3.3
+            compiler.fallback-append macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
+            patchfiles      patch-cmake-Modules-Geant4InterfaceOptions.cmake.4102.diff \
+                            patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4102.diff
+        }
         if {${geant.version} == "10.2"} {
 #           PortGroup       cxx11 1.0
             PortGroup       compiler_blacklist_versions 1.0

Copied: trunk/dports/science/geant4/files/geant4.10.3 (from rev 150847, trunk/dports/science/geant4/files/geant4.10.2)
===================================================================
--- trunk/dports/science/geant4/files/geant4.10.3	                        (rev 0)
+++ trunk/dports/science/geant4/files/geant4.10.3	2016-08-11 11:03:30 UTC (rev 151271)
@@ -0,0 +1,3 @@
+libexec/Geant4/Geant4.10.3/geant4-config
+libexec/Geant4/Geant4.10.3/geant4data.sh
+libexec/Geant4/Geant4.10.3/geant4data.csh
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160811/a1ea0a0b/attachment-0001.html>


More information about the macports-changes mailing list