3 files changed, 7 insertions, 127 deletions

diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 9b019b3bfb76..1c160da199e2 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	surfraw
 PORTVERSION=	2.2.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
@@ -9,7 +10,10 @@ MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Command line interface to popular WWW search engines
 
 GNU_CONFIGURE=	yes
-USES=		perl5 gmake
+USES=		gmake perl5 shebangfix
+SHEBANG_FILES=	opensearch-discover \
+		opensearch-genquery \
+		surfraw-update-path.IN
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} '\|xdg/surfraw|d' ${WRKSRC}/Makefile.in
@@ -25,11 +29,6 @@ post-install:
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/surfraw
 .for f in surfraw.bookmarks surfraw.conf
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/etc/${f}.sample
-	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/${f} ]; then \
-		${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/${f}.sample \
-			${STAGEDIR}${PREFIX}/etc/${f}; \
-	fi
 .endfor
 
-.include "${.CURDIR}/manpages"
 .include <bsd.port.mk>
diff --git a/www/surfraw/manpages b/www/surfraw/manpages
deleted file mode 100644
index 87239bc87e28..000000000000
--- a/www/surfraw/manpages
+++ /dev/null
@@ -1,113 +0,0 @@
-MLINKS= \
-elvi.1sr W.1 \
-elvi.1sr acronym.1sr \
-elvi.1sr ads.1sr \
-elvi.1sr alioth.1sr \
-elvi.1sr amazon.1sr \
-elvi.1sr archpkg.1sr \
-elvi.1sr archwiki.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 bugzilla.1sr \
-elvi.1sr cablesearch.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 deli.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 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 openports.1sr \
-elvi.1sr opensearch.1sr \
-elvi.1sr pasearch.1sr \
-elvi.1sr pgpkeys.1sr \
-elvi.1sr piratebay.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 scirus.1sr \
-elvi.1sr scitopia.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 stack.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 worldwidescience.1sr \
-elvi.1sr yahoo.1sr \
-elvi.1sr yandex.1sr \
-elvi.1sr youtube.1sr \
-elvi.1sr yubnub.1sr \
-surfraw.1 sr.1
diff --git a/www/surfraw/pkg-plist b/www/surfraw/pkg-plist
index 036ae857fbed..addba73b527f 100644
--- a/www/surfraw/pkg-plist
+++ b/www/surfraw/pkg-plist
@@ -5,12 +5,8 @@ bin/surfraw
 bin/surfraw-update-path
 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
+@sample etc/surfraw.bookmarks.sample
+@sample etc/surfraw.conf.sample
 lib/surfraw/W
 lib/surfraw/acronym
 lib/surfraw/ads
@@ -257,5 +253,3 @@ man/man1/yahoo.1sr.gz
 man/man1/yandex.1sr.gz
 man/man1/youtube.1sr.gz
 man/man1/yubnub.1sr.gz
-@dirrmtry etc/bash_completion.d
-@dirrm lib/surfraw