Date: Thu, 18 May 2006 07:52:37 +0300 From: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org> To: Vulpes Velox <v.velox@vvelox.net> Cc: ports@FreeBSD.org, Wesley Shields <wxs@atarininja.org> Subject: Re: change submission question Message-ID: <20060518075237.0a5187c4@it.buh.tecnik93.com> In-Reply-To: <20060517205858.7c325190@vixen42.vulpes> References: <20060517200857.7de98f97@vixen42.vulpes> <20060518021241.GA7122@atarininja.org> <20060517205858.7c325190@vixen42.vulpes>
next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_2U6SeC6ICP9sdZP+I4U8LCS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
On Wed, 17 May 2006 20:58:58 -0500
Vulpes Velox <v.velox@vvelox.net> wrote:
> On Wed, 17 May 2006 21:12:41 -0500
> Wesley Shields <wxs@atarininja.org> wrote:
>=20
> > On Wed, May 17, 2006 at 08:08:57PM -0500, Vulpes Velox wrote:
> > > I am just working on writing up new rc.d for qmail and for pdnsd
> > > that use rc.subr. How do I do about submitting a PR for the likes
> > > of that? The porters handbook is not totally clear how to submit
> > > something like that. Any suggested reads or the like?
> >=20
> > Submit it as any other change to a port. Make the patch and submit
> > it (CC the maintainer if it is not ports@), with a synopsis line of
> > something like: [PATCH]: New rc.d script for qmail.
>=20
> Cool. In that case I just assume just diff the before and after port
> directories and submit that?
If you can, please submit a cvs diff, they are easier to handle that
diffs between "new and old" dirs. Plus it's easier for you to see what
you have changed and update your diff if something modifies in the
Ports Collection from when you started to work on it until you submit
your changes or if the commiter ask you to fix something.
cd ~/my_wrkdir [1]
cvs -d R_CVSROOT co pdnsd [2] [3]
cd ~/my_wrkdir/pdnsd
.....
hack around
.....
see if it builds, package, etc. [4]
cvs add new_file [5]
cvs rm file-not_needed_anymore [6]
portlint -A [7]
cvs status [8]
cvs update [9]
(fix conflicts if any) [10]
repeat [4] - [10] as necessary
cvs diff -uN > ../`basename ${PWD}`.diff [11]
[1] this can be anywhere you want, of course; ports can be built from
anywhere, not only /usr/ports
[2] R_CVSROOT is any public cvs server, take your pick from
www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/anoncvs.html
[3] pdnsd is the module name for the port; it is generally the name of
the port, with some exceptions, notably for national categories
(ports/german/selfhtml has the module name de-selfhtml); you can either
look-up the module name via web cvs interface or write the hole path,
in our example 'ports/dns/pdnsd'
[4] Please follow the check-list from
doc/en_US.ISO8859-1/books/porters-handbook/porting-testing.html and if
you can use a tinderbox (misc/tinderbox)
[5] [6] of course, you need to do this only if you add / remove files.
[8] This will tell you what type of changes are between your files and
what's in the CVS
[9] Same as above, but it will also try to merge the differences if
something changed in the CVS; Watch the output of the cvs update with
care. The letter in front of each filename indicates what was done with
it:
U The file was updated without trouble.=09
P The file was updated without trouble (you will only see this
when working against a remote repository).=09
M The file had been modified, and was merged without conflicts.
C The file had been modified, and was merged with conflicts.
[10] If you get 'C' as a result of 'cvs update' it means something
changed in the CVS and cvs(1) wasn't able to merge you local changes
and those from CVS. It's always a good idea to inspect the changes
anyway, since cvs(1) doesn't know anything about how a port should be,
so it might merge things that don't make sense.
[11] Here's your diff, ready to send via send-pr(1) or gtk-send-pr
(sysutils/gkt-send-pr) or _attached_ (attached as text/x-patch, if you
can't convince your MUA to attach patches correctly then it's probably
the time to find a MUA that obeys standards) to an email (if you do a
follow-up).
PS. I'm being verbose in this mail because I intend to refer others to
it as well, since I got tired to write the same things again and again.
--=20
IOnut - Un^d^dregistered ;) FreeBSD "user"
"Intellectual Property" is nowhere near as valuable as "Intellect"
BOFH excuse #179:
multicasts on broken packets
--Sig_2U6SeC6ICP9sdZP+I4U8LCS
Content-Type: application/pgp-signature; name=signature.asc
Content-Disposition: attachment; filename=signature.asc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (FreeBSD)
iD8DBQFEa/2WBX6fi0k6KXsRAhdhAKCyXh+d4QFgXHmpZzF/OTbh3Ohn7QCgizMI
R58/Kt4kjUktZBm4HvMiupo=
=W6RX
-----END PGP SIGNATURE-----
--Sig_2U6SeC6ICP9sdZP+I4U8LCS--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060518075237.0a5187c4>