--- freebsd-usbin-9.2_rc3.ebuild	2013-08-27 05:46:17.000000000 +0900
+++ freebsd-usbin-10.0_beta1.ebuild	2013-10-16 20:45:21.000000000 +0900
@@ -25,8 +25,6 @@
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
 	=sys-freebsd/freebsd-libexec-${RV}*
-	=sys-freebsd/freebsd-contrib-${RV}*
-	acpi? ( sys-power/iasl )
 	build? ( sys-apps/baselayout )
 	ssl? ( dev-libs/openssl )
 	>=app-arch/libarchive-3
@@ -64,7 +62,7 @@
 	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
 	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
 
-	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
+	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
 
 	append-flags $(test-flags -fno-strict-aliasing)
 }
@@ -72,22 +70,20 @@
 PATCHES=(
 	"${FILESDIR}/${PN}-adduser.patch"
 	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	"${FILESDIR}/${PN}-9.1-bsdxml2expat.patch"
+	"${FILESDIR}/${PN}-10.0-bsdxml2expat.patch"
 	)
 
 REMOVE_SUBDIRS="
-	named named-checkzone named-checkconf rndc rndc-confgen
-	dnssec-keygen dnssec-signzone
 	tcpdchk tcpdmatch
 	sendmail praliases editmap mailstats makemap
-	sysinstall cron mailwrapper ntp bsnmpd
+	pc-sysinstall cron mailwrapper ntp bsnmpd
 	tcpdump ndp inetd
 	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
 	zic amd
 	pkg pkg_install freebsd-update service sysrc"
 
 src_prepare() {
-	if ! use build; then
+	if [[ ${PV} != *9999* ]] && ! use build; then
 		ln -s "/usr/src/sys" "${WORKDIR}/sys"
 		ln -s "/usr/include" "${WORKDIR}/include"
 	else
@@ -120,7 +116,7 @@
 	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
 
 	# Most of these now come from openrc.
-	for util in nfs rpc.statd rpc.lockd; do
+	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
 		newinitd "${FILESDIR}/"${util}.initd ${util} || die
 		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
 			newconfd "${FILESDIR}"/${util}.confd ${util} || die