Index: branches/2019Q1/www/dokuwiki/Makefile
===================================================================
--- branches/2019Q1/www/dokuwiki/Makefile	(revision 489756)
+++ branches/2019Q1/www/dokuwiki/Makefile	(revision 489757)
@@ -1,42 +1,42 @@
 # Created by: Chin-San Huang <chinsan@mail2000.com.tw>
 # $FreeBSD$
 
 PORTNAME=	dokuwiki
 PORTVERSION=	${DIST_VER:S/${PORTNAME}//:S/-//g}
 CATEGORIES=	www
 MASTER_SITES=	http://download.dokuwiki.org/src/dokuwiki/
 DISTNAME=	${DIST_VER}
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Simple and easy to use wiki, no database required
 
 LICENSE=			BSD3CLAUSE GPLv2 GPLv2+ GPLv3 MIT
 LICENSE_COMB=			multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/vendor/simplepie/simplepie/LICENSE.txt
 LICENSE_FILE_GPLv2=		${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2+ =		${WRKSRC}/vendor/geshi/geshi/LICENSE
 LICENSE_FILE_GPLv3=		${WRKSRC}/vendor/marcusschwarz/lesserphp/LICENSE
 LICENSE_FILE_MIT=		${WRKSRC}/vendor/composer/LICENSE
 
-DIST_VER=	${PORTNAME}-2018-04-22a
+DIST_VER=	${PORTNAME}-2018-04-22b
 USES=		cpe tar:tgz php:web
 USE_PHP=	gd hash json mbstring openssl pcre session xml zlib
 NO_ARCH=	YES
 NO_BUILD=	YES
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME=${PORTNAME}
 SHAREOWN=	${WWWOWN}
 SHAREGRP=	${WWWGRP}
 
 REINPLACE_ARGS=	-i ''
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' ${WRKSRC}/bin/*.php
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${RM} ${WRKSRC}/data/deleted.files
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
Index: branches/2019Q1/www/dokuwiki/distinfo
===================================================================
--- branches/2019Q1/www/dokuwiki/distinfo	(revision 489756)
+++ branches/2019Q1/www/dokuwiki/distinfo	(revision 489757)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525452171
-SHA256 (dokuwiki-2018-04-22a.tgz) = 284e1329f27322da8b4120f69171ae8fa12c6134453fcd3700d2914c47a70204
-SIZE (dokuwiki-2018-04-22a.tgz) = 3749191
+TIMESTAMP = 1547016599
+SHA256 (dokuwiki-2018-04-22b.tgz) = 9d1437cdc7e98e471ff32079f7ca224ccf52dbbaafed39ec9746b0405b3a29ce
+SIZE (dokuwiki-2018-04-22b.tgz) = 3745314
Index: branches/2019Q1
===================================================================
--- branches/2019Q1	(revision 489756)
+++ branches/2019Q1	(revision 489757)

Property changes on: branches/2019Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r489756