5 files changed, 79 insertions, 38 deletions

diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index 25a2dcc34d54..09cc27ed47fc 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -3,22 +3,21 @@
 
 PORTNAME=	mumble
 PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Mumble/${PORTVERSION}
 
 MAINTAINER=	marius@nuenneri.ch
 COMMENT=	A voice chat software primarily intended for use while gaming
 
-LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex \
-		sndfile:${PORTSDIR}/audio/libsndfile \
-		boost_iostreams:${PORTSDIR}/devel/boost-libs \
-		boost_python:${PORTSDIR}/devel/boost-python-libs \
-		protoc:${PORTSDIR}/devel/protobuf \
-		opus:${PORTSDIR}/audio/opus
+LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libboost_iostreams.so:${PORTSDIR}/devel/boost-libs \
+		libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
+		libprotoc.so:${PORTSDIR}/devel/protobuf \
+		libopus.so:${PORTSDIR}/audio/opus
 
 USES=		gmake pkgconfig
-NO_STAGE=	yes
 USE_QT4=	gui svg iconengines_run xml sql network l10n \
 		linguist_build qmake_build moc_build rcc_build uic_build \
 		opengl sql-sqlite3_run
@@ -26,6 +25,7 @@ USE_QT4=	gui svg iconengines_run xml sql network l10n \
 USE_XORG=	ice
 HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
+MAKE_JOBS_UNSAFE=yes
 
 CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-bundled-opus no-update \
 		bundled-celt no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations
@@ -34,8 +34,6 @@ OPTIONS_DEFINE=	DBUS BONJOUR
 OPTIONS_DEFAULT=	DBUS
 BONJOUR_DESC=		Bonjour support
 
-MAN1=		mumble.1
-
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDBUS}
@@ -57,22 +55,22 @@ do-configure:
 	cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${PREFIX}/lib/libcelt-mumble.so.0.11.0
-	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${PREFIX}/lib/libcelt-mumble.so.0.7.0
-	${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so.1.2.4
-	${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so
-	${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so.1
-	${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so.1.2
-	${MKDIR} ${PREFIX}/share/services
-	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${PREFIX}/share/services
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${PREFIX}/share/pixmaps
-	${MKDIR} ${PREFIX}/share/icons/hicolor/128x128/apps ${PREFIX}/share/icons/hicolor/scalable/apps
-	${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${PREFIX}/share/icons/hicolor/128x128/apps
-	@${MV} ${PREFIX}/share/icons/hicolor/128x128/apps/mumble.osx.png ${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
-	${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${PREFIX}/share/icons/hicolor/scalable/apps
-	${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0
+	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
+	${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.1.2.4 ${STAGEDIR}${PREFIX}/lib/libmumble.so.1.2.4
+	${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${STAGEDIR}${PREFIX}/lib/libmumble.so
+	${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${STAGEDIR}${PREFIX}/lib/libmumble.so.1
+	${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${STAGEDIR}${PREFIX}/lib/libmumble.so.1.2
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/services
+	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${STAGEDIR}${PREFIX}/share/services
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps
+	@${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.osx.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
+	${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mumble.1
 
 .include <bsd.port.mk>
diff --git a/audio/mumble/files/patch-src__mumble__OSS.cpp b/audio/mumble/files/patch-src__mumble__OSS.cpp
new file mode 100644
index 000000000000..123d3c38dd82
--- /dev/null
+++ b/audio/mumble/files/patch-src__mumble__OSS.cpp
@@ -0,0 +1,38 @@
+--- ./src/mumble/OSS.cpp.orig	2013-06-01 21:16:31.000000000 +0000
++++ ./src/mumble/OSS.cpp	2013-10-12 02:38:45.443221514 +0000
+@@ -221,20 +221,23 @@
+ 	ival = AFMT_S16_NE;
+ 	if ((ioctl(fd, SNDCTL_DSP_SETFMT, &ival) == -1) || (ival != AFMT_S16_NE)) {
+ 		qWarning("OSSInput: Failed to set sound format");
+-		goto out;
++		close(fd);
++		return;
+ 	}
+ 
+ 	ival = 1;
+ 	if ((ioctl(fd, SNDCTL_DSP_CHANNELS, &ival) == -1)) {
+ 		qWarning("OSSInput: Failed to set mono mode");
+-		goto out;
++		close(fd);
++		return;
+ 	}
+ 	iMicChannels = ival;
+ 
+ 	ival = SAMPLE_RATE;
+ 	if (ioctl(fd, SNDCTL_DSP_SPEED, &ival) == -1) {
+ 		qWarning("OSSInput: Failed to set speed");
+-		goto out;
++		close(fd);
++		return;
+ 	}
+ 	iMicFreq = ival;
+ 
+@@ -258,8 +261,6 @@
+ 	qWarning("OSSInput: Releasing.");
+ 	ioctl(fd, SNDCTL_DSP_RESET, NULL);
+ 
+-out:
+-	close(fd);
+ }
+ 
+ OSSOutput::OSSOutput() {
diff --git a/audio/mumble/files/patch-src__mumble__VoiceRecorderDialog.cpp b/audio/mumble/files/patch-src__mumble__VoiceRecorderDialog.cpp
new file mode 100644
index 000000000000..2dd42fa79d75
--- /dev/null
+++ b/audio/mumble/files/patch-src__mumble__VoiceRecorderDialog.cpp
@@ -0,0 +1,11 @@
+--- ./src/mumble/VoiceRecorderDialog.cpp.orig	2013-06-01 21:16:32.000000000 +0000
++++ ./src/mumble/VoiceRecorderDialog.cpp	2013-10-12 02:38:45.441221500 +0000
+@@ -38,7 +38,7 @@
+ #include "ServerHandler.h"
+ #include "VoiceRecorder.h"
+ 
+-VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p = NULL) : QDialog(p), qtTimer(new QTimer(this)) {
++VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p) : QDialog(p), qtTimer(new QTimer(this)) {
+ 	qtTimer->setObjectName(QLatin1String("qtTimer"));
+ 	qtTimer->setInterval(200);
+ 	setupUi(this);
diff --git a/audio/mumble/pkg-message b/audio/mumble/pkg-message
deleted file mode 100644
index c5b36e695fda..000000000000
--- a/audio/mumble/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-On FreeBSD versions <8.0 you need to load sem.ko into your kernel
-otherwise mumble won't start and you will get an error message about an
-invalid system call.
-
-To make this persistent over a reboot add
-	sem_load="YES"
-to your /boot/loader.conf
diff --git a/audio/mumble/pkg-plist b/audio/mumble/pkg-plist
index 5b52111fad29..938ad0ed770f 100644
--- a/audio/mumble/pkg-plist
+++ b/audio/mumble/pkg-plist
@@ -5,16 +5,17 @@ lib/libmumble.so
 lib/libmumble.so.1
 lib/libmumble.so.1.2
 lib/libmumble.so.1.2.4
+man/man1/mumble.1.gz
 share/applications/mumble.desktop
-share/services/mumble.protocol
 share/icons/hicolor/128x128/apps/mumble.png
 share/icons/hicolor/scalable/apps/mumble.svg
 share/pixmaps/mumble.xpm
-@dirrmtry share/applications
+share/services/mumble.protocol
 @dirrmtry share/services
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
+@dirrmtry share/applications