Import sys-freebsd into main portage.

Package-Manager: portage-2.1_pre7-r3

9 files changed, 226 insertions, 0 deletions

diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.0 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.0
new file mode 100644
index 000000000000..0f858e744035
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.0
@@ -0,0 +1,18 @@
+MD5 b5b626909c9707d0bab0c54b50e132b9 freebsd-contrib-6.0.tar.bz2 34972594
+RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b freebsd-contrib-6.0.tar.bz2 34972594
+SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 freebsd-contrib-6.0.tar.bz2 34972594
+MD5 3f5ace196589dee4044fd717abf4b57c freebsd-crypto-6.0.tar.bz2 3978650
+RMD160 361efbba1f651925a7cc2284665b044bc232f181 freebsd-crypto-6.0.tar.bz2 3978650
+SHA256 e86223d40ef2747de98f575f3875a6ce8a5e913baa850a5ef547ffef00ace480 freebsd-crypto-6.0.tar.bz2 3978650
+MD5 7c2af3af5be2f46372f9cc0efaeda4c7 freebsd-etc-6.0.tar.bz2 178941
+RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 freebsd-etc-6.0.tar.bz2 178941
+SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 freebsd-etc-6.0.tar.bz2 178941
+MD5 3888da5da1cb329a65a3ac9d316f99ea freebsd-lib-6.0.tar.bz2 2613087
+RMD160 30bf04438a00408284f135c2670106141cae4873 freebsd-lib-6.0.tar.bz2 2613087
+SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 freebsd-lib-6.0.tar.bz2 2613087
+MD5 44996c2edac20108da43add45b599d94 freebsd-libexec-6.0.tar.bz2 277631
+RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 freebsd-libexec-6.0.tar.bz2 277631
+SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e freebsd-libexec-6.0.tar.bz2 277631
+MD5 df8c3764da190437a1d47c6ff1872520 freebsd-usbin-6.0.tar.bz2 2635411
+RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d freebsd-usbin-6.0.tar.bz2 2635411
+SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 freebsd-usbin-6.0.tar.bz2 2635411
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
new file mode 100644
index 000000000000..00de8a6debb8
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
@@ -0,0 +1,13 @@
+Index: fbsd-6/lib/libipsec/policy_token.l
+===================================================================
+--- fbsd-6.orig/lib/libipsec/policy_token.l
++++ fbsd-6/lib/libipsec/policy_token.l
+@@ -138,8 +138,6 @@ void
+ __policy__strbuffer__init__(msg)
+ 	char *msg;
+ {
+-	if (yy_current_buffer)
+-		yy_delete_buffer(yy_current_buffer);
+ 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
+ 	yy_switch_to_buffer(strbuffer);
+ 
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
new file mode 100644
index 000000000000..a3e7d5e1b63c
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
@@ -0,0 +1,16 @@
+This patch is needed to avoid inclusion of GCC's float.h that defines
+LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
+
+Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
+===================================================================
+--- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
++++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
+@@ -28,7 +28,7 @@
+ __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
+ 
+ #include <fenv.h>
+-#include <float.h>
++#include <machine/float.h>
+ #include <math.h>
+ 
+ /*
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
new file mode 100644
index 000000000000..2f6de4652822
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
@@ -0,0 +1,13 @@
+Index: freebsd-6.0_beta4/lib/libpmc/Makefile
+===================================================================
+--- freebsd-6.0_beta4.orig/lib/libpmc/Makefile
++++ freebsd-6.0_beta4/lib/libpmc/Makefile
+@@ -9,6 +9,8 @@ WARNS?=	6
+ 
+ MAN=	pmc.3 pmclog.3
+ 
++CFLAGS+= -I${.CURDIR}
++
+ MLINKS+= \
+ 	pmc.3 pmc_allocate.3 \
+ 	pmc.3 pmc_attach.3 \
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
new file mode 100644
index 000000000000..ec90defc03a0
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
@@ -0,0 +1,13 @@
+diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile
+--- lib/libgeom/Makefile	2004-03-07 16:07:57 +0000
++++ lib.xml/libgeom/Makefile	2005-05-06 10:38:41 +0000
+@@ -8,7 +8,8 @@
+ SRCS+=	geom_ctl.c
+ INCS=	libgeom.h
+ 
+-CFLAGS += -I${.CURDIR}
++CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat
++LDFLAGS += -L${.CURDIR}/../libexpat
+ 
+ WARNS?=	3
+ 
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-fixmakefiles.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-fixmakefiles.patch
new file mode 100644
index 000000000000..1254fb3f7f14
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-fixmakefiles.patch
@@ -0,0 +1,119 @@
+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-fixmp.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-fixmp.patch
new file mode 100644
index 000000000000..80a4b6adc0d2
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-fixmp.patch
@@ -0,0 +1,12 @@
+diff -ur lib/libtelnet/Makefile lib-fixmp/libtelnet/Makefile
+--- lib/libtelnet/Makefile	2005-02-13 07:23:14 +0000
++++ lib-fixmp/libtelnet/Makefile	2005-05-26 06:32:26 +0000
+@@ -16,7 +16,7 @@
+ .if !defined(RELEASE_CRUNCH)
+ .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+ SRCS+=		encrypt.c auth.c enc_des.c sra.c pk.c
+-CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA
++CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA -I${.CURDIR}/../libmp
+ .if !defined(NO_KERBEROS)
+ SRCS+=		kerberos5.c
+ CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-msun-fenvc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-msun-fenvc.patch
new file mode 100644
index 000000000000..34ba28cee775
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-msun-fenvc.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..43eec6a43c18
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-runet.patch
@@ -0,0 +1,11 @@
+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.