diff options
| author | peter <peter@FreeBSD.org> | 2014-02-20 20:34:01 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-02-20 20:34:01 +0000 |
| commit | 7cfbe47f2542407346168136f8e33b5015eda94f (patch) | |
| tree | 426421a188b5faf74faf738fdd1043deefa52372 /usr.bin | |
| parent | c34a48054549ac04376eabb976efd13ee68210a9 (diff) | |
| download | FreeBSD-src-7cfbe47f2542407346168136f8e33b5015eda94f.zip FreeBSD-src-7cfbe47f2542407346168136f8e33b5015eda94f.tar.gz | |
MFC r257129,257936,258084,258569,258602,262250,262251
svn-1.8.4, 1.8.5, 1.8.8 and self-contained private support libraries
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/svn/lib/libapr_util/apu_config.h | 2 | ||||
| -rw-r--r-- | usr.bin/svn/svn/Makefile | 9 | ||||
| -rw-r--r-- | usr.bin/svn/svn_private_config.h | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/usr.bin/svn/lib/libapr_util/apu_config.h b/usr.bin/svn/lib/libapr_util/apu_config.h index ac247d0..78a7065 100644 --- a/usr.bin/svn/lib/libapr_util/apu_config.h +++ b/usr.bin/svn/lib/libapr_util/apu_config.h @@ -13,7 +13,7 @@ /* #undef APU_DSO_LIBDIR */ /* Define if the inbuf parm to iconv() is const char ** */ -/* #undef APU_ICONV_INBUF_CONST */ +#define APU_ICONV_INBUF_CONST 1 /* Define that OpenSSL uses const buffers */ #define CRYPTO_OPENSSL_CONST_BUFFERS 1 diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile index 4638c17..61c62e6 100644 --- a/usr.bin/svn/svn/Makefile +++ b/usr.bin/svn/svn/Makefile @@ -53,4 +53,13 @@ DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} +.if(defined(ORGANIZATION) && !empty(ORGANIZATION)) +DPSRCS+= freebsd-organization.h +CLEANFILES+= freebsd-organization.h +CFLAGS+= -I. -DHAS_ORGANIZATION_NAME +freebsd-organization.h: + @echo '#define ORGANIZATION_NAME ${ORGANIZATION}' \ + > freebsd-organization.h +.endif + .include <bsd.prog.mk> diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h index 0611095..8d220d8 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.1" +#define PACKAGE_STRING "subversion 1.8.8" /* 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.1" +#define PACKAGE_VERSION "1.8.8" /* 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-green-indigo-orange-freebsd" +#define SVN_BUILD_HOST "bikeshed-malachite-topaz-amber-freebsd" /* Defined to the config.guess name of the build target */ -#define SVN_BUILD_TARGET "bikeshed-green-indigo-orange-freebsd" +#define SVN_BUILD_TARGET "bikeshed-malachite-topaz-amber-freebsd" /* The path of a default editor for the client. */ /* #undef SVN_CLIENT_EDITOR */ |
