(1) Update to 1.5.4

  (2) Create SVNUSER in cases when SVHGROUP is created [1]
  (3) Change default repository path to "/home/svn/repos" in svnwrapper [1]
  (4) Fix typo [2]

PR:		[1] ports/122972, [2] ports/127347

10 files changed, 132 insertions, 116 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 1fc3e76cc38d..39aeb2884761 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -108,10 +108,10 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 .if defined(WITH_REPOSITORY_CREATION)
-	@${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group."
+	@${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
+	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with user '${SVNUSER}' and group '${SVNGROUP}'."
 	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
 	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
 .else
@@ -133,7 +133,7 @@ pre-everything::
 	@${ECHO_MSG} "asvn will be installed"
 	@${ECHO_MSG} ""
 .endif
-	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}}"
+	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
 
 pre-configure:
 	@if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \
@@ -203,17 +203,29 @@ _mkrepos:	.USE
 	        ${FALSE}; \
 	    fi; \
 	fi
+	@if /usr/sbin/pw usershow "${SVNUSER}" >/dev/null 2>&1; then \
+	    ${ECHO_MSG} "You already have a user \"${SVNUSER}\", so I will use it."; \
+	else \
+	    if /usr/sbin/pw useradd ${SVNUSER} -h -; \
+	    then \
+	        ${ECHO_MSG} "Added user \"${SVNUSER}\"."; \
+	    else \
+	        ${ECHO_MSG} "Adding user \"${SVNUSER}\" failed..."; \
+	        ${ECHO_MSG} "Please create it, and try again."; \
+	        ${FALSE}; \
+	    fi; \
+	fi
 .endif
 	@${MKDIR} ${SVNREPOS}
 	@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
 .if defined(WITH_SVNSERVE_WRAPPER)
-	@${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
+	@${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES}
 	@${CHMOD} g+w ${SVNGRPFILES}
 	@for i in ${SVNREPOS}/db/* ; do \
 	    i=$${i##*/}; \
 	    case $$i in \
 	    DB_CONFIG|fs-type|uuid) ;; \
-	    *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
+	    *) ${CHOWN} -R ${SVNUSER}:${SVNGROUP} ${SVNREPOS}/db/$$i; \
 	       ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
 	       ;; \
 	    esac; \
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index a629f98c7e0e..e383d3e9e14b 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.5.2
+PORTVERSION=	1.5.4
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
@@ -62,10 +62,12 @@ WITH_APACHE2_APR=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=	MOD_DAV_SVN=""
 SVNGROUP?=	www
+SVNGUSER?=	www
 .else
 PLIST_SUB+=	MOD_DAV_SVN="@comment "
 PKGDEINSTALL=	NONEXISTENT
 SVNGROUP?=	svn
+SVNUSER?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index bd235b65ddbb..f5a1ab8847fc 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,12 +1,6 @@
-MD5 (subversion/subversion-1.5.2.tar.bz2) = 8321d0e1964846090f0174cb6bb18838
-SHA256 (subversion/subversion-1.5.2.tar.bz2) = 7c4c439035cd75722fa3da27433e2c3a4a2dc88694982a5ceb1ce5169982c7f5
-SIZE (subversion/subversion-1.5.2.tar.bz2) = 4902078
-MD5 (subversion/svn-book-html.tar.bz2) = eda5fa7d7e3aff9473adf063385d3527
-SHA256 (subversion/svn-book-html.tar.bz2) = a73110c724ee7fca4ab0e6090f0a47fdd3a03cfdfbecab799aca90c80824d9e0
-SIZE (subversion/svn-book-html.tar.bz2) = 366277
-MD5 (subversion/svn-book.pdf) = b4f04dfc6cae59212c255322e4fa27a4
-SHA256 (subversion/svn-book.pdf) = d3fffd8191d62faf2a571cfe96bdadc772ff90bd5e32364f888f9b2d7fd81b5d
-SIZE (subversion/svn-book.pdf) = 1462807
+MD5 (subversion/subversion-1.5.4.tar.bz2) = 037d1ed7a313631d50defdc3cf727415
+SHA256 (subversion/subversion-1.5.4.tar.bz2) = e24b6257b53988287471f83689846018e8e7b1e1c713da2567ab57b99e45fb40
+SIZE (subversion/subversion-1.5.4.tar.bz2) = 4925141
 MD5 (subversion/svn_hacks_1.1.diff) = c936ad112897d698c6b3c066c8f93606
 SHA256 (subversion/svn_hacks_1.1.diff) = cbc4503e4f6a624ec40d23b8b8444ced84d71482308c4c08e3cce6f3452b64cb
 SIZE (subversion/svn_hacks_1.1.diff) = 17813
diff --git a/devel/subversion/files/build-outputs.mk b/devel/subversion/files/build-outputs.mk
index 5fa4eae6bc0d..14fa53a3e3ca 100644
--- a/devel/subversion/files/build-outputs.mk
+++ b/devel/subversion/files/build-outputs.mk
@@ -150,31 +150,31 @@ subversion/tests/libsvn_subr/hashdump-test$(EXEEXT): $(hashdump_test_DEPS)
 
 javahl_java_PATH = subversion/bindings/javahl/classes
 javahl_java_HEADERS = 
-javahl_java_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LockStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InfoCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DirEntry.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/OutputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressListener.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdmin.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CopySource.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Status.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientSynchronized.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Depth.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ScheduleKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ErrorCodes.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Mergeinfo.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/MergeinfoLogKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PropertyData.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummaryReceiver.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Lock.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNOutputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NodeKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessageCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNInputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ListCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Path.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangePath.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Revision.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionRange.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyInformation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogDate.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyAction.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientLogLevel.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangelistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResolverCallback.class
+javahl_java_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ListCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Path.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdmin.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InfoCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyInformation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ScheduleKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNInputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogDate.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DirEntry.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummaryReceiver.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNOutputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResolverCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NodeKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientLogLevel.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyAction.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangePath.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Status.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionRange.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/OutputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Mergeinfo.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PropertyData.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LockStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CopySource.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ErrorCodes.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressListener.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/MergeinfoLogKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Depth.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientSynchronized.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangelistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessageCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Revision.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Lock.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyStatus.class
 javahl_java_DEPS = $(javahl_java_HEADERS) $(javahl_java_OBJECTS)  
 javahl-java: $(javahl_java_DEPS)
-javahl_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LockStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InfoCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressListener.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeResources.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummaryReceiver.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SubversionException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword3.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNOutputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNInputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ListCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientLogLevel.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/JNIError.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java
+javahl_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ListCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SubversionException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InfoCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNInputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummaryReceiver.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNOutputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeResources.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientLogLevel.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword3.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/JNIError.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LockStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressListener.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java
 $(javahl_java_OBJECTS): $(javahl_java_SRC)
 	$(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_java_CLASSPATH) $(javahl_java_SRC)
 
 
 javahl_javah_PATH = subversion/bindings/javahl/include
