Update typo3 package to 4.2.2.

* News
	This release is a bugfix release.

Full ChangeLog is too large to write here please refer:

	http://wiki.typo3.org/index.php/TYPO3_4.2.2

3 files changed, 30 insertions, 11 deletions

diff --git a/www/typo3/Makefile b/www/typo3/Makefile
index 0233aeae6a1..699865cff8f 100644
--- a/www/typo3/Makefile
+++ b/www/typo3/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/09/28 02:24:27 taca Exp $
+# $NetBSD: Makefile,v 1.7 2008/10/12 06:41:39 taca Exp $
 #
 
 DISTNAME=	${TYPO3NAME}
 PKGNAME=	typo3-${VER}
-PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=typo3/}
 DISTFILES=	${TYPO3NAME}${EXTRACT_SUFX} ${SITESRC}${EXTRACT_SUFX}
@@ -17,7 +16,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib/
 
 PKG_DESTDIR_SUPPORT=	destdir
 
-VER=		4.2.1
+VER=		4.2.2
 NO_BUILD=	yes
 USE_TOOLS=	pax
 
@@ -65,6 +64,21 @@ SUBST_SED.conf+=        -e 's|@TYPO3DIR@|${TYPO3DIR:Q}|g'
 SUBST_SED.conf+=        -e 's|@SITEDIR@|${SITEDIR:Q}|g'
 SUBST_STAGE.conf=	post-configure
 
+PRINT_PLIST_AWK+=	/^${EGDIR:S|/|\\/|g}/ \
+			{ gsub(/${EGDIR:S|/|\\/|g}/, "$${EGDIR}") }
+PRINT_PLIST_AWK+=	/^(@dirrm )?${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/ \
+			{ gsub(/${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/, \
+				"$${TYPO3DIR}/$${TYPO3NAME}") }
+PRINT_PLIST_AWK+=	/^@dirrm ${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/ \
+			{ gsub(/${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/, \
+				"$${TYPO3DIR}/$${TYPO3NAME}") }
+PRINT_PLIST_AWK+=	/^(@dirrm )?${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/ \
+			{ gsub(/${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/, \
+				"$${TYPO3DIR}/$${SITEDIR}") }
+PRINT_PLIST_AWK+=	/^@dirrm ${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/ \
+			{ gsub(/${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/, \
+				"$${TYPO3DIR}/$${SITEDIR}") }
+
 .include "../../mk/bsd.prefs.mk"
 
 SITEDIR?=	www
@@ -80,6 +94,7 @@ do-install:
 	cd ${WRKSRC}; pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${TYPO3NAME}
 	cd ${WRKDIR}/${SITESRC}; \
 		pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}
+	${RM} -f ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}/typo3conf/localconf.php
 	${INSTALL_DATA} ${WRKDIR}/${SITESRC}/typo3conf/localconf.php \
 		${DESTDIR}${PREFIX}/${EGDIR}
 
diff --git a/www/typo3/PLIST b/www/typo3/PLIST
index 19b0cdcf9d9..3ede3159acd 100644
--- a/www/typo3/PLIST
+++ b/www/typo3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/09/25 02:22:12 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/10/12 06:41:39 taca Exp $
 ${EGDIR}/localconf.php
 ${TYPO3DIR}/${TYPO3NAME}/ChangeLog
 ${TYPO3DIR}/${TYPO3NAME}/GPL.txt
@@ -498,6 +498,7 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/gfx/i/_icon_ftp.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/gfx/i/_icon_ftp__h.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/gfx/i/_icon_ftp__x.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/gfx/i/_icon_ftp_group.gif
+${TYPO3DIR}/${TYPO3NAME}/typo3/gfx/i/_icon_ftp_readonly.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/gfx/i/_icon_ftp_user.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/gfx/i/_icon_webfolders.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/gfx/i/_icon_webfolders_ro.gif
@@ -2377,6 +2378,7 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/BlockStyle/locallan
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/CharacterMap/class.tx_rtehtmlarea_charactermap.php
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/CharacterMap/skin/htmlarea.css
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/CharacterMap/skin/images/insertCharacter.gif
+${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/ContextMenu/class.tx_rtehtmlarea_contextmenu.php
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/DefaultColor/class.tx_rtehtmlarea_defaultcolor.php
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/DefaultColor/locallang.xml
@@ -3002,6 +3004,7 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/t3skin/icons/gfx/history2.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/t3skin/icons/gfx/history_details.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/t3skin/icons/gfx/i/_icon_ftp.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/t3skin/icons/gfx/i/_icon_ftp_2.gif
+${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/t3skin/icons/gfx/i/_icon_ftp_readonly.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/t3skin/icons/gfx/i/_icon_webfolders.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/t3skin/icons/gfx/i/_icon_website.gif
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/t3skin/icons/gfx/i/be_admin.gif
@@ -4108,6 +4111,7 @@ ${TYPO3DIR}/${SITEDIR}/uploads/index.html
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/DefaultColor/skin
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/DefaultColor
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/DefaultClean
+@dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/ContextMenu
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/CharacterMap/skin/images
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/CharacterMap/skin
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/rtehtmlarea/extensions/CharacterMap
diff --git a/www/typo3/distinfo b/www/typo3/distinfo
index 7568557bc1a..ffb6ed8bb09 100644
--- a/www/typo3/distinfo
+++ b/www/typo3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2008/09/25 02:22:12 taca Exp $
+$NetBSD: distinfo,v 1.3 2008/10/12 06:41:39 taca Exp $
 
-SHA1 (dummy-4.2.1.tar.gz) = 5ab30a8b1c8ee514a52f6995ee33740550b94c5b
-RMD160 (dummy-4.2.1.tar.gz) = 6e1469dd5d10047f192c8b18a6c77ddf237a014c
-Size (dummy-4.2.1.tar.gz) = 9436 bytes
-SHA1 (typo3_src-4.2.1.tar.gz) = a8410f2a1f0495500caf4ac48b5778b5a7437d09
-RMD160 (typo3_src-4.2.1.tar.gz) = 43d827b2ee6b8015fbac77f44ac8afc1df79f0a2
-Size (typo3_src-4.2.1.tar.gz) = 8351003 bytes
+SHA1 (dummy-4.2.2.tar.gz) = 5b5eba8ccea5f8d651556c512bc9adc18d781627
+RMD160 (dummy-4.2.2.tar.gz) = 2d20379cddca2c3ebf64ebfa96984076940a9813
+Size (dummy-4.2.2.tar.gz) = 9441 bytes
+SHA1 (typo3_src-4.2.2.tar.gz) = 868cd1830a795fc4fd2546eec2e86b3133db5f8a
+RMD160 (typo3_src-4.2.2.tar.gz) = 600b5e462744b60d401f1064361e2fdce97e6dff
+Size (typo3_src-4.2.2.tar.gz) = 8362341 bytes
 SHA1 (patch-aa) = 12dc31e5d1b03f38c4957a08a5451da667d58214