(1) Fix bindings dependencies when WITH_FREEBSD_SUBVERSION is set

  (2) Fix CATEGORIES for devel/*-subversion ports
  (3) Add note to UPDATING about neon26/neon28 transition and
      binding changes.

PR:		ports/125168 [2]
Submitted by:	Dmitry Morozovsky <marck rinet ru> [1,2,3]

9 files changed, 56 insertions, 18 deletions

diff --git a/UPDATING b/UPDATING
index 661aac8e592..49b292b1bf1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,31 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20080701
+  AFFECTS: users of devel/subversion*
+  AUTHOR: Lev Serebryakov <lev@FreeBSD.org>
+
+  subversion now uses neon-0.28.x (www/neon28) port, and automatic
+  portupgrade will fail because neon26 will conflict with installed
+  neon26.
+  You should upgrade neon library tohgether with subversion with
+
+  # portupgrade -o www/neon28 neon subversion
+
+  command.
+
+  Also, if you use special subversion port with bindings, you
+  should upgrade your port to clean subversion port with
+
+  # portupgrade -o devel/subversion subversion-\*
+
+  and install needed bindings (p5-subversion, py-subversion and/or
+  ruby-subversion) after that.
+
+  If you use subversion with bindings, installed from devel/subversion
+  with custom options, don't forget to install separate bindings ports
+  after subversion upgrade.
+
 20080630:
   AFFECTS: users of graphics/poppler* and future users of firefox3
   AUTHOR: FreeBSD GNOME Team <gnome@FreeBSD.org>
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index f503eea2586..c3303a98433 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -6,7 +6,6 @@
 #
 
 PKGNAMEPREFIX=	p5-
-CATEGORIES+=	perl
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Perl bindings for Version control system
@@ -30,6 +29,8 @@ SVN_BUILD_BINDINGS=yes
 
 .include "${MASTERDIR}/Makefile.common"
 
+CATEGORIES+=	perl
+
 do-build:
 	cd ${WRKSRC} ; ${MAKE} swig-pl-lib ; ${MAKE} swig-pl
 
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 06d60847511..897c4069f41 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -6,7 +6,6 @@
 #
 
 PKGNAMEPREFIX=	py-
-CATEGORIES+=	python
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Python bindings for version control system
@@ -20,6 +19,8 @@ SVN_BUILD_BINDINGS=yes
 
 .include "${MASTERDIR}/Makefile.common"
 
+CATEGORIES+=	python
+
 do-build:
 	cd ${WRKSRC} ; ${MAKE} swig-py-lib ; ${MAKE} swig-py
 
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index 14189b77850..ed0703a1854 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -6,7 +6,6 @@
 #
 
 PKGNAMEPREFIX=	ruby-
-CATEGORIES+=	ruby
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Ruby bindings for version control system
@@ -20,6 +19,8 @@ SVN_BUILD_BINDINGS=yes
 
 .include "${MASTERDIR}/Makefile.common"
 
+CATEGORIES+=	ruby
+
 do-build:
 	cd ${WRKSRC} ; ${MAKE} swig-rb-lib ; ${MAKE} swig-rb
 
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 0ae12baf8ce..4388524e10a 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -6,9 +6,10 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.5.0
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
-		http://svnbook.red-bean.com/nightly/en/:book
+		http://svnbook.red-bean.com/en/1.4/:book
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 DIST_SUBDIR=	subversion
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
@@ -22,7 +23,11 @@ WANT_PERL=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(SVN_BUILD_BINDINGS)
+.if defined(WITH_FREEBSD_SUBVERSION)
+LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.else
 LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
+.endif
 EXTRA_PATCHES+=	${PATCHDIR}/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in
 .endif
 
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index d928d93ada7..4df41db3fec 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,12 +1,12 @@
 MD5 (subversion/subversion-1.5.0.tar.bz2) = 004b57643406dd10957ec87955702189
 SHA256 (subversion/subversion-1.5.0.tar.bz2) = 755e9b2bac5ce69ff0177a02f3946c2840db06411e92e767e3c44a8c46d496b3
 SIZE (subversion/subversion-1.5.0.tar.bz2) = 4852793
-MD5 (subversion/svn-book-html.tar.bz2) = 4574357586b0a73afd712b8c898cf84a
-SHA256 (subversion/svn-book-html.tar.bz2) = 5d3adfccfc3c72af6860702b8f5349107d52c9866384765611606bd53c8cbd77
-SIZE (subversion/svn-book-html.tar.bz2) = 404468
-MD5 (subversion/svn-book.pdf) = 5fe39899d7e17f31f1498991dce7dafb
-SHA256 (subversion/svn-book.pdf) = cb34765531342a619ca3b710a75478ac9884e4e11ae680161b68f424f6f533f3
-SIZE (subversion/svn-book.pdf) = 1659122
+MD5 (subversion/svn-book-html.tar.bz2) = eda5fa7d7e3aff9473adf063385d3527
+SHA256 (subversion/svn-book-html.tar.bz2) = a73110c724ee7fca4ab0e6090f0a47fdd3a03cfdfbecab799aca90c80824d9e0
+SIZE (subversion/svn-book-html.tar.bz2) = 366277
+MD5 (subversion/svn-book.pdf) = b4f04dfc6cae59212c255322e4fa27a4
+SHA256 (subversion/svn-book.pdf) = d3fffd8191d62faf2a571cfe96bdadc772ff90bd5e32364f888f9b2d7fd81b5d
+SIZE (subversion/svn-book.pdf) = 1462807
 MD5 (subversion/svn_hacks_1.1.diff) = c936ad112897d698c6b3c066c8f93606
 SHA256 (subversion/svn_hacks_1.1.diff) = cbc4503e4f6a624ec40d23b8b8444ced84d71482308c4c08e3cce6f3452b64cb
 SIZE (subversion/svn_hacks_1.1.diff) = 17813
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 0ae12baf8ce..4388524e10a 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -6,9 +6,10 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.5.0
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
-		http://svnbook.red-bean.com/nightly/en/:book
+		http://svnbook.red-bean.com/en/1.4/:book
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 DIST_SUBDIR=	subversion
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
@@ -22,7 +23,11 @@ WANT_PERL=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(SVN_BUILD_BINDINGS)
+.if defined(WITH_FREEBSD_SUBVERSION)
+LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.else
 LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
+.endif
 EXTRA_PATCHES+=	${PATCHDIR}/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in
 .endif
 
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index d928d93ada7..4df41db3fec 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,12 +1,12 @@
 MD5 (subversion/subversion-1.5.0.tar.bz2) = 004b57643406dd10957ec87955702189
 SHA256 (subversion/subversion-1.5.0.tar.bz2) = 755e9b2bac5ce69ff0177a02f3946c2840db06411e92e767e3c44a8c46d496b3
 SIZE (subversion/subversion-1.5.0.tar.bz2) = 4852793
-MD5 (subversion/svn-book-html.tar.bz2) = 4574357586b0a73afd712b8c898cf84a
-SHA256 (subversion/svn-book-html.tar.bz2) = 5d3adfccfc3c72af6860702b8f5349107d52c9866384765611606bd53c8cbd77
-SIZE (subversion/svn-book-html.tar.bz2) = 404468
-MD5 (subversion/svn-book.pdf) = 5fe39899d7e17f31f1498991dce7dafb
-SHA256 (subversion/svn-book.pdf) = cb34765531342a619ca3b710a75478ac9884e4e11ae680161b68f424f6f533f3
-SIZE (subversion/svn-book.pdf) = 1659122
+MD5 (subversion/svn-book-html.tar.bz2) = eda5fa7d7e3aff9473adf063385d3527
+SHA256 (subversion/svn-book-html.tar.bz2) = a73110c724ee7fca4ab0e6090f0a47fdd3a03cfdfbecab799aca90c80824d9e0
+SIZE (subversion/svn-book-html.tar.bz2) = 366277
+MD5 (subversion/svn-book.pdf) = b4f04dfc6cae59212c255322e4fa27a4
+SHA256 (subversion/svn-book.pdf) = d3fffd8191d62faf2a571cfe96bdadc772ff90bd5e32364f888f9b2d7fd81b5d
+SIZE (subversion/svn-book.pdf) = 1462807
 MD5 (subversion/svn_hacks_1.1.diff) = c936ad112897d698c6b3c066c8f93606
 SHA256 (subversion/svn_hacks_1.1.diff) = cbc4503e4f6a624ec40d23b8b8444ced84d71482308c4c08e3cce6f3452b64cb
 SIZE (subversion/svn_hacks_1.1.diff) = 17813
diff --git a/java/subversion-java/Makefile b/java/subversion-java/Makefile
index c6d8613e883..592aee0087c 100644
--- a/java/subversion-java/Makefile
+++ b/java/subversion-java/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-java
-CATEGORIES+=	java
+CATEGORIES=	java
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Java bindings for Version control system