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

[m-eik at users.sf.net]

Revision: 4676
          http://sourceforge.net/p/rkward/code/4676
Author:   m-eik
Date:     2013-04-07 10:34:59 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
MacPorts: reverting failed gmake fix, ensure PATH is fully set instead

Modified Paths:
--------------
    trunk/rkward/macports/kde/rkward/Portfile
    trunk/rkward/macports/kde/rkward-devel/Portfile
    trunk/rkward/rkward/CMakeLists.txt
    trunk/rkward/rkward/rkward.sh.in

Modified: trunk/rkward/macports/kde/rkward/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward/Portfile	2013-04-07 10:14:11 UTC (rev 4675)
+++ trunk/rkward/macports/kde/rkward/Portfile	2013-04-07 10:34:59 UTC (rev 4676)
@@ -29,8 +29,7 @@
 
 depends_lib         port:kdelibs4 \
                     port:kate \
-                    port:R-framework \
-                    port:gmake
+                    port:R-framework
 
 # add port:okular once the graphics device is fully functional
 # this needs port:poppler with +qt4 +quartz varaints which cannot be

Modified: trunk/rkward/macports/kde/rkward-devel/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward-devel/Portfile	2013-04-07 10:14:11 UTC (rev 4675)
+++ trunk/rkward/macports/kde/rkward-devel/Portfile	2013-04-07 10:34:59 UTC (rev 4676)
@@ -27,11 +27,9 @@
 
 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 \
-                    port:gmake
+                    port:R-framework
 
 # add port:okular once the graphics device is fully functional
 # this needs port:poppler with +qt4 +quartz varaints which cannot be

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2013-04-07 10:14:11 UTC (rev 4675)
+++ trunk/rkward/rkward/CMakeLists.txt	2013-04-07 10:34:59 UTC (rev 4676)
@@ -9,11 +9,9 @@
 	SET(CPACK_BUNDLE_ICON rkward.icns)
 	SET(CPACK_BUNDLE_NAME RKWard)
 	SET(CPACK_BUNDLE_STARTUP_COMMAND rkward)
-	SET(LOOKUP_LOCAL_MAKE "# 'make' is needed to build source packages.
-# usually it's only available on OS X if XCode or similar was installed,
-# so we'll check for that and try to provide an alternative if it's not found
-if ! [ -f /usr/bin/make ] && [ -f \"${BIN_INSTALL_DIR}/gmake\" ] ; then
-  export MAKE=\"${BIN_INSTALL_DIR}/gmake\"
+	SET(APPEND_LOCAL_PATH "# ensure that PATH is set to include what we deliver with the bundle
+if ! [ $(echo $PATH | grep ${CMAKE_INSTALL_PREFIX}) ] ; then
+  export PATH=\"${CMAKE_INSTALL_PREFIX}/bin\":\"${CMAKE_INSTALL_PREFIX}/sbin\":${PATH}
 fi")
 	SET(KDE_START_DBUS "launchctl load -w \"${CMAKE_INSTALL_PREFIX}/Library/LaunchAgents/org.freedesktop.dbus-session.plist\"")
 #	SET(CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/rkward/Info.plist)

Modified: trunk/rkward/rkward/rkward.sh.in
===================================================================
--- trunk/rkward/rkward/rkward.sh.in	2013-04-07 10:14:11 UTC (rev 4675)
+++ trunk/rkward/rkward/rkward.sh.in	2013-04-07 10:34:59 UTC (rev 4676)
@@ -42,7 +42,7 @@
 ## set LC_NUMERIC to "C"
 export LC_NUMERIC="C"
 
- at LOOKUP_LOCAL_MAKE@
+ at APPEND_LOCAL_PATH@
 @KDE_START_DBUS@
 
 ## Start rkward. Running through R CMD to set all the relevant R enviroment variables