os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Expand the description of the proper steps one should take when

Browse source 
repository copies, port removals or renames are made.

Copied almost verbatim from a post by: kris
This commit is contained in:
Giorgos Keramidas 2002-06-16 00:38:24 +00:00
parent 8aa3f55def
commit 514c1710ad
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13407
1 changed files with 65 additions and 26 deletions

91
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -583,11 +583,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.125 2002-05-26 23:35:19 keramida Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.126 2002-06-16 00:38:24 keramida Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.125 2002-05-26 23:35:19 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.125 2002-05-26 23:35:19 keramida Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.126 2002-06-16 00:38:24 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.126 2002-06-16 00:38:24 keramida Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2024,33 +2024,72 @@ docs:Documentation Bug:nik:</programlisting>
You will then get a notice, at which point you are
expected to perform the following:</para>
<procedure>
<step>
<para><command>cvs remove</command> the old port (if
necessary)</para>
</step>
<itemizedlist>
<listitem>
<para>When a port has been repo copied:</para>
<step>
<para>Adjust the parent (category)
<filename>Makefile</filename></para>
</step>
<procedure>
<step>
<para>Upgrade the copied port to the new version (remember
to change the <makevar>PORTNAME</makevar> so there
aren't duplicate ports with the same name).</para>
</step>
<step>
<para>Update <filename>CVSROOT/modules</filename></para>
</step>
<step>
<para>Add the new subdirectory to the
<makevar>SUBDIR</makevar> listing in the parent
directory Makefile. You can run <command>make
checksubdirs</command> in the parent directory to check
this.</para>
</step>
<step>
<para>If other ports depend on the updated port,
change their <filename>Makefile</filename>s'
dependency lines</para>
</step>
<step>
<para>If the port changed categories, modify the
<makevar>CATEGORIES</makevar> line of the port's
<filename>Makefile</filename> accordingly</para>
</step>
<step>
<para>If the port changed categories, modify the
<makevar>CATEGORIES</makevar> line of the port's
<filename>Makefile</filename> accordingly</para>
</step>
</procedure>
<step>
<para>Add the new module entry.</para>
</step>
</procedure>
</listitem>
<listitem>
<para>When removing a port:</para>
<procedure>
<step>
<para>Perform a thorough check of the ports collection for
any dependencies on the old port location/name, and
update them. Running <command>grep</command> on
<filename>INDEX</filename> is not enough because some
ports have dependencies enabled by compile-time options.
A full <command>grep -r</command> of the ports
collection is recommended.</para>
</step>
<step>
<para>Remove the old port, the old
<makevar>SUBDIR</makevar> entry and the old module
entry.</para>
</step>
</procedure>
</listitem>
<listitem>
<para>After repo moves (<quote>rename</quote> operations where
a port is copied and the old location is removed):</para>
<procedure>
<step>
<para>Follow the same steps that are outlined in the
previous two entries, to activate the new location of
the port and remove the old one.</para>
</step>
</procedure>
</listitem>
</itemizedlist>
</answer>
</qandaentry>
</qandadiv>