sys-freebsd/freebsd-lib: sync latest tree.

2 files changed, 17 insertions, 16 deletions

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 57cde08..71e37e1 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -34,5 +34,5 @@ AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
 DIST freebsd-src-10.3_beta3.tar.xz 127233612 SHA256 4586124f1ad9439b939d49efac3a3aa110399e4fecf0231792d4b0d1bf66a2c1 SHA512 06fbe2f56f5b500301b7018299c6d7aa8b0aa5b619b309d6f50e32b1837eed8541d54364bdec0dee21272cdb7131ce1a49f6c4c9dc62306923b3bbc6098a2203 WHIRLPOOL 2a0f4c55b8e01a7754be2d023d5a62a782acb40bd5f4e45cbacb14dd095a65457bb987fb6bdcf5ef42e16f29be67e3b7b713ee8d804824ecdd76485482d41ffb
-EBUILD freebsd-lib-10.3_beta3.ebuild 19062 SHA256 3152470e2a282acc52cca0331da1b0bd2fe6c6468ddcf0b931e58ea54287ccf4 SHA512 7e57b9c6dc3fe5dbfe676405c0283aa87de48ade1d085c3f14c1a9a88bda94b2ff0dc8000f1703d351600cf1c7bc9dbf765a6b92e5c06d4ea2b65168a3cdfd55 WHIRLPOOL 16723a051c227e37f0c04e5c5c34b72527f87995708e2ae57a8f564b0051672a5cfc5eae2e78308f0b845541c32ff6337cbd1dcbddb5d6b7b72e4df3383273a0
+EBUILD freebsd-lib-10.3_beta3.ebuild 19098 SHA256 d7a5e84a1015abc1de3bfa3b9e393cff5ff3b8b3ac6983220784c2d8c71ae4ef SHA512 8a450e02b1dfcfdbd91d5c9c8a17ee2b835c3978c4bc7fe81139f2d7ea98f935db8026a2f6ad246674f4096fe512211dbc50f4ae985e2adaec3f85cf1ace4a32 WHIRLPOOL e0cd42009f0606d968738609ecb66a3465e940a370be48e101d28c2b00994896e2ace2f02b6813f5d5e8d56079eb82097a5712e79743d8a368eed07634295ceb
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta3.ebuild
index c6b0376..0043989 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta3.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta3.ebuild
@@ -161,7 +161,7 @@ src_prepare() {
 
 	# This one is here because it also
 	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}" || die
+	cd "${WORKDIR}"
 	epatch "${FILESDIR}/${PN}-includes.patch"
 	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
 	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
@@ -173,7 +173,7 @@ src_prepare() {
 	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
 
 	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}" || die
+	cd "${S}"
 	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
 		libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
 		die "Problem fixing \"${dir}/Makefile"
@@ -183,7 +183,7 @@ src_prepare() {
 		-i "${S}/csu/i386-elf/Makefile" \
 		-i "${S}/csu/ia64/Makefile" || die
 	if use build; then
-		cd "${WORKDIR}" || die
+		cd "${WORKDIR}"
 		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
 		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
 		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
@@ -207,9 +207,10 @@ src_prepare() {
 
 	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
 	# BSD's sed on BSD.
-	cd "${S}" || die
+	cd "${S}"
 	if use userland_GNU; then
 		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+		sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die
 	fi
 }
 
@@ -239,7 +240,7 @@ bootstrap_csu() {
 
 	bootstrap_lib "gnu/lib/csu"
 
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" || die
+	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
 	for i in *.So ; do
 		ln -s $i ${i%.So}S.o
 	done
@@ -361,7 +362,7 @@ src_compile() {
 
 	use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
 
-	cd "${WORKDIR}/include" || die
+	cd "${WORKDIR}/include"
 	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
 
 	use crosscompile_opts_headers-only && return 0
@@ -400,11 +401,11 @@ gen_libc_ldscript() {
 	#   $3 = source libssp_nonshared dir
 
 	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
+	rm -f "${DESTDIR}/$2/libc.so" || die
 
 	# Move the library if needed
 	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
+		mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die
 	fi
 
 	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
@@ -418,7 +419,7 @@ gen_libc_ldscript() {
 
 	# iconv symbol provided by libc_nonshared.a.
 	# http://svnweb.freebsd.org/base?view=revision&revision=258283
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
+	cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT
 /* GNU ld script
    SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
    GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
@@ -523,13 +524,13 @@ do_install() {
 
 	if ! is_crosscompile ; then
 		if ! multilib_is_native_abi ; then
-			gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
+			DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
 		else
 			dodir "$(get_libdir)"
-			gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
+			DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
 		fi
 	else
-		CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
+		CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib"
 		# We're done for the cross libc here.
 		return 0
 	fi
@@ -540,7 +541,7 @@ do_install() {
 			kvm m md procstat sbuf thr ufs util elf
 
 	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
-		cd "${D}/usr/include" || die
+		cd "${D}/usr/include"
 		for i in machine/*.h fenv.h ; do
 			move_header ${i}
 		done
@@ -584,7 +585,7 @@ src_install() {
 		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
 	fi
 
-	cd "${WORKDIR}/etc/" || die
+	cd "${WORKDIR}/etc/"
 	insinto /etc
 	doins nls.alias mac.conf netconfig
 
@@ -613,7 +614,7 @@ install_includes()
 
 	# Must exist before we use it.
 	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include" || die
+	cd "${WORKDIR}/include"
 
 	local MACHINE="$(tc-arch-kernel)"