Index: branches/2017Q1/mail/phpmailer/Makefile
===================================================================
--- branches/2017Q1/mail/phpmailer/Makefile	(revision 431263)
+++ branches/2017Q1/mail/phpmailer/Makefile	(revision 431264)
@@ -1,42 +1,42 @@
 # Created by: Zhen REN <bg1tpt@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	phpmailer
-PORTVERSION=	5.2.20
+PORTVERSION=	5.2.22
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Full Featured Email Transfer Class for PHP
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PHPMailer
 GH_PROJECT=	PHPMailer
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 USES=		dos2unix php
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in PHPMailerAutoload.php class.phpmailer.php class.pop3.php \
 	class.smtp.php composer.json
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
 .endfor
 .for d in extras language
 	@${MKDIR} ${STAGEDIR}${DATADIR}/$d
 	${INSTALL_DATA} ${WRKSRC}/$d/* ${STAGEDIR}${DATADIR}/$d
 .endfor
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: branches/2017Q1/mail/phpmailer/distinfo
===================================================================
--- branches/2017Q1/mail/phpmailer/distinfo	(revision 431263)
+++ branches/2017Q1/mail/phpmailer/distinfo	(revision 431264)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482937380
-SHA256 (PHPMailer-PHPMailer-v5.2.20_GH0.tar.gz) = 4716acef60503f345323849842f3138a8453c178d3829477553bf1e347664976
-SIZE (PHPMailer-PHPMailer-v5.2.20_GH0.tar.gz) = 156793
+TIMESTAMP = 1484220608
+SHA256 (PHPMailer-PHPMailer-v5.2.22_GH0.tar.gz) = e30631e04333e05eb10077c94385d002c2cd3452d451da3b3899951e3aa1ff42
+SIZE (PHPMailer-PHPMailer-v5.2.22_GH0.tar.gz) = 157657
Index: branches/2017Q1/mail/phpmailer/pkg-plist
===================================================================
--- branches/2017Q1/mail/phpmailer/pkg-plist	(revision 431263)
+++ branches/2017Q1/mail/phpmailer/pkg-plist	(revision 431264)
@@ -1,101 +1,102 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/DKIM.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/code_generator.phps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contactform.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contents.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contentsutf8.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exceptions.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmail.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmail_xoauth.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/phpmailer.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/phpmailer_mini.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mail.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailing_list.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop_before_smtp.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/XRegExp.js
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shAutoloader.js
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shBrushPhp.js
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shCore.js
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/shLegacy.js
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/send_file_upload.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/send_multiple_file_upload.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendmail.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/signed-mail.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp_check.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp_no_auth.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl_options.phps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shCore.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shCoreDefault.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shCoreDjango.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shCoreEclipse.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shCoreEmacs.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shCoreFadeToGrey.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shCoreMDUltra.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shCoreMidnight.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shCoreRDark.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeAppleScript.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeDefault.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeDjango.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeEclipse.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeEmacs.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeFadeToGrey.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeMDUltra.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeMidnight.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeRDark.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/shThemeVisualStudio.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/styles/wrapping.png
 %%DATADIR%%/PHPMailerAutoload.php
 %%DATADIR%%/class.phpmailer.php
 %%DATADIR%%/class.pop3.php
 %%DATADIR%%/class.smtp.php
 %%DATADIR%%/composer.json
 %%DATADIR%%/extras/EasyPeasyICS.php
 %%DATADIR%%/extras/README.md
 %%DATADIR%%/extras/htmlfilter.php
 %%DATADIR%%/extras/ntlm_sasl_client.php
 %%DATADIR%%/language/phpmailer.lang-am.php
 %%DATADIR%%/language/phpmailer.lang-ar.php
 %%DATADIR%%/language/phpmailer.lang-az.php
 %%DATADIR%%/language/phpmailer.lang-be.php
 %%DATADIR%%/language/phpmailer.lang-bg.php
 %%DATADIR%%/language/phpmailer.lang-ca.php
 %%DATADIR%%/language/phpmailer.lang-ch.php
 %%DATADIR%%/language/phpmailer.lang-cs.php
 %%DATADIR%%/language/phpmailer.lang-da.php
 %%DATADIR%%/language/phpmailer.lang-de.php
 %%DATADIR%%/language/phpmailer.lang-el.php
 %%DATADIR%%/language/phpmailer.lang-eo.php
 %%DATADIR%%/language/phpmailer.lang-es.php
 %%DATADIR%%/language/phpmailer.lang-et.php
 %%DATADIR%%/language/phpmailer.lang-fa.php
 %%DATADIR%%/language/phpmailer.lang-fi.php
 %%DATADIR%%/language/phpmailer.lang-fo.php
 %%DATADIR%%/language/phpmailer.lang-fr.php
 %%DATADIR%%/language/phpmailer.lang-gl.php
 %%DATADIR%%/language/phpmailer.lang-he.php
 %%DATADIR%%/language/phpmailer.lang-hr.php
 %%DATADIR%%/language/phpmailer.lang-hu.php
 %%DATADIR%%/language/phpmailer.lang-id.php
 %%DATADIR%%/language/phpmailer.lang-it.php
 %%DATADIR%%/language/phpmailer.lang-ja.php
 %%DATADIR%%/language/phpmailer.lang-ka.php
 %%DATADIR%%/language/phpmailer.lang-ko.php
 %%DATADIR%%/language/phpmailer.lang-lt.php
 %%DATADIR%%/language/phpmailer.lang-lv.php
 %%DATADIR%%/language/phpmailer.lang-ms.php
 %%DATADIR%%/language/phpmailer.lang-nb.php
 %%DATADIR%%/language/phpmailer.lang-nl.php
 %%DATADIR%%/language/phpmailer.lang-pl.php
 %%DATADIR%%/language/phpmailer.lang-pt.php
 %%DATADIR%%/language/phpmailer.lang-pt_br.php
 %%DATADIR%%/language/phpmailer.lang-ro.php
 %%DATADIR%%/language/phpmailer.lang-ru.php
 %%DATADIR%%/language/phpmailer.lang-sk.php
 %%DATADIR%%/language/phpmailer.lang-sl.php
 %%DATADIR%%/language/phpmailer.lang-sr.php
 %%DATADIR%%/language/phpmailer.lang-sv.php
 %%DATADIR%%/language/phpmailer.lang-tr.php
 %%DATADIR%%/language/phpmailer.lang-uk.php
 %%DATADIR%%/language/phpmailer.lang-vi.php
 %%DATADIR%%/language/phpmailer.lang-zh.php
 %%DATADIR%%/language/phpmailer.lang-zh_cn.php
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 431263)
+++ branches/2017Q1	(revision 431264)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r431252