Fix macOS build. NFCI elsewhere.

1 files changed, 86 insertions, 89 deletions

diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST
index 5a4ae6b2100..1cfdc10096f 100644
--- a/audio/pulseaudio/PLIST
+++ b/audio/pulseaudio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2021/08/26 13:20:40 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.39 2021/09/17 06:47:29 schmonz Exp $
 bin/pa-info
 bin/pacat
 bin/pacmd
@@ -58,91 +58,88 @@ lib/libpulse.so.0.24.0
 lib/pkgconfig/libpulse-mainloop-glib.pc
 lib/pkgconfig/libpulse-simple.pc
 lib/pkgconfig/libpulse.pc
-${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/libalsa-util.so
-${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/libavahi-wrap.so
-lib/pulse-${PKGVERSION}/modules/libavahi-wrap.so
-lib/pulse-${PKGVERSION}/modules/libcli.so
-${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/liboss-util.so
-lib/pulse-${PKGVERSION}/modules/libprotocol-cli.so
-lib/pulse-${PKGVERSION}/modules/libprotocol-http.so
-lib/pulse-${PKGVERSION}/modules/libprotocol-native.so
-lib/pulse-${PKGVERSION}/modules/libprotocol-simple.so
-lib/pulse-${PKGVERSION}/modules/libraop.so
-lib/pulse-${PKGVERSION}/modules/librtp.so
-lib/pulse-${PKGVERSION}/modules/module-allow-passthrough.so
-${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-card.so
-${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-sink.so
-${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-source.so
-lib/pulse-${PKGVERSION}/modules/module-always-sink.so
-lib/pulse-${PKGVERSION}/modules/module-always-source.so
-lib/pulse-${PKGVERSION}/modules/module-augment-properties.so
-${PLIST.bonjour}lib/pulse-${PULSELIBVER}/modules/module-bonjour-publish.so
-lib/pulse-${PKGVERSION}/modules/module-card-restore.so
-lib/pulse-${PKGVERSION}/modules/module-cli-protocol-tcp.so
-lib/pulse-${PKGVERSION}/modules/module-cli-protocol-unix.so
-lib/pulse-${PKGVERSION}/modules/module-cli.so
-lib/pulse-${PKGVERSION}/modules/module-combine-sink.so
-lib/pulse-${PKGVERSION}/modules/module-combine.so
-lib/pulse-${PKGVERSION}/modules/module-console-kit.so
-${PLIST.coreaudio}lib/pulse-${PULSELIBVER}/modules/module-coreaudio-detect.so
-${PLIST.coreaudio}lib/pulse-${PULSELIBVER}/modules/module-coreaudio-device.so
-lib/pulse-${PKGVERSION}/modules/module-dbus-protocol.so
-lib/pulse-${PKGVERSION}/modules/module-default-device-restore.so
-lib/pulse-${PKGVERSION}/modules/module-detect.so
-lib/pulse-${PKGVERSION}/modules/module-device-manager.so
-lib/pulse-${PKGVERSION}/modules/module-device-restore.so
-lib/pulse-${PKGVERSION}/modules/module-echo-cancel.so
-lib/pulse-${PKGVERSION}/modules/module-filter-apply.so
-lib/pulse-${PKGVERSION}/modules/module-filter-heuristics.so
-${PLIST.gsettings}lib/pulse-${PULSELIBVER}/modules/module-gsettings.so
-lib/pulse-${PKGVERSION}/modules/module-http-protocol-tcp.so
-lib/pulse-${PKGVERSION}/modules/module-http-protocol-unix.so
-lib/pulse-${PKGVERSION}/modules/module-intended-roles.so
-lib/pulse-${PKGVERSION}/modules/module-ladspa-sink.so
-${PLIST.lirc}lib/pulse-${PULSELIBVER}/modules/module-lirc.so
-lib/pulse-${PKGVERSION}/modules/module-loopback.so
-lib/pulse-${PKGVERSION}/modules/module-match.so
-${PLIST.evdev}lib/pulse-${PULSELIBVER}/modules/module-mmkbd-evdev.so
-lib/pulse-${PKGVERSION}/modules/module-native-protocol-fd.so
-lib/pulse-${PKGVERSION}/modules/module-native-protocol-tcp.so
-lib/pulse-${PKGVERSION}/modules/module-native-protocol-unix.so
-lib/pulse-${PKGVERSION}/modules/module-null-sink.so
-lib/pulse-${PKGVERSION}/modules/module-null-source.so
-${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/module-oss.so
-lib/pulse-${PKGVERSION}/modules/module-pipe-sink.so
-lib/pulse-${PKGVERSION}/modules/module-pipe-source.so
-lib/pulse-${PKGVERSION}/modules/module-position-event-sounds.so
-${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-raop-discover.so
-lib/pulse-${PKGVERSION}/modules/module-raop-sink.so
-lib/pulse-${PKGVERSION}/modules/module-remap-sink.so
-lib/pulse-${PKGVERSION}/modules/module-remap-source.so
-lib/pulse-${PKGVERSION}/modules/module-rescue-streams.so
-lib/pulse-${PKGVERSION}/modules/module-role-cork.so
-lib/pulse-${PKGVERSION}/modules/module-role-ducking.so
-lib/pulse-${PKGVERSION}/modules/module-rtp-recv.so
-lib/pulse-${PKGVERSION}/modules/module-rtp-send.so
-lib/pulse-${PKGVERSION}/modules/module-rygel-media-server.so
-lib/pulse-${PKGVERSION}/modules/module-simple-protocol-tcp.so
-lib/pulse-${PKGVERSION}/modules/module-simple-protocol-unix.so
-lib/pulse-${PKGVERSION}/modules/module-sine-source.so
-lib/pulse-${PKGVERSION}/modules/module-sine.so
-lib/pulse-${PKGVERSION}/modules/module-stream-restore.so
-lib/pulse-${PKGVERSION}/modules/module-suspend-on-idle.so
-lib/pulse-${PKGVERSION}/modules/module-switch-on-connect.so
-lib/pulse-${PKGVERSION}/modules/module-switch-on-port-available.so
-lib/pulse-${PKGVERSION}/modules/module-tunnel-sink-new.so
-lib/pulse-${PKGVERSION}/modules/module-tunnel-sink.so
-lib/pulse-${PKGVERSION}/modules/module-tunnel-source-new.so
-lib/pulse-${PKGVERSION}/modules/module-tunnel-source.so
-lib/pulse-${PKGVERSION}/modules/module-virtual-sink.so
-lib/pulse-${PKGVERSION}/modules/module-virtual-source.so
-lib/pulse-${PKGVERSION}/modules/module-volume-restore.so
-${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-bell.so
-${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-cork-request.so
-${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-publish.so
-${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-xsmp.so
-${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-discover.so
-${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-publish.so
+${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/libalsa-util.${SOEXT}
+${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/libavahi-wrap.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/libavahi-wrap.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/libcli.${SOEXT}
+${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/liboss-util.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/libprotocol-cli.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/libprotocol-http.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/libprotocol-native.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/libprotocol-simple.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/libraop.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/librtp.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-allow-passthrough.${SOEXT}
+${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-card.${SOEXT}
+${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-sink.${SOEXT}
+${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-source.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-always-sink.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-always-source.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-augment-properties.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-card-restore.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-cli-protocol-tcp.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-cli-protocol-unix.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-cli.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-combine-sink.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-combine.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-console-kit.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-dbus-protocol.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-default-device-restore.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-detect.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-device-manager.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-device-restore.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-echo-cancel.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-filter-apply.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-filter-heuristics.${SOEXT}
+${PLIST.gsettings}lib/pulse-${PULSELIBVER}/modules/module-gsettings.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-http-protocol-tcp.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-http-protocol-unix.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-intended-roles.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-ladspa-sink.${SOEXT}
+${PLIST.lirc}lib/pulse-${PULSELIBVER}/modules/module-lirc.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-loopback.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-match.${SOEXT}
+${PLIST.evdev}lib/pulse-${PULSELIBVER}/modules/module-mmkbd-evdev.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-native-protocol-fd.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-native-protocol-tcp.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-native-protocol-unix.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-null-sink.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-null-source.${SOEXT}
+${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/module-oss.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-pipe-sink.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-pipe-source.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-position-event-sounds.${SOEXT}
+${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-raop-discover.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-raop-sink.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-remap-sink.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-remap-source.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-rescue-streams.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-role-cork.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-role-ducking.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-rtp-recv.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-rtp-send.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-rygel-media-server.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-simple-protocol-tcp.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-simple-protocol-unix.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-sine-source.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-sine.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-stream-restore.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-suspend-on-idle.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-switch-on-connect.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-switch-on-port-available.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-tunnel-sink-new.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-tunnel-sink.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-tunnel-source-new.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-tunnel-source.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-virtual-sink.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-virtual-source.${SOEXT}
+lib/pulse-${PKGVERSION}/modules/module-volume-restore.${SOEXT}
+${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-bell.${SOEXT}
+${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-cork-request.${SOEXT}
+${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-publish.${SOEXT}
+${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-xsmp.${SOEXT}
+${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-discover.${SOEXT}
+${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-publish.${SOEXT}
 lib/pulseaudio/libpulsecommon-${PKGVERSION}.so
 lib/pulseaudio/libpulsecore-${PKGVERSION}.so
 ${PLIST.oss}lib/pulseaudio/libpulsedsp.so
@@ -150,7 +147,7 @@ ${PLIST.gsettings}libexec/pulse/gsettings-helper
 man/man1/pacat.1
 man/man1/pacmd.1
 man/man1/pactl.1
-man/man1/padsp.1
+${PLIST.oss}man/man1/padsp.1
 man/man1/pamon.1
 man/man1/paplay.1
 man/man1/parec.1
@@ -173,14 +170,14 @@ share/bash-completion/completions/parec
 share/bash-completion/completions/parecord
 share/bash-completion/completions/pasuspender
 share/bash-completion/completions/pulseaudio
-share/examples/pulseaudio/dbus-1/system.d/pulseaudio-system.conf
 share/examples/pulseaudio/client.conf
 share/examples/pulseaudio/daemon.conf
+share/examples/pulseaudio/dbus-1/system.d/pulseaudio-system.conf
 share/examples/pulseaudio/default.pa
 share/examples/pulseaudio/system.pa
-${PLIST.gsettings}share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml
 ${PLIST.x11}share/examples/pulseaudio/xdg/Xwayland-session.d/00-pulseaudio-x11
 ${PLIST.x11}share/examples/pulseaudio/xdg/autostart/pulseaudio.desktop
+${PLIST.gsettings}share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml
 share/locale/af/LC_MESSAGES/pulseaudio.mo
 share/locale/as/LC_MESSAGES/pulseaudio.mo
 share/locale/be/LC_MESSAGES/pulseaudio.mo