diff options
| author | vanilla <vanilla@FreeBSD.org> | 2005-04-18 21:08:02 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 2005-04-18 21:08:02 +0800 |
| commit | 300112a7083c09e0b643fa4c61b303555fc12dd4 (patch) | |
| tree | b0cb965f42bef7b4a45f04464e5fb1d35f499b1c /www/dokuwiki | |
| parent | 17167ce4f1e9993b6c4ebcc20ac9257046d22e77 (diff) | |
| download | freebsd-ports-gnome-300112a7083c09e0b643fa4c61b303555fc12dd4.tar.gz freebsd-ports-gnome-300112a7083c09e0b643fa4c61b303555fc12dd4.tar.zst freebsd-ports-gnome-300112a7083c09e0b643fa4c61b303555fc12dd4.zip | |
- fix insufficient check on conf['uploadtypes']
- fix pkg-message
Submitted by: Stephane Lentz <stephane.lentz@gmail.com> & chinsan <chinsan@mail2000.com.tw>
Diffstat (limited to 'www/dokuwiki')
| -rw-r--r-- | www/dokuwiki/Makefile | 22 | ||||
| -rw-r--r-- | www/dokuwiki/files/patch-conf-dokuwiki.php | 11 | ||||
| -rw-r--r-- | www/dokuwiki/pkg-message | 2 |
3 files changed, 27 insertions, 8 deletions
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile index ccc305d029a2..3ed6e66e1d7f 100644 --- a/www/dokuwiki/Makefile +++ b/www/dokuwiki/Makefile @@ -7,6 +7,7 @@ PORTNAME= dokuwiki PORTVERSION= 20050218 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.splitbrain.org/Programming/PHP/DokuWiki/ DISTNAME= dokuwiki-2005-02-18 @@ -19,7 +20,12 @@ USE_PHP= pcre session PHP4_PORT?= www/mod_php4 NO_BUILD= YES WANT_PHP_WEB= YES -DOKUWIKIDIR?= www/data-dist/dokuwiki + +WWWDOCROOT?= www/data-dist +DOKUWIKIURL?= dokuwiki +WWWOWN?= www +WWWGRP?= www +DOKUWIKIDIR?= ${WWWDOCROOT}/${DOKUWIKIURL} PLIST= ${WRKDIR}/pkg-plist .include <bsd.port.pre.mk> @@ -35,17 +41,19 @@ pre-install: do-install: # Data files -${MKDIR} ${PREFIX}/${DOKUWIKIDIR} - @${CHOWN} www:www ${PREFIX}/${DOKUWIKIDIR} + @${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR} @${CHMOD} 755 ${PREFIX}/${DOKUWIKIDIR} @${CP} -R ${WRKSRC}/ ${PREFIX}/${DOKUWIKIDIR} # Setup the correct permissions @${TOUCH} ${PREFIX}/${DOKUWIKIDIR}/changes.log - @${CHOWN} -R www:www ${PREFIX}/${DOKUWIKIDIR}/changes.log - @${CHOWN} -R www:www ${PREFIX}/${DOKUWIKIDIR}/data - @${CHOWN} -R www:www ${PREFIX}/${DOKUWIKIDIR}/media - @${CHOWN} -R www:www ${PREFIX}/${DOKUWIKIDIR}/attic + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/changes.log + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/data + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/media + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/attic post-install: - @${SED} -e 's|%%DOKUWIKIDIR%%|${PREFIX}/${DOKUWIKIDIR}|' ${PKGMESSAGE} + @${SED} -e 's|%%PREFIX%%|${PREFIX}|' \ + -e 's|%%WWWDOCROOT%%|${WWWDOCROOT}|' \ + -e 's|%%DOKUWIKIURL%%|${DOKUWIKIURL}|' ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/www/dokuwiki/files/patch-conf-dokuwiki.php b/www/dokuwiki/files/patch-conf-dokuwiki.php new file mode 100644 index 000000000000..bacb63e8aa06 --- /dev/null +++ b/www/dokuwiki/files/patch-conf-dokuwiki.php @@ -0,0 +1,11 @@ +--- 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 --git a/www/dokuwiki/pkg-message b/www/dokuwiki/pkg-message index 69ab9386a04c..a1f5df517ea3 100644 --- a/www/dokuwiki/pkg-message +++ b/www/dokuwiki/pkg-message @@ -1,6 +1,6 @@ ================================================================= **** NOTE **** - edit PREFIX/www/data-dist/dokuwiki/conf/dokuwiki.php + 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 |