--- Libc/Libc-763.13/nls/FreeBSD/msgcat.c.patch
+++ Libc/Libc-583/nls/FreeBSD/msgcat.c.patch
@@ -1,6 +1,6 @@
---- msgcat.c.orig	2009-12-05 13:47:14.000000000 -0800
-+++ msgcat.c	2009-12-05 13:49:56.000000000 -0800
-@@ -45,16 +45,22 @@ __FBSDID("$FreeBSD: src/lib/libc/nls/msg
+--- msgcat.c.orig	2007-02-07 01:54:34.000000000 -0800
++++ msgcat.c	2007-02-07 02:03:33.000000000 -0800
+@@ -45,16 +45,22 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <limits.h>
@@ -25,7 +25,7 @@
  
  #define _DEFAULT_NLS_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L:/usr/local/share/nls/%L/%N.cat:/usr/local/share/nls/%N/%L"
  
-@@ -85,7 +91,7 @@ catopen(__const char *name, int type)
+@@ -87,7 +93,7 @@
  		return (loadCat(name));
  
  	if (type == NL_CAT_LOCALE)
@@ -34,7 +34,7 @@
  	else
  		lang = getenv("LANG");
  
-@@ -208,21 +214,21 @@ catopen(__const char *name, int type)
+@@ -210,21 +216,21 @@
  
  #define LOOKUP(PARENT, CHILD, ID, NUM, SET) {                    \
  	lo = 0;                                                  \
@@ -62,8 +62,14 @@
  			dir = 1;                                 \
  		} else {                                         \
  			hi = cur;                                \
-@@ -241,11 +247,11 @@ static MCSetT *
- MCGetSet(MCCatT *cat, int setId)
+@@ -240,32 +246,28 @@
+ }
+ 
+ static MCSetT *
+-MCGetSet(cat, setId)
+-	MCCatT  *cat;
+-	int     setId;
++MCGetSet(MCCatT *cat, int setId)
  {
  	MCSetT  *set;
 -	long    lo, hi, cur, dir;
@@ -76,8 +82,13 @@
  	if (set->invalid && loadSet(cat, set) <= 0)
  		return (NULL);
  	return (set);
-@@ -255,11 +261,11 @@ static MCMsgT *
- MCGetMsg(MCSetT *set, int msgId)
+ }
+ 
+ static MCMsgT *
+-MCGetMsg(set, msgId)
+-	MCSetT  *set;
+-	int     msgId;
++MCGetMsg(MCSetT *set, int msgId)
  {
  	MCMsgT  *msg;
 -	long    lo, hi, cur, dir;
@@ -90,7 +101,7 @@
  	return (msg);
  }
  
-@@ -341,7 +347,7 @@ loadCat(__const char *catpath)
+@@ -357,7 +359,7 @@
  	MCHeaderT       header;
  	MCCatT          *cat;
  	MCSetT          *set;
@@ -99,7 +110,7 @@
  	off_t           nextSet;
  	int             saverr;
  
-@@ -360,27 +366,30 @@ loadCat(__const char *catpath)
+@@ -377,27 +379,30 @@
  	    strncmp(header.magic, MCMagic, MCMagicLen) != 0)
  		CORRUPT();
  
@@ -139,7 +150,7 @@
  	for (i = 0; i < cat->numSets; ++i) {
  		if (fseeko(cat->fp, nextSet, SEEK_SET) == -1) {
  			__nls_free_resources(cat, i);
-@@ -397,11 +406,11 @@ loadCat(__const char *catpath)
+@@ -414,7 +419,7 @@
  		/* if it's invalid, skip over it (and backup 'i') */
  		if (set->invalid) {
  			--i;
@@ -147,13 +158,17 @@
 +			nextSet = ntohll(set->nextSet);
  			continue;
  		}
- 		set->invalid = TRUE;
+ #if 0
+@@ -432,7 +437,7 @@
+ 		} else
+ #endif
+ 			set->invalid = TRUE;
 -		nextSet = set->nextSet;
 +		nextSet = ntohll(set->nextSet);
  	}
- 
- 	return ((nl_catd) cat);
-@@ -415,11 +424,11 @@ loadSet(MCCatT *cat, MCSetT *set)
+ #if 0
+ 	if (cat->loadType == MCLoadAll) {
+@@ -453,11 +458,11 @@
  	int     saverr;
  
  	/* Get the data */
@@ -168,7 +183,7 @@
  		saverr = errno;
  		free(set->data.str);
  		errno = saverr;
-@@ -427,13 +436,13 @@ loadSet(MCCatT *cat, MCSetT *set)
+@@ -465,13 +470,13 @@
  	}
  
  	/* Get the messages */
@@ -184,7 +199,7 @@
  	    NULL) {
  		saverr = errno;
  		free(set->data.str);
-@@ -441,7 +450,7 @@ loadSet(MCCatT *cat, MCSetT *set)
+@@ -479,7 +484,7 @@
  		return (-1);
  	}
  
@@ -193,7 +208,7 @@
  		msg = set->u.msgs + i;
  		if (fread(msg, sizeof(*msg), 1, cat->fp) != 1) {
  			saverr = errno;
-@@ -454,7 +463,7 @@ loadSet(MCCatT *cat, MCSetT *set)
+@@ -492,7 +497,7 @@
  			--i;
  			continue;
  		}