Wed Apr 15 23:01:42 2009 UTC ()
set BUILDLINK_API_DEPENDS.neon to 0.25.0, following the rules in
configure.ac.

Addresses PR pkg/34311


(gdt)
diff -r1.58 -r1.59 pkgsrc/devel/subversion-base/Makefile

cvs diff -r1.58 -r1.59 pkgsrc/devel/subversion-base/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/subversion-base/Makefile 2009/04/06 12:59:30 1.58
+++ pkgsrc/devel/subversion-base/Makefile 2009/04/15 23:01:42 1.59
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.58 2009/04/06 12:59:30 markd Exp $ 1# $NetBSD: Makefile,v 1.59 2009/04/15 23:01:42 gdt Exp $
2 2
3PKGNAME= subversion-base-${SVNVER} 3PKGNAME= subversion-base-${SVNVER}
4PKGREVISION= 1 4PKGREVISION= 1
5COMMENT= Version control system, base programs and libraries 5COMMENT= Version control system, base programs and libraries
6 6
7PKG_INSTALLATION_TYPES= overwrite pkgviews 7PKG_INSTALLATION_TYPES= overwrite pkgviews
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10.include "../../devel/subversion/Makefile.common" 10.include "../../devel/subversion/Makefile.common"
11 11
12.if !empty(PKG_OPTIONS:Mapr1) 12.if !empty(PKG_OPTIONS:Mapr1)
13APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util 13APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util
14.else 14.else
@@ -24,34 +24,34 @@ USE_TOOLS+= msgfmt @@ -24,34 +24,34 @@ USE_TOOLS+= msgfmt
24BROKEN_GETTEXT_DETECTION= yes 24BROKEN_GETTEXT_DETECTION= yes
25 25
26CONFIGURE_ARGS+= --disable-neon-version-check 26CONFIGURE_ARGS+= --disable-neon-version-check
27CONFIGURE_ARGS+= --without-apache 27CONFIGURE_ARGS+= --without-apache
28CONFIGURE_ARGS+= --without-apxs 28CONFIGURE_ARGS+= --without-apxs
29 29
30.if !empty(PKG_OPTIONS:Mapr1) 30.if !empty(PKG_OPTIONS:Mapr1)
31. include "../../devel/apr/buildlink3.mk" 31. include "../../devel/apr/buildlink3.mk"
32. include "../../devel/apr-util/buildlink3.mk" 32. include "../../devel/apr-util/buildlink3.mk"
33. if !empty(PKG_OPTIONS:Mserf) 33. if !empty(PKG_OPTIONS:Mserf)
34DAV_RA= serf 34DAV_RA= serf
35. include "../../www/serf/buildlink3.mk" 35. include "../../www/serf/buildlink3.mk"
36. else 36. else
37BUILDLINK_API_DEPENDS.neon+= neon>=0.24.7 37BUILDLINK_API_DEPENDS.neon+= neon>=0.25.0
38DAV_RA= neon 38DAV_RA= neon
39. include "../../www/neon/buildlink3.mk" 39. include "../../www/neon/buildlink3.mk"
40. endif 40. endif
41.else 41.else
42. include "../../devel/apr0/buildlink3.mk" 42. include "../../devel/apr0/buildlink3.mk"
43BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5 43BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5
44BUILDLINK_API_DEPENDS.neon+= neon>=0.24.7 44BUILDLINK_API_DEPENDS.neon+= neon>=0.25.0
45DAV_RA= neon 45DAV_RA= neon
46. include "../../www/neon/buildlink3.mk" 46. include "../../www/neon/buildlink3.mk"
47.endif 47.endif
48 48
49.if !empty(${APU_OPTIONS}:Mdb4) 49.if !empty(${APU_OPTIONS}:Mdb4)
50PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb 50PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
51.else 51.else
52CONFIGURE_ARGS+= --without-berkeley-db 52CONFIGURE_ARGS+= --without-berkeley-db
53.endif 53.endif
54 54
55.if !empty(PKG_OPTIONS:Msasl) 55.if !empty(PKG_OPTIONS:Msasl)
56.include "../../security/cyrus-sasl/buildlink3.mk" 56.include "../../security/cyrus-sasl/buildlink3.mk"
57CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} 57CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}