[rkward-cvs] SF.net SVN: rkward-code:[4734] trunk/rkward/macports/kde

[m-eik at users.sf.net]

Revision: 4734
          http://sourceforge.net/p/rkward/code/4734
Author:   m-eik
Date:     2013-04-30 11:32:38 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
MacPorts: updated portfiles

Modified Paths:
--------------
    trunk/rkward/macports/kde/rkward/Portfile
    trunk/rkward/macports/kde/rkward-devel/Portfile

Modified: trunk/rkward/macports/kde/rkward/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward/Portfile	2013-04-29 08:08:34 UTC (rev 4733)
+++ trunk/rkward/macports/kde/rkward/Portfile	2013-04-30 11:32:38 UTC (rev 4734)
@@ -29,7 +29,7 @@
 
 depends_lib         port:kdelibs4 \
                     port:kate \
-                    port:R-framework
+                    port:R
 
 # add port:okular once the graphics device is fully functional
 # this needs port:poppler with +qt4 +quartz varaints which cannot be
@@ -56,17 +56,28 @@
 configure.args-append \
         -DNO_R_XML=1 \
         -DRKVERSION_NUMBER=${version} \
-        -DBUNDLE_INSTALL_DIR=${applications_dir}
+        -DBUNDLE_INSTALL_DIR=${applications_dir} \
+        -DR_EXECUTABLE=${prefix}/Library/Frameworks/R.framework/Resources/R
 # work around moved Qt include dir
 if { ![file exists ${prefix}/include/Qt/qglobal.h] && [file exists ${prefix}/include/QtCore/qglobal.h] } {
         configure.args-append -DQT_QT_INCLUDE_DIR=${prefix}/include/QtCore
 }
 configure.cmd       cmake ..
 
-# configure R to install Mac binaries by default
+# configure R to use Mac binaries by default
+# you must first install the OS X packages of CRAN R, as we'll link against them
 subport rkward-binary {
         conflicts-append rkward rkward-devel-binary rkward-devel-debug rkward-debug
-        configure.args-append -DUSE_BINARY_PACKAGES=1
+        depends_lib-delete   port:gcc47 port:R
+        configure.compiler   llvm-gcc-4.2
+        configure.args-delete \
+               -DR_EXECUTABLE=${prefix}/Library/Frameworks/R.framework/Resources/R
+        configure.args-append \
+               -DUSE_BINARY_PACKAGES=1 \
+               -DR_EXECUTABLE=/Library/Frameworks/R.framework/Resources/R \
+               -DR_LIBDIR=${prefix}/Library/Frameworks/R.framework/Resources/library
+        # create libdir if it doesn't exist
+        file mkdir ${prefix}/Library/Frameworks/R.framework/Resources/library
 }
 
 # compile with full debugging support

Modified: trunk/rkward/macports/kde/rkward-devel/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward-devel/Portfile	2013-04-29 08:08:34 UTC (rev 4733)
+++ trunk/rkward/macports/kde/rkward-devel/Portfile	2013-04-30 11:32:38 UTC (rev 4734)
@@ -9,7 +9,7 @@
 
 name                rkward-devel
 conflicts           rkward
-version             0.6.1-svn${svn.revision}
+version             0.6.1-svn
 categories          kde kde4 math science
 maintainers         hhu.de:meik.michalke
 license             GPL-2
@@ -29,7 +29,7 @@
 
 depends_lib         port:kdelibs4 \
                     port:kate \
-                    port:R-framework
+                    port:R
 
 # add port:okular once the graphics device is fully functional
 # this needs port:poppler with +qt4 +quartz varaints which cannot be
@@ -68,7 +68,7 @@
 # you must first install the OS X packages of CRAN R, as we'll link against them
 subport rkward-devel-binary {
         conflicts-append rkward-devel rkward-binary rkward-devel-debug rkward-debug
-        depends_lib-delete   port:gcc47 port:R-framework
+        depends_lib-delete   port:gcc47 port:R
         configure.compiler   llvm-gcc-4.2
         configure.args-delete \
                -DR_EXECUTABLE=${prefix}/Library/Frameworks/R.framework/Resources/R