From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 21 15:00:53 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 94E6316A474 for ; Wed, 21 Jun 2006 15:00:53 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 723AC43D69 for ; Wed, 21 Jun 2006 15:00:47 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k5LF0lrl072775 for ; Wed, 21 Jun 2006 15:00:47 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k5LF0lwl072774; Wed, 21 Jun 2006 15:00:47 GMT (envelope-from gnats) Resent-Date: Wed, 21 Jun 2006 15:00:47 GMT Resent-Message-Id: <200606211500.k5LF0lwl072774@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, chinsan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B00BC16A492 for ; Wed, 21 Jun 2006 14:56:00 +0000 (UTC) (envelope-from chinsan.tw@gmail.com) Received: from smtp2.bc.hgc.com.tw (smtp2.bc.hgc.com.tw [203.133.1.156]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FB3643D48 for ; Wed, 21 Jun 2006 14:56:00 +0000 (GMT) (envelope-from chinsan.tw@gmail.com) Received: from smtp2.bc.hgc.com.tw (u14-109.u203-187.giga.net.tw [203.187.14.109]) by smtp2.bc.hgc.com.tw (Postfix) with SMTP id CFC5630206 for ; Wed, 21 Jun 2006 22:55:59 +0800 (CST) Received: by smtp2.bc.hgc.com.tw (sSMTP sendmail emulation); Wed, 21 Jun 2006 22:57:50 +0800 Message-Id: <20060621145559.CFC5630206@smtp2.bc.hgc.com.tw> Date: Wed, 21 Jun 2006 22:57:50 +0800 From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/99255: [MAINTAINER] www/dokuwiki: Fix pkg-plist 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, 21 Jun 2006 15:00:53 -0000 >Number: 99255 >Category: ports >Synopsis: [MAINTAINER] www/dokuwiki: Fix pkg-plist >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 Jun 21 15:00:46 GMT 2006 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 6.1-STABLE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD chinsan2.twbbs.org 6.1-STABLE FreeBSD 6.1-STABLE #1: Fri Jun 2 16:44:35 CST >Description: - Fix pkg-plist - Due to http://lists.freebsd.org/pipermail/freebsd-ports/2006-May/032010.html Add a note about adding an alias to httpd.conf since dokuwiki is getting installed to /usr/local/www/dokuwiki and not under the data directory Suggested by Eric Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- dokuwiki-20060309_4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/dokuwiki/Makefile /usr/home/chinsan/project/dokuwiki/Makefile --- /usr/ports/www/dokuwiki/Makefile Wed Jun 14 18:55:55 2006 +++ /usr/home/chinsan/project/dokuwiki/Makefile Wed Jun 21 22:49:53 2006 @@ -7,7 +7,7 @@ PORTNAME= dokuwiki PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://www.splitbrain.org/_media/projects/dokuwiki/ \ http://dev.splitbrain.org/browse/snapshots/ @@ -18,18 +18,16 @@ COMMENT= A simple and easy to use wiki, no database required DIST_VER= ${PORTNAME}-2006-03-09 -USE_PHP= gd pcre session xml zlib +USE_PHP= gd mbstring pcre session xml zlib NO_BUILD= YES WANT_PHP_WEB= YES -WWWDOCROOT?= www/data -DOKUWIKI_URL?= ${PORTNAME} -DOKUWIKI_DIR?= www/${DOKUWIKI_URL} +DOKUWIKI_DIR?= www/${PORTNAME} WRKSRC= ${WRKDIR}/${DIST_VER} PLIST_SUB= DOKUWIKI_DIR=${DOKUWIKI_DIR} .if defined(BATCH) -WIKI_LANG?=en +WIKI_LANG?= en .endif .include @@ -79,14 +77,6 @@ @${ECHO_MSG} '*******************************************************' .endif -pre-fetch: -.if ${DOKUWIKI_DIR} == ${WWWDOCROOT}/${DOKUWIKI_URL} - @${ECHO_MSG} "" - @${ECHO_MSG} "You can define DOKUWIKI_DIR to override default '${DOKUWIKI_DIR}'" - @${ECHO_MSG} "installed under ${PREFIX}" - @${ECHO_MSG} "" -.endif - pre-patch: .if defined(WIKI_LANG) @${REINPLACE_CMD} -e 's|lang\(.*\)'en'|lang\1'${WIKI_LANG}'|g' \ @@ -104,7 +94,7 @@ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKI_DIR} post-install: - @${SED} -e 's|%%PREFIX%%|${PREFIX}|' \ + @${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%PORTNAME%%|${PORTNAME}|' \ -e 's|%%DOKUWIKI_DIR%%|${DOKUWIKI_DIR}|' ${PKGMESSAGE} .include diff -ruN --exclude=CVS /usr/ports/www/dokuwiki/pkg-message /usr/home/chinsan/project/dokuwiki/pkg-message --- /usr/ports/www/dokuwiki/pkg-message Tue Mar 21 10:44:39 2006 +++ /usr/home/chinsan/project/dokuwiki/pkg-message Wed Jun 21 22:52:46 2006 @@ -1,6 +1,12 @@ ================================================================= **** NOTE **** - Remember to edit the following file: +1) Please add the following to your apache config, and restart. + # + # Directives to allow use of dokuwki + # + Alias /%%PORTNAME%% "%%PREFIX%%/%%DOKUWIKI_DIR%%/" + +2) Remember to edit the following file: %%PREFIX%%/%%DOKUWIKI_DIR%%/conf/local.php For FULL configuration instructions see diff -ruN --exclude=CVS /usr/ports/www/dokuwiki/pkg-plist /usr/home/chinsan/project/dokuwiki/pkg-plist --- /usr/ports/www/dokuwiki/pkg-plist Wed Jun 14 18:55:55 2006 +++ /usr/home/chinsan/project/dokuwiki/pkg-plist Wed Jun 21 14:27:28 2006 @@ -19,6 +19,7 @@ %%DOKUWIKI_DIR%%/conf/wordblock.conf %%DOKUWIKI_DIR%%/conf/words.aspell.dist %%DOKUWIKI_DIR%%/data/.htaccess +%%DOKUWIKI_DIR%%/data/changes.log %%DOKUWIKI_DIR%%/data/attic/_dummy %%DOKUWIKI_DIR%%/data/cache/_dummy %%DOKUWIKI_DIR%%/data/locks/_dummy --- dokuwiki-20060309_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: