- Update to 1.6.4

PR:		ports/158414
Submitted by:	Terry Sposato <tabmow@freenode.net>

3 files changed, 35 insertions, 10 deletions

diff --git a/www/joomla25/Makefile b/www/joomla25/Makefile
index e5a997983ace..3a948b609956 100644
--- a/www/joomla25/Makefile
+++ b/www/joomla25/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	joomla
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.4
 CATEGORIES=	www
-MASTER_SITES=	http://joomlacode.org/gf/download/frsrelease/14236/62391/
+MASTER_SITES=	http://joomlacode.org/gf/download/frsrelease/15063/65931/
 DISTNAME=	Joomla_${PORTVERSION}-Stable-Full_Package
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	A dynamic web content management system (CMS)
@@ -26,7 +25,7 @@ SUB_FILES=	pkg-message
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
-	@${TAR} -yxf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKSRC}
+	@${TAR} -yxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${WWWDIR}
diff --git a/www/joomla25/distinfo b/www/joomla25/distinfo
index 5e66d37cc336..6ad174a92c5f 100644
--- a/www/joomla25/distinfo
+++ b/www/joomla25/distinfo
@@ -1,2 +1,2 @@
-SHA256 (joomla/Joomla_1.6.1-Stable-Full_Package.tar.bz2) = 1527f755519449da0870c6c4ae92eb16318e217258ca1d096c3f7549fddc9df9
-SIZE (joomla/Joomla_1.6.1-Stable-Full_Package.tar.bz2) = 5081734
+SHA256 (Joomla_1.6.4-Stable-Full_Package.tar.bz2) = 80bfedc9a48aa2cd48722f1d01459f6dd7f65208783202a02929360031465c99
+SIZE (Joomla_1.6.4-Stable-Full_Package.tar.bz2) = 5107208
diff --git a/www/joomla25/pkg-plist b/www/joomla25/pkg-plist
index 11311130d15e..1bb87e49db35 100644
--- a/www/joomla25/pkg-plist
+++ b/www/joomla25/pkg-plist
@@ -1,5 +1,6 @@
 %%WWWDIR%%/LICENSE.txt
 %%WWWDIR%%/README.txt
+%%WWWDIR%%/web.config.txt
 %%WWWDIR%%/administrator/cache/index.html
 %%WWWDIR%%/administrator/components/com_admin/admin.php
 %%WWWDIR%%/administrator/components/com_admin/admin.xml
@@ -748,7 +749,6 @@
 %%WWWDIR%%/administrator/components/com_users/controllers/users.php
 %%WWWDIR%%/administrator/components/com_users/helpers/debug.php
 %%WWWDIR%%/administrator/components/com_users/helpers/index.html
-%%WWWDIR%%/administrator/components/com_users/helpers/levels.php
 %%WWWDIR%%/administrator/components/com_users/helpers/users.php
 %%WWWDIR%%/administrator/components/com_users/index.html
 %%WWWDIR%%/administrator/components/com_users/models/debuggroup.php
@@ -979,6 +979,7 @@
 %%WWWDIR%%/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
 %%WWWDIR%%/administrator/language/en-GB/en-GB.ini
 %%WWWDIR%%/administrator/language/en-GB/en-GB.lib_joomla.ini
+%%WWWDIR%%/administrator/language/en-GB/en-GB.localise.php
 %%WWWDIR%%/administrator/language/en-GB/en-GB.mod_custom.ini
 %%WWWDIR%%/administrator/language/en-GB/en-GB.mod_custom.sys.ini
 %%WWWDIR%%/administrator/language/en-GB/en-GB.mod_feed.ini
@@ -2041,9 +2042,14 @@
 %%WWWDIR%%/components/com_contact/models/category.php
 %%WWWDIR%%/components/com_contact/models/contact.php
 %%WWWDIR%%/components/com_contact/models/featured.php
