Date: Tue, 30 Dec 2008 19:27:43 +0100 From: "Torfinn Ingolfsen" <tingox@gmail.com> To: freebsd-ports@freebsd.org Subject: Re: aMule 22.3 porting - some questions Message-ID: <ef8c8a880812301027l671b84b5j9cdf4733ccbbab57@mail.gmail.com> In-Reply-To: <20081230175527.GC81218@hades.panopticon> References: <ef8c8a880812291349g5fd986ebwe970f3ed040ba2fb@mail.gmail.com> <ef8c8a880812291504g1daa00d5o5de7bfd27fa20765@mail.gmail.com> <20081230175527.GC81218@hades.panopticon>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_86186_32898112.1230661663591 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello, On Tue, Dec 30, 2008 at 6:55 PM, Dmitry Marakasov <amdmi3@amdmi3.ru> wrote: > But I assume what you need is -r option for diff - it compares 2 > directories recursively, processing all changes as well as new and > removed files correctly. I actually tried with the -r option to diff after sending mail to this list. But it seems like -r on it's own isn't enough, I also need patch with the -E argument. I created the attached patch with diff -ruN ... when I try patch without '-E': root@kg-vm# patch -C -p1 < /home/tingo/work/amule/amule2-3.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/Makefile amule2/Makefile |--- amule2.org/Makefile 2008-08-21 08:18:04.000000000 +0200 |+++ amule2/Makefile 2008-12-29 21:18:08.000000000 +0100 -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 6. Hunk #2 succeeded at 45 (offset 1 line). Hunk #3 succeeded at 121 (offset 1 line). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/Makefile.man amule2/Makefile.man |--- amule2.org/Makefile.man 2006-01-04 06:59:25.000000000 +0100 |+++ amule2/Makefile.man 2008-12-29 20:51:00.000000000 +0100 -------------------------- Patching file Makefile.man using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 20. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/distinfo amule2/distinfo |--- amule2.org/distinfo 2007-01-12 18:18:48.000000000 +0100 |+++ amule2/distinfo 2008-12-29 20:43:48.000000000 +0100 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/files/patch-amuleDlg.cpp amule2/files/patch-amuleDlg.cpp |--- amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 |+++ amule2/files/patch-amuleDlg.cpp 1970-01-01 01:00:00.000000000 +0100 -------------------------- Patching file files/patch-amuleDlg.cpp using Plan A... Hunk #1 failed at 0. 1 out of 1 hunks failed--saving rejects to files/patch-amuleDlg.cpp.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/pkg-plist amule2/pkg-plist |--- amule2.org/pkg-plist 2007-10-25 01:36:24.000000000 +0200 |+++ amule2/pkg-plist 2008-12-29 22:24:25.000000000 +0100 -------------------------- Patching file pkg-plist using Plan A... Hunk #1 succeeded at 39. done Looks like it doesn't remove the file. Next try - now with '-E': root@kg-vm# patch -C -Ep1 < /home/tingo/work/amule/amule2-3.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/Makefile amule2/Makefile |--- amule2.org/Makefile 2008-08-21 08:18:04.000000000 +0200 |+++ amule2/Makefile 2008-12-29 21:18:08.000000000 +0100 -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 6. Hunk #2 succeeded at 45 (offset 1 line). Hunk #3 succeeded at 121 (offset 1 line). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/Makefile.man amule2/Makefile.man |--- amule2.org/Makefile.man 2006-01-04 06:59:25.000000000 +0100 |+++ amule2/Makefile.man 2008-12-29 20:51:00.000000000 +0100 -------------------------- Patching file Makefile.man using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 20. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/distinfo amule2/distinfo |--- amule2.org/distinfo 2007-01-12 18:18:48.000000000 +0100 |+++ amule2/distinfo 2008-12-29 20:43:48.000000000 +0100 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/files/patch-amuleDlg.cpp amule2/files/patch-amuleDlg.cpp |--- amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 |+++ amule2/files/patch-amuleDlg.cpp 1970-01-01 01:00:00.000000000 +0100 -------------------------- Patching file files/patch-amuleDlg.cpp using Plan A... Hunk #1 failed at 0. Removing files/patch-amuleDlg.cpp (empty after patching). 1 out of 1 hunks failed--saving rejects to files/patch-amuleDlg.cpp.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/pkg-plist amule2/pkg-plist |--- amule2.org/pkg-plist 2007-10-25 01:36:24.000000000 +0200 |+++ amule2/pkg-plist 2008-12-29 22:24:25.000000000 +0100 -------------------------- Patching file pkg-plist using Plan A... Hunk #1 succeeded at 39. done It stills says "hunk failed" but now it removes the empty file. So this is good then? Thanks for your feedback, helpful as always. -- Regards, Torfinn Ingolfsen ------=_Part_86186_32898112.1230661663591 Content-Type: text/x-diff; name=amule2-3.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_fpcvzy2m0 Content-Disposition: attachment; filename=amule2-3.diff ZGlmZiAtcnVOIGFtdWxlMi5vcmcvTWFrZWZpbGUgYW11bGUyL01ha2VmaWxlCi0tLSBhbXVsZTIu b3JnL01ha2VmaWxlCTIwMDgtMDgtMjEgMDg6MTg6MDQuMDAwMDAwMDAwICswMjAwCisrKyBhbXVs ZTIvTWFrZWZpbGUJMjAwOC0xMi0yOSAyMToxODowOC4wMDAwMDAwMDAgKzAxMDAKQEAgLTYsMTgg KzYsMTcgQEAKICMKIAogUE9SVE5BTUU9CWFNdWxlCi1QT1JUVkVSU0lPTj0JMi4xLjMKLVBPUlRS RVZJU0lPTj0JNworUE9SVFZFUlNJT049CTIuMi4zCiBDQVRFR09SSUVTPQluZXQtcDJwCiBNQVNU RVJfU0lURVM9CVNGL2FtdWxlCiAKLVBBVENIX1NJVEVTPQlodHRwOi8vY3ZzLnBsZC1saW51eC5v cmcvY2dpLWJpbi9jdnN3ZWIvU09VUkNFUy8KLVBBVENIRklMRVM9CWFNdWxlLXd4LnBhdGNoP3Jl dj0xLjIKLVBBVENIX0RJU1RfU1RSSVA9CS1wMQotCiBNQUlOVEFJTkVSPQlib3Jpc0B0YWduZXQu cnUKIENPTU1FTlQ9CVRoZSBhbGwtcGxhdGZvcm0gZU11bGUgcDJwIGNsaWVudAogCitCVUlMRF9E RVBFTkRTPSAke0xPQ0FMQkFTRX0vYmluL2ZsZXg6JHtQT1JUU0RJUn0vdGV4dHByb2MvZmxleCBc CisgICAgICAgICAgICAgICAke0xPQ0FMQkFTRX0vbGliL2xpYmNyeXB0b3BwLmE6JHtQT1JUU0RJ Un0vc2VjdXJpdHkvY3J5cHRvcHAKK0xJQl9ERVBFTkRTPSAgIGN1cmwuNDoke1BPUlRTRElSfS9m dHAvY3VybAorCiBMQVRFU1RfTElOSz0JYU11bGUyCiBDT05GTElDVFM9CWFNdWxlLTEuKiBhTXVs ZS1kZXZlbC1bMC05XSogZWQyay1oYXNoLSoKIApAQCAtNDUsNiArNDQsMTEgQEAKIAkJQU1VTEVE QUVNT04gIkNvbXBpbGUgYU11bGUgZGFlbW9uIHZlcnNpb24gLSBFWFBFUklNRU5UQUwiIG9mZiBc CiAJCVdYVU5JQ09ERSAiRW5hYmxlIFVuaWNvZGUgc3VwcG9ydCIgb24KIAorRE9DU0RJUj0gICAg ICAgICR7UFJFRklYfS9zaGFyZS9kb2MvYU11bGUtJHtQT1JUVkVSU0lPTn0KK1BPUlRET0NTPQlk b2NzL0FVVEhPUlMgZG9jcy9DT1BZSU5HIGRvY3MvQ2hhbmdlbG9nIGRvY3MvRG94eWZpbGUgZG9j cy9FQ19Qcm90b2NvbC50eHQgXAorCQlkb2NzL0VEMkstTGlua3MuSE9XVE8gZG9jcy9JTlNUQUxM IGRvY3MvUkVBRE1FKiBkb2NzL1JlbGVhc2VzLmRpYSBkb2NzL1RPRE8gXAorCQlkb2NzL2FtdWxl LXdpbjMyLkhPV1RPLnR4dCBkb2NzL2FtdWxlc2lnLnR4dCBkb2NzL2xpY2Vuc2UudHh0IGRvY3Mv c29ja3M0LnByb3RvY29sCisKIC5pbmNsdWRlIDxic2QucG9ydC5wcmUubWs+CiAKIC5pZiAhZGVm aW5lZChXSVRIT1VUX05MUykKQEAgLTExNiwyNCArMTIwLDkgQEAKICMgTWFuIHBhZ2VzIG1hbmFn ZW1lbnQKIC5pbmNsdWRlICJNYWtlZmlsZS5tYW4iCiAKLXBvc3QtaW5zdGFsbDoKLSMgZnIgbWFu cGFnZXMgYXJlIHN0aWxsIGluY29tcGxldGUgYW5kIGNhbid0IGJlIG1hbmFnZWQKLSMgYnkgTUFO TEFORy4gV2lsbCBiZSBkb25lIHdoZW4gcGFnZXMgYXJlIGNvbXBsZXRlLgotLmlmIGRlZmluZWQo V0lUSF9BTVVMRUNNRCkKLQkke0daSVBfQ01EfSAke1BSRUZJWH0vbWFuL2ZyL21hbjEvYW11bGVj bWQuMQotLmVuZGlmCi0uaWYgZGVmaW5lZChXSVRIX0FNVUxFV0VCU1JWKQotCSR7R1pJUF9DTUR9 ICR7UFJFRklYfS9tYW4vZnIvbWFuMS9hbXVsZXdlYi4xCi0uZW5kaWYKLQkke0daSVBfQ01EfSAk e1BSRUZJWH0vbWFuL2ZyL21hbjEvYW11bGUuMQotLmlmIGRlZmluZWQoV0lUSF9BTVVMRURBRU1P TikKLQkke0daSVBfQ01EfSAke1BSRUZJWH0vbWFuL2ZyL21hbjEvYW11bGVkLjEKLS5lbmRpZgot LmlmIGRlZmluZWQoV0lUSF9FRDJLKQotCSR7R1pJUF9DTUR9ICR7UFJFRklYfS9tYW4vZnIvbWFu MS9lZDJrLjEKLS5lbmRpZgotLmlmIGRlZmluZWQoV0lUSF9BTEMpCi0JJHtHWklQX0NNRH0gJHtQ UkVGSVh9L21hbi9mci9tYW4xL2FsY2MuMQotLmVuZGlmCitwb3N0LXBhdGNoOgorIyByZW1vdmUg c29tZSBiYXNoaXNtcworIyAgICAgICAgJHtSRUlOUExBQ0VfQ01EfSAtZSAnL2lmIHRlc3QvIHN8 PT18PXwnICR7V1JLU1JDfS9jb25maWd1cmUKKyMgICAgICAgICR7UkVJTlBMQUNFX0NNRH0gLWUg Jy9pZiB0ZXN0LyBzfD09fD18JyAke1dSS1NSQ30vYXV0b21ha2UvbWFucGFnZXMuYW0KIAogLmlu Y2x1ZGUgPGJzZC5wb3J0LnBvc3QubWs+CmRpZmYgLXJ1TiBhbXVsZTIub3JnL01ha2VmaWxlLm1h biBhbXVsZTIvTWFrZWZpbGUubWFuCi0tLSBhbXVsZTIub3JnL01ha2VmaWxlLm1hbgkyMDA2LTAx LTA0IDA2OjU5OjI1LjAwMDAwMDAwMCArMDEwMAorKysgYW11bGUyL01ha2VmaWxlLm1hbgkyMDA4 LTEyLTI5IDIwOjUxOjAwLjAwMDAwMDAwMCArMDEwMApAQCAtMSwxMiArMSwxMiBAQAogIyBUT0RP IDogQWRkIGZyIGhlcmUgd2hlbiBwYWdlcyBhcmUgY29tcGxldGUKLU1BTkxBTkc9CSIiIGRlIGVz IGh1CitNQU5MQU5HPQkiIgogTUFOQ09NUFJFU1NFRD0Jbm8KIC5pZiBkZWZpbmVkKFdJVEhfQ0FT KQotTUFOMSs9CWNhcy4xCi1NQU4xKz0Jd3hjYXMuMQorTUFOMV9FTis9CWNhcy4xCitNQU4xX0VO Kz0Jd3hjYXMuMQogLmVuZGlmCiAuaWYgZGVmaW5lZChXSVRIX0FMQykKLU1BTjErPQlhbGMuMQor TUFOMV9FTis9CWFsYy4xCiBNQU4xKz0JYWxjYy4xCiAuZW5kaWYKIC5pZiBkZWZpbmVkKFdJVEhf QU1VTEVXRUJTUlYpCkBAIC0yMCw2ICsyMCw3IEBACiAuZW5kaWYKIC5pZiBkZWZpbmVkKFdJVEhf QU1VTEVEQUVNT04pCiBNQU4xKz0JYW11bGVkLjEKK01BTjFfRU4rPQlhbXVsZWd1aS4xCiAuZW5k aWYKIE1BTjErPQlhbXVsZS4xCi1NQU4xKz0JeGFzLjEKK01BTjFfRU4rPQl4YXMuMQpkaWZmIC1y dU4gYW11bGUyLm9yZy9kaXN0aW5mbyBhbXVsZTIvZGlzdGluZm8KLS0tIGFtdWxlMi5vcmcvZGlz dGluZm8JMjAwNy0wMS0xMiAxODoxODo0OC4wMDAwMDAwMDAgKzAxMDAKKysrIGFtdWxlMi9kaXN0 aW5mbwkyMDA4LTEyLTI5IDIwOjQzOjQ4LjAwMDAwMDAwMCArMDEwMApAQCAtMSw2ICsxLDMgQEAK LU1ENSAoYU11bGUtMi4xLjMudGFyLmJ6MikgPSAwYWFmZGQxNTllZGI4YWQ1ZjAwNjRkYTg3OTk4 YjQ3ZAotU0hBMjU2IChhTXVsZS0yLjEuMy50YXIuYnoyKSA9IDZlOTdlOTQ3YmI3YWMyMzFiNzVl M2IyMWE1MDlhMmVjMDIzOWJjZDdlOWRiZmM2MDYyYzUyMGE2ZDEzYjAyNDQKLVNJWkUgKGFNdWxl LTIuMS4zLnRhci5iejIpID0gMzI0ODUzMAotTUQ1IChhTXVsZS13eC5wYXRjaD9yZXY9MS4yKSA9 IDdiNjE2NTFiMGFiZGVlN2RjNTc3YTAzZGFkODAyNWMxCi1TSEEyNTYgKGFNdWxlLXd4LnBhdGNo P3Jldj0xLjIpID0gYzBjMGE1NWZiNDM3ZmRmNjE4MTM3ZjJjYjBjNWZmNTlhMTU5NWFlZGRmNTQ1 NWExYmFkMmIyYWIxMWIwYTI0NAotU0laRSAoYU11bGUtd3gucGF0Y2g/cmV2PTEuMikgPSA0OTQz CitNRDUgKGFNdWxlLTIuMi4zLnRhci5iejIpID0gNjRhMGQ0MWVkYmRkN2NmMzZmYTg5MmU0NWE2 NTJiZmQKK1NIQTI1NiAoYU11bGUtMi4yLjMudGFyLmJ6MikgPSA4ODg2MjE1YWU4YjNhZWY3NDg3 NWNkMWFjZTU1MTEwOTMyNDY0OWQxZDM1M2RiNmIwYzFhYzc4NWY0OGRjNDRhCitTSVpFIChhTXVs ZS0yLjIuMy50YXIuYnoyKSA9IDQ2NjYwMDEKZGlmZiAtcnVOIGFtdWxlMi5vcmcvZmlsZXMvcGF0 Y2gtYW11bGVEbGcuY3BwIGFtdWxlMi9maWxlcy9wYXRjaC1hbXVsZURsZy5jcHAKLS0tIGFtdWxl Mi5vcmcvZmlsZXMvcGF0Y2gtYW11bGVEbGcuY3BwCTIwMDYtMDEtMDQgMDY6NTk6MjUuMDAwMDAw MDAwICswMTAwCisrKyBhbXVsZTIvZmlsZXMvcGF0Y2gtYW11bGVEbGcuY3BwCTE5NzAtMDEtMDEg MDE6MDA6MDAuMDAwMDAwMDAwICswMTAwCkBAIC0xLDI0ICswLDAgQEAKLS0tLSBzcmMvYW11bGVE bGcuY3BwLm9yaWcJU3VuIEphbiAgMSAwNjoxNzoyNSAyMDA2Ci0rKysgc3JjL2FtdWxlRGxnLmNw cAlUdWUgSmFuICAzIDE5OjEyOjA0IDIwMDYKLUBAIC00MTMsOSArNDEzLDkgQEAKLSB7Ci0gCXd4 U3RyaW5nIG1zZyA9IHd4VCgiICIpOwotICNpZmRlZiBDTElFTlRfR1VJCi0tCW1zZyA8PCBfKCJh TXVsZSByZW1vdGUgY29udHJvbCAiKSA8PCB3eFQoVkVSU0lPTik7Ci0rCW1zZyA8PCBfKCJhTXVs ZSByZW1vdGUgY29udHJvbCAiKSA8PCB3eFQoVkVSU0lPTikgPDwgd3hUKCIgZm9yIEZyZWVCU0Qi KTsKLSAjZWxzZQotLQltc2cgPDwgd3hUKCJhTXVsZSAiKSA8PCB3eFQoVkVSU0lPTik7Ci0rCW1z ZyA8PCB3eFQoImFNdWxlICIpIDw8IHd4VChWRVJTSU9OKSA8PCB3eFQoIiBmb3IgRnJlZUJTRCIp OwotICNlbmRpZgotIAltc2cgPDwgd3hUKCIgIik7Ci0gI2lmZGVmIENWU0RBVEUKLUBAIC00MjUs NyArNDI1LDggQEAKLSAJCSIgJ0FsbC1QbGF0Zm9ybScgcDJwIGNsaWVudCBiYXNlZCBvbiBlTXVs ZSBcblxuIgotIAkJIiBXZWJzaXRlOiBodHRwOi8vd3d3LmFtdWxlLm9yZyBcbiIKLSAJCSIgRm9y dW06IGh0dHA6Ly9mb3J1bS5hbXVsZS5vcmcgXG4iCi0tCQkiIEZBUTogaHR0cDovL3dpa2kuYW11 bGUub3JnIFxuXG4iCi0rCQkiIEZBUTogaHR0cDovL3dpa2kuYW11bGUub3JnIFxuIgotKwkJIiBG cmVlQlNEIHBvcnQ6IGh0dHA6Ly9jb250cmlicy5tYXJ0eW1hYy5jb20gXG5cbiIKLSAJCSIgQ29u dGFjdDogYWRtaW5AYW11bGUub3JnIChhZG1pbmlzdHJhdGl2ZSBpc3N1ZXMpIFxuIgotIAkJIiBD b3B5cmlnaHQgKEMpIDIwMDMtMjAwNiBhTXVsZSBUZWFtIFxuXG4iCi0gCQkiIFBhcnQgb2YgYU11 bGUgaXMgYmFzZWQgb24gXG4iCmRpZmYgLXJ1TiBhbXVsZTIub3JnL3BrZy1wbGlzdCBhbXVsZTIv cGtnLXBsaXN0Ci0tLSBhbXVsZTIub3JnL3BrZy1wbGlzdAkyMDA3LTEwLTI1IDAxOjM2OjI0LjAw MDAwMDAwMCArMDIwMAorKysgYW11bGUyL3BrZy1wbGlzdAkyMDA4LTEyLTI5IDIyOjI0OjI1LjAw MDAwMDAwMCArMDEwMApAQCAtMzksMjAgKzM5LDYgQEAKIEBkaXJybXRyeSBzaGFyZS9sb2NhbGUv aXRfQ0gKIEBkaXJybXRyeSBzaGFyZS9sb2NhbGUva29fS1IvTENfTUVTU0FHRVMKIEBkaXJybXRy eSBzaGFyZS9sb2NhbGUva29fS1IKLXNoYXJlL2RvYy9hTXVsZS0yLjEuMy9BQk9VVC1OTFMKLXNo YXJlL2RvYy9hTXVsZS0yLjEuMy9hbXVsZXNpZy50eHQKLXNoYXJlL2RvYy9hTXVsZS0yLjEuMy9h bXVsZS13aW4zMi5IT1dUTy50eHQKLXNoYXJlL2RvYy9hTXVsZS0yLjEuMy9DaGFuZ2Vsb2cKLXNo YXJlL2RvYy9hTXVsZS0yLjEuMy9Eb3h5ZmlsZQotc2hhcmUvZG9jL2FNdWxlLTIuMS4zL0VEMkst TGlua3MuSE9XVE8KLXNoYXJlL2RvYy9hTXVsZS0yLjEuMy9JTlNUQUxMCi1zaGFyZS9kb2MvYU11 bGUtMi4xLjMvbGljZW5zZS50eHQKLXNoYXJlL2RvYy9hTXVsZS0yLjEuMy9SRUFETUUKLXNoYXJl L2RvYy9hTXVsZS0yLjEuMy9UT0RPCi1zaGFyZS9kb2MvYU11bGUtMi4xLjMvRUNfUHJvdG9jb2wu dHh0Ci1zaGFyZS9kb2MvYU11bGUtMi4xLjMvc29ja3M0LnByb3RvY29sCi1AZGlycm10cnkgc2hh cmUvZG9jL2FNdWxlLTIuMS4zCi1AZGlycm10cnkgc2hhcmUvZG9jCiAlJVBMX0NBUyUlc2hhcmUv Y2FzL3RtcC5odG1sCiAlJVBMX0NBUyUlc2hhcmUvY2FzL3N0YXQucG5nCiAlJVBMX0NBUyUlQGRp cnJtdHJ5IHNoYXJlL2Nhcwo= ------=_Part_86186_32898112.1230661663591--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ef8c8a880812301027l671b84b5j9cdf4733ccbbab57>