- Update to 2.6.7.

PR:		ports/149104
Submitted by:	Bo-Yi Wu <appleboy.tw@gmail.com>
Approved by:	Florian Smeets <flo@smeets.im> (maintainer)

4 files changed, 37 insertions, 16 deletions

diff --git a/www/phpmyfaq/Makefile b/www/phpmyfaq/Makefile
index 8923a1721ae2..727c4a9dd118 100644
--- a/www/phpmyfaq/Makefile
+++ b/www/phpmyfaq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phpmyfaq
-PORTVERSION=	2.6.6
+PORTVERSION=	2.6.7
 CATEGORIES=	www
 MASTER_SITES=	http://www.phpmyfaq.de/download/
 
diff --git a/www/phpmyfaq/distinfo b/www/phpmyfaq/distinfo
index 23fed9f2c337..a87820f3e386 100644
--- a/www/phpmyfaq/distinfo
+++ b/www/phpmyfaq/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpmyfaq-2.6.6.tar.gz) = 8b7eb7996313382a0ac93dc0a64a48ff
-SHA256 (phpmyfaq-2.6.6.tar.gz) = a4ceec951c78b53a72d12ef0239196280964d9b8f996c5705726cfcd5270cade
-SIZE (phpmyfaq-2.6.6.tar.gz) = 3032100
+MD5 (phpmyfaq-2.6.7.tar.gz) = 3d15bff7d1d711a6061b56d880a46ffc
+SHA256 (phpmyfaq-2.6.7.tar.gz) = 71e5846d4854548444f41b0d02ec221fda72439cf512cdefdb34332e7788029a
+SIZE (phpmyfaq-2.6.7.tar.gz) = 3034093
diff --git a/www/phpmyfaq/files/patch-inc-PMF_Search-Resultset.php b/www/phpmyfaq/files/patch-inc-PMF_Search-Resultset.php
new file mode 100644
index 000000000000..15237bf1c74d
--- /dev/null
+++ b/www/phpmyfaq/files/patch-inc-PMF_Search-Resultset.php
@@ -0,0 +1,11 @@
+--- ./inc/PMF_Search/Resultset.php.orig	2010-08-02 13:58:15.000000000 +0200
++++ ./inc/PMF_Search/Resultset.php	2010-08-02 13:58:40.000000000 +0200
+@@ -107,7 +107,9 @@
+         
+         $duplicateResults = array();
+         $currentUserId    = $this->user->getUserId();
+-        $currentGroupIds  = $this->user->perm->getUserGroups($currentUserId);
++        if ('medium' == PMF_Configuration::getInstance()->get('main.permLevel')) {
++            $currentGroupIds  = $this->user->perm->getUserGroups($currentUserId);
++        }
+
diff --git a/www/phpmyfaq/pkg-plist b/www/phpmyfaq/pkg-plist
index 2142baa25a16..a92a87cd30ed 100644
--- a/www/phpmyfaq/pkg-plist
+++ b/www/phpmyfaq/pkg-plist
@@ -656,8 +656,8 @@
 %%WWWDIR%%/admin/images/url-noajax.png
 %%WWWDIR%%/admin/images/url-nolinks.png
 %%WWWDIR%%/admin/images/url-noscript.png
-%%WWWDIR%%/admin/js/user.js
 %%WWWDIR%%/admin/index.php
+%%WWWDIR%%/admin/js/user.js
 %%WWWDIR%%/admin/linkconfig.main.php
 %%WWWDIR%%/admin/news.php
 %%WWWDIR%%/admin/password.php
@@ -694,10 +694,10 @@
 %%WWWDIR%%/contact.php
 %%WWWDIR%%/cron.verifyurls.php
 %%WWWDIR%%/docs/CHANGEDFILES
+%%WWWDIR%%/docs/CHANGELOG
 %%WWWDIR%%/docs/INSTALL
 %%WWWDIR%%/docs/LICENSE
 %%WWWDIR%%/docs/README
-%%WWWDIR%%/docs/CHANGELOG
 %%WWWDIR%%/docs/documentation.en.html
 %%WWWDIR%%/feed/category/rss.php
 %%WWWDIR%%/feed/latest/rss.php
