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

[m-eik at users.sourceforge.net]

Revision: 4285
          http://rkward.svn.sourceforge.net/rkward/?rev=4285&view=rev
Author:   m-eik
Date:     2012-08-22 17:31:42 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
MacPorts: dbus session must be started as normal user, so it doesn't help in the postinstall script. trying to start it in the wrapper script in Mac OSX builds instead.

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

Modified: trunk/rkward/macports/kde/rkward/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward/Portfile	2012-08-22 16:42:41 UTC (rev 4284)
+++ trunk/rkward/macports/kde/rkward/Portfile	2012-08-22 17:31:42 UTC (rev 4285)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 fetch.type          svn
 svn.url             http://rkward.svn.sourceforge.net/svnroot/rkward/trunk
-svn.revision        4284
+svn.revision        4285
 worksrcdir          ${workpath}/trunk/rkward
 
 name                rkward-devel

Modified: trunk/rkward/macports/postinstall
===================================================================
--- trunk/rkward/macports/postinstall	2012-08-22 16:42:41 UTC (rev 4284)
+++ trunk/rkward/macports/postinstall	2012-08-22 17:31:42 UTC (rev 4285)
@@ -1,5 +1,4 @@
 #!/bin/sh
 launchctl load -w /opt/rkward/Library/LaunchDaemons/org.freedesktop.dbus-system.plist
-launchctl load -w /opt/rkward/Library/LaunchAgents/org.freedesktop.dbus-session.plist
 /opt/rkward/bin/update-mime-database -V /opt/rkward/share/mime
 exit 0

Modified: trunk/rkward/rkward/rkward.sh.in
===================================================================
--- trunk/rkward/rkward/rkward.sh.in	2012-08-22 16:42:41 UTC (rev 4284)
+++ trunk/rkward/rkward/rkward.sh.in	2012-08-22 17:31:42 UTC (rev 4285)
@@ -42,6 +42,8 @@
 ## set LC_NUMERIC to "C"
 export LC_NUMERIC="C"
 
+ at KDE_START_DBUS@
+
 ## Start rkward. Running through R CMD to set all the relevant R enviroment variables
 if test -x "`dirname $0`/rkward.frontend" ; then
   # for running directly from a build directory. Don't use this, unless you are a developer!

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.