--- patches/apply.pl.orig	Thu Jan  4 05:16:03 2007
+++ patches/apply.pl	Sun Jan 14 06:55:07 2007
@@ -722,7 +722,7 @@
     my $ver_line;
     my $is_old = 1;
 
-    open ($Patch, "patch --version|") || die "Can't run patch: $!";
+    open ($Patch, "gpatch --version|") || die "Can't run patch: $!";
     $ver_line = <$Patch>;
     $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n";
     if ($1 >= 2 && $2 >= 5 && $3 >= 9) {
@@ -1006,7 +1006,7 @@
     $applied_patches = $dest_dir.'/applied_patches';
 
     $opts = join ' ', @arguments;
-    $base_cmd = "patch -l -p0 $opts -d $dest_dir";
+    $base_cmd = "gpatch -l -p0 $opts -d $dest_dir";
     if (is_old_patch_version()) {
 	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
     }

--- patches/src680/apply.orig	Fri Jan 12 06:43:19 2007
+++ patches/src680/apply	Sun Jan 14 06:43:42 2007
@@ -96,6 +96,8 @@
 NovellWin32ISO: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas
 # Mac OS X
 MacOSX : MacOSXCommon, SystemJavaBits, CalcSolver, MacOSXOnly
+# FreeBSD
+FreeBSD : LinuxCommon, NotDebian, Lockdown, CalcSolver
 # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
 
 
@@ -781,7 +783,7 @@
 autodoc-add-missing-stdio-h.diff, rengelha
 
 # do not pack any potential .orig files with ppds
-psprint_config-no-orig.diff, jholesov
+# psprint_config-no-orig.diff, jholesov
 
 # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
 # of files does not conflict with the main package, i#64802
@@ -873,7 +875,7 @@
 warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
 
 # Don't re-define NULL
-solar-dont-define-NULL.diff, i#66666, jholesov
+# solar-dont-define-NULL.diff, i#66666, jholesov
 
 # Fix warnings that appear on x86-64 & are considered dangerous
 sixtyfour-warnings-svx.diff, i#70594, jholesov
@@ -887,7 +889,7 @@
 buildfix-gcc41-pointers-icu.diff, pmladek
 
 # fix build with newer gccs
-buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684
+# buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684
 
 [ BFBuildBits ]
 SectionOwner => pmladek
@@ -903,7 +905,7 @@
 sixtyfour-warnings-binfilter.diff, i#70594, jholesov
 
 # fix build with newer gccs
-buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684
+# buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684
 
 
 [ VCL ]
