3 files changed, 14 insertions, 12 deletions
diff --git a/office/htmldoc/htmldoc.SlackBuild b/office/htmldoc/htmldoc.SlackBuild
index 8d8fb16161240..42ba6aed6b525 100644
--- a/office/htmldoc/htmldoc.SlackBuild
+++ b/office/htmldoc/htmldoc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for htmldoc
 
-# Copyright 2009-2010  LukenShiro <lukenshiro@ngi.it>
+# Copyright 2009-2013  LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,15 +27,13 @@
 
 PRGNAM=htmldoc
 VERSION=1.8.27
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -61,6 +59,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -68,7 +68,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -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 {} \;
 
 # workaround to avoid /usr/share/doc/htmldoc's use for help function
 sed -i 's|^#define DOCUMENTATION "$prefix/share/doc/htmldoc"|\
@@ -120,13 +124,11 @@ cp -a desktop/htmldoc-64.png $PKG/usr/share/icons/hicolor/64x64/apps/$PRGNAM.png
 cp -a desktop/htmldoc-96.png $PKG/usr/share/icons/hicolor/96x96/apps/$PRGNAM.png
 cp -a desktop/htmldoc-128.png $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png
 
-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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 # Just in case ..
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
diff --git a/office/htmldoc/htmldoc.info b/office/htmldoc/htmldoc.info
index 8aa31f3defd5d..f703d1bc2273c 100644
--- a/office/htmldoc/htmldoc.info
+++ b/office/htmldoc/htmldoc.info
@@ -1,6 +1,6 @@
 PRGNAM="htmldoc"
 VERSION="1.8.27"
-HOMEPAGE="http://www.htmldoc.org/index.php"
+HOMEPAGE="http://www.msweet.org/projects.php?Z1"
 DOWNLOAD="http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2"
 MD5SUM="35589e7b8fe9c54e11be87cd5aec4dcc"
 DOWNLOAD_x86_64=""
diff --git a/office/htmldoc/slack-desc b/office/htmldoc/slack-desc
index 27ce884f1dedb..85d7c44c5a9bb 100644
--- a/office/htmldoc/slack-desc
+++ b/office/htmldoc/slack-desc
@@ -13,7 +13,7 @@ htmldoc: indexed HTML, Adobe(r) PostScript(r), or Adobe(r) Portable Document
 htmldoc: Format ("PDF") files. 
 htmldoc: It is a product by Easy Software Products.
 htmldoc:
-htmldoc: Homepage: http://www.htmldoc.org/index.php
+htmldoc: Homepage: http://www.msweet.org/projects.php?Z1
 htmldoc:
 htmldoc:
 htmldoc: