- Update to 1.4.2

  (Also fix the fetch error reported by QAT@)

Feature safe:	yes

3 files changed, 141 insertions, 30 deletions

diff --git a/www/fluxbb/Makefile b/www/fluxbb/Makefile
index 087ea49b9232..b486acbd24e7 100644
--- a/www/fluxbb/Makefile
+++ b/www/fluxbb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fluxbb
-PORTVERSION=	1.2.22
+PORTVERSION=	1.4.2
 CATEGORIES=	www
 MASTER_SITES=	http://fluxbb.org/download/releases/${PORTVERSION}/
 
@@ -35,8 +35,12 @@ USE_PHP+=	pgsql
 USE_PHP+=	sqlite
 .endif
 
+do-extract:
+	@${MKDIR} ${WRKSRC}
+	@${TAR} -yxf ${DISTDIR}/${DISTFILES} -C ${WRKSRC}
+
 do-install:
-	@cd ${WRKSRC}/upload && ${COPYTREE_SHARE} . ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
 
diff --git a/www/fluxbb/distinfo b/www/fluxbb/distinfo
index 3b22dbe5e48f..c943154b4359 100644
--- a/www/fluxbb/distinfo
+++ b/www/fluxbb/distinfo
@@ -1,3 +1,2 @@
-MD5 (fluxbb-1.2.22.tar.gz) = 2bcf1ad79e8e42d4ac695fd4c397a204
-SHA256 (fluxbb-1.2.22.tar.gz) = a7b97f507c5d684b4a8bb8ab82ac491f06e3d8db3f64c044f250890a22279ed0
-SIZE (fluxbb-1.2.22.tar.gz) = 162044
+SHA256 (fluxbb-1.4.2.tar.gz) = 265f13fa18911c40dcdf5a66636fa4f3f115400f00da474ac8bdcecd9c17c3a8
+SIZE (fluxbb-1.4.2.tar.gz) = 269153
diff --git a/www/fluxbb/pkg-plist b/www/fluxbb/pkg-plist
index 6395af00df55..55d4293f4150 100644
--- a/www/fluxbb/pkg-plist
+++ b/www/fluxbb/pkg-plist
@@ -1,3 +1,5 @@
+%%WWWDIR%%/.gitignore
+%%WWWDIR%%/COPYING
 %%WWWDIR%%/admin_bans.php
 %%WWWDIR%%/admin_categories.php
 %%WWWDIR%%/admin_censoring.php
@@ -14,6 +16,7 @@
 %%WWWDIR%%/admin_users.php
 %%WWWDIR%%/cache/.htaccess
 %%WWWDIR%%/cache/index.html
+%%WWWDIR%%/db_update.php
 %%WWWDIR%%/delete.php
 %%WWWDIR%%/edit.php
 %%WWWDIR%%/extern.php
@@ -35,17 +38,21 @@
 %%WWWDIR%%/img/smilies/tongue.png
 %%WWWDIR%%/img/smilies/wink.png
 %%WWWDIR%%/img/smilies/yikes.png
+%%WWWDIR%%/img/test.png
 %%WWWDIR%%/include/cache.php
 %%WWWDIR%%/include/common.php
 %%WWWDIR%%/include/common_admin.php
 %%WWWDIR%%/include/dblayer/common_db.php
 %%WWWDIR%%/include/dblayer/index.html
 %%WWWDIR%%/include/dblayer/mysql.php
+%%WWWDIR%%/include/dblayer/mysql_innodb.php
 %%WWWDIR%%/include/dblayer/mysqli.php
+%%WWWDIR%%/include/dblayer/mysqli_innodb.php
 %%WWWDIR%%/include/dblayer/pgsql.php
 %%WWWDIR%%/include/dblayer/sqlite.php
 %%WWWDIR%%/include/email.php
 %%WWWDIR%%/include/functions.php
+%%WWWDIR%%/include/index.html
 %%WWWDIR%%/include/parser.php
 %%WWWDIR%%/include/search_idx.php
 %%WWWDIR%%/include/template/admin.tpl
@@ -54,9 +61,50 @@
 %%WWWDIR%%/include/template/main.tpl
 %%WWWDIR%%/include/template/maintenance.tpl
 %%WWWDIR%%/include/template/redirect.tpl
+%%WWWDIR%%/include/utf8/index.html
+%%WWWDIR%%/include/utf8/mbstring/core.php
+%%WWWDIR%%/include/utf8/mbstring/index.html
+%%WWWDIR%%/include/utf8/native/core.php
+%%WWWDIR%%/include/utf8/native/index.html
+%%WWWDIR%%/include/utf8/ord.php
+%%WWWDIR%%/include/utf8/str_ireplace.php
+%%WWWDIR%%/include/utf8/str_pad.php
+%%WWWDIR%%/include/utf8/str_split.php
+%%WWWDIR%%/include/utf8/strcasecmp.php
+%%WWWDIR%%/include/utf8/strcspn.php
+%%WWWDIR%%/include/utf8/stristr.php
+%%WWWDIR%%/include/utf8/strrev.php
+%%WWWDIR%%/include/utf8/strspn.php
+%%WWWDIR%%/include/utf8/substr_replace.php
+%%WWWDIR%%/include/utf8/trim.php
+%%WWWDIR%%/include/utf8/ucfirst.php
+%%WWWDIR%%/include/utf8/ucwords.php
+%%WWWDIR%%/include/utf8/utf8.php
+%%WWWDIR%%/include/utf8/utils/ascii.php
+%%WWWDIR%%/include/utf8/utils/bad.php
+%%WWWDIR%%/include/utf8/utils/index.html
+%%WWWDIR%%/include/utf8/utils/patterns.php
+%%WWWDIR%%/include/utf8/utils/position.php
+%%WWWDIR%%/include/utf8/utils/specials.php
+%%WWWDIR%%/include/utf8/utils/unicode.php
+%%WWWDIR%%/include/utf8/utils/validation.php
 %%WWWDIR%%/index.php
 %%WWWDIR%%/install.php
-%%WWWDIR%%/lang/index.html
+%%WWWDIR%%/lang/English/admin_bans.php
+%%WWWDIR%%/lang/English/admin_categories.php
+%%WWWDIR%%/lang/English/admin_censoring.php
+%%WWWDIR%%/lang/English/admin_common.php
+%%WWWDIR%%/lang/English/admin_forums.php
+%%WWWDIR%%/lang/English/admin_groups.php
+%%WWWDIR%%/lang/English/admin_index.php
+%%WWWDIR%%/lang/English/admin_maintenance.php
+%%WWWDIR%%/lang/English/admin_options.php
+%%WWWDIR%%/lang/English/admin_permissions.php
+%%WWWDIR%%/lang/English/admin_plugin_example.php
+%%WWWDIR%%/lang/English/admin_prune.php
+%%WWWDIR%%/lang/English/admin_ranks.php
+%%WWWDIR%%/lang/English/admin_reports.php
+%%WWWDIR%%/lang/English/admin_users.php
 %%WWWDIR%%/lang/English/common.php
 %%WWWDIR%%/lang/English/delete.php
 %%WWWDIR%%/lang/English/forum.php
@@ -64,6 +112,14 @@
 %%WWWDIR%%/lang/English/index.html
 %%WWWDIR%%/lang/English/index.php
 %%WWWDIR%%/lang/English/login.php
+%%WWWDIR%%/lang/English/mail_templates/activate_email.tpl
+%%WWWDIR%%/lang/English/mail_templates/activate_password.tpl
+%%WWWDIR%%/lang/English/mail_templates/form_email.tpl
+%%WWWDIR%%/lang/English/mail_templates/index.html
+%%WWWDIR%%/lang/English/mail_templates/new_reply.tpl
+%%WWWDIR%%/lang/English/mail_templates/new_reply_full.tpl
+%%WWWDIR%%/lang/English/mail_templates/rename.tpl
+%%WWWDIR%%/lang/English/mail_templates/welcome.tpl
 %%WWWDIR%%/lang/English/misc.php
 %%WWWDIR%%/lang/English/post.php
 %%WWWDIR%%/lang/English/prof_reg.php
@@ -73,13 +129,7 @@
 %%WWWDIR%%/lang/English/stopwords.txt
 %%WWWDIR%%/lang/English/topic.php
 %%WWWDIR%%/lang/English/userlist.php
-%%WWWDIR%%/lang/English/mail_templates/activate_email.tpl
-%%WWWDIR%%/lang/English/mail_templates/activate_password.tpl
-%%WWWDIR%%/lang/English/mail_templates/form_email.tpl
-%%WWWDIR%%/lang/English/mail_templates/index.html
-%%WWWDIR%%/lang/English/mail_templates/new_reply.tpl
-%%WWWDIR%%/lang/English/mail_templates/new_reply_full.tpl
-%%WWWDIR%%/lang/English/mail_templates/welcome.tpl
+%%WWWDIR%%/lang/index.html
 %%WWWDIR%%/login.php
 %%WWWDIR%%/misc.php
 %%WWWDIR%%/moderate.php
@@ -89,19 +139,66 @@
 %%WWWDIR%%/profile.php
 %%WWWDIR%%/register.php
 %%WWWDIR%%/search.php
+%%WWWDIR%%/style/Air/base_admin.css
+%%WWWDIR%%/style/Air/img/asterisk.png
+%%WWWDIR%%/style/Air/img/bull.png
+%%WWWDIR%%/style/Air/img/email.png
+%%WWWDIR%%/style/Air/img/exclaim.png
+%%WWWDIR%%/style/Air/img/ext.png
+%%WWWDIR%%/style/Air/img/feed.png
+%%WWWDIR%%/style/Air/img/help.png
+%%WWWDIR%%/style/Air/img/index.html
+%%WWWDIR%%/style/Air/img/main_end.png
+%%WWWDIR%%/style/Air/img/main_top.png
+%%WWWDIR%%/style/Air/index.html
+%%WWWDIR%%/style/Air.css
 %%WWWDIR%%/style/Cobalt.css
+%%WWWDIR%%/style/Earth/base_admin.css
+%%WWWDIR%%/style/Earth/img/asterisk.png
+%%WWWDIR%%/style/Earth/img/bull.png
+%%WWWDIR%%/style/Earth/img/email.png
+%%WWWDIR%%/style/Earth/img/exclaim.png
+%%WWWDIR%%/style/Earth/img/ext.png
+%%WWWDIR%%/style/Earth/img/feed.png
+%%WWWDIR%%/style/Earth/img/help.png
+%%WWWDIR%%/style/Earth/img/index.html
+%%WWWDIR%%/style/Earth/img/main_end.png
+%%WWWDIR%%/style/Earth/img/main_top.png
+%%WWWDIR%%/style/Earth/index.html
+%%WWWDIR%%/style/Earth.css
+%%WWWDIR%%/style/Fire/base_admin.css
+%%WWWDIR%%/style/Fire/img/asterisk.png
+%%WWWDIR%%/style/Fire/img/bull.png
+%%WWWDIR%%/style/Fire/img/email.png
+%%WWWDIR%%/style/Fire/img/exclaim.png
+%%WWWDIR%%/style/Fire/img/ext.png
+%%WWWDIR%%/style/Fire/img/feed.png
+%%WWWDIR%%/style/Fire/img/help.png
+%%WWWDIR%%/style/Fire/img/index.html
+%%WWWDIR%%/style/Fire/img/main_end.png
+%%WWWDIR%%/style/Fire/img/main_top.png
+%%WWWDIR%%/style/Fire/index.html
+%%WWWDIR%%/style/Fire.css
 %%WWWDIR%%/style/Lithium.css
 %%WWWDIR%%/style/Mercury.css
 %%WWWDIR%%/style/Oxygen.css
 %%WWWDIR%%/style/Radium.css
 %%WWWDIR%%/style/Sulfur.css
