Add new patch for GCC 4.1 from Javier.

Package-Manager: portage-2.1

6 files changed, 604 insertions, 22 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 69c76d9e7e0f..fc8e3a92ae58 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.14 2006/06/01 11:36:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.15 2006/06/12 09:52:13 flameeyes Exp $
+
+*freebsd-sources-6.1-r2 (12 Jun 2006)
+
+  12 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/freebsd-sources-6.1-gcc41.patch, freebsd-sources-6.1-r1.ebuild,
+  +freebsd-sources-6.1-r2.ebuild:
+  Add new patch for GCC 4.1 from Javier.
 
 *freebsd-sources-6.1-r1 (01 Jun 2006)
 *freebsd-sources-6.0-r5 (01 Jun 2006)
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 16959ebe02d1..1449f755c069 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -45,10 +45,10 @@ AUX freebsd-sources-6.0-werror.patch 898 RMD160 41a6f582a70018f29c96c08a5853bcbf
 MD5 1c230261604f76eb3766df9769864942 files/freebsd-sources-6.0-werror.patch 898
 RMD160 41a6f582a70018f29c96c08a5853bcbf167157d0 files/freebsd-sources-6.0-werror.patch 898
 SHA256 7fbd139296e98697c94dcc6a4cd4d926b057779cb2415cb62bbb881b8acf26e5 files/freebsd-sources-6.0-werror.patch 898
-AUX freebsd-sources-6.1-gcc41.patch 550 RMD160 fe78d018f0744fe9382006cd10685135e75282a4 SHA1 14eb87313e3067f67711be79284d55c3e9d9d839 SHA256 720280675f81b7cbca10ecf98faf9c173e1283740bf879280ce095f3181a2684
-MD5 fa073bcb2b46a2652cbf7672e691c030 files/freebsd-sources-6.1-gcc41.patch 550
-RMD160 fe78d018f0744fe9382006cd10685135e75282a4 files/freebsd-sources-6.1-gcc41.patch 550
-SHA256 720280675f81b7cbca10ecf98faf9c173e1283740bf879280ce095f3181a2684 files/freebsd-sources-6.1-gcc41.patch 550
+AUX freebsd-sources-6.1-gcc41.patch 16013 RMD160 c259aec856d5d4b68682138c7b1112e60b6814fa SHA1 5a0e61de9dde00279d36425cc451a2e0af1b38ae SHA256 d5b702657dae7e30774c4222094166334e5e466ccc5307a92992ed8df29e6b05
+MD5 8effd8101607ae4f84a9621e57f1ae2f files/freebsd-sources-6.1-gcc41.patch 16013
+RMD160 c259aec856d5d4b68682138c7b1112e60b6814fa files/freebsd-sources-6.1-gcc41.patch 16013
+SHA256 d5b702657dae7e30774c4222094166334e5e466ccc5307a92992ed8df29e6b05 files/freebsd-sources-6.1-gcc41.patch 16013
 AUX freebsd-sources-gentoo.patch 1191 RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 SHA1 abe5d4ff186d1b9b6ad6d7af6be359563e81183b SHA256 e5e7186858259e7d6d21e925dde640a68b27255cf69ab089ee82675568e7d9a7
 MD5 91662a80d0cd0cd3dca34f3c1ca54830 files/freebsd-sources-gentoo.patch 1191
 RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 files/freebsd-sources-gentoo.patch 1191
@@ -59,14 +59,18 @@ EBUILD freebsd-sources-6.0-r5.ebuild 2133 RMD160 f707107948afc244e3aeb99bb3f105a
 MD5 1d749d4486a44f958babd076db87e303 freebsd-sources-6.0-r5.ebuild 2133
 RMD160 f707107948afc244e3aeb99bb3f105a171fdbed4 freebsd-sources-6.0-r5.ebuild 2133
 SHA256 4c86b43f5517f9a89ec98fd46b98b3dbcae9930111fdebf7a51c711b38e221db freebsd-sources-6.0-r5.ebuild 2133
