svn commit: r353885 - in head/www/dokuwiki: . files

Mon May 12 18:03:48 UTC 2014

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
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub6/tplfoo6
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub6
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub4/template4
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub4
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub3/template3
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplsub3
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/tplfoo5
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/template2
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/template1
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plugin2
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plugin1
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub6/plgfoo6
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub6
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub4/plugin4
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub4
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub3/plugin3
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub3
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgfoo5
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/eithersub2/either2
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/eithersub2
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata/either1
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test/testdata
- at dirrm %%WWWDIR%%/lib/plugins/extension/_test
 @dirrm %%WWWDIR%%/lib/plugins/extension
 @dirrm %%WWWDIR%%/lib/plugins/config/settings
 @dirrm %%WWWDIR%%/lib/plugins/config/lang/zh
