Shorten the fixmakefiles patch so that it applies to both 6.0 and 6.1. Update nowrap patch from Robert Sebastian Gerus. Create /usr/bin directory. Remove from 6.1_rc1 hostapd_cli and wpa_cli, remove amd (am-utils package will provide that), block am-utils from 6.0.

Package-Manager: portage-2.1_pre10

6 files changed, 91 insertions, 244 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 652e53af37d7..5189e7bd9559 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.8 2006/05/01 00:51:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.9 2006/05/01 12:27:31 flameeyes Exp $
+
+  01 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/freebsd-usbin-6.0-fixmakefiles.patch,
+  +files/freebsd-usbin-6.1-nowrap.patch, freebsd-usbin-6.0-r2.ebuild,
+  freebsd-usbin-6.1_rc1.ebuild:
+  Shorten the fixmakefiles patch so that it applies to both 6.0 and 6.1.
+  Update nowrap patch from Robert Sebastian Gerus. Create /usr/bin directory.
+  Remove from 6.1_rc1 hostapd_cli and wpa_cli, remove amd (am-utils package
+  will provide that), block am-utils from 6.0.
 
 *freebsd-usbin-6.1_rc1 (01 May 2006)
 
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index f629eedd649e..976e18fde7e7 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,10 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX freebsd-usbin-6.0-fixmakefiles.patch 7377 RMD160 237a22b28f6abeb5b34da11fbe7c1763ee71489c SHA1 ff6fb5364e55754d73e7089a8402e68b40ea2dbd SHA256 fc8cd07547553d763ce60d1f50e8e0f0f2635da2a5173d12ac15a842ceeabf7e size 7377
-MD5 9554fa2aadce8c958640378b0982440b files/freebsd-usbin-6.0-fixmakefiles.patch 7377
-RMD160 237a22b28f6abeb5b34da11fbe7c1763ee71489c files/freebsd-usbin-6.0-fixmakefiles.patch 7377
-SHA256 fc8cd07547553d763ce60d1f50e8e0f0f2635da2a5173d12ac15a842ceeabf7e files/freebsd-usbin-6.0-fixmakefiles.patch 7377
+AUX freebsd-usbin-6.0-fixmakefiles.patch 691 RMD160 247fdda9f51068dece3098d1ef01df0e30da7c65 SHA1 77a29d98fe51c2b848d663a150326baec5e718cc SHA256 d94f8d091ec7eaf75c264ee351b1b6c590297cb99f0c603c5e75672bb6c6c069 size 691
+MD5 7158b6024cc0e8c5a8237fcc899e6210 files/freebsd-usbin-6.0-fixmakefiles.patch 691
+RMD160 247fdda9f51068dece3098d1ef01df0e30da7c65 files/freebsd-usbin-6.0-fixmakefiles.patch 691
+SHA256 d94f8d091ec7eaf75c264ee351b1b6c590297cb99f0c603c5e75672bb6c6c069 files/freebsd-usbin-6.0-fixmakefiles.patch 691
+AUX freebsd-usbin-6.1-nowrap.patch 1256 RMD160 2356f3fc63a6d27b399e7ec7f2d8637fa519712d SHA1 7dab1d79f05f732d589f81bdb7d9b8a7ac4a6ffb SHA256 e1413acbf003be3fa3a73f8fa0bdf79caa99885192622c79b034345d600b92f8 size 1256
+MD5 13ff92c94bd109435bff0855224d1116 files/freebsd-usbin-6.1-nowrap.patch 1256
+RMD160 2356f3fc63a6d27b399e7ec7f2d8637fa519712d files/freebsd-usbin-6.1-nowrap.patch 1256
+SHA256 e1413acbf003be3fa3a73f8fa0bdf79caa99885192622c79b034345d600b92f8 files/freebsd-usbin-6.1-nowrap.patch 1256
 AUX freebsd-usbin-nowrap.patch 1229 RMD160 2931c7cc81e6dcffdbdd9ea98ff5ae31654070cf SHA1 5b9cb96adcddd1216c6842f1d1f9311f637e4d49 SHA256 4ae0724d5e642e0399188b6805e94495af360ccf4f99443f9bfa80c220d29a8b size 1229
 MD5 39d0d0915156088d99b1524fc39e8ebd files/freebsd-usbin-nowrap.patch 1229
 RMD160 2931c7cc81e6dcffdbdd9ea98ff5ae31654070cf files/freebsd-usbin-nowrap.patch 1229
