From owner-svn-ports-head@FreeBSD.ORG Mon Mar 23 19:07:47 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC33ECAF; Mon, 23 Mar 2015 19:07:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7153CFF; Mon, 23 Mar 2015 19:07:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NJ7k0p043201; Mon, 23 Mar 2015 19:07:46 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NJ7j1R043196; Mon, 23 Mar 2015 19:07:45 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201503231907.t2NJ7j1R043196@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 23 Mar 2015 19:07:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382024 - in head/www/dokuwiki: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2015 19:07:47 -0000 Author: delphij Date: Mon Mar 23 19:07:44 2015 New Revision: 382024 URL: https://svnweb.freebsd.org/changeset/ports/382024 QAT: https://qat.redports.org/buildarchive/r382024/ Log: Update to 2014-09-29d. MFH: 2015Q1 Added: head/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d (contents, props changed) Modified: head/www/dokuwiki/Makefile head/www/dokuwiki/pkg-plist Modified: head/www/dokuwiki/Makefile ============================================================================== --- head/www/dokuwiki/Makefile Mon Mar 23 19:04:23 2015 (r382023) +++ head/www/dokuwiki/Makefile Mon Mar 23 19:07:44 2015 (r382024) @@ -3,7 +3,7 @@ PORTNAME= dokuwiki PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://download.dokuwiki.org/src/dokuwiki/ DISTNAME= ${DIST_VER} Added: head/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d Mon Mar 23 19:07:44 2015 (r382024) @@ -0,0 +1,50 @@ +diff -ur VERSION VERSION +--- VERSION 2015-02-24 12:01:05.000000000 -0800 ++++ VERSION 2015-03-19 12:29:53.000000000 -0700 +@@ -1 +1 @@ +-2014-09-29c "Hrun" ++2014-09-29d "Hrun" +diff -ur doku.php doku.php +--- doku.php 2015-02-24 12:01:05.000000000 -0800 ++++ doku.php 2015-03-19 12:29:53.000000000 -0700 +@@ -9,7 +9,7 @@ + */ + + // update message version +-$updateVersion = 46.3; ++$updateVersion = 46.4; + + // xdebug_start_profiling(); + +diff -ur lib/plugins/usermanager/admin.php lib/plugins/usermanager/admin.php +--- lib/plugins/usermanager/admin.php 2015-02-24 12:01:05.000000000 -0800 ++++ lib/plugins/usermanager/admin.php 2015-03-19 12:29:53.000000000 -0700 +@@ -191,9 +191,9 @@ + */ + $groups = join(', ',$grps); + ptln(" "); +- ptln(" "); ++ ptln(" "); + if ($editable) { +- ptln(" 1, ++ ptln(" 1, + 'do' => 'admin', + 'page' => 'usermanager', + 'sectok' => getSecurityToken())). +@@ -325,7 +325,7 @@ + + // save current $user, we need this to access details if the name is changed + if ($user) +- ptln(" ",$indent); ++ ptln(" ",$indent); + + $this->_htmlFilterSettings($indent+10); + +@@ -370,6 +370,7 @@ + $fieldtype = 'text'; + $autocomp = ''; + } ++ $value = hsc($value); + + echo ""; + echo ""; Modified: head/www/dokuwiki/pkg-plist ============================================================================== --- head/www/dokuwiki/pkg-plist Mon Mar 23 19:04:23 2015 (r382023) +++ head/www/dokuwiki/pkg-plist Mon Mar 23 19:07:44 2015 (r382024) @@ -36,6 +36,7 @@ %%WWWDIR%%/data/media_attic/_dummy %%WWWDIR%%/data/media_meta/_dummy %%WWWDIR%%/data/meta/_dummy +%%WWWDIR%%/data/pages/playground/playground.txt %%WWWDIR%%/data/pages/wiki/dokuwiki.txt %%WWWDIR%%/data/pages/wiki/syntax.txt %%WWWDIR%%/data/pages/wiki/welcome.txt