From 01711c22ba234834851a42b53a75596de79cdaf1 Mon Sep 17 00:00:00 2001 From: delphij Date: Mon, 12 May 2014 18:03:46 +0000 Subject: 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. --- www/dokuwiki/Makefile | 7 +------ www/dokuwiki/files/pkg-message.in | 33 +++++++++++++++++++----------- www/dokuwiki/pkg-plist | 42 --------------------------------------- 3 files changed, 22 insertions(+), 60 deletions(-) (limited to 'www/dokuwiki') diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile index 81c711d30c1c..e50055707e71 100644 --- a/www/dokuwiki/Makefile +++ b/www/dokuwiki/Makefile @@ -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 database required 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} diff --git a/www/dokuwiki/files/pkg-message.in b/www/dokuwiki/files/pkg-message.in index 354184ddc645..2ced763aa10b 100644 --- a/www/dokuwiki/files/pkg-message.in +++ b/www/dokuwiki/files/pkg-message.in @@ -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. + +====================================================================== diff --git a/www/dokuwiki/pkg-plist b/www/dokuwiki/pkg-plist index 8f4d423f58bb..ed1d378df74b 100644 --- a/www/dokuwiki/pkg-plist +++ b/www/dokuwiki/pkg-plist @@ -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 -- cgit