network/gyachi: Updated for version 1.1.71

3 files changed, 16 insertions, 17 deletions

diff --git a/network/gyachi/README b/network/gyachi/README
index d2f207d71f..62925a087d 100644
--- a/network/gyachi/README
+++ b/network/gyachi/README
@@ -1,10 +1,8 @@
-This Yahoo! client for Linux operating system supports almost 
+This Yahoo! client for Linux operating system supports almost
 all of the features you would expect to find on the official
-Windows Yahoo! client: Voice chat, webcams, faders, 'nicknames', 
-audibles, avatars, display images, and more. Yet, it remains 
+Windows Yahoo! client: Voice chat, webcams, faders, 'nicknames',
+audibles, avatars, display images, and more. Yet, it remains
 very light-weight and memory-friendly.
 
-This requires mcrypt, pulseaudio, and jasper.
-
 An optional requirement is libnotify; if you have it installed,
 then run the script with:  USE_LIBNOTIFY=yes ./gyachi.SlackBuild
diff --git a/network/gyachi/gyachi.SlackBuild b/network/gyachi/gyachi.SlackBuild
index 1f0de33c0b..8658a832df 100644
--- a/network/gyachi/gyachi.SlackBuild
+++ b/network/gyachi/gyachi.SlackBuild
@@ -3,11 +3,11 @@
 # Slackware build script for gyachi
 
 # Copyright (c) 2006, 2007, 2008, 2009 Althaf K Backer althafkbacker@gmail.com
-# 
+#
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ -39,10 +39,10 @@ elif [ "$ARCH" = "x86_64" ]; then
   WINE_STATUS="--disable-wine"
 fi
 
-if [ "$USE_LIBNOTIFY" != "no" ]; then
-  LIBNOTIFY_STATUS="--enable-plugin_libnotify"
-else
+if [ "${USE_LIBNOTIFY:-no}" = "no" ]; then
   LIBNOTIFY_STATUS="--disable-plugin_libnotify"
+else
+  LIBNOTIFY_STATUS="--enable-plugin_libnotify"
 fi
 
 set -e
@@ -55,7 +55,9 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
+
 ./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
   ./configure \
@@ -69,6 +71,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --build=$ARCH-slackware-linux \
   --enable-maintainer-mode \
+  --disable-plugin_pulseaudio \
   ${WINE_STATUS} \
   ${LIBNOTIFY_STATUS}
 
@@ -82,16 +85,12 @@ make install DESTDIR=$PKG
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# --docdir / --htmldir are ignored
+mv $PKG/usr/share/doc $PKG/usr/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-( 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
-)
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/network/gyachi/gyachi.info b/network/gyachi/gyachi.info
index d9d81e3a0e..053297533d 100644
--- a/network/gyachi/gyachi.info
+++ b/network/gyachi/gyachi.info
@@ -2,7 +2,9 @@ PRGNAM="gyachi"
 VERSION="1.1.71"
 HOMEPAGE="http://gyachi.sourceforge.net/"
 DOWNLOAD="http://prdownloads.sourceforge.net/gyachi/gyachi-1.1.71.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="49852abe4e9ae3f95922340b526510ab"
+MD5SUM_x86_64=""
 MAINTAINER="Althaf K Backer"
 EMAIL="althafkbacker<at>gmail<dot>com"
 APPROVED="rworkman"