Remove alias "sr" which serves no purpose, but conflicts with the

compiler "sr" (from package lang/sr). Whoever wants an alias, should
add it in his/her shell startup script.

7 files changed, 76 insertions, 8 deletions

diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 6a22627ef28..9e73ee953ce 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2008/07/29 21:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2008/08/22 13:50:50 is Exp $
 #
 
 DISTNAME=	surfraw-2.2.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
@@ -13,7 +14,7 @@ CONFLICTS+=	surfaw-[0-9]*
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl sed
 REPLACE_PERL+=		surfraw-update-path.IN opensearch-discover \
 			opensearch-genquery
 
@@ -26,8 +27,12 @@ CONF_FILES+=		${EGDIR}/surfraw.bookmarks ${PKG_SYSCONFDIR}/surfraw.bookmarks
 
 # 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
+	-${GREP} -v elvi.1sr.gz ${WRKSRC}/links.IN > ${WRKSRC}/links.IN.new
+	${MV} ${WRKSRC}/links.IN.new ${WRKSRC}/links.IN
+	${SED} -e s/sr/surfraw/g ${WRKSRC}/surfraw.1.IN > ${WRKSRC}/surfraw.1.IN.new
+	${MV} ${WRKSRC}/surfraw.1.IN.new ${WRKSRC}/surfraw.1.IN
+	${SED} -e s/sr/surfraw/g ${WRKSRC}/elvi.1sr.IN > ${WRKSRC}/elvi.1sr.IN.new
+	${MV} ${WRKSRC}/elvi.1sr.IN.new ${WRKSRC}/elvi.1sr.IN
 
 # Override installation to install config files in example dir
 do-install:
diff --git a/www/surfraw/PLIST b/www/surfraw/PLIST
index 3bde9694fa4..e401c2da79a 100644
--- a/www/surfraw/PLIST
+++ b/www/surfraw/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2008/07/29 21:19:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/08/22 13:50:51 is Exp $
 bin/opensearch-discover
 bin/opensearch-genquery
-bin/sr
 bin/surfraw
 bin/surfraw-update-path
 lib/surfraw/W
@@ -86,7 +85,6 @@ 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
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index 8e68c89f877..a0b9b7ca016 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.11 2008/07/30 10:21:27 drochner Exp $
+$NetBSD: distinfo,v 1.12 2008/08/22 13:50:51 is Exp $
 
 SHA1 (surfraw-2.2.2.tar.gz) = 1f2786564fb0f6b4cc3bbe3d54e9a2af6ef6dec6
 RMD160 (surfraw-2.2.2.tar.gz) = 189fcc69c0a1938cfec48f6657da14828bbc168c
 Size (surfraw-2.2.2.tar.gz) = 133596 bytes
 SHA1 (patch-ab) = a7e99d56668caab338996a20d65d08c7bfb48c27
 SHA1 (patch-ac) = c3d83a595a1c175532dd10b2eb8375f0af875d9d
+SHA1 (patch-ad) = b3e9c83fedaf8b72563a75e4faeb69542124b475
+SHA1 (patch-ae) = ce53ae464ea01344240d530016b93bc0a4f9c9da
+SHA1 (patch-af) = cf9a5abeded87609ce47024a18c0572b39ba48b9
+SHA1 (patch-ag) = 0d9c55af4cefb3707fb90d38c113d2abf10de264
diff --git a/www/surfraw/patches/patch-ad b/www/surfraw/patches/patch-ad
new file mode 100644
index 00000000000..78a96dd844e
--- /dev/null
+++ b/www/surfraw/patches/patch-ad
@@ -0,0 +1,10 @@
+$NetBSD: patch-ad,v 1.1 2008/08/22 13:50:51 is Exp $
+
+--- links.IN.orig	2008-06-16 13:05:06.000000000 +0000
++++ links.IN
+@@ -1,5 +1,3 @@
+-surfraw @bindir@/sr
+-surfraw.1.gz @mandir@/man1/sr.1.gz
+ elvi.1sr.gz @mandir@/man1/W.1.gz
+ elvi.1sr.gz @mandir@/man1/alioth.1sr.gz
+ elvi.1sr.gz @mandir@/man1/altavista.1sr.gz
diff --git a/www/surfraw/patches/patch-ae b/www/surfraw/patches/patch-ae
new file mode 100644
index 00000000000..e7ab510ebdd
--- /dev/null
+++ b/www/surfraw/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1 2008/08/22 13:50:51 is Exp $
+
+--- surfraw.1.IN.orig	2008-02-14 05:37:39.000000000 +0100
++++ surfraw.1.IN
+@@ -21,9 +21,6 @@ surfraw \- a fast unix command line inte
+ .B surfraw
+ .I elviname [options]  search words ...
+ .br
+-.B sr
+-.I elviname  [options]  search words ...
+-.br
+ .B sr \-elvi
+ .br
+ .B sr
+@@ -46,10 +43,6 @@ To see the list of elvi type:
+ 
+  surfraw \-elvi
+ 
+-Note that sr is an alias for surfraw, so that could equally be
+-
+- sr \-elvi
+-
+ To search using an elvis use:
+ 
+  sr elviname [options] search terms..
diff --git a/www/surfraw/patches/patch-af b/www/surfraw/patches/patch-af
new file mode 100644
index 00000000000..4e096b5c06a
--- /dev/null
+++ b/www/surfraw/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2008/08/22 13:50:51 is Exp $
+
+--- elvi.1sr.IN.orig	2008-02-14 04:37:39.000000000 +0000
++++ elvi.1sr.IN
+@@ -23,9 +23,6 @@ elvi \- surfraw(1) search tools
+ .I elviname [options]  search words ...
+ .br
+ .B sr
+-.I elviname  [options]  search words ...
+-.br
+-.B sr
+ .I elviname
+ \-help
+ .br
diff --git a/www/surfraw/patches/patch-ag b/www/surfraw/patches/patch-ag
new file mode 100644
index 00000000000..cbd3f784284
--- /dev/null
+++ b/www/surfraw/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2008/08/22 13:50:51 is Exp $
+
+--- surfraw.IN.orig	2008-07-03 00:22:43.000000000 +0000
++++ surfraw.IN
+@@ -355,7 +355,6 @@ Usage: $w3_argv0 [-help] [-elvi] elvis [
+ Options:
+    -elvi  List elvi
+    -help  This help
+-sr is an alias for surfraw
+ EOF
+ 	w3_global_usage
+ }