8 files changed, 29 insertions, 23 deletions
diff --git a/Library/Formula/disktype.rb b/Library/Formula/disktype.rb
index 5fc25d4b6..b39b51afa 100644
--- a/Library/Formula/disktype.rb
+++ b/Library/Formula/disktype.rb
@@ -1,8 +1,6 @@
-require 'formula'
-
 class Disktype < Formula
   homepage 'http://disktype.sourceforge.net/'
-  head ':pserver:anonymous:@disktype.cvs.sourceforge.net:/cvsroot/disktype:disktype', :using => :cvs
+  head ":pserver:anonymous:@disktype.cvs.sourceforge.net:/cvsroot/disktype", :using => :cvs
   url 'https://downloads.sourceforge.net/project/disktype/disktype/9/disktype-9.tar.gz'
   sha1 '5ccc55d1c47f9a37becce7336c4aa3a7a43cc89c'
 
diff --git a/Library/Formula/global.rb b/Library/Formula/global.rb
index 2e116264a..a2e928706 100644
--- a/Library/Formula/global.rb
+++ b/Library/Formula/global.rb
@@ -1,5 +1,3 @@
-require "formula"
-
 class Global < Formula
   homepage "https://www.gnu.org/software/global/"
   url "http://ftpmirror.gnu.org/global/global-6.3.2.tar.gz"
@@ -13,7 +11,7 @@ class Global < Formula
   end
 
   head do
-    url ":pserver:anonymous:@cvs.savannah.gnu.org:/sources/global:global", :using => :cvs
+    url ":pserver:anonymous:@cvs.savannah.gnu.org:/sources/global", :using => :cvs
 
     depends_on "autoconf" => :build
     depends_on "automake" => :build
diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb
index 578cb20eb..2cc500e89 100644
--- a/Library/Formula/gnuplot.rb
+++ b/Library/Formula/gnuplot.rb
@@ -1,5 +1,3 @@
-require 'formula'
-
 class LuaRequirement < Requirement
   fatal true
   default_formula 'lua'
@@ -19,7 +17,7 @@ class Gnuplot < Formula
   end
 
   head do
-    url ':pserver:anonymous:@gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot', :using => :cvs
+    url ":pserver:anonymous:@gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot", :using => :cvs
 
     depends_on "autoconf" => :build
     depends_on "automake" => :build
diff --git a/Library/Formula/id3lib.rb b/Library/Formula/id3lib.rb
index 3a53c6078..6e1932cc6 100644
--- a/Library/Formula/id3lib.rb
+++ b/Library/Formula/id3lib.rb
@@ -1,5 +1,3 @@
-require 'formula'
-
 class Id3lib < Formula
   homepage 'http://id3lib.sourceforge.net/'
 
@@ -18,7 +16,8 @@ class Id3lib < Formula
     end
   end
 
-  head ":pserver:anonymous:@id3lib.cvs.sourceforge.net:/cvsroot/id3lib:id3lib-devel", :using => :cvs
+  head ":pserver:anonymous:@id3lib.cvs.sourceforge.net:/cvsroot/id3lib",
+    :using => :cvs, :module => "id3lib-devel"
 
   bottle do
     cellar :any
diff --git a/Library/Formula/libowfat.rb b/Library/Formula/libowfat.rb
index ddb138ae5..90e8f23fa 100644
--- a/Library/Formula/libowfat.rb
+++ b/Library/Formula/libowfat.rb
@@ -1,8 +1,6 @@
-require 'formula'
-
 class Libowfat < Formula
   homepage 'http://www.fefe.de/libowfat/'
-  head ':pserver:cvs:@cvs.fefe.de:/cvs:libowfat', :using => :cvs
+  head ":pserver:cvs:@cvs.fefe.de:/cvs", :using => :cvs
   url 'http://dl.fefe.de/libowfat-0.29.tar.bz2'
   sha1 'f944ebac326f4a8bd1437ff995d0b8201280434c'
 
diff --git a/Library/Formula/log4c.rb b/Library/Formula/log4c.rb
index 5b78511ec..2f80c9a64 100644
--- a/Library/Formula/log4c.rb
+++ b/Library/Formula/log4c.rb
@@ -1,11 +1,9 @@
-require 'formula'
-
 class Log4c < Formula
   homepage 'http://log4c.sourceforge.net/'
   url 'https://downloads.sourceforge.net/project/log4c/log4c/1.2.4/log4c-1.2.4.tar.gz'
   sha1 'a2795d7fcbdf5e43e1cc644893adfa725046abe8'
 
-  head ':pserver:anonymous:@log4c.cvs.sourceforge.net:/cvsroot/log4c:log4c', :using => :cvs
+  head ":pserver:anonymous:@log4c.cvs.sourceforge.net:/cvsroot/log4c", :using => :cvs
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/ncp.rb b/Library/Formula/ncp.rb
index 0a446d406..02a4768cc 100644
--- a/Library/Formula/ncp.rb
+++ b/Library/Formula/ncp.rb
@@ -1,10 +1,8 @@
-require "formula"
-
 class Ncp < Formula
   homepage "http://www.fefe.de/ncp/"
   url "http://dl.fefe.de/ncp-1.2.4.tar.bz2"
   sha1 "bd33e5311c249948559d17bfd59df93ae72e1f17"
-  head ":pserver:cvs:@cvs.fefe.de:/cvs:ncp", :using => :cvs
+  head ":pserver:cvs:@cvs.fefe.de:/cvs", :using => :cvs
 
   depends_on "libowfat"
 
diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index e77e14cfe..4978f3c07 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -566,9 +566,10 @@ end
 
 class ResourceAuditor
   attr_reader :problems
-  attr_reader :version, :checksum, :using, :specs, :url
+  attr_reader :version, :checksum, :using, :specs, :url, :name
 
   def initialize(resource)
+    @name     = resource.name
     @version  = resource.version
     @checksum = resource.checksum
     @url      = resource.url
@@ -635,11 +636,29 @@ class ResourceAuditor
       problem "#{using.name} is deprecated, please choose a different URL"
     end
 
+    if using == :cvs
+      mod = specs[:module]
+
+      if mod == name
+        problem "Redundant :module value in URL"
+      end
+
+      if url =~ %r[:[^/]+$]
+        mod = url.split(":").last
+
+        if mod == name
+          problem "Redundant CVS module appended to URL"
+        else
+          problem "Specify CVS module as `:module => \"#{mod}\"` instead of appending it to the URL"
+        end
+      end
+    end
+
     url_strategy   = DownloadStrategyDetector.detect(url)
     using_strategy = DownloadStrategyDetector.detect('', using)
 
     if url_strategy == using_strategy
-      problem "redundant :using specification in URL"
+      problem "Redundant :using value in URL"
     end
   end