From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 1 08:00:12 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAC0F10656C9 for ; Wed, 1 Sep 2010 08:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 79E098FC26 for ; Wed, 1 Sep 2010 08:00:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o8180CnR092942 for ; Wed, 1 Sep 2010 08:00:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o8180CFd092922; Wed, 1 Sep 2010 08:00:12 GMT (envelope-from gnats) Resent-Date: Wed, 1 Sep 2010 08:00:12 GMT Resent-Message-Id: <201009010800.o8180CFd092922@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Florian Smeets Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80E2E10656AA for ; Wed, 1 Sep 2010 08:00:02 +0000 (UTC) (envelope-from flo@mail.solomo.de) Received: from mail.solomo.de (mail.solomo.de [IPv6:2a01:238:42c7:9a00::2]) by mx1.freebsd.org (Postfix) with ESMTP id A9A368FC13 for ; Wed, 1 Sep 2010 08:00:01 +0000 (UTC) Received: from mail.solomo.de (localhost [127.0.0.1]) by mail.solomo.de (Postfix) with ESMTP id 714E45C9F for ; Wed, 1 Sep 2010 10:00:00 +0200 (CEST) Received: from mail.solomo.de ([127.0.0.1]) by mail.solomo.de (mail.solomo.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Es4TaXS2juEu for ; Wed, 1 Sep 2010 09:59:57 +0200 (CEST) Received: by mail.solomo.de (Postfix, from userid 1001) id DB4C45CA2; Wed, 1 Sep 2010 09:59:57 +0200 (CEST) Message-Id: <20100901075957.DB4C45CA2@mail.solomo.de> Date: Wed, 1 Sep 2010 09:59:57 +0200 (CEST) From: Florian Smeets To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/150177: [MAINTAINER] www/phpmyfaq: update to 2.6.8 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Sep 2010 08:00:12 -0000 >Number: 150177 >Category: ports >Synopsis: [MAINTAINER] www/phpmyfaq: update to 2.6.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Sep 01 08:00:11 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Florian Smeets >Release: FreeBSD 8.1-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD mail.solomo.de 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #1: Fri Jul 23 15:47:09 UTC 2010 >Description: - Update to 2.6.8 Removed file(s): - files/patch-inc-PMF_Search-Resultset.php Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- phpmyfaq-2.6.8.patch begins here --- 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 --- phpmyfaq-2.6.8.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: