Index: branches/2020Q4/www/tikiwiki/Makefile
===================================================================
--- branches/2020Q4/www/tikiwiki/Makefile	(revision 552549)
+++ branches/2020Q4/www/tikiwiki/Makefile	(revision 552550)
@@ -1,51 +1,51 @@
 # Created by: Babak Farrokhi <babak@farrokhi.net>
 # $FreeBSD$
 
 PORTNAME=	tikiwiki
-DISTVERSION=	20.1
+DISTVERSION=	21.2
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME}/Tiki_20.x_Tarazed/${DISTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/Tiki_21.x_UY_Scuti/${DISTVERSION}/
 DISTNAME=	tiki-${DISTVERSION}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Powerful PHP based Wiki/CMS/Groupware
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 USES=		php:web
 USE_PHP=	calendar dom fileinfo gd gettext intl mbstring mcrypt pcre \
 		posix session xml zip zlib
 
 NO_BUILD=	yes
 NO_MTREE=	yes
 NO_ARCH=	yes
 TIKIWIKI_DIR?=	www/${PORTNAME}-${DISTVERSION}
 SUB_FILES=	pkg-message
 SUB_LIST+=	TIKIWIKI_DIR=${TIKIWIKI_DIR}
 
 WRI_DIR=	db dump img/trackers img/wiki img/wiki_up modules/cache \
 		temp temp/cache templates_c templates whelp
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TIKIWIKI_DIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${TIKIWIKI_DIR})
 
 # pkg-plist would be over 15,000 lines, consuming 1.1Mb
 # The benefits of a fixed pkg-plist aren't worth it, autogen!
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
 		${SORT} | ${SED} -e 's/^/@(${WWWOWN},${WWWGRP},) /' >> ${TMPPLIST})
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty | \
 		${SORT} -r | ${SED} -e 's/^/@dir /' >> ${TMPPLIST})
 
 	@${ECHO_CMD} "@mode 777" >> ${TMPPLIST}
 .for i in ${WRI_DIR} do
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TIKIWIKI_DIR}/${i}
 	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/${i}" >> ${TMPPLIST}
 .endfor
 	@${ECHO_CMD} "@mode" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: branches/2020Q4/www/tikiwiki/distinfo
===================================================================
--- branches/2020Q4/www/tikiwiki/distinfo	(revision 552549)
+++ branches/2020Q4/www/tikiwiki/distinfo	(revision 552550)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568988464
-SHA256 (tiki-20.1.tar.gz) = da16212a7eb4c1766000f7065872f7aefa8ee098dbc66dd40c81c4bfbdea0f26
-SIZE (tiki-20.1.tar.gz) = 80614940
+TIMESTAMP = 1602882508
+SHA256 (tiki-21.2.tar.gz) = e37bdb6d59c54d03b239d29b06bd3b5290f8a282975b9021ba05dd02d8d26acd
+SIZE (tiki-21.2.tar.gz) = 79804242
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 552549)
+++ branches/2020Q4	(revision 552550)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r552549