- Update to 1.5.8

PR:		128911
Submitted by:	Wen Heping <wenheping@gmail.com>
Approved by:	maintainer

4 files changed, 25 insertions, 9 deletions

diff --git a/www/joomla15/Makefile b/www/joomla15/Makefile
index 40bb6ee1871d..cb24be446ac9 100644
--- a/www/joomla15/Makefile
+++ b/www/joomla15/Makefile
@@ -5,17 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	joomla15
-PORTVERSION=	1.5.7
+PORTVERSION=	1.5.8
 CATEGORIES=	www
-MASTER_SITES=	http://joomlacode.org/gf/download/frsrelease/8376/30993/ \
+MASTER_SITES=	http://joomlacode.org/gf/download/frsrelease/8897/32886/ \
 		http://web.dti.supsi.ch/downloads/
 DISTNAME=	Joomla_${PORTVERSION}-Stable-Full_Package
 
 MAINTAINER=	robi@nunnisoft.ch
 COMMENT=	A dynamic web content management system (CMS)
 
+FETCH_CMD=	fetch -Rr
 NO_BUILD=	yes
-USE_ZIP=	yes
 USE_MYSQL=	yes
 USE_PHP=	mysql pcre xml zlib session gd pdf
 WANT_PHP_WEB=	yes
diff --git a/www/joomla15/distinfo b/www/joomla15/distinfo
index d70d191e3a92..3c254df2cb48 100644
--- a/www/joomla15/distinfo
+++ b/www/joomla15/distinfo
@@ -1,3 +1,3 @@
-MD5 (Joomla_1.5.7-Stable-Full_Package.zip) = 7d7b69e88c391e6033dce72fb24aae84
-SHA256 (Joomla_1.5.7-Stable-Full_Package.zip) = 88f5b1afcc3e16744f23e9eba2ff9a04d07cd55801cae1c39d5fdccbf35e934a
-SIZE (Joomla_1.5.7-Stable-Full_Package.zip) = 6029609
+MD5 (Joomla_1.5.8-Stable-Full_Package.tar.gz) = 1a40ee8fbe9fe51fbc13f32b992a2401
+SHA256 (Joomla_1.5.8-Stable-Full_Package.tar.gz) = b07ce577d7f9a32001c5acc69e4e4822e40d6814f83eafa4e4f86d84e6e54390
+SIZE (Joomla_1.5.8-Stable-Full_Package.tar.gz) = 4194623
diff --git a/www/joomla15/files/pkg-message.in b/www/joomla15/files/pkg-message.in
index d5ba842dedbe..b85038272976 100644
--- a/www/joomla15/files/pkg-message.in
+++ b/www/joomla15/files/pkg-message.in
@@ -4,4 +4,8 @@
 		
   %%WWWDIR%%/INSTALL.php
 
+If you've just upgraded an existing installation, please read:
+
+http://docs.joomla.org/Category:Version_1.5.8_FAQ
+
 *******************************************************************
diff --git a/www/joomla15/pkg-plist b/www/joomla15/pkg-plist
index 583fadc2195d..263b64e37d41 100644
--- a/www/joomla15/pkg-plist
+++ b/www/joomla15/pkg-plist
@@ -1761,6 +1761,9 @@
 %%WWWDIR%%/installation/installer/views/index.html
 %%WWWDIR%%/installation/installer/views/install/index.html
 %%WWWDIR%%/installation/installer/views/install/view.php
+%%WWWDIR%%/installation/language/ar-DZ/ar-DZ.ini
+%%WWWDIR%%/installation/language/ar-DZ/ar-DZ.xml
+%%WWWDIR%%/installation/language/ar-DZ/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
@@ -1846,6 +1849,9 @@
 %%WWWDIR%%/installation/language/lv-LV/index.html
 %%WWWDIR%%/installation/language/lv-LV/lv-LV.ini
 %%WWWDIR%%/installation/language/lv-LV/lv-LV.xml
+%%WWWDIR%%/installation/language/mk-MK/index.html
+%%WWWDIR%%/installation/language/mk-MK/mk-MK.ini
+%%WWWDIR%%/installation/language/mk-MK/mk-MK.xml
 %%WWWDIR%%/installation/language/nb-NO/index.htm
 %%WWWDIR%%/installation/language/nb-NO/nb-NO.ini
 %%WWWDIR%%/installation/language/nb-NO/nb-NO.xml
