Drop obsolete files.

Package-Manager: portage-2.1_pre7-r3

27 files changed, 48 insertions, 1557 deletions

diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index 9a0ade5ce695..3fa828ec2c6a 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/boot0
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.2 2006/04/02 21:58:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/boot0-gentoo.patch:
+  Drop obsolete files.
 
 *boot0-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/boot0/files/boot0-gentoo.patch b/sys-freebsd/boot0/files/boot0-gentoo.patch
deleted file mode 100644
index 3d0a101ef9c4..000000000000
--- a/sys-freebsd/boot0/files/boot0-gentoo.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -ur sys/boot/alpha/common/Makefile.common sys.boot0/boot/alpha/common/Makefile.common
---- sys/boot/alpha/common/Makefile.common	2004-08-23 06:26:55.000000000 +0200
-+++ sys.boot0/boot/alpha/common/Makefile.common	2005-06-20 19:53:39.322858584 +0200
-@@ -34,7 +34,7 @@
- 
- CFLAGS+=	-Wall
- 
--CFLAGS+=	-I${LIBSTANDDIR}
-+CFLAGS+=	-I/usr/include/libstand
- CFLAGS+=	-I${.CURDIR}/..
- 
- vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
-diff -ur sys/boot/alpha/libalpha/Makefile sys.boot0/boot/alpha/libalpha/Makefile
---- sys/boot/alpha/libalpha/Makefile	2005-02-13 08:23:30.000000000 +0100
-+++ sys.boot0/boot/alpha/libalpha/Makefile	2005-06-20 19:53:39.323858432 +0200
-@@ -5,7 +5,7 @@
- 
- #CFLAGS+=	-DDISK_DEBUG
- 
--CFLAGS+=	-I${LIBSTANDDIR}
-+CFLAGS+=	-I/usr/include/libstand
- 
- # Pick up the bootstrap header for some interface items
- CFLAGS+=	-I${.CURDIR}/../../common
-diff -ur sys/boot/arc/lib/Makefile sys.boot0/boot/arc/lib/Makefile
---- sys/boot/arc/lib/Makefile	2005-02-13 08:23:30.000000000 +0100
-+++ sys.boot0/boot/arc/lib/Makefile	2005-06-20 19:53:39.323858432 +0200
-@@ -7,7 +7,7 @@
- .PATH:		${.CURDIR}/arch/${MACHINE_ARCH}
- # XXX hack to pick up stand.h
- LIBSTANDDIR=	${.CURDIR}/../../../../lib/libstand
--CFLAGS+=	-I${LIBSTANDDIR}
-+CFLAGS+=	-I/usr/include/libstand
- CFLAGS+=	-DDEBUG
- 
- # Pick up the bootstrap header for some interface items
-diff -ur sys/boot/arc/loader/Makefile sys.boot0/boot/arc/loader/Makefile
---- sys/boot/arc/loader/Makefile	2002-05-10 11:26:30.000000000 +0200
-+++ sys.boot0/boot/arc/loader/Makefile	2005-06-20 19:53:39.323858432 +0200
-@@ -26,7 +26,7 @@
- 
- CFLAGS+=	-Wall
- 
--CFLAGS+=	-I${LIBSTANDDIR}
-+CFLAGS+=	-I/usr/include/libstand
- CFLAGS+=	-I${.CURDIR}/../include
- CRT=		start.o
- STRIP=
-diff -ur sys/boot/efi/libefi/Makefile sys.boot0/boot/efi/libefi/Makefile
---- sys/boot/efi/libefi/Makefile	2005-02-13 08:23:31.000000000 +0100
-+++ sys.boot0/boot/efi/libefi/Makefile	2005-06-20 19:53:39.323858432 +0200
-@@ -14,7 +14,7 @@
- 
- CFLAGS+=	-I${.CURDIR}/../include
- CFLAGS+=	-I${.CURDIR}/../include/${MACHINE_ARCH}
--CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
-+CFLAGS+=	-I/usr/include/libstand
- 
- # Pick up the bootstrap header for some interface items
- CFLAGS+=	-I${.CURDIR}/../../common
-diff -ur sys/boot/efi/loader/Makefile sys.boot0/boot/efi/loader/Makefile
---- sys/boot/efi/loader/Makefile	2004-07-20 09:01:02.000000000 +0200
-+++ sys.boot0/boot/efi/loader/Makefile	2005-06-20 19:53:39.324858280 +0200
-@@ -27,7 +27,7 @@
- CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH}
- CFLAGS+= -I${.CURDIR}/../../common
- CFLAGS+= -I${.CURDIR}/../libefi
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
-+CFLAGS+= -I/usr/include/libstand
- CFLAGS+= -DLOADER
- 
- LDSCRIPT=	${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH}
-diff -ur sys/boot/i386/boot2/Makefile sys.boot0/boot/i386/boot2/Makefile
---- sys/boot/i386/boot2/Makefile	2005-03-16 19:54:37.000000000 +0100
-+++ sys.boot0/boot/i386/boot2/Makefile	2005-06-20 19:31:36.871901688 +0200
-@@ -24,7 +24,6 @@
- 	-fno-guess-branch-probability \
- 	-fomit-frame-pointer \
- 	-fno-unit-at-a-time \
--	-mno-align-long-strings \
- 	-mrtd \
- 	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
- 	-D${BOOT2_UFS} \
-diff -ur sys/boot/i386/libi386/Makefile sys.boot0/boot/i386/libi386/Makefile
---- sys/boot/i386/libi386/Makefile	2005-02-13 08:23:31.000000000 +0100
-+++ sys.boot0/boot/i386/libi386/Makefile	2005-06-20 19:53:39.324858280 +0200
-@@ -28,7 +28,7 @@
- 		-I${.CURDIR}/../../../contrib/dev/acpica \
- 		-I${.CURDIR}/../../.. -I.
- # the location of libstand
--CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+=	-I/usr/include/libstand/
- 
- .if ${MACHINE_ARCH} == "amd64"
- CLEANFILES+=	machine
-diff -ur sys/boot/ia64/libski/Makefile sys.boot0/boot/ia64/libski/Makefile
---- sys/boot/ia64/libski/Makefile	2004-02-13 05:43:41.000000000 +0100
-+++ sys.boot0/boot/ia64/libski/Makefile	2005-06-20 19:53:39.324858280 +0200
-@@ -7,7 +7,7 @@
- SRCS+=	delay.c skifs.c elf_freebsd.c bootinfo.c ssc.c
- SRCS+=	acpi_stub.c efi_stub.c pal_stub.S sal_stub.c
- 
--CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
-+CFLAGS+=	-I/usr/include/libstand
- CFLAGS+=	-I${.CURDIR}/../../efi/include
- CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
- 
-diff -ur sys/boot/ofw/libofw/Makefile sys.boot0/boot/ofw/libofw/Makefile
---- sys/boot/ofw/libofw/Makefile	2005-02-13 08:23:31.000000000 +0100
-+++ sys.boot0/boot/ofw/libofw/Makefile	2005-06-20 19:53:39.325858128 +0200
-@@ -7,7 +7,7 @@
- 	ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
- 	ofw_time.c openfirm.c
- 
--CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+=	-I/usr/include/libstand/
- 
- # Pick up the bootstrap header for some interface items
- CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
-diff -ur sys/boot/pc98/libpc98/Makefile sys.boot0/boot/pc98/libpc98/Makefile
---- sys/boot/pc98/libpc98/Makefile	2005-02-13 08:23:31.000000000 +0100
-+++ sys.boot0/boot/pc98/libpc98/Makefile	2005-06-20 19:53:39.325858128 +0200
-@@ -29,6 +29,6 @@
- 		-I${.CURDIR}/../../i386/libi386 \
- 		-I${.CURDIR}/../../.. -I.
- # the location of libstand
--CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+=	-I/usr/include/libstand/
- 
- .include <bsd.lib.mk>
-diff -ur sys/boot/sparc64/loader/Makefile sys.boot0/boot/sparc64/loader/Makefile
---- sys/boot/sparc64/loader/Makefile	2004-08-16 17:45:25.000000000 +0200
-+++ sys.boot0/boot/sparc64/loader/Makefile	2005-06-20 19:53:39.325858128 +0200
-@@ -63,7 +63,7 @@
- CFLAGS+=	-I${.CURDIR}/../../ofw/libofw/
- 
- # where to get libstand from
--CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+=	-I/usr/include/libstand/
- 
- DPADD=		${LIBFICL} ${LIBOFW} ${LIBSTAND}
- LDADD=		${LIBFICL} ${LIBOFW} -lstand
diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog
index 502c3920750c..f87a7d028e4d 100644
--- a/sys-freebsd/freebsd-bin/ChangeLog
+++ b/sys-freebsd/freebsd-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.2 2006/04/02 21:50:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freebsd-bin-flex.patch:
+  Drop obsolete files.
 
 *freebsd-bin-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-bin/files/freebsd-bin-flex.patch b/sys-freebsd/freebsd-bin/files/freebsd-bin-flex.patch
