Date: Tue, 26 Mar 2013 11:00:19 +0200 From: Peter Pentchev <roam@ringlet.net> To: Florent Peterschmitt <florent@peterschmitt.fr> Cc: freebsd-ports@freebsd.org Subject: Re: Ports should provide knobs disabling unwanted network services Message-ID: <20130326090019.GB6037@straylight.m.ringlet.net> In-Reply-To: <515158B2.2080900@peterschmitt.fr> References: <1364123355503-5798581.post@n5.nabble.com> <514EF84F.1090208@peterschmitt.fr> <1364126459718-5798594.post@n5.nabble.com> <CACdU%2Bf8FcqTQk=672S4qYjCgH0tVtgBg5YZPk8tCKzng=gjhbA@mail.gmail.com> <514FC573.8060806@peterschmitt.fr> <CACdU%2Bf9vjkB%2B2=ce7wPoAbbnAwy9YU7SNWnwcCmvtwSVTUci1g@mail.gmail.com> <515158B2.2080900@peterschmitt.fr>
next in thread | previous in thread | raw e-mail | index | archive | help
--jq0ap7NbKX2Kqbes Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 26, 2013 at 09:13:38AM +0100, Florent Peterschmitt wrote: > Le 25/03/2013 04:40, Scot Hetzel a =C3=A9crit : > > On Sun, Mar 24, 2013 at 10:33 PM, Florent Peterschmitt > > <florent@peterschmitt.fr> wrote: > >> Le 24/03/2013 17:34, Scot Hetzel a =C3=A9crit : > >>> On Sun, Mar 24, 2013 at 7:00 AM, Beeblebrox <zaphod@berentweb.com> wr= ote: > >>>> I would be very happy to submit a patch, if I actually knew how to w= rite > >>>> one... > >>>> > >>> > >>> It is quite simple to create the patch. > >>> > >>> If you have a working copy checked out with svn, then it would be: > >>> > >>> cd /usr/ports/[category]/[port] > >>> - Make the necessary changes to the port > >>> - After testing the port make sure to do a 'make clean' > >>> svn diff > port.diff > >>> > >>> Otherwise make a copy of the port: > >>> > >>> cd /usr/ports/[catagory] > >>> cp port port-orig > >>> cd port > >>> - Make the necessary changes to port > >>> - After testing port make sure to do a 'make clean' > >>> cd .. > >>> diff -ruN port-orig port > port.diff > >>> > >>> Then just submit the port.diff in a PR using either send-pr or > >>> http://www.freebsd.org/send-pr.html. > >>> > >> > >> Is there a way to manually make a patch that will say : > >> > >> --- MyFile > >> +++ MyFile > >> > >> Even if these files are in two distinct trees ? > >> > > There is always a way to do that: > >=20 > > diff -u /path/to/original/port/MyFile /path/to/modified/port/MyFile > > > /place/to/save/patch/port.diff > >=20 > > or if you modifed several files: > >=20 > > diff -ruN /path/to/original/port /path/to/modified/port > > > /place/to/save/patch/port.diff > >=20 > Hum yes but what I mean is that we'll have, for example: >=20 > --- /home/florent-gentoo/patch/old/one 2013-03-24 14:04:20.757200724 +0100 > +++ /home/florent-gentoo/patch/new/one 2013-03-24 14:04:08.541201548 +0100 > [=E2=80=A6] >=20 > And what I want is: >=20 > --- /home/florent-gentoo/patch/old/one 2013-03-24 14:04:20.757200724 +0100 > +++ /home/florent-gentoo/patch/old/one 2013-03-24 14:04:08.541201548 +0100 > [=E2=80=A6] >=20 > SCM make patches like the second one and I'm no sure it is possible to > do without modifying by hand the patch generated. Well, one way to do it would be to actually *use* an SCM :) My preferred way would be a Git copy of the Subversion repository - then you do your changes in your local Git tree and periodically pull down the changes from the FreeBSD Subversion repo and merge them into yours. But really, is there actually a reason why you don't want two separate directories? To be honest, before the advent of Subversion and Git everyone did their patches that way (well, there *were* local CVS repositories and checkouts from there, but most of the patches were diffs between two side-by-side directories) - and I don't think anyone ever complained. Are there any problems you are seeing with two paths in the diff headers, or is it just aesthetic? G'luck, Peter --=20 Peter Pentchev roam@ringlet.net roam@FreeBSD.org p.penchev@storpool.com PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13 I am jealous of the first word in this sentence. --jq0ap7NbKX2Kqbes Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJRUWOjAAoJEGUe77AlJ98Tc74QAMjRLOzwZs6lK+NA4OgZ9BJB KKgH2cGBDb2MV8oTS/wrzpgWHjMwsEQQQiy6UW96JQ5bM0+LaU2wHq3MqPrVaYSD BQt5RpPU/Bk9yuIOzxsj/BQBkqtL1MtTUyOPjLzA5WXCqnpWCFcLuwjRTwzZh03J iQXmr8Z+fwIdL4qELoAJ2T8SZSzLPY9pEIF9LVwzb+MHWJuCI2/3f6AEHqiqCXTS OJ6sqVmN8vndsFfuSNJjO4sp5gHx3XHxIkf0Ebg0sWKpr9k07gX1yV8C2XoQPySQ Qat4McWniyBjCShMvWsuSyHltmshPwZMpeM073JgKS9rLJGWLGi87bbTt4oaPQ93 RQtRP1NwGXAAHiKRj8V/Ti+oLfLf9OFXP4JMd7ziBDO8B21mWHRLMg+34HmHpGPI Q5rL1QVHAEJnouo7SfIWXLx2ITRpTr5cJi8DBeBcut1I4Md5kR9m7Anaq7rcNuop Fooxz00a9NwG9eOmhe7L8hxsgAN/BD1pF8vS8RtLrnLPNOrNlF7wt3MUq9pmxzq7 g1OQWlbx17UQ4sucFvc0Z0gB70N9w49ueNPnmby1apyO4PC4TX0EXkFhjvR79wBV OPGZtw9GXVYuRoBEMegWp1PBbJ1Yyj0DVZyuNkaJsb5YzCkt5oZeC2WlfpPU/oEK uGQjLfDbHXFafanV4NxG =F43u -----END PGP SIGNATURE----- --jq0ap7NbKX2Kqbes--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130326090019.GB6037>