Update fengoffice to 1.7.3.1.

Changelog
=========

Since 1.7.3
------------
bugfix: Email address autocomplete click fix.
bugfix: Fixed calendar when rendering some evnets (week & day views).
bugfix: Error when sending notifications through cron.
bugfix: Improved email parsing for some email encodings.
bugfix: Improved email list refresh after taking some actions.
bugfix: Overview - view as list does not order emails properly.
bugfix: Emails are not ordered properly by 'to' field.
bugfix: Email permissions when sending.
bugfix: Email background sending process improved.

4 files changed, 43 insertions, 81 deletions

diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile
index 7c5116aac3b..e04b2b66846 100644
--- a/www/fengoffice/Makefile
+++ b/www/fengoffice/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2010/12/01 15:55:27 taca Exp $
+# $NetBSD: Makefile,v 1.9 2010/12/02 13:35:23 taca Exp $
 #
 
-DISTNAME=	fengoffice_1.7.2
+DISTNAME=	fengoffice_1.7.3.1
 PKGNAME=	${DISTNAME:S/_/-/:C/.rc$/rc1/}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opengoo/}
 EXTRACT_SUFX=	.zip
-DIST_SUBDIR=	${PKGBASE}-20100126
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://fengoffice.com/web/community/community_index.php
@@ -25,7 +23,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-imap>=5.1.0:../../mail/php-imap
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/${PKGBASE}
+WRKSRC=		${WRKDIR}/feng_community
 USE_TOOLS=	pax
 NO_BUILD=	yes
 
diff --git a/www/fengoffice/PLIST b/www/fengoffice/PLIST
index 57f7937d578..4cf957456c0 100644
--- a/www/fengoffice/PLIST
+++ b/www/fengoffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/09/14 00:57:11 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/12/02 13:35:23 taca Exp $
 ${FO_DIR}/.htaccess
 ${FO_DIR}/application/application.php
 ${FO_DIR}/application/controllers/AccessController.class.php
@@ -668,6 +668,7 @@ ${FO_DIR}/environment/classes/logger/backend/Logger_Backend_File.class.php
 ${FO_DIR}/environment/classes/logger/backend/Logger_Backend_Null.class.php
 ${FO_DIR}/environment/classes/mail/MailUtilities.class.php
 ${FO_DIR}/environment/classes/mail/Mime_Types.class.php
+${FO_DIR}/environment/classes/mail/SwiftHeaderValidator.class.php
 ${FO_DIR}/environment/classes/mail/mime_parser.class.php
 ${FO_DIR}/environment/classes/mail/mimetypes.txt
 ${FO_DIR}/environment/classes/mail/rfc822_addresses.class.php
@@ -1793,9 +1794,15 @@ ${FO_DIR}/public/assets/javascript/ckeditor/CHANGES.html
 ${FO_DIR}/public/assets/javascript/ckeditor/INSTALL.html
 ${FO_DIR}/public/assets/javascript/ckeditor/LICENSE.html
 ${FO_DIR}/public/assets/javascript/ckeditor/ck_upload_handler.php
+${FO_DIR}/public/assets/javascript/ckeditor/ckeditor.asp
 ${FO_DIR}/public/assets/javascript/ckeditor/ckeditor.js
 ${FO_DIR}/public/assets/javascript/ckeditor/ckeditor.pack
+${FO_DIR}/public/assets/javascript/ckeditor/ckeditor.php
 ${FO_DIR}/public/assets/javascript/ckeditor/ckeditor_basic.js
+${FO_DIR}/public/assets/javascript/ckeditor/ckeditor_basic_source.js
+${FO_DIR}/public/assets/javascript/ckeditor/ckeditor_php4.php
+${FO_DIR}/public/assets/javascript/ckeditor/ckeditor_php5.php
+${FO_DIR}/public/assets/javascript/ckeditor/ckeditor_source.js
 ${FO_DIR}/public/assets/javascript/ckeditor/config.js
 ${FO_DIR}/public/assets/javascript/ckeditor/contents.css
 ${FO_DIR}/public/assets/javascript/ckeditor/images/spacer.gif
