--- xfig-3.2.4-r2.ebuild.orig	2005-04-28 18:18:12.000000000 +0200
+++ xfig-3.2.4-r2.ebuild	2005-04-28 22:49:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r2.ebuild,v 1.3 2004/12/16 09:46:19 corsair Exp $
+# $Header: $
 
-inherit eutils
+inherit eutils x11-prefix
 
 MY_P=${PN}.${PV}
 S=${WORKDIR}/${MY_P}
@@ -11,8 +11,7 @@
 DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window."
 HOMEPAGE="http://www.xfig.org"
 SRC_URI="http://www.xfig.org/xfigdist/${MY_P}.full.tar.gz
-	http://www.ctan.org/tex-archive/graphics/transfig-shapepatch/${SHAPE_P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2"
+	http://www.ctan.org/tex-archive/graphics/transfig-shapepatch/${SHAPE_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -30,27 +29,16 @@
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${WORKDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-xaw3d.diff
+	epatch ${FILESDIR}/${P}-gentoo.patch
 	epatch ../${SHAPE_P}/${PN}.${SHAPE_P#*.}.patch	# bug #20877
-}
-
-src_compile() {
-	xmkmf || die
-	make BINDIR=/usr/bin XFIGLIBDIR=/usr/lib/xfig || die
+	xmkmf || die "xmkmf failed"
+	fix_Imake_Makefile
+	sed -i "s:/usr/X11R6:/usr:" xfig.desktop
 }
 
 src_install() {
-
-	make \
-		DESTDIR=${D} \
-		BINDIR=/usr/bin \
-		XFIGLIBDIR=/usr/lib/xfig \
-		MANDIR=/usr/share/man/man1 \
-		MANSUFFIX=1 \
-		install install.all || die
-
-	mv ${D}/usr/share/doc/{${P},${PF}}
+	make DESTDIR=${D} install.all \
+		|| die "make install.all failed"
 	dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
 	dodoc ../${SHAPE_P}/shapepatch.README
 }