-javahl_javah_HEADERS = subversion/bindings/javahl/include/org_tigris_subversion_javahl_LockStatus.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_InfoCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DirEntry.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_OutputInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProgressListener.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNAdmin.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictResult.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogMessage.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ClientException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CopySource.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Status.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientSynchronized.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProplistCallbackImpl.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Depth.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Notify2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ScheduleKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NativeResources.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ErrorCodes.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_InputInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Mergeinfo.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_MergeinfoLogKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitItem.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PropertyData.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DiffSummaryReceiver.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Notify.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyStatus.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SubversionException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Version.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword3.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallback2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Lock.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Info.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_RevisionKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Info2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallbackImpl.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NativeException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClient.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_StatusCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNOutputStream.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NodeKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogMessageCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNInputStream.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ListCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DiffSummary.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Path.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ChangePath.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Revision.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_RevisionRange.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyInformation.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogDate.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProplistCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyAction.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientLogLevel.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_JNIError.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProgressEvent.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_StatusKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitMessage.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ChangelistCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictResolverCallback.h
+javahl_javah_HEADERS = subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallback2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Notify2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ListCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitMessage.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Path.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SubversionException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNAdmin.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Info.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_InfoCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyInformation.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProgressEvent.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProplistCallbackImpl.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictResult.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DiffSummary.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ScheduleKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNInputStream.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogDate.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DirEntry.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NativeException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DiffSummaryReceiver.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNOutputStream.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitItem.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NativeResources.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictResolverCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NodeKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientLogLevel.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogMessage.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword3.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ClientException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyAction.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ChangePath.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProplistCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Status.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_JNIError.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_RevisionRange.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_OutputInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Info2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_StatusCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClient.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_RevisionKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Notify.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Mergeinfo.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PropertyData.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallbackImpl.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_InputInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_StatusKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LockStatus.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CopySource.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ErrorCodes.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProgressListener.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Version.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_MergeinfoLogKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Depth.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientSynchronized.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ChangelistCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogMessageCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Revision.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Lock.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyStatus.h
 javahl_javah_OBJECTS = 
 javahl_javah_DEPS = $(javahl_javah_HEADERS) $(javahl_javah_OBJECTS) $(javahl_java_DEPS) 
 javahl-javah: $(javahl_javah_DEPS)
-javahl_javah_CLASS_FILENAMES = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LockStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InfoCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DirEntry.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/OutputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressListener.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdmin.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CopySource.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Status.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientSynchronized.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Depth.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ScheduleKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ErrorCodes.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Mergeinfo.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/MergeinfoLogKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PropertyData.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummaryReceiver.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Lock.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNOutputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NodeKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessageCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNInputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ListCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Path.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangePath.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Revision.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionRange.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyInformation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogDate.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyAction.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientLogLevel.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangelistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResolverCallback.class
-javahl_javah_CLASSES = org.tigris.subversion.javahl.LockStatus org.tigris.subversion.javahl.InfoCallback org.tigris.subversion.javahl.DirEntry org.tigris.subversion.javahl.OutputInterface org.tigris.subversion.javahl.ProgressListener org.tigris.subversion.javahl.SVNAdmin org.tigris.subversion.javahl.ConflictResult org.tigris.subversion.javahl.LogMessage org.tigris.subversion.javahl.PromptUserPassword2 org.tigris.subversion.javahl.PromptUserPassword org.tigris.subversion.javahl.ClientException org.tigris.subversion.javahl.CopySource org.tigris.subversion.javahl.CommitItemStateFlags org.tigris.subversion.javahl.Status org.tigris.subversion.javahl.SVNClientSynchronized org.tigris.subversion.javahl.ProplistCallbackImpl org.tigris.subversion.javahl.Depth org.tigris.subversion.javahl.Notify2 org.tigris.subversion.javahl.ScheduleKind org.tigris.subversion.javahl.NativeResources org.tigris.subversion.javahl.ErrorCodes org.tigris.subversion.javahl.InputInterface org.tigris.subversion.javahl.Mergeinfo org.tigris.subversion.javahl.MergeinfoLogKind org.tigris.subversion.javahl.ConflictDescriptor org.tigris.subversion.javahl.CommitItem org.tigris.subversion.javahl.PropertyData org.tigris.subversion.javahl.DiffSummaryReceiver org.tigris.subversion.javahl.Notify org.tigris.subversion.javahl.NotifyStatus org.tigris.subversion.javahl.SubversionException org.tigris.subversion.javahl.SVNClientInterface org.tigris.subversion.javahl.Version org.tigris.subversion.javahl.PromptUserPassword3 org.tigris.subversion.javahl.BlameCallback2 org.tigris.subversion.javahl.Lock org.tigris.subversion.javahl.Info org.tigris.subversion.javahl.RevisionKind org.tigris.subversion.javahl.Info2 org.tigris.subversion.javahl.BlameCallbackImpl org.tigris.subversion.javahl.NativeException org.tigris.subversion.javahl.SVNClient org.tigris.subversion.javahl.StatusCallback org.tigris.subversion.javahl.SVNOutputStream org.tigris.subversion.javahl.NodeKind org.tigris.subversion.javahl.BlameCallback org.tigris.subversion.javahl.LogMessageCallback org.tigris.subversion.javahl.SVNInputStream org.tigris.subversion.javahl.ListCallback org.tigris.subversion.javahl.DiffSummary org.tigris.subversion.javahl.Path org.tigris.subversion.javahl.ChangePath org.tigris.subversion.javahl.Revision org.tigris.subversion.javahl.RevisionRange org.tigris.subversion.javahl.NotifyInformation org.tigris.subversion.javahl.LogDate org.tigris.subversion.javahl.ProplistCallback org.tigris.subversion.javahl.NotifyAction org.tigris.subversion.javahl.SVNClientLogLevel org.tigris.subversion.javahl.JNIError org.tigris.subversion.javahl.ProgressEvent org.tigris.subversion.javahl.StatusKind org.tigris.subversion.javahl.CommitMessage org.tigris.subversion.javahl.ChangelistCallback org.tigris.subversion.javahl.ConflictResolverCallback
+javahl_javah_CLASS_FILENAMES = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ListCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Path.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdmin.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InfoCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyInformation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ScheduleKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNInputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogDate.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DirEntry.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummaryReceiver.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNOutputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResolverCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NodeKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientLogLevel.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyAction.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangePath.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Status.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionRange.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/OutputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Mergeinfo.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PropertyData.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LockStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CopySource.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ErrorCodes.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressListener.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/MergeinfoLogKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Depth.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientSynchronized.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangelistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessageCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Revision.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Lock.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyStatus.class
+javahl_javah_CLASSES = org.tigris.subversion.javahl.BlameCallback2 org.tigris.subversion.javahl.ConflictDescriptor org.tigris.subversion.javahl.Notify2 org.tigris.subversion.javahl.ListCallback org.tigris.subversion.javahl.CommitMessage org.tigris.subversion.javahl.Path org.tigris.subversion.javahl.SubversionException org.tigris.subversion.javahl.SVNAdmin org.tigris.subversion.javahl.Info org.tigris.subversion.javahl.InfoCallback org.tigris.subversion.javahl.NotifyInformation org.tigris.subversion.javahl.ProgressEvent org.tigris.subversion.javahl.ProplistCallbackImpl org.tigris.subversion.javahl.ConflictResult org.tigris.subversion.javahl.DiffSummary org.tigris.subversion.javahl.ScheduleKind org.tigris.subversion.javahl.SVNInputStream org.tigris.subversion.javahl.SVNClientInterface org.tigris.subversion.javahl.LogDate org.tigris.subversion.javahl.DirEntry org.tigris.subversion.javahl.NativeException org.tigris.subversion.javahl.DiffSummaryReceiver org.tigris.subversion.javahl.SVNOutputStream org.tigris.subversion.javahl.CommitItem org.tigris.subversion.javahl.NativeResources org.tigris.subversion.javahl.ConflictResolverCallback org.tigris.subversion.javahl.NodeKind org.tigris.subversion.javahl.SVNClientLogLevel org.tigris.subversion.javahl.LogMessage org.tigris.subversion.javahl.PromptUserPassword3 org.tigris.subversion.javahl.ClientException org.tigris.subversion.javahl.NotifyAction org.tigris.subversion.javahl.ChangePath org.tigris.subversion.javahl.ProplistCallback org.tigris.subversion.javahl.PromptUserPassword2 org.tigris.subversion.javahl.Status org.tigris.subversion.javahl.JNIError org.tigris.subversion.javahl.BlameCallback org.tigris.subversion.javahl.RevisionRange org.tigris.subversion.javahl.OutputInterface org.tigris.subversion.javahl.Info2 org.tigris.subversion.javahl.StatusCallback org.tigris.subversion.javahl.SVNClient org.tigris.subversion.javahl.RevisionKind org.tigris.subversion.javahl.Notify org.tigris.subversion.javahl.Mergeinfo org.tigris.subversion.javahl.PropertyData org.tigris.subversion.javahl.BlameCallbackImpl org.tigris.subversion.javahl.InputInterface org.tigris.subversion.javahl.StatusKind org.tigris.subversion.javahl.LockStatus org.tigris.subversion.javahl.CopySource org.tigris.subversion.javahl.ErrorCodes org.tigris.subversion.javahl.ProgressListener org.tigris.subversion.javahl.Version org.tigris.subversion.javahl.MergeinfoLogKind org.tigris.subversion.javahl.Depth org.tigris.subversion.javahl.SVNClientSynchronized org.tigris.subversion.javahl.CommitItemStateFlags org.tigris.subversion.javahl.ChangelistCallback org.tigris.subversion.javahl.LogMessageCallback org.tigris.subversion.javahl.PromptUserPassword org.tigris.subversion.javahl.Revision org.tigris.subversion.javahl.Lock org.tigris.subversion.javahl.NotifyStatus
 $(javahl_javah_HEADERS): $(javahl_javah_CLASS_FILENAMES)
 	$(COMPILE_JAVAHL_JAVAH) -force -d subversion/bindings/javahl/include -classpath subversion/bindings/javahl/classes:$(javahl_javah_CLASSPATH) $(javahl_javah_CLASSES)
 
 
 javahl_tests_PATH = subversion/bindings/javahl/classes
 javahl_tests_HEADERS = 