-%%WWWDIR%%/components/com_contact/models/form/contact.xml
-%%WWWDIR%%/components/com_contact/models/form/index.html
+%%WWWDIR%%/components/com_contact/models/forms/contact.xml
+%%WWWDIR%%/components/com_contact/models/forms/form.xml
+%%WWWDIR%%/components/com_contact/models/forms/index.html
 %%WWWDIR%%/components/com_contact/models/index.html
+%%WWWDIR%%/components/com_contact/models/rules/contactemail.php
+%%WWWDIR%%/components/com_contact/models/rules/contactemailmessage.php
+%%WWWDIR%%/components/com_contact/models/rules/contactemailsubject.php
+%%WWWDIR%%/components/com_contact/models/rules/index.html
 %%WWWDIR%%/components/com_contact/router.php
 %%WWWDIR%%/components/com_contact/views/categories/index.html
 %%WWWDIR%%/components/com_contact/views/categories/tmpl/default.php
@@ -2423,6 +2429,9 @@
 %%WWWDIR%%/installation/language/ar-AA/ar-AA.ini
 %%WWWDIR%%/installation/language/ar-AA/ar-AA.xml
 %%WWWDIR%%/installation/language/ar-AA/index.html
+%%WWWDIR%%/installation/language/az-AZ/az-AZ.ini
+%%WWWDIR%%/installation/language/az-AZ/az-AZ.xml
+%%WWWDIR%%/installation/language/az-AZ/index.html
 %%WWWDIR%%/installation/language/be-BY/be-BY.ini
 %%WWWDIR%%/installation/language/be-BY/be-BY.xml
 %%WWWDIR%%/installation/language/be-BY/index.html
@@ -2432,6 +2441,9 @@
 %%WWWDIR%%/installation/language/bn-BD/bn-BD.ini
 %%WWWDIR%%/installation/language/bn-BD/bn-BD.xml
 %%WWWDIR%%/installation/language/bn-BD/index.html
+%%WWWDIR%%/installation/language/bs-BA/bs-BA.ini
+%%WWWDIR%%/installation/language/bs-BA/bs-BA.xml
+%%WWWDIR%%/installation/language/bs-BA/index.html
 %%WWWDIR%%/installation/language/ca-ES/ca-ES.ini
 %%WWWDIR%%/installation/language/ca-ES/ca-ES.xml
 %%WWWDIR%%/installation/language/ca-ES/index.html
@@ -2486,6 +2498,8 @@
 %%WWWDIR%%/installation/language/he-IL/he-IL.ini
 %%WWWDIR%%/installation/language/he-IL/he-IL.xml
 %%WWWDIR%%/installation/language/he-IL/index.html
+%%WWWDIR%%/installation/language/hr-HR/hr-HR.ini
+%%WWWDIR%%/installation/language/hr-HR/hr-HR.xml
 %%WWWDIR%%/installation/language/hu-HU/hu-HU.ini
 %%WWWDIR%%/installation/language/hu-HU/hu-HU.xml
 %%WWWDIR%%/installation/language/hu-HU/index.html
@@ -2493,6 +2507,9 @@
 %%WWWDIR%%/installation/language/id-ID/id-ID.xml
 %%WWWDIR%%/installation/language/id-ID/index.html
 %%WWWDIR%%/installation/language/index.html
+%%WWWDIR%%/installation/language/is-IS/index.html
+%%WWWDIR%%/installation/language/is-IS/is-IS.ini
+%%WWWDIR%%/installation/language/is-IS/is-IS.xml
 %%WWWDIR%%/installation/language/it-IT/index.html
 %%WWWDIR%%/installation/language/it-IT/it-IT.ini
 %%WWWDIR%%/installation/language/it-IT/it-IT.xml
@@ -2704,6 +2721,7 @@
 %%WWWDIR%%/language/en-GB/en-GB.com_wrapper.ini
 %%WWWDIR%%/language/en-GB/en-GB.files_joomla.sys.ini
 %%WWWDIR%%/language/en-GB/en-GB.ini
