system/rhash: Updated for version 1.3.5

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 28 insertions, 33 deletions

diff --git a/system/rhash/rhash.SlackBuild b/system/rhash/rhash.SlackBuild
index eeeb01b5d0..df9e4dcec9 100644
--- a/system/rhash/rhash.SlackBuild
+++ b/system/rhash/rhash.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014, Симон Болоканов, Bulgaria <sbolokanov@abv.bg>
+# Copyright (c) 2014, Симонъ–Севаръ Болокановъ, Bulgaria <sbolokanov@abv.bg>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Written by: Симон Болоканов <sbolokanov@abv.bg>
+# Written by: Симонъ Болокановъ <sbolokanov@abv.bg>
 # Date: Unknown
 
 # Changelog:
@@ -28,10 +28,12 @@
 #    27.2.2015 - no headers!? - thanks to Marcel Saegebarth for spotting this
 #    3.3.2015 - added STATICLIB per Marcel Saegebarth request
 #      П.П. Честит ден на Освобождението, българи!
+#    10.3.2015 - made quiet the clean up, script actually broke on last update…
+#      3 Мартъ 1878 – възстановѧване на Българиѧ, 3 Мартъ 1918 (40 г. по–късно) – победа надъ Русиѧ
 
 PRGNAM=rhash
-VERSION=${VERSION:-1.3.3}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.3.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # Shall we compile with OpenSSL support?
@@ -84,6 +86,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+mv RHash-$VERSION $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -92,39 +95,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Export FLAGS
+export ADDCFLAGS="${SLKCFLAGS} -DUSE_GETTEXT ${OPTCFLAGS}"
+export ADDLDFLAGS="${OPTLDFLAGS}"
+
 # -DUSE_GETTEXT = internationalization support
-make ADDCFLAGS="${SLKCFLAGS} -DUSE_GETTEXT ${OPTCFLAGS}" \
-    ADDLDFLAGS="${OPTLDFLAGS}" \
-    PREFIX=/usr \
-    MANDIR=/usr/man \
-    DESTDIR=$PKG \
-    install
-
-# Install libraries (static and shared)
-make ADDCFLAGS="${SLKCFLAGS} -DUSE_GETTEXT ${OPTCFLAGS}" \
-    ADDLDFLAGS="${OPTLDFLAGS}" \
-    PREFIX=/usr \
-    LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-    DESTDIR=$PKG \
-    install-lib-shared $INSTALLSTATICLIB
-
-# Install headers
+# Build and install program and locales
+make \
+  PREFIX=/usr \
+  MANDIR=/usr/man \
+  DESTDIR=$PKG \
+    install-shared install-gmo
+
+# Build and install headers, libraries (static and shared)
 make -C librhash \
-    PREFIX=/usr \
-    DESTDIR=$PKG \
-    install-headers
-
-# Install locales
-make PREFIX=/usr \
-    DESTDIR=$PKG \
-    install-gmo
+  PREFIX=/usr \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  DESTDIR=$PKG \
+    install-headers install-lib-shared $INSTALLSTATICLIB install-so-link
 
 # Don't clobber the default config
 mv -v $PKG/etc/rhashrc $PKG/etc/rhashrc.new
 
 # Copy docs
 mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog  COPYING README INSTALL $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a ChangeLog COPYING README INSTALL $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/system/rhash/rhash.info b/system/rhash/rhash.info
index 0673a04919..c80c2b299b 100644
--- a/system/rhash/rhash.info
+++ b/system/rhash/rhash.info
@@ -1,10 +1,10 @@
 PRGNAM="rhash"
-VERSION="1.3.3"
+VERSION="1.3.5"
 HOMEPAGE="http://rhash.anz.ru/?l=en"
-DOWNLOAD="http://downloads.sourceforge.net/rhash/rhash-1.3.3-src.tar.gz"
-MD5SUM="0e3c758b5e4b25e29e0094a33a9d2764"
+DOWNLOAD="http://downloads.sourceforge.net/rhash/rhash-1.3.5-src.tar.gz"
+MD5SUM="f586644019c10c83c6b6835de4b99e74"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Симон Болоканов"
+MAINTAINER="Симонъ–Севаръ Болокановъ"
 EMAIL="sbolokanov@abv.bg"