-javahl_tests_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BasicTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdminTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/WC.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RunTests.class
+javahl_tests_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RunTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BasicTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/WC.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdminTests.class
 javahl_tests_DEPS = $(javahl_tests_HEADERS) $(javahl_tests_OBJECTS)  
 javahl-tests: $(javahl_tests_DEPS)
-javahl_tests_SRC = $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java
+javahl_tests_SRC = $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java
 $(javahl_tests_OBJECTS): $(javahl_tests_SRC)
 	$(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_tests_CLASSPATH) $(javahl_tests_SRC)
 
@@ -699,7 +699,7 @@ install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_
 	cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
 	cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
 
-install-mods-static: subversion/libsvn_delta/libsvn_delta-1.la-a subversion/libsvn_fs/libsvn_fs-1.la-a subversion/libsvn_repos/libsvn_repos-1.la-a subversion/libsvn_subr/libsvn_subr-1.la-a subversion/mod_authz_svn/mod_authz_svn.la-a subversion/mod_dav_svn/mod_dav_svn.la-a subversion/mod_dav_svn/static/Makefile.in subversion/mod_dav_svn/static/config.m4
+install-mods-static: subversion/libsvn_delta/libsvn_delta-1.la-a subversion/libsvn_fs/libsvn_fs-1.la-a subversion/libsvn_repos/libsvn_repos-1.la-a subversion/libsvn_subr/libsvn_subr-1.la-a subversion/mod_authz_svn/mod_authz_svn.la-a subversion/mod_dav_svn/mod_dav_svn.la-a subversion/mod_dav_svn/static/config.m4 subversion/mod_dav_svn/static/Makefile.in
 	$(MKDIR) $(DESTDIR)$(APACHE_TARGET)/.libs
 	$(INSTALL_MOD_STATIC) subversion/libsvn_delta/.libs/libsvn_delta-1.a $(DESTDIR)$(APACHE_TARGET)/.libs/libsvn_delta-1.a
 	$(INSTALL_MOD_STATIC) subversion/libsvn_delta/libsvn_delta-1.la-a $(DESTDIR)$(APACHE_TARGET)/libsvn_delta-1.la
@@ -713,8 +713,8 @@ install-mods-static: subversion/libsvn_delta/libsvn_delta-1.la-a subversion/libs
 	$(INSTALL_MOD_STATIC) subversion/mod_authz_svn/mod_authz_svn.la-a $(DESTDIR)$(APACHE_TARGET)/mod_authz_svn.la
 	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/.libs/mod_dav_svn.a $(DESTDIR)$(APACHE_TARGET)/.libs/mod_dav_svn.a
 	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/mod_dav_svn.la-a $(DESTDIR)$(APACHE_TARGET)/mod_dav_svn.la
-	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/static/Makefile.in $(DESTDIR)$(APACHE_TARGET)/Makefile.in
 	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/static/config.m4 $(DESTDIR)$(APACHE_TARGET)/config.m4
+	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/static/Makefile.in $(DESTDIR)$(APACHE_TARGET)/Makefile.in
 
 install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
 	$(MKDIR) $(DESTDIR)$(bdb_libdir)
@@ -857,47 +857,47 @@ install-tools: tools/server-side/svn-populate-node-origins-index$(EXEEXT) contri
 # Section 8: The install-include rule
 ########################################
 
