[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-52-gf67b38c

[Ian Beckwith]

The following commit has been merged in the master branch:
commit f67b38cc5d5aff17b13ce53998f526a76a97d8be
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Thu Nov 12 16:20:03 2009 +0000

    renamed macportspkg to macports: old name was too unwieldy

diff --git a/ChangeLog b/ChangeLog
index 023becf..afb26fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@
 
 	* New elvi:
 	  + finkpkg: search Fink packages.
-	  + macportspkg: search macports packages.
+	  + macports: search macports packages.
+	  + rpmsearch: search for packages in rpm-based distros.
 	* surfraw.IN: w3_parse_args: avoid bogus initial space in w3_args
 
 2009-11-11  Ian Beckwith  <ianb at erislabs.net>
diff --git a/README b/README
index bccc600..a008d28 100644
--- a/README
+++ b/README
@@ -209,7 +209,7 @@ l1sp            -- Search lisp documentation
 lastfm          -- Search last.fm
 leodict         -- Search Leo's German <-> English dictionary (dict.leo.org)
 lsm             -- Search the Linux Software Map
-macportspkg	-- Search macports packages (macports.org)
+macports   	-- Search macports packages (macports.org)
 mathworld       -- Search Wolfram MathWorld
 mininova        -- Search the mininova bittorent source.
 musicbrainz     -- Search MusicBrainz (musicbrainz.org)
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index c5fb2d5..756d115 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -63,7 +63,7 @@ dist_elvi_SCRIPTS	= \
 		  lastfm \
 		  leodict \
 		  lsm \
-		  macportspkg \
+		  macports \
 		  mathworld \
 		  mininova \
 		  musicbrainz \
diff --git a/elvi/Makefile.in b/elvi/Makefile.in
index 6660253..efd05a4 100644
--- a/elvi/Makefile.in
+++ b/elvi/Makefile.in
@@ -51,7 +51,7 @@ am__dist_elvi_SCRIPTS_DIST = W acronym alioth altavista amazon archpkg \
 	foldoc filesearching finkpkg freebsd freedb freshmeat fsfdir \
 	gcache genbugs genpkg genportage gutenberg google happypenguin \
 	imdb ixquick javasun scpan slinuxdoc l1sp lastfm leodict lsm \
-	macportspkg mathworld mininova musicbrainz netbsd ntrs openbsd \
+	macports mathworld mininova musicbrainz netbsd ntrs openbsd \
 	piratebay pgpkeys port pubmed rae rfc rhyme rpmsearch scholar \
 	scicom slashdot sourceforge springer stockquote sunonesearch \
 	thesaurus translate urban w3css w3html w3link w3rdf wayback \
@@ -169,7 +169,7 @@ dist_elvi_SCRIPTS = W acronym alioth altavista amazon archpkg arxiv \
 	discogs dmoz ebay etym excite fast foldoc filesearching \
 	finkpkg freebsd freedb freshmeat fsfdir gcache genbugs genpkg \
 	genportage gutenberg google happypenguin imdb ixquick javasun \
-	scpan slinuxdoc l1sp lastfm leodict lsm macportspkg mathworld \
+	scpan slinuxdoc l1sp lastfm leodict lsm macports mathworld \
 	mininova musicbrainz netbsd ntrs openbsd piratebay pgpkeys \
 	port pubmed rae rfc rhyme rpmsearch scholar scicom slashdot \
 	sourceforge springer stockquote sunonesearch thesaurus \
diff --git a/elvi/macportspkg b/elvi/macports
similarity index 78%
rename from elvi/macportspkg
rename to elvi/macports
index 982ba72..8fc1079 100755
--- a/elvi/macportspkg
+++ b/elvi/macports
@@ -1,11 +1,11 @@
 #!/bin/sh
-# elvis: macportspkg	-- Search macports packages (macports.org)
+# elvis: macports	-- Search macports packages (macports.org)
 # ianb at erislabs.net 20091112
 
 . surfraw || exit 1
 
 w3_config_hook () {
-def   SURFRAW_macportspkg_by     name
+def   SURFRAW_macports_by     name
 }
 
 w3_usage_hook () {
@@ -28,7 +28,7 @@ w3_parse_option_hook () {
     opt="$1"
     optarg="$2"
     case "$opt" in
-	-by*=*)     setopt   SURFRAW_macportspkg_by           $optarg ;;
+	-by*=*)     setopt   SURFRAW_macports_by           $optarg ;;
 	*) return 1 ;;
     esac
     return 0
@@ -42,7 +42,7 @@ escaped_args=$(w3_url_of_arg $w3_args)
 url="http://www.macports.org/ports.php"
 if [ -n "$escaped_args" ]
 then
-    url="${url}?by=${SURFRAW_macportspkg_by}&substr=${escaped_args}"
+    url="${url}?by=${SURFRAW_macports_by}&substr=${escaped_args}"
 fi
 
 w3_browse_url "$url"
diff --git a/links.IN b/links.IN
index 931b74a..94386c0 100644
--- a/links.IN
+++ b/links.IN
@@ -57,7 +57,7 @@ elvi.1sr.gz @mandir@/man1/lastfm.1sr.gz
 elvi.1sr.gz @mandir@/man1/leodict.1sr.gz
 elvi.1sr.gz @mandir@/man1/l1sp.1sr.gz
 elvi.1sr.gz @mandir@/man1/lsm.1sr.gz
-elvi.1sr.gz @mandir@/man1/macportspkg.1sr.gz
+elvi.1sr.gz @mandir@/man1/macports.1sr.gz
 elvi.1sr.gz @mandir@/man1/mathworld.1sr.gz
 elvi.1sr.gz @mandir@/man1/mininova.1sr.gz
 elvi.1sr.gz @mandir@/man1/musicbrainz.1sr.gz
diff --git a/test/macportspkg.test b/test/macports.test
similarity index 67%
rename from test/macportspkg.test
rename to test/macports.test
index e8f3a16..cc2e0cc 100644
--- a/test/macportspkg.test
+++ b/test/macports.test
@@ -1,3 +1,3 @@
-macportspkg surfraw
+macports surfraw
 Revolutionary Front Rage Against the Web
 

-- 
surfraw -  a fast unix command line interface to WWW