Index: configure.pl
--- configure.pl.orig	2009-07-23 20:03:04 +0200
+++ configure.pl	2009-08-07 14:02:36 +0200
@@ -2305,7 +2305,7 @@
     }
 
     my $uname = $$config{'uname'};
-    if($uname ne '') {
+    if($uname ne '' and $uname !~ m/FreeBSD/) {
         my $cpu = guess_cpu_from_this($uname);
 
         if($cpu ne '')
Index: src/build-data/cc/gcc
--- src/build-data/cc/gcc.orig	2009-07-23 20:03:05 +0200
+++ src/build-data/cc/gcc	2009-08-07 14:01:16 +0200
@@ -10,8 +10,8 @@
 add_lib_dir_option "-L"
 add_lib_option "-l"
 
-lang_flags "-D_REENTRANT -ansi -Wno-long-long"
-warning_flags "-W -Wall"
+lang_flags "-D_REENTRANT -Wno-long-long"
+warning_flags ""
 #warning_flags "-Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter"
 
 lib_opt_flags "-O2 -finline-functions"
Index: src/build-data/makefile/unix.in
--- src/build-data/makefile/unix.in.orig	2009-07-23 20:03:05 +0200
+++ src/build-data/makefile/unix.in	2009-08-07 14:01:16 +0200
@@ -22,7 +22,7 @@
 BINDIR        = $(DESTDIR)/bin
 LIBDIR        = $(DESTDIR)/%{libdir}
 HEADERDIR     = $(DESTDIR)/%{includedir}/botan
-DOCDIR        = $(DESTDIR)/%{docdir}/Botan-$(VERSION)
+DOCDIR        = $(DESTDIR)/%{docdir}
 PKGCONF_DIR   = $(LIBDIR)/pkgconfig
 
 CONFIG_SCRIPT = %{botan_config}
Index: src/utils/types.h
--- src/utils/types.h.orig	2009-07-23 20:03:06 +0200
+++ src/utils/types.h	2009-08-07 14:01:16 +0200
@@ -22,7 +22,7 @@
    typedef unsigned __int64 u64bit;
 #elif defined(__KCC)
    typedef unsigned __long_long u64bit;
-#elif defined(__GNUG__)
+#elif defined(__GNUC__)
    __extension__ typedef unsigned long long u64bit;
 #else
    typedef unsigned long long u64bit;