--- freebsd-lib-9.2_rc3.ebuild	2013-08-27 05:42:59.000000000 +0900
+++ freebsd-lib-10.0_beta1.ebuild	2013-10-16 20:45:21.000000000 +0900
@@ -36,6 +36,7 @@
 		>=dev-libs/expat-2.0.1
 		!sys-libs/libutempter
 		!dev-libs/libelf
+		!dev-libs/libexecinfo
 		!sys-freebsd/freebsd-headers"
 	DEPEND="${RDEPEND}
 		>=sys-devel/flex-2.5.31-r2
@@ -78,7 +79,7 @@
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
 
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= "
+	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= WITHOUT_ICONV= "
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
 		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
@@ -89,9 +90,10 @@
 PATCHES=(
 	"${FILESDIR}/${PN}-6.0-pmc.patch"
 	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-9.2-liblink.patch"
+	"${FILESDIR}/${PN}-10.0-liblink.patch"
+	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
+	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-9.0-netware.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
 	)
@@ -175,7 +177,9 @@
 	fi
 
 	if ! is_crosscompile ; then
-		ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+		if [[ ${PV} != *9999* ]]; then
+			ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+		fi
 	else
 		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
 			"${S}/libc/rpc/Makefile.inc" \
@@ -302,6 +306,7 @@
 		mkdir "${WORKDIR}/include_proper_${ABI}" || die
 		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
 		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
+		CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
 	fi
 	bootstrap_csu
 	bootstrap_libssp_nonshared
@@ -318,6 +323,7 @@
 		do_bootstrap
 	else
 		CFLAGS="${CFLAGS} -isystem /usr/include"
+		CXXFLAGS="${CXXFLAGS} -isystem /usr/include"
 	fi
 
 	export RAW_LDFLAGS=$(raw-ldflags)
@@ -341,7 +347,7 @@
 	use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
 
 	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
+	WITHOUT_ICONV= $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
 
 	use crosscompile_opts_headers-only && return 0
 
@@ -360,6 +366,7 @@
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
 		mymakeopts="${mymakeopts} NLS="
 		CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
+		CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include"
 		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
 	fi
 
@@ -582,7 +589,7 @@
 	local MACHINE="$(tc-arch-kernel)"
 
 	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
+	WITHOUT_ICONV= $(freebsd_get_bmake) installincludes \
 		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
 		DESTDIR="${DESTDIR}" \
 		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
@@ -592,7 +599,7 @@
 	for i in $EXTRA_INCLUDES; do
 		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
 		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
+		WITHOUT_ICONV= $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
 			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
 			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
 			BINGRP="${BINGRP}" || die "problem installing $i includes."