Update *subversion* to 1.8.0:

Version 1.8.0 (18 Jun 2013, from /branches/1.8.x) http://svn.apache.org/repos/asf/subversion/tags/1.8.0 User-visible changes: - General: * require serf as client-side http library (neon support removed) (r1349694) * deprecate the Berkeley DB FS backend (libsvn_fs_base) (r1464985 et al) - Major new features: * working copy records moves as first-class operation (issue #3631, #4232) * merge uses reintegrate mode automatically when needed (r1369896 et al) * FSFS: Packing of revision property shards (issue #3944) * support inheritable properties (r1395109) * repository can suggest config for autoprops and ignores (r1401908) * support gpg-agent for password caching (r1151069) * authz rules can be stored inside the repository (r1424780) - Minor new features and improvements (client-side): * doubled svn:// protocol throughput (r1325899) * optimize file/dir truename checks on Windows (r1435527) * new 'commit --include-externals' option (related to issues #1167, #3563) * new --include-externals option for 'svn list' (issue #4225) * remove extraneous externals output from 'svn status -q' (issue #1935) * reject some attempts to merge between unrelated branches (r1215273) * new --ignore-properties option for 'svn diff' (r1239553, -617) * new --properties-only option for 'svn diff' (r1336110) * new --patch-compatible option for 'svn diff' (r1239561) * new --no-diff-added option for 'svn diff' (r1433958) * new w/c subtree duplication tool (tools/client-side/detach.py) * new mergeinfo fixup tool (tools/client-side/mergeinfo-sanitizer.py) * 'svn diff' can compare arbitrary files and directories (r1310291, et al) * ra_serf avoids re-downloading content present in pristine store (r1333936) * 'svn mergeinfo' now honors the --revision (-r) option (issue #4199) * 'svn mergeinfo' now shows a summary graph by default (issue #4239) * new --search and --search-and options for 'svn log' (r1354666, -83518) * 'svn log' reports the node kind even for pre-1.6 revision files (r1242958) * sort path list generated by "svn log -v --xml" (r1299323) * new built-in interactive text conflict merge tool (r1357864, et al) * 'svn --version' shows build system info (r1368662) * 'svn --version --verbose' shows runtime environment info (r1370813 et al) * 'svn' is now non-interactive when not run in a terminal device (r1424037) * 'svn propset' checks spelling of reserved property names (r1470781) * improve working copy performance on network disks (issue #4176) * support for custom keyword definitions in svn:keywords (issue #890) * svn:ignore __pycache__ directories by default (r1150073) * 'svn diff --git' include copyfrom revision in "copied" headers (r1155279) * svn:mergeinfo related operations now use much less memory (r1149519 et al) * get list of supported schemes for RA libraries (r1148134) * 'svn checkout' skips file externals from other repositories (r1153110) * 'svn resolve' exits non-zero if conflicts could not be resolved (r1150439) * let HTTPv2-aware clients fetch v2-style resources (r1161202) * 'svn status' with better NLS support (r1157537, -682) * better tracking of shallow-yet-complete merges (issues #4056, #4057) * make 'svn status --quiet' w/ externals quieter still (issue #1935) * ensure that conflict paths are shown relative-ized (r1337520) * improve performance of local multi-target deletions (r1195873) * various interactive conflict resolver improvements in 'svn' (r1440421 etc) * improved tree diff implementation for diff and merge (r1440599 et al) * tree conflicts on directories detected better during merges (issue #3150) * allow reverting unmodified copies with 'svn remove' (r1442611) * make 'svn diff' with mixed URL and local path targets work (r1442640) * make 'svn patch' re-add deleted directories if needed (r1445333) * make repos-wc diffs fully ancestry-aware (r1445904) * 'svn diff --git' now implies 'svn diff --show-copies-as-adds' (r1446279) * 'svn diff --show-copies-as-adds' now implies --notice-ancestry (r1446279) * improved tree-conflict detection for 'svn switch' (r1449413, r1450582) * allow up to 8 revision number digits in 'svn status -v' output (r1428637) * show node kind (file or dir) in tree conflict descriptions (r1429907) * restore deleted switched paths upon next update (issue #4295) * add support for copying paths from foreign repositories (issue #3590) * fix merge -cA,B with --accept option aborts if rA conflicts (issue #4238) * 'svn resolve' interactive support; no longer requires --accept (r1336929) * notify when removing externals leaves behind modified files (r1366021) * new 'http-max-connections' configuration option for serf (r1421559) * new 'http-bulk-updates' configuration option for serf (r1421490) * 'svn cleanup' now runs SQLite "vacuum" to reclaim space (r1418459) * 'svn info' displays repository-relative URL (r1415365) * fix serf memory leak on checkout (issue #4194) * detect duplicate paths setting svn:externals (issue #4227) * make ra_serf work over HTTP/1.0 proxies (issue #3979) * make ra_serf accept gzip compression for all responses (r1407454) * double ra_serf performance for checkout and export (r1407545) * improve network and disk i/o interleaving in ra_serf (r1407934) * avoid assert in ra_serf when REPORT response was truncated (r1407935) * rewrite ra_serf XML parser (r1409259 et al) * ra_serf can create transaction with inline txnprops (r1375167) * partially fix replace+propset of locked file fails over DAV (issue #3674) * fix ra_serf doesn't handle bad baseline error from server (issue #4127) * decreased default http timeout for ra_serf (issue #3968) * prevent ra_serf from corrupting the working copy (issue #3993) * ra_serf transmits property changes inline to reduce requests (r1378927) * allow client to avoid SSL certificate prompts (issue #2410) * improve interactive resolution of property conflicts (r1387678 et al) * make ra_serf raise an error upon delta-base mismatch (issue #4235) * tune ra_svn transmit buffer handling (r1391788) * make 'svnrdump' work with serf (issue #4116) * fix 'svnrdump' on path below repository root (issue #4101) * support ipv6 in URLs (e.g. http://[::1]/svn/repos) (r1454047) * conflict resolver now iterates paths in a sorted order (r1461820) * mod_dav_svn does keyword expansion with 'kw=1' query arg (r1466055) * add support for custom keyword definitions (issue #890) - Minor new features and improvements (server-side): * improve performance of config file parsing (r1344347 et al) * new 'svnadmin load --revision' load filtering support (issue #3734) * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815) * new 'svnadmin lock' / 'svnadmin unlock' subcommands (issue #3942, #4092) * new SVNUseUTF8 configuration option for mod_dav_svn (issue #2487) * new SVNHooksEnv configuration option for mod_dav_svn (r1239966) * new SvnPubSub distributed commit hooks (tools/server-side/svnpubsub) * new light-weight benchmarking client (tools/client-side/svn-bench) * svndumpfilter dependency analysis (tools/server-side/svnpredumpfilter.py) * new automatic working copy updater (tools/server-side/svnpubsub) * new 'svnadmin freeze' subcommand (r1376228) * 'svndumpfilter' now supports --delta dumpfiles (r1351009, -3745) * new --drop-all-emtpy-revs option for 'svndumpfilter' (issue #3681) * client version info now reported to commit hooks (issue #4124) * txn name now reported to post-commit hooks (r1240856) * support for server-side keyword expansion in mod_dav_svn (r1466055) * FSFS now able to cache revision properties (r1326307) * FSFS cache for changed-paths increases 'svn log' performance (r1378358) * FSFS cache mergeinfo requested during 'log -g' (r1395439) * many FSFS caching improvements (r1390435, r1390447) * directory and property deltification option in FSFS (issue #4084) * fine-grained control deltification behavior via fsfs.conf (r1311476) * FSFS de-duplication ("rep sharing") now works within a revision (r1397773) * FSFS de-duplication now works for properties as well (r1243312) * read FSFS data using fewer fopen calls (issue #3372) * 'svnadmin verify' will now check meta data (issues #3956, #4211) * 'svnadmin verify' now checks for issue #4129 style corruption (r1304656) * new --client-speed option for svnserve (r1391788) * new --single-threaded option in svnserve (r1296018) * hook script templates are now marked as executable (r1153414) * error out on non-canonical fspaths in the authz file (r1166111) * improve path lookup performance in FSFS (r1442088) * svnserve now logs explicit path and reason for authz failures (r1446542) * validate offsets from rep-cache to prevent FSFS corruption (issue #4277) * new AuthzSVNGroupsFile option to store authz groups separately (r1438407) * new 'SVNAllowBulkUpdates prefer' option for mod_dav_svn (r1417642, et al) * new 'SVNMasterVersion' option for mod_dav_svn (r1398962) * added virtual-host support to 'svnserve' (r1401296) * new fsfs-stats tool which prints FSFS repository stats (r1410995) * new fsfs-reorg tool to optimize FSFS packing (r1383214, r1385395) * new --compatible-version option for 'svnadmin create' (r1407279 ) * new --ignore-properties option for 'svnlook diff' (r1407905) * new --properties-only option for 'svnlook diff' (r1407905) * new --diff-cmd option for 'svnlook diff' (r1413449) * allow leading "r"'s in http: ?p= and ?r= query parameters (r1221463) * faster 'svn ls' for large directories (r1296627) * mod_dav_svn now advertises supported POST types (r1375123) * mod_dav_svn can create transaction with inline txnprops (r1375167) * run start-commit hook after transaction creation (r1376201) * avoid byte-for-byte comparison where it can be avoided (r1390641) * various server-side performance improvements for 'log -g' (r1395442 et al) * allow up to 10Gbit throughput with svnserve (r1391788) * install mod_dontdothat correctly (r1454450) * svnadmin verify can now verify transactions (r1462353) * FSFS verifies revisions as they are added (r1462409) - Client-side bugfixes: * fix inconsistent 'svn log' output for empty revisions (issue #3964) * fix mis-ordered text output of 'svn log --diff' on Windows (r1220783) * fix 'svn log --diff' on moved file (issue #4153). * fix 'svn revert' of 'svn move' (issue #876) * fix file externals wrongly "resurrecting" a deleted file (#4017) * fix reporting of corrupted 1.6 w/cs by 'svn upgrade' (r1182904, -9) * fix bug caused by URI-decoding local merge source paths (r1210539) * fix properties out of sync with repos after merge and revert (issue #4305) * fix merge of replacement on local delete fails (issue #4011) * fix replacements on deletes produce wrong tree conflicts (issue #3806) * made ra_serf handle location headers that are not RFC-compliant (r1443906) * merge no longer errors out after resolving all conflicts (issue #4316) * fix svn blame mis-categorizing file type as binary (issue #2089) * fix externals not removed when working copy is made shallow (issue #3741) * fix update under add with not-present parent (issue #4111) * fix revert of files with svn:needs-lock under copied dirs (r1343168) * fix repos->wc diff of local copied/moved-here directories (r1341927) * fix repos->wc diff of local copied/moved-here files (r1341544) * fix "svn diff -cN PATH" where PATH was deleted in rN (r1338708) * fix dependency on APR hash order in several logic paths (r1338350 et al) * fix path inconsistencies in 'svn diff' output (r1338291) * fix misleading error message printed by 'svn switch' (issue #2337) * fix bug in mergeinfo recording during foreign-repos merge (r1430310) * fix spurious merge conflicts for binary files with keywords (issue #4221) * fix patching symlinks with 'svn patch' (issue #4273) * make 'svn switch' refresh lock information (issue #3376) * fix 'svn diff' output doesn't apply as patch without fuzz (issue #3362) * fix mergeinfo recording for multiple-revision-range merge (issue #4306) * fix diffs shown by 'show-diff' conflict prompt option (r1438879) * don't print an update summary header with no content (r1439480) * make 'svn rm' remove externals registrations below its targets (r1361256) * fix crashes in ra_serf where AVG 2012 Surf-Shield is in use (issue #4175) * don't raise conflicts on identical binary files (issue #4128) * improve error messages when wc.db missing (issue #4118) * fix 'svn diff' showing wrong text change (issue #4270) * fix 'svn diff -rN' failing to show local replace (issue #3797) * fix 'svn diff' showing wrong revision (issue #4010) * fix 'svn merge' showing spurious notifications (issue #2910) * parse '.@HEAD' correctly (issue #3606) * fix 'svn revert' after conflict in sparse working copy (issue #4168) * fix bug in global/per-server config handling in serf (r1421516) * properly display errors from serf (r1398742) * fix crash in ra_serf (r1408291) * fixed svnmucc propset and propdel on repository root (issue #3663) * fix 'svn info' output with ancient svnserve servers (pre-1.2) (r1409732) * ra_serf shows error message for 408 Request Timeout response (r1410983) * fix handling of "\ No newline ..." in diff/patch (r1411723, r1412382) * allow infinite http timeout in ra_serf (r1411976) * using unknown svn: property names now requires --force (issue #4261) * fix handling of case insensitive configuration files (r1215089) * properly handle errors during password caching (r1380695) * fix svnversion output not always a number (issue #4226) * fix conflict resolver losing executable bit of a file (r1391019) * fix redundant notifications when merging with ra_serf (issue #3802) * fix 'svn add --force /path/to/wcroot' should work (issue #4241) * fix file permissions changed after commit (issue #4331) * improve handling of http errors in ra_serf (1452792, 1452870) * include checksum of missing pristines in error message (r1452800) * fix an assert when merging against a replaced source (issue #4132) * fix replacement in merge source has incorrect notification (issue #4138) * improve performance of checkout (r1453791) * fixed documentation regarding merge source (issue #3247) * fix merge errors out after resolving conflicts (issue #4316) * fix delete/move with file external in unversioned dir (issue #4293) * fix resolving tree conflict with local node missing (r1461848) * fix invalid read during diff suffix scanning (issue #4339) * fix assertion when running 'svn log <SOME_URL>@PREV' (r1462134) * optimize enumerating configuration options (r1464478) * revert will now sleep for timestamps if using commit times (r1464769) * don't allow externals to be deleted with 'svn rm' (r1464992) * improved memory usage in ra_serf and ra_local (r1465280) * replace some assertions with more helpful error messages (r1465975) * fixed long keyword expansion truncated (issue #4349) - Server-side bugfixes: * SVNParentPath / repository listing now authz-filtered (r1408184) * user/group names in the authz config file are case-sensitive (r1475772) * limit commit runtime for nodes with very deep histories (r1224836) * 'svnadmin recover' truncates rep-cache at the right point (issue #4077) * fix crashes in dumpstream loading with skipped revs (r1214202, r1214216) * fix 'svn log -g' incorrectly treating rename as merge (issue #4022) * fix bug where fsfs file-hinting fails (issue #4320) * don't leak path of repository on server's disk to clients (r1330906) * remove spurious is-fresh-txn-root from empty revision files (issue #4031) * fix a stdout handling problem in 'svnlook diff' (r1411971) * fix erratic behaviour in 'svnlook diff' showing property diffs (r1412224) * fix inconsistent authz error messages in 'svn log' in svnserve (r1292462) * fix svndumpfilter for empty paths in included or excluded lists (r1294583) * make fsfs packing threadsafe (r1376011) * don't error out on intermittent memcached failures (r1394470) * fix a ra_svn deadlock with zero-copy server option (r1465622) - Other tool improvements and bugfixes: * 'svnmucc' promoted to first-class supported utility (issue #3308, #4279) * make 'svnmucc' prompt for log messages (issue #3418) * rename 'svnauthz-validate' to 'svnauthz' (issue #4284) * make 'svnauthz' optionally validate user/path access (r1197588) * fix mailer.py test suite problems (r1449582) * fix mailer.py not showing dirs with property deletions (r1449582) * make mailer.py generate Date and Message-ID headers (r1449592) * new '-?' option support for 'svnmucc' (r1339428) * provide the repository name to mailer.py (r1439592) * add '--force-interactive' to svnmucc (r1457789) * add '--trust-server-cert' to svnmucc (r1458995) Developer-visible changes: - General: * now require Python 2.5 for tests and dev tools (r1243627) * now require bzip2 for tests and dev tools (r1148512) * configure defaults to --without-apache-libexecdir (r1469862) * support builds with APR pool debugging (r1176894) * 'make extraclean' is more thorough now (r1149460) * support for Serf 2 (r1147538) * introduction of editor v2 (via private APIs only) (r1166332 et al) * improve SQLite setup for compatibility with OS X 10.7. (r1181666) * rework switch statement to accomodate OWC compiler limitations (r1204407) * new --enable-sqlite-compatibility-version configure option (r1201421) * make test suite LD_LIBRARY_PATH include just-built auth plugins (r1200474) * packages/ directory removed, contents were outdated and unused (r1442167) * rename 'makefile.ezt' to 'build-outputs.mk.ezt' (r1444822) * use expensive compiler optimizations with --enable-optimize (r1445063) * in Visual C++ builds, move temp files to different directory (r1446416) * remove --with-ssl and --with-gssapi configure options (r1449023) * require at least serf 1.2.0 as build dependency (issue #4296) * fix error tracing to record file/line properly (r1331242) * add --log-level argument to win-tests.py (r1335461) * improve GDB pretty-printing of svn types (r1351336, r1364750, r1365035) * load third-party FS modules (if --enable-runtime-module-search) (r1362434) * enable running the regression tests over https (r1349699) * support 'make davautocheck' on OS X (r1421583) * new '--enable-gcov' configure option (r1416646) * fix build with Apache HTTPD 2.5 (r1408985) * allow running the test suite through a http proxy (r1410195) * don't use non-constant initializers in struct variables (r1412911) * allow generation of Visual Studio 2012 compatible projects (r1245152) * nicer pretty-printing of Subversion data types in gdb (r1367262 et al) * teach serf build on Windows to use static APR/Util and OpenSSL (r1371338) * add --ssl-cert option to win-tests.py to run tests over https (r1372760) * don't strip Content-Type header form .po files on Windows (r1380056) * configure now script auto-detects GNOME keyring (r1387230) * allow configure to detect BDB on Debian-based Linux distros (r1390633) * auto-detect serf via pkg-config (r1391662) * improve queries for compatability with SQLite 3.7.16 (r1455239) * remove support for in-tree apr, apr-util and apr-memcache (r1456924) * FSFS caching supports prefixes now (r1462436) * maintainer mode now prints symbolic error codes (r1465157) * don't require NLS support for kwallet support (r1466445) * make Julian happy (r1413030) - API changes: * fix inconsistent handling of log revs without changed paths (issue #3694) * deprecated SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA (r1173240) * provide API to clear cached auth credentials (issue #2775) * improve repository location information in various APIs (issue #4170) * major rewrite of conflict storage and handling APIs (r1354973 et al) * hide (deprecate) svn_wc APIs that use editors (r1243339) * svn_stringbuf_ensure() allocates an extra byte for terminator (r1308966) * switch and update apis are now more consistent (r1465292) * deprecated svn_client_merge_reintegrate (r1466742) * deprecated low level ra_svn apis (r1466907) - Bindings: * star-imports in swig-py only import 'svn_*' symbols (r1303375) * fix compilation of Perl bindings on Mandriva 2007 (issue #2617) * new JavaHL testing targets (r1182983) * enable returning an error on malfunctions for JavaHL (r1366215) * MacOS X build fix to cope with missing GNOME keyring (r1397844) * fix swig bindings tests on MacOS X (r1397846) * fix assertion failure in JavaHL error reporting (r1405922) * support ruby 1.9 (r1407206) * JavaHL: Include OSGI Manifest information in svn-javahl.jar (r1234864) * new svn_auth_set_gnome_keyring_unlock_prompt_func function (r1241554) * fix svn_txdelta window ops for python bindings (r1389054) * fix build of Perl bindings with newer versions of SWIG (r1389658) * add missing API functions to Perl bindings (issue #2646) * add missing API functions to Python bindings (r1392038 et al) * add missing API functions to JavaHL bindings (issue #4326) * fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
author: wiz <wiz> 2013-07-04 19:31:14 +0000
committer: wiz <wiz> 2013-07-04 19:31:14 +0000
commit: fbb73fdd109091d6359f523b42c4274af8259936 (patch)
tree: f1b94ab13266c1a4949dfce29b9a53171054deb2
parent: c18a0c8aa2a3eb2ea201c3f70749d422fd62b2bc (diff)
download: pkgsrc-fbb73fdd109091d6359f523b42c4274af8259936.tar.gz
10 files changed, 44 insertions, 33 deletions
diff --git a/devel/py-subversion/PLIST b/devel/py-subversion/PLIST
index 99ba866d934..7bb6403f7c6 100644
--- a/devel/py-subversion/PLIST
+++ b/devel/py-subversion/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:49:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/07/04 19:31:14 wiz Exp $
 lib/libsvn_swig_py-1.la
 ${PYSITELIB}/libsvn/__init__.py
 ${PYSITELIB}/libsvn/__init__.pyc
