network/surfraw: Updated for version 2.2.7.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

5 files changed, 67 insertions, 42 deletions

diff --git a/network/surfraw/README b/network/surfraw/README
index de5bad4eb4..566eb4be76 100644
--- a/network/surfraw/README
+++ b/network/surfraw/README
@@ -1,6 +1,23 @@
+        ______  _     _  ______   _______  ______   _______  _  _  _                                                                                                                                             
+       / _____)(_)   (_)(_____ \ (_______)(_____ \ (_______)(_)(_)(_)                                                                                                                                            
+      ( (____   _     _  _____) ) _____    _____) ) _______  _  _  _                                                                                                                                             
+       \____ \ | |   | ||  __  / |  ___)  |  __  / |  ___  || || || |                                                                                                                                            
+       _____) )| |___| || |  \ \ | |      | |  \ \ | |   | || || || |                                                                                                                                            
+      (______/  \_____/ |_|   |_||_|      |_|   |_||_|   |_| \_____/
+
+Surfraw - Shell Users' Revolutionary Front Rage Against the Web
+
 Surfraw provides a fast unix command line interface to a variety of
 popular WWW search engines and other artifacts of power. It reclaims
 google, altavista, babelfish, dejanews, freshmeat, research index,
-slashdot and many others from the false-prophet, pox-infested heathen
+slashdot, and many others from the false-prophet, pox-infested heathen
 lands of html-forms, placing these wonders where they belong, deep in
 unix heartland, as god loving extensions to the shell.
+
+The script uses a configure switch in order to enable the opensearch elvi.
+If you want to use it run it with OPENSEARCH=true in which case libwww-perl
+is a dependency.
+
+Mind that the global configuration files in /etc/xdg/surfraw ALWAYS get higher
+priority than per user ones in $HOME/.config/surfraw if they are present, so
+it might be preferable editing them instead of copying them to your $HOME.
diff --git a/network/surfraw/doinst.sh b/network/surfraw/doinst.sh
index 929af44196..d2006abcfa 100644
--- a/network/surfraw/doinst.sh
+++ b/network/surfraw/doinst.sh
@@ -11,6 +11,6 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/surfraw.conf.new
-config etc/surfraw_elvi.list.new
+config etc/xdg/surfraw/conf.new
+config etc/xdg/surfraw/bookmarks.new
 
diff --git a/network/surfraw/slack-desc b/network/surfraw/slack-desc
index 71585f3660..58372f6f18 100644
--- a/network/surfraw/slack-desc
+++ b/network/surfraw/slack-desc
@@ -15,5 +15,5 @@ surfraw: slashdot and many others from the false-prophet, pox-infested heathen
 surfraw: lands of html-forms, placing these wonders where they belong, deep in
 surfraw: unix heartland, as god loving extensions to the shell.
 surfraw:
-surfraw:
+surfraw: Homepage: http://surfraw.alioth.debian.org
 surfraw:
diff --git a/network/surfraw/surfraw.SlackBuild b/network/surfraw/surfraw.SlackBuild
index 9c9bb55137..27a3d02668 100644
--- a/network/surfraw/surfraw.SlackBuild
+++ b/network/surfraw/surfraw.SlackBuild
@@ -1,40 +1,34 @@
 #!/bin/sh
-
 # Slackware build script for surfraw
 
 # Copyright 2007 Martin Lefebvre <dadexter@slackadelic.com>
+# Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
 # All rights reserved.
 #
-# 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.
+# 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 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.
-
-# Modified by the SlackBuilds.org project
+# 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=surfraw
-VERSION=1.0.7
+VERSION=${VERSION:-2.2.7}
 BUILD=${BUILD:-1}
 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
@@ -58,16 +52,30 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO"
+
+OPENSEARCH=${OPENSEARCH:-false}
+
+if [ "${OPENSEARCH}" = "true" ] ; then
+  OPENSEARCH_ARGS="--enable-opensearch"
+  else
+  OPENSEARCH_ARGS="--disable-opensearch"
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -77,26 +85,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  ${OPENSEARCH_ARGS} \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO banner \
-	$PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/etc/xdg/surfraw/conf $PKG/etc/xdg/surfraw/conf.new
+mv $PKG/etc/xdg/surfraw/bookmarks $PKG/etc/xdg/surfraw/bookmarks.new
+
+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
 
+mkdir -p $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
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Rename new config files to .new
-for file in $PKG/etc/*; do
-	mv ${file} ${file}.new
-done
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/surfraw/surfraw.info b/network/surfraw/surfraw.info
index fd9415e6ef..ed9110438c 100644
--- a/network/surfraw/surfraw.info
+++ b/network/surfraw/surfraw.info
@@ -1,10 +1,10 @@
 PRGNAM="surfraw"
-VERSION="1.0.7"
-HOMEPAGE="http://surfraw.sf.net"
-DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/surfraw-1.0.7.tar.gz"
-MD5SUM="0957382bbdebf3d678879fa5d2592c9d"
+VERSION="2.2.7"
+HOMEPAGE="http://surfraw.alioth.debian.org/"
+DOWNLOAD="http://surfraw.alioth.debian.org/dist/surfraw-2.2.7.tar.gz"
+MD5SUM="213010e9b7c8478827e8903530cf7787"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Martin Lefebvre"
-EMAIL="dadexter@gmail.com"
+MAINTAINER="Grigorios Bouzakis"
+EMAIL="grbzks@xsmail.com"
 APPROVED="rworkman"