network/w3m: Updated for version git20170104 + new maintainer.

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

4 files changed, 59 insertions, 30 deletions

diff --git a/network/w3m/README b/network/w3m/README
index 86951b88df..15ea4bb339 100644
--- a/network/w3m/README
+++ b/network/w3m/README
@@ -1,10 +1,32 @@
-w3m is a World Wide Web (WWW) text based client. It has English and
-Japanese help files and an option menu and can be configured to use
-either language. It will display hypertext markup language (HTML)
-documents containing links to files residing on the local system, as
-well as files residing on remote systems. It can display HTML tables,
-frames, and images, and supports tabbed browsing. In addition, it can
-be used as a "pager" in much the same manner as "more" or "less".
-w3m can display images in both the framebuffer and the X server.
+w3m is a World Wide Web (WWW) text based client.
+
+Help is avaliable in English, German and Japanese.  There is an
+option menu which can be configured for the chosen lanugage.
+
+It will display hypertext markup language (HTML) documents containing
+links to files residing on the local system, as well as files
+residing on remote systems. It can display HTML tables, frames, and
+images, and supports tabbed browsing. In addition, it can be used as
+a "pager" in much the same manner as "more" or "less".  w3m can
+display images in both the framebuffer, incertain consoles, and the X
+server.
+
+Supported consoles for image display are urxvt (rxvt-unicode) and
+termite (via a patch), including inside screen (untested with tmux).
 
 Optional dependency: compface
+
+SlackBuild Options:
+
+To disable mouse support pass NOMOUSE=1 to the slackbuild.
+To disable w3mmailer pass NOMAILER=1 to the slackbuild.
+To set the GUI browser pass the desired browser as GUIBROWSER.
+
+EG:
+
+NOMOUSE=1 ./w3m.SlackBuild
+NOMAILER=1 ./w3m.SlackBuild
+GUIBROWSER=/usr/bin/qutebrowser ./w3m.SlackBuild
+
+Or combine any of them together. By default the GUI browser is set to
+/usr/bin/firefox.
diff --git a/network/w3m/slack-desc b/network/w3m/slack-desc
index edffc81c92..65665208b5 100644
--- a/network/w3m/slack-desc
+++ b/network/w3m/slack-desc
@@ -8,12 +8,12 @@
    |-----handy-ruler------------------------------------------------------|
 w3m: w3m (text based web browser and pager)
 w3m:
-w3m: w3m is a World Wide Web (WWW) text based client. It has English and
-w3m: Japanese help files and an option menu and can be configured to use
-w3m: either language. It will display hypertext markup language (HTML)
-w3m: documents containing links to files residing on the local system, as
-w3m: well as files residing on remote systems. It can display HTML tables,
-w3m: frames, and images, and supports tabbed browsing. In addition, it can
-w3m: be used as a "pager" in much the same manner as "more" or "less".
+w3m: w3m is a World Wide Web (WWW) text based client. It has English,
+w3m: German and  Japanese help files and an option menu that can be
+w3m: configured to use  the preferred language. It will display hypertext
+w3m: markup language (HTML) documents containing links to files
+w3m: residing on the local system, as well as files residing on remote
+w3m: systems. It can display HTML tables, frames, and images, and
+w3m: supports tabbed browsing.
 w3m:
 w3m: Homepage: http://w3m.sourceforge.net
diff --git a/network/w3m/w3m.SlackBuild b/network/w3m/w3m.SlackBuild
index 9dcb7e96b2..c6175eed32 100644
--- a/network/w3m/w3m.SlackBuild
+++ b/network/w3m/w3m.SlackBuild
@@ -19,14 +19,16 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by David Woodfall <dave@dawoodfall.net>
+
 PRGNAM=w3m
-VERSION=${VERSION:-0.5.3}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-git20170104}
+BUILD=${BUILD:-1}
 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
@@ -37,8 +39,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"
@@ -51,7 +53,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="ChangeLog NEWS doc/*"
+DOCS="ChangeLog NEWS doc* ABOUT-NLS README TODO"
 
 set -e
 
@@ -68,14 +70,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Thanks go to gentoo for these patches
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
+[ -n "$NOMOUSE" ] && mouse="--disable-mouse"
+[ -n "$NOMAILER" ] && mailer="--disable-w3mmailer"
+[ -n "$GUIBROWSER" ] && browser="--with-browser=$GUIBROWSER"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+	--libexecdir=/usr/libexec \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -83,8 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-image=x11,fb \
   --enable-keymap=w3m \
   --enable-gopher \
-  --with-imagelib=imlib2 \
-  --with-termlib=ncurses \
+  --with-imagelib="gtk2 gdk-pixbuf imlib2" \
+  --with-termlib="terminfo ncurses" \
+	$mouse \
+	$mailer \
+	$browser \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/network/w3m/w3m.info b/network/w3m/w3m.info
index 4012816c12..7623fe8dcb 100644
--- a/network/w3m/w3m.info
+++ b/network/w3m/w3m.info
@@ -1,10 +1,10 @@
 PRGNAM="w3m"
-VERSION="0.5.3"
+VERSION="git20170104"
 HOMEPAGE="http://w3m.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/w3m/w3m-0.5.3.tar.gz"
-MD5SUM="1b845a983a50b8dec0169ac48479eacc"
+DOWNLOAD="http://unrealize.co.uk/source/w3m-git20170104.tar.gz"
+MD5SUM="c97079ea18a90919227a74cc465f9c9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"
-MAINTAINER="Grigorios Bouzakis"
-EMAIL="grbzks@imap.cc"
+MAINTAINER="David Woodfall"
+EMAIL="dave@dawoodfall.net"