network/elinks: Updated for version git20131231 + New Maintainer.

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

3 files changed, 58 insertions, 48 deletions

diff --git a/network/elinks/README b/network/elinks/README
index 4daa1bca8e..91a5cf3cb6 100644
--- a/network/elinks/README
+++ b/network/elinks/README
@@ -1,10 +1,6 @@
 elinks (ELinks - Full-Featured Text WWW Browser)
 
-ELinks is an advanced and well-established feature-rich text mode web 
-(HTTP/FTP/..) browser. ELinks can render both frames and tables, is highly 
-customizable, and it can be extended via Lua or Guile scripts. It is very 
-portable and runs on a variety of platforms.
-
-There are some optional dependencies that are not included in Slackware. 
-Please consult the ELinks Manual Section 2.3 for more information on 
-dependencies: http://elinks.or.cz/documentation/manual.html
+ELinks is an advanced and well-established feature-rich text mode
+web (HTTP/FTP/..) browser. ELinks can render both frames and tables,
+is highly customizable, and can be extended via Lua or Guile scripts.
+It is very portable and runs on a variety of platforms.
diff --git a/network/elinks/elinks.SlackBuild b/network/elinks/elinks.SlackBuild
index 6dc3d9a84d..67abfc3833 100644
--- a/network/elinks/elinks.SlackBuild
+++ b/network/elinks/elinks.SlackBuild
@@ -1,15 +1,32 @@
 #!/bin/sh
 
 # Slackware build script for elinks
-
-# Written by Brian Muramatsu (btmura@gmail.com)
-# Thanks to dadexter@sekurity.com for help with this.
-
-# Modified by the SlackBuilds.org project
+# Copyright 2014 David Woodfall <dave@dawoodfall.net>
+# All rights reserved.
+#
+# Brian Muramatsu's (btmura@gmail.com) original slackbuild rewritten
+# from scratch.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=elinks
-VERSION=0.11.5
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-git20131231}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -25,12 +42,12 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
@@ -39,12 +56,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -58,6 +77,9 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-guile \
   --enable-cgi \
   --enable-nntp \
@@ -67,33 +89,25 @@ CFLAGS="$SLKCFLAGS" \
   --enable-exmode \
   --enable-88-colors \
   --enable-256-colors \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README SITES \
-  THANKS TODO doc $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/doc/man
-find $PKG/usr/doc -name "Makefile*" -exec rm -f {} \;
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
+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
+
+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
 
-# The locale.alias file is part of the glibc package; let's not clobber it
-rm -f $PKG/usr/share/locale/locale.alias
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/html doc/*txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Move man pages to their proper location.
-mv $PKG/usr/share/man $PKG/usr
-( 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
-)
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/elinks/elinks.info b/network/elinks/elinks.info
index b9ce087f81..08d80ec74a 100644
--- a/network/elinks/elinks.info
+++ b/network/elinks/elinks.info
@@ -1,10 +1,10 @@
 PRGNAM="elinks"
-VERSION="0.11.5"
+VERSION="git20131231"
 HOMEPAGE="http://elinks.or.cz/"
-DOWNLOAD="http://elinks.or.cz/download/elinks-0.11.5.tar.bz2"
-MD5SUM="7dccdb6568d7eeda68912f6541496b7e"
+DOWNLOAD="http://www.unrealize.co.uk/source/elinks-git20131231.tar.xz"
+MD5SUM="3b3b57ac6b9bafe123d046f342272d17"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Brian Muramatsu"
-EMAIL="btmura@gmail.com"
+MAINTAINER="David Woodfall"
+EMAIL="dave@dawoodfall.net"