[132911] trunk/dports/science/rNMR

[ryandesign at macports.org]

Revision: 132911
          https://trac.macports.org/changeset/132911
Author:   ryandesign at macports.org
Date:     2015-02-12 16:33:22 -0800 (Thu, 12 Feb 2015)
Log Message:
-----------
rNMR: adapt to changed directory structure of R port (#46838; maintainer)

Modified Paths:
--------------
    trunk/dports/science/rNMR/Portfile
    trunk/dports/science/rNMR/files/rNMR.sh

Modified: trunk/dports/science/rNMR/Portfile
===================================================================
--- trunk/dports/science/rNMR/Portfile	2015-02-13 00:09:02 UTC (rev 132910)
+++ trunk/dports/science/rNMR/Portfile	2015-02-13 00:33:22 UTC (rev 132911)
@@ -5,6 +5,7 @@
 
 name                rNMR
 version             1.1.7
+revision            1
 categories          science chemistry
 platforms           darwin
 maintainers         gmail.com:howarth.at.macports
@@ -41,15 +42,16 @@
 }
 
 destroot {
-    xinstall -d ${destroot}${prefix}/lib/R/library/${name}/macosx/
-    system "tar -C ${destroot}${prefix}/lib/R/library -zxf ${worksrcpath}/${distname}.tgz"
-    xinstall -W ${destroot}${prefix}/lib/R/library/${name}/linux \
+    xinstall -d ${destroot}${frameworks_dir}/R.framework/Resources/library/${name}/macosx/
+    system "tar -C ${destroot}${frameworks_dir}/R.framework/Resources/library -zxf ${worksrcpath}/${distname}.tgz"
+    xinstall -W ${destroot}${frameworks_dir}/R.framework/Resources/library/${name}/linux \
         loadrNMR.R rNMR.gif xdg-open \
-        ${destroot}${prefix}/lib/R/library/${name}/macosx/
-    reinplace "s|~/rNMR/linux/|./|g" ${destroot}${prefix}/lib/R/library/${name}/macosx/loadrNMR.R
-    xinstall -m 755 ${filespath}/${name}.sh ${destroot}${prefix}/lib/R/library/${name}/macosx
-    reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${prefix}/lib/R/library/${name}/macosx/rNMR.sh
-    ln -s ${prefix}/lib/R/library/${name}/macosx/${name}.sh ${destroot}${prefix}/bin/${name}
+        ${destroot}${frameworks_dir}/R.framework/Resources/library/${name}/macosx/
+    reinplace "s|~/rNMR/linux/|./|g" ${destroot}${frameworks_dir}/R.framework/Resources/library/${name}/macosx/loadrNMR.R
+    xinstall -m 755 ${filespath}/${name}.sh ${destroot}${frameworks_dir}/R.framework/Resources/library/${name}/macosx
+    reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${frameworks_dir}/R.framework/Resources/library/${name}/macosx/rNMR.sh
+    reinplace "s|@FRAMEWORKS_DIR@|${frameworks_dir}|g" ${destroot}${frameworks_dir}/R.framework/Resources/library/${name}/macosx/rNMR.sh
+    ln -s ${frameworks_dir}/R.framework/Resources/library/${name}/macosx/${name}.sh ${destroot}${prefix}/bin/${name}
 }
 
 livecheck.type      regex

Modified: trunk/dports/science/rNMR/files/rNMR.sh
===================================================================
--- trunk/dports/science/rNMR/files/rNMR.sh	2015-02-13 00:09:02 UTC (rev 132910)
+++ trunk/dports/science/rNMR/files/rNMR.sh	2015-02-13 00:33:22 UTC (rev 132911)
@@ -1,4 +1,4 @@
 #!/bin/sh
 rm -f .RData
- at PREFIX@/bin/R -f @PREFIX@/lib/R/library/rNMR/macosx/loadrNMR.R
+ at PREFIX@/bin/R -f @FRAMEWORKS_DIR@/R.framework/Resources/library/rNMR/macosx/loadrNMR.R
 @PREFIX@/bin/R
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150212/6d227202/attachment.html>