@@ -56,3 +56,4 @@ share/examples/subversion/python/putfile.py
 share/examples/subversion/python/revplist.py
 share/examples/subversion/python/svnlook.py
 share/examples/subversion/python/svnshell.py
+share/examples/subversion/python/walk-config-auth.py
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 412ae365e23..4c288e588a8 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2013/02/09 13:22:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.83 2013/07/04 19:31:15 wiz Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -13,7 +13,6 @@ BROKEN_GETTEXT_DETECTION=	yes
 
 USE_TOOLS+=		msgfmt
 
-CONFIGURE_ARGS+=	--disable-neon-version-check
 CONFIGURE_ARGS+=	--without-apxs
 
 .if !empty(PKG_OPTIONS:Mapr1)
@@ -31,7 +30,7 @@ BUILDLINK_API_DEPENDS.apr+=	apr>=0.9.5
 .  include "../../devel/apr0/buildlink3.mk"
 .endif
 
-BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.4
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.7.15.1
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
diff --git a/devel/subversion-base/PLIST b/devel/subversion-base/PLIST
index 1464984eaac..332d56be85c 100644
--- a/devel/subversion-base/PLIST
+++ b/devel/subversion-base/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.21 2013/02/09 13:22:10 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.22 2013/07/04 19:31:15 wiz Exp $
 bin/svn
 bin/svnadmin
 bin/svndumpfilter
 bin/svnlook
