Index: branches/2019Q4/audio/murmur/Makefile
===================================================================
--- branches/2019Q4/audio/murmur/Makefile	(revision 515134)
+++ branches/2019Q4/audio/murmur/Makefile	(revision 515135)
@@ -1,100 +1,85 @@
 # Created by: Ayumi M <ayu@commun.jp>
 # $FreeBSD$
 
 PORTNAME=	murmur
-DISTVERSION=	1.3.0-rc1
-PORTREVISION=	8
+PORTVERSION=	1.3.0
+PORTREVISION=	0
 CATEGORIES=	audio net
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Murmur is the server component of Mumble
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
-USERS=		murmur
-GROUPS=		murmur
-USES=		compiler:c++11-lang qmake pkgconfig python:2.7 qt:5 ssl
+USES=		compiler:c++11-lang qmake pkgconfig python:build qt:5 ssl
 USE_CXXSTD=	c++11
 USE_QT=		buildtools_build core network sql xml
 
 USE_GITHUB=	YES
 GH_ACCOUNT=	mumble-voip
 GH_PROJECT=	mumble
 
 CONFIG=		no-client
 QMAKE_ARGS=	"CONFIG+=${CONFIG}"
+QMAKE_ENV+=	"MUMBLE_PYTHON=${PYTHON_CMD}"
 
 USE_RC_SUBR=	murmur
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
-OPTIONS_DEFINE=	BONJOUR DBUS DOCS ICE
+OPTIONS_DEFINE=		BONJOUR DBUS DOCS ICE
 OPTIONS_DEFAULT=	BONJOUR MYSQL SQLITE
-OPTIONS_MULTI=	SQL
+OPTIONS_MULTI=		SQL
 OPTIONS_MULTI_SQL=	MYSQL SQLITE
-ICE_DESC=	Ice Support
-BONJOUR_DESC=	Bonjour Support
 
-.include <bsd.port.options.mk>
+BONJOUR_DESC=		Bonjour Support
+BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
+BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 
-.if ${PORT_OPTIONS:MICE}
-LIB_DEPENDS+=	libIce.so:devel/ice
-.else
-CONFIG+=	no-ice
-.endif
+DBUS_VARS_OFF=		CONFIG+=no-dbus
+DBUS_USE=		QT=dbus
 
-.if ${PORT_OPTIONS:MDBUS}
-USE_QT+=	dbus
-.else
-CONFIG+=	no-dbus
-.endif
+ICE_DESC=		Ice Support
+ICE_VARS_OFF=		CONFIG+=no-ice
+ICE_LIB_DEPENDS=	libIce.so:devel/ice
 
-.if ${PORT_OPTIONS:MBONJOUR}
-LIB_DEPENDS+=	libdns_sd.so:net/mDNSResponder
-.else
-CONFIG+=	no-bonjour
-.endif
+MYSQL_VARS_OFF=		CONFIG+=no-sql-mysql
+MYSQL_USE=		QT=sql-mysql
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_QT+=	sql-mysql
-.else
-CONFIG+=	no-sql-mysql
-.endif
+SQLITE_VARS_OFF=	CONFIG+=no-sqlite3_run
+SQLITE_USE=		QT=sql-sqlite3_run
 
-.if ${PORT_OPTIONS:MSQLITE}
-USE_QT+=	sql-sqlite3_run
-.else
-CONFIG+=	no-sqlite3_run
-.endif
+USERS=		murmur
+GROUPS=		murmur
 
 .include <bsd.port.pre.mk>
 # PCH is broken on GCC
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIG+=	no-pch
 .endif
 
 post-patch:
 	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
 
 pre-install:
 	${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini
 	${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
 	${SED} -i '' -e 's|#logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini
 	${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
 	${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in CHANGES INSTALL README README.Linux
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
Index: branches/2019Q4/audio/murmur/distinfo
===================================================================
--- branches/2019Q4/audio/murmur/distinfo	(revision 515134)
+++ branches/2019Q4/audio/murmur/distinfo	(revision 515135)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553098586
-SHA256 (mumble-voip-mumble-1.3.0-rc1_GH0.tar.gz) = acf475910923326ef3293192b2cfe2bc3cb0abeea444ac76b4c191b918a4cfeb
-SIZE (mumble-voip-mumble-1.3.0-rc1_GH0.tar.gz) = 4741717
+TIMESTAMP = 1567947618
+SHA256 (mumble-voip-mumble-1.3.0_GH0.tar.gz) = 388d8f023a73dafdacdb7556bf503c40b57e2e41679cc7490e884dd7013ab600
+SIZE (mumble-voip-mumble-1.3.0_GH0.tar.gz) = 4888455
Index: branches/2019Q4
===================================================================
--- branches/2019Q4	(revision 515134)
+++ branches/2019Q4	(revision 515135)

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