diff -r 777251fa3676 -r a4474882bf60 components/subversion/Makefile
--- a/components/subversion/Makefile	Tue Apr 26 14:16:51 2011 -0700
+++ b/components/subversion/Makefile	Wed Apr 27 22:40:44 2011 -0700
@@ -25,12 +25,14 @@
 
 include ../../make-rules/shared-macros.mk
 
+PATH=$(dir $(CC)):/usr/bin:/usr/gnu/bin
+
 COMPONENT_NAME=		subversion
 COMPONENT_VERSION=	1.6.16
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:e957da04252d4d7e0fff72fdcf72c715bfbaa393
-COMPONENT_ARCHIVE_URL=	http://subversion.tigris.org/downloads/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	http://subversion.tigris.org/downloads/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
@@ -38,51 +40,30 @@
 
 PATCH_LEVEL = 0
 
-# We need to remove these environment files when
-# apache2, apr and apr-util move to Userland
-include $(COMPONENT_DIR)/apache.build.env
-include $(COMPONENT_DIR)/apr.build.env
-include $(COMPONENT_DIR)/apr-util.build.env
-
 PYMODS = client core delta fs ra repos wc
 
-ARCH = $(shell arch)
 PERL = /usr/perl5/bin/perl
-PLVER = 5.8.4
-PLARCH = $(ARCH)-solaris-64int
-PLDIR = /usr/perl5/$(PLVER)
-PLVENDORDIR = /usr/perl5/vendor_perl/$(PLVER)
-PLVENDORARCHDIR = $(PLVENDORDIR)/$(PLARCH)
+PERLARCH=$(shell $(PERL) -e 'use Config; print $$Config{archname}')
 PLMODS= Fs Core Wc Client Repos Ra Delta
-SWIGPROG = /usr/bin/swig
-ELFEDIT = /usr/bin/elfedit
+
 JAVA_ROOT = $(JAVA_HOME)
-PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig
-PROTOUSRSHAREJAVADIR = $(PROTOUSRSHAREDIR)/lib/java
-SVN_LDFLAGS = -R/usr/lib/svn:$(APR_USR_PREFIX)/lib:$(APR_UTIL_USR_PREFIX)/lib \
-		-L$(APR_USR_PREFIX)/lib \
-		-L$(APR_UTIL_USR_PREFIX)/lib \
-		-lc -lm -lsocket -lresolv -lnsl -lgen
 
-CFLAGS += -Xc -xnorunpath $(CC_BITS)
-CFLAGS += -features=extinl,extensions
+# because we can't seem to get -norunpath to the java bindings build any
+# other way.
+CXX += $(studio_NORUNPATH)
+
+CFLAGS += -features=extensions
 CFLAGS += -xustr=ascii_utf16_ushort -xcsi
-CFLAGS += $(studio_C99_ENABLE)
-CFLAGS += $(CPP_XPG6MODE)
-CXXFLAGS += $(CC_BITS)
-CXXFLAGS += -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic
-CXXFLAGS += -instances=global
+CXXFLAGS += -features=nestedaccess,tmplife,tmplrefstatic
 CXXFLAGS += -template=geninlinefuncs
 CXXFLAGS += -verbose=template
 CXXFLAGS += -xustr=ascii_utf16_ushort
-CXXFLAGS += -norunpath
-CXXFLAGS += $(PICFLAG)
+CXXFLAGS += $(CC_PIC)
 CXXFLAGS += -mt -D_REENTRANT -DNDEBUG -DSOLARIS
-CXXFLAGS += $(studio_cplusplus_C99_ENABLE)
-CXXFLAGS += $(CPP_XPG5MODE)
-CPPFLAGS += `pkg-config --cflags neon`
-CPPFLAGS += $(CPP_LARGEFILES) $(CPP_POSIX)
-CPPFLAGS += -DNDEBUG -DSOLARIS
+CFLAGS += `pkg-config --cflags neon`
+CFLAGS += $(CPP_LARGEFILES)
+
+PKG_MACROS += PERLARCH=$(PERLARCH)
 
 # Let's write some post-configure hacks
 COMPONENT_POST_CONFIGURE_ACTION = \
@@ -92,39 +73,23 @@
 
 COMPONENT_BUILD_TARGETS = all swig-py swig-pl javahl
 COMPONENT_INSTALL_TARGETS = install install-lib \
-			    install-swig-pl-lib install-swig-py \
+			    install-swig-pl install-swig-py \
 			    install-javahl install-javahl-lib \
 			    install-mods-shared \
 			    install-bin install-docs
 
 CONFIGURE_ENV += CC="$(CC)"
-CONFIGURE_ENV += CXX="$(CCC)"
+CONFIGURE_ENV += CXX="$(CXX)"
 CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
 CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)"
-CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
-CONFIGURE_ENV += CPP="$(CC) $(CPPFLAGS) $(CFLAGS) -E"
-CONFIGURE_ENV += CXXCPP="$(CCC) $(CPPFLAGS) $(CXXFLAGS) -E"
-CONFIGURE_ENV += LDFLAGS="$(SVN_LDFLAGS) $(LDFLAGS)"
-CONFIGURE_ENV += LD="$(CC) $(CFLAGS) $(LDFLAGS)"
-CONFIGURE_ENV += CCLD="$(CC) $(CFLAGS) $(LDFLAGS)"
-CONFIGURE_ENV += CXXLD="$(CCC) $(CXXFLAGS) $(LDFLAGS)"
-CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH_$(BITS))"
-CONFIGURE_ENV += SWIG_LDFLAGS="$(LDFLAGS) $(SWIG_LDFLAGS)"
-CONFIGURE_ENV += NEON_LIBS="`pkg-config --libs neon`"
+CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
 CONFIGURE_ENV += PYTHON="$(PYTHON)"
 CONFIGURE_ENV += PYMODS="$(PYMODS)"
 CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES)"
 CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)"
 CONFIGURE_ENV += PERL="$(PERL)"
-CONFIGURE_ENV += PLARCH="$(PLARCH)"
-CONFIGURE_ENV += PLVER="$(PLVER)"
-CONFIGURE_ENV += PLDIR="$(PLDIR)"
-CONFIGURE_ENV += PLVENDORDIR="$(PLVENDORDIR)"
-CONFIGURE_ENV += PLVENDORARCHDIR="$(PLVENDORARCHDIR)"
 CONFIGURE_ENV += PLMODS="$(PLMODS)"
 
-LD_OPTIONS += $(SVN_LDFLAGS) $(SWIG_LDFLAGS)
-
 # Let's make noise just because we have to override --libdir
 CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)
@@ -137,41 +102,22 @@
 CONFIGURE_OPTIONS += --disable-libtool-lock 
 CONFIGURE_OPTIONS += --disable-neon-version-check
 CONFIGURE_OPTIONS += --disable-experimental-libtool
-CONFIGURE_OPTIONS += --with-apxs=$(APACHE_USR_PREFIX)/bin/apxs
+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=$(APR_USR_PREFIX)
-CONFIGURE_OPTIONS += --with-apr-util=$(APR_UTIL_USR_PREFIX)
+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
 CONFIGURE_OPTIONS += --with-swig
 CONFIGURE_OPTIONS += --with-neon=$(CONFIGURE_PREFIX)
 
-# elfedit to remove the wrong RUNPATH/RPATH from the C++ library
-COMPONENT_POST_INSTALL_ACTION = \
-	( cd $(PROTO_DIR)/$(CONFIGURE_INCLUDEDIR) ; \
-	    $(MV) subversion-1 svn ; \
-	    cd $(PROTOUSRLIBDIR)/svn ; \
-	    $(ELFEDIT) -e 'dyn:runpath /usr/lib/svn:/usr/apr/1.3/lib:/usr/apr-util/1.3/lib' libsvnjavahl-1.so.0.0.0 ; \
-	    $(ELFEDIT) -e 'dyn:rpath /usr/lib/svn:/usr/apr/1.3/lib:/usr/apr-util/1.3/lib' libsvnjavahl-1.so.0.0.0 )
-
-# Perl target
-install_perl:
-	$(PERL) -MExtUtils::Install -e \
-	    'install({@ARGV}, '\''0'\'', 0, '\''0'\'');' \
-	    $(BUILD_DIR_32)/subversion/bindings/swig/perl/native/blib/lib $(PROTO_DIR)/$(PLVENDORDIR) \
-	    $(BUILD_DIR_32)/subversion/bindings/swig/perl/native/blib/arch $(PROTO_DIR)/$(PLVENDORDIR)/$(PLARCH) \
-	    $(BUILD_DIR_32)/subversion/bindings/swig/perl/native/blib/man3 $(PROTO_DIR)/$(PLDIR)/man/man3
-
 # common targets - we only build 32-bit subversion
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) install_perl
-	$(MKDIR) $(PROTOUSRSHAREJAVADIR) ; \
-	$(INSTALL) -m 0644 $(PROTOUSRLIBDIR)/svn/svn-javahl/svn-javahl.jar \
-	    $(PROTOUSRSHAREJAVADIR)/
+install:	$(INSTALL_32)
 
 test:		$(TEST_32)