@@ -63,18 +67,18 @@ DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ece
 DIST freebsd-ubin-6.1_rc1.tar.bz2 1762943 RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 size 1762943
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
 DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
-EBUILD freebsd-usbin-6.0-r2.ebuild 4479 RMD160 eccf2d79ae2a23b5eeaafc95a399d889bdc0f1a6 SHA1 0abfc899539f95106cc9ad5a79b2a0b667131e0e SHA256 e3102e099d2ea91917f428acbd49791db67e2506f42e4cccfe34904a79e47b40 size 4479
-MD5 5d29799ae797c075801dad1066268a47 freebsd-usbin-6.0-r2.ebuild 4479
-RMD160 eccf2d79ae2a23b5eeaafc95a399d889bdc0f1a6 freebsd-usbin-6.0-r2.ebuild 4479
-SHA256 e3102e099d2ea91917f428acbd49791db67e2506f42e4cccfe34904a79e47b40 freebsd-usbin-6.0-r2.ebuild 4479
-EBUILD freebsd-usbin-6.1_rc1.ebuild 4478 RMD160 97be8f461470d8dcf508e7c81e749e8bef8465fa SHA1 f1c54fcbf8ec02a626f51a057a895698de6b94c6 SHA256 bf41e75fdf0c5b73018b9b09593712fc14772365db8434e148dcf3f3e23fb9e3 size 4478
-MD5 f83fd1ffea77a640a5c85f7d673385e6 freebsd-usbin-6.1_rc1.ebuild 4478
-RMD160 97be8f461470d8dcf508e7c81e749e8bef8465fa freebsd-usbin-6.1_rc1.ebuild 4478
-SHA256 bf41e75fdf0c5b73018b9b09593712fc14772365db8434e148dcf3f3e23fb9e3 freebsd-usbin-6.1_rc1.ebuild 4478
-MISC ChangeLog 7762 RMD160 29f99c03356eb9d53a0542a519c710042a63a360 SHA1 1744c0105364c6ed3ee56d66d9d4413bd56a93c6 SHA256 54a74eea142e15aafba920f23b6de1c98deed2e5a77a4d1d34a7cc864efbc763 size 7762
-MD5 59b75e03a6ec40ab1c73a40959f6e004 ChangeLog 7762
-RMD160 29f99c03356eb9d53a0542a519c710042a63a360 ChangeLog 7762
-SHA256 54a74eea142e15aafba920f23b6de1c98deed2e5a77a4d1d34a7cc864efbc763 ChangeLog 7762
+EBUILD freebsd-usbin-6.0-r2.ebuild 4497 RMD160 8209e49747046ca194553c2f2bef6194c4d48bcb SHA1 23a6a5d8af837e37728823f2774334584f7eb62b SHA256 184369481778b09f527ca18e0d2fef7b674a4777cbf48e034183286fb39959f6 size 4497
+MD5 4ac1daaab9b9409fc8a2a8fa10ca7754 freebsd-usbin-6.0-r2.ebuild 4497
+RMD160 8209e49747046ca194553c2f2bef6194c4d48bcb freebsd-usbin-6.0-r2.ebuild 4497
+SHA256 184369481778b09f527ca18e0d2fef7b674a4777cbf48e034183286fb39959f6 freebsd-usbin-6.0-r2.ebuild 4497
+EBUILD freebsd-usbin-6.1_rc1.ebuild 4485 RMD160 c87bd654502849afcd4df62faf3a178a3b488212 SHA1 2c8b469fd6e5239f6fa993d86b0f7a736eda81b9 SHA256 e633b792447c51e79193580e0ef54d26ea864797596ead0aca32c20eb6ef8bbf size 4485
+MD5 f90644fa5552206f9af729beeebfb122 freebsd-usbin-6.1_rc1.ebuild 4485
+RMD160 c87bd654502849afcd4df62faf3a178a3b488212 freebsd-usbin-6.1_rc1.ebuild 4485
+SHA256 e633b792447c51e79193580e0ef54d26ea864797596ead0aca32c20eb6ef8bbf freebsd-usbin-6.1_rc1.ebuild 4485
+MISC ChangeLog 8238 RMD160 14562552cdde58e4c2057411348a470a33790eef SHA1 a2295165ca245ab38bd0f476e275ff86e4b3c72a SHA256 c74421632ba0022cf0936c31d1998c6db1504541cb7a5d25a4cc684e4b722714 size 8238
+MD5 c689d69680eb8d3e0c7f32134aa95dd3 ChangeLog 8238
+RMD160 14562552cdde58e4c2057411348a470a33790eef ChangeLog 8238
+SHA256 c74421632ba0022cf0936c31d1998c6db1504541cb7a5d25a4cc684e4b722714 ChangeLog 8238
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -88,7 +92,7 @@ SHA256 65f8ce2d3dfb59a8f66d935de6cebe642d2ea157a49f2423738d3726df79db73 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVVu0AiZjviIA2XgRAlBzAJ9ur+o0D1qvT7BPBFTGLCJBbJLMOQCg2yTa
-DBO0KOseY+4yRFHctDKC2oo=
-=8Af2
+iD8DBQFEVf7MAiZjviIA2XgRAn82AJ9neHMgnDVwRKI9GfW5oI0GgDE2sACgq9h3
+N87X0nwIJ5a6czSP7qEkVAU=
+=an9q
 -----END PGP SIGNATURE-----
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
index 0df740aef3dd..1b1af6d5da7b 100644
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.0-fixmakefiles.patch
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.0-fixmakefiles.patch
@@ -1,220 +1,3 @@
-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
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-nowrap.patch
new file mode 100644
index 000000000000..175b0c80c6c8
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-nowrap.patch
@@ -0,0 +1,48 @@
+diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile
+--- usr.sbin.orig/rpcbind/Makefile	2006-03-15 07:44:28 +0000
++++ usr.sbin/rpcbind/Makefile	2006-04-19 17:37:18 +0000
+@@ -13,13 +13,19 @@
+ 	rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \
+ 	rpc_generic.c
+ 
+-CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DLIBWRAP
++CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP
++
++DPADD=	${LIBUTIL}
++LDADD=	-lutil
++
++.if !defined(NO_WRAP)
++CFLAGS+= -DLIBWRAP
++DPADD+=  ${LIBWRAP}
++LDADD+=  -lwrap
++.endif
+ 
+ .if !defined(NO_INET6)
+ CFLAGS+= -DINET6
+ .endif
+ 
+-DPADD=	${LIBWRAP} ${LIBUTIL}
+-LDADD=	-lwrap -lutil
+-
+ .include <bsd.prog.mk>
+diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
+--- usr.sbin.orig/ypserv/Makefile	2004-10-18 21:42:15 +0000
++++ usr.sbin/ypserv/Makefile	2006-04-19 17:31:23 +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
+ 
+Only in usr.sbin/ypserv: Makefile.orig
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.0-r2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.0-r2.ebuild
index daf2faedaa66..8c8edb8e6a9f 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.0-r2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.0-r2.ebuild,v 1.1 2006/04/22 13:35:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.0-r2.ebuild,v 1.2 2006/05/01 12:27:31 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -23,7 +23,8 @@ RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	=sys-freebsd/freebsd-libexec-${RV}*
 	ssl? ( dev-libs/openssl )
 	tcpd? ( sys-apps/tcp-wrappers )