-EBUILD freebsd-sources-6.1-r1.ebuild 2137 RMD160 f2e989aab462f1ad2fce6668144786d57154ad66 SHA1 ce93d7f142fb8f97e0bec279214e2d66dbc57ede SHA256 1ece5824b7cc1624dbc247bcd81deb78b44ed8fb3fe7e10ef7e25562a3d8eda6
-MD5 a6ffb5dbe231512cf0375b7b20dd44a6 freebsd-sources-6.1-r1.ebuild 2137
-RMD160 f2e989aab462f1ad2fce6668144786d57154ad66 freebsd-sources-6.1-r1.ebuild 2137
-SHA256 1ece5824b7cc1624dbc247bcd81deb78b44ed8fb3fe7e10ef7e25562a3d8eda6 freebsd-sources-6.1-r1.ebuild 2137
-MISC ChangeLog 6207 RMD160 e366d6ffe719244090ccdf5ba085a64566059c85 SHA1 c20870a19d01ad4161eba00b216bd84a946bb81e SHA256 90b4fec68b5d60fcb4e1f186f25690b1aca98c664bf2b1115896421ad6a98159
-MD5 a4c40a2c81c7f61c582be50c50d0994b ChangeLog 6207
-RMD160 e366d6ffe719244090ccdf5ba085a64566059c85 ChangeLog 6207
-SHA256 90b4fec68b5d60fcb4e1f186f25690b1aca98c664bf2b1115896421ad6a98159 ChangeLog 6207
+EBUILD freebsd-sources-6.1-r1.ebuild 2093 RMD160 45df5c380836cdd40d031dc7a1a8aa77d7a55a69 SHA1 cd51a895e8da1a14e0650e64c4872b62987e625e SHA256 880c9227ca574269491797777150e5ba2a1e3d9deede8e28713e95619e087ed3
+MD5 0a2863d1f1166b269053b5aabcbf48de freebsd-sources-6.1-r1.ebuild 2093
+RMD160 45df5c380836cdd40d031dc7a1a8aa77d7a55a69 freebsd-sources-6.1-r1.ebuild 2093
+SHA256 880c9227ca574269491797777150e5ba2a1e3d9deede8e28713e95619e087ed3 freebsd-sources-6.1-r1.ebuild 2093
+EBUILD freebsd-sources-6.1-r2.ebuild 2164 RMD160 037adeb6dd878e68609ea31423ab7b3698f403a2 SHA1 446e00e1a98a88e4980b7b4df89b5f2b55158da3 SHA256 b94e389c3890df205d92b9ad8fb55c0469f7f50c462fb96fd8fb0f09f5b0be0e
+MD5 403261b334905d85c7868102c7575fd2 freebsd-sources-6.1-r2.ebuild 2164
+RMD160 037adeb6dd878e68609ea31423ab7b3698f403a2 freebsd-sources-6.1-r2.ebuild 2164
+SHA256 b94e389c3890df205d92b9ad8fb55c0469f7f50c462fb96fd8fb0f09f5b0be0e freebsd-sources-6.1-r2.ebuild 2164
+MISC ChangeLog 6447 RMD160 93172da61c5c731c2b3d1c908e2cb786e8e57278 SHA1 2e9d5665e894fca9b284a88bc33411a6d2e0c227 SHA256 597c5593f4b9c151bcea6be23fcb74d7b0e8bd5e2437aeaf4e0dd6c6ae4a375c
+MD5 b67ec863aca952c664f04af19369aaab ChangeLog 6447
+RMD160 93172da61c5c731c2b3d1c908e2cb786e8e57278 ChangeLog 6447
+SHA256 597c5593f4b9c151bcea6be23fcb74d7b0e8bd5e2437aeaf4e0dd6c6ae4a375c ChangeLog 6447
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -77,10 +81,13 @@ SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/di
 MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1-r1 256
 RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1-r1 256
 SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1-r1 256
+MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1-r2 256
+RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1-r2 256
+SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1-r2 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEftE+AiZjviIA2XgRAldbAKCOZmBUVONlmLMhQUDEiVxvoU0pmwCbBOR4
-7jNqIYW42lviYQf3lQPXJB0=
-=SYaA
+iD8DBQFEjTlfAiZjviIA2XgRApbnAJ9dym9R/AMziBYDyEgsiTUNwhvJWQCfW1RR
+TvovOrCcsthD+TWPMYvYT50=
+=cGp0
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r2 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r2
new file mode 100644
index 000000000000..ed81a3f45c74
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r2
@@ -0,0 +1,3 @@
+MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
+RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
+SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-gcc41.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-gcc41.patch
index 73643d971a27..6e92a100f1de 100644
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-gcc41.patch
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-gcc41.patch
@@ -1,7 +1,285 @@
-Index: fbsd-6.1/sys/kern/kern_tc.c
-===================================================================
---- fbsd-6.1.orig/sys/kern/kern_tc.c
-+++ fbsd-6.1/sys/kern/kern_tc.c
+diff -ru sys.orig/conf/kern.pre.mk sys-gcc4.1/conf/kern.pre.mk
+--- sys/conf/kern.pre.mk	2006-06-11 08:30:14 -0300
++++ sys-gcc4.1/conf/kern.pre.mk	2006-06-10 21:53:27 -0300
+@@ -46,7 +46,7 @@
+ NOSTDINC= -nostdinc
+ .endif
+ 
+-INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S
++INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
+ 
+ # This hack lets us use the OpenBSD altq code without spamming a new
+ # include path into contrib'ed source files.
+diff -ru sys/conf/kmod.mk sys-gcc4.1/conf/kmod.mk
+--- sys/conf/kmod.mk	2006-06-11 08:30:14 -0300
++++ sys-gcc4.1/conf/kmod.mk	2006-06-09 13:22:22 -0300
+@@ -87,7 +87,7 @@
+ .else
+ NOSTDINC=	-nostdinc
+ .endif
+-CFLAGS:=	${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*}
++CFLAGS:=	${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
+ .if defined(KERNBUILDDIR)
+ CFLAGS+=	-DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h
+ .endif
+diff -ru sys/ddb/db_command.c sys-gcc4.1/ddb/db_command.c
+--- sys/ddb/db_command.c	2005-10-25 17:10:56 -0300
++++ sys-gcc4.1/ddb/db_command.c	2006-06-09 22:26:53 -0300
+@@ -75,7 +75,7 @@
+ static db_cmdfcn_t	db_watchdog;
+ 
+ /* XXX this is actually forward-static. */
+-extern struct command	db_show_cmds[];
++static struct command	db_show_cmds[];
+ 
+ /*
+  * if 'ed' style: 'dot' is set at start of last item printed,
+diff -ru sys/dev/cp/if_cp.c sys-gcc4.1/dev/cp/if_cp.c
+--- sys/dev/cp/if_cp.c	2005-08-25 02:01:06 -0300
++++ sys-gcc4.1/dev/cp/if_cp.c	2006-06-09 08:08:56 -0300
+@@ -338,7 +338,7 @@
+ #endif
+ }
+ 
+-extern struct cdevsw cp_cdevsw;
++static struct cdevsw cp_cdevsw;
+ 
+ static void
+ cp_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error)
+diff -ru sys/dev/ctau/if_ct.c sys-gcc4.1/dev/ctau/if_ct.c
+--- sys/dev/ctau/if_ct.c	2005-08-25 02:01:06 -0300
++++ sys-gcc4.1/dev/ctau/if_ct.c	2006-06-09 08:10:31 -0300
+@@ -486,7 +486,7 @@
+ 	return 0;
+ }
+ 
+-extern struct cdevsw ct_cdevsw;
++static struct cdevsw ct_cdevsw;
+ 
+ static void
+ ct_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error)
+diff -ru sys/dev/cx/if_cx.c sys-gcc4.1/dev/cx/if_cx.c
+--- sys/dev/cx/if_cx.c	2006-03-10 16:37:31 -0300
++++ sys-gcc4.1/dev/cx/if_cx.c	2006-06-09 08:12:01 -0300
+@@ -229,7 +229,7 @@
+ static drv_t *channel [NCX*NCHAN];
+ static struct callout led_timo [NCX];
+ static struct callout timeout_handle;
+-extern struct cdevsw cx_cdevsw;
++static struct cdevsw cx_cdevsw;
+ 
+ static int MY_SOFT_INTR;
+ 
+diff -ru sys/dev/fb/vga.c sys-gcc4.1/dev/fb/vga.c
+--- sys/dev/fb/vga.c	2005-10-05 18:48:02 -0300
++++ sys-gcc4.1/dev/fb/vga.c	2006-06-09 12:58:32 -0300
+@@ -206,7 +206,7 @@
+  * with a physical address in the following table, as verify_adapter()
+  * will perform address conversion at run-time.
+  */
+-static video_adapter_t adapter_init_value[] = {
++video_adapter_t adapter_init_value[] = {
+     /* DCC_MONO */
+     { 0, KD_MONO, "mda", 0, 0, 0, 	    IO_MDA, IO_MDASIZE, MONO_CRTC,
+       MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, 
+@@ -748,10 +748,7 @@
+ }
+ 
+ #ifndef VGA_NO_BIOS
+-static void
+-fill_adapter_param(int code, video_adapter_t *adp)
+-{
+-    static struct {
++    struct {
+ 	int primary;
+ 	int secondary;
+     } dcc[] = {
+@@ -768,7 +765,9 @@
+ 	{ DCC_EGAMONO, 			DCC_CGA40 },
+ 	{ DCC_EGAMONO, 			DCC_CGA80 },
+     };
+-
++static void
++fill_adapter_param(int code, video_adapter_t *adp)
++{
+     if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) {
+ 	adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO];
+ 	adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80];
+diff -ru sys/dev/iicbus/iicbus.c sys-gcc4.1/dev/iicbus/iicbus.c
+--- sys/dev/iicbus/iicbus.c	2004-05-27 10:29:09 -0300
++++ sys-gcc4.1/dev/iicbus/iicbus.c	2006-06-09 08:31:40 -0300
+@@ -45,7 +45,7 @@
+ 
+ #define DEVTOIICBUS(dev) ((struct iicbus_device*)device_get_ivars(dev))
+ 
+-static devclass_t iicbus_devclass;
++static devclass_t iicbus_dev_class;
+ 
+ /* See comments below for why auto-scanning is a bad idea. */
+ #define SCAN_IICBUS 0
+@@ -187,8 +187,8 @@
+ 	return (IIC_ENOTSUPP);
+ }
+ 
+-DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0);
+-DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0);
+-DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0);
+-DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_devclass, 0, 0);
++DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_dev_class, 0, 0);
++DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_dev_class, 0, 0);
++DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_dev_class, 0, 0);
++DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_dev_class, 0, 0);
+ MODULE_VERSION(iicbus, IICBUS_MODVER);
+diff -ru sys/dev/ppbus/ppb_msq.c sys-gcc4.1/dev/ppbus/ppb_msq.c
+--- sys/dev/ppbus/ppb_msq.c	2003-08-24 14:54:16 -0300
++++ sys-gcc4.1/dev/ppbus/ppb_msq.c	2006-06-09 07:26:54 -0300
+@@ -153,31 +153,32 @@
+  * Execute a microseq loop
+  *
+  */
++struct ppb_microseq loop_microseq_1[] = {
++	  MS_CALL(0),			/* execute prolog */
++
++	  MS_SET(MS_UNKNOWN),		/* set size of transfer */
++	/* loop: */
++	  MS_CALL(0),			/* execute body */
++	  MS_DBRA(-1 /* loop: */),
++
++	  MS_CALL(0),			/* execute epilog */
++	  MS_RET(0)
++};
++
+ int
+ ppb_MS_loop(device_t bus, device_t dev, struct ppb_microseq *prolog,
+ 		struct ppb_microseq *body, struct ppb_microseq *epilog,
+ 		int iter, int *ret)
+ {
+-	struct ppb_microseq loop_microseq[] = {
+-		  MS_CALL(0),			/* execute prolog */
+-
+-		  MS_SET(MS_UNKNOWN),		/* set size of transfer */
+-	/* loop: */
+-		  MS_CALL(0),			/* execute body */
+-		  MS_DBRA(-1 /* loop: */),
+-
+-		  MS_CALL(0),			/* execute epilog */
+-		  MS_RET(0)
+-	};
+ 
+ 	/* initialize the structure */
+-	loop_microseq[0].arg[0].p = (void *)prolog;
+-	loop_microseq[1].arg[0].i = iter;
+-	loop_microseq[2].arg[0].p = (void *)body;
+-	loop_microseq[4].arg[0].p = (void *)epilog;
++	loop_microseq_1[0].arg[0].p = (void *)prolog;
++	loop_microseq_1[1].arg[0].i = iter;
++	loop_microseq_1[2].arg[0].p = (void *)body;
++	loop_microseq_1[4].arg[0].p = (void *)epilog;
+ 
+ 	/* execute the loop */
+-	return (ppb_MS_microseq(bus, dev, loop_microseq, ret));
++	return (ppb_MS_microseq(bus, dev, loop_microseq_1, ret));
+ }
+ 
+ /*
+diff -ru sys/fs/fdescfs/fdesc_vnops.c sys-gcc4.1/fs/fdescfs/fdesc_vnops.c
+--- sys/fs/fdescfs/fdesc_vnops.c	2006-03-22 14:39:27 -0300
++++ sys-gcc4.1/fs/fdescfs/fdesc_vnops.c	2006-06-09 08:18:20 -0300
+@@ -74,7 +74,7 @@
+ static vop_reclaim_t	fdesc_reclaim;
+ static vop_setattr_t	fdesc_setattr;
+ 
+-extern struct vop_vector fdesc_vnodeops;
++static struct vop_vector fdesc_vnodeops;
+ 
+ /*
+  * Initialise cache headers
+diff -ru sys/fs/ntfs/ntfs_vfsops.c sys/fs/ntfs/ntfs_vfsops.c
+--- sys/fs/ntfs/ntfs_vfsops.c	2006-02-19 21:53:13 -0300
++++ sys-gcc4.1/fs/ntfs/ntfs_vfsops.c	2006-06-09 08:54:14 -0300
+@@ -60,7 +60,7 @@
+ #include <fs/ntfs/ntfs_ihash.h>
+ #include <fs/ntfs/ntfsmount.h>
+ 
+-static MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure");
++static MALLOC_DEFINE(M_NTFS_MNT, "NTFS mount", "NTFS mount structure");
+ MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode",  "NTFS ntnode information");
+ MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode",  "NTFS fnode information");
+ MALLOC_DEFINE(M_NTFSDIR,"NTFS dir",  "NTFS dir buffer");
+@@ -286,7 +286,7 @@
+ 	error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp);
+ 	if (error)
+ 		goto out;
+-	ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO);
++	ntmp = malloc( sizeof *ntmp, M_NTFS_MNT, M_WAITOK | M_ZERO);
+ 	bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) );
+ 	/*
+ 	 * We must not cache the boot block if its size is not exactly
+@@ -411,7 +411,7 @@
+ 		/* Alloc memory for attribute definitions */
+ 		MALLOC(ntmp->ntm_ad, struct ntvattrdef *,
+ 			num * sizeof(struct ntvattrdef),
+-			M_NTFSMNT, M_WAITOK);
++			M_NTFS_MNT, M_WAITOK);
+ 
+ 		ntmp->ntm_adnum = num;
+ 
+@@ -515,8 +515,8 @@
+ 	ntfs_82u_uninit(ntmp);
+ 	mp->mnt_data = (qaddr_t)0;
+ 	mp->mnt_flag &= ~MNT_LOCAL;
+-	FREE(ntmp->ntm_ad, M_NTFSMNT);
+-	FREE(ntmp, M_NTFSMNT);
++	FREE(ntmp->ntm_ad, M_NTFS_MNT);
++	FREE(ntmp, M_NTFS_MNT);
+ 	return (error);
+ }
+ 
+diff -ru sys/fs/unionfs/union_vfsops.c sys-gcc4.1/fs/unionfs/union_vfsops.c
+--- sys/fs/unionfs/union_vfsops.c	2005-04-27 06:07:13 -0300
++++ sys-gcc4.1/fs/unionfs/union_vfsops.c	2006-06-09 09:02:09 -0300
+@@ -466,7 +466,7 @@
+ 	return (0);
+ }
+ 
+-static struct vfsops union_vfsops = {
++static struct vfsops union_vfs_ops = {
+ 	.vfs_init = 		union_init,
+ 	.vfs_mount =		union_mount,
+ 	.vfs_root =		union_root,
+@@ -474,4 +474,4 @@
+ 	.vfs_unmount =		union_unmount,
+ };
+ 
+-VFS_SET(union_vfsops, unionfs, VFCF_LOOPBACK);
++VFS_SET(union_vfs_ops, unionfs, VFCF_LOOPBACK);
+diff -ru sys/i386/i386/vm86.c sys-gcc4.1/i386/i386/vm86.c
+--- sys/i386/i386/vm86.c	2004-11-27 03:51:36 -0300
++++ sys-gcc4.1/i386/i386/vm86.c	2006-06-10 21:48:24 -0300
+@@ -505,7 +505,7 @@
+ 	panic("vm86_addpage: not enough room");
+ }
+ 
+-static void
++void
+ vm86_initflags(struct vm86frame *vmf)
+ {
+ 	int eflags = vmf->vmf_eflags;
+diff -ru sys/i386/include/segments.h sys-gcc4.1/i386/include/segments.h
+--- sys/i386/include/segments.h	2005-04-13 19:57:17 -0300
++++ sys-gcc4.1/i386/include/segments.h	2006-06-09 07:29:09 -0300
+@@ -244,7 +244,7 @@
+ extern struct soft_segment_descriptor gdt_segs[];
+ extern struct gate_descriptor *idt;
+ extern union descriptor ldt[NLDT];
+-extern struct region_descriptor r_gdt, r_idt;
++//extern struct region_descriptor r_gdt, r_idt;
+ 
+ void	lgdt(struct region_descriptor *rdp);
+ void	sdtossd(struct segment_descriptor *sdp,
+diff -ru sys/kern/kern_tc.c sys-gcc4.1/kern/kern_tc.c
+--- sys/kern/kern_tc.c	2006-04-04 17:07:23 -0300
++++ sys-gcc4.1/kern/kern_tc.c	2006-06-09 05:26:02 -0300
 @@ -61,7 +61,7 @@ struct timehands {
  	struct timehands	*th_next;
  };
@@ -11,3 +289,218 @@ Index: fbsd-6.1/sys/kern/kern_tc.c
  static struct timehands th9 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th0};
  static struct timehands th8 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th9};
  static struct timehands th7 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th8};
