Remove redundant versions and update version tests

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

24 files changed, 33 insertions, 36 deletions

diff --git a/Library/Formula/antlr.rb b/Library/Formula/antlr.rb
index e356a9111..8a4543310 100644
--- a/Library/Formula/antlr.rb
+++ b/Library/Formula/antlr.rb
@@ -1,9 +1,8 @@
 require 'formula'
 
 class Antlr < Formula
-  url "http://www.antlr.org/download/antlr-3.4-complete.jar"
-  version '3.4'
   homepage 'http://www.antlr.org/'
+  url "http://www.antlr.org/download/antlr-3.4-complete.jar"
   md5 '1b91dea1c7d480b3223f7c8a9aa0e172'
 
   def install
diff --git a/Library/Formula/assimp.rb b/Library/Formula/assimp.rb
index 7f724005c..cc6981701 100644
--- a/Library/Formula/assimp.rb
+++ b/Library/Formula/assimp.rb
@@ -3,7 +3,6 @@ require 'formula'
 class Assimp < Formula
   homepage 'http://assimp.sourceforge.net/'
   url 'http://downloads.sourceforge.net/project/assimp/assimp-2.0/assimp--2.0.863-sdk.zip'
-  version '2.0.863'
   md5 '9f41662501bd9d9533c4cf03b7c25d5b'
 
   depends_on 'cmake' => :build
diff --git a/Library/Formula/cmucl.rb b/Library/Formula/cmucl.rb
index c1884dda9..343a48c2b 100644
--- a/Library/Formula/cmucl.rb
+++ b/Library/Formula/cmucl.rb
@@ -1,9 +1,8 @@
 require 'formula'
 
 class Cmucl < Formula
-  url 'http://common-lisp.net/project/cmucl/downloads/release/20c/cmucl-20c-x86-darwin.tar.bz2'
-  version '20c'
   homepage 'http://www.cons.org/cmucl'
+  url 'http://common-lisp.net/project/cmucl/downloads/release/20c/cmucl-20c-x86-darwin.tar.bz2'
   md5 '98dc8fe17a7033fdd39fab35a2147ea9'
 
   skip_clean 'bin'
diff --git a/Library/Formula/fann.rb b/Library/Formula/fann.rb
index 1d6488c09..eabfa6d4c 100644
--- a/Library/Formula/fann.rb
+++ b/Library/Formula/fann.rb
@@ -1,9 +1,8 @@
 require 'formula'
 
 class Fann < Formula
-  url 'http://downloads.sourceforge.net/project/fann/fann/2.1.0beta/fann-2.1.0beta.zip'
   homepage 'http://leenissen.dk/fann'
-  version '2.1.0beta'
+  url 'http://downloads.sourceforge.net/project/fann/fann/2.1.0beta/fann-2.1.0beta.zip'
   md5 '9c53d96ce415c927cb97b8f9de2ea881'
 
   def install
diff --git a/Library/Formula/grads.rb b/Library/Formula/grads.rb
index 372bb6a1a..9f51b5b30 100644
--- a/Library/Formula/grads.rb
+++ b/Library/Formula/grads.rb
@@ -6,10 +6,9 @@ class GradsSupplementary < Formula
 end
 
 class Grads < Formula
-  url 'ftp://iges.org/grads/2.0/grads-2.0.1-bin-darwin9.8-intel.tar.gz'
   homepage 'http://www.iges.org/grads/grads.html'
+  url 'ftp://iges.org/grads/2.0/grads-2.0.1-bin-darwin9.8-intel.tar.gz'
   md5 '3c94e4e2f840a323df24df5264e159ff'
-  version '2.0.1'
 
   def install
     bin.install ['bin/bufrscan', 'bin/grads', 'bin/grib2scan', 'bin/gribmap', 'bin/gribscan', 'bin/gxeps', 'bin/gxps', 'bin/gxtran', 'bin/stnmap', 'bin/wgrib']
diff --git a/Library/Formula/haxe.rb b/Library/Formula/haxe.rb
index e4f38ee5e..0677101f0 100644
--- a/Library/Formula/haxe.rb
+++ b/Library/Formula/haxe.rb
@@ -1,9 +1,8 @@
 require 'formula'
 
 class Haxe < Formula
-  url 'http://haxe.org/file/haxe-2.08-osx.tar.gz'
-  version '2.08'
   homepage 'http://haxe.org/'
+  url 'http://haxe.org/file/haxe-2.08-osx.tar.gz'
   sha1 'e8758ea9155bf27606348d02240c2af1fecee67b'
 
   def install
