8 files changed, 24 insertions, 25 deletions

diff --git a/MOVED b/MOVED
index 01780a8ff958..28660dd9e954 100644
--- a/MOVED
+++ b/MOVED
@@ -9207,3 +9207,4 @@ databases/p5-Search-Xapian|databases/p5-Search-Xapian12|2017-04-04|Rename to mat
 archivers/pecl-snappy|archivers/php-snappy|2017-04-04|Update PKGNAMEPREFIX: it builds fine with PHP 7.x
 textproc/kibana50|textproc/kibana5|2017-04-05|Rename port to match the rest of the 5.X line of the elastic stack
 textproc/kibana50-x-pack|textproc/kibana5-x-pack|2017-04-05|Rename port to match the rest of the 5.X line of the elastic stack
+www/typo3|www/typo3-8|2017-04-08|Rename to coexist with TYPO3 7.x (was typo3-lts) since both versions are LTS now
diff --git a/www/Makefile b/www/Makefile
index 3c05033a9001..cc6bfea49f2d 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2308,7 +2308,7 @@
     SUBDIR += twiki-WysiwygPlugin
     SUBDIR += twill
     SUBDIR += twms
-    SUBDIR += typo3
+    SUBDIR += typo3-8
     SUBDIR += typo3-lts
     SUBDIR += uchiwa
     SUBDIR += udmsearch
diff --git a/www/typo3/Makefile b/www/typo3-8/Makefile
index 20beb1465a24..beb11a1c8daa 100644
--- a/www/typo3/Makefile
+++ b/www/typo3-8/Makefile
@@ -1,10 +1,11 @@
-# Created by: Gerrit Beine <tux@pinguru.net>
+# Created by: Helmut Ritter <freebsd-ports@charlieroot.de>
 # $FreeBSD$
 
 PORTNAME=	typo3
-PORTVERSION=	8.6.1
+PORTVERSION=	${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
+PKGNAMESUFFIX=	-${PORT_V_MAJOR}
 
 MAINTAINER=	freebsd-ports@charlieroot.de
 COMMENT=	Typo3 content management system
@@ -14,23 +15,22 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 IGNORE_WITH_PHP=	56
 
-PORTSCOUT=	limit:^8\.6\.
+PORTSCOUT=	limit:^${PORT_V_MAJOR}\.${PORT_V_MINOR}\.
 
 USES=		cpe php:web shebangfix
-SHEBANG_FILES=	typo3/sysext/core/Build/Scripts/cglFixMyCommit.sh \
-		typo3/sysext/core/Build/Scripts/checkFilePermissions.sh \
-		typo3/sysext/core/Build/Scripts/duplicateExceptionCodeCheck.sh \
-		typo3/sysext/core/Build/Scripts/validateRstFiles.sh \
-		typo3/sysext/core/Build/Scripts/xlfcheck.sh \
-		vendor/doctrine/instantiator/.travis.install.sh
+SHEBANG_FILES=	vendor/doctrine/instantiator/.travis.install.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}
 
+PORT_V_MAJOR=	8
+PORT_V_MINOR=	7
+PORT_V_PATCH=	0
+
 TYPO3WWW=	www
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
-TYPO3DIR=	${PORTNAME}
+TYPO3DIR=	${PORTNAME}-${PORT_V_MAJOR}
 
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
diff --git a/www/typo3-8/distinfo b/www/typo3-8/distinfo
new file mode 100644
index 000000000000..8e39a546d594
--- /dev/null
+++ b/www/typo3-8/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1491403626
+SHA256 (typo3_src-8.7.0.tar.gz) = 3e91e8d4ef0a6733613fc33a5182679da3234f2003436ae31141d26a25d412d5
+SIZE (typo3_src-8.7.0.tar.gz) = 21622296
diff --git a/www/typo3/files/pkg-message.in b/www/typo3-8/files/pkg-message.in
index f71099988005..f71099988005 100644
--- a/www/typo3/files/pkg-message.in
+++ b/www/typo3-8/files/pkg-message.in
diff --git a/www/typo3-8/pkg-descr b/www/typo3-8/pkg-descr
new file mode 100644
index 000000000000..9e1624974eb8
--- /dev/null
+++ b/www/typo3-8/pkg-descr
@@ -0,0 +1,9 @@
+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 current stable LTS release (for all new projects)
+The latest version with Long Term Support (LTS). It will have full support
+until October 2018 and security bugfixes until March 2020.
+
+WWW: http://typo3.org/
diff --git a/www/typo3/distinfo b/www/typo3/distinfo
deleted file mode 100644
index 6c5f1e82da41..000000000000
--- a/www/typo3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1488387996
-SHA256 (typo3_src-8.6.1.tar.gz) = 4edf44df3c1e7fc6d00c106843b522c3bd66c0a74edc7b9137e112b7898733fa
-SIZE (typo3_src-8.6.1.tar.gz) = 21924474
diff --git a/www/typo3/pkg-descr b/www/typo3/pkg-descr
deleted file mode 100644
index e7c1468d96db..000000000000
--- a/www/typo3/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-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, 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/