@@ -797,12 +797,21 @@
 %%WWWDIR%%/inc/PMF_Perm/PermMedium.php
 %%WWWDIR%%/inc/PMF_Search/Abstract.php
 %%WWWDIR%%/inc/PMF_Search/Database.php
+%%WWWDIR%%/inc/PMF_Search/Database/Ibase.php
+%%WWWDIR%%/inc/PMF_Search/Database/Ibm_db2.php
+%%WWWDIR%%/inc/PMF_Search/Database/Mssql.php
 %%WWWDIR%%/inc/PMF_Search/Database/Mysql.php
 %%WWWDIR%%/inc/PMF_Search/Database/Mysqli.php
+%%WWWDIR%%/inc/PMF_Search/Database/Oci8.php
 %%WWWDIR%%/inc/PMF_Search/Database/Pgsql.php
+%%WWWDIR%%/inc/PMF_Search/Database/Sqlite.php
+%%WWWDIR%%/inc/PMF_Search/Database/Sqlsrv.php
+%%WWWDIR%%/inc/PMF_Search/Database/Sybase.php
 %%WWWDIR%%/inc/PMF_Search/Exception.php
+%%WWWDIR%%/inc/PMF_Search/Factory.php
 %%WWWDIR%%/inc/PMF_Search/Interface.php
 %%WWWDIR%%/inc/PMF_Search/Resultset.php
+%%WWWDIR%%/inc/PMF_Search/Resultset.php.orig
 %%WWWDIR%%/inc/PMF_String/Abstract.php
 %%WWWDIR%%/inc/PMF_String/Basic.php
 %%WWWDIR%%/inc/PMF_String/Mbstring.php
@@ -837,8 +846,6 @@
 %%WWWDIR%%/inc/js/plugins/datePicker/jquery.datePicker.js
 %%WWWDIR%%/inc/js/suggest.js
 %%WWWDIR%%/inc/js/syntaxhighlighter/LGPLv3.txt
-%%WWWDIR%%/inc/js/syntaxhighlighter/src/shCore.js
-%%WWWDIR%%/inc/js/syntaxhighlighter/src/shLegacy.js
 %%WWWDIR%%/inc/js/syntaxhighlighter/scripts/clipboard.swf
 %%WWWDIR%%/inc/js/syntaxhighlighter/scripts/shBrushAS3.js
 %%WWWDIR%%/inc/js/syntaxhighlighter/scripts/shBrushBash.js
@@ -865,6 +872,8 @@
 %%WWWDIR%%/inc/js/syntaxhighlighter/scripts/shBrushXml.js
 %%WWWDIR%%/inc/js/syntaxhighlighter/scripts/shCore.js
 %%WWWDIR%%/inc/js/syntaxhighlighter/scripts/shLegacy.js
+%%WWWDIR%%/inc/js/syntaxhighlighter/src/shCore.js
+%%WWWDIR%%/inc/js/syntaxhighlighter/src/shLegacy.js
 %%WWWDIR%%/inc/js/syntaxhighlighter/styles/help.png
 %%WWWDIR%%/inc/js/syntaxhighlighter/styles/magnifier.png
 %%WWWDIR%%/inc/js/syntaxhighlighter/styles/page_white_code.png
@@ -925,6 +934,7 @@
 %%WWWDIR%%/install/questionnaire.php
 %%WWWDIR%%/install/setup.php
 %%WWWDIR%%/install/sqlite.sql.php
+%%WWWDIR%%/install/sqlsrv.sql.php
 %%WWWDIR%%/install/stopwords.sql.php
 %%WWWDIR%%/install/style/setup.css
 %%WWWDIR%%/install/sybase.sql.php
@@ -983,15 +993,15 @@
 %%WWWDIR%%/savecomment.php
 %%WWWDIR%%/savequestion.php
 %%WWWDIR%%/savevoting.php
+%%WWWDIR%%/scripts/git2changelog.sh
+%%WWWDIR%%/scripts/git2package.sh
+%%WWWDIR%%/scripts/version.sh
 %%WWWDIR%%/search.php
 %%WWWDIR%%/send2friend.php
 %%WWWDIR%%/sendmail.php
 %%WWWDIR%%/show.php
 %%WWWDIR%%/sitemap.google.php
 %%WWWDIR%%/sitemap.php
