Update to 2.2.8:

Tue Jul 12 00:46:02 BST 2011  - surfraw 2.2.8

        * New elvi:
	  + ads - search the SAO/NASA Astrophysics data system.
	  + archwiki: search the arch wiki.
	  + bugzilla - search various bugzillas, defaults to kernel.
	  + cablesearch - search wikileaks cables
	  + deli: search delicious.com.
	  + duckduckgo - replace with better implementation
	  + openports - search openbsd ports
	  + pasearch - search Penny Arcade archives.
	  + scirus, scitopia, worldwidescience - science searches
	  + stack: search stackoverflow.com and friends.
	  + yandex - russian web search.
	* Changed elvi:
	  + archpkg: now supports options.
	  + arxiv: quote queries for exact string matches.
	  + ctan: Option -doc replaced by -id. Options no longer mutually
	    exclusive.
	  + codesearch, musicbrainz, rpmsearch: rewritten to match new
	    site. Options have changed to match site, see help message.
	  + debbugs: add -s as an alias for -search=src.
	  + google: new options:
	    * -v, -search=video: search video
	    * -m, -search=maps: search maps
	    * -n, -search=news: search news
	    * -i: new shortcut for -search=images
	    * -safe=default|off|moderate|strict: safe search
	  + openbsd: support -misc and -tech.
	  + opensearch: new option -r, uses remote redirector
	    which means it can run without heavy dependencies.
	  + pgpkeys: add more options, support more keyservers,
	    default to sks-keyservers.net.
	  + translate: added Google Translate support.
	  + wayback: advanced search is broken, rip out all
	    options and use basic search.
	  + wikipedia: new option -d, uses remote redirector
	    to search both wikipedia and deletionpedia.
	    use -fallback=wikipedia|deletionpedia to customise
	    behaviour.
	* Fixed elvi: archpkg, arxiv, cia, codesearch, ctan, javasun,
	  lastfm, musicbrainz, netbsd, rpmsearch, w3link, yahoo.
	* Removed elvi:
	  + altavista: is now just a front-end to yahoo. RIP.
	  + cddb: gracenote made the "hard decision" to remove the
	    website search. sigh.
	  + fast: another yahoo front-end.
	  + filesearching: refuses to work without 'Referer:' header.
	  + port: site gone
	* Support -local-help, --local-help or -lh to get elvi-specific
	  help without displaying the global options. This works for
	  all elvi and the main surfraw script.
	* Support -h as a synonym for -help.
	* Improved listing of elvi.
	* Default to surfraw_graphical_remote=no,
	  as chromium doesn't support "-remote openURL".
	* Bookmark names are now an exact match not a substring match.
	* Support BSD/POSIX make.
	* README: added INTEGRATION section on uzbl and pentadactyl.

4 files changed, 26 insertions, 22 deletions

diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 66f59a33418..2fce268b37a 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2010/05/09 20:53:15 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2011/08/06 10:43:25 wiz Exp $
 #
 
-DISTNAME=	surfraw-2.2.7
+DISTNAME=	surfraw-2.2.8
 CATEGORIES=	www
 MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--disable-sr
-USE_TOOLS+=		gmake perl sed
+USE_TOOLS+=		perl sed
 REPLACE_PERL+=		surfraw-update-path.IN opensearch-discover \
 			opensearch-genquery
 
diff --git a/www/surfraw/PLIST b/www/surfraw/PLIST
index ba399ec2eec..260adf0d524 100644
--- a/www/surfraw/PLIST
+++ b/www/surfraw/PLIST
@@ -1,14 +1,15 @@
-@comment $NetBSD: PLIST,v 1.15 2010/12/30 14:12:45 obache Exp $
+@comment $NetBSD: PLIST,v 1.16 2011/08/06 10:43:25 wiz Exp $
 bin/opensearch-discover
 bin/opensearch-genquery
 bin/surfraw
 bin/surfraw-update-path
 lib/surfraw/W
 lib/surfraw/acronym
+lib/surfraw/ads
 lib/surfraw/alioth
-lib/surfraw/altavista
 lib/surfraw/amazon
 lib/surfraw/archpkg
+lib/surfraw/archwiki
 lib/surfraw/arxiv
 lib/surfraw/ask
 lib/surfraw/aur
@@ -17,7 +18,8 @@ lib/surfraw/bbcnews
 lib/surfraw/bing
 lib/surfraw/bookfinder
 lib/surfraw/bugmenot
