Index: head/devel/subversion/Makefile.common
===================================================================
--- head/devel/subversion/Makefile.common	(revision 225008)
+++ head/devel/subversion/Makefile.common	(revision 225009)
@@ -1,156 +1,156 @@
 # New ports collection makefile for:	subversion
 # Date created:				10 September 2001
 # Whom:					rooneg@electricjellyfish.net
 #
 # $FreeBSD$
 
 PORTNAME=	subversion
 PORTVERSION=	1.5.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
-		http://svnbook.red-bean.com/en/1.4/:book
+		http://svnbook.red-bean.com/en/1.5/:book
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 DIST_SUBDIR=	subversion
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=		--with-ssl
 WANT_PERL=	yes
 
 .if defined(SVN_BUILD_BINDINGS)
 # Bindings ports should use the same, as main port
 OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
 # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
 OPTIONS=
 .endif
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--without-swig
 
 # Default is "on"
 .if !defined(WITHOUT_NEON)
 LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		NEON=""
 .else
 CONFIGURE_ARGS+=	--without-neon
 PLIST_SUB+=		NEON="@comment "
 .endif
 
 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 PLIST_SUB+=		SASL=""
 .else
 CONFIGURE_ARGS+=	--without-sasl
 PLIST_SUB+=		SASL="@comment "
 .endif
 
 # Default us "on"
 .if !defined(WITHOUT_BDB)
 PLIST_SUB+=		BDB=""
 .else
 CONFIGURE_ARGS+=	--without-berkeley-db
 PLIST_SUB+=		BDB="@comment "
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=	MOD_DAV_SVN=""
 SVNGROUP?=	www
 SVNUSER?=	www
 .else
 PLIST_SUB+=	MOD_DAV_SVN="@comment "
 PKGDEINSTALL=	NONEXISTENT
 SVNGROUP?=	svn
 SVNUSER?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
 USE_APACHE=	2.0+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${APACHE_VERSION} >= 21
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .else
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 .endif
 APR_PORT=	${APACHE_PORT}
 .if !defined(WITHOUT_BDB)
 DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
 .endif
 .else
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .if !defined(WITHOUT_BDB)
 LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr-svn
 APR_PORT=	devel/apr-svn
 OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
 .else
 LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr
 APR_PORT=	devel/apr
 .endif
 .endif
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
 		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
 
 .if defined(WITH_SERF)
 LIB_DEPENDS+=	serf-0.0:${PORTSDIR}/www/serf
 CONFIGURE_ARGS+=	--with-serf=${LOCALBASE}
 PLIST_SUB+=		SERF=""
 .else
 PLIST_SUB+=		SERF="@comment "
 .endif
 
 .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
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
 PLIST_SUB+=		WITHOUT_GETTEXT=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 .if defined(WITH_MAINTAINER_DEBUG)
 CONFIGURE_ARGS+=--enable-maintainer-mode \
 		--enable-debug
 CFLAGS+=	-g
 .endif
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/neon
 	@${RM} -rf ${WRKSRC}/apr
 	@${RM} -rf ${WRKSRC}/apr-util
 
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
 .if defined(SVN_BUILD_BINDINGS)
 	@${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}
 .endif

Property changes on: head/devel/subversion/Makefile.common
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/devel/subversion/distinfo
===================================================================
--- head/devel/subversion/distinfo	(revision 225008)
+++ head/devel/subversion/distinfo	(revision 225009)
@@ -1,12 +1,12 @@
 MD5 (subversion/subversion-1.5.5.tar.bz2) = 6f3701a0f2acf3fe53093491ba3d77ee
 SHA256 (subversion/subversion-1.5.5.tar.bz2) = 88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
 SIZE (subversion/subversion-1.5.5.tar.bz2) = 4940482
-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-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
+SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
+SIZE (subversion/svn-book-html.tar.bz2) = 406484
+MD5 (subversion/svn-book.pdf) = a2d503ce36f6a72a8f136a127f3e14d3
+SHA256 (subversion/svn-book.pdf) = 64e483cd27be6752eb8dfc1b00749f8dc46adfc4fb1ab1356dd8e2406d878225
+SIZE (subversion/svn-book.pdf) = 1671317
 MD5 (subversion/svn_hacks_1.1.diff) = c936ad112897d698c6b3c066c8f93606
 SHA256 (subversion/svn_hacks_1.1.diff) = cbc4503e4f6a624ec40d23b8b8444ced84d71482308c4c08e3cce6f3452b64cb
 SIZE (subversion/svn_hacks_1.1.diff) = 17813

