xaw3d: audit and style issues

Formula/xaw3d.rb

@@ -1,35 +1,37 @@
 require 'formula'
 
 class Xaw3d < Formula
-  url 'ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-1.5E.tar.gz'
   homepage 'http://freshmeat.net/projects/xaw3d'
-  md5 '29ecfdcd6bcf47f62ecfd672d31269a1'
+  url 'ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-1.5E.tar.gz'
   version '1.5E'
+  md5 '29ecfdcd6bcf47f62ecfd672d31269a1'
 
-  depends_on 'imake'
+  depends_on 'imake' => :build
 
   def install
     ENV.x11
-    chdir 'lib/Xaw3d'
-    inreplace 'Imakefile', 'XCOMM EXTRA_INCLUDES', 'EXTRA_INCLUDES'
-    mkdir 'X11'
-    chdir 'X11' do
-      ln_s '..', 'Xaw3d'
+    inreplace 'lib/Xaw3d/Imakefile', 'XCOMM EXTRA_INCLUDES', 'EXTRA_INCLUDES'
+    cd 'lib/Xaw3d' do
+      mkdir 'X11'
+      cd 'X11' do
+        # TODO - surely this symlink can be made without the cd
+        ln_s '..', 'Xaw3d'
+      end
+
+      system 'xmkmf'
+
+      # force usage of /usr/X11/lib when linking, and install into the Cellar
+      # apparently s.change_make_var! silently fails when Makefile variables
+      # are preceded by whitespace, so do it manually
+      inreplace 'Makefile' do |s|
+        s.gsub! 'LDPRELIB = -L$(USRLIBDIR)', 'LDPRELIB = -L$(USRLIBDIR) $(LDFLAGS)'
+        s.gsub! 'USRLIBDIR = /usr/local/lib', "USRLIBDIR = #{lib}"
+        s.gsub! 'SHLIBDIR = /usr/local/lib', "SHLIBDIR = #{lib}"
+        s.gsub! 'INCROOT = /usr/local/include', "INCROOT = #{include}"
+      end
+
+      system 'make'
+      system 'make install'
     end
-
-    system 'xmkmf'
-
-    # force usage of /usr/X11/lib when linking, and install into the Cellar
-    # apparently s.change_make_var! silently fails when Makefile variables
-    # are preceded by whitespace, so do it manually
-    inreplace 'Makefile' do |s|
-      s.gsub! 'LDPRELIB = -L$(USRLIBDIR)', 'LDPRELIB = -L$(USRLIBDIR) $(LDFLAGS)'
-      s.gsub! 'USRLIBDIR = /usr/local/lib', "USRLIBDIR = #{lib}"
-      s.gsub! 'SHLIBDIR = /usr/local/lib', "SHLIBDIR = #{lib}"
-      s.gsub! 'INCROOT = /usr/local/include', "INCROOT = #{include}"
-    end
-
-    system 'make'
-    system 'make install'
   end
 end