Use more inreplace features.

Update formulas to make more idiomatic use of "inreplace", including
its new ability to take a list of files to act on.

1 files changed, 11 insertions, 12 deletions

diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 7f1ee6048..0930efa50 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -44,20 +44,19 @@ class Glib <Formula
     system "make"
     system "make install"
 
-    # this sucks, basically gettext is Keg only to prevent conflicts with
-    # the wider system, but pkg-config or glib is not smart enough to
-    # have determined that libintl.dylib isn't in the DYLIB_PATH so we have
-    # to add it manually, we might have to do this a lot, so clearly we need
-    # to make it automatic or solve the BSD/GNU gettext conflict in another
-    # way
-    gettext = Formula.factory 'gettext'
-    inreplace lib+'pkgconfig'+'glib-2.0.pc',
-              'Libs: -L${libdir} -lglib-2.0 -lintl',
+    # This sucks; gettext is Keg only to prevent conflicts with the wider
+    # system, but pkg-config or glib is not smart enough to have determined
+    # that libintl.dylib isn't in the DYLIB_PATH so we have to add it
+    # manually.
+    gettext = Formula.factory('gettext')
+    inreplace lib+'pkgconfig/glib-2.0.pc' do |s|
+      s.gsub! 'Libs: -L${libdir} -lglib-2.0 -lintl',
               "Libs: -L${libdir} -lglib-2.0 -L#{gettext.lib} -lintl"
-    inreplace lib+'pkgconfig'+'glib-2.0.pc',
-              'Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include',
+      
+      s.gsub! 'Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include',
               "Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I#{gettext.include}"
+    end
 
-    (prefix+'share'+'gtk-doc').rmtree
+    (prefix+'share/gtk-doc').rmtree
   end
 end