Index: www/surfraw/Makefile
===================================================================
RCS file: /a/.cvsup/ports/www/surfraw/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- www/surfraw/Makefile	14 May 2009 08:45:36 -0000	1.21
+++ www/surfraw/Makefile	25 May 2010 20:35:54 -0000
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/www/surfraw/Makefile,v 1.21 2009/05/14 08:45:36 jadawin Exp $
 
 PORTNAME=	surfraw
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.7
 CATEGORIES=	www
 MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
@@ -16,15 +16,23 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 
-MAN1=	surfraw-update-path.1 \
-	surfraw.1 \
-	elvi.1sr \
+MAN1=	elvi.1sr \
 	opensearch-discover.1 \
-	opensearch-genquery.1
+	opensearch-genquery.1 \
+	surfraw-update-path.1 \
+	surfraw.1
+
+post-patch:	.SILENT
+	${REINPLACE_CMD} '\|xdg/surfraw|d' ${WRKSRC}/Makefile.in
 
 post-install:
-	${MKDIR} ${PREFIX}/share/examples/surfraw
-	${INSTALL_DATA} ${WRKSRC}/surfraw.conf ${PREFIX}/share/examples/surfraw
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.for f in surfraw.bookmarks surfraw.conf
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/etc/${f}.sample
+	@if [ ! -f ${PREFIX}/etc/${f} ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/${f}.sample \
+			${PREFIX}/etc/${f}; \
+	fi
+.endfor
 
+.include "${.CURDIR}/manpages"
 .include <bsd.port.mk>
Index: www/surfraw/distinfo
===================================================================
RCS file: /a/.cvsup/ports/www/surfraw/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- www/surfraw/distinfo	14 May 2009 08:45:36 -0000	1.14
+++ www/surfraw/distinfo	25 May 2010 19:25:44 -0000
@@ -1,3 +1,3 @@
-MD5 (surfraw-2.2.5.tar.gz) = e33fb6fe23b1ff60095a103272500672
-SHA256 (surfraw-2.2.5.tar.gz) = d5e05b60fa20265e17330bd178a7d47c678a6d5e308dbcb584c2a618cee4afcb
-SIZE (surfraw-2.2.5.tar.gz) = 148858
+MD5 (surfraw-2.2.7.tar.gz) = 213010e9b7c8478827e8903530cf7787
+SHA256 (surfraw-2.2.7.tar.gz) = 1f23e08210ba04d874e825e6bbbdb23e669cf9c0804388ba0fdd0fd535995fcb
+SIZE (surfraw-2.2.7.tar.gz) = 169771
Index: www/surfraw/manpages
===================================================================
RCS file: www/surfraw/manpages
diff -N www/surfraw/manpages
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/surfraw/manpages	25 May 2010 19:41:58 -0000
@@ -0,0 +1,106 @@
+MLINKS= \
+elvi.1sr W.1 \
+elvi.1sr acronym.1sr \
+elvi.1sr alioth.1sr \
+elvi.1sr altavista.1sr \
+elvi.1sr amazon.1sr \
+elvi.1sr archpkg.1sr \
+elvi.1sr arxiv.1sr \
+elvi.1sr ask.1sr \
+elvi.1sr aur.1sr \
+elvi.1sr austlii.1sr \
+elvi.1sr bbcnews.1sr \
+elvi.1sr bing.1sr \
+elvi.1sr bookfinder.1sr \
+elvi.1sr bugmenot.1sr \
+elvi.1sr cddb.1sr \
+elvi.1sr cia.1sr \
+elvi.1sr cite.1sr \
+elvi.1sr cliki.1sr \
+elvi.1sr cnn.1sr \
+elvi.1sr codesearch.1sr \
+elvi.1sr comlaw.1sr \
+elvi.1sr ctan.1sr \
+elvi.1sr currency.1sr \
+elvi.1sr cve.1sr \
+elvi.1sr debbugs.1sr \
+elvi.1sr debcontents.1sr \
+elvi.1sr deblists.1sr \
+elvi.1sr deblogs.1sr \
+elvi.1sr debpackages.1sr \
+elvi.1sr debpkghome.1sr \
+elvi.1sr debpts.1sr \
+elvi.1sr debsec.1sr \
+elvi.1sr debvcsbrowse.1sr \
+elvi.1sr debwiki.1sr \
+elvi.1sr deja.1sr \
+elvi.1sr discogs.1sr \
+elvi.1sr dmoz.1sr \
+elvi.1sr duckduckgo.1sr \
+elvi.1sr ebay.1sr \
+elvi.1sr etym.1sr \
+elvi.1sr excite.1sr \
+elvi.1sr fast.1sr \
+elvi.1sr filesearching.1sr \
+elvi.1sr finkpkg.1sr \
+elvi.1sr foldoc.1sr \
+elvi.1sr freebsd.1sr \
+elvi.1sr freedb.1sr \
+elvi.1sr freshmeat.1sr \
+elvi.1sr fsfdir.1sr \
+elvi.1sr gcache.1sr \
+elvi.1sr genbugs.1sr \
+elvi.1sr genportage.1sr \
+elvi.1sr google.1sr \
+elvi.1sr gutenberg.1sr \
+elvi.1sr happypenguin.1sr \
+elvi.1sr imdb.1sr \
+elvi.1sr ixquick.1sr \
+elvi.1sr jamendo.1sr \
+elvi.1sr javasun.1sr \
+elvi.1sr l1sp.1sr \
+elvi.1sr lastfm.1sr \
+elvi.1sr leodict.1sr \
+elvi.1sr lsm.1sr \
+elvi.1sr macports.1sr \
+elvi.1sr mathworld.1sr \
+elvi.1sr mininova.1sr \
+elvi.1sr musicbrainz.1sr \
+elvi.1sr netbsd.1sr \
+elvi.1sr ntrs.1sr \
+elvi.1sr openbsd.1sr \
+elvi.1sr opensearch.1sr \
+elvi.1sr pgpkeys.1sr \
+elvi.1sr piratebay.1sr \
+elvi.1sr port.1sr \
+elvi.1sr pubmed.1sr \
+elvi.1sr rae.1sr \
+elvi.1sr rfc.1sr \
+elvi.1sr rhyme.1sr \
+elvi.1sr rpmsearch.1sr \
+elvi.1sr scholar.1sr \
+elvi.1sr scicom.1sr \
+elvi.1sr scpan.1sr \
+elvi.1sr scroogle.1sr \
+elvi.1sr slashdot.1sr \
+elvi.1sr slinuxdoc.1sr \
+elvi.1sr sourceforge.1sr \
+elvi.1sr springer.1sr \
+elvi.1sr stockquote.1sr \
+elvi.1sr sunonesearch.1sr \
+elvi.1sr thesaurus.1sr \
+elvi.1sr translate.1sr \
+elvi.1sr urban.1sr \
+elvi.1sr w3css.1sr \
+elvi.1sr w3html.1sr \
+elvi.1sr w3link.1sr \
+elvi.1sr w3rdf.1sr \
+elvi.1sr wayback.1sr \
+elvi.1sr webster.1sr \
+elvi.1sr wetandwild.1sr \
+elvi.1sr wikipedia.1sr \
+elvi.1sr woffle.1sr \
+elvi.1sr yahoo.1sr \
+elvi.1sr youtube.1sr \
+elvi.1sr yubnub.1sr \
+surfraw.1 sr.1
Index: www/surfraw/pkg-deinstall
===================================================================
RCS file: www/surfraw/pkg-deinstall
diff -N www/surfraw/pkg-deinstall
--- www/surfraw/pkg-deinstall	4 Aug 2001 05:41:37 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# De-installation setup of surfraw
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=${PREFIX}/etc/surfraw.conf
-
-# Function: tell the user what they need to do to delete the port completely
-#
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| these steps as root:"
-    echo "|"
-    echo "|       rm -f ${CONFIG_FILE}"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo
-}
-
-# Verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    DEINSTALL)
-        : nothing to deinstall for this port
-	;;
-    POST-DEINSTALL)
-	if [ -f ${CONFIG_FILE} ]; then
-	    do_notice "$1"
-	fi
-        ;;
-    *)
-	echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
Index: www/surfraw/pkg-install
===================================================================
RCS file: www/surfraw/pkg-install
diff -N www/surfraw/pkg-install
--- www/surfraw/pkg-install	17 Sep 2000 19:05:58 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-# Pre/post-installation setup of surfraw
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=${PREFIX}/etc/surfraw.conf
-SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/surfraw
-
-# Function: tell the user what they need to do to use the port just installed
-#
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| The existing $1 configuration file, ${CONFIG_FILE},"
-    echo "| has NOT been changed.  You may want to compare it to the"
-    echo "| current sample files in ${SAMPLE_CONFIG_DIR}"
-    echo "| and update your configuration as needed."
-    echo "+---------------"
-    echo
-}
-
-# Function: install configuration files
-#
-do_install()
-{
-    install -c -o root -g wheel ${SAMPLE_CONFIG_DIR}/surfraw.conf ${CONFIG_FILE}
-    echo
-    echo "+---------------"
-    echo "| The $1 configuration file, ${CONFIG_FILE},"
-    echo "| has been installed.  Please view this file and change"
-    echo "| the configuration to meet your needs"
-    echo "+---------------"
-    echo
-}
-
-# Verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	if [ -f ${CONFIG_FILE} ]; then
-	    do_notice "$1"
-	else
-	    do_install "$1"
-	fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
Index: www/surfraw/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/www/surfraw/pkg-plist,v
retrieving revision 1.12
diff -u -p -r1.12 pkg-plist
--- www/surfraw/pkg-plist	14 May 2009 08:45:36 -0000	1.12
+++ www/surfraw/pkg-plist	25 May 2010 21:01:08 -0000
@@ -3,9 +3,14 @@ bin/opensearch-genquery
 bin/sr
 bin/surfraw
 bin/surfraw-update-path
