--- a/gub/freebsd.py	Sun Dec 28 01:21:37 2014 +0900
+++ b/gub/freebsd.py	Sun Dec 28 18:13:16 2014 +0900
@@ -18,15 +18,15 @@
 # headers and build full toolchain from source?
 def get_sdk ():
     '''
-#! /bin/sh
+#! /bin/bash
 
 if test $# != '3'; then
     cat <<EOF
 Usage: get-freebsd ARCH VERSION BUILD
 
 Example:
-  get-freebsd i386 4.11 1
-  get-freebsd amd64 6.2 2
+  bash get-freebsd i386 6.2 1
+  bash get-freebsd amd64 6.2 2
 EOF
     exit 2
 fi
@@ -37,11 +37,10 @@
 
 tmp=tmp-freebsd-$arch-$version-$build
 mkdir -p $tmp && cd $tmp
-wget ftp://ftp.surfnet.nl/pub/os/FreeBSD/releases/$arch/$version-RELEASE/base/base.??
-wget ftp://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/$arch/$version-RELEASE/bin/bin.??
+wget ftp://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/$arch/$version-RELEASE/base/base.??
 rm -rf root
 mkdir -p root
-cat base.?? bin.?? | tar --unlink -xpzf - -C root
+cat base.?? | tar --unlink -xpzf - -C root
 cd root && tar --exclude=zlib.h --exclude=zconf.h --exclude=gmp.h --exclude=curses.h --exclude=ncurses.h --exclude=c++ --exclude=g++ -czf ../../downloads/freebsd-runtime/freebsd-runtime-$version-$build.$arch.tar.gz {,usr/}lib/{lib{c,c_r,m,pthread}{.a,.so{,.*}},crt{i,n,1}.o} usr/include
 #rm -rf $tmp
 '''

--- a/gub/settings.py	Sun Dec 28 01:21:37 2014 +0900
+++ b/gub/settings.py	Sun Dec 28 18:13:16 2014 +0900
@@ -23,7 +23,7 @@
     'freebsd4-x86': 'i686-freebsd4',
     'freebsd6-x86': 'i686-freebsd6',
 
-    'freebsd-x86': 'i686-freebsd4',
+    'freebsd-x86': 'i686-freebsd6',
     'freebsd-64': 'x86_64-freebsd6',
 
     'linux-arm': 'arm-linux',

--- a/gub/specs/freebsd-runtime.py	Sun Dec 28 01:21:37 2014 +0900
+++ b/gub/specs/freebsd-runtime.py	Sun Dec 28 18:13:16 2014 +0900
@@ -1,7 +1,7 @@
 from gub import build
 
 class Freebsd_runtime (build.BinaryBuild, build.SdkBuild):
-    source = 'http://lilypond.org/download/gub-sources/freebsd-runtime-4.11-1.%(package_arch)s.tar.gz&strip=0'
+    source = 'http://lilypond.org/download/gub-sources/freebsd-runtime-6.2-1.%(package_arch)s.tar.gz&strip=0'
     def untar (self):
         build.BinaryBuild.untar (self)
         self.system ('''
@@ -11,18 +11,5 @@
 rm -f %(srcdir)s%(prefix_dir)s/include/FlexLexer.h
 ''')
 
-class Freebsd_runtime__freebsd__x86 (Freebsd_runtime):
-    patches = ['freebsd4-runtime.patch', 'freebsd4-runtime-gcc-4.8.2.patch']
-    def untar (self):
-        Freebsd_runtime.untar (self)
-        self.patch ()
-        # FIXME: check if empty? (on freebsds4 it is...)
-        # cpp -P ~/vc/gub/target/freebsd-x86/root/usr/include/wctype.h
-        self.system ('''
-#breaks boost#rm %(srcdir)s%(prefix_dir)s/include/wctype.h
-cp %(sourcefiledir)s/stdint-32.h %(srcdir)s%(prefix_dir)s/include/stdint.h
-ln -s libc_r.so %(srcdir)s%(prefix_dir)s/lib/libpthread.so || true
-''')
-
 class Freebsd_runtime__freebsd__64 (Freebsd_runtime):
     source = 'http://lilypond.org/download/gub-sources/freebsd-runtime-6.2-2.%(package_arch)s.tar.gz&strip=0'

--- a/gub/specs/gettext.py	Sun Dec 28 01:21:37 2014 +0900
+++ b/gub/specs/gettext.py	Sun Dec 28 18:13:16 2014 +0900
@@ -53,9 +53,6 @@
                 ],
                        '%(builddir)s/gettext-tools/Makefile')
 
-class Gettext__freebsd__x86 (Gettext):
-    dependencies = (Gettext.dependencies + ['libgnugetopt'])
-
 class Gettext__mingw (Gettext):
     patches = ['gettext-0.15-mingw.patch']
     config_cache_overrides = (Gettext.config_cache_overrides