diff options
Diffstat (limited to 'Library/Formula/subversion.rb')
| -rw-r--r-- | Library/Formula/subversion.rb | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb index 930554ea5..2055195f5 100644 --- a/Library/Formula/subversion.rb +++ b/Library/Formula/subversion.rb @@ -2,15 +2,11 @@ require 'formula' class Subversion < Formula homepage 'http://subversion.apache.org/' - url 'http://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.8.4.tar.bz2' - mirror 'http://archive.apache.org/dist/subversion/subversion-1.8.4.tar.bz2' - sha1 '6e7ac5b56ec22995c763a668c658577f96f2c090' + url 'http://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.8.5.tar.bz2' + mirror 'http://archive.apache.org/dist/subversion/subversion-1.8.5.tar.bz2' + sha1 'd21de7daf37d9dd1cb0f777e999a529b96f83082' bottle do - revision 1 - sha1 '03a9e38626bf1f9c243b4052a7955985c4962b9f' => :mavericks - sha1 'c13bbc716a1ee788812ecefd52f36778b22978b9' => :mountain_lion - sha1 '0d956908378049edfdfcef732af1769b7c52b4c0' => :lion end option :universal @@ -44,8 +40,7 @@ class Subversion < Formula # If building bindings, allow non-system interpreters env :userpaths if build.include? 'perl' or build.include? 'ruby' - # One patch to prevent '-arch ppc' from being pulled in from Perl's $Config{ccflags}, - # and another one to put the svn-tools directory into libexec instead of bin + # Prevent '-arch ppc' from being pulled in from Perl's $Config{ccflags} def patches { :p0 => DATA } end @@ -138,6 +133,9 @@ class Subversion < Formula # variable to prevent failures due to incompatible CFLAGS ENV['ac_cv_python_compile'] = ENV.cc + inreplace 'Makefile.in', + 'toolsdir = @bindir@/svn-tools', + 'toolsdir = @libexecdir@/svn-tools' # Suggestion by upstream. http://svn.haxx.se/users/archive-2013-09/0188.shtml system "./autogen.sh" system "./configure", *args @@ -256,14 +254,3 @@ __END__ " -I$swig_srcdir/perl/libsvn_swig_perl", " -I$svnlib_srcdir/include", ---- Makefile.in~ 2013-07-25 16:55:27.000000000 +0200 -+++ Makefile.in 2013-07-25 17:02:02.000000000 +0200 -@@ -85,7 +85,7 @@ - swig_pydir_extra = @libdir@/svn-python/svn - swig_pldir = @libdir@/svn-perl - swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext --toolsdir = @bindir@/svn-tools -+toolsdir = @libexecdir@/svn-tools - - javahl_javadir = @libdir@/svn-javahl - javahl_javahdir = @libdir@/svn-javahl/include |