Version 1.4.3

(18 January 2007, from /branches/1.4.x)
http://svn.collab.net/repos/svn/tags/1.4.3

 pkgsrc changes:
  - Add new 'serf' option to PKG_OPTIONS.subversion to use serf for
    the DAV (http) network transport instead of neon.

 User-visible-changes:
  - Client:
    * fixed: crash using automatic auth protocols with Neon 0.26 (r22440, -61)
    * fixed: svn_load_dirs.pl cannot import file names containing '@' (r22203)
    * fixed: error when committing replaced directories (r22991, -8)
    * fixed: inability to change file perms due to existing file perms (r23018)
    * include newest version of svn-graph.pl (r22969)

  - Server:
    * fixed: incorrectly reporting authz circular dependencies (issue #2684)
    * fixed: potential filesystem memory leak in commit finalisation (r22729)

  - Client and Server:
    * fixed: crash in character translation, particularly on Windows (r22417)
    * fixed: potential string corruption when resizing string buffers (r22689)
    * translation updates for Korean, Spanish, Italian, Simplified Chinese,
          and Japanese (fixing issues #2649 and #2681)

Developer-visible-changes:
* support Neon 0.26.2 (issue #2666)
* update (experimental) ra_serf repository access module for DAV (r22872)
* Windows installer improvements (r21516, r22155, r22224)
* fixed: svn_{ra,repos}_replay() doesn't send checksums (r22346, -51, -52)
* fixed: error when calling svn_repos_replay2() with a txn root (r22609)
* fixed: Solaris packaging script broken (issue #2669)
* javahl bindings:
    - fixed: auth cache is created in the current directory (r22780)
    - fixed: SVNAdmin's setLog() method always fails (r22387)
    - fixed: target dependency order in generated build scripts (r22209)
* SWIG/perl bindings:
    - fixed: ra_do_{update,switch,status} work with Perl delta editors (r22311)
    - fixed: memory leak when calling methods on a Perl commit editor (r22332)

7 files changed, 42 insertions, 22 deletions

diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index d05465dba41..496634ace07 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/01/25 07:35:30 epg Exp $
+# $NetBSD: Makefile,v 1.42 2007/01/25 18:15:49 epg Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -28,20 +28,30 @@ CONFIGURE_ARGS+=	--without-apxs
 .if !empty(PKG_OPTIONS:Mapr1)
 .  include "../../devel/apr/buildlink3.mk"
 .  include "../../devel/apr-util/buildlink3.mk"
+.  if !empty(PKG_OPTIONS:Mserf)
+DAV_RA=				serf
+.    include "../../www/serf/buildlink3.mk"
+.  else
+BUILDLINK_API_DEPENDS.neon+=	neon>=0.24.7
+DAV_RA=				dav
+.    include "../../www/neon/buildlink3.mk"
+.  endif
 .else
-BUILDLINK_API_DEPENDS.apr+=    apr>=0.9.5
+BUILDLINK_API_DEPENDS.apr+=	apr>=0.9.5
+BUILDLINK_API_DEPENDS.neon+=	neon>=0.24.7
+DAV_RA=				dav
 .  include "../../devel/apr0/buildlink3.mk"
+.  include "../../www/neon/buildlink3.mk"
 .endif
 
-BUILDLINK_API_DEPENDS.neon+=   neon>=0.24.7
-.include "../../www/neon/buildlink3.mk"
-
 .if !empty(${APU_OPTIONS}:Mdb4)
 PLIST_SRC=		${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
 .else
 CONFIGURE_ARGS+=	--without-berkeley-db
 .endif
 
+PLIST_SUBST+=		DAV_RA=${DAV_RA:Q}
+
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=      contrib/cgi/tweak-log.cgi
diff --git a/devel/subversion-base/PLIST b/devel/subversion-base/PLIST
index 6a09f4c477b..537fea711af 100644
--- a/devel/subversion-base/PLIST
+++ b/devel/subversion-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/11/08 05:08:25 epg Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/01/25 18:15:49 epg Exp $
 bin/svn
 bin/svnadmin
 bin/svndumpfilter
@@ -49,7 +49,7 @@ lib/libsvn_diff-1.la
 lib/libsvn_fs-1.la
 lib/libsvn_fs_fs-1.la
 lib/libsvn_ra-1.la
-lib/libsvn_ra_dav-1.la
+lib/libsvn_ra_${DAV_RA}-1.la
 lib/libsvn_ra_local-1.la
 lib/libsvn_ra_svn-1.la
 lib/libsvn_repos-1.la
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index 04cb441de18..ba3583baf42 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/01/25 07:35:30 epg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2007/01/25 18:15:49 epg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -30,10 +30,14 @@ PKG_BUILD_OPTIONS.subversion!=cd ${BUILDLINK_PKGSRCDIR.subversion-base} && \
 .if !empty(PKG_BUILD_OPTIONS.subversion:Mapr1)
 .  include "../../devel/apr/buildlink3.mk"
 .  include "../../devel/apr-util/buildlink3.mk"
+.  if !empty(PKG_BUILD_OPTIONS.subversion:Mserf)
+.    include "../../www/serf/buildlink3.mk"
+.  else
+.    include "../../www/neon/buildlink3.mk"
+.  endif
 .else
 .  include "../../devel/apr0/buildlink3.mk"
+.  include "../../www/neon/buildlink3.mk"
 .endif
 
-.include "../../www/neon/buildlink3.mk"
-
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/subversion-base/options.mk b/devel/subversion-base/options.mk
index 57021ee1cdc..447ca7321f4 100644
--- a/devel/subversion-base/options.mk
+++ b/devel/subversion-base/options.mk
@@ -1,12 +1,14 @@
-# $NetBSD: options.mk,v 1.1 2007/01/25 07:35:30 epg Exp $
+# $NetBSD: options.mk,v 1.2 2007/01/25 18:15:49 epg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.subversion
-PKG_SUPPORTED_OPTIONS=	apache22 apr1
+PKG_SUPPORTED_OPTIONS=	apache22 apr1 serf
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mapache22)
+.if !empty(PKG_OPTIONS:Mapache22) || !empty(PKG_OPTIONS:Mserf)
 PKG_OPTIONS+=		apr1
-.elif !empty(PKG_OPTIONS:Mapr1)
+.endif
+
+.if !empty(PKG_OPTIONS:Mapr1) && empty(PKG_OPTIONS:Mapache22)
 PKG_OPTIONS+=		apache22
 .endif
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index df658ca4733..3f08bdf177b 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.26 2007/01/25 07:35:30 epg Exp $
+# $NetBSD: Makefile.common,v 1.27 2007/01/25 18:15:49 epg Exp $
 
 DISTNAME=		subversion-${SVNVER}
 CATEGORIES=		devel
 MASTER_SITES=		http://subversion.tigris.org/tarballs/
-EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		epg@NetBSD.org
 HOMEPAGE=		http://subversion.tigris.org/
@@ -24,7 +23,12 @@ GNU_CONFIGURE=		YES
 .include "../../mk/bsd.prefs.mk"
 .include "../../devel/subversion-base/options.mk"
 
+.if !empty(PKG_OPTIONS:Mserf)
+CONFIGURE_ARGS+=	--with-serf=${BUILDLINK_PREFIX.serf} --without-neon
+.else
 CONFIGURE_ARGS+=	--with-neon=${BUILDLINK_PREFIX.neon}
+.endif
+
 # workaround: does not install info file, but does create directory
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index 1680977bdbd..c10386a0805 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.37 2006/11/08 11:29:14 adam Exp $
+# $NetBSD: Makefile.version,v 1.38 2007/01/25 18:15:49 epg Exp $
 
 .if !defined(SVNVER)
-SVNVER=		1.4.2
+SVNVER=		1.4.3
 .endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index ff3800a47df..1d4292231bb 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.57 2006/11/08 11:29:14 adam Exp $
+$NetBSD: distinfo,v 1.58 2007/01/25 18:15:49 epg Exp $
 
-SHA1 (subversion-1.4.2.tar.bz2) = 349847a97ad790cb14ad15bfd7bfe5bc5a9c8837
-RMD160 (subversion-1.4.2.tar.bz2) = 8c6f7e73fbc9caed8b6ac7af8361eb4aad6efe71
-Size (subversion-1.4.2.tar.bz2) = 4714508 bytes
+SHA1 (subversion-1.4.3.tar.gz) = 46f80a414b3cb0350cdaba9e85b405035fdfac69
+RMD160 (subversion-1.4.3.tar.gz) = 5d9061ccc5764a7045bc6620c78b694b16c90bb2
+Size (subversion-1.4.3.tar.gz) = 6303068 bytes
 SHA1 (patch-ad) = 419c65ed318f4d6a7ab7dc8b0972b0e3824e6daf
 SHA1 (patch-ag) = c1e41bbb0e6a0ae5015cb24fe3db7ce67931d6b8
 SHA1 (patch-ah) = c41c68a8ad82a2e5f6c3e2568589da5b819946b4