Date: Tue, 26 Feb 2002 04:09:13 +0100 From: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx> To: dochawk@psu.edu Cc: freebsd-ports@FreeBSD.ORG Subject: Re: dumb diff question Message-ID: <20020226040913.34e570b0.corecode@corecode.ath.cx> In-Reply-To: <200202260044.g1Q0hxb56581@fac13.ds.psu.edu> References: <200202260044.g1Q0hxb56581@fac13.ds.psu.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
--=.+S2S(YYq)vydB? Content-Type: multipart/mixed; boundary="Multipart_Tue__26_Feb_2002_04:09:13_+0100_086b5a00" --Multipart_Tue__26_Feb_2002_04:09:13_+0100_086b5a00 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 25 Feb 2002 19:43:59 -0500 dochawk@psu.edu wrote: > > Maybe it's years of contamination by GNU diff/patch, but I'm stumped. > > The files I need to patch are in WRKDIR, not WRKSRC. Installation is > really a matter of patching the two linux install scripts and getting > things untarred in the right places. > > I've already changed $WRKSRC to be WRKDIR rather than WRKDIR/lf95, as > WRKDIR never gets created. I now just need to create the correct diffs > for those two files. i've written a nice script to automate this process. just make sure that the original files are the ones with .orig suffix. in general it works this way: cd $WRKSRC (this means just ,cd work' for you) diff -ruN path/to/original . > I've tried just applying diff to the original and modified versions-- > this gives me patches that work, but that ask for the name of the file > to be patched. if the path within the diff is correct this shouldn't happen. > I've tried duplicating work and using diff -r, but that gives me a file > beginning with > > diff -r work.old/install work/install > 1c1 yea right as i thought. you need to change into $WRKSRC cheerz corecode ps: portmgr, in case you find this useful don't hesitate to include that script somewhere. -- /"\ http://corecode.ath.cx/ \ / \ ASCII Ribbon Campaign / \ Against HTML Mail and News --Multipart_Tue__26_Feb_2002_04:09:13_+0100_086b5a00 Content-Type: text/plain; name="genpatch" Content-Disposition: attachment; filename="genpatch" Content-Transfer-Encoding: base64 IyEvYmluL3NoCgojIENvcHlyaWdodCAoYykgMjAwMiBTaW1vbiAnY29yZWNvZGUnIFNjaHViZXJ0 LCBjb3JlY29kZUBjb3JlY29kZS5hdGguY3gKIyBBbGwgcmlnaHRzIHJlc2VydmVkLgojIAojIFJl ZGlzdHJpYnV0aW9uIGFuZCAgdXNlIGluICBzb3VyY2UgYW5kIGJpbmFyeSAgZm9ybXMsIHdpdGgg IG9yIHdpdGhvdXQKIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCiMgbWV0OgojIAojIDEuIFJlZGlzdHJpYnV0aW9u cyAgb2Ygc291cmNlICBjb2RlICBtdXN0IHJldGFpbiAgdGhlIGFib3ZlICBjb3B5cmlnaHQKIyAg ICBub3RpY2UsIGFuZCB0aGUgZW50aXJlIHBlcm1pc3Npb24gbm90aWNlIGluIGl0cyBlbnRpcmV0 eSwgaW5jbHVkaW5nCiMgICAgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgojIAojIDIuIFJlZGlz dHJpYnV0aW9ucyBpbiAgYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgIHRoZSBhYm92ZSBjb3B5 cmlnaHQKIyAgICBub3RpY2UsICB0aGlzICBsaXN0ICBvZiAgY29uZGl0aW9ucyBhbmQgIHRoZSAg Zm9sbG93aW5nICBkaXNjbGFpbWVyCiMgICAgaW4gIHRoZSAgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig IG90aGVyICBtYXRlcmlhbHMgIHByb3ZpZGVkIHdpdGggIHRoZQojICAgIGRpc3RyaWJ1dGlvbi4K IyAKIyAzLiBUaGUgIG5hbWUgb2YgIHRoZSBhdXRob3IgIG1heSAgbm90IGJlICB1c2VkIHRvICBl bmRvcnNlIG9yICBwcm9tb3RlCiMgICAgcHJvZHVjdHMgZGVyaXZlZCBmcm9tIHRoaXMgIHNvZnR3 YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbgojICAgIHBlcm1pc3Npb24uCiMgCiMg CiMgQUxURVJOQVRJVkVMWSwgdGhpcyAgcHJvZHVjdCBtYXkgYmUgZGlzdHJpYnV0ZWQgIGFuZC9v ciBtb2RpZmllZCB1bmRlcgojIHRoZSB0ZXJtcyBvZiB0aGUgR05VIFB1YmxpYyBMaWNlbnNlIChh cyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUKIyBGb3VuZGF0aW9uOyBlaXRoZXIgdmVy c2lvbiAgMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0ICB5b3VyIG9wdGlvbikgYW55CiMgbGF0ZXIg dmVyc2lvbiksIGluICB3aGljaCBjYXNlIHRoZSBwcm92aXNpb25zIG9mIHRoZSAgR1BMIGFyZSBy ZXF1aXJlZAojIElOU1RFQUQgT0YgdGhlICBhYm92ZSByZXN0cmljdGlvbnMuIChUaGlzIGNsYXVz ZSBpc25lY2Vzc2FyeSAgZHVlIHRvIGEKIyBwb3RlbnRpYWwgIGJhZCAgaW50ZXJhY3Rpb24gIGJl dHdlZW4gIHRoZSAgR1BMICBhbmQgIHRoZSAgcmVzdHJpY3Rpb25zCiMgY29udGFpbmVkIGluIGEg QlNELXN0eWxlIGNvcHlyaWdodC4pCiMgCiMgCiMgICAgICBUSElTICBTT0ZUV0FSRSBJUyAgUFJP VklERUQgIGBgQVMgSVMnJyAgQU5EICBBTlkgRVhQUkVTUyAgT1IKIyAgICAgIElNUExJRUQgIFdB UlJBTlRJRVMsICBJTkNMVURJTkcsICBCVVQgTk9UICBMSU1JVEVEICBUTywgIFRIRQojICAgICAg SU1QTElFRCAgV0FSUkFOVElFUyBPRiAgTUVSQ0hBTlRBQklMSVRZICBBTkQgIEZJVE5FU1MgRk9S ICBBCiMgICAgICBQQVJUSUNVTEFSICBQVVJQT1NFIEFSRSAgRElTQ0xBSU1FRC4gSU4gIE5PIEVW RU5UICBTSEFMTCBUSEUKIyAgICAgIEFVVEhPUiAgQkUgIExJQUJMRSAgRk9SIEFOWSAgRElSRUNU LCAgSU5ESVJFQ1QsICBJTkNJREVOVEFMLAojICAgICAgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBD T05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUCiMgICAgICBOT1QgTElNSVRFRCBU TywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsKIyAgICAgIExP U1MgIE9GIFVTRSwgIERBVEEsIE9SICBQUk9GSVRTOyBPUiAgQlVTSU5FU1MgSU5URVJSVVBUSU9O KQojICAgICAgSE9XRVZFUiBDQVVTRUQgIEFORCBPTiBBTlkgIFRIRU9SWSBPRiBMSUFCSUxJVFks ICBXSEVUSEVSIElOCiMgICAgICBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IKIyAgICAgIE9USEVSV0lTRSkgIEFSSVNJTkcgIElOIEFO WSAgV0FZICBPVVQgIE9GICBUSEUgVVNFICBPRiAgVEhJUwojICAgICAgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCgojCiMgJGNvcmVj b2RlOiB0b29scy9nZW5wYXRjaC9nZW5wYXRjaCx2IDEuMSAyMDAyLzAyLzI2IDAzOjA0OjQxIGNv cmVjb2RlIEV4cCAkCiMKCiMKIyB2ZXJ5IHNpbXBsaXN0aWMgZG9jdW1lbnRhdGlvbjoKIyBjYWxs IGFzIGBnZW5wYXRjaCA8c291cmNlZGlyPiA8ZGVzdGRpcj4gW3JlcGxhY2VdJwojCiMgZ2VucGF0 Y2ggc2VhcmNoZXMgZm9yIC5vcmlnIGZpbGVzICBhbmQgdGhlIGNvcnJlc3BvbmRpbmcgcGF0Y2hl ZCBmaWxlcwojIChhbHNvIHN1aXRzIHZpbXMgYHNldCAgcGF0Y2htb2RlPS5vcmlnJykuIGBzb3Vy Y2VkaXInIGlzIHRoZSBkaXJlY3RvcnkKIyB0aGUgcGF0Y2hlcyBzaG91bGQgYmUgcmVsYXRpdmUg dG8gYW5kIHRoZSBmaWxlcyBhcmUgbG9jYXRlZC4gYGRlc3RkaXInCiMgaXMgdGhlICBkaXJlY3Rv cnkgdGhlIHJlYWR5IGRvbmUgIHBhdGNoLSogZmlsZXMgYXJlIHdyaXR0ZW4gIHRvIGlmIHlvdQoj IHNwZWNpZnkgIGByZXBsYWNlJyAgdGhpcyAgc3RyaW5nICB3aWxsICBiZSB1c2VkICBpbnN0ZWFk ICBvZiAgYC0nICBmb3IKIyBzZXBlcmF0aW9uIG9mIGRpcmVjdG9yeSBuYW1lcy4KIwojIGV4YW1w bGU6CiMgICBnZW5wYXRjaCBteXBvcnRzL2Zvby93b3JrL2Zvby0wLjIgbXlwb3J0cy9mb28vZmls ZXMgJzo6JwojCiMgd2lsbCByZXN1bHQgIGluIHBhdGNoLSogIGZpbGVzIHJlbGF0aXZlICB0byBg bXlwb3J0cy9mb28vd29yay9mb28tMC4yJwojIGJlaW5nIHB1dCAgaW50byBgbXlwb3J0cy9mb28v ZmlsZXMnICB3aGVyZSBhbGwgZGlyZWN0b3J5ICBuYW1lcyB3aXRoaW4KIyB0aGUgZmlsZXMgYXJl IHNlcGVyYXRlZCBieSBkb3VibGUgY29sb25zICg6OikuCiMKCnNvdXJjZT0kMQpkZXN0PSQyCnJl cGxhY2U9JHszOi0tfQoKaWYgWyAteiAiJHNvdXJjZSIgLW8gLXogIiRkZXN0IiBdOyB0aGVuCgll Y2hvICJ1c2FnZTogYGJhc2VuYW1lICQwYCA8c291cmNlZGlyPiA8ZGVzdGRpcj4gW3JlcGxhY2Vd IiA+JjIKCWV4aXQgMQpmaQoKZm9yIGYgaW4gYGZpbmQgJHtzb3VyY2V9IC1uYW1lICcqLm9yaWcn YDsgZG8KCWY9JHtmIyMke3NvdXJjZX0vfQoJKCBjZCAkc291cmNlIDsgZGlmZiAtdSAkZiAke2Yl Lm9yaWd9ICkgPiBcCgkJJHtkZXN0fS9wYXRjaC1gZWNobyAke2YlLm9yaWd9IHwgc2VkIC1lICJz fC98JHtyZXBsYWNlfXxnImAKZG9uZQo= --Multipart_Tue__26_Feb_2002_04:09:13_+0100_086b5a00-- --=.+S2S(YYq)vydB? Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) iD8DBQE8evxcr5S+dk6z85oRAimQAKDBFX3ic/y7rzKwWJPVJxd68QQXIwCdE8Oc Xo4rEZFo1IAjCgmCFbxRjmA= =6uo2 -----END PGP SIGNATURE----- --=.+S2S(YYq)vydB?-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020226040913.34e570b0.corecode>