diff --git a/Library/Formula/imap-uw.rb b/Library/Formula/imap-uw.rb
index d718b980e..65a400b3d 100644
--- a/Library/Formula/imap-uw.rb
+++ b/Library/Formula/imap-uw.rb
@@ -3,7 +3,6 @@ require 'formula'
 class ImapUw < Formula
   homepage 'http://www.washington.edu/imap/'
   url 'ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz'
-  version '2007f'
   sha1 '7a82ebd5aae57a5dede96ac4923b63f850ff4fa7'
 
   def patches
diff --git a/Library/Formula/jsl.rb b/Library/Formula/jsl.rb
index d4d0ea415..08086d742 100644
--- a/Library/Formula/jsl.rb
+++ b/Library/Formula/jsl.rb
@@ -2,10 +2,8 @@ require 'formula'
 
 class Jsl < Formula
   homepage 'http://www.javascriptlint.com/'
-
   url 'http://www.javascriptlint.com/download/jsl-0.3.0-mac.tar.gz'
   md5 '23c1c8e70dc991d35271074723a96d5d'
-  version '0.3.0'
 
   def install
     bin.install 'jsl'
diff --git a/Library/Formula/libspotify.rb b/Library/Formula/libspotify.rb
index d051ffc5f..fbffcfe9f 100644
--- a/Library/Formula/libspotify.rb
+++ b/Library/Formula/libspotify.rb
@@ -1,9 +1,8 @@
 require 'formula'
 
 class Libspotify < Formula
-  url "http://developer.spotify.com/download/libspotify/libspotify-10.1.16-Darwin-universal.zip"
-  version '10.1.16'
   homepage 'http://developer.spotify.com/en/libspotify/overview/'
+  url "http://developer.spotify.com/download/libspotify/libspotify-10.1.16-Darwin-universal.zip"
   md5 'd26c3f34b7416ffcfdf27b525b7febeb'
 
   def install
diff --git a/Library/Formula/mafft.rb b/Library/Formula/mafft.rb
index 3e3f6688d..41bfbfeab 100644
--- a/Library/Formula/mafft.rb
+++ b/Library/Formula/mafft.rb
@@ -4,7 +4,6 @@ class Mafft < Formula
   homepage 'http://mafft.cbrc.jp/alignment/software/index.html'
   url 'http://align.bmr.kyushu-u.ac.jp/mafft/software/mafft-6.717-with-extensions-src.tgz'
   md5 '2fc3acfce3a48f9804e8ca5e22bb984d'
-  version '6.717'
 
   def install
     cd 'core' do
diff --git a/Library/Formula/ncrack.rb b/Library/Formula/ncrack.rb
index 080c2c8c4..aa76e6556 100644
--- a/Library/Formula/ncrack.rb
+++ b/Library/Formula/ncrack.rb
@@ -4,7 +4,6 @@ class Ncrack < Formula
   url 'http://nmap.org/ncrack/dist/ncrack-0.4ALPHA.tar.gz'
   homepage 'http://nmap.org/ncrack/'
   sha256 'f8bd7e0ef68559490064ec0a5f139b2b9c49aeaf9f6323e080db9ff344c87603'
-  version '0.4ALPHA'
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
diff --git a/Library/Formula/openssl.rb b/Library/Formula/openssl.rb
index d0979a560..e6eaf3b94 100644
--- a/Library/Formula/openssl.rb
+++ b/Library/Formula/openssl.rb
@@ -1,9 +1,8 @@
 require 'formula'
 
 class Openssl < Formula
-  url 'http://www.openssl.org/source/openssl-0.9.8s.tar.gz'
-  version '0.9.8s'
   homepage 'http://www.openssl.org'
+  url 'http://www.openssl.org/source/openssl-0.9.8s.tar.gz'
   sha1 'a7410b0991f37e125bf835dfd1315822fca64d56'
 
   keg_only :provided_by_osx,
diff --git a/Library/Formula/phpmyadmin.rb b/Library/Formula/phpmyadmin.rb
index f74d0657b..d4c7a6f6e 100644
--- a/Library/Formula/phpmyadmin.rb
+++ b/Library/Formula/phpmyadmin.rb
@@ -1,10 +1,9 @@
 require 'formula'
 
 class Phpmyadmin < Formula
-  url 'http://downloads.sourceforge.net/project/phpmyadmin/phpMyAdmin/3.4.7/phpMyAdmin-3.4.7-all-languages.tar.gz'
   homepage 'http://www.phpmyadmin.net/documentation'
+  url 'http://downloads.sourceforge.net/project/phpmyadmin/phpMyAdmin/3.4.7/phpMyAdmin-3.4.7-all-languages.tar.gz'
   md5 'b422d003ed6239bc9f96c02af6c66405'
-  version '3.4.7'
 
   depends_on 'mcrypt-php'
 
