1 On FreeBSD the default patch program has a different command line
2 interface than GNU patch. Make patcher use the GNU patch.
5 --- patcher/patcher.py.old Mon Sep 13 21:59:05 2004
6 +++ patcher/patcher.py Sun Jul 17 14:24:50 2005
10 # ... then we look if the patch would apply cleanly ...
11 - print "DEBUG: patch --dry-run $opt\n" if $debug > 1;
12 - $res = system("patch --dry-run $opt >$patchlog 2>/dev/null");
13 + print "DEBUG: gpatch --dry-run $opt\n" if $debug > 1;
14 + $res = system("gpatch --dry-run $opt >$patchlog 2>/dev/null");
19 # Finally we apply the patch. No need to create backup copies with -b,
20 # that has been done by PutIntoPatch()
21 $opt = "-f $opt" if $do_force;
22 - print "DEBUG: patch $opt\n" if $debug > 1;
23 - $res = system("patch $opt >$patchlog");
24 + print "DEBUG: gpatch $opt\n" if $debug > 1;
25 + $res = system("gpatch $opt >$patchlog");
27 $res = 0 if $do_force && $res == 256;