Index: Portfile
===================================================================
diff --git a/users/mojca/ports/science/geant/Portfile b/users/mojca/ports/science/geant/Portfile
--- a/users/mojca/ports/science/geant/Portfile	(revision 108000)
+++ b/users/mojca/ports/science/geant/Portfile	(working copy)
@@ -105,18 +105,22 @@
         }
         use_configure no
         build {}
-        destroot {
-            xinstall -m 755 -d ${destroot}${geant.datadir}
-            # TODO: maybe a better name or a better location
-            # in any case the filename of this file needs to be known in the portgroup
-            set filename ${destroot}${geant.datadir}/setup-geant4data.sh
-            system "echo export G4DATADIR=${geant.datadir} > ${filename}"
-            foreach {data.name data.version data.filename data.envvariable data.md5 data.rmd160 data.sha256} ${geant.data_versions} {
-                move ${workpath}/${data.name}${data.version} ${destroot}${geant.datadir}
-                # one option is also to install this as part of geant4 core installation
-                system "echo export ${data.envvariable}=\\\$G4DATADIR/${data.name}${data.version} >> ${filename}"
+
+        set dr {
+            destroot {
+                xinstall -m 755 -d ${destroot}${geant.datadir}
+                # TODO: maybe a better name or a better location
+                # in any case the filename of this file needs to be known in the portgroup
+                set filename ${destroot}${geant.datadir}/setup-geant4data.sh
+                system "echo export G4DATADIR=${geant.datadir} > ${filename}"
+                foreach {data.name data.version data.filename data.envvariable data.md5 data.rmd160 data.sha256} ${geant.data_versions} {
+                    move ${workpath}/${data.name}${data.version} ${destroot}${geant.datadir}
+                    # one option is also to install this as part of geant4 core installation
+                    system "echo export ${data.envvariable}=\\\$G4DATADIR/${data.name}${data.version} >> ${filename}"
+                }
             }
         }
+        eval [string map [list \${geant.datadir} [list ${geant.datadir}]] $dr]
     }
 
     # TODO: should eventually become ${name}.${geant.version} (geant4.9.6)