Update to 2.2.0:

Thu Sep  6 21:59:35 BST 2007 - surfraw 2.1.7

  * Resumed making upstream releases.
    Surfraw is now maintained by the Debian Surfraw-Devel Team. Please
    report bugs to <surfraw-devel@lists.alioth.debian.org>, and feel
    free to join us on the list.

    There have been many changes since the last official release.

    New elvi: alioth archpkg bbcnews cddb cia codesearch ctan cve
    	      deblists deblogs debpts debsec debwiki discogs dmoz ebay
    	      etym foldoc freedb fsfdir genpkg gutenberg happypenguin
    	      imdb ixquick lastfm leodict musicbrainz opensearch
    	      pgpkeys port rae rfc scholar scpan w3css w3html w3link
    	      w3rdf wayback wikipedia yubnub

    Removed elvi: appwatch britannica ftpfind ftpsearch jake
    	    	  raging swhois

    Elvi now live in ${PREFIX}/lib/surfraw
    Use surfraw-update-path to add this directory to your path or
    prefix elvi with sr or surfraw, eg "sr google foo bar".

    Bookmarks can be defined in /etc/surfraw.bookmarks or
    ~/.surfraw.bookmarks. See /etc/surfraw.bookmarks for the format.
    Bookmarks can be used with "sr [options] bookmarkname".

    There is now a test suite. "make test" to run it or
    see test/README.

    For a full list of changes since the last release, see
    debian/changelog. From this release onwards, changes will be
    logged in ./ChangeLog as normal.

Tur Mar 30 01:21:03 CEST 2004 - surfraw 2.0.2

  * Added bash completion support by Justin B Rye
  * Do not set $DISPLAY when running in text mode
  * Removed sharereactor elvi

Tue Feb 10 04:01:40 GMT 2004 - surfraw 2.0.1

Please note that the elvi have moved again, to /usr/lib/surfraw

