Fix broken PLIST. Along with it, add a small patch to fix code editor problem.

Bump PKGREVISION.

4 files changed, 28 insertions, 4 deletions

diff --git a/www/contao29/Makefile b/www/contao29/Makefile
index 1ac9c7e8825..e0b55e9c145 100644
--- a/www/contao29/Makefile
+++ b/www/contao29/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2011/01/06 13:19:08 taca Exp $
+# $NetBSD: Makefile,v 1.11 2011/03/25 16:52:08 taca Exp $
 #
 
 DISTNAME=	contao-${CT_VERSION}
 PKGNAME=	contao${CT_VER}-${CT_PKGVER}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=typolight/}
 DIST_SUBDIR=	${PKGBASE}-20101203
diff --git a/www/contao29/PLIST b/www/contao29/PLIST
index 94eefb1e196..57ba3f494ff 100644
--- a/www/contao29/PLIST
+++ b/www/contao29/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/07/18 14:46:44 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/03/25 16:52:08 taca Exp $
 ${CT_WEBDIR}/CHANGELOG.txt
 ${CT_WEBDIR}/GPL.txt
 ${CT_WEBDIR}/INSTALL.txt
@@ -233,6 +233,7 @@ ${CT_WEBDIR}/plugins/mediabox/images/WhiteClose.gif
 ${CT_WEBDIR}/plugins/mediabox/images/WhiteLoading.gif
 ${CT_WEBDIR}/plugins/mediabox/images/WhiteNext.gif
 ${CT_WEBDIR}/plugins/mediabox/images/WhitePrevious.gif
+${CT_WEBDIR}/plugins/mediabox/js/Quickie.js
 ${CT_WEBDIR}/plugins/mediabox/js/mediabox.js
 ${CT_WEBDIR}/plugins/mediabox/js/mediabox.js.gz
 ${CT_WEBDIR}/plugins/mediabox/js/mediabox_src.js
@@ -896,6 +897,8 @@ ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/de.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/de_dlg.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/en.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/en_dlg.js
+${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/es.js
+${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/es_dlg.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/fr.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/fr_dlg.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/it.js
@@ -910,6 +913,8 @@ ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/pl.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/pl_dlg.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/ru.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/ru_dlg.js
+${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/sv.js
+${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/langs/sv_dlg.js
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/typobox.html
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/typoimages.php
 ${CT_WEBDIR}/plugins/tinyMCE/plugins/typolinks/typolib.php
@@ -1973,8 +1978,9 @@ ${CT_WEBDIR}/system/themes/default/src/popup.css
 ${CT_WEBDIR}/system/themes/default/src/switch.css
 ${CT_WEBDIR}/system/themes/default/switch.css
 ${CT_WEBDIR}/system/themes/tinymce.css
-${CT_WEBDIR}/system/utf8_lookup.php
 ${CT_WEBDIR}/system/tmp/.htaccess
+${CT_WEBDIR}/system/utf8_lookup.php
+${CT_WEBDIR}/templates/.htaccess
 ${CT_WEBDIR}/typolight/index.php
 ${CT_WEBDIR}/typolight/install.php
 ${CT_WEBDIR}/typolight/main.php
diff --git a/www/contao29/distinfo b/www/contao29/distinfo
index b77432f62a9..2016ed424c4 100644
--- a/www/contao29/distinfo
+++ b/www/contao29/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2011/03/08 14:11:56 taca Exp $
+$NetBSD: distinfo,v 1.8 2011/03/25 16:52:08 taca Exp $
 
 SHA1 (contao29-20101203/contao-2.9.4.tar.gz) = 42a75a20d2aef3f3f2ef9d8654cdf115c6540a32
 RMD160 (contao29-20101203/contao-2.9.4.tar.gz) = 8ce6527558121df1e3e457c372796789e3065827
 Size (contao29-20101203/contao-2.9.4.tar.gz) = 4404002 bytes
+SHA1 (patch-system_drivers_DC__Folder.php) = 7583ff06b074be4c1a2900b15ea2d263bb5d3eae
diff --git a/www/contao29/patches/patch-system_drivers_DC__Folder.php b/www/contao29/patches/patch-system_drivers_DC__Folder.php
new file mode 100644
index 00000000000..935e4056e99
--- /dev/null
+++ b/www/contao29/patches/patch-system_drivers_DC__Folder.php
@@ -0,0 +1,16 @@
+$NetBSD: patch-system_drivers_DC__Folder.php,v 1.1 2011/03/25 16:52:08 taca Exp $
+
+Fix code editor problem applying r630 from repository.
+
+--- system/drivers/DC_Folder.php.orig	2011-03-02 13:03:27.000000000 +0000
++++ system/drivers/DC_Folder.php
+@@ -1403,7 +1403,8 @@ window.addEvent(\'domready\', function()
+ 		// Prepare the code editor
+ 		if ($GLOBALS['TL_CONFIG']['useCE'])
+ 		{
+-			$this->ceField = 'ctrl_source';
++			$this->ceFields = array('ctrl_source');
++			$this->ceField = 'ctrl_source'; // Backwards compatibility
+ 			$this->language = $GLOBALS['TL_LANGUAGE'];
+ 			$this->extension = $objFile->extension;
+