aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorKarl Pflästerer2014-08-15 19:19:37 +0200
committerJack Nagel2014-08-17 23:59:42 -0500
commit4a95ae39501a52163d9fb33ee7694519ff8b61ad (patch)
treec00a356559e82a7b2cef875bd994e3ac85dd7605 /Library
parentea21c679ef43ad85eeb8b2bacf4c206444eae3a8 (diff)
downloadhomebrew-4a95ae39501a52163d9fb33ee7694519ff8b61ad.tar.bz2
svn 1.8.10
svn is updated to 1.1.10 serf is updated to 1.3.7 The patches are adjusted so they can be cleanly applied Closes #31621. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/subversion.rb33
1 files changed, 14 insertions, 19 deletions
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index 01f44a831..3a246222f 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -2,15 +2,11 @@ require 'formula'
class Subversion < Formula
homepage 'https://subversion.apache.org/'
- url 'http://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.8.9.tar.bz2'
- mirror 'http://archive.apache.org/dist/subversion/subversion-1.8.9.tar.bz2'
- sha1 '424ee12708f39a126efd905886666083dcc4eeaf'
+ url 'http://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.8.10.tar.bz2'
+ mirror 'http://archive.apache.org/dist/subversion/subversion-1.8.10.tar.bz2'
+ sha1 'd6896d94bb53c1b4c6e9c5bb1a5c466477b19b2b'
bottle do
- revision 2
- sha1 "860453653114edfcf152bad3a7901719777a5f72" => :mavericks
- sha1 "f9acba18f2d4547a24cd7e5a18eda47bf9f40925" => :mountain_lion
- sha1 "1f632c42ec044abaaf373dd955aa100a8f879a81" => :lion
end
option :universal
@@ -19,8 +15,8 @@ class Subversion < Formula
option 'ruby', 'Build Ruby bindings'
resource 'serf' do
- url 'https://serf.googlecode.com/svn/src_releases/serf-1.3.6.tar.bz2', :using => :curl
- sha1 '409a153583b3e370a130e3fb1623ac98f5af9975'
+ url 'https://serf.googlecode.com/svn/src_releases/serf-1.3.7.tar.bz2', :using => :curl
+ sha1 'db9ae339dba10a2b47f9bdacf30a58fd8e36683a'
end
depends_on "pkg-config" => :build
@@ -234,12 +230,12 @@ __END__
Patch 1
---- subversion/bindings/swig/perl/native/Makefile.PL.in~ 2013-06-20 18:58:55.000000000 +0200
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2013-06-20 19:00:49.000000000 +0200
-@@ -69,10 +69,15 @@
-
+--- subversion/bindings/swig/perl/native/Makefile.PL.in~ 2014-01-18 05:04:18.000000000 +0100
++++ subversion/bindings/swig/perl/native/Makefile.PL.in 2014-08-15 18:37:33.000000000 +0200
+@@ -76,10 +76,15 @@
+
chomp $apr_shlib_path_var;
-
+
+my $config_ccflags = $Config{ccflags};
+# remove any -arch arguments, since those
+# we want will already be in $cflags
@@ -257,10 +253,9 @@ Patch 1
Patch 2
-diff -u configure.ac configure.ac
---- configure.ac (working copy)
-+++ configure.ac (working copy)
-@@ -1446,6 +1446,10 @@
+--- configure.ac 2014-08-15 19:15:23.000000000 +0200
++++ configure.ac 2014-08-15 19:15:45.000000000 +0200
+@@ -1442,6 +1442,10 @@
# Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well.
SWIG_CPPFLAGS="$CPPFLAGS"
SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-no-cpp-precomp ])
@@ -269,5 +264,5 @@ diff -u configure.ac configure.ac
+SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-F\/[[^ ]]* ])
+SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-isystem\/[[^ ]]* ])
AC_SUBST([SWIG_CPPFLAGS])
-
+
dnl Since this is used only on Unix-y systems, define the path separator as '/'