Index: branches/2017Q4/www/tomcat-devel/Makefile
===================================================================
--- branches/2017Q4/www/tomcat-devel/Makefile	(revision 451419)
+++ branches/2017Q4/www/tomcat-devel/Makefile	(revision 451420)
@@ -1,94 +1,94 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	9.0.0.M26
+PORTVERSION=	9.0.1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	-devel
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vvd@unislabs.com
 COMMENT=	Open-source Java web server by Apache, development branch
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:devel/jakarta-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 TOMCAT_SUBDIR?=	${DISTNAME:C/([0-9])\.([0-9])(.*)/\1.\2/}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 TOMCAT_CONF_FILES=	\
 		catalina.policy catalina.properties context.xml logging.properties \
 		server.xml tomcat-users.xml tomcat-users.xsd web.xml \
 		jaspic-providers.xml jaspic-providers.xsd
 
 OPTIONS_DEFINE= HOST_MANAGER MANAGER DOCS EXAMPLES ROOT
 HOST_MANAGER_DESC= Install Host Manager application
 MANAGER_DESC= Install Manager web application
 DOCS_DESC= Install Documentation web application
 EXAMPLES_DESC= Install Examples web application
 ROOT_DESC= Install default ROOT web application
 OPTIONS_DEFAULT= HOST_MANAGER MANAGER DOCS EXAMPLES ROOT
 OPTIONS_SUB= yes
 
 PLIST_SUB=	T=${TOMCAT_SUBDIR} \
 		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
 		TOMCAT_USER=${WWWOWN} \
 		JAVA_HOME=${JAVA_HOME}
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${TOMCAT_HOME}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.bat' -delete
 .for f in ${TOMCAT_CONF_FILES}
 	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.sample
 .endfor
 
 do-install:
 	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Copying files to destination directory..."
 	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 .if !${PORT_OPTIONS:MHOST_MANAGER}
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager
 .endif
 .if !${PORT_OPTIONS:MMANAGER}
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager
 .endif
 .if !${PORT_OPTIONS:MDOCS}
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/docs
 .endif
 .if !${PORT_OPTIONS:MEXAMPLES}
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/examples
 .endif
 .if !${PORT_OPTIONS:MROOT}
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/ROOT
 .endif
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${FIND} ${STAGEDIR}${TOMCAT_HOME} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	@${ECHO_MSG} " [ DONE ]"
 
 .include <bsd.port.post.mk>
Index: branches/2017Q4/www/tomcat-devel/distinfo
===================================================================
--- branches/2017Q4/www/tomcat-devel/distinfo	(revision 451419)
+++ branches/2017Q4/www/tomcat-devel/distinfo	(revision 451420)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502730442
-SHA256 (apache-tomcat-9.0.0.M26.tar.gz) = 86ea5d18c5af108defd31e67bc9c367ceec3564f7c54b075b40d11e986b21cbd
-SIZE (apache-tomcat-9.0.0.M26.tar.gz) = 9376594
+TIMESTAMP = 1507286153
+SHA256 (apache-tomcat-9.0.1.tar.gz) = 976d9aa996fc34d387ef8de87eed79c5f20c0679b76c1a1fcf331eaa7cdf758f
+SIZE (apache-tomcat-9.0.1.tar.gz) = 9397803
Index: branches/2017Q4/www/tomcat-devel/pkg-descr
===================================================================
--- branches/2017Q4/www/tomcat-devel/pkg-descr	(revision 451419)
+++ branches/2017Q4/www/tomcat-devel/pkg-descr	(revision 451420)
@@ -1,8 +1,12 @@
 Apache Tomcat is a web server written in 100% Pure Java.
 
-This is the version of Tomcat currently under active development.
+Apache Tomcat 9.x is the current focus of development. It builds on Tomcat
+8.0.x and 8.5.x and implements the current draft of the Servlet 4.0
+specification and also the JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1
+specifications (the versions required by Java EE 8 platform).
+
 Development releases may contain large amounts of untested or missing
 functionality required by the specification and/or significant
 bugs and are not expected to run stably for any length of time.
 
 WWW: http://tomcat.apache.org/

Property changes on: branches/2017Q4/www/tomcat-devel/pkg-descr
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property
Index: branches/2017Q4
===================================================================
--- branches/2017Q4	(revision 451419)
+++ branches/2017Q4	(revision 451420)

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