Removed executalbe permission and fixed location of misc files which are installed into XFIGLIBDIR, bug #221243 thank Volkmar Glauche for report.

(Portage version: 2.1.4.4)

5 files changed, 80 insertions, 169 deletions

diff --git a/media-gfx/transfig/ChangeLog b/media-gfx/transfig/ChangeLog
index 8812d9adaf22..0170f97a68c5 100644
--- a/media-gfx/transfig/ChangeLog
+++ b/media-gfx/transfig/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/transfig
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/ChangeLog,v 1.42 2007/07/22 07:25:51 pva Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/ChangeLog,v 1.43 2008/05/11 12:04:31 pva Exp $
+
+*transfig-3.2.5-r1 (11 May 2008)
+
+  11 May 2008; Peter Volkov <pva@gentoo.org>
+  -files/transfig-3.2.4-gcc-3.3.patch, -files/transfig-3.2.4.patch,
+  -transfig-3.2.4-r2.ebuild, +transfig-3.2.5-r1.ebuild:
+  Removed executalbe permission and fixed location of misc files which are
+  installed into XFIGLIBDIR, bug #221243 thank Volkmar Glauche for report.
 
   22 Jul 2007; <pva@gentoo.org> transfig-3.2.4-r2.ebuild,
   transfig-3.2.5.ebuild:
