--- /usr/portage/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild	2005-04-29 11:36:00 +0000
+++ xorg-x11-6.8.99.3.ebuild	2005-05-03 10:05:41 +0000
@@ -524,6 +524,11 @@
 		#echo "#define SharedLibraryLoadFlags  -shared -Wl,-z,defs" \
 		#	>> ${HOSTCONF}
 
+		if [[ "${KERNEL}" == "FreeBSD" ]]; then
+			echo "#define __FreeBSD__" >> ${HOSTCONF}
+			echo "#undef linux" >> ${HOSTCONF}
+		fi
+
 		# Enable i810 on x86_64 (RH #126687)
 		if use amd64; then
 			echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF}
@@ -922,6 +927,16 @@
 		else
 			patch_exclude 5851
 		fi
+
+		# Glibc-specific patches to exclude for non-glibc systems
+		if [[ "${LIBC}" != "glibc" ]]; then
+			patch_exclude 0700
+		fi
+
+		# Linux-specific patches to exclude for non-linux systems
+		if [[ "${KERNEL}" != "linux" ]]; then
+			patch_exclude 5900 5901
+		fi
 	einfo "Done excluding patches."
 }
 
@@ -968,11 +983,11 @@
 		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
 			|| die "debug make World failed"
 	else
-		FAST=1 emake World WORLDOPTS="" || die "make World failed"
+		FAST=1 emake World WORLDOPTS="" MAKE="make" || die "make World failed"
 	fi
 
 	if use nls; then
-		emake -C ${S}/nls || die "nls build failed"
+		emake -C ${S}/nls MAKE="make" || die "nls build failed"
 	fi
 }
 
@@ -987,29 +1002,29 @@
 	# gcc3 related fix.  Do this during install, so that our
 	# whole build will not be compiled without mmx instructions.
 	if [ "$(gcc-version)" != "2.95" ] && use x86; then
-		make install DESTDIR=${D} \
+		make install MAKE="make" DESTDIR=${D} \
 		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
 			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
-			install DESTDIR=${D} || die "install failed"
+			install MAKE="make" DESTDIR=${D} || die "install failed"
 	else
-		make install DESTDIR=${D} || die "install failed"
+		make install MAKE="make" DESTDIR=${D} || die "install failed"
 	fi
 
 	if use sdk; then
 		einfo "Installing X.org X11 SDK..."
-		make install.sdk DESTDIR=${D} || die "sdk install failed"
+		make install.sdk MAKE="make" DESTDIR=${D} || die "sdk install failed"
 	fi
 
 	if ! use minimal; then
 		einfo "Installing man pages..."
-		make install.man DESTDIR=${D} || die "man page install failed"
+		make install.man MAKE="make" DESTDIR=${D} || die "man page install failed"
 		einfo "Compressing man pages..."
 		prepman /usr
 	fi
 
 	if use nls; then
 		cd ${S}/nls
-		make DESTDIR=${D} install || die "nls install failed"
+		make MAKE="make" DESTDIR=${D} install || die "nls install failed"
 	fi
 	dodoc ${S}/RELNOTES
 }
@@ -1949,7 +1964,7 @@
 			mkdir -p ${x}
 		fi
 
-		chown root:root ${x}
+		chown root:wheel ${x}
 		chmod 1777 ${x}
 	done
 }