Date: Sun, 8 Mar 2015 18:10:49 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380782 - in head: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey... Message-ID: <201503081810.t28IAnnq066966@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Mar 8 18:10:48 2015 New Revision: 380782 URL: https://svnweb.freebsd.org/changeset/ports/380782 QAT: https://qat.redports.org/buildarchive/r380782/ Log: - Add CANBERRA and enable by default for Thunderbird and SeaMonkey [1] - Bump version requirements for harfbuzz and libvorbis PR: 198142 [1] See also: https://dxr.mozilla.org/comm-central/search?q=nsISound [1] Modified: head/Mk/bsd.gecko.mk head/mail/thunderbird/Makefile head/mail/thunderbird/files/patch-z-bug517422 head/www/firefox-esr/Makefile head/www/firefox-esr/files/patch-z-bug517422 head/www/firefox/Makefile head/www/firefox/Makefile.options head/www/firefox/files/patch-bug847568 head/www/firefox/files/patch-z-bug517422 head/www/libxul/Makefile head/www/libxul/files/patch-z-bug517422 head/www/seamonkey/Makefile head/www/seamonkey/files/patch-bug847568 head/www/seamonkey/files/patch-z-bug517422 Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Sun Mar 8 17:56:30 2015 (r380781) +++ head/Mk/bsd.gecko.mk Sun Mar 8 18:10:48 2015 (r380782) @@ -284,6 +284,10 @@ MOZ_OPTIONS+= --enable-optimize MOZ_OPTIONS+= --disable-optimize .endif +.if ${PORT_OPTIONS:MCANBERRA} +RUN_DEPENDS+= libcanberra>0:${PORTSDIR}/audio/libcanberra +.endif + .if ${PORT_OPTIONS:MDBUS} BUILD_DEPENDS+= libnotify>0:${PORTSDIR}/devel/libnotify LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Sun Mar 8 17:56:30 2015 (r380781) +++ head/mail/thunderbird/Makefile Sun Mar 8 18:10:48 2015 (r380782) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 31.5.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ @@ -19,7 +20,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ - libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ + libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \ @@ -58,7 +59,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME} MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= ENIGMAIL LIGHTNING -OPTIONS_DEFAULT=ENIGMAIL LIGHTNING +OPTIONS_DEFAULT=CANBERRA ENIGMAIL LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" Modified: head/mail/thunderbird/files/patch-z-bug517422 ============================================================================== --- head/mail/thunderbird/files/patch-z-bug517422 Sun Mar 8 17:56:30 2015 (r380781) +++ head/mail/thunderbird/files/patch-z-bug517422 Sun Mar 8 18:10:48 2015 (r380782) @@ -157,7 +157,7 @@ index 87db361..7947626 100644 +MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) ++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) +fi + +AC_SUBST(MOZ_NATIVE_VORBIS) Modified: head/www/firefox-esr/Makefile ============================================================================== --- head/www/firefox-esr/Makefile Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/firefox-esr/Makefile Sun Mar 8 18:10:48 2015 (r380782) @@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ - libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ + libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \ Modified: head/www/firefox-esr/files/patch-z-bug517422 ============================================================================== --- head/www/firefox-esr/files/patch-z-bug517422 Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/firefox-esr/files/patch-z-bug517422 Sun Mar 8 18:10:48 2015 (r380782) @@ -157,7 +157,7 @@ index 87db361..7947626 100644 +MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) ++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) +fi + +AC_SUBST(MOZ_NATIVE_VORBIS) Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/firefox/Makefile Sun Mar 8 18:10:48 2015 (r380782) @@ -17,9 +17,9 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ - harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ + harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ - libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ + libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.7.4:${PORTSDIR}/databases/sqlite3 \ Modified: head/www/firefox/Makefile.options ============================================================================== --- head/www/firefox/Makefile.options Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/firefox/Makefile.options Sun Mar 8 18:10:48 2015 (r380782) @@ -1,12 +1,14 @@ # -*- makefile-bsdmake -*- -OPTIONS_DEFINE+= DBUS DEBUG DTRACE GCONF GIO GNOMEUI GSTREAMER \ - LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO PROFILE TEST +OPTIONS_DEFINE+= CANBERRA DBUS DEBUG DTRACE GCONF GIO GNOMEUI \ + GSTREAMER LIBPROXY LOGGING OPTIMIZED_CFLAGS \ + PGO PROFILE TEST OPTIONS_DEFAULT+= ALSA DBUS GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS OPTIONS_MULTI+= AUDIO OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO +CANBERRA_DESC?= Sound theme alerts ENIGMAIL_DESC?= Enigmail extension GNOMEUI_DESC?= libgnomeui support module LIBPROXY_DESC?= Proxy support via libproxy Modified: head/www/firefox/files/patch-bug847568 ============================================================================== --- head/www/firefox/files/patch-bug847568 Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/firefox/files/patch-bug847568 Sun Mar 8 18:10:48 2015 (r380782) @@ -46,7 +46,7 @@ index ac38f40..87536b7 100644 +MOZ_NATIVE_HARFBUZZ=) + +if test -n "$MOZ_NATIVE_HARFBUZZ"; then -+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25) ++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34) +fi + +AC_SUBST(MOZ_NATIVE_HARFBUZZ) Modified: head/www/firefox/files/patch-z-bug517422 ============================================================================== --- head/www/firefox/files/patch-z-bug517422 Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/firefox/files/patch-z-bug517422 Sun Mar 8 18:10:48 2015 (r380782) @@ -154,7 +154,7 @@ index 87db361..7947626 100644 +MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) ++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) +fi + +AC_SUBST(MOZ_NATIVE_VORBIS) Modified: head/www/libxul/Makefile ============================================================================== --- head/www/libxul/Makefile Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/libxul/Makefile Sun Mar 8 18:10:48 2015 (r380782) @@ -17,7 +17,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ - libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ + libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \ Modified: head/www/libxul/files/patch-z-bug517422 ============================================================================== --- head/www/libxul/files/patch-z-bug517422 Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/libxul/files/patch-z-bug517422 Sun Mar 8 18:10:48 2015 (r380782) @@ -157,7 +157,7 @@ index 87db361..7947626 100644 +MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) ++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) +fi + +AC_SUBST(MOZ_NATIVE_VORBIS) Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/seamonkey/Makefile Sun Mar 8 18:10:48 2015 (r380782) @@ -3,6 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.32.1 +PORTREVISION= 1 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ @@ -17,9 +18,9 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ - harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ + harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ - libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ + libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.6:${PORTSDIR}/databases/sqlite3 \ @@ -53,7 +54,7 @@ MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS -OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS +OPTIONS_DEFAULT=CANBERRA CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module COMPOSER_DESC?= HTML Composer module Modified: head/www/seamonkey/files/patch-bug847568 ============================================================================== --- head/www/seamonkey/files/patch-bug847568 Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/seamonkey/files/patch-bug847568 Sun Mar 8 18:10:48 2015 (r380782) @@ -46,7 +46,7 @@ index ac38f40..87536b7 100644 +MOZ_NATIVE_HARFBUZZ=) + +if test -n "$MOZ_NATIVE_HARFBUZZ"; then -+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25) ++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34) +fi + +AC_SUBST(MOZ_NATIVE_HARFBUZZ) Modified: head/www/seamonkey/files/patch-z-bug517422 ============================================================================== --- head/www/seamonkey/files/patch-z-bug517422 Sun Mar 8 17:56:30 2015 (r380781) +++ head/www/seamonkey/files/patch-z-bug517422 Sun Mar 8 18:10:48 2015 (r380782) @@ -154,7 +154,7 @@ index 87db361..7947626 100644 +MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) ++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) +fi + +AC_SUBST(MOZ_NATIVE_VORBIS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503081810.t28IAnnq066966>