From aa2039997a85da69591d7cf38e2e8a59ec86a07b Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Tue, 13 Jan 2015 06:39:54 +0700
Subject: development/icoutils: Updated for version 0.31.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/icoutils/icoutils.SlackBuild | 22 ++++++++--------------
 development/icoutils/icoutils.info       |  6 +++---
 2 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'development/icoutils')

diff --git a/development/icoutils/icoutils.SlackBuild b/development/icoutils/icoutils.SlackBuild
index 9a379d9aeb..d6ed3ddcba 100644
--- a/development/icoutils/icoutils.SlackBuild
+++ b/development/icoutils/icoutils.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=icoutils
-VERSION=0.26.0
+VERSION=${VERSION:-0.31.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,14 +62,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -83,21 +83,15 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# Kill an empty directory
-rmdir $PKG/usr/share 2>/dev/null || true
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+mv $PKG/usr/share/man $PKG/usr
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog NEWS README TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/icoutils/icoutils.info b/development/icoutils/icoutils.info
index 3ae2958ea7..2a242d7c71 100644
--- a/development/icoutils/icoutils.info
+++ b/development/icoutils/icoutils.info
@@ -1,8 +1,8 @@
 PRGNAM="icoutils"
-VERSION="0.26.0"
+VERSION="0.31.0"
 HOMEPAGE="http://www.nongnu.org/icoutils/"
-DOWNLOAD="http://savannah.nongnu.org/download/icoutils/icoutils-0.26.0.tar.gz"
-MD5SUM="5494ee42a9dad562b49c6b8721f973e8"
+DOWNLOAD="http://savannah.nongnu.org/download/icoutils/icoutils-0.31.0.tar.bz2"
+MD5SUM="fe12dcfb7796cb6cb4ac9bb0720ae362"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3