Update to 2.2.3:

Sat Sep 13 20:40:01 BST 2008  - surfraw 2.2.3

  * Surfraw now defaults to graphical mode. See surfraw(1)
    for how to change the default back.
  * Search for default browsers during build.
    This can be overridden by passing --with-text-browser=BROWSER
    and --with-graphical-browser=BROWSER to ./configure.
  * New elvis: piratebay, genportage. Thanks to J.R. Mauro.
  * Detect which awk to use.
  * Fixed slinuxdoc and webster.
  * Removed bashisms.
  * Fixed uninstall.
  * Add --disable-sr option to ./configure to disable installing the
    'sr' symbolic link, to avoid clashes with the SR programming language.

9 files changed, 16 insertions, 93 deletions

diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 9e73ee953ce..2487608003b 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2008/08/22 13:50:50 is Exp $
+# $NetBSD: Makefile,v 1.39 2008/10/09 09:45:43 wiz Exp $
 #
 
-DISTNAME=	surfraw-2.2.2
-PKGREVISION=	1
+DISTNAME=	surfraw-2.2.3
 CATEGORIES=	www
 MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
@@ -14,6 +13,7 @@ CONFLICTS+=	surfaw-[0-9]*
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--disable-sr
 USE_TOOLS+=		gmake perl sed
 REPLACE_PERL+=		surfraw-update-path.IN opensearch-discover \
 			opensearch-genquery
diff --git a/www/surfraw/PLIST b/www/surfraw/PLIST
index e401c2da79a..e0729d0be9a 100644
--- a/www/surfraw/PLIST
+++ b/www/surfraw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2008/08/22 13:50:51 is Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/10/09 09:45:43 wiz Exp $
 bin/opensearch-discover
 bin/opensearch-genquery
 bin/surfraw
@@ -42,6 +42,7 @@ lib/surfraw/freedb
 lib/surfraw/freshmeat
 lib/surfraw/fsfdir
 lib/surfraw/genpkg
+lib/surfraw/genportage
 lib/surfraw/google
 lib/surfraw/gutenberg
 lib/surfraw/happypenguin
@@ -56,6 +57,7 @@ lib/surfraw/netbsd
 lib/surfraw/openbsd
 lib/surfraw/opensearch
 lib/surfraw/pgpkeys
+lib/surfraw/piratebay
 lib/surfraw/port
 lib/surfraw/pubmed
 lib/surfraw/rae
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index a0b9b7ca016..e6a5b937f7c 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.12 2008/08/22 13:50:51 is Exp $
+$NetBSD: distinfo,v 1.13 2008/10/09 09:45:43 wiz Exp $
 
-SHA1 (surfraw-2.2.2.tar.gz) = 1f2786564fb0f6b4cc3bbe3d54e9a2af6ef6dec6
-RMD160 (surfraw-2.2.2.tar.gz) = 189fcc69c0a1938cfec48f6657da14828bbc168c
-Size (surfraw-2.2.2.tar.gz) = 133596 bytes
-SHA1 (patch-ab) = a7e99d56668caab338996a20d65d08c7bfb48c27
-SHA1 (patch-ac) = c3d83a595a1c175532dd10b2eb8375f0af875d9d
-SHA1 (patch-ad) = b3e9c83fedaf8b72563a75e4faeb69542124b475
-SHA1 (patch-ae) = ce53ae464ea01344240d530016b93bc0a4f9c9da
-SHA1 (patch-af) = cf9a5abeded87609ce47024a18c0572b39ba48b9
-SHA1 (patch-ag) = 0d9c55af4cefb3707fb90d38c113d2abf10de264
+SHA1 (surfraw-2.2.3.tar.gz) = a991d099c72812e545f9bb36b9cab68c82211b6c
+RMD160 (surfraw-2.2.3.tar.gz) = 7480077d4e28a1763d9de3e0c3c6f7c58c8cd239
+Size (surfraw-2.2.3.tar.gz) = 135919 bytes
+SHA1 (patch-ab) = 25560169f13c1a635ee0bd59760a9ecec58eea6c
diff --git a/www/surfraw/patches/patch-ab b/www/surfraw/patches/patch-ab
index 418d3036f3e..3d3bde08727 100644
--- a/www/surfraw/patches/patch-ab
+++ b/www/surfraw/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2007/10/27 11:25:30 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2008/10/09 09:45:43 wiz Exp $
 
---- Makefile.in.orig	2007-09-14 09:51:42.000000000 +0000
+--- Makefile.in.orig	2008-09-14 12:37:57.000000000 +0000
 +++ Makefile.in
