[118749] users/mojca/ports/science

[mojca at macports.org]

Revision: 118749
          https://trac.macports.org/changeset/118749
Author:   mojca at macports.org
Date:     2014-04-10 05:33:29 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
mojca/root: symlink all binaries from libexec

Modified Paths:
--------------
    users/mojca/ports/science/root5/Portfile
    users/mojca/ports/science/root6/Portfile

Modified: users/mojca/ports/science/root5/Portfile
===================================================================
--- users/mojca/ports/science/root5/Portfile	2014-04-10 12:28:31 UTC (rev 118748)
+++ users/mojca/ports/science/root5/Portfile	2014-04-10 12:33:29 UTC (rev 118749)
@@ -147,8 +147,16 @@
 }
 
 post-destroot {
-    # create a symlink 'root5' in bin
-    ln -s ${prefix}/${install_bindir}/root ${destroot}${prefix}/bin/root${version_major}
+    # create versioned symlinks for the content of libexec's bin dir.
+    foreach f [glob -directory ${destroot}${prefix}/${install_bindir} *] {
+        set filename  [file tail $f]
+        set extension [file extension $filename]
+        set base      [file rootname $filename]
+        set versioned_filename ${base}${version_major}${extension}
+        ln -s ${prefix}/${install_bindir}/${filename} ${destroot}${prefix}/bin/${versioned_filename}
+    }
+    # 'Fix' genreflex
+    reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${prefix}/${install_bindir}/genreflex
 }
 
 universal_variant   no
@@ -163,10 +171,6 @@
     set default_gui_variant +x11
 }
 
-post-destroot {
-    reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${install_bindir}/genreflex
-}
-
 variant debug description {Enable a debug build} {
     configure.args-append --build=debug
 }

Modified: users/mojca/ports/science/root6/Portfile
===================================================================
--- users/mojca/ports/science/root6/Portfile	2014-04-10 12:28:31 UTC (rev 118748)
+++ users/mojca/ports/science/root6/Portfile	2014-04-10 12:33:29 UTC (rev 118749)
@@ -64,6 +64,11 @@
 select.group        root
 select.file         ${filespath}/${name}
 
+# TODO: exact compiler fallback/black list
+# Force a compatible compiler
+compiler.blacklist-append {clang < 425} macports-clang-2.9
+compiler.fallback-append macports-clang-3.5 macports-clang-3.4 macports-clang-3.3
+
 set install_bindir  "libexec/root${version_major}/bin"
 set install_mandir  "libexec/root${version_major}/share/man"
 
@@ -148,8 +153,16 @@
 }
 
 post-destroot {
-    # create a symlink 'root6' in bin
-    ln -s ${prefix}/${install_bindir}/root ${destroot}${prefix}/bin/root${version_major}
+    # create versioned symlinks for the content of libexec's bin dir.
+    foreach f [glob -directory ${destroot}${prefix}/${install_bindir} *] {
+        set filename  [file tail $f]
+        set extension [file extension $filename]
+        set base      [file rootname $filename]
+        set versioned_filename ${base}${version_major}${extension}
+        ln -s ${prefix}/${install_bindir}/${filename} ${destroot}${prefix}/bin/${versioned_filename}
+    }
+    # 'Fix' genreflex
+    #reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${prefix}/${install_bindir}/genreflex
 }
 
 universal_variant   no
@@ -377,10 +390,6 @@
 }
 
 variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
-    # TODO: exact compiler fallback list
-    # Force a compatible clang compiler
-    compiler.blacklist-append {clang < 425} macports-clang-2.9
-    compiler.fallback-append macports-clang-3.4 macports-clang-3.3
     # Enable cocoa support in configure
     configure.args-append   -Dcocoa=ON
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140410/82245e6d/attachment-0001.html>