network/gnubiff: Updated for version 2.2.8

5 files changed, 12 insertions, 38 deletions

diff --git a/network/gnubiff/README b/network/gnubiff/README
index e8e47a96a2..5aeba2e932 100644
--- a/network/gnubiff/README
+++ b/network/gnubiff/README
@@ -4,6 +4,3 @@ Gnubiff is a mail notification program that checks for mail and
 displays headers when new mail has arrived. 
 
 For further information see 'man 1 gnubiff' and 'info gnubiff'. 
-
-Also, if you have gamin (and optional dependency) installed, be
-sure to look at the build script for how to enable it.
diff --git a/network/gnubiff/doinst.sh b/network/gnubiff/doinst.sh
new file mode 100644
index 0000000000..36bfd4f380
--- /dev/null
+++ b/network/gnubiff/doinst.sh
@@ -0,0 +1 @@
+chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/gnubiff.info.gz 2> /dev/null
diff --git a/network/gnubiff/gnubiff.SlackBuild b/network/gnubiff/gnubiff.SlackBuild
index 4770fd2db3..1ad08f2c6e 100644
--- a/network/gnubiff/gnubiff.SlackBuild
+++ b/network/gnubiff/gnubiff.SlackBuild
@@ -22,10 +22,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
 PRGNAM=gnubiff
-VERSION=2.2.6
+VERSION=2.2.8
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -34,11 +32,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-GAMIN=${GAMIN:-NO}
-# Slackware 11.0 does not include gamin; however, if you have it installed,
-# change the variable above or run this build script with the following command:
-#   GAMIN=YES ./gnubiff.SlackBuild
-
 DOCS="ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL LICENSE NEWS README THANKS TODO"
 
 if [ "$ARCH" = "i486" ]; then
@@ -56,13 +49,6 @@ cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# If GAMIN=YES above, then enable gamin/fam usage; otherwise, disable it.
-if [ "$GAMIN" = "YES" ]; then
-    do_fam="en"
-  else
-    do_fam="dis"
-fi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -70,24 +56,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --disable-gnome \
-  --${do_fam}able-fam \
   --with-password \
-  --program-prefix="" \
-  --build=$ARCH-slackware-linux \
   || exit 1
-  
-make || exit 1
-make install DESTDIR=$PKG || exit 1
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+make || exit 1
+make install-strip DESTDIR=$PKG || exit 1
 
-( cd $PKG/usr/man
-  find . -name "*.?" -type f 2> /dev/null | xargs gzip -9 2> /dev/null
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+gzip -9 $PKG/usr/man/man1/* 2> /dev/null
 
 gzip -9 $PKG/usr/info/*.info*
 rm -f $PKG/usr/info/dir
@@ -102,6 +77,7 @@ rm -rf $PKG/usr/lib $PKG/usr/share/gnome-2.0
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/gnubiff/gnubiff.info b/network/gnubiff/gnubiff.info
index dea5e240f3..f54e21af4d 100644
--- a/network/gnubiff/gnubiff.info
+++ b/network/gnubiff/gnubiff.info
@@ -1,8 +1,8 @@
 PRGNAM="gnubiff"
-VERSION="2.2.6"
+VERSION="2.2.8"
 HOMEPAGE="http://gnubiff.sourceforge.net"
-DOWNLOAD="http://prdownloads.sourceforge.net/gnubiff/gnubiff-2.2.6.tar.gz"
-MD5SUM="b6c2580b7b2b73cddafdc1fdcedcfde2"
+DOWNLOAD="http://downloads.sourceforge.net/gnubiff/gnubiff-2.2.8.tar.gz"
+MD5SUM="5c9a17840d968d2b6dddff479c7be5dd"
 MAINTAINER="Michael Wagner"
 EMAIL="lapinours@web.de"
 APPROVED="rworkman"
diff --git a/network/gnubiff/slack-desc b/network/gnubiff/slack-desc
index ac16df418d..1aedcc1f26 100644
--- a/network/gnubiff/slack-desc
+++ b/network/gnubiff/slack-desc
@@ -5,11 +5,11 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-       |-----handy-ruler------------------------------------------------------|
+       |-----handy-ruler----------------------------------------------------|
 gnubiff: gnubiff (GTK+2 mail notification program)
 gnubiff:
-gnubiff: gnubiff is a mail notification program that checks for mail and 
-gnubiff: displays headers when new mail has arrived. 
+gnubiff: gnubiff is a mail notification program that checks for
+gnubiff: mail and displays headers when new mail has arrived. 
 gnubiff:
 gnubiff: Homepage: http://gnubiff.sourceforge.net
 gnubiff: