academic/rkward: Updated for version 0.5.2

4 files changed, 32 insertions, 30 deletions

diff --git a/academic/rkward/README b/academic/rkward/README
index a2ed26b03f53..5e353fc54b5e 100644
--- a/academic/rkward/README
+++ b/academic/rkward/README
@@ -3,4 +3,4 @@ RWard strives  to  combine  the  power  of  the  R-language with the
 RKWard is far from finished, it is already useful as an IDE interface
 to the R language.
 
-RKWard requires R available at SlackBuilds.org.
\ No newline at end of file
+RKWard requires R.
diff --git a/academic/rkward/doinst.sh b/academic/rkward/doinst.sh
index 5fb28930db0b..1f8ff67dedb2 100644
--- a/academic/rkward/doinst.sh
+++ b/academic/rkward/doinst.sh
@@ -1,3 +1,10 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/academic/rkward/rkward.SlackBuild b/academic/rkward/rkward.SlackBuild
index 79fdea360672..1876f089e063 100644
--- a/academic/rkward/rkward.SlackBuild
+++ b/academic/rkward/rkward.SlackBuild
@@ -3,10 +3,9 @@
 # Slackware build script for RKWard
 #
 # Written by Germán Márquez Mejía (manchito at users.sourceforge.net)
-#
 
 PRGNAM=rkward
-VERSION=${VERSION:-0.4.9b}
+VERSION=${VERSION:-0.5.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -42,34 +41,28 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-#These files already exist within R
+# These files already exist within R
 rm -vf $PKG/usr/share/apps/katepart/syntax/r.xml \
-  $PKG/usr/lib/R/library/R.css
+  $PKG/usr/lib$LIBDIRSUFFIX/R/library/R.css
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPYING INSTALL README TODO \
+  AUTHORS ChangeLog COPYING INSTALL README TODO NOTES \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -78,4 +71,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/rkward/rkward.info b/academic/rkward/rkward.info
index 35bb71ea4261..aad08fa67d38 100644
--- a/academic/rkward/rkward.info
+++ b/academic/rkward/rkward.info
@@ -1,8 +1,10 @@
 PRGNAM="rkward"
-VERSION="0.4.9b"
+VERSION="0.5.2"
 HOMEPAGE="http://rkward.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/rkward/rkward-0.4.9b.tar.gz"
-MD5SUM="988b89b00a10336736ccc0b3486a6f39"
+DOWNLOAD="http://sourceforge.net/projects/rkward/files/Current_Stable_Releases/rkward-0.5.2.tar.gz/download"
+MD5SUM="c272660aa2eff52e357c33a8c25e0df5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Germán Márquez Mejía"
 EMAIL="manchito at users dot sourceforge dot net"
-APPROVED="dsomero"
+APPROVED="rworkman"