From owner-svn-ports-all@FreeBSD.ORG Mon May 12 18:03:47 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBE16707; Mon, 12 May 2014 18:03:47 +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 D64E42FCC; Mon, 12 May 2014 18:03:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CI3ldx074586; Mon, 12 May 2014 18:03:47 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CI3lSi074578; Mon, 12 May 2014 18:03:47 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201405121803.s4CI3lSi074578@svn.freebsd.org> From: Xin LI Date: Mon, 12 May 2014 18:03:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353885 - 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 18:03:48 -0000 Author: delphij Date: Mon May 12 18:03:46 2014 New Revision: 353885 URL: http://svnweb.freebsd.org/changeset/ports/353885 QAT: https://qat.redports.org/buildarchive/r353885/ Log: Fix breakage introduced by previous commit. I have compared the two distfiles (old and new) and the only difference was a rename of the containing directory and removal of a few test and scratch files. While I'm there also make pkg-message show what the administrator should do in a new installation because the scripts are intentionally installed under root:wheel. Modified: head/www/dokuwiki/Makefile head/www/dokuwiki/files/pkg-message.in head/www/dokuwiki/pkg-plist Modified: head/www/dokuwiki/Makefile ============================================================================== --- head/www/dokuwiki/Makefile Mon May 12 17:58:25 2014 (r353884) +++ head/www/dokuwiki/Makefile Mon May 12 18:03:46 2014 (r353885) @@ -3,6 +3,7 @@ PORTNAME= dokuwiki PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g} +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.dokuwiki.org/src/dokuwiki/ DISTNAME= ${DIST_VER} @@ -13,17 +14,11 @@ COMMENT= Simple and easy to use wiki, no LICENSE= GPLv2 -# 2014-05-12 upstream re-rolled the DISTFILE w/o changing it's name! -# Somebody needs to advise upstream they need a RCS, or VCS! - DIST_VER= ${PORTNAME}-2014-05-05 USE_PHP= gd mbstring openssl pcre session xml zlib NO_BUILD= YES WANT_PHP_WEB= YES -# XXX - What the author is thinking about? -WRKSRC= ${WRKDIR}/${PORTNAME}-2014-05-06 - SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} SHAREOWN= ${WWWOWN} Modified: head/www/dokuwiki/files/pkg-message.in ============================================================================== --- head/www/dokuwiki/files/pkg-message.in Mon May 12 17:58:25 2014 (r353884) +++ head/www/dokuwiki/files/pkg-message.in Mon May 12 18:03:46 2014 (r353885) @@ -1,15 +1,24 @@ -================================================================= - **** NOTE **** -1) Please add the following to your apache config, and restart. - - # Directives to allow use of dokuwiki - # - Alias /%%PORTNAME%% "%%WWWDIR%%/ +====================================================================== + INSTALLATION NOTES -2) Open the following page in your browser and follow the instructions: - http://www.your.host/dokuwiki/install.php +The wiki program have been installed to %%WWWDIR%%. - For FULL configuration instructions see - http://wiki.splitbrain.org/wiki:config +Please configure your web server to allow running PHP scripts there. -================================================================= +Please create dedicated data directory outside the installation directory +and make it owned by the process running these PHP scripts. It is important +to make sure that your PHP intepreter does not allow running PHP scripts +there. + +For first install, you may have to manually copy the contents from +%%WWWDIR%%/data into the newly created data directory and change +the owner of %%WWWDIR%%/conf to the web server. + +Please go to http://www.your.host/dokuwiki/install.php to finish the +installation. For FULL configuration instructions, see +http://wiki.splitbrain.org/wiki:config + +After installation please change the permissions of +%%WWWDIR%%/conf back to root:wheel. + +====================================================================== Modified: head/www/dokuwiki/pkg-plist ============================================================================== --- head/www/dokuwiki/pkg-plist Mon May 12 17:58:25 2014 (r353884) +++ head/www/dokuwiki/pkg-plist Mon May 12 18:03:46 2014 (r353885) @@ -1,6 +1,4 @@ -%%WWWDIR%%/.editorconfig %%WWWDIR%%/.htaccess.dist -%%WWWDIR%%/.travis.yml %%WWWDIR%%/COPYING %%WWWDIR%%/README %%WWWDIR%%/VERSION @@ -2958,23 +2956,6 @@ %%WWWDIR%%/lib/plugins/config/settings/config.metadata.php %%WWWDIR%%/lib/plugins/config/settings/extra.class.php %%WWWDIR%%/lib/plugins/config/style.css -%%WWWDIR%%/lib/plugins/extension/_test/extension.test.php -%%WWWDIR%%/lib/plugins/extension/_test/testdata/either1/script.js -%%WWWDIR%%/lib/plugins/extension/_test/testdata/eithersub2/either2/script.js -%%WWWDIR%%/lib/plugins/extension/_test/testdata/plgfoo5/plugin.info.txt -%%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub3/plugin3/syntax.php -%%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub4/plugin4/plugin.info.txt -%%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub6/plgfoo6/plugin.info.txt -%%WWWDIR%%/lib/plugins/extension/_test/testdata/plugin1/syntax.php -%%WWWDIR%%/lib/plugins/extension/_test/testdata/plugin2/plugin.info.txt -%%WWWDIR%%/lib/plugins/extension/_test/testdata/template1/main.php -%%WWWDIR%%/lib/plugins/extension/_test/testdata/template1/style.ini -%%WWWDIR%%/lib/plugins/extension/_test/testdata/template2/template.info.txt -%%WWWDIR%%/lib/plugins/extension/_test/testdata/tplfoo5/template.info.txt -%%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub3/template3/main.php -%%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub3/template3/style.ini -%%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub4/template4/template.info.txt -%%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub6/tplfoo6/template.info.txt %%WWWDIR%%/lib/plugins/extension/action.php %%WWWDIR%%/lib/plugins/extension/admin.php %%WWWDIR%%/lib/plugins/extension/all.less @@ -3874,29 +3855,6 @@ @dirrm %%WWWDIR%%/lib/plugins/extension/lang @dirrm %%WWWDIR%%/lib/plugins/extension/images @dirrm %%WWWDIR%%/lib/plugins/extension/helper -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub6/tplfoo6 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub6 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub4/template4 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub4 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub3/template3 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub3 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplfoo5 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/template2 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/template1 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plugin2 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plugin1 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub6/plgfoo6 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub6 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub4/plugin4 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub4 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub3/plugin3 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub3 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgfoo5 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/eithersub2/either2 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/eithersub2 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/either1 -@dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata -@dirrm %%WWWDIR%%/lib/plugins/extension/_test @dirrm %%WWWDIR%%/lib/plugins/extension @dirrm %%WWWDIR%%/lib/plugins/config/settings @dirrm %%WWWDIR%%/lib/plugins/config/lang/zh