--- freebsd-lib-6.2-r2.ebuild.old	2007-09-26 20:48:28 -0600
+++ freebsd-lib-6.2-r2.ebuild	2007-09-26 20:47:50 -0600
@@ -66,7 +66,7 @@
 	use nis || mymakeopts="${mymakeopts} NO_NIS= "
 	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
 
-	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= "
+	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= NO_LIBC_R= NO_LIBPTHREAD="
 
 	if [[ ${CTARGET} != ${CHOST} ]]; then
 		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
@@ -85,7 +85,8 @@
 	${FILESDIR}/${PN}-6.2-gcc41.patch
 	${FILESDIR}/${PN}-6.2-dl_iterate_phdr.patch
 	${FILESDIR}/${PN}-6.2-as-needed.patch
-	${FILESDIR}/${PN}-6.2-sparc64.patch"
+	${FILESDIR}/${PN}-6.2-sparc64.patch
+	${FILESDIR}/${PN}-6.2-libthr.patch"
 
 # Here we disable and remove source which we don't need or want
 # In order:
@@ -245,6 +246,16 @@
 		mkinstall || die "Install failed"
 	fi
 
+	# Add symlinks (-> libthr) for legacy threading libraries, since these are
+	# not built by us (they are disabled in FreeBSD-7 anyway).
+	dosym libthr.a /usr/lib/libpthread.a
+	dosym libthr.so /usr/lib/libpthread.so
+	dosym libthr.a /usr/lib/libc_r.a
+	dosym libthr.so /usr/lib/libc_r.so
+
+	# Add symlink (-> libthr) so previously built binaries still work.
+	dosym libthr.so.2 /lib/libpthread.so.2
+
 	# Don't install the rest of the configuration files if crosscompiling
 	[[ ${CTARGET} != ${CHOST} ]] && return 0
 
@@ -265,9 +276,6 @@
 	# Install ttys file
 	doins "etc.$(tc-arch-kernel)"/*
 
-	# Install a default libmap.conf that uses libthr by default
-	doins "${FILESDIR}"/libmap.conf
-
 	dodir /etc/sandbox.d
 	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
 # /dev/crypto is used mostly by OpenSSL on *BSD platforms