Index: subversion/Makefile.in
===================================================================
--- subversion/Makefile.in	(revision 0)
+++ subversion/Makefile.in	(working copy)
@@ -596,7 +596,7 @@
            .po .spo .mo .rnc .rng .dtd .xsd .sql .h
 
 .sql.h:
-	$(top_srcdir)/build/transform_sql.sh $< < $< > $(top_srcdir)/$@
+	$(top_srcdir)/build/transform_sql.sh $< < $< > $(top_builddir)/subversion/$(notdir $@)
 
 .c.o:
 	$(COMPILE) -o $@ -c $<
Index: subversion/apr/network_io/unix/sockopt.c
===================================================================
--- subversion/apr/network_io/unix/sockopt.c	(revision 0)
+++ subversion/apr/network_io/unix/sockopt.c	(working copy)
@@ -346,7 +346,7 @@
 
 apr_status_t apr_socket_atmark(apr_socket_t *sock, int *atmark)
 {
-#ifndef BEOS_R5
+#if ! (defined BEOS_R5 | defined __VOS__)
     int oobmark;
 
     if (ioctl(sock->socketdes, SIOCATMARK, (void*) &oobmark) < 0)
Index: subversion/apr-util/xml/expat/Makefile.in
===================================================================
--- subversion/apr-util/xml/expat/Makefile.in	(revision 0)
+++ subversion/apr-util/xml/expat/Makefile.in	(working copy)
@@ -99,7 +99,7 @@
 	fi
 
 configure: configure.in
-	$(AUTOCONF)
+#	$(AUTOCONF)
 
 config.h: config.h.in config.status
 	CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADERS) \
Index: subversion/apr-util/xml/expat/conftools/config.guess
===================================================================
--- subversion/apr-util/xml/expat/conftools/config.guess	(revision 0)
+++ subversion/apr-util/xml/expat/conftools/config.guess	(working copy)
@@ -1040,6 +1040,10 @@
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
 	exit 0 ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
Index: subversion/serf/Makefile.in
===================================================================
--- subversion/serf/Makefile.in	(revision 0)
+++ subversion/serf/Makefile.in	(working copy)
@@ -49,7 +49,7 @@
 INSTALL = @INSTALL@
 
 LDFLAGS = @LDFLAGS@
-LIBS = @SERF_LIBS@ -lz -lssl -lcrypto
+LIBS = @SERF_LIBS@ -lssl -lcrypto -lz
 
 all: $(TARGET_LIB) $(PROGRAMS)
 
Index: subversion/neon/install-sh
===================================================================
--- subversion/neon/install-sh	(revision 0)
+++ subversion/neon/install-sh	(working copy)
@@ -220,7 +220,7 @@
 
 # Make a temp file name in the proper directory.
 
-	dsttmp=$dstdir/#inst.$$#
+	dsttmp=$dstdir/_inst.$$_
 
 # Move or copy the file name to the temp name
 
Index: subversion/sqlite-amalgamation/sqlite3.c
===================================================================
--- subversion/sqlite-amalgamation/sqlite3.c	(revision 0)
+++ subversion/sqlite-amalgamation/sqlite3.c	(working copy)
@@ -20644,6 +20644,9 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <errno.h>
+#ifdef __VOS__
+#include <utime.h>
+#endif
 
 #if SQLITE_ENABLE_LOCKING_STYLE
 # include <sys/ioctl.h>
@@ -22496,8 +22499,12 @@
     pFile->locktype = locktype;
 #if !OS_VXWORKS
     /* Always update the timestamp on the old file */
+#ifdef __VOS__
+    utime(zLockFile, NULL);
+#else
     utimes(zLockFile, NULL);
 #endif
+#endif
     return SQLITE_OK;
   }