Sat May 30 00:16:48 2009 UTC ()
Update subversion to 1.6.2 via patch in private mail from Jens
Rehsack.  apr1 is no longer an option; that's just the way it is.

Version 1.6.2
(09 May 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.2

 User-visible changes:
  * vastly improve memory usage with 'svn merge' (issue #3393)
  * make default depth for merge 'infinity' (r37156)
  * make 'status --quiet' show tree conflicts (issue #3396)
  * allow '--set-depth infinity' to expand shallow subtrees (r37169)
  * return an error if attempting to reintegrate from/to the repo root (r37385)
  * don't store bogus mergeinfo for '--ignore-ancestry', foreign merges (r37333)
  * don't allow merge of difference between two repos (r37519)
  * avoid potential segfault with subtree mergeinfo (r36613, -15, -31, -41)
  * recommend sqlite 3.6.13 (r37245)
  * avoid unnecessary server query for implicit mergeinfo (r36509)
  * avoid unnecessary server query during reverse merges (r36527)
  * set depth=infinity on 'svn add' items with restricted depth (r37607)
  * fixed: commit log message template missing paths (issue #3399)
  * fixed: segfault on merge with servers < 1.6 (r37363, -67, -68, -79)
  * fixed: repeat merge failures with non-inheritable mergeinfo (issue #3392)
  * fixed: another memory leak when performing mergeinfo-aware merges (r37398)
  * fixed: incorrect mergeinfo on children of shallow merges (issue #3407)
  * fixed: pool lifetime issues in the BDB backend (r37137)

 Developer-visible changes:
  * don't fail if an embedding app has already initialized SQLite (issue #3387)
  * resolve naming collisions with static stat() function in svnserve (r37527)
  * fix an expectation for a failing dirent windows test (r37121)

Version 1.6.1
(10 Apr 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.1

 User-visible changes:
  * recommend Neon 0.28.4. (r36388)
  * improve performance of 'svn merge --ignore-ancestry' (r36256)
  * improve 'svn merge' performance with subtree mergeinfo (r36444)
  * correctly proxy LOCK and UNLOCK requests (r36159)
  * prevent a crash when updating old working copies (r36751)
  * don't let svnmerge.py delete a nonexistent property (r36086, -767, -769)
  * don't fail when upgrading pre-1.2 repositories (r36851, -7)
  * allow escaping of separator characters in autoprops (r36763, -84)
  * improve tempfile creation robustness on Windows (r36442, -3)
  * fix change-svn-wc-format.py for 1.6.x working copies (r36874, -5)
  * improve configure's detection of Berkeley DB (r36741, -2)
  * don't allow foreign merges to add foreign mergeinfo (issue #3383)
  * improve performance of 'svn update' on large files (r36389, et. al.)
  * fixed: error leak and potential crash (r36860)
  * fixed: parent directory handling on Windows (r36049, -50, -51, -131)
  * fixed: unintialized memory errors (r36252, -3)
  * fixed: potential working copy corruption (r36714)
  * fixed: working copy upgrade error (r36302)
  * fixed: pointer dereference error (r36783)
  * fixed: error diff'ing large data with ignored whitespace (r36816)
  * fixed: potential hang in ra_serf (r36913)
  * fixed: problem with merge and non-inheritable mergeinfo (r36879)
  * fixed: repeated merging of conflicted properties fails (issue #3250)
  * fixed: excluding an absent directory segfaults (issue #3391)

 Developer-visible changes:
  * ensure svn_subst_translate_cstring2() properly flushes data (r36747)
  * make serf report a base checksum to apply_textdelta (r36890)
  * syntax updates for strict C89 compilers (r36799)
  * update RPM scripts for RHEL4 (r36834)
  * allow tests to be run with Python 2.6.1 on Windows (r36149, -50, -51, -56)
  * allow building JavaHL with Visual Studio 2008 (r36954)
  * stop setting default translation domain in JavaHL (r36955)
  * fixed: warning with Python 2.6 and ctypes bindings (r36559)
  * fixed: undefined references to svn_fs_path_change2_create() (r36823)

Version 1.6.0
(20 Mar 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.0

 User-visible changes:
  - General:
    * Now require Windows 2000 or newer on Windows (r33170)

  - Major new features:
    * identical files share storage space in repository (issue #2286)
    * file-externals support for intra-repository files (issue #937)
    * "tree" conflicts now handled more gracefully (issue #2282, #2908)
    * repository root relative URL support on most commands (issue #3193)

  - Minor new features and improvements:
    * pre-lock hook can now specify lock tokens via stdout (r32778)
    * svnmucc: support '--with-revprop' (r29492)
    * merge: log include-descendants in operational log (r30426, r30428)
    * improved operational logging for 'svn switch' (r30517)
    * new 'Header' keyword, similar to 'Id' but with full URL (r35386)
    * warn/disallow when storing plain-text passwords (r31046)
    * support KWallet and GNOME keyring for password storage (r31241, -337)
    * client now caches SSL client cert passphrases (issue #2489)
    * add '--prefix-file' option to 'svndumpfilter' (issue #2697)
    * add '--ignore-externals' option to 'svn cp' (issue #3365)
    * add '--with-no-revprops' to 'svn log' (issue #3286)
    * new 'svnadmin pack' command to compress FSFS filesystems
    * new SVNAllowBulkUpdates mod_dav_svn directive (issue #3121)
    * new public mod_dav_svn URI syntax:  path?[p=PEG][&r=REV] (r34076)
    * new 'svnsync info' command to show synchronization information (r35053)
    * conflict resolver supports display-conflict, mine-conflict and theirs-conflict

  - Client-side bugfixes:
    * faulty reflexive merges (issue #2897)
    * buffer overflow on a 0 byte string buffer (r35968, -74)
    * conflict resolver needed more useful 'diff' option (issue #3048)
    * disable username assumption (issue #2324)
    * more accurate usage message for 'svn log' (r30449)
    * do not repeat merge if target has explicit mergeinfo (issue #2821)
    * corruption when filtering self-referential mergeinfo (r30467)
    * filter empty mergeinfo with self-referential mergeinfo (r30510)
    * pay attention to partial replay from the server in svnsync (r30440)
    * improved property name handling in svnsync (r30480)
    * properly recognize the file:/// in repository with svnsync (r30482)
    * svn+ssh SIGKILLs ssh processes (issue #2580)
    * 'svn up'/'svn co' early abort with svn:externals (issue #3148)
    * improve tempfile names for conflict resolver (issue #3166)
    * ra_serf: 'svn merge' aborts (issue #3212)
    * 'svn cleanup' failed on non-ASCII characters (issue #3313)
    * 'svn update' fails on moved, modified file with local mods (issue #3354)
    * easier use of NTLM for proxy with ra_neon (r29874)
    * 2-url merge from DAV-accessed foreign repo makes bad wcprops (issue #3118)
    * can't add .svn (and children) to your wc via '--parents' (r35819)
    * improved performance removing unversioned directories (r36111)
    * 'svn cp --parents' had path URL encoding issues (issue #3374)
    * support shell quoting rules in externals definitions (issue #2461)
    * new SVN_LOCALE_DIR environment variable for localization (issue #2879)
    * scheme and domain name in urls handled case insensitive (issue #2475)
    * merge: pick default revisions with peg revision in single url (r30455)
    * many other minor bugfixes, optimizations, plugs of memory leaks, etc

  - Server-side bugfixes:
    * mod_dav_svn runs pre-revprop-change twice (issue #3085)
    * mod_dav_svn ignores pre-revprop-change failure on delete (issue #3086)
    * mod_dav_svn prevented lock breaks from being propagated to client (r29914)
    * non-UTF8 filenames could enter repository (issue #2748)
    * 'svnlook proplist' xml output (issue #2809)
    * don't let mod_dav_svn hide errors from client (issue #3102)
    * ra_serf failure during update (issue #3113)
    * ra_serf comply with RFC 2617 in handling authentication headers (r35981)
    * use both SHA1 and MD5 in the FS backends (r34388)
    * many other minor bugfixes too numerous to list here

  - Contributed tools improvements and bugfixes:
    * commit-email.pl: Deprecated; use mailer.py instead (r31755, -67)
    * svnmerge.py migration tool munged svn:mergeinfo ordering (issue #3302)
    * And other random sundry stuff

 Developer-visible changes:
  - General:
    * serf 0.3.0 required, when building with serf (r35586)
    * require SQLite 3.4.0 or newer (r33520)
    * allow the use of an in-tree SQLite amalgamation (r35263)
    * svn_log_changed_path_t now includes a 'kind' field (issue #1967)
    * BDB `changes' table inconsistency when APIs are misused (issue #3349)
    * configure should prefer apr-1 over apr-0 if both are present (issue #2671)
    * make 'Not Found' errors consistent between RA layers (issue #3137)
    * fix a potential buffer overrun (r34374)
    * many bug fixes and improvements to the test suite

  - API changes:
    * notification system for properties and revision properties (issue #783)
    * make ra_svn's merge commit-revprops public (r30462, r30453)
    * mod_dav_svn operational logging compatible with svnserve logging (r30518)
    * improve speed of svn_client__get_copy_source() (issue #3356)
    * if fsfs commit fails return SVN_INVALID_REVNUM (r35950)

  - Bindings:
    * new: ctypes python bindings
    * many improvements to all bindings (Java, Perl, Python, and Ruby)
    * respect CFLAGS in SWIG bindings (r35879)
    * fix building Ruby bindings with Ruby 1.9 (r35852, r35883)


(gdt)
diff -r1.4 -r1.5 pkgsrc/devel/java-subversion/Makefile
diff -r1.45 -r1.46 pkgsrc/devel/p5-subversion/Makefile
diff -r1.33 -r1.34 pkgsrc/devel/py-subversion/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/py-subversion/PLIST
diff -r1.24 -r1.25 pkgsrc/devel/ruby-subversion/Makefile
diff -r1.39 -r1.40 pkgsrc/devel/subversion/Makefile
diff -r1.48 -r1.49 pkgsrc/devel/subversion/Makefile.version
diff -r1.70 -r1.71 pkgsrc/devel/subversion/distinfo
diff -r1.62 -r1.63 pkgsrc/devel/subversion-base/Makefile
diff -r1.17 -r1.18 pkgsrc/devel/subversion-base/PLIST
diff -r1.1 -r1.2 pkgsrc/devel/subversion-base/PLIST.bdb
diff -r1.19 -r1.20 pkgsrc/devel/subversion-base/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/devel/subversion-base/options.mk
diff -r1.11 -r1.12 pkgsrc/devel/subversion/files/build-outputs.mk
diff -r1.15 -r1.16 pkgsrc/devel/subversion/patches/patch-aa
diff -r1.37 -r1.38 pkgsrc/www/ap2-subversion/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/devel/java-subversion/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/java-subversion/Makefile 2009/04/16 21:42:41 1.4
+++ pkgsrc/devel/java-subversion/Makefile 2009/05/30 00:16:46 1.5
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.4 2009/04/16 21:42:41 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2009/05/30 00:16:46 gdt Exp $
2 2
3PKGNAME= java-subversion-${SVNVER} 3PKGNAME= java-subversion-${SVNVER}
4PKGREVISION= 1 
5COMMENT= Java bindings for Subversion 4COMMENT= Java bindings for Subversion
6 5
7PKG_INSTALLATION_TYPES= overwrite pkgviews 6PKG_INSTALLATION_TYPES= overwrite pkgviews
8PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
9 8
10MAKE_JOBS_SAFE= no 9MAKE_JOBS_SAFE= no
11 10
12.include "../../devel/subversion/Makefile.common" 11.include "../../devel/subversion/Makefile.common"
13 12
14SHLIBTOOL_OVERRIDE= # empty 13SHLIBTOOL_OVERRIDE= # empty
15 14
16USE_LANGUAGES+= c c++ 15USE_LANGUAGES+= c c++
17USE_JAVA= yes 16USE_JAVA= yes
cvs diff -r1.45 -r1.46 pkgsrc/devel/p5-subversion/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/p5-subversion/Makefile 2009/04/16 21:42:41 1.45
+++ pkgsrc/devel/p5-subversion/Makefile 2009/05/30 00:16:47 1.46
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.45 2009/04/16 21:42:41 wiz Exp $ 1# $NetBSD: Makefile,v 1.46 2009/05/30 00:16:47 gdt Exp $
2 2
3PKGNAME= p5-subversion-${SVNVER} 3PKGNAME= p5-subversion-${SVNVER}
4PKGREVISION= 2 
5COMMENT= Perl bindings for Subversion 4COMMENT= Perl bindings for Subversion
6 5
7PKG_INSTALLATION_TYPES= overwrite pkgviews 6PKG_INSTALLATION_TYPES= overwrite pkgviews
8PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
9 8
10MAKE_JOBS_SAFE= no 9MAKE_JOBS_SAFE= no
11 10
12.include "../../devel/subversion/Makefile.common" 11.include "../../devel/subversion/Makefile.common"
13 12
14SHLIBTOOL_OVERRIDE= # empty 13SHLIBTOOL_OVERRIDE= # empty
15 14
16USE_TOOLS+= perl 15USE_TOOLS+= perl
17PERL5_CONFIGURE= no 16PERL5_CONFIGURE= no
cvs diff -r1.33 -r1.34 pkgsrc/devel/py-subversion/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-subversion/Makefile 2009/04/16 21:42:41 1.33
+++ pkgsrc/devel/py-subversion/Makefile 2009/05/30 00:16:47 1.34
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.33 2009/04/16 21:42:41 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2009/05/30 00:16:47 gdt Exp $
2 2
3PKGNAME= ${PYPKGPREFIX}-subversion-${SVNVER} 3PKGNAME= ${PYPKGPREFIX}-subversion-${SVNVER}
4PKGREVISION= 1 
5COMMENT= Python bindings and tools for Subversion 4COMMENT= Python bindings and tools for Subversion
6 5
7PKG_DESTDIR_SUPPORT= user-destdir 6PKG_DESTDIR_SUPPORT= user-destdir
8 7
9.include "../../devel/subversion/Makefile.common" 8.include "../../devel/subversion/Makefile.common"
10 9
11SHLIBTOOL_OVERRIDE= # empty 10SHLIBTOOL_OVERRIDE= # empty
12 11
13CONFIGURE_ENV+= PYTHON2=${PYTHONBIN:Q} 12CONFIGURE_ENV+= PYTHON2=${PYTHONBIN:Q}
14 13
15PY_PATCHPLIST= YES 14PY_PATCHPLIST= YES
16PYTHON_PATCH_SCRIPTS= tools/hook-scripts/mailer/mailer.py 15PYTHON_PATCH_SCRIPTS= tools/hook-scripts/mailer/mailer.py
17 16
cvs diff -r1.6 -r1.7 pkgsrc/devel/py-subversion/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/py-subversion/PLIST 2008/06/19 22:33:25 1.6
+++ pkgsrc/devel/py-subversion/PLIST 2009/05/30 00:16:47 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2008/06/19 22:33:25 epg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2009/05/30 00:16:47 gdt Exp $
2lib/libsvn_swig_py-1.la 2lib/libsvn_swig_py-1.la
3${PYSITELIB}/libsvn/__init__.py 3${PYSITELIB}/libsvn/__init__.py
4${PYSITELIB}/libsvn/__init__.pyc 4${PYSITELIB}/libsvn/__init__.pyc
5${PYSITELIB}/libsvn/_client.la 5${PYSITELIB}/libsvn/_client.la
6${PYSITELIB}/libsvn/_core.la 6${PYSITELIB}/libsvn/_core.la
7${PYSITELIB}/libsvn/_delta.la 7${PYSITELIB}/libsvn/_delta.la
8${PYSITELIB}/libsvn/_diff.la 8${PYSITELIB}/libsvn/_diff.la
9${PYSITELIB}/libsvn/_fs.la 9${PYSITELIB}/libsvn/_fs.la
10${PYSITELIB}/libsvn/_ra.la 10${PYSITELIB}/libsvn/_ra.la
11${PYSITELIB}/libsvn/_repos.la 11${PYSITELIB}/libsvn/_repos.la
12${PYSITELIB}/libsvn/_wc.la 12${PYSITELIB}/libsvn/_wc.la
13${PYSITELIB}/libsvn/client.py 13${PYSITELIB}/libsvn/client.py
14${PYSITELIB}/libsvn/client.pyc 14${PYSITELIB}/libsvn/client.pyc
@@ -47,15 +47,17 @@ ${PYSITELIB}/svn/wc.pyc @@ -47,15 +47,17 @@ ${PYSITELIB}/svn/wc.pyc
47share/examples/subversion/hook-scripts/mailer.conf.example 47share/examples/subversion/hook-scripts/mailer.conf.example
48share/examples/subversion/hook-scripts/mailer.py 48share/examples/subversion/hook-scripts/mailer.py
49share/examples/subversion/python/blame.py 49share/examples/subversion/python/blame.py
50share/examples/subversion/python/check-modified.py 50share/examples/subversion/python/check-modified.py
51share/examples/subversion/python/dumpprops.py 51share/examples/subversion/python/dumpprops.py
52share/examples/subversion/python/get-location-segments.py 52share/examples/subversion/python/get-location-segments.py
53share/examples/subversion/python/getfile.py 53share/examples/subversion/python/getfile.py
54share/examples/subversion/python/geturl.py 54share/examples/subversion/python/geturl.py
55share/examples/subversion/python/putfile.py 55share/examples/subversion/python/putfile.py
56share/examples/subversion/python/revplist.py 56share/examples/subversion/python/revplist.py
57share/examples/subversion/python/svnlook.py 57share/examples/subversion/python/svnlook.py
58share/examples/subversion/python/svnshell.py 58share/examples/subversion/python/svnshell.py
59@dirrm share/examples/subversion/python 59@dirrm share/examples/subversion/python
 60@dirrm share/examples/subversion/hook-scripts
 61@dirrm share/examples/subversion
60@dirrm ${PYSITELIB}/svn 62@dirrm ${PYSITELIB}/svn
61@dirrm ${PYSITELIB}/libsvn 63@dirrm ${PYSITELIB}/libsvn
cvs diff -r1.24 -r1.25 pkgsrc/devel/ruby-subversion/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-subversion/Makefile 2009/04/16 21:42:42 1.24
+++ pkgsrc/devel/ruby-subversion/Makefile 2009/05/30 00:16:47 1.25
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.24 2009/04/16 21:42:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2009/05/30 00:16:47 gdt Exp $
2 2
3PKGNAME= ${RUBY_PKGPREFIX}-subversion-${SVNVER} 3PKGNAME= ${RUBY_PKGPREFIX}-subversion-${SVNVER}
4PKGREVISION= 1 
5COMMENT= Ruby bindings for Subversion 4COMMENT= Ruby bindings for Subversion
6 5
7PKG_DESTDIR_SUPPORT= user-destdir 6PKG_DESTDIR_SUPPORT= user-destdir
8 7
9.include "../../devel/subversion/Makefile.common" 8.include "../../devel/subversion/Makefile.common"
10 9
11SHLIBTOOL_OVERRIDE= # empty 10SHLIBTOOL_OVERRIDE= # empty
12 11
13REPLACE_RUBY_DIRS= tools 12REPLACE_RUBY_DIRS= tools
14 13
15CONFIGURE_ENV+= RUBY=${RUBY:Q} 14CONFIGURE_ENV+= RUBY=${RUBY:Q}
16CONFIGURE_ARGS+= --with-ruby-sitedir=${PREFIX}/${RUBY_VENDORLIB_BASE} 15CONFIGURE_ARGS+= --with-ruby-sitedir=${PREFIX}/${RUBY_VENDORLIB_BASE}
17 16
cvs diff -r1.39 -r1.40 pkgsrc/devel/subversion/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/subversion/Makefile 2009/04/08 22:54:22 1.39
+++ pkgsrc/devel/subversion/Makefile 2009/05/30 00:16:47 1.40
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.39 2009/04/08 22:54:22 joerg Exp $ 1# $NetBSD: Makefile,v 1.40 2009/05/30 00:16:47 gdt Exp $
2 2
3PKGNAME= subversion-${SVNVER} 3PKGNAME= subversion-${SVNVER}
4PKGREVISION= 1 
5COMMENT= Version control system, meta-package 4COMMENT= Version control system, meta-package
6 5
7META_PACKAGE= # empty 6META_PACKAGE= # empty
8 7
9.include "../../devel/subversion/Makefile.common" 8.include "../../devel/subversion/Makefile.common"
10 9
11DEPENDS+= subversion-base-${SVNVER}{,nb[0-9]*}:../../devel/subversion-base 10DEPENDS+= subversion-base-${SVNVER}{,nb[0-9]*}:../../devel/subversion-base
12DEPENDS+= ${APACHE_PKG_PREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion 11DEPENDS+= ${APACHE_PKG_PREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion
13DEPENDS+= p5-subversion-${SVNVER}{,nb[0-9]*}:../../devel/p5-subversion 12DEPENDS+= p5-subversion-${SVNVER}{,nb[0-9]*}:../../devel/p5-subversion
14DEPENDS+= ${PYPKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/py-subversion 13DEPENDS+= ${PYPKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/py-subversion
15DEPENDS+= ${RUBY_PKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/ruby-subversion 14DEPENDS+= ${RUBY_PKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/ruby-subversion
16 15
17.if !empty(PKG_OPTIONS:Mjava) 16.if !empty(PKG_OPTIONS:Mjava)
cvs diff -r1.48 -r1.49 pkgsrc/devel/subversion/Makefile.version (expand / switch to unified diff)

--- pkgsrc/devel/subversion/Makefile.version 2009/03/22 15:27:06 1.48
+++ pkgsrc/devel/subversion/Makefile.version 2009/05/30 00:16:47 1.49
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1# $NetBSD: Makefile.version,v 1.48 2009/03/22 15:27:06 gdt Exp $ 1# $NetBSD: Makefile.version,v 1.49 2009/05/30 00:16:47 gdt Exp $
2 2
3.if !defined(SVNVER) 3.if !defined(SVNVER)
4# As of 2009-03-22 gdt@NetBSD.org knows 1.6.0 is out, but is 4# As of 2009-03-22 gdt@NetBSD.org knows 1.6.0 is out, but is
5# intentionally waiting until post-2009Q1 and until there is enough 5# intentionally waiting until post-2009Q1 and until there is enough
6# experience with 1.6.0 before subjecting pkgsrc users to it. Update 6# experience with 1.6.0 before subjecting pkgsrc users to it. Update
7# will probably come mid to late April; comments welcome. 7# will probably come mid to late April; comments welcome.
8SVNVER= 1.5.6 8SVNVER= 1.6.2
9.endif 9.endif
cvs diff -r1.70 -r1.71 pkgsrc/devel/subversion/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/subversion/distinfo 2009/05/21 16:11:41 1.70
+++ pkgsrc/devel/subversion/distinfo 2009/05/30 00:16:47 1.71
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.70 2009/05/21 16:11:41 abs Exp $ 1$NetBSD: distinfo,v 1.71 2009/05/30 00:16:47 gdt Exp $
2 2
3SHA1 (subversion-1.5.6.tar.gz) = de5fd8c46e3872f7ee3a05a45b71936f82646a92 3SHA1 (subversion-1.6.2.tar.gz) = 35964d8c00dd58e78a374a083a2347b97cc7be1d
4RMD160 (subversion-1.5.6.tar.gz) = cc725c81854f594c9471fd5a4712e53e83d1be9a 4RMD160 (subversion-1.6.2.tar.gz) = c311c1b3e532b3e92bc2eba661b74e0764d41ea4
5Size (subversion-1.5.6.tar.gz) = 6727513 bytes 5Size (subversion-1.6.2.tar.gz) = 7506011 bytes
6SHA1 (patch-aa) = b74ab8e8a0f2a28bee9b00f3562d8ff31b2004ba 
7SHA1 (patch-ad) = 52da52e60e4d70266081d98ab0bf4ec312427bd6 6SHA1 (patch-ad) = 52da52e60e4d70266081d98ab0bf4ec312427bd6
8SHA1 (patch-ae) = 55982ded0a7cbb09a91545c7580021e8ed4947f0 7SHA1 (patch-ae) = 55982ded0a7cbb09a91545c7580021e8ed4947f0
cvs diff -r1.62 -r1.63 pkgsrc/devel/subversion-base/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/subversion-base/Makefile 2009/05/21 16:11:41 1.62
+++ pkgsrc/devel/subversion-base/Makefile 2009/05/30 00:16:47 1.63
@@ -1,93 +1,73 @@ @@ -1,93 +1,73 @@
1# $NetBSD: Makefile,v 1.62 2009/05/21 16:11:41 abs Exp $ 1# $NetBSD: Makefile,v 1.63 2009/05/30 00:16:47 gdt Exp $
2 2
3PKGNAME= subversion-base-${SVNVER} 3PKGNAME= subversion-base-${SVNVER}
4PKGREVISION= 3 
5COMMENT= Version control system, base programs and libraries 4COMMENT= Version control system, base programs and libraries
6 5
7PKG_INSTALLATION_TYPES= overwrite pkgviews 6PKG_INSTALLATION_TYPES= overwrite pkgviews
8PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
9 8
10# on at least solaris, configure fails to figure out 9# on at least solaris, configure fails to figure out
11# that you need -lintl 10# that you need -lintl
12BROKEN_GETTEXT_DETECTION= yes 11BROKEN_GETTEXT_DETECTION= yes
13 12
14.include "../../devel/subversion/Makefile.common" 13.include "../../devel/subversion/Makefile.common"
15 14
16.if !empty(PKG_OPTIONS:Mapr1) 
17APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util 
18.else 
19APU_OPTIONS= PKG_BUILD_OPTIONS.apr 
20.endif 
21 
22BUILD_DEFS+= ${APU_OPTIONS} 
23 
24USE_TOOLS+= msgfmt 15USE_TOOLS+= msgfmt
25 16
26CONFIGURE_ARGS+= --disable-neon-version-check 17CONFIGURE_ARGS+= --disable-neon-version-check
27CONFIGURE_ARGS+= --without-apache 
28CONFIGURE_ARGS+= --without-apxs 18CONFIGURE_ARGS+= --without-apxs
29 19
30.if !empty(PKG_OPTIONS:Mapr1) 20.include "../../devel/apr/buildlink3.mk"
31. include "../../devel/apr/buildlink3.mk" 21.include "../../devel/apr-util/buildlink3.mk"
32. include "../../devel/apr-util/buildlink3.mk" 22BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.4
33. if !empty(PKG_OPTIONS:Mserf) 23.include "../../databases/sqlite3/buildlink3.mk"
34DAV_RA= serf 24.include "../../devel/zlib/buildlink3.mk"
35. include "../../www/serf/buildlink3.mk" 25
36. else 26PLIST_VARS+= db4
37BUILDLINK_API_DEPENDS.neon+= neon>=0.25.0 27.if !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
38DAV_RA= neon 28PLIST.db4= yes
39. include "../../www/neon/buildlink3.mk" 
40. endif 
41.else 
42. include "../../devel/apr0/buildlink3.mk" 
43BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5 
44BUILDLINK_API_DEPENDS.neon+= neon>=0.25.0 
45DAV_RA= neon 
46. include "../../www/neon/buildlink3.mk" 
47.endif 
48 
49.if !empty(${APU_OPTIONS}:Mdb4) 
50PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb 
51.else 29.else
52CONFIGURE_ARGS+= --without-berkeley-db 30CONFIGURE_ARGS+= --without-berkeley-db
53.endif 31.endif
54 32
55.if !empty(PKG_OPTIONS:Msasl) 
56.include "../../security/cyrus-sasl/buildlink3.mk" 
57CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} 
58.else 
59CONFIGURE_ARGS+= --without-sasl 
60.endif 
61 
62PLIST_SUBST+= DAV_RA=${DAV_RA:Q} 33PLIST_SUBST+= DAV_RA=${DAV_RA:Q}
63 34
64SUBST_CLASSES+= paths 35SUBST_CLASSES+= paths
65SUBST_STAGE.paths= pre-configure 36SUBST_STAGE.paths= pre-configure
66SUBST_FILES.paths= contrib/cgi/tweak-log.cgi 37SUBST_FILES.paths= contrib/cgi/tweak-log.cgi
67SUBST_SED.paths= -e "s|/usr/local/bin/|${PREFIX}/bin|g" 38SUBST_SED.paths= -e "s|/usr/local/bin/|${PREFIX}/bin|g"
68SUBST_MESSAGE.paths= Fixing hardcoded /usr/local/bin paths. 39SUBST_MESSAGE.paths= Fixing hardcoded /usr/local/bin paths.
69 40
70post-install: 41post-install:
71 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNDOC} 42 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNDOC}
72 cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README ${DESTDIR}${SVNDOC} 43 cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README ${DESTDIR}${SVNDOC}
73 cd ${WRKSRC}/doc/user && ${INSTALL_DATA} *.html *.txt ${DESTDIR}${SVNDOC} 44 cd ${WRKSRC}/doc/user && ${INSTALL_DATA} *.html *.txt ${DESTDIR}${SVNDOC}
74 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/backup 45 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/backup
75 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/cgi 46 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/cgi
76 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts 47 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts
 48 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
 49 ${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
77 ${INSTALL_DATA} ${WRKSRC}/tools/backup/hot-backup.py \ 50 ${INSTALL_DATA} ${WRKSRC}/tools/backup/hot-backup.py \
78 ${DESTDIR}${SVNEXAMPLES}/backup 51 ${DESTDIR}${SVNEXAMPLES}/backup
79 ${INSTALL_DATA} ${WRKSRC}/contrib/cgi/tweak-log.cgi \ 52 ${INSTALL_DATA} ${WRKSRC}/contrib/cgi/tweak-log.cgi \
80 ${DESTDIR}${SVNEXAMPLES}/cgi 53 ${DESTDIR}${SVNEXAMPLES}/cgi
81 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-email.pl \ 54 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit* \
82 ${DESTDIR}${SVNEXAMPLES}/hook-scripts 55 ${DESTDIR}${SVNEXAMPLES}/hook-scripts
83 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \ 56 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \
84 ${DESTDIR}${SVNEXAMPLES}/hook-scripts 57 ${DESTDIR}${SVNEXAMPLES}/hook-scripts
 58 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/log-police.py \
 59 ${WRKSRC}/tools/hook-scripts/verify-po.py \
 60 ${DESTDIR}${SVNEXAMPLES}/hook-scripts
 61 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer* \
 62 ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
 63 ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/mailer* \
 64 ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
85 65
86.PHONY: svn-build-outputs-hack 66.PHONY: svn-build-outputs-hack
87# Use this target to update the build-outputs.mk hack for sub-packages. 67# Use this target to update the build-outputs.mk hack for sub-packages.
88svn-build-outputs-hack: 68svn-build-outputs-hack:
89 cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc 69 cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc
90 ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk 70 ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
91 71
92.include "../../devel/gettext-lib/buildlink3.mk" 72.include "../../devel/gettext-lib/buildlink3.mk"
93.include "../../mk/bsd.pkg.mk" 73.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/devel/subversion-base/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/subversion-base/PLIST 2008/06/19 22:33:26 1.17
+++ pkgsrc/devel/subversion-base/PLIST 2009/05/30 00:16:47 1.18
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1@comment $NetBSD: PLIST,v 1.17 2008/06/19 22:33:26 epg Exp $ 1@comment $NetBSD: PLIST,v 1.18 2009/05/30 00:16:47 gdt Exp $
2bin/svn 2bin/svn
3bin/svnadmin 3bin/svnadmin
4bin/svndumpfilter 4bin/svndumpfilter
5bin/svnlook 5bin/svnlook
6bin/svnserve 6bin/svnserve
7bin/svnsync 7bin/svnsync
8bin/svnversion 8bin/svnversion
9include/subversion-1/mod_authz_svn.h 9include/subversion-1/mod_authz_svn.h
10include/subversion-1/mod_dav_svn.h 10include/subversion-1/mod_dav_svn.h
11include/subversion-1/svn-revision.txt 11include/subversion-1/svn-revision.txt
12include/subversion-1/svn_auth.h 12include/subversion-1/svn_auth.h
13include/subversion-1/svn_base64.h 13include/subversion-1/svn_base64.h
 14include/subversion-1/svn_checksum.h
14include/subversion-1/svn_client.h 15include/subversion-1/svn_client.h
15include/subversion-1/svn_cmdline.h 16include/subversion-1/svn_cmdline.h
16include/subversion-1/svn_compat.h 17include/subversion-1/svn_compat.h
17include/subversion-1/svn_config.h 18include/subversion-1/svn_config.h
18include/subversion-1/svn_ctype.h 19include/subversion-1/svn_ctype.h
19include/subversion-1/svn_dav.h 20include/subversion-1/svn_dav.h
20include/subversion-1/svn_delta.h 21include/subversion-1/svn_delta.h
21include/subversion-1/svn_diff.h 22include/subversion-1/svn_diff.h
 23include/subversion-1/svn_dirent_uri.h
22include/subversion-1/svn_dso.h 24include/subversion-1/svn_dso.h
23include/subversion-1/svn_error.h 25include/subversion-1/svn_error.h
24include/subversion-1/svn_error_codes.h 26include/subversion-1/svn_error_codes.h
25include/subversion-1/svn_fs.h 27include/subversion-1/svn_fs.h
26include/subversion-1/svn_hash.h 28include/subversion-1/svn_hash.h
27include/subversion-1/svn_io.h 29include/subversion-1/svn_io.h
28include/subversion-1/svn_iter.h 30include/subversion-1/svn_iter.h
29include/subversion-1/svn_md5.h 31include/subversion-1/svn_md5.h
30include/subversion-1/svn_mergeinfo.h 32include/subversion-1/svn_mergeinfo.h
31include/subversion-1/svn_nls.h 33include/subversion-1/svn_nls.h
32include/subversion-1/svn_opt.h 34include/subversion-1/svn_opt.h
33include/subversion-1/svn_path.h 35include/subversion-1/svn_path.h
34include/subversion-1/svn_pools.h 36include/subversion-1/svn_pools.h
@@ -42,57 +44,73 @@ include/subversion-1/svn_string.h @@ -42,57 +44,73 @@ include/subversion-1/svn_string.h
42include/subversion-1/svn_subst.h 44include/subversion-1/svn_subst.h
43include/subversion-1/svn_time.h 45include/subversion-1/svn_time.h
44include/subversion-1/svn_types.h 46include/subversion-1/svn_types.h
45include/subversion-1/svn_user.h 47include/subversion-1/svn_user.h
46include/subversion-1/svn_utf.h 48include/subversion-1/svn_utf.h
47include/subversion-1/svn_version.h 49include/subversion-1/svn_version.h
48include/subversion-1/svn_wc.h 50include/subversion-1/svn_wc.h
49include/subversion-1/svn_xml.h 51include/subversion-1/svn_xml.h
50lib/libsvn_client-1.la 52lib/libsvn_client-1.la
51lib/libsvn_delta-1.la 53lib/libsvn_delta-1.la
52lib/libsvn_diff-1.la 54lib/libsvn_diff-1.la
53lib/libsvn_fs-1.la 55lib/libsvn_fs-1.la
54lib/libsvn_fs_fs-1.la 56lib/libsvn_fs_fs-1.la
 57${PLIST.db4}lib/libsvn_fs_base-1.la
55lib/libsvn_fs_util-1.la 58lib/libsvn_fs_util-1.la
56lib/libsvn_ra-1.la 59lib/libsvn_ra-1.la
57lib/libsvn_ra_${DAV_RA}-1.la 
58lib/libsvn_ra_local-1.la 60lib/libsvn_ra_local-1.la
 61${PLIST.neon}lib/libsvn_ra_neon-1.la
 62${PLIST.serf}lib/libsvn_ra_serf-1.la
59lib/libsvn_ra_svn-1.la 63lib/libsvn_ra_svn-1.la
60lib/libsvn_repos-1.la 64lib/libsvn_repos-1.la
61lib/libsvn_subr-1.la 65lib/libsvn_subr-1.la
62lib/libsvn_wc-1.la 66lib/libsvn_wc-1.la
63man/man1/svn.1 67man/man1/svn.1
64man/man1/svnadmin.1 68man/man1/svnadmin.1
65man/man1/svndumpfilter.1 69man/man1/svndumpfilter.1
66man/man1/svnlook.1 70man/man1/svnlook.1
67man/man1/svnsync.1 71man/man1/svnsync.1
68man/man1/svnversion.1 72man/man1/svnversion.1
69man/man5/svnserve.conf.5 73man/man5/svnserve.conf.5
70man/man8/svnserve.8 74man/man8/svnserve.8
71share/doc/subversion/INSTALL 75share/doc/subversion/INSTALL
72share/doc/subversion/README 76share/doc/subversion/README
73share/doc/subversion/cvs-crossover-guide.html 77share/doc/subversion/cvs-crossover-guide.html
74share/doc/subversion/lj_article.txt 78share/doc/subversion/lj_article.txt
75share/doc/subversion/svn-best-practices.html 79share/doc/subversion/svn-best-practices.html
76share/examples/subversion/backup/hot-backup.py 80share/examples/subversion/backup/hot-backup.py
77share/examples/subversion/cgi/tweak-log.cgi 81share/examples/subversion/cgi/tweak-log.cgi
78share/examples/subversion/hook-scripts/commit-email.pl 82share/examples/subversion/hook-scripts/commit-access-control.cfg.example
 83share/examples/subversion/hook-scripts/commit-access-control.pl
 84share/examples/subversion/hook-scripts/commit-access-control.pl.in
 85share/examples/subversion/hook-scripts/commit-email.rb
 86share/examples/subversion/hook-scripts/log-police.py
 87share/examples/subversion/hook-scripts/mailer/mailer.conf.example
 88share/examples/subversion/hook-scripts/mailer/mailer.py
 89share/examples/subversion/hook-scripts/mailer/tests/mailer-init.sh
 90share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.output
 91share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.sh
 92share/examples/subversion/hook-scripts/mailer/tests/mailer-tweak.py
 93share/examples/subversion/hook-scripts/mailer/tests/mailer.conf
79share/examples/subversion/hook-scripts/svnperms.conf.example 94share/examples/subversion/hook-scripts/svnperms.conf.example
80share/examples/subversion/hook-scripts/svnperms.py 95share/examples/subversion/hook-scripts/svnperms.py
 96share/examples/subversion/hook-scripts/verify-po.py
81share/locale/de/LC_MESSAGES/subversion.mo 97share/locale/de/LC_MESSAGES/subversion.mo
82share/locale/es/LC_MESSAGES/subversion.mo 98share/locale/es/LC_MESSAGES/subversion.mo
83share/locale/fr/LC_MESSAGES/subversion.mo 99share/locale/fr/LC_MESSAGES/subversion.mo
84share/locale/it/LC_MESSAGES/subversion.mo 100share/locale/it/LC_MESSAGES/subversion.mo
85share/locale/ja/LC_MESSAGES/subversion.mo 101share/locale/ja/LC_MESSAGES/subversion.mo
86share/locale/ko/LC_MESSAGES/subversion.mo 102share/locale/ko/LC_MESSAGES/subversion.mo
87share/locale/nb/LC_MESSAGES/subversion.mo 103share/locale/nb/LC_MESSAGES/subversion.mo
88share/locale/pl/LC_MESSAGES/subversion.mo 104share/locale/pl/LC_MESSAGES/subversion.mo
89share/locale/pt_BR/LC_MESSAGES/subversion.mo 105share/locale/pt_BR/LC_MESSAGES/subversion.mo
90share/locale/sv/LC_MESSAGES/subversion.mo 106share/locale/sv/LC_MESSAGES/subversion.mo
91share/locale/zh_CN/LC_MESSAGES/subversion.mo 107share/locale/zh_CN/LC_MESSAGES/subversion.mo
92share/locale/zh_TW/LC_MESSAGES/subversion.mo 108share/locale/zh_TW/LC_MESSAGES/subversion.mo
 109@dirrm share/examples/subversion/hook-scripts/mailer/tests
 110@dirrm share/examples/subversion/hook-scripts/mailer
93@dirrm share/examples/subversion/hook-scripts 111@dirrm share/examples/subversion/hook-scripts
94@dirrm share/examples/subversion/cgi 112@dirrm share/examples/subversion/cgi
95@dirrm share/examples/subversion/backup 113@dirrm share/examples/subversion/backup
96@dirrm share/examples/subversion 114@dirrm share/examples/subversion
97@dirrm share/doc/subversion 115@dirrm share/doc/subversion
98@dirrm include/subversion-1 116@dirrm include/subversion-1
cvs diff -r1.1 -r1.2 pkgsrc/devel/subversion-base/Attic/PLIST.bdb (expand / switch to unified diff)

--- pkgsrc/devel/subversion-base/Attic/PLIST.bdb 2004/09/30 14:39:33 1.1
+++ pkgsrc/devel/subversion-base/Attic/PLIST.bdb 2009/05/30 00:16:47 1.2
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
1@comment $NetBSD: PLIST.bdb,v 1.1 2004/09/30 14:39:33 epg Exp $ 
2lib/libsvn_fs_base-1.la 
cvs diff -r1.19 -r1.20 pkgsrc/devel/subversion-base/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/subversion-base/buildlink3.mk 2009/04/16 21:42:42 1.19
+++ pkgsrc/devel/subversion-base/buildlink3.mk 2009/05/30 00:16:47 1.20
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1# $NetBSD: buildlink3.mk,v 1.19 2009/04/16 21:42:42 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.20 2009/05/30 00:16:47 gdt Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4.include "../../devel/subversion/Makefile.version" 4.include "../../devel/subversion/Makefile.version"
5 5
6BUILDLINK_TREE+= subversion-base 6BUILDLINK_TREE+= subversion-base
7 7
8.if !defined(SUBVERSION_BASE_BUILDLINK3_MK) 8.if !defined(SUBVERSION_BASE_BUILDLINK3_MK)
9SUBVERSION_BASE_BUILDLINK3_MK:= 9SUBVERSION_BASE_BUILDLINK3_MK:=
10 10
11BUILDLINK_API_DEPENDS.subversion-base+= subversion-base>=1.5.2nb1 11BUILDLINK_API_DEPENDS.subversion-base+= subversion-base>=1.5.2nb1
12BUILDLINK_ABI_DEPENDS.subversion-base?= subversion-base>=1.5.6nb1 12BUILDLINK_ABI_DEPENDS.subversion-base?= subversion-base>=1.5.6nb1
13BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base 13BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base
14 14
15BUILDLINK_FILES.subversion-base+= bin/svn-config 15BUILDLINK_FILES.subversion-base+= bin/svn-config
16 16
17pkgbase := subversion-base 17pkgbase := subversion-base
18.include "../../mk/pkg-build-options.mk" 18.include "../../mk/pkg-build-options.mk"
19 19
20.if !empty(PKG_BUILD_OPTIONS.subversion-base:Msasl) 20.if !empty(PKG_BUILD_OPTIONS.subversion-base:Msasl)
21.include "../../security/cyrus-sasl/buildlink3.mk" 21.include "../../security/cyrus-sasl/buildlink3.mk"
22.endif 22.endif
23 23
24.if !empty(PKG_BUILD_OPTIONS.subversion-base:Mapr1) 24.include "../../devel/apr/buildlink3.mk"
25. include "../../devel/apr/buildlink3.mk" 25.include "../../devel/apr-util/buildlink3.mk"
26. include "../../devel/apr-util/buildlink3.mk" 26.if !empty(PKG_BUILD_OPTIONS.subversion-base:Mserf)
27. if !empty(PKG_BUILD_OPTIONS.subversion-base:Mserf) 27. include "../../www/serf/buildlink3.mk"
28. include "../../www/serf/buildlink3.mk" 
29. else 
30. include "../../www/neon/buildlink3.mk" 
31. endif 
32.else 28.else
33. include "../../devel/apr0/buildlink3.mk" 
34. include "../../www/neon/buildlink3.mk" 29. include "../../www/neon/buildlink3.mk"
35.endif 30.endif
 31
 32BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.4
 33.include "../../databases/sqlite3/buildlink3.mk"
 34.include "../../devel/zlib/buildlink3.mk"
36.endif # SUBVERSION_BASE_BUILDLINK3_MK 35.endif # SUBVERSION_BASE_BUILDLINK3_MK
37 36
38BUILDLINK_TREE+= -subversion-base 37BUILDLINK_TREE+= -subversion-base
cvs diff -r1.8 -r1.9 pkgsrc/devel/subversion-base/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/subversion-base/options.mk 2008/07/03 22:01:48 1.8
+++ pkgsrc/devel/subversion-base/options.mk 2009/05/30 00:16:47 1.9
@@ -1,16 +1,32 @@ @@ -1,16 +1,32 @@
1# $NetBSD: options.mk,v 1.8 2008/07/03 22:01:48 schmonz Exp $ 1# $NetBSD: options.mk,v 1.9 2009/05/30 00:16:47 gdt Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.subversion 3PKG_OPTIONS_VAR= PKG_OPTIONS.subversion
4PKG_SUPPORTED_OPTIONS= apache22 apr1 serf java sasl 4PKG_SUPPORTED_OPTIONS= serf sasl
5PKG_SUGGESTED_OPTIONS= apr1 5PKG_SUGGESTED_OPTIONS= # empty
6 6
7# Note that this file is included as part of several packages. 7# Note that this file is included as part of several packages.
8# Therefore this file only defines options, but does not include the 8# Therefore this file only defines options, but does not include the
9# typical fragments to change behavior based on options, leaving those 9# typical fragments to change behavior based on options, leaving those
10# to the individual Makefiles. 10# to the individual Makefiles.
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14.if !empty(PKG_OPTIONS:Mapache22) || !empty(PKG_OPTIONS:Mserf) 14PLIST_VARS+= serf neon
15PKG_OPTIONS+= apr1 15
 16.if !empty(PKG_OPTIONS:Mserf)
 17DAV_RA= serf
 18PLIST.serf= yes
 19. include "../../www/serf/buildlink3.mk"
 20.else
 21BUILDLINK_API_DEPENDS.neon+= neon>=0.25.0
 22DAV_RA= neon
 23PLIST.neon= yes
 24. include "../../www/neon/buildlink3.mk"
 25.endif
 26
 27.if !empty(PKG_OPTIONS:Msasl)
 28.include "../../security/cyrus-sasl/buildlink3.mk"
 29CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 30.else
 31CONFIGURE_ARGS+= --without-sasl
16.endif 32.endif
cvs diff -r1.11 -r1.12 pkgsrc/devel/subversion/files/build-outputs.mk (expand / switch to unified diff)

--- pkgsrc/devel/subversion/files/build-outputs.mk 2008/07/31 21:00:39 1.11
+++ pkgsrc/devel/subversion/files/build-outputs.mk 2009/05/30 00:16:47 1.12
@@ -26,27 +26,28 @@ BUILD_DIRS = subversion/tests/libsvn_fs_ @@ -26,27 +26,28 @@ BUILD_DIRS = subversion/tests/libsvn_fs_
26 26
27BDB_TEST_DEPS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/key-test$(EXEEXT) subversion/tests/libsvn_fs_base/skel-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) 27BDB_TEST_DEPS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/key-test$(EXEEXT) subversion/tests/libsvn_fs_base/skel-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT)
28 28
29BDB_TEST_PROGRAMS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/key-test$(EXEEXT) subversion/tests/libsvn_fs_base/skel-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) 29BDB_TEST_PROGRAMS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/key-test$(EXEEXT) subversion/tests/libsvn_fs_base/skel-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT)
30 30
31TEST_DEPS = subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_subr/target-test.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/utf8_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/changelist_tests.py 31TEST_DEPS = subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_subr/target-test.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/utf8_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/changelist_tests.py
32 32
33TEST_PROGRAMS = subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_subr/target-test.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/utf8_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/changelist_tests.py 33TEST_PROGRAMS = subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_subr/target-test.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/utf8_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/changelist_tests.py
34 34
35MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndumpfilter/svndumpfilter.1 subversion/svnlook/svnlook.1 subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5 subversion/svnsync/svnsync.1 subversion/svnversion/svnversion.1 35MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndumpfilter/svndumpfilter.1 subversion/svnlook/svnlook.1 subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5 subversion/svnsync/svnsync.1 subversion/svnversion/svnversion.1
36 36
37CLEAN_FILES = contrib/client-side/svn-push/svn-push$(EXEEXT) contrib/client-side/svnmucc/svnmucc$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/key-test$(EXEEXT) subversion/tests/libsvn_fs_base/skel-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) 37CLEAN_FILES = contrib/client-side/svn-push/svn-push$(EXEEXT) contrib/client-side/svnmucc/svnmucc$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/key-test$(EXEEXT) subversion/tests/libsvn_fs_base/skel-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT)
38 38
39SWIG_INCLUDES = -I$(abs_srcdir)/subversion/include \ 39SWIG_INCLUDES = -I$(abs_srcdir)/subversion \
 40 -I$(abs_srcdir)/subversion/include \
40 -I$(abs_srcdir)/subversion/bindings/swig \ 41 -I$(abs_srcdir)/subversion/bindings/swig \
41 -I$(abs_srcdir)/subversion/bindings/swig/include \ 42 -I$(abs_srcdir)/subversion/bindings/swig/include \
42 -I$(abs_srcdir)/subversion/bindings/swig/proxy \ 43 -I$(abs_srcdir)/subversion/bindings/swig/proxy \
43 -I$(abs_builddir)/subversion/bindings/swig/proxy \ 44 -I$(abs_builddir)/subversion/bindings/swig/proxy \
44 $(SVN_APR_INCLUDES) $(SVN_APRUTIL_INCLUDES) 45 $(SVN_APR_INCLUDES) $(SVN_APRUTIL_INCLUDES)
45 46
46RELEASE_MODE = 1 47RELEASE_MODE = 1
47 48
48 49
49######################################## 50########################################
50# Section 2: SWIG headers (wrappers and external runtimes) 51# Section 2: SWIG headers (wrappers and external runtimes)
51######################################## 52########################################
52 53
cvs diff -r1.15 -r1.16 pkgsrc/devel/subversion/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/subversion/patches/Attic/patch-aa 2009/05/21 16:11:41 1.15
+++ pkgsrc/devel/subversion/patches/Attic/patch-aa 2009/05/30 00:16:47 1.16
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1$NetBSD: patch-aa,v 1.15 2009/05/21 16:11:41 abs Exp $ 
2 
3--- tools/hook-scripts/commit-email.pl.in.orig 2008-04-01 16:12:17.000000000 +0100 
4+++ tools/hook-scripts/commit-email.pl.in 
5@@ -557,7 +557,7 @@ foreach my $project (@project_settings_l 
6  
7 my @head; 
8 my $formatted_date; 
9- if (defined $stdout) 
10+ if ($stdout) 
11 { 
12 $formatted_date = strftime('%a %b %e %X %Y', localtime()); 
13 push(@head, "From $mail_from $formatted_date\n"); 
cvs diff -r1.37 -r1.38 pkgsrc/www/ap2-subversion/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-subversion/Makefile 2009/04/16 21:42:43 1.37
+++ pkgsrc/www/ap2-subversion/Makefile 2009/05/30 00:16:47 1.38
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.37 2009/04/16 21:42:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.38 2009/05/30 00:16:47 gdt Exp $
2 2
3PKGNAME= ${APACHE_PKG_PREFIX}-subversion-${SVNVER} 3PKGNAME= ${APACHE_PKG_PREFIX}-subversion-${SVNVER}
4PKGREVISION= 1 
5COMMENT= WebDAV server (Apache module) for Subversion 4COMMENT= WebDAV server (Apache module) for Subversion
6 5
7PKG_DESTDIR_SUPPORT= user-destdir 6PKG_DESTDIR_SUPPORT= user-destdir
8 7
9.include "../../devel/subversion/Makefile.common" 8.include "../../devel/subversion/Makefile.common"
10 9
11CONFIGURE_ARGS+= --with-apxs=${APXS:Q} 10CONFIGURE_ARGS+= --with-apxs=${APXS:Q}
12CONFIGURE_ARGS+= --disable-mod-activation 11CONFIGURE_ARGS+= --disable-mod-activation
13 12
14APACHE_MODULE= YES 13APACHE_MODULE= YES
15 14
16BUILD_TARGET= apache-mod 15BUILD_TARGET= apache-mod
17INSTALL_TARGET= install-mods-shared 16INSTALL_TARGET= install-mods-shared