3 files changed, 20 insertions, 6 deletions

diff --git a/usr.bin/svn/lib/libapr_util/Makefile b/usr.bin/svn/lib/libapr_util/Makefile
index 4d82443b4e6a..4f25e8f5bfac 100644
--- a/usr.bin/svn/lib/libapr_util/Makefile
+++ b/usr.bin/svn/lib/libapr_util/Makefile
@@ -10,10 +10,10 @@ SRCS=		apr_base64.c apr_brigade.c apr_buckets.c apr_buckets_alloc.c \
 		apr_buckets_heap.c apr_buckets_mmap.c apr_buckets_pipe.c \
 		apr_buckets_pool.c apr_buckets_refcount.c apr_buckets_simple.c \
 		apr_buckets_socket.c apr_crypto.c apr_date.c apr_dbd.c \
-		apr_hooks.c apr_md4.c apr_md5.c apr_memcache.c \
+		apr_hooks.c apr_md4.c apr_md5.c apr_memcache.c apr_passwd.c \
 		apr_queue.c apr_reslist.c apr_rmm.c apr_sha1.c apr_strmatch.c \
 		apr_thread_pool.c apr_uri.c apr_xml.c apu_dso.c apu_version.c \
-		getuuid.c uuid.c xlate.c
+		crypt_blowfish.c getuuid.c uuid.c xlate.c
 
 .PATH:		${APRU}/buckets ${APRU}/crypto ${APRU}/dbd \
 		${APRU}/encoding ${APRU}/hooks \
diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h
index ea090bf51b95..639cec46f9d9 100644
--- a/usr.bin/svn/lib/libapr_util/apu.h
+++ b/usr.bin/svn/lib/libapr_util/apu.h
@@ -43,6 +43,7 @@
  * conventions at compile time.
  */
 
+#if defined(DOXYGEN) || !defined(WIN32)
 /**
  * The public APR-UTIL functions are declared with APU_DECLARE(), so they may
  * use the most appropriate calling convention.  Public APR functions with 
@@ -67,6 +68,19 @@
  * declarations within headers to properly import the variable.
  */
 #define APU_DECLARE_DATA
+#elif defined(APU_DECLARE_STATIC)
+#define APU_DECLARE(type)            type __stdcall
+#define APU_DECLARE_NONSTD(type)     type __cdecl
+#define APU_DECLARE_DATA
+#elif defined(APU_DECLARE_EXPORT)
+#define APU_DECLARE(type)            __declspec(dllexport) type __stdcall
+#define APU_DECLARE_NONSTD(type)     __declspec(dllexport) type __cdecl
+#define APU_DECLARE_DATA             __declspec(dllexport)
+#else
+#define APU_DECLARE(type)            __declspec(dllimport) type __stdcall
+#define APU_DECLARE_NONSTD(type)     __declspec(dllimport) type __cdecl
+#define APU_DECLARE_DATA             __declspec(dllimport)
+#endif
 
 #if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
 /**
diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h
index b08ac7af9ed3..00eb0fc5d5e7 100644
--- a/usr.bin/svn/svn_private_config.h
+++ b/usr.bin/svn/svn_private_config.h
@@ -105,7 +105,7 @@
 #define PACKAGE_NAME "subversion"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "subversion 1.8.0"
+#define PACKAGE_STRING "subversion 1.8.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "subversion"
@@ -114,7 +114,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.8.0"
+#define PACKAGE_VERSION "1.8.1"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -129,10 +129,10 @@
 #define SVN_BINDIR "/usr/bin"
 
 /* Defined to the config.guess name of the build system */
-#define SVN_BUILD_HOST "bikeshed-violet-magenta-aqua-freebsd"
+#define SVN_BUILD_HOST "bikeshed-green-indigo-orange-freebsd"
 
 /* Defined to the config.guess name of the build target */
-#define SVN_BUILD_TARGET "bikeshed-violet-magenta-aqua-freebsd"
+#define SVN_BUILD_TARGET "bikeshed-green-indigo-orange-freebsd"
 
 /* The path of a default editor for the client. */
 /* #undef SVN_CLIENT_EDITOR */