svn commit: r384089 - head/audio/pulseaudio

[Koop Mast]

Author: kwm
Date: Thu Apr 16 07:46:16 2015
New Revision: 384089
URL: https://svnweb.freebsd.org/changeset/ports/384089

Log:
  The _DISABLE used by the zsh option doesn't exist, change it to _OFF [1]
  Fix plist when the ALSA option is enabled. [2]
  
  Submitted by:	jbeich@ [1], Barbara Guida <barbara.freebsd at gmail.com> [2]

Modified:
  head/audio/pulseaudio/Makefile
  head/audio/pulseaudio/pkg-plist

Modified: head/audio/pulseaudio/Makefile
==============================================================================
--- head/audio/pulseaudio/Makefile	Thu Apr 16 07:36:11 2015	(r384088)
+++ head/audio/pulseaudio/Makefile	Thu Apr 16 07:46:16 2015	(r384089)
@@ -73,7 +73,7 @@ ALSA_CONFIGURE_ENABLE=	alsa
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 SIMD_CONFIGURE_ENABLE=	orc
 SIMD_LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/devel/orc
-ZSH_CONFIGURE_DISABLE=	--without-zsh-completion-dir
+ZSH_CONFIGURE_OFF=	--without-zsh-completion-dir
 
 PULSE_VERSION=	${PORTVERSION}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}

Modified: head/audio/pulseaudio/pkg-plist
==============================================================================
--- head/audio/pulseaudio/pkg-plist	Thu Apr 16 07:36:11 2015	(r384088)
+++ head/audio/pulseaudio/pkg-plist	Thu Apr 16 07:46:16 2015	(r384089)
@@ -196,7 +196,6 @@ man/man5/pulse-daemon.conf.5.gz
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-video.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input.conf.common
-%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-desktop-speaker.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-lineout.conf
@@ -209,9 +208,12 @@ man/man5/pulse-daemon.conf.5.gz
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-1.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-2.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-3.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-4.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-5.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-6.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-7.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-output.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/default.conf
-%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/extra-hdmi.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker-and-int-mic.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/kinect-audio.conf