+bin/svnmucc
 bin/svnrdump
 bin/svnserve
 bin/svnsync
@@ -60,7 +61,6 @@ ${PLIST.db4}lib/libsvn_fs_base-1.la
 lib/libsvn_fs_util-1.la
 lib/libsvn_ra-1.la
 lib/libsvn_ra_local-1.la
-${PLIST.neon}lib/libsvn_ra_neon-1.la
 ${PLIST.serf}lib/libsvn_ra_serf-1.la
 lib/libsvn_ra_svn-1.la
 lib/libsvn_repos-1.la
@@ -70,6 +70,7 @@ man/man1/svn.1
 man/man1/svnadmin.1
 man/man1/svndumpfilter.1
 man/man1/svnlook.1
+man/man1/svnmucc.1
 man/man1/svnrdump.1
 man/man1/svnsync.1
 man/man1/svnversion.1
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index fd61f1177fb..a5bedbaa95e 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2013/05/09 07:39:08 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2013/07/04 19:31:15 wiz Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 .include "../../devel/subversion/Makefile.version"
@@ -29,14 +29,11 @@ pkgbase := subversion-base
 .endif
 
 # If serf and -apr1 are selected, the build will probably fail.
-# Do that rather than force neon for apr0
 .if !empty(PKG_BUILD_OPTIONS.subversion-base:Mserf)
 .  include "../../www/serf/buildlink3.mk"
