Index: head/comms/ebusd/Makefile
===================================================================
--- head/comms/ebusd/Makefile	(revision 513469)
+++ head/comms/ebusd/Makefile	(revision 513470)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	ebusd
 PORTVERSION=	3.3
+DISTVERSIONPREFIX=	v
 CATEGORIES=	comms
 
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Daemon for communication with eBUS heating systems
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libargp.so:devel/argp-standalone
 
 USES=		autoreconf compiler:c++11-lang localbase:ldflags
 
-OPTIONS_DEFINE=	MQTT
-OPTIONS_DEFAULT=MQTT
-MQTT_DESC=	MQTT protocol support
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	john30
-GH_TAGNAME=	v${PORTVERSION}
 
 USE_RC_SUBR=	ebusd
 
 USERS=		ebusd
 GROUPS=		ebusd
 
 LOGDIR=		/var/log/${PORTNAME}
 RUNDIR=		/var/run/${PORTNAME}
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 
 PLIST_SUB=	USER=${USERS} GROUP=${GROUPS} \
 		LOGDIR=${LOGDIR} \
 		RUNDIR=${RUNDIR}
+
+OPTIONS_DEFINE=	MQTT
+OPTIONS_DEFAULT=MQTT
+MQTT_DESC=	MQTT protocol support
 
 MQTT_CONFIGURE_WITH=	mqtt
 MQTT_LIB_DEPENDS=	libmosquitto.so:net/mosquitto
 MQTT_VARS=		LIBS+=-lmosquitto
 
 post-install:
 	${MKDIR} ${STAGEDIR}${LOGDIR}
 	${MKDIR} ${STAGEDIR}${RUNDIR}
 
 .include <bsd.port.mk>
Index: head/comms/ebusd/distinfo
===================================================================
--- head/comms/ebusd/distinfo	(revision 513469)
+++ head/comms/ebusd/distinfo	(revision 513470)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565559816
-SHA256 (john30-ebusd-3.3-v3.3_GH0.tar.gz) = 48669140cfafbe060c765b4530018b30f07e1b074dbce00b205a8f2a22dee573
-SIZE (john30-ebusd-3.3-v3.3_GH0.tar.gz) = 696172
+TIMESTAMP = 1569925578
+SHA256 (john30-ebusd-v3.3_GH0.tar.gz) = 48669140cfafbe060c765b4530018b30f07e1b074dbce00b205a8f2a22dee573
+SIZE (john30-ebusd-v3.3_GH0.tar.gz) = 696172
Index: head/devel/collada-dom/Makefile
===================================================================
--- head/devel/collada-dom/Makefile	(revision 513469)
+++ head/devel/collada-dom/Makefile	(revision 513470)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	collada-dom
+DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
 CATEGORIES=	devel
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	COLLADA Document Object Model (DOM) C++ Library
 
 LICENSE=	MIT
 
-LIB_DEPENDS+=	libminizip.so:archivers/minizip \
+LIB_DEPENDS=	libminizip.so:archivers/minizip \
 		libpcre.so:devel/pcre \
 		libboost_filesystem.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs
 
 USES=	cmake gnome
 USE_LDCONFIG=	yes
 
-USE_GNOME+=	libxml2
+USE_GNOME=	libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rdiankov
 GH_PROJECT=	collada-dom
-GH_TAGNAME=	v${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 .include <bsd.port.mk>
Index: head/devel/collada-dom/distinfo
===================================================================
--- head/devel/collada-dom/distinfo	(revision 513469)
+++ head/devel/collada-dom/distinfo	(revision 513470)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557428395
-SHA256 (rdiankov-collada-dom-2.5.0-v2.5.0_GH0.tar.gz) = 3be672407a7aef60b64ce4b39704b32816b0b28f61ebffd4fbd02c8012901e0d
-SIZE (rdiankov-collada-dom-2.5.0-v2.5.0_GH0.tar.gz) = 4509266
+TIMESTAMP = 1569926613
+SHA256 (rdiankov-collada-dom-v2.5.0_GH0.tar.gz) = 3be672407a7aef60b64ce4b39704b32816b0b28f61ebffd4fbd02c8012901e0d
+SIZE (rdiankov-collada-dom-v2.5.0_GH0.tar.gz) = 4509266
Index: head/mail/dovecot-fts-xapian/Makefile
===================================================================
--- head/mail/dovecot-fts-xapian/Makefile	(revision 513469)
+++ head/mail/dovecot-fts-xapian/Makefile	(revision 513470)
@@ -1,35 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	fts-xapian
 PORTVERSION=	1.2.1
+DISTVERSIONPREFIX=	${PORTNAME}-
 PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Dovecot FTS plugin based on Xapian
 
 LICENSE=	LGPL21
 
+BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 LIB_DEPENDS=	libxapian.so:databases/xapian-core \
 		libicuuc.so:devel/icu
-BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 RUN_DEPENDS=	dovecot>=2.3.7:mail/dovecot
 
 USES=		autoreconf compiler:c++11-lang libtool pkgconfig
 
 USE_LDCONFIG=	yes
 
 USE_GITHUB=yes
 GH_ACCOUNT=	grosjo
-GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/dovecot/lib21_fts_xapian_plugin.a \
 		lib/dovecot/lib21_fts_xapian_plugin.so
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so
 
 .include <bsd.port.mk>
Index: head/mail/dovecot-fts-xapian/distinfo
===================================================================
--- head/mail/dovecot-fts-xapian/distinfo	(revision 513469)
+++ head/mail/dovecot-fts-xapian/distinfo	(revision 513470)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568284001
-SHA256 (grosjo-fts-xapian-1.2.1-fts-xapian-1.2.1_GH0.tar.gz) = 9c8dbaa3ddf5f489356a3ec40af012c02aaa6af7ae513ade5b208d3d19771277
-SIZE (grosjo-fts-xapian-1.2.1-fts-xapian-1.2.1_GH0.tar.gz) = 27267
+TIMESTAMP = 1569926733
+SHA256 (grosjo-fts-xapian-fts-xapian-1.2.1_GH0.tar.gz) = 9c8dbaa3ddf5f489356a3ec40af012c02aaa6af7ae513ade5b208d3d19771277
+SIZE (grosjo-fts-xapian-fts-xapian-1.2.1_GH0.tar.gz) = 27267