-install-include: subversion/include/svn_ra.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_wc.h subversion/include/svn_cmdline.h subversion/include/mod_authz_svn.h subversion/include/svn_types.h subversion/include/svn_auth.h subversion/include/svn_compat.h subversion/include/svn_subst.h subversion/include/svn_ctype.h subversion/include/svn_quoprint.h subversion/include/svn_pools.h subversion/include/mod_dav_svn.h subversion/include/svn_md5.h subversion/include/svn_base64.h subversion/include/svn_client.h subversion/include/svn_iter.h subversion/include/svn_utf.h subversion/include/svn_error_codes.h subversion/include/svn_opt.h subversion/include/svn_user.h subversion/include/svn_ra_svn.h subversion/include/svn_nls.h subversion/include/svn_fs.h subversion/include/svn_xml.h subversion/include/svn_sorts.h subversion/include/svn_delta.h subversion/include/svn_hash.h subversion/include/svn_props.h subversion/include/svn_config.h subversion/include/svn_diff.h subversion/include/svn_version.h subversion/include/svn_io.h subversion/include/svn_dso.h subversion/include/svn_mergeinfo.h subversion/include/svn_time.h subversion/include/svn_repos.h subversion/include/svn_dav.h subversion/include/svn_error.h
+install-include: subversion/include/svn_time.h subversion/include/svn_ctype.h subversion/include/svn_dso.h subversion/include/svn_version.h subversion/include/svn_ra_svn.h subversion/include/mod_dav_svn.h subversion/include/svn_compat.h subversion/include/svn_wc.h subversion/include/svn_props.h subversion/include/svn_error_codes.h subversion/include/mod_authz_svn.h subversion/include/svn_opt.h subversion/include/svn_repos.h subversion/include/svn_base64.h subversion/include/svn_nls.h subversion/include/svn_diff.h subversion/include/svn_iter.h subversion/include/svn_ra.h subversion/include/svn_quoprint.h subversion/include/svn_config.h subversion/include/svn_user.h subversion/include/svn_sorts.h subversion/include/svn_io.h subversion/include/svn_client.h subversion/include/svn_dav.h subversion/include/svn_pools.h subversion/include/svn_mergeinfo.h subversion/include/svn_fs.h subversion/include/svn_delta.h subversion/include/svn_path.h subversion/include/svn_hash.h subversion/include/svn_string.h subversion/include/svn_cmdline.h subversion/include/svn_auth.h subversion/include/svn_xml.h subversion/include/svn_subst.h subversion/include/svn_md5.h subversion/include/svn_utf.h subversion/include/svn_types.h subversion/include/svn_error.h
 	$(MKDIR) $(DESTDIR)$(includedir)/subversion-1
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ra.h $(DESTDIR)$(includedir)/subversion-1/svn_ra.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_path.h $(DESTDIR)$(includedir)/subversion-1/svn_path.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_string.h $(DESTDIR)$(includedir)/subversion-1/svn_string.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_wc.h $(DESTDIR)$(includedir)/subversion-1/svn_wc.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_cmdline.h $(DESTDIR)$(includedir)/subversion-1/svn_cmdline.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/mod_authz_svn.h $(DESTDIR)$(includedir)/subversion-1/mod_authz_svn.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_types.h $(DESTDIR)$(includedir)/subversion-1/svn_types.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_auth.h $(DESTDIR)$(includedir)/subversion-1/svn_auth.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_compat.h $(DESTDIR)$(includedir)/subversion-1/svn_compat.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_subst.h $(DESTDIR)$(includedir)/subversion-1/svn_subst.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_time.h $(DESTDIR)$(includedir)/subversion-1/svn_time.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ctype.h $(DESTDIR)$(includedir)/subversion-1/svn_ctype.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_quoprint.h $(DESTDIR)$(includedir)/subversion-1/svn_quoprint.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_pools.h $(DESTDIR)$(includedir)/subversion-1/svn_pools.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_dso.h $(DESTDIR)$(includedir)/subversion-1/svn_dso.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_version.h $(DESTDIR)$(includedir)/subversion-1/svn_version.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ra_svn.h $(DESTDIR)$(includedir)/subversion-1/svn_ra_svn.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/mod_dav_svn.h $(DESTDIR)$(includedir)/subversion-1/mod_dav_svn.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_md5.h $(DESTDIR)$(includedir)/subversion-1/svn_md5.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_base64.h $(DESTDIR)$(includedir)/subversion-1/svn_base64.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_client.h $(DESTDIR)$(includedir)/subversion-1/svn_client.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_iter.h $(DESTDIR)$(includedir)/subversion-1/svn_iter.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_utf.h $(DESTDIR)$(includedir)/subversion-1/svn_utf.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_compat.h $(DESTDIR)$(includedir)/subversion-1/svn_compat.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_wc.h $(DESTDIR)$(includedir)/subversion-1/svn_wc.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_props.h $(DESTDIR)$(includedir)/subversion-1/svn_props.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_error_codes.h $(DESTDIR)$(includedir)/subversion-1/svn_error_codes.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/mod_authz_svn.h $(DESTDIR)$(includedir)/subversion-1/mod_authz_svn.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_opt.h $(DESTDIR)$(includedir)/subversion-1/svn_opt.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_user.h $(DESTDIR)$(includedir)/subversion-1/svn_user.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ra_svn.h $(DESTDIR)$(includedir)/subversion-1/svn_ra_svn.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_repos.h $(DESTDIR)$(includedir)/subversion-1/svn_repos.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_base64.h $(DESTDIR)$(includedir)/subversion-1/svn_base64.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_nls.h $(DESTDIR)$(includedir)/subversion-1/svn_nls.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_fs.h $(DESTDIR)$(includedir)/subversion-1/svn_fs.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_xml.h $(DESTDIR)$(includedir)/subversion-1/svn_xml.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_sorts.h $(DESTDIR)$(includedir)/subversion-1/svn_sorts.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_delta.h $(DESTDIR)$(includedir)/subversion-1/svn_delta.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_hash.h $(DESTDIR)$(includedir)/subversion-1/svn_hash.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_props.h $(DESTDIR)$(includedir)/subversion-1/svn_props.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_config.h $(DESTDIR)$(includedir)/subversion-1/svn_config.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_diff.h $(DESTDIR)$(includedir)/subversion-1/svn_diff.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_version.h $(DESTDIR)$(includedir)/subversion-1/svn_version.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_iter.h $(DESTDIR)$(includedir)/subversion-1/svn_iter.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ra.h $(DESTDIR)$(includedir)/subversion-1/svn_ra.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_quoprint.h $(DESTDIR)$(includedir)/subversion-1/svn_quoprint.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_config.h $(DESTDIR)$(includedir)/subversion-1/svn_config.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_user.h $(DESTDIR)$(includedir)/subversion-1/svn_user.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_sorts.h $(DESTDIR)$(includedir)/subversion-1/svn_sorts.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_io.h $(DESTDIR)$(includedir)/subversion-1/svn_io.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_dso.h $(DESTDIR)$(includedir)/subversion-1/svn_dso.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_mergeinfo.h $(DESTDIR)$(includedir)/subversion-1/svn_mergeinfo.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_time.h $(DESTDIR)$(includedir)/subversion-1/svn_time.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_repos.h $(DESTDIR)$(includedir)/subversion-1/svn_repos.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_client.h $(DESTDIR)$(includedir)/subversion-1/svn_client.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_dav.h $(DESTDIR)$(includedir)/subversion-1/svn_dav.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_pools.h $(DESTDIR)$(includedir)/subversion-1/svn_pools.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_mergeinfo.h $(DESTDIR)$(includedir)/subversion-1/svn_mergeinfo.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_fs.h $(DESTDIR)$(includedir)/subversion-1/svn_fs.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_delta.h $(DESTDIR)$(includedir)/subversion-1/svn_delta.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_path.h $(DESTDIR)$(includedir)/subversion-1/svn_path.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_hash.h $(DESTDIR)$(includedir)/subversion-1/svn_hash.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_string.h $(DESTDIR)$(includedir)/subversion-1/svn_string.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_cmdline.h $(DESTDIR)$(includedir)/subversion-1/svn_cmdline.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_auth.h $(DESTDIR)$(includedir)/subversion-1/svn_auth.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_xml.h $(DESTDIR)$(includedir)/subversion-1/svn_xml.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_subst.h $(DESTDIR)$(includedir)/subversion-1/svn_subst.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_md5.h $(DESTDIR)$(includedir)/subversion-1/svn_md5.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_utf.h $(DESTDIR)$(includedir)/subversion-1/svn_utf.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_types.h $(DESTDIR)$(includedir)/subversion-1/svn_types.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_error.h $(DESTDIR)$(includedir)/subversion-1/svn_error.h
 
 ########################################
@@ -1706,7 +1706,7 @@ subversion/libsvn_ra_neon/props.lo: subversion/libsvn_ra_neon/props.c subversion
 
 subversion/libsvn_ra_neon/replay.lo: subversion/libsvn_ra_neon/replay.c subversion/include/private/svn_dav_protocol.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_neon/ra_neon.h subversion/svn_private_config.h
 
-subversion/libsvn_ra_neon/session.lo: subversion/libsvn_ra_neon/session.c subversion/include/private/svn_dav_protocol.h subversion/include/svn_auth.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_neon/ra_neon.h subversion/svn_private_config.h
+subversion/libsvn_ra_neon/session.lo: subversion/libsvn_ra_neon/session.c subversion/include/private/svn_atomic.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_neon/ra_neon.h subversion/svn_private_config.h
 
 subversion/libsvn_ra_neon/util.lo: subversion/libsvn_ra_neon/util.c subversion/include/private/svn_dav_protocol.h subversion/include/svn_auth.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra_neon/ra_neon.h subversion/svn_private_config.h
 
diff --git a/devel/subversion/files/svnserve.in b/devel/subversion/files/svnserve.in
index 809bf08c440e..6cc29b0d3862 100644
--- a/devel/subversion/files/svnserve.in
+++ b/devel/subversion/files/svnserve.in
@@ -22,7 +22,7 @@
 # Set some defaults
 svnserve_enable=${svnserve_enable:-"NO"}
 svnserve_flags=${svnserve_flags:-"-d --listen-port=3690"}
