Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/transfig/files/, media-gfx/transfig/
Date: Sun, 15 Oct 2017 12:36:31
Message-Id: 1508070957.719850e2247470ab48181d95e8c2518f9d97cfde.mgorny@gentoo
1 commit: 719850e2247470ab48181d95e8c2518f9d97cfde
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 15 12:02:57 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 15 12:35:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719850e2
7
8 media-gfx/transfig: Move patches to a dist tarball
9
10 Closes: https://bugs.gentoo.org/620582
11
12 media-gfx/transfig/Manifest | 2 +
13 .../transfig/files/transfig-3.2.5-solaris.patch | 12 -
14 .../files/transfig-3.2.5c-maxfontsize.patch | 44 -
15 .../transfig/files/transfig-3.2.5d-MAXWIDTH.patch | 19 -
16 .../files/transfig-3.2.5d-fig2mpdf-r1.patch | 1425 --------------------
17 .../transfig/files/transfig-3.2.5d-leadspace.patch | 19 -
18 .../files/transfig-3.2.5d-libpng-1.5.patch | 39 -
19 .../transfig/files/transfig-3.2.5d-precision.patch | 45 -
20 .../transfig-3.2.5e-fprintf_format_warnings.patch | 55 -
21 .../files/transfig-3.2.5e-man-hyphen.patch | 530 --------
22 .../transfig/files/transfig-3.2.5e-typos.patch | 25 -
23 media-gfx/transfig/files/transfig-ru_RU.CP1251.ps | 298 ----
24 media-gfx/transfig/files/transfig-ru_RU.KOI8-R.ps | 298 ----
25 media-gfx/transfig/files/transfig-uk_UA.KOI8-U.ps | 298 ----
26 media-gfx/transfig/transfig-3.2.5d-r1.ebuild | 25 +-
27 media-gfx/transfig/transfig-3.2.5e.ebuild | 21 +-
28 16 files changed, 26 insertions(+), 3129 deletions(-)
29
30 diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
31 index ba4354a3157..283d4616f91 100644
32 --- a/media-gfx/transfig/Manifest
33 +++ b/media-gfx/transfig/Manifest
34 @@ -1,3 +1,5 @@
35 DIST fig2mpdf-1.1.2.tar.bz2 191438 SHA256 35f02293592244d5ff4a7a60e00023696c05dec855495871226c67669ba4daf3 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 WHIRLPOOL 73f98e0c8f26a0a9f5a06ba38169a107587dd09ecce69c69d251d46274697db7a1923479030693bf9079705820ce67b3df62d0de54492039acd0ac71f4f22fa7
36 +DIST transfig-3.2.5d-gentoo-patchset.tar.bz2 17114 SHA256 26ce2d8cab3d9dd9f2ba1fa628dbfce0b938511a71fd793cdbb31af9ce4ab9a7 SHA512 fc6a4cff49312a5f70b7ddf655d6c96f47512dadce0acc2bb2e2ffa568a48e735560d773b70905900e6ab5e2ec36eac13eafa8ff2d413ea4e0ff126eefe909d8 WHIRLPOOL 8fef27c4d1e86b60ed4f83cce7c2e06b17bcdc980b26bb1a455399ff27dc36b53a182d0c042a7ce0a46e333f3e3dc24283751e8432f24e1232aa106ae6ac963b
37 +DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 SHA256 47cba917dee66b1a8a3fe97c8658000acd66aee378a65537ce29bee6aae16162 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97 WHIRLPOOL 6fba3859fb8768f56cd9bea6acbdd2a0855b285c1a513f05ee7ab50e8651fcf7f262abb7b52167c84dedffd4472cb0f37f2ca38cda91e03e24e289b1984f14f3
38 DIST transfig.3.2.5d.tar.gz 497451 SHA256 ae81214177fb05f91f6e43b0b42633b6e0024570cbc6591a3858e12100ce8aaa SHA512 6e9b9551bf3bff7a94d6a0d8bac336c36b2721f9babc4cf38472737ac737afd27f93dcb012e510d6c439c6aaeed95ba03b19508b4229386915c0dc0751daac10 WHIRLPOOL ca503a9ba228f54d20a6771dfca9dd0e6bb127618db8bc94bf1a62149e007627786fe2eee8f15a47723781d8381950cfac97264b5846550f7c669a8d8c82a1f2
39 DIST transfig.3.2.5e.tar.gz 531256 SHA256 8ec5a8f13254dd155622ed3ee0fda1382b1e2b5882d83b9aca1871f12a3e7744 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e WHIRLPOOL a781dd6fd85ff7ff12219444a8fbc91fc8c7f6fe1b4628cc1fd6bb3feae29392edc62a8f3a4db0945bdf2e67a67af7046864826024acdbaa8a8581a873cdb82f
40
41 diff --git a/media-gfx/transfig/files/transfig-3.2.5-solaris.patch b/media-gfx/transfig/files/transfig-3.2.5-solaris.patch
42 deleted file mode 100644
43 index 680a0591f1c..00000000000
44 --- a/media-gfx/transfig/files/transfig-3.2.5-solaris.patch
45 +++ /dev/null
46 @@ -1,12 +0,0 @@
47 -Fixes complation error on both Darwin and Solaris
48 -
49 ---- fig2dev/fig2dev.h
50 -+++ fig2dev/fig2dev.h
51 -@@ -20,6 +20,7 @@
52 - #include "patchlevel.h"
53 - #include <math.h>
54 - #include <sys/file.h>
55 -+#include <sys/stat.h>
56 - #include <signal.h>
57 - #include <string.h>
58 - #include <pwd.h>
59
60 diff --git a/media-gfx/transfig/files/transfig-3.2.5c-maxfontsize.patch b/media-gfx/transfig/files/transfig-3.2.5c-maxfontsize.patch
61 deleted file mode 100644
62 index 9ce105fe935..00000000000
63 --- a/media-gfx/transfig/files/transfig-3.2.5c-maxfontsize.patch
64 +++ /dev/null
65 @@ -1,44 +0,0 @@
66 -#! /bin/sh /usr/share/dpatch/dpatch-run
67 -## 09_maxfontsize.dpatch by Roland Rosenfeld <roland@××××××.org>
68 -##
69 -## All lines beginning with `## DP:' are a description of the patch.
70 -## DP: For fonts >=42pt use the given font size in TeX instead of
71 -## DP: restricting this to 42pt. This allows to create posters using
72 -## DP: \usepackage{type1cm}. See
73 -## DP: http://linuxgazette.vlsm.org/issue96/artime.html and Bug#343139
74 -
75 -@DPATCH@
76 -diff -urNad transfig~/LATEX.AND.XFIG transfig/LATEX.AND.XFIG
77 ---- transfig~/LATEX.AND.XFIG
78 -+++ transfig/LATEX.AND.XFIG
79 -@@ -55,7 +55,7 @@
80 - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LaTeX Preamble %%%%%%%%%%%%%%%%%%%%%%%%%
81 - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
82 -
83 --\documentstyle[12pt,bezier,amstex]{article} % include bezier curves
84 -+\documentclass[12pt,bezier,amstex]{article} % include bezier curves
85 - \renewcommand\baselinestretch{1.0} % single space
86 - \pagestyle{empty} % no headers and page numbers
87 - \oddsidemargin -10 true pt % Left margin on odd-numbered pages.
88 -@@ -72,7 +72,9 @@
89 - \usepackage{epsfig}
90 -
91 - \usepackage{graphicx} % Graphics package
92 --
93 -+
94 -+\usepackage{type1cm} % Necessary for fonts bigger than 42pt
95 -+
96 - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
97 - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Document Beginning %%%%%%%%%%%%%%%%%%%%%
98 - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
99 -diff -urNad transfig~/fig2dev/dev/texfonts.h transfig/fig2dev/dev/texfonts.h
100 ---- transfig~/fig2dev/dev/texfonts.h
101 -+++ transfig/fig2dev/dev/texfonts.h
102 -@@ -86,6 +86,7 @@
103 -
104 - #define TEXFONTSIZE(S) (texfontsizes[((S) <= MAXFONTSIZE) ? (int)(round(S))\
105 - : (MAXFONTSIZE-1)])
106 -+#define TEXFONTSIZE(S) (((S) <= MAXFONTSIZE) ? texfontsizes[(int)(round(S))] : (S))
107 - #define TEXFONTMAG(T) TEXFONTSIZE(T->size*(rigid_text(T) ? 1.0 : fontmag))
108 -
109 - void setfigfont( F_text *text ); /* genepic.c */
110
111 diff --git a/media-gfx/transfig/files/transfig-3.2.5d-MAXWIDTH.patch b/media-gfx/transfig/files/transfig-3.2.5d-MAXWIDTH.patch
112 deleted file mode 100644
113 index 3ac14818655..00000000000
114 --- a/media-gfx/transfig/files/transfig-3.2.5d-MAXWIDTH.patch
115 +++ /dev/null
116 @@ -1,19 +0,0 @@
117 -#! /bin/sh /usr/share/dpatch/dpatch-run
118 -## 23_MAXWIDTH.dpatch by Roland Rosenfeld <roland@××××××.org>
119 -##
120 -## All lines beginning with `## DP:' are a description of the patch.
121 -## DP: Increasese MAXWIDTH of embedded images from 8K to 16K (Closes: #610466)
122 -
123 -@DPATCH@
124 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/dev/psencode.c transfig/fig2dev/dev/psencode.c
125 ---- transfig~/fig2dev/dev/psencode.c
126 -+++ transfig/fig2dev/dev/psencode.c
127 -@@ -18,7 +18,7 @@
128 -
129 - #include "fig2dev.h"
130 -
131 --#define MAXWIDTH 8192
132 -+#define MAXWIDTH 16384
133 -
134 - #define put_string nc=strlen(s); for(i=0;i<nc;i++) (putc((s[i]),tfp)); Nbyte += nc
135 -
136
137 diff --git a/media-gfx/transfig/files/transfig-3.2.5d-fig2mpdf-r1.patch b/media-gfx/transfig/files/transfig-3.2.5d-fig2mpdf-r1.patch
138 deleted file mode 100644
139 index 879b4471254..00000000000
140 --- a/media-gfx/transfig/files/transfig-3.2.5d-fig2mpdf-r1.patch
141 +++ /dev/null
142 @@ -1,1425 +0,0 @@
143 -#! /bin/sh /usr/share/dpatch/dpatch-run
144 -## 14_fig2mpdf.dpatch by Michael Pfeiffer <p3fff@×××.de>
145 -##
146 -## All lines beginning with `## DP:' are a description of the patch.
147 -
148 -## DP: creating multilayered or singlelayer PDF or EPS figures for
149 -## DP: including into LaTeX documents.
150 -## DP: http://p3f.gmxhome.de/fig2mpdf/fig2mpdf.html
151 -
152 -@DPATCH@
153 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/doc/fig2dev.1 transfig/doc/fig2dev.1
154 ---- transfig~/doc/fig2dev.1
155 -+++ transfig/doc/fig2dev.1
156 -@@ -53,8 +53,8 @@
157 - \fBbox, cgm, epic, eepic, eepicemu, emf, eps, gbx (Gerber beta driver), gif, ibmgl, jpeg,
158 - latex, map (HTML image map), mf (MetaFont),
159 - mp (MetaPost), mmp (Multi-MetaPost),
160 --pcx, pdf, pdftex, pdftex_t, pic, pictex, png, ppm, ps,
161 --pstex, pstex_t, pstricks, ptk (Perl/tk),
162 -+pcx, pdf, pdftex, pdftex_t, pdftex_p, pic, pictex, png, ppm, ps,
163 -+pstex, pstex_t, pstex_p, pstricks, ptk (Perl/tk),
164 - shape (LaTeX shaped paragraphs), sld (AutoCad slide format),
165 - svg (beta driver), textyl,
166 - tiff, tk (tcl/tk), tpic, xbm and
167 -@@ -1062,6 +1062,62 @@
168 - font. Option 1 sets LaTeX font size only. Option 2 issues no font
169 - commands at all.
170 -
171 -+.SH PSTEX_P and PDFTEX_P OPTIONS
172 -+The \fBpstex_p\fR language has the same intention as
173 -+the combination of \fBpstex\fR and \fBpstex_t\fR.
174 -+The only reason to use \fBpstex_p\fR is that you have partially overlayed texts.
175 -+\fBpstex_p\fR splits the Fig file concerning the depths of existing texts. Because
176 -+of it's necessary to get the resulting size of the figure for the pdf document
177 -+you have to specify the target document format
178 -+(i.e. using \fBpstex_p\fR rsp. \fBpdftex_p\fR).
179 -+.br
180 -+Two files results by using this language:
181 -+.br
182 -+.HP +.3i
183 -+1) A bash script for creating and removing the necessary graphics files.
184 -+Extension: \fB.create\fR
185 -+.HP +.3i
186 -+.HP +.3i
187 -+2) The latex code which includes all graphics files and special texts. Content is
188 -+put to stdout.
189 -+
190 -+.TP
191 -+The \fBpstex_p\fR driver has the following special options:
192 -+
193 -+.TP
194 -+.B \-p basename
195 -+specifies the basename of the files to be created (see (1) above). This option
196 -+is mandatory.
197 -+.TP
198 -+.B "\-d dmag"
199 -+Set a separate magnification for the length of line dashes to
200 -+.I dmag.
201 -+.TP
202 -+.B \-E num
203 -+Set encoding for latex text translation (0 no translation, 1 ISO-8859-1, 2 ISO-8859-2)
204 -+.TP
205 -+.B "\-l lwidth"
206 -+Sets the threshold between LaTeX thin and thick lines to
207 -+.I lwidth
208 -+pixels.
209 -+LaTeX supports only two different line width: \\thinlines and \\thicklines.
210 -+Lines of width greater than
211 -+.I lwidth
212 -+pixels are drawn as \\thicklines.
213 -+Also affects the size of dots in dotted line style.
214 -+The default is 1.
215 -+.TP
216 -+.B \-v
217 -+Verbose mode.
218 -+.TP
219 -+.B \-F
220 -+Don't set the font face, series, and style; only set it's size and the
221 -+baselineskip. By default, fig2dev sets all 5 font parameters when it
222 -+puts some text. The disadvantage is that you can't set the font from your
223 -+LaTeX document. With this option on, you can set the font from your LaTeX
224 -+document (like "\fB\\sfshape \\input picture.eepic\fR").
225 -+
226 -+
227 - .SH TK and PTK OPTIONS (tcl/tk and Perl/tk)
228 - .TP
229 - .B \-l dummy_arg
230 -@@ -1107,6 +1163,13 @@
231 - .PP
232 - Rotated text is only supported in the IBM-GL (HP/GL) and PostScript (including eps)
233 - languages.
234 -+.PP
235 -+In \fBpdftex_p\fR language \fIfig2dev\fR can not determine the exact sizes of
236 -+the special texts set by pdflatex afterwards. If these texts are bigger than
237 -+expected the calculated bounding box might be too small so that some texts passes
238 -+over the figure boundaries. If this happen you have to put an invisible
239 -+rectangle (line width 0) around the text or the entire figure.
240 -+
241 - .SH COPYRIGHT
242 - Copyright (c) 1991 Micah Beck
243 - .br
244 -@@ -1187,3 +1250,7 @@
245 - The GBX (Gerber) driver was written by
246 - .br
247 - Edward Grace (ej.grace@×××××××××××.uk).
248 -+.sp
249 -+The PSTEX_P and PDFTEX_P drivers (overlayed LaTeX texts) was written by
250 -+.br
251 -+Michael Pfeiffer (p3f@×××.de)
252 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/dev/genpstex.c transfig/fig2dev/dev/genpstex.c
253 ---- transfig~/fig2dev/dev/genpstex.c
254 -+++ transfig/fig2dev/dev/genpstex.c
255 -@@ -70,7 +70,307 @@
256 - genps_end ();
257 -
258 - static char pstex_file[1000] = "";
259 -+static int iObjectsRead = 0;
260 -+static int iTextRead = 0;
261 -+static int iObjectsFileNumber = 0;
262 -+static int iStartDepth;
263 -+static int iLastDepth;
264 -+static FILE * ptCreateFile;
265 -+static char szFileName[1000];
266 -+static int iLength;
267 -+static int iPdfOutputs = 0;
268 -+
269 -+#ifdef never
270 -+static double unitlength;
271 -+static double dash_mag = 1.0;
272 -+
273 -+static int (*translate_coordinates)() = NULL;
274 -+static int (*translate_coordinates_d)() = NULL;
275 -+#else
276 -+extern double unitlength;
277 -+extern double dash_mag;
278 -+
279 -+extern int (*translate_coordinates)();
280 -+extern int (*translate_coordinates_d)();
281 -+#endif
282 -+
283 -+#define TOP 840
284 -+#define SWAP(x,y) {tmp=x; x=y; y=tmp;}
285 -+#define TRANS(x,y) (*translate_coordinates)(&x,&y)
286 -+#define TRANS2(x1,y1,x2,y2) (*translate_coordinates)(&x1,&y1); \
287 -+ (*translate_coordinates)(&x2,&y2)
288 -+#define TRANSD(x,y) (*translate_coordinates_d)(&x,&y)
289 -+
290 -+static void genpstex_p_finalize_objects(int depth);
291 -+
292 -+/*************************************************************************
293 -+ *************************************************************************/
294 -+static
295 -+translate2(xp, yp)
296 -+ int *xp, *yp;
297 -+{
298 -+ *xp = *xp + 1;
299 -+ *yp = (double)(TOP - *yp -1);
300 -+ }
301 -+
302 -+static
303 -+translate1_d(xp, yp)
304 -+ double *xp, *yp;
305 -+{
306 -+ *xp = *xp + 1.0;
307 -+ *yp = *yp + 1.0;
308 -+ }
309 -+
310 -+static
311 -+translate2_d(xp, yp)
312 -+ double *xp, *yp;
313 -+{
314 -+ *xp = *xp + 1.0;
315 -+ *yp = (double)TOP - *yp -1.0;
316 -+ }
317 -+
318 -+/*************************************************************************
319 -+ *************************************************************************/
320 -+void genpstex_p_option(opt, optarg)
321 -+char opt, *optarg;
322 -+{
323 -+ if (opt == 'p')
324 -+ {
325 -+ strcpy(pstex_file, optarg);
326 -+ }
327 -+ else
328 -+ genlatex_option(opt, optarg);
329 -+}
330 -+
331 -+
332 -+/*************************************************************************
333 -+ *************************************************************************/
334 -+void genpstex_p_start(objects)
335 -+ F_compound *objects;
336 -+{
337 -+ int tmp;
338 -+ struct stat tStat;
339 -+ long lUnitLength;
340 -+
341 -+ if (*pstex_file == '\0')
342 -+ {
343 -+ put_msg("Argument -p is mandatory to pstex_p.");
344 -+ exit(1);
345 -+ }
346 -+
347 -+ strncpy(szFileName, pstex_file, 900);
348 -+ iLength = strlen(szFileName);
349 -+
350 -+ sprintf(szFileName + iLength, ".create");
351 -+ ptCreateFile = fopen (szFileName, "wb");
352 -+
353 -+ if ( ! ptCreateFile)
354 -+ {
355 -+ put_msg("Couldn't open %s for writing", szFileName);
356 -+ exit(1);
357 -+ }
358 -+ fstat(fileno(ptCreateFile), & tStat);
359 -+ fchmod (fileno(ptCreateFile), tStat.st_mode | ((tStat.st_mode & (S_IRUSR | S_IRGRP | S_IROTH)) >> 2));
360 -+ fprintf(ptCreateFile, "#!/bin/bash\n\n", szFileName);
361 -+
362 -+ fprintf(ptCreateFile, "while getopts \"r\" Option\n");
363 -+ fprintf(ptCreateFile, "do\n");
364 -+ fprintf(ptCreateFile, " case $Option in\n");
365 -+ fprintf(ptCreateFile, " r) iOptRemove=1;;\n");
366 -+ fprintf(ptCreateFile, " *) echo \"illegal option -$Option\"\n");
367 -+ fprintf(ptCreateFile, " esac\n");
368 -+ fprintf(ptCreateFile, "done\n");
369 -+ fprintf(ptCreateFile, "shift $(($OPTIND - 1))\n");
370 -+
371 -+ texfontsizes[0] = texfontsizes[1] =
372 -+ TEXFONTSIZE(font_size != 0.0? font_size : DEFAULT_FONT_SIZE);
373 -+
374 -+ unitlength = mag/ppi;
375 -+ dash_mag /= unitlength*80.0;
376 -+
377 -+ translate_coordinates = translate2;
378 -+ translate_coordinates_d = translate2_d;
379 -+
380 -+ TRANS2(llx, lly, urx, ury);
381 -+ if (llx > urx) SWAP(llx, urx)
382 -+ if (lly > ury) SWAP(lly, ury)
383 -+
384 -+ /* LaTeX start */
385 -+
386 -+ /* print any whole-figure comments prefixed with "%" */
387 -+ if (objects->comments) {
388 -+ fprintf(tfp,"%%\n");
389 -+ print_comments("% ",objects->comments, "");
390 -+ fprintf(tfp,"%%\n");
391 -+ }
392 -+
393 -+ lUnitLength = (long) (round(4736286.72*unitlength));
394 -+ fprintf(tfp, "\\setlength{\\unitlength}{%lisp}%%\n",
395 -+ lUnitLength);
396 -+ /* define the SetFigFont macro */
397 -+ define_setfigfont(tfp);
398 -+
399 -+ sprintf(szFileName + iLength, ".size");
400 -+ fprintf(ptCreateFile, "if [ \"$iOptRemove\" == \"\" ]; then\n");
401 -+ if (iPdfOutputs)
402 -+ fprintf(ptCreateFile, " echo \"\\setlength\\pdfpagewidth{%3.2fpt}\\setlength\\pdfpageheight{%3.2fpt}\" > %s\n",
403 -+ (float) lUnitLength / 65536 * (urx - llx), (float) lUnitLength / 65536 * (ury - lly), szFileName);
404 -+ else
405 -+ fprintf(ptCreateFile, "echo -n\"\" > %s\n", szFileName);
406 -+ fprintf(ptCreateFile, "else\n rm -f %s\nfi\n", szFileName);
407 -+}
408 -+
409 -+/*************************************************************************
410 -+ *************************************************************************/
411 -+void genpdftex_p_start(objects)
412 -+ F_compound *objects;
413 -+{
414 -+ iPdfOutputs = 1;
415 -+ genpstex_p_start(objects);
416 -+}
417 -+
418 -+
419 -+/*************************************************************************
420 -+ *************************************************************************/
421 -+int genpstex_p_end()
422 -+{
423 -+ if (iTextRead)
424 -+ {
425 -+ fprintf(tfp, "\\end{picture}%%\n");
426 -+ iTextRead = 0;
427 -+ }
428 -+ if (iObjectsRead)
429 -+ {
430 -+ genpstex_p_finalize_objects(iLastDepth);
431 -+ iObjectsRead = 0;
432 -+ }
433 -+
434 -+ /* LaTeX ending */
435 -+ fprintf(tfp, "\\begin{picture}(%d,%d)\n", urx-llx, ury-lly);
436 -+ fprintf(tfp, "\\end{picture}%%\n");
437 -+
438 -+ fclose(ptCreateFile);
439 -+
440 -+ /* all ok */
441 -+ return 0;
442 -+}
443 -+
444 -+
445 -+/*************************************************************************
446 -+ *************************************************************************/
447 -+void genpstex_p_finalize_objects(depth)
448 -+int depth;
449 -+{
450 -+ char szFileName[1000];
451 -+ int iLength;
452 -+
453 -+ strncpy(szFileName, pstex_file, 900);
454 -+ iLength = strlen(szFileName);
455 -+
456 -+
457 -+ sprintf(szFileName + iLength, "%03d", iObjectsFileNumber++);
458 -+ fprintf(ptCreateFile, "if [ \"$iOptRemove\" == \"\" ]; then\n");
459 -+ if (iPdfOutputs)
460 -+ {
461 -+ fprintf(ptCreateFile, " %s -L pstex -D +%d,%d %s", prog, depth, iStartDepth, from, szFileName);
462 -+ fprintf(ptCreateFile, " | epstopdf -f > %s.pdf\n", szFileName, szFileName);
463 -+ }
464 -+ else
465 -+ fprintf(ptCreateFile, "%s -L pstex -D +%d,%d %s %s.eps\n", prog, depth, iStartDepth, from, szFileName);
466 -+ fprintf(ptCreateFile, "else\n rm -f %s.", szFileName);
467 -+ if (iPdfOutputs)
468 -+ fprintf(ptCreateFile, "pdf");
469 -+ else
470 -+ fprintf(ptCreateFile, "eps");
471 -+ fprintf(ptCreateFile, "\nfi\n");
472 -+
473 -+ fprintf(tfp, "\\begin{picture}(0,0)%%\n");
474 -+/* newer includegraphics directive suggested by Stephen Harker 1/13/99 */
475 -+#if defined(LATEX2E_GRAPHICS)
476 -+# if defined(EPSFIG)
477 -+ fprintf(tfp, "\\epsfig{file=%s.eps}%%\n",szFileName);
478 -+# else
479 -+ fprintf(tfp, "\\includegraphics{%s}%%\n",szFileName);
480 -+# endif
481 -+#else
482 -+ fprintf(tfp, "\\special{psfile=%s.eps}%%\n",szFileName);
483 -+#endif
484 -+ fprintf(tfp, "\\end{picture}%%\n");
485 -+}
486 -+
487 -+/*************************************************************************
488 -+ *************************************************************************/
489 -+void genpstex_p_object(depth)
490 -+int depth;
491 -+{
492 -+ if (iTextRead)
493 -+ {
494 -+ fprintf(tfp, "\\end{picture}%%\n");
495 -+ iTextRead = 0;
496 -+ }
497 -+ if (iObjectsRead == 0)
498 -+ {
499 -+ iStartDepth = depth;
500 -+ iObjectsRead = 1;
501 -+ }
502 -+ iLastDepth = depth;
503 -+
504 -+}
505 -
506 -+void genpstex_p_arc(obj)
507 -+F_arc *obj;
508 -+{
509 -+ genpstex_p_object(obj->depth);
510 -+}
511 -+
512 -+
513 -+void genpstex_p_ellipse(obj)
514 -+F_ellipse *obj;
515 -+{
516 -+ genpstex_p_object(obj->depth);
517 -+}
518 -+
519 -+void genpstex_p_line(obj)
520 -+F_line *obj;
521 -+{
522 -+ genpstex_p_object(obj->depth);
523 -+}
524 -+
525 -+void genpstex_p_spline(obj)
526 -+F_spline *obj;
527 -+{
528 -+ genpstex_p_object(obj->depth);
529 -+}
530 -+
531 -+
532 -+
533 -+/*************************************************************************
534 -+ *************************************************************************/
535 -+void genpstex_p_text(t)
536 -+F_text *t;
537 -+{
538 -+
539 -+ if (!special_text(t))
540 -+ genpstex_p_object(t->depth);
541 -+ else
542 -+ {
543 -+ if (iObjectsRead)
544 -+ {
545 -+ genpstex_p_finalize_objects(iLastDepth);
546 -+ iObjectsRead = 0;
547 -+ }
548 -+ if (iTextRead == 0)
549 -+ {
550 -+ fprintf(tfp, "\\begin{picture}(0,0)(%d,%d)\n", llx, lly);
551 -+ iTextRead = 1;
552 -+ }
553 -+ genlatex_text(t);
554 -+ }
555 -+
556 -+}
557 -+
558 -+/*************************************************************************
559 -+ *************************************************************************/
560 - void genpstex_t_option(opt, optarg)
561 - char opt, *optarg;
562 - {
563 -@@ -112,6 +412,8 @@
564 - else genlatex_text(t);
565 - }
566 -
567 -+/*************************************************************************
568 -+ *************************************************************************/
569 - void genpstex_text(t)
570 - F_text *t;
571 - {
572 -@@ -128,6 +430,32 @@
573 - genlatex_option(opt, optarg);
574 - }
575 -
576 -+struct driver dev_pstex_p = {
577 -+ genpstex_p_option,
578 -+ genpstex_p_start,
579 -+ gendev_null,
580 -+ genpstex_p_arc,
581 -+ genpstex_p_ellipse,
582 -+ genpstex_p_line,
583 -+ genpstex_p_spline,
584 -+ genpstex_p_text,
585 -+ genpstex_p_end,
586 -+ INCLUDE_TEXT
587 -+};
588 -+
589 -+struct driver dev_pdftex_p = {
590 -+ genpstex_p_option,
591 -+ genpdftex_p_start,
592 -+ gendev_null,
593 -+ genpstex_p_arc,
594 -+ genpstex_p_ellipse,
595 -+ genpstex_p_line,
596 -+ genpstex_p_spline,
597 -+ genpstex_p_text,
598 -+ genpstex_p_end,
599 -+ INCLUDE_TEXT
600 -+};
601 -+
602 - struct driver dev_pstex_t = {
603 - genpstex_t_option,
604 - genpstex_t_start,
605 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/drivers.h transfig/fig2dev/drivers.h
606 ---- transfig~/fig2dev/drivers.h
607 -+++ transfig/fig2dev/drivers.h
608 -@@ -30,8 +30,10 @@
609 - extern struct driver dev_pdf;
610 - extern struct driver dev_pdftex;
611 - extern struct driver dev_pdftex_t;
612 -+extern struct driver dev_pdftex_p;
613 - extern struct driver dev_pstex;
614 - extern struct driver dev_pstex_t;
615 -+extern struct driver dev_pstex_p;
616 - extern struct driver dev_pstricks;
617 - extern struct driver dev_textyl;
618 - extern struct driver dev_tk;
619 -@@ -75,6 +77,7 @@
620 - {"pdf", &dev_pdf},
621 - {"pdftex", &dev_pdftex},
622 - {"pdftex_t", &dev_pdftex_t},
623 -+ {"pdftex_p", &dev_pdftex_p},
624 - {"pic", &dev_pic},
625 - {"pictex", &dev_pictex},
626 - {"png", &dev_bitmaps},
627 -@@ -82,6 +85,7 @@
628 - {"ps", &dev_ps},
629 - {"pstex", &dev_pstex},
630 - {"pstex_t", &dev_pstex_t},
631 -+ {"pstex_p", &dev_pstex_p},
632 - {"pstricks", &dev_pstricks},
633 - {"ptk", &dev_ptk},
634 - {"shape", &dev_shape},
635 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/fig2dev.c transfig/fig2dev/fig2dev.c
636 ---- transfig~/fig2dev/fig2dev.c
637 -+++ transfig/fig2dev/fig2dev.c
638 -@@ -651,6 +651,18 @@
639 - #endif /* NFSS */
640 - printf(" -p name name of the PostScript file to be overlaid\n");
641 -
642 -+ printf("PSTEX_P and PDFTEX_P Options:\n");
643 -+ printf(" -p name basename of the files to be created\n");
644 -+#ifdef NFSS
645 -+ printf(" -F don't set font family/series/shape, so you can\n");
646 -+ printf(" set it from latex\n");
647 -+#endif /* NFSS */
648 -+ printf(" -d dmag set separate magnification for length of line dashes to dmag\n");
649 -+ printf(" -E num set encoding for text translation (0 no translation,\n");
650 -+ printf(" 1 ISO-8859-1, 2 ISO-8859-2)\n");
651 -+ printf(" -l lwidth set threshold between thin and thick lines to lwidth\n");
652 -+ printf(" -v verbose mode\n");
653 -+
654 - printf("SHAPE (ShapePar driver) Options:\n");
655 - printf(" -n name Set basename of the macro (e.g. \"face\" gives faceshape and facepar)\n");
656 - printf("Tcl/Tk (tk) and Perl/Tk (ptk) Options:\n");
657 -@@ -778,6 +790,12 @@
658 - int rec_comp(r1, r2)
659 - struct obj_rec *r1, *r2;
660 - {
661 -+ if (r2->depth == r1->depth)
662 -+ {
663 -+ if ((r1->gendev == dev->text) ^ (r2->gendev == dev->text))
664 -+ return ((r1->gendev == dev->text) * 2 - 1);
665 -+ return (0);
666 -+ }
667 - return (r2->depth - r1->depth);
668 - }
669 -
670 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2mpdf/copyright.txt transfig/fig2mpdf/copyright.txt
671 ---- transfig~/fig2mpdf/copyright.txt
672 -+++ transfig/fig2mpdf/copyright.txt
673 -@@ -0,0 +1,25 @@
674 -+The following files contain copyright and license info for
675 -+the code they contain:
676 -+fig2mpdf, fig2mpdf.1, transfig.3.2.4.patch, transfig-3.2.5-alpha7.patch
677 -+
678 -+-- fig2mpdf copyright begins here --
679 -+
680 -+ fig2mpdf/pdftex_p and pstex_p driver of fig2dev
681 -+ Copyright (C) 2006 Michael Pfeiffer -- p3fff@×××.de
682 -+
683 -+ This program is free software; you can redistribute it and/or modify
684 -+ it under the terms of the GNU General Public License as published by
685 -+ the Free Software Foundation; either version 2 of the License, or
686 -+ (at your option) any later version.
687 -+
688 -+ This program is distributed in the hope that it will be useful,
689 -+ but WITHOUT ANY WARRANTY; without even the implied warranty of
690 -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
691 -+ GNU General Public License for more details.
692 -+
693 -+ You should have received a copy of the GNU General Public License
694 -+ along with this program; if not, write to the Free Software
695 -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
696 -+
697 -+ (Author's note: the license is in the file gpl.txt, which is included
698 -+ in the archive.)
699 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2mpdf/fig2mpdf transfig/fig2mpdf/fig2mpdf
700 ---- transfig~/fig2mpdf/fig2mpdf
701 -+++ transfig/fig2mpdf/fig2mpdf
702 -@@ -0,0 +1,653 @@
703 -+#!/bin/sh
704 -+
705 -+unset POSIXLY_CORRECT
706 -+
707 -+gawk '
708 -+#########################################################################
709 -+#########################################################################
710 -+BEGIN {
711 -+
712 -+ cmdGawk = "gawk";
713 -+ cmdCat = "cat";
714 -+ cmdLess = "less";
715 -+ cmdRm = "rm"
716 -+ cmdMv = "mv"
717 -+ cmdLatex = "latex";
718 -+ cmdPdftex = "pdflatex";
719 -+ cmdEpsToPdf = "epstopdf";
720 -+ cmdDvips = "dvips";
721 -+ cmdFig2dev = "fig2dev";
722 -+ cmdTouch = "touch";
723 -+
724 -+ szVersion = "1.1.2";
725 -+ iError = 0;
726 -+ iGapWidth = 1;
727 -+
728 -+
729 -+ # get the options
730 -+ szOptString = "&l%e&m$p%i%I$s$H$g%G%v%V%d";
731 -+ getopt(szOptString);
732 -+
733 -+ if (aOptions["d"])
734 -+ {
735 -+ aOptions["v"] = "-";
736 -+ for (iI = 0; iI < ARGC; iI++)
737 -+ printf("ARGV[%d]=%s\n", iI, ARGV[iI]);
738 -+
739 -+ iDim = split(szOptString, aOpts, "[$%&]");
740 -+ for (iI = 2; iI <= iDim; iI++)
741 -+ debug("aOptions[%s] = >%s<\n", aOpts[iI], aOptions[aOpts[iI]]);
742 -+ }
743 -+
744 -+
745 -+
746 -+ if (aOptions["V"] != "")
747 -+ {
748 -+ printf("fig2mpdf: version %s\n", szVersion);
749 -+ iError = 1;
750 -+ exit(0);
751 -+ }
752 -+
753 -+ szTmpPrefix = "_fig2mpdf"
754 -+
755 -+ iLine = -1;
756 -+ iInString = 0;
757 -+ iDepths = 1;
758 -+
759 -+ iInvalidDepth = -2
760 -+ iAdminDepth = 2000
761 -+
762 -+ szBase = ARGV[1];
763 -+ szOrigFile = ARGV[1];
764 -+ szOrigPath = ARGV[1];
765 -+
766 -+ # set default switch state
767 -+ iDoMultiLayer = 0;
768 -+ iDoLatex = 0;
769 -+ iDoPdftex = 1;
770 -+ iIncludeLowestRange = 1;
771 -+
772 -+ # set iDoLatex and iDoMultiLayer concerning the given suffix
773 -+ match(szBase, /\.[^\.\/]+$/);
774 -+ if (RLENGTH != -1)
775 -+ {
776 -+ szSuffix = substr(szBase, RSTART);
777 -+ if (szSuffix == ".lfig")
778 -+ iDoLatex = 1;
779 -+ else if (szSuffix == ".mfig")
780 -+ iDoMultiLayer = 1;
781 -+ else if ((szSuffix == ".mlfig") || (szSuffix == ".lmfig"))
782 -+ {
783 -+ iDoLatex = 1;
784 -+ iDoMultiLayer = 1;
785 -+ }
786 -+ }
787 -+
788 -+ ################################
789 -+ # evalutate options
790 -+
791 -+ # set toggle latex
792 -+ if (aOptions["l"] == "-")
793 -+ iDoLatex = 1;
794 -+ if (aOptions["l"] == "+")
795 -+ iDoLatex = 0;
796 -+
797 -+ # set multilayer flag
798 -+ if (aOptions["m"] == "-")
799 -+ iDoMultiLayer = 1;
800 -+ if (aOptions["m"] == "+")
801 -+ iDoMultiLayer = 0;
802 -+
803 -+ # set toggle pdftex
804 -+ if (aOptions["e"] == "-")
805 -+ iDoPdftex = 0;
806 -+
807 -+ # evaluate do not include lowest layer in all figs
808 -+ iIncludeLowestRange = (aOptions["i"] == "-");
809 -+
810 -+ # evaluate include all lower ranges in the sub figs
811 -+ iIncludeAllLowerRanges = (aOptions["I"] != "-");
812 -+
813 -+ # check consistencies
814 -+ # if there are ranges given -> do multilayer
815 -+ if (aOptions["p"] != "")
816 -+ iDoMultiLayer = 1;
817 -+
818 -+
819 -+ if (aOptions["g"] != "")
820 -+ {
821 -+ if ( ! match (aOptions["g"], /^[0-9]+$/))
822 -+ usage();
823 -+
824 -+ iGapWidth = aOptions["g"] + 1;
825 -+ }
826 -+
827 -+ # get the basename of the source
828 -+ gsub(/\.[^\/]+$/, "", szBase);
829 -+ gsub(/^.*\//, "", szBase);
830 -+
831 -+ # get the path to the original
832 -+ gsub(/[^\/]+$/, "", szOrigPath);
833 -+}
834 -+#########################################################################
835 -+#########################################################################
836 -+
837 -+( iInString != 0) {
838 -+ aszLine[iLine] = sprintf("%s\n%s", aszLine[iLine], $0);
839 -+ iInString = (match($0, "\\\\001$") == 0);
840 -+ iSubLine++;
841 -+ next;
842 -+}
843 -+
844 -+/^[135][ ]/ {
845 -+ iCmd = $1;
846 -+ iSubCmd = -1;
847 -+ iSubLine = 0;
848 -+ aiDepth[++iLine] = fnGetDepth($1);
849 -+ aszLine[iLine] = $0;
850 -+ next;
851 -+}
852 -+
853 -+/^[2][ ]/ {
854 -+ iCmd = $1;
855 -+ iSubCmd = $2;
856 -+ iSubLine = 0;
857 -+ aiDepth[++iLine] = fnGetDepth($1);
858 -+ aszLine[iLine] = $0;
859 -+ next;
860 -+}
861 -+
862 -+
863 -+/^[4][ ]/ {
864 -+ iCmd = $1;
865 -+ iSubCmd = $2;
866 -+ iSubLine = 0;
867 -+ aiDepth[++iLine] = fnGetDepth($1);
868 -+ aszLine[iLine] = $0;
869 -+ iInString = (match($0, "\\\\001$") == 0);
870 -+ next;
871 -+}
872 -+
873 -+/^(6[ ])|(-6)/ {
874 -+ iCmd = $1;
875 -+ iSubCmd = -1;
876 -+ iSubLine = 0;
877 -+ next;
878 -+}
879 -+
880 -+/^[^ ]/ {
881 -+ iCmd = -1;
882 -+ aiDepth[++iLine] = fnGetDepth("A");
883 -+ iSubLine = 0;
884 -+ aszLine[iLine] = $0;
885 -+ next;
886 -+}
887 -+
888 -+/^[ ]/ {
889 -+ iSubLine++;
890 -+ if ((iCmd == 2) && (iSubCmd == 5) && (iSubLine == 1))
891 -+ {
892 -+ if (match($0, "^\t[01] "))
893 -+ {
894 -+ szFileName = substr($0, RSTART + RLENGTH);
895 -+ if ( ! match(szFileName, /^\//))
896 -+ szFileName = sprintf("%s%s", szOrigPath, szFileName);
897 -+ aszLine[iLine] = sprintf("%s\n\t%s %s", aszLine[iLine], $1, szFileName);
898 -+ }
899 -+ else
900 -+ aszLine[iLine] = sprintf("%s\n%s", aszLine[iLine], $0);
901 -+ }
902 -+ else
903 -+ aszLine[iLine] = sprintf("%s\n%s", aszLine[iLine], $0);
904 -+}
905 -+
906 -+
907 -+END {
908 -+ iLine++;
909 -+ iLowestLayer = 0;
910 -+ iFirstRange = 0;
911 -+
912 -+ if (iError == 0)
913 -+ {
914 -+
915 -+
916 -+ if (iDoMultiLayer)
917 -+ {
918 -+ asort(aiDepths, aiSortedDepth);
919 -+
920 -+ # check for ranges as options
921 -+ if (aOptions["p"] != "")
922 -+ {
923 -+ # we have explicit ranges
924 -+ gsub(/-/, ":", aOptions["p"]);
925 -+ iRanges = split(aOptions["p"], aszRanges, ",");
926 -+ }
927 -+ else
928 -+ {
929 -+ if (iDepths < 4)
930 -+ {
931 -+ iRanges = 1;
932 -+ aszRanges[1] = "1:999";
933 -+ }
934 -+ else
935 -+ {
936 -+ iRanges = 0;
937 -+ iLastRange = aiSortedDepth[iDepths - 2] + 0;
938 -+ iRangeStart = iLastRange;
939 -+ for (iI = iDepths - 3; iI > 0; iI--)
940 -+ {
941 -+ aiSortedDepth[iI] += 0;
942 -+ if ((aiSortedDepth[iI] < iLastRange - iGapWidth) || (iI == 1))
943 -+ {
944 -+ if (aiSortedDepth[iI] >= iLastRange - iGapWidth)
945 -+ iLastRange = aiSortedDepth[iI];
946 -+
947 -+ if (iLastRange != iRangeStart)
948 -+ aszRanges[++iRanges] = sprintf("%d:%d", iLastRange, iRangeStart);
949 -+ else
950 -+ aszRanges[++iRanges] = sprintf("%d", iRangeStart);
951 -+ iRangeStart = aiSortedDepth[iI];
952 -+
953 -+ if ((iI == 1) && (aiSortedDepth[iI] < iLastRange - iGapWidth))
954 -+ aszRanges[++iRanges] = sprintf("%d", aiSortedDepth[iI]);
955 -+ }
956 -+ iLastRange = aiSortedDepth[iI];
957 -+ }
958 -+ }
959 -+ }
960 -+
961 -+
962 -+ # check for a multilayer file with only one range
963 -+ if ((iRanges == 1) && iIncludeLowestRange)
964 -+ {
965 -+ iIncludeLowestRange = 0;
966 -+ }
967 -+
968 -+ szInitRangeList = " -D ";
969 -+ szSep = "";
970 -+
971 -+ if (iIncludeLowestRange)
972 -+ {
973 -+ szInitRangeList = sprintf("%s+%s", szInitRangeList, aszRanges[1]);
974 -+ szSep = ",";
975 -+ }
976 -+ szRangeList = szInitRangeList;
977 -+
978 -+ # step through the ranges
979 -+ for (iI = iIncludeLowestRange; iI < iRanges; iI++)
980 -+ {
981 -+ szFileBase = sprintf("%s-%d", szBase, iI - iIncludeLowestRange);
982 -+
983 -+ if (aOptions["I"])
984 -+ {
985 -+ szRangeList = sprintf("%s%s+%s", szRangeList, szSep, aszRanges[iI + 1]);
986 -+ szSep = ",";
987 -+ }
988 -+ else
989 -+ szRangeList = sprintf("%s%s+%s", szInitRangeList, szSep, aszRanges[iI + 1]);
990 -+
991 -+
992 -+ if (iDoLatex)
993 -+ szTargetFile = fnDoTexFig(szFileBase, szOrigFile, szRangeList, (iDoPdftex != 0));
994 -+ else
995 -+ szTargetFile = fnDoNormalFig(szFileBase, szOrigFile, szRangeList, (iDoPdftex != 0));
996 -+
997 -+
998 -+ if (aOptions["G"])
999 -+ {
1000 -+ match(szTargetFile, /\.[^.]*$/);
1001 -+ szCommand = sprintf("%s %s %s.page%d%s", cmdMv, szTargetFile, szBase, iI - iIncludeLowestRange, substr(szTargetFile, RSTART, RLENGTH));
1002 -+ debug("%s\n", szCommand);
1003 -+ system(szCommand);
1004 -+ }
1005 -+ }
1006 -+ }
1007 -+ else
1008 -+ {
1009 -+ szRangeList = "";
1010 -+
1011 -+ if (iDoLatex)
1012 -+ szTargetFile = fnDoTexFig(szBase, szOrigFile, szRangeList, (iDoPdftex != 0));
1013 -+ else
1014 -+ szTargetFile = fnDoNormalFig(szBase, szOrigFile, szRangeList, (iDoPdftex != 0));
1015 -+ }
1016 -+ }
1017 -+}
1018 -+
1019 -+
1020 -+
1021 -+#########################################################################
1022 -+#########################################################################
1023 -+function debug(str, arg0, arg1, arg2, arg3, arg4)
1024 -+{
1025 -+ if (aOptions["v"])
1026 -+ printf (str, arg0, arg1, arg2, arg3, arg4);
1027 -+}
1028 -+
1029 -+#########################################################################
1030 -+#########################################################################
1031 -+function fnGetDepth (iControl)
1032 -+{
1033 -+
1034 -+ if (iControl == 1)
1035 -+ {
1036 -+ iReturn = sprintf("%04d", $7);
1037 -+ }
1038 -+ else if (iControl == 2)
1039 -+ {
1040 -+ iReturn = sprintf("%04d", $7);
1041 -+ }
1042 -+ else if (iControl == 3)
1043 -+ {
1044 -+ iReturn = sprintf("%04d", $7);
1045 -+ }
1046 -+ else if (iControl == 4)
1047 -+ {
1048 -+ iReturn = sprintf("%04d", $4);
1049 -+ }
1050 -+ else if (iControl == 5)
1051 -+ {
1052 -+ iReturn = sprintf("%04d", $7);
1053 -+ }
1054 -+ else if ((iControl == 6) || (iControl == -6))
1055 -+ {
1056 -+ iReturn = sprintf("%04d", iInvalidDepth);
1057 -+ }
1058 -+ else
1059 -+ {
1060 -+ iReturn = sprintf("%04d", iAdminDepth);
1061 -+ }
1062 -+
1063 -+ if (iReturn >= 0)
1064 -+ {
1065 -+ if (ahDepths[iReturn] == 0)
1066 -+ {
1067 -+ ahDepths[iReturn] = 1;
1068 -+ aiDepths[iDepths++] = iReturn;
1069 -+ }
1070 -+ }
1071 -+
1072 -+ return (iReturn);
1073 -+
1074 -+}
1075 -+
1076 -+#########################################################################
1077 -+#########################################################################
1078 -+function fnDoNormalFig(szFileNameBase, szFigFile, szRangeList, iPdf,
1079 -+ szEpsFile, szPdfFile, szTargetFile, szCommand)
1080 -+{
1081 -+
1082 -+ debug("FileNameBase >%s< FigFile >%s< Pdf:%d\n", szFileNameBase, szFigFile, iPdf);
1083 -+
1084 -+ if (iPdf)
1085 -+ szEpsFile = sprintf("%s%s.eps", szTmpPrefix, szFileNameBase);
1086 -+ else
1087 -+ {
1088 -+ szEpsFile = sprintf("%s.eps", szFileNameBase);
1089 -+ szTargetFile = szEpsFile;
1090 -+ }
1091 -+
1092 -+ szCommand = sprintf("%s -L eps %s %s %s 2> /dev/null", cmdFig2dev, szRangeList, szFigFile, szEpsFile);
1093 -+ debug("%s\n", szCommand);
1094 -+ system(szCommand);
1095 -+
1096 -+ if (iPdf)
1097 -+ {
1098 -+ szPdfFile = sprintf("%s.pdf", szFileNameBase);
1099 -+ szTargetFile = szPdfFile;
1100 -+ szCommand = sprintf("%s --outfile=%s %s", cmdEpsToPdf, szPdfFile, szEpsFile);
1101 -+ debug("%s\n", szCommand);
1102 -+ system(szCommand);
1103 -+
1104 -+
1105 -+ if ( ! aOptions["d"])
1106 -+ {
1107 -+ szCommand = sprintf("%s -f %s", cmdRm, szEpsFile);
1108 -+ debug("%s\n", szCommand);
1109 -+ system(szCommand);
1110 -+ }
1111 -+ }
1112 -+
1113 -+
1114 -+ return (szTargetFile);
1115 -+}
1116 -+
1117 -+
1118 -+#########################################################################
1119 -+#########################################################################
1120 -+function fnDoTexFig(szFileNameBase, szFigFile, szRangeList, iPdf,
1121 -+ szEpsFile, szPdfFile, szTexDoc, szTexPdf, szTexLog, szTexAux, szTexInp, szTmpPs, szTmpPdf, szTexSiz, szTmpEps, szCommand, szHeader)
1122 -+{
1123 -+
1124 -+ debug("FileNameBase >%s< FigFile >%s< Pdf:%d\n", szFileNameBase, szFigFile, iPdf);
1125 -+
1126 -+ szEpsFile = sprintf("%s.eps", szFileNameBase);
1127 -+ szPdfFile = sprintf("%s.pdf", szFileNameBase);
1128 -+ szTexDoc = sprintf("%s%s_doc.tex", szTmpPrefix, szFileNameBase);
1129 -+ szTexPdf = sprintf("%s%s_doc.pdf", szTmpPrefix, szFileNameBase);
1130 -+ szTexDvi = sprintf("%s%s_doc.dvi", szTmpPrefix, szFileNameBase);
1131 -+ szTexLog = sprintf("%s%s_doc.log", szTmpPrefix, szFileNameBase);
1132 -+ szTexAux = sprintf("%s%s_doc.aux", szTmpPrefix, szFileNameBase);
1133 -+ szTexInpPref = sprintf("%s%s_inp", szTmpPrefix, szFileNameBase);
1134 -+ szTexInp = sprintf("%s.tex", szTexInpPref);
1135 -+ szTexCreator = sprintf("%s.create", szTexInpPref);
1136 -+ szTexSiz = sprintf("%s.size", szTexInpPref);
1137 -+
1138 -+ if (iPdf)
1139 -+ szCommand = sprintf("%s -L pdftex_p %s -p %s %s %s", cmdFig2dev, szRangeList, szTexInpPref, szFigFile, szTexInp);
1140 -+ else
1141 -+ szCommand = sprintf("%s -L pstex_p %s -p %s %s %s", cmdFig2dev, szRangeList, szTexInpPref, szFigFile, szTexInp);
1142 -+ debug("%s\n", szCommand);
1143 -+ system(szCommand);
1144 -+
1145 -+ szCommand = sprintf("./%s", szTexCreator);
1146 -+ debug("%s\n", szCommand);
1147 -+ system(szCommand);
1148 -+
1149 -+ # check if there is an own hederfile to include
1150 -+ if (aOptions["s"] == "")
1151 -+ aOptions["s"] = "times";
1152 -+
1153 -+ if (aOptions["H"] == "")
1154 -+ {
1155 -+ szHeader = sprintf("\\documentclass{article}\n\
1156 -+\\usepackage{german,amssymb,amsmath}\n\
1157 -+\\usepackage{%s}", aOptions["s"]);
1158 -+ }
1159 -+ else
1160 -+ szHeader = sprintf("\\input{%s}\n", aOptions["H"]);
1161 -+
1162 -+ szHeader = sprintf("%s\n\
1163 -+\\usepackage{color}\n\
1164 -+\\usepackage{ifpdf}\n\
1165 -+\\setlength{\\textwidth}{100cm}\n\
1166 -+\\setlength{\\textheight}{100cm}\n\
1167 -+\\setlength{\\topmargin}{-1in}\n\
1168 -+\\setlength{\\headsep}{0pt}\n\
1169 -+\\setlength{\\headheight}{0pt}\n\
1170 -+\\setlength{\\oddsidemargin}{-1in}\n\
1171 -+\\parindent=0cm\n\
1172 -+\\ifpdf\n\
1173 -+\\usepackage[pdftex]{graphicx}\n\
1174 -+\\DeclareGraphicsExtensions{.pdf,.png,.jpg}\n\
1175 -+\\usepackage{epsfig}\n\
1176 -+\\input{%s}\n\
1177 -+\\else\n\
1178 -+\\usepackage{graphicx}\n\
1179 -+\\usepackage{epsfig}\n\
1180 -+\\fi\n\
1181 -+", szHeader, szTexSiz);
1182 -+
1183 -+ szCommand = sprintf("%s > %s << EOF\n\
1184 -+%s\\begin{document}\n\
1185 -+\\pagestyle{empty}\n\
1186 -+\\input{%s}\n\
1187 -+\\end{document}\n\
1188 -+EOF", cmdCat, szTexDoc, szHeader, szTexInp);
1189 -+ if (aOptions["d"] != "")
1190 -+ debug("%s\n", szCommand);
1191 -+ system(szCommand);
1192 -+
1193 -+ if (iPdf)
1194 -+ {
1195 -+
1196 -+ szCommand = sprintf("%s -interaction batchmode %s", cmdPdftex, szTexDoc);
1197 -+ debug("%s\n", szCommand);
1198 -+ iReturn = system(szCommand);
1199 -+
1200 -+ if (iReturn)
1201 -+ {
1202 -+ szCommand = sprintf("%s %s | %s +G", cmdCat, szTexLog, cmdLess);
1203 -+ system (szCommand);
1204 -+ }
1205 -+ else
1206 -+ {
1207 -+ szCommand = sprintf("%s %s %s", cmdMv, szTexPdf, szPdfFile);
1208 -+ debug("%s\n", szCommand);
1209 -+ system(szCommand);
1210 -+ }
1211 -+
1212 -+ }
1213 -+ else
1214 -+ {
1215 -+ szCommand = sprintf("%s -interaction batchmode %s", cmdLatex, szTexDoc);
1216 -+ debug("%s\n", szCommand);
1217 -+ iReturn = system(szCommand);
1218 -+ if (iReturn)
1219 -+ {
1220 -+ szCommand = sprintf("%s %s | %s +G", cmdCat, szTexLog, cmdLess);
1221 -+ system (szCommand);
1222 -+ }
1223 -+ else
1224 -+ {
1225 -+ szCommand = sprintf("%s -q -E %s -o %s 2>&1 > /dev/null", cmdDvips, szTexDvi, szEpsFile);
1226 -+ debug("%s\n", szCommand);
1227 -+ system(szCommand);
1228 -+ }
1229 -+ }
1230 -+
1231 -+ if ( ! aOptions["d"])
1232 -+ {
1233 -+ szCommand = sprintf("./%s -r", szTexCreator);
1234 -+ debug("%s\n", szCommand);
1235 -+ system(szCommand);
1236 -+ }
1237 -+
1238 -+ if ( ! aOptions["d"])
1239 -+ {
1240 -+ szCommand = sprintf("%s -f %s %s %s %s %s %s %s", cmdRm, szTexDoc, szTexLog, szTexAux, szTexDvi, szTexInp, szTexCreator, szTexPdf);
1241 -+ debug("%s\n", szCommand);
1242 -+ system(szCommand);
1243 -+ }
1244 -+
1245 -+ if (iPdf)
1246 -+ return (szPdfFile);
1247 -+ else
1248 -+ return (szEpsFile);
1249 -+}
1250 -+
1251 -+
1252 -+#########################################################################
1253 -+#########################################################################
1254 -+function getopt(sOptions, n, m, fHuntParam, iSearchMinus, iSPos, iCLen, iHuntSwitches, szSwChar, szOptChar) {
1255 -+# Options: Flagoptions: %f
1256 -+# Parameter: $p
1257 -+
1258 -+ n = 1; # index in argv
1259 -+ m = 1; # processed entries in argv finally it points to the firs$
1260 -+ iSearchMinus = 1; # indicate that a switch leading sign minus is expected
1261 -+
1262 -+ # check for initial -- to separate the gawk switches from the script switches
1263 -+ if (ARGV[n] == "--")
1264 -+ n++;
1265 -+
1266 -+
1267 -+ while (n < ARGC)
1268 -+ {
1269 -+ iHuntSwitches = 0;
1270 -+ iCLen = length(ARGV[n]);
1271 -+
1272 -+ szSwChar = substr(ARGV[n], 1, 1);
1273 -+ if ((szSwChar == "-") || (szSwChar == "+"))
1274 -+ {
1275 -+ if ((iSearchMinus == 0) || fHuntParam)
1276 -+ usage();
1277 -+ iHuntSwitches = 1;
1278 -+ iSPos = 2;
1279 -+ fHuntParam = 0;
1280 -+ }
1281 -+ else
1282 -+ {
1283 -+ iSPos = 1;
1284 -+
1285 -+ if (fHuntParam == 0)
1286 -+ iSearchMinus = 0;
1287 -+ }
1288 -+
1289 -+ while (iSPos <= iCLen)
1290 -+ {
1291 -+ if (iHuntSwitches)
1292 -+ {
1293 -+ szOptChar = substr(ARGV[n], iSPos, 1);
1294 -+ iOPos = index(sOptions, szOptChar);
1295 -+ if (iOPos == 0)
1296 -+ {
1297 -+ printf("unknown option \"%s\"\n", szOptChar);
1298 -+ usage();
1299 -+ }
1300 -+ if ((substr(sOptions, iOPos - 1, 1) == "&") || ((substr(sOptions, iOPos - 1, 1) == "%") && (szSwChar == "-")))
1301 -+ {
1302 -+ aOptions[szOptChar] = szSwChar;
1303 -+ iSPos = iSPos + 1;
1304 -+ }
1305 -+ else if ((substr(sOptions, iOPos - 1, 1) == "$") && (szSwChar == "-"))
1306 -+ {
1307 -+ fHuntParam = 1;
1308 -+ iHuntSwitches = 0;
1309 -+ iSPos = iSPos + 1;
1310 -+ }
1311 -+ else
1312 -+ usage();
1313 -+
1314 -+ }
1315 -+ else if (fHuntParam)
1316 -+ {
1317 -+ fHuntParam = 0;
1318 -+ aOptions[szOptChar] = substr(ARGV[n], iSPos, iCLen + 1 - iSPos);
1319 -+ iSPos = iCLen + 1;
1320 -+ }
1321 -+ else
1322 -+ {
1323 -+ ARGV[m++] = ARGV[n];
1324 -+ iSPos = iCLen + 1;
1325 -+ }
1326 -+ }
1327 -+ n = n + 1;
1328 -+ }
1329 -+ ARGC = m;
1330 -+}
1331 -+
1332 -+
1333 -+#########################################################################
1334 -+#########################################################################
1335 -+function usage() {
1336 -+ print "usage: fig2mpdf [-|+lm] [-eiIGvV] [-p <ranges>] [-g <gapwidth>] [-s <style>] [-H <headerfile>] file\n\
1337 -+\n\
1338 -+ -|+l set|reset latex call\n\
1339 -+ -e create an eps file instead of a pdf\n\
1340 -+ -|+m set|reset multilayer creation\n\
1341 -+ -p <ranges> colon separated list of layer ranges a-b,c,d-e,...\n\
1342 -+ -i do include the deepest range in all figures\n\
1343 -+ (the one with the higest level number)\n\
1344 -+ -I include all lower ranges (pyramide mode)\n\
1345 -+ -g <gap> set layer gapwidth for automatically detecting ranges (default:0)\n\
1346 -+ -s <style> replace \\usepackage{times} by \\usepackage{<style>} in the latex commands\n\
1347 -+ -H <header> use file <header> for creating tex documents (only\n\
1348 -+ \\begin{document}...\\end{document} is set by fig2mpdf)\n\
1349 -+ -G name multilayer files in PGF file name format <name>.page<no>.<ext>\n\
1350 -+ -v be verbose\n\
1351 -+ -V print out the version of fig2mpdf\n";
1352 -+ exit 1;
1353 -+}
1354 -+' -- $*
1355 -+
1356 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2mpdf/fig2mpdf.1 transfig/fig2mpdf/fig2mpdf.1
1357 ---- transfig~/fig2mpdf/fig2mpdf.1
1358 -+++ transfig/fig2mpdf/fig2mpdf.1
1359 -@@ -0,0 +1,208 @@
1360 -+.TH fig2mpdf 1 "Jun 2006" "" "Including xfig figures into LaTeX documents"
1361 -+.SH NAME
1362 -+fig2mpdf \- creation of multilayer pdf or eps figures from fig files using latex for typesetting
1363 -+.SH SYNOPSIS
1364 -+.B fig2mpdf
1365 -+[\fIOPTION\fR]... \fIFILE\fR
1366 -+.SH DESCRIPTION
1367 -+.PP
1368 -+This tool can create pdf or eps figures using fig files as source. For beamer
1369 -+presentations, for example, you can use the multilayer mode to create
1370 -+multiple figures that can be overlayed to get a dynamic figure. For
1371 -+proper appearance you can use latex to typeset some or all texts,
1372 -+possibly containing formulas.
1373 -+
1374 -+The default interpretation of the given fig \fIFILE\fR depends on its suffix.
1375 -+.TP
1376 -+\fIfig\fR
1377 -+Normal conversion of a fig file. All texts are interpreted as postscript
1378 -+texts and all elements of the figure are included in the resulting figure.
1379 -+.TP
1380 -+\fIlfig\fR
1381 -+LaTeX interpretation of the file. All texts of the input file that have the
1382 -+special bit set are typeset by pdflatex resp. latex (see: Option \fB\-|+l\fR).
1383 -+.TP
1384 -+\fImfig\fR
1385 -+Multilayer file interpretation. Depending on the used depths of the
1386 -+figure it is split into multiple parts. For each part an output file is
1387 -+created (see: section \fBMultiLayerOutput\fR).
1388 -+.TP
1389 -+\fImlfig\fR or \fIlmfig\fR
1390 -+Combination of multilayer and LaTeX interpretation of the input (see: Suffix
1391 -+\fIlfig\fR and \fImfig\fR).
1392 -+.PP
1393 -+The default interpretation of the input can be changed by using the options below.
1394 -+.SH OPTIONS
1395 -+.PP
1396 -+.TP
1397 -+\fB\-e\fR
1398 -+produce an eps output file. Instead of creating a pdf file (the default)
1399 -+an eps figure is produced.
1400 -+.TP
1401 -+\fB\-|+l\fR
1402 -+force calling (pdf)latex (-) or do not use (pdf)latex (+) for
1403 -+typesetting the text marked with the special flag. With this option you
1404 -+can change the default behavior given by the input file suffix.
1405 -+.TP
1406 -+\fB\-|+m\fR
1407 -+force set (-) or unset (+) the multilayer interpretation (see:
1408 -+\fBMultiLayerOutput\fR below) which was previously set by the input
1409 -+file suffix.
1410 -+.TP
1411 -+\fB\-p\fR \fIranges\fR
1412 -+explicitly set the ranges of depths for splitting the input figure in
1413 -+multilayer mode. \fIranges\fR is a colon separated list of ranges of
1414 -+the form \fIupper-lower\fR or \fIdepth\fR where \fIupper\fR is the
1415 -+top and \fIlower\fR the bottom depth in the range. If you use the
1416 -+\fIdepth\fR form the range consist of just that depth.
1417 -+.TP
1418 -+\fB\-i\fR
1419 -+include the the bottommost range (that is, the one with the highest depth) into
1420 -+all output figures. This is for compatibility to older versions of this
1421 -+tool.
1422 -+.TP
1423 -+\fB\-I\fR
1424 -+turn on pyramid mode. The figure of a corresponding range in multilayer
1425 -+mode includes all lower ranges too.
1426 -+.TP
1427 -+\fB\-g\fR \fIgapwidth\fR
1428 -+set the allowed gapwidth between two used depths to decide if these
1429 -+depths should be grouped together in one range. With this option you get
1430 -+more flexibility to insert objects with new depths. The default width is
1431 -+zero (no gap = consecutively numbered depths are grouped together).
1432 -+.TP
1433 -+\fB\-s\fR \fIstyle\fR
1434 -+replace the default style for selecting a font family in LaTeX mode.
1435 -+If this option is omitted the style `times' is set by default.
1436 -+.TP
1437 -+\fB\-H\fR \fIheader\fR
1438 -+replace the default header sequence for creating temporary
1439 -+LaTeX documents in LaTeX mode. To get maximum flexibility you can
1440 -+set the entire document header in the file \fIheader\fR (see:
1441 -+\fBCustomized Headers\fR below).
1442 -+.TP
1443 -+\fB\-G\fR
1444 -+in multilayer mode change the default output file pattern to the PDF
1445 -+format which is <name>.page<no>.<ext>
1446 -+.TP
1447 -+\fB\-v\fR
1448 -+be verbose and print out all executed commands
1449 -+.TP
1450 -+\fB\-V\fR
1451 -+print out the version of \fBfig2mpdf\fR
1452 -+.PP
1453 -+.SH "MultiLayerOutput"
1454 -+In xfig you can assign an individual depth to all objects of the
1455 -+figure. These depths are normally used to determine the order of
1456 -+printing the objects. \fBfig2mpdf\fR uses these depths to group the
1457 -+objects into ranges in automatic mode (if the ranges option is
1458 -+omitted). In the list of used depths, consecutively numbered depths are
1459 -+grouped into one range. That is, all gaps between used depths are used
1460 -+to logically split the figure. With \fB\-g\fR you can set the
1461 -+gapwidth which doesn't split the figure (default: zero).
1462 -+.PP
1463 -+The resulting list of ranges determines the number of output files. In
1464 -+default mode all objects with depths assigned to one range are
1465 -+collected and put into the corresponding output file. The contents of
1466 -+the output files can be changed with the two Options \fB\-i\fR and
1467 -+\fB\-I\fR.
1468 -+.PP
1469 -+The \fB\-i\fR option reduces the number of output files by one. The
1470 -+bottommost range, that is the range which consist of the highest depths
1471 -+of the figure, is included into all output files.
1472 -+.PP
1473 -+In pyramid mode, activated by the option \fB\-I\fR, the output files
1474 -+contain additionally all lower ranges. With this mode you can
1475 -+get stand alone figures that don't have to be overlayed to have
1476 -+meaningful content.
1477 -+.PP
1478 -+\fBExample 1\fR
1479 -+.PD 0
1480 -+.PP
1481 -+Assume that you have a fig file \fIfoo.fig\fR which contains the three ranges
1482 -+.IR "230-233",
1483 -+.IR "455-460"
1484 -+and
1485 -+.IR "499-500".
1486 -+.PD
1487 -+.PP
1488 -+With no options set you get three output files, one per range. But if you
1489 -+set the \fB\-i\fR option you get the following two files where the
1490 -+bottommost range is included in both of the files:
1491 -+.PD 0
1492 -+.PP
1493 -+ \fIfoo-0.pdf\fR with ranges \fI455-460\fR and \fI499-500\fR
1494 -+.PP
1495 -+ \fIfoo-1.pdf\fR with ranges \fI230-233\fR and \fI499-500\fR.
1496 -+.PD
1497 -+.PP
1498 -+\fBExample 2\fR
1499 -+.PD 0
1500 -+.PP
1501 -+The pyramid mode, activated by the option \fB\-I\fR, will produce the
1502 -+following files from the source file of \fBExample 1\fR:
1503 -+.PP
1504 -+ \fIfoo-0.pdf\fR with ranges \fI499-500\fR
1505 -+.PP
1506 -+ \fIfoo-1.pdf\fR with ranges \fI455-460\fR and \fI499-500\fR
1507 -+.PP
1508 -+ \fIfoo-2.pdf\fR with ranges \fI230-233\fR, \fI455-460\fR and \fI499-500\fR.
1509 -+.PD
1510 -+.PP
1511 -+\fBExample 3\fR
1512 -+.PD 0
1513 -+.PP
1514 -+If both options are set you will get just two files with the following
1515 -+contents:
1516 -+.PP
1517 -+ \fIfoo-0.pdf\fR with ranges \fI455-460\fR and \fI499-500\fR
1518 -+.PP
1519 -+ \fIfoo-1.pdf\fR with ranges \fI230-233\fR, \fI455-460\fR and \fI499-500\fR.
1520 -+.PD
1521 -+.PP
1522 -+.SH "Customized Headers"
1523 -+For various reasons you might want to change the standard latex generation,
1524 -+e.g., if you want to change the default font family. The following
1525 -+example represents a valid header file.
1526 -+
1527 -+The usage of this example file changes the font family to sans serif
1528 -+and adds an additional search path for includegraphics to the `figures'
1529 -+subdirectory.
1530 -+
1531 -+.PD 0
1532 -+ \\documentclass{article}
1533 -+.PP
1534 -+ \\usepackage{german,amssymb,amsmath}
1535 -+.PP
1536 -+ \\renewcommand{\\familydefault}{\\sfdefault}
1537 -+.PP
1538 -+ \\AtBeginDocument{\\graphicspath{{figures/}}}
1539 -+.PD
1540 -+
1541 -+The following packages are generally used: \fBcolor\fR, \fBgraphicx\fR and \fBepsfig\fR.
1542 -+.SH "Tex errors"
1543 -+Sometimes it might happen that latex generates an error while processing
1544 -+your special texts. To keep you informed about the occurrence of that
1545 -+error and about what has happened, in this case the log file is shown
1546 -+by invoking a less command.
1547 -+.SH "Files"
1548 -+In single layer mode for the resulting files the suffix fig is replaced
1549 -+by pdf (resp. eps) (i.e. foo.fig -> foo.pdf).
1550 -+.PP
1551 -+.PD 0
1552 -+In multilayer mode the base name of the source fig files is extended
1553 -+by '-<range>' and the suffix is set to pdf (resp. eps).
1554 -+.PP
1555 -+(i.e., foo.fig -> foo-0.pdf, foo-1.pdf, foo-2.pdf, ...
1556 -+.PP
1557 -+ or foo.fig -> foo.page0.pdf, foo.page1.pdf, foo.page2.pdf, ...
1558 -+.PP
1559 -+ if the option \fB\-G\fR is set).
1560 -+.PD
1561 -+.SH "SEE ALSO"
1562 -+.IR xfig(1)
1563 -+.IR fig2dev(1)
1564 -+.IR gawk(1)
1565 -+.IR pdflatex(1)
1566 -+.IR latex(1)
1567 -+.IR dvips(1)
1568
1569 diff --git a/media-gfx/transfig/files/transfig-3.2.5d-leadspace.patch b/media-gfx/transfig/files/transfig-3.2.5d-leadspace.patch
1570 deleted file mode 100644
1571 index d222cf6590e..00000000000
1572 --- a/media-gfx/transfig/files/transfig-3.2.5d-leadspace.patch
1573 +++ /dev/null
1574 @@ -1,19 +0,0 @@
1575 -#! /bin/sh /usr/share/dpatch/dpatch-run
1576 -## 25_PIC_leadspace.dpatch by Roger Leigh <rleigh@××××××.org>
1577 -##
1578 -## All lines beginning with `## DP:' are a description of the patch.
1579 -## DP: Avoid wrong leading spaces in PIC text (Closes: #611977).
1580 -
1581 -@DPATCH@
1582 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/dev/genpic.c transfig/fig2dev/dev/genpic.c
1583 ---- transfig~/fig2dev/dev/genpic.c
1584 -+++ transfig/fig2dev/dev/genpic.c
1585 -@@ -443,7 +443,7 @@
1586 - size = PICFONTMAG(t);
1587 - if (!OptNoUnps) {
1588 - unpsfont(t);
1589 -- fprintf(tfp, "\"\\s%d\\f%s ", size, PICFONT(t->font));
1590 -+ fprintf(tfp, "\"\\s%d\\f%s", size, PICFONT(t->font));
1591 - } else {
1592 - fprintf(tfp, ".ps\n.ps %d\n", size );
1593 - fprintf(tfp, ".ft\n.ft %s\n", PICPSFONT(t) );
1594
1595 diff --git a/media-gfx/transfig/files/transfig-3.2.5d-libpng-1.5.patch b/media-gfx/transfig/files/transfig-3.2.5d-libpng-1.5.patch
1596 deleted file mode 100644
1597 index e6f15e43e93..00000000000
1598 --- a/media-gfx/transfig/files/transfig-3.2.5d-libpng-1.5.patch
1599 +++ /dev/null
1600 @@ -1,39 +0,0 @@
1601 -http://bugs.gentoo.org/show_bug.cgi?id=356751
1602 -
1603 -Index: transfig.3.2.5d/fig2dev/dev/readpng.c
1604 -===================================================================
1605 ---- transfig.3.2.5d.orig/fig2dev/dev/readpng.c
1606 -+++ transfig.3.2.5d/fig2dev/dev/readpng.c
1607 -@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly)
1608 - }
1609 -
1610 - /* set long jump here */
1611 -- if (setjmp(png_ptr->jmpbuf)) {
1612 -+ if (setjmp(png_jmpbuf(png_ptr))) {
1613 - /* if we get here there was a problem reading the file */
1614 - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
1615 - return 0;
1616 -@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly)
1617 - png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
1618 - &interlace_type, &compression_type, &filter_type);
1619 -
1620 -- if (info_ptr->valid & PNG_INFO_gAMA)
1621 -- png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
1622 -- else
1623 -- png_set_gamma(png_ptr, 2.2, 0.45);
1624 -+ png_fixed_point gamma = 0.45;
1625 -+ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
1626 -+ png_set_gamma(png_ptr, 2.2, gamma);
1627 -
1628 -- if (info_ptr->valid & PNG_INFO_bKGD)
1629 -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
1630 - /* set the background to the one supplied */
1631 -- png_set_background(png_ptr, &info_ptr->background,
1632 -+ png_color_16p background;
1633 -+ png_get_bKGD(png_ptr,info_ptr,&background);
1634 -+ png_set_background(png_ptr, background,
1635 - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
1636 -+ }
1637 - else {
1638 - /* blend the canvas background using the alpha channel */
1639 - if (bgspec) {
1640
1641 diff --git a/media-gfx/transfig/files/transfig-3.2.5d-precision.patch b/media-gfx/transfig/files/transfig-3.2.5d-precision.patch
1642 deleted file mode 100644
1643 index 227f19cfe71..00000000000
1644 --- a/media-gfx/transfig/files/transfig-3.2.5d-precision.patch
1645 +++ /dev/null
1646 @@ -1,45 +0,0 @@
1647 -#! /bin/sh /usr/share/dpatch/dpatch-run
1648 -## 24_PIC_precision.dpatch by Roger Leigh <rleigh@××××××.org>
1649 -##
1650 -## All lines beginning with `## DP:' are a description of the patch.
1651 -## DP: Change the precision of PIC floating point output from %.2f to %.3f.
1652 -## DP: (Closes: #611948)
1653 -
1654 -@DPATCH@
1655 -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/dev/genpic.c transfig/fig2dev/dev/genpic.c
1656 ---- transfig~/fig2dev/dev/genpic.c
1657 -+++ transfig/fig2dev/dev/genpic.c
1658 -@@ -229,9 +229,9 @@
1659 -
1660 - /* Should have a #define somewhere for the # of fill patterns */
1661 - if (l->fill_style != UNFILLED)
1662 -- fprintf(tfp, " fill %.2f", ((double) l->fill_style ) / (double) BLACK_FILL);
1663 -+ fprintf(tfp, " fill %.3f", ((double) l->fill_style ) / (double) BLACK_FILL);
1664 -
1665 -- fprintf(tfp, " with .sw at (%.2f,%.2f) ",
1666 -+ fprintf(tfp, " with .sw at (%.3f,%.3f) ",
1667 - minx / ppi, convy(maxy / ppi));
1668 -
1669 - width = (maxx - minx) / ppi;
1670 -@@ -239,10 +239,10 @@
1671 - height = convy(maxy / ppi) - convy(miny / ppi);
1672 - if (height < 0.0) height = -height;
1673 -
1674 -- fprintf(tfp, "width %.2f height %.2f", width, height);
1675 -+ fprintf(tfp, "width %.3f height %.3f", width, height);
1676 -
1677 - if (OptArcBox && l->type == T_ARC_BOX)
1678 -- fprintf(tfp, " rad %.2f", l->radius/ppi);
1679 -+ fprintf(tfp, " rad %.3f", l->radius/ppi);
1680 -
1681 - AddThickness();
1682 -
1683 -@@ -411,7 +411,7 @@
1684 - 2 * e->radiuses.x/ppi, 2 * e->radiuses.y/ppi);
1685 -
1686 - if ( OptEllipseFill && e->fill_style != UNFILLED)
1687 -- fprintf(tfp, " fill %.2f", (double)e->fill_style / (double) BLACK_FILL);
1688 -+ fprintf(tfp, " fill %.3f", (double)e->fill_style / (double) BLACK_FILL);
1689 -
1690 - AddThickness();
1691 -
1692
1693 diff --git a/media-gfx/transfig/files/transfig-3.2.5e-fprintf_format_warnings.patch b/media-gfx/transfig/files/transfig-3.2.5e-fprintf_format_warnings.patch
1694 deleted file mode 100644
1695 index 6b3f8a7d870..00000000000
1696 --- a/media-gfx/transfig/files/transfig-3.2.5e-fprintf_format_warnings.patch
1697 +++ /dev/null
1698 @@ -1,55 +0,0 @@
1699 -Author: Roland Rosenfeld <roland@××××××.org>
1700 -Description: Add a format string to fprintf()/sprintf() call instead
1701 - of directly printing out Err_Mem. This is needed by harding options.
1702 -
1703 ---- a/fig2dev/trans_spline.c
1704 -+++ b/fig2dev/trans_spline.c
1705 -@@ -648,7 +648,7 @@
1706 - F_control *cp;
1707 -
1708 - if ((cp = (F_control *) malloc(CONTROL_SIZE)) == NULL)
1709 -- fprintf(stderr,Err_mem);
1710 -+ fprintf(stderr, "%s", Err_mem);
1711 - return cp;
1712 - }
1713 -
1714 -@@ -659,7 +659,7 @@
1715 - F_line *l;
1716 -
1717 - if ((l = (F_line *) malloc(LINOBJ_SIZE)) == NULL)
1718 -- fprintf(stderr,Err_mem);
1719 -+ fprintf(stderr, "%s", Err_mem);
1720 - l->pic = NULL;
1721 - l->next = NULL;
1722 - l->for_arrow = NULL;
1723 ---- a/fig2dev/dev/gencgm.c
1724 -+++ b/fig2dev/dev/gencgm.c
1725 -@@ -139,7 +139,7 @@
1726 -
1727 - if (from) {
1728 - figname = malloc(strlen(from)+1);
1729 -- sprintf(figname, from);
1730 -+ sprintf(figname, "%s", from);
1731 - p = strrchr(figname, '/');
1732 - if (p)
1733 - figname = p+1; /* remove path from name for comment in file */
1734 ---- a/fig2dev/dev/genmp.c
1735 -+++ b/fig2dev/dev/genmp.c
1736 -@@ -1150,7 +1150,7 @@
1737 - }
1738 - } else {
1739 - /* special text in latex mode: just write the text. */
1740 -- fprintf(tfp, t->cstring);
1741 -+ fprintf(tfp, "%s", t->cstring);
1742 - }
1743 - fprintf(tfp," etex;\n");
1744 -
1745 -@@ -1164,7 +1164,7 @@
1746 -
1747 - fprintf(tfp," picture q;\n");
1748 - fprintf(tfp," q=thelabel.urt(\"");
1749 -- fprintf(tfp, t->cstring);
1750 -+ fprintf(tfp, "%s", t->cstring);
1751 - fprintf(tfp, "\" infont ");
1752 - if (t->font<0) {
1753 - fprintf(tfp, "defaultfont");
1754
1755 diff --git a/media-gfx/transfig/files/transfig-3.2.5e-man-hyphen.patch b/media-gfx/transfig/files/transfig-3.2.5e-man-hyphen.patch
1756 deleted file mode 100644
1757 index bb79ec82c92..00000000000
1758 --- a/media-gfx/transfig/files/transfig-3.2.5e-man-hyphen.patch
1759 +++ /dev/null
1760 @@ -1,530 +0,0 @@
1761 -Author: Roland Rosenfeld <roland@××××××.org>
1762 -Description: Escape hyphen '-' in man pages
1763 -
1764 ---- a/doc/fig2dev.1
1765 -+++ b/doc/fig2dev.1
1766 -@@ -63,9 +63,9 @@
1767 - Notes:
1768 - .br
1769 - .I dvips
1770 --and
1771 -+ and
1772 - .I xdvi
1773 --must be compiled with the tpic support (-DTPIC) for epic, eepic and tpic to work.
1774 -+must be compiled with the tpic support (\-DTPIC) for epic, eepic and tpic to work.
1775 - .br
1776 - You must have ghostscript and ps2pdf, which comes with the ghostscript distribution
1777 - to get the pdf output and the bitmap formats (png, jpeg, etc.), and the netpbm (pbmplus)
1778 -@@ -81,16 +81,16 @@
1779 -
1780 - .TP
1781 - .B "\-D +/-rangelist"
1782 --With +rangelist, keep only those depths in the list. With -rangelist, keep all
1783 -+With +rangelist, keep only those depths in the list. With \-rangelist, keep all
1784 - depths except those in the list. The rangelist may be a list of comma-separated
1785 --numbers or ranges separated by colon (:). For example, -D +10,40,55:70,80
1786 -+numbers or ranges separated by colon (:). For example, \-D +10,40,55:70,80
1787 - means keep only layers 10, 40, 55 \fBthrough\fR 70, and 80.
1788 -
1789 - .TP
1790 --.B -K
1791 --The selection of the depths with the '-D +/-rangelist' option does normally not
1792 -+.B \-K
1793 -+The selection of the depths with the '\-D +/\-rangelist' option does normally not
1794 - affect the calcualtion of the bounding box. Thus the generated document might
1795 --have a much larger bounding box than necessary. If -K is given then the
1796 -+have a much larger bounding box than necessary. If \-K is given then the
1797 - bounding box is adjusted to include only those objects in the selected depths.
1798 -
1799 - .TP
1800 -@@ -107,10 +107,10 @@
1801 - .TP
1802 - .B "\-G minor[:major][:unit]"
1803 - Draws a grid on the page. Specify thin, or thin and thick line
1804 --spacing in one of several units. For example, "-G .25:1cm" draws a thin,
1805 -+spacing in one of several units. For example, "\-G .25:1cm" draws a thin,
1806 - gray line every .25 cm and a thicker gray line every 1 cm. Specifying
1807 --"-G 1in" draws a thin line every 1 inch.
1808 --Fractions may be used, e.g. "-G 1/16:1/2in" will draw a thin line every
1809 -+"\-G 1in" draws a thin line every 1 inch.
1810 -+Fractions may be used, e.g. "\-G 1/16:1/2in" will draw a thin line every
1811 - 1/16 inch (0.0625 inch) and a thick line every 1/2 inch.
1812 - .br
1813 - Allowable units are: i, in, inch, f, ft, feet, c, cm, mm, and m.
1814 -@@ -126,7 +126,7 @@
1815 - Set the magnification at which the figure is rendered to
1816 - .I mag.
1817 - The default is 1.0.
1818 --This may not be used with the maxdimension option (-Z).
1819 -+This may not be used with the maxdimension option (\-Z).
1820 -
1821 - .TP
1822 - .B "\-s size"
1823 -@@ -141,7 +141,7 @@
1824 - .I maxdimension
1825 - inches or cm, depending on whether the figure was saved with
1826 - imperial or metric units.
1827 --This may not be used with the magnification option (-m).
1828 -+This may not be used with the magnification option (\-m).
1829 -
1830 - .TP
1831 - .I other options
1832 -@@ -157,7 +157,7 @@
1833 - something that they won't do with EPS files that have an ASCII preview.
1834 - .TP
1835 - .B "\-b dummyarg"
1836 --Generate binary output (dummy argument required after the "-b").
1837 -+Generate binary output (dummy argument required after the "\-b").
1838 -
1839 - .TP
1840 - .B \-r
1841 -@@ -335,7 +335,7 @@
1842 - file.
1843 - The table must have 21 entries - one for each of the area fill patterns.
1844 - Each entry consists of 5 numbers which specify the
1845 --1.) pattern number (-1 - 6),
1846 -+1.) pattern number (\-1 - 6),
1847 - 2.) pattern length (inches),
1848 - 3.) fill type (1 - 5),
1849 - 4.) fill spacing (inches) and
1850 -@@ -390,7 +390,7 @@
1851 - .TP
1852 - .B \-F
1853 - Use correct font sizes (points, 1/72 inch) instead of the traditional size that xfig/fig2dev uses,
1854 --which is (1/80 inch). The corresponding xfig command-line option is -correct_font_size.
1855 -+which is (1/80 inch). The corresponding xfig command-line option is \-correct_font_size.
1856 -
1857 - .TP
1858 - .B \-g color
1859 -@@ -403,13 +403,13 @@
1860 - Convert all colors to grayscale.
1861 -
1862 - .TP
1863 --.B -S smoothfactor
1864 -+.B \-S smoothfactor
1865 - This will smooth the output by passing
1866 - .I smoothfactor
1867 - to ghostscript in the
1868 --.I -dTextAlphaBits
1869 -+.I \-dTextAlphaBits
1870 - and
1871 --.I -dGraphicsAlphaBits
1872 -+.I \-dGraphicsAlphaBits
1873 - options to improve font rendering and graphic smoothing.
1874 - A value of 2 for
1875 - .I smoothfactor
1876 -@@ -418,7 +418,7 @@
1877 - .SH GIF OPTIONS
1878 -
1879 - .TP
1880 --.B -t color
1881 -+.B \-t color
1882 - Use
1883 - .I color
1884 - for the transparent color in the GIF file. This must be specified
1885 -@@ -428,7 +428,7 @@
1886 -
1887 - .SH JPEG OPTIONS
1888 - .TP
1889 --.B -q image_quality
1890 -+.B \-q image_quality
1891 - use the integer value
1892 - .I image_quality
1893 - for the JPEG "Quality" factor. Valid values are 0-100, with the default being 75.
1894 -@@ -495,7 +495,7 @@
1895 - .I fig2dev
1896 - scales the figure by 1/8 before generating METAFONT code.
1897 - The magnification can be further changed with the
1898 --.B -m
1899 -+.B \-m
1900 - option or by giving magnification options to
1901 - .B mf.
1902 - .LP
1903 -@@ -506,33 +506,33 @@
1904 - under the subdirectory: graphics/mfpic
1905 -
1906 - .TP
1907 --.B -C code
1908 -+.B \-C code
1909 - specifies the starting METAFONT font code. The default is 32.
1910 - .TP
1911 --.B -n name
1912 -+.B \-n name
1913 - specifies the name to use in the output file.
1914 - .TP
1915 --.B -p pen_magnification
1916 -+.B \-p pen_magnification
1917 - specifies how much the line width should be magnified compared to the
1918 - original figure. The default is 1.
1919 - .TP
1920 --.B -t top
1921 -+.B \-t top
1922 - specifies the top of the whole coordinate system. The default is
1923 - .B ypos.
1924 - .TP
1925 --.B -x xmin
1926 -+.B \-x xmin
1927 - specifies the minimum x coordinate value of the figure (inches). The
1928 - default is 0.
1929 - .TP
1930 --.B -y ymin
1931 -+.B \-y ymin
1932 - specifies the minumum y coordinate value of the figure (inches). The
1933 - default is 0.
1934 - .TP
1935 --.B -X xmax
1936 -+.B \-X xmax
1937 - specifies the maximum x coordinate value of the figure (inches). The
1938 - default is 8.
1939 - .TP
1940 --.B -Y ymax
1941 -+.B \-Y ymax
1942 - specifies the maximum y coordinate value of the figure (inches). The
1943 - default is 8.
1944 -
1945 -@@ -546,7 +546,7 @@
1946 - Include file content as additional header.
1947 -
1948 - .TP
1949 --.B -o
1950 -+.B \-o
1951 - Old mode (no latex).
1952 -
1953 - .TP
1954 -@@ -597,15 +597,15 @@
1955 - Set encoding for latex text translation (0 no translation, 1 ISO-8859-1, 2 ISO-8859-2)
1956 -
1957 - .SH GBX OPTIONS (Gerber, RS-247-X)
1958 --Typically you will wish to set the y scale to -1. See
1959 --.B -g
1960 -+Typically you will wish to set the y scale to \-1. See
1961 -+.B \-g
1962 - for more information.
1963 - .TP
1964 --.B -d [mm|in]
1965 -+.B \-d [mm|in]
1966 - Output dimensions should be assumed to be millimeters (mm) or inches
1967 - (in). The default is millimeters.
1968 - .TP
1969 --.B -p [pos|neg]
1970 -+.B \-p [pos|neg]
1971 - Select the image polarity. For positive images lines drawn in the fig
1972 - file will generate lines of material. For negative images lines drawn
1973 - in the fig file will result in removed material. Consider etching a
1974 -@@ -613,29 +613,29 @@
1975 - choosing 'neg' will result in these lines being etched through the
1976 - chrome, leaving transparent lines.
1977 - .TP
1978 --.B -g <x scale>x<y scale>+<x offset>+<y offset>
1979 -+.B \-g <x scale>x<y scale>+<x offset>+<y offset>
1980 - This controls the geometry of the output, scaling the dimensions as
1981 - shown and applying the given offset. Typically you will wish to set
1982 --the y scale to -1, mirroring about the x axis. This is because Gerber
1983 -+the y scale to \-1, mirroring about the x axis. This is because Gerber
1984 - assumes the origin to be bottom left, while xfig selects top left.
1985 - .TP
1986 --.B -f <n digits>.<n digits>
1987 -+.B \-f <n digits>.<n digits>
1988 - This controls the number of digits of precision before and after the
1989 --implied decimal point. With -f 5.3 the following number 12345678
1990 --corresponds to 12345.678. Whereas with -f 3.5 it corresponds to
1991 -+implied decimal point. With \-f 5.3 the following number 12345678
1992 -+corresponds to 12345.678. Whereas with \-f 3.5 it corresponds to
1993 - 123.45678. The default is for 3 places before the decimal point and 5
1994 - after. This corresponds, to a range of 0 to 1m in 10 micron
1995 - increments.
1996 - .TP
1997 --.B -i [on|off]
1998 -+.B \-i [on|off]
1999 - Controls the output of comments describing the type of objects being
2000 - output. The text appears as comments starting with ## on each line in
2001 - the output file. By default this is on.
2002 -
2003 - .SH POSTSCRIPT, ENCAPSULATED POSTSCRIPT (EPS), and PDF OPTIONS
2004 - With PostScript, xfig can be used to create multiple page figures
2005 --Specify the -M option to produce a multi-page output.
2006 --For posters, add -O to overlap the pages slightly to get around the problem of
2007 -+Specify the \-M option to produce a multi-page output.
2008 -+For posters, add \-O to overlap the pages slightly to get around the problem of
2009 - the unprintable area in most printers, then cut and paste the pages together.
2010 - Due to memory limitations of most laser printers, the figure should not
2011 - have large imported images (bitmaps). Great for text with very big letters.
2012 -@@ -658,7 +658,7 @@
2013 - .LP
2014 - The EPS driver has the following two special options:
2015 - .TP
2016 --.B -B 'Wx [Wy X0 Y0]'
2017 -+.B \-B 'Wx [Wy X0 Y0]'
2018 - This specifies that the bounding box of the EPS file should have the
2019 - width Wx and the height Wy.
2020 - Note that it doesn't scale the figure to this size, it merely sets the bounding box.
2021 -@@ -667,13 +667,13 @@
2022 - screen (0,0) (upper-left).
2023 - Wx, Wy, X0 and Y0 are interpreted in centimeters or inches depending on the measure
2024 - given in the fig-file.
2025 --Remember to put either quotes (") or apostrophes (') to group the arguments to -B.
2026 -+Remember to put either quotes (") or apostrophes (') to group the arguments to \-B.
2027 - .TP
2028 --.B -R 'Wx [Wy X0 Y0]'
2029 --Same as the -B option except that X0 and Y0 is relative to the lower
2030 -+.B \-R 'Wx [Wy X0 Y0]'
2031 -+Same as the \-B option except that X0 and Y0 is relative to the lower
2032 - left corner of the
2033 - .B figure.
2034 --Remember to put either quotes (") or apostrophes (') to group the arguments to -R.
2035 -+Remember to put either quotes (") or apostrophes (') to group the arguments to \-R.
2036 - .LP
2037 - The PDF driver uses all the PostScript options.
2038 - .LP
2039 -@@ -697,106 +697,106 @@
2040 - In addition, there are 16 patterns such as bricks, diagonal lines,
2041 - crosshatch, etc.
2042 - .TP
2043 --.B -A
2044 -+.B \-A
2045 - Add an ASCII (EPSI) preview.
2046 - .TP
2047 --.B -b borderwidth
2048 -+.B \-b borderwidth
2049 - Make blank border around figure of width
2050 - .I borderwidth.
2051 - .br
2052 --Not availble in EPS.
2053 -+Not available in EPS.
2054 -
2055 - .TP
2056 --.B -C dummy_arg
2057 -+.B \-C dummy_arg
2058 - Add a color *binary* TIFF preview for Microsoft products that need a binary preview.
2059 --See also -T (monochrome preview). A dummy argument must be supplied for historical reasons.
2060 -+See also \-T (monochrome preview). A dummy argument must be supplied for historical reasons.
2061 - .TP
2062 --.B -c
2063 -+.B \-c
2064 - option centers the figure on the page.
2065 - The centering may not be accurate if there are texts in the
2066 - .I fig_file
2067 - that extends too far to the right of other objects.
2068 - .TP
2069 --.B -e
2070 -+.B \-e
2071 - option puts the figure against the edge (not centered) of the page.
2072 --Not availble in EPS.
2073 -+Not available in EPS.
2074 -
2075 - .TP
2076 --.B -F
2077 -+.B \-F
2078 - Use correct font sizes (points) instead of the traditional size that xfig/fig2dev uses,
2079 --which is 1/80 inch. The corresponding xfig command-line option is -correct_font_size.
2080 -+which is 1/80 inch. The corresponding xfig command-line option is \-correct_font_size.
2081 -
2082 - .TP
2083 --.B -g color
2084 -+.B \-g color
2085 - Use
2086 - .I color
2087 - for the background.
2088 - .TP
2089 --.B -l dummy_arg
2090 -+.B \-l dummy_arg
2091 - Generate figure in landscape mode. The dummy argument is ignored,
2092 - but must appear on the command line for reasons of compatibility.
2093 - This option will override the orientation specification in the
2094 - file (for file versions 3.0 and higher).
2095 - .br
2096 --Not availble in EPS.
2097 -+Not available in EPS.
2098 - .TP
2099 --.B -M
2100 -+.B \-M
2101 - Generate multiple pages if figure exceeds paper size.
2102 - .br
2103 --Not availble in EPS.
2104 -+Not available in EPS.
2105 - .TP
2106 - .B \-N
2107 - Convert all colors to grayscale.
2108 -
2109 - .TP
2110 --.B -n name
2111 -+.B \-n name
2112 - Set the Title part of the PostScript output to
2113 - .I name.
2114 - This is useful when the input to
2115 - .I fig2dev
2116 - comes from standard input.
2117 - .TP
2118 --.B -O
2119 -+.B \-O
2120 - When used with \fB-M\fR,
2121 - overlaps the pages slightly to get around the problem of
2122 - the unprintable area in most printers.
2123 - .br
2124 --Not availble in EPS.
2125 -+Not available in EPS.
2126 - .TP
2127 --.B -p dummy_arg
2128 -+.B \-p dummy_arg
2129 - Generate figure in portrait mode. The dummy argument is ignored,
2130 - but must appear on the command line for reasons of compatibility.
2131 - This option will override the orientation specification in the
2132 - file (for file versions 3.0 and higher).
2133 - This is the default for Fig files of version 2.1 or lower.
2134 - .br
2135 --Not availble in EPS.
2136 -+Not available in EPS.
2137 -
2138 - .TP
2139 --.B -T
2140 -+.B \-T
2141 - Add a monochrome *binary* TIFF preview for Microsoft products that need a binary preview.
2142 --See also -C (color preview).
2143 -+See also \-C (color preview).
2144 - .TP
2145 - .TP
2146 --.B -x offset
2147 -+.B \-x offset
2148 - shift the figure in the X direction by
2149 - .I offset
2150 - units (1/72 inch).
2151 - A negative value shifts the figure to the left and a positive value to the right.
2152 - .br
2153 --Not availble in EPS.
2154 -+Not available in EPS.
2155 - .TP
2156 --.B -y offset
2157 -+.B \-y offset
2158 - shift the figure in the Y direction by
2159 - .I offset
2160 - units (1/72 inch).
2161 - A negative value shifts the figure up and a positive value down.
2162 - .br
2163 --Not availble in EPS.
2164 -+Not available in EPS.
2165 - .TP
2166 --.B -z papersize
2167 -+.B \-z papersize
2168 - Sets the papersize.
2169 --Not availble in EPS.
2170 -+Not available in EPS.
2171 - .br
2172 - Available paper sizes are:
2173 - .nf
2174 -@@ -839,17 +839,17 @@
2175 - special text.
2176 -
2177 - .TP
2178 --.B -F
2179 -+.B \-F
2180 - Use correct font sizes (points) instead of the traditional size that xfig/fig2dev uses,
2181 --which is 1/80 inch. The corresponding xfig command-line option is -correct_font_size.
2182 -+which is 1/80 inch. The corresponding xfig command-line option is \-correct_font_size.
2183 -
2184 - .TP
2185 --.B -g color
2186 -+.B \-g color
2187 - Use
2188 - .I color
2189 - for the background.
2190 - .TP
2191 --.B -n name
2192 -+.B \-n name
2193 - sets the Title part of the PostScript output to
2194 - .I name.
2195 - This is useful when the input to
2196 -@@ -876,7 +876,7 @@
2197 - LaTeX document. With this option on, you can set the font from your LaTeX
2198 - document (like "\fB\\sfshape \\input picture.eepic\fR").
2199 - .TP
2200 --.B -p file
2201 -+.B \-p file
2202 - specifies the name of the PostScript file to be overlaid.
2203 - If not set or its value is null then no PS file will be inserted.
2204 -
2205 -@@ -977,7 +977,7 @@
2206 - .TP
2207 - .B \-P
2208 - Shorthand for
2209 --.B -n 3
2210 -+.B \-n 3
2211 - .
2212 -
2213 - .TP
2214 -@@ -992,7 +992,7 @@
2215 - directory! Don't put your stuff here. The
2216 - .B includegraphics
2217 - commands in the output file refer to this directory. Even
2218 --if the -p option is not used,
2219 -+if the \-p option is not used,
2220 - .B includegrpahics
2221 - commands follow this convention with the default directory
2222 - .I "\./eps".
2223 -@@ -1064,26 +1064,26 @@
2224 -
2225 - .SH TK and PTK OPTIONS (tcl/tk and Perl/tk)
2226 - .TP
2227 --.B -l dummy_arg
2228 -+.B \-l dummy_arg
2229 - Generate figure in landscape mode. The dummy argument is ignored,
2230 - but must appear on the command line for reasons of compatibility.
2231 - This option will override the orientation specification in the
2232 - file (for file versions 3.0 and higher).
2233 - .TP
2234 --.B -p dummy_arg
2235 -+.B \-p dummy_arg
2236 - Generate figure in portrait mode. The dummy argument is ignored,
2237 - but must appear on the command line for reasons of compatibility.
2238 - This option will override the orientation specification in the
2239 - file (for file versions 3.0 and higher).
2240 - This is the default for Fig files of version 2.1 or lower.
2241 - .TP
2242 --.B -P
2243 -+.B \-P
2244 - Generate canvas of full page size instead of using the bounding box
2245 - of the figure's objects. The default is to use only the bounding box.
2246 - .TP
2247 --.B -z papersize
2248 -+.B \-z papersize
2249 - Sets the papersize. See the POSTSCRIPT OPTIONS for available paper sizes.
2250 --This is only used when the -P option (use full page) is used.
2251 -+This is only used when the \-P option (use full page) is used.
2252 -
2253 - .SH "SEE ALSO"
2254 - [x]fig(1),
2255 ---- a/doc/transfig.1
2256 -+++ b/doc/transfig.1
2257 -@@ -3,11 +3,11 @@
2258 - transfig \- creates a makefile for portable LaTeX figures
2259 - .SH SYNOPSIS
2260 - .B transfig
2261 --[ -L \fIlanguage\fR ]
2262 --[ -M \fImakefile\fR ]
2263 --[ -T \fItexfile\fR ]
2264 --[ -I \fImacrofile\fR ]
2265 --[ -V ]
2266 -+[ \-L \fIlanguage\fR ]
2267 -+[ \-M \fImakefile\fR ]
2268 -+[ \-T \fItexfile\fR ]
2269 -+[ \-I \fImacrofile\fR ]
2270 -+[ \-V ]
2271 - [ \fIcontrol_specs\fR figfile ... ]
2272 - .SH DESCRIPTION
2273 - .I Transfig
2274 -@@ -76,13 +76,13 @@
2275 - is the default.
2276 - .PP
2277 - The names of the makefile and TeX macro file can be set with the
2278 ---M and -T options.
2279 -+\-M and \-T options.
2280 - The default names are "Makefile" and "transfig.tex", respectively.
2281 - If there is already an existing \fImakefile\fR in the directory, transfig
2282 - first renames it to \fImakefile~\fR. The same holds for any existing TeX macro file.
2283 --If the -I option is specified, then a command to read in \fImacrofile\fR is
2284 -+If the \-I option is specified, then a command to read in \fImacrofile\fR is
2285 - inserted into the TeX macro file.
2286 --If the -V option is specified, the program version number is printed only.
2287 -+If the \-V option is specified, the program version number is printed only.
2288 - .PP
2289 - Control specifiers are
2290 - .TP
2291
2292 diff --git a/media-gfx/transfig/files/transfig-3.2.5e-typos.patch b/media-gfx/transfig/files/transfig-3.2.5e-typos.patch
2293 deleted file mode 100644
2294 index 0a0e5cd60b1..00000000000
2295 --- a/media-gfx/transfig/files/transfig-3.2.5e-typos.patch
2296 +++ /dev/null
2297 @@ -1,25 +0,0 @@
2298 -Author: Roland Rosenfeld <roland@××××××.org>
2299 -Description: Fix some spelling errors in the binaries
2300 -
2301 ---- a/fig2dev/dev/readgif.c
2302 -+++ b/fig2dev/dev/readgif.c
2303 -@@ -151,7 +151,7 @@
2304 -
2305 - if (c == '!') { /* Extension */
2306 - if (! ReadOK(file,&c,1))
2307 -- fprintf(stderr,"GIF read error on extention function code\n");
2308 -+ fprintf(stderr,"GIF read error on extension function code\n");
2309 - (void) DoGIFextension(file, c);
2310 - continue;
2311 - }
2312 ---- a/fig2dev/read.c
2313 -+++ b/fig2dev/read.c
2314 -@@ -109,7 +109,7 @@
2315 - /* Format error; relevant error message is already delivered */
2316 - }
2317 - else
2318 -- put_msg("File \"%s\" is not accessable; %s", file, strerror(err));
2319 -+ put_msg("File \"%s\" is not accessible; %s", file, strerror(err));
2320 - }
2321 -
2322 - /**********************************************************
2323
2324 diff --git a/media-gfx/transfig/files/transfig-ru_RU.CP1251.ps b/media-gfx/transfig/files/transfig-ru_RU.CP1251.ps
2325 deleted file mode 100644
2326 index f8c142a642b..00000000000
2327 --- a/media-gfx/transfig/files/transfig-ru_RU.CP1251.ps
2328 +++ /dev/null
2329 @@ -1,298 +0,0 @@
2330 -%% Begining of ru_RU.CP1251.ps
2331 -%%
2332 -%% Author: Yura Zotov <yz@××××××××.ru>
2333 -%% based on cs_CZ.ps made by Radim Gelner <radim.gelner@××××.cz>
2334 -%%
2335 -%%BeginResource: encoding ISOLatin2Encoding
2336 -
2337 -/isol2vec [
2338 -10#0 /.notdef
2339 -10#1 /.notdef
2340 -10#2 /.notdef
2341 -10#3 /.notdef
2342 -10#4 /.notdef
2343 -10#5 /.notdef
2344 -10#6 /.notdef
2345 -10#7 /.notdef
2346 -10#8 /.notdef
2347 -10#9 /.notdef
2348 -10#10 /.notdef
2349 -10#11 /.notdef
2350 -10#12 /.notdef
2351 -10#13 /.notdef
2352 -10#14 /.notdef
2353 -10#15 /.notdef
2354 -10#16 /.notdef
2355 -10#17 /.notdef
2356 -10#18 /.notdef
2357 -10#19 /.notdef
2358 -10#20 /.notdef
2359 -10#21 /.notdef
2360 -10#22 /.notdef
2361 -10#23 /.notdef
2362 -10#24 /.notdef
2363 -10#25 /.notdef
2364 -10#26 /.notdef
2365 -10#27 /.notdef
2366 -10#28 /.notdef
2367 -10#29 /.notdef
2368 -10#30 /.notdef
2369 -10#31 /.notdef
2370 -10#32 /space
2371 -10#33 /exclam
2372 -10#34 /quotedbl
2373 -10#35 /numbersign
2374 -10#36 /dollar
2375 -10#37 /percent
2376 -10#38 /ampersand
2377 -10#39 /quoteright
2378 -10#40 /parenleft
2379 -10#41 /parenright
2380 -10#42 /asterisk
2381 -10#43 /plus
2382 -10#44 /comma
2383 -10#45 /hyphen
2384 -10#46 /period
2385 -10#47 /slash
2386 -10#48 /zero
2387 -10#49 /one
2388 -10#50 /two
2389 -10#51 /three
2390 -10#52 /four
2391 -10#53 /five
2392 -10#54 /six
2393 -10#55 /seven
2394 -10#56 /eight
2395 -10#57 /nine
2396 -10#58 /colon
2397 -10#59 /semicolon
2398 -10#60 /less
2399 -10#61 /equal
2400 -10#62 /greater
2401 -10#63 /question
2402 -10#64 /at
2403 -10#65 /A
2404 -10#66 /B
2405 -10#67 /C
2406 -10#68 /D
2407 -10#69 /E
2408 -10#70 /F
2409 -10#71 /G
2410 -10#72 /H
2411 -10#73 /I
2412 -10#74 /J
2413 -10#75 /K
2414 -10#76 /L
2415 -10#77 /M
2416 -10#78 /N
2417 -10#79 /O
2418 -10#80 /P
2419 -10#81 /Q
2420 -10#82 /R
2421 -10#83 /S
2422 -10#84 /T
2423 -10#85 /U
2424 -10#86 /V
2425 -10#87 /W
2426 -10#88 /X
2427 -10#89 /Y
2428 -10#90 /Z
2429 -10#91 /bracketleft
2430 -10#92 /backslash
2431 -10#93 /bracketright
2432 -10#94 /asciicircum
2433 -10#95 /underscore
2434 -10#96 /quoteleft
2435 -10#97 /a
2436 -10#98 /b
2437 -10#99 /c
2438 -10#100 /d
2439 -10#101 /e
2440 -10#102 /f
2441 -10#103 /g
2442 -10#104 /h
2443 -10#105 /i
2444 -10#106 /j
2445 -10#107 /k
2446 -10#108 /l
2447 -10#109 /m
2448 -10#110 /n
2449 -10#111 /o
2450 -10#112 /p
2451 -10#113 /q
2452 -10#114 /r
2453 -10#115 /s
2454 -10#116 /t
2455 -10#117 /u
2456 -10#118 /v
2457 -10#119 /w
2458 -10#120 /x
2459 -10#121 /y
2460 -10#122 /z
2461 -10#123 /braceleft
2462 -10#124 /bar
2463 -10#125 /braceright
2464 -10#126 /asciitilde
2465 -10#127 /.notdef
2466 -10#128 /afii10051
2467 -10#129 /afii10052
2468 -10#130 /quotesinglbase
2469 -10#131 /afii10100
2470 -10#132 /quotedblbase
2471 -10#133 /ellipsis
2472 -10#134 /dagger
2473 -10#135 /daggerdbl
2474 -10#136 /Euro
2475 -10#137 /perthousand
2476 -10#138 /afii10058
2477 -10#139 /guilsinglleft
2478 -10#140 /afii10059
2479 -10#141 /afii10061
2480 -10#142 /afii10060
2481 -10#143 /afii10145
2482 -10#144 /afii10099
2483 -10#145 /quoteleft
2484 -10#146 /quoteright
2485 -10#147 /quotedblleft
2486 -10#148 /quotedblright
2487 -10#149 /bullet
2488 -10#150 /endash
2489 -10#151 /emdash
2490 -10#152 /tilde
2491 -10#153 /trademark
2492 -10#154 /afii10106
2493 -10#155 /guilsinglright
2494 -10#156 /afii10107
2495 -10#157 /afii10109
2496 -10#158 /afii10108
2497 -10#159 /afii10193
2498 -10#160 /.notdef
2499 -10#161 /afii10062
2500 -10#162 /afii10110
2501 -10#163 /afii10057
2502 -10#164 /currency
2503 -10#165 /afii10050
2504 -10#166 /brokenbar
2505 -10#167 /section
2506 -10#168 /afii10023
2507 -10#169 /copyright
2508 -10#170 /afii10053
2509 -10#171 /guillemotleft
2510 -10#172 /logicalnot
2511 -10#173 /hyphen
2512 -10#174 /registered
2513 -10#175 /afii10056
2514 -10#176 /degree
2515 -10#177 /plusminus
2516 -10#178 /afii10055
2517 -10#179 /afii10103
2518 -10#180 /afii10098
2519 -10#181 /mu
2520 -10#182 /paragraph
2521 -10#183 /periodcentered
2522 -10#184 /afii10071
2523 -10#185 /afii61352
2524 -10#186 /afii10101
2525 -10#187 /guillemotright
2526 -10#188 /afii10105
2527 -10#189 /afii10054
2528 -10#190 /afii10102
2529 -10#191 /afii10104
2530 -10#192 /afii10017
2531 -10#193 /afii10018
2532 -10#194 /afii10019
2533 -10#195 /afii10020
2534 -10#196 /afii10021
2535 -10#197 /afii10022
2536 -10#198 /afii10024
2537 -10#199 /afii10025
2538 -10#200 /afii10026
2539 -10#201 /afii10027
2540 -10#202 /afii10028
2541 -10#203 /afii10029
2542 -10#204 /afii10030
2543 -10#205 /afii10031
2544 -10#206 /afii10032
2545 -10#207 /afii10033
2546 -10#208 /afii10034
2547 -10#209 /afii10035
2548 -10#210 /afii10036
2549 -10#211 /afii10037
2550 -10#212 /afii10038
2551 -10#213 /afii10039
2552 -10#214 /afii10040
2553 -10#215 /afii10041
2554 -10#216 /afii10042
2555 -10#217 /afii10043
2556 -10#218 /afii10044
2557 -10#219 /afii10045
2558 -10#220 /afii10046
2559 -10#221 /afii10047
2560 -10#222 /afii10048
2561 -10#223 /afii10049
2562 -10#224 /afii10065
2563 -10#225 /afii10066
2564 -10#226 /afii10067
2565 -10#227 /afii10068
2566 -10#228 /afii10069
2567 -10#229 /afii10070
2568 -10#230 /afii10072
2569 -10#231 /afii10073
2570 -10#232 /afii10074
2571 -10#233 /afii10075
2572 -10#234 /afii10076
2573 -10#235 /afii10077
2574 -10#236 /afii10078
2575 -10#237 /afii10079
2576 -10#238 /afii10080
2577 -10#239 /afii10081
2578 -10#240 /afii10082
2579 -10#241 /afii10083
2580 -10#242 /afii10084
2581 -10#243 /afii10085
2582 -10#244 /afii10086
2583 -10#245 /afii10087
2584 -10#246 /afii10088
2585 -10#247 /afii10089
2586 -10#248 /afii10090
2587 -10#249 /afii10091
2588 -10#250 /afii10092
2589 -10#251 /afii10093
2590 -10#252 /afii10094
2591 -10#253 /afii10095
2592 -10#254 /afii10096
2593 -10#255 /afii10097] def
2594 -%%EndResource
2595 -/Times-Roman /Times-Roman-iso isol2vec ReEncode
2596 -/Times-Italic /Times-Italic-iso isol2vec ReEncode
2597 -/Times-Bold /Times-Bold-iso isol2vec ReEncode
2598 -/Times-BoldItalic /Times-BoldItalic-iso isol2vec ReEncode
2599 -/AvantGarde-Book /AvantGarde-Book-iso isol2vec ReEncode
2600 -/AvantGarde-BookOblique /AvantGarde-BookOblique-iso isol2vec ReEncode
2601 -/AvantGarde-Demi /AvantGarde-Demi-iso isol2vec ReEncode
2602 -/AvantGarde-DemiOblique /AvantGarde-DemiOblique-iso isol2vec ReEncode
2603 -/Bookman-Light /Bookman-Light-iso isol2vec ReEncode
2604 -/Bookman-LightItalic /Bookman-LightItalic-iso isol2vec ReEncode
2605 -/Bookman-Demi /Bookman-Demi-iso isol2vec ReEncode
2606 -/Bookman-DemiItalic /Bookman-DemiItalic-iso isol2vec ReEncode
2607 -/Courier /Courier-iso isol2vec ReEncode
2608 -/Courier-Oblique /Courier-Oblique-iso isol2vec ReEncode
2609 -/Courier-Bold /Courier-Bold-iso isol2vec ReEncode
2610 -/Courier-BoldOblique /Courier-BoldOblique-iso isol2vec ReEncode
2611 -/Helvetica /Helvetica-iso isol2vec ReEncode
2612 -/Helvetica-Oblique /Helvetica-Oblique-iso isol2vec ReEncode
2613 -/Helvetica-Bold /Helvetica-Bold-iso isol2vec ReEncode
2614 -/Helvetica-BoldOblique /Helvetica-BoldOblique-iso isol2vec ReEncode
2615 -/Helvetica-Narrow /Helvetica-Narrow-iso isol2vec ReEncode
2616 -/Helvetica-Narrow-Oblique /Helvetica-Narrow-Oblique-iso isol2vec ReEncode
2617 -/Helvetica-Narrow-Bold /Helvetica-Narrow-Bold-iso isol2vec ReEncode
2618 -/Helvetica-Narrow-BoldOblique /Helvetica-Narrow-BoldOblique-iso isol2vec ReEncode
2619 -/NewCenturySchlbk-Roman /NewCenturySchlbk-Roman-iso isol2vec ReEncode
2620 -/NewCenturySchlbk-Italic /NewCenturySchlbk-Italic-iso isol2vec ReEncode
2621 -/NewCenturySchlbk-Bold /NewCenturySchlbk-Bold-iso isol2vec ReEncode
2622 -/NewCenturySchlbk-BoldItalic /NewCenturySchlbk-BoldItalic-iso isol2vec ReEncode
2623 -/Palatino-Roman /Palatino-Roman-iso isol2vec ReEncode
2624 -/Palatino-Italic /Palatino-Italic-iso isol2vec ReEncode
2625 -/Palatino-Bold /Palatino-Bold-iso isol2vec ReEncode
2626 -/Palatino-BoldItalic /Palatino-BoldItalic-iso isol2vec ReEncode
2627 -%% End of ru_RU.CP1251.ps
2628
2629 diff --git a/media-gfx/transfig/files/transfig-ru_RU.KOI8-R.ps b/media-gfx/transfig/files/transfig-ru_RU.KOI8-R.ps
2630 deleted file mode 100644
2631 index 1bda0b26a60..00000000000
2632 --- a/media-gfx/transfig/files/transfig-ru_RU.KOI8-R.ps
2633 +++ /dev/null
2634 @@ -1,298 +0,0 @@
2635 -%% Begining of ru_RU.KOI8-R.ps
2636 -%%
2637 -%% Author: Yura Zotov <yz@××××××××.ru>
2638 -%% based on cs_CZ.ps made by Radim Gelner <radim.gelner@××××.cz>
2639 -%%
2640 -%%BeginResource: encoding ISOLatin2Encoding
2641 -
2642 -/isol2vec [
2643 -10#0 /.notdef
2644 -10#1 /.notdef
2645 -10#2 /.notdef
2646 -10#3 /.notdef
2647 -10#4 /.notdef
2648 -10#5 /.notdef
2649 -10#6 /.notdef
2650 -10#7 /.notdef
2651 -10#8 /.notdef
2652 -10#9 /.notdef
2653 -10#10 /.notdef
2654 -10#11 /.notdef
2655 -10#12 /.notdef
2656 -10#13 /.notdef
2657 -10#14 /.notdef
2658 -10#15 /.notdef
2659 -10#16 /.notdef
2660 -10#17 /.notdef
2661 -10#18 /.notdef
2662 -10#19 /.notdef
2663 -10#20 /.notdef
2664 -10#21 /.notdef
2665 -10#22 /.notdef
2666 -10#23 /.notdef
2667 -10#24 /.notdef
2668 -10#25 /.notdef
2669 -10#26 /.notdef
2670 -10#27 /.notdef
2671 -10#28 /.notdef
2672 -10#29 /.notdef
2673 -10#30 /.notdef
2674 -10#31 /.notdef
2675 -10#32 /space
2676 -10#33 /exclam
2677 -10#34 /quotedbl
2678 -10#35 /numbersign
2679 -10#36 /dollar
2680 -10#37 /percent
2681 -10#38 /ampersand
2682 -10#39 /quotesingle
2683 -10#40 /parenleft
2684 -10#41 /parenright
2685 -10#42 /asterisk
2686 -10#43 /plus
2687 -10#44 /comma
2688 -10#45 /hyphen
2689 -10#46 /period
2690 -10#47 /slash
2691 -10#48 /zero
2692 -10#49 /one
2693 -10#50 /two
2694 -10#51 /three
2695 -10#52 /four
2696 -10#53 /five
2697 -10#54 /six
2698 -10#55 /seven
2699 -10#56 /eight
2700 -10#57 /nine
2701 -10#58 /colon
2702 -10#59 /semicolon
2703 -10#60 /less
2704 -10#61 /equal
2705 -10#62 /greater
2706 -10#63 /question
2707 -10#64 /at
2708 -10#65 /A
2709 -10#66 /B
2710 -10#67 /C
2711 -10#68 /D
2712 -10#69 /E
2713 -10#70 /F
2714 -10#71 /G
2715 -10#72 /H
2716 -10#73 /I
2717 -10#74 /J
2718 -10#75 /K
2719 -10#76 /L
2720 -10#77 /M
2721 -10#78 /N
2722 -10#79 /O
2723 -10#80 /P
2724 -10#81 /Q
2725 -10#82 /R
2726 -10#83 /S
2727 -10#84 /T
2728 -10#85 /U
2729 -10#86 /V
2730 -10#87 /W
2731 -10#88 /X
2732 -10#89 /Y
2733 -10#90 /Z
2734 -10#91 /bracketleft
2735 -10#92 /backslash
2736 -10#93 /bracketright
2737 -10#94 /asciicircum
2738 -10#95 /underscore
2739 -10#96 /grave
2740 -10#97 /a
2741 -10#98 /b
2742 -10#99 /c
2743 -10#100 /d
2744 -10#101 /e
2745 -10#102 /f
2746 -10#103 /g
2747 -10#104 /h
2748 -10#105 /i
2749 -10#106 /j
2750 -10#107 /k
2751 -10#108 /l
2752 -10#109 /m
2753 -10#110 /n
2754 -10#111 /o
2755 -10#112 /p
2756 -10#113 /q
2757 -10#114 /r
2758 -10#115 /s
2759 -10#116 /t
2760 -10#117 /u
2761 -10#118 /v
2762 -10#119 /w
2763 -10#120 /x
2764 -10#121 /y
2765 -10#122 /z
2766 -10#123 /braceleft
2767 -10#124 /bar
2768 -10#125 /braceright
2769 -10#126 /asciitilde
2770 -10#127 /.notdef
2771 -10#128 /SF100000
2772 -10#129 /SF110000
2773 -10#130 /SF010000
2774 -10#131 /SF030000
2775 -10#132 /SF020000
2776 -10#133 /SF040000
2777 -10#134 /SF080000
2778 -10#135 /SF090000
2779 -10#136 /SF060000
2780 -10#137 /SF070000
2781 -10#138 /SF050000
2782 -10#139 /upblock
2783 -10#140 /dnblock
2784 -10#141 /block
2785 -10#142 /lfblock
2786 -10#143 /rtblock
2787 -10#144 /ltshade
2788 -10#145 /shade
2789 -10#146 /dkshade
2790 -10#147 /integraltp
2791 -10#148 /filledbox
2792 -10#149 /uni2219
2793 -10#150 /radical
2794 -10#151 /approxequal
2795 -10#152 /lessequal
2796 -10#153 /greaterequal
2797 -10#154 /uni00A0
2798 -10#155 /integralbt
2799 -10#156 /degree
2800 -10#157 /twosuperior
2801 -10#158 /periodcentered
2802 -10#159 /divide
2803 -10#160 /SF430000
2804 -10#161 /SF240000
2805 -10#162 /SF510000
2806 -10#163 /afii10071
2807 -10#164 /SF520000
2808 -10#165 /SF390000
2809 -10#166 /SF220000
2810 -10#167 /SF210000
2811 -10#168 /SF250000
2812 -10#169 /SF500000
2813 -10#170 /SF490000
2814 -10#171 /SF380000
2815 -10#172 /SF280000
2816 -10#173 /SF270000
2817 -10#174 /SF260000
2818 -10#175 /SF360000
2819 -10#176 /SF370000
2820 -10#177 /SF420000
2821 -10#178 /SF190000
2822 -10#179 /afii10023
2823 -10#180 /SF200000
2824 -10#181 /SF230000
2825 -10#182 /SF470000
2826 -10#183 /SF480000
2827 -10#184 /SF410000
2828 -10#185 /SF450000
2829 -10#186 /SF460000
2830 -10#187 /SF400000
2831 -10#188 /SF540000
2832 -10#189 /SF530000
2833 -10#190 /SF440000
2834 -10#191 /copyright
2835 -10#192 /afii10096
2836 -10#193 /afii10065
2837 -10#194 /afii10066
2838 -10#195 /afii10088
2839 -10#196 /afii10069
2840 -10#197 /afii10070
2841 -10#198 /afii10086
2842 -10#199 /afii10068
2843 -10#200 /afii10087
2844 -10#201 /afii10074
2845 -10#202 /afii10075
2846 -10#203 /afii10076
2847 -10#204 /afii10077
2848 -10#205 /afii10078
2849 -10#206 /afii10079
2850 -10#207 /afii10080
2851 -10#208 /afii10081
2852 -10#209 /afii10097
2853 -10#210 /afii10082
2854 -10#211 /afii10083
2855 -10#212 /afii10084
2856 -10#213 /afii10085
2857 -10#214 /afii10072
2858 -10#215 /afii10067
2859 -10#216 /afii10094
2860 -10#217 /afii10093
2861 -10#218 /afii10073
2862 -10#219 /afii10090
2863 -10#220 /afii10095
2864 -10#221 /afii10091
2865 -10#222 /afii10089
2866 -10#223 /afii10092
2867 -10#224 /afii10048
2868 -10#225 /afii10017
2869 -10#226 /afii10018
2870 -10#227 /afii10040
2871 -10#228 /afii10021
2872 -10#229 /afii10022
2873 -10#230 /afii10038
2874 -10#231 /afii10020
2875 -10#232 /afii10039
2876 -10#233 /afii10026
2877 -10#234 /afii10027
2878 -10#235 /afii10028
2879 -10#236 /afii10029
2880 -10#237 /afii10030
2881 -10#238 /afii10031
2882 -10#239 /afii10032
2883 -10#240 /afii10033
2884 -10#241 /afii10049
2885 -10#242 /afii10034
2886 -10#243 /afii10035
2887 -10#244 /afii10036
2888 -10#245 /afii10037
2889 -10#246 /afii10024
2890 -10#247 /afii10019
2891 -10#248 /afii10046
2892 -10#249 /afii10045
2893 -10#250 /afii10025
2894 -10#251 /afii10042
2895 -10#252 /afii10047
2896 -10#253 /afii10043
2897 -10#254 /afii10041
2898 -10#255 /afii10044] def
2899 -%%EndResource
2900 -/Times-Roman /Times-Roman-iso isol2vec ReEncode
2901 -/Times-Italic /Times-Italic-iso isol2vec ReEncode
2902 -/Times-Bold /Times-Bold-iso isol2vec ReEncode
2903 -/Times-BoldItalic /Times-BoldItalic-iso isol2vec ReEncode
2904 -/AvantGarde-Book /AvantGarde-Book-iso isol2vec ReEncode
2905 -/AvantGarde-BookOblique /AvantGarde-BookOblique-iso isol2vec ReEncode
2906 -/AvantGarde-Demi /AvantGarde-Demi-iso isol2vec ReEncode
2907 -/AvantGarde-DemiOblique /AvantGarde-DemiOblique-iso isol2vec ReEncode
2908 -/Bookman-Light /Bookman-Light-iso isol2vec ReEncode
2909 -/Bookman-LightItalic /Bookman-LightItalic-iso isol2vec ReEncode
2910 -/Bookman-Demi /Bookman-Demi-iso isol2vec ReEncode
2911 -/Bookman-DemiItalic /Bookman-DemiItalic-iso isol2vec ReEncode
2912 -/Courier /Courier-iso isol2vec ReEncode
2913 -/Courier-Oblique /Courier-Oblique-iso isol2vec ReEncode
2914 -/Courier-Bold /Courier-Bold-iso isol2vec ReEncode
2915 -/Courier-BoldOblique /Courier-BoldOblique-iso isol2vec ReEncode
2916 -/Helvetica /Helvetica-iso isol2vec ReEncode
2917 -/Helvetica-Oblique /Helvetica-Oblique-iso isol2vec ReEncode
2918 -/Helvetica-Bold /Helvetica-Bold-iso isol2vec ReEncode
2919 -/Helvetica-BoldOblique /Helvetica-BoldOblique-iso isol2vec ReEncode
2920 -/Helvetica-Narrow /Helvetica-Narrow-iso isol2vec ReEncode
2921 -/Helvetica-Narrow-Oblique /Helvetica-Narrow-Oblique-iso isol2vec ReEncode
2922 -/Helvetica-Narrow-Bold /Helvetica-Narrow-Bold-iso isol2vec ReEncode
2923 -/Helvetica-Narrow-BoldOblique /Helvetica-Narrow-BoldOblique-iso isol2vec ReEncode
2924 -/NewCenturySchlbk-Roman /NewCenturySchlbk-Roman-iso isol2vec ReEncode
2925 -/NewCenturySchlbk-Italic /NewCenturySchlbk-Italic-iso isol2vec ReEncode
2926 -/NewCenturySchlbk-Bold /NewCenturySchlbk-Bold-iso isol2vec ReEncode
2927 -/NewCenturySchlbk-BoldItalic /NewCenturySchlbk-BoldItalic-iso isol2vec ReEncode
2928 -/Palatino-Roman /Palatino-Roman-iso isol2vec ReEncode
2929 -/Palatino-Italic /Palatino-Italic-iso isol2vec ReEncode
2930 -/Palatino-Bold /Palatino-Bold-iso isol2vec ReEncode
2931 -/Palatino-BoldItalic /Palatino-BoldItalic-iso isol2vec ReEncode
2932 -%% End of ru_RU.KOI8-R.ps
2933
2934 diff --git a/media-gfx/transfig/files/transfig-uk_UA.KOI8-U.ps b/media-gfx/transfig/files/transfig-uk_UA.KOI8-U.ps
2935 deleted file mode 100644
2936 index 8803c72e469..00000000000
2937 --- a/media-gfx/transfig/files/transfig-uk_UA.KOI8-U.ps
2938 +++ /dev/null
2939 @@ -1,298 +0,0 @@
2940 -%% Begining of uk_UA.KOI8-U.ps
2941 -%%
2942 -%% Author: Yura Zotov <yz@××××××××.ru>
2943 -%% based on cs_CZ.ps made by Radim Gelner <radim.gelner@××××.cz>
2944 -%%
2945 -%%BeginResource: encoding ISOLatin2Encoding
2946 -
2947 -/isol2vec [
2948 -10#0 /.notdef
2949 -10#1 /.notdef
2950 -10#2 /.notdef
2951 -10#3 /.notdef
2952 -10#4 /.notdef
2953 -10#5 /.notdef
2954 -10#6 /.notdef
2955 -10#7 /.notdef
2956 -10#8 /.notdef
2957 -10#9 /.notdef
2958 -10#10 /.notdef
2959 -10#11 /.notdef
2960 -10#12 /.notdef
2961 -10#13 /.notdef
2962 -10#14 /.notdef
2963 -10#15 /.notdef
2964 -10#16 /.notdef
2965 -10#17 /.notdef
2966 -10#18 /.notdef
2967 -10#19 /.notdef
2968 -10#20 /.notdef
2969 -10#21 /.notdef
2970 -10#22 /.notdef
2971 -10#23 /.notdef
2972 -10#24 /.notdef
2973 -10#25 /.notdef
2974 -10#26 /.notdef
2975 -10#27 /.notdef
2976 -10#28 /.notdef
2977 -10#29 /.notdef
2978 -10#30 /.notdef
2979 -10#31 /.notdef
2980 -10#32 /space
2981 -10#33 /exclam
2982 -10#34 /quotedbl
2983 -10#35 /numbersign
2984 -10#36 /dollar
2985 -10#37 /percent
2986 -10#38 /ampersand
2987 -10#39 /quotesingle
2988 -10#40 /parenleft
2989 -10#41 /parenright
2990 -10#42 /asterisk
2991 -10#43 /plus
2992 -10#44 /comma
2993 -10#45 /hyphen
2994 -10#46 /period
2995 -10#47 /slash
2996 -10#48 /zero
2997 -10#49 /one
2998 -10#50 /two
2999 -10#51 /three
3000 -10#52 /four
3001 -10#53 /five
3002 -10#54 /six
3003 -10#55 /seven
3004 -10#56 /eight
3005 -10#57 /nine
3006 -10#58 /colon
3007 -10#59 /semicolon
3008 -10#60 /less
3009 -10#61 /equal
3010 -10#62 /greater
3011 -10#63 /question
3012 -10#64 /at
3013 -10#65 /A
3014 -10#66 /B
3015 -10#67 /C
3016 -10#68 /D
3017 -10#69 /E
3018 -10#70 /F
3019 -10#71 /G
3020 -10#72 /H
3021 -10#73 /I
3022 -10#74 /J
3023 -10#75 /K
3024 -10#76 /L
3025 -10#77 /M
3026 -10#78 /N
3027 -10#79 /O
3028 -10#80 /P
3029 -10#81 /Q
3030 -10#82 /R
3031 -10#83 /S
3032 -10#84 /T
3033 -10#85 /U
3034 -10#86 /V
3035 -10#87 /W
3036 -10#88 /X
3037 -10#89 /Y
3038 -10#90 /Z
3039 -10#91 /bracketleft
3040 -10#92 /backslash
3041 -10#93 /bracketright
3042 -10#94 /asciicircum
3043 -10#95 /underscore
3044 -10#96 /grave
3045 -10#97 /a
3046 -10#98 /b
3047 -10#99 /c
3048 -10#100 /d
3049 -10#101 /e
3050 -10#102 /f
3051 -10#103 /g
3052 -10#104 /h
3053 -10#105 /i
3054 -10#106 /j
3055 -10#107 /k
3056 -10#108 /l
3057 -10#109 /m
3058 -10#110 /n
3059 -10#111 /o
3060 -10#112 /p
3061 -10#113 /q
3062 -10#114 /r
3063 -10#115 /s
3064 -10#116 /t
3065 -10#117 /u
3066 -10#118 /v
3067 -10#119 /w
3068 -10#120 /x
3069 -10#121 /y
3070 -10#122 /z
3071 -10#123 /braceleft
3072 -10#124 /bar
3073 -10#125 /braceright
3074 -10#126 /asciitilde
3075 -10#127 /.notdef
3076 -10#128 /SF100000
3077 -10#129 /SF110000
3078 -10#130 /SF010000
3079 -10#131 /SF030000
3080 -10#132 /SF020000
3081 -10#133 /SF040000
3082 -10#134 /SF080000
3083 -10#135 /SF090000
3084 -10#136 /SF060000
3085 -10#137 /SF070000
3086 -10#138 /SF050000
3087 -10#139 /upblock
3088 -10#140 /dnblock
3089 -10#141 /block
3090 -10#142 /lfblock
3091 -10#143 /rtblock
3092 -10#144 /ltshade
3093 -10#145 /shade
3094 -10#146 /dkshade
3095 -10#147 /integraltp
3096 -10#148 /filledbox
3097 -10#149 /uni2219
3098 -10#150 /radical
3099 -10#151 /approxequal
3100 -10#152 /lessequal
3101 -10#153 /greaterequal
3102 -10#154 /uni00A0
3103 -10#155 /integralbt
3104 -10#156 /degree
3105 -10#157 /twosuperior
3106 -10#158 /periodcentered
3107 -10#159 /divide
3108 -10#160 /SF430000
3109 -10#161 /SF240000
3110 -10#162 /SF510000
3111 -10#163 /afii10071
3112 -10#164 /afii10101
3113 -10#165 /SF390000
3114 -10#166 /afii10103
3115 -10#167 /afii10104
3116 -10#168 /SF250000
3117 -10#169 /SF500000
3118 -10#170 /SF490000
3119 -10#171 /SF380000
3120 -10#172 /SF280000
3121 -10#173 /afii10098
3122 -10#174 /SF260000
3123 -10#175 /SF360000
3124 -10#176 /SF370000
3125 -10#177 /SF420000
3126 -10#178 /SF190000
3127 -10#179 /afii10023
3128 -10#180 /afii10053
3129 -10#181 /SF230000
3130 -10#182 /afii10055
3131 -10#183 /afii10056
3132 -10#184 /SF410000
3133 -10#185 /SF450000
3134 -10#186 /SF460000
3135 -10#187 /SF400000
3136 -10#188 /SF540000
3137 -10#189 /afii10050
3138 -10#190 /SF440000
3139 -10#191 /copyright
3140 -10#192 /afii10096
3141 -10#193 /afii10065
3142 -10#194 /afii10066
3143 -10#195 /afii10088
3144 -10#196 /afii10069
3145 -10#197 /afii10070
3146 -10#198 /afii10086
3147 -10#199 /afii10068
3148 -10#200 /afii10087
3149 -10#201 /afii10074
3150 -10#202 /afii10075
3151 -10#203 /afii10076
3152 -10#204 /afii10077
3153 -10#205 /afii10078
3154 -10#206 /afii10079
3155 -10#207 /afii10080
3156 -10#208 /afii10081
3157 -10#209 /afii10097
3158 -10#210 /afii10082
3159 -10#211 /afii10083
3160 -10#212 /afii10084
3161 -10#213 /afii10085
3162 -10#214 /afii10072
3163 -10#215 /afii10067
3164 -10#216 /afii10094
3165 -10#217 /afii10093
3166 -10#218 /afii10073
3167 -10#219 /afii10090
3168 -10#220 /afii10095
3169 -10#221 /afii10091
3170 -10#222 /afii10089
3171 -10#223 /afii10092
3172 -10#224 /afii10048
3173 -10#225 /afii10017
3174 -10#226 /afii10018
3175 -10#227 /afii10040
3176 -10#228 /afii10021
3177 -10#229 /afii10022
3178 -10#230 /afii10038
3179 -10#231 /afii10020
3180 -10#232 /afii10039
3181 -10#233 /afii10026
3182 -10#234 /afii10027
3183 -10#235 /afii10028
3184 -10#236 /afii10029
3185 -10#237 /afii10030
3186 -10#238 /afii10031
3187 -10#239 /afii10032
3188 -10#240 /afii10033
3189 -10#241 /afii10049
3190 -10#242 /afii10034
3191 -10#243 /afii10035
3192 -10#244 /afii10036
3193 -10#245 /afii10037
3194 -10#246 /afii10024
3195 -10#247 /afii10019
3196 -10#248 /afii10046
3197 -10#249 /afii10045
3198 -10#250 /afii10025
3199 -10#251 /afii10042
3200 -10#252 /afii10047
3201 -10#253 /afii10043
3202 -10#254 /afii10041
3203 -10#255 /afii10044] def
3204 -%%EndResource
3205 -/Times-Roman /Times-Roman-iso isol2vec ReEncode
3206 -/Times-Italic /Times-Italic-iso isol2vec ReEncode
3207 -/Times-Bold /Times-Bold-iso isol2vec ReEncode
3208 -/Times-BoldItalic /Times-BoldItalic-iso isol2vec ReEncode
3209 -/AvantGarde-Book /AvantGarde-Book-iso isol2vec ReEncode
3210 -/AvantGarde-BookOblique /AvantGarde-BookOblique-iso isol2vec ReEncode
3211 -/AvantGarde-Demi /AvantGarde-Demi-iso isol2vec ReEncode
3212 -/AvantGarde-DemiOblique /AvantGarde-DemiOblique-iso isol2vec ReEncode
3213 -/Bookman-Light /Bookman-Light-iso isol2vec ReEncode
3214 -/Bookman-LightItalic /Bookman-LightItalic-iso isol2vec ReEncode
3215 -/Bookman-Demi /Bookman-Demi-iso isol2vec ReEncode
3216 -/Bookman-DemiItalic /Bookman-DemiItalic-iso isol2vec ReEncode
3217 -/Courier /Courier-iso isol2vec ReEncode
3218 -/Courier-Oblique /Courier-Oblique-iso isol2vec ReEncode
3219 -/Courier-Bold /Courier-Bold-iso isol2vec ReEncode
3220 -/Courier-BoldOblique /Courier-BoldOblique-iso isol2vec ReEncode
3221 -/Helvetica /Helvetica-iso isol2vec ReEncode
3222 -/Helvetica-Oblique /Helvetica-Oblique-iso isol2vec ReEncode
3223 -/Helvetica-Bold /Helvetica-Bold-iso isol2vec ReEncode
3224 -/Helvetica-BoldOblique /Helvetica-BoldOblique-iso isol2vec ReEncode
3225 -/Helvetica-Narrow /Helvetica-Narrow-iso isol2vec ReEncode
3226 -/Helvetica-Narrow-Oblique /Helvetica-Narrow-Oblique-iso isol2vec ReEncode
3227 -/Helvetica-Narrow-Bold /Helvetica-Narrow-Bold-iso isol2vec ReEncode
3228 -/Helvetica-Narrow-BoldOblique /Helvetica-Narrow-BoldOblique-iso isol2vec ReEncode
3229 -/NewCenturySchlbk-Roman /NewCenturySchlbk-Roman-iso isol2vec ReEncode
3230 -/NewCenturySchlbk-Italic /NewCenturySchlbk-Italic-iso isol2vec ReEncode
3231 -/NewCenturySchlbk-Bold /NewCenturySchlbk-Bold-iso isol2vec ReEncode
3232 -/NewCenturySchlbk-BoldItalic /NewCenturySchlbk-BoldItalic-iso isol2vec ReEncode
3233 -/Palatino-Roman /Palatino-Roman-iso isol2vec ReEncode
3234 -/Palatino-Italic /Palatino-Italic-iso isol2vec ReEncode
3235 -/Palatino-Bold /Palatino-Bold-iso isol2vec ReEncode
3236 -/Palatino-BoldItalic /Palatino-BoldItalic-iso isol2vec ReEncode
3237 -%% End of uk_UA.KOI8-U.ps
3238
3239 diff --git a/media-gfx/transfig/transfig-3.2.5d-r1.ebuild b/media-gfx/transfig/transfig-3.2.5d-r1.ebuild
3240 index aee8e3b9599..bf3cd62341a 100644
3241 --- a/media-gfx/transfig/transfig-3.2.5d-r1.ebuild
3242 +++ b/media-gfx/transfig/transfig-3.2.5d-r1.ebuild
3243 @@ -1,4 +1,4 @@
3244 -# Copyright 1999-2013 Gentoo Foundation
3245 +# Copyright 1999-2017 Gentoo Foundation
3246 # Distributed under the terms of the GNU General Public License v2
3247
3248 EAPI="4"
3249 @@ -9,7 +9,8 @@ MY_P=${PN}.${PV}
3250 DESCRIPTION="A set of tools for creating TeX documents with graphics"
3251 HOMEPAGE="http://www.xfig.org/"
3252 SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
3253 - mirror://gentoo/fig2mpdf-1.1.2.tar.bz2"
3254 + mirror://gentoo/fig2mpdf-1.1.2.tar.bz2
3255 + https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
3256
3257 LICENSE="BSD"
3258 SLOT="0"
3259 @@ -47,13 +48,13 @@ sed_Imakefile() {
3260 src_prepare() {
3261 find . -type f -exec chmod a-x '{}' \;
3262 find . -name Makefile -delete
3263 - epatch "${FILESDIR}"/${P}-fig2mpdf-r1.patch
3264 - epatch "${FILESDIR}"/${PN}-3.2.5c-maxfontsize.patch
3265 - epatch "${FILESDIR}"/${P}-leadspace.patch
3266 - epatch "${FILESDIR}"/${P}-precision.patch
3267 - epatch "${FILESDIR}"/${P}-MAXWIDTH.patch
3268 - epatch "${FILESDIR}"/${P}-libpng-1.5.patch #356751
3269 - epatch "${FILESDIR}"/${PN}-3.2.5-solaris.patch
3270 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${P}-fig2mpdf-r1.patch
3271 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5c-maxfontsize.patch
3272 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${P}-leadspace.patch
3273 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${P}-precision.patch
3274 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${P}-MAXWIDTH.patch
3275 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${P}-libpng-1.5.patch #356751
3276 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5-solaris.patch
3277
3278 sed -e 's:-L$(ZLIBDIR) -lz::' \
3279 -e 's: -lX11::' \
3280 @@ -77,9 +78,9 @@ src_install() {
3281 doman "${WORKDIR}/fig2mpdf/fig2mpdf.1"
3282
3283 insinto /usr/share/fig2dev/
3284 - newins "${FILESDIR}/transfig-ru_RU.CP1251.ps" ru_RU.CP1251.ps
3285 - newins "${FILESDIR}/transfig-ru_RU.KOI8-R.ps" ru_RU.KOI8-R.ps
3286 - newins "${FILESDIR}/transfig-uk_UA.KOI8-U.ps" uk_UA.KOI8-U.ps
3287 + newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.CP1251.ps" ru_RU.CP1251.ps
3288 + newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.KOI8-R.ps" ru_RU.KOI8-R.ps
3289 + newins "${WORKDIR}/${P}-gentoo-patchset/transfig-uk_UA.KOI8-U.ps" uk_UA.KOI8-U.ps
3290
3291 dohtml "${WORKDIR}/fig2mpdf/doc/"* || die
3292
3293
3294 diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
3295 index 13da9e1be0e..dddff705b4d 100644
3296 --- a/media-gfx/transfig/transfig-3.2.5e.ebuild
3297 +++ b/media-gfx/transfig/transfig-3.2.5e.ebuild
3298 @@ -9,7 +9,8 @@ MY_P=${PN}.${PV}
3299 DESCRIPTION="A set of tools for creating TeX documents with graphics"
3300 HOMEPAGE="http://www.xfig.org/"
3301 SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
3302 - mirror://gentoo/fig2mpdf-1.1.2.tar.bz2"
3303 + mirror://gentoo/fig2mpdf-1.1.2.tar.bz2
3304 + https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
3305
3306 LICENSE="BSD"
3307 SLOT="0"
3308 @@ -47,12 +48,12 @@ sed_Imakefile() {
3309 src_prepare() {
3310 find . -type f -exec chmod a-x '{}' \;
3311 find . -name Makefile -delete
3312 - epatch "${FILESDIR}"/${PN}-3.2.5d-fig2mpdf-r1.patch
3313 - epatch "${FILESDIR}"/${PN}-3.2.5c-maxfontsize.patch
3314 - epatch "${FILESDIR}"/${PN}-3.2.5-solaris.patch
3315 - epatch "${FILESDIR}"/${PN}-3.2.5e-typos.patch
3316 - epatch "${FILESDIR}"/${PN}-3.2.5e-man-hyphen.patch
3317 - epatch "${FILESDIR}"/${PN}-3.2.5e-fprintf_format_warnings.patch
3318 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5d-fig2mpdf-r1.patch
3319 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5c-maxfontsize.patch
3320 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5-solaris.patch
3321 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-typos.patch
3322 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-man-hyphen.patch
3323 + epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-fprintf_format_warnings.patch
3324
3325 sed -e 's:-L$(ZLIBDIR) -lz::' \
3326 -e 's: -lX11::' \
3327 @@ -76,9 +77,9 @@ src_install() {
3328 doman "${WORKDIR}/fig2mpdf/fig2mpdf.1"
3329
3330 insinto /usr/share/fig2dev/
3331 - newins "${FILESDIR}/transfig-ru_RU.CP1251.ps" ru_RU.CP1251.ps
3332 - newins "${FILESDIR}/transfig-ru_RU.KOI8-R.ps" ru_RU.KOI8-R.ps
3333 - newins "${FILESDIR}/transfig-uk_UA.KOI8-U.ps" uk_UA.KOI8-U.ps
3334 + newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.CP1251.ps" ru_RU.CP1251.ps
3335 + newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.KOI8-R.ps" ru_RU.KOI8-R.ps
3336 + newins "${WORKDIR}/${P}-gentoo-patchset/transfig-uk_UA.KOI8-U.ps" uk_UA.KOI8-U.ps
3337
3338 dohtml "${WORKDIR}/fig2mpdf/doc/"* || die