version 1.3, 2014/06/09 08:32:38
|
version 1.7, 2015/01/16 14:04:45
|
Line 67 Checkout the branch.
|
Line 67 Checkout the branch.
|
|
|
Create named branch for working. |
Create named branch for working. |
|
|
$ hg branch ryoon_firefox-30.b9 |
$ hg branch ryoon_firefox-30.0b9 |
|
|
Create named branch for applying pkgsrc patches |
|
|
|
$ hg branch ryoon_firefox-30.0 |
|
$ hg commit -m "Create ryoon_firefox-30.0 branch for applying freebsd-gecko patches" |
$ hg commit -m "Create ryoon_firefox-30.0 branch for applying freebsd-gecko patches" |
|
|
Add .*\.orig$ to .hgignore, and commit this change |
Add .*\.orig$ to .hgignore, and commit this change |
Line 100 Commit the patches
|
Line 96 Commit the patches
|
$ vi file/marked/as/U |
$ vi file/marked/as/U |
$ hg resolve --mark file/marked/as/U |
$ hg resolve --mark file/marked/as/U |
(loop) |
(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 |
# Create patch file for patch -p0 |
|
|
$ hg diff -r (revision of first commit in ryoon_freebsd-30.0) | \ |
$ hg diff -r (revision of first commit in ryoon_freebsd-30.0) | \ |
sed -e 's!^--- a/!--- !' -e 's!^+++ b/!+++ !' > ~/firefox-30.0.diff |
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 .hgignore) |
(Remove patch to .hgtags) |
(Remove patch to .hgtags) |
|
|
Line 117 Commit the patches
|
Line 113 Commit the patches
|
$ vi Makefile |
$ vi Makefile |
(Update version) |
(Update version) |
(Remove PKGREVISION) |
(Remove PKGREVISION) |
(Fix WRKSRC) |
(Fix WRKSRC variable) |
$ make mdi |
$ make mdi |
$ make extract |
$ make extract |
$ pushd ${WRKOBJDIR}/www/firefox/work/mozilla-beta |
$ pushd ${WRKOBJDIR}/www/firefox/work/mozilla-beta |