-svnserve_data=${svnserve_data:-"%%PREFIX%%/repositories"}
+svnserve_data=${svnserve_data:-"/home/svn/repos"}
 svnserve_user=${svnserve_user:-"svn"}
 svnserve_group=${svnserve_group:-"svn"}
 
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 1fc3e76cc38d..39aeb2884761 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -108,10 +108,10 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 .if defined(WITH_REPOSITORY_CREATION)
-	@${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group."
+	@${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
+	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with user '${SVNUSER}' and group '${SVNGROUP}'."
 	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
 	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
 .else
@@ -133,7 +133,7 @@ pre-everything::
 	@${ECHO_MSG} "asvn will be installed"
 	@${ECHO_MSG} ""
 .endif
-	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}}"
+	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
 
 pre-configure:
 	@if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \
@@ -203,17 +203,29 @@ _mkrepos:	.USE
 	        ${FALSE}; \
 	    fi; \
 	fi
+	@if /usr/sbin/pw usershow "${SVNUSER}" >/dev/null 2>&1; then \
+	    ${ECHO_MSG} "You already have a user \"${SVNUSER}\", so I will use it."; \
+	else \
+	    if /usr/sbin/pw useradd ${SVNUSER} -h -; \
+	    then \
+	        ${ECHO_MSG} "Added user \"${SVNUSER}\"."; \
+	    else \
+	        ${ECHO_MSG} "Adding user \"${SVNUSER}\" failed..."; \
+	        ${ECHO_MSG} "Please create it, and try again."; \
+	        ${FALSE}; \
+	    fi; \
+	fi
 .endif
 	@${MKDIR} ${SVNREPOS}
 	@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
 .if defined(WITH_SVNSERVE_WRAPPER)
-	@${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
+	@${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES}
 	@${CHMOD} g+w ${SVNGRPFILES}
 	@for i in ${SVNREPOS}/db/* ; do \
 	    i=$${i##*/}; \
 	    case $$i in \
 	    DB_CONFIG|fs-type|uuid) ;; \
-	    *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
+	    *) ${CHOWN} -R ${SVNUSER}:${SVNGROUP} ${SVNREPOS}/db/$$i; \
 	       ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
 	       ;; \
 	    esac; \
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index a629f98c7e0e..e383d3e9e14b 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.5.2
+PORTVERSION=	1.5.4
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
@@ -62,10 +62,12 @@ WITH_APACHE2_APR=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=	MOD_DAV_SVN=""
 SVNGROUP?=	www
+SVNGUSER?=	www
 .else
 PLIST_SUB+=	MOD_DAV_SVN="@comment "
 PKGDEINSTALL=	NONEXISTENT
 SVNGROUP?=	svn
+SVNUSER?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index bd235b65ddbb..f5a1ab8847fc 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,12 +1,6 @@
-MD5 (subversion/subversion-1.5.2.tar.bz2) = 8321d0e1964846090f0174cb6bb18838
-SHA256 (subversion/subversion-1.5.2.tar.bz2) = 7c4c439035cd75722fa3da27433e2c3a4a2dc88694982a5ceb1ce5169982c7f5
-SIZE (subversion/subversion-1.5.2.tar.bz2) = 4902078
-MD5 (subversion/svn-book-html.tar.bz2) = eda5fa7d7e3aff9473adf063385d3527
-SHA256 (subversion/svn-book-html.tar.bz2) = a73110c724ee7fca4ab0e6090f0a47fdd3a03cfdfbecab799aca90c80824d9e0
-SIZE (subversion/svn-book-html.tar.bz2) = 366277
-MD5 (subversion/svn-book.pdf) = b4f04dfc6cae59212c255322e4fa27a4
-SHA256 (subversion/svn-book.pdf) = d3fffd8191d62faf2a571cfe96bdadc772ff90bd5e32364f888f9b2d7fd81b5d
-SIZE (subversion/svn-book.pdf) = 1462807
+MD5 (subversion/subversion-1.5.4.tar.bz2) = 037d1ed7a313631d50defdc3cf727415
+SHA256 (subversion/subversion-1.5.4.tar.bz2) = e24b6257b53988287471f83689846018e8e7b1e1c713da2567ab57b99e45fb40
+SIZE (subversion/subversion-1.5.4.tar.bz2) = 4925141
 MD5 (subversion/svn_hacks_1.1.diff) = c936ad112897d698c6b3c066c8f93606
 SHA256 (subversion/svn_hacks_1.1.diff) = cbc4503e4f6a624ec40d23b8b8444ced84d71482308c4c08e3cce6f3452b64cb
 SIZE (subversion/svn_hacks_1.1.diff) = 17813
diff --git a/devel/subversion16/files/build-outputs.mk b/devel/subversion16/files/build-outputs.mk
index 5fa4eae6bc0d..14fa53a3e3ca 100644
--- a/devel/subversion16/files/build-outputs.mk
+++ b/devel/subversion16/files/build-outputs.mk
@@ -150,31 +150,31 @@ subversion/tests/libsvn_subr/hashdump-test$(EXEEXT): $(hashdump_test_DEPS)
 
 javahl_java_PATH = subversion/bindings/javahl/classes
 javahl_java_HEADERS = 
-javahl_java_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LockStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InfoCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DirEntry.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/OutputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressListener.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdmin.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CopySource.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Status.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientSynchronized.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Depth.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ScheduleKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ErrorCodes.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Mergeinfo.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/MergeinfoLogKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PropertyData.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummaryReceiver.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Lock.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNOutputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NodeKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessageCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNInputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ListCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Path.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangePath.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Revision.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionRange.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyInformation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogDate.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyAction.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientLogLevel.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangelistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResolverCallback.class
+javahl_java_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ListCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Path.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdmin.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InfoCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyInformation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ScheduleKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNInputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogDate.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DirEntry.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummaryReceiver.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNOutputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResolverCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NodeKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientLogLevel.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyAction.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangePath.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Status.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionRange.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/OutputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Mergeinfo.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PropertyData.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LockStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CopySource.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ErrorCodes.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressListener.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/MergeinfoLogKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Depth.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientSynchronized.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangelistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessageCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Revision.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Lock.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyStatus.class
 javahl_java_DEPS = $(javahl_java_HEADERS) $(javahl_java_OBJECTS)  
 javahl-java: $(javahl_java_DEPS)
-javahl_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LockStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InfoCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressListener.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeResources.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummaryReceiver.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SubversionException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword3.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNOutputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNInputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ListCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientLogLevel.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/JNIError.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java
+javahl_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ListCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SubversionException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InfoCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNInputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummaryReceiver.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNOutputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeResources.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientLogLevel.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword3.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/JNIError.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LockStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressListener.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java
 $(javahl_java_OBJECTS): $(javahl_java_SRC)
 	$(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_java_CLASSPATH) $(javahl_java_SRC)
 
 
 javahl_javah_PATH = subversion/bindings/javahl/include
