--- groff-1.19.1-r2.ebuild.orig	2005-04-29 15:09:17.000000000 +0200
+++ groff-1.19.1-r2.ebuild	2005-05-01 19:39:14.000000000 +0200
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.1-r2.ebuild,v 1.13 2005/04/27 03:47:17 vapier Exp $
+# $Header: $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs x11-prefix
 
 MB_PATCH="groff_1.18.1-7" #"${P/-/_}-7"
 DESCRIPTION="Text formatter used for man pages"
@@ -57,7 +57,7 @@
 	fi
 	# Only build X stuff if we have X installed, but do 
 	# not depend on it, else we get circular deps :(
-	if ! use X || [ ! -x /usr/X11R6/bin/xmkmf ] ; then
+	if ! use X || [ ! -x ${X11_PREFIX}/bin/xmkmf ] ; then
 		touch .dont-build-X
 	fi
 }
@@ -88,6 +88,8 @@
 	if [ ! -f .dont-build-X ] ; then
 		cd ${S}/src/xditview
 		xmkmf || die
+		# do not install the html man page in the xorg-x11 doc dir:
+		fix_Imake_Makefile
 		make depend all || die
 	fi
 }