-	net-libs/libpcap"
+	net-libs/libpcap
+	!net-fs/am-utils"
 DEPEND="${RDEPEND}
 	=sys-freebsd/freebsd-mk-defs-${RV}*
 	=sys-freebsd/freebsd-sources-${RV}*
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild
index 07d890eb7b57..215d44c0c746 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild,v 1.1 2006/05/01 00:51:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild,v 1.2 2006/05/01 12:27:31 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -65,7 +65,7 @@ pkg_setup() {
 }
 
 PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch
-	${FILESDIR}/${PN}-nowrap.patch"
+	${FILESDIR}/${PN}-6.1-nowrap.patch"
 
 REMOVE_SUBDIRS="
 	named named-checkzone named-checkconf rndc rndc-confgen
@@ -74,7 +74,8 @@ REMOVE_SUBDIRS="
 	sendmail praliases editmap mailstats makemap
 	sysinstall cron mailwrapper ntp bsnmpd mount_smbfs
 	tcpdump ndp traceroute pkg_install inetd
-	wpa/wpa_supplicant wpa/hostapd zic"
+	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli
+	zic amd"
 
 src_unpack() {
 	freebsd_src_unpack
@@ -83,11 +84,12 @@ src_unpack() {
 }
 
 src_install() {
-	# By creating these two directories we avoid having to do a
-	# more complex hack inside lpr/SMM.doc and nologin makefiles.
+	# By creating these directories we avoid having to do a
+	# more complex hack
 	dodir /usr/share/doc
 	dodir /sbin
 	dodir /usr/libexec
+	dodir /usr/bin
 
 	# FILESDIR is used by some makefiles which will install files
 	# in the wrong place, just put it in the doc directory.