1 files changed, 165 insertions, 47 deletions

diff --git a/www/surfraw/pkg-plist b/www/surfraw/pkg-plist
index 5658fa5933e0..09990c637ee7 100644
--- a/www/surfraw/pkg-plist
+++ b/www/surfraw/pkg-plist
@@ -1,50 +1,168 @@
-@comment $FreeBSD$
-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/netbsd
-bin/openbsd
-bin/pubmed
-bin/raging
-bin/rhyme
-bin/scaleplus
-bin/slashdot
-bin/slinuxdoc
-bin/sourceforge
-bin/stockquote
-bin/sundocs
-bin/sunsolve
+bin/opensearch-discover
+bin/opensearch-genquery
+bin/sr
 bin/surfraw
-bin/swhois
-bin/thesaurus
-bin/translate
-bin/webster
-bin/wetandwild
-bin/woffle
-bin/xxx
-bin/yahoo
-@unexec if cmp -s %D/etc/surfraw.conf %D/share/examples/surfraw/surfraw.conf; then rm -f %D/etc/surfraw.conf; fi
+bin/surfraw-update-path
+etc/surfraw.bookmarks
+etc/surfraw.conf
+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/sr.1.gz
+man/man1/W.1.gz
+man/man1/alioth.1sr.gz
+man/man1/altavista.1sr.gz
+man/man1/amazon.1sr.gz
+man/man1/archpkg.1sr.gz
+man/man1/ask.1sr.gz
+man/man1/austlii.1sr.gz
+man/man1/bbcnews.1sr.gz
+man/man1/cddb.1sr.gz
+man/man1/cite.1sr.gz
+man/man1/cia.1sr.gz
+man/man1/cnn.1sr.gz
+man/man1/codesearch.1sr.gz
+man/man1/ctan.1sr.gz
+man/man1/currency.1sr.gz
+man/man1/cve.1sr.gz
+man/man1/debbugs.1sr.gz
+man/man1/debcontents.1sr.gz
+man/man1/deblists.1sr.gz
+man/man1/deblogs.1sr.gz
+man/man1/debpackages.1sr.gz
+man/man1/debpts.1sr.gz
+man/man1/debsec.1sr.gz
+man/man1/debwiki.1sr.gz
+man/man1/deja.1sr.gz
+man/man1/discogs.1sr.gz
+man/man1/dmoz.1sr.gz
+man/man1/ebay.1sr.gz
+man/man1/etym.1sr.gz
+man/man1/excite.1sr.gz
+man/man1/fast.1sr.gz
+man/man1/filesearching.1sr.gz
+man/man1/imdb.1sr.gz
+man/man1/foldoc.1sr.gz
+man/man1/freebsd.1sr.gz
+man/man1/freedb.1sr.gz
+man/man1/freshmeat.1sr.gz
+man/man1/fsfdir.1sr.gz
+man/man1/genpkg.1sr.gz
+man/man1/google.1sr.gz
+man/man1/gutenberg.1sr.gz
+man/man1/happypenguin.1sr.gz
+man/man1/ixquick.1sr.gz
+man/man1/lastfm.1sr.gz
+man/man1/leodict.1sr.gz
+man/man1/musicbrainz.1sr.gz
+man/man1/netbsd.1sr.gz
+man/man1/openbsd.1sr.gz
+man/man1/pgpkeys.1sr.gz
+man/man1/port.1sr.gz
+man/man1/pubmed.1sr.gz
+man/man1/rae.1sr.gz
+man/man1/rfc.1sr.gz
+man/man1/rhyme.1sr.gz
+man/man1/scaleplus.1sr.gz
+man/man1/scholar.1sr.gz
+man/man1/scpan.1sr.gz
+man/man1/slashdot.1sr.gz
+man/man1/slinuxdoc.1sr.gz
+man/man1/sourceforge.1sr.gz
+man/man1/stockquote.1sr.gz
+man/man1/sundocs.1sr.gz
+man/man1/sunsolve.1sr.gz
+man/man1/thesaurus.1sr.gz
+man/man1/translate.1sr.gz
+man/man1/w3css.1sr.gz
+man/man1/w3html.1sr.gz
+man/man1/w3link.1sr.gz
+man/man1/w3rdf.1sr.gz
+man/man1/wayback.1sr.gz
+man/man1/webster.1sr.gz
+man/man1/wetandwild.1sr.gz
+man/man1/wikipedia.1sr.gz
+man/man1/woffle.1sr.gz
+man/man1/xxx.1sr.gz
+man/man1/yahoo.1sr.gz
+man/man1/yubnub.1sr.gz
+man/man1/opensearch.1sr.gz
 share/examples/surfraw/surfraw.conf
-share/surfraw/surfraw_elvi.list
+@unexec if cmp -s %D/etc/surfraw.conf %D/share/examples/surfraw/surfraw.conf; then rm -f %D/etc/surfraw.conf; fi
 @dirrm share/examples/surfraw
-@dirrm share/surfraw
+@dirrm lib/surfraw