ports/144119: audio/mumble 1.2.x does not build client compatible to 1.1.x [patch]

[Sascha Schneider]

The following reply was made to PR ports/144119; it has been noted by GNATS.

From: Sascha Schneider <suntsu at suntsu.org>
To: bug-followup at FreeBSD.org, suntsu at suntsu.org
Cc:  
Subject: Re: ports/144119: audio/mumble 1.2.x does not build client
 compatible to 1.1.x [patch]
Date: Sun, 21 Feb 2010 10:34:22 +0100

 --FCuugMFkClbJLl1L
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 In the attached I changed default state of MUBLE11X to off as requested and removed
 MAKE_JOBS_SAFE. Additionally I added PORTREVISION=1, to make the change
 apparent.
 
 --FCuugMFkClbJLl1L
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="mumble11x.patch"
 
 diff -c -r mumble.orig/Makefile mumble/Makefile
 *** mumble.orig/Makefile	2010-01-24 11:59:33.000000000 +0100
 --- mumble/Makefile	2010-02-21 10:31:46.000000000 +0100
 ***************
 *** 7,12 ****
 --- 7,13 ----
   
   PORTNAME=	mumble
   PORTVERSION=	1.2.1
 + PORTREVISION=	1
   CATEGORIES=	audio
   MASTER_SITES=	SF/${PORTNAME}/Mumble/${PORTVERSION}
   
 ***************
 *** 29,41 ****
   HAS_CONFIGURE=	yes
   INSTALLS_ICONS=	yes
   
 - MAKE_JOBS_SAFE=	yes
 - 
   CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-bundled-celt no-update \
 ! 		no-g15 no-portaudio no-pulseaudio no-xevie no-11x
   
   OPTIONS=	DBUS "Enable D-Bus support" on \
   		BONJOUR "Enable Bonjour support" off \
   
   MAN1=		mumble.1
   
 --- 30,41 ----
   HAS_CONFIGURE=	yes
   INSTALLS_ICONS=	yes
   
   CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-bundled-celt no-update \
 ! 		no-g15 no-portaudio no-pulseaudio no-xevie
   
   OPTIONS=	DBUS "Enable D-Bus support" on \
   		BONJOUR "Enable Bonjour support" off \
 + 		MUMBLE11X "Enable mumble 1.1 support" off \
   
   MAN1=		mumble.1
   
 ***************
 *** 57,62 ****
 --- 57,69 ----
   LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
   .endif
   
 + .if defined(WITHOUT_MUMBLE11X)
 + CONFIG+=	no-11x
 + PLIST_SUB+=	MUMBLE11X=""
 + .else
 + PLIST_SUB+=     MUMBLE11X="@comment "
 + .endif
 + 
   post-patch:
   	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
   
 ***************
 *** 65,70 ****
 --- 72,80 ----
   
   do-install:
   	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${PREFIX}/bin
 + .if !defined(WITHOUT_MUMBLE11X)
 + 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble11x ${PREFIX}/bin
 + .endif
   	${MKDIR} ${PREFIX}/share/services
   	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${PREFIX}/share/services
   	${MKDIR} ${PREFIX}/share/applications
 Only in mumble: mumble11x.patch
 diff -c -r mumble.orig/pkg-plist mumble/pkg-plist
 *** mumble.orig/pkg-plist	2010-01-16 18:28:09.000000000 +0100
 --- mumble/pkg-plist	2010-02-19 23:24:17.000000000 +0100
 ***************
 *** 1,5 ****
 --- 1,6 ----
   @comment $FreeBSD: ports/audio/mumble/pkg-plist,v 1.2 2010/01/16 17:28:09 beat Exp $
   bin/mumble
 + %%MUMBLE11X%%bin/mumble11x
   share/applications/mumble.desktop
   share/services/mumble.protocol
   share/icons/hicolor/128x128/apps/mumble.png
 Only in mumble: work
 
 --FCuugMFkClbJLl1L--