close bug #25076

3 files changed, 57 insertions, 29 deletions

diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 56d8a1928b0b..31cdb5acba74 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,4 +1,4 @@
-MD5 edf46d7682559a667f57d18a2302e976 ChangeLog 1914
+MD5 b2cebc827ecf910c55ddb80eb41f5b8d ChangeLog 1917
 MD5 50afa532bad053ef4d322e0dbf0e2b30 transfig-3.2.3d-r1.ebuild 1079
 MD5 b380a2c5e2bc5560d66a8be2a87c47ed transfig-3.2.4-r1.ebuild 1265
 MD5 c79bb2d8e4e2c25d12c2420048c00baf metadata.xml 235
diff --git a/media-gfx/transfig/files/transfig-3.2.4.patch b/media-gfx/transfig/files/transfig-3.2.4.patch
index c6507aa353ca..fa33aa30689a 100644
--- a/media-gfx/transfig/files/transfig-3.2.4.patch
+++ b/media-gfx/transfig/files/transfig-3.2.4.patch
@@ -1,47 +1,66 @@
-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 @@
+--- fig2dev/Imakefile.orig	2002-12-19 12:33:44.000000000 -0500
++++ fig2dev/Imakefile	2003-07-22 13:38:50.000000000 -0500
+@@ -20,13 +20,13 @@
  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
++XFIGLIBDIR =	$(LIBDIR)/xfig
  
  XCOMM ******
  XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
+ XCOMM comment out NEED_STRERROR with an XCOMM comment.
+ 
+-NEED_STRERROR = -DNEED_STRERROR
++XCOMM NEED_STRERROR = -DNEED_STRERROR
+ 
+ XCOMM The following probably only applies to Windows 9x/NT:
+ XCOMM If your system can open files in text and binary modes and has the
+@@ -39,7 +39,7 @@
+ XCOMM inline functions. With the "INLINE" keyword, you should notice that
+ XCOMM the display will be a bit faster in complex figures
+ 
+-XCOMM USEINLINE = -DUSE_INLINE
++USEINLINE = -DUSE_INLINE
+ 
+ XCOMM ****************
+ XCOMM Change RGB if necessary, to point to your rgb.txt color database
+@@ -60,8 +60,8 @@
+ XCOMM are in different places
+ 
+ #ifdef USEPNG
+-PNGLIBDIR = $(USRLIBDIR)
+-PNGINC = -I/usr/include/X11
++PNGLIBDIR = $(SYSTEMUSRLIBDIR)
++PNGINC = -I$(SYSTEMUSRINCDIR)/libpng
+ #endif
+ 
+ XCOMM ****************
+@@ -73,11 +73,11 @@
+ XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
+ XCOMM
+ 
+-XCOMM #define USEXPM
++#define USEXPM
+ 
+ #ifdef USEXPM
+ XPMLIBDIR = $(USRLIBDIR)
+-XPMINC = -I/usr/include/X11
++XPMINC = -I$(INCDIR)/X11
+ #endif
+ 
+ XCOMM ****************
 @@ -126,11 +126,11 @@
  
  #ifdef I18N
  I18N_DEFS = -DI18N 
 -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
-+FIG2DEV_LIBDIR = /usr/lib/X11/fig2dev
++FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
  I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
  
  install::
 -	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR)
-+	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir -p $(DESTDIR)$(FIG2DEV_LIBDIR)
++	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || $(MKDIRHIER) $(DESTDIR)$(FIG2DEV_LIBDIR)
  	$(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/metadata.xml b/media-gfx/transfig/metadata.xml
new file mode 100644
index 000000000000..79ff27482bb0
--- /dev/null
+++ b/media-gfx/transfig/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer>
+		<email>malverian@gentoo.org</email>
+		<name>Philip Walls</name>
+	</maintainer>
+</pkgmetadata>