ports/140586: [patch] maintainer update audio/mumble

[Marius Nuennerich]

>Number:         140586
>Category:       ports
>Synopsis:       [patch] maintainer update audio/mumble
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 15 22:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Marius Nuennerich
>Release:        stable/8
>Organization:
>Environment:
>Description:
please apply attached patch.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/audio/mumble/Makefile mumble/Makefile
--- /usr/ports/audio/mumble/Makefile	2009-08-22 02:13:15.000000000 +0200
+++ mumble/Makefile	2009-11-15 23:34:29.672852413 +0100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mumble
-PORTVERSION=	1.1.7
-PORTREVISION=	1
+PORTVERSION=	1.1.8
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Mumble/${PORTVERSION}
 
@@ -26,6 +25,8 @@
 HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
+MAKE_JOBS_SAFE=	yes
+
 CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-update no-g15 \
 		no-portaudio no-pulseaudio no-xevie
 
diff -ruN /usr/ports/audio/mumble/distinfo mumble/distinfo
--- /usr/ports/audio/mumble/distinfo	2009-03-19 01:22:00.000000000 +0100
+++ mumble/distinfo	2009-11-15 23:32:27.791777025 +0100
@@ -1,3 +1,3 @@
-MD5 (mumble-1.1.7.tar.gz) = 5a382d5c065bb264abfe240ca6f03ddc
-SHA256 (mumble-1.1.7.tar.gz) = e30e41cfb5d8b7596211b8c4530ee1b79b3bcd5cccac7aebb06122275d5eeedd
-SIZE (mumble-1.1.7.tar.gz) = 1169344
+MD5 (mumble-1.1.8.tar.gz) = a7da012922d39b87c45d9f481d4b5efb
+SHA256 (mumble-1.1.8.tar.gz) = 4cef76457e3178f9d854327f4a02c3521b19ddf64c03947b3ba182f871a81856
+SIZE (mumble-1.1.8.tar.gz) = 1241365
diff -ruN /usr/ports/audio/mumble/files/patch-mumble118 mumble/files/patch-mumble118
--- /usr/ports/audio/mumble/files/patch-mumble118	1970-01-01 01:00:00.000000000 +0100
+++ mumble/files/patch-mumble118	2009-11-13 00:50:00.874934230 +0100
@@ -0,0 +1,42 @@
+diff -r -C 2 mumble-1.1.8/overlay/overlay.h overlay/overlay.h
+*** mumble-1.1.8/overlay/overlay.h	2009-03-22 16:05:00.000000000 +0100
+--- overlay/overlay.h	2009-08-06 20:07:48.000000000 +0200
+***************
+*** 43,46 ****
+--- 43,65 ----
+  #define OVERLAY_VERSION_SUB 0
+  
++ /* BSD support */
++ #ifndef ElfW
++ # ifdef __FreeBSD__
++ #  if __ELF_WORD_SIZE == 32
++ #   define ElfW(type) Elf32_##type
++ #  else
++ #   define ElfW(type) Elf64_##type
++ #  endif
++ # else
++ # ifdef __NetBSD__
++ #  if ELFSIZE == 32
++ #   define ElfW(type) Elf32_##type
++ #  else 
++ #   define ElfW(type) Elf64_##type
++ #  endif
++ # endif
++ # endif
++ #endif
++ 
+  struct TextEntry {
+  	unsigned int color;
+diff -r -C 2 mumble-1.1.8/src/mumble/ServerHandler.cpp src/mumble/ServerHandler.cpp
+*** mumble-1.1.8/src/mumble/ServerHandler.cpp	2009-03-22 16:05:00.000000000 +0100
+--- src/mumble/ServerHandler.cpp	2009-08-06 12:50:18.000000000 +0200
+***************
+*** 40,43 ****
+--- 40,46 ----
+  #include "PacketDataStream.h"
+  #include "NetworkConfig.h"
++ #include <sys/types.h>
++ #include <sys/socket.h>
++ #include <netinet/in.h>
+  
+  ServerHandlerMessageEvent::ServerHandlerMessageEvent(QByteArray &msg, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) {


>Release-Note:
>Audit-Trail:
>Unformatted: