[rkward-cvs] SF.net SVN: rkward:[4153] trunk/rkward/macports
m-eik at users.sourceforge.net
m-eik at users.sourceforge.net
Tue Jan 10 16:02:35 UTC 2012
Revision: 4153
http://rkward.svn.sourceforge.net/rkward/?rev=4153&view=rev
Author: m-eik
Date: 2012-01-10 16:02:35 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
updates to the MacPorts files
Modified Paths:
--------------
trunk/rkward/macports/kde/rkward/Portfile
trunk/rkward/macports/update_bundle.sh
Added Paths:
-----------
trunk/rkward/macports/README.MacOSX
Removed Paths:
-------------
trunk/rkward/macports/README.MacPorts
Added: trunk/rkward/macports/README.MacOSX
===================================================================
--- trunk/rkward/macports/README.MacOSX (rev 0)
+++ trunk/rkward/macports/README.MacOSX 2012-01-10 16:02:35 UTC (rev 4153)
@@ -0,0 +1,49 @@
+AFTER THE INSTALLATION
+======================
+
+KDE needs dbus to run. Therefore, after you installed the bundle image, run these command *once* in a terminal session:
+
+ sudo launchctl load -w /opt/rkward/Library/LaunchDaemons/org.freedesktop.dbus-system.plist
+ launchctl load -w /opt/rkward/Library/LaunchAgents/org.freedesktop.dbus-session.plist
+
+The bundle installs mostly to /opt/rkward. To launch all newly installed applications directly (e.g., R), you probably want to add this to the PATH environment variable, by adding it to ~/.profile:
+
+ echo "export PATH=/opt/rkward/bin:/opt/rkward/sbin:\$PATH" >> ~/.profile
+
+LOCALIZATION
+============
+
+Support for other localizations than english are available for all KDE applications, if the environment variable LANG is set accordingly. To acheive that temporarily for your running session, call the following (example for german):
+
+ launchctl setenv LANG de_DE.UTF-8
+
+To set the variable permanently, you can create or edit the file ~/.MacOSX/environment.plist (you need to login again for the changes to take effect):
+
+ 1. If it doesn't exist, create the folder:
+ mkdir ~/.MacOSX
+
+ 2. Open/create the file with a text editor, e.g.:
+ nano ~/.MacOSX/environment.plist
+
+ 3. If the file is new/empty, paste this to it (change the language string to your needs):
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+ <plist version="1.0">
+ <dict>
+ <key>LANG</key>
+ <string>de_DE.UTF-8</string>
+ </dict>
+ </plist>
+
+ If the file does already exist, only add the above key and string nodes accordingly.
+
+UPDATES/UNINSTALL
+=================
+
+There is no real update for binary bundles yet. That is, you need to uninstall and install the new version. Your personal settings should survive that, as they are sored in your personal directory (including manually installed R packages, if you didn't install them to /opt/rkward):
+
+1. pull the "RKWard" folder from Applications to Trash
+2. remove the directory /opt/rkward:
+ sudo rm -rf /opt/rkward
+
+Afterwards, you can install the new bundle. You don't need to repeat the steps outlined in "After the installation" and "Localization".
Deleted: trunk/rkward/macports/README.MacPorts
===================================================================
--- trunk/rkward/macports/README.MacPorts 2012-01-10 11:14:50 UTC (rev 4152)
+++ trunk/rkward/macports/README.MacPorts 2012-01-10 16:02:35 UTC (rev 4153)
@@ -1,42 +0,0 @@
-AFTER THE INSTALLATION
-======================
-
-KDE needs dbus to run. Therefore, after you installed the bundle image, run these command *once* in a terminal session:
-
- sudo launchctl load -w /opt/rkward/Library/LaunchDaemons/org.freedesktop.dbus-system.plist
- launchctl load -w /opt/rkward/Library/LaunchAgents/org.freedesktop.dbus-session.plist
-
-The bundle installs mostly to /opt/rkward. To launch all newly installed applications directly (e.g., R), you probably want to add this to the PATH environment variable, by adding this to ~/.profile (create it, if not present):
-
- export PATH=/opt/rkward/bin:/opt/rkward/sbin:$PATH
-
-
-LOCALIZATION
-============
-
-Support for other localizations than english are available for all KDE applications, if the environment variable LANG is set accordingly. To acheive that temporarily for your running session, call the following (example for german):
-
- launchctl setenv LANG de_DE.UTF-8
-
-To set the variable permanently, you can create or edit the file ~/.MacOSX/environment.plist (you need to login again for the changes to take effect):
-
- <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
- <plist version="1.0">
- <dict>
- <key>LANG</key>
- <string>de_DE.UTF-8</string>
- </dict>
- </plist>
-
-
-UPDATES/UNINSTALL
-=================
-
-There is no real update for binary bundles yet. That is, you need to uninstall and install the new version. Your personal settings should survive that, as they are sored in your personal directory (including manually installed R packages, if you didn't install them to /opt/rkward):
-
-1. pull the "RKWard" folder from Applications to Trash
-2. remove the directory /opt/rkward:
- sudo rm -rf /opt/rkward
-
-Afterwards, you can install the new bundle.
Modified: trunk/rkward/macports/kde/rkward/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward/Portfile 2012-01-10 11:14:50 UTC (rev 4152)
+++ trunk/rkward/macports/kde/rkward/Portfile 2012-01-10 16:02:35 UTC (rev 4153)
@@ -44,7 +44,4 @@
-DBUNDLE_INSTALL_DIR=${applications_dir}
configure.cmd cmake ..
-# remove r.xml from installation, conflicts with the kate port
-#patchfiles patch-rkward-syntax-CMakeLists.txt.diff
-
build.dir ${worksrcdir}/build
Modified: trunk/rkward/macports/update_bundle.sh
===================================================================
--- trunk/rkward/macports/update_bundle.sh 2012-01-10 11:14:50 UTC (rev 4152)
+++ trunk/rkward/macports/update_bundle.sh 2012-01-10 16:02:35 UTC (rev 4153)
@@ -1,7 +1,11 @@
#!/bin/bash
+# get SVN revision number
+echo "get SVN revision number..."
+SVNREV=$(svn info http://rkward.svn.sourceforge.net/svnroot/rkward/trunk 2>&1 | grep "^Revision:" | sed -e 's/[^[:digit:]]*//g')
+echo "Revision: $SVNREV"
SRCDATE=$(date +%Y-%m-%d)
SRCPATH=/opt/ports
-SRCFILE=${SRCPATH}/sources_bundle_${SRCDATE}.tar
+SRCFILE=${SRCPATH}/sources_bundle_svn$SVNREV_${SRCDATE}.tar
# specify macports installation path
MPTINST=/opt/rkward
# specify work directory
@@ -66,15 +70,21 @@
sudo port -v install $PTARGET
fi
+# set some variables
+if [[ $COPYMDMD ]] ; then
+ # get version information of installed ports
+ PORTVERS=$(port list $PTARGET | sed -e "s/.*@//;s/[[:space:]].*//")
+ KDEVERS=$(port list kde4-baseapps | sed -e "s/.*@//;s/[[:space:]].*//")
+ RVERS=$(port list R | sed -e "s/.*@//;s/[[:space:]].*//")
+fi
+
# make meta-package including dependencies
if [[ $MAKEMDMD ]] ; then
sudo port -v mdmg $PTARGET
# copy the image file to a public directory
if [[ $COPYMDMD ]] ; then
- # get version information of installed port
- PORTVERS=$(port list $PTARGET | sed -e "s/.*@//;s/[[:space:]].*//")
MDMGFILE=${WORKDIR}/${PTARGET}-${PORTVERS}.dmg
- TRGTFILE=${LPUBDIR}/${PTARGET}-${PORTVERS}_${SRCDATE}.dmg
+ TRGTFILE=${LPUBDIR}/RKWard-${PORTVERS}${SVNREV}_R-${RVERS}_KDE-${KDEVERS}_MacOSX_bundle.dmg
echo "copying: $MDMGFILE to $TRGTFILE ..."
cp -av $MDMGFILE $TRGTFILE
echo "done."
@@ -89,8 +99,7 @@
tar cvf $SRCFILE ${MPTINST}/var/macports/distfiles || exit 1
# copy the source archive to a public directory
if [[ $COPYMDMD ]] ; then
- PORTVERS=$(port list $PTARGET | sed -e "s/.*@//;s/[[:space:]].*//")
- TRGSFILE=${LPUBDIR}/${PTARGET}-${PORTVERS}_${SRCDATE}_src.tar
+ TRGSFILE=${LPUBDIR}/RKWard-${PORTVERS}${SVNREV}_R-${RVERS}_KDE-${KDEVERS}_src.tar
echo "copying: $SRCFILE to $TRGSFILE ..."
cp -av $SRCFILE $TRGSFILE
echo "done."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list