-.else
-.  include "../../www/neon/buildlink3.mk"
 .endif
 
-BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.4
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.7.15.1
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .endif # SUBVERSION_BASE_BUILDLINK3_MK
diff --git a/devel/subversion-base/options.mk b/devel/subversion-base/options.mk
index edbd6ec9130..6ecdca09793 100644
--- a/devel/subversion-base/options.mk
+++ b/devel/subversion-base/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2011/12/06 02:02:10 obache Exp $
+# $NetBSD: options.mk,v 1.12 2013/07/04 19:31:15 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.subversion
 PKG_SUPPORTED_OPTIONS=	apr1 serf sasl
@@ -6,6 +6,7 @@ PKG_SUPPORTED_OPTIONS=	apr1 serf sasl
 .if !defined(PKG_APACHE_DEFAULT) || empty(PKG_APACHE_DEFAULT:Mapache2)
 PKG_SUGGESTED_OPTIONS=	apr1
 .endif
+PKG_SUGGESTED_OPTIONS+=	serf
 
 # Note that this file is included as part of several packages.
 # Therefore this file defines options and includes some but not all of
@@ -13,17 +14,13 @@ PKG_SUGGESTED_OPTIONS=	apr1
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	serf neon
+PLIST_VARS+=	serf
 
 .if !empty(PKG_OPTIONS:Mserf)
 DAV_RA=		serf
 PLIST.serf=	yes
