3 files changed, 13 insertions, 42 deletions

diff --git a/www/impresscms/Makefile b/www/impresscms/Makefile
index 03c51ff6fe07..8d431e1e4121 100644
--- a/www/impresscms/Makefile
+++ b/www/impresscms/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	impresscms
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/ImpressCMS%20Official%20Releases/ImpressCMS%20${PORTVERSION}%20Final
 DISTNAME=	${PORTNAME}_${PORTVERSION}_final
@@ -22,13 +22,12 @@ SUB_FILES=	pkg-message
 .include <bsd.port.pre.mk>
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} htdocs ${WWWDIR}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} upgrade ${WWWDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} extras ${WWWDIR}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 	@${CHMOD} -R 755 ${WWWDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${CHMOD} 755 -R ${WWWDIR}' \
+	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' \
 		>> ${TMPPLIST}
 
 post-install:
diff --git a/www/impresscms/distinfo b/www/impresscms/distinfo
index b6d28ad27a1e..f2e3691281dd 100644
--- a/www/impresscms/distinfo
+++ b/www/impresscms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (impresscms_1.2.4_final.tar.gz) = 4b8de045431d754e6fa5f7c6e6808c588d08c332b4cdfd3ed878abc299d2ccd5
-SIZE (impresscms_1.2.4_final.tar.gz) = 6267717
+SHA256 (impresscms_1.2.5_final.tar.gz) = be854653330ab082fb8b1a4655a48900973215c9c449c279684d157976bba3c8
+SIZE (impresscms_1.2.5_final.tar.gz) = 6230153
diff --git a/www/impresscms/pkg-plist b/www/impresscms/pkg-plist
index 9d0eb05b6a14..2a01c9376dfc 100644
--- a/www/impresscms/pkg-plist
+++ b/www/impresscms/pkg-plist
@@ -3534,31 +3534,6 @@
 %%WWWDIR%%/htdocs/userinfo.php
 %%WWWDIR%%/htdocs/viewpmsg.php
 %%WWWDIR%%/htdocs/xmlrpc.php
-%%WWWDIR%%/upgrade/check_version.php
-%%WWWDIR%%/upgrade/cnt-2.2.x-to-2.0.x/index.php
-%%WWWDIR%%/upgrade/cnt-2.3.x-to-2.0.x/index.php
-%%WWWDIR%%/upgrade/img/logo.png
-%%WWWDIR%%/upgrade/img/no.png
-%%WWWDIR%%/upgrade/img/top_bg.png
-%%WWWDIR%%/upgrade/img/yes.png
-%%WWWDIR%%/upgrade/index.php
-%%WWWDIR%%/upgrade/language/english/login.tpl
-%%WWWDIR%%/upgrade/language/english/upgrade.php
-%%WWWDIR%%/upgrade/login.php
-%%WWWDIR%%/upgrade/readme.txt
-%%WWWDIR%%/upgrade/style.css
-%%WWWDIR%%/upgrade/style_rtl.css
-%%WWWDIR%%/upgrade/upd-2.0.13-to-2.0.14/index.php
-%%WWWDIR%%/upgrade/upd-2.0.15-to-2.0.16/index.php
-%%WWWDIR%%/upgrade/upd-2.0.16-to-2.0.17/index.php
-%%WWWDIR%%/upgrade/upd-2.0.17-to-2.0.18/index.php
-%%WWWDIR%%/upgrade/upd-2.0.18-to-impresscms-1.0/index.php
-%%WWWDIR%%/upgrade/upd-icms-1.0-to-1.1/index.php
-%%WWWDIR%%/upgrade/upd-icms-1.0-to-1.1/mainfile.dist.php
-%%WWWDIR%%/upgrade/upd-icms-1.0-to-1.1/settings_db.php
-%%WWWDIR%%/upgrade/upd-icms-1.0-to-1.1/settings_salt.php
-%%WWWDIR%%/upgrade/upd-icms-1.0-to-1.1/settings_trust_path.php
-%%WWWDIR%%/upgrade/upgrade_tpl.php
 @dirrm %%WWWDIR%%/extras/editors/FCKeditor/editor/filemanager/connectors
 @dirrm %%WWWDIR%%/extras/editors/FCKeditor/editor/filemanager
 @dirrm %%WWWDIR%%/extras/editors/FCKeditor/editor
@@ -3802,10 +3777,12 @@
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/root/modules/protector/admin
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/root/modules/protector/blocks
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/root/modules/protector/images
+@dirrm %%WWWDIR%%/htdocs/install/modules/protector/root/modules/protector/preload
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/root/modules/protector
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/root/modules
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/root
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/trust_path/modules/protector/admin
+@dirrm %%WWWDIR%%/htdocs/install/modules/protector/trust_path/modules/protector/blocks
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/trust_path/modules/protector/class
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/trust_path/modules/protector/configs
 @dirrm %%WWWDIR%%/htdocs/install/modules/protector/trust_path/modules/protector/doc
@@ -3842,6 +3819,10 @@
 @dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/Interchange
 @dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema
 @dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/ConfigSchema
+@dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/CSS
+@dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML
+@dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/Test
+@dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/URI
 @dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer
 @dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/DefinitionCache
 @dirrm %%WWWDIR%%/htdocs/libraries/htmlpurifier/standalone/HTMLPurifier/EntityLookup
@@ -3927,6 +3908,8 @@
 @dirrm %%WWWDIR%%/htdocs/libraries
 @dirrm %%WWWDIR%%/htdocs/modules/content/admin
 @dirrm %%WWWDIR%%/htdocs/modules/content/blocks
+@dirrm %%WWWDIR%%/htdocs/modules/content/class/form/elements
+@dirrm %%WWWDIR%%/htdocs/modules/content/class/form
 @dirrm %%WWWDIR%%/htdocs/modules/content/class
 @dirrm %%WWWDIR%%/htdocs/modules/content/images
 @dirrm %%WWWDIR%%/htdocs/modules/content/include
@@ -4005,6 +3988,7 @@
 @dirrm %%WWWDIR%%/htdocs/modules/system/admin/userrank
 @dirrm %%WWWDIR%%/htdocs/modules/system/admin/users/images
 @dirrm %%WWWDIR%%/htdocs/modules/system/admin/users
+@dirrm %%WWWDIR%%/htdocs/modules/system/admin/version/class
 @dirrm %%WWWDIR%%/htdocs/modules/system/admin/version/images
 @dirrm %%WWWDIR%%/htdocs/modules/system/admin/version
 @dirrm %%WWWDIR%%/htdocs/modules/system/admin
@@ -4122,16 +4106,4 @@
 @dirrm %%WWWDIR%%/htdocs/uploads/system
 @dirrm %%WWWDIR%%/htdocs/uploads
 @dirrm %%WWWDIR%%/htdocs
-@dirrm %%WWWDIR%%/upgrade/cnt-2.2.x-to-2.0.x
-@dirrm %%WWWDIR%%/upgrade/cnt-2.3.x-to-2.0.x
-@dirrm %%WWWDIR%%/upgrade/img
-@dirrm %%WWWDIR%%/upgrade/language/english
-@dirrm %%WWWDIR%%/upgrade/language
-@dirrm %%WWWDIR%%/upgrade/upd-2.0.13-to-2.0.14
-@dirrm %%WWWDIR%%/upgrade/upd-2.0.15-to-2.0.16
-@dirrm %%WWWDIR%%/upgrade/upd-2.0.16-to-2.0.17
-@dirrm %%WWWDIR%%/upgrade/upd-2.0.17-to-2.0.18
-@dirrm %%WWWDIR%%/upgrade/upd-2.0.18-to-impresscms-1.0
-@dirrm %%WWWDIR%%/upgrade/upd-icms-1.0-to-1.1
-@dirrm %%WWWDIR%%/upgrade
 @dirrm %%WWWDIR%%