@@ -1808,12 +1815,13 @@ ${FO_DIR}/public/assets/javascript/ckeditor/lang/bn.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/bs.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/ca.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/cs.js
+${FO_DIR}/public/assets/javascript/ckeditor/lang/cy.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/da.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/de.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/el.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/en-au.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/en-ca.js
-${FO_DIR}/public/assets/javascript/ckeditor/lang/en-uk.js
+${FO_DIR}/public/assets/javascript/ckeditor/lang/en-gb.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/en.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/eo.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/es.js
@@ -1858,33 +1866,19 @@ ${FO_DIR}/public/assets/javascript/ckeditor/lang/uk.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/vi.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/zh-cn.js
 ${FO_DIR}/public/assets/javascript/ckeditor/lang/zh.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/a11yhelp/lang/en.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/a11yhelp/lang/he.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/about/dialogs/about.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/about/dialogs/logo_ckeditor.png
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/about/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/basicstyles/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/blockquote/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/button/plugin.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/autogrow/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/clipboard/dialogs/paste.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/clipboard/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/colorbutton/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/contextmenu/plugin.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/colordialog/dialogs/colordialog.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/dialog/dialogDefinition.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/dialog/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/dialogui/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/domiterator/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/editingblock/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/elementspath/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/enterkey/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/entities/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/fakeobjects/plugin.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/div/dialogs/div.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/find/dialogs/find.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/find/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/flash/dialogs/flash.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/flash/images/placeholder.png
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/flash/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/floatpanel/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/font/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/format/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/forms/dialogs/button.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/forms/dialogs/checkbox.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/forms/dialogs/form.js
@@ -1893,45 +1887,18 @@ ${FO_DIR}/public/assets/javascript/ckeditor/plugins/forms/dialogs/radio.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/forms/dialogs/select.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/forms/dialogs/textarea.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/forms/dialogs/textfield.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/forms/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/horizontalrule/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/htmldataprocessor/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/htmlwriter/plugin.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/forms/images/hiddenfield.gif
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/iframedialog/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/image/dialogs/image.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/image/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/indent/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/justify/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/keystrokes/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/link/dialogs/anchor.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/link/dialogs/link.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/link/images/anchor.gif
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/link/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/list/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/listblock/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/maximize/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/menu/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/menubutton/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/newpage/plugin.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/liststyle/dialogs/liststyle.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/pagebreak/images/pagebreak.gif
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/pagebreak/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/panel/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/panelbutton/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/pastefromword/dialogs/pastefromword.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/pastefromword/plugin.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/pastefromword/filter/default.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/pastetext/dialogs/pastetext.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/pastetext/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/popup/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/preview/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/print/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/removeformat/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/resize/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/richcombo/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/save/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/scayt/dialogs/options.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/scayt/dialogs/toolbar.css
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/scayt/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/selection/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/showblocks/images/block_address.png
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/showblocks/images/block_blockquote.png
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/showblocks/images/block_div.png
@@ -1943,7 +1910,6 @@ ${FO_DIR}/public/assets/javascript/ckeditor/plugins/showblocks/images/block_h5.p
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/showblocks/images/block_h6.png
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/showblocks/images/block_p.png
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/showblocks/images/block_pre.png
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/showblocks/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/smiley/dialogs/smiley.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/smiley/images/angel_smile.gif
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/smiley/images/angry_smile.gif
@@ -1966,25 +1932,16 @@ ${FO_DIR}/public/assets/javascript/ckeditor/plugins/smiley/images/thumbs_up.gif
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/smiley/images/tounge_smile.gif
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/smiley/images/wink_smile.gif
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/smiley/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/sourcearea/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/specialchar/dialogs/specialchar.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/specialchar/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/styles/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/stylescombo/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/stylescombo/styles/default.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/tab/plugin.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/styles/styles/default.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/table/dialogs/table.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/table/plugin.js
+${FO_DIR}/public/assets/javascript/ckeditor/plugins/tableresize/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/tabletools/dialogs/tableCell.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/tabletools/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/templates/dialogs/templates.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/templates/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/templates/templates/default.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/templates/templates/images/template1.gif
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/templates/templates/images/template2.gif
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/templates/templates/images/template3.gif
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/toolbar/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/uicolor/dialogs/uicolor.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/uicolor/lang/en.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/uicolor/plugin.js
@@ -1995,13 +1952,10 @@ ${FO_DIR}/public/assets/javascript/ckeditor/plugins/uicolor/yui/assets/picker_ma
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/uicolor/yui/assets/yui.css
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/uicolor/yui/yui.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/undo/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/wsc/dialogs/ciframe.html
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/wsc/dialogs/wsc.css
 ${FO_DIR}/public/assets/javascript/ckeditor/plugins/wsc/dialogs/wsc.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/wsc/plugin.js
-${FO_DIR}/public/assets/javascript/ckeditor/plugins/wysiwygarea/plugin.js
 ${FO_DIR}/public/assets/javascript/ckeditor/skins/kama/dialog.css
 ${FO_DIR}/public/assets/javascript/ckeditor/skins/kama/editor.css
 ${FO_DIR}/public/assets/javascript/ckeditor/skins/kama/icons.png
@@ -2446,6 +2400,7 @@ ${FO_DIR}/public/assets/javascript/og/modules/massmailerForm.js
 ${FO_DIR}/public/assets/javascript/og/modules/updatePermissionsForm.js
 ${FO_DIR}/public/assets/javascript/og/og.js
 ${FO_DIR}/public/assets/javascript/og/plugin/dummy.php
+${FO_DIR}/public/assets/javascript/og/plugin/task_dependencies.js
 ${FO_DIR}/public/assets/javascript/og/swfobject.js
 ${FO_DIR}/public/assets/javascript/og/tasks/TasksBottomToolbar.js
 ${FO_DIR}/public/assets/javascript/og/tasks/TasksTopToolbar.js
