From 7afe1ed67aa2509791705cf6d54ecfe771c61862 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 25 Dec 2014 19:35:44 +0000
Subject: [PATCH] requirements: recommend casks where available.

Also, tweak the XQuartz requirement to not show 0.0.0 versions being required.

Closes Homebrew/homebrew#35254.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/Homebrew/requirements.rb                | 12 ++++++++----
 Library/Homebrew/requirements/x11_dependency.rb |  8 ++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb
index b2206fd7e9..9a893516ef 100644
--- a/Library/Homebrew/requirements.rb
+++ b/Library/Homebrew/requirements.rb
@@ -73,7 +73,10 @@ class TeXDependency < Requirement
     <<-EOS.undent
     A LaTeX distribution is required for Homebrew to install this formula.
 
-    You can install MacTeX distribution from:
+    You can install MacTeX distribution with:
+      brew cask install mactex
+
+    Or from:
       http://www.tug.org/mactex/
 
     Make sure that "/usr/texbin", or the location you installed it to, is in
@@ -136,10 +139,11 @@ class JavaDependency < Requirement
     <<-EOS.undent
       Java#{version_string} is required to install this formula.
 
-      You can install Java from:
-        http://www.oracle.com/technetwork/java/javase/downloads/index.html
+      You can install the Java Development Kit (JDK) with:
+        brew cask install java
 
-      Make sure you install both the JRE and JDK.
+      Or from:
+        http://www.oracle.com/technetwork/java/javase/downloads/index.html
     EOS
   end
 end
diff --git a/Library/Homebrew/requirements/x11_dependency.rb b/Library/Homebrew/requirements/x11_dependency.rb
index 514f61f8bf..95d939f938 100644
--- a/Library/Homebrew/requirements/x11_dependency.rb
+++ b/Library/Homebrew/requirements/x11_dependency.rb
@@ -12,8 +12,10 @@ class X11Dependency < Requirement
     @name = name
     if /(\d\.)+\d/ === tags.first
       @min_version = Version.new(tags.shift)
+      @min_version_string = " #{@min_version}"
     else
       @min_version = Version.new("0.0.0")
+      @min_version_string = ""
     end
     super(tags)
   end
@@ -23,8 +25,10 @@ class X11Dependency < Requirement
   end
 
   def message; <<-EOS.undent
-    Unsatisfied dependency: XQuartz #{@min_version}
-    Homebrew does not package XQuartz. Installers may be found at:
+    You can install XQuartz#{@min_version_string} with:
+      brew cask install xquartz
+
+    Or from:
       https://xquartz.macosforge.org
     EOS
   end