+BUILDLINK_ABI_DEPENDS.serf+=    serf>=1.2.1
 .  include "../../www/serf/buildlink3.mk"
-.else
-BUILDLINK_API_DEPENDS.neon+=	neon>=0.25.0
-DAV_RA=		neon
-PLIST.neon=	yes
-.  include "../../www/neon/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Msasl)
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index aa8cdafe03e..304e1cdf2d6 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.62 2013/06/29 08:56:56 obache Exp $
+# $NetBSD: Makefile.version,v 1.63 2013/07/04 19:31:15 wiz Exp $
 
 # When updating subversion, all packages are updated at the same time
 # to have a consistent set of packages.  A particularly tricky aspect
@@ -7,5 +7,5 @@
 # changing the version.
 
 .if !defined(SVNVER)
-SVNVER=		1.7.10
+SVNVER=		1.8.0
 .endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 50b08bee33b..de5d5e78584 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.84 2013/06/29 08:56:56 obache Exp $
+$NetBSD: distinfo,v 1.85 2013/07/04 19:31:15 wiz Exp $
 
-SHA1 (subversion-1.7.10.tar.bz2) = a4f3de0a13b034b0eab4d35512c6c91a4abcf4f5
-RMD160 (subversion-1.7.10.tar.bz2) = 1919161092ef6014cdfcbf52e22a576744468fd2
-Size (subversion-1.7.10.tar.bz2) = 5952121 bytes
+SHA1 (subversion-1.8.0.tar.bz2) = 45d227511507c5ed99e07f9d42677362c18b364c
+RMD160 (subversion-1.8.0.tar.bz2) = 134a7688152ce6290021138641cf1ce5ddcb9726
+Size (subversion-1.8.0.tar.bz2) = 6711904 bytes
 SHA1 (patch-ad) = ae54d77447c2ef746bca21f755aa7c255c9521b9
