Update to 2.2.6:

Fri Nov 20 03:34:19 GMT 2009  - surfraw 2.2.6

        * New elvi:
          + by Sumant Oemrawsingh:
            * cliki        - search the common lisp wiki.
            * l1sp         - search lisp documentation.
            * mathworld    - search Wolfram MathWorld.
            * mininova     - search mininova for torrents.
            * youtube      - search youtube for videos.
          + by fittabile@lifegate.it:
            * acronym      - find acronyms
            * gcache       - search google cache.
          + by Nick White:
            * genbugs      - search gentoo bug tracker
          + by Ian Beckwith:
            * debpkghome   - view home page of a debian package.
            * debvcsbrowse - browse vcs of a debian package
            * rpmsearch    - search for packages in rpm-based distros.
            * finkpkg      - search Fink packages.
            * macports     - search macports packages.
        * Move config files to follow XDG basedir spec
	  This means that if your global config was in /etc/surfraw.conf
	  it is now in /etc/xdg/surfraw/conf, and local config is
	  now in $HOME/.config/surfraw/conf. The same applies to bookmarks.
	  See README for details on configuring config locations, and
	  http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html
	  for the gory details. The old locations are still supported for
	  backwards-compatibility.
        * Support per-user elvi in $HOME/.config/surfraw/elvi/
          Patch by James Rowe, idea by Sumant Oemrawsingh.
        * Added -o | -o=FILE option, to fetch URL and dump to
          stdout or FILE.
        * Modified elvi:
          + freebsd: new options -psearch=TYPE -psection=SEC
            to conduct a search of type TYPE in section SEC of ports.
          + netbsd:  new option -ps to search ports
          + openbsd: new option -ps to search ports
          + debsec: fixed (Thanks to Moritz Muehlenhoff, for this
            and all his other work).
          + cia: fixed.
        * Added examples/uzbl_load_url_from_surfraw, to integrate surfraw
          with uzbl (uzbl.org), thanks to Sumant Oemrawsingh.

4 files changed, 40 insertions, 17 deletions

diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index b834118c438..94e66704867 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2009/06/06 22:07:43 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2009/11/26 15:22:55 wiz Exp $
 #
 
-DISTNAME=	surfraw-2.2.5
+DISTNAME=	surfraw-2.2.6
 CATEGORIES=	www
 MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
@@ -25,9 +25,9 @@ DOCDIR=			${PREFIX}/share/doc/surfraw
 EGDIR=			${PREFIX}/share/examples/surfraw
 INSTALLATION_DIRS=	${DOCDIR}
 INSTALL_MAKE_FLAGS=	sysconfdir=${EGDIR}
-
-CONF_FILES=		${EGDIR}/surfraw.conf ${PKG_SYSCONFDIR}/surfraw.conf
-CONF_FILES+=		${EGDIR}/surfraw.bookmarks ${PKG_SYSCONFDIR}/surfraw.bookmarks
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/xdg/surfraw
+CONF_FILES=		${EGDIR}/xdg/surfraw/conf ${PKG_SYSCONFDIR}/xdg/surfraw/conf
+CONF_FILES+=		${EGDIR}/xdg/surfraw/bookmarks ${PKG_SYSCONFDIR}/xdg/surfraw/bookmarks
 
 # avoid installing useless manpage links
 post-patch:
diff --git a/www/surfraw/PLIST b/www/surfraw/PLIST
index 07460630b63..b0309d59557 100644
--- a/www/surfraw/PLIST
+++ b/www/surfraw/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 22:00:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/11/26 15:22:55 wiz Exp $
 bin/opensearch-discover
 bin/opensearch-genquery
 bin/surfraw
 bin/surfraw-update-path
 lib/surfraw/W
+lib/surfraw/acronym
 lib/surfraw/alioth
 lib/surfraw/altavista
 lib/surfraw/amazon
@@ -16,6 +17,7 @@ lib/surfraw/bbcnews
 lib/surfraw/cddb
 lib/surfraw/cia
 lib/surfraw/cite
+lib/surfraw/cliki
 lib/surfraw/cnn
 lib/surfraw/codesearch
 lib/surfraw/comlaw
@@ -27,8 +29,10 @@ lib/surfraw/debcontents
 lib/surfraw/deblists
 lib/surfraw/deblogs
 lib/surfraw/debpackages
+lib/surfraw/debpkghome
 lib/surfraw/debpts
 lib/surfraw/debsec
+lib/surfraw/debvcsbrowse
 lib/surfraw/debwiki
 lib/surfraw/deja
 lib/surfraw/discogs
@@ -38,11 +42,14 @@ lib/surfraw/etym
 lib/surfraw/excite
 lib/surfraw/fast
 lib/surfraw/filesearching
