Update to 2.2.0

PR:		ports/40468
Submitted by:	maintainer

4 files changed, 41 insertions, 40 deletions

diff --git a/www/smarty/Makefile b/www/smarty/Makefile
index d5c6be275f85..d67a328d679f 100644
--- a/www/smarty/Makefile
+++ b/www/smarty/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	smarty
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2.0
 CATEGORIES=	www
-MASTER_SITES=	http://www.phpinsider.com/php/code/Smarty/download/
+MASTER_SITES=	http://smarty.php.net/distributions/ \
+		http://smarty.php.net/distributions/manual/en/:manual
 DISTFILES=	Smarty-${PORTVERSION}${EXTRACT_SUFX}
 .if !defined(NOPORTDOCS)
-DISTFILES+=	Smarty-${PORTVERSION}-docs${EXTRACT_SUFX}
+DISTFILES+=	Smarty-${PORTVERSION}-docs${EXTRACT_SUFX}:manual
 .endif
 
 MAINTAINER=	corecode@corecode.ath.cx
@@ -29,14 +30,14 @@ MSG_SUB=	DATADIR=${DATADIR} LOCALBASE=${LOCALBASE}
 
 do-install:
 	@${MKDIR} ${DATADIR}
-.for f in Config_File.class.php Smarty.class.php Smarty_Compiler.class.php overlib.js templates/debug.tpl
+.for f in Config_File.class.php Smarty.class.php Smarty_Compiler.class.php debug.tpl
 	@${INSTALL_DATA} ${WRKSRC}/$f ${DATADIR}
 .endfor
 	@${MKDIR} ${DATADIR}/plugins
 	@${INSTALL_DATA} ${WRKSRC}/plugins/* ${DATADIR}/plugins
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for f in BUGS FAQ INSTALL QUICKSTART README RESOURCES
+.for f in BUGS FAQ INSTALL NEWS QUICKSTART README RESOURCES
 	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
 .endfor
 	@${MKDIR} ${DOCSDIR}/manual
diff --git a/www/smarty/distinfo b/www/smarty/distinfo
index 4875170ca5ce..bfab1f465394 100644
--- a/www/smarty/distinfo
+++ b/www/smarty/distinfo
@@ -1,2 +1,2 @@
-MD5 (Smarty-2.1.1.tar.gz) = 7170ee47248d3f9f6be08400b908a886
-MD5 (Smarty-2.1.1-docs.tar.gz) = 3a6fa05cfe01d3e45572dadd72fe3805
+MD5 (Smarty-2.2.0.tar.gz) = 610758764319e52e4184ce2c0e3e2e35
+MD5 (Smarty-2.2.0-docs.tar.gz) = 5f56ae1f361ea56143b67f26a35626b9
diff --git a/www/smarty/pkg-descr b/www/smarty/pkg-descr
index fa3539b3df61..c6fb55d6753e 100644
--- a/www/smarty/pkg-descr
+++ b/www/smarty/pkg-descr
@@ -8,6 +8,6 @@ the  templates into  PHP  scripts,  eliminating the  need  to parse  the
 templates on every invocation. This  makes Smarty extremely scalable and
 managable for large application needs.
 
-WWW: http://www.phpinsider.com/php/code/Smarty/
+WWW: http://smarty.php.net/
 
 - Simon 'corecode' Schubert
diff --git a/www/smarty/pkg-plist b/www/smarty/pkg-plist
index 336daac1970b..4ddb5d945105 100644
--- a/www/smarty/pkg-plist
+++ b/www/smarty/pkg-plist
@@ -1,6 +1,7 @@
 %%PORTDOCS%%share/doc/smarty/BUGS
 %%PORTDOCS%%share/doc/smarty/FAQ
 %%PORTDOCS%%share/doc/smarty/INSTALL
+%%PORTDOCS%%share/doc/smarty/NEWS
 %%PORTDOCS%%share/doc/smarty/QUICKSTART
 %%PORTDOCS%%share/doc/smarty/README
 %%PORTDOCS%%share/doc/smarty/RESOURCES
@@ -40,18 +41,18 @@
 %%PORTDOCS%%share/doc/smarty/manual/api.variables.html
 %%PORTDOCS%%share/doc/smarty/manual/appendixes.html
 %%PORTDOCS%%share/doc/smarty/manual/bugs.html
+%%PORTDOCS%%share/doc/smarty/manual/caching.groups.html
+%%PORTDOCS%%share/doc/smarty/manual/caching.html
+%%PORTDOCS%%share/doc/smarty/manual/caching.multiple.caches.html
 %%PORTDOCS%%share/doc/smarty/manual/chapter.debugging.console.html
 %%PORTDOCS%%share/doc/smarty/manual/config.files.html
-%%PORTDOCS%%share/doc/smarty/manual/constant.smarty.dir.html
 %%PORTDOCS%%share/doc/smarty/manual/date.format.html
 %%PORTDOCS%%share/doc/smarty/manual/default.template.handler.function.html
-%%PORTDOCS%%share/doc/smarty/manual/features.caching.html
-%%PORTDOCS%%share/doc/smarty/manual/features.compiling.html
 %%PORTDOCS%%share/doc/smarty/manual/getting.started.html
-%%PORTDOCS%%share/doc/smarty/manual/how.smarty.works.html
 %%PORTDOCS%%share/doc/smarty/manual/index.html
 %%PORTDOCS%%share/doc/smarty/manual/installation.html
-%%PORTDOCS%%share/doc/smarty/manual/installing.smarty.html
+%%PORTDOCS%%share/doc/smarty/manual/installing.smarty.basic.html
+%%PORTDOCS%%share/doc/smarty/manual/installing.smarty.extended.html
 %%PORTDOCS%%share/doc/smarty/manual/language.basic.syntax.html
 %%PORTDOCS%%share/doc/smarty/manual/language.builtin.functions.html
 %%PORTDOCS%%share/doc/smarty/manual/language.combining.modifiers.html
@@ -91,7 +92,6 @@
 %%PORTDOCS%%share/doc/smarty/manual/language.variables.smarty.now.html
 %%PORTDOCS%%share/doc/smarty/manual/language.variables.smarty.request.html
 %%PORTDOCS%%share/doc/smarty/manual/language.variables.smarty.template.html
-%%PORTDOCS%%share/doc/smarty/manual/overview.html
 %%PORTDOCS%%share/doc/smarty/manual/plugins.block.functions.html
 %%PORTDOCS%%share/doc/smarty/manual/plugins.compiler.functions.html
 %%PORTDOCS%%share/doc/smarty/manual/plugins.functions.html
@@ -150,35 +150,36 @@
 %%PORTDOCS%%share/doc/smarty/manual/variable.show.info.include.html
 %%PORTDOCS%%share/doc/smarty/manual/variable.trusted.dir.html
 %%PORTDOCS%%share/doc/smarty/manual/variable.undefined.html
-%%PORTDOCS%%share/doc/smarty/manual/x1015.html
-%%PORTDOCS%%share/doc/smarty/manual/x1024.html
-%%PORTDOCS%%share/doc/smarty/manual/x1030.html
-%%PORTDOCS%%share/doc/smarty/manual/x1036.html
-%%PORTDOCS%%share/doc/smarty/manual/x1044.html
-%%PORTDOCS%%share/doc/smarty/manual/x1050.html
-%%PORTDOCS%%share/doc/smarty/manual/x1056.html
-%%PORTDOCS%%share/doc/smarty/manual/x1062.html
-%%PORTDOCS%%share/doc/smarty/manual/x1068.html
-%%PORTDOCS%%share/doc/smarty/manual/x1076.html
-%%PORTDOCS%%share/doc/smarty/manual/x234.html
-%%PORTDOCS%%share/doc/smarty/manual/x240.html
-%%PORTDOCS%%share/doc/smarty/manual/x246.html
-%%PORTDOCS%%share/doc/smarty/manual/x252.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.use.sub.dirs.html
+%%PORTDOCS%%share/doc/smarty/manual/what.is.smarty.html
+%%PORTDOCS%%share/doc/smarty/manual/x1066.html
+%%PORTDOCS%%share/doc/smarty/manual/x1075.html
+%%PORTDOCS%%share/doc/smarty/manual/x1081.html
+%%PORTDOCS%%share/doc/smarty/manual/x1087.html
+%%PORTDOCS%%share/doc/smarty/manual/x1094.html
+%%PORTDOCS%%share/doc/smarty/manual/x1100.html
+%%PORTDOCS%%share/doc/smarty/manual/x1106.html
+%%PORTDOCS%%share/doc/smarty/manual/x1112.html
+%%PORTDOCS%%share/doc/smarty/manual/x1118.html
+%%PORTDOCS%%share/doc/smarty/manual/x1126.html
+%%PORTDOCS%%share/doc/smarty/manual/x270.html
+%%PORTDOCS%%share/doc/smarty/manual/x276.html
+%%PORTDOCS%%share/doc/smarty/manual/x282.html
 %%PORTDOCS%%share/doc/smarty/manual/x288.html
-%%PORTDOCS%%share/doc/smarty/manual/x316.html
-%%PORTDOCS%%share/doc/smarty/manual/x346.html
-%%PORTDOCS%%share/doc/smarty/manual/x379.html
-%%PORTDOCS%%share/doc/smarty/manual/x385.html
+%%PORTDOCS%%share/doc/smarty/manual/x330.html
+%%PORTDOCS%%share/doc/smarty/manual/x358.html
+%%PORTDOCS%%share/doc/smarty/manual/x388.html
 %%PORTDOCS%%share/doc/smarty/manual/x421.html
-%%PORTDOCS%%share/doc/smarty/manual/x456.html
-%%PORTDOCS%%share/doc/smarty/manual/x484.html
-%%PORTDOCS%%share/doc/smarty/manual/x512.html
-%%PORTDOCS%%share/doc/smarty/manual/x518.html
-%%PORTDOCS%%share/doc/smarty/manual/x557.html
-%%PORTDOCS%%share/doc/smarty/manual/x563.html
+%%PORTDOCS%%share/doc/smarty/manual/x427.html
+%%PORTDOCS%%share/doc/smarty/manual/x462.html
+%%PORTDOCS%%share/doc/smarty/manual/x497.html
+%%PORTDOCS%%share/doc/smarty/manual/x525.html
+%%PORTDOCS%%share/doc/smarty/manual/x553.html
+%%PORTDOCS%%share/doc/smarty/manual/x559.html
+%%PORTDOCS%%share/doc/smarty/manual/x598.html
+%%PORTDOCS%%share/doc/smarty/manual/x604.html
 %%PORTDOCS%%share/examples/smarty/configs/test.conf
 %%PORTDOCS%%share/examples/smarty/index.php
-%%PORTDOCS%%share/examples/smarty/templates/debug.tpl
 %%PORTDOCS%%share/examples/smarty/templates/footer.tpl
 %%PORTDOCS%%share/examples/smarty/templates/header.tpl
 %%PORTDOCS%%share/examples/smarty/templates/index.tpl
@@ -186,7 +187,6 @@ share/smarty/Config_File.class.php
 share/smarty/Smarty.class.php
 share/smarty/Smarty_Compiler.class.php
 share/smarty/debug.tpl
-share/smarty/overlib.js
 share/smarty/plugins/function.assign.php
 share/smarty/plugins/function.assign_debug_info.php
 share/smarty/plugins/function.counter.php