deleted file mode 100644
index ed3fb101eecf..000000000000
--- a/sys-freebsd/freebsd-bin/files/freebsd-bin-flex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur bin/sh/Makefile bin-flex/sh/Makefile
---- bin/sh/Makefile	2004-03-18 10:55:47 +0000
-+++ bin-flex/sh/Makefile	2005-05-05 15:03:29 +0000
-@@ -16,7 +16,7 @@
- # builtin.1 in share/man/man1/.  
- 
- DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
--LDADD= -ll -ledit -ltermcap
-+LDADD= -lfl -ledit -ltermcap
- 
- LFLAGS= -8	# 8-bit lex scanner for arithmetic
- CFLAGS+=-DSHELL -I. -I${.CURDIR}
diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index d096d4b28aed..1a12a7d8b022 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-contrib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.2 2006/04/02 21:51:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freebsd-contrib-crt_gcc4.patch:
+  Drop obsolete files.
 
 *freebsd-contrib-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-contrib/files/freebsd-contrib-crt_gcc4.patch b/sys-freebsd/freebsd-contrib/files/freebsd-contrib-crt_gcc4.patch
deleted file mode 100644
index 6516237159e6..000000000000
--- a/sys-freebsd/freebsd-contrib/files/freebsd-contrib-crt_gcc4.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ur gcc.orig/contrib/gcc/crtstuff.c gcc/contrib/gcc/crtstuff.c
---- gcc.orig/contrib/gcc/crtstuff.c	2005-04-27 23:18:59 +0000
-+++ gcc/contrib/gcc/crtstuff.c	2005-04-27 23:20:45 +0000
-@@ -1,7 +1,7 @@
- /* Specialized bits of code needed to support construction and
-    destruction of file-scope objects in C++ code.
-    Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998,
--   1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-    Contributed by Ron Guilmette (rfg@monkeys.com).
- 
- This file is part of GCC.
-@@ -55,6 +55,8 @@
-    compiled for the target, and hence definitions concerning only the host
-    do not apply.  */
- 
-+#define IN_LIBGCC2
-+
- /* We include auto-host.h here to get HAVE_GAS_HIDDEN.  This is
-    supposedly valid even though this is a "target" file.  */
- #include "auto-host.h"
-@@ -92,7 +94,7 @@
- #if defined(EH_FRAME_SECTION_NAME) && !defined(USE_PT_GNU_EH_FRAME)
- # define USE_EH_FRAME_REGISTRY
- #endif
--#if defined(EH_FRAME_SECTION_NAME) && defined(HAVE_LD_RO_RW_SECTION_MIXING)
-+#if defined(EH_FRAME_SECTION_NAME) && EH_TABLES_CAN_BE_READ_ONLY
- # define EH_FRAME_SECTION_CONST const
- #else
- # define EH_FRAME_SECTION_CONST
-@@ -109,7 +111,7 @@
-    but not its definition.
- 
-    Making TARGET_WEAK_ATTRIBUTE conditional seems like a good solution until
--   one thinks about scaling to larger problems -- ie, the condition under
-+   one thinks about scaling to larger problems -- i.e., the condition under
-    which TARGET_WEAK_ATTRIBUTE is active will eventually get far too
-    complicated.
- 
-@@ -312,8 +314,13 @@
- #endif /* CRT_GET_RFIB_DATA */
- #endif /* USE_EH_FRAME_REGISTRY */
- #ifdef JCR_SECTION_NAME
--  if (__JCR_LIST__[0] && _Jv_RegisterClasses)
--    _Jv_RegisterClasses (__JCR_LIST__);
-+  if (__JCR_LIST__[0])
-+    {
-+      void (*register_classes) (void *) = _Jv_RegisterClasses;
-+      __asm ("" : "+r" (register_classes));
-+      if (register_classes)
-+	register_classes (__JCR_LIST__);
-+    }
- #endif /* JCR_SECTION_NAME */
- }
- 
-@@ -395,8 +402,13 @@
-     __register_frame_info (__EH_FRAME_BEGIN__, &object);
- #endif
- #ifdef JCR_SECTION_NAME
--  if (__JCR_LIST__[0] && _Jv_RegisterClasses)
--    _Jv_RegisterClasses (__JCR_LIST__);
-+  if (__JCR_LIST__[0])
-+    {
-+      void (*register_classes) (void *) = _Jv_RegisterClasses;
-+      __asm ("" : "+r" (register_classes));
-+      if (register_classes)
-+	register_classes (__JCR_LIST__);
-+    }
- #endif
- }
- #endif /* USE_EH_FRAME_REGISTRY || JCR_SECTION_NAME */
-@@ -445,9 +457,18 @@
- #ifdef EH_FRAME_SECTION_NAME
- /* Terminate the frame unwind info section with a 4byte 0 as a sentinel;
-    this would be the 'length' field in a real FDE.  */
--STATIC EH_FRAME_SECTION_CONST int __FRAME_END__[]
--     __attribute__ ((unused, mode(SI), section(EH_FRAME_SECTION_NAME),
--		     aligned(4)))
-+# if __INT_MAX__ == 2147483647
-+typedef int int32;
-+# elif __LONG_MAX__ == 2147483647
-+typedef long int32;
-+# elif __SHRT_MAX__ == 2147483647
-+typedef short int32;
-+# else
-+#  error "Missing a 4 byte integer"
-+# endif
-+STATIC EH_FRAME_SECTION_CONST int32 __FRAME_END__[]
-+     __attribute__ ((unused, section(EH_FRAME_SECTION_NAME),
-+		     aligned(sizeof(int32))))
-      = { 0 };
- #endif /* EH_FRAME_SECTION_NAME */
- 
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 3904407f5f20..dc1c3c391fdb 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.2 2006/04/02 21:52:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freebsd-lib-fixmakefiles.patch,
+  -files/freebsd-lib-msun-fenvc.patch, -files/freebsd-lib-runet.patch:
+  Drop obsolete files.
 
 *freebsd-lib-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-fixmakefiles.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-fixmakefiles.patch
