5 files changed, 56 insertions, 225 deletions

diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 153dcee5f8e2..2d92c9ed59c5 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	surfraw
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.7
 CATEGORIES=	www
 MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
@@ -16,15 +16,31 @@ 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
+	${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' \
+		-e 's/^function[[:space:]]//' \
+		${WRKSRC}/examples/uzbl_load_url_from_surfraw.IN
 
 post-install:
-	${MKDIR} ${PREFIX}/share/examples/surfraw
-	${INSTALL_DATA} ${WRKSRC}/surfraw.conf ${PREFIX}/share/examples/surfraw
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/uzbl_load_url_from_surfraw \
+		${PREFIX}/bin
+	${MKDIR} ${PREFIX}/etc/bash_completion.d
+	${INSTALL_DATA} ${WRKSRC}/surfraw-bash-completion \
+		${PREFIX}/etc/bash_completion.d/surfraw
+.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>
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index 8b10fe33fdc7..97511b0a02ea 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -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
diff --git a/www/surfraw/pkg-deinstall b/www/surfraw/pkg-deinstall
deleted file mode 100644
index 521f2bff7ef8..000000000000
--- a/www/surfraw/pkg-deinstall
+++ /dev/null
@@ -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
diff --git a/www/surfraw/pkg-install b/www/surfraw/pkg-install
deleted file mode 100644
index b6ecbf0e7c0d..000000000000
--- a/www/surfraw/pkg-install
+++ /dev/null
@@ -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
diff --git a/www/surfraw/pkg-plist b/www/surfraw/pkg-plist
index e57ed01bcaef..e42e823a4a7a 100644
--- a/www/surfraw/pkg-plist
+++ b/www/surfraw/pkg-plist
@@ -3,9 +3,16 @@ bin/opensearch-genquery
 bin/sr
 bin/surfraw
 bin/surfraw-update-path
-etc/surfraw.bookmarks
-etc/surfraw.conf
+bin/uzbl_load_url_from_surfraw
+etc/bash_completion.d/surfraw
+@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 +22,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 +40,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 +89,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 +113,7 @@ 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
+@dirrmtry etc/bash_completion.d
 @dirrm lib/surfraw