diff --git a/Library/Formula/poco.rb b/Library/Formula/poco.rb
index 2d975600b..3e4dcbddc 100644
--- a/Library/Formula/poco.rb
+++ b/Library/Formula/poco.rb
@@ -1,10 +1,9 @@
 require 'formula'
 
 class Poco < Formula
-  url 'http://downloads.sourceforge.net/project/poco/sources/poco-1.4.1/poco-1.4.1p1-all.tar.bz2'
   homepage 'http://pocoproject.org/'
+  url 'http://downloads.sourceforge.net/project/poco/sources/poco-1.4.1/poco-1.4.1p1-all.tar.bz2'
   md5 '5b35baa1bf7ee4b20437b8950a1c5012'
-  version '1.4.1p1'
 
   def install
     arch = Hardware.is_64_bit? ? 'Darwin64': 'Darwin'
diff --git a/Library/Formula/privoxy.rb b/Library/Formula/privoxy.rb
index 326fc72a5..217b96fcd 100644
--- a/Library/Formula/privoxy.rb
+++ b/Library/Formula/privoxy.rb
@@ -3,7 +3,6 @@ require 'formula'
 class Privoxy < Formula
   homepage 'http://www.privoxy.org'
   url 'http://downloads.sourceforge.net/project/ijbswa/Sources/3.0.19%20%28stable%29/privoxy-3.0.19-stable-src.tar.gz'
-  version '3.0.19'
   sha1 'a82287cbf48375ef449d021473a366baeca49250'
 
   if MacOS.xcode_version >= "4.3"
diff --git a/Library/Formula/pypy.rb b/Library/Formula/pypy.rb
index fa0c53954..4aadfa915 100644
--- a/Library/Formula/pypy.rb
+++ b/Library/Formula/pypy.rb
@@ -5,12 +5,11 @@ class Pypy < Formula
 
   if MacOS.prefer_64_bit?
     url 'https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-osx64.tar.bz2'
-    md5 '1c293253e8e4df411c3dd59dff82a663'
     version '1.8'
+    md5 '1c293253e8e4df411c3dd59dff82a663'
   else
     url 'http://pypy.org/download/pypy-1.4.1-osx.tar.bz2'
     md5 '8584c4e8c042f5b661fcfffa0d9b8a25'
-    version '1.4.1'
   end
 
   def install
diff --git a/Library/Formula/savana.rb b/Library/Formula/savana.rb
index ed934e1c6..40d57fcc7 100644
--- a/Library/Formula/savana.rb
+++ b/Library/Formula/savana.rb
@@ -4,7 +4,6 @@ class Savana < Formula
   homepage 'http://savana.codehaus.org'
   url 'http://repository.codehaus.org/org/codehaus/savana/1.2/savana-1.2-install.tar.gz'
   md5 'cb0d5907540799d7d48fc23ca80f6b0f'
-  version '1.2'
 
   def install
     # Remove Windows files
diff --git a/Library/Formula/scala.rb b/Library/Formula/scala.rb
index deb73f0e5..e88966e4d 100644
--- a/Library/Formula/scala.rb
+++ b/Library/Formula/scala.rb
@@ -3,7 +3,6 @@ require 'formula'
 class ScalaDocs < Formula
   homepage 'http://www.scala-lang.org/'
   url 'http://www.scala-lang.org/downloads/distrib/files/scala-2.9.1-1-devel-docs.tgz'
-  version '2.9.1-1'
   md5 '6bfdd990c379c1b2c87335c89f6c444c'
 end
 
@@ -17,7 +16,6 @@ end
 class Scala < Formula
   homepage 'http://www.scala-lang.org/'
   url 'http://www.scala-lang.org/downloads/distrib/files/scala-2.9.1-1.tgz'
-  version '2.9.1-1'
   md5 'bde2427b3f56e9c5ccb86a4376ac0d93'
 
   def options
diff --git a/Library/Formula/sedna.rb b/Library/Formula/sedna.rb
index 8ac043988..776567c05 100644
--- a/Library/Formula/sedna.rb
+++ b/Library/Formula/sedna.rb
@@ -3,7 +3,6 @@ require 'formula'
 class Sedna < Formula
   homepage 'http://modis.ispras.ru/sedna/index.html'
   url 'http://www.modis.ispras.ru/FTPContent/sedna/current/sedna-3.4.66-src-darwin.tar.gz'
-  version '3.4.66'
   md5 '8c0006dbfb0ab89a63b4ae93e35f2213'
 
   depends_on 'cmake' => :build
