From 0d076d2ca6535568bf979979c7e6a4bc7fc1b1dc Mon Sep 17 00:00:00 2001
From: Max Howell
Date: Mon, 19 Oct 2009 02:35:50 +0100
Subject: Force xmlstarlet to link to the xml2 dylibs

Static linking makes no sense for us anyway. And OS X doesn't even provide those libs as static variants so we have no choice.
---
 Library/Formula/xmlstarlet.rb | 50 ++++++-------------------------------------
 1 file changed, 6 insertions(+), 44 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/xmlstarlet.rb b/Library/Formula/xmlstarlet.rb
index 14c54e129..ca99a340c 100644
--- a/Library/Formula/xmlstarlet.rb
+++ b/Library/Formula/xmlstarlet.rb
@@ -2,55 +2,17 @@ require 'formula'
 
 class Xmlstarlet <Formula
   url 'http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/1.0.1/xmlstarlet-1.0.1.tar.gz'
-  homepage 'http://xmlstar.sourceforge.net/'
   md5 '8deb71834bcdfb4443c258a1f0042fce'
-
-  def patches
-    DATA
-  end
+  homepage 'http://xmlstar.sourceforge.net/'
 
   def install
-    ENV.x11
+    # thanks, xmlstarlet but OS X doesn't have the static versions
+    inreplace 'configure', '${LIBXML_PREFIX}/lib/libxml2.a', '-lxml2'
+    inreplace 'configure', '${LIBXSLT_PREFIX}/lib/libxslt.a', '-lxslt'
+    inreplace 'configure', '${LIBXSLT_PREFIX}/lib/libexslt.a', '-lexslt'
+
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make"
     system "make install"
   end
 end
-
-__END__
-diff -u a/configure b/configure
---- a/configure	2009-10-14 14:31:08.000000000 -0700
-+++ b/configure	2009-10-14 14:30:14.000000000 -0700
-@@ -2096,6 +2096,11 @@
- WIN32_EXTRA_LIBADD=
- WIN32_EXTRA_LDFLAGS=
- 
-+if test "x$LIBXML_LIBS" = "x"
-+then
-+	LIBXML_LIBS="${LIBXML_PREFIX}/lib/libxml2.a -lz -lm -lpthread -ldl"
-+fi
-+
- case "${host}" in
-   *sun* )
-       LIBXML_LIBS="${LIBXML_LIBS} -lsocket -lnsl"
-@@ -2109,7 +2114,7 @@
-           LIBXML_LIBS="${LIBXML_LIBS} -liconv"
-       fi
-       ;;
--  *mac* )
-+  *mac* | *darwin* )
-       if test "x$LIBICONV_LIBS" = "x"
-       then
-           LIBXML_LIBS="${LIBXML_LIBS} ${LIBICONV_LIBS} -liconv"
-@@ -2157,11 +2162,6 @@
- 	LIBXML_CFLAGS="-I${LIBXML_PREFIX}/include/libxml2"
- fi
- 
--if test "x$LIBXML_LIBS" = "x"
--then
--	LIBXML_LIBS="${LIBXML_PREFIX}/lib/libxml2.a -lz -lm -lpthread -ldl"
--fi
--
- if test "x$LIBXSLT_CFLAGS" = "x"
- then
- 	LIBXSLT_CFLAGS="-I${LIBXSLT_PREFIX}/include/libxslt -I${LIBXSLT_PREFIX}/include/libexslt"
-- 
cgit v1.2.3