If you used surfraw-update-path from version 2.0 to add the elvi
directory to your path, you will need to run it again, first with
-remove to remove the old path, then again with -add. To change your
path you will need to either log out and in again or source the
relevant config files.

  * Moved elvi to /usr/lib/surfraw
  * Updated docs for new elvi location
  * Changed man page section for all elvi to 1sr
  * Fixed surfraw help text
  * Added man page links for pgpkeys, ebay and sharereactor
  * Added linda override (and surfraw.dirs) for usr-lib-in-arch-all
  * Added debhelper tokens to prerm/postinst
    (they were in released 2.0-1 but not CVS)
  * Rewrote man page surfraw.1.in, added man page elvi.1sr.in
    Both go via autoconf.
  * Removed old debian/surfraw.1
  * Updated debian/surfraw.links to point elvi to elvi.1sr.gz
  * Updated AUTHORS to hopefully include every contributor, ever.
  * Changed a few "def"s to "defyn"s in surfraw.conf.in
  * Fixed quoting so   sr google foo "bar baz" qux   works
  * Makefile.am: Added missing files to EXTRA_DIST
  * Added a debconf note (only visible if upgrading from 2.0-1)
    explaining the elvi have moved again
  * configure.in: changed to new AM_INIT_AUTOMAKE format,
    specified minimum automake version 1.7
  * updated surfraw.lsm with new URLs
  * deleted debian/rules.save (old rules backup)
  * Removed elvi:
    + britannica: gone subscription-only
    + swhois: all whois sites I can find have anti-harvester features
	  that stop us using them.
  * Fixed elvi:
    + wikipedia - added missing quotes (could've sworn I did this already)
    + cnn - updated url
    + translate - corrected docs
  * Moved debian/surfraw.links to links.IN in top dir, now uses autoconf
    and is not debian-specific
  * Makefile.am: Added install-data-hook to create links
  * configure.in, elvi/Makefile.in: fixed ELVIDIR quoting
  * added elvi/surfraw_elvi to CLEANFILES & removed it from cvs, as it is
    generated on build.
  * disabled ifs quoting in elvi that don't like it:
    freedb, happypenguin, jake, rhyme, scaleplus,
	sharereactor, thesaurus, webster, deblists.
  * Added note to HACKING explaining how to disable ifs quoting
  * synced NAMESPACE branch with HEAD
    Please use the main HEAD branch from now on.
  * links.IN: made links relative
  * Converted debconf to po-debconf
  * Eliminated templates.IN, as it confused po-debconf
  * Deautoconfiscated the debian directory, as only templates went through
    autoconf

Tue Dec 23 03:19:58 GMT 2003 - surfraw 2.0

New development team, see http://alioth.debian.org/projects/surfraw

  * Moved elvi to /usr/bin/surfraw-elvi. (Closes: #209155, #192869, #201175)
  * Provided surfraw-update-path to put new dir in path.
  * Added sr as alias to surfraw.
  * Added bookmark support and /etc/surfraw.bookmarks.
  * New elvi: alioth, rfc, scpan, deblists. (Closes: #134498)
    plus leodict and happypenguin by Moritz Muehlenhoff (Closes: #217799)
    and wikipedia, also by Moritz Muehlenhoff (Closes: #223953)
    and sharereactor, pgpkeys and ebay, also by Moritz Muehlenhoff
  * Fixed elvi: altavista, debcontents, excite, jake, scaleplus,
    slinuxdoc, sundocs, swhois, translate.
  * amazon: fixed test (Closes: #163903) and -country, removed tag-id stuff.
  * debcontents: changed options to SURFRAW_debcontents_*.
  * sourceforge: added -type and -exact options.
  * webster: added -t (thesaurus) option.
  * debbugs: added options.
  * Removed elvi: appwatch, ftpsearch, ftpfind, raging (sites defunct).
  * Updated Debian Standards-Version to 3.6.1.0
  * surfraw.in:
    - Applied Brian Nelson's "-remote openURL" patch (Closes: #165967).
    - Fixed browser selection (Closes: #118314).
  * google -l/-lucky support (Closes: #127078, #128544).
  * Added deja patch from Christian Garbs (Closes: #149600).
  * debian/rules: changed to use DESTDIR.
  * Force default browser to sensible-browser (Closes: #119357)
    - This supercedes NMU changes (Closes: #200164, #201229, #149584)
    - Change default browser in manpage (Closes: #113148)
  * Rename stranslate back to translate (Closes: #141243)
  * Make woffle not look for /usr/local/bin/surfraw (Closes: #156466)
  * Add lynx to Recommends (Closes: #141242)
  * Make surfraw lintian-clean
    - Remove '(s)' from copyright
    - Remove /etc conffile entries
  * Kevin Kreamer <kkreamer@etherhogz.org> did this work.
  * Easy bugs first
    - fix type in README (Closes: #154304)
    - s/README/README.gz/ in manpage (Closes: #164206)
  * Added elvi for imdb, cddb, freedb and bbcnews written by Ian Beckwith.
  * changed "Author(s)" to "Author" in debian/copyright
  * removed debian/conffiles to prevent debhelper being so incredibly
    "helpful" as to inlude conffiles *twice*

5 files changed, 146 insertions, 69 deletions

diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index c0b0603226e..6a314a822fd 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,33 +1,39 @@
-# $NetBSD: Makefile,v 1.33 2007/02/18 18:14:57 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2007/10/27 11:25:29 wiz Exp $
 #
 
-DISTNAME=	surfraw-1.0.8
+DISTNAME=	surfraw-2.2.0
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/wiz/
+MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
 MAINTAINER=	wiz@NetBSD.org
-#HOMEPAGE=	http://surfraw.sourceforge.net/
+HOMEPAGE=	http://surfraw.alioth.debian.org/
 COMMENT=	Shell Users' Revolutionary Front Rage Against the Web
 
 CONFLICTS+=	surfaw-[0-9]*
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+USE_TOOLS+=		gmake
 
-# Override sysconfdir so that the installation puts the example config file
-# in ${EGDIR}.
-#
-MAKE_FLAGS+=	sysconfdir=${EGDIR:Q}
-MAKE_ENV+=	AM_MAKEFLAGS=${MAKE_FLAGS:Q}
+DOCDIR=			${PREFIX}/share/doc/surfraw
+EGDIR=			${PREFIX}/share/examples/surfraw
+INSTALLATION_DIRS=	${DOCDIR}
+
+CONF_FILES=		${EGDIR}/surfraw.conf ${PKG_SYSCONFDIR}/surfraw.conf
+CONF_FILES+=		${EGDIR}/surfraw.bookmarks ${PKG_SYSCONFDIR}/surfraw.bookmarks
 
-DOCDIR=		${PREFIX}/share/doc/surfraw
-EGDIR=		${PREFIX}/share/examples/${PKGBASE}
+# avoid installing useless manpage links
+post-patch:
+	${MV} ${WRKSRC}/links.IN ${WRKSRC}/links.IN.orig
+	${GREP} -v elvi.1sr.gz ${WRKSRC}/links.IN.orig > ${WRKSRC}/links.IN
 
-CONF_FILES=	${EGDIR}/surfraw.conf ${PKG_SYSCONFDIR}/surfraw.conf
-CONF_FILES+=	${EGDIR}/surfraw_elvi.list ${PKG_SYSCONFDIR}/surfraw_elvi.list
+# Override installation to install config files in example dir
+do-install:
+	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_ARGS} sysconfdir=${EGDIR} install
 
+# fix man page name; install additional documentation
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${MV} ${PREFIX}/${PKGMANDIR}/man1/elvi.1sr ${PREFIX}/${PKGMANDIR}/man1/elvi.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/surfraw/PLIST b/www/surfraw/PLIST
index 72f539f86ea..67b8505f7a3 100644
--- a/www/surfraw/PLIST
+++ b/www/surfraw/PLIST
@@ -1,52 +1,96 @@
-@comment $NetBSD: PLIST,v 1.4 2007/02/18 18:14:57 wiz Exp $
-bin/W
-bin/altavista
-bin/amazon
-bin/appwatch
-bin/ask
-bin/austlii
-bin/britannica
-bin/cite
-bin/cnn
-bin/currency
-bin/debbugs
-bin/debcontents
-bin/debpackages
-bin/deja
-bin/excite
-bin/fast
-bin/filesearching
-bin/freebsd
-bin/freshmeat
-bin/ftpfind
-bin/ftpsearch
-bin/google
-bin/jake
-bin/leodict
-bin/netbsd
-bin/openbsd
-bin/pubmed
-bin/raging
-bin/rhyme
-bin/scaleplus
-bin/slashdot
-bin/slinuxdoc
-bin/sourceforge
-bin/stockquote
-bin/sundocs
-bin/sunsolve
+@comment $NetBSD: PLIST,v 1.5 2007/10/27 11:25:29 wiz Exp $
+bin/opensearch-discover
+bin/opensearch-genquery
+bin/sr
 bin/surfraw
-bin/swhois
-bin/thesaurus
-bin/translate
-bin/webster
-bin/wetandwild
-bin/wikipedia
-bin/woffle
-bin/xxx
-bin/yahoo
-share/doc/${PKGBASE}/README
-share/examples/${PKGBASE}/surfraw.conf
-share/examples/${PKGBASE}/surfraw_elvi.list
-@dirrm share/examples/${PKGBASE}
-@dirrm share/doc/${PKGBASE}
+bin/surfraw-update-path
+lib/surfraw/W
+lib/surfraw/alioth
+lib/surfraw/altavista
+lib/surfraw/amazon
+lib/surfraw/archpkg
+lib/surfraw/ask
+lib/surfraw/austlii
+lib/surfraw/bbcnews
+lib/surfraw/cddb
+lib/surfraw/cia
+lib/surfraw/cite
+lib/surfraw/cnn
+lib/surfraw/codesearch
+lib/surfraw/ctan
+lib/surfraw/currency
+lib/surfraw/cve
+lib/surfraw/debbugs
+lib/surfraw/debcontents
+lib/surfraw/deblists
+lib/surfraw/deblogs
+lib/surfraw/debpackages
+lib/surfraw/debpts
+lib/surfraw/debsec
+lib/surfraw/debwiki
+lib/surfraw/deja
+lib/surfraw/discogs
+lib/surfraw/dmoz
+lib/surfraw/ebay
+lib/surfraw/etym
+lib/surfraw/excite
+lib/surfraw/fast
+lib/surfraw/filesearching
+lib/surfraw/foldoc
+lib/surfraw/freebsd
+lib/surfraw/freedb
+lib/surfraw/freshmeat
+lib/surfraw/fsfdir
+lib/surfraw/genpkg
+lib/surfraw/google
+lib/surfraw/gutenberg
+lib/surfraw/happypenguin
+lib/surfraw/imdb
+lib/surfraw/ixquick
+lib/surfraw/lastfm
+lib/surfraw/leodict
+lib/surfraw/musicbrainz
+lib/surfraw/netbsd
+lib/surfraw/openbsd
+lib/surfraw/opensearch
+lib/surfraw/pgpkeys
+lib/surfraw/port
+lib/surfraw/pubmed
+lib/surfraw/rae
+lib/surfraw/rfc
+lib/surfraw/rhyme
+lib/surfraw/scaleplus
+lib/surfraw/scholar
+lib/surfraw/scpan
+lib/surfraw/slashdot
+lib/surfraw/slinuxdoc
+lib/surfraw/sourceforge
+lib/surfraw/stockquote
+lib/surfraw/sundocs
+lib/surfraw/sunsolve
+lib/surfraw/thesaurus
+lib/surfraw/translate
+lib/surfraw/w3css
+lib/surfraw/w3html
+lib/surfraw/w3link
+lib/surfraw/w3rdf
+lib/surfraw/wayback
+lib/surfraw/webster
+lib/surfraw/wetandwild
+lib/surfraw/wikipedia
+lib/surfraw/woffle
+lib/surfraw/xxx
+lib/surfraw/yahoo
+lib/surfraw/yubnub
+man/man1/elvi.1
+man/man1/opensearch-discover.1
+man/man1/opensearch-genquery.1
+man/man1/sr.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
+@dirrm share/examples/surfraw
+@dirrm share/doc/surfraw
+@dirrm lib/surfraw
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index ed5e507f768..8ff42d0e649 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2007/02/18 18:14:57 wiz Exp $
+$NetBSD: distinfo,v 1.8 2007/10/27 11:25:29 wiz Exp $
 
-SHA1 (surfraw-1.0.8.tar.gz) = 53a170fe878dab3f0cbc9414008023f2527c63e4
-RMD160 (surfraw-1.0.8.tar.gz) = 6596cbcc5bbba22fe97582ffdcebc28605b0d56a
-Size (surfraw-1.0.8.tar.gz) = 98170 bytes
+SHA1 (surfraw-2.2.0.tar.gz) = 508535428643c9ae98fb405f0d1770ddded04399
+RMD160 (surfraw-2.2.0.tar.gz) = 132adc8d38bd410350c2a89ffcba31df56dba0b8
+Size (surfraw-2.2.0.tar.gz) = 127765 bytes
+SHA1 (patch-aa) = 2587982fce0a6445d11ea71ba7111cf16c01444f
+SHA1 (patch-ab) = a7e99d56668caab338996a20d65d08c7bfb48c27
diff --git a/www/surfraw/patches/patch-aa b/www/surfraw/patches/patch-aa
new file mode 100644
index 00000000000..290cee400e7
--- /dev/null
+++ b/www/surfraw/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2007/10/27 11:25:29 wiz Exp $
+
+--- surfraw.IN.orig	2007-09-07 02:59:36.000000000 +0000
++++ surfraw.IN
+@@ -302,7 +302,7 @@ w3_parse_args () {
+ }
+ 
+ w3_browse_url () {
+-   if ok SURFRAW_new_screen && test -n "$STY" && test $mode == text; then
++   if ok SURFRAW_new_screen && test -n "$STY" && test $mode = text; then
+    	screen=yes
+    else
+    	screen=no
diff --git a/www/surfraw/patches/patch-ab b/www/surfraw/patches/patch-ab
new file mode 100644
index 00000000000..418d3036f3e
--- /dev/null
+++ b/www/surfraw/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2007/10/27 11:25:30 wiz Exp $
+
+--- Makefile.in.orig	2007-09-14 09:51:42.000000000 +0000
++++ Makefile.in
+@@ -747,7 +747,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
+ 
+ submit-lsm: surfraw.lsm
+ 	mail -s add LSM@qqx.org < $<