- fix distinfo for svn docs (lost in last commit)

- adjust CONFLICTS add upcomming 1.8

Approved by:	lev (implicit)

6 files changed, 14 insertions, 6 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 2df935d3f3f0..5cdb9c525645 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -4,7 +4,7 @@
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Version control system
 
-CONFLICTS_INSTALL=	subversion-devel-[0-9]* subversion-freebsd-[0-9]*
+CONFLICTS_INSTALL=	subversion-1.[6|8].[0-9]*
 
 USE_RC_SUBR=	svnserve
 
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index e39d59e297cb..fab2b55e23c5 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -19,7 +19,7 @@ USE_KDE4=	# Used below if KWallet support is enabled
 
 LICENSE=	AL2
 
-CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.6.[0-9]*
+CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|8].[0-9]*
 
 LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 			expat:${PORTSDIR}/textproc/expat2
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--with-ssl \
 			--with-expat=/usr/local/include:/usr/local/lib:expat
 
 .if defined(SVN_BUILD_BINDINGS)
-CONFLICTS_BUILD+=	${PORTNAME}-1.6.[0-9]*
+CONFLICTS_BUILD+=	${PORTNAME}-1.[6|8].[0-9]*
 LIB_DEPENDS+=		svn_client-1.0:${PORTSDIR}/devel/subversion
 OPTIONSFILE=		${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS=		# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index acfa9c49a6ce..4a4f7e6747a7 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,2 +1,6 @@
 SHA256 (subversion17/subversion-1.7.10.tar.bz2) = c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7
 SIZE (subversion17/subversion-1.7.10.tar.bz2) = 5952121
+SHA256 (subversion17/svn-book-html-r4304.tar.bz2) = a63d958b1ae70daf2ac93a53ece70a0ba0f8f7de7af3f74a665fe44b8f50ca14
+SIZE (subversion17/svn-book-html-r4304.tar.bz2) = 467806
+SHA256 (subversion17/svn-book-r4304.pdf) = 1b2cada79db8268fd6cd55fac4e5ee04c1e2977bbc587fa1098bd3613b9689b2
+SIZE (subversion17/svn-book-r4304.pdf) = 1921443
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index bc1ee97ef0e1..b7293d38cfbc 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -4,7 +4,7 @@
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Version control system
 
-CONFLICTS_INSTALL=	subversion-devel-[0-9]* subversion-freebsd-[0-9]*
+CONFLICTS_INSTALL=	subversion-1.[7|8].[0-9]*
 
 USE_RC_SUBR=	svnserve
 
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 32cd792729c0..5d8dd6f6a680 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -18,7 +18,7 @@ USE_KDE4=	# Used below if KWallet support is enabled
 
 LICENSE=	AL2
 
-CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.7.[0-9]*
+CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[7|8].[0-9]*
 LATEST_LINK=		${PKGNAMEPREFIX}${PORTNAME}16${PKGNAMESUFFIX}
 
 LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--with-ssl \
 			--with-expat=/usr/local/include:/usr/local/lib:expat
 
 .if defined(SVN_BUILD_BINDINGS)
-CONFLICTS_BUILD+=	${PORTNAME}-1.7.[0-9]*
+CONFLICTS_BUILD+=	${PORTNAME}-1.[7|8].[0-9]*
 LIB_DEPENDS+=		svn_client-1.0:${PORTSDIR}/devel/subversion16
 OPTIONSFILE=		${PORT_DBDIR}/${PORTNAME}16/options
 OPTIONS=		# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 64227168d101..33cc7d447ea2 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,2 +1,6 @@
 SHA256 (subversion/subversion-1.6.23.tar.bz2) = 214abc6b9359ea3a5fda2dee87dad110d1b33dcf888c1f8e361d69fbfa053943
 SIZE (subversion/subversion-1.6.23.tar.bz2) = 5566442
+SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
+SIZE (subversion/svn-book-html.tar.bz2) = 406484
+SHA256 (subversion/svn-book.pdf) = 64e483cd27be6752eb8dfc1b00749f8dc46adfc4fb1ab1356dd8e2406d878225
+SIZE (subversion/svn-book.pdf) = 1671317