Import sys-freebsd into main portage.

(Portage version: 2.1_pre7-r3)

14 files changed, 931 insertions, 0 deletions

diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.0 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.0
new file mode 100644
index 000000000000..5e1353bf00a8
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.0
@@ -0,0 +1,21 @@
+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 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 961eeb893125bfaa47a7d2f2fee9f2c2 freebsd-sbin-6.0.tar.bz2 1132085
+RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 freebsd-sbin-6.0.tar.bz2 1132085
+SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f freebsd-sbin-6.0.tar.bz2 1132085
+MD5 62d4513f9f16d2eadfc3f1d5be53acee freebsd-ubin-6.0.tar.bz2 1760986
+RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d freebsd-ubin-6.0.tar.bz2 1760986
+SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b freebsd-ubin-6.0.tar.bz2 1760986
+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-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch
new file mode 100644
index 000000000000..43b35cc75eab
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch
@@ -0,0 +1,31 @@
+diff -Npaur usr.sbin.orig/ntp/doc/Makefile usr.sbin/ntp/doc/Makefile
+--- usr.sbin.orig/ntp/doc/Makefile	Thu Mar 10 21:57:57 2005
++++ usr.sbin/ntp/doc/Makefile	Thu Mar 10 21:59:04 2005
+@@ -2,7 +2,7 @@
+ 
+ MAINTAINER=	sheldonh
+ 
+-FILESDIR=	${SHAREDIR}/doc/ntp
++FILESDIR=	${DOCDIR}/ntp
+ 
+ FILES=	accopt.html assoc.html audio.html authopt.html build.html \
+ 	clockopt.html \
+diff -Npaur usr.sbin.orig/pcvt/Misc/Doc/Makefile usr.sbin/pcvt/Misc/Doc/Makefile
+--- usr.sbin.orig/pcvt/Misc/Doc/Makefile	Thu Mar 10 21:57:58 2005
++++ usr.sbin/pcvt/Misc/Doc/Makefile	Thu Mar 10 21:59:39 2005
+@@ -4,6 +4,6 @@ NOOBJ=	noobj
+ FILES=	Acknowledgements Bibliography CharGen \
+ 	Charsets EscapeSequences Keyboard.HP Keyboard.VT \
+ 	NotesAndHints
+-FILESDIR=	${BINDIR}/Doc
++FILESDIR=	${DOCDIR}/pcvt_misc
+ 
+ .include <bsd.prog.mk>
+diff -Npaur usr.sbin.orig/pcvt/Misc/Makefile.inc usr.sbin/pcvt/Misc/Makefile.inc
+--- usr.sbin.orig/pcvt/Misc/Makefile.inc	Thu Mar 10 21:57:58 2005
++++ usr.sbin/pcvt/Misc/Makefile.inc	Thu Mar 10 21:58:38 2005
+@@ -2,3 +2,4 @@
+ 
+ DISTRIBUTION=	doc
+ BINDIR=		${SHAREDIR}/pcvt
++FILESDIR=	${DOCDIR}/pcvt
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.0-fixmakefiles.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.0-fixmakefiles.patch
new file mode 100644
index 000000000000..0df740aef3dd
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.0-fixmakefiles.patch
@@ -0,0 +1,241 @@
+Index: usr.sbin/acpi/Makefile.inc
+===================================================================
+--- usr.sbin/acpi/Makefile.inc.orig
++++ usr.sbin/acpi/Makefile.inc
+@@ -1,8 +1,8 @@
+ # $Id: freebsd-usbin-6.0-fixmakefiles.patch,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+ # $FreeBSD: src/usr.sbin/acpi/Makefile.inc,v 1.8 2003/08/07 16:51:50 njl Exp $
+ 
+-ACPICA_DIR= ${.CURDIR}/../../../sys/contrib/dev/acpica
+-CFLAGS+= -I${.CURDIR}/../../../sys -I${ACPICA_DIR} -I${ACPICA_DIR}/compiler
++ACPICA_DIR= /usr/src/sys/contrib/dev/acpica
++CFLAGS+= -I/usr/src/sys -I${ACPICA_DIR} -I${ACPICA_DIR}/compiler
+ 
+ .if exists(${.CURDIR}/../../Makefile.inc)
+ .include "${.CURDIR}/../../Makefile.inc"
+Index: usr.sbin/arlcontrol/Makefile
+===================================================================
+--- usr.sbin/arlcontrol/Makefile.orig
++++ usr.sbin/arlcontrol/Makefile
+@@ -4,7 +4,7 @@
+ #
+ 
+ PROG=	arlcontrol
+-CFLAGS+=	-I${.CURDIR}/../../sys -DARLCACHE
++CFLAGS+=	-I/usr/src/sys -DARLCACHE
+ MAN=	arlcontrol.8
+ 
+ .include <bsd.prog.mk>
+Index: usr.sbin/dconschat/Makefile
+===================================================================
+--- usr.sbin/dconschat/Makefile.orig
++++ usr.sbin/dconschat/Makefile
+@@ -3,7 +3,7 @@
+ PROG=	dconschat
+ MAN=	dconschat.8
+ 
+-CFLAGS+= -I${.CURDIR}/../../sys
++CFLAGS+= -I/usr/src/sys
+ 
+ DPADD=  ${LIBKVM}
+ LDADD=  -lkvm
+Index: usr.sbin/fwcontrol/Makefile
+===================================================================
+--- usr.sbin/fwcontrol/Makefile.orig
++++ usr.sbin/fwcontrol/Makefile
+@@ -4,9 +4,9 @@ PROG=	fwcontrol
+ SRCS=	fwcontrol.c fwcrom.c fwdv.c
+ MAN=	fwcontrol.8
+ 
+-.PATH:	${.CURDIR}/../../sys/dev/firewire
++.PATH:	/usr/src/sys/dev/firewire
+ 
+-SDIR= ${.CURDIR}/../../sys
++SDIR= /usr/src/sys
+ CFLAGS+=-I${.CURDIR} -I${SDIR}
+ 
+ .include <bsd.prog.mk>
+Index: usr.sbin/mlxcontrol/Makefile
+===================================================================
+--- usr.sbin/mlxcontrol/Makefile.orig
++++ usr.sbin/mlxcontrol/Makefile
+@@ -4,6 +4,6 @@ PROG=	mlxcontrol
+ MAN=	mlxcontrol.8
+ SRCS=	command.c config.c interface.c util.c
+ 
+-CFLAGS+= -I${.CURDIR}/../../sys
++CFLAGS+= -I/usr/src/sys
+ 
+ .include <bsd.prog.mk>
+Index: usr.sbin/ndiscvt/Makefile
+===================================================================
+--- usr.sbin/ndiscvt/Makefile.orig
++++ usr.sbin/ndiscvt/Makefile
+@@ -1,6 +1,6 @@
+ # $FreeBSD: src/usr.sbin/ndiscvt/Makefile,v 1.7 2005/04/24 20:21:22 wpaul Exp $
+ 
+-.PATH:	${.CURDIR}/../../sys/compat/ndis
++.PATH:	/usr/src/sys/compat/ndis
+ 
+ PROG=	ndiscvt
+ SRCS=	ndiscvt.c
+@@ -17,7 +17,7 @@ LDADD=  -ll
+ 
+ YFLAGS+=-v
+ 
+-CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys
++CFLAGS+=-I. -I${.CURDIR} -I/usr/src/sys
+ 
+ CLEANFILES= y.output
+ 
+Index: usr.sbin/pciconf/Makefile
+===================================================================
+--- usr.sbin/pciconf/Makefile.orig
++++ usr.sbin/pciconf/Makefile
+@@ -4,6 +4,6 @@
+ PROG=	pciconf
+ MAN=	pciconf.8
+ 
+-CFLAGS+= -I${.CURDIR}/../../sys
++CFLAGS+= -I/usr/src/sys
+ 
+ .include <bsd.prog.mk>
+Index: usr.sbin/pnpinfo/Makefile
+===================================================================
+--- usr.sbin/pnpinfo/Makefile.orig
++++ usr.sbin/pnpinfo/Makefile
+@@ -5,7 +5,7 @@
+ PROG=	pnpinfo
+ MAN=	pnpinfo.8
+ 
+-CFLAGS+= -I${.CURDIR}/../../sys
++CFLAGS+= -I/usr/src/sys
+ 
+ .if ${MACHINE} == "pc98"
+ CFLAGS+= -DPC98
+Index: usr.sbin/raycontrol/Makefile
+===================================================================
+--- usr.sbin/raycontrol/Makefile.orig
++++ usr.sbin/raycontrol/Makefile
+@@ -3,6 +3,6 @@
+ PROG=	raycontrol
+ MAN=	raycontrol.8
+ 
+-CFLAGS+= -I${.CURDIR}/../../sys
++CFLAGS+= -I/usr/src/sys
+ 
+ .include <bsd.prog.mk>
+Index: usr.sbin/rpc.ypxfrd/Makefile
+===================================================================
+--- usr.sbin/rpc.ypxfrd/Makefile.orig
++++ usr.sbin/rpc.ypxfrd/Makefile
+@@ -14,7 +14,7 @@ LDADD=	-lrpcsvc
+ 
+ CLEANFILES= ypxfrd_svc.c ypxfrd.h
+ 
+-RPCDIR=	${.CURDIR}/../../include/rpcsvc
++RPCDIR=	/usr/include/rpcsvc
+ RPCGEN= rpcgen -I -C
+ 
+ # We need to remove the 'static' keyword from _rpcsvcstate so that
+Index: usr.sbin/setkey/Makefile
+===================================================================
+--- usr.sbin/setkey/Makefile.orig
++++ usr.sbin/setkey/Makefile
+@@ -41,9 +41,9 @@ CLEANFILES=	y.tab.c y.tab.h key_test.o k
+ 
+ # libpfkey
+ # ipsec_strerror.c is for avoiding shlib reference to non-exported function.
+-.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netkey
++.PATH: ${.CURDIR}/../../lib/libipsec /usr/src/sys/netkey
+ SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
+-CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
++CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I/usr/src/sys/netkey
+ 
+ SRCS+=	y.tab.h
+ y.tab.h: parse.y
+Index: usr.sbin/sicontrol/Makefile
+===================================================================
+--- usr.sbin/sicontrol/Makefile.orig
++++ usr.sbin/sicontrol/Makefile
+@@ -3,6 +3,6 @@
+ PROG=	sicontrol
+ MAN=	sicontrol.8
+ 
+-CFLAGS+= -I${.CURDIR}/../../sys
++CFLAGS+= -I/usr/src/sys
+ 
+ .include <bsd.prog.mk>
+Index: usr.sbin/sysinstall/Makefile
+===================================================================
+--- usr.sbin/sysinstall/Makefile.orig
++++ usr.sbin/sysinstall/Makefile
+@@ -87,7 +87,7 @@ KEYMAPS= be.iso bg.bds.ctrlcaps bg.phone
+ keymap.h:
+ 	rm -f keymap.tmp
+ 	for map in ${KEYMAPS} ; do \
+-		KEYMAP_PATH=${.CURDIR}/../../share/syscons/keymaps \
++		KEYMAP_PATH=/usr/share/syscons/keymaps \
+ 			kbdcontrol -L $$map | \
+ 			sed -e '/^static accentmap_t/,$$d' >> keymap.tmp ; \
+ 	done
+Index: usr.sbin/yppush/Makefile
+===================================================================
+--- usr.sbin/yppush/Makefile.orig
++++ usr.sbin/yppush/Makefile
+@@ -1,6 +1,6 @@
+ # $FreeBSD: src/usr.sbin/yppush/Makefile,v 1.9 2001/07/20 06:20:30 obrien Exp $
+ 
+-RPCDIR=	${.CURDIR}/../../include/rpcsvc
++RPCDIR=	/usr/include/rpcsvc
+ .PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \
+        ${.CURDIR}/../../libexec/ypxfr
+ 
+Index: usr.sbin/ypserv/Makefile
+===================================================================
+--- usr.sbin/ypserv/Makefile.orig
++++ usr.sbin/ypserv/Makefile
+@@ -1,6 +1,6 @@
+ # $FreeBSD: src/usr.sbin/ypserv/Makefile,v 1.24 2004/10/18 21:42:15 ru Exp $
+ 
+-RPCDIR=	${.CURDIR}/../../include/rpcsvc
++RPCDIR=	/usr/include/rpcsvc
+ .PATH: ${RPCDIR}
+ 
+ PROG=	ypserv
+Index: usr.sbin/ntp/doc/Makefile
+===================================================================
+--- usr.sbin/ntp/doc/Makefile.orig
++++ usr.sbin/ntp/doc/Makefile
+@@ -1,6 +1,6 @@
+ # $FreeBSD: src/usr.sbin/ntp/doc/Makefile,v 1.11 2005/05/25 16:30:43 sheldonh Exp $
+ 
+-FILESDIR=	${SHAREDIR}/doc/ntp
++FILESDIR=	${DOCDIR}/ntp
+ 
+ FILES=	accopt.html assoc.html audio.html authopt.html build.html \
+ 	clockopt.html \
+Index: usr.sbin/pcvt/Misc/Doc/Makefile
+===================================================================
+--- usr.sbin/pcvt/Misc/Doc/Makefile.orig
++++ usr.sbin/pcvt/Misc/Doc/Makefile
+@@ -4,6 +4,6 @@ NO_OBJ=
+ FILES=	Acknowledgements Bibliography CharGen \
+ 	Charsets EscapeSequences Keyboard.HP Keyboard.VT \
+ 	NotesAndHints
+-FILESDIR=	${BINDIR}/Doc
++FILESDIR=	${DOCDIR}/Doc
+ 
+ .include <bsd.prog.mk>
+Index: usr.sbin/pcvt/Misc/Makefile
+===================================================================
+--- usr.sbin/pcvt/Misc/Makefile.orig
++++ usr.sbin/pcvt/Misc/Makefile
+@@ -2,6 +2,7 @@
+ 
+ NO_OBJ=
+ FILES=	README.FIRST
++FILESDIR= ${DOCDIR}/pcvt
+ SUBDIR=	Doc Etc
+ 
+ .include "Makefile.inc"
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-fixmakefiles.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-fixmakefiles.patch
new file mode 100644
index 000000000000..f38f2770291a
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-fixmakefiles.patch
@@ -0,0 +1,34 @@
+diff -ur usr.sbin.orig/pcvt/keycap/Makefile usr.sbin/pcvt/keycap/Makefile
+--- usr.sbin.orig/pcvt/keycap/Makefile	Thu Apr  7 22:01:55 2005
++++ usr.sbin/pcvt/keycap/Makefile	Thu Apr  7 22:07:37 2005
+@@ -18,6 +18,7 @@
+ #CLEANFILES+=	keycap.0 man5/keycap.0
+ 
+ beforeinstall:
++	${INSTALL} -d ${DESTDIR}${CAPPATH}
+ 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+ 	    ${.CURDIR}/${KEYCAPSRC} ${DESTDIR}${CAPPATH}
+ 
+diff -ur usr.sbin.orig/sysinstall/Makefile usr.sbin/sysinstall/Makefile
+--- usr.sbin.orig/sysinstall/Makefile	Thu Apr  7 22:01:56 2005
++++ usr.sbin/sysinstall/Makefile	Thu Apr  7 22:05:33 2005
+@@ -84,7 +84,7 @@
+ keymap.h:
+ 	rm -f keymap.tmp
+ 	for map in ${KEYMAPS} ; do \
+-		KEYMAP_PATH=${.CURDIR}/../../share/syscons/keymaps \
++		KEYMAP_PATH=/usr/share/syscons/keymaps \
+ 			kbdcontrol -L $$map | \
+ 			sed -e '/^static accentmap_t/,$$d' >> keymap.tmp ; \
+ 	done
+diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
+--- usr.sbin.orig/ypserv/Makefile	Thu Apr  7 22:01:55 2005
++++ usr.sbin/ypserv/Makefile	Thu Apr  7 22:06:07 2005
+@@ -31,6 +31,7 @@
+ 	${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x
+ 
+ afterinstall:
++	${INSTALL} -d ${DESTDIR}/var/yp
+ 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ 		${.CURDIR}/Makefile.yp \
+ 		${DESTDIR}/var/yp/Makefile.dist
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-flex.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-flex.patch
new file mode 100644
index 000000000000..27327fdff773
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-flex.patch
@@ -0,0 +1,155 @@
+diff -ur usr.sbin/apmd/Makefile usr.sbin-flex/apmd/Makefile
+--- usr.sbin/apmd/Makefile	2004-01-21 13:38:17 +0000
++++ usr.sbin-flex/apmd/Makefile	2005-05-05 18:05:56 +0000
+@@ -6,7 +6,7 @@
+ SRCS=	apmd.c apmdlex.l apmdparse.y y.tab.h
+ 
+ DPADD=	${LIBL}
+-LDADD=	-ll
++LDADD=	-lfl
+ 
+ YFLAGS+=-v
+ CFLAGS+=-I. -I${.CURDIR} #-DYY_STACK_USED
+diff -ur usr.sbin/config/Makefile usr.sbin-flex/config/Makefile
+--- usr.sbin/config/Makefile	2004-05-11 15:42:44 +0000
++++ usr.sbin-flex/config/Makefile	2005-05-05 18:06:13 +0000
+@@ -10,7 +10,7 @@
+ CFLAGS+= -I. -I${.CURDIR}
+ 
+ DPADD=	${LIBL}
+-LDADD=	-ll
++LDADD=	-lfl
+ 
+ mkmakefile.o: configvers.h
+ 
+diff -ur usr.sbin/crunch/examples/filesystem.conf usr.sbin-flex/crunch/examples/filesystem.conf
+--- usr.sbin/crunch/examples/filesystem.conf	1999-08-28 01:15:57 +0000
++++ usr.sbin-flex/crunch/examples/filesystem.conf	2005-05-05 18:06:29 +0000
+@@ -28,4 +28,4 @@
+ # /usr/sbin
+ progs bad144
+ 
+-libs -ll -ledit -ltermcap -lutil -lscrypt
++libs -lfl -ledit -ltermcap -lutil -lscrypt
+diff -ur usr.sbin/crunch/examples/fixit.conf usr.sbin-flex/crunch/examples/fixit.conf
+--- usr.sbin/crunch/examples/fixit.conf	1994-12-31 05:36:40 +0000
++++ usr.sbin-flex/crunch/examples/fixit.conf	2005-05-05 18:06:43 +0000
+@@ -41,5 +41,5 @@
+ 
+ # finally, we specify the libraries to link in with our binary
+ 
+-libs -lcrypt -ltelnet -lutil -ll
++libs -lcrypt -ltelnet -lutil -lfl
+ libs -lcurses -ltermcap -ledit -lkvm
+diff -ur usr.sbin/crunch/examples/kcopy.conf usr.sbin-flex/crunch/examples/kcopy.conf
+--- usr.sbin/crunch/examples/kcopy.conf	1999-08-28 01:15:57 +0000
++++ usr.sbin-flex/crunch/examples/kcopy.conf	2005-05-05 18:06:53 +0000
+@@ -18,4 +18,4 @@
+ ln reboot fastboot
+ ln reboot fasthalt
+ 
+-libs -ll -ledit -ltermcap -lcompat -lutil -lscrypt
++libs -lfl -ledit -ltermcap -lcompat -lutil -lscrypt
+diff -ur usr.sbin/crunch/examples/really-big.conf usr.sbin-flex/crunch/examples/really-big.conf
+--- usr.sbin/crunch/examples/really-big.conf	2001-06-01 11:25:40 +0000
++++ usr.sbin-flex/crunch/examples/really-big.conf	2005-05-05 18:07:06 +0000
+@@ -155,4 +155,4 @@
+ ln gzip gzcat
+ 
+ libs -ledit -lgnumalloc -lc -lcrypt -ltermcap -lcurses -ltelnet -lutil -lkvm 
+-libs -ll -ly -lm -lresolv -lrpcsvc -lcompat
++libs -lfl -ly -lm -lresolv -lrpcsvc -lcompat
+diff -ur usr.sbin/ipsend/Makefile usr.sbin-flex/ipsend/Makefile
+--- usr.sbin/ipsend/Makefile	2003-06-06 11:30:50 +0000
++++ usr.sbin-flex/ipsend/Makefile	2005-05-05 18:07:16 +0000
+@@ -18,6 +18,6 @@
+ 	 -I${.CURDIR}/../../contrib/ipfilter
+ 
+ DPADD=	${LIBL}
+-LDADD=	-ll
++LDADD=	-lfl
+ 
+ .include <bsd.prog.mk>
+diff -ur usr.sbin/kbdcontrol/Makefile usr.sbin-flex/kbdcontrol/Makefile
+--- usr.sbin/kbdcontrol/Makefile	2003-04-04 17:49:14 +0000
++++ usr.sbin-flex/kbdcontrol/Makefile	2005-05-05 18:07:41 +0000
+@@ -9,6 +9,6 @@
+ CFLAGS+= -I${.CURDIR}
+ 
+ DPADD=	${LIBL}
+-LDADD=	-ll
++LDADD=	-lfl
+ 
+ .include <bsd.prog.mk>
+diff -ur usr.sbin/ndiscvt/Makefile usr.sbin-flex/ndiscvt/Makefile
+--- usr.sbin/ndiscvt/Makefile	2004-02-23 20:21:21 +0000
++++ usr.sbin-flex/ndiscvt/Makefile	2005-05-05 18:07:53 +0000
+@@ -12,7 +12,7 @@
+ WARNS?=	4
+ 
+ DPADD=  ${LIBL}
+-LDADD=  -ll
++LDADD=  -lfl
+ 
+ YFLAGS+=-v
+ 
+diff -ur usr.sbin/pcvt/kbdio/Makefile usr.sbin-flex/pcvt/kbdio/Makefile
+--- usr.sbin/pcvt/kbdio/Makefile	2005-02-13 07:23:45 +0000
++++ usr.sbin-flex/pcvt/kbdio/Makefile	2005-05-05 18:08:19 +0000
+@@ -13,7 +13,7 @@
+ LFLAGS+= -I
+ 
+ DPADD=	${LIBM} ${LIBY} ${LIBL}
+-LDADD=	-lm -ly -ll
++LDADD=	-lm -ly -lfl
+ 
+ CLEANFILES+= y.output	# comment file from bison
+ 
+diff -ur usr.sbin/pcvt/vgaio/Makefile usr.sbin-flex/pcvt/vgaio/Makefile
+--- usr.sbin/pcvt/vgaio/Makefile	2001-07-20 06:20:09 +0000
++++ usr.sbin-flex/pcvt/vgaio/Makefile	2005-05-05 18:08:08 +0000
+@@ -14,7 +14,7 @@
+ LFLAGS+= -I
+ 
+ DPADD=	${LIBM} ${LIBY} ${LIBL}
+-LDADD=	-lm -ly -ll
++LDADD=	-lm -ly -lfl
+ 
+ CLEANFILES+= y.output	# comment file from bison
+ 
+diff -ur usr.sbin/rrenumd/Makefile usr.sbin-flex/rrenumd/Makefile
+--- usr.sbin/rrenumd/Makefile	2004-06-21 16:10:00 +0000
++++ usr.sbin-flex/rrenumd/Makefile	2005-05-05 18:08:30 +0000
+@@ -21,7 +21,7 @@
+ CFLAGS+= -DINET6 -DIPSEC -I. -I${.CURDIR}
+ YFLAGS=	-d
+ 
+-LDADD=	-lipsec -ll -ly
++LDADD=	-lipsec -lfl -ly
+ DPADD=	${LIBIPSEC} ${LIBL} ${LIBY}
+ 
+ CLEANFILES=	y.tab.h
+diff -ur usr.sbin/setkey/Makefile usr.sbin-flex/setkey/Makefile
+--- usr.sbin/setkey/Makefile	2003-11-05 09:47:54 +0000
++++ usr.sbin-flex/setkey/Makefile	2005-05-05 18:08:48 +0000
+@@ -35,7 +35,7 @@
+ YFLAGS=	-d
+ 
+ DPADD=	${LIBL} ${LIBY}
+-LDADD=	-ll -ly
++LDADD=	-lfl -ly
+ 
+ CLEANFILES=	y.tab.c y.tab.h key_test.o keytest
+ 
+diff -ur usr.sbin/tcpdump/tcpdump/Makefile usr.sbin-flex/tcpdump/tcpdump/Makefile
+--- usr.sbin/tcpdump/tcpdump/Makefile	2004-08-06 07:27:08 +0000
++++ usr.sbin-flex/tcpdump/tcpdump/Makefile	2005-05-05 18:08:58 +0000
+@@ -41,7 +41,7 @@
+ .endif
+ 
+ DPADD=	${LIBL} ${LIBPCAP}
+-LDADD=	-ll -lpcap
++LDADD=	-lfl -lpcap
+ .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+ DPADD+= ${LIBCRYPTO}
+ LDADD+= -lcrypto
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-nowrap.patch
new file mode 100644
index 000000000000..f01d6e2b9690
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-nowrap.patch
@@ -0,0 +1,46 @@
+diff -ur usr.sbin/rpcbind/Makefile usr.sbin-nowrap/rpcbind/Makefile
+--- usr.sbin/rpcbind/Makefile	2003-04-04 17:49:18 +0000
++++ usr.sbin-nowrap/rpcbind/Makefile	2005-06-20 14:15:59 +0000
+@@ -13,9 +13,19 @@
+ 	rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \
+ 	rpc_generic.c
+ 
+-CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 -DLIBWRAP
++CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP
+ 
+-DPADD=	${LIBWRAP} ${LIBUTIL}
+-LDADD=	-lwrap -lutil
++DPADD=	${LIBUTIL}
++LDADD=	-lutil
++
++.if !defined(NO_WRAP)
++CFLAGS+= -DLIBWRAP
++DPADD+=  ${LIBWRAP}
++LDADD+=  -lwrap
++.endif
++
++.if !defined(NOINET6)
++CFLAGS+= -DINET6
++.endif
+ 
+ .include <bsd.prog.mk>
+diff -ur usr.sbin/ypserv/Makefile usr.sbin-nowrap/ypserv/Makefile
+--- usr.sbin/ypserv/Makefile	2003-04-04 17:49:20 +0000
++++ usr.sbin-nowrap/ypserv/Makefile	2005-06-20 14:17:41 +0000
+@@ -8,10 +8,13 @@
+ SRCS=	yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
+ 	ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c
+ 
+-CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
++CFLAGS+= -DDB_CACHE -I.
+ 
+-DPADD=	${LIBWRAP}
+-LDADD=	-lwrap
++.if !defined(NO_WRAP)
++CFLAGS+= -DTCP_WRAPPER
++DPADD+=	 ${LIBWRAP}
++LDADD+=	 -lwrap
++.endif
+ 
+ CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h
+ 
diff --git a/sys-freebsd/freebsd-usbin/files/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd
new file mode 100644
index 000000000000..3bb4400e3119
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/moused.confd
@@ -0,0 +1,11 @@
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.confd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+
+moused_type="auto"       # See man page for rc.conf(5) for available settings.
+
+moused_port="/dev/ums0" # Set to your mouse port.
+
+moused_flags=""         # Any additional flags to moused.
+
+mousechar_start=""    	# if 0xd0-0xd3 default range is occupied in your
+                        # language code table, specify alternative range
+			# start like mousechar_start=3, see vidcontrol(1)
diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd
new file mode 100644
index 000000000000..06e9c2e5cd1d
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/moused.initd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+
+
+start() {
+	ebegin "Starting Moused"
+	
+	start-stop-daemon --start --quiet --exec /usr/sbin/moused \
+		-- ${moused_flags} -p ${moused_port} -t ${moused_type}
+	
+	retval=$?
+	
+	[[ -n ${mousechar_start} ]] && mousechar_start="-M ${mousechar_start}"
+	
+	for ttyv in /dev/ttyv* ; do
+		vidcontrol < ${ttyv} ${mousechar_start} -m on || retval=1
+	done
+	
+	eend $retval "Failed to start Moused"
+}
+
+stop() {
+	ebegin "Stopping Moused"
+	
+	start-stop-daemon --stop --quiet --pidfile /var/run/moused.pid
+	retval=$?
+	[[ -f /var/run/moused.pid ]] && rm /var/run/moused.pid
+	
+	eend $retval "Failed to stop Moused"
+}
+			
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd
new file mode 100644
index 000000000000..80ace9c40235
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/nfs.confd
@@ -0,0 +1,24 @@
+# /etc/conf.d/nfs
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.confd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+
+# Config file for /etc/init.d/nfs
+
+# If you wish to set the port numbers for lockd,
+# please see /etc/sysctl.conf
+
+# Number of servers to be started up by default
+RPCNFSDCOUNT=8
+
+# Options to pass to rpc.mountd
+# ex. RPCMOUNTDOPTS="-p 32767
+RPCMOUNTDOPTS=""
+
+# Options to pass to rpc.statd
+# ex. RPCSTATDOPTS="-p 32765 -o 32766"
+RPCSTATDOPTS=""
+
+# Options to pass to rpc.idmapd
+RPCIDMAPDOPTS=""
+
+# Timeout (in seconds) for exportfs
+EXPORTFSTIMEOUT=30
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd
new file mode 100755
index 000000000000..77f51c723fb8
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/nfs.initd
@@ -0,0 +1,209 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+
+#---------------------------------------------------------------------------
+# This script starts/stops the following
+#	rpc.statd if necessary (also checked by init.d/nfsmount)
+#	rpc.rquotad if exists (from quota package)
+#	rpc.nfsd
+#	rpc.mountd
+#---------------------------------------------------------------------------
+
+# NB: Config is in /etc/conf.d/nfs
+
+opts="reload"
+
+# This variable is used for controlling whether or not to run exportfs -ua;
+# see stop() for more information
+restarting=no
+
+# The binary locations
+exportfs=/usr/sbin/exportfs
+statd=/usr/sbin/rpc.statd
+idmapd=/usr/sbin/rpc.idmapd
+rquotad=/usr/sbin/rpc.rquotad
+nfsd=/usr/sbin/rpc.nfsd
+mountd=/usr/sbin/rpc.mountd
+
+depend() {
+	use ypbind net
+	need rpcbind
+	after quota
+}
+
+start_idmapd() {
+	[[ ! -x ${idmapd} ]] && return 0
+
+	if grep -q rpc_pipefs /proc/filesystems ; then
+		if ! grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
+			[[ ! -d /var/lib/nfs/rpc_pipefs ]] && mkdir -p /var/lib/nfs/rpc_pipefs
+			ebegin "Mounting RPC pipefs"
+			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+			eend $?
+		fi
+	fi
+
+	ebegin "Starting idmapd"
+	${idmapd} ${RPCIDMAPDOPTS}
+	eend $?
+}
+
+stop_idmapd() {
+	[[ ! -x ${idmapd} ]] && return 0
+
+	ebegin "Stopping idmapd"
+	start-stop-daemon --stop --quiet --exec ${idmapd}
+	ret=$?
+	eend ${ret}
+
+	if [[ $restarting == "no" ]] ; then
+		if grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
+			ebegin "Unmounting RPC pipefs"
+			umount /var/lib/nfs/rpc_pipefs
+			eend $?
+		fi
+	fi
+
+	return ${ret}
+}
+
+start_statd() {
+	# Don't start rpc.statd if already started by init.d/nfsmount
+	killall -0 rpc.statd &>/dev/null && return 0
+	ebegin "Starting NFS statd"
+	start-stop-daemon --start --quiet --exec \
+		$statd -- $RPCSTATDOPTS 1>&2
+	eend $? "Error starting NFS statd"
+}
+
+stop_statd() {
+	# Don't stop rpc.statd if it's in use by init.d/nfsmount.
+	mount -t nfs | grep -q . && return 0
+	# Make sure it's actually running
+	killall -0 rpc.statd &>/dev/null || return 0
+	# Okay, all tests passed, stop rpc.statd
+	ebegin "Stopping NFS statd"
+	start-stop-daemon --stop --quiet --exec $statd 1>&2
+	eend $? "Error stopping NFS statd"
+}
+
+waitfor_exportfs() {
+	local pid=$1
+	( sleep ${EXPORTFSTIMEOUT:-30}; kill -9 $pid &>/dev/null ) &
+	wait $1
+}
+
+start() {
+	# Make sure nfs support is loaded in the kernel #64709
+	if [ -e /proc/modules ] ; then
+		modprobe nfsd &> /dev/null
+	fi
+
+	# This is the new "kernel 2.6 way" to handle the exports file
+	if grep -q nfsd /proc/filesystems &>/dev/null; then
+		if ! grep -q "nfsd /proc/fs/nfs" /proc/mounts &>/dev/null; then
+			ebegin "Mounting nfsd filesystem in /proc"
+			mount -t nfsd nfsd /proc/fs/nfs
+			eend $? "Error mounting nfsd filesystem in /proc"
+		fi
+	fi
+	# now that nfsd is mounted inside /proc, we can safely start mountd later
+
+	start_idmapd
+	start_statd
+
+	# Exportfs likes to hang if networking isn't working.
+	# If that's the case, then try to kill it so the
+	# bootup process can continue.
+	if grep -q '^/' /etc/exports &>/dev/null; then
+		ebegin "Exporting NFS directories"
+		$exportfs -r 1>&2 &
+		waitfor_exportfs $!
+		eend $? "Error exporting NFS directories"
+	fi
+
+	if [ -x $rquotad ]; then
+		ebegin "Starting NFS rquotad"
+		start-stop-daemon --start --quiet --exec \
+			$rquotad -- $RPCRQUOTADOPTS 1>&2
+		eend $? "Error starting NFS rquotad"
+	fi
+
+	ebegin "Starting NFS daemon"
+	start-stop-daemon --start --quiet --exec \
+		$nfsd -- $RPCNFSDCOUNT 1>&2
+	eend $? "Error starting NFS daemon"
+
+	# Start mountd
+	ebegin "Starting NFS mountd"
+	start-stop-daemon --start --quiet --exec \
+		$mountd -- $RPCMOUNTDOPTS 1>&2
+	eend $? "Error starting NFS mountd"
+}
+
+stop() {
+	# Don't check NFSSERVER variable since it might have changed,
+	# instead use --oknodo to smooth things over
+	ebegin "Stopping NFS mountd"
+	start-stop-daemon --stop --quiet --oknodo \
+		--exec $mountd 1>&2
+	eend $? "Error stopping NFS mountd"
+
+	# nfsd sets its process name to [nfsd] so don't look for $nfsd
+	ebegin "Stopping NFS daemon"
+	start-stop-daemon --stop --quiet --oknodo \
+		--name nfsd --user root --signal 2 1>&2
+	eend $? "Error stopping NFS daemon"
+
+	if [ -x $rquotad ]; then
+		ebegin "Stopping NFS rquotad"
+		start-stop-daemon --stop --quiet --oknodo \
+			--exec $rquotad 1>&2
+		eend $? "Error stopping NFS rquotad"
+	fi
+
+	# When restarting the NFS server, running "exportfs -ua" probably
+	# isn't what the user wants.  Running it causes all entries listed
+	# in xtab to be removed from the kernel export tables, and the
+	# xtab file is cleared. This effectively shuts down all NFS
+	# activity, leaving all clients holding stale NFS filehandles,
+	# *even* when the NFS server has restarted.
+	#
+	# That's what you would want if you were shutting down the NFS
+	# server for good, or for a long period of time, but not when the
+	# NFS server will be running again in short order.  In this case,
+	# then "exportfs -r" will reread the xtab, and all the current
+	# clients will be able to resume NFS activity, *without* needing
+	# to umount/(re)mount the filesystem.
+	if [ "$restarting" = no ]; then
+		ebegin "Unexporting NFS directories"
+		# Exportfs likes to hang if networking isn't working.
+		# If that's the case, then try to kill it so the
+		# shutdown process can continue.
+		$exportfs -ua 1>&2 &
+		waitfor_exportfs $!
+		eend $? "Error unexporting NFS directories"
+	fi
+
+	stop_statd
+	stop_idmapd
+}
+
+reload() {
+	# Exportfs likes to hang if networking isn't working.
+	# If that's the case, then try to kill it so the
+	# bootup process can continue.
+	ebegin "Reloading /etc/exports"
+	$exportfs -r 1>&2 &
+	waitfor_exportfs $!
+	eend $? "Error exporting NFS directories"
+}
+
+restart() {
+	# See long comment in stop() regarding "restarting" and exportfs -ua
+	restarting=yes
+	svc_stop
+	svc_start
+}
diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd
new file mode 100755
index 000000000000..bf30eeb92870
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/nfsmount.initd
@@ -0,0 +1,68 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfsmount.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+
+depend() {
+	need net rpcbind
+	use ypbind
+}
+
+start_statd() {
+	# Don't start rpc.statd if already started by init.d/nfs
+	killall -0 rpc.statd &>/dev/null && return 0
+	ebegin "Starting NFS statd"
+	rpc.statd
+	eend $? "Error starting NFS statd"
+}
+
+stop_statd() {
+	# Don't stop rpc.statd if it's in use by init.d/nfs
+	killall -0 nfsd &>/dev/null && return 0
+	# Make sure it's actually running
+	killall -0 rpc.statd &>/dev/null || return 0
+	# Okay, all tests passed, stop rpc.statd
+	ebegin "Stopping NFS statd"
+	killall rpc.statd
+	eend $? "Error stopping NFS statd"
+}
+
+start_lockd() {
+	# Don't start rpc.lockd if already started by init.d/nfs
+	killall -0 rpc.lockd &>/dev/null && return 0
+	ebegin "Starting NFS lockd"
+	rpc.lockd
+	eend $? "Error starting NFS lockd"
+}
+
+stop_lockd() {
+	# Don't stop rpc.lockd if it's in use by init.d/nfs
+	killall -0 nfsd &>/dev/null && return 0
+	# Make sure it's actually running
+	killall -0 rpc.lockd &>/dev/null || return 0
+	# Okay, all tests passed, stop rpc.lockd
+	ebegin "Stopping NFS lockd"
+	killall rpc.lockd
+	eend $? "Error stopping NFS lockd"
+}
+
+start() {
+	start_statd
+	start_lockd
+	ebegin "Mounting NFS filesystems"
+	mount -a -t nfs
+	eend $? "Error mounting NFS filesystems"
+}
+
+stop() {
+	ebegin "Unmounting NFS filesystems"
+	umount -a -t nfs
+	eend $? "Error unmounting NFS filesystems"
+	stop_statd
+	stop_lockd
+}
+
+restart() {
+	svc_stop
+	svc_start
+}
diff --git a/sys-freebsd/freebsd-usbin/files/pw.conf b/sys-freebsd/freebsd-usbin/files/pw.conf
new file mode 100644
index 000000000000..29a246f72b8f
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/pw.conf
@@ -0,0 +1,5 @@
+# Change this to Gentoo's Default, instead of FreeBSD's default of
+# /usr/share/skel, so that bash and other packages installs the files on the
+# right place.
+skeleton /etc/skel
+
diff --git a/sys-freebsd/freebsd-usbin/files/rpcbind.initd b/sys-freebsd/freebsd-usbin/files/rpcbind.initd
new file mode 100755
index 000000000000..32079f809651
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/rpcbind.initd
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rpcbind.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+
+depend() {
+	use net
+	before inetd
+	before xinetd
+}
+
+start() {
+	ebegin "Starting rpcbind"
+	rpcbind
+	local ret=$?
+	eend ${ret}
+	
+	# without, if a service depending on portmap is started too fast,
+	# connecting to portmap will fail -- azarah
+	# doing that for rpcbind, too -- flameeyes
+	sleep 1
+	return ${ret}
+}
+
+stop() {
+	ebegin "Stopping rpcbind"
+	killall rpcbind
+	eend $?
+}
diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd
new file mode 100755
index 000000000000..fd0b2f6c1373
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/syslogd.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syslogd.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+
+
+depend() {
+	 need localmount
+}
+
+start() {
+	ebegin "Starting syslogd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/syslogd
+	eend $? "Failed to start syslogd"
+}
+
+stop() {
+       ebegin "Stopping syslogd"
+       start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid
+       eend $? "Failed to stop syslogd"
+}
+
+
+