--- Libc/Libc-594.9.5/gen/FreeBSD/err.c.patch
+++ Libc/Libc-498/gen/FreeBSD/err.c.patch
@@ -1,46 +1,26 @@
---- err.c.orig	2009-05-12 11:21:55.000000000 -0700
-+++ err.c	2009-05-23 13:27:52.000000000 -0700
-@@ -44,12 +44,105 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/err
+--- err.c.orig	2006-12-15 11:18:17.000000000 -0800
++++ err.c	2006-12-15 11:46:52.000000000 -0800
+@@ -44,12 +44,85 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 +#include <vis.h>
  #include "un-namespace.h"
  
-+#ifdef __BLOCKS__
-+#include <Block.h>
-+#endif /* __BLOCKS__ */
  #include "libc_private.h"
  
 -static FILE *err_file; /* file to use for error output */
 -static void (*err_exit)(int);
-+#define ERR_EXIT_UNDEF	0
-+#ifdef __BLOCKS__
-+#define ERR_EXIT_BLOCK	1
-+#endif /* __BLOCKS__ */
-+#define ERR_EXIT_FUNC	2
-+struct _e_err_exit {
-+	unsigned int type;
-+#ifdef __BLOCKS__
-+	union {
-+#endif /* __BLOCKS__ */
-+		void (*func)(int);
-+#ifdef __BLOCKS__
-+		void (^block)(int);
-+	};
-+#endif /* __BLOCKS__ */
-+};
-+
 +#ifdef BUILDING_VARIANT
 +
 +__private_extern__ FILE *_e_err_file; /* file to use for error output */
-+__private_extern__ struct _e_err_exit _e_err_exit;
++__private_extern__ void (*_e_err_exit)(int);
 +__private_extern__ void _e_visprintf(FILE * __restrict, const char * __restrict, va_list);
 +
 +#else /* !BUILDING_VARIANT */
 +
 +__private_extern__ FILE *_e_err_file = NULL; /* file to use for error output */
-+__private_extern__ struct _e_err_exit _e_err_exit = {ERR_EXIT_UNDEF};
++__private_extern__ void (*_e_err_exit)(int) = NULL;
 +
 +/*
 + * zero means pass as is
@@ -108,7 +88,7 @@
  
  /*
   * This is declared to take a `void *' so that the caller is not required
-@@ -60,16 +153,27 @@ void
+@@ -60,16 +133,17 @@
  err_set_file(void *fp)
  {
  	if (fp)
@@ -123,23 +103,13 @@
  err_set_exit(void (*ef)(int))
  {
 -	err_exit = ef;
-+	_e_err_exit.type = ERR_EXIT_FUNC;
-+	_e_err_exit.func = ef;
-+}
-+
-+#ifdef __BLOCKS__
-+void
-+err_set_exit_b(void (^ef)(int))
-+{
-+	_e_err_exit.type = ERR_EXIT_BLOCK;
-+	_e_err_exit.block = Block_copy(ef);
++	_e_err_exit = ef;
  }
-+#endif /* __BLOCKS__ */
 +#endif /* !BUILDING_VARIANT */
  
  __weak_reference(_err, err);
  
-@@ -107,16 +211,21 @@ verrc(eval, code, fmt, ap)
+@@ -107,16 +181,16 @@
  	const char *fmt;
  	va_list ap;
  {
@@ -158,17 +128,12 @@
 -	if (err_exit)
 -		err_exit(eval);
 +	fprintf(_e_err_file, "%s\n", strerror(code));
-+	if (_e_err_exit.type)
-+#ifdef __BLOCKS__
-+		if (_e_err_exit.type == ERR_EXIT_BLOCK)
-+			_e_err_exit.block(eval);
-+		else
-+#endif /* __BLOCKS__ */
-+			_e_err_exit.func(eval);
++	if (_e_err_exit)
++		_e_err_exit(eval);
  	exit(eval);
  }
  
-@@ -135,14 +244,19 @@ verrx(eval, fmt, ap)
+@@ -135,14 +209,14 @@
  	const char *fmt;
  	va_list ap;
  {
@@ -184,17 +149,12 @@
 -		err_exit(eval);
 +		_e_visprintf(_e_err_file, fmt, ap);
 +	fprintf(_e_err_file, "\n");
-+	if (_e_err_exit.type)
-+#ifdef __BLOCKS__
-+		if (_e_err_exit.type == ERR_EXIT_BLOCK)
-+			_e_err_exit.block(eval);
-+		else
-+#endif /* __BLOCKS__ */
-+			_e_err_exit.func(eval);
++	if (_e_err_exit)
++		_e_err_exit(eval);
  	exit(eval);
  }
  
-@@ -180,14 +294,14 @@ vwarnc(code, fmt, ap)
+@@ -180,14 +254,14 @@
  	const char *fmt;
  	va_list ap;
  {
@@ -214,7 +174,7 @@
  }
  
  void
-@@ -204,10 +318,10 @@ vwarnx(fmt, ap)
+@@ -204,10 +278,10 @@
  	const char *fmt;
  	va_list ap;
  {