-etc/surfraw.bookmarks
-etc/surfraw.conf
+@unexec if cmp -s %D/etc/surfraw.bookmarks.sample %D/etc/surfraw.bookmarks; then rm -f %D/etc/surfraw.bookmarks; fi
+etc/surfraw.bookmarks.sample
+@exec if [ ! -f %B/surfraw.bookmarks ]; then cp -p %D/%F %B/surfraw.bookmarks; fi
+@unexec if cmp -s %D/etc/surfraw.conf.sample %D/etc/surfraw.conf; then rm -f %D/etc/surfraw.conf; fi
+etc/surfraw.conf.sample
+@exec if [ ! -f %B/surfraw.conf ]; then cp -p %D/%F %B/surfraw.conf; fi
 lib/surfraw/W
+lib/surfraw/acronym
 lib/surfraw/alioth
 lib/surfraw/altavista
 lib/surfraw/amazon
@@ -15,9 +20,13 @@ lib/surfraw/ask
 lib/surfraw/aur
 lib/surfraw/austlii
 lib/surfraw/bbcnews
+lib/surfraw/bing
+lib/surfraw/bookfinder
+lib/surfraw/bugmenot
 lib/surfraw/cddb
 lib/surfraw/cia
 lib/surfraw/cite
+lib/surfraw/cliki
 lib/surfraw/cnn
 lib/surfraw/codesearch
 lib/surfraw/comlaw