-javahl_javah_HEADERS = subversion/bindings/javahl/include/org_tigris_subversion_javahl_LockStatus.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_InfoCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DirEntry.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_OutputInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProgressListener.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNAdmin.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictResult.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogMessage.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ClientException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CopySource.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Status.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientSynchronized.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProplistCallbackImpl.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Depth.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Notify2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ScheduleKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NativeResources.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ErrorCodes.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_InputInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Mergeinfo.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_MergeinfoLogKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitItem.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PropertyData.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DiffSummaryReceiver.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Notify.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyStatus.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SubversionException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Version.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword3.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallback2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Lock.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Info.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_RevisionKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Info2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallbackImpl.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NativeException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClient.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_StatusCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNOutputStream.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NodeKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogMessageCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNInputStream.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ListCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DiffSummary.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Path.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ChangePath.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Revision.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_RevisionRange.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyInformation.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogDate.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProplistCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyAction.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientLogLevel.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_JNIError.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProgressEvent.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_StatusKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitMessage.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ChangelistCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictResolverCallback.h
+javahl_javah_HEADERS = subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallback2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Notify2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ListCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitMessage.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Path.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SubversionException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNAdmin.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Info.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_InfoCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyInformation.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProgressEvent.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProplistCallbackImpl.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictResult.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DiffSummary.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ScheduleKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNInputStream.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogDate.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DirEntry.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NativeException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_DiffSummaryReceiver.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNOutputStream.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitItem.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NativeResources.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictResolverCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NodeKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientLogLevel.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogMessage.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword3.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ClientException.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyAction.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ChangePath.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProplistCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Status.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_JNIError.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_RevisionRange.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_OutputInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Info2.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_StatusCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClient.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_RevisionKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Notify.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Mergeinfo.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PropertyData.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_BlameCallbackImpl.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_InputInterface.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_StatusKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LockStatus.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CopySource.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ErrorCodes.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ProgressListener.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Version.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_MergeinfoLogKind.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Depth.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientSynchronized.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_ChangelistCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_LogMessageCallback.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Revision.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_Lock.h subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyStatus.h
 javahl_javah_OBJECTS = 
 javahl_javah_DEPS = $(javahl_javah_HEADERS) $(javahl_javah_OBJECTS) $(javahl_java_DEPS) 
 javahl-javah: $(javahl_javah_DEPS)
-javahl_javah_CLASS_FILENAMES = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LockStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InfoCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DirEntry.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/OutputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressListener.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdmin.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CopySource.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Status.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientSynchronized.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Depth.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ScheduleKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ErrorCodes.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Mergeinfo.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/MergeinfoLogKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PropertyData.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummaryReceiver.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Lock.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNOutputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NodeKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessageCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNInputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ListCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Path.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangePath.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Revision.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionRange.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyInformation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogDate.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyAction.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientLogLevel.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangelistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResolverCallback.class
-javahl_javah_CLASSES = org.tigris.subversion.javahl.LockStatus org.tigris.subversion.javahl.InfoCallback org.tigris.subversion.javahl.DirEntry org.tigris.subversion.javahl.OutputInterface org.tigris.subversion.javahl.ProgressListener org.tigris.subversion.javahl.SVNAdmin org.tigris.subversion.javahl.ConflictResult org.tigris.subversion.javahl.LogMessage org.tigris.subversion.javahl.PromptUserPassword2 org.tigris.subversion.javahl.PromptUserPassword org.tigris.subversion.javahl.ClientException org.tigris.subversion.javahl.CopySource org.tigris.subversion.javahl.CommitItemStateFlags org.tigris.subversion.javahl.Status org.tigris.subversion.javahl.SVNClientSynchronized org.tigris.subversion.javahl.ProplistCallbackImpl org.tigris.subversion.javahl.Depth org.tigris.subversion.javahl.Notify2 org.tigris.subversion.javahl.ScheduleKind org.tigris.subversion.javahl.NativeResources org.tigris.subversion.javahl.ErrorCodes org.tigris.subversion.javahl.InputInterface org.tigris.subversion.javahl.Mergeinfo org.tigris.subversion.javahl.MergeinfoLogKind org.tigris.subversion.javahl.ConflictDescriptor org.tigris.subversion.javahl.CommitItem org.tigris.subversion.javahl.PropertyData org.tigris.subversion.javahl.DiffSummaryReceiver org.tigris.subversion.javahl.Notify org.tigris.subversion.javahl.NotifyStatus org.tigris.subversion.javahl.SubversionException org.tigris.subversion.javahl.SVNClientInterface org.tigris.subversion.javahl.Version org.tigris.subversion.javahl.PromptUserPassword3 org.tigris.subversion.javahl.BlameCallback2 org.tigris.subversion.javahl.Lock org.tigris.subversion.javahl.Info org.tigris.subversion.javahl.RevisionKind org.tigris.subversion.javahl.Info2 org.tigris.subversion.javahl.BlameCallbackImpl org.tigris.subversion.javahl.NativeException org.tigris.subversion.javahl.SVNClient org.tigris.subversion.javahl.StatusCallback org.tigris.subversion.javahl.SVNOutputStream org.tigris.subversion.javahl.NodeKind org.tigris.subversion.javahl.BlameCallback org.tigris.subversion.javahl.LogMessageCallback org.tigris.subversion.javahl.SVNInputStream org.tigris.subversion.javahl.ListCallback org.tigris.subversion.javahl.DiffSummary org.tigris.subversion.javahl.Path org.tigris.subversion.javahl.ChangePath org.tigris.subversion.javahl.Revision org.tigris.subversion.javahl.RevisionRange org.tigris.subversion.javahl.NotifyInformation org.tigris.subversion.javahl.LogDate org.tigris.subversion.javahl.ProplistCallback org.tigris.subversion.javahl.NotifyAction org.tigris.subversion.javahl.SVNClientLogLevel org.tigris.subversion.javahl.JNIError org.tigris.subversion.javahl.ProgressEvent org.tigris.subversion.javahl.StatusKind org.tigris.subversion.javahl.CommitMessage org.tigris.subversion.javahl.ChangelistCallback org.tigris.subversion.javahl.ConflictResolverCallback
+javahl_javah_CLASS_FILENAMES = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ListCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Path.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdmin.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InfoCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyInformation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ScheduleKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNInputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogDate.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DirEntry.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummaryReceiver.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNOutputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResolverCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NodeKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientLogLevel.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyAction.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangePath.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Status.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionRange.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/OutputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Mergeinfo.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PropertyData.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LockStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CopySource.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ErrorCodes.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressListener.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/MergeinfoLogKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Depth.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientSynchronized.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangelistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessageCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Revision.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Lock.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyStatus.class
+javahl_javah_CLASSES = org.tigris.subversion.javahl.BlameCallback2 org.tigris.subversion.javahl.ConflictDescriptor org.tigris.subversion.javahl.Notify2 org.tigris.subversion.javahl.ListCallback org.tigris.subversion.javahl.CommitMessage org.tigris.subversion.javahl.Path org.tigris.subversion.javahl.SubversionException org.tigris.subversion.javahl.SVNAdmin org.tigris.subversion.javahl.Info org.tigris.subversion.javahl.InfoCallback org.tigris.subversion.javahl.NotifyInformation org.tigris.subversion.javahl.ProgressEvent org.tigris.subversion.javahl.ProplistCallbackImpl org.tigris.subversion.javahl.ConflictResult org.tigris.subversion.javahl.DiffSummary org.tigris.subversion.javahl.ScheduleKind org.tigris.subversion.javahl.SVNInputStream org.tigris.subversion.javahl.SVNClientInterface org.tigris.subversion.javahl.LogDate org.tigris.subversion.javahl.DirEntry org.tigris.subversion.javahl.NativeException org.tigris.subversion.javahl.DiffSummaryReceiver org.tigris.subversion.javahl.SVNOutputStream org.tigris.subversion.javahl.CommitItem org.tigris.subversion.javahl.NativeResources org.tigris.subversion.javahl.ConflictResolverCallback org.tigris.subversion.javahl.NodeKind org.tigris.subversion.javahl.SVNClientLogLevel org.tigris.subversion.javahl.LogMessage org.tigris.subversion.javahl.PromptUserPassword3 org.tigris.subversion.javahl.ClientException org.tigris.subversion.javahl.NotifyAction org.tigris.subversion.javahl.ChangePath org.tigris.subversion.javahl.ProplistCallback org.tigris.subversion.javahl.PromptUserPassword2 org.tigris.subversion.javahl.Status org.tigris.subversion.javahl.JNIError org.tigris.subversion.javahl.BlameCallback org.tigris.subversion.javahl.RevisionRange org.tigris.subversion.javahl.OutputInterface org.tigris.subversion.javahl.Info2 org.tigris.subversion.javahl.StatusCallback org.tigris.subversion.javahl.SVNClient org.tigris.subversion.javahl.RevisionKind org.tigris.subversion.javahl.Notify org.tigris.subversion.javahl.Mergeinfo org.tigris.subversion.javahl.PropertyData org.tigris.subversion.javahl.BlameCallbackImpl org.tigris.subversion.javahl.InputInterface org.tigris.subversion.javahl.StatusKind org.tigris.subversion.javahl.LockStatus org.tigris.subversion.javahl.CopySource org.tigris.subversion.javahl.ErrorCodes org.tigris.subversion.javahl.ProgressListener org.tigris.subversion.javahl.Version org.tigris.subversion.javahl.MergeinfoLogKind org.tigris.subversion.javahl.Depth org.tigris.subversion.javahl.SVNClientSynchronized org.tigris.subversion.javahl.CommitItemStateFlags org.tigris.subversion.javahl.ChangelistCallback org.tigris.subversion.javahl.LogMessageCallback org.tigris.subversion.javahl.PromptUserPassword org.tigris.subversion.javahl.Revision org.tigris.subversion.javahl.Lock org.tigris.subversion.javahl.NotifyStatus
 $(javahl_javah_HEADERS): $(javahl_javah_CLASS_FILENAMES)
 	$(COMPILE_JAVAHL_JAVAH) -force -d subversion/bindings/javahl/include -classpath subversion/bindings/javahl/classes:$(javahl_javah_CLASSPATH) $(javahl_javah_CLASSES)
 
 
 javahl_tests_PATH = subversion/bindings/javahl/classes
 javahl_tests_HEADERS = 
