--- /Gentoo/usr/portage/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r6.ebuild	2009-04-11 23:52:23 +0400
+++ /Gentoo/usr/portage/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r6.ebuild	2009-05-03 22:54:13 +0400
@@ -17,7 +17,9 @@ 
 DEPEND=">=sys-apps/portage-2.0.51"
 RDEPEND=">=sys-libs/readline-5.0-r1
 	>=app-shells/bash-3.1_p7
-	>=sys-apps/coreutils-5.2.1"
+	>=sys-apps/coreutils-5.2.1
+	ppc-macos? ( sys-process/pidof-bsd )
+	x86-macos? ( sys-process/pidof-bsd )"
 
 PROVIDE="virtual/baselayout"
 
@@ -28,13 +30,23 @@ 
 
 	epatch "${FILESDIR}"/${P/-prefix/}-prefix.patch
 	use prefix-chaining && epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining.patch
+	epatch "${FILESDIR}"/${P/-prefix/}-src.patch
+	epatch "${FILESDIR}"/${P/-prefix/}-sh.patch
+	# Next patch is to be applied on systems that don't have a pidof.
+	epatch "${FILESDIR}"/${P/-prefix/}-pidof.patch
+	# The consoletype application in this form will only work on Linux
+	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/${P/-prefix/}-no-consoletype.patch
 	cd "${S}"
 	eprefixify \
 		etc/env.d/00basic \
 		etc/profile \
 		sbin/env-update.sh \
 		sbin/functions.sh \
-		sbin/runscript.sh
+		sbin/runscript.sh \
+		src/runscript.c \
+		sbin/depscan.sh \
+		sbin/rc-daemon.sh \
+		sbin/rc-services.sh
 	# add the host OS MANPATH
 	echo 'MANPATH="/usr/share/man"' > etc/env.d/99basic || die "can't make file"
 }
@@ -45,11 +57,11 @@ 
 	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
 
 # doesn't compile on Darwin
-	#make -C "${S}"/src \
-	#	CC="$(tc-getCC)" \
-	#	LD="$(tc-getCC) ${LDFLAGS}" \
-	#	CFLAGS="${CFLAGS}" \
-	#	LIBDIR="${libdir}" || die
+	make -C "${S}"/src \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC) ${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LIBDIR="${libdir}" || die
 }
 
 src_install() {
@@ -128,8 +140,11 @@ 
 	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
 
 # doesn't compile on Darwin
-	#cd "${S}"/src
-	#make DESTDIR="${D}" LIBDIR="${libdir}" install || die
+	cd "${S}"/src
+	make DESTDIR="${ED}" LIBDIR="${libdir}" install || die
+
+	insinto ${rcscripts_dir}/sh
+	doins "${S}"/sbin/rc-*
 }
 
 pkg_postinst() {