@@ -1876,6 +1882,9 @@
 %%WWWDIR%%/installation/language/sk-SK/index.html
 %%WWWDIR%%/installation/language/sk-SK/sk-SK.ini
 %%WWWDIR%%/installation/language/sk-SK/sk-SK.xml
+%%WWWDIR%%/installation/language/sq-AL/index.html
+%%WWWDIR%%/installation/language/sq-AL/sq-AL.ini
+%%WWWDIR%%/installation/language/sq-AL/sq-AL.xml
 %%WWWDIR%%/installation/language/sr-ME/index.html
 %%WWWDIR%%/installation/language/sr-ME/sr-ME.ini
 %%WWWDIR%%/installation/language/sr-ME/sr-ME.xml
@@ -3381,8 +3390,8 @@
 %%WWWDIR%%/templates/beez/html/com_weblinks/category/default_items.php
 %%WWWDIR%%/templates/beez/html/com_weblinks/category/index.html
 %%WWWDIR%%/templates/beez/html/com_weblinks/index.html
-%%WWWDIR%%/templates/beez/html/com_weblinks/weblinks/form.php
-%%WWWDIR%%/templates/beez/html/com_weblinks/weblinks/index.html
+%%WWWDIR%%/templates/beez/html/com_weblinks/weblink/form.php
+%%WWWDIR%%/templates/beez/html/com_weblinks/weblink/index.html
 %%WWWDIR%%/templates/beez/html/editor_content.css
 %%WWWDIR%%/templates/beez/html/index.html
 %%WWWDIR%%/templates/beez/html/mod_latestnews/default.php
@@ -3972,9 +3981,9 @@
 @dirrm %%WWWDIR%%/templates/beez/html/mod_newsflash
 @dirrm %%WWWDIR%%/templates/beez/html/mod_login
 @dirrm %%WWWDIR%%/templates/beez/html/mod_latestnews
-@dirrm %%WWWDIR%%/templates/beez/html/com_weblinks/weblinks
 @dirrm %%WWWDIR%%/templates/beez/html/com_weblinks/category
 @dirrm %%WWWDIR%%/templates/beez/html/com_weblinks/categories
+@dirrm %%WWWDIR%%/templates/beez/html/com_weblinks/weblink
 @dirrm %%WWWDIR%%/templates/beez/html/com_weblinks
 @dirrm %%WWWDIR%%/templates/beez/html/com_user/user
 @dirrm %%WWWDIR%%/templates/beez/html/com_user/reset
@@ -4304,6 +4313,7 @@
 @dirrm %%WWWDIR%%/installation/language/sv-SE
 @dirrm %%WWWDIR%%/installation/language/sr-RS
 @dirrm %%WWWDIR%%/installation/language/sr-ME
+@dirrm %%WWWDIR%%/installation/language/sq-AL
 @dirrm %%WWWDIR%%/installation/language/sk-SK
 @dirrm %%WWWDIR%%/installation/language/si-LK
 @dirrm %%WWWDIR%%/installation/language/sd-PK
@@ -4314,6 +4324,7 @@
 @dirrm %%WWWDIR%%/installation/language/pl-PL
 @dirrm %%WWWDIR%%/installation/language/nl-NL
 @dirrm %%WWWDIR%%/installation/language/nb-NO
+@dirrm %%WWWDIR%%/installation/language/mk-MK
 @dirrm %%WWWDIR%%/installation/language/lv-LV
 @dirrm %%WWWDIR%%/installation/language/lt-LT
 @dirrm %%WWWDIR%%/installation/language/lo-LA
@@ -4342,6 +4353,7 @@
 @dirrm %%WWWDIR%%/installation/language/bn-IN
 @dirrm %%WWWDIR%%/installation/language/bg-BG
 @dirrm %%WWWDIR%%/installation/language/be-BY
+@dirrm %%WWWDIR%%/installation/language/ar-DZ
 @dirrm %%WWWDIR%%/installation/language
 @dirrm %%WWWDIR%%/installation/installer/views/install
 @dirrm %%WWWDIR%%/installation/installer/views