From owner-svn-ports-all@FreeBSD.ORG Sun May 18 15:13:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A30CF6F6; Sun, 18 May 2014 15:13:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CD76219E; Sun, 18 May 2014 15:13:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IFDOus070185; Sun, 18 May 2014 15:13:24 GMT (envelope-from lev@svn.freebsd.org) Received: (from lev@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4IFDMgJ070169; Sun, 18 May 2014 15:13:22 GMT (envelope-from lev@svn.freebsd.org) Message-Id: <201405181513.s4IFDMgJ070169@svn.freebsd.org> From: "Lev A. Serebryakov" Date: Sun, 18 May 2014 15:13:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354427 - in head: devel/p5-subversion devel/py-subversion devel/ruby-subversion devel/subversion devel/subversion/files java/java-subversion X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 15:13:24 -0000 Author: lev Date: Sun May 18 15:13:21 2014 New Revision: 354427 URL: http://svnweb.freebsd.org/changeset/ports/354427 QAT: https://qat.redports.org/buildarchive/r354427/ Log: (1) Update to latest 1.8.9 (2) USES=libtool instead of USE_AUTOTOOLS=libtool (3) Bump required Java version to 1.7 for java/java-subversion. (4) Build java/kava-subversion with system clang, not "any" gcc on 10 and CURRENT (checked with OpenJDK7 and OpenJDK8). Modified: head/devel/p5-subversion/pkg-plist head/devel/py-subversion/pkg-plist head/devel/ruby-subversion/pkg-plist head/devel/subversion/Makefile head/devel/subversion/Makefile.common head/devel/subversion/distinfo head/devel/subversion/files/build-outputs.mk head/devel/subversion/files/patch-configure head/devel/subversion/pkg-plist head/java/java-subversion/Makefile head/java/java-subversion/pkg-plist Modified: head/devel/p5-subversion/pkg-plist ============================================================================== --- head/devel/p5-subversion/pkg-plist Sun May 18 14:49:25 2014 (r354426) +++ head/devel/p5-subversion/pkg-plist Sun May 18 15:13:21 2014 (r354427) @@ -1,7 +1,7 @@ lib/libsvn_swig_perl-1.a -lib/libsvn_swig_perl-1.la lib/libsvn_swig_perl-1.so lib/libsvn_swig_perl-1.so.0 +lib/libsvn_swig_perl-1.so.0.0.0 %%PERL5_MAN3%%/SVN::Base.3.gz %%PERL5_MAN3%%/SVN::Client.3.gz %%PERL5_MAN3%%/SVN::Core.3.gz Modified: head/devel/py-subversion/pkg-plist ============================================================================== --- head/devel/py-subversion/pkg-plist Sun May 18 14:49:25 2014 (r354426) +++ head/devel/py-subversion/pkg-plist Sun May 18 15:13:21 2014 (r354427) @@ -1,24 +1,16 @@ lib/libsvn_swig_py-1.a -lib/libsvn_swig_py-1.la lib/libsvn_swig_py-1.so lib/libsvn_swig_py-1.so.0 +lib/libsvn_swig_py-1.so.0.0.0 %%PYTHON_SITELIBDIR%%/libsvn/__init__.py %%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc -%%PYTHON_SITELIBDIR%%/libsvn/_client.la %%PYTHON_SITELIBDIR%%/libsvn/_client.so -%%PYTHON_SITELIBDIR%%/libsvn/_core.la %%PYTHON_SITELIBDIR%%/libsvn/_core.so -%%PYTHON_SITELIBDIR%%/libsvn/_delta.la %%PYTHON_SITELIBDIR%%/libsvn/_delta.so -%%PYTHON_SITELIBDIR%%/libsvn/_diff.la %%PYTHON_SITELIBDIR%%/libsvn/_diff.so -%%PYTHON_SITELIBDIR%%/libsvn/_fs.la %%PYTHON_SITELIBDIR%%/libsvn/_fs.so -%%PYTHON_SITELIBDIR%%/libsvn/_ra.la %%PYTHON_SITELIBDIR%%/libsvn/_ra.so -%%PYTHON_SITELIBDIR%%/libsvn/_repos.la %%PYTHON_SITELIBDIR%%/libsvn/_repos.so -%%PYTHON_SITELIBDIR%%/libsvn/_wc.la %%PYTHON_SITELIBDIR%%/libsvn/_wc.so %%PYTHON_SITELIBDIR%%/libsvn/client.py %%PYTHON_SITELIBDIR%%/libsvn/client.pyc Modified: head/devel/ruby-subversion/pkg-plist ============================================================================== --- head/devel/ruby-subversion/pkg-plist Sun May 18 14:49:25 2014 (r354426) +++ head/devel/ruby-subversion/pkg-plist Sun May 18 15:13:21 2014 (r354427) @@ -1,22 +1,14 @@ lib/libsvn_swig_ruby-1.a -lib/libsvn_swig_ruby-1.la lib/libsvn_swig_ruby-1.so lib/libsvn_swig_ruby-1.so.0 -%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.la +lib/libsvn_swig_ruby-1.so.0.0.0 %%RUBY_SITEARCHLIBDIR%%/svn/ext/client.so -%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.la %%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so -%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.la %%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.so -%%RUBY_SITEARCHLIBDIR%%/svn/ext/diff.la %%RUBY_SITEARCHLIBDIR%%/svn/ext/diff.so -%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.la %%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.so -%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.la %%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.so -%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.la %%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.so -%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.la %%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.so %%RUBY_SITELIBDIR%%/svn/client.rb %%RUBY_SITELIBDIR%%/svn/commit-mailer.rb Modified: head/devel/subversion/Makefile ============================================================================== --- head/devel/subversion/Makefile Sun May 18 14:49:25 2014 (r354426) +++ head/devel/subversion/Makefile Sun May 18 15:13:21 2014 (r354427) @@ -266,7 +266,7 @@ _mkrepos: .USE .endif svn-build-outputs-hack: - cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc + cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk .include Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Sun May 18 14:49:25 2014 (r354426) +++ head/devel/subversion/Makefile.common Sun May 18 15:13:21 2014 (r354427) @@ -2,16 +2,16 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.8.8 -PORTREVISION?= 2 +PORTVERSION= 1.8.9 +PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion18 MASTER_SITE_SUBDIR= subversion -USE_AUTOTOOLS= libtool USE_KDE4= # Used below if KWallet support is enabled -USES+= tar:bzip2 pkgconfig +GNU_CONFIGURE= yes +USES+= tar:bzip2 pkgconfig libtool LICENSE= APACHE20 @@ -105,7 +105,6 @@ post-patch: .endif @${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 - @${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in .if defined(SVN_BUILD_BINDINGS) @${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} .endif Modified: head/devel/subversion/distinfo ============================================================================== --- head/devel/subversion/distinfo Sun May 18 14:49:25 2014 (r354426) +++ head/devel/subversion/distinfo Sun May 18 15:13:21 2014 (r354427) @@ -1,2 +1,2 @@ -SHA256 (subversion18/subversion-1.8.8.tar.bz2) = 1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3 -SIZE (subversion18/subversion-1.8.8.tar.bz2) = 6821200 +SHA256 (subversion18/subversion-1.8.9.tar.bz2) = 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 +SIZE (subversion18/subversion-1.8.9.tar.bz2) = 6828921 Modified: head/devel/subversion/files/build-outputs.mk ============================================================================== --- head/devel/subversion/files/build-outputs.mk Sun May 18 14:49:25 2014 (r354426) +++ head/devel/subversion/files/build-outputs.mk Sun May 18 15:13:21 2014 (r354427) @@ -2829,17 +2829,17 @@ subversion/tests/libsvn_wc/op-depth-test subversion/tests/libsvn_wc/pristine-store-test.lo: subversion/tests/libsvn_wc/pristine-store-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-querie s.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc. h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/lib svn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc. h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/lib svn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc. h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/lib svn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc. h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/lib svn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc. h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/lib svn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc. h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.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_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/lib svn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h subversion/tests/libsvn_wc/wc-incomplete-tester.lo: subversion/tests/libsvn_wc/wc-incomplete-tester.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.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_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h Modified: head/devel/subversion/files/patch-configure ============================================================================== --- head/devel/subversion/files/patch-configure Sun May 18 14:49:25 2014 (r354426) +++ head/devel/subversion/files/patch-configure Sun May 18 15:13:21 2014 (r354427) @@ -1,15 +1,6 @@ ---- configure.orig 2013-06-13 13:08:08.000000000 +0400 -+++ configure 2013-06-19 19:54:23.000000000 +0400 -@@ -4496,7 +4496,7 @@ - # ==== Libraries, for which we may have source to build ====================== - - --APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\." -+APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\." - - - APR_WANTED_REGEXES="$APR_VER_REGEXES" -@@ -18971,11 +18971,11 @@ +--- configure.orig 2014-04-30 20:29:25.000000000 +0400 ++++ configure 2014-05-18 15:22:03.000000000 +0400 +@@ -19419,11 +19419,11 @@ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include" qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" @@ -23,7 +14,7 @@ input_flags="$qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix" output_flags="" filtered_dirs="/lib /lib64 /usr/lib /usr/lib64" -@@ -18994,7 +18994,7 @@ +@@ -19442,7 +19442,7 @@ if test -n "$output_flags"; then printf "%s" "${output_flags# }" fi Modified: head/devel/subversion/pkg-plist ============================================================================== --- head/devel/subversion/pkg-plist Sun May 18 14:49:25 2014 (r354426) +++ head/devel/subversion/pkg-plist Sun May 18 15:13:21 2014 (r354427) @@ -65,69 +65,69 @@ include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a -%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la %%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so %%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0 +%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0.0.0 %%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a -%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.la %%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so %%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0 +%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0.0.0 lib/libsvn_client-1.a -lib/libsvn_client-1.la %%DYNAMIC_ENABLED%%lib/libsvn_client-1.so %%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0.0.0 lib/libsvn_delta-1.a -lib/libsvn_delta-1.la %%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so %%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0.0.0 lib/libsvn_diff-1.a -lib/libsvn_diff-1.la %%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so %%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0.0.0 lib/libsvn_fs-1.a -lib/libsvn_fs-1.la %%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so %%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0.0.0 %%BDB%%lib/libsvn_fs_base-1.a -%%BDB%%lib/libsvn_fs_base-1.la %%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so %%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0 +%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 lib/libsvn_fs_fs-1.a -lib/libsvn_fs_fs-1.la %%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so %%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0.0.0 lib/libsvn_fs_util-1.a -lib/libsvn_fs_util-1.la %%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so %%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0.0.0 lib/libsvn_ra-1.a -lib/libsvn_ra-1.la %%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so %%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0.0.0 lib/libsvn_ra_local-1.a -lib/libsvn_ra_local-1.la %%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so %%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0.0.0 %%SERF%%lib/libsvn_ra_serf-1.a -%%SERF%%lib/libsvn_ra_serf-1.la %%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so %%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0 +%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 lib/libsvn_ra_svn-1.a -lib/libsvn_ra_svn-1.la %%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so %%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0.0.0 lib/libsvn_repos-1.a -lib/libsvn_repos-1.la %%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so %%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0.0.0 lib/libsvn_subr-1.a -lib/libsvn_subr-1.la %%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so %%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0.0.0 lib/libsvn_wc-1.a -lib/libsvn_wc-1.la %%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so %%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0 +%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0.0.0 @comment enable / disable modules in this order: dav_svn, authz_svn, dontdothat %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so Modified: head/java/java-subversion/Makefile ============================================================================== --- head/java/java-subversion/Makefile Sun May 18 14:49:25 2014 (r354426) +++ head/java/java-subversion/Makefile Sun May 18 15:13:21 2014 (r354427) @@ -16,9 +16,10 @@ MASTERDIR= ${.CURDIR}/../../devel/subver .endif PKGDIR= ${.CURDIR} -USE_GCC= any +USES+= compiler + USE_JAVA= yes -JAVA_VERSION= 1.6+ +JAVA_VERSION= 1.7+ JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes @@ -29,6 +30,13 @@ SVN_BUILD_BINDINGS=yes CONFIGURE_ARGS+= --enable-javahl --with-jdk=${JAVA_HOME} --with-jikes=no +post-configure: +.if ${COMPILER_TYPE} == clang + @${REINPLACE_CMD} "s#^LT_CXX_LIBADD = .*#LT_CXX_LIBADD =#" ${WRKSRC}/Makefile +.else + @${DO_NADA} +.endif + do-build: @${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes cd ${WRKSRC} ; \ Modified: head/java/java-subversion/pkg-plist ============================================================================== --- head/java/java-subversion/pkg-plist Sun May 18 14:49:25 2014 (r354426) +++ head/java/java-subversion/pkg-plist Sun May 18 15:13:21 2014 (r354427) @@ -1,7 +1,7 @@ lib/libsvnjavahl-1.a -lib/libsvnjavahl-1.la lib/libsvnjavahl-1.so lib/libsvnjavahl-1.so.0 +lib/libsvnjavahl-1.so.0.0.0 lib/svn-javahl/svn-javahl.jar @dirrm lib/svn-javahl/include @dirrm lib/svn-javahl