+diff -ru sys/net/rtsock.c sys-gcc4.1/net/rtsock.c
+--- sys/net/rtsock.c	2006-04-04 17:07:23 -0300
++++ sys-gcc4.1/net/rtsock.c	2006-06-09 05:26:02 -0300
+@@ -1243,7 +1243,7 @@
+  * Definitions of protocols supported in the ROUTE domain.
+  */
+ 
+-extern struct domain routedomain;		/* or at least forward */
++static struct domain routedomain;		/* or at least forward */
+ 
+ static struct protosw routesw[] = {
+ {
+diff -ru sys/net/zlib.c sys-gcc4.1/net/zlib.c
+--- sys/net/zlib.c	2005-01-06 22:45:35 -0300
++++ sys-gcc4.1/net/zlib.c	2006-06-09 09:06:42 -0300
+@@ -94,7 +94,7 @@
+ typedef ush FAR ushf;
+ typedef unsigned long  ulg;
+ 
+-extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
++static const char *z_errmsg[10]; /* indexed by 2-zlib_error */
+ /* (size given to avoid silly warnings with Visual C++) */
+ 
+ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+diff -ru sys/netinet6/in6_proto.c sys-gcc4.1/netinet6/in6_proto.c
+--- sys/netinet6/in6_proto.c	2005-11-16 07:31:23 -0300
++++ sys-gcc4.1/netinet6/in6_proto.c	2006-06-09 06:52:31 -0300
+@@ -145,7 +145,7 @@
+  */
+ 
+ extern	struct domain inet6domain;
+-static	struct pr_usrreqs nousrreqs;
++static	struct pr_usrreqs nousr_reqs;
+ 
+ #define PR_LISTEN	0
+ #define PR_ABRTACPTDIS	0
+@@ -158,7 +158,7 @@
+ 	.pr_init =		ip6_init,
+ 	.pr_slowtimo =		frag6_slowtimo,
+ 	.pr_drain =		frag6_drain,
+-	.pr_usrreqs =		&nousrreqs,
++	.pr_usrreqs =		&nousr_reqs,
+ },
+ {
+ 	.pr_type =		SOCK_DGRAM,
+@@ -216,7 +216,7 @@
+ 	.pr_protocol =		IPPROTO_DSTOPTS,
+ 	.pr_flags =		PR_ATOMIC|PR_ADDR,
+ 	.pr_input =		dest6_input,
+-	.pr_usrreqs =		&nousrreqs
++	.pr_usrreqs =		&nousr_reqs
+ },
+ {
+ 	.pr_type =		SOCK_RAW,
+@@ -224,7 +224,7 @@
+ 	.pr_protocol =		IPPROTO_ROUTING,
+ 	.pr_flags =		PR_ATOMIC|PR_ADDR,
+ 	.pr_input =		route6_input,
+-	.pr_usrreqs =		&nousrreqs
++	.pr_usrreqs =		&nousr_reqs
+ },
+ {
+ 	.pr_type =		SOCK_RAW,
+@@ -232,7 +232,7 @@
+ 	.pr_protocol =		IPPROTO_FRAGMENT,
+ 	.pr_flags =		PR_ATOMIC|PR_ADDR,
+ 	.pr_input =		frag6_input,
+-	.pr_usrreqs =		&nousrreqs
++	.pr_usrreqs =		&nousr_reqs
+ },
+ #ifdef IPSEC
+ {
+@@ -241,7 +241,7 @@
+ 	.pr_protocol =		IPPROTO_AH,
+ 	.pr_flags =		PR_ATOMIC|PR_ADDR,
+ 	.pr_input =		ah6_input,
+-	.pr_usrreqs =		&nousrreqs,
++	.pr_usrreqs =		&nousr_reqs,
+ },
+ #ifdef IPSEC_ESP
+ {
+@@ -251,7 +251,7 @@
+ 	.pr_flags =		PR_ATOMIC|PR_ADDR,
+ 	.pr_input =		esp6_input,
+ 	.pr_ctlinput =		esp6_ctlinput,
+-	.pr_usrreqs =		&nousrreqs,
++	.pr_usrreqs =		&nousr_reqs,
+ },
+ #endif
+ {
+@@ -260,7 +260,7 @@
+ 	.pr_protocol =		IPPROTO_IPCOMP,
+ 	.pr_flags =		PR_ATOMIC|PR_ADDR,
+ 	.pr_input =		ipcomp6_input,
+-	.pr_usrreqs =		&nousrreqs,
++	.pr_usrreqs =		&nousr_reqs,
+ },
+ #endif /* IPSEC */
+ #ifdef INET
+diff -ru sys/netinet6/ip6_mroute.c sys-gcc4.1/netinet6/ip6_mroute.c
+--- sys/netinet6/ip6_mroute.c	2006-04-20 13:05:17 -0300
++++ sys-gcc4.1/netinet6/ip6_mroute.c	2006-06-09 06:53:47 -0300
+@@ -188,7 +188,7 @@
+ static mifi_t nummifs = 0;
+ static mifi_t reg_mif_num = (mifi_t)-1;
+ 
+-static struct pim6stat pim6stat;
++static struct pim6stat pim6_stat;
+ static int pim6;
+ 
+ /*
+@@ -1622,7 +1622,7 @@
+ 		log(LOG_DEBUG, "** IPv6 register_send **\n src %s dst %s\n",
+ 		    ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&ip6->ip6_dst));
+ #endif
+-	++pim6stat.pim6s_snd_registers;
++	++pim6_stat.pim6s_snd_registers;
+ 
+ 	/* Make a copy of the packet to send to the user level process */
+ 	MGETHDR(mm, M_DONTWAIT, MT_HEADER);
+@@ -1690,7 +1690,7 @@
+ 	int minlen;
+ 	int off = *offp;
+ 
+-	++pim6stat.pim6s_rcv_total;
++	++pim6_stat.pim6s_rcv_total;
+ 
+ 	ip6 = mtod(m, struct ip6_hdr *);
+ 	pimlen = m->m_pkthdr.len - *offp;
+@@ -1699,7 +1699,7 @@
+ 	 * Validate lengths
+ 	 */
+ 	if (pimlen < PIM_MINLEN) {
+-		++pim6stat.pim6s_rcv_tooshort;
++		++pim6_stat.pim6s_rcv_tooshort;
+ #ifdef MRT6DEBUG
+ 		if (mrt6debug & DEBUG_PIM)
+ 			log(LOG_DEBUG,"pim6_input: PIM packet too short\n");
+@@ -1732,7 +1732,7 @@
+ #else
+ 	IP6_EXTHDR_GET(pim, struct pim *, m, off, minlen);
+ 	if (pim == NULL) {
+-		pim6stat.pim6s_rcv_tooshort++;
++		pim6_stat.pim6s_rcv_tooshort++;
+ 		return (IPPROTO_DONE);
+ 	}
+ #endif
+@@ -1752,7 +1752,7 @@
+ 			cksumlen = pimlen;
+ 
+ 		if (in6_cksum(m, IPPROTO_PIM, off, cksumlen)) {
+-			++pim6stat.pim6s_rcv_badsum;
++			++pim6_stat.pim6s_rcv_badsum;
+ #ifdef MRT6DEBUG
+ 			if (mrt6debug & DEBUG_PIM)
+ 				log(LOG_DEBUG,
+@@ -1766,7 +1766,7 @@
+ 
+ 	/* PIM version check */
+ 	if (pim->pim_ver != PIM_VERSION) {
+-		++pim6stat.pim6s_rcv_badversion;
++		++pim6_stat.pim6s_rcv_badversion;
+ #ifdef MRT6DEBUG
+ 		log(LOG_ERR,
+ 		    "pim6_input: incorrect version %d, expecting %d\n",
+@@ -1789,7 +1789,7 @@
+ 		u_int32_t *reghdr;
+ 		int rc;
+ 
+-		++pim6stat.pim6s_rcv_registers;
++		++pim6_stat.pim6s_rcv_registers;
+ 
+ 		if ((reg_mif_num >= nummifs) || (reg_mif_num == (mifi_t) -1)) {
+ #ifdef MRT6DEBUG
+@@ -1811,8 +1811,8 @@
+ 		 * Validate length
+ 		 */
+ 		if (pimlen < PIM6_REG_MINLEN) {
+-			++pim6stat.pim6s_rcv_tooshort;
+-			++pim6stat.pim6s_rcv_badregisters;
++			++pim6_stat.pim6s_rcv_tooshort;
++			++pim6_stat.pim6s_rcv_badregisters;
+ #ifdef MRT6DEBUG
+ 			log(LOG_ERR,
+ 			    "pim6_input: register packet size too "
+@@ -1836,7 +1836,7 @@
+ 
+ 		/* verify the version number of the inner packet */
+ 		if ((eip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) {
+-			++pim6stat.pim6s_rcv_badregisters;
++			++pim6_stat.pim6s_rcv_badregisters;
+ #ifdef MRT6DEBUG
+ 			log(LOG_DEBUG, "pim6_input: invalid IP version (%d) "
+ 			    "of the inner packet\n",
+@@ -1848,7 +1848,7 @@
+ 
+ 		/* verify the inner packet is destined to a mcast group */
+ 		if (!IN6_IS_ADDR_MULTICAST(&eip6->ip6_dst)) {
+-			++pim6stat.pim6s_rcv_badregisters;
++			++pim6_stat.pim6s_rcv_badregisters;
+ #ifdef MRT6DEBUG
+ 			if (mrt6debug & DEBUG_PIM)
+ 				log(LOG_DEBUG,
+diff -ru sys/sys/proc.h sys-gcc4.1/sys/proc.h
+--- sys/sys/proc.h	2006-03-10 16:37:35 -0300
++++ sys-gcc4.1/sys/proc.h	2006-06-09 05:15:08 -0300
+@@ -835,7 +835,7 @@
+ extern int nprocs, maxproc;		/* Current and max number of procs. */
+ extern int maxprocperuid;		/* Max procs per uid. */
+ extern u_long ps_arg_cache_limit;
+-extern int sched_quantum;		/* Scheduling quantum in ticks. */
++//extern int sched_quantum;		/* Scheduling quantum in ticks. */
+ 
+ LIST_HEAD(proclist, proc);
+ TAILQ_HEAD(procqueue, proc);
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
index cea468e88222..cc15a4715384 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild,v 1.1 2006/06/01 11:36:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild,v 1.2 2006/06/12 09:52:13 flameeyes Exp $
 
 inherit bsdmk freebsd
 
@@ -37,7 +37,6 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
 	epatch "${FILESDIR}/${PN}-6.0-asm.patch"
 	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
-	epatch "${FILESDIR}/${PN}-6.1-gcc41.patch"
 
 	epatch "${FILESDIR}/SA-06-16-smbfs.patch"
 
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild
new file mode 100644
index 000000000000..238020996ea7
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild,v 1.1 2006/06/12 09:52:13 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# This replaces the gentoover patch, it doesn't need reapply every time.
+	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+		"${S}/conf/newvers.sh"
+
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	epatch "${FILESDIR}/${PN}-6.0-asm.patch"
+	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
+	epatch "${FILESDIR}/${PN}-6.1-gcc41.patch"
+
+	epatch "${FILESDIR}/SA-06-16-smbfs.patch"
+
+	# Disable SSP for the kernel
+	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+		"s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g"
+}
+
+src_compile() {
+	einfo "Nothing to compile.."
+}
+
+src_install() {
+	insinto "/usr/src/sys-${MY_PVR}"
+	doins -r "${S}/"*
+}
+
+pkg_postinst() {
+	if [[ ! -L $"{ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys symlink doesn't exist; creating..."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	elif use symlink; then
+		einfo "Updating /usr/src/sys symlink..."
+		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}"
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	fi
+}