aboutsummaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2002-04-16 05:04:58 +0800
committersobomax <sobomax@FreeBSD.org>2002-04-16 05:04:58 +0800
commit589ab39a562ae6fbbe9d79c36366ca9489c93b67 (patch)
treecd6b9a7cfeb254bf7d1d2142279954c20e66ab3c /Tools
parent8a9606bc2b0b23b388531d0565eeb0d9bf7dc6ae (diff)
downloadfreebsd-ports-gnome-589ab39a562ae6fbbe9d79c36366ca9489c93b67.tar.gz
freebsd-ports-gnome-589ab39a562ae6fbbe9d79c36366ca9489c93b67.tar.zst
freebsd-ports-gnome-589ab39a562ae6fbbe9d79c36366ca9489c93b67.zip
Recognise EXTRA_PATCHES.
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/scripts/patchtool.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Tools/scripts/patchtool.py b/Tools/scripts/patchtool.py
index b830f5c74c81..8ae9ba0e75d2 100755
--- a/Tools/scripts/patchtool.py
+++ b/Tools/scripts/patchtool.py
@@ -269,6 +269,7 @@ def query_yn(message, default = False):
elif reply == '' and default in (True, False):
return default
print 'Wrong answer "%s", please try again' % reply
+ return default
#
@@ -557,6 +558,11 @@ def generate(args, automatic, force, ignoremtime):
if os.path.isdir(patchdir):
patches.adddir(patchdir, wrksrc)
+ extra_patches = querymakevar('EXTRA_PATCHES', portdir, True)
+ for extra_patch in extra_patches.split():
+ if os.path.isfile(extra_patch):
+ patches.addpatchfile(extra_patch, wrksrc)
+
patchobj = patches.lookupbytarget(wrksrc, relpath)
if patchobj == None:
patchobj = NewPatch(patchdir, wrksrc, relpath)