CVS commit: pkgsrc/www/firefox

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon May 15 15:49:27 UTC 2017

Modified Files:
        pkgsrc/www/firefox: Makefile options.mk

Log Message:
firefox: default to oss everywhere but linux, which defaults to pulseaudio.

alsa is not supported upstream, and checks for failures by calling assert,
which means the default setup crashes whenever audio is played.

bump pkgrevision


To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/www/firefox/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.294 pkgsrc/www/firefox/Makefile:1.295
--- pkgsrc/www/firefox/Makefile:1.294   Mon May  8 15:33:43 2017
+++ pkgsrc/www/firefox/Makefile Mon May 15 15:49:27 2017
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.294 2017/05/08 15:33:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.295 2017/05/15 15:49:27 maya Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            53.0
 MOZ_BRANCH_MINOR=      .2
+PKGREVISION=           1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}

Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.40 pkgsrc/www/firefox/options.mk:1.41
--- pkgsrc/www/firefox/options.mk:1.40  Mon Mar 20 13:39:33 2017
+++ pkgsrc/www/firefox/options.mk       Mon May 15 15:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.40 2017/03/20 13:39:33 ryoon Exp $
+# $NetBSD: options.mk,v 1.41 2017/05/15 15:49:27 maya Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -12,15 +12,9 @@ PKG_SUPPORTED_OPTIONS+=      alsa oss pulseau
 PLIST_VARS+=           gnome jemalloc debug
 
 .if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=        alsa mozilla-jemalloc dbus
-.elif ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=        alsa dbus
-.elif ${OPSYS} == "FreeBSD"
-PKG_SUGGESTED_OPTIONS+=        oss dbus
-.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+=        oss dbus
+PKG_SUGGESTED_OPTIONS+=        pulseaudio mozilla-jemalloc dbus
 .else
-PKG_SUGGESTED_OPTIONS+= dbus pulseaudio
+PKG_SUGGESTED_OPTIONS+=        oss dbus
 .endif
 
 # On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.