Index: head/www/jetty8/Makefile
===================================================================
--- head/www/jetty8/Makefile	(revision 403169)
+++ head/www/jetty8/Makefile	(revision 403170)
@@ -1,69 +1,71 @@
 # Created by: Stephane Legrand <stephane@freebsd-fr.org>
 # $FreeBSD$
 
 PORTNAME=	jetty
 PORTVERSION=	8.1.15
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	ECLIPSE/jetty/${PORTVERSION}.${JDVDATE}/dist
+PKGNAMESUFFIX=	8
 DISTNAME=	jetty-distribution-${PORTVERSION}.${JDVDATE}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Full-featured web server implemented entirely in Java
 
 LICENSE=	APACHE20 EPL
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 CONFLICTS=	jetty-9.*
 
 JDVDATE=	v20140411
 USE_RC_SUBR=	${PORTNAME}
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USES=		python
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PLIST_SUB+=	RUNASUSER=${RUNASUSER} GROUP=${GROUP}
 
 APP_NAME=	${PORTNAME}
 APP_HOME=	${PREFIX}/${PORTNAME}
 PID_FILE?=	${APP_HOME}/${APP_NAME}.pid
 RUNASUSER?=	www
 RUNASUID?=	80
 GROUP?=		www
 GID?=		80
 LOG_FILE?=	${APP_HOME}/${APP_NAME}.log
 
 SUB_LIST=	\
 		APP_HOME=${APP_HOME} \
 		APP_NAME=${APP_NAME} \
 		JAVA_HOME=${JAVA_HOME} \
 		JAVA=${JAVA} \
 		PID_FILE=${PID_FILE} \
 		RUNASUSER=${RUNASUSER} \
 		RUNASUID=${RUNASUID} \
 		GROUP=${GROUP} \
 		GID=${GID} \
 		LOG_FILE=${LOG_FILE} \
 		PYTHON_CMD=${PYTHON_CMD}
 
 SUB_FILES=	\
 		pkg-install \
 		pkg-deinstall \
 		${APP_NAME}ctl \
 		${APP_NAME} \
 		message \
 		message-advanced
 
 do-build:
 
 pre-install:
 	@${FMT} -w80 ${WRKDIR}/message > ${PKGMESSAGE}
 	@${CAT} ${WRKDIR}/message-advanced >> ${PKGMESSAGE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${APP_HOME}
 	cd ${WRKSRC} && ${FIND} -H * | ${EGREP} -v "^(bin/|bin$$)" | ${CPIO} -pdmuL ${STAGEDIR}${APP_HOME}
 	${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
Index: head/www/jetty9/Makefile
===================================================================
--- head/www/jetty9/Makefile	(revision 403169)
+++ head/www/jetty9/Makefile	(revision 403170)
@@ -1,68 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	jetty
 PORTVERSION=	9.3.6
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	ECLIPSE/jetty/${PORTVERSION}.${JDVDATE}/dist
+PKGNAMESUFFIX=	9
 DISTNAME=	jetty-distribution-${PORTVERSION}.${JDVDATE}
 
 MAINTAINER=	dharrigan@gmail.com
 COMMENT=	Full-featured web server implemented entirely in Java
 
 LICENSE=	APACHE20 EPL
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/license-eplv10-aslv20.html
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 CONFLICTS=	jetty-8.*
 
 JDVDATE=	v20151106
 USE_JAVA=	yes
 NO_ARCH=	yes
 USES=		shebangfix
 SHEBANG_FILES=	bin/jetty.sh
 NO_BUILD=	yes
 JAVA_VERSION=	1.8+
 JAVA_VENDOR=	openjdk
 ONLY_FOR_ARCHS=	i386 amd64
 USE_RC_SUBR=	${PORTNAME}
 
 APP_NAME=	${PORTNAME}
 APP_HOME=	${PREFIX}/${PORTNAME}
 
 USERS=		www
 GROUPS=		www
 
 SUB_LIST=	\
 		APP_HOME=${APP_HOME} \
 		APP_NAME=${APP_NAME} \
 		JAVA_HOME=${JAVA_HOME} \
 		JAVA=${JAVA} \
 		WWWDIR=${WWWDIR}
 
 SUB_FILES=	\
 		${APP_NAME} \
 		pkg-message \
 		jetty.sample
 
 PLIST_SUB=	\
 		APP_HOME=${APP_HOME} \
 		APP_NAME=${APP_NAME} \
 		WWWDIR=${WWWDIR}
 
 do-install:
 		${MKDIR} ${STAGEDIR}${APP_HOME}
 		${MKDIR} ${STAGEDIR}${WWWDIR}
 		${RM} ${WRKSRC}/lib/setuid/libsetuid-linux.so
 		${RM} ${WRKSRC}/lib/setuid/libsetuid-osx.so
 		(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${PORTNAME})
 		${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/demo-base ${STAGEDIR}${WWWDIR}
 		${MKDIR} ${STAGEDIR}${WWWDIR}/demo-base/logs
 		${INSTALL_SCRIPT} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/sbin
 
 post-install:
 		${MKDIR} ${STAGEDIR}${ETCDIR}
 		${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/
 
 .include <bsd.port.mk>