From cc2002fab7c02dca0ab9ef6cdc2acaa51cbb7c69 Mon Sep 17 00:00:00 2001 From: "Lev A. Serebryakov" Date: Tue, 12 Aug 2014 15:05:00 +0000 Subject: [PATCH] Update to latest 1.8.10 Turn off unneded options in case of addons explicitly. --- devel/p5-subversion/Makefile | 4 ++++ devel/py-subversion/Makefile | 4 ++++ devel/ruby-subversion/Makefile | 4 ++++ devel/subversion/Makefile | 1 - devel/subversion/Makefile.common | 6 +++--- devel/subversion/distinfo | 4 ++-- .../files/{build-outputs.mk => build-outputs.mk.addons} | 6 +++--- java/java-subversion/Makefile | 5 ++++- www/mod_dav_svn/Makefile | 4 +++- 9 files changed, 27 insertions(+), 11 deletions(-) rename devel/subversion/files/{build-outputs.mk => build-outputs.mk.addons} (99%) diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile index 6d94070eab72..56c3feb48d1d 100644 --- a/devel/p5-subversion/Makefile +++ b/devel/p5-subversion/Makefile @@ -25,6 +25,10 @@ SVN_BUILD_ADDONS= yes CATEGORIES+= perl5 +CONFIGURE_ARGS+= --without-gnome-keyring \ + --without-kwallet \ + --with-apxs=no + ALL_TARGET= swig-pl-lib swig-pl INSTALL_TARGET= install-swig-pl diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 1fa426ff5974..7d43e0801dfd 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -24,6 +24,10 @@ SVN_BUILD_ADDONS= yes CATEGORIES+= python +CONFIGURE_ARGS+= --without-gnome-keyring \ + --without-kwallet \ + --with-apxs=no + ALL_TARGET= swig-py-lib swig-py INSTALL_TARGET= install-swig-py diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index 3f0b1c234821..c45b576a8ad0 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -25,6 +25,10 @@ SVN_BUILD_ADDONS= yes CATEGORIES+= ruby +CONFIGURE_ARGS+= --without-gnome-keyring \ + --without-kwallet \ + --with-apxs=no + ALL_TARGET= swig-rb-lib swig-rb INSTALL_TARGET= install-swig-rb diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 72c2ff5d04a5..46d5f924bdb2 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,7 +1,6 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ -PORTREVISION= 7 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index c1c1f3acb1c8..2f05ab0249d1 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.8.9 -PORTREVISION?= 5 +PORTVERSION= 1.8.10 +PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion18 @@ -98,7 +98,7 @@ post-patch: @${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in .if defined(SVN_BUILD_ADDONS) - @${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} + @${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC} .endif .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo index d8abd3c3166f..350007a34cf5 100644 --- a/devel/subversion/distinfo +++ b/devel/subversion/distinfo @@ -1,2 +1,2 @@ -SHA256 (subversion18/subversion-1.8.9.tar.bz2) = 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 -SIZE (subversion18/subversion-1.8.9.tar.bz2) = 6828921 +SHA256 (subversion18/subversion-1.8.10.tar.bz2) = 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc +SIZE (subversion18/subversion-1.8.10.tar.bz2) = 6899384 diff --git a/devel/subversion/files/build-outputs.mk b/devel/subversion/files/build-outputs.mk.addons similarity index 99% rename from devel/subversion/files/build-outputs.mk rename to devel/subversion/files/build-outputs.mk.addons index a1c1b6d724ec..814f5b934adf 100644 --- a/devel/subversion/files/build-outputs.mk +++ b/devel/subversion/files/build-outputs.mk.addons @@ -2231,7 +2231,7 @@ subversion/libsvn_ra_serf/serf.lo: subversion/libsvn_ra_serf/serf.c subversion/i subversion/libsvn_ra_serf/update.lo: subversion/libsvn_ra_serf/update.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.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_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/util.lo: subversion/libsvn_ra_serf/util.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.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_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/util.lo: subversion/libsvn_ra_serf/util.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_cert.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.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_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h subversion/libsvn_ra_serf/util_error.lo: subversion/libsvn_ra_serf/util_error.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_error_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.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_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h @@ -2329,7 +2329,7 @@ subversion/libsvn_subr/debug.lo: subversion/libsvn_subr/debug.c subversion/inclu subversion/libsvn_subr/deprecated.lo: subversion/libsvn_subr/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_subr/opt.h subversion/svn_private_config.h -subversion/libsvn_subr/dirent_uri.lo: subversion/libsvn_subr/dirent_uri.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/dirent_uri.h subversion/svn_private_config.h +subversion/libsvn_subr/dirent_uri.lo: subversion/libsvn_subr/dirent_uri.c subversion/include/private/svn_cert.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/dirent_uri.h subversion/svn_private_config.h subversion/libsvn_subr/dso.lo: subversion/libsvn_subr/dso.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h @@ -2781,7 +2781,7 @@ subversion/tests/libsvn_subr/config-test.lo: subversion/tests/libsvn_subr/config subversion/tests/libsvn_subr/crypto-test.lo: subversion/tests/libsvn_subr/crypto-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/crypto.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/dirent_uri-test.lo: subversion/tests/libsvn_subr/dirent_uri-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/dirent_uri-test.lo: subversion/tests/libsvn_subr/dirent_uri-test.c subversion/include/private/svn_cert.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h subversion/tests/libsvn_subr/error-code-test.lo: subversion/tests/libsvn_subr/error-code-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile index 728b16755271..02ed148eb477 100644 --- a/java/java-subversion/Makefile +++ b/java/java-subversion/Makefile @@ -31,7 +31,10 @@ SVN_BUILD_ADDONS= yes CONFIGURE_ARGS+= --enable-javahl \ --with-jdk=${JAVA_HOME} \ - --with-jikes=no + --with-jikes=no \ + --without-gnome-keyring \ + --without-kwallet \ + --with-apxs=no MAKE_JOBS_UNSAFE= yes diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile index dc1f44941562..52c6f456a3b9 100644 --- a/www/mod_dav_svn/Makefile +++ b/www/mod_dav_svn/Makefile @@ -19,7 +19,9 @@ SVN_BUILD_ADDONS= yes USE_APACHE= 22+ CONFIGURE_ARGS+= --with-apxs=${APXS} \ - --with-apache-libexecdir + --with-apache-libexecdir \ + --without-gnome-keyring \ + --without-kwallet SUB_FILES= pkg-install