3 files changed, 114 insertions, 17 deletions

diff --git a/mail/phpmailer/Makefile b/mail/phpmailer/Makefile
index 13580899e026..3b4b27af06d9 100644
--- a/mail/phpmailer/Makefile
+++ b/mail/phpmailer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phpmailer
-PORTVERSION=	5.2.1
+PORTVERSION=	5.2.2
 CATEGORIES=	mail
 MASTER_SITES=	http://${PORTNAME}.apache-extras.org.codespot.com/files/
 DISTNAME=	PHPMailer_${PORTVERSION}
diff --git a/mail/phpmailer/distinfo b/mail/phpmailer/distinfo
index 10588559110c..a1928b5be6b3 100644
--- a/mail/phpmailer/distinfo
+++ b/mail/phpmailer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PHPMailer_5.2.1.zip) = 812f8d26013b1a319ac65977eed32da484a60769b2fe395259edd7d3f33c85da
-SIZE (PHPMailer_5.2.1.zip) = 254840
+SHA256 (PHPMailer_5.2.2.zip) = ae30f513407a3ae0e906306d95c385a26c1aa5d4c8e2a046480538e0527dc914
+SIZE (PHPMailer_5.2.2.zip) = 719734
diff --git a/mail/phpmailer/pkg-plist b/mail/phpmailer/pkg-plist
index 8d277b183584..433d95bac0f5 100644
--- a/mail/phpmailer/pkg-plist
+++ b/mail/phpmailer/pkg-plist
@@ -1,10 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/5.0-phpdocs/blank.html
-%%PORTDOCS%%%%DOCSDIR%%/5.0-phpdocs/classtrees_PHPMailer.html
-%%PORTDOCS%%%%DOCSDIR%%/5.0-phpdocs/elementindex.html
-%%PORTDOCS%%%%DOCSDIR%%/5.0-phpdocs/elementindex_PHPMailer.html
-%%PORTDOCS%%%%DOCSDIR%%/5.0-phpdocs/index.html
-%%PORTDOCS%%%%DOCSDIR%%/5.0-phpdocs/li_PHPMailer.html
-%%PORTDOCS%%%%DOCSDIR%%/5.0-phpdocs/packages.html
 %%PORTDOCS%%%%DOCSDIR%%/Callback_function_notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/DomainKeys_notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
@@ -13,6 +6,104 @@
 %%PORTDOCS%%%%DOCSDIR%%/changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/extending.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/makedocs2.sh
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/classes.svg
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/classes/PHPMailer.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/classes/POP3.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/classes/SMTP.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/classes/phpmailerException.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/css/bootstrap-responsive.css
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/css/bootstrap-responsive.min.css
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/css/bootstrap.css
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/css/bootstrap.min.css
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/css/jquery.iviewer.css
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/css/prettify.css
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/css/template.css
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/errors.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/graph_class.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/apple-touch-icon-114x114.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/apple-touch-icon-72x72.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/apple-touch-icon.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/favicon.ico
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/glyphicons-halflings-white.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/glyphicons-halflings.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/arrow_down.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/arrow_right.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/class.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/constant.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/favicon.ico
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/file-php.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/file.gif
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/folder.gif
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/function.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/icon-folder-open-big.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/icon-th-big.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/icon_template.svg
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/interface.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/method.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/ok.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/property.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/search.gif
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/variable.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/view_source.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/visibility_private.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/visibility_protected.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/icons/visibility_public.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/grab.cur
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/hand.cur
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.rotate_left.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.rotate_right.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.zoom_fit.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.zoom_fit2.gif
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.zoom_in.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.zoom_in2.gif
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.zoom_out.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.zoom_out2.gif
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.zoom_zero.png
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/iviewer/iviewer.zoom_zero2.gif
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/img/loader.gif
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/SVGPan.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/bootstrap.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/bootstrap.min.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery-1.4.2.min.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery-1.7.1.min.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery-ui-1.8.2.custom.min.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery.cookie.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery.iviewer.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery.iviewer.min.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery.mousewheel.min.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery.panzoom.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery.splitter.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery.tools.min.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/jquery.treeview.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/menu.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-apollo.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-clj.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-css.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-go.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-hs.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-lisp.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-lua.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-ml.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-n.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-proto.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-scala.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-sql.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-tex.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-vb.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-vhdl.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-wiki.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-xq.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/lang-yaml.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/prettify/prettify.min.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/sidebar.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/js/template.js
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/markers.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/namespaces/global.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/packages/PHPMailer.html
+%%PORTDOCS%%%%DOCSDIR%%/phpdoc/structure.xml
 %%PORTDOCS%%%%DOCSDIR%%/pop3_article.txt
 %%PORTDOCS%%%%DOCSDIR%%/use_gmail.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contents.html
@@ -35,7 +126,9 @@
 %%DATADIR%%/class.phpmailer.php
 %%DATADIR%%/class.pop3.php
 %%DATADIR%%/class.smtp.php
+%%DATADIR%%/extras/class.html2text.inc
 %%DATADIR%%/extras/htmlfilter.php
+%%DATADIR%%/extras/ntlm_sasl_client.php
 %%DATADIR%%/language/phpmailer.lang-ar.php
 %%DATADIR%%/language/phpmailer.lang-br.php
 %%DATADIR%%/language/phpmailer.lang-ca.php
@@ -57,6 +150,7 @@
 %%DATADIR%%/language/phpmailer.lang-ro.php
 %%DATADIR%%/language/phpmailer.lang-ru.php
 %%DATADIR%%/language/phpmailer.lang-se.php
+%%DATADIR%%/language/phpmailer.lang-sk.php
 %%DATADIR%%/language/phpmailer.lang-tr.php
 %%DATADIR%%/language/phpmailer.lang-zh.php
 %%DATADIR%%/language/phpmailer.lang-zh_cn.php
@@ -119,11 +213,14 @@
 @dirrm %%DATADIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/5.0-phpdocs/media
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/5.0-phpdocs/__filesource
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/5.0-phpdocs/PHPMailer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/5.0-phpdocs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc/packages
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc/namespaces
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc/js/prettify
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc/js
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc/img/iviewer
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc/img/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc/img
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc/css
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc/classes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/phpdoc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@exec mkdir -p %D/%%DOCSDIR%%/5.0-phpdocs/media
-%%PORTDOCS%%@exec mkdir -p %D/%%DOCSDIR%%/5.0-phpdocs/__filesource
-%%PORTDOCS%%@exec mkdir -p %D/%%DOCSDIR%%/5.0-phpdocs/PHPMailer