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

[m-eik at users.sf.net]

Revision: 4675
          http://sourceforge.net/p/rkward/code/4675
Author:   m-eik
Date:     2013-04-07 10:14:11 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
MacPorts: fixing bundle script to be able to build subports (and removing a comment from portfile)

Modified Paths:
--------------
    trunk/rkward/macports/kde/rkward/Portfile
    trunk/rkward/macports/update_bundle.sh

Modified: trunk/rkward/macports/kde/rkward/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward/Portfile	2013-04-05 16:18:41 UTC (rev 4674)
+++ trunk/rkward/macports/kde/rkward/Portfile	2013-04-07 10:14:11 UTC (rev 4675)
@@ -27,7 +27,6 @@
 
 PortGroup           cmake 1.0
 
-# gmake is needed to be able to build R source packages without XCode
 depends_lib         port:kdelibs4 \
                     port:kate \
                     port:R-framework \

Modified: trunk/rkward/macports/update_bundle.sh
===================================================================
--- trunk/rkward/macports/update_bundle.sh	2013-04-05 16:18:41 UTC (rev 4674)
+++ trunk/rkward/macports/update_bundle.sh	2013-04-07 10:14:11 UTC (rev 4675)
@@ -192,10 +192,6 @@
       sudo port clean ${i}
     fi
   done
-#   if [[ $(echo $INSTALLEDPORTS | grep "[[:space:]]rkward-devel[[:space:]]" 2> /dev/null ) ]] ; then 
-#     sudo port uninstall rkward-devel
-#     sudo port clean rkward-devel
-#   fi
   # build and install recent version
   sudo port -v install ${PTARGET} || exit 1
 fi
@@ -238,7 +234,7 @@
     # this is to fix some kind of a race condition: if RKWard gets installed before R-framework,
     # it wil create a directory which must actually be a symlink in order for R to run! so we'll
     # move RKWard's own packages before bundling it
-    RKWDSTROOT=${MPTINST}/var/macports/build/_opt_ports_kde_${PTARGET}/${PTARGET}/work/destroot
+    RKWDSTROOT=${WORKDIR}/destroot
     RKWRFWPATH=${RKWDSTROOT}/${MPTINST}/Library/Frameworks/R.framework
     if ! [ -d ${RKWRFWPATH} ] ; then
       echo "cannot find R.framework, bogus path? ${RKWRFWPATH}"