Mon Jul 23 04:56:12 2018 UTC ()
firefox52: switch netbsd to oss and linux to pulse.

alsa is problematic and pulseaudio is more widely used on linux.
oss works fine on netbsd, no need for extra dependencies.


(maya)
diff -r1.27 -r1.28 pkgsrc/www/firefox52/Makefile
diff -r1.1 -r1.2 pkgsrc/www/firefox52/options.mk
cvs diff -r1.27 -r1.28 pkgsrc/www/firefox52/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox52/Makefile 2018/07/20 03:34:31 1.27
+++ pkgsrc/www/firefox52/Makefile 2018/07/23 04:56:12 1.28
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.27 2018/07/20 03:34:31 ryoon Exp $ 1# $NetBSD: Makefile,v 1.28 2018/07/23 04:56:12 maya Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 52.9 4MOZ_BRANCH= 52.9
5MOZ_BRANCH_MINOR= .0esr 5MOZ_BRANCH_MINOR= .0esr
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox52-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox52-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
9PKGREVISION= 2 9PKGREVISION= 3
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
13EXTRACT_SUFX= .tar.xz 13EXTRACT_SUFX= .tar.xz
14 14
15WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//} 15WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//}
16 16
17MAINTAINER= ryoon@NetBSD.org 17MAINTAINER= ryoon@NetBSD.org
18HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 18HOMEPAGE= http://www.mozilla.com/en-US/firefox/
19COMMENT= Web browser with support for extensions (version ${MOZ_BRANCH:C/\..*//}) 19COMMENT= Web browser with support for extensions (version ${MOZ_BRANCH:C/\..*//})
20LICENSE= mpl-1.1 20LICENSE= mpl-1.1
21 21
22MOZILLA_DIR= # empty 22MOZILLA_DIR= # empty
cvs diff -r1.1 -r1.2 pkgsrc/www/firefox52/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox52/options.mk 2017/04/27 01:55:57 1.1
+++ pkgsrc/www/firefox52/options.mk 2018/07/23 04:56:12 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: options.mk,v 1.1 2017/04/27 01:55:57 ryoon Exp $ 1# $NetBSD: options.mk,v 1.2 2018/07/23 04:56:12 maya Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= gtk 5PKG_OPTIONS_REQUIRED_GROUPS= gtk
6PKG_OPTIONS_GROUP.gtk= gtk2 gtk3 6PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
7PKG_SUGGESTED_OPTIONS= gtk3 7PKG_SUGGESTED_OPTIONS= gtk3
8 8
9PKG_SUPPORTED_OPTIONS= official-mozilla-branding 9PKG_SUPPORTED_OPTIONS= official-mozilla-branding
10PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 10PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
11PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus 11PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus
12PLIST_VARS+= gnome jemalloc debug 12PLIST_VARS+= gnome jemalloc debug
13 13
14.if ${OPSYS} == "Linux" 14.if ${OPSYS} == "Linux"
15PKG_SUGGESTED_OPTIONS+= alsa mozilla-jemalloc dbus 15PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus
16.elif ${OPSYS} == "NetBSD" 16.elif ${OPSYS} == "NetBSD"
17PKG_SUGGESTED_OPTIONS+= alsa dbus 17PKG_SUGGESTED_OPTIONS+= oss dbus
18.elif ${OPSYS} == "FreeBSD" 18.elif ${OPSYS} == "FreeBSD"
19PKG_SUGGESTED_OPTIONS+= oss dbus 19PKG_SUGGESTED_OPTIONS+= oss dbus
20.elif ${OPSYS} == "DragonFly" 20.elif ${OPSYS} == "DragonFly"
21PKG_SUGGESTED_OPTIONS+= oss dbus 21PKG_SUGGESTED_OPTIONS+= oss dbus
22.else 22.else
23PKG_SUGGESTED_OPTIONS+= dbus pulseaudio 23PKG_SUGGESTED_OPTIONS+= dbus pulseaudio
24.endif 24.endif
25 25
26# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set. 26# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
27PKG_SUGGESTED_OPTIONS.Linux+= webrtc 27PKG_SUGGESTED_OPTIONS.Linux+= webrtc
28 28
29.include "../../mk/bsd.options.mk" 29.include "../../mk/bsd.options.mk"
30 30