diff --git a/Library/Formula/sphinx.rb b/Library/Formula/sphinx.rb
index 1dcd7b20b..e39f5102e 100644
--- a/Library/Formula/sphinx.rb
+++ b/Library/Formula/sphinx.rb
@@ -11,7 +11,6 @@ end
 class Sphinx < Formula
   homepage 'http://www.sphinxsearch.com'
   url 'http://sphinxsearch.com/files/sphinx-2.0.3-release.tar.gz'
-  version '2.0.3'
   md5 'a1293aecd5034aa797811610beb7ba89'
 
   head 'http://sphinxsearch.googlecode.com/svn/trunk/'
diff --git a/Library/Formula/synergy.rb b/Library/Formula/synergy.rb
index 72c130165..cc176d388 100644
--- a/Library/Formula/synergy.rb
+++ b/Library/Formula/synergy.rb
@@ -6,13 +6,11 @@ class Synergy < Formula
   # Do not bump this to 1.3.7 or newer until that issue is resolved.
   url 'http://synergy.googlecode.com/files/synergy-1.3.6p2-MacOSX-Universal.zip'
   sha1 '5b9336fb553db17bd109e3f2bca517af18ed3863'
-  version '1.3.6p2'
   homepage 'http://synergy-foss.org'
 
   devel do
     url 'http://synergy.googlecode.com/files/synergy-1.4.3-MacOSX106-Universal.zip'
     sha1 'aa60fa6ac975dd22dc095d6cd9f3dc755b91bb64'
-    version '1.4.3'
   end
 
   def install
diff --git a/Library/Formula/wwwoffle.rb b/Library/Formula/wwwoffle.rb
index 3f84e23b2..f867ceafa 100644
--- a/Library/Formula/wwwoffle.rb
+++ b/Library/Formula/wwwoffle.rb
@@ -4,7 +4,6 @@ class Wwwoffle < Formula
   homepage 'http://www.gedanken.demon.co.uk/wwwoffle/'
   url 'http://www.gedanken.demon.co.uk/download-wwwoffle/wwwoffle-2.9h.tgz'
   md5 'a1c93ad6aa4a5095f19ca9fc6b1a7227'
-  version '2.9h'
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/x3270.rb b/Library/Formula/x3270.rb
index e65fd3714..b3744a407 100644
--- a/Library/Formula/x3270.rb
+++ b/Library/Formula/x3270.rb
@@ -3,7 +3,6 @@ require 'formula'
 class X3270 < Formula
   homepage 'http://x3270.bgp.nu/'
   url 'http://sourceforge.net/projects/x3270/files/x3270/3.3.12ga7/suite3270-3.3.12ga7-src.tgz'
-  version '3.3.12ga7'
   md5 '5a501ed84d522c02d3c7ed3e36a00d0a'
 
   def options
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb
index 50a96bd6e..9b916fa3a 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test_versions.rb
@@ -188,4 +188,27 @@ class VersionTests < Test::Unit::TestCase
     check 'http://downloads.sf.net/project/machomebrew/Bottles/imagemagick-6.7.1-1-bottle.tar.gz',
       '6.7.1-1'
   end
+
+  def test_dash_version_dash_style
+    check 'http://www.antlr.org/download/antlr-3.4-complete.jar', '3.4'
+  end
+
+  def test_more_versions
+    check 'http://pypy.org/download/pypy-1.4.1-osx.tar.bz2', '1.4.1'
+    check 'http://www.openssl.org/source/openssl-0.9.8s.tar.gz', '0.9.8s'
+    check 'ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-1.5E.tar.gz', '1.5E'
+    check 'http://downloads.sourceforge.net/project/assimp/assimp-2.0/assimp--2.0.863-sdk.zip',
+      '2.0.863'
+    check 'http://common-lisp.net/project/cmucl/downloads/release/20c/cmucl-20c-x86-darwin.tar.bz2',
+      '20c'
+    check 'http://downloads.sourceforge.net/project/fann/fann/2.1.0beta/fann-2.1.0beta.zip',
+      '2.1.0beta'
+    check 'ftp://iges.org/grads/2.0/grads-2.0.1-bin-darwin9.8-intel.tar.gz', '2.0.1'
+    check 'http://haxe.org/file/haxe-2.08-osx.tar.gz', '2.08'
+    check 'ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz', '2007f'
+    check 'http://sourceforge.net/projects/x3270/files/x3270/3.3.12ga7/suite3270-3.3.12ga7-src.tgz',
+      '3.3.12ga7'
+    check 'http://www.gedanken.demon.co.uk/download-wwwoffle/wwwoffle-2.9h.tgz', '2.9h'
+    check 'http://synergy.googlecode.com/files/synergy-1.3.6p2-MacOSX-Universal.zip', '1.3.6p2'
+  end
 end