-%%WWWDIR%%/style/imports/Cobalt_cs.css
-%%WWWDIR%%/style/imports/Lithium_cs.css
-%%WWWDIR%%/style/imports/Mercury_cs.css
-%%WWWDIR%%/style/imports/Oxygen_cs.css
-%%WWWDIR%%/style/imports/Radium_cs.css
-%%WWWDIR%%/style/imports/Sulfur_cs.css
-%%WWWDIR%%/style/imports/base.css
+%%WWWDIR%%/style/Technetium/bg.png
+%%WWWDIR%%/style/Technetium/dark-shade.png
+%%WWWDIR%%/style/Technetium/darker-shade.png
+%%WWWDIR%%/style/Technetium/feed.png
+%%WWWDIR%%/style/Technetium/icon-closed-sticky.png
+%%WWWDIR%%/style/Technetium/icon-closed.png
+%%WWWDIR%%/style/Technetium/icon-moved.png
+%%WWWDIR%%/style/Technetium/icon-new-sticky.png
+%%WWWDIR%%/style/Technetium/icon-new.png
+%%WWWDIR%%/style/Technetium/icon-nonew-sticky.png
+%%WWWDIR%%/style/Technetium/icon-nonew.png
+%%WWWDIR%%/style/Technetium/index.html
+%%WWWDIR%%/style/Technetium/inv-shade.png
+%%WWWDIR%%/style/Technetium/light-shade.png
+%%WWWDIR%%/style/Technetium.css
 %%WWWDIR%%/style/imports/base_admin.css
 %%WWWDIR%%/style/imports/index.html
 %%WWWDIR%%/style/imports/minmax.js
@@ -109,17 +206,28 @@
 %%WWWDIR%%/userlist.php
 %%WWWDIR%%/viewforum.php
 %%WWWDIR%%/viewtopic.php
-@dirrm %%WWWDIR%%/style/imports
-@dirrm %%WWWDIR%%/style
-@dirrm %%WWWDIR%%/plugins
+@dirrm %%WWWDIR%%/cache
+@dirrm %%WWWDIR%%/img/avatars
+@dirrm %%WWWDIR%%/img/smilies
+@dirrm %%WWWDIR%%/img
+@dirrm %%WWWDIR%%/include/dblayer
+@dirrm %%WWWDIR%%/include/template
+@dirrm %%WWWDIR%%/include/utf8/mbstring
+@dirrm %%WWWDIR%%/include/utf8/native
+@dirrm %%WWWDIR%%/include/utf8/utils
+@dirrm %%WWWDIR%%/include/utf8
+@dirrm %%WWWDIR%%/include
 @dirrm %%WWWDIR%%/lang/English/mail_templates
 @dirrm %%WWWDIR%%/lang/English
 @dirrm %%WWWDIR%%/lang
-@dirrm %%WWWDIR%%/include/template
-@dirrm %%WWWDIR%%/include/dblayer
-@dirrm %%WWWDIR%%/include
-@dirrm %%WWWDIR%%/img/smilies
-@dirrm %%WWWDIR%%/img/avatars
-@dirrm %%WWWDIR%%/img
-@dirrm %%WWWDIR%%/cache
+@dirrm %%WWWDIR%%/plugins
+@dirrm %%WWWDIR%%/style/Air/img
+@dirrm %%WWWDIR%%/style/Air
+@dirrm %%WWWDIR%%/style/Earth/img
+@dirrm %%WWWDIR%%/style/Earth
+@dirrm %%WWWDIR%%/style/Fire/img
+@dirrm %%WWWDIR%%/style/Fire
+@dirrm %%WWWDIR%%/style/Technetium
+@dirrm %%WWWDIR%%/style/imports
+@dirrm %%WWWDIR%%/style
 @dirrm %%WWWDIR%%