Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (642f04ab218e085c9722a35bbfe79f40b8399738)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (642f04ab218e085c9722a35bbfe79f40b8399738)
  • Date: Sat, 21 Apr 2018 22:14:09 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

kernels/virtualbox-module/DETAILS | 2 +-
kernels/virtualbox-module/HISTORY | 3 +++
science/r/DEPENDS | 25 ++++++++++++-------------
science/r/DETAILS | 6 +++---
science/r/HISTORY | 3 +++
utils/virtualbox/DETAILS | 4 ++--
utils/virtualbox/HISTORY | 3 +++
utils/virtualbox/INSTALL | 6 +++---
utils/virtualbox/virtualbox | 6 +++---
9 files changed, 33 insertions(+), 25 deletions(-)

New commits:
commit 642f04ab218e085c9722a35bbfe79f40b8399738
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/r: version 3.4.4

commit ee8650acb9202ff6cce885cbcf8ed519a78c41d9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kernels/virtualbox-module: version 5.2.10

commit 99ad292d049d7137222a9ab77ce7830a3e071eab
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/virtualbox: version 5.2.10

diff --git a/kernels/virtualbox-module/DETAILS
b/kernels/virtualbox-module/DETAILS
index ac0443a..5486e64 100755
--- a/kernels/virtualbox-module/DETAILS
+++ b/kernels/virtualbox-module/DETAILS
@@ -1,5 +1,5 @@
SPELL=virtualbox-module
- VERSION=5.2.8
+ VERSION=5.2.10
SOURCE=virtualbox-module-$VERSION.tar.gz
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
diff --git a/kernels/virtualbox-module/HISTORY
b/kernels/virtualbox-module/HISTORY
index ff223fd..d0df060 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2018-04-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.2.10
+
2018-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.2.8

diff --git a/science/r/DEPENDS b/science/r/DEPENDS
index 156da2c..400020c 100755
--- a/science/r/DEPENDS
+++ b/science/r/DEPENDS
@@ -1,6 +1,10 @@
depends ncurses &&
depends -sub FORTRAN gcc &&
depends -sub CXX gcc &&
+depends zlib &&
+depends bzip2 &&
+depends pcre &&
+depends LZMA &&

# also looks for but not sure if it needs
# less, perl, TeX, laTeX, unzip, zip, gzip,
@@ -11,16 +15,11 @@ optional_depends readline \
'--without-readline' \
'for command line editing' &&

-optional_depends zlib \
- '--with-system-zlib' \
- '--without-system-zlib' \
- 'Use system zlib' &&
+optional_depends tiff \
+ '--with-libtiff' \
+ '--without-libtiff' \
+ 'for TIFF support' &&

-optional_depends bzip2 \
- '--with-system-bzlib' \
- '--without-system-bzlib' \
- 'Use system bzip2' &&
-
optional_depends libpng \
'--with-libpng' \
'--without-libpng' \
@@ -31,10 +30,10 @@ optional_depends JPEG \
'--without-system-jpeglib' \
'Enable jpeg support' &&

-optional_depends pcre \
- '--with-system-pcre' \
- '--without-pcre' \
- 'Enable pcre support' &&
+optional_depends icu \
+ '--with-icu' \
+ '--without-icu' \
+ 'Use the ICU library' &&

