diff -ruN --exclude=CVS /usr/ports/www/phpmyfaq.orig/Makefile /usr/ports/www/phpmyfaq/Makefile --- /usr/ports/www/phpmyfaq.orig/Makefile 2010-08-10 01:02:13.000000000 +0200 +++ /usr/ports/www/phpmyfaq/Makefile 2010-09-01 09:39:02.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= phpmyfaq -PORTVERSION= 2.6.7 +PORTVERSION= 2.6.8 CATEGORIES= www MASTER_SITES= http://www.phpmyfaq.de/download/ diff -ruN --exclude=CVS /usr/ports/www/phpmyfaq.orig/distinfo /usr/ports/www/phpmyfaq/distinfo --- /usr/ports/www/phpmyfaq.orig/distinfo 2010-08-10 01:02:13.000000000 +0200 +++ /usr/ports/www/phpmyfaq/distinfo 2010-09-01 09:39:02.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (phpmyfaq-2.6.7.tar.gz) = 3d15bff7d1d711a6061b56d880a46ffc -SHA256 (phpmyfaq-2.6.7.tar.gz) = 71e5846d4854548444f41b0d02ec221fda72439cf512cdefdb34332e7788029a -SIZE (phpmyfaq-2.6.7.tar.gz) = 3034093 +MD5 (phpmyfaq-2.6.8.tar.gz) = 411e0fa70b60759d7f258efec365da01 +SHA256 (phpmyfaq-2.6.8.tar.gz) = 994431cf465289f8bcb4f41a869abce406b356464ba07dbf321d2b8cc9ac9409 +SIZE (phpmyfaq-2.6.8.tar.gz) = 3064892 diff -ruN --exclude=CVS /usr/ports/www/phpmyfaq.orig/files/patch-inc-PMF_Search-Resultset.php /usr/ports/www/phpmyfaq/files/patch-inc-PMF_Search-Resultset.php --- /usr/ports/www/phpmyfaq.orig/files/patch-inc-PMF_Search-Resultset.php 2010-08-10 01:02:13.000000000 +0200 +++ /usr/ports/www/phpmyfaq/files/patch-inc-PMF_Search-Resultset.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- ./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 -ruN --exclude=CVS /usr/ports/www/phpmyfaq.orig/pkg-plist /usr/ports/www/phpmyfaq/pkg-plist --- /usr/ports/www/phpmyfaq.orig/pkg-plist 2010-08-10 01:02:13.000000000 +0200 +++ /usr/ports/www/phpmyfaq/pkg-plist 2010-09-01 09:39:03.000000000 +0200 @@ -477,6 +477,15 @@ %%WWWDIR%%/admin/editor/plugins/paste/langs/en_dlg.js %%WWWDIR%%/admin/editor/plugins/paste/pastetext.htm %%WWWDIR%%/admin/editor/plugins/paste/pasteword.htm +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/img/phpmyfaq.gif +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/js/dialog.js +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/langs/de.js +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/langs/de_dlg.js +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/langs/en.js +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/langs/en_dlg.js +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/dialog.html +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/editor_plugin.js +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/editor_plugin_src.js %%WWWDIR%%/admin/editor/plugins/preview/editor_plugin.js %%WWWDIR%%/admin/editor/plugins/preview/editor_plugin_src.js %%WWWDIR%%/admin/editor/plugins/preview/example.html @@ -771,7 +780,6 @@ %%WWWDIR%%/inc/PMF_DB/Mssql.php %%WWWDIR%%/inc/PMF_DB/Mysql.php %%WWWDIR%%/inc/PMF_DB/Mysqli.php -%%WWWDIR%%/inc/PMF_DB/Oci8.php %%WWWDIR%%/inc/PMF_DB/Pgsql.php %%WWWDIR%%/inc/PMF_DB/Sqlite.php %%WWWDIR%%/inc/PMF_DB/Sqlsrv.php @@ -802,7 +810,6 @@ %%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 @@ -811,7 +818,6 @@ %%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 @@ -929,7 +935,6 @@ %%WWWDIR%%/install/mysql.utf8migration.php %%WWWDIR%%/install/mysqli.sql.php %%WWWDIR%%/install/mysqli.utf8migration.php -%%WWWDIR%%/install/oci8.sql.php %%WWWDIR%%/install/pgsql.sql.php %%WWWDIR%%/install/questionnaire.php %%WWWDIR%%/install/setup.php @@ -1149,6 +1154,10 @@ @dirrm %%WWWDIR%%/admin/editor/plugins/print @dirrm %%WWWDIR%%/admin/editor/plugins/preview/jscripts @dirrm %%WWWDIR%%/admin/editor/plugins/preview +@dirrm %%WWWDIR%%/admin/editor/plugins/phpmyfaq/langs +@dirrm %%WWWDIR%%/admin/editor/plugins/phpmyfaq/js +@dirrm %%WWWDIR%%/admin/editor/plugins/phpmyfaq/img +@dirrm %%WWWDIR%%/admin/editor/plugins/phpmyfaq @dirrm %%WWWDIR%%/admin/editor/plugins/paste/langs @dirrm %%WWWDIR%%/admin/editor/plugins/paste/js @dirrm %%WWWDIR%%/admin/editor/plugins/paste/css