3 files changed, 33 insertions, 32 deletions
diff --git a/www/smarty/Makefile b/www/smarty/Makefile
index de178f988b2b..c8ad894dce36 100644
--- a/www/smarty/Makefile
+++ b/www/smarty/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	smarty
-PORTVERSION=	2.6.5
+PORTVERSION=	2.6.6
 CATEGORIES=	www
 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-2.6.4-docs${EXTRACT_SUFX}:manual
+DISTFILES+=	Smarty-2.6.5-docs${EXTRACT_SUFX}:manual
 .endif
 
-MAINTAINER=	zaa@ulstu.ru
+MAINTAINER=	zaa@zaa.pp.ru
 COMMENT=	The PHP compiling template engine
 
 WRKSRC=	${WRKDIR}/Smarty-${PORTVERSION}
@@ -34,8 +34,8 @@ do-install:
 .for f in Config_File.class.php Smarty.class.php Smarty_Compiler.class.php debug.tpl
 	@${INSTALL_DATA} ${WRKSRC}/libs/$f ${DATADIR}
 .endfor
-	@${MKDIR} ${DATADIR}/core
-	@${INSTALL_DATA} ${WRKSRC}/libs/core/* ${DATADIR}/core
+	@${MKDIR} ${DATADIR}/internals
+	@${INSTALL_DATA} ${WRKSRC}/libs/internals/* ${DATADIR}/internals
 	@${MKDIR} ${DATADIR}/plugins
 	@${INSTALL_DATA} ${WRKSRC}/libs/plugins/* ${DATADIR}/plugins
 .if !defined(NOPORTDOCS)
diff --git a/www/smarty/distinfo b/www/smarty/distinfo
index 382135a4c7da..441cd74f6f82 100644
--- a/www/smarty/distinfo
+++ b/www/smarty/distinfo
@@ -1,4 +1,4 @@
-MD5 (Smarty-2.6.5.tar.gz) = d42e97144beefe362cec4c6d94a758c9
-SIZE (Smarty-2.6.5.tar.gz) = 136058
-MD5 (Smarty-2.6.4-docs.tar.gz) = a1f0a45b67db318fc274e2f939d011ba
-SIZE (Smarty-2.6.4-docs.tar.gz) = 105197
+MD5 (Smarty-2.6.6.tar.gz) = cfe923cbce423b69fabd93edd00395d1
+SIZE (Smarty-2.6.6.tar.gz) = 137589
+MD5 (Smarty-2.6.5-docs.tar.gz) = 724b8e508fd052654a2bd59615518cab
+SIZE (Smarty-2.6.5-docs.tar.gz) = 106304
diff --git a/www/smarty/pkg-plist b/www/smarty/pkg-plist
index a732ac37201c..3ac2a2b50cba 100644
--- a/www/smarty/pkg-plist
+++ b/www/smarty/pkg-plist
@@ -55,6 +55,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/manual/caching.multiple.caches.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/chapter.debugging.console.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/config.files.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/constant.smarty.core.dir.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/getting.started.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/installation.html
@@ -186,28 +187,28 @@
 %%DATADIR%%/Smarty.class.php
 %%DATADIR%%/Smarty_Compiler.class.php
 %%DATADIR%%/debug.tpl
-%%DATADIR%%/core/core.assemble_plugin_filepath.php
-%%DATADIR%%/core/core.assign_smarty_interface.php
-%%DATADIR%%/core/core.create_dir_structure.php
-%%DATADIR%%/core/core.display_debug_console.php
-%%DATADIR%%/core/core.get_include_path.php
-%%DATADIR%%/core/core.get_microtime.php
-%%DATADIR%%/core/core.get_php_resource.php
-%%DATADIR%%/core/core.is_secure.php
-%%DATADIR%%/core/core.is_trusted.php
-%%DATADIR%%/core/core.load_plugins.php
-%%DATADIR%%/core/core.load_resource_plugin.php
-%%DATADIR%%/core/core.process_cached_inserts.php
-%%DATADIR%%/core/core.process_compiled_include.php
-%%DATADIR%%/core/core.read_cache_file.php
-%%DATADIR%%/core/core.rm_auto.php
-%%DATADIR%%/core/core.rmdir.php
-%%DATADIR%%/core/core.run_insert_handler.php
-%%DATADIR%%/core/core.smarty_include_php.php
-%%DATADIR%%/core/core.write_cache_file.php
-%%DATADIR%%/core/core.write_compiled_include.php
-%%DATADIR%%/core/core.write_compiled_resource.php
-%%DATADIR%%/core/core.write_file.php
+%%DATADIR%%/internals/core.assemble_plugin_filepath.php
+%%DATADIR%%/internals/core.assign_smarty_interface.php
+%%DATADIR%%/internals/core.create_dir_structure.php
+%%DATADIR%%/internals/core.display_debug_console.php
+%%DATADIR%%/internals/core.get_include_path.php
+%%DATADIR%%/internals/core.get_microtime.php
+%%DATADIR%%/internals/core.get_php_resource.php
+%%DATADIR%%/internals/core.is_secure.php
+%%DATADIR%%/internals/core.is_trusted.php
+%%DATADIR%%/internals/core.load_plugins.php
+%%DATADIR%%/internals/core.load_resource_plugin.php
+%%DATADIR%%/internals/core.process_cached_inserts.php
+%%DATADIR%%/internals/core.process_compiled_include.php
+%%DATADIR%%/internals/core.read_cache_file.php
+%%DATADIR%%/internals/core.rm_auto.php
+%%DATADIR%%/internals/core.rmdir.php
+%%DATADIR%%/internals/core.run_insert_handler.php
+%%DATADIR%%/internals/core.smarty_include_php.php
+%%DATADIR%%/internals/core.write_cache_file.php
+%%DATADIR%%/internals/core.write_compiled_include.php
+%%DATADIR%%/internals/core.write_compiled_resource.php
+%%DATADIR%%/internals/core.write_file.php
 %%DATADIR%%/plugins/block.textformat.php
 %%DATADIR%%/plugins/compiler.assign.php
 %%DATADIR%%/plugins/function.assign_debug_info.php
@@ -255,6 +256,6 @@
 %%DATADIR%%/plugins/shared.make_timestamp.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/core
+@dirrm %%DATADIR%%/internals
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%