audio/lash: Add texi2html auto-detection.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

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

4 files changed, 25 insertions, 17 deletions

diff --git a/audio/lash/README b/audio/lash/README
index 90d52868ff58e..5bbf72a7985f4 100644
--- a/audio/lash/README
+++ b/audio/lash/README
@@ -1,4 +1,8 @@
 LASH is a session management system for GNU/Linux audio applications.
-It allows you to save and restore audio sessions consisting of
-multiple interconneced applications, restoring program state (ie
-loaded patches) and the connections between them.
+It allows you to save and restore audio sessions consisting of multiple
+interconnected applications, restoring program state (i.e. loaded
+patches) and the connections between them.
+
+NOTE:
+
+tetex or texi2html is required to build the HTML manual.
diff --git a/audio/lash/lash.SlackBuild b/audio/lash/lash.SlackBuild
index 15270712ba00f..281ad2b76e771 100644
--- a/audio/lash/lash.SlackBuild
+++ b/audio/lash/lash.SlackBuild
@@ -27,12 +27,12 @@
 PRGNAM=lash
 VERSION=${VERSION:-0.6.0.594}
 SOURCE=$PRGNAM-0.6.0~rc2
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -43,8 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -67,15 +67,19 @@ tar xvf $CWD/$SOURCE.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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
-if [ "$(/usr/share/texmf/bin/texi2html --version)" != "1.76" ]; then
+if [ "$(/usr/share/texmf/bin/texi2html --version 2>/dev/null)" != "1.76" ]; then
     patch -p1 --verbose < $CWD/texlive.patch
 fi
 
+if $( which texi2html >/dev/null 2>&1 ); then
+    manual=docs/lash-manual-html-one-page/lash-manual.html
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -91,12 +95,12 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp AUTHORS README.SECURITY COPYING ChangeLog ChangeLog.old NEWS INSTALL README \
-    docs/lash-manual-html-one-page/lash-manual.html \
+    $manual \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/audio/lash/lash.info b/audio/lash/lash.info
index e4730a1801e54..0b6644657224e 100644
--- a/audio/lash/lash.info
+++ b/audio/lash/lash.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://download.savannah.gnu.org/releases/lash/lash-0.6.0~rc2.tar.bz2"
 MD5SUM="af1dc4f4ceb284b1b0845de4f4c2fe47"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack"
+REQUIRES="jack %README%"
 MAINTAINER="David Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/audio/lash/slack-desc b/audio/lash/slack-desc
index 797ba2331c350..076a1cd802c8f 100644
--- a/audio/lash/slack-desc
+++ b/audio/lash/slack-desc
@@ -10,10 +10,10 @@ lash: lash (audio session management system)
 lash:
 lash: LASH is a session management system for GNU/Linux audio applications.
 lash: It allows you to save and restore audio sessions consisting of
-lash: multiple interconneced applications, restoring program state (ie
+lash: multiple interconnected applications, restoring program state (i.e.
 lash: loaded patches) and the connections between them.
 lash:
-lash: Slackbuild by David Woodfall
+lash: http://savannah.nongnu.org/projects/lash
 lash:
 lash:
 lash: