system/sakura: Updated for version 2.3.2

6 files changed, 22 insertions, 36 deletions

diff --git a/system/sakura/README b/system/sakura/README
index 130f5692f3..88a2c5d15d 100644
--- a/system/sakura/README
+++ b/system/sakura/README
@@ -5,4 +5,3 @@ based on VTE are  gnome-terminal, XFCE Terminal, and a small sample program
 included in the vte sources. Sakura differences from the last one is that it
 uses a notebook to provide several terminals in one window and adds a
 contextual menu with some basic options - no more no less.
-
diff --git a/system/sakura/doinst.sh b/system/sakura/doinst.sh
index 854e20633d..3718faa5a2 100644
--- a/system/sakura/doinst.sh
+++ b/system/sakura/doinst.sh
@@ -1,3 +1,4 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-  ./usr/bin/update-desktop-database -q usr/share/applications
+  /usr/bin/update-desktop-database -q /usr/share/applications
 fi
+
diff --git a/system/sakura/sakura.SlackBuild b/system/sakura/sakura.SlackBuild
index ad59bfab6d..32da0defd6 100644
--- a/system/sakura/sakura.SlackBuild
+++ b/system/sakura/sakura.SlackBuild
@@ -2,10 +2,10 @@
 
 # Slackware build script for sakura
 # Written by Erik Hanson  erik@slackbuilds.org
-# Updated by Kristaps Esterlins <esterlinsh@gmail.com>
+# Updated by Kristaps Esterlins <esterlinsh[at]gmail.com>
 
 PRGNAM=sakura
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-2.3.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -15,22 +15,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# These are ignored, but I'm leaving them here in case
-# someone with some sed skills wants to wedge SLKCFLAGS
-# into the Makefile.in later.
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-fi
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP 
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -39,15 +30,19 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cmake -DCMAKE_INSTALL_PREFIX=/usr . || exit 1
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+cmake -DCMAKE_INSTALL_PREFIX=/usr .
+make
+make install DESTDIR=$PKG 
 strip --strip-unneeded $PKG/usr/bin/sakura
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/applications
+cat $TMP/$PRGNAM-$VERSION/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS GPL INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
diff --git a/system/sakura/sakura.desktop b/system/sakura/sakura.desktop
deleted file mode 100644
index 7690731521..0000000000
--- a/system/sakura/sakura.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Sakura Terminal
-Comment=Use the command line
-TryExec=sakura
-Exec=sakura
-Icon=/usr/share/pixmaps/terminal-tango.png
-Type=Application
-Categories=GTK;Application;Utility;TerminalEmulator;
-StartupNotify=true
diff --git a/system/sakura/sakura.info b/system/sakura/sakura.info
index 5bae92d267..896ea66202 100644
--- a/system/sakura/sakura.info
+++ b/system/sakura/sakura.info
@@ -1,8 +1,8 @@
 PRGNAM="sakura"
-VERSION="2.2.0"
+VERSION="2.3.2"
 HOMEPAGE="http://pleyades.net/david/sakura.php"
-DOWNLOAD="http://pleyades.net/david/projects/sakura/sakura-2.2.0.tar.bz2"
-MD5SUM="452b5059f5dc37a3845ec11a0e46b5b1"
-MAINTAINER="Kristaps Esterlinsh"
+DOWNLOAD="http://pleyades.net/david/projects/sakura/sakura-2.3.2.tar.bz2"
+MD5SUM="d2f595a4b20a6f81c6904b138e152dce"
+MAINTAINER="Kristaps Esterlins"
 EMAIL="esterlinsh@gmail.com"
-APPROVED="David Somero"
+APPROVED="rworkman"
diff --git a/system/sakura/slack-desc b/system/sakura/slack-desc
index ee56f2f970..5140b147af 100644
--- a/system/sakura/slack-desc
+++ b/system/sakura/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-sakura: sakure (a terminal emulator)
+sakura: sakura (a terminal emulator)
 sakura: 
 sakura: sakura is a terminal emulator based on GTK and VTE. It's a terminal
 sakura: emulator with few dependencies, so you don't need a full GNOME desktop
@@ -17,3 +17,4 @@ sakura:
 sakura: http://pleyades.net/david/sakura.php
 sakura:
 sakura:
+sakura: