--- wikisrc/users/ryoon/how_to_update_www_firefox.mdwn 2014/06/09 08:32:38 1.3 +++ wikisrc/users/ryoon/how_to_update_www_firefox.mdwn 2014/06/09 08:47:26 1.6 @@ -100,14 +100,14 @@ Commit the patches $ vi file/marked/as/U $ hg resolve --mark file/marked/as/U (loop) - $ hg commit -m "Merge pkgsrc_firefox-29.0.1 brnach to 30.0" + $ hg commit -m "Merge pkgsrc_firefox-29.0.1 branch to 30.0" # Create patch file for patch -p0 $ hg diff -r (revision of first commit in ryoon_freebsd-30.0) | \ sed -e 's!^--- a/!--- !' -e 's!^+++ b/!+++ !' > ~/firefox-30.0.diff - vi ~/firefox-30.0.diff + $ vi ~/firefox-30.0.diff (Remove patch to .hgignore) (Remove patch to .hgtags) @@ -117,7 +117,7 @@ Commit the patches $ vi Makefile (Update version) (Remove PKGREVISION) - (Fix WRKSRC) + (Fix WRKSRC variable) $ make mdi $ make extract $ pushd ${WRKOBJDIR}/www/firefox/work/mozilla-beta