diff --git a/network/dokuwiki/README b/network/dokuwiki/README index afddebc299..135a3e9234 100644 --- a/network/dokuwiki/README +++ b/network/dokuwiki/README @@ -7,9 +7,5 @@ useful in the enterprise context and the large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki. -Note: -You must add this line in your httpd.conf to enable dokuwiki: -Include /etc/httpd/extra/httpd-dokuwiki.conf - If your default directory is not /var/www/htdocs please edit to your default directory. diff --git a/network/dokuwiki/dokuwiki.SlackBuild b/network/dokuwiki/dokuwiki.SlackBuild index 7e6fb13f28..2ea3576282 100644 --- a/network/dokuwiki/dokuwiki.SlackBuild +++ b/network/dokuwiki/dokuwiki.SlackBuild @@ -23,9 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dokuwiki -VERSION=${VERSION:-20180422c} +VERSION=${VERSION:-20200729} UNPACK=${UNPACK:-stable} -SRCVERSION=${SRCVERSION:-2018-04-22c} +SRCVERSION=${SRCVERSION:-2020-07-29} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -45,9 +45,9 @@ cd $TMP rm -rf $PRGNAM-$SRCVERSION tar xvzf $CWD/$PRGNAM-$SRCVERSION.tgz -mkdir -p $PKG/var/www/$PRGNAM -mv $TMP/$PRGNAM-$SRCVERSION/* $PKG/var/www/$PRGNAM/ -chown -R apache:apache $PKG/var/www/$PRGNAM/ +mkdir -p $PKG/var/www/htdocs/$PRGNAM +mv $TMP/$PRGNAM-$SRCVERSION/* $PKG/var/www/htdocs/$PRGNAM/ +chown -R apache:apache $PKG/var/www/htdocs/$PRGNAM/ mkdir -p $PKG/etc/httpd/extra cat > $PKG/etc/httpd/extra/httpd-dokuwiki.conf <<'EOF' @@ -67,6 +67,8 @@ Alias /dokuwiki /var/www/htdocs/dokuwiki EOF mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +# Move all docs +mv $PKG/var/www/htdocs/${PRGNAM}/{COPYING,README,VERSION} $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/dokuwiki/dokuwiki.info b/network/dokuwiki/dokuwiki.info index 131e419b77..ff5714ca14 100644 --- a/network/dokuwiki/dokuwiki.info +++ b/network/dokuwiki/dokuwiki.info @@ -1,8 +1,8 @@ PRGNAM="dokuwiki" -VERSION="20180422c" +VERSION="20200729" HOMEPAGE="https://www.dokuwiki.org/dokuwiki" DOWNLOAD="https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" -MD5SUM="6272e552b9a71a764781bd4182dd2b7d" +MD5SUM="8867b6a5d71ecb5203402fe5e8fa18c9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""