@@ -29,33 +38,43 @@ 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
 lib/surfraw/dmoz
+lib/surfraw/duckduckgo
 lib/surfraw/ebay
 lib/surfraw/etym
 lib/surfraw/excite
 lib/surfraw/fast
 lib/surfraw/filesearching
-lib/surfraw/lsm
+lib/surfraw/finkpkg
 lib/surfraw/foldoc
 lib/surfraw/freebsd
 lib/surfraw/freedb
 lib/surfraw/freshmeat
 lib/surfraw/fsfdir
-lib/surfraw/genpkg
+lib/surfraw/gcache
+lib/surfraw/genbugs
 lib/surfraw/genportage
 lib/surfraw/google
 lib/surfraw/gutenberg
 lib/surfraw/happypenguin
 lib/surfraw/imdb
 lib/surfraw/ixquick
+lib/surfraw/jamendo
 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/ntrs
@@ -68,9 +87,11 @@ lib/surfraw/pubmed
 lib/surfraw/rae
 lib/surfraw/rfc
 lib/surfraw/rhyme
+lib/surfraw/rpmsearch
 lib/surfraw/scholar
 lib/surfraw/scicom
 lib/surfraw/scpan
+lib/surfraw/scroogle
 lib/surfraw/slashdot
 lib/surfraw/slinuxdoc
 lib/surfraw/sourceforge
@@ -90,95 +111,6 @@ lib/surfraw/wetandwild
 lib/surfraw/wikipedia
 lib/surfraw/woffle
 lib/surfraw/yahoo
+lib/surfraw/youtube
 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/aur.1sr.gz
-man/man1/arxiv.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/comlaw.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/genportage.1sr.gz
-man/man1/google.1sr.gz
-man/man1/gutenberg.1sr.gz
-man/man1/happypenguin.1sr.gz
-man/man1/ixquick.1sr.gz
-man/man1/javasun.1sr.gz
-man/man1/lastfm.1sr.gz
-man/man1/leodict.1sr.gz
-man/man1/lsm.1sr.gz
-man/man1/musicbrainz.1sr.gz
-man/man1/netbsd.1sr.gz
-man/man1/ntrs.1sr.gz
-man/man1/openbsd.1sr.gz
-man/man1/pgpkeys.1sr.gz
-man/man1/piratebay.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/scholar.1sr.gz
-man/man1/scpan.1sr.gz
-man/man1/scicom.1sr.gz
-man/man1/slashdot.1sr.gz
-man/man1/slinuxdoc.1sr.gz
-man/man1/sourceforge.1sr.gz
-man/man1/stockquote.1sr.gz
-man/man1/sunonesearch.1sr.gz
-man/man1/springer.1sr.gz
-man/man1/thesaurus.1sr.gz
-man/man1/translate.1sr.gz
-man/man1/urban.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/yahoo.1sr.gz
-man/man1/yubnub.1sr.gz
-man/man1/opensearch.1sr.gz
-share/examples/surfraw/surfraw.conf
-@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 lib/surfraw