optional_depends tk \
'--with-tcltk' \
diff --git a/science/r/DETAILS b/science/r/DETAILS
index e56e3d3..b410b24 100755
--- a/science/r/DETAILS
+++ b/science/r/DETAILS
@@ -1,9 +1,9 @@
SPELL=r
- VERSION=2.13.0
+ VERSION=3.4.4
SOURCE=R-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/R-$VERSION
- SOURCE_URL[0]=http://cran.r-project.org/src/base/R-2/$SOURCE
-
SOURCE_HASH=sha512:384bb0144e81439bfc4049f6d30564b864cc5e56e861800faf556b02f7c08a45c1c5fe3f2e9364c686f7a713ac09f82a364a7bd5c891b1fe1115e7e55a04fd92
+ SOURCE_URL[0]=https://cran.r-project.org/src/base/R-$(echo $VERSION|cut
-f1 -d.)/$SOURCE
+
SOURCE_HASH=sha512:83f3023097ef150f066dd51a8706333d955ec0bb91b1e92e73aedba3dcf6abcedb1de196a6aaf32283eb72392d5ea4872f37bd77c1e75a2de20d995846497a44
LICENSE[0]=GPL
WEB_SITE=http://www.r-project.org/
KEYWORDS="science"
diff --git a/science/r/HISTORY b/science/r/HISTORY
index a97cd1b..d7b80a0 100644
--- a/science/r/HISTORY
+++ b/science/r/HISTORY
@@ -1,3 +1,6 @@
+2018-04-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 3.4.4
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index 8a4248e..b94f2ae 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,9 +1,9 @@
SPELL=virtualbox
- VERSION=5.2.8
+ VERSION=5.2.10
SOURCE=VirtualBox-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION%-*}

SOURCE_URL[0]=http://download.virtualbox.org/virtualbox/${VERSION%-*}/$SOURCE
-
SOURCE_HASH=sha512:49a3bd1c60d2c4cbd3799ece5fbfe15d9b6a00c5af9692478a1365a8eb4975228410e17dba24a388c0cf5387cb79fb7492feb4e6b2f531bc17322c3d61de7887
+
SOURCE_HASH=sha512:1e6d5e5c6ce45d9a3864860819f6301c192c83be154c674cfb37c98506db88a8f70526ec05d115c53e40c4c91d243513f0a3196261c7dee244a18091b2e5717e
TMPFS=off
LICENSE[0]=GPL
WEB_SITE=http://www.virtualbox.org/
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index c3b5415..d099e46 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,6 @@
+2018-04-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, INSTALL, virtualbox: version 5.2.10
+
2018-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.2.8

diff --git a/utils/virtualbox/INSTALL b/utils/virtualbox/INSTALL
index 355c365d..586c30c 100755
--- a/utils/virtualbox/INSTALL
+++ b/utils/virtualbox/INSTALL
@@ -1,4 +1,4 @@
-mkdir -p /opt/virtualbox &&
+mkdir -p /opt/VirtualBox &&
cd out/linux.*/release/bin &&

# generating of source tarball for virtualbox-module spell
@@ -9,10 +9,10 @@ cp virtualbox-module-$VERSION.tar.gz $SOURCE_CACHE &&
rm virtualbox-module-$VERSION.tar.gz &&
rm -r vboxdrv &&

-cp -r * /opt/virtualbox &&
+cp -r * /opt/VirtualBox &&

if [ $VBOXHARD == "y" ]; then
- cd /opt/virtualbox &&
+ cd /opt/VirtualBox &&
for f in VirtualBox VBoxHeadless VBoxSDL VBoxBFE VBoxNetDHCP
VBoxNetAdpCtl; do
chmod 4511 $f
done;
diff --git a/utils/virtualbox/virtualbox b/utils/virtualbox/virtualbox
index 04f6704..6a83993 100755
--- a/utils/virtualbox/virtualbox
+++ b/utils/virtualbox/virtualbox
@@ -1,7 +1,7 @@
#!/bin/bash

-# VirtualBox is installed in /opt/virtualbox
-cd /opt/virtualbox
+# VirtualBox is installed in /opt/VirtualBox
+cd /opt/VirtualBox

# Is vboxdrv module loaded?
if lsmod | grep vboxdrv > /dev/null
@@ -24,4 +24,4 @@ else
fi

echo OK, VirtualBox is starting ...
-LD_LIBRARY_PATH=.:/opt/qt4/lib ./VirtualBox
+LD_LIBRARY_PATH=.:/opt/qt5/lib ./VirtualBox



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (642f04ab218e085c9722a35bbfe79f40b8399738), Florian Franzmann, 04/21/2018

Archive powered by MHonArc 2.6.24.

Top of Page