Use always-installed +COMMENTS file to detect if a patch is already installed rather than +CONTENTS, which is not present if the patch was installed with the -r flag.
Use always-installed +COMMENTS file to detect if a patch is already
installed rather than +CONTENTS, which is not present if the patch
was installed with the -r flag.

tonnerre/patchadd,tonnerre/patchadd