Update section on what to do when distfiles change.

1 files changed, 10 insertions, 6 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 0ca4b438423..fe1283b756c 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -3983,13 +3983,17 @@ ap-aolserver, www/openacs. Try to be consistent with them.
 Sometimes authors of a software package make some modifications after the
 software was released, and they put up a new distfile without changing the
 package's version number. If a package is already in pkgsrc at that time, the
-md5 checksum will no longer match. The correct way to work around this is to
-update the package's md5 checksum to match the package on the master site
-(beware, any mirrors may not be up to date yet!), and to remove the old
-distfile from ftp.NetBSD.org's /pub/NetBSD/packages/distfiles directory.
-Furthermore, a mail to the package's author seems appropriate making sure the
+checksum will no longer match. The contents of the new distfile should be
+compared against the old one before changing anything, to make sure the
 distfile was really updated on purpose, and that no trojan horse or so crept
-in.
+in. Then, the correct way to work around this is to set DIST_SUBDIR to a unique
+directory name, usually based on PKGNAME_NOREV. In case this happens more
+often, PKGNAME can be used (thus including the nbX suffix) or a date stamp can
+be appended, like ${PKGNAME_NOREV}-YYYYMMDD. Do not forget regenerating the
+distinfo file after that, since it contains the DIST_SUBDIR path in the
+filenames. Furthermore, a mail to the package's authors seems appropriate
+telling them that changing distfiles after releases without changing the file
+names is not good practice.
 
 13.3. Configuration gotchas