fix bug #18983

5 files changed, 53 insertions, 10 deletions

diff --git a/media-gfx/transfig/ChangeLog b/media-gfx/transfig/ChangeLog
index 611037fc92fe..0f8ac8a083ae 100644
--- a/media-gfx/transfig/ChangeLog
+++ b/media-gfx/transfig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/transfig
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/ChangeLog,v 1.5 2003/02/12 07:04:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/ChangeLog,v 1.6 2003/04/18 14:22:13 malverian Exp $
+
+*transfig-3.2.4-r1 (18 Apr 2003)
+
+  18 Apr 2003; Philip Walls <malverian@gentoo.org> transfig-3.2.4.ebuild
+  files/transfig-3.2.4.patch :
+  Stopped from installing into /usr/local
+  Fixes bug #18983
 
 *transfig-3.2.4 (08 Jan 2003)
 
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 61a00aa98425..e3b1fa10cf84 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,6 +1,6 @@
-MD5 26f7cea46fb082ab417e311ac98d3549 ChangeLog 1292
+MD5 69b877506842e9ddf68a57d5e3f6357f ChangeLog 1295
 MD5 50afa532bad053ef4d322e0dbf0e2b30 transfig-3.2.3d-r1.ebuild 1079
-MD5 46c5d27814cc83af5fee4054e686a93e transfig-3.2.4-r1.ebuild 1074
+MD5 d77962724e29d49a65753e144b0e5907 transfig-3.2.4-r1.ebuild 1080
 MD5 db86c631cd0071efe757e7ea210f777c files/digest-transfig-3.2.3d-r1 67
 MD5 f9974d3952eb7a7aaef9145c8970f371 files/digest-transfig-3.2.4-r1 66
 MD5 4649eef8f14275cfba64c077532d6aad files/transfig-3.2.3d.patch 1532
diff --git a/media-gfx/transfig/files/digest-transfig-3.2.4 b/media-gfx/transfig/files/digest-transfig-3.2.4-r1
index 17c846fe1a15..17c846fe1a15 100644
--- a/media-gfx/transfig/files/digest-transfig-3.2.4
+++ b/media-gfx/transfig/files/digest-transfig-3.2.4-r1
diff --git a/media-gfx/transfig/files/transfig-3.2.4.patch b/media-gfx/transfig/files/transfig-3.2.4.patch
index 668a5eb70d12..c6507aa353ca 100644
--- a/media-gfx/transfig/files/transfig-3.2.4.patch
+++ b/media-gfx/transfig/files/transfig-3.2.4.patch
@@ -1,7 +1,21 @@
-diff -ru transfig.3.2.4/fig2dev/Imakefile.org transfig.3.2.4/fig2dev/Imakefile
---- transfig.3.2.4/fig2dev/Imakefile.org	2003-01-14 09:04:09.000000000 +0000
-+++ transfig.3.2.4/fig2dev/Imakefile	2003-01-14 09:04:18.000000000 +0000
-@@ -130,7 +130,7 @@
+diff -ru transfig.3.2.4/fig2dev/Imakefile new.transfig/fig2dev/Imakefile
+--- transfig.3.2.4/fig2dev/Imakefile	2002-12-19 12:33:44.000000000 -0500
++++ new.transfig/fig2dev/Imakefile	2003-04-18 10:07:14.000000000 -0400
+@@ -20,7 +20,7 @@
+ XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
+ XCOMM and installed xfig.
+ 
+-XFIGLIBDIR =	/usr/local/lib/X11/xfig
++XFIGLIBDIR =	/usr/lib/X11/xfig
+ 
+ XCOMM ******
+ XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
+@@ -126,11 +126,11 @@
+ 
+ #ifdef I18N
+ I18N_DEFS = -DI18N 
+-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
++FIG2DEV_LIBDIR = /usr/lib/X11/fig2dev
  I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
  
  install::
@@ -10,3 +24,24 @@ diff -ru transfig.3.2.4/fig2dev/Imakefile.org transfig.3.2.4/fig2dev/Imakefile
  	$(INSTALL) -c dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
  	( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \
  	  rm -f ja.ps ja_JP.ps ja_JP.ujis.ps ja_JP.eucJP.ps ja_JP.EUC.ps; \
+diff -ru transfig.3.2.4/fig2dev/Makefile.noimake new.transfig/fig2dev/Makefile.noimake
+--- transfig.3.2.4/fig2dev/Makefile.noimake	2002-12-18 17:58:00.000000000 -0500
++++ new.transfig/fig2dev/Makefile.noimake	2003-04-18 10:07:35.000000000 -0400
+@@ -830,7 +830,7 @@
+ # You should point XFIGLIBDIR to the same directory you did when you compiled
+ # and installed xfig.
+ 
+-XFIGLIBDIR =	/usr/local/lib/X11/xfig
++XFIGLIBDIR =	/usr/lib/X11/xfig
+ 
+ # ******
+ # If your system has the strerror() function (doesn't have sys_errlist) then
+@@ -925,7 +925,7 @@
+ # Comment out the next line if you have any problems with locale not being found
+ 
+ I18N_DEFS = -DI18N
+-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
++FIG2DEV_LIBDIR = /usr/lib/X11/fig2dev
+ I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
+ 
+ install::
diff --git a/media-gfx/transfig/transfig-3.2.4.ebuild b/media-gfx/transfig/transfig-3.2.4-r1.ebuild
index 7b7dd9cc48c3..a036ba620a4e 100644
--- a/media-gfx/transfig/transfig-3.2.4.ebuild
+++ b/media-gfx/transfig/transfig-3.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.4.ebuild,v 1.2 2003/02/13 12:38:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.4-r1.ebuild,v 1.1 2003/04/18 14:22:13 malverian Exp $
 
 MY_P=${P/transfig-/transfig.}
 S=${WORKDIR}/${MY_P}
@@ -19,13 +19,14 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/${P}.patch
 }
 
 src_compile() {
 	xmkmf || die
 	make Makefiles || die
-	make || die
+
+	emake || die
 }
 
 src_install() {