Attachment 207449 Details for Bug 240419 – Update to release 1.3.0 + optimization of Makefile

[patch] Update to release 1.3.0 + optimization of Makefile

murmur.diff (text/plain), 2.53 KB, created by Vladimir Druzenko on 2019-09-13 00:44:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2019-09-13 00:44:22 UTC

Size: 2.53 KB

patch

obsolete

>diff -ur audio/murmur.orig/Makefile audio/murmur/Makefile
>--- audio/murmur.orig/Makefile
>+++ audio/murmur/Makefile
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/audio/murmur/Makefile 509290 2019-08-19 15:35:27Z jbeich $
> 
> PORTNAME=	murmur
>-DISTVERSION=	1.3.0-rc1
>-PORTREVISION=	8
>+PORTVERSION=	1.3.0
>+PORTREVISION=	0
> CATEGORIES=	audio net
> 
> MAINTAINER=	feld@FreeBSD.org
>@@ -17,7 +17,7 @@
> 
> 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
> 
>@@ -27,48 +27,35 @@
> 
> 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_USES=		qt:5
>+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_USES=		qt:5
>+MYSQL_USE=		QT=sql-mysql
> 
>-.if ${PORT_OPTIONS:MMYSQL}
>-USE_QT+=	sql-mysql
>-.else
>-CONFIG+=	no-sql-mysql
>-.endif
>-
>-.if ${PORT_OPTIONS:MSQLITE}
>-USE_QT+=	sql-sqlite3_run
>-.else
>-CONFIG+=	no-sqlite3_run
>-.endif
>+SQLITE_VARS_OFF=	CONFIG+=no-sqlite3_run
>+SQLITE_USES=		qt:5
>+SQLITE_USE=		QT=sql-sqlite3_run
> 
> .include <bsd.port.pre.mk>
> # PCH is broken on GCC
>diff -ur audio/murmur.orig/distinfo audio/murmur/distinfo
>--- audio/murmur.orig/distinfo
>+++ audio/murmur/distinfo
>@@ -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

Actions: View | Diff

Attachments on bug 240419: 207291 | 207380 | 207449