+lib/surfraw/finkpkg
 lib/surfraw/foldoc
 lib/surfraw/freebsd
 lib/surfraw/freedb
 lib/surfraw/freshmeat
 lib/surfraw/fsfdir
+lib/surfraw/gcache
+lib/surfraw/genbugs
 lib/surfraw/genpkg
 lib/surfraw/genportage
 lib/surfraw/google
@@ -51,11 +58,15 @@ lib/surfraw/happypenguin
 lib/surfraw/imdb
 lib/surfraw/ixquick
 lib/surfraw/javasun
+lib/surfraw/l1sp
 lib/surfraw/lastfm
 lib/surfraw/leodict
 lib/surfraw/lsm
+lib/surfraw/macports
+lib/surfraw/mathworld
+lib/surfraw/mininova
 lib/surfraw/musicbrainz
-lib/surfraw/netbsd
+lib/surfraw/${LOWER_OPSYS}
 lib/surfraw/ntrs
 lib/surfraw/openbsd
 lib/surfraw/opensearch
@@ -66,6 +77,7 @@ lib/surfraw/pubmed
 lib/surfraw/rae
 lib/surfraw/rfc
 lib/surfraw/rhyme
+lib/surfraw/rpmsearch
 lib/surfraw/scholar
 lib/surfraw/scicom
 lib/surfraw/scpan
@@ -88,6 +100,7 @@ lib/surfraw/wetandwild
 lib/surfraw/wikipedia
 lib/surfraw/woffle
 lib/surfraw/yahoo
+lib/surfraw/youtube
 lib/surfraw/yubnub
 man/man1/elvi.1
 man/man1/opensearch-discover.1
@@ -95,5 +108,5 @@ man/man1/opensearch-genquery.1
 man/man1/surfraw-update-path.1
 man/man1/surfraw.1
 share/doc/surfraw/README
-share/examples/surfraw/surfraw.bookmarks
-share/examples/surfraw/surfraw.conf
+share/examples/surfraw/xdg/surfraw/bookmarks
+share/examples/surfraw/xdg/surfraw/conf
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index 799e3e9bbf5..a4c4e102158 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2009/06/06 22:07:43 wiz Exp $
+$NetBSD: distinfo,v 1.16 2009/11/26 15:22:55 wiz Exp $
 
-SHA1 (surfraw-2.2.5.tar.gz) = 3da861c0a98a9d197e84a8995bc286ca4b885d62
-RMD160 (surfraw-2.2.5.tar.gz) = ff7c0ee495374400d205f684c3cf7b78fdbfcc77
-Size (surfraw-2.2.5.tar.gz) = 148858 bytes
-SHA1 (patch-ab) = 25560169f13c1a635ee0bd59760a9ecec58eea6c
+SHA1 (surfraw-2.2.6.tar.gz) = d6326e3092bc11506987ae29db344fbd27502b84
+RMD160 (surfraw-2.2.6.tar.gz) = fa046e26057fdacbac7d1f1502bef9cafed030c4
+Size (surfraw-2.2.6.tar.gz) = 165105 bytes
+SHA1 (patch-ab) = befdb0e07f79274d4fb15953380e346af565ad60
diff --git a/www/surfraw/patches/patch-ab b/www/surfraw/patches/patch-ab
index 3d3bde08727..9551998af19 100644
--- a/www/surfraw/patches/patch-ab
+++ b/www/surfraw/patches/patch-ab
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.2 2008/10/09 09:45:43 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2009/11/26 15:22:55 wiz Exp $
 
---- Makefile.in.orig	2008-09-14 12:37:57.000000000 +0000
+--- Makefile.in.orig	2009-11-20 04:38:11.000000000 +0000
 +++ Makefile.in
-@@ -757,7 +757,6 @@ install-data-hook: links
+@@ -861,14 +861,13 @@ links: links.IN
+ 
+ install-data-hook: links surfraw.conf
+ 	chmod -x surfraw.conf elvi.1sr surfraw.1
+-	mkdir -p $(DESTDIR)@sysconfdir@/xdg/surfraw
+-	cp surfraw.conf $(DESTDIR)@sysconfdir@/xdg/surfraw/conf
+-	cp $(top_srcdir)/surfraw.bookmarks $(DESTDIR)@sysconfdir@/xdg/surfraw/bookmarks
++	mkdir -p $(DESTDIR)${sysconfdir}/xdg/surfraw
++	cp surfraw.conf $(DESTDIR)${sysconfdir}/xdg/surfraw/conf
++	cp $(top_srcdir)/surfraw.bookmarks $(DESTDIR)${sysconfdir}/xdg/surfraw/bookmarks
+ 	while read target link ;\
  	do \
  		ln -sf $$target  $(DESTDIR)/$$link ;\
  	done < links