@@ -2453,6 +2408,12 @@ ${FO_DIR}/public/assets/javascript/og/tasks/addTask.js
 ${FO_DIR}/public/assets/javascript/og/tasks/drawing.js
 ${FO_DIR}/public/assets/javascript/og/tasks/main.js
 ${FO_DIR}/public/assets/javascript/og/tasks/print.js
+${FO_DIR}/public/assets/javascript/og/tasks_bck/TasksBottomToolbar.js
+${FO_DIR}/public/assets/javascript/og/tasks_bck/TasksTopToolbar.js
+${FO_DIR}/public/assets/javascript/og/tasks_bck/addTask.js
+${FO_DIR}/public/assets/javascript/og/tasks_bck/drawing.js
+${FO_DIR}/public/assets/javascript/og/tasks_bck/main.js
+${FO_DIR}/public/assets/javascript/og/tasks_bck/print.js
 ${FO_DIR}/public/assets/javascript/og/time/drawing.js
 ${FO_DIR}/public/assets/javascript/og/time/main.js
 ${FO_DIR}/public/assets/javascript/ogmin.js
@@ -2829,6 +2790,7 @@ ${FO_DIR}/public/assets/themes/default/images/16x16/exclamation.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/expand.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/fax.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/folder.png
+${FO_DIR}/public/assets/themes/default/images/16x16/gantt.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/gooplayer.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/help.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/hide_messages.png
@@ -3330,6 +3292,8 @@ ${FO_DIR}/public/assets/themes/default/stylesheets/og/workspace_panel.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/ogmin.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/ogmin1.5-beta.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/plugin/dummy.css
+${FO_DIR}/public/assets/themes/default/stylesheets/plugin/task_dependencies.css
+${FO_DIR}/public/assets/themes/default/stylesheets/plugin/webpage_post_fields.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/project/project.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/website.css
 ${FO_DIR}/public/files/dummy.txt
diff --git a/www/fengoffice/distinfo b/www/fengoffice/distinfo
index 45121b50b29..40d753d9ae1 100644
--- a/www/fengoffice/distinfo
+++ b/www/fengoffice/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/12/01 15:55:27 taca Exp $
+$NetBSD: distinfo,v 1.7 2010/12/02 13:35:23 taca Exp $
 
-SHA1 (fengoffice-20100126/fengoffice_1.7.2.zip) = c7c073873cbdc75457cfd7954ac0f234623d9894
-RMD160 (fengoffice-20100126/fengoffice_1.7.2.zip) = 398de30aa621acfd83c705a4249dded44e0113a7
-Size (fengoffice-20100126/fengoffice_1.7.2.zip) = 7840400 bytes
-SHA1 (patch-aa) = 2a1aad7b4de85ea69a00921f54ddae2b4ebd3060
+SHA1 (fengoffice_1.7.3.1.zip) = b34ebeb89f318bf9815b425da31017684497afdb
+RMD160 (fengoffice_1.7.3.1.zip) = 2e0425b59c39cf29fab5ea2880ea462cc7f50ac5
+Size (fengoffice_1.7.3.1.zip) = 7959379 bytes
+SHA1 (patch-aa) = 9f135a98241ace92ed66babd4042efe9dec0304e
 SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5
diff --git a/www/fengoffice/patches/patch-aa b/www/fengoffice/patches/patch-aa
index 3a9a5dfe903..a69f68f5ce6 100644
--- a/www/fengoffice/patches/patch-aa
+++ b/www/fengoffice/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2010/12/01 15:55:27 taca Exp $
+$NetBSD: patch-aa,v 1.3 2010/12/02 13:35:24 taca Exp $
 
 Unofficial patch to avoid iconv(GNU or gnu libc) portability problem.
 (mb-iconv.patch from http://www.fengoffice.com/web/bugs/view.php?id=6)
 
---- environment/classes/encoding/EncodingConverter.class.php.orig	2010-09-13 20:30:20.000000000 +0000
+--- environment/classes/encoding/EncodingConverter.class.php.orig	2010-12-01 12:33:32.000000000 +0000
 +++ environment/classes/encoding/EncodingConverter.class.php
 @@ -6,6 +6,16 @@ class EncodingConverter
  	var $_last_err_filename;
@@ -42,13 +42,13 @@ Unofficial patch to avoid iconv(GNU or gnu libc) portability problem.
  		$this->_last_err = null;
  		set_error_handler(array(&$this, '_handleError'));
 -		
--		if ($ignore_non_compatible) $out_enc .= "//IGNORE";
+-		if ($ignore_non_compatible) $out_enc .= "//IGNORE//TRANSLIT";
 -		
 -		$retval = iconv($in_enc, $out_enc, $str);
 +
 +		if(!$mbflag) {
 +			if (self::$gnu_iconv)
-+				if ($ignore_non_compatible) $out_enc .= "//IGNORE";
++				if ($ignore_non_compatible) $out_enc .= "//IGNORE//TRANSLIT";
 +			$retval = iconv($in_enc, $out_enc, $str);
 +		} else { 
 +			$retval = mb_convert_encoding($str, $out_enc, $in_enc);