diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-06-14 17:36:43 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-06-14 17:36:43 +0000 |
| commit | 2db3fd018e2d57b7dfec7f49d8d582e718d42430 (patch) | |
| tree | d1319810c166d4c49e69cd7e54c31b8062e5f2cf /usr.bin | |
| parent | ac40588acda0e7a3ce78c8345bcf097bf7e90170 (diff) | |
Notes
Diffstat (limited to 'usr.bin')
37 files changed, 1335 insertions, 528 deletions
diff --git a/usr.bin/svn/Makefile b/usr.bin/svn/Makefile index cafa47d6a5d8..3a9e64adb10f 100644 --- a/usr.bin/svn/Makefile +++ b/usr.bin/svn/Makefile @@ -1,8 +1,18 @@ # $FreeBSD$ -SUBDIR= lib .WAIT \ - svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserve \ - svnsync svnversion svnmucc svnrdump +SUBDIR= lib \ + .WAIT \ + svn \ + svnadmin \ + svnbench \ + svndumpfilter \ + svnfsfs \ + svnlook \ + svnserve \ + svnsync \ + svnversion \ + svnmucc \ + svnrdump SUBDIR_PARALLEL= .include <bsd.subdir.mk> diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc index 32eee3399ceb..8a6458fc0419 100644 --- a/usr.bin/svn/Makefile.inc +++ b/usr.bin/svn/Makefile.inc @@ -2,13 +2,14 @@ .include <src.opts.mk> -MK_PIE:= no # Explicit libXXX.a references - .if ${MK_SVN} == "yes" SVNLITE?= .else SVNLITE?= lite .endif +.if ${MK_PIE} != "no" +PIE_SUFFIX= _pie +.endif PACKAGE= svn @@ -40,23 +41,23 @@ LIBSVN_REPOSDIR= ${.OBJDIR:H}/lib/libsvn_repos LIBSVN_SUBRDIR= ${.OBJDIR:H}/lib/libsvn_subr LIBSVN_WCDIR= ${.OBJDIR:H}/lib/libsvn_wc -LIBAPR= ${LIBAPRDIR}/libapr.a -LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util.a -LIBSERF= ${LIBSERFDIR}/libserf.a +LIBAPR= ${LIBAPRDIR}/libapr${PIE_SUFFIX}.a +LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util${PIE_SUFFIX}.a +LIBSERF= ${LIBSERFDIR}/libserf${PIE_SUFFIX}.a -LIBSVN_CLIENT= ${LIBSVN_CLIENTDIR}/libsvn_client.a -LIBSVN_DELTA= ${LIBSVN_DELTADIR}/libsvn_delta.a -LIBSVN_DIFF= ${LIBSVN_DIFFDIR}/libsvn_diff.a -LIBSVN_FS= ${LIBSVN_FSDIR}/libsvn_fs.a -LIBSVN_FS_FS= ${LIBSVN_FS_FSDIR}/libsvn_fs_fs.a -LIBSVN_FS_UTIL= ${LIBSVN_FS_UTILDIR}/libsvn_fs_util.a -LIBSVN_FS_X= ${LIBSVN_FS_XDIR}/libsvn_fs_x.a -LIBSVN_RA= ${LIBSVN_RADIR}/libsvn_ra.a -LIBSVN_RA_LOCAL= ${LIBSVN_RA_LOCALDIR}/libsvn_ra_local.a -LIBSVN_RA_SVN= ${LIBSVN_RA_SVNDIR}/libsvn_ra_svn.a -LIBSVN_RA_SERF= ${LIBSVN_RA_SERFDIR}/libsvn_ra_serf.a -LIBSVN_REPOS= ${LIBSVN_REPOSDIR}/libsvn_repos.a -LIBSVN_SUBR= ${LIBSVN_SUBRDIR}/libsvn_subr.a -LIBSVN_WC= ${LIBSVN_WCDIR}/libsvn_wc.a +LIBSVN_CLIENT= ${LIBSVN_CLIENTDIR}/libsvn_client${PIE_SUFFIX}.a +LIBSVN_DELTA= ${LIBSVN_DELTADIR}/libsvn_delta${PIE_SUFFIX}.a +LIBSVN_DIFF= ${LIBSVN_DIFFDIR}/libsvn_diff${PIE_SUFFIX}.a +LIBSVN_FS= ${LIBSVN_FSDIR}/libsvn_fs${PIE_SUFFIX}.a +LIBSVN_FS_FS= ${LIBSVN_FS_FSDIR}/libsvn_fs_fs${PIE_SUFFIX}.a +LIBSVN_FS_UTIL= ${LIBSVN_FS_UTILDIR}/libsvn_fs_util${PIE_SUFFIX}.a +LIBSVN_FS_X= ${LIBSVN_FS_XDIR}/libsvn_fs_x${PIE_SUFFIX}.a +LIBSVN_RA= ${LIBSVN_RADIR}/libsvn_ra${PIE_SUFFIX}.a +LIBSVN_RA_LOCAL= ${LIBSVN_RA_LOCALDIR}/libsvn_ra_local${PIE_SUFFIX}.a +LIBSVN_RA_SVN= ${LIBSVN_RA_SVNDIR}/libsvn_ra_svn${PIE_SUFFIX}.a +LIBSVN_RA_SERF= ${LIBSVN_RA_SERFDIR}/libsvn_ra_serf${PIE_SUFFIX}.a +LIBSVN_REPOS= ${LIBSVN_REPOSDIR}/libsvn_repos${PIE_SUFFIX}.a +LIBSVN_SUBR= ${LIBSVN_SUBRDIR}/libsvn_subr${PIE_SUFFIX}.a +LIBSVN_WC= ${LIBSVN_WCDIR}/libsvn_wc${PIE_SUFFIX}.a .endif diff --git a/usr.bin/svn/lib/Makefile b/usr.bin/svn/lib/Makefile index fd3ad856b104..3d0e62902dfe 100644 --- a/usr.bin/svn/lib/Makefile +++ b/usr.bin/svn/lib/Makefile @@ -1,9 +1,22 @@ # $FreeBSD$ -SUBDIR= libapr libapr_util libserf \ - libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_fs \ - libsvn_fs_util libsvn_fs_x libsvn_ra libsvn_ra_local libsvn_ra_serf \ - libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc +SUBDIR= libapr \ + libapr_util \ + libserf \ + libsvn_client \ + libsvn_delta \ + libsvn_diff \ + libsvn_fs \ + libsvn_fs_fs \ + libsvn_fs_util \ + libsvn_fs_x \ + libsvn_ra \ + libsvn_ra_local \ + libsvn_ra_serf \ + libsvn_ra_svn \ + libsvn_repos \ + libsvn_subr \ + libsvn_wc SUBDIR_PARALLEL= .include <bsd.subdir.mk> diff --git a/usr.bin/svn/lib/libapr/Makefile b/usr.bin/svn/lib/libapr/Makefile index 7dff95c1b242..6c8e333b3ecf 100644 --- a/usr.bin/svn/lib/libapr/Makefile +++ b/usr.bin/svn/lib/libapr/Makefile @@ -4,31 +4,115 @@ INTERNALLIB= yes LIB= apr -SRCS= apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c apr_skiplist.c \ - apr_pools.c apr_random.c apr_snprintf.c apr_strings.c \ - apr_strnatcmp.c apr_strtok.c apr_tables.c buffer.c \ - builtins.c charset.c common.c copy.c dir.c dso.c env.c \ - epoll.c errorcodes.c fileacc.c filedup.c filepath.c \ - filepath_util.c filestat.c flock.c fullrw.c getopt.c \ - global_mutex.c groupinfo.c ia32.c inet_ntop.c inet_pton.c \ - kqueue.c mktemp.c mmap.c multicast.c mutex.c open.c \ - otherchild.c pipe.c poll.c pollcb.c pollset.c port.c \ - ppc.c proc.c proc_mutex.c procsup.c rand.c readwrite.c \ - s390.c seek.c select.c sendrecv.c sha2.c sha2_glue.c \ - shm.c signals.c sockaddr.c socket_util.c sockets.c \ - sockopt.c solaris.c start.c tempdir.c thread.c thread_cond.c \ - thread_mutex.c thread_rwlock.c threadpriv.c time.c \ - timestr.c userinfo.c version.c waitio.c z_asio.c +SRCS= apr_cpystrn.c \ + apr_escape.c \ + apr_fnmatch.c \ + apr_getpass.c \ + apr_hash.c \ + apr_pools.c \ + apr_random.c \ + apr_skiplist.c \ + apr_snprintf.c \ + apr_strings.c \ + apr_strnatcmp.c \ + apr_strtok.c \ + apr_tables.c \ + buffer.c \ + builtins.c \ + builtins64.c \ + charset.c \ + common.c \ + copy.c \ + dir.c \ + dso.c \ + env.c \ + epoll.c \ + errorcodes.c \ + fileacc.c \ + filedup.c \ + filepath.c \ + filepath_util.c \ + filestat.c \ + flock.c \ + fullrw.c \ + getopt.c \ + global_mutex.c \ + groupinfo.c \ + ia32.c \ + inet_ntop.c \ + inet_pton.c \ + kqueue.c \ + mktemp.c \ + mmap.c \ + multicast.c \ + mutex.c \ + mutex64.c \ + open.c \ + otherchild.c \ + pipe.c \ + poll.c \ + pollcb.c \ + pollset.c \ + port.c \ + ppc.c \ + proc.c \ + proc_mutex.c \ + procsup.c \ + rand.c \ + readwrite.c \ + s390.c \ + seek.c \ + select.c \ + sendrecv.c \ + sha2.c \ + sha2_glue.c \ + shm.c \ + signals.c \ + sockaddr.c \ + socket_util.c \ + sockets.c \ + sockopt.c \ + solaris.c \ + start.c \ + tempdir.c \ + thread.c \ + thread_cond.c \ + thread_mutex.c \ + thread_rwlock.c \ + threadpriv.c \ + time.c \ + timestr.c \ + userinfo.c \ + version.c \ + waitio.c \ + wakeup.c \ + z_asio.c -.PATH: ${APR}/atomic/unix ${APR}/dso/unix ${APR}/file_io/unix \ - ${APR}/locks/unix ${APR}/memory/unix ${APR}/misc/unix \ - ${APR}/mmap/unix ${APR}/network_io/unix ${APR}/passwd \ - ${APR}/poll/unix ${APR}/random/unix ${APR}/shmem/unix \ - ${APR}/strings ${APR}/support/unix ${APR}/tables \ - ${APR}/threadproc/unix ${APR}/time/unix ${APR}/user/unix \ +.PATH: ${APR}/atomic/unix \ + ${APR}/dso/unix \ + ${APR}/encoding \ + ${APR}/file_io/unix \ + ${APR}/locks/unix \ + ${APR}/memory/unix \ + ${APR}/misc/unix \ + ${APR}/mmap/unix \ + ${APR}/network_io/unix \ + ${APR}/passwd \ + ${APR}/poll/unix \ + ${APR}/random/unix \ + ${APR}/shmem/unix \ + ${APR}/strings \ + ${APR}/support/unix \ + ${APR}/tables \ + ${APR}/threadproc/unix \ + ${APR}/time/unix \ + ${APR}/user/unix \ ${APR}/include -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} \ - -I${APR}/include/arch/unix -I${APR}/include +CFLAGS+= -DHAVE_CONFIG_H \ + -I${.CURDIR} \ + -I${APR}/include/arch/unix \ + -I${APR}/include/private \ + -I${APR}/include .include <bsd.lib.mk> diff --git a/usr.bin/svn/lib/libapr/apr.h b/usr.bin/svn/lib/libapr/apr.h index fbad4469a417..8120937d50d3 100644 --- a/usr.bin/svn/lib/libapr/apr.h +++ b/usr.bin/svn/lib/libapr/apr.h @@ -95,6 +95,7 @@ #define APR_HAVE_STDLIB_H 1 #define APR_HAVE_STRING_H 1 #define APR_HAVE_STRINGS_H 1 +#define APR_HAVE_INTTYPES_H 1 #define APR_HAVE_SYS_IOCTL_H 1 #define APR_HAVE_SYS_SENDFILE_H 0 #define APR_HAVE_SYS_SIGNAL_H 1 @@ -170,16 +171,25 @@ #include <sys/socket.h> #endif -#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) +#if APR_HAVE_STDINT_H +#ifdef __cplusplus /* C99 7.18.4 requires that stdint.h only exposes INT64_C * and UINT64_C for C++ implementations if this is defined: */ +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS #endif - -#if APR_HAVE_STDINT_H +/* C++ needs this too for PRI*NN formats: */ +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS +#endif +#endif /* __cplusplus */ #include <stdint.h> #endif +#if APR_HAVE_INTTYPES_H +#include <inttypes.h> +#endif + #if APR_HAVE_SYS_WAIT_H #include <sys/wait.h> #endif @@ -199,6 +209,13 @@ #endif #endif +/* __APPLE__ is now the official pre-defined macro for macOS */ +#ifdef __APPLE__ +#undef DARWIN +#undef DARWIN_10 +#define DARWIN +#define DARWIN_10 +#endif /* __APPLE__ */ #ifdef __cplusplus extern "C" { @@ -219,10 +236,10 @@ extern "C" { #define APR_HAVE_SHMEM_BEOS 0 #define APR_USE_SHMEM_MMAP_TMP 0 -#define APR_USE_SHMEM_MMAP_SHM 1 +#define APR_USE_SHMEM_MMAP_SHM 0 #define APR_USE_SHMEM_MMAP_ZERO 0 #define APR_USE_SHMEM_SHMGET_ANON 0 -#define APR_USE_SHMEM_SHMGET 0 +#define APR_USE_SHMEM_SHMGET 1 #define APR_USE_SHMEM_MMAP_ANON 1 #define APR_USE_SHMEM_BEOS 0 @@ -237,7 +254,7 @@ extern "C" { #define APR_HAS_SYSVSEM_SERIALIZE 1 #define APR_HAS_POSIXSEM_SERIALIZE 1 #define APR_HAS_FCNTL_SERIALIZE 1 -#define APR_HAS_PROC_PTHREAD_SERIALIZE 0 +#define APR_HAS_PROC_PTHREAD_SERIALIZE 1 #define APR_PROCESS_LOCK_IS_GLOBAL 0 @@ -247,6 +264,7 @@ extern "C" { #define APR_HAVE_INET_ADDR 1 #define APR_HAVE_INET_NETWORK 1 #define APR_HAVE_IPV6 1 +#define APR_HAVE_SOCKADDR_UN 1 #define APR_HAVE_MEMMOVE 1 #define APR_HAVE_SETRLIMIT 1 #define APR_HAVE_SIGACTION 1 @@ -273,7 +291,7 @@ extern "C" { #define APR_HAS_FORK 1 #define APR_HAS_RANDOM 1 #define APR_HAS_OTHER_CHILD 1 -#define APR_HAS_DSO 0 +#define APR_HAS_DSO 1 #define APR_HAS_SO_ACCEPTFILTER 1 #define APR_HAS_UNICODE_FS 0 #define APR_HAS_PROC_INVOKED 0 @@ -281,6 +299,7 @@ extern "C" { #define APR_HAS_LARGE_FILES 0 #define APR_HAS_XTHREAD_FILES 0 #define APR_HAS_OS_UUID 1 +#define APR_HAS_TIMEDLOCKS 1 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0 @@ -340,31 +359,35 @@ typedef unsigned int apr_uint32_t; */ #ifdef DARWIN_10 #undef APR_SIZEOF_VOIDP -#undef INT64_C -#undef UINT64_C +#undef APR_INT64_C +#undef APR_UINT64_C #ifdef __LP64__ typedef long apr_int64_t; typedef unsigned long apr_uint64_t; #define APR_SIZEOF_VOIDP 8 - #define INT64_C(v) (v ## L) - #define UINT64_C(v) (v ## UL) + #define APR_INT64_C(v) (v ## L) + #define APR_UINT64_C(v) (v ## UL) #else typedef long long apr_int64_t; typedef unsigned long long apr_uint64_t; #define APR_SIZEOF_VOIDP 4 - #define INT64_C(v) (v ## LL) - #define UINT64_C(v) (v ## ULL) + #define APR_INT64_C(v) (v ## LL) + #define APR_UINT64_C(v) (v ## ULL) #endif #else typedef __int64_t apr_int64_t; typedef __uint64_t apr_uint64_t; + + /* Mechanisms to properly type numeric literals */ + #define APR_INT64_C(val) INT64_C(val) + #define APR_UINT64_C(val) UINT64_C(val) #endif typedef size_t apr_size_t; typedef ssize_t apr_ssize_t; typedef off_t apr_off_t; typedef socklen_t apr_socklen_t; -typedef unsigned int apr_ino_t; +typedef __ino_t apr_ino_t; #if APR_SIZEOF_VOIDP == 8 typedef apr_uint64_t apr_uintptr_t; @@ -381,10 +404,6 @@ typedef apr_uint32_t apr_uintptr_t; #error Unknown byte order. #endif -/* Mechanisms to properly type numeric literals */ -#define APR_INT64_C(val) INT64_C(val) -#define APR_UINT64_C(val) UINT64_C(val) - #ifdef INT16_MIN #define APR_INT16_MIN INT16_MIN #else diff --git a/usr.bin/svn/lib/libapr/apr_escape_test_char.h b/usr.bin/svn/lib/libapr/apr_escape_test_char.h new file mode 100644 index 000000000000..a1f2cc2e3690 --- /dev/null +++ b/usr.bin/svn/lib/libapr/apr_escape_test_char.h @@ -0,0 +1,27 @@ +/* $FreeBSD$ */ + +/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */ +#define T_ESCAPE_SHELL_CMD (1) +#define T_ESCAPE_PATH_SEGMENT (2) +#define T_OS_ESCAPE_PATH (4) +#define T_ESCAPE_ECHO (8) +#define T_ESCAPE_URLENCODED (16) +#define T_ESCAPE_XML (32) +#define T_ESCAPE_LDAP_DN (64) +#define T_ESCAPE_LDAP_FILTER (128) + +static const unsigned char test_char_table[256] = { + 224,222,222,222,222,222,222,222,222,222,223,222,222,222,222,222,222,222,222,222, + 222,222,222,222,222,222,222,222,222,222,222,222,6,16,127,22,17,22,49,17, + 145,145,129,80,80,0,0,18,0,0,0,0,0,0,0,0,0,0,16,87, + 119,16,119,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,23,223,23,23,0,23,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,23,23,23,17,222,222,222,222,222,222,222,222,222,222,222,222,222, + 222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222, + 222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222, + 222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222, + 222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222, + 222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222, + 222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222 +}; diff --git a/usr.bin/svn/lib/libapr/apr_private.h b/usr.bin/svn/lib/libapr/apr_private.h index 0ebe0a1981e1..496837a8f862 100644 --- a/usr.bin/svn/lib/libapr/apr_private.h +++ b/usr.bin/svn/lib/libapr/apr_private.h @@ -11,6 +11,9 @@ /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ +/* Define if apr_allocator should use guard pages */ +/* #undef APR_ALLOCATOR_GUARD_PAGES */ + /* Define if apr_allocator should use mmap */ /* #undef APR_ALLOCATOR_USES_MMAP */ @@ -21,6 +24,9 @@ /* Define as function used for conversion of strings to apr_off_t */ #define APR_OFF_T_STRFN strtol +/* Define if pool functions should abort if concurrent usage is detected */ +/* #undef APR_POOL_CONCURRENCY_CHECK */ + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -30,7 +36,7 @@ /* #undef C_ALLOCA */ /* Define to path of random device */ -#define DEV_RANDOM "/dev/urandom" +/* #undef DEV_RANDOM */ /* Define if struct dirent has an inode member */ #define DIRENT_INODE d_fileno @@ -39,7 +45,7 @@ #define DIRENT_TYPE d_type /* Define if DSO support uses dlfcn.h */ -/* #undef DSO_USE_DLFCN */ +#define DSO_USE_DLFCN 1 /* Define if DSO support uses dyld.h */ /* #undef DSO_USE_DYLD */ @@ -86,6 +92,12 @@ /* Define if accept4 function is supported */ #define HAVE_ACCEPT4 1 +/* Define to 1 if you have the `acquire_sem' function. */ +/* #undef HAVE_ACQUIRE_SEM */ + +/* Define to 1 if you have the `acquire_sem_etc' function. */ +/* #undef HAVE_ACQUIRE_SEM_ETC */ + /* Define if async i/o supports message q's */ /* #undef HAVE_AIO_MSGQ */ @@ -96,6 +108,9 @@ */ /* #undef HAVE_ALLOCA_H */ +/* Define to 1 if you have the `arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + /* Define to 1 if you have the <arpa/inet.h> header file. */ #define HAVE_ARPA_INET_H 1 @@ -128,6 +143,10 @@ /* Define to 1 if you have the <ctype.h> header file. */ #define HAVE_CTYPE_H 1 +/* Define to 1 if you have the declaration of `SYS_getrandom', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_GETRANDOM 1 + /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you don't. */ #define HAVE_DECL_SYS_SIGLIST 1 @@ -163,7 +182,7 @@ #define HAVE_FCNTL_H 1 /* Define to 1 if you have the `fdatasync' function. */ -/* #undef HAVE_FDATASYNC */ +#define HAVE_FDATASYNC 1 /* Define to 1 if you have the `flock' function. */ #define HAVE_FLOCK 1 @@ -216,6 +235,9 @@ /* Define to 1 if you have the `getpwuid_r' function. */ #define HAVE_GETPWUID_R 1 +/* Define to 1 if you have the `getrandom' function. */ +#define HAVE_GETRANDOM 1 + /* Define to 1 if you have the `getrlimit' function. */ #define HAVE_GETRLIMIT 1 @@ -231,6 +253,12 @@ /* Define if hstrerror is present */ /* #undef HAVE_HSTRERROR */ +/* Define to 1 if you have the `if_indextoname' function. */ +#define HAVE_IF_INDEXTONAME 1 + +/* Define to 1 if you have the `if_nametoindex' function. */ +#define HAVE_IF_NAMETOINDEX 1 + /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 @@ -264,6 +292,9 @@ /* Define to 1 if you have the <limits.h> header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the <linux/random.h> header file. */ +/* #undef HAVE_LINUX_RANDOM_H */ + /* Define to 1 if you have the `localtime_r' function. */ #define HAVE_LOCALTIME_R 1 @@ -279,6 +310,9 @@ /* Define if MAP_ANON is defined in sys/mman.h */ #define HAVE_MAP_ANON 1 +/* Define to 1 if you have the <memcheck.h> header file. */ +/* #undef HAVE_MEMCHECK_H */ + /* Define to 1 if you have the `memchr' function. */ #define HAVE_MEMCHR 1 @@ -300,6 +334,9 @@ /* Define to 1 if you have the `mmap64' function. */ /* #undef HAVE_MMAP64 */ +/* Define to 1 if you have the `mprotect' function. */ +#define HAVE_MPROTECT 1 + /* Define to 1 if you have the `munmap' function. */ #define HAVE_MUNMAP 1 @@ -321,6 +358,9 @@ /* Define to 1 if you have the <net/errno.h> header file. */ /* #undef HAVE_NET_ERRNO_H */ +/* Define to 1 if you have the <net/if.h> header file. */ +#define HAVE_NET_IF_H 1 + /* Define to 1 if you have the `nl_langinfo' function. */ #define HAVE_NL_LANGINFO 1 @@ -351,6 +391,9 @@ /* Define to 1 if you have the `pthread_attr_setguardsize' function. */ #define HAVE_PTHREAD_ATTR_SETGUARDSIZE 1 +/* Define to 1 if you have the `pthread_condattr_setpshared' function. */ +#define HAVE_PTHREAD_CONDATTR_SETPSHARED 1 + /* Define to 1 if you have the <pthread.h> header file. */ #define HAVE_PTHREAD_H 1 @@ -364,7 +407,13 @@ #define HAVE_PTHREAD_MUTEX_RECURSIVE 1 /* Define if cross-process robust mutexes are available */ -/* #undef HAVE_PTHREAD_MUTEX_ROBUST */ +#define HAVE_PTHREAD_MUTEX_ROBUST 1 + +/* Define if non-posix/portable cross-process robust mutexes are available */ +/* #undef HAVE_PTHREAD_MUTEX_ROBUST_NP */ + +/* Define to 1 if you have the `pthread_mutex_timedlock' function. */ +#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1 /* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */ #define HAVE_PTHREAD_PROCESS_SHARED 1 @@ -402,12 +451,21 @@ /* Define to 1 if you have the `semget' function. */ #define HAVE_SEMGET 1 +/* Define to 1 if you have the `semop' function. */ +#define HAVE_SEMOP 1 + +/* Define to 1 if you have the `semtimedop' function. */ +/* #undef HAVE_SEMTIMEDOP */ + /* Define to 1 if you have the `sem_close' function. */ #define HAVE_SEM_CLOSE 1 /* Define to 1 if you have the `sem_post' function. */ #define HAVE_SEM_POST 1 +/* Define to 1 if you have the `sem_timedwait' function. */ +#define HAVE_SEM_TIMEDWAIT 1 + /* Define if SEM_UNDO is defined in sys/sem.h */ #define HAVE_SEM_UNDO 1 @@ -591,6 +649,9 @@ /* Define to 1 if you have the <sys/poll.h> header file. */ #define HAVE_SYS_POLL_H 1 +/* Define to 1 if you have the <sys/random.h> header file. */ +#define HAVE_SYS_RANDOM_H 1 + /* Define to 1 if you have the <sys/resource.h> header file. */ #define HAVE_SYS_RESOURCE_H 1 @@ -618,6 +679,9 @@ /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the <sys/syscall.h> header file. */ +#define HAVE_SYS_SYSCALL_H 1 + /* Define to 1 if you have the <sys/sysctl.h> header file. */ #define HAVE_SYS_SYSCTL_H 1 @@ -693,6 +757,12 @@ /* Define to 1 if you have the <uuid/uuid.h> header file. */ /* #undef HAVE_UUID_UUID_H */ +/* Compile in valgrind support */ +/* #undef HAVE_VALGRIND */ + +/* Define to 1 if you have the <valgrind.h> header file. */ +/* #undef HAVE_VALGRIND_H */ + /* Define if C compiler supports VLA */ #define HAVE_VLA 1 @@ -711,8 +781,7 @@ /* Define for z/OS pthread API nuances */ /* #undef HAVE_ZOS_PTHREADS */ -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" /* Define if EAI_ error codes from getaddrinfo are negative */ @@ -748,8 +817,8 @@ /* Define if pthread_getspecific() has two args */ /* #undef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS */ -/* Define if readdir is thread safe */ -/* #undef READDIR_IS_THREAD_SAFE */ +/* Modern readdir is thread safe */ +#define READDIR_IS_THREAD_SAFE 1 /* Define to 1 if the `setpgrp' function takes no argument. */ /* #undef SETPGRP_VOID */ @@ -761,7 +830,11 @@ #define SIZEOF_CHAR 1 /* The size of ino_t */ +#if __FreeBSD__ >= 12 +#define SIZEOF_INO_T 8 +#else #define SIZEOF_INO_T 4 +#endif /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -810,6 +883,9 @@ /* Define if SysV semaphores affect threads within the process */ /* #undef SYSVSEM_IS_GLOBAL */ +/* Define system call of random */ +#define SYS_RANDOM "getrandom" + /* Define if use of generic atomics is requested */ /* #undef USE_ATOMICS_GENERIC */ @@ -822,6 +898,9 @@ /* Define if 4.2BSD-style flock() will be used */ #define USE_FLOCK_SERIALIZE 1 +/* Define if pthread pshared mutex will be used */ +/* #undef USE_PROC_PTHREAD_SERIALIZE */ + /* Define if BeOS areas will be used */ /* #undef USE_SHMEM_BEOS */ @@ -832,7 +911,7 @@ #define USE_SHMEM_MMAP_ANON 1 /* Define if mmap() via POSIX.1 shm_open() on temporary file will be used */ -#define USE_SHMEM_MMAP_SHM 1 +/* #undef USE_SHMEM_MMAP_SHM */ /* Define if Classical mmap() on temporary file will be used */ /* #undef USE_SHMEM_MMAP_TMP */ @@ -847,7 +926,7 @@ /* #undef USE_SHMEM_OS2_ANON */ /* Define if SysV IPC shmget() will be used */ -/* #undef USE_SHMEM_SHMGET */ +#define USE_SHMEM_SHMGET 1 /* Define if SysV IPC shmget() will be used */ /* #undef USE_SHMEM_SHMGET_ANON */ diff --git a/usr.bin/svn/lib/libapr_util/Makefile b/usr.bin/svn/lib/libapr_util/Makefile index df2d1f9a2104..7a345d9bc801 100644 --- a/usr.bin/svn/lib/libapr_util/Makefile +++ b/usr.bin/svn/lib/libapr_util/Makefile @@ -5,22 +5,57 @@ INTERNALLIB= yes LIB= apr-util -SRCS= apr_base64.c apr_brigade.c apr_buckets.c apr_buckets_alloc.c \ - apr_buckets_eos.c apr_buckets_file.c apr_buckets_flush.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_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 \ - crypt_blowfish.c getuuid.c uuid.c xlate.c +SRCS= apr_base64.c \ + apr_brigade.c \ + apr_buckets.c \ + apr_buckets_alloc.c \ + apr_buckets_eos.c \ + apr_buckets_file.c \ + apr_buckets_flush.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_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 \ + crypt_blowfish.c \ + getuuid.c \ + uuid.c \ + xlate.c -.PATH: ${APRU}/buckets ${APRU}/crypto ${APRU}/dbd \ - ${APRU}/encoding ${APRU}/hooks \ - ${APRU}/memcache ${APRU}/misc ${APRU}/strmatch \ - ${APRU}/uri ${APRU}/xlate ${APRU}/xml ${APRU}/include +.PATH: ${APRU}/buckets \ + ${APRU}/crypto \ + ${APRU}/dbd \ + ${APRU}/encoding \ + ${APRU}/hooks \ + ${APRU}/memcache \ + ${APRU}/misc \ + ${APRU}/strmatch \ + ${APRU}/uri \ + ${APRU}/xlate \ + ${APRU}/xml \ + ${APRU}/include -CFLAGS+= -DHAVE_CONFIG_H \ +CFLAGS+= -DHAVE_CONFIG_H \ -I${.CURDIR} \ -I${APRU}/include/private \ -I${APRU}/include \ @@ -31,8 +66,8 @@ CFLAGS+= -DHAVE_CONFIG_H \ .include <src.opts.mk> .if ${MK_ICONV} == "yes" -CFLAGS+= -DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1 +CFLAGS+= -DHAVE_ICONV_H=1 \ + -DAPU_HAVE_ICONV=1 .endif .include <bsd.lib.mk> - diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h index 575d633162d7..875e28c05e74 100644 --- a/usr.bin/svn/lib/libapr_util/apu.h +++ b/usr.bin/svn/lib/libapr_util/apu.h @@ -114,12 +114,12 @@ #define APU_HAVE_SQLITE3 0 #define APU_HAVE_SQLITE2 0 #define APU_HAVE_ORACLE 0 -#define APU_HAVE_FREETDS 0 #define APU_HAVE_ODBC 0 #define APU_HAVE_CRYPTO 1 #define APU_HAVE_OPENSSL 1 #define APU_HAVE_NSS 0 +#define APU_HAVE_COMMONCRYPTO 0 #define APU_HAVE_APR_ICONV 0 #ifndef APU_HAVE_ICONV diff --git a/usr.bin/svn/lib/libapr_util/apu_config.h b/usr.bin/svn/lib/libapr_util/apu_config.h index ac247d06b132..1e709f71da7e 100644 --- a/usr.bin/svn/lib/libapr_util/apu_config.h +++ b/usr.bin/svn/lib/libapr_util/apu_config.h @@ -27,6 +27,10 @@ /* Define if CODESET is defined in langinfo.h */ #define HAVE_CODESET 1 +/* Define to 1 if you have the <CommonCrypto/CommonKeyDerivation.h> header + file. */ +/* #undef HAVE_COMMONCRYPTO_COMMONKEYDERIVATION_H */ + /* Define to 1 if you have the `crypt_r' function. */ /* #undef HAVE_CRYPT_R */ @@ -37,9 +41,6 @@ /* Define if expat.h is available */ #define HAVE_EXPAT_H 1 -/* Define to 1 if you have the <freetds/sybdb.h> header file. */ -/* #undef HAVE_FREETDS_SYBDB_H */ - /* Define to 1 if you have the <iconv.h> header file. */ /* #undef HAVE_ICONV_H */ @@ -64,6 +65,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 +/* Define if memset_s function is supported */ +#define HAVE_MEMSET_S 1 + /* Define to 1 if you have the <mysql.h> header file. */ /* #undef HAVE_MYSQL_H */ @@ -133,9 +137,6 @@ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the <sybdb.h> header file. */ -/* #undef HAVE_SYBDB_H */ - /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 @@ -145,6 +146,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 +/* Define if compiler handles weak symbols */ +#define HAVE_WEAK_SYMBOLS 1 + /* Define if xmlparse/xmlparse.h is available */ /* #undef HAVE_XMLPARSE_XMLPARSE_H */ diff --git a/usr.bin/svn/lib/libserf/Makefile b/usr.bin/svn/lib/libserf/Makefile index f8d618fa913b..5bd89a68e78f 100644 --- a/usr.bin/svn/lib/libserf/Makefile +++ b/usr.bin/svn/lib/libserf/Makefile @@ -5,20 +5,44 @@ INTERNALLIB= yes LIB= serf -SRCS= aggregate_buckets.c allocator.c auth.c auth_basic.c \ - auth_digest.c auth_spnego.c auth_spnego_gss.c barrier_buckets.c \ - buckets.c bwtp_buckets.c chunk_buckets.c context.c \ - dechunk_buckets.c deflate_buckets.c file_buckets.c \ - headers_buckets.c incoming.c iovec_buckets.c limit_buckets.c \ - mmap_buckets.c outgoing.c request_buckets.c \ - response_body_buckets.c response_buckets.c simple_buckets.c \ - socket_buckets.c ssl_buckets.c ssltunnel.c +SRCS= aggregate_buckets.c \ + allocator.c \ + auth.c \ + auth_basic.c \ + auth_digest.c \ + auth_spnego.c \ + auth_spnego_gss.c \ + barrier_buckets.c \ + buckets.c \ + bwtp_buckets.c \ + chunk_buckets.c \ + context.c \ + dechunk_buckets.c \ + deflate_buckets.c \ + file_buckets.c \ + headers_buckets.c \ + incoming.c \ + iovec_buckets.c \ + limit_buckets.c \ + mmap_buckets.c \ + outgoing.c \ + request_buckets.c \ + response_body_buckets.c \ + response_buckets.c \ + simple_buckets.c \ + socket_buckets.c \ + ssl_buckets.c \ + ssltunnel.c -.PATH: ${SERF}/buckets ${SERF}/auth ${SERF} +.PATH: ${SERF}/buckets \ + ${SERF}/auth \ + ${SERF} -CFLAGS+= -I${.CURDIR} -I${SERF} \ +CFLAGS+= -I${.CURDIR} \ + -I${SERF} \ -I${.CURDIR}/../libapr \ - -I${APR}/include/arch/unix -I${APR}/include \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ -I${.CURDIR}/../libapr_util \ -I${APRU}/include diff --git a/usr.bin/svn/lib/libsvn_client/Makefile b/usr.bin/svn/lib/libsvn_client/Makefile index fd3eb6635962..0a73b3cee179 100644 --- a/usr.bin/svn/lib/libsvn_client/Makefile +++ b/usr.bin/svn/lib/libsvn_client/Makefile @@ -7,17 +7,59 @@ INTERNALLIB= yes LIB= svn_client -SRCS= add.c blame.c cat.c changelist.c checkout.c cleanup.c \ - cmdline.c commit_util.c commit.c compat_providers.c \ - conflicts.c copy_foreign.c copy.c ctx.c delete.c deprecated.c \ - diff_local.c diff_summarize.c diff.c export.c externals.c \ - import.c info.c iprops.c list.c locking_commands.c log.c \ - merge_elements.c merge.c mergeinfo.c mtcc.c patch.c \ - prop_commands.c ra.c relocate.c repos_diff.c resolved.c \ - revert.c revisions.c shelve.c status.c switch.c update.c \ - upgrade.c url.c util.c version.c +SRCS= add.c \ + blame.c \ + cat.c \ + changelist.c \ + checkout.c \ + cleanup.c \ + cmdline.c \ + commit.c \ + commit_util.c \ + compat_providers.c \ + conflicts.c \ + copy.c \ + ctx.c \ + delete.c \ + deprecated.c \ + diff.c \ + diff_local.c \ + diff_summarize.c \ + export.c \ + externals.c \ + import.c \ + info.c \ + iprops.c \ + layout.c \ + list.c \ + locking_commands.c \ + log.c \ + merge.c \ + merge_elements.c \ + mergeinfo.c \ + mtcc.c \ + patch.c \ + prop_commands.c \ + ra.c \ + relocate.c \ + repos_diff.c \ + resolved.c \ + revert.c \ + revisions.c \ + shelf.c \ + shelf2.c \ + status.c \ + switch.c \ + update.c \ + upgrade.c \ + url.c \ + util.c \ + version.c \ + wc_editor.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_delta/Makefile b/usr.bin/svn/lib/libsvn_delta/Makefile index fb510df3d1ff..5b8335db52b1 100644 --- a/usr.bin/svn/lib/libsvn_delta/Makefile +++ b/usr.bin/svn/lib/libsvn_delta/Makefile @@ -7,13 +7,29 @@ INTERNALLIB= yes LIB= svn_delta -SRCS= branch.c branch_compat.c branch_migrate.c branch_nested.c \ - branch_repos.c cancel.c compat.c compose_delta.c \ - debug_editor.c default_editor.c deprecated.c \ - depth_filter_editor.c editor.c element.c \ - path_driver.c svndiff.c text_delta.c version.c xdelta.c +SRCS= branch.c \ + branch_compat.c \ + branch_migrate.c \ + branch_nested.c \ + branch_repos.c \ + cancel.c \ + compat.c \ + compose_delta.c \ + debug_editor.c \ + default_editor.c \ + deprecated.c \ + depth_filter_editor.c \ + editor.c \ + element.c \ + path_driver.c \ + svndiff.c \ + text_delta.c \ + version.c \ + xdelta.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_diff/Makefile b/usr.bin/svn/lib/libsvn_diff/Makefile index f9d342c61180..0d1bbefb8121 100644 --- a/usr.bin/svn/lib/libsvn_diff/Makefile +++ b/usr.bin/svn/lib/libsvn_diff/Makefile @@ -7,11 +7,22 @@ INTERNALLIB= yes LIB= svn_diff -SRCS= binary_diff.c deprecated.c diff.c diff3.c diff4.c \ - diff_file.c diff_memory.c diff_tree.c lcs.c parse-diff.c \ - token.c util.c +SRCS= binary_diff.c \ + deprecated.c \ + diff.c \ + diff3.c \ + diff4.c \ + diff_file.c \ + diff_memory.c \ + diff_tree.c \ + lcs.c \ + parse-diff.c \ + token.c \ + util.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ @@ -20,4 +31,3 @@ CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ -I${APRU}/include .include <bsd.lib.mk> - diff --git a/usr.bin/svn/lib/libsvn_fs/Makefile b/usr.bin/svn/lib/libsvn_fs/Makefile index 467ac93967d4..70810ee4f525 100644 --- a/usr.bin/svn/lib/libsvn_fs/Makefile +++ b/usr.bin/svn/lib/libsvn_fs/Makefile @@ -7,9 +7,14 @@ INTERNALLIB= yes LIB= svn_fs -SRCS= access.c deprecated.c editor.c fs-loader.c +SRCS= access.c \ + deprecated.c \ + editor.c \ + fs-loader.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_fs_fs/Makefile b/usr.bin/svn/lib/libsvn_fs_fs/Makefile index eabb4f29d4bd..5cad91eda323 100644 --- a/usr.bin/svn/lib/libsvn_fs_fs/Makefile +++ b/usr.bin/svn/lib/libsvn_fs_fs/Makefile @@ -7,13 +7,33 @@ INTERNALLIB= yes LIB= svn_fs_fs -SRCS= cached_data.c caching.c dag.c dump-index.c fs.c fs_fs.c \ - hotcopy.c id.c index.c load-index.c lock.c low_level.c \ - pack.c recovery.c rep-cache.c rev_file.c revprops.c \ - stats.c temp_serializer.c transaction.c tree.c util.c \ +SRCS= cached_data.c \ + caching.c \ + dag.c \ + dump-index.c \ + fs.c \ + fs_fs.c \ + hotcopy.c \ + id.c \ + index.c \ + load-index.c \ + lock.c \ + low_level.c \ + pack.c \ + recovery.c \ + rep-cache.c \ + rev_file.c \ + revprops.c \ + stats.c \ + temp_serializer.c \ + transaction.c \ + tree.c \ + util.c \ verify.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_fs_util/Makefile b/usr.bin/svn/lib/libsvn_fs_util/Makefile index 6652931188b5..a8450067304a 100644 --- a/usr.bin/svn/lib/libsvn_fs_util/Makefile +++ b/usr.bin/svn/lib/libsvn_fs_util/Makefile @@ -9,7 +9,9 @@ LIB= svn_fs_util SRCS= fs-util.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_fs_x/Makefile b/usr.bin/svn/lib/libsvn_fs_x/Makefile index 354ebd22c348..3bd701eb4f63 100644 --- a/usr.bin/svn/lib/libsvn_fs_x/Makefile +++ b/usr.bin/svn/lib/libsvn_fs_x/Makefile @@ -7,14 +7,37 @@ INTERNALLIB= yes LIB= svn_fs_x -SRCS= batch_fsync.c cached_data.c caching.c changes.c \ - dag_cache.c dag.c fs.c fs_id.c fs_x.c \ - hotcopy.c id.c index.c lock.c low_level.c noderevs.c pack.c \ - recovery.c rep-cache.c reps.c rev_file.c revprops.c \ - string_table.c temp_serializer.c transaction.c tree.c \ - util.c verify.c +SRCS= batch_fsync.c \ + cached_data.c \ + caching.c \ + changes.c \ + dag.c \ + dag_cache.c \ + fs.c \ + fs_id.c \ + fs_x.c \ + hotcopy.c \ + id.c \ + index.c \ + lock.c \ + low_level.c \ + noderevs.c \ + pack.c \ + recovery.c \ + rep-cache.c \ + reps.c \ + rev_file.c \ + revprops.c \ + string_table.c \ + temp_serializer.c \ + transaction.c \ + tree.c \ + util.c \ + verify.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_ra/Makefile b/usr.bin/svn/lib/libsvn_ra/Makefile index 1e7a22c6cb00..b5fcfb23f155 100644 --- a/usr.bin/svn/lib/libsvn_ra/Makefile +++ b/usr.bin/svn/lib/libsvn_ra/Makefile @@ -7,10 +7,16 @@ INTERNALLIB= yes LIB= svn_ra -SRCS= compat.c debug_reporter.c deprecated.c editor.c \ - ra_loader.c util.c +SRCS= compat.c \ + debug_reporter.c \ + deprecated.c \ + editor.c \ + ra_loader.c \ + util.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_ra_local/Makefile b/usr.bin/svn/lib/libsvn_ra_local/Makefile index 45318f1bcca9..24f4815d1028 100644 --- a/usr.bin/svn/lib/libsvn_ra_local/Makefile +++ b/usr.bin/svn/lib/libsvn_ra_local/Makefile @@ -7,9 +7,12 @@ INTERNALLIB= yes LIB= svn_ra_local -SRCS= ra_plugin.c split_url.c +SRCS= ra_plugin.c \ + split_url.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_ra_serf/Makefile b/usr.bin/svn/lib/libsvn_ra_serf/Makefile index f89bec182370..d256a8f8a559 100644 --- a/usr.bin/svn/lib/libsvn_ra_serf/Makefile +++ b/usr.bin/svn/lib/libsvn_ra_serf/Makefile @@ -7,15 +7,40 @@ INTERNALLIB= yes LIB= svn_ra_serf -SRCS= blame.c blncache.c commit.c eagain_bucket.c \ - get_deleted_rev.c get_file.c get_lock.c getdate.c \ - getlocations.c getlocationsegments.c getlocks.c \ - inherited_props.c list.c lock.c log.c merge.c mergeinfo.c \ - multistatus.c options.c property.c replay.c \ - request_body.c sb_bucket.c serf.c stat.c stream_bucket.c \ - update.c util.c util_error.c xml.c +SRCS= blame.c \ + blncache.c \ + commit.c \ + eagain_bucket.c \ + get_deleted_rev.c \ + get_file.c \ + get_lock.c \ + getdate.c \ + getlocations.c \ + getlocationsegments.c \ + getlocks.c \ + inherited_props.c \ + list.c \ + lock.c \ + log.c \ + merge.c \ + mergeinfo.c \ + multistatus.c \ + options.c \ + property.c \ + replay.c \ + request_body.c \ + sb_bucket.c \ + serf.c \ + stat.c \ + stream_bucket.c \ + update.c \ + util.c \ + util_error.c \ + xml.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_ra_svn/Makefile b/usr.bin/svn/lib/libsvn_ra_svn/Makefile index 756e7591c7d4..9b292c63de03 100644 --- a/usr.bin/svn/lib/libsvn_ra_svn/Makefile +++ b/usr.bin/svn/lib/libsvn_ra_svn/Makefile @@ -7,10 +7,20 @@ INTERNALLIB= yes LIB= svn_ra_svn -SRCS= client.c cram.c cyrus_auth.c deprecated.c editorp.c \ - internal_auth.c marshal.c streams.c wrapped_sasl.c version.c +SRCS= client.c \ + cram.c \ + cyrus_auth.c \ + deprecated.c \ + editorp.c \ + internal_auth.c \ + marshal.c \ + streams.c \ + version.c \ + wrapped_sasl.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_repos/Makefile b/usr.bin/svn/lib/libsvn_repos/Makefile index 6bea94d09997..51aa05b9f5d3 100644 --- a/usr.bin/svn/lib/libsvn_repos/Makefile +++ b/usr.bin/svn/lib/libsvn_repos/Makefile @@ -7,13 +7,33 @@ INTERNALLIB= yes LIB= svn_repos -SRCS= authz.c authz_info.c authz_parse.c \ - config_pool.c commit.c compat.c config_file.c delta.c \ - deprecated.c dump.c fs-wrap.c hooks.c load-fs-vtable.c \ - list.c load.c log.c node_tree.c notify.c replay.c reporter.c \ - repos.c rev_hunt.c +SRCS= authz.c \ + authz_info.c \ + authz_parse.c \ + commit.c \ + compat.c \ + config_file.c \ + config_pool.c \ + delta.c \ + deprecated.c \ + dump.c \ + dump_editor.c \ + fs-wrap.c \ + hooks.c \ + list.c \ + load-fs-vtable.c \ + load.c \ + log.c \ + node_tree.c \ + notify.c \ + replay.c \ + reporter.c \ + repos.c \ + rev_hunt.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/lib/libsvn_subr/Makefile b/usr.bin/svn/lib/libsvn_subr/Makefile index ca90bbd06cf1..20e728f4642d 100644 --- a/usr.bin/svn/lib/libsvn_subr/Makefile +++ b/usr.bin/svn/lib/libsvn_subr/Makefile @@ -7,29 +7,96 @@ INTERNALLIB= yes LIB= svn_subr -SRCS= adler32.c atomic.c auth.c base64.c bit_array.c \ - cache-inprocess.c cache-membuffer.c cache-memcache.c \ - cache.c cache-null.c cache_config.c checksum.c cmdline.c \ - compat.c compress_lz4.c compress_zlib.c \ - config.c config_auth.c config_file.c \ - config_win.c crypto.c ctype.c date.c debug.c \ - deprecated.c dirent_uri.c dso.c \ - encode.c eol.c error.c fnv1a.c \ - gpg_agent.c hash.c io.c iter.c lock.c log.c lz4.c \ - macos_keychain.c magic.c md5.c mergeinfo.c mutex.c nls.c \ - object_pool.c opt.c packed_data.c path.c \ - pool.c prefix_string.c prompt.c properties.c quoprint.c \ - root_pools.c simple_providers.c skel.c sorts.c spillbuf.c \ - sqlite.c sqlite3wrapper.c ssl_client_cert_providers.c \ - ssl_client_cert_pw_providers.c ssl_server_trust_providers.c \ - stream.c string.c subst.c sysinfo.c target.c \ - temp_serializer.c time.c token.c types.c user.c \ - username_providers.c utf.c utf8proc.c \ - utf_validate.c utf_width.c validate.c version.c \ - win32_crashrpt.c win32_crypto.c win32_xlate.c \ - x509info.c x509parse.c xml.c +SRCS= adler32.c \ + atomic.c \ + auth.c \ + base64.c \ + bit_array.c \ + cache-inprocess.c \ + cache-membuffer.c \ + cache-memcache.c \ + cache-null.c \ + cache.c \ + cache_config.c \ + checksum.c \ + cmdline.c \ + compat.c \ + compress_lz4.c \ + compress_zlib.c \ + config.c \ + config_auth.c \ + config_file.c \ + config_win.c \ + crypto.c \ + ctype.c \ + date.c \ + debug.c \ + deprecated.c \ + dirent_uri.c \ + dso.c \ + encode.c \ + eol.c \ + error.c \ + fnv1a.c \ + gpg_agent.c \ + hash.c \ + io.c \ + iter.c \ + lock.c \ + log.c \ + lz4.c \ + macos_keychain.c \ + magic.c \ + md5.c \ + mergeinfo.c \ + mutex.c \ + nls.c \ + object_pool.c \ + opt.c \ + packed_data.c \ + path.c \ + pool.c \ + prefix_string.c \ + prompt.c \ + properties.c \ + quoprint.c \ + root_pools.c \ + simple_providers.c \ + skel.c \ + sorts.c \ + spillbuf.c \ + sqlite.c \ + sqlite3wrapper.c \ + ssl_client_cert_providers.c \ + ssl_client_cert_pw_providers.c \ + ssl_server_trust_providers.c \ + stream.c \ + string.c \ + subst.c \ + sysinfo.c \ + target.c \ + temp_serializer.c \ + time.c \ + token.c \ + types.c \ + user.c \ + username_providers.c \ + utf.c \ + utf8proc.c \ + utf_validate.c \ + utf_width.c \ + validate.c \ + version.c \ + win32_crashrpt.c \ + win32_crypto.c \ + win32_xlate.c \ + x509info.c \ + x509parse.c \ + xml.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ @@ -39,4 +106,3 @@ CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ -I${SQLITE} .include <bsd.lib.mk> - diff --git a/usr.bin/svn/lib/libsvn_wc/Makefile b/usr.bin/svn/lib/libsvn_wc/Makefile index ce3905a6670e..1b711c4ebfc0 100644 --- a/usr.bin/svn/lib/libsvn_wc/Makefile +++ b/usr.bin/svn/lib/libsvn_wc/Makefile @@ -7,17 +7,48 @@ INTERNALLIB= yes LIB= svn_wc -SRCS= adm_crawler.c adm_files.c adm_ops.c \ - ambient_depth_filter_editor.c cleanup.c conflicts.c \ - context.c copy.c crop.c delete.c deprecated.c diff_editor.c \ - diff_local.c entries.c externals.c info.c lock.c merge.c \ - node.c old-and-busted.c props.c questions.c relocate.c \ - revert.c revision_status.c status.c translate.c \ - tree_conflicts.c update_editor.c upgrade.c util.c \ - wc_db.c wc_db_pristine.c wc_db_update_move.c wc_db_util.c \ - wc_db_wcroot.c wcroot_anchor.c workqueue.c +SRCS= adm_crawler.c \ + adm_files.c \ + adm_ops.c \ + ambient_depth_filter_editor.c \ + cleanup.c \ + conflicts.c \ + context.c \ + copy.c \ + crop.c \ + delete.c \ + deprecated.c \ + diff_editor.c \ + diff_local.c \ + entries.c \ + externals.c \ + info.c \ + lock.c \ + merge.c \ + node.c \ + old-and-busted.c \ + props.c \ + questions.c \ + relocate.c \ + revert.c \ + revision_status.c \ + status.c \ + translate.c \ + tree_conflicts.c \ + update_editor.c \ + upgrade.c \ + util.c \ + wc_db.c \ + wc_db_pristine.c \ + wc_db_update_move.c \ + wc_db_util.c \ + wc_db_wcroot.c \ + wcroot_anchor.c \ + workqueue.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile index 261ed25f606f..fc31b878fbee 100644 --- a/usr.bin/svn/svn/Makefile +++ b/usr.bin/svn/svn/Makefile @@ -2,54 +2,113 @@ .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svn +.PATH: ${SVNDIR}/svn -PROG= svn${SVNLITE} +PROG= svn${SVNLITE} -SRCS= add-cmd.c auth-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c \ - checkout-cmd.c cl-conflicts.c cleanup-cmd.c commit-cmd.c \ - conflict-callbacks.c copy-cmd.c delete-cmd.c deprecated.c \ - diff-cmd.c export-cmd.c file-merge.c help-cmd.c import-cmd.c \ - info-cmd.c list-cmd.c lock-cmd.c log-cmd.c merge-cmd.c \ - mergeinfo-cmd.c mkdir-cmd.c move-cmd.c notify.c patch-cmd.c \ - propdel-cmd.c propedit-cmd.c propget-cmd.c proplist-cmd.c \ - props.c propset-cmd.c relocate-cmd.c resolve-cmd.c \ - resolved-cmd.c revert-cmd.c \ - shelve-cmd.c status-cmd.c similarity.c status.c \ - svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c +SRCS= add-cmd.c \ + auth-cmd.c \ + blame-cmd.c \ + cat-cmd.c \ + changelist-cmd.c \ + checkout-cmd.c \ + cl-conflicts.c \ + cleanup-cmd.c \ + commit-cmd.c \ + conflict-callbacks.c \ + copy-cmd.c \ + delete-cmd.c \ + deprecated.c \ + diff-cmd.c \ + export-cmd.c \ + file-merge.c \ + filesize.c \ + help-cmd.c \ + import-cmd.c \ + info-cmd.c \ + list-cmd.c \ + lock-cmd.c \ + log-cmd.c \ + merge-cmd.c \ + mergeinfo-cmd.c \ + mkdir-cmd.c \ + move-cmd.c \ + notify.c \ + patch-cmd.c \ + propdel-cmd.c \ + propedit-cmd.c \ + propget-cmd.c \ + proplist-cmd.c \ + props.c \ + propset-cmd.c \ + relocate-cmd.c \ + resolve-cmd.c \ + resolved-cmd.c \ + revert-cmd.c \ + shelf-cmd.c \ + shelf2-cmd.c \ + similarity.c \ + status-cmd.c \ + status.c \ + svn.c \ + switch-cmd.c \ + unlock-cmd.c \ + update-cmd.c \ + upgrade-cmd.c \ + util.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ - -L${LIBSVN_WCDIR} -lsvn_wc \ - -L${LIBSVN_RADIR} -lsvn_ra \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ - -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_DIFFDIR} -lsvn_diff \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBSERFDIR} -lserf \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ - ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ - ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ - ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + magic \ + crypto \ + ssl \ + pthread + +DPADD= ${LIBSVN_CLIENT} \ + ${LIBSVN_WC} \ + ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} CLEANFILES+= svnlite.1 .if(defined(ORGANIZATION) && !empty(ORGANIZATION)) diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h index 8a6435de7451..c923728d6a49 100644 --- a/usr.bin/svn/svn_private_config.h +++ b/usr.bin/svn/svn_private_config.h @@ -19,12 +19,21 @@ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ /* #undef HAVE_BIND_TEXTDOMAIN_CODESET */ +/* define if the Boost library is available */ +/* #undef HAVE_BOOST */ + +/* define if the Boost::Unit_Test_Framework library is available */ +/* #undef HAVE_BOOST_UNIT_TEST_FRAMEWORK */ + /* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* #undef HAVE_DOPRNT */ +/* Define to 1 if you have the <elf.h> header file. */ +#define HAVE_ELF_H 1 + /* Define to 1 if you have the `getpid' function. */ #define HAVE_GETPID 1 @@ -43,6 +52,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 +/* Define to 1 if you have the <py3c.h> header file. */ +/* #undef HAVE_PY3C_H */ + /* Define to 1 if you have the `rb_errinfo' function. */ /* #undef HAVE_RB_ERRINFO */ @@ -52,12 +64,6 @@ /* Define to 1 if you have the <serf.h> header file. */ #define HAVE_SERF_H 1 -/* Define to use internal LZ4 code */ -#define SVN_INTERNAL_LZ4 1 - -/* Define to use internal UTF8PROC code */ -#define SVN_INTERNAL_UTF8PROC 1 - /* Define to 1 if you have the <stdbool.h> header file. */ #define HAVE_STDBOOL_H 1 @@ -116,7 +122,7 @@ #define PACKAGE_NAME "subversion" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "subversion 1.10.0" +#define PACKAGE_STRING "subversion 1.14.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "subversion" @@ -125,7 +131,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.10.0" +#define PACKAGE_VERSION "1.14.0" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -133,9 +139,6 @@ /* Defined to build against httpd 2.4 with broken auth */ /* #undef SVN_ALLOW_BROKEN_HTTPD_AUTH */ -/* Define to the Python/C API format character suitable for apr_int64_t */ -#define SVN_APR_INT64_T_PYCFMT "l" - /* Defined to be the path to the installed binaries */ #define SVN_BINDIR "/usr/bin" @@ -155,7 +158,7 @@ /* #undef SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE */ /* Shared library file name suffix format */ -#undef SVN_DSO_SUFFIX_FMT +/* #undef SVN_DSO_SUFFIX_FMT */ /* The desired major version for the Berkeley DB */ #define SVN_FS_WANT_DB_MAJOR 4 @@ -179,7 +182,7 @@ /* #undef SVN_HAVE_KEYCHAIN_SERVICES */ /* Defined if KF5 available */ -#undef SVN_HAVE_KF5 +/* #undef SVN_HAVE_KF5 */ /* Defined if KWallet support is enabled */ /* #undef SVN_HAVE_KWALLET */ @@ -188,7 +191,7 @@ #define SVN_HAVE_LIBMAGIC 1 /* Is libsecret support enabled? */ -#undef SVN_HAVE_LIBSECRET +/* #undef SVN_HAVE_LIBSECRET */ /* Is Mach-O low-level _dyld API available? */ /* #undef SVN_HAVE_MACHO_ITERATE */ @@ -208,6 +211,12 @@ /* Defined if support for Serf is enabled */ #define SVN_HAVE_SERF 1 +/* Define to use internal LZ4 code */ +#define SVN_INTERNAL_LZ4 1 + +/* Define to use internal UTF8PROC code */ +#define SVN_INTERNAL_UTF8PROC 1 + /* Defined if libsvn_fs should link against libsvn_fs_base */ /* #undef SVN_LIBSVN_FS_LINKS_FS_BASE */ diff --git a/usr.bin/svn/svnadmin/Makefile b/usr.bin/svn/svnadmin/Makefile index eab3b2c89be9..f6d0a8e0c540 100644 --- a/usr.bin/svn/svnadmin/Makefile +++ b/usr.bin/svn/svnadmin/Makefile @@ -4,33 +4,44 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnadmin +.PATH: ${SVNDIR}/svnadmin -PROG= svn${SVNLITE}admin +PROG= svn${SVNLITE}admin -SRCS= svnadmin.c +SRCS= svnadmin.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> diff --git a/usr.bin/svn/svnbench/Makefile b/usr.bin/svn/svnbench/Makefile index 8fe07d7f40c5..5ab6d8636156 100644 --- a/usr.bin/svn/svnbench/Makefile +++ b/usr.bin/svn/svnbench/Makefile @@ -4,45 +4,71 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnbench +.PATH: ${SVNDIR}/svnbench -PROG= svn${SVNLITE}bench +PROG= svn${SVNLITE}bench -SRCS= help-cmd.c notify.c null-blame-cmd.c null-export-cmd.c \ - null-info-cmd.c null-list-cmd.c null-log-cmd.c svnbench.c util.c +SRCS= help-cmd.c \ + notify.c \ + null-blame-cmd.c \ + null-export-cmd.c \ + null-info-cmd.c \ + null-list-cmd.c \ + null-log-cmd.c \ + svnbench.c \ + util.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ - -L${LIBSVN_WCDIR} -lsvn_wc \ - -L${LIBSVN_RADIR} -lsvn_ra \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ - -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_DIFFDIR} -lsvn_diff \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBSERFDIR} -lserf \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread +LIBADD+= bsdxml \ + sqlite3 \ + z \ + magic \ + crypto \ + ssl \ + pthread -DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ - ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ - ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ - ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +DPADD= ${LIBSVN_CLIENT} \ + ${LIBSVN_WC} \ + ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> diff --git a/usr.bin/svn/svndumpfilter/Makefile b/usr.bin/svn/svndumpfilter/Makefile index ccb54eb35f19..6c9024fbe9bc 100644 --- a/usr.bin/svn/svndumpfilter/Makefile +++ b/usr.bin/svn/svndumpfilter/Makefile @@ -4,33 +4,45 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svndumpfilter +.PATH: ${SVNDIR}/svndumpfilter -PROG= svn${SVNLITE}dumpfilter +PROG= svn${SVNLITE}dumpfilter -SRCS= svndumpfilter.c +SRCS= svndumpfilter.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD+= bsdxml sqlite3 z crypt pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypt \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> diff --git a/usr.bin/svn/svnfsfs/Makefile b/usr.bin/svn/svnfsfs/Makefile index 2a465b6038b4..2818d5bc6ccc 100644 --- a/usr.bin/svn/svnfsfs/Makefile +++ b/usr.bin/svn/svnfsfs/Makefile @@ -4,33 +4,47 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnfsfs +.PATH: ${SVNDIR}/svnfsfs -PROG= svn${SVNLITE}fsfs +PROG= svn${SVNLITE}fsfs -SRCS= dump-index-cmd.c load-index-cmd.c stats-cmd.c svnfsfs.c +SRCS= dump-index-cmd.c \ + load-index-cmd.c \ + stats-cmd.c \ + svnfsfs.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> diff --git a/usr.bin/svn/svnlook/Makefile b/usr.bin/svn/svnlook/Makefile index b4c3929bfbb0..4969c889a3c6 100644 --- a/usr.bin/svn/svnlook/Makefile +++ b/usr.bin/svn/svnlook/Makefile @@ -4,34 +4,46 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnlook +.PATH: ${SVNDIR}/svnlook -PROG= svn${SVNLITE}look +PROG= svn${SVNLITE}look -SRCS= svnlook.c +SRCS= svnlook.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_DIFFDIR} -lsvn_diff \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> diff --git a/usr.bin/svn/svnmucc/Makefile b/usr.bin/svn/svnmucc/Makefile index f2bd597aafd3..3f3a1554f721 100644 --- a/usr.bin/svn/svnmucc/Makefile +++ b/usr.bin/svn/svnmucc/Makefile @@ -4,42 +4,60 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnmucc +.PATH: ${SVNDIR}/svnmucc -PROG= svn${SVNLITE}mucc +PROG= svn${SVNLITE}mucc -SRCS= svnmucc.c +SRCS= svnmucc.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ - -L${LIBSVN_WCDIR} -lsvn_wc \ - -L${LIBSVN_RADIR} -lsvn_ra \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ - -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_DIFFDIR} -lsvn_diff \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBSERFDIR} -lserf \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD+= bsdxml sqlite3 z crypto ssl pthread +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \ - ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} \ - ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} \ - ${LIBAPR_UTIL} ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypto \ + ssl \ + pthread + +DPADD= ${LIBSVN_CLIENT} \ + ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> diff --git a/usr.bin/svn/svnrdump/Makefile b/usr.bin/svn/svnrdump/Makefile index f1dd5e7e16d4..9cd479107d22 100644 --- a/usr.bin/svn/svnrdump/Makefile +++ b/usr.bin/svn/svnrdump/Makefile @@ -4,43 +4,65 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnrdump +.PATH: ${SVNDIR}/svnrdump -PROG= svn${SVNLITE}rdump +PROG= svn${SVNLITE}rdump -SRCS= dump_editor.c load_editor.c svnrdump.c util.c +SRCS= dump_editor.c \ + load_editor.c \ + svnrdump.c \ + util.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ - -L${LIBSVN_WCDIR} -lsvn_wc \ - -L${LIBSVN_RADIR} -lsvn_ra \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ - -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_DIFFDIR} -lsvn_diff \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBSERFDIR} -lserf \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD+= bsdxml sqlite3 z crypto ssl pthread +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ - ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ - ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ - ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypto \ + ssl \ + pthread + +DPADD= ${LIBSVN_CLIENT} \ + ${LIBSVN_WC} \ + ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> diff --git a/usr.bin/svn/svnserve/Makefile b/usr.bin/svn/svnserve/Makefile index 5e2c79cd37c3..8723338abe53 100644 --- a/usr.bin/svn/svnserve/Makefile +++ b/usr.bin/svn/svnserve/Makefile @@ -4,39 +4,59 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnserve +.PATH: ${SVNDIR}/svnserve -PROG= svn${SVNLITE}serve +PROG= svn${SVNLITE}serve -SRCS= cyrus_auth.c log-escape.c logger.c serve.c svnserve.c winservice.c +SRCS= cyrus_auth.c \ + log-escape.c \ + logger.c \ + serve.c \ + svnserve.c \ + winservice.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_RADIR} -lsvn_ra \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ - -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBSERFDIR} -lserf \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ - ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> diff --git a/usr.bin/svn/svnsync/Makefile b/usr.bin/svn/svnsync/Makefile index 7867611cf6e2..50a784b84e06 100644 --- a/usr.bin/svn/svnsync/Makefile +++ b/usr.bin/svn/svnsync/Makefile @@ -4,39 +4,57 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnsync +.PATH: ${SVNDIR}/svnsync -PROG= svn${SVNLITE}sync +PROG= svn${SVNLITE}sync -SRCS= svnsync.c sync.c +SRCS= svnsync.c \ + sync.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_RADIR} -lsvn_ra \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ - -L${LIBSVN_REPOSDIR} -lsvn_repos \ - -L${LIBSVN_FSDIR} -lsvn_fs \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBSERFDIR} -lserf \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD= bsdxml sqlite3 z crypto ssl pthread +LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ - ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypto \ + ssl \ + pthread + +DPADD= ${LIBSVN_RA} \ + ${LIBSVN_RA_LOCAL} \ + ${LIBSVN_RA_SVN} \ + ${LIBSVN_RA_SERF} \ + ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> diff --git a/usr.bin/svn/svnversion/Makefile b/usr.bin/svn/svnversion/Makefile index 29e5b339f6bf..c3d7321dee33 100644 --- a/usr.bin/svn/svnversion/Makefile +++ b/usr.bin/svn/svnversion/Makefile @@ -4,29 +4,40 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnversion +.PATH: ${SVNDIR}/svnversion -PROG= svn${SVNLITE}version +PROG= svn${SVNLITE}version -SRCS= svnversion.c +SRCS= svnversion.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_WCDIR} -lsvn_wc \ - -L${LIBSVN_DELTADIR} -lsvn_delta \ - -L${LIBSVN_DIFFDIR} -lsvn_diff \ - -L${LIBSVN_SUBRDIR} -lsvn_subr \ - -L${LIBAPR_UTILDIR} -lapr-util \ - -L${LIBAPRDIR} -lapr -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \ - ${LIBSERF} ${LIBAPR_UTIL} ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_WC} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> |