diff --git a/media-gfx/transfig/files/transfig-3.2.4-gcc-3.3.patch b/media-gfx/transfig/files/transfig-3.2.4-gcc-3.3.patch
deleted file mode 100644
index dd9f00a7e5f9..000000000000
--- a/media-gfx/transfig/files/transfig-3.2.4-gcc-3.3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruN transfig.3.2.4.orig/fig2dev/dev/gensvg.c transfig.3.2.4/fig2dev/dev/gensvg.c
---- transfig.3.2.4.orig/fig2dev/dev/gensvg.c	2003-06-24 23:13:43.000000000 +0200
-+++ transfig.3.2.4/fig2dev/dev/gensvg.c	2003-06-24 23:18:55.000000000 +0200
-@@ -692,16 +692,17 @@
-     if (t->angle != 0) {
- 	fprintf (tfp, "<g transform=\"translate(%d,%d) rotate(%d)\" >\n",
- 		 (int) (t->base_x * mag), (int) (t->base_y * mag), degrees (t->angle));
--	fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"  font-family=\"%s\" 
--		 font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
-+	fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\" "
-+		"font-family=\"%s\" font-style=\"%s\" font-weight=\"%s\" "
-+		"font-size=\"%d\" text-anchor=\"%s\" >\n",
- 		 rgbColorVal (t->color), family[(int) ceil ((t->font + 1) / 4)],
- 		 (t->font % 2 == 0 ? "normal" : "italic"),
- 		 (t->font % 4 < 2 ? "normal" : "bold"), (int) (ceil (t->size * 12 * mag)),
- 		 anchor[t->type]);
-     }
-     else
--	fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"  font-family=\"%s\" 
--		 font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
-+	fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"  font-family=\"%s\" "
-+	"font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
- 		 (int) (t->base_x * mag), (int) (t->base_y * mag), rgbColorVal (t->color),
- 		 family[(int) ceil ((t->font + 1) / 4)],
- 		 (t->font % 2 == 0 ? "normal" : "italic"),
-diff -ruN transfig.3.2.4.orig/fig2dev/fig2dev.h transfig.3.2.4/fig2dev/fig2dev.h
---- transfig.3.2.4.orig/fig2dev/fig2dev.h	2003-06-24 23:13:43.000000000 +0200
-+++ transfig.3.2.4/fig2dev/fig2dev.h	2003-06-24 23:14:31.000000000 +0200
-@@ -22,7 +22,7 @@
- #include <sys/file.h>
- #include <signal.h>
- #include <string.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include <pwd.h>
- #include <errno.h>
- #include <time.h>
diff --git a/media-gfx/transfig/files/transfig-3.2.4.patch b/media-gfx/transfig/files/transfig-3.2.4.patch
deleted file mode 100644
index fa33aa30689a..000000000000
--- a/media-gfx/transfig/files/transfig-3.2.4.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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 =	$(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 = $(LIBDIR)/fig2dev
- I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
- 
- install::
--	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(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 --git a/media-gfx/transfig/transfig-3.2.4-r2.ebuild b/media-gfx/transfig/transfig-3.2.4-r2.ebuild
deleted file mode 100644
index d6d5461b34ee..000000000000
--- a/media-gfx/transfig/transfig-3.2.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.4-r2.ebuild,v 1.18 2007/07/22 07:25:51 pva Exp $
-
-IUSE=""
-
-inherit toolchain-funcs eutils
-
-MY_P=${PN}.${PV}
-S=${WORKDIR}/${MY_P}
-SHAPE_P=shape-patch.${PV}-shape-1.1
-
-DESCRIPTION="A set of tools for creating TeX documents with graphics which can be printed in a wide variety of environments"
-SRC_URI="http://www.xfig.org/xfigdist/${MY_P}.tar.gz
-	http://www.ctan.org/tex-archive/graphics/transfig-shapepatch/${SHAPE_P}.tar.gz"
-HOMEPAGE="http://www.xfig.org"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-RDEPEND="x11-libs/libXpm
-	>=media-libs/jpeg-6
-	media-libs/libpng"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	app-text/rman"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
-	epatch ../${SHAPE_P}/${PN}.${SHAPE_P#*.}.patch	# bug #20877
-
-	# Apply gcc-3.3 patch for GCC 3.3 and above -- bug #110948
-	if [ "$(gcc-major-version)$(gcc-minor-version)" -ge "33" ];
-	then
-		epatch  ${FILESDIR}/${P}-gcc-3.3.patch
-	fi
-}
-
-src_compile() {
-	xmkmf || die "xmkmf failed"
-	make Makefiles || die "make Makefiles failed"
-
-	emake \
-		CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
-		BINDIR=/usr/bin LIBDIR=/usr/$(get_libdir) || die "emake failed"
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		BINDIR=/usr/bin \
-		LIBDIR=/usr/$(get_libdir) \
-		install || die
-
-	#Install docs
-	dodoc README CHANGES LATEX.AND.XFIG NOTES
-	dodoc ../${SHAPE_P}/shapepatch.README
-	doman doc/fig2dev.1
-	doman doc/fig2ps2tex.1
-	doman doc/pic2tpic.1
-}
diff --git a/media-gfx/transfig/transfig-3.2.5-r1.ebuild b/media-gfx/transfig/transfig-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..a5d960bc1da4
--- /dev/null
+++ b/media-gfx/transfig/transfig-3.2.5-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.5-r1.ebuild,v 1.1 2008/05/11 12:04:31 pva Exp $
+
+inherit toolchain-funcs eutils flag-o-matic
+
+MY_P=${PN}.${PV}
+
+DESCRIPTION="A set of tools for creating TeX documents with graphics which can be printed in a wide variety of environments"
+SRC_URI="http://xfig.org/software/xfig/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.xfig.org"
+IUSE=""
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="x11-libs/libXpm
+	>=media-libs/jpeg-6
+	media-libs/libpng"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	app-text/rman"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	find "${S}" -type f -exec chmod -x \{\} \;
+}
+
+sed_Imakefile() {
+	# see fig2dev/Imakefile for details
+	vars2subs="BINDIR=/usr/bin
+			MANDIR=/usr/share/man/man\$\(MANSUFFIX\)
+			XFIGLIBDIR=/usr/share/xfig
+			USEINLINE=-DUSE_INLINE
+			RGB=/usr/share/X11/rgb.txt
+			FIG2DEV_LIBDIR=/usr/share/fig2dev"
+
+	for variable in ${vars2subs} ; do
+		varname=${variable%%=*}
+		varval=${variable##*=}
+		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
+	done
+}
+
+src_compile() {
+	sed_Imakefile fig2dev/Imakefile fig2dev/dev/Imakefile
+
+	# without append transfig compiles with warining
+	# incompatible implicit declaration of built-in function ‘strlen’
+	# but are we really SVR4?
+	#append-flags -DSVR4
+	xmkmf || die "xmkmf failed"
+	make Makefiles || die "make Makefiles failed"
+
+	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
+	USRLIBDIR=/usr/$(get_libdir) || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" \
+		${transfig_conf} install install.man || die
+
+	#Install docs
+	dodoc README CHANGES LATEX.AND.XFIG NOTES
+}