Rename url params patch=<ignored>/pnum=<n> to apply={yes,no}/striplevel=<n>

I think this makes the behavior rather more clear.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>

22 files changed, 151 insertions, 151 deletions

diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb
index 15f936b98f..bca47f1bde 100644
--- a/recipes/mozilla/fennec_hg.bb
+++ b/recipes/mozilla/fennec_hg.bb
@@ -7,9 +7,9 @@ PE = "1"
 
 SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=060ddfe5aa48 \
            hg://hg.mozilla.org/;module=mobile-browser;rev=ad254d8abbc9 \
-           file://use-native-bpp.patch;patch=1 \
+           file://use-native-bpp.patch;apply=yes \
            file://jsautocfg.h \
-           file://jsautocfg-dontoverwrite.patch;patch=1 \
+           file://jsautocfg-dontoverwrite.patch;apply=yes \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/firefox_1.0.7.bb b/recipes/mozilla/firefox_1.0.7.bb
index 28746f392d..b7340cc5d9 100644
--- a/recipes/mozilla/firefox_1.0.7.bb
+++ b/recipes/mozilla/firefox_1.0.7.bb
@@ -1,14 +1,14 @@
 PR = "r2"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://firefox-cc-fix.patch;patch=1 \
+	file://xptcstubs.patch;apply=yes \
+	file://no-xmb.patch;apply=yes \
+	file://firefox-cc-fix.patch;apply=yes \
 	file://jsautocfg.h \
-	file://extensions-hack.patch;patch=1 \
-	file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \
-	file://xptcinvoke-arm.patch;patch=1 \
-	file://mozilla-eabi.patch;patch=1"
+	file://extensions-hack.patch;apply=yes \
+	file://firefox-1.0-gcc4-compile.patch;apply=yes;striplevel=0 \
+	file://xptcinvoke-arm.patch;apply=yes \
+	file://mozilla-eabi.patch;apply=yes"
 S = "${WORKDIR}/mozilla"
 
 inherit autotools mozilla
diff --git a/recipes/mozilla/firefox_2.0.0.3.bb b/recipes/mozilla/firefox_2.0.0.3.bb
index be33d679af..3ce38bd42c 100644
--- a/recipes/mozilla/firefox_2.0.0.3.bb
+++ b/recipes/mozilla/firefox_2.0.0.3.bb
@@ -2,17 +2,17 @@ DEPENDS += "cairo"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
+	file://xptcstubs.patch;apply=yes \
+	file://no-xmb.patch;apply=yes \
 	file://jsautocfg.h \
-	file://extensions-hack.patch;patch=1 \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://xptcinvoke-arm.patch;patch=1 \
-	file://eabi-fix.patch;patch=1 \
-	file://eabi-fix2.patch;patch=1 \
-	file://eabi-fix3.patch;patch=1 \
-	file://linkage-problem.patch;patch=1 \
+	file://extensions-hack.patch;apply=yes \
+	file://security-cross.patch;apply=yes \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
+	file://xptcinvoke-arm.patch;apply=yes \
+	file://eabi-fix.patch;apply=yes \
+	file://eabi-fix2.patch;apply=yes \
+	file://eabi-fix3.patch;apply=yes \
+	file://linkage-problem.patch;apply=yes \
 "
 
 S = "${WORKDIR}/mozilla"
diff --git a/recipes/mozilla/firefox_3.0.1.bb b/recipes/mozilla/firefox_3.0.1.bb
index 48013e6249..96894f779a 100644
--- a/recipes/mozilla/firefox_3.0.1.bb
+++ b/recipes/mozilla/firefox_3.0.1.bb
@@ -3,17 +3,17 @@ PR = "r9"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://random_to_urandom.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://wchart.diff;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://use-native-bpp.patch;patch=1 \
+	file://security-cross.patch;apply=yes \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
+	file://Bug339782.additional.fix.diff;apply=yes \
+	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
+	file://Bug405992.atomic.nspr.diff;apply=yes \
+	file://random_to_urandom.diff;apply=yes \
+	file://jemalloc-tls.patch;apply=yes \
+	file://wchart.diff;apply=yes \
+	file://0001-Remove-Werror-from-build.patch;apply=yes \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
+	file://use-native-bpp.patch;apply=yes \
 "
 
 S = "${WORKDIR}/mozilla"
diff --git a/recipes/mozilla/firefox_3.0.4.bb b/recipes/mozilla/firefox_3.0.4.bb
index 6f1e226088..555145aa61 100644
--- a/recipes/mozilla/firefox_3.0.4.bb
+++ b/recipes/mozilla/firefox_3.0.4.bb
@@ -3,16 +3,16 @@ PR = "r1"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://random_to_urandom.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch;apply=yes \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
+	file://Bug339782.additional.fix.diff;apply=yes \
+	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
+	file://Bug405992.atomic.nspr.diff;apply=yes \
+	file://random_to_urandom.diff;apply=yes \
+	file://jemalloc-tls.patch;apply=yes \
+	file://0001-Remove-Werror-from-build.patch;apply=yes \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
+	file://plugins-dir.patch;apply=yes \
 "
 
 S = "${WORKDIR}/mozilla"
diff --git a/recipes/mozilla/firefox_3.0.8.bb b/recipes/mozilla/firefox_3.0.8.bb
index 12635287e8..3518d91d1e 100644
--- a/recipes/mozilla/firefox_3.0.8.bb
+++ b/recipes/mozilla/firefox_3.0.8.bb
@@ -7,15 +7,15 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch;apply=yes \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
+	file://Bug339782.additional.fix.diff;apply=yes \
+	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
+	file://Bug405992.atomic.nspr.diff;apply=yes \
+	file://jemalloc-tls.patch;apply=yes \
+	file://0001-Remove-Werror-from-build.patch;apply=yes \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
+	file://plugins-dir.patch;apply=yes \
 "
 
 S = "${WORKDIR}/mozilla"
diff --git a/recipes/mozilla/firefox_3.1b1.bb b/recipes/mozilla/firefox_3.1b1.bb
index 113f44e24d..ef12924561 100644
--- a/recipes/mozilla/firefox_3.1b1.bb
+++ b/recipes/mozilla/firefox_3.1b1.bb
@@ -6,8 +6,8 @@ PR = "r1"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build2/source/firefox-${MOZPV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://random_to_urandom.diff;patch=1 \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
+	file://random_to_urandom.diff;apply=yes \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/firefox_3.1b2.bb b/recipes/mozilla/firefox_3.1b2.bb
index a74e8d2954..a7704f522a 100644
--- a/recipes/mozilla/firefox_3.1b2.bb
+++ b/recipes/mozilla/firefox_3.1b2.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build2/source/firefox-${MOZPV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb
index 282148c492..b4a4409c09 100644
--- a/recipes/mozilla/firefox_3.5.2.bb
+++ b/recipes/mozilla/firefox_3.5.2.bb
@@ -4,15 +4,15 @@ PR = "r4"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch;apply=yes \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
+	file://Bug339782.additional.fix.diff;apply=yes \
+	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
+	file://Bug405992.atomic.nspr.diff;apply=yes \
+	file://jemalloc-tls.patch;apply=yes \
+	file://0001-Remove-Werror-from-build.patch;apply=yes \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
+	file://plugins-dir.patch;apply=yes \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb
index 18e864d984..58a63f1e5e 100644
--- a/recipes/mozilla/firefox_3.5.4.bb
+++ b/recipes/mozilla/firefox_3.5.4.bb
@@ -4,15 +4,15 @@ PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch;apply=yes \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
+	file://Bug339782.additional.fix.diff;apply=yes \
+	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
+	file://Bug405992.atomic.nspr.diff;apply=yes \
+	file://jemalloc-tls.patch;apply=yes \
+	file://0001-Remove-Werror-from-build.patch;apply=yes \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
+	file://plugins-dir.patch;apply=yes \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb
index 5de60b9777..6bb1f36fa4 100644
--- a/recipes/mozilla/firefox_3.5.5.bb
+++ b/recipes/mozilla/firefox_3.5.5.bb
@@ -4,15 +4,15 @@ PR = "r4"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch;apply=yes \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
+	file://Bug339782.additional.fix.diff;apply=yes \
+	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
+	file://Bug405992.atomic.nspr.diff;apply=yes \
+	file://jemalloc-tls.patch;apply=yes \
+	file://0001-Remove-Werror-from-build.patch;apply=yes \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
+	file://plugins-dir.patch;apply=yes \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_3.5b4.bb b/recipes/mozilla/firefox_3.5b4.bb
index e8571cef37..a22108e65b 100644
--- a/recipes/mozilla/firefox_3.5b4.bb
+++ b/recipes/mozilla/firefox_3.5b4.bb
@@ -6,7 +6,7 @@ PR = "r3"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/source/firefox-${MOZPV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
+	file://jsautocfg-dontoverwrite.patch;apply=yes \
 "
 
 S = "${WORKDIR}/mozilla-1.9.1"
diff --git a/recipes/mozilla/firefox_3.6.2.bb b/recipes/mozilla/firefox_3.6.2.bb
index 1c975e0baf..8043a25eed 100644
--- a/recipes/mozilla/firefox_3.6.2.bb
+++ b/recipes/mozilla/firefox_3.6.2.bb
@@ -3,14 +3,14 @@ DEPENDS += "cairo sqlite3 libnotify"
 # The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version!
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch;apply=yes \
+	file://Bug339782.additional.fix.diff;apply=yes \
+	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
+	file://Bug405992.atomic.nspr.diff;apply=yes \
+	file://jemalloc-tls.patch;apply=yes \
+	file://0001-Remove-Werror-from-build.patch;apply=yes \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
+	file://plugins-dir.patch;apply=yes \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_3.6.3.bb b/recipes/mozilla/firefox_3.6.3.bb
index 49b38ad813..fc6b1ca9b5 100644
--- a/recipes/mozilla/firefox_3.6.3.bb
+++ b/recipes/mozilla/firefox_3.6.3.bb
@@ -3,14 +3,14 @@ DEPENDS += "cairo sqlite3 libnotify"
 # The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version!
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch;apply=yes \
+	file://Bug339782.additional.fix.diff;apply=yes \
+	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
+	file://Bug405992.atomic.nspr.diff;apply=yes \
+	file://jemalloc-tls.patch;apply=yes \
+	file://0001-Remove-Werror-from-build.patch;apply=yes \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
+	file://plugins-dir.patch;apply=yes \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_3.6.bb b/recipes/mozilla/firefox_3.6.bb
index 573154f3aa..9d4b3c4b08 100644
--- a/recipes/mozilla/firefox_3.6.bb
+++ b/recipes/mozilla/firefox_3.6.bb
@@ -5,14 +5,14 @@ PR = "r4"
 # The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version!
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch;apply=yes \
+	file://Bug339782.additional.fix.diff;apply=yes \
+	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
+	file://Bug405992.atomic.nspr.diff;apply=yes \
+	file://jemalloc-tls.patch;apply=yes \
+	file://0001-Remove-Werror-from-build.patch;apply=yes \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
+	file://plugins-dir.patch;apply=yes \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_hg.bb b/recipes/mozilla/firefox_hg.bb
index 37bb2608bd..e98fdcd723 100644
--- a/recipes/mozilla/firefox_hg.bb
+++ b/recipes/mozilla/firefox_hg.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=8c9a6d851018 \
            file://jsautocfg.h \
-           file://jsautocfg-dontoverwrite.patch;patch=1 \
+           file://jsautocfg-dontoverwrite.patch;apply=yes \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/minimo_cvs.bb b/recipes/mozilla/minimo_cvs.bb
index 25ab87a181..3d325d6b18 100644
--- a/recipes/mozilla/minimo_cvs.bb
+++ b/recipes/mozilla/minimo_cvs.bb
@@ -16,14 +16,14 @@ PE = "1"
 PR = "r1"
 
 SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
-	   file://minimo.patch;patch=1 \
-           file://bug-322806.diff;patch=1 \
+	   file://minimo.patch;apply=yes \
+           file://bug-322806.diff;apply=yes \
 	   file://mozconfig file://minimo \
-	   file://eabi-fix.patch;patch=1 \
-	   file://eabi-fix2.patch;patch=1 \
-	   file://eabi-fix3.patch;patch=1 \
-	   file://minimo-components-ssr-only.patch;patch=1 \
-	   file://minimo-disable-mode-switch.patch;patch=1 \
+	   file://eabi-fix.patch;apply=yes \
+	   file://eabi-fix2.patch;apply=yes \
+	   file://eabi-fix3.patch;apply=yes \
+	   file://minimo-components-ssr-only.patch;apply=yes \
+	   file://minimo-disable-mode-switch.patch;apply=yes \
            file://minimo.desktop file://minimo.png"
 
 inherit autotools
diff --git a/recipes/mozilla/nspr-tools-native_4.7.1.bb b/recipes/mozilla/nspr-tools-native_4.7.1.bb
index 5fc9a32960..247f4b48bc 100644
--- a/recipes/mozilla/nspr-tools-native_4.7.1.bb
+++ b/recipes/mozilla/nspr-tools-native_4.7.1.bb
@@ -2,11 +2,11 @@ require nspr-tools-native.inc
 
 SRC_URI = "\
 	http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive \
-	file://30_config_64bits.dpatch;patch=1 \
-	file://30_pkgconfig.dpatch;patch=1 \
-	file://81_sonames.dpatch;patch=1 \
-	file://99_configure.dpatch;patch=1 \
-	file://unbreak-build.diff;patch=1 \
+	file://30_config_64bits.dpatch;apply=yes \
+	file://30_pkgconfig.dpatch;apply=yes \
+	file://81_sonames.dpatch;apply=yes \
+	file://99_configure.dpatch;apply=yes \
+	file://unbreak-build.diff;apply=yes \
 	"
 
 SRC_URI[archive.md5sum] = "7c6e75a0867ce2b9ec62e399a908b5ac"
diff --git a/recipes/mozilla/nspr_4.7.1.bb b/recipes/mozilla/nspr_4.7.1.bb
index 92ed18d3c3..e6c4768c38 100644
--- a/recipes/mozilla/nspr_4.7.1.bb
+++ b/recipes/mozilla/nspr_4.7.1.bb
@@ -2,11 +2,11 @@ require nspr.inc
 
 SRC_URI = "\
 	http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive \
-	file://30_config_64bits.dpatch;patch=1 \
-	file://30_pkgconfig.dpatch;patch=1 \
-	file://81_sonames.dpatch;patch=1 \
-	file://99_configure.dpatch;patch=1 \
-	file://unbreak-build.diff;patch=1 \
+	file://30_config_64bits.dpatch;apply=yes \
+	file://30_pkgconfig.dpatch;apply=yes \
+	file://81_sonames.dpatch;apply=yes \
+	file://99_configure.dpatch;apply=yes \
+	file://unbreak-build.diff;apply=yes \
 	"
 
 SRC_URI[archive.md5sum] = "7c6e75a0867ce2b9ec62e399a908b5ac"
diff --git a/recipes/mozilla/nss_3.12.6.bb b/recipes/mozilla/nss_3.12.6.bb
index 76ad318a7e..9966f08ff5 100644
--- a/recipes/mozilla/nss_3.12.6.bb
+++ b/recipes/mozilla/nss_3.12.6.bb
@@ -9,21 +9,21 @@ DEPENDS = "sqlite3 nspr"
 
 SRC_URI = "\
 	http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/${PN}-${PV}.tar.gz;name=archive \
-	file://00_ckbi_1.79.patch;patch=1 \
-	file://25_entropy.patch;patch=1 \
-	file://38_hurd.patch;patch=1 \
-	file://38_kbsd.patch;patch=1 \
-	file://38_mips64_build.patch;patch=1 \
-	file://80_security_build.patch;patch=1 \
-	file://80_security_tools.patch;patch=1 \
-	file://81_sonames.patch;patch=1 \
-	file://85_security_load.patch;patch=1 \
-	file://90_realpath.patch;patch=1 \
-	file://91_build_pwdecrypt.patch;patch=1 \
-	file://95_add_spi+cacert_ca_certs.patch;patch=1 \
-	file://96_NSS_VersionCheck.patch;patch=1 \
-	file://97_SSL_RENEGOTIATE_TRANSITIONAL.patch;patch=1 \
-	file://build-fix.patch;patch=1;pnum=0 \
+	file://00_ckbi_1.79.patch;apply=yes \
+	file://25_entropy.patch;apply=yes \
+	file://38_hurd.patch;apply=yes \
+	file://38_kbsd.patch;apply=yes \
+	file://38_mips64_build.patch;apply=yes \
+	file://80_security_build.patch;apply=yes \
+	file://80_security_tools.patch;apply=yes \
+	file://81_sonames.patch;apply=yes \
+	file://85_security_load.patch;apply=yes \
+	file://90_realpath.patch;apply=yes \
+	file://91_build_pwdecrypt.patch;apply=yes \
+	file://95_add_spi+cacert_ca_certs.patch;apply=yes \
+	file://96_NSS_VersionCheck.patch;apply=yes \
+	file://97_SSL_RENEGOTIATE_TRANSITIONAL.patch;apply=yes \
+	file://build-fix.patch;apply=yes;striplevel=0 \
 	file://nss.pc.in \
 "
 
diff --git a/recipes/mozilla/nss_3.12.bb b/recipes/mozilla/nss_3.12.bb
index a6408954cb..3c9b707875 100644
--- a/recipes/mozilla/nss_3.12.bb
+++ b/recipes/mozilla/nss_3.12.bb
@@ -9,16 +9,16 @@ DEPENDS = "sqlite3 nspr"
 
 SRC_URI = "\
 	http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_RTM/src/${PN}-${PV}.tar.gz;name=archive \
-	file://25_entropy.dpatch;patch=1 \
-	file://38_mips64_build.dpatch;patch=1 \
-	file://80_security_build.dpatch;patch=1 \
-	file://80_security_tools.dpatch;patch=1 \
-	file://81_sonames.dpatch;patch=1 \
-	file://85_security_load.dpatch;patch=1 \
-	file://90_realpath.dpatch;patch=1 \
-	file://91_build_pwdecrypt.dpatch;patch=1 \
-	file://95_add_spi+cacert_ca_certs.dpatch;patch=1 \
-	file://build-fix.patch;patch=1 \
+	file://25_entropy.dpatch;apply=yes \
+	file://38_mips64_build.dpatch;apply=yes \
+	file://80_security_build.dpatch;apply=yes \
+	file://80_security_tools.dpatch;apply=yes \
+	file://81_sonames.dpatch;apply=yes \
+	file://85_security_load.dpatch;apply=yes \
+	file://90_realpath.dpatch;apply=yes \
+	file://91_build_pwdecrypt.dpatch;apply=yes \
+	file://95_add_spi+cacert_ca_certs.dpatch;apply=yes \
+	file://build-fix.patch;apply=yes \
     file://nss.pc.in \
 "
 
diff --git a/recipes/mozilla/thunderbird_1.0.7.bb b/recipes/mozilla/thunderbird_1.0.7.bb
index cc4e6744c0..f46045367a 100644
--- a/recipes/mozilla/thunderbird_1.0.7.bb
+++ b/recipes/mozilla/thunderbird_1.0.7.bb
@@ -8,10 +8,10 @@ IPCVER="1.1.3"
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2;name=archive \
 	http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz;name=enigmail \
 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz;name=ipc \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://extensions-hack.patch;patch=1 \
-	file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \
+	file://xptcstubs.patch;apply=yes \
+	file://no-xmb.patch;apply=yes \
+	file://extensions-hack.patch;apply=yes \
+	file://firefox-1.0-gcc4-compile.patch;apply=yes;striplevel=0 \
 	file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop"
 S = "${WORKDIR}/mozilla"