5 files changed, 37 insertions, 40 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index fbe843e983ef..8f9482a3efec 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -5,8 +5,7 @@
 # PORTREVISION bumps of depending ports.
 
 PORTNAME=	pulseaudio
-PORTVERSION=	6.0
-PORTREVISION=	2
+PORTVERSION=	8.0
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
@@ -29,8 +28,8 @@ LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
 USE_GNOME=	glib20 intltool
 USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
-USES=		cpe execinfo gettext gmake libtool pathfix pkgconfig \
-		shebangfix tar:xz
+USES=		cpe compiler:c11 execinfo gettext gmake gnome libtool \
+		pathfix pkgconfig shebangfix tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread" \
 		OPENSSL_CFLAGS="-I/usr/include" \
@@ -75,7 +74,7 @@ SIMD_CONFIGURE_ENABLE=	orc
 SIMD_LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/devel/orc
 ZSH_CONFIGURE_OFF=	--without-zsh-completion-dir
 
-PULSE_VERSION=	${PORTVERSION}
+PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
 
 post-patch:
@@ -91,7 +90,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
 		${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
 .endfor
+
 post-install-BASH-off:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	@${RM} -rf ${STAGEDIR}${PREFIX}/share/bash-completion
 
 .include <bsd.port.mk>
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index feb041c035e5..c91a1cf3dbde 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pulseaudio-6.0.tar.xz) = b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6
-SIZE (pulseaudio-6.0.tar.xz) = 1469248
+SHA256 (pulseaudio-8.0.tar.xz) = 690eefe28633466cfd1ab9d85ebfa9376f6b622deec6bfee5091ac9737cd1989
+SIZE (pulseaudio-8.0.tar.xz) = 1517656
diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in
index e8503dd85719..2c19f6f58e8b 100644
--- a/audio/pulseaudio/files/patch-src_Makefile.in
+++ b/audio/pulseaudio/files/patch-src_Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	2012-06-08 11:09:45.000000000 +0200
-+++ src/Makefile.in	2012-06-08 11:10:00.000000000 +0200
-@@ -8531,7 +8531,7 @@
- info-am:
+--- src/Makefile.in.orig	2016-02-01 11:20:44.952568000 +0100
++++ src/Makefile.in	2016-02-01 11:22:08.462998000 +0100
+@@ -11042,7 +11042,7 @@
  
- install-data-am: install-dbuspolicyDATA install-dist_alsapathsDATA \
--	install-dist_alsaprofilesetsDATA install-dist_udevrulesDATA \
-+	install-dist_alsaprofilesetsDATA \
- 	install-padsplibLTLIBRARIES install-pulseconfDATA \
- 	install-pulseincludeHEADERS install-xdgautostartDATA
+ install-data-am: install-commonlibLTLIBRARIES install-dbuspolicyDATA \
+ 	install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \
+-	install-dist_udevrulesDATA install-padsplibLTLIBRARIES \
++	install-padsplibLTLIBRARIES \
+ 	install-pulseconfDATA install-pulseincludeHEADERS \
+ 	install-systemduserunitDATA install-xdgautostartDATA
  
diff --git a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
index 4edcb6627c96..e7b600cb3bf1 100644
--- a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
+++ b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
@@ -1,6 +1,6 @@
---- src/modules/oss/module-oss.c.orig	2014-01-23 19:57:55.000000000 +0100
-+++ src/modules/oss/module-oss.c	2014-03-22 10:59:05.000000000 +0100
-@@ -1229,10 +1229,14 @@ int pa__init(pa_module*m) {
+--- src/modules/oss/module-oss.c.orig	2015-08-06 11:39:12.000000000 +0200
++++ src/modules/oss/module-oss.c	2015-09-03 13:13:37.953255000 +0200
+@@ -1227,10 +1227,14 @@
          use_mmap = false;
      }
  
@@ -15,12 +15,3 @@
  
      if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
          pa_log_info("Hardware name is '%s'.", hwdesc);
