3 files changed, 139 insertions, 8 deletions

diff --git a/www/smarty/Makefile b/www/smarty/Makefile
index 6b1d1d975442..d5c6be275f85 100644
--- a/www/smarty/Makefile
+++ b/www/smarty/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smarty
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1.1
 CATEGORIES=	www
 MASTER_SITES=	http://www.phpinsider.com/php/code/Smarty/download/
 DISTFILES=	Smarty-${PORTVERSION}${EXTRACT_SUFX}
@@ -29,7 +29,7 @@ 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
+.for f in Config_File.class.php Smarty.class.php Smarty_Compiler.class.php overlib.js templates/debug.tpl
 	@${INSTALL_DATA} ${WRKSRC}/$f ${DATADIR}
 .endfor
 	@${MKDIR} ${DATADIR}/plugins
diff --git a/www/smarty/distinfo b/www/smarty/distinfo
index 6f8ea6e4b2a0..4875170ca5ce 100644
--- a/www/smarty/distinfo
+++ b/www/smarty/distinfo
@@ -1,2 +1,2 @@
-MD5 (Smarty-2.0.1.tar.gz) = 5c5f43f3301ad0d6c04f2f9bad8c29f8
-MD5 (Smarty-2.0.1-docs.tar.gz) = 65d76d9040ab6cb5ff5e0068bc4a98eb
+MD5 (Smarty-2.1.1.tar.gz) = 7170ee47248d3f9f6be08400b908a886
+MD5 (Smarty-2.1.1-docs.tar.gz) = 3a6fa05cfe01d3e45572dadd72fe3805
diff --git a/www/smarty/pkg-plist b/www/smarty/pkg-plist
index 79e6cf1caa29..336daac1970b 100644
--- a/www/smarty/pkg-plist
+++ b/www/smarty/pkg-plist
@@ -5,30 +5,101 @@
 %%PORTDOCS%%share/doc/smarty/README
 %%PORTDOCS%%share/doc/smarty/RESOURCES
 %%PORTDOCS%%share/doc/smarty/manual/advanced.features.html
+%%PORTDOCS%%share/doc/smarty/manual/advanced.features.outputfilters.html
 %%PORTDOCS%%share/doc/smarty/manual/advanced.features.postfilters.html
+%%PORTDOCS%%share/doc/smarty/manual/api.assign.html
+%%PORTDOCS%%share/doc/smarty/manual/api.clear.all.assign.html
+%%PORTDOCS%%share/doc/smarty/manual/api.clear.all.cache.html
+%%PORTDOCS%%share/doc/smarty/manual/api.clear.assign.html
+%%PORTDOCS%%share/doc/smarty/manual/api.clear.cache.html
+%%PORTDOCS%%share/doc/smarty/manual/api.clear.compiled.tpl.html
+%%PORTDOCS%%share/doc/smarty/manual/api.display.html
+%%PORTDOCS%%share/doc/smarty/manual/api.fetch.html
 %%PORTDOCS%%share/doc/smarty/manual/api.functions.html
-%%PORTDOCS%%share/doc/smarty/manual/api.html
+%%PORTDOCS%%share/doc/smarty/manual/api.get.template.vars.html
+%%PORTDOCS%%share/doc/smarty/manual/api.is.cached.html
+%%PORTDOCS%%share/doc/smarty/manual/api.load.filter.html
+%%PORTDOCS%%share/doc/smarty/manual/api.register.block.html
+%%PORTDOCS%%share/doc/smarty/manual/api.register.compiler.function.html
+%%PORTDOCS%%share/doc/smarty/manual/api.register.function.html
+%%PORTDOCS%%share/doc/smarty/manual/api.register.modifier.html
+%%PORTDOCS%%share/doc/smarty/manual/api.register.outputfilter.html
+%%PORTDOCS%%share/doc/smarty/manual/api.register.postfilter.html
+%%PORTDOCS%%share/doc/smarty/manual/api.register.prefilter.html
+%%PORTDOCS%%share/doc/smarty/manual/api.register.resource.html
+%%PORTDOCS%%share/doc/smarty/manual/api.template.exists.html
+%%PORTDOCS%%share/doc/smarty/manual/api.trigger.error.html
+%%PORTDOCS%%share/doc/smarty/manual/api.unregister.block.html
+%%PORTDOCS%%share/doc/smarty/manual/api.unregister.compiler.function.html
+%%PORTDOCS%%share/doc/smarty/manual/api.unregister.function.html
+%%PORTDOCS%%share/doc/smarty/manual/api.unregister.modifier.html
+%%PORTDOCS%%share/doc/smarty/manual/api.unregister.outputfilter.html
+%%PORTDOCS%%share/doc/smarty/manual/api.unregister.postfilter.html
+%%PORTDOCS%%share/doc/smarty/manual/api.unregister.prefilter.html
+%%PORTDOCS%%share/doc/smarty/manual/api.unregister.resource.html
+%%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/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/language.basic.syntax.html
 %%PORTDOCS%%share/doc/smarty/manual/language.builtin.functions.html
-%%PORTDOCS%%share/doc/smarty/manual/language.custom.functions.top.html
-%%PORTDOCS%%share/doc/smarty/manual/language.html
+%%PORTDOCS%%share/doc/smarty/manual/language.combining.modifiers.html
+%%PORTDOCS%%share/doc/smarty/manual/language.config.variables.html
+%%PORTDOCS%%share/doc/smarty/manual/language.custom.functions.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.config.load.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.counter.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.cycle.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.eval.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.fetch.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.foreach.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.html.options.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.html.select.date.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.html.select.time.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.if.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.include.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.include.php.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.insert.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.ldelim.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.literal.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.math.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.php.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.popup.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.popup.init.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.section.html
+%%PORTDOCS%%share/doc/smarty/manual/language.function.strip.html
 %%PORTDOCS%%share/doc/smarty/manual/language.modifiers.html
+%%PORTDOCS%%share/doc/smarty/manual/language.syntax.attributes.html
+%%PORTDOCS%%share/doc/smarty/manual/language.syntax.functions.html
+%%PORTDOCS%%share/doc/smarty/manual/language.variables.array.indexes.html
+%%PORTDOCS%%share/doc/smarty/manual/language.variables.assoc.arrays.html
 %%PORTDOCS%%share/doc/smarty/manual/language.variables.html
+%%PORTDOCS%%share/doc/smarty/manual/language.variables.objects.html
+%%PORTDOCS%%share/doc/smarty/manual/language.variables.smarty.capture.html
+%%PORTDOCS%%share/doc/smarty/manual/language.variables.smarty.html
+%%PORTDOCS%%share/doc/smarty/manual/language.variables.smarty.loops.html
+%%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
 %%PORTDOCS%%share/doc/smarty/manual/plugins.html
 %%PORTDOCS%%share/doc/smarty/manual/plugins.inserts.html
 %%PORTDOCS%%share/doc/smarty/manual/plugins.modifiers.html
 %%PORTDOCS%%share/doc/smarty/manual/plugins.naming.conventions.html
+%%PORTDOCS%%share/doc/smarty/manual/plugins.outputfilters.html
 %%PORTDOCS%%share/doc/smarty/manual/plugins.prefilters.postfilters.html
 %%PORTDOCS%%share/doc/smarty/manual/plugins.resources.html
 %%PORTDOCS%%share/doc/smarty/manual/plugins.writing.html
@@ -37,8 +108,11 @@
 %%PORTDOCS%%share/doc/smarty/manual/section.template.cache.handler.func.html
 %%PORTDOCS%%share/doc/smarty/manual/smarty.constants.html
 %%PORTDOCS%%share/doc/smarty/manual/smarty.for.designers.html
-%%PORTDOCS%%share/doc/smarty/manual/smarty.for.programmersr.html
+%%PORTDOCS%%share/doc/smarty/manual/smarty.for.programmers.html
 %%PORTDOCS%%share/doc/smarty/manual/template.resources.html
+%%PORTDOCS%%share/doc/smarty/manual/templates.from.any.dir.html
+%%PORTDOCS%%share/doc/smarty/manual/templates.from.elsewhere.html
+%%PORTDOCS%%share/doc/smarty/manual/templates.from.template.dir.html
 %%PORTDOCS%%share/doc/smarty/manual/tips.componentized.templates.html
 %%PORTDOCS%%share/doc/smarty/manual/tips.dates.html
 %%PORTDOCS%%share/doc/smarty/manual/tips.default.var.handling.html
@@ -47,6 +121,61 @@
 %%PORTDOCS%%share/doc/smarty/manual/tips.passing.vars.html
 %%PORTDOCS%%share/doc/smarty/manual/tips.wap.html
 %%PORTDOCS%%share/doc/smarty/manual/troubleshooting.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.autoload.filters.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.cache.dir.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.cache.handler.func.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.cache.lifetime.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.cache.modified.check.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.caching.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.compile.check.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.compile.dir.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.compile.id.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.compiler.class.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.config.dir.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.debug.tpl.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.debugging.ctrl.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.debugging.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.default.template.handler.func.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.force.compile.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.global.assign.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.left.delimiter.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.php.handling.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.plugins.dir.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.request.vars.order.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.right.delimiter.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.secure.dir.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.security.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.security.settings.html
+%%PORTDOCS%%share/doc/smarty/manual/variable.show.info.header.html
+%%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/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/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/examples/smarty/configs/test.conf
 %%PORTDOCS%%share/examples/smarty/index.php
 %%PORTDOCS%%share/examples/smarty/templates/debug.tpl
@@ -56,10 +185,12 @@
 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
+share/smarty/plugins/function.cycle.php
 share/smarty/plugins/function.eval.php
 share/smarty/plugins/function.fetch.php
 share/smarty/plugins/function.html_options.php