-lib/surfraw/cddb
+lib/surfraw/bugzilla
+lib/surfraw/cablesearch
 lib/surfraw/cia
 lib/surfraw/cite
 lib/surfraw/cliki
@@ -38,14 +40,13 @@ lib/surfraw/debsec
 lib/surfraw/debvcsbrowse
 lib/surfraw/debwiki
 lib/surfraw/deja
+lib/surfraw/deli
 lib/surfraw/discogs
 lib/surfraw/dmoz
 lib/surfraw/duckduckgo
 lib/surfraw/ebay
 lib/surfraw/etym
 lib/surfraw/excite
-lib/surfraw/fast
-lib/surfraw/filesearching
 lib/surfraw/finkpkg
 lib/surfraw/foldoc
 lib/surfraw/freebsd
@@ -73,10 +74,11 @@ lib/surfraw/musicbrainz
 lib/surfraw/netbsd
 lib/surfraw/ntrs
 lib/surfraw/openbsd
+lib/surfraw/openports
 lib/surfraw/opensearch
+lib/surfraw/pasearch
 lib/surfraw/pgpkeys
 lib/surfraw/piratebay
-lib/surfraw/port
 lib/surfraw/pubmed
 lib/surfraw/rae
 lib/surfraw/rfc
@@ -84,12 +86,15 @@ lib/surfraw/rhyme
 lib/surfraw/rpmsearch
 lib/surfraw/scholar
 lib/surfraw/scicom
+lib/surfraw/scirus
+lib/surfraw/scitopia
 lib/surfraw/scpan
 lib/surfraw/scroogle
 lib/surfraw/slashdot
 lib/surfraw/slinuxdoc
 lib/surfraw/sourceforge
 lib/surfraw/springer
+lib/surfraw/stack
 lib/surfraw/stockquote
 lib/surfraw/sunonesearch
 lib/surfraw/thesaurus
@@ -104,7 +109,9 @@ lib/surfraw/webster
 lib/surfraw/wetandwild
 lib/surfraw/wikipedia
 lib/surfraw/woffle
+lib/surfraw/worldwidescience
 lib/surfraw/yahoo
+lib/surfraw/yandex
 lib/surfraw/youtube
 lib/surfraw/yubnub
 man/man1/elvi.1
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index 8f572bd8f32..4b348ff2549 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2010/05/09 20:53:15 wiz Exp $
+$NetBSD: distinfo,v 1.18 2011/08/06 10:43:25 wiz Exp $
 
-SHA1 (surfraw-2.2.7.tar.gz) = 18f7db3b85f6c8af784338b9af66bf84d9d33443
-RMD160 (surfraw-2.2.7.tar.gz) = aaab07dd942ad7fa0885d362132bc7db6d87b59c
-Size (surfraw-2.2.7.tar.gz) = 169771 bytes
-SHA1 (patch-ab) = 9a5b276b82a4605ca0edf898b9e810b8fa85b6a8
+SHA1 (surfraw-2.2.8.tar.gz) = 3114cd6e8d64f87b84ed0eff4369bfb0b10f2eb6
+RMD160 (surfraw-2.2.8.tar.gz) = 77f8f625946fb76665c9e4834506ce4e45f1cd4f
+Size (surfraw-2.2.8.tar.gz) = 183019 bytes
+SHA1 (patch-Makefile.in) = d29e62b200c4f97d9ce2b4dc9b288599edd6e001
diff --git a/www/surfraw/patches/patch-ab b/www/surfraw/patches/patch-Makefile.in
index c7a867784b8..ed9f1fa9bea 100644
--- a/www/surfraw/patches/patch-ab
+++ b/www/surfraw/patches/patch-Makefile.in
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2010/05/09 20:53:15 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.1 2011/08/06 10:43:26 wiz Exp $
 
---- Makefile.in.orig	2010-05-06 19:26:01.000000000 +0000
+To more easily install into share/examples.
+
+--- Makefile.in.orig	2011-07-12 00:35:20.000000000 +0000
 +++ Makefile.in
-@@ -763,14 +763,13 @@ links: links.IN
+@@ -790,9 +790,9 @@ opensearch-genquery.1: opensearch-genque
  
  install-data-hook: links
  	chmod -x surfraw.conf elvi.1sr surfraw.1
@@ -15,8 +17,3 @@ $NetBSD: patch-ab,v 1.4 2010/05/09 20:53:15 wiz Exp $
  	while read target link ;\
  	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
-