3 files changed, 41 insertions, 38 deletions

diff --git a/www/typo346/Makefile b/www/typo346/Makefile
index 99768bf90fae..531ea204931f 100644
--- a/www/typo346/Makefile
+++ b/www/typo346/Makefile
@@ -15,14 +15,15 @@ COMMENT=	The typo3 content management system
 
 LICENSE=	GPLv2
 
+NO_LATEST_LINK=	yes
 NO_BUILD=	yes
 USE_PHP=	ctype filter json mysql pcre session xml
 WANT_PHP_WEB=	yes
 IGNORE_WITH_PHP=4
 
 TYPO3WWW=	www
-TYPO3RELEASE=
-TYPO3SITE=	${TYPO3WWW}/${PORTNAME}
+TYPO3RELEASE=	46
+TYPO3SITE=	${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}
 TYPO3PKG=	${PORTNAME}-${PORTVERSION}
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
 TYPO3DUMMY=	dummy-${PORTVERSION}
diff --git a/www/typo346/pkg-descr b/www/typo346/pkg-descr
index 38a9b600d305..091d460a03d0 100644
--- a/www/typo346/pkg-descr
+++ b/www/typo346/pkg-descr
@@ -2,7 +2,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.
 
-This version is the current stable release. It is recommended for existing
-projects and will get full support until April 2013.
+Old stable release
+Support for this version will be dropped entirely when TYPO3 6.0 is released.
+Updating to TYPO3 4.5 LTS or TYPO3 4.7 is seriously recommended, depending on
+how long you wish to be supported.
 
 WWW:	http://typo3.org/
diff --git a/www/typo346/pkg-plist b/www/typo346/pkg-plist
index d30578d51116..fb8ca2840e3e 100644
--- a/www/typo346/pkg-plist
+++ b/www/typo346/pkg-plist
@@ -1,25 +1,25 @@
-%%WWWDIR%%/INSTALL.txt
-%%WWWDIR%%/README.txt
-%%WWWDIR%%/RELEASE_NOTES.txt
-%%WWWDIR%%/_.htaccess
-%%WWWDIR%%/clear.gif
-%%WWWDIR%%/fileadmin/_temp_/.htaccess
-%%WWWDIR%%/fileadmin/_temp_/index.html
-%%WWWDIR%%/fileadmin/user_upload/index.html
-%%WWWDIR%%/index.php
-%%WWWDIR%%/t3lib
-%%WWWDIR%%/typo3
-%%WWWDIR%%/typo3_src
-%%WWWDIR%%/typo3conf/ext/index.html
-%%WWWDIR%%/typo3conf/extTables.php
-%%WWWDIR%%/typo3conf/index.html
-%%WWWDIR%%/typo3conf/l10n/index.html
-%%WWWDIR%%/typo3conf/localconf.php.dist
-%%WWWDIR%%/typo3temp/index.html
-%%WWWDIR%%/uploads/index.html
-%%WWWDIR%%/uploads/media/index.html
-%%WWWDIR%%/uploads/pics/index.html
-%%WWWDIR%%/uploads/tf/index.html
+%%WWWDIR%%-46/INSTALL.txt
+%%WWWDIR%%-46/README.txt
+%%WWWDIR%%-46/RELEASE_NOTES.txt
+%%WWWDIR%%-46/_.htaccess
+%%WWWDIR%%-46/clear.gif
+%%WWWDIR%%-46/fileadmin/_temp_/.htaccess
+%%WWWDIR%%-46/fileadmin/_temp_/index.html
+%%WWWDIR%%-46/fileadmin/user_upload/index.html
+%%WWWDIR%%-46/index.php
+%%WWWDIR%%-46/t3lib
+%%WWWDIR%%-46/typo3
+%%WWWDIR%%-46/typo3_src
+%%WWWDIR%%-46/typo3conf/ext/index.html
+%%WWWDIR%%-46/typo3conf/extTables.php
+%%WWWDIR%%-46/typo3conf/index.html
+%%WWWDIR%%-46/typo3conf/l10n/index.html
+%%WWWDIR%%-46/typo3conf/localconf.php.dist
+%%WWWDIR%%-46/typo3temp/index.html
+%%WWWDIR%%-46/uploads/index.html
+%%WWWDIR%%-46/uploads/media/index.html
+%%WWWDIR%%-46/uploads/pics/index.html
+%%WWWDIR%%-46/uploads/tf/index.html
 %%WWWDIR%%_src-%%PORTVERSION%%/ChangeLog
 %%WWWDIR%%_src-%%PORTVERSION%%/GPL.txt
 %%WWWDIR%%_src-%%PORTVERSION%%/INSTALL.txt
@@ -9003,15 +9003,15 @@
 @dirrm %%WWWDIR%%_src-%%PORTVERSION%%/t3lib/cache
 @dirrm %%WWWDIR%%_src-%%PORTVERSION%%/t3lib
 @dirrm %%WWWDIR%%_src-%%PORTVERSION%%
-@dirrm %%WWWDIR%%/uploads/tf
-@dirrm %%WWWDIR%%/uploads/pics
-@dirrm %%WWWDIR%%/uploads/media
-@dirrm %%WWWDIR%%/uploads
-@dirrm %%WWWDIR%%/typo3temp
-@dirrm %%WWWDIR%%/typo3conf/l10n
-@dirrm %%WWWDIR%%/typo3conf/ext
-@dirrm %%WWWDIR%%/typo3conf
-@dirrm %%WWWDIR%%/fileadmin/user_upload
-@dirrm %%WWWDIR%%/fileadmin/_temp_
-@dirrm %%WWWDIR%%/fileadmin
-@dirrm %%WWWDIR%%
+@dirrm %%WWWDIR%%-46/uploads/tf
+@dirrm %%WWWDIR%%-46/uploads/pics
+@dirrm %%WWWDIR%%-46/uploads/media
+@dirrm %%WWWDIR%%-46/uploads
+@dirrm %%WWWDIR%%-46/typo3temp
+@dirrm %%WWWDIR%%-46/typo3conf/l10n
+@dirrm %%WWWDIR%%-46/typo3conf/ext
+@dirrm %%WWWDIR%%-46/typo3conf
+@dirrm %%WWWDIR%%-46/fileadmin/user_upload
+@dirrm %%WWWDIR%%-46/fileadmin/_temp_
+@dirrm %%WWWDIR%%-46/fileadmin
+@dirrm %%WWWDIR%%-46