--- /usr/portage/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild	2005-04-29 13:36:00.000000000 +0200
+++ xorg-x11-6.8.99.3.ebuild	2005-05-02 17:50:47.793780744 +0200
@@ -502,6 +502,13 @@
 	# Bulk patching - based on patch name
 	# Will create excluded stuff once it's needed
 	cd ${WORKDIR}
+
+	# As the patch sais, that breaks non-linux systems, more exaclty
+	# it breaks non-glibc systems where open64 and loff_t doesn't exists.
+	# Exclude this until a better workaround is in place.
+	[[ "$LIBC" == "glibc" ]] || \
+		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 0700_all_4.2.0-sessreg-highuid.patch"
+
 	EPATCH_SUFFIX="patch" \
 	epatch ${PATCHDIR}
 	cd ${S}
@@ -524,6 +531,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}
@@ -968,11 +980,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 +999,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
 }