3 files changed, 169 insertions, 10 deletions

diff --git a/mail/nocc/Makefile b/mail/nocc/Makefile
index 3cbc24e31d35..654288df44cb 100644
--- a/mail/nocc/Makefile
+++ b/mail/nocc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nocc
-DISTVERSION=	1.2
+DISTVERSION=	1.3
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +25,7 @@ PORTDOCS=	*
 
 do-install:
 	${MKDIR} ${PREFIX}/www/nocc
-	${CP} -Rp ${WRKSRC}/html ${WRKSRC}/lang ${WRKSRC}/themes \
+	${CP} -Rp ${WRKSRC}/fckeditor ${WRKSRC}/html ${WRKSRC}/lang ${WRKSRC}/themes \
 	          ${PREFIX}/www/nocc
 	${CP} -p ${WRKSRC}/*.php ${PREFIX}/www/nocc
 	${CP} -p ${WRKSRC}/conf.php.dist ${PREFIX}/www/nocc
diff --git a/mail/nocc/distinfo b/mail/nocc/distinfo
index 44b5a785c73e..80cfee24457a 100644
--- a/mail/nocc/distinfo
+++ b/mail/nocc/distinfo
@@ -1,3 +1,3 @@
-MD5 (nocc-1.2.tar.gz) = 5e0a790bdd5ac815cdc39e11f3cf616c
-SHA256 (nocc-1.2.tar.gz) = 4c7eb126432251a4b2d280c288f95e434f1c6475e5bf3fcdfbdab9549bffb9a3
-SIZE (nocc-1.2.tar.gz) = 190483
+MD5 (nocc-1.3.tar.gz) = bb7c9103831ce35d1769c3ed7d797021
+SHA256 (nocc-1.3.tar.gz) = 1d4459c889a2a9b5f8f95a95e9b275f987ceeaa0ae70894be22b89c685e38a44
+SIZE (nocc-1.3.tar.gz) = 580157
diff --git a/mail/nocc/pkg-plist b/mail/nocc/pkg-plist
index ccfbe87328da..17f2c382904a 100644
--- a/mail/nocc/pkg-plist
+++ b/mail/nocc/pkg-plist
@@ -29,6 +29,144 @@ www/nocc/proxy.php
 www/nocc/send.php
 www/nocc/user_filters.php
 www/nocc/user_prefs.php
+www/nocc/fckeditor/editor/css/behaviors/disablehandles.htc
+www/nocc/fckeditor/editor/css/behaviors/hiddenfield.gif
+www/nocc/fckeditor/editor/css/behaviors/hiddenfield.htc
+www/nocc/fckeditor/editor/css/behaviors/showtableborders.htc
+www/nocc/fckeditor/editor/css/fck_editorarea.css
+www/nocc/fckeditor/editor/css/fck_internal.css
+www/nocc/fckeditor/editor/css/fck_showtableborders_gecko.css
+www/nocc/fckeditor/editor/css/images/fck_anchor.gif
+www/nocc/fckeditor/editor/css/images/fck_flashlogo.gif
+www/nocc/fckeditor/editor/css/images/fck_pagebreak.gif
+www/nocc/fckeditor/editor/dialog/common/fck_dialog_common.css
+www/nocc/fckeditor/editor/dialog/common/fck_dialog_common.js
+www/nocc/fckeditor/editor/dialog/common/fcknumericfield.htc
+www/nocc/fckeditor/editor/dialog/common/images/locked.gif
+www/nocc/fckeditor/editor/dialog/common/images/reset.gif
+www/nocc/fckeditor/editor/dialog/common/images/unlocked.gif
+www/nocc/fckeditor/editor/dialog/common/moz-bindings.xml
+www/nocc/fckeditor/editor/dialog/fck_about/lgpl.html
+www/nocc/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif
+www/nocc/fckeditor/editor/dialog/fck_about/logo_fredck.gif
+www/nocc/fckeditor/editor/dialog/fck_about.html
+www/nocc/fckeditor/editor/dialog/fck_anchor.html
+www/nocc/fckeditor/editor/dialog/fck_button.html
+www/nocc/fckeditor/editor/dialog/fck_checkbox.html
+www/nocc/fckeditor/editor/dialog/fck_colorselector.html
+www/nocc/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
+www/nocc/fckeditor/editor/dialog/fck_docprops.html
+www/nocc/fckeditor/editor/dialog/fck_find.html
+www/nocc/fckeditor/editor/dialog/fck_flash.html
+www/nocc/fckeditor/editor/dialog/fck_form.html
+www/nocc/fckeditor/editor/dialog/fck_hiddenfield.html
+www/nocc/fckeditor/editor/dialog/fck_image.html
+www/nocc/fckeditor/editor/dialog/fck_link/fck_link.js
+www/nocc/fckeditor/editor/dialog/fck_link.html
+www/nocc/fckeditor/editor/dialog/fck_listprop.html
+www/nocc/fckeditor/editor/dialog/fck_paste.html
+www/nocc/fckeditor/editor/dialog/fck_radiobutton.html
+www/nocc/fckeditor/editor/dialog/fck_replace.html
+www/nocc/fckeditor/editor/dialog/fck_select/fck_select.js
+www/nocc/fckeditor/editor/dialog/fck_select.html
+www/nocc/fckeditor/editor/dialog/fck_smiley.html
+www/nocc/fckeditor/editor/dialog/fck_source.html
+www/nocc/fckeditor/editor/dialog/fck_specialchar.html
+www/nocc/fckeditor/editor/dialog/fck_spellerpages.html
+www/nocc/fckeditor/editor/dialog/fck_table.html
+www/nocc/fckeditor/editor/dialog/fck_tablecell.html
+www/nocc/fckeditor/editor/dialog/fck_template/images/template1.gif
+www/nocc/fckeditor/editor/dialog/fck_template/images/template2.gif
+www/nocc/fckeditor/editor/dialog/fck_template/images/template3.gif
+www/nocc/fckeditor/editor/dialog/fck_template.html
+www/nocc/fckeditor/editor/dialog/fck_textarea.html
+www/nocc/fckeditor/editor/dialog/fck_textfield.html
+www/nocc/fckeditor/editor/dialog/fck_universalkey/00.gif
+www/nocc/fckeditor/editor/dialog/fck_universalkey/data.js
+www/nocc/fckeditor/editor/dialog/fck_universalkey/diacritic.js
+www/nocc/fckeditor/editor/dialog/fck_universalkey/dialogue.js
+www/nocc/fckeditor/editor/dialog/fck_universalkey/fck_universalkey.css
+www/nocc/fckeditor/editor/dialog/fck_universalkey/keyboard_layout.gif
+www/nocc/fckeditor/editor/dialog/fck_universalkey/multihexa.js
+www/nocc/fckeditor/editor/dialog/fck_universalkey.html
+www/nocc/fckeditor/editor/fckblank.html
+www/nocc/fckeditor/editor/fckdebug.html
+www/nocc/fckeditor/editor/fckdialog.html
+www/nocc/fckeditor/editor/fckeditor.html
+www/nocc/fckeditor/editor/fckeditor.original.html
+www/nocc/fckeditor/editor/images/anchor.gif
+www/nocc/fckeditor/editor/images/arrow_ltr.gif
+www/nocc/fckeditor/editor/images/arrow_rtl.gif
+www/nocc/fckeditor/editor/images/spacer.gif
+www/nocc/fckeditor/editor/js/fckeditorcode_gecko.js
+www/nocc/fckeditor/editor/js/fckeditorcode_ie.js
+www/nocc/fckeditor/editor/lang/ar.js
+www/nocc/fckeditor/editor/lang/bg.js
+www/nocc/fckeditor/editor/lang/bn.js
+www/nocc/fckeditor/editor/lang/bs.js
+www/nocc/fckeditor/editor/lang/ca.js
+www/nocc/fckeditor/editor/lang/cs.js
+www/nocc/fckeditor/editor/lang/da.js
+www/nocc/fckeditor/editor/lang/de.js
+www/nocc/fckeditor/editor/lang/el.js
+www/nocc/fckeditor/editor/lang/en-au.js
+www/nocc/fckeditor/editor/lang/en-ca.js
+www/nocc/fckeditor/editor/lang/en-uk.js
+www/nocc/fckeditor/editor/lang/en.js
+www/nocc/fckeditor/editor/lang/eo.js
+www/nocc/fckeditor/editor/lang/es.js
+www/nocc/fckeditor/editor/lang/et.js
+www/nocc/fckeditor/editor/lang/eu.js
+www/nocc/fckeditor/editor/lang/fa.js
+www/nocc/fckeditor/editor/lang/fi.js
+www/nocc/fckeditor/editor/lang/fo.js
+www/nocc/fckeditor/editor/lang/fr.js
+www/nocc/fckeditor/editor/lang/gl.js
+www/nocc/fckeditor/editor/lang/he.js
+www/nocc/fckeditor/editor/lang/hi.js
+www/nocc/fckeditor/editor/lang/hr.js
+www/nocc/fckeditor/editor/lang/hu.js
+www/nocc/fckeditor/editor/lang/it.js
+www/nocc/fckeditor/editor/lang/ja.js
+www/nocc/fckeditor/editor/lang/km.js
+www/nocc/fckeditor/editor/lang/ko.js
+www/nocc/fckeditor/editor/lang/lt.js
+www/nocc/fckeditor/editor/lang/lv.js
+www/nocc/fckeditor/editor/lang/mn.js
+www/nocc/fckeditor/editor/lang/ms.js
+www/nocc/fckeditor/editor/lang/nb.js
+www/nocc/fckeditor/editor/lang/nl.js
+www/nocc/fckeditor/editor/lang/no.js
+www/nocc/fckeditor/editor/lang/pl.js
+www/nocc/fckeditor/editor/lang/pt-br.js
+www/nocc/fckeditor/editor/lang/pt.js
+www/nocc/fckeditor/editor/lang/ro.js
+www/nocc/fckeditor/editor/lang/ru.js
+www/nocc/fckeditor/editor/lang/sk.js
+www/nocc/fckeditor/editor/lang/sl.js
+www/nocc/fckeditor/editor/lang/sr-latn.js
+www/nocc/fckeditor/editor/lang/sr.js
+www/nocc/fckeditor/editor/lang/sv.js
+www/nocc/fckeditor/editor/lang/th.js
+www/nocc/fckeditor/editor/lang/tr.js
+www/nocc/fckeditor/editor/lang/uk.js
+www/nocc/fckeditor/editor/lang/vi.js
+www/nocc/fckeditor/editor/lang/zh-cn.js
+www/nocc/fckeditor/editor/lang/zh.js
+www/nocc/fckeditor/editor/skins/default/fck_dialog.css
+www/nocc/fckeditor/editor/skins/default/fck_editor.css
+www/nocc/fckeditor/editor/skins/default/fck_strip.gif
+www/nocc/fckeditor/editor/skins/default/images/toolbar.arrowright.gif
+www/nocc/fckeditor/editor/skins/default/images/toolbar.buttonarrow.gif
+www/nocc/fckeditor/editor/skins/default/images/toolbar.collapse.gif
+www/nocc/fckeditor/editor/skins/default/images/toolbar.end.gif
+www/nocc/fckeditor/editor/skins/default/images/toolbar.expand.gif
+www/nocc/fckeditor/editor/skins/default/images/toolbar.separator.gif
+www/nocc/fckeditor/editor/skins/default/images/toolbar.start.gif
+www/nocc/fckeditor/fckconfig.js
+www/nocc/fckeditor/fckeditor.php
+www/nocc/fckeditor/fckstyles.xml
+www/nocc/fckeditor/fcktemplates.xml
 www/nocc/html/error.php
 www/nocc/html/filter_prefs.php
 www/nocc/html/folders.php
@@ -36,20 +174,17 @@ www/nocc/html/footer.php
 www/nocc/html/header.php
 www/nocc/html/html_bottom_table.php
 www/nocc/html/html_inbox.php
-www/nocc/html/html_mail_bottom.php
-www/nocc/html/html_mail_header.php
-www/nocc/html/html_mail_top.php
+www/nocc/html/html_mail.php
 www/nocc/html/html_top_table.php
 www/nocc/html/menu_inbox.php
+www/nocc/html/menu_inbox_bottom_opts.php
 www/nocc/html/menu_inbox_opts.php
 www/nocc/html/menu_inbox_status.php
 www/nocc/html/menu_mail.php
 www/nocc/html/menu_prefs.php
 www/nocc/html/no_mail.php
 www/nocc/html/prefs.php
-www/nocc/html/prefs_error.php
 www/nocc/html/send.php
-www/nocc/html/send_confirmed.php
 www/nocc/html/send_error.php
 www/nocc/lang/add_message.sh
 www/nocc/lang/ar.php
@@ -113,6 +248,7 @@ www/nocc/themes/blue/img/smilies/tongue.png
 www/nocc/themes/blue/img/smilies/unhappy.png
 www/nocc/themes/blue/img/smilies/wink.png
 www/nocc/themes/blue/img/up.png
+www/nocc/themes/blue/print.css
 www/nocc/themes/blue/style.css
 www/nocc/themes/newlook/img/attach.png
 www/nocc/themes/newlook/img/button.png
@@ -137,6 +273,7 @@ www/nocc/themes/newlook/img/smilies/tongue.png
 www/nocc/themes/newlook/img/smilies/unhappy.png
 www/nocc/themes/newlook/img/smilies/wink.png
 www/nocc/themes/newlook/img/up.png
+www/nocc/themes/newlook/print.css
 www/nocc/themes/newlook/style.css
 www/nocc/themes/standard/img/attach.png
 www/nocc/themes/standard/img/button.png
@@ -160,6 +297,7 @@ www/nocc/themes/standard/img/smilies/tongue.png
 www/nocc/themes/standard/img/smilies/unhappy.png
 www/nocc/themes/standard/img/smilies/wink.png
 www/nocc/themes/standard/img/up.png
+www/nocc/themes/standard/print.css
 www/nocc/themes/standard/style.css
 @dirrm www/nocc/themes/standard/img/smilies
 @dirrm www/nocc/themes/standard/img
@@ -173,4 +311,25 @@ www/nocc/themes/standard/style.css
 @dirrm www/nocc/themes
 @dirrm www/nocc/lang
 @dirrm www/nocc/html
+@dirrm www/nocc/fckeditor/editor/skins/default/images
+@dirrm www/nocc/fckeditor/editor/skins/default
+@dirrm www/nocc/fckeditor/editor/skins
+@dirrm www/nocc/fckeditor/editor/lang
+@dirrm www/nocc/fckeditor/editor/js
+@dirrm www/nocc/fckeditor/editor/images
+@dirrm www/nocc/fckeditor/editor/dialog/fck_universalkey
+@dirrm www/nocc/fckeditor/editor/dialog/fck_template/images
+@dirrm www/nocc/fckeditor/editor/dialog/fck_template
+@dirrm www/nocc/fckeditor/editor/dialog/fck_select
+@dirrm www/nocc/fckeditor/editor/dialog/fck_docprops
+@dirrm www/nocc/fckeditor/editor/dialog/fck_link
+@dirrm www/nocc/fckeditor/editor/dialog/fck_about
+@dirrm www/nocc/fckeditor/editor/dialog/common/images
+@dirrm www/nocc/fckeditor/editor/dialog/common
+@dirrm www/nocc/fckeditor/editor/dialog
+@dirrm www/nocc/fckeditor/editor/css/images
+@dirrm www/nocc/fckeditor/editor/css/behaviors
+@dirrm www/nocc/fckeditor/editor/css
+@dirrm www/nocc/fckeditor/editor
+@dirrm www/nocc/fckeditor
 @dirrm www/nocc