From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 8 05:40:02 2005 Return-Path: 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 E88B416A4E1 for ; Sun, 8 May 2005 05:40:02 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6BD343D72 for ; Sun, 8 May 2005 05:40:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j485e2Uu014658 for ; Sun, 8 May 2005 05:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j485e2jn014657; Sun, 8 May 2005 05:40:02 GMT (envelope-from gnats) Resent-Date: Sun, 8 May 2005 05:40:02 GMT Resent-Message-Id: <200505080540.j485e2jn014657@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 5A9C716A4E1 for ; Sun, 8 May 2005 05:38:09 +0000 (GMT) Received: from chinsan.twbbs.org (sw169-31-180.adsl.seed.net.tw [221.169.31.180]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D41A43D6B for ; Sun, 8 May 2005 05:38:08 +0000 (GMT) (envelope-from root@chinsan.twbbs.org) Received: by chinsan.twbbs.org (Postfix, from userid 0) id EC82F73019; Sun, 8 May 2005 13:38:08 +0800 (CST) Message-Id: <20050508053808.EC82F73019@chinsan.twbbs.org> Date: Sun, 8 May 2005 13:38:08 +0800 (CST) From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80746: [UPDATE] www/dokuwiki: update to 20050507 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: chinsan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 May 2005 05:40:03 -0000 >Number: 80746 >Category: ports >Synopsis: [UPDATE] www/dokuwiki: update to 20050507 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun May 08 05:40:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 5.3-RELEASE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD chinsan.twbbs.org 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: update to 20050507 >How-To-Repeat: >Fix: --- dokuwiki.diff begins here --- diff -ruN dokuwiki.orig/Makefile dokuwiki/Makefile --- dokuwiki.orig/Makefile Mon Apr 18 21:08:02 2005 +++ dokuwiki/Makefile Sun May 8 13:11:21 2005 @@ -6,23 +6,23 @@ # PORTNAME= dokuwiki -PORTVERSION= 20050218 -PORTREVISION= 1 +PORTVERSION= 20050507 +PORTREVISION= 0 CATEGORIES= www MASTER_SITES= http://www.splitbrain.org/Programming/PHP/DokuWiki/ -DISTNAME= dokuwiki-2005-02-18 +DISTNAME= ${PORTNAME}-2005-05-07 EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A simple and easy to use wiki, no database required -USE_PHP= pcre session +USE_PHP= pcre session xml zlib PHP4_PORT?= www/mod_php4 NO_BUILD= YES WANT_PHP_WEB= YES WWWDOCROOT?= www/data-dist -DOKUWIKIURL?= dokuwiki +DOKUWIKIURL?= ${PORTNAME} WWWOWN?= www WWWGRP?= www DOKUWIKIDIR?= ${WWWDOCROOT}/${DOKUWIKIURL} @@ -36,7 +36,7 @@ && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm ${DOKUWIKIDIR}/|' >> ${PLIST} \ && ${ECHO_CMD} ${DOKUWIKIDIR}/changes.log >> ${PLIST} \ - && ${ECHO_CMD} @dirrm ${DOKUWIKIDIR} >> ${PLIST} + && ${ECHO_CMD} "@unexec rmdir %D/${DOKUWIKIDIR} 2>/dev/null || true">> ${PLIST} do-install: # Data files @@ -57,3 +57,4 @@ -e 's|%%DOKUWIKIURL%%|${DOKUWIKIURL}|' ${PKGMESSAGE} .include + diff -ruN dokuwiki.orig/distinfo dokuwiki/distinfo --- dokuwiki.orig/distinfo Mon Apr 11 00:49:08 2005 +++ dokuwiki/distinfo Sun May 8 10:35:50 2005 @@ -1,2 +1,2 @@ -MD5 (dokuwiki-2005-02-18.tgz) = a4cb8233de0926e5ee6922a517c7dfdb -SIZE (dokuwiki-2005-02-18.tgz) = 337051 +MD5 (dokuwiki-2005-05-07.tgz) = 03c4c26376250fdc8a755d8e8232c778 +SIZE (dokuwiki-2005-05-07.tgz) = 439671 diff -ruN dokuwiki.orig/files/patch-conf-dokuwiki.php dokuwiki/files/patch-conf-dokuwiki.php --- dokuwiki.orig/files/patch-conf-dokuwiki.php Mon Apr 18 21:08:02 2005 +++ dokuwiki/files/patch-conf-dokuwiki.php Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- conf/dokuwiki.php.orig Fri Feb 18 21:04:39 2005 -+++ conf/dokuwiki.php Mon Apr 18 07:14:35 2005 -@@ -17,7 +17,7 @@ - $conf['mediadir'] = './media'; //where to store media files - $conf['mediaweb'] = 'media'; //access to media from the web - $conf['changelog'] = './changes.log'; //change log --$conf['uploadtypes'] = 'gif|jpe?g|png|zip|pdf|tar(\.gz)?|tgz'; //regexp of allowed filetypes to upload -+$conf['uploadtypes'] = '(gif|jpe?g|png|zip|pdf|tar(\.gz)?|tgz)'; //regexp of allowed filetypes to upload - - /* Display Options */ - diff -ruN dokuwiki.orig/pkg-message dokuwiki/pkg-message --- dokuwiki.orig/pkg-message Mon Apr 18 21:08:02 2005 +++ dokuwiki/pkg-message Sun May 8 13:22:10 2005 @@ -1,9 +1,9 @@ ================================================================= **** NOTE **** - edit %%PREFIX%%/%%WWWDOCROOT%%/%%DOKUWIKIURL%%/conf/dokuwiki.php - if you want to change anything within it or (better) create - dokuwiki/conf/local.php containing those lines from dokuwiki.php, - which you want to change. This way your changes are preserved - when overwriting the dokuwiki.php with a new release. + Remember to edit the following file: + %%PREFIX%%/%%WWWDOCROOT%%/%%DOKUWIKIURL%%/conf/dokuwiki.php + + For FULL configuration instructions see + http://wiki.splitbrain.org/wiki:install ================================================================= --- dokuwiki.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: