Import of pkgsrc-2014Q1

devel/subversion-base/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2013/02/09 13:22:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.92 2014/02/12 23:17:51 tron Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
+PKGREVISION=	1
 COMMENT=	Version control system, base programs and libraries
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -13,7 +14,6 @@ BROKEN_GETTEXT_DETECTION=	yes
 
 USE_TOOLS+=		msgfmt
 
-CONFIGURE_ARGS+=	--disable-neon-version-check
 CONFIGURE_ARGS+=	--without-apxs
 
 .if !empty(PKG_OPTIONS:Mapr1)
@@ -23,6 +23,8 @@ APU_OPTIONS=		PKG_BUILD_OPTIONS.apr
 .endif
 BUILD_DEFS+=		${APU_OPTIONS}
 
+CFLAGS.SunOS+=		-D__EXTENSIONS__
+
 .if !empty(PKG_OPTIONS:Mapr1)
 .  include "../../devel/apr/buildlink3.mk"
 .  include "../../devel/apr-util/buildlink3.mk"
@@ -31,14 +33,13 @@ 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"
 
 PLIST_VARS+=		db4
 .if !empty(PKG_OPTIONS:Mapr1) && !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
 PLIST.db4=		yes
-#CONFIGURE_ARGS+=	--with-berkeley-db=:${BUILDLINK_PREFIX.db4:Q}/include:${BUILDLINK_PREFIX.db4:Q}/lib:${BUILDLINK_LDADD.db4:S/^-l//:Q}
 CONFIGURE_ARGS+=	--with-berkeley-db
 .else
 CONFIGURE_ARGS+=	--without-berkeley-db

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.23 2014/03/11 14:05:01 jperkin 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
@@ -80,7 +81,6 @@ share/doc/subversion/README
 share/doc/subversion/cvs-crossover-guide.html
 share/doc/subversion/lj_article.txt
 share/doc/subversion/svn-best-practices.html
-share/examples/rc.d/svnserve
 share/examples/subversion/backup/hot-backup.py
 share/examples/subversion/hook-scripts/commit-access-control.cfg.example
 share/examples/subversion/hook-scripts/commit-access-control.pl

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.37 2014/02/12 23:17:51 tron Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 .include "../../devel/subversion/Makefile.version"
@@ -9,7 +9,7 @@ BUILDLINK_TREE+=	subversion-base
 SUBVERSION_BASE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.subversion-base+=	subversion-base>=1.5.2nb1
-BUILDLINK_ABI_DEPENDS.subversion-base+=	subversion-base>=1.7.9
+BUILDLINK_ABI_DEPENDS.subversion-base+=	subversion-base>=1.8.5nb1
 BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
 
 BUILDLINK_FILES.subversion-base+=	bin/svn-config
@@ -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

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)