-SHA1 (patch-ae) = 9be99291ffb37eb10859a98cb25dee4228136a00
+SHA1 (patch-ae) = eb348506865a465cc5d123ffacd2778b02b0adc8
+SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a
diff --git a/devel/subversion/patches/patch-ae b/devel/subversion/patches/patch-ae
index fce6036dc21..2cc56510047 100644
--- a/devel/subversion/patches/patch-ae
+++ b/devel/subversion/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.19 2013/02/09 13:22:10 ryoon Exp $
+$NetBSD: patch-ae,v 1.20 2013/07/04 19:31:15 wiz Exp $
 
 Second hunk is subversion Revision 1145203.  Ensure the
 Perl extension is built using the Perl compiler flags.
 
---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	2012-09-30 04:02:09.000000000 +0000
+--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	2012-12-14 06:05:48.000000000 +0000
 +++ subversion/bindings/swig/perl/native/Makefile.PL.in
 @@ -35,9 +35,10 @@ my $svnlib_srcdir = "${top_srcdir}/subve
  my $svnlib_builddir = "${top_builddir}/subversion";
@@ -15,5 +15,5 @@ Perl extension is built using the Perl compiler flags.
 -my @ldpaths = (abs_path($swig_builddir) . "/perl/libsvn_swig_perl/.libs",
 +my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs", $subversion_base_lib,
                 map { abs_path($svnlib_builddir) . "/libsvn_$_/.libs" }
-                    @modules, qw/diff subr ra_local ra_svn ra_neon
-                                 ra_serf fs_base fs_util fs_fs/);
+                    @modules, qw/diff subr ra_local ra_svn ra_serf
+                                 fs_base fs_util fs_fs/);
diff --git a/devel/subversion/patches/patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh b/devel/subversion/patches/patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh
new file mode 100644
index 00000000000..781f1bfa6bf
--- /dev/null
+++ b/devel/subversion/patches/patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh,v 1.1 2013/07/04 19:31:15 wiz Exp $
+
+Fix unportable test(1) construct.
+
+--- tools/dev/benchmarks/large_dirs/create_bigdir.sh.orig	2012-05-21 00:23:26.000000000 +0000
++++ tools/dev/benchmarks/large_dirs/create_bigdir.sh
+@@ -199,7 +199,7 @@ while [ $FILECOUNT -lt $MAXCOUNT ]; do
+   run_svn_del ${FILECOUNT} 1
+ 
+   printf "\tDeleting files ... \t"
+-  if [ "$FILECOUNT" == "1" ] ; then
++  if [ "$FILECOUNT" = "1" ] ; then
+     printf " skipped (0 files to delete)\n"
+   else
+     run_svn_del_many ${FILECOUNT}
diff --git a/www/ap2-subversion/PLIST b/www/ap2-subversion/PLIST
index 8dca329a4cf..de592d1a012 100644
--- a/www/ap2-subversion/PLIST
+++ b/www/ap2-subversion/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/02/09 13:22:11 ryoon Exp $
-lib/httpd/mod_authz_svn.so
-lib/httpd/mod_dav_svn.so
-lib/httpd/mod_dontdothat.so
+@comment $NetBSD: PLIST,v 1.4 2013/07/04 19:31:15 wiz Exp $
+libexec/mod_authz_svn.so
+libexec/mod_dav_svn.so
+libexec/mod_dontdothat.so
author	wiz <wiz>	2013-07-04 19:31:14 +0000
committer	wiz <wiz>	2013-07-04 19:31:14 +0000
commit	fbb73fdd109091d6359f523b42c4274af8259936 (patch)
tree	f1b94ab13266c1a4949dfce29b9a53171054deb2
parent	c18a0c8aa2a3eb2ea201c3f70749d422fd62b2bc (diff)
download	pkgsrc-fbb73fdd109091d6359f523b42c4274af8259936.tar.gz