+%%WWWDIR%%/language/en-GB/en-GB.lib_joomla.ini
 %%WWWDIR%%/language/en-GB/en-GB.localise.php
 %%WWWDIR%%/language/en-GB/en-GB.mod_articles_archive.ini
 %%WWWDIR%%/language/en-GB/en-GB.mod_articles_archive.sys.ini
@@ -3631,6 +3649,7 @@
 %%WWWDIR%%/media/mod_languages/images/it.gif
 %%WWWDIR%%/media/mod_languages/images/ja.gif
 %%WWWDIR%%/media/mod_languages/images/ka.gif
+%%WWWDIR%%/media/mod_languages/images/km.gif
 %%WWWDIR%%/media/mod_languages/images/ko.gif
 %%WWWDIR%%/media/mod_languages/images/ku.gif
 %%WWWDIR%%/media/mod_languages/images/lt.gif
@@ -3669,6 +3688,7 @@
 %%WWWDIR%%/media/system/images/arrow_rtl.png
 %%WWWDIR%%/media/system/images/blank.png
 %%WWWDIR%%/media/system/images/calendar.png
+%%WWWDIR%%/media/system/images/checked_out.png
 %%WWWDIR%%/media/system/images/edit.png
 %%WWWDIR%%/media/system/images/edit_unpublished.png
 %%WWWDIR%%/media/system/images/emailButton.png
@@ -4242,6 +4262,7 @@
 %%WWWDIR%%/templates/beez_20/css/nature.css
 %%WWWDIR%%/templates/beez_20/css/nature_rtl.css
 %%WWWDIR%%/templates/beez_20/css/personal.css
+%%WWWDIR%%/templates/beez_20/css/personal_rtl.css
 %%WWWDIR%%/templates/beez_20/css/position.css
 %%WWWDIR%%/templates/beez_20/css/print.css
 %%WWWDIR%%/templates/beez_20/css/template.css
@@ -4825,7 +4846,8 @@
 @dirrm %%WWWDIR%%/components/com_banners
 @dirrm %%WWWDIR%%/components/com_contact/controllers
 @dirrm %%WWWDIR%%/components/com_contact/helpers
-@dirrm %%WWWDIR%%/components/com_contact/models/form
+@dirrm %%WWWDIR%%/components/com_contact/models/forms
+@dirrm %%WWWDIR%%/components/com_contact/models/rules
 @dirrm %%WWWDIR%%/components/com_contact/models
 @dirrm %%WWWDIR%%/components/com_contact/views/categories/tmpl
 @dirrm %%WWWDIR%%/components/com_contact/views/categories
@@ -4929,9 +4951,11 @@
 @dirrm %%WWWDIR%%/installation/includes
 @dirrm %%WWWDIR%%/installation/language/af-ZA
 @dirrm %%WWWDIR%%/installation/language/ar-AA
+@dirrm %%WWWDIR%%/installation/language/az-AZ
 @dirrm %%WWWDIR%%/installation/language/be-BY
 @dirrm %%WWWDIR%%/installation/language/bg-BG
 @dirrm %%WWWDIR%%/installation/language/bn-BD
+@dirrm %%WWWDIR%%/installation/language/bs-BA
 @dirrm %%WWWDIR%%/installation/language/ca-ES
 @dirrm %%WWWDIR%%/installation/language/ckb-IQ
 @dirrm %%WWWDIR%%/installation/language/cs-CZ
@@ -4950,8 +4974,10 @@
 @dirrm %%WWWDIR%%/installation/language/gl-ES
 @dirrm %%WWWDIR%%/installation/language/gu-IN
 @dirrm %%WWWDIR%%/installation/language/he-IL
+@dirrm %%WWWDIR%%/installation/language/hr-HR
 @dirrm %%WWWDIR%%/installation/language/hu-HU
 @dirrm %%WWWDIR%%/installation/language/id-ID
+@dirrm %%WWWDIR%%/installation/language/is-IS
 @dirrm %%WWWDIR%%/installation/language/it-IT
 @dirrm %%WWWDIR%%/installation/language/ja-JP
 @dirrm %%WWWDIR%%/installation/language/ka-GE