[134054] trunk/dports/kde/rkward
mk at macports.org
mk at macports.org
Tue Mar 17 12:59:48 PDT 2015
Revision: 134054
https://trac.macports.org/changeset/134054
Author: mk at macports.org
Date: 2015-03-17 12:59:47 -0700 (Tue, 17 Mar 2015)
Log Message:
-----------
rkward: another going-to-fail build (now with 'ls -ltR' in pre-activate phase for analysis of issue #47064)
Modified Paths:
--------------
trunk/dports/kde/rkward/Portfile
Added Paths:
-----------
trunk/dports/kde/rkward/files/patch-dbus_session_startup.diff
Removed Paths:
-------------
trunk/dports/kde/rkward/files/dbus_session_startup.diff
Modified: trunk/dports/kde/rkward/Portfile
===================================================================
--- trunk/dports/kde/rkward/Portfile 2015-03-17 19:47:23 UTC (rev 134053)
+++ trunk/dports/kde/rkward/Portfile 2015-03-17 19:59:47 UTC (rev 134054)
@@ -2,6 +2,7 @@
# $Id$
PortSystem 1.0
+
# See dports/_resources/port1.0/group/kde4-1.1.tcl for more info.
PortGroup kde4 1.1
@@ -25,7 +26,7 @@
master_sites http://download.kde.org/stable/${name}/${version}/src
-patchfiles dbus_session_startup.diff
+patchfiles patch-dbus_session_startup.diff
worksrcdir ${name}-${version}
@@ -56,6 +57,19 @@
build.dir ${worksrcpath}/build
+# We force deletion of all residual (previously not properly destrooted) rkward files
+# possibly installed on the buildbots, which otherwise fail for the rkward port
+# [this should be deleted once the buildbots are clean again]:
+pre-activate {
+# delete ${frameworks_dir}/R.framework/Resources/library/rkward/
+# delete ${frameworks_dir}/R.framework/Resources/library/rkwardtests/
+#
+# First we want to know the timesstamps for further failure analysis
+ ui_msg "RKWARD_TIMESTAMPS:"
+ ls -ltR ${frameworks_dir}/R.framework/Resources/library/rkward/
+ ls -ltR ${frameworks_dir}/R.framework/Resources/library/rkwardtests/
+}
+
livecheck.type regex
livecheck.regex ">Get RKWard (\\d+\\.\\d+\\.\\d+)<"
Deleted: trunk/dports/kde/rkward/files/dbus_session_startup.diff
===================================================================
--- trunk/dports/kde/rkward/files/dbus_session_startup.diff 2015-03-17 19:47:23 UTC (rev 134053)
+++ trunk/dports/kde/rkward/files/dbus_session_startup.diff 2015-03-17 19:59:47 UTC (rev 134054)
@@ -1,11 +0,0 @@
---- rkward/rkward_startup_wrapper.cpp
-+++ rkward/rkward_startup_wrapper.cpp
-@@ -170,7 +170,7 @@
- }
- // ensure that RKWard finds its own packages
- qputenv ("R_LIBS", R_LIBS);
-- QProcess::execute ("lanuchctl", QStringList () << "load" << "-w" << INSTALL_PATH "/Library/LaunchAgents/org.freedesktop.dbus-session.plist");
-+ QProcess::execute ("launchctl", QStringList () << "load" << "-w" << INSTALL_PATH "/Library/LaunchAgents/org.freedesktop.dbus-session.plist");
- #endif
-
- // Locate KDE and RKWard installations
Copied: trunk/dports/kde/rkward/files/patch-dbus_session_startup.diff (from rev 134052, trunk/dports/kde/rkward/files/dbus_session_startup.diff)
===================================================================
--- trunk/dports/kde/rkward/files/patch-dbus_session_startup.diff (rev 0)
+++ trunk/dports/kde/rkward/files/patch-dbus_session_startup.diff 2015-03-17 19:59:47 UTC (rev 134054)
@@ -0,0 +1,11 @@
+--- rkward/rkward_startup_wrapper.cpp
++++ rkward/rkward_startup_wrapper.cpp
+@@ -170,7 +170,7 @@
+ }
+ // ensure that RKWard finds its own packages
+ qputenv ("R_LIBS", R_LIBS);
+- QProcess::execute ("lanuchctl", QStringList () << "load" << "-w" << INSTALL_PATH "/Library/LaunchAgents/org.freedesktop.dbus-session.plist");
++ QProcess::execute ("launchctl", QStringList () << "load" << "-w" << INSTALL_PATH "/Library/LaunchAgents/org.freedesktop.dbus-session.plist");
+ #endif
+
+ // Locate KDE and RKWard installations
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150317/93e227a1/attachment.html>
More information about the macports-changes
mailing list