Index: branches/2016Q3/www/typo3/Makefile
===================================================================
--- branches/2016Q3/www/typo3/Makefile	(revision 418230)
+++ branches/2016Q3/www/typo3/Makefile	(revision 418231)
@@ -1,85 +1,85 @@
 # Created by: Gerrit Beine <tux@pinguru.net>
 # $FreeBSD$
 
 PORTNAME=	typo3
-PORTVERSION=	7.6.5
+PORTVERSION=	7.6.9
 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
 
 USES=		cpe shebangfix
 SHEBANG_FILES=	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
 WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/${TYPO3SRC}
 
 TYPO3WWW=	www
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
 TYPO3DIR=	${PORTNAME}
 
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 
 DISTFILES+=	${TYPO3SRC}${EXTRACT_SUFX}
 
 OPTIONS_DEFINE=	APC CURL GD GMP IMAGICK MBSTRING MYSQL ZLIB
 OPTIONS_DEFAULT=	GD ZLIB
 APC_DESC=	Alternative PHP Cache
 GD_DESC=	GDlib/freetype support
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 MBSTRING_DESC=	${MULTIBYTE_DESC}
 MYSQL_DESC=	Install MySQL Server
 
 APC_USE=	PHP=apc
 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}
 
 .include <bsd.port.mk>
Index: branches/2016Q3/www/typo3/distinfo
===================================================================
--- branches/2016Q3/www/typo3/distinfo	(revision 418230)
+++ branches/2016Q3/www/typo3/distinfo	(revision 418231)
@@ -1,2 +1,3 @@
-SHA256 (typo3_src-7.6.5.tar.gz) = 1ca76565aaac74e28ee0ffd3d8f52cf29c2b2edd883e54c296cd9966e9c36e35
-SIZE (typo3_src-7.6.5.tar.gz) = 20594347
+TIMESTAMP = 1467797014
+SHA256 (typo3_src-7.6.9.tar.gz) = 624576cd5910d31e21bdf267d55dcfa649d7684fa0b58251b97cbe227f7b930c
+SIZE (typo3_src-7.6.9.tar.gz) = 20639347
Index: branches/2016Q3
===================================================================
--- branches/2016Q3	(revision 418230)
+++ branches/2016Q3	(revision 418231)

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