Index: branches/2016Q4/devel/subversion/Makefile.common
===================================================================
--- branches/2016Q4/devel/subversion/Makefile.common	(revision 427492)
+++ branches/2016Q4/devel/subversion/Makefile.common	(revision 427493)
@@ -1,114 +1,114 @@
 # Created by: rooneg@electricjellyfish.net
 # $FreeBSD$
 
 PORTNAME?=	subversion
-PORTVERSION=	1.9.4
+PORTVERSION=	1.9.5
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
 DIST_SUBDIR=	subversion19
 
 GNU_CONFIGURE=	yes
 USES+=		cpe libtool pathfix pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	tools/server-side/svnpubsub/rc.d/svnpubsub.solaris \
 		tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
 
 LICENSE=	APACHE20
 
 CPE_VENDOR=	apache
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^9].[0-9]*
 
 LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 			libsqlite3.so:databases/sqlite3 \
 			libexpat.so:textproc/expat2
 
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
 			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 .if defined(SVN_BUILD_ADDONS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[^9].[0-9]*
 LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion
 OPTIONS_NAME=		devel_subversion
 .endif
 
 # ===============================================================
 OPTIONS_SUB=			yes
 
 BDB_CONFIGURE_OFF=		--without-berkeley-db
 BDB_USES=			bdb
 
 MAINTAINER_DEBUG_CONFIGURE_ON=	--enable-maintainer-mode --enable-debug
 
 NLS_CONFIGURE_OFF=		--disable-nls
 NLS_USES=			gettext
 
 SASL_CONFIGURE_OFF=		--without-sasl
 SASL_CONFIGURE_ON=		--with-sasl=${LOCALBASE}
 SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 SERF_CONFIGURE_OFF=		--without-serf
 SERF_CONFIGURE_ON=		--with-serf
 SERF_LIB_DEPENDS=		libserf-1.so:www/serf
 
 STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
 
 # ===============================================================
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
 WITH_DEBUG=	yes
 .endif
 
 APR_CONFIG=	${LOCALBASE}/bin/apr-1-config
 APU_CONFIG=	${LOCALBASE}/bin/apu-1-config
 
 CONFIGURE_ARGS+=--with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 OPTIONS_FILE_UNSET?=""
 OPTIONS_FILE_SET?=""
 
 .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
 CFLAGS+=	-DHAS_ORGANIZATION_NAME
 .endif
 
 .include <bsd.port.pre.mk>
 
 pre-everything::
 .if defined(SVN_BUILD_ADDONS)
 .if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC}
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!"
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${FALSE}
 .endif
 .endif
 
 pre-patch:
 .if defined(SVN_BUILD_ADDONS)
 	@${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk
 .endif
 
 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
 .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
 	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
 .endif
 # shebangfix
 	@${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \
 		| ${XARGS} ${REINPLACE_CMD} -e '1s|#\!/bin/b|#\!/usr/local/bin/b|' \
 		-e '1s|#\!/bin/env|#\!/usr/bin/env|' \
 		-e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|'
 # remove all .bak files to clean the stage
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
Index: branches/2016Q4/devel/subversion/distinfo
===================================================================
--- branches/2016Q4/devel/subversion/distinfo	(revision 427492)
+++ branches/2016Q4/devel/subversion/distinfo	(revision 427493)
@@ -1,2 +1,3 @@
-SHA256 (subversion19/subversion-1.9.4.tar.bz2) = 1267f9e2ab983f260623bee841e6c9cc458bf4bf776238ed5f100983f79e9299
-SIZE (subversion19/subversion-1.9.4.tar.bz2) = 7911473
+TIMESTAMP = 1480509767
+SHA256 (subversion19/subversion-1.9.5.tar.bz2) = 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5
+SIZE (subversion19/subversion-1.9.5.tar.bz2) = 7904861
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 427492)
+++ branches/2016Q4	(revision 427493)

Property changes on: branches/2016Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r427424