4 files changed, 47 insertions, 29 deletions
diff --git a/network/w3m/README b/network/w3m/README
index 6fe3b43392..9ec92d4162 100644
--- a/network/w3m/README
+++ b/network/w3m/README
@@ -5,9 +5,6 @@ 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".
-This buildscript includes some security and bug fix patches. However
-the actual stable version of w3m is more than 3 years old. You should
-not use it as your default browser, it is only here as an optional
-dependency for SuperCollider.
+w3m can display images in both the framebuffer and the X server.
 
-This requires gc.
+This requires gc and imlib2.
diff --git a/network/w3m/slack-desc b/network/w3m/slack-desc
index a99ba2add1..09ec9fd663 100644
--- a/network/w3m/slack-desc
+++ b/network/w3m/slack-desc
@@ -5,8 +5,8 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-   |-----handy-ruler--------------------------------------------------------|
-w3m: w3m (text-mode browser)
+   |-----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
@@ -16,4 +16,4 @@ 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: Homepage: http://w3m.sourceforge.net/
+w3m: Homepage: http://w3m.sourceforge.net
diff --git a/network/w3m/w3m.SlackBuild b/network/w3m/w3m.SlackBuild
index 63475804f9..801a3d3131 100644
--- a/network/w3m/w3m.SlackBuild
+++ b/network/w3m/w3m.SlackBuild
@@ -1,20 +1,33 @@
 #!/bin/sh
-
 # Slackware build script for w3m
-# Written by slakmagik <jsun@freeshell.org>
-# Released under the WTFPL
+
+# Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc>
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without fee is hereby granted, provided that the above copyright
+# notice and this permission notice appear in all copies.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
+# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS 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=w3m
-VERSION=0.5.3
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.5.3}
+BUILD=${BUILD:-2}
 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
@@ -38,6 +51,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="ChangeLog NEWS doc/*"
+
 set -e
 
 rm -rf $PKG
@@ -48,32 +63,38 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 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 {} \;
+ \( -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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-keymap=lynx \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-image=x11,fb \
+  --enable-keymap=w3m \
   --enable-gopher \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --with-imagelib=imlib2 \
+  --with-termlib=ncurses \
+  --build=$ARCH-slackware-linux
 
 make
-make DESTDIR=$PKG install
+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
 
 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
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [ACNT]* doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/w3m/w3m.info b/network/w3m/w3m.info
index 09251d436f..3448b0c0e9 100644
--- a/network/w3m/w3m.info
+++ b/network/w3m/w3m.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/w3m/w3m-0.5.3.tar.gz"
 MD5SUM="1b845a983a50b8dec0169ac48479eacc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Felix Pfeifer"
-EMAIL="pfeifer[dot]felix[at]googlemail[dot]com"
-APPROVED="dsomero"
+MAINTAINER="Grigorios Bouzakis"
+EMAIL="grbzks@imap.cc"
+APPROVED="rworkman"