Update to 2.2.9:

Tue Dec 10 15:49:46 GMT 2013  - surfraw 2.2.9

        * New elvi:
          + S - search using w3_custom_search (see below)
          + cisco - search Cisco documentation
          + debcodesearch - search Debian codebase
          + github - search github
          + gmane - search mailing lists
          + jquery - search jQuery documentation
          + mdn - search Mozilla Developer Network
          + mysqldoc - search MySQL documentation
          + oraclesearch - search Oracle documentation
          + pgdoc - search PostgreSQL documentation
          + phpdoc - search PHP documentation
          + pin - search pinboard.in
          + wolfram - search Wolfram Alpha
          + yacy - search YaCy P2P search engines, including ScienceNet
        * Changed elvi:
          + aur - uses HTTPS by default, use -no-https to disable
          + deblists
            * Removed options -author, -lists, -lang
            * added options -ml (message links) and -mv (list view)
          + duckduckgo:
            * removed -p (clashes with global print option), use -safe instead
            * stopped -l[ucky] from clobbering -lh
          + google: changed -g option to -G to avoid clash with -g for graphical view
        * Fixed elvi: ask, ctan, deli, genportage, jamendo, javasun, openbsd
          musicbrainz, rae, slashdot, slinuxdoc
        * Removed elvi for dead sites: happypenguin, scroogle, sunonesearch (replaced by oraclesearch)
        * w3_custom_search
          + elvi that use a search engine as a backend with site: and inurl:
            can now choose which search engine to use.
            So far, google and duckduckgo are supported, with duckduckgo the default.
          + Affected elvi: mdn, mysqldoc, netbsd, openbsd, pgdoc, slinuxdoc
          + To select on the commandline use -custom-search=google or -custom-search=duckduckgo
          + Or configure SURFRAW_customsearch_provider
        * New variable: SURFRAW_bookmark_search_elvis
	  When using searchable bookmarks, if all else fails run this elvis.
          Defaults to google
        * New example elinks integration script in examples/hooks.lua.
        * Debian packaging now included in release, in debian/ dir.
        * Known problems at time of release
          + deblogs - down (hopefully) temporarily
          + yacy - demo portal down, ScienceNet still up
          + scicom - down, status unknown

3 files changed, 23 insertions, 15 deletions

diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 6594b940303..1b3a2fc3c1d 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2013/10/18 07:01:46 apb Exp $
-#
+# $NetBSD: Makefile,v 1.50 2013/12/31 17:39:48 wiz Exp $
 
-DISTNAME=	surfraw-2.2.8
-PKGREVISION=	3
+DISTNAME=	surfraw-2.2.9
 CATEGORIES=	www
 MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
diff --git a/www/surfraw/PLIST b/www/surfraw/PLIST
index 260adf0d524..a17e9bb4a2a 100644
--- a/www/surfraw/PLIST
+++ b/www/surfraw/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.16 2011/08/06 10:43:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2013/12/31 17:39:48 wiz Exp $
 bin/opensearch-discover
 bin/opensearch-genquery
 bin/surfraw
 bin/surfraw-update-path
+lib/surfraw/S
 lib/surfraw/W
 lib/surfraw/acronym
 lib/surfraw/ads
@@ -21,15 +22,16 @@ lib/surfraw/bugmenot
 lib/surfraw/bugzilla
 lib/surfraw/cablesearch
 lib/surfraw/cia
+lib/surfraw/cisco
 lib/surfraw/cite
 lib/surfraw/cliki
 lib/surfraw/cnn
-lib/surfraw/codesearch
 lib/surfraw/comlaw
 lib/surfraw/ctan
 lib/surfraw/currency
 lib/surfraw/cve
 lib/surfraw/debbugs
+lib/surfraw/debcodesearch
 lib/surfraw/debcontents
 lib/surfraw/deblists
 lib/surfraw/deblogs
@@ -47,6 +49,7 @@ lib/surfraw/duckduckgo
 lib/surfraw/ebay
 lib/surfraw/etym
 lib/surfraw/excite
+lib/surfraw/f5
 lib/surfraw/finkpkg
 lib/surfraw/foldoc
 lib/surfraw/freebsd
@@ -56,29 +59,38 @@ lib/surfraw/fsfdir
 lib/surfraw/gcache
 lib/surfraw/genbugs
 lib/surfraw/genportage
+lib/surfraw/github
+lib/surfraw/gmane
 lib/surfraw/google
 lib/surfraw/gutenberg
-lib/surfraw/happypenguin
 lib/surfraw/imdb
 lib/surfraw/ixquick
 lib/surfraw/jamendo
 lib/surfraw/javasun
+lib/surfraw/jquery
 lib/surfraw/l1sp
 lib/surfraw/lastfm
 lib/surfraw/leodict
 lib/surfraw/lsm
 lib/surfraw/macports
 lib/surfraw/mathworld
+lib/surfraw/mdn
 lib/surfraw/mininova
 lib/surfraw/musicbrainz
+lib/surfraw/mysqldoc
 lib/surfraw/netbsd
 lib/surfraw/ntrs
 lib/surfraw/openbsd
 lib/surfraw/openports
 lib/surfraw/opensearch
+lib/surfraw/oraclesearch
 lib/surfraw/pasearch
+lib/surfraw/pgdoc
 lib/surfraw/pgpkeys
+lib/surfraw/phpdoc
+lib/surfraw/pin
 lib/surfraw/piratebay
+lib/surfraw/priberam
 lib/surfraw/pubmed
 lib/surfraw/rae
 lib/surfraw/rfc
@@ -87,16 +99,13 @@ 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
 lib/surfraw/translate
 lib/surfraw/urban
@@ -109,7 +118,9 @@ lib/surfraw/webster
 lib/surfraw/wetandwild
 lib/surfraw/wikipedia
 lib/surfraw/woffle
+lib/surfraw/wolfram
 lib/surfraw/worldwidescience
+lib/surfraw/yacy
 lib/surfraw/yahoo
 lib/surfraw/yandex
 lib/surfraw/youtube
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index 7bfad0694a9..49f239f1cc9 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.19 2013/10/18 07:01:46 apb Exp $
+$NetBSD: distinfo,v 1.20 2013/12/31 17:39:48 wiz Exp $
 
-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 (surfraw-2.2.9.tar.gz) = 70bbba44ffc3b1bf7c7c4e0e9f0bdd656698a1c0
+RMD160 (surfraw-2.2.9.tar.gz) = 27bddd2f133a48f9215fc30bdf4891c70751bc5c
+Size (surfraw-2.2.9.tar.gz) = 200042 bytes
 SHA1 (patch-Makefile.in) = d29e62b200c4f97d9ce2b4dc9b288599edd6e001
-SHA1 (patch-elvi_netbsd) = 48e79dd6c8fccd5a4868dddb9305af87510018df