From a7a5772a22f02a5e3e8505151fd18178d3342b7f Mon Sep 17 00:00:00 2001
From: Giorgos Keramidas <keramida@FreeBSD.org>
Date: Mon, 8 May 2006 14:34:46 +0000
Subject: [PATCH] Add a description of how a port should be removed, and a note
 about the `rmport' script of vd@

PR:		docs/96639
Submitted by:	clsung
Reviewed by:	vd
---
 .../articles/committers-guide/article.sgml    | 80 +++++++++++++++++--
 1 file changed, 74 insertions(+), 6 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 572352ed2d..aa64ac7932 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -729,11 +729,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
 	</itemizedlist>
 
 	<para>You will almost certainly get a conflict because
-	  of the <literal>$Id: article.sgml,v 1.237 2006-03-10 07:16:55 marck Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.238 2006-05-08 14:34:46 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.237 2006-03-10 07:16:55 marck Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.237 2006-03-10 07:16:55 marck Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.238 2006-05-08 14:34:46 keramida Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.238 2006-05-08 14:34:46 keramida Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -2422,6 +2422,74 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
 	</qandaentry>
       </qandadiv>
 
+      <qandadiv>
+	<title>Removing an Existing Port</title>
+
+	<qandaentry>
+	  <question>
+	    <para>How do I remove an existing port?</para>
+	  </question>
+
+	  <answer>
+	    <para>First, please read the section about repository
+	      copies. Before you remove the port, you have to verify
+	      there are no other ports depending on it.</para>
+	    <itemizedlist>
+              <listitem>
+	        <para>Make sure there is no dependency on the port
+	          in the ports collection:</para>
+	          <itemizedlist>
+	            <listitem>
+	              <para>The port's PKGNAME should appear in exactly one
+	                line in a recent INDEX file.</para>
+	            </listitem>
+	            <listitem>
+	              <para>No other ports should contain any reference to
+	                the port's directory or PKGNAME in their
+	                Makefiles</para>
+	            </listitem>
+	      </itemizedlist>
+              </listitem>
+              <listitem>
+	        <para>Then, remove the port:</para>
+
+	        <procedure>
+	          <step>
+	            <para>Remove the port's files via <command>cvs remove</command>.</para>
+	          </step>
+
+	          <step>
+	            <para>Remove <makevar>SUBDIR</makevar> listing of the port
+	              in the parent directory <filename>Makefile</filename>.</para>
+	          </step>
+
+	          <step>
+	            <para>Remove the module entry in
+	              <filename>CVSROOT/modules</filename>.</para>
+	          </step>
+
+	          <step>
+	            <para>Add an entry to
+	              <filename>ports/MOVED</filename>.</para>
+	          </step>
+
+	          <step>
+	            <para>Remove the port from
+	              <filename>ports/LEGAL</filename> if it is there.</para>
+	          </step>
+	        </procedure>
+	      </listitem>
+	    </itemizedlist>
+
+	    <para>Alternatively, you can use the <command>rmport</command>
+	      script, from <filename role="directory">ports/Tools/scripts</filename>.
+	      This script has been written by &a.vd;, who is also its current
+	      maintainer, so please send questions, patches or suggestions
+	      about <command>rmport</command> to him.</para>
+	  </answer>
+	</qandaentry>
+      </qandadiv>
+
       <qandadiv>
 	<title>Repository Copies</title>
 
@@ -2495,9 +2563,9 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
 		  <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>
+		      directory <filename>Makefile</filename>.  You can run
+		      <command>make checksubdirs</command> in the parent
+		      directory to check this.</para>
 		  </step>
 
 		  <step>