summaryrefslogtreecommitdiff
path: root/devel/subversion-base
diff options
context:
space:
mode:
Diffstat (limited to 'devel/subversion-base')
-rw-r--r--devel/subversion-base/Makefile10
-rw-r--r--devel/subversion-base/PLIST7
-rw-r--r--devel/subversion-base/buildlink3.mk4
3 files changed, 15 insertions, 6 deletions
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 5690645d74a..37d9454117d 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2008/03/08 20:56:37 gdt Exp $
+# $NetBSD: Makefile,v 1.53 2008/06/19 22:33:25 epg Exp $
PKGNAME= subversion-base-${SVNVER}
-PKGREVISION= 4
COMMENT= Version control system, base programs and libraries
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -26,6 +25,9 @@ BROKEN_GETTEXT_DETECTION= yes
CONFIGURE_ARGS+= --disable-neon-version-check
CONFIGURE_ARGS+= --without-apache
CONFIGURE_ARGS+= --without-apxs
+CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
+
+.include "../../security/cyrus-sasl/buildlink3.mk"
.if !empty(PKG_OPTIONS:Mapr1)
. include "../../devel/apr/buildlink3.mk"
@@ -35,14 +37,14 @@ DAV_RA= serf
. include "../../www/serf/buildlink3.mk"
. else
BUILDLINK_API_DEPENDS.neon+= neon>=0.24.7
-DAV_RA= dav
+DAV_RA= neon
. include "../../www/neon/buildlink3.mk"
. endif
.else
. include "../../devel/apr0/buildlink3.mk"
BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5
BUILDLINK_API_DEPENDS.neon+= neon>=0.24.7
-DAV_RA= dav
+DAV_RA= neon
. include "../../www/neon/buildlink3.mk"
.endif
diff --git a/devel/subversion-base/PLIST b/devel/subversion-base/PLIST
index 537fea711af..b7e42678d22 100644
--- a/devel/subversion-base/PLIST
+++ b/devel/subversion-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2007/01/25 18:15:49 epg Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/06/19 22:33:26 epg Exp $
bin/svn
bin/svnadmin
bin/svndumpfilter
@@ -6,12 +6,14 @@ bin/svnlook
bin/svnserve
bin/svnsync
bin/svnversion
+include/subversion-1/mod_authz_svn.h
include/subversion-1/mod_dav_svn.h
include/subversion-1/svn-revision.txt
include/subversion-1/svn_auth.h
include/subversion-1/svn_base64.h
include/subversion-1/svn_client.h
include/subversion-1/svn_cmdline.h
+include/subversion-1/svn_compat.h
include/subversion-1/svn_config.h
include/subversion-1/svn_ctype.h
include/subversion-1/svn_dav.h
@@ -23,7 +25,9 @@ include/subversion-1/svn_error_codes.h
include/subversion-1/svn_fs.h
include/subversion-1/svn_hash.h
include/subversion-1/svn_io.h
+include/subversion-1/svn_iter.h
include/subversion-1/svn_md5.h
+include/subversion-1/svn_mergeinfo.h
include/subversion-1/svn_nls.h
include/subversion-1/svn_opt.h
include/subversion-1/svn_path.h
@@ -48,6 +52,7 @@ lib/libsvn_delta-1.la
lib/libsvn_diff-1.la
lib/libsvn_fs-1.la
lib/libsvn_fs_fs-1.la
+lib/libsvn_fs_util-1.la
lib/libsvn_ra-1.la
lib/libsvn_ra_${DAV_RA}-1.la
lib/libsvn_ra_local-1.la
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index 9dccf83d57d..385be93dd21 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:14:40 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2008/06/19 22:33:26 epg Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUBVERSION_BASE_BUILDLINK3_MK:= ${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -26,6 +26,8 @@ pkgbase := subversion-base
.endif # SUBVERSION_BASE_BUILDLINK3_MK
+.include "../../security/cyrus-sasl/buildlink3.mk"
+
.if !empty(PKG_BUILD_OPTIONS.subversion-base:Mapr1)
. include "../../devel/apr/buildlink3.mk"
. include "../../devel/apr-util/buildlink3.mk"