summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/surfraw/README18
-rw-r--r--network/surfraw/doinst.sh4
-rw-r--r--network/surfraw/surfraw.SlackBuild48
-rw-r--r--network/surfraw/surfraw.info8
4 files changed, 23 insertions, 55 deletions
diff --git a/network/surfraw/README b/network/surfraw/README
index 566eb4be76..42584a87c9 100644
--- a/network/surfraw/README
+++ b/network/surfraw/README
@@ -1,8 +1,8 @@
- ______ _ _ ______ _______ ______ _______ _ _ _
- / _____)(_) (_)(_____ \ (_______)(_____ \ (_______)(_)(_)(_)
- ( (____ _ _ _____) ) _____ _____) ) _______ _ _ _
- \____ \ | | | || __ / | ___) | __ / | ___ || || || |
- _____) )| |___| || | \ \ | | | | \ \ | | | || || || |
+ ______ _ _ ______ _______ ______ _______ _ _ _
+ / _____)(_) (_)(_____ \ (_______)(_____ \ (_______)(_)(_)(_)
+ ( (____ _ _ _____) ) _____ _____) ) _______ _ _ _
+ \____ \ | | | || __ / | ___) | __ / | ___ || || || |
+ _____) )| |___| || | \ \ | | | | \ \ | | | || || || |
(______/ \_____/ |_| |_||_| |_| |_||_| |_| \_____/
Surfraw - Shell Users' Revolutionary Front Rage Against the Web
@@ -13,11 +13,3 @@ google, altavista, babelfish, dejanews, freshmeat, research index,
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 d2006abcfa..0499224741 100644
--- a/network/surfraw/doinst.sh
+++ b/network/surfraw/doinst.sh
@@ -1,10 +1,10 @@
config() {
NEW="$1"
- OLD="`dirname $NEW`/`basename $NEW .new`"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
# If there's no config file by that name, mv it over:
if [ ! -r $OLD ]; then
mv $NEW $OLD
- elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
# toss the redundant copy
rm $NEW
fi
diff --git a/network/surfraw/surfraw.SlackBuild b/network/surfraw/surfraw.SlackBuild
index 47859c9500..78ef71a85b 100644
--- a/network/surfraw/surfraw.SlackBuild
+++ b/network/surfraw/surfraw.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for surfraw
# Copyright 2007 Martin Lefebvre <dadexter@slackadelic.com>
-# Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
+# Copyright 2010-2011 Grigorios Bouzakis <grbzks@xsmail.com>
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for any purpose
@@ -21,47 +21,19 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=surfraw
-VERSION=${VERSION:-2.2.7}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.2.8}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
+ARCH=noarch
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-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"
-else
- SLKCFLAGS="-O2"
- 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
@@ -77,16 +49,17 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+# fix man page symlinking
+sed -i 's,\.gz,,g' links.IN
+
./configure \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
- ${OPENSEARCH_ARGS} \
+ --disable-opensearch \
+ --with-elvidir=/usr/share/surfraw \
--build=$ARCH-slackware-linux
make
@@ -95,6 +68,9 @@ make install DESTDIR=$PKG
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
diff --git a/network/surfraw/surfraw.info b/network/surfraw/surfraw.info
index ed9110438c..f8524ef4bb 100644
--- a/network/surfraw/surfraw.info
+++ b/network/surfraw/surfraw.info
@@ -1,10 +1,10 @@
PRGNAM="surfraw"
-VERSION="2.2.7"
+VERSION="2.2.8"
HOMEPAGE="http://surfraw.alioth.debian.org/"
-DOWNLOAD="http://surfraw.alioth.debian.org/dist/surfraw-2.2.7.tar.gz"
-MD5SUM="213010e9b7c8478827e8903530cf7787"
+DOWNLOAD="http://surfraw.alioth.debian.org/dist/surfraw-2.2.8.tar.gz"
+MD5SUM="e0f571f7a2d109555c26bdb40781a3f2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Grigorios Bouzakis"
EMAIL="grbzks@xsmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"