-javahl_tests_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BasicTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdminTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/WC.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RunTests.class
+javahl_tests_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RunTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BasicTests.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/WC.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdminTests.class
 javahl_tests_DEPS = $(javahl_tests_HEADERS) $(javahl_tests_OBJECTS)  
 javahl-tests: $(javahl_tests_DEPS)
-javahl_tests_SRC = $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java
+javahl_tests_SRC = $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java
 $(javahl_tests_OBJECTS): $(javahl_tests_SRC)
 	$(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_tests_CLASSPATH) $(javahl_tests_SRC)
 
@@ -699,7 +699,7 @@ install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_
 	cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
 	cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
 
-install-mods-static: subversion/libsvn_delta/libsvn_delta-1.la-a subversion/libsvn_fs/libsvn_fs-1.la-a subversion/libsvn_repos/libsvn_repos-1.la-a subversion/libsvn_subr/libsvn_subr-1.la-a subversion/mod_authz_svn/mod_authz_svn.la-a subversion/mod_dav_svn/mod_dav_svn.la-a subversion/mod_dav_svn/static/Makefile.in subversion/mod_dav_svn/static/config.m4
+install-mods-static: subversion/libsvn_delta/libsvn_delta-1.la-a subversion/libsvn_fs/libsvn_fs-1.la-a subversion/libsvn_repos/libsvn_repos-1.la-a subversion/libsvn_subr/libsvn_subr-1.la-a subversion/mod_authz_svn/mod_authz_svn.la-a subversion/mod_dav_svn/mod_dav_svn.la-a subversion/mod_dav_svn/static/config.m4 subversion/mod_dav_svn/static/Makefile.in
 	$(MKDIR) $(DESTDIR)$(APACHE_TARGET)/.libs
 	$(INSTALL_MOD_STATIC) subversion/libsvn_delta/.libs/libsvn_delta-1.a $(DESTDIR)$(APACHE_TARGET)/.libs/libsvn_delta-1.a
 	$(INSTALL_MOD_STATIC) subversion/libsvn_delta/libsvn_delta-1.la-a $(DESTDIR)$(APACHE_TARGET)/libsvn_delta-1.la
@@ -713,8 +713,8 @@ install-mods-static: subversion/libsvn_delta/libsvn_delta-1.la-a subversion/libs
 	$(INSTALL_MOD_STATIC) subversion/mod_authz_svn/mod_authz_svn.la-a $(DESTDIR)$(APACHE_TARGET)/mod_authz_svn.la
 	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/.libs/mod_dav_svn.a $(DESTDIR)$(APACHE_TARGET)/.libs/mod_dav_svn.a
 	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/mod_dav_svn.la-a $(DESTDIR)$(APACHE_TARGET)/mod_dav_svn.la
-	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/static/Makefile.in $(DESTDIR)$(APACHE_TARGET)/Makefile.in
 	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/static/config.m4 $(DESTDIR)$(APACHE_TARGET)/config.m4
+	$(INSTALL_MOD_STATIC) subversion/mod_dav_svn/static/Makefile.in $(DESTDIR)$(APACHE_TARGET)/Makefile.in
 
 install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
 	$(MKDIR) $(DESTDIR)$(bdb_libdir)
@@ -857,47 +857,47 @@ install-tools: tools/server-side/svn-populate-node-origins-index$(EXEEXT) contri
 # Section 8: The install-include rule
 ########################################
 
