git: adaaa19d1e - main - Committer's guide: Fix about (re)moving ports

From: Lorenzo Salvadore <salvadore_at_FreeBSD.org>
Date: Sat, 07 May 2022 19:13:16 UTC
The branch main has been updated by salvadore (ports committer):

URL: https://cgit.FreeBSD.org/doc/commit/?id=adaaa19d1e5fcae34095238878c3d222a66982db

commit adaaa19d1e5fcae34095238878c3d222a66982db
Author:     Lorenzo Salvadore <salvadore@FreeBSD.org>
AuthorDate: 2022-05-02 22:08:26 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2022-05-07 19:12:00 +0000

    Committer's guide: Fix about (re)moving ports
    
    Summary:
    - Move consideration about security vulnerabilities from instructions
      for removing ports to instructions for moving ports.
    - Reword the above consideration to take into account the splitting of
      vuln.xml into one file per year.
    
    Reviewed by:    portmgr (rene), Pau Amma <pauamma@gundo.com>
    Approved by:    docs (carlavilla), gerald (mentor)
    Differential Revision: https://reviews.freebsd.org/D35112
---
 documentation/content/en/articles/committers-guide/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 9b06216e01..07465d5f81 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -3731,7 +3731,6 @@ When using Git, consider using man:git-grep[1], it is much faster than `grep -r`
 * Remove the port's files and directory with `git rm`.
 * Remove the `SUBDIR` listing of the port in the parent directory [.filename]#Makefile#.
 * Add an entry to [.filename]#ports/MOVED#.
-* Search for entries in [.filename]#ports/security/vuxml/vuln.xml# and adjust them accordingly. In particular, check for previous packages with the new name which version could include the new port.
 * Remove the port from [.filename]#ports/LEGAL# if it is there.
 ====
 
@@ -3747,6 +3746,7 @@ When sending questions about this script to the {freebsd-ports}, please also CC
 . Perform a thorough check of the ports collection for any dependencies on the old port location/name, and update them. Running `grep` on [.filename]#INDEX# is not enough because some ports have dependencies enabled by compile-time options. A full man:git-grep[1] of the ports collection is recommended.
 . Remove the `SUBDIR` entry from the old category Makefile and add a `SUBDIR` entry to the new category Makefile.
 . Add an entry to [.filename]#ports/MOVED#.
+. Search for entries in xml files inside [.filename]#ports/security/vuxml# and adjust them accordingly. In particular, check for previous packages with the new name which version could include the new port.
 . Move the port with `git mv`.
 . Commit the changes.
 ====