-%%WWWDIR%%/scripts/git2changelog.sh
-%%WWWDIR%%/scripts/git2package.sh
-%%WWWDIR%%/scripts/version.sh
 %%WWWDIR%%/template/default/add.tpl
 %%WWWDIR%%/template/default/artikel.tpl
 %%WWWDIR%%/template/default/ask.tpl
@@ -1034,6 +1044,7 @@
 @dirrm %%WWWDIR%%/xml
 @dirrm %%WWWDIR%%/template/default
 @dirrmtry %%WWWDIR%%/template
+@dirrm %%WWWDIR%%/scripts
 @dirrmtry %%WWWDIR%%/pdf
 @dirrm %%WWWDIR%%/lang
 @dirrm %%WWWDIR%%/install/style
@@ -1043,18 +1054,18 @@
 @dirrm %%WWWDIR%%/inc/libs/phpseclib/Crypt
 @dirrm %%WWWDIR%%/inc/libs/phpseclib
 @dirrm %%WWWDIR%%/inc/libs
-@dirrm %%WWWDIR%%/inc/js/syntaxhighlighter/scripts
 @dirrm %%WWWDIR%%/inc/js/syntaxhighlighter/styles
 @dirrm %%WWWDIR%%/inc/js/syntaxhighlighter/src
+@dirrm %%WWWDIR%%/inc/js/syntaxhighlighter/scripts
 @dirrm %%WWWDIR%%/inc/js/syntaxhighlighter
 @dirrm %%WWWDIR%%/inc/js/plugins/datePicker
 @dirrm %%WWWDIR%%/inc/js/plugins/autocomplete
 @dirrm %%WWWDIR%%/inc/js/plugins
 @dirrm %%WWWDIR%%/inc/js
 @dirrm %%WWWDIR%%/inc/PMF_User
+@dirrm %%WWWDIR%%/inc/PMF_String
 @dirrm %%WWWDIR%%/inc/PMF_Search/Database
 @dirrm %%WWWDIR%%/inc/PMF_Search
-@dirrm %%WWWDIR%%/inc/PMF_String
 @dirrm %%WWWDIR%%/inc/PMF_Perm
 @dirrm %%WWWDIR%%/inc/PMF_Mail
 @dirrm %%WWWDIR%%/inc/PMF_Language
@@ -1070,7 +1081,6 @@
 @dirrm %%WWWDIR%%/inc/PMF_Attachment/Filesystem
 @dirrm %%WWWDIR%%/inc/PMF_Attachment
 @dirrm %%WWWDIR%%/inc
-@dirrm %%WWWDIR%%/scripts
 @dirrmtry %%WWWDIR%%/images
 @dirrm %%WWWDIR%%/font
 @dirrm %%WWWDIR%%/feed/topten
@@ -1084,8 +1094,8 @@
 @dirrmtry %%WWWDIR%%/config
 @dirrm %%WWWDIR%%/attachments
 @dirrm %%WWWDIR%%/admin/style
-@dirrm %%WWWDIR%%/admin/images
 @dirrm %%WWWDIR%%/admin/js
+@dirrm %%WWWDIR%%/admin/images
 @dirrm %%WWWDIR%%/admin/editor/utils
 @dirrm %%WWWDIR%%/admin/editor/themes/simple/skins/o2k7/img
 @dirrm %%WWWDIR%%/admin/editor/themes/simple/skins/o2k7
@@ -1153,8 +1163,8 @@
 @dirrm %%WWWDIR%%/admin/editor/plugins/media/img
 @dirrm %%WWWDIR%%/admin/editor/plugins/media/css
 @dirrm %%WWWDIR%%/admin/editor/plugins/media
-@dirrm %%WWWDIR%%/admin/editor/plugins/layer
 @dirrm %%WWWDIR%%/admin/editor/plugins/legacyoutput
+@dirrm %%WWWDIR%%/admin/editor/plugins/layer
 @dirrm %%WWWDIR%%/admin/editor/plugins/insertdatetime
 @dirrm %%WWWDIR%%/admin/editor/plugins/inlinepopups/skins/clearlooks2/img
 @dirrm %%WWWDIR%%/admin/editor/plugins/inlinepopups/skins/clearlooks2