From 28f7c7471256eadfae82ac1b88887db429cc1c18 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 14 Aug 2015 16:39:33 +0000 Subject: [PATCH] Back out r394012 after r394231 PR: 202270 Exp-run by: antoine MFH: 2015Q3 X-MFH-With: r394231 --- mail/thunderbird/Makefile | 6 +++--- www/firefox-esr/Makefile | 6 +++--- www/firefox/Makefile | 6 +++--- www/libxul/Makefile | 6 +++--- www/seamonkey/Makefile | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 8963c849d2ca..6a3e590373dd 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 38.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source @@ -21,13 +21,13 @@ BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ + libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \ # opus>=1.1:${PORTSDIR}/audio/opus \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -37,7 +37,7 @@ L_VERSION= 4.0.1 SSP_UNSAFE= yes USE_GECKO= gecko -USE_MOZILLA= -opus -vpx +USE_MOZILLA= -opus USE_QT5= # empty QT_NONSTANDARD= yes diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 89986c7bc27d..089c06c244c0 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 38.2.0 DISTVERSIONSUFFIX=esr.source -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ @@ -21,13 +21,13 @@ BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \ harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ + libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \ # opus>=1.1:${PORTSDIR}/audio/opus \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -36,7 +36,7 @@ USE_GECKO= gecko CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox-4[0-4].* firefox-3[02-9].* firefox-2[0-35-9].* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -opus -vpx +USE_MOZILLA= -opus MOZILLA_NAME= Firefox USE_QT5= # empty diff --git a/www/firefox/Makefile b/www/firefox/Makefile index d42279b13555..de7a7fb9a4f1 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 40.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -20,13 +20,13 @@ BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \ harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ + libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \ # opus>=1.1:${PORTSDIR}/audio/opus \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -34,7 +34,7 @@ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr-31.* firefox-esr-24.* firefox-esr-17.* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -opus -vpx +USE_MOZILLA= -opus MOZILLA_NAME= Firefox USE_QT5= # empty diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 7ff9188a0fa2..b6212cd497ed 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -3,7 +3,7 @@ PORTNAME= libxul DISTVERSION= 38.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source @@ -19,13 +19,13 @@ BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \ harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ + libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \ # opus>=1.1:${PORTSDIR}/audio/opus \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -46,7 +46,7 @@ MOZ_OPTIONS?= --enable-application=xulrunner USE_GECKO= gecko CPE_PRODUCT= firefox_esr MOZILLA_EXEC_NAME=xulrunner -USE_MOZILLA= -opus -vpx +USE_MOZILLA= -opus MOZILLA_PLIST_DIRS= bin include lib share/idl libdata MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \ mozilla-plugin diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 7ba1a26ee1fb..4713b36c48cf 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.33.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source @@ -21,13 +21,13 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ 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 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -47,7 +47,7 @@ MOZ_EXTENSIONS= default MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --enable-application=suite -USE_MOZILLA= -vpx +USE_MOZILLA= # empty MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64