-@@ -1428,7 +1432,7 @@ int pa__init(pa_module*m) {
-     if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
-         bool do_close = true;
- 
--        if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
-+        if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
-             pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
-         else {
-             if (u->sink && (u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM))) {
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index b62c7383b31f..283b7222de1e 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -12,15 +12,15 @@ bin/pax11publish
 bin/pulseaudio
 bin/qpaeq
 bin/start-pulseaudio-x11
-%%BASH%%etc/bash_completion.d/pacat
-%%BASH%%etc/bash_completion.d/pacmd
-%%BASH%%etc/bash_completion.d/pactl
-%%BASH%%etc/bash_completion.d/padsp
-%%BASH%%etc/bash_completion.d/paplay
-%%BASH%%etc/bash_completion.d/parec
-%%BASH%%etc/bash_completion.d/parecord
-%%BASH%%etc/bash_completion.d/pasuspender
-%%BASH%%etc/bash_completion.d/pulseaudio
+%%BASH%%share/bash-completion/completions/pacat
+%%BASH%%share/bash-completion/completions/pacmd
+%%BASH%%share/bash-completion/completions/pactl
+%%BASH%%share/bash-completion/completions/padsp
+%%BASH%%share/bash-completion/completions/paplay
+%%BASH%%share/bash-completion/completions/parec
+%%BASH%%share/bash-completion/completions/parecord
+%%BASH%%share/bash-completion/completions/pasuspender
+%%BASH%%share/bash-completion/completions/pulseaudio
 etc/dbus-1/system.d/pulseaudio-system.conf
 @sample etc/pulse/client.conf.sample
 @sample etc/pulse/daemon.conf.sample
@@ -69,8 +69,7 @@ lib/libpulse-simple.so.0
 lib/libpulse-simple.so.0.1.0
 lib/libpulse.so
 lib/libpulse.so.0
-lib/libpulse.so.0.18.0
-lib/libpulsecore-%%PULSE_VERSION%%.so
+lib/libpulse.so.0.19.0
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
 %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/libalsa-util.so
@@ -160,6 +159,7 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
 lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.so
+lib/pulseaudio/libpulsecore-%%PULSE_VERSION%%.so
 lib/pulseaudio/libpulsedsp.so
 libdata/pkgconfig/libpulse-mainloop-glib.pc
 libdata/pkgconfig/libpulse-simple.pc
@@ -170,7 +170,10 @@ man/man1/pacat.1.gz
 man/man1/pacmd.1.gz
 man/man1/pactl.1.gz
 man/man1/padsp.1.gz
+man/man1/pamon.1.gz
 man/man1/paplay.1.gz
+man/man1/parec.1.gz
+man/man1/parecord.1.gz
 man/man1/pasuspender.1.gz
 man/man1/pax11publish.1.gz
 man/man1/pulseaudio.1.gz
@@ -225,6 +228,7 @@ man/man5/pulse-daemon.conf.5.gz
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio2.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf
 %%ZSH%%share/zsh/site-functions/_pulseaudio
 share/locale/as/LC_MESSAGES/pulseaudio.mo
 share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
@@ -244,9 +248,11 @@ share/locale/id/LC_MESSAGES/pulseaudio.mo
 share/locale/it/LC_MESSAGES/pulseaudio.mo
 share/locale/ja/LC_MESSAGES/pulseaudio.mo
 share/locale/kn/LC_MESSAGES/pulseaudio.mo
+share/locale/ko/LC_MESSAGES/pulseaudio.mo
 share/locale/ml/LC_MESSAGES/pulseaudio.mo
 share/locale/mr/LC_MESSAGES/pulseaudio.mo
 share/locale/nl/LC_MESSAGES/pulseaudio.mo
+share/locale/oc/LC_MESSAGES/pulseaudio.mo
 share/locale/or/LC_MESSAGES/pulseaudio.mo
 share/locale/pa/LC_MESSAGES/pulseaudio.mo
 share/locale/pl/LC_MESSAGES/pulseaudio.mo