diff -r 458facedc485 -r 0790e4bc8a79 config/global/extract.in
--- a/config/global/extract.in	Sat Jul 19 21:22:58 2008 +0000
+++ b/config/global/extract.in	Tue Oct 27 18:49:15 2009 +0100
@@ -40,3 +40,83 @@
       Exit after unpacking and patching tarballs.
       
       Usefull to look at the code before doing the build itself.
+
+choice
+    prompt "Patches origin"
+    bool
+    default PATCH_BUNDLED
+
+config PATCH_BUNDLED
+    bool
+    prompt "Bundled only"
+    help
+      Only apply patches bundled with crosstool-NG.
+
+config PATCH_LOCAL
+    bool
+    prompt "Local only"
+    select PATCH_USE_LOCAL
+    help
+      Only apply your local patches.
+
+config PATCH_BUNDLED_LOCAL
+    bool
+    prompt "Bundled, then local"
+    select PATCH_USE_LOCAL
+    help
+      Apply the patches bundled with crosstool-NG,
+      then apply your local patches.
+
+config PATCH_LOCAL_BUNDLED
+    bool
+    prompt "Local, then bundled"
+    select PATCH_USE_LOCAL
+    help
+      Apply your local patches, then apply the patches
+      bundled with crosstool-NG.
+
+config PATCH_BUNDLED_FALLBACK_LOCAL
+    bool
+    prompt "Bundled only, local if no bundled"
+    select PATCH_USE_LOCAL
+    select PATCH_SINGLE
+    help
+      Apply the patches bundled with crosstool-NG;
+      if there's no bundled patches, apply your local patches.
+
+config PATCH_LOCAL_FALLBACK_BUNDLED
+    bool
+    prompt "Local only, bundled if no local"
+    select PATCH_USE_LOCAL
+    select PATCH_SINGLE
+    help
+      Only apply your local patches;
+      if there's no local patches, apply patches bundled with crosstool-NG.
+
+endchoice
+
+config PATCH_ORDER
+    string
+    default "bundled"           if PATCH_BUNDLED
+    default "local"             if PATCH_LOCAL
+    default "bundled,local"     if PATCH_BUNDLED_LOCAL
+    default "local,bundled"     if PATCH_LOCAL_BUNDLED
+
+config PATCH_SINGLE
+    bool
+    default n
+
+config PATCH_USE_LOCAL
+    bool
+    default n
+
+config LOCAL_PATCH_DIR
+    string
+    prompt "|  Local patch directory"
+    default ""
+    depends on PATCH_USE_LOCAL
+    help
+      Enter the custom patch directory here.
+      
+      Note that you must ensure that the directory contianing your custom
+      patches is arranged the same way the official directory is.