--- a/components/subversion/Makefile	Thu Mar 19 03:21:25 2015 -0700
+++ b/components/subversion/Makefile	Fri Mar 20 14:10:33 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -28,23 +28,25 @@
 PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
 
 COMPONENT_NAME=		subversion
-COMPONENT_VERSION=	1.7.19
+COMPONENT_VERSION=	1.7.5
 COMPONENT_PROJECT_URL=	http://subversion.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:184246bf5ccd0cb31f296b87fdae72617e445901b468529e638b919ca4012d4f
+	sha256:cb102a437335a8921f00cef9bf730d84527713f1a5091e3e1eb2f16402f85dc1
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/subversion/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/svn
-TPNO=			21233
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
 PATCH_LEVEL = 0
+
 PYMODS = client core delta fs ra repos wc
+
 PLMODS= Fs Core Wc Client Repos Ra Delta
+
 JAVA_ROOT = $(JAVA_HOME)
 
 # because we can't seem to get -norunpath to the java bindings build any
@@ -52,16 +54,16 @@
 CXX += $(studio_NORUNPATH)
 
 CFLAGS += -features=extensions
+CFLAGS += -xustr=ascii_utf16_ushort -xcsi
 CXXFLAGS += -features=nestedaccess,tmplife,tmplrefstatic
 CXXFLAGS += -template=geninlinefuncs
+CXXFLAGS += -verbose=template
+CXXFLAGS += -xustr=ascii_utf16_ushort
 CXXFLAGS += $(CC_PIC)
 CXXFLAGS += -mt -D_REENTRANT -DNDEBUG -DSOLARIS
 CFLAGS += `pkg-config --cflags neon`
 CFLAGS += $(CPP_LARGEFILES)
 
-APR_VERSION = 1.3
-APR_UTIL_VERSION = 1.3
-
 # Let's write some post-configure hacks
 COMPONENT_POST_CONFIGURE_ACTION = \
     ( $(CLONEY) $(SOURCE_DIR) $(@D) ; \
@@ -86,20 +88,6 @@
 CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)"
 CONFIGURE_ENV += PERL="$(PERL)"
 CONFIGURE_ENV += PLMODS="$(PLMODS)"
-
-LIBSVNDIR.32 = $(CONFIGURE_PREFIX)/lib/svn
-APR-CONFIG.32 = /usr/apr/$(APR_VERSION)/bin/apr-1-config
-APU-CONFIG.32 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/apu-1-config
-APXS.32 = /usr/apache2/2.2/bin/apxs
-APR-CONFIG-RPATH.32 = /usr/apr/$(APR_VERSION)/lib
-APU-CONFIG-RPATH.32 = /usr/apr-util/$(APR_VERSION)/lib
-APACHE_LIBEXECDIR.32 = `$(APXS.32) -q libexecdir`
-
-LDFLAGS += -R$(LIBSVNDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \
-	   -R$(APU-CONFIG-RPATH.$(BITS))
-
-CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)"
-
 # Current version of subversion only supports ruby 1.8, not 1.9.
 # Until subversion is updated to 1.8.0 (ruby 1.9 support added)
 # or later, use ruby 1.8.
@@ -110,19 +98,19 @@
 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)
 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS))
 CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_SBINDIR.$(BITS))
-CONFIGURE_OPTIONS += --libdir=$(LIBSVNDIR.$(BITS))
+CONFIGURE_OPTIONS += --libdir=$(CONFIGURE_PREFIX)/lib/svn
 CONFIGURE_OPTIONS += --localstatedir=/var
 CONFIGURE_OPTIONS += --enable-shared 
 CONFIGURE_OPTIONS += --disable-static
 CONFIGURE_OPTIONS += --disable-libtool-lock 
 CONFIGURE_OPTIONS += --disable-neon-version-check
 CONFIGURE_OPTIONS += --disable-experimental-libtool
-CONFIGURE_OPTIONS += --with-apxs=$(APXS.$(BITS))
+CONFIGURE_OPTIONS += --with-apxs=/usr/apache2/2.2/bin/apxs
 CONFIGURE_OPTIONS += --with-ssl 
 CONFIGURE_OPTIONS += --with-zlib=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS += --with-jdk=$(JAVA_ROOT)
-CONFIGURE_OPTIONS += --with-apr=/usr/apr/$(APR_VERSION)
-CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/$(APR_UTIL_VERSION)
+CONFIGURE_OPTIONS += --with-apr=/usr/apr/1.3
+CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/1.3
 CONFIGURE_OPTIONS += --enable-nls
 CONFIGURE_OPTIONS += --disable-mod-activation
 CONFIGURE_OPTIONS += --enable-javahl