- pkg-comment is no longer mandatory;

- ignore patchfiles ending with `,v' or '.orig'.

1 files changed, 5 insertions, 1 deletions

diff --git a/Tools/scripts/patchtool.py b/Tools/scripts/patchtool.py
index f9008af92cd2..de9a5ed99ac7 100755
--- a/Tools/scripts/patchtool.py
+++ b/Tools/scripts/patchtool.py
@@ -60,7 +60,7 @@ class Vars:
 # Check if the supplied patch refers to a port's directory.
 #
 def isportdir(path, soft = False):
-	REQ_FILES = ('Makefile', 'pkg-comment', 'pkg-descr', 'pkg-plist', \
+	REQ_FILES = ('Makefile', 'pkg-descr', 'pkg-plist', \
       'distinfo')
 	if not os.path.isdir(path) and soft != True:
 		raise IOError(errno.ENOENT, path)
@@ -542,6 +542,10 @@ def generate(args, automatic, force, ignoremtime):
 	patches = PatchesCollection()
 
 	for filepath in args:
+		for suf in Vars.RCSDIFF_SUFX, Vars.DIFF_SUFX:
+			if filepath.endswith(suf):
+				filepath = filepath[:-len(suf)]
+				break
 		if not os.path.isfile(filepath):
 			raise IOError(errno.ENOENT, filepath)
 			# Not reached #