Index: head/www/typo3/Makefile
===================================================================
--- head/www/typo3/Makefile	(revision 433307)
+++ head/www/typo3/Makefile	(revision 433308)
@@ -1,83 +1,88 @@
 # Created by: Gerrit Beine <tux@pinguru.net>
 # $FreeBSD$
 
 PORTNAME=	typo3
-PORTVERSION=	7.6.15
+PORTVERSION=	8.5.1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
 
 MAINTAINER=	freebsd-ports@charlieroot.de
 COMMENT=	Typo3 content management system
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+IGNORE_WITH_PHP=	56
+PHP_VER=	70
+
+PORTSCOUT=	limit:^8\.5\.
+
 USES=		cpe php:web shebangfix
-SHEBANG_FILES=	typo3/sysext/core/Build/Scripts/xlfcheck.sh \
-		typo3/sysext/core/Build/Scripts/splitFunctionalTests.sh
+SHEBANG_FILES=	vendor/doctrine/instantiator/.travis.install.sh \
+		typo3/sysext/core/Build/Scripts/cglFixMyCommit.sh \
+		typo3/sysext/core/Build/Scripts/splitFunctionalTests.sh \
+		typo3/sysext/core/Build/Scripts/validateRstFiles.sh \
+		typo3/sysext/core/Build/Scripts/duplicateExceptionCodeCheck.sh \
+		typo3/sysext/core/Build/Scripts/checkFilePermissions.sh \
+		typo3/sysext/core/Build/Scripts/xlfcheck.sh
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_PHP=	ctype fileinfo filter hash json mysqli openssl pcre session soap xml zip simplexml
 WRKSRC=		${WRKDIR}/${TYPO3SRC}
 
 TYPO3WWW=	www
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
 TYPO3DIR=	${PORTNAME}
 
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 
 DISTFILES+=	${TYPO3SRC}${EXTRACT_SUFX}
 
 OPTIONS_DEFINE=	CURL GD GMP IMAGICK MBSTRING MYSQL ZLIB
-OPTIONS_DEFAULT=	GD ZLIB
+OPTIONS_DEFAULT=
 GD_DESC=	GDlib/freetype support
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 MBSTRING_DESC=	${MULTIBYTE_DESC}
 MYSQL_DESC=	Install MySQL Server
 
 CURL_USE=	PHP=curl
 GD_USE=		PHP=gd
 GMP_USE=	PHP=gmp
 MBSTRING_USE=	PHP=mbstring
 MYSQL_USE=	MYSQL=server
 ZLIB_USE=	PHP=zlib
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGICK}
 .if ${PORT_OPTIONS:MX11}
 RUN_DEPENDS+=	convert:graphics/ImageMagick
 .else
 RUN_DEPENDS+=	convert:graphics/ImageMagick-nox11
 .endif
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}
 	${CP} -R ${WRKDIR}/${TYPO3SRC} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/
 	${LN} -fs ../${TYPO3SRC} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/typo3_src
 	${LN} -fs typo3_src/index.php ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/index.php
 	${LN} -fs typo3_src/typo3 ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/typo3
 	${CP} ${WRKDIR}/${TYPO3SRC}/_.htaccess ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/.htaccess
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX}; \
 		${FIND} * \( -type f -or -type l \) -path "${TYPO3WWW}/${TYPO3DIR}/*" | \
 		${SORT} >> ${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX}; \
 		${FIND} * \( -type f -or -type l \) -path "${TYPO3WWW}/${TYPO3SRC}/*" | \
 		${SORT} >> ${TMPPLIST}
 
-	${TOUCH} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/FIRST_INSTALL
-	@${ECHO_CMD} ${TYPO3WWW}/${TYPO3DIR}/FIRST_INSTALL >> ${TMPPLIST}
-
-	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@mode 755" >> ${TMPPLIST}
-	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3DIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@mode" >> ${TMPPLIST}
-	@${ECHO_CMD} "@group" >> ${TMPPLIST}
-	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
+	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/common/lib/vendor/doctrine-build-common" >> ${TMPPLIST}
+	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/dbal/lib/vendor/Symfony/Component/Console" >> ${TMPPLIST}
+	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/dbal/lib/vendor/doctrine-build-common" >> ${TMPPLIST}
+	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/dbal/lib/vendor/doctrine-common" >> ${TMPPLIST}
+	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/guzzlehttp/guzzle/build" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/www/typo3/distinfo
===================================================================
--- head/www/typo3/distinfo	(revision 433307)
+++ head/www/typo3/distinfo	(revision 433308)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483516120
-SHA256 (typo3_src-7.6.15.tar.gz) = e263bf3f20dbd50b5f790d25995f02785a35681d1c18406f571d10df5f75a9c9
-SIZE (typo3_src-7.6.15.tar.gz) = 21674023
+TIMESTAMP = 1486209945
+SHA256 (typo3_src-8.5.1.tar.gz) = 0684e266c3711616efe260ec1381af30dfec3a4db0d0647313f1040ff48eb5fd
+SIZE (typo3_src-8.5.1.tar.gz) = 21762084
Index: head/www/typo3/pkg-descr
===================================================================
--- head/www/typo3/pkg-descr	(revision 433307)
+++ head/www/typo3/pkg-descr	(revision 433308)
@@ -1,11 +1,11 @@
 TYPO3 is a free Open Source content management system for enterprise purposes
 on the web and in intranets. It offers full flexibility and extendability while
 featuring an accomplished set of ready-made interfaces, functions and modules.
 
-The upcoming LTS release, which will be released in Fall 2015. It will get 3
-years of important and security fixes from the day of the release. Until the
-final release several sprint releases will be published (7.0, 7.1, 7.2, ...)
-in between. Adopters are encouraged to use each of those release on the way
-to TYPO3 CMS 7 LTS.
+The upcoming LTS release, scheduled for April 2017. Stay tuned for more
+information. Once released, it will get 3 years of important and security fixes
+from the day of the release. Until the final release several sprint releases
+will be published (8.0, 8.1, 8.2, ...) in between. Adopters are encouraged to
+use each of those release on the way to TYPO3 CMS 8 LTS.
 
 WWW: http://typo3.org/