Move www/typo3-lts to www/typo3-7

- Update pkg-descr

PR:		218456
Submitted by:	Helmut Ritter <freebsd-ports@charlieroot.de> (maintainer)

5 files changed, 16 insertions, 11 deletions

diff --git a/MOVED b/MOVED
index 28660dd9e954..2cbe0c51e642 100644
--- a/MOVED
+++ b/MOVED
@@ -9208,3 +9208,4 @@ archivers/pecl-snappy|archivers/php-snappy|2017-04-04|Update PKGNAMEPREFIX: it b
 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
+www/typo3-lts|www/typo3-7|2017-04-08|Rename to coexist with TYPO3 8.x (was typo3) since both versions are LTS now
diff --git a/www/Makefile b/www/Makefile
index cc6bfea49f2d..9ab553bf1a41 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2308,8 +2308,8 @@
     SUBDIR += twiki-WysiwygPlugin
     SUBDIR += twill
     SUBDIR += twms
+    SUBDIR += typo3-7
     SUBDIR += typo3-8
-    SUBDIR += typo3-lts
     SUBDIR += uchiwa
     SUBDIR += udmsearch
     SUBDIR += ufdbguard
diff --git a/www/typo3-lts/Makefile b/www/typo3-7/Makefile
index 84a847181df8..d9086c7ece9b 100644
--- a/www/typo3-lts/Makefile
+++ b/www/typo3-7/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	typo3
-PORTVERSION=	7.6.16
+PORTVERSION=	${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
-PKGNAMESUFFIX=	-lts
+PKGNAMESUFFIX=	-${PORT_V_MAJOR}
 
 MAINTAINER=	freebsd-ports@charlieroot.de
 COMMENT=	Typo3 content management system
@@ -13,21 +13,25 @@ COMMENT=	Typo3 content management system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${TYPO3SRC}/LICENSE.txt
 
-PORTSCOUT=	limit:^7\.6\.
+PORTSCOUT=	limit:^${PORT_V_MAJOR}\.${PORT_V_MINOR}\.
 
 USES=		cpe shebangfix php:web
-SHEBANG_FILES=	vendor/doctrine/instantiator/.travis.install.sh \
-		typo3/sysext/core/Build/Scripts/cglFixMyCommit.sh \
+SHEBANG_FILES=	typo3/sysext/core/Build/Scripts/cglFixMyCommit.sh \
 		typo3/sysext/core/Build/Scripts/splitFunctionalTests.sh \
-		typo3/sysext/core/Build/Scripts/xlfcheck.sh
+		typo3/sysext/core/Build/Scripts/xlfcheck.sh \
+		vendor/doctrine/instantiator/.travis.install.sh
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_PHP=	ctype fileinfo filter hash json mysqli openssl pcre session simplexml soap xml zip
 WRKSRC=		${WRKDIR}/${TYPO3SRC}
 
+PORT_V_MAJOR=	7
+PORT_V_MINOR=	6
+PORT_V_PATCH=	16
+
 TYPO3WWW=	www
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
-TYPO3DIR=	${PORTNAME}-LTS
+TYPO3DIR=	${PORTNAME}-${PORT_V_MAJOR}
 
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
diff --git a/www/typo3-lts/distinfo b/www/typo3-7/distinfo
index 24c23a1d54cf..24c23a1d54cf 100644
--- a/www/typo3-lts/distinfo
+++ b/www/typo3-7/distinfo
diff --git a/www/typo3-lts/pkg-descr b/www/typo3-7/pkg-descr
index fb0c038afe92..1a4d5934cf6c 100644
--- a/www/typo3-lts/pkg-descr
+++ b/www/typo3-7/pkg-descr
@@ -2,8 +2,8 @@ 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
-April 2017 and security bugfixes until November 2018.
+The old stable LTS release (for existing projects)
+The old version with Long Term Support (LTS). It will have maintenance and
+security-related bugfixes until October 2018.
 
 WWW: http://typo3.org/