From 4ed3834be0956d4ad0911281367fbe807c6a5a09 Mon Sep 17 00:00:00 2001
From: Piotr Usewicz <piotr@layer22.com>
Date: Wed, 16 Sep 2009 11:28:50 +0100
Subject: [PATCH] Add full version and build numbers to user agent

Signed-off-by: Max Howell <max@methylblue.com>

I adapted it slightly based on the user agent that Safari gives.
---
 Library/Homebrew/brewkit.rb |  4 +---
 Library/Homebrew/global.rb  | 14 +++++++++-----
 bin/brew                    |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Library/Homebrew/brewkit.rb b/Library/Homebrew/brewkit.rb
index 91ea9fa644..a6fb58abaa 100644
--- a/Library/Homebrew/brewkit.rb
+++ b/Library/Homebrew/brewkit.rb
@@ -33,9 +33,7 @@ require 'hardware'
 #    build systems we support to do it.
 
 
-`/usr/bin/sw_vers -productVersion` =~ /(10\.\d+)(\.\d+)?/
-MACOS_VERSION=$1.to_f
-ENV['MACOSX_DEPLOYMENT_TARGET']=$1
+ENV['MACOSX_DEPLOYMENT_TARGET']=MACOS_VERSION.to_s
 
 # ignore existing build vars, thus we should have less bugs to deal with
 ENV['LDFLAGS']=""
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index 3feec1c8ca..95e4c9ded8 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -34,8 +34,12 @@ else
   HOMEBREW_CACHE=Pathname.new("~/Library/Caches/Homebrew").expand_path
 end
 
-HOMEBREW_PREFIX=(Pathname.getwd+__FILE__).dirname.parent.parent.cleanpath
-HOMEBREW_CELLAR=HOMEBREW_PREFIX+'Cellar'
-HOMEBREW_VERSION='0.4'
-HOMEBREW_WWW='http://bit.ly/Homebrew'
-HOMEBREW_USER_AGENT="Homebrew #{HOMEBREW_VERSION} (Ruby #{VERSION}; Mac OS X 10.5 Leopard)"
+HOMEBREW_PREFIX = (Pathname.getwd+__FILE__).dirname.parent.parent.cleanpath
+HOMEBREW_CELLAR = HOMEBREW_PREFIX+'Cellar'
+HOMEBREW_VERSION = 0.4
+HOMEBREW_WWW = 'http://bit.ly/Homebrew'
+
+MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp
+MACOS_VERSION = /(10\.\d+)(\.\d+)?/.match(MACOS_FULL_VERSION).captures.first.to_f
+
+HOMEBREW_USER_AGENT = "Homebrew #{HOMEBREW_VERSION} (Ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}; Mac OS X #{MACOS_FULL_VERSION})"
diff --git a/bin/brew b/bin/brew
index fa8755f28b..971478d721 100755
--- a/bin/brew
+++ b/bin/brew
@@ -81,7 +81,7 @@ begin
 
       if ARGV.verbose?
         ohai "Build Environment"
-        %w[CFLAGS LDFLAGS CPPFLAGS MAKEFLAGS CC CXX].each do |f|
+        %w[CFLAGS LDFLAGS CPPFLAGS MAKEFLAGS CC CXX MACOSX_DEPLOYMENT_TARGET].each do |f|
           puts "#{f}: #{ENV[f]}" unless ENV[f].to_s.empty?
         end
       end