-install-include: subversion/include/svn_ra.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_wc.h subversion/include/svn_cmdline.h subversion/include/mod_authz_svn.h subversion/include/svn_types.h subversion/include/svn_auth.h subversion/include/svn_compat.h subversion/include/svn_subst.h subversion/include/svn_ctype.h subversion/include/svn_quoprint.h subversion/include/svn_pools.h subversion/include/mod_dav_svn.h subversion/include/svn_md5.h subversion/include/svn_base64.h subversion/include/svn_client.h subversion/include/svn_iter.h subversion/include/svn_utf.h subversion/include/svn_error_codes.h subversion/include/svn_opt.h subversion/include/svn_user.h subversion/include/svn_ra_svn.h subversion/include/svn_nls.h subversion/include/svn_fs.h subversion/include/svn_xml.h subversion/include/svn_sorts.h subversion/include/svn_delta.h subversion/include/svn_hash.h subversion/include/svn_props.h subversion/include/svn_config.h subversion/include/svn_diff.h subversion/include/svn_version.h subversion/include/svn_io.h subversion/include/svn_dso.h subversion/include/svn_mergeinfo.h subversion/include/svn_time.h subversion/include/svn_repos.h subversion/include/svn_dav.h subversion/include/svn_error.h
+install-include: subversion/include/svn_time.h subversion/include/svn_ctype.h subversion/include/svn_dso.h subversion/include/svn_version.h subversion/include/svn_ra_svn.h subversion/include/mod_dav_svn.h subversion/include/svn_compat.h subversion/include/svn_wc.h subversion/include/svn_props.h subversion/include/svn_error_codes.h subversion/include/mod_authz_svn.h subversion/include/svn_opt.h subversion/include/svn_repos.h subversion/include/svn_base64.h subversion/include/svn_nls.h subversion/include/svn_diff.h subversion/include/svn_iter.h subversion/include/svn_ra.h subversion/include/svn_quoprint.h subversion/include/svn_config.h subversion/include/svn_user.h subversion/include/svn_sorts.h subversion/include/svn_io.h subversion/include/svn_client.h subversion/include/svn_dav.h subversion/include/svn_pools.h subversion/include/svn_mergeinfo.h subversion/include/svn_fs.h subversion/include/svn_delta.h subversion/include/svn_path.h subversion/include/svn_hash.h subversion/include/svn_string.h subversion/include/svn_cmdline.h subversion/include/svn_auth.h subversion/include/svn_xml.h subversion/include/svn_subst.h subversion/include/svn_md5.h subversion/include/svn_utf.h subversion/include/svn_types.h subversion/include/svn_error.h
 	$(MKDIR) $(DESTDIR)$(includedir)/subversion-1
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ra.h $(DESTDIR)$(includedir)/subversion-1/svn_ra.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_path.h $(DESTDIR)$(includedir)/subversion-1/svn_path.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_string.h $(DESTDIR)$(includedir)/subversion-1/svn_string.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_wc.h $(DESTDIR)$(includedir)/subversion-1/svn_wc.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_cmdline.h $(DESTDIR)$(includedir)/subversion-1/svn_cmdline.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/mod_authz_svn.h $(DESTDIR)$(includedir)/subversion-1/mod_authz_svn.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_types.h $(DESTDIR)$(includedir)/subversion-1/svn_types.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_auth.h $(DESTDIR)$(includedir)/subversion-1/svn_auth.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_compat.h $(DESTDIR)$(includedir)/subversion-1/svn_compat.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_subst.h $(DESTDIR)$(includedir)/subversion-1/svn_subst.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_time.h $(DESTDIR)$(includedir)/subversion-1/svn_time.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ctype.h $(DESTDIR)$(includedir)/subversion-1/svn_ctype.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_quoprint.h $(DESTDIR)$(includedir)/subversion-1/svn_quoprint.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_pools.h $(DESTDIR)$(includedir)/subversion-1/svn_pools.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_dso.h $(DESTDIR)$(includedir)/subversion-1/svn_dso.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_version.h $(DESTDIR)$(includedir)/subversion-1/svn_version.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ra_svn.h $(DESTDIR)$(includedir)/subversion-1/svn_ra_svn.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/mod_dav_svn.h $(DESTDIR)$(includedir)/subversion-1/mod_dav_svn.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_md5.h $(DESTDIR)$(includedir)/subversion-1/svn_md5.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_base64.h $(DESTDIR)$(includedir)/subversion-1/svn_base64.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_client.h $(DESTDIR)$(includedir)/subversion-1/svn_client.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_iter.h $(DESTDIR)$(includedir)/subversion-1/svn_iter.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_utf.h $(DESTDIR)$(includedir)/subversion-1/svn_utf.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_compat.h $(DESTDIR)$(includedir)/subversion-1/svn_compat.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_wc.h $(DESTDIR)$(includedir)/subversion-1/svn_wc.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_props.h $(DESTDIR)$(includedir)/subversion-1/svn_props.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_error_codes.h $(DESTDIR)$(includedir)/subversion-1/svn_error_codes.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/mod_authz_svn.h $(DESTDIR)$(includedir)/subversion-1/mod_authz_svn.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_opt.h $(DESTDIR)$(includedir)/subversion-1/svn_opt.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_user.h $(DESTDIR)$(includedir)/subversion-1/svn_user.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ra_svn.h $(DESTDIR)$(includedir)/subversion-1/svn_ra_svn.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_repos.h $(DESTDIR)$(includedir)/subversion-1/svn_repos.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_base64.h $(DESTDIR)$(includedir)/subversion-1/svn_base64.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_nls.h $(DESTDIR)$(includedir)/subversion-1/svn_nls.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_fs.h $(DESTDIR)$(includedir)/subversion-1/svn_fs.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_xml.h $(DESTDIR)$(includedir)/subversion-1/svn_xml.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_sorts.h $(DESTDIR)$(includedir)/subversion-1/svn_sorts.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_delta.h $(DESTDIR)$(includedir)/subversion-1/svn_delta.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_hash.h $(DESTDIR)$(includedir)/subversion-1/svn_hash.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_props.h $(DESTDIR)$(includedir)/subversion-1/svn_props.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_config.h $(DESTDIR)$(includedir)/subversion-1/svn_config.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_diff.h $(DESTDIR)$(includedir)/subversion-1/svn_diff.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_version.h $(DESTDIR)$(includedir)/subversion-1/svn_version.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_iter.h $(DESTDIR)$(includedir)/subversion-1/svn_iter.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_ra.h $(DESTDIR)$(includedir)/subversion-1/svn_ra.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_quoprint.h $(DESTDIR)$(includedir)/subversion-1/svn_quoprint.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_config.h $(DESTDIR)$(includedir)/subversion-1/svn_config.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_user.h $(DESTDIR)$(includedir)/subversion-1/svn_user.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_sorts.h $(DESTDIR)$(includedir)/subversion-1/svn_sorts.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_io.h $(DESTDIR)$(includedir)/subversion-1/svn_io.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_dso.h $(DESTDIR)$(includedir)/subversion-1/svn_dso.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_mergeinfo.h $(DESTDIR)$(includedir)/subversion-1/svn_mergeinfo.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_time.h $(DESTDIR)$(includedir)/subversion-1/svn_time.h
-	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_repos.h $(DESTDIR)$(includedir)/subversion-1/svn_repos.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_client.h $(DESTDIR)$(includedir)/subversion-1/svn_client.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_dav.h $(DESTDIR)$(includedir)/subversion-1/svn_dav.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_pools.h $(DESTDIR)$(includedir)/subversion-1/svn_pools.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_mergeinfo.h $(DESTDIR)$(includedir)/subversion-1/svn_mergeinfo.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_fs.h $(DESTDIR)$(includedir)/subversion-1/svn_fs.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_delta.h $(DESTDIR)$(includedir)/subversion-1/svn_delta.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_path.h $(DESTDIR)$(includedir)/subversion-1/svn_path.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_hash.h $(DESTDIR)$(includedir)/subversion-1/svn_hash.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_string.h $(DESTDIR)$(includedir)/subversion-1/svn_string.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_cmdline.h $(DESTDIR)$(includedir)/subversion-1/svn_cmdline.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_auth.h $(DESTDIR)$(includedir)/subversion-1/svn_auth.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_xml.h $(DESTDIR)$(includedir)/subversion-1/svn_xml.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_subst.h $(DESTDIR)$(includedir)/subversion-1/svn_subst.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_md5.h $(DESTDIR)$(includedir)/subversion-1/svn_md5.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_utf.h $(DESTDIR)$(includedir)/subversion-1/svn_utf.h
+	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_types.h $(DESTDIR)$(includedir)/subversion-1/svn_types.h
 	$(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_error.h $(DESTDIR)$(includedir)/subversion-1/svn_error.h
 
 ########################################
@@ -1706,7 +1706,7 @@ subversion/libsvn_ra_neon/props.lo: subversion/libsvn_ra_neon/props.c subversion
 
 subversion/libsvn_ra_neon/replay.lo: subversion/libsvn_ra_neon/replay.c subversion/include/private/svn_dav_protocol.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_neon/ra_neon.h subversion/svn_private_config.h
 
-subversion/libsvn_ra_neon/session.lo: subversion/libsvn_ra_neon/session.c subversion/include/private/svn_dav_protocol.h subversion/include/svn_auth.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_neon/ra_neon.h subversion/svn_private_config.h
+subversion/libsvn_ra_neon/session.lo: subversion/libsvn_ra_neon/session.c subversion/include/private/svn_atomic.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_neon/ra_neon.h subversion/svn_private_config.h
 
 subversion/libsvn_ra_neon/util.lo: subversion/libsvn_ra_neon/util.c subversion/include/private/svn_dav_protocol.h subversion/include/svn_auth.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra_neon/ra_neon.h subversion/svn_private_config.h
 
diff --git a/devel/subversion16/files/svnserve.in b/devel/subversion16/files/svnserve.in
index 809bf08c440e..6cc29b0d3862 100644
--- a/devel/subversion16/files/svnserve.in
+++ b/devel/subversion16/files/svnserve.in
@@ -22,7 +22,7 @@
 # Set some defaults
 svnserve_enable=${svnserve_enable:-"NO"}
 svnserve_flags=${svnserve_flags:-"-d --listen-port=3690"}
-svnserve_data=${svnserve_data:-"%%PREFIX%%/repositories"}
+svnserve_data=${svnserve_data:-"/home/svn/repos"}
 svnserve_user=${svnserve_user:-"svn"}
 svnserve_group=${svnserve_group:-"svn"}