Property changes on: head/devel/subversion/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.61
\ No newline at end of property
+1.62
\ No newline at end of property
Index: head/devel/subversion16/Makefile.common
===================================================================
--- head/devel/subversion16/Makefile.common	(revision 225008)
+++ head/devel/subversion16/Makefile.common	(revision 225009)
@@ -1,156 +1,156 @@
 # New ports collection makefile for:	subversion
 # Date created:				10 September 2001
 # Whom:					rooneg@electricjellyfish.net
 #
 # $FreeBSD$
 
 PORTNAME=	subversion
 PORTVERSION=	1.5.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
-		http://svnbook.red-bean.com/en/1.4/:book
+		http://svnbook.red-bean.com/en/1.5/:book
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 DIST_SUBDIR=	subversion
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=		--with-ssl
 WANT_PERL=	yes
 
 .if defined(SVN_BUILD_BINDINGS)
 # Bindings ports should use the same, as main port
 OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
 # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
 OPTIONS=
 .endif
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--without-swig
 
 # Default is "on"
 .if !defined(WITHOUT_NEON)
 LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		NEON=""
 .else
 CONFIGURE_ARGS+=	--without-neon
 PLIST_SUB+=		NEON="@comment "
 .endif
 
 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 PLIST_SUB+=		SASL=""
 .else
 CONFIGURE_ARGS+=	--without-sasl
 PLIST_SUB+=		SASL="@comment "
 .endif
 
 # Default us "on"
 .if !defined(WITHOUT_BDB)
 PLIST_SUB+=		BDB=""
 .else
 CONFIGURE_ARGS+=	--without-berkeley-db
 PLIST_SUB+=		BDB="@comment "
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=	MOD_DAV_SVN=""
 SVNGROUP?=	www
 SVNUSER?=	www
 .else
 PLIST_SUB+=	MOD_DAV_SVN="@comment "
 PKGDEINSTALL=	NONEXISTENT
 SVNGROUP?=	svn
 SVNUSER?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
 USE_APACHE=	2.0+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${APACHE_VERSION} >= 21
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .else
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 .endif
 APR_PORT=	${APACHE_PORT}
 .if !defined(WITHOUT_BDB)
 DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
 .endif
 .else
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
 .if !defined(WITHOUT_BDB)
 LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr-svn
 APR_PORT=	devel/apr-svn
 OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
 .else
 LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr
 APR_PORT=	devel/apr
 .endif
 .endif
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
 		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
 
 .if defined(WITH_SERF)
 LIB_DEPENDS+=	serf-0.0:${PORTSDIR}/www/serf
 CONFIGURE_ARGS+=	--with-serf=${LOCALBASE}
 PLIST_SUB+=		SERF=""
 .else
 PLIST_SUB+=		SERF="@comment "
 .endif
 
 .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
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
 PLIST_SUB+=		WITHOUT_GETTEXT=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 .if defined(WITH_MAINTAINER_DEBUG)
 CONFIGURE_ARGS+=--enable-maintainer-mode \
 		--enable-debug
 CFLAGS+=	-g
 .endif
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/neon
 	@${RM} -rf ${WRKSRC}/apr
 	@${RM} -rf ${WRKSRC}/apr-util
 
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
 .if defined(SVN_BUILD_BINDINGS)
 	@${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}
 .endif

Property changes on: head/devel/subversion16/Makefile.common
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/devel/subversion16/distinfo
===================================================================
--- head/devel/subversion16/distinfo	(revision 225008)
+++ head/devel/subversion16/distinfo	(revision 225009)
@@ -1,12 +1,12 @@
 MD5 (subversion/subversion-1.5.5.tar.bz2) = 6f3701a0f2acf3fe53093491ba3d77ee
 SHA256 (subversion/subversion-1.5.5.tar.bz2) = 88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
 SIZE (subversion/subversion-1.5.5.tar.bz2) = 4940482
-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-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
+SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
+SIZE (subversion/svn-book-html.tar.bz2) = 406484
+MD5 (subversion/svn-book.pdf) = a2d503ce36f6a72a8f136a127f3e14d3
+SHA256 (subversion/svn-book.pdf) = 64e483cd27be6752eb8dfc1b00749f8dc46adfc4fb1ab1356dd8e2406d878225
+SIZE (subversion/svn-book.pdf) = 1671317
 MD5 (subversion/svn_hacks_1.1.diff) = c936ad112897d698c6b3c066c8f93606
 SHA256 (subversion/svn_hacks_1.1.diff) = cbc4503e4f6a624ec40d23b8b8444ced84d71482308c4c08e3cce6f3452b64cb
 SIZE (subversion/svn_hacks_1.1.diff) = 17813

Property changes on: head/devel/subversion16/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.61
\ No newline at end of property
+1.62
\ No newline at end of property