deleted file mode 100644
index 1254fb3f7f14..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-fixmakefiles.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -ur lib.orig/libc/Makefile lib/libc/Makefile
---- lib.orig/libc/Makefile	Thu Apr  7 12:11:33 2005
-+++ lib/libc/Makefile	Thu Apr  7 12:26:50 2005
-@@ -13,7 +13,7 @@
- SHLIB_MAJOR= 5
- SHLIBDIR?= /lib
- WARNS?=	2
--CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
-+CFLAGS+=-I${.CURDIR}/include -I/usr/include
- CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH}
- CLEANFILES+=tags
- INSTALL_PIC_ARCHIVE=
-Only in lib/libc: Makefile.orig
-diff -ur lib.orig/libc/sys/Makefile.inc lib/libc/sys/Makefile.inc
---- lib.orig/libc/sys/Makefile.inc	Thu Apr  7 12:11:33 2005
-+++ lib/libc/sys/Makefile.inc	Thu Apr  7 12:26:58 2005
-@@ -6,7 +6,7 @@
- 
- # Include the generated makefile containing the *complete* list
- # of syscall names in MIASM.
--.include "${.CURDIR}/../../sys/sys/syscall.mk"
-+.include "/usr/src/sys/sys/syscall.mk"
- 
- # Include machine dependent definitions.
- #
-Only in lib/libc/sys: Makefile.inc.orig
-diff -ur lib.orig/libcam/Makefile lib/libcam/Makefile
---- lib.orig/libcam/Makefile	Thu Apr  7 12:11:33 2005
-+++ lib/libcam/Makefile	Thu Apr  7 12:27:06 2005
-@@ -34,9 +34,9 @@
- 		cam_cdbparse.3 csio_encode_visit.3 \
- 		cam_cdbparse.3 buff_encode_visit.3
- 
--.PATH:		${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam
-+.PATH:		/usr/src/sys/cam/scsi /usr/src/sys/cam
- 
--SDIR=		${.CURDIR}/../../sys
-+SDIR=		/usr/src/sys
- CFLAGS+=	-I${.CURDIR} -I${SDIR}
- 
- .include <bsd.lib.mk>
-Only in lib/libcam: Makefile.orig
-diff -ur lib.orig/libkvm/Makefile lib/libkvm/Makefile
---- lib.orig/libkvm/Makefile	Thu Apr  7 12:11:34 2005
-+++ lib/libkvm/Makefile	Thu Apr  7 12:17:40 2005
-@@ -3,7 +3,7 @@
- 
- LIB=	kvm
- SHLIBDIR?= /lib
--CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
-+CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I/usr/src/sys
- SRCS=	kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
- 	kvm_getswapinfo.c kvm_proc.c
- INCS=	kvm.h
-Only in lib/libkvm: Makefile.orig
-diff -ur lib.orig/libncurses/Makefile lib/libncurses/Makefile
---- lib.orig/libncurses/Makefile	Thu Apr  7 12:11:34 2005
-+++ lib/libncurses/Makefile	Thu Apr  7 12:28:02 2005
-@@ -255,6 +255,7 @@
- 
- .if !defined(NOHTML)
- afterinstall:
-+	${INSTALL} -d ${DESTDIR}${DOCSDIR}
- .for file in ${DOCS}
- 	cd ${.CURDIR}/../../contrib/ncurses/doc/html ; \
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \
-Only in lib/libncurses: Makefile.orig
-diff -ur lib.orig/libngatm/Makefile lib/libngatm/Makefile
---- lib.orig/libngatm/Makefile	Thu Apr  7 12:11:34 2005
-+++ lib/libngatm/Makefile	Thu Apr  7 12:27:55 2005
-@@ -8,7 +8,7 @@
- WARNS?=	6
- 
- # source of the library lives in contrib
--SDIR=	${.CURDIR}/../../sys
-+SDIR=	/usr/src/sys
- CTRB=	${.CURDIR}/../../contrib/ngatm
- LIBBASE= ${SDIR}/contrib/ngatm
- 
-Only in lib/libngatm: Makefile.orig
-diff -ur lib.orig/libsbuf/Makefile lib/libsbuf/Makefile
---- lib.orig/libsbuf/Makefile	Thu Apr  7 12:11:34 2005
-+++ lib/libsbuf/Makefile	Thu Apr  7 12:21:30 2005
-@@ -5,6 +5,6 @@
- SRCS=	subr_sbuf.c 
- WARNS?= 2
- 
--.PATH:	${.CURDIR}/../../sys/kern
-+.PATH:	/usr/src/sys/kern
- 
- .include <bsd.lib.mk>
-Only in lib/libsbuf: Makefile.orig
-diff -ur lib.orig/libthr/Makefile lib/libthr/Makefile
---- lib.orig/libthr/Makefile	Thu Apr  7 12:11:35 2005
-+++ lib/libthr/Makefile	Thu Apr  7 12:28:14 2005
-@@ -14,6 +14,7 @@
- CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
- 	-I${.CURDIR}/../../include
- CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
-+CFLAGS+=-I/usr/src/sys
- 
- # enable extra internal consistancy checks
- CFLAGS+=-D_PTHREADS_INVARIANTS
-Only in lib/libthr: Makefile.orig
-diff -ur lib.orig/libypclnt/Makefile lib/libypclnt/Makefile
---- lib.orig/libypclnt/Makefile	Thu Apr  7 12:11:34 2005
-+++ lib/libypclnt/Makefile	Thu Apr  7 12:22:15 2005
-@@ -24,8 +24,8 @@
- 	yppasswd_private_xdr.c
- 
- RPCGEN=	rpcgen -C
--RPCSRC=	${.CURDIR}/../../include/rpcsvc/yp.x
--RPCSRC_PW=	${.CURDIR}/../../include/rpcsvc/yppasswd.x
-+RPCSRC=	/usr/include/rpcsvc/yp.x
-+RPCSRC_PW=	/usr/include/rpcsvc/yppasswd.x
- RPCSRC_PRIV=	${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x
- 
- yp.h: ${RPCSRC}
-Only in lib/libypclnt: Makefile.orig
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-msun-fenvc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-msun-fenvc.patch
deleted file mode 100644
index 34ba28cee775..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-msun-fenvc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- msun/i387/fenv.c.orig	Mon Nov  1 01:40:10 2004
-+++ msun/i387/fenv.c	Mon Nov  1 01:40:21 2004
-@@ -28,7 +28,7 @@
- 
- #include <sys/types.h>
- #include <machine/npx.h>
--#include <fenv.h>
-+#include "fenv.h"
- 
- const fenv_t __fe_dfl_env = {
- 	0xffff0000 | __INITIAL_NPXCW__,
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-runet.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-runet.patch
deleted file mode 100644
index 43eec6a43c18..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-runet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur lib.orig/libc/locale/mblocal.h lib/libc/locale/mblocal.h
---- lib.orig/libc/locale/mblocal.h	2005-04-29 13:57:07 +0000
-+++ lib/libc/locale/mblocal.h	2005-04-29 14:00:33 +0000
-@@ -30,6 +30,7 @@
- #define	_MBLOCAL_H_
- 
- #include <stddef.h>	/* XXX for rune_t */
-+#include <rune.h>
- 
- /*
-  * Conversion function pointers for current encoding.
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index 812a09ea5ce4..76484f9cd7c6 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.2 2006/04/02 21:53:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freebsd-mk-defs-gentoo.patch, -files/sys.patch:
+  Drop obsolete files.
 
 *freebsd-mk-defs-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch
deleted file mode 100644
index 5d5235eb0097..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff -ur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
---- share.orig/mk/bsd.doc.mk	Thu Apr  7 12:01:25 2005
-+++ share/mk/bsd.doc.mk	Thu Apr  7 12:00:13 2005
-@@ -137,10 +137,12 @@
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-diff -ur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
---- share.orig/mk/bsd.files.mk	Thu Apr  7 12:01:25 2005
-+++ share/mk/bsd.files.mk	Thu Apr  7 12:00:34 2005
-@@ -39,6 +39,7 @@
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@
- installfiles: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff -ur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
---- share.orig/mk/bsd.incs.mk	Thu Apr  7 12:01:25 2005
-+++ share/mk/bsd.incs.mk	Thu Apr  7 12:00:40 2005
-@@ -39,6 +39,10 @@
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
-+	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,9 +55,11 @@
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff -ur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
---- share.orig/mk/bsd.info.mk	Thu Apr  7 12:01:25 2005
-+++ share/mk/bsd.info.mk	Thu Apr  7 12:00:44 2005
-@@ -85,6 +85,7 @@
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -145,6 +146,7 @@
- .for x in ${INFO}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
- 	    --defsection=${INFOSECTION} \
- 	    --defentry=${INFOENTRY_${x}} \
-diff -ur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
---- share.orig/mk/bsd.lib.mk	Thu Apr  7 12:01:25 2005
-+++ share/mk/bsd.lib.mk	Thu Apr  7 12:00:49 2005
-@@ -208,14 +208,17 @@
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
- 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-diff -ur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
---- share.orig/mk/bsd.man.mk	Thu Apr  7 12:01:25 2005
-+++ share/mk/bsd.man.mk	Thu Apr  7 12:00:52 2005
-@@ -165,9 +165,11 @@
- .if defined(NOMANCOMPRESS)
- .if defined(MANFILTER)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- .endif
-@@ -186,6 +188,7 @@
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- .endfor
-@@ -193,9 +196,11 @@
- .endif
- .else
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- 	${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-diff -ur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
---- share.orig/mk/bsd.prog.mk	Thu Apr  7 12:01:25 2005
-+++ share/mk/bsd.prog.mk	Thu Apr  7 12:00:55 2005
-@@ -126,9 +126,11 @@
- _proginstall:
- .if defined(PROG)
- .if defined(PROGNAME)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
- .endif
-@@ -156,6 +158,7 @@
- SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-diff -ur share.orig/mk/sys.mk share/mk/sys.mk
---- share.orig/mk/sys.mk	Thu Apr  7 12:01:25 2005
-+++ share/mk/sys.mk	Thu Apr  7 12:02:06 2005
-@@ -37,7 +37,7 @@
- CFLAGS		?=	-O
- .else
- CC		?=	cc
--CFLAGS		?=	-O -pipe
-+CFLAGS		+=	-pipe
- .endif
- 
- CXX		?=	c++
-@@ -258,12 +258,6 @@
- 	${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c
- 	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
- 	rm -f ${.PREFIX}.tmp.c
--
--# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
- 
- # Default executable format
- # XXX hint for bsd.port.mk
diff --git a/sys-freebsd/freebsd-mk-defs/files/sys.patch b/sys-freebsd/freebsd-mk-defs/files/sys.patch
deleted file mode 100644
index 051d7c40eed4..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/sys.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- sys.mk.orig	Wed Oct 20 15:05:43 2004
-+++ sys.mk	Wed Oct 20 16:45:42 2004
-@@ -253,17 +253,17 @@
- 
- .endif
- 
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
-+#__MAKE_CONF?=/etc/make.conf
-+#.if exists(${__MAKE_CONF})
-+#.include "${__MAKE_CONF}"
-+#.endif
- 
- .include <bsd.cpu.mk>
- 
--.if exists(/etc/make.conf.local)
--.error Error, /etc/make.conf.local should be renamed to /etc/make.conf.
--.include </etc/make.conf.local>
--.endif
-+#.if exists(/etc/make.conf.local)
-+#.error Error, /etc/make.conf.local should be renamed to /etc/make.conf.
-+#.include </etc/make.conf.local>
-+#.endif
- 
- # Default executable format
- # XXX hint for bsd.port.mk
diff --git a/sys-freebsd/freebsd-pam-modules/ChangeLog b/sys-freebsd/freebsd-pam-modules/ChangeLog
index e6f1390def2c..7c24f59505ee 100644
--- a/sys-freebsd/freebsd-pam-modules/ChangeLog
+++ b/sys-freebsd/freebsd-pam-modules/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-pam-modules
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.2 2006/04/02 21:53:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freebsd-pam-modules-gentoo.patch:
+  Drop obsolete files.
 
 *freebsd-pam-modules-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-gentoo.patch
deleted file mode 100644
index a20a0f4c3cfc..000000000000
--- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur -x '*~' lib/libpam/modules/Makefile.inc lib/libpam.gentoo/modules/Makefile.inc
---- lib/libpam/modules/Makefile.inc	2005-02-13 08:23:13.000000000 +0100
-+++ lib/libpam.gentoo/modules/Makefile.inc	2005-06-04 20:48:26.560373440 +0200
-@@ -1,22 +1,12 @@
- # $FreeBSD: src/lib/libpam/modules/Makefile.inc,v 1.15.6.1 2005/02/13 07:23:13 obrien Exp $
- 
--PAMDIR=		${.CURDIR}/../../../../contrib/openpam
--
- NOINSTALLLIB=
- NOPROFILE=
- 
--CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
-+CFLAGS+= -I${.CURDIR}/../../libpam
- WARNS?=	4
- 
--# This is nasty.
--# For the static case, libpam.a depends on the modules.
--# For the dynamic case, the modules depend on libpam.so.N
--.if defined(_NO_LIBPAM_SO_YET)
--NOPIC=
--.else
- SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
--DPADD+=		${LIBPAM}
- LDADD+=		-lpam
--.endif
- 
- .include "../Makefile.inc"
diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 84ceaeef87d8..eac4fb8aca72 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.2 2006/04/02 21:55:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freebsd-sbin-fixmakefiles.patch, -files/freebsd-sbin-flex.patch:
+  Drop obsolete files.
 
 *freebsd-sbin-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-fixmakefiles.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-fixmakefiles.patch
deleted file mode 100644
index 9db78a735083..000000000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-fixmakefiles.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-Only in sbin: Makefile.orig
-diff -ur sbin.orig/atm/atm/Makefile sbin/atm/atm/Makefile
---- sbin.orig/atm/atm/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/atm/atm/Makefile	Thu Apr  7 20:28:33 2005
-@@ -34,7 +34,7 @@
- WARNS?=	6
- .endif
- 
--CFLAGS+= -I${.CURDIR}/../../../sys
-+CFLAGS+= -I/usr/src/sys
- 
- DPADD=	${LIBATM}
- LDADD=	-latm
-Only in sbin/atm/atm: Makefile.orig
-diff -ur sbin.orig/atm/fore_dnld/Makefile sbin/atm/fore_dnld/Makefile
---- sbin.orig/atm/fore_dnld/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/atm/fore_dnld/Makefile	Thu Apr  7 20:28:45 2005
-@@ -28,7 +28,7 @@
- SRCS=	fore_dnld.c pca200e.c
- 
- WARNS?=	6
--CFLAGS+= -I${.CURDIR}/../../../sys
-+CFLAGS+= -I/usr/src/sys
- 
- DPADD=	${LIBATM}
- LDADD=	-latm
-Only in sbin/atm/fore_dnld: Makefile.orig
-diff -ur sbin.orig/atm/ilmid/Makefile sbin/atm/ilmid/Makefile
---- sbin.orig/atm/ilmid/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/atm/ilmid/Makefile	Thu Apr  7 20:28:58 2005
-@@ -32,7 +32,7 @@
- WARNS?=	6
- .endif
- 
--CFLAGS+= -I${.CURDIR}/../../../sys
-+CFLAGS+= -I/usr/src/sys
- 
- DPADD=	${LIBATM}
- LDADD=	-latm
-Only in sbin/atm/ilmid: Makefile.orig
-diff -ur sbin.orig/bsdlabel/Makefile sbin/bsdlabel/Makefile
---- sbin.orig/bsdlabel/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/bsdlabel/Makefile	Thu Apr  7 20:29:09 2005
-@@ -1,7 +1,7 @@
- #	@(#)Makefile	8.2 (Berkeley) 3/17/94
- # $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.19 2004/01/11 09:11:10 nyan Exp $
- 
--.PATH: ${.CURDIR}/../../sys/geom
-+.PATH: /usr/src/sys/geom
- 
- PROG=	bsdlabel
- SRCS=	bsdlabel.c geom_bsd_enc.c
-Only in sbin/bsdlabel: Makefile.orig
-diff -ur sbin.orig/fdisk/Makefile sbin/fdisk/Makefile
---- sbin.orig/fdisk/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/fdisk/Makefile	Thu Apr  7 20:29:18 2005
-@@ -5,7 +5,7 @@
- WARNS?=	4
- MAN=	fdisk.8
- 
--.PATH:	${.CURDIR}/../../sys/geom
-+.PATH:	/usr/src/sys/geom
- 
- .include <bsd.prog.mk>
- 
-Only in sbin/fdisk: Makefile.orig
-diff -ur sbin.orig/fsck_ffs/Makefile sbin/fsck_ffs/Makefile
---- sbin.orig/fsck_ffs/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/fsck_ffs/Makefile	Thu Apr  7 20:29:34 2005
-@@ -11,6 +11,6 @@
- WARNS?=	2
- CFLAGS+= -I${.CURDIR}
- 
--.PATH:	${.CURDIR}/../../sys/ufs/ffs
-+.PATH:	/usr/src/sys/ufs/ffs
- 
- .include <bsd.prog.mk>
-Only in sbin/fsck_ffs: Makefile.orig
-diff -ur sbin.orig/fsdb/Makefile sbin/fsdb/Makefile
---- sbin.orig/fsdb/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/fsdb/Makefile	Thu Apr  7 20:29:44 2005
-@@ -11,6 +11,6 @@
- WARNS?= 0
- LDADD=	-ledit -ltermcap
- DPADD=	${LIBEDIT} ${LIBTERMCAP}
--.PATH:	${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
-+.PATH:	${.CURDIR}/../fsck_ffs /usr/src/sys/ufs/ffs
- 
- .include <bsd.prog.mk>
-Only in sbin/fsdb: Makefile.orig
-diff -ur sbin.orig/gbde/Makefile sbin/gbde/Makefile
---- sbin.orig/gbde/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/gbde/Makefile	Thu Apr  7 20:29:56 2005
-@@ -15,10 +15,10 @@
- WARNS?=	3
- .endif
- 
--CFLAGS+= -I${.CURDIR}/../../sys
--.PATH:	${.CURDIR}/../../sys/geom/bde \
--	${.CURDIR}/../../sys/crypto/rijndael \
--	${.CURDIR}/../../sys/crypto/sha2
-+CFLAGS+= -I/usr/src/sys
-+.PATH:	/usr/src/sys/geom/bde \
-+	/usr/src/sys/crypto/rijndael \
-+	/usr/src/sys/crypto/sha2
- 
- CLEANFILES+= template.c
- 
-Only in sbin/gbde: Makefile.orig
-diff -ur sbin.orig/gvinum/Makefile sbin/gvinum/Makefile
---- sbin.orig/gvinum/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/gvinum/Makefile	Thu Apr  7 20:30:05 2005
-@@ -4,11 +4,11 @@
- SRCS=	gvinum.c gvinum.h geom_vinum_share.c
- NOMAN=	# not yet
- 
--CFLAGS+=	-I${.CURDIR}/../../sys
-+CFLAGS+=	-I/usr/src/sys
- 
- DPADD=	${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
- LDADD=	-lreadline -ltermcap -ldevstat -lkvm -lgeom
- 
--.PATH: ${.CURDIR}/../../sys/geom/vinum
-+.PATH: /usr/src/sys/geom/vinum
- 
- .include <bsd.prog.mk>
-Only in sbin/gvinum: Makefile.orig
-diff -ur sbin.orig/ipf/Makefile sbin/ipf/Makefile
---- sbin.orig/ipf/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/ipf/Makefile	Thu Apr  7 20:30:20 2005
-@@ -6,9 +6,9 @@
- MAN=	ipf.4 ipf.5 ipf.8
- SRCS=	ipf.c parse.c opt.c facpri.c common.c
- CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
--CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
--CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
--CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
-+CFLAGS+=-I/usr/src/sys/contrib/ipfilter/netinet
-+CFLAGS+=-I/usr/src/sys/contrib/ipfilter
-+CFLAGS+=-I/usr/src/contrib/ipfilter
- WARNS?=	0
- 
- MAINTAINER=	darrenr@freebsd.org
-Only in sbin/ipf: Makefile.orig
-diff -ur sbin.orig/ipfs/Makefile sbin/ipfs/Makefile
---- sbin.orig/ipfs/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/ipfs/Makefile	Thu Apr  7 20:30:27 2005
-@@ -6,8 +6,8 @@
- MAN=	ipfs.8
- SRCS=	ipfs.c
- CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
--CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
--CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
-+CFLAGS+=-I/usr/src/sys/contrib/ipfilter/netinet
-+CFLAGS+=-I/usr/src/sys/contrib/ipfilter
- CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
- WARNS?=	0
- 
-Only in sbin/ipfs: Makefile.orig
-diff -ur sbin.orig/ipfstat/Makefile sbin/ipfstat/Makefile
---- sbin.orig/ipfstat/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/ipfstat/Makefile	Thu Apr  7 20:30:32 2005
-@@ -6,8 +6,8 @@
- MAN=	ipfstat.8
- SRCS=	fils.c parse.c opt.c kmem.c facpri.c common.c printstate.c
- CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP
--CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
--CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
-+CFLAGS+=-I/usr/src/sys/contrib/ipfilter/netinet
-+CFLAGS+=-I/usr/src/sys/contrib/ipfilter
- CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
- WARNS?=	0
- 
-Only in sbin/ipfstat: Makefile.orig
-diff -ur sbin.orig/ipmon/Makefile sbin/ipmon/Makefile
---- sbin.orig/ipmon/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/ipmon/Makefile	Thu Apr  7 20:30:46 2005
-@@ -7,7 +7,7 @@
- SRCS=	ipmon.c
- 
- CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DLOGFAC=LOG_SECURITY
--CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
-+CFLAGS+=-I/usr/src/sys/contrib/ipfilter
- CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
- WARNS?=	0
- 
-Only in sbin/ipmon: Makefile.orig
-diff -ur sbin.orig/ipnat/Makefile sbin/ipnat/Makefile
---- sbin.orig/ipnat/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/ipnat/Makefile	Thu Apr  7 20:30:55 2005
-@@ -7,8 +7,8 @@
- MLINKS=	ipnat.5 ipnat.conf.5
- SRCS=	ipnat.c kmem.c natparse.c common.c printnat.c
- CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
--CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
--CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
-+CFLAGS+=-I/usr/src/sys/contrib/ipfilter/netinet
-+CFLAGS+=-I/usr/src/sys/contrib/ipfilter
- CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
- WARNS?=	0
- 
-Only in sbin/ipnat: Makefile.orig
-diff -ur sbin.orig/sunlabel/Makefile sbin/sunlabel/Makefile
---- sbin.orig/sunlabel/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/sunlabel/Makefile	Thu Apr  7 20:31:02 2005
-@@ -1,6 +1,6 @@
- # $FreeBSD: src/sbin/sunlabel/Makefile,v 1.12 2004/02/01 13:09:26 ceri Exp $
- 
--.PATH: ${.CURDIR}/../../sys/geom
-+.PATH: /usr/src/sys/geom
- 
- PROG=	sunlabel
- SRCS=	sunlabel.c geom_sunlabel_enc.c
-Only in sbin/sunlabel: Makefile.orig
-diff -ur sbin.orig/vinum/Makefile sbin/vinum/Makefile
---- sbin.orig/vinum/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin/vinum/Makefile	Thu Apr  7 20:31:25 2005
-@@ -4,12 +4,12 @@
- SRCS=	v.c list.c vinumparser.c vinumutil.c vext.h commands.c
- MAN=	vinum.8
- 
--CFLAGS+=	-I${.CURDIR}/../../sys
-+CFLAGS+=	-I/usr/src/sys
- WARNS?=	0
- 
- DPADD=	${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM}
- LDADD=	-lreadline -ltermcap -ldevstat -lkvm
- 
--.PATH: ${.CURDIR}/../../sys/dev/vinum
-+.PATH: /usr/src/sys/dev/vinum
- 
- .include <bsd.prog.mk>
-Only in sbin/vinum: Makefile.orig
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-flex.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-flex.patch
deleted file mode 100644
index 4294146ee7fc..000000000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-flex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur sbin/devd/Makefile sbin-flex/devd/Makefile
---- sbin/devd/Makefile	2003-08-17 08:40:49 +0000
-+++ sbin-flex/devd/Makefile	2005-05-06 11:12:54 +0000
-@@ -8,7 +8,7 @@
- NOSHARED?=YES
- 
- DPADD=	${LIBL}
--LDADD=	-ll
-+LDADD=	-lfl
- 
- YFLAGS+=-v
- CFLAGS+=-I. -I${.CURDIR}
diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index c927828ed04f..fee769e2f7a2 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-share
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.2 2006/04/02 21:56:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freebsd-share-5.3-colldef-makefile_links.patch:
+  Drop obsolete files.
 
 *freebsd-share-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-colldef-makefile_links.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.3-colldef-makefile_links.patch
deleted file mode 100644
index 167358fe8c5d..000000000000
--- a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-colldef-makefile_links.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- colldef/Makefile.orig	Sat Feb  5 16:47:55 2005
-+++ colldef/Makefile	Sat Feb  5 16:48:21 2005
-@@ -106,42 +106,6 @@
- uk_UA.ISO8859-5.out:	map.ISO8859-5
- uk_UA.KOI8-U.out:       map.KOI8-U
- 
--afterinstall:
--.for locale in ${LOCALES}
--	${INSTALL} -m 644 -o ${BINOWN} -g ${BINGRP} \
--		${locale}.out ${LOCALEDIR}/${locale}/LC_COLLATE
--.endfor
--.for link in ${ASCIILINKS}
--	ln -fs ../la_LN.US-ASCII/LC_COLLATE \
--	       ${LOCALEDIR}/${link}/LC_COLLATE
--.endfor
--.for link in ${ZHLINKS}
--	ln -fs ../is_IS.ISO8859-1/LC_COLLATE \
--	       ${LOCALEDIR}/${link}/LC_COLLATE
--.endfor
--.for link in ${LATIN1LINKS}
--	ln -fs ../la_LN.ISO8859-1/LC_COLLATE \
--	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
--	ln -fs ../la_LN.ISO8859-15/LC_COLLATE \
--	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
--.endfor
--.for link in ${LATIN2LINKS}
--	ln -fs ../la_LN.ISO8859-2/LC_COLLATE \
--	       ${LOCALEDIR}/${link}.ISO8859-2/LC_COLLATE
--.endfor
--.for link in ${DELINKS}
--	ln -fs ../de_DE.ISO8859-1/LC_COLLATE \
--	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
--	ln -fs ../de_DE.ISO8859-15/LC_COLLATE \
--	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
--.endfor
--	ln -fs ../cs_CZ.ISO8859-2/LC_COLLATE \
--	       ${LOCALEDIR}/sk_SK.ISO8859-2/LC_COLLATE
--	ln -fs ../pt_PT.ISO8859-1/LC_COLLATE \
--		${LOCALEDIR}/pt_BR.ISO8859-1/LC_COLLATE
--.for link in ${UTF8LINKS}
--	ln -fs ../la_LN.US-ASCII/LC_COLLATE \
--	       ${LOCALEDIR}/${link}.UTF-8/LC_COLLATE
--.endfor
-+#afterinstall:
- 
- .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 1736cc73b560..77150b188ac3 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2006/04/02 21:56:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+
+  02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/SA-05-09-htt5.patch, -files/SA-05-13-ipfw.patch,
+  -files/SA-05-15-tcp.patch, -files/SA-05-17-devfs.patch,
+  -files/SA-05-19-ipsec.patch, -files/freebsd-sources-gentoo.patch:
+  Drop obsolete files.
 
 *freebsd-sources-6.0-r1 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-sources/files/SA-05-09-htt5.patch b/sys-freebsd/freebsd-sources/files/SA-05-09-htt5.patch
deleted file mode 100644
index 56d2e396f72f..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-05-09-htt5.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-Index: sys/amd64/amd64/mp_machdep.c
-===================================================================
-RCS file: /home/ncvs/src/sys/amd64/amd64/mp_machdep.c,v
-retrieving revision 1.242.2.10
-diff -u -p -r1.242.2.10 mp_machdep.c
---- sys/amd64/amd64/mp_machdep.c	1 May 2005 05:34:45 -0000	1.242.2.10
-+++ sys/amd64/amd64/mp_machdep.c	12 May 2005 15:22:54 -0000
-@@ -142,6 +142,9 @@ static int	start_ap(int apic_id);
- static void	release_aps(void *dummy);
- 
- static int	hlt_logical_cpus;
-+static u_int	hyperthreading_cpus;
-+static cpumask_t	hyperthreading_cpus_mask;
-+static int	hyperthreading_allowed;
- static struct	sysctl_ctx_list logical_cpu_clist;
- static u_int	bootMP_size;
- 
-@@ -301,6 +304,7 @@ void
- cpu_mp_start(void)
- {
- 	int i;
-+	u_int threads_per_cache, p[4];
- 
- 	/* Initialize the logical ID to APIC ID table. */
- 	for (i = 0; i < MAXCPU; i++) {
-@@ -340,6 +344,48 @@ cpu_mp_start(void)
- 	if (cpu_feature & CPUID_HTT)
- 		logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
- 
-+	/*
-+	 * Work out if hyperthreading is *really* enabled.  This
-+	 * is made really ugly by the fact that processors lie: Dual
-+	 * core processors claim to be hyperthreaded even when they're
-+	 * not, presumably because they want to be treated the same
-+	 * way as HTT with respect to per-cpu software licensing.
-+	 * At the time of writing (May 12, 2005) the only hyperthreaded
-+	 * cpus are from Intel, and Intel's dual-core processors can be
-+	 * identified via the "deterministic cache parameters" cpuid
-+	 * calls.
-+	 */
-+	/*
-+	 * First determine if this is an Intel processor which claims
-+	 * to have hyperthreading support.
-+	 */
-+	if ((cpu_feature & CPUID_HTT) &&
-+	    (strcmp(cpu_vendor, "GenuineIntel") == 0)) {
-+		/*
-+		 * If the "deterministic cache parameters" cpuid calls
-+		 * are available, use them.
-+		 */
-+		if (cpu_high >= 4) {
-+			/* Ask the processor about up to 32 caches. */
-+			for (i = 0; i < 32; i++) {
-+				cpuid_count(4, i, p);
-+				threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1;
-+				if (hyperthreading_cpus < threads_per_cache)
-+					hyperthreading_cpus = threads_per_cache;
-+				if ((p[0] & 0x1f) == 0)
-+					break;
-+			}
-+		}
-+
-+		/*
-+		 * If the deterministic cache parameters are not
-+		 * available, or if no caches were reported to exist,
-+		 * just accept what the HTT flag indicated.
-+		 */
-+		if (hyperthreading_cpus == 0)
-+			hyperthreading_cpus = logical_cpus;
-+	}
-+
- 	set_logical_apic_ids();
- }
- 
-@@ -474,6 +520,11 @@ init_secondary(void)
- 	if (logical_cpus > 1 && PCPU_GET(apic_id) % logical_cpus != 0)
- 		logical_cpus_mask |= PCPU_GET(cpumask);
- 	
-+	/* Determine if we are a hyperthread. */
-+	if (hyperthreading_cpus > 1 &&
-+	    PCPU_GET(apic_id) % hyperthreading_cpus != 0)
-+		hyperthreading_cpus_mask |= PCPU_GET(cpumask);
-+
- 	/* Build our map of 'other' CPUs. */
- 	PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
- 
-@@ -1148,6 +1199,9 @@ sysctl_hlt_cpus(SYSCTL_HANDLER_ARGS)
- 	else
- 		hlt_logical_cpus = 0;
- 
-+	if (! hyperthreading_allowed)
-+		mask |= hyperthreading_cpus_mask;
-+
- 	if ((mask & all_cpus) == all_cpus)
- 		mask &= ~(1<<0);
- 	hlt_cpus_mask = mask;
-@@ -1172,6 +1226,9 @@ sysctl_hlt_logical_cpus(SYSCTL_HANDLER_A
- 	else
- 		hlt_cpus_mask &= ~logical_cpus_mask;
- 
-+	if (! hyperthreading_allowed)
-+		hlt_cpus_mask |= hyperthreading_cpus_mask;
-+
- 	if ((hlt_cpus_mask & all_cpus) == all_cpus)
- 		hlt_cpus_mask &= ~(1<<0);
- 
-@@ -1179,6 +1236,34 @@ sysctl_hlt_logical_cpus(SYSCTL_HANDLER_A
- 	return (error);
- }
- 
-+static int
-+sysctl_hyperthreading_allowed(SYSCTL_HANDLER_ARGS)
-+{
-+	int allowed, error;
-+
-+	allowed = hyperthreading_allowed;
-+	error = sysctl_handle_int(oidp, &allowed, 0, req);
-+	if (error || !req->newptr)
-+		return (error);
-+
-+	if (allowed)
-+		hlt_cpus_mask &= ~hyperthreading_cpus_mask;
-+	else
-+		hlt_cpus_mask |= hyperthreading_cpus_mask;
-+
-+	if (logical_cpus_mask != 0 &&
-+	    (hlt_cpus_mask & logical_cpus_mask) == logical_cpus_mask)
-+		hlt_logical_cpus = 1;
-+	else
-+		hlt_logical_cpus = 0;
-+
-+	if ((hlt_cpus_mask & all_cpus) == all_cpus)
-+		hlt_cpus_mask &= ~(1<<0);
-+
-+	hyperthreading_allowed = allowed;
-+	return (error);
-+}
-+
- static void
- cpu_hlt_setup(void *dummy __unused)
- {
-@@ -1198,6 +1283,22 @@ cpu_hlt_setup(void *dummy __unused)
- 
- 		if (hlt_logical_cpus)
- 			hlt_cpus_mask |= logical_cpus_mask;
-+
-+		/*
-+		 * If necessary for security purposes, force
-+		 * hyperthreading off, regardless of the value
-+		 * of hlt_logical_cpus.
-+		 */
-+		if (hyperthreading_cpus_mask) {
-+			TUNABLE_INT_FETCH("machdep.hyperthreading_allowed",
-+			    &hyperthreading_allowed);
-+			SYSCTL_ADD_PROC(&logical_cpu_clist,
-+			    SYSCTL_STATIC_CHILDREN(_machdep), OID_AUTO,
-+			    "hyperthreading_allowed", CTLTYPE_INT|CTLFLAG_RW,
-+			    0, 0, sysctl_hyperthreading_allowed, "IU", "");
-+			if (! hyperthreading_allowed)
-+				hlt_cpus_mask |= hyperthreading_cpus_mask;
-+		}
- 	}
- }
- SYSINIT(cpu_hlt, SI_SUB_SMP, SI_ORDER_ANY, cpu_hlt_setup, NULL);
-Index: sys/amd64/include/cpufunc.h
-===================================================================
-RCS file: /home/ncvs/src/sys/amd64/include/cpufunc.h,v
-retrieving revision 1.145
-diff -u -p -r1.145 cpufunc.h
---- sys/amd64/include/cpufunc.h	30 Jul 2004 16:44:29 -0000	1.145
-+++ sys/amd64/include/cpufunc.h	12 May 2005 15:22:55 -0000
-@@ -110,6 +110,14 @@ do_cpuid(u_int ax, u_int *p)
- }
- 
- static __inline void
-+cpuid_count(u_int ax, u_int cx, u_int *p)
-+{
-+	__asm __volatile("cpuid"
-+			 : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
-+			 :  "0" (ax), "c" (cx));
-+}
-+
-+static __inline void
- enable_intr(void)
- {
- 	__asm __volatile("sti");
-Index: sys/i386/i386/mp_machdep.c
-===================================================================
-RCS file: /home/ncvs/src/sys/i386/i386/mp_machdep.c,v
-retrieving revision 1.235.2.9
-diff -u -p -r1.235.2.9 mp_machdep.c
---- sys/i386/i386/mp_machdep.c	1 May 2005 05:34:46 -0000	1.235.2.9
-+++ sys/i386/i386/mp_machdep.c	12 May 2005 15:22:55 -0000
-@@ -217,6 +217,9 @@ static int	start_ap(int apic_id);
- static void	release_aps(void *dummy);
- 
- static int	hlt_logical_cpus;
-+static u_int	hyperthreading_cpus;
-+static cpumask_t	hyperthreading_cpus_mask;
-+static int	hyperthreading_allowed;
- static struct	sysctl_ctx_list logical_cpu_clist;
- 
- static void
-@@ -353,6 +356,7 @@ void
- cpu_mp_start(void)
- {
- 	int i;
-+	u_int threads_per_cache, p[4];
- 
- 	POSTCODE(MP_START_POST);
- 
-@@ -404,6 +408,48 @@ cpu_mp_start(void)
- 	if (cpu_feature & CPUID_HTT)
- 		logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
- 
-+	/*
-+	 * Work out if hyperthreading is *really* enabled.  This
-+	 * is made really ugly by the fact that processors lie: Dual
-+	 * core processors claim to be hyperthreaded even when they're
-+	 * not, presumably because they want to be treated the same
-+	 * way as HTT with respect to per-cpu software licensing.
-+	 * At the time of writing (May 12, 2005) the only hyperthreaded
-+	 * cpus are from Intel, and Intel's dual-core processors can be
-+	 * identified via the "deterministic cache parameters" cpuid
-+	 * calls.
-+	 */
-+	/*
-+	 * First determine if this is an Intel processor which claims
-+	 * to have hyperthreading support.
-+	 */
-+	if ((cpu_feature & CPUID_HTT) &&
-+	    (strcmp(cpu_vendor, "GenuineIntel") == 0)) {
-+		/*
-+		 * If the "deterministic cache parameters" cpuid calls
-+		 * are available, use them.
-+		 */
-+		if (cpu_high >= 4) {
-+			/* Ask the processor about up to 32 caches. */
-+			for (i = 0; i < 32; i++) {
-+				cpuid_count(4, i, p);
-+				threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1;
-+				if (hyperthreading_cpus < threads_per_cache)
-+					hyperthreading_cpus = threads_per_cache;
-+				if ((p[0] & 0x1f) == 0)
-+					break;
-+			}
-+		}
-+
-+		/*
-+		 * If the deterministic cache parameters are not
-+		 * available, or if no caches were reported to exist,
-+		 * just accept what the HTT flag indicated.
-+		 */
-+		if (hyperthreading_cpus == 0)
-+			hyperthreading_cpus = logical_cpus;
-+	}
-+
- 	set_logical_apic_ids();
- }
- 
-@@ -539,6 +585,11 @@ init_secondary(void)
- 	if (logical_cpus > 1 && PCPU_GET(apic_id) % logical_cpus != 0)
- 		logical_cpus_mask |= PCPU_GET(cpumask);
- 	
-+	/* Determine if we are a hyperthread. */
-+	if (hyperthreading_cpus > 1 &&
-+	    PCPU_GET(apic_id) % hyperthreading_cpus != 0)
-+		hyperthreading_cpus_mask |= PCPU_GET(cpumask);
-+
- 	/* Build our map of 'other' CPUs. */
- 	PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
- 
-@@ -1368,6 +1419,9 @@ sysctl_hlt_cpus(SYSCTL_HANDLER_ARGS)
- 	else
- 		hlt_logical_cpus = 0;
- 
-+	if (! hyperthreading_allowed)
-+		mask |= hyperthreading_cpus_mask;
-+
- 	if ((mask & all_cpus) == all_cpus)
- 		mask &= ~(1<<0);
- 	hlt_cpus_mask = mask;
-@@ -1392,6 +1446,9 @@ sysctl_hlt_logical_cpus(SYSCTL_HANDLER_A
- 	else
- 		hlt_cpus_mask &= ~logical_cpus_mask;
- 
-+	if (! hyperthreading_allowed)
-+		hlt_cpus_mask |= hyperthreading_cpus_mask;
-+
- 	if ((hlt_cpus_mask & all_cpus) == all_cpus)
- 		hlt_cpus_mask &= ~(1<<0);
- 
-@@ -1399,6 +1456,34 @@ sysctl_hlt_logical_cpus(SYSCTL_HANDLER_A
- 	return (error);
- }
- 
-+static int
-+sysctl_hyperthreading_allowed(SYSCTL_HANDLER_ARGS)
-+{
-+	int allowed, error;
-+
-+	allowed = hyperthreading_allowed;
-+	error = sysctl_handle_int(oidp, &allowed, 0, req);
-+	if (error || !req->newptr)
-+		return (error);
-+
-+	if (allowed)
-+		hlt_cpus_mask &= ~hyperthreading_cpus_mask;
-+	else
-+		hlt_cpus_mask |= hyperthreading_cpus_mask;
-+
-+	if (logical_cpus_mask != 0 &&
-+	    (hlt_cpus_mask & logical_cpus_mask) == logical_cpus_mask)
-+		hlt_logical_cpus = 1;
-+	else
-+		hlt_logical_cpus = 0;
-+
-+	if ((hlt_cpus_mask & all_cpus) == all_cpus)
-+		hlt_cpus_mask &= ~(1<<0);
-+
-+	hyperthreading_allowed = allowed;
-+	return (error);
-+}
-+
- static void
- cpu_hlt_setup(void *dummy __unused)
- {
-@@ -1418,6 +1503,22 @@ cpu_hlt_setup(void *dummy __unused)
- 
- 		if (hlt_logical_cpus)
- 			hlt_cpus_mask |= logical_cpus_mask;
-+
-+		/*
-+		 * If necessary for security purposes, force
-+		 * hyperthreading off, regardless of the value
-+		 * of hlt_logical_cpus.
-+		 */
-+		if (hyperthreading_cpus_mask) {
-+			TUNABLE_INT_FETCH("machdep.hyperthreading_allowed",
-+			    &hyperthreading_allowed);
-+			SYSCTL_ADD_PROC(&logical_cpu_clist,
-+			    SYSCTL_STATIC_CHILDREN(_machdep), OID_AUTO,
-+			    "hyperthreading_allowed", CTLTYPE_INT|CTLFLAG_RW,
-+			    0, 0, sysctl_hyperthreading_allowed, "IU", "");
-+			if (! hyperthreading_allowed)
-+				hlt_cpus_mask |= hyperthreading_cpus_mask;
-+		}
- 	}
- }
- SYSINIT(cpu_hlt, SI_SUB_SMP, SI_ORDER_ANY, cpu_hlt_setup, NULL);
-Index: sys/i386/include/cpufunc.h
-===================================================================
-RCS file: /home/ncvs/src/sys/i386/include/cpufunc.h,v
-retrieving revision 1.142
-diff -u -p -r1.142 cpufunc.h
---- sys/i386/include/cpufunc.h	7 Apr 2004 20:46:05 -0000	1.142
-+++ sys/i386/include/cpufunc.h	12 May 2005 15:22:55 -0000
-@@ -89,6 +89,14 @@ do_cpuid(u_int ax, u_int *p)
- }
- 
- static __inline void
-+cpuid_count(u_int ax, u_int cx, u_int *p)
-+{
-+	__asm __volatile("cpuid"
-+			 : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
-+			 :  "0" (ax), "c" (cx));
-+}
-+
-+static __inline void
- enable_intr(void)
- {
- 	__asm __volatile("sti");
diff --git a/sys-freebsd/freebsd-sources/files/SA-05-13-ipfw.patch b/sys-freebsd/freebsd-sources/files/SA-05-13-ipfw.patch
deleted file mode 100644
index 7fed8e6902cf..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-05-13-ipfw.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: sys/netinet/ip_fw2.c
-===================================================================
-RCS file: /home/ncvs/src/sys/netinet/ip_fw2.c,v
-retrieving revision 1.70.2.13
-diff -u -d -r1.70.2.13 ip_fw2.c
---- sys/netinet/ip_fw2.c	17 Jun 2005 23:56:59 -0000	1.70.2.13
-+++ sys/netinet/ip_fw2.c	20 Jun 2005 21:31:56 -0000
-@@ -185,9 +185,12 @@
- };
- 
- #define	IPFW_TABLES_MAX		128
--static struct {
-+static struct ip_fw_table {
- 	struct radix_node_head	*rnh;
- 	int			modified;
-+	in_addr_t		last_addr;
-+	int			last_match;
-+	u_int32_t		last_value;
- } ipfw_tables[IPFW_TABLES_MAX];
- 
- static int fw_debug = 1;
-@@ -1491,36 +1494,36 @@
- lookup_table(u_int16_t tbl, in_addr_t addr, u_int32_t *val)
- {
- 	struct radix_node_head *rnh;
-+	struct ip_fw_table *table;
- 	struct table_entry *ent;
- 	struct sockaddr_in sa;
--	static in_addr_t last_addr;
--	static int last_tbl;
--	static int last_match;
--	static u_int32_t last_value;
-+	int last_match;
- 
- 	if (tbl >= IPFW_TABLES_MAX)
- 		return (0);
--	if (tbl == last_tbl && addr == last_addr &&
--	    !ipfw_tables[tbl].modified) {
-+	table = &ipfw_tables[tbl];
-+	rnh = table->rnh;
-+	RADIX_NODE_HEAD_LOCK(rnh);
-+	if (addr == table->last_addr && !table->modified) {
-+		last_match = table->last_match;
- 		if (last_match)
--			*val = last_value;
-+			*val = table->last_value;
-+		RADIX_NODE_HEAD_UNLOCK(rnh);
- 		return (last_match);
- 	}
--	rnh = ipfw_tables[tbl].rnh;
-+	table->modified = 0;
- 	sa.sin_len = 8;
- 	sa.sin_addr.s_addr = addr;
--	RADIX_NODE_HEAD_LOCK(rnh);
--	ipfw_tables[tbl].modified = 0;
- 	ent = (struct table_entry *)(rnh->rnh_lookup(&sa, NULL, rnh));
--	RADIX_NODE_HEAD_UNLOCK(rnh);
--	last_addr = addr;
--	last_tbl = tbl;
-+	table->last_addr = addr;
- 	if (ent != NULL) {
--		last_value = *val = ent->value;
--		last_match = 1;
-+		table->last_value = *val = ent->value;
-+		table->last_match = 1;
-+		RADIX_NODE_HEAD_UNLOCK(rnh);
- 		return (1);
- 	}
--	last_match = 0;
-+	table->last_match = 0;
-+	RADIX_NODE_HEAD_UNLOCK(rnh);
- 	return (0);
- }
- 
diff --git a/sys-freebsd/freebsd-sources/files/SA-05-15-tcp.patch b/sys-freebsd/freebsd-sources/files/SA-05-15-tcp.patch
deleted file mode 100644
index 31e14fb8fcbd..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-05-15-tcp.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- sys/netinet/tcp_input.c	27 Feb 2005 21:43:54 -0000	1.252.2.14
-+++ sys/netinet/tcp_input.c	28 Jun 2005 20:53:10 -0000
-@@ -1081,7 +1081,7 @@
- 	 * XXX this is traditional behavior, may need to be cleaned up.
- 	 */
- 	tcp_dooptions(tp, &to, optp, optlen, thflags & TH_SYN, th);
--	if (thflags & TH_SYN) {
-+	if (tp->t_state == TCPS_SYN_SENT && (thflags & TH_SYN)) {
- 		if (to.to_flags & TOF_SCALE) {
- 			tp->t_flags |= TF_RCVD_SCALE;
- 			tp->requested_s_scale = to.to_requested_s_scale;
-@@ -1816,11 +1816,25 @@
- 	/*
- 	 * If last ACK falls within this segment's sequence numbers,
- 	 * record its timestamp.
--	 * NOTE that the test is modified according to the latest
--	 * proposal of the tcplw@cray.com list (Braden 1993/04/26).
-+	 * NOTE: 
-+	 * 1) That the test incorporates suggestions from the latest
-+	 *    proposal of the tcplw@cray.com list (Braden 1993/04/26).
-+	 * 2) That updating only on newer timestamps interferes with
-+	 *    our earlier PAWS tests, so this check should be solely
-+	 *    predicated on the sequence space of this segment.
-+	 * 3) That we modify the segment boundary check to be 
-+	 *        Last.ACK.Sent <= SEG.SEQ + SEG.Len  
-+	 *    instead of RFC1323's
-+	 *        Last.ACK.Sent < SEG.SEQ + SEG.Len,
-+	 *    This modified check allows us to overcome RFC1323's
-+	 *    limitations as described in Stevens TCP/IP Illustrated
-+	 *    Vol. 2 p.869. In such cases, we can still calculate the
-+	 *    RTT correctly when RCV.NXT == Last.ACK.Sent.
- 	 */
- 	if ((to.to_flags & TOF_TS) != 0 &&
--	    SEQ_LEQ(th->th_seq, tp->last_ack_sent)) {
-+	    SEQ_LEQ(th->th_seq, tp->last_ack_sent) &&
-+	    SEQ_LEQ(tp->last_ack_sent, th->th_seq + tlen +
-+		((thflags & (TH_SYN|TH_FIN)) != 0))) {
- 		tp->ts_recent_age = ticks;
- 		tp->ts_recent = to.to_tsval;
- 	}
-@@ -2685,6 +2699,12 @@
- 			bcopy((char *)cp + 6,
- 			    (char *)&to->to_tsecr, sizeof(to->to_tsecr));
- 			to->to_tsecr = ntohl(to->to_tsecr);
-+			/*
-+			 * If echoed timestamp is later than the current time,
-+			 * fall back to non RFC1323 RTT calculation.
-+			 */
-+			if ((to->to_tsecr != 0) && TSTMP_GT(to->to_tsecr, ticks))
-+				to->to_tsecr = 0;
- 			break;
- 		case TCPOPT_CC:
- 			if (optlen != TCPOLEN_CC)
---- sys/netinet/tcp_seq.h	31 Jan 2005 23:26:36 -0000	1.22.2.1
-+++ sys/netinet/tcp_seq.h	29 Jun 2005 08:59:23 -0000
-@@ -47,6 +47,7 @@
- 
- /* for modulo comparisons of timestamps */
- #define TSTMP_LT(a,b)	((int)((a)-(b)) < 0)
-+#define TSTMP_GT(a,b)	((int)((a)-(b)) > 0)
- #define TSTMP_GEQ(a,b)	((int)((a)-(b)) >= 0)
- 
- /*
diff --git a/sys-freebsd/freebsd-sources/files/SA-05-17-devfs.patch b/sys-freebsd/freebsd-sources/files/SA-05-17-devfs.patch
deleted file mode 100644
index 5192875d3477..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-05-17-devfs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: sys/fs/devfs/devfs_vnops.c
-===================================================================
-RCS file: /home/ncvs/src/sys/fs/devfs/devfs_vnops.c,v
-retrieving revision 1.115
-diff -u -d -r1.115 devfs_vnops.c
---- sys/fs/devfs/devfs_vnops.c	14 Jul 2005 10:22:09 -0000	1.115
-+++ sys/fs/devfs/devfs_vnops.c	18 Jul 2005 18:51:41 -0000
-@@ -788,6 +788,12 @@
- 	struct devfs_mount *dmp;
- 	int error;
- 
-+	/*
-+	 * The only type of node we should be creating here is a
-+	 * character device, for anything else return EOPNOTSUPP.
-+	 */
-+	if (ap->a_vap->va_type != VCHR)
-+		return (EOPNOTSUPP);
- 	dvp = ap->a_dvp;
- 	dmp = VFSTODEVFS(dvp->v_mount);
- 	lockmgr(&dmp->dm_lock, LK_EXCLUSIVE, 0, curthread);
diff --git a/sys-freebsd/freebsd-sources/files/SA-05-19-ipsec.patch b/sys-freebsd/freebsd-sources/files/SA-05-19-ipsec.patch
deleted file mode 100644
index b2bd10c9848d..000000000000
--- a/sys-freebsd/freebsd-sources/files/SA-05-19-ipsec.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: sys/netinet6/ah_aesxcbcmac.c
-===================================================================
-RCS file: /home/ncvs/src/sys/netinet6/ah_aesxcbcmac.c,v
-retrieving revision 1.2
-diff -u -p -r1.2 ah_aesxcbcmac.c
---- sys/netinet6/ah_aesxcbcmac.c	7 Jan 2005 02:30:34 -0000	1.2
-+++ sys/netinet6/ah_aesxcbcmac.c	26 Jul 2005 06:51:39 -0000
-@@ -78,6 +78,7 @@ ah_aes_xcbc_mac_init(state, sav)
- 	u_int8_t k3seed[AES_BLOCKSIZE] = { 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3 };
- 	u_int32_t r_ks[(RIJNDAEL_MAXNR+1)*4];
- 	aesxcbc_ctx *ctx;
-+	u_int8_t k1[AES_BLOCKSIZE];
- 
- 	if (!state)
- 		panic("ah_aes_xcbc_mac_init: what?");
-@@ -93,14 +94,15 @@ ah_aes_xcbc_mac_init(state, sav)
- 	if ((ctx->r_nr = rijndaelKeySetupEnc(r_ks,
- 	    (char *)_KEYBUF(sav->key_auth), AES_BLOCKSIZE * 8)) == 0)
- 		return -1;
--	if (rijndaelKeySetupEnc(ctx->r_k1s, k1seed, AES_BLOCKSIZE * 8) == 0)
-+	rijndaelEncrypt(r_ks, ctx->r_nr, k1seed, k1);
-+	rijndaelEncrypt(r_ks, ctx->r_nr, k2seed, ctx->k2);
-+	rijndaelEncrypt(r_ks, ctx->r_nr, k3seed, ctx->k3);
-+	if (rijndaelKeySetupEnc(ctx->r_k1s, k1, AES_BLOCKSIZE * 8) == 0)
- 		return -1;
--	if (rijndaelKeySetupEnc(ctx->r_k2s, k2seed, AES_BLOCKSIZE * 8) == 0)
-+	if (rijndaelKeySetupEnc(ctx->r_k2s, ctx->k2, AES_BLOCKSIZE * 8) == 0)
- 		return -1;
--	if (rijndaelKeySetupEnc(ctx->r_k3s, k3seed, AES_BLOCKSIZE * 8) == 0)
-+	if (rijndaelKeySetupEnc(ctx->r_k3s, ctx->k3, AES_BLOCKSIZE * 8) == 0)
- 		return -1;
--	rijndaelEncrypt(r_ks, ctx->r_nr, k2seed, ctx->k2);
--	rijndaelEncrypt(r_ks, ctx->r_nr, k3seed, ctx->k3);
- 
- 	return 0;
- }
-@@ -151,8 +153,8 @@ ah_aes_xcbc_mac_loop(state, addr, len)
- 		addr += AES_BLOCKSIZE;
- 	}
- 	if (addr < ep) {
--		bcopy(addr, ctx->buf, ep - addr);
--		ctx->buflen = ep - addr;
-+		bcopy(addr, ctx->buf + ctx->buflen, ep - addr);
-+		ctx->buflen += ep - addr;
- 	}
- }
- 
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch
deleted file mode 100644
index b2ea95cb02ad..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur sys/conf/kern.mk sys-gentoo/conf/kern.mk
---- sys/conf/kern.mk	2005-03-16 18:54:36 +0000
-+++ sys-gentoo/conf/kern.mk	2005-07-21 11:08:39 +0000
-@@ -12,7 +12,7 @@
- .else
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-fformat-extensions -std=c99
-+		-std=c99
- .endif
- #
- # The following flags are next up for working on:
-@@ -28,7 +28,7 @@
- # cache tag lines)
- #
- .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2 \
-+CFLAGS+=	-mpreferred-stack-boundary=2 \
- 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2
- INLINE_LIMIT?=	8000
- .endif
-Only in sys-gentoo/conf: kern.mk.orig
-diff -ur sys/conf/kern.pre.mk sys-gentoo/conf/kern.pre.mk
---- sys/conf/kern.pre.mk	2005-03-16 17:51:56 +0000
-+++ sys-gentoo/conf/kern.pre.mk	2005-07-21 11:08:20 +0000
-@@ -72,7 +72,8 @@
- CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
- CFLAGS+= --param inline-unit-growth=100
- CFLAGS+= --param large-function-growth=1000
--WERROR?= -Werror
-+# Gentoo's GCC outputs a few more warnings
-+#WERROR?= -Werror
- .endif
- 
- # XXX LOCORE means "don't declare C stuff" not "for locore.s".
-Only in sys-gentoo/conf: kern.pre.mk.orig
-diff -ur sys/dev/aic7xxx/aicasm/Makefile sys-gentoo/dev/aic7xxx/aicasm/Makefile
---- sys/dev/aic7xxx/aicasm/Makefile	2005-02-13 07:23:32 +0000
-+++ sys-gentoo/dev/aic7xxx/aicasm/Makefile	2005-07-21 11:08:20 +0000
-@@ -14,7 +14,7 @@
- SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD=	${LIBL}
--LDADD=	-ll
-+LDADD=	-lfl
- 
- # Correct path for kernel builds
- # Don't rely on the kernel's .depend file
-Only in sys-gentoo/dev/aic7xxx/aicasm: Makefile.orig