-@@ -747,7 +747,6 @@ install-data-hook: links
+@@ -757,7 +757,6 @@ install-data-hook: links
  	do \
  		ln -sf $$target  $(DESTDIR)/$$link ;\
  	done < links
 -@OPENSEARCH_TRUE@	ln -sf elvi.1sr.gz $(DESTDIR)/@mandir@/man1/opensearch.1sr.gz
+ @INSTALLSR_TRUE@	ln -sf surfraw $(DESTDIR)/@bindir@/sr
+ @INSTALLSR_TRUE@	ln -sf surfraw.1.gz $(DESTDIR)/@mandir@/man1/sr.1.gz
  
- submit-lsm: surfraw.lsm
- 	mail -s add LSM@qqx.org < $<
diff --git a/www/surfraw/patches/patch-ac b/www/surfraw/patches/patch-ac
deleted file mode 100644
index fdeb0ab4588..00000000000
--- a/www/surfraw/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/07/30 10:21:27 drochner Exp $
-
---- elvi/google.orig	2008-07-08 21:42:02.000000000 +0200
-+++ elvi/google
-@@ -53,7 +53,7 @@ w3_parse_args "$@"
- # w3_args now contains a list of arguments
- 
- # Use SURFRAW_lang if present and the country has not been changed
--if test -n "$SURFRAW_lang" -a "$SURFRAW_google_country" == "us"; then
-+if test -n "$SURFRAW_lang" -a "$SURFRAW_google_country" = "us"; then
-     SURFRAW_google_country=$SURFRAW_lang;
- fi
- 
diff --git a/www/surfraw/patches/patch-ad b/www/surfraw/patches/patch-ad
deleted file mode 100644
index 78a96dd844e..00000000000
--- a/www/surfraw/patches/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/08/22 13:50:51 is Exp $
-
---- links.IN.orig	2008-06-16 13:05:06.000000000 +0000
-+++ links.IN
-@@ -1,5 +1,3 @@
--surfraw @bindir@/sr
--surfraw.1.gz @mandir@/man1/sr.1.gz
- elvi.1sr.gz @mandir@/man1/W.1.gz
- elvi.1sr.gz @mandir@/man1/alioth.1sr.gz
- elvi.1sr.gz @mandir@/man1/altavista.1sr.gz
diff --git a/www/surfraw/patches/patch-ae b/www/surfraw/patches/patch-ae
deleted file mode 100644
index e7ab510ebdd..00000000000
--- a/www/surfraw/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/08/22 13:50:51 is Exp $
-
---- surfraw.1.IN.orig	2008-02-14 05:37:39.000000000 +0100
-+++ surfraw.1.IN
-@@ -21,9 +21,6 @@ surfraw \- a fast unix command line inte
- .B surfraw
- .I elviname [options]  search words ...
- .br
--.B sr
--.I elviname  [options]  search words ...
--.br
- .B sr \-elvi
- .br
- .B sr
-@@ -46,10 +43,6 @@ To see the list of elvi type:
- 
-  surfraw \-elvi
- 
--Note that sr is an alias for surfraw, so that could equally be
--
-- sr \-elvi
--
- To search using an elvis use:
- 
-  sr elviname [options] search terms..
diff --git a/www/surfraw/patches/patch-af b/www/surfraw/patches/patch-af
deleted file mode 100644
index 4e096b5c06a..00000000000
--- a/www/surfraw/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/08/22 13:50:51 is Exp $
-
---- elvi.1sr.IN.orig	2008-02-14 04:37:39.000000000 +0000
-+++ elvi.1sr.IN
-@@ -23,9 +23,6 @@ elvi \- surfraw(1) search tools
- .I elviname [options]  search words ...
- .br
- .B sr
--.I elviname  [options]  search words ...
--.br
--.B sr
- .I elviname
- \-help
- .br
diff --git a/www/surfraw/patches/patch-ag b/www/surfraw/patches/patch-ag
deleted file mode 100644
index cbd3f784284..00000000000
--- a/www/surfraw/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/08/22 13:50:51 is Exp $
-
---- surfraw.IN.orig	2008-07-03 00:22:43.000000000 +0000
-+++ surfraw.IN
-@@ -355,7 +355,6 @@ Usage: $w3_argv0 [-help] [-elvi] elvis [
- Options:
-    -elvi  List elvi
-    -help  This help
--sr is an alias for surfraw
- EOF
- 	w3_global_usage
- }