summaryrefslogtreecommitdiff
path: root/Build/source/utils/psutils/psutils-1.17-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils/psutils/psutils-1.17-PATCHES')
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog42
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes14
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-01-WIN32127
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-02-PERL93
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-03-main-is-int128
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-04-warnings41
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-05-const114
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-07-TEMPDIR14
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-08-non-free25
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-09-PERL41
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-10-binary-mode60
-rw-r--r--Build/source/utils/psutils/psutils-1.17-PATCHES/patch-11-extern44
12 files changed, 0 insertions, 743 deletions
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog b/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog
deleted file mode 100644
index 3236283e03e..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog
+++ /dev/null
@@ -1,42 +0,0 @@
-2012-08-26 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-01-WIN32: Adapt to W32TeX (from Akira Kakuto).
- * patch-06-MINGW (removed): Obsolete.
-
-2012-03-29 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-11-extern (new): Remove extern decls from *.c files.
-
-2011-09-22 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-10-binary-mode (new): Fix error messages when setting
- binary mode fails.
-
-2011-01-09 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-07-TEMPDIR: Fix broken perl syntax.
- * patch-09-PERL (new): Avoid problems with Akira's perl.
-
- Mail from Akira Sat, 08 Jan 2011 14:43:53.
-
-2010-12-20 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-07-TEMPDIR (new): Honor $TMPDIR, $TEMP, and $TMP.
- * patch-08-non-free (new): Adapt to removal of non-free files.
-
-2010-12-16 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-02-PERL: Adapt to new kpsewhich semantics and
- texmf layout.
- Change basename => dirname and add 'use File::Basename'.
-
-2010-12-10 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- Patches applied to psutils-1.17 as obtained from CTAN.
- * patch-01-WIN32: Added various #ifdef WIN32.
- * patch-02-PERL: Handling of perl scripts.
- * patch-03-main-is-int: Changed return type of main() from void
- to int; changed exit at end into return.
- * patch-04-warnings: Avoid various compiler warnings.
- * patch-05-const: Constify strings.
- * patch-06-MINGW: Do not #include <win32lib.h> for MinGW32.
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes b/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes
deleted file mode 100644
index 19ab64a7cda..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes
+++ /dev/null
@@ -1,14 +0,0 @@
-Changes applied to the psutils-1.17 tree as obtained from:
- http://mirror.ctan.org/support/psutils/psutils-p17.tar.gz
-
-Remove non-free files:
- md68_0.ps
- md71_0.ps
-
-Rename:
- patchlev.h -> patchlev.h.in
-
-Add execute permissions:
- getafm.sh
- showchar.sh
-
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-01-WIN32 b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-01-WIN32
deleted file mode 100644
index 056fb4852dc..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-01-WIN32
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -ur psutils-1.17.orig/config.h psutils-1.17/config.h
---- psutils-1.17.orig/config.h 1997-03-11 23:52:52.000000000 +0100
-+++ psutils-1.17/config.h 2012-08-26 15:44:12.000000000 +0200
-@@ -4,13 +4,13 @@
- * OS specific configuration for PSUtils
- */
-
--#if defined(MSDOS) || defined(WINNT)
--#define TMPDIR "\\tmp"
-+#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
-+#define TMPDIR "."
- #define OPEN_READ "rb"
- #define OPEN_WRITE "wb"
- #include <fcntl.h>
- #include <io.h>
--#else /* ! MSDOS && ! WINNT */
-+#else /* ! MSDOS && ! WINNT && ! WIN32 */
- #if defined(OS2)
- #define TMPDIR "."
- #define OPEN_READ "rb"
-@@ -26,5 +26,5 @@
- #define TMPDIR "/tmp"
- #endif /* ! VMS */
- #endif /* ! OS2 */
--#endif /* ! MSDOS && ! WINNT */
-+#endif /* ! MSDOS && ! WINNT && !WIN32 */
-
-diff -ur psutils-1.17.orig/epsffit.c psutils-1.17/epsffit.c
---- psutils-1.17.orig/epsffit.c 1997-03-11 23:52:52.000000000 +0100
-+++ psutils-1.17/epsffit.c 2006-01-17 22:16:42.000000000 +0100
-@@ -75,7 +75,7 @@
- if(!(input = fopen(argv[4], OPEN_READ)))
- message(FATAL, "can't open input file %s\n", argv[4]);
- } else {
--#if defined(MSDOS) || defined(WINNT)
-+#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
- message(FATAL, "can't reset stdin to binary mode\n");
-@@ -87,7 +87,7 @@
- if(!(output = fopen(argv[5], OPEN_WRITE)))
- message(FATAL, "can't open output file %s\n", argv[5]);
- } else {
--#if defined(MSDOS) || defined(WINNT)
-+#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
- int fd = fileno(stdout) ;
- if ( setmode(fd, O_BINARY) < 0 )
- message(FATAL, "can't reset stdout to binary mode\n");
-diff -ur psutils-1.17.orig/psbook.c psutils-1.17/psbook.c
---- psutils-1.17.orig/psbook.c 1997-03-11 23:53:01.000000000 +0100
-+++ psutils-1.17/psbook.c 2006-01-17 22:16:42.000000000 +0100
-@@ -62,7 +62,7 @@
- message(FATAL, "can't open output file %s\n", *argv);
- } else usage();
- }
--#if defined(MSDOS) || defined(WINNT)
-+#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-diff -ur psutils-1.17.orig/psnup.c psutils-1.17/psnup.c
---- psutils-1.17.orig/psnup.c 1997-03-11 23:53:02.000000000 +0100
-+++ psutils-1.17/psnup.c 2006-01-17 22:16:42.000000000 +0100
-@@ -190,7 +190,7 @@
- message(FATAL, "can't open output file %s\n", *argv);
- } else usage();
- }
--#if defined(MSDOS) || defined(WINNT)
-+#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-diff -ur psutils-1.17.orig/psresize.c psutils-1.17/psresize.c
---- psutils-1.17.orig/psresize.c 1997-03-11 23:53:03.000000000 +0100
-+++ psutils-1.17/psresize.c 2006-01-17 22:16:42.000000000 +0100
-@@ -114,7 +114,7 @@
- message(FATAL, "can't open output file %s\n", *argv);
- } else usage();
- }
--#if defined(MSDOS) || defined(WINNT)
-+#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-diff -ur psutils-1.17.orig/psselect.c psutils-1.17/psselect.c
---- psutils-1.17.orig/psselect.c 1997-03-11 23:53:03.000000000 +0100
-+++ psutils-1.17/psselect.c 2006-01-17 22:16:42.000000000 +0100
-@@ -133,7 +133,7 @@
- message(FATAL, "can't open output file %s\n", *argv);
- } else usage();
- }
--#if defined(MSDOS) || defined(WINNT)
-+#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-diff -ur psutils-1.17.orig/pstops.c psutils-1.17/pstops.c
---- psutils-1.17.orig/pstops.c 1997-03-11 23:53:04.000000000 +0100
-+++ psutils-1.17/pstops.c 2006-01-17 22:16:42.000000000 +0100
-@@ -177,7 +177,7 @@
- }
- if (specs == NULL)
- usage();
--#if defined(MSDOS) || defined(WINNT)
-+#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-diff -ur psutils-1.17.orig/psutil.c psutils-1.17/psutil.c
---- psutils-1.17.orig/psutil.c 1997-03-11 23:53:04.000000000 +0100
-+++ psutils-1.17/psutil.c 2006-01-17 22:16:42.000000000 +0100
-@@ -85,13 +85,13 @@
- #endif
- char *p;
- char buffer[BUFSIZ] ;
--#if defined(WINNT)
-+#if defined(WINNT) || defined(WIN32)
- struct _stat fs ;
- #else
- long fpos;
- #endif
-
--#if defined(WINNT)
-+#if defined(WINNT) || defined(WIN32)
- if (_fstat(fileno(fp), &fs) == 0 && (fs.st_mode&_S_IFREG) != 0)
- return (fp);
- #else
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-02-PERL b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-02-PERL
deleted file mode 100644
index 2887e44e7eb..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-02-PERL
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ur psutils-1.17.orig/fixmacps.man psutils-1.17/fixmacps.man
---- psutils-1.17.orig/fixmacps.man 1997-03-11 23:52:54.000000000 +0100
-+++ psutils-1.17/fixmacps.man 2006-01-17 22:16:42.000000000 +0100
-@@ -16,7 +16,7 @@
- .B psutils
- package.
- .SH FILES
--@INCLUDE@/md68_0.ps, @INCLUDE@/md71_0.ps - sanitised versions of the md
-+md68_0.ps, md71_0.ps - sanitised versions of the md
- prologue.
- .SH AUTHOR
- Copyright (C) Angus J. C. Duggan 1991-1995
-diff -ur psutils-1.17.orig/fixmacps.pl psutils-1.17/fixmacps.pl
---- psutils-1.17.orig/fixmacps.pl 1997-03-11 23:52:54.000000000 +0100
-+++ psutils-1.17/fixmacps.pl 2010-12-13 15:04:50.000000000 +0100
-@@ -4,8 +4,11 @@
- # Copyright (C) Angus J. C. Duggan 1991-1995
- # See file LICENSE for details.
-
-+use File::Basename;
-+
- $line = 0; # keep line count
--$dir = "@INCLUDE@";
-+$predir = `kpsewhich -progname=dvips -format="other text files" md71_0.ps`;
-+$dir=`dirname $predir`;
- $prefix = "md";
- $default = "md71_0.ps";
-
-diff -ur psutils-1.17.orig/includeres.man psutils-1.17/includeres.man
---- psutils-1.17.orig/includeres.man 1997-03-11 23:52:57.000000000 +0100
-+++ psutils-1.17/includeres.man 2006-01-17 22:16:42.000000000 +0100
-@@ -26,8 +26,6 @@
- or
- .I pstops
- safely.
--.SH FILES
--@INCLUDE@ - system resource directory.
- .SH AUTHOR
- Copyright (C) Angus J. C. Duggan 1991-1995
- .SH "SEE ALSO"
-diff -ur psutils-1.17.orig/includeres.pl psutils-1.17/includeres.pl
---- psutils-1.17.orig/includeres.pl 1997-03-11 23:52:58.000000000 +0100
-+++ psutils-1.17/includeres.pl 2006-01-17 22:16:42.000000000 +0100
-@@ -4,6 +4,11 @@
- # Copyright (C) Angus J. C. Duggan 1991-1995
- # See file LICENSE for details.
-
-+use File::Basename;
-+
-+$predir = `kpsewhich -progname=dvips -format="other text files" md71_0.ps`;
-+$inc=`dirname $predir`;
-+
- $prog = ($0 =~ s=.*/==);
-
- %extn = ("font", ".pfa", "file", ".ps", "procset", ".ps", # resource extns
-@@ -28,7 +33,6 @@
- local($comment, @res) = split(/\s+/);
- local($type) = defined($type{$comment}) ? $type{$comment} : shift(@res);
- local($name) = &filename(@res);
-- local($inc) = "@INCLUDE@"; # system include directory
- if (open(RES, $name) || open(RES, "$name$extn{$type}") ||
- open(RES, "$inc/$name") || open(RES, "$inc/$name$extn{$type}")) {
- while (<RES>) {
-diff -ur psutils-1.17.orig/maketext psutils-1.17/maketext
---- psutils-1.17.orig/maketext 1997-03-11 23:52:59.000000000 +0100
-+++ psutils-1.17/maketext 2006-01-17 22:16:42.000000000 +0100
-@@ -1,7 +1,4 @@
--eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-- & eval 'exec perl -S $0 $argv:q'
-- if 0;
--
-+#!/usr/bin/env perl
- # maketext: perl filter to substitute names in scripts and man pages.
-
- %change = (); # names -> substitutions
-@@ -15,14 +12,16 @@
-
- $os = "" ;
-
--%perlstart = ("UNIX", "\#!PERL\neval 'exec perl -S \$0 \"\$\@\"'\n\tif \$running_under_some_shell;\n",
-+%perlstart = ("UNIX", "\#!PERL",
- "DOS", "\@rem = '-*- Perl -*-\n\@echo off\nPERL -S %0.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9\ngoto endofperl\n';\n",
- "WINNT", "\@rem = '-*- Perl -*-\n\@echo off\nPERL -S %0.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9\ngoto endofperl\n';\n",
-+ "Win32", "\@rem = '-*- Perl -*-\n\@echo off\nPERL -S %0.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9\ngoto endofperl\n';\n",
- "OS2", "extproc PERL -x\n\#! PERL\n",
- "", "PSUTILS MAKEFILE CONFIGURATION ERROR") ;
- %perlend = ("UNIX", "",
- "DOS", "__END__\n:endofperl\n",
- "WINNT", "__END__\n:endofperl\n",
-+ "Win32", "__END__\n:endofperl\n",
- "OS2", "\# End of Script",
- "", "PSUTILS MAKEFILE CONFIGURATION ERROR");
-
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-03-main-is-int b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-03-main-is-int
deleted file mode 100644
index c36e61686ce..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-03-main-is-int
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -ur psutils-1.17.orig/epsffit.c psutils-1.17/epsffit.c
---- psutils-1.17.orig/epsffit.c 2006-01-17 22:16:42.000000000 +0100
-+++ psutils-1.17/epsffit.c 2008-02-01 12:23:16.000000000 +0100
-@@ -39,7 +39,7 @@
- exit(1);
- }
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- int bbfound = 0; /* %%BoundingBox: found */
- int urx, ury, llx, lly;
-@@ -185,5 +185,5 @@
- } else
- message(FATAL, "no %%%%BoundingBox:\n");
-
-- exit(0);
-+ return 0;
- }
-diff -ur psutils-1.17.orig/psbook.c psutils-1.17/psbook.c
---- psutils-1.17.orig/psbook.c 2006-01-17 22:16:42.000000000 +0100
-+++ psutils-1.17/psbook.c 2008-02-01 12:23:16.000000000 +0100
-@@ -32,7 +32,7 @@
- }
-
-
--void main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
- int signature = 0;
- int currentpg, maxpage;
-@@ -107,5 +107,5 @@
- }
- writetrailer();
-
-- exit(0);
-+ return 0;
- }
-diff -ur psutils-1.17.orig/pserror.c psutils-1.17/pserror.c
---- psutils-1.17.orig/pserror.c 1997-03-11 23:53:01.000000000 +0100
-+++ psutils-1.17/pserror.c 2008-02-01 12:23:16.000000000 +0100
-@@ -24,7 +24,7 @@
- void message(int flags, char *format, ...)
- {
- va_list args ;
-- static column = 0 ; /* current screen column for message wrap */
-+ static int column = 0 ; /* current screen column for message wrap */
- char msgbuf[MAX_MESSAGE] ; /* buffer in which to put the message */
- char *bufptr = msgbuf ; /* message buffer pointer */
-
-diff -ur psutils-1.17.orig/psnup.c psutils-1.17/psnup.c
---- psutils-1.17.orig/psnup.c 2006-01-17 22:16:42.000000000 +0100
-+++ psutils-1.17/psnup.c 2008-02-01 12:23:16.000000000 +0100
-@@ -66,7 +66,7 @@
- return (0);
- }
-
--void main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
- int horiz, vert, rotate, column, flip, leftright, topbottom;
- int nup = 1;
-@@ -331,6 +331,6 @@
- pstops(nup, 1, 0, specs, draw); /* do page rearrangement */
- }
-
-- exit(0);
-+ return 0;
- }
-
-diff -ur psutils-1.17.orig/psresize.c psutils-1.17/psresize.c
---- psutils-1.17.orig/psresize.c 2006-01-17 22:16:42.000000000 +0100
-+++ psutils-1.17/psresize.c 2008-02-01 12:23:16.000000000 +0100
-@@ -46,7 +46,7 @@
- #define MIN(x,y) ((x) > (y) ? (y) : (x))
- #define MAX(x,y) ((x) > (y) ? (x) : (y))
-
--void main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
- double scale, rscale; /* page scale */
- double waste, rwaste; /* amount wasted */
-@@ -175,6 +175,6 @@
-
- pstops(1, 1, 0, specs, 0.0); /* do page rearrangement */
-
-- exit(0);
-+ return 0;
- }
-
-diff -ur psutils-1.17.orig/psselect.c psutils-1.17/psselect.c
---- psutils-1.17.orig/psselect.c 2006-01-17 22:16:42.000000000 +0100
-+++ psutils-1.17/psselect.c 2008-02-01 12:23:16.000000000 +0100
-@@ -91,7 +91,7 @@
- }
-
-
--void main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
- int currentpg, maxpage = 0;
- int even = 0, odd = 0, reverse = 0;
-@@ -235,5 +235,5 @@
- }
- writetrailer();
-
-- exit(0);
-+ return 0;
- }
-diff -ur psutils-1.17.orig/pstops.c psutils-1.17/pstops.c
---- psutils-1.17.orig/pstops.c 2006-01-17 22:16:42.000000000 +0100
-+++ psutils-1.17/pstops.c 2008-02-01 12:23:16.000000000 +0100
-@@ -112,7 +112,7 @@
- return (head);
- }
-
--void main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
- PageSpec *specs = NULL;
- int nobinding = 0;
-@@ -194,5 +194,5 @@
-
- pstops(modulo, pagesperspec, nobinding, specs, draw);
-
-- exit(0);
-+ return 0;
- }
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-04-warnings b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-04-warnings
deleted file mode 100644
index c8b957a185b..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-04-warnings
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur psutils-1.17.orig/epsffit.c psutils-1.17/epsffit.c
---- psutils-1.17.orig/epsffit.c 2008-02-01 12:23:16.000000000 +0100
-+++ psutils-1.17/epsffit.c 2009-06-24 00:22:15.000000000 +0200
-@@ -42,7 +42,7 @@
- int main(int argc, char **argv)
- {
- int bbfound = 0; /* %%BoundingBox: found */
-- int urx, ury, llx, lly;
-+ int urx = 0, ury = 0, llx = 0, lly = 0; /* avoid uninitialized warning */
- int furx, fury, fllx, flly;
- int showpage = 0, centre = 0, rotate = 0, aspect = 0, maximise = 0;
- char buf[BUFSIZ];
-diff -ur psutils-1.17.orig/psnup.c psutils-1.17/psnup.c
---- psutils-1.17.orig/psnup.c 2008-02-01 12:23:16.000000000 +0100
-+++ psutils-1.17/psnup.c 2009-06-24 00:18:08.000000000 +0200
-@@ -68,10 +68,11 @@
-
- int main(int argc, char *argv[])
- {
-- int horiz, vert, rotate, column, flip, leftright, topbottom;
-+ int horiz = 0, vert = 0, rotate = 0; /* avoid uninitialized warning */
-+ int column, flip, leftright, topbottom;
- int nup = 1;
- double draw = 0; /* draw page borders */
-- double scale; /* page scale */
-+ double scale = 0; /* page scale */
- double uscale = 0; /* user supplied scale */
- double ppwid, pphgt; /* paper dimensions */
- double margin, border; /* paper & page margins */
-diff -ur psutils-1.17.orig/pstops.c psutils-1.17/pstops.c
---- psutils-1.17.orig/pstops.c 2008-02-01 12:23:16.000000000 +0100
-+++ psutils-1.17/pstops.c 2009-06-24 00:18:08.000000000 +0200
-@@ -21,7 +21,7 @@
- char pagelabel[BUFSIZ] ;
- int pageno ;
-
--void usage(void)
-+static void usage(void)
- {
- fprintf(stderr, "%s release %d patchlevel %d\n", program, RELEASE, PATCHLEVEL);
- fprintf(stderr, "Copyright (C) Angus J. C. Duggan, 1991-1995. See file LICENSE for details.\n");
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-05-const b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-05-const
deleted file mode 100644
index ce8b5ca4920..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-05-const
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -ur psutils-1.17.orig/pserror.c psutils-1.17/pserror.c
---- psutils-1.17.orig/pserror.c 2008-02-01 12:23:16.000000000 +0100
-+++ psutils-1.17/pserror.c 2009-09-01 13:40:27.000000000 +0200
-@@ -21,7 +21,7 @@
- #define MAX_FORMAT 16 /* maximum format length */
- #define MAX_COLUMN 78 /* maximum column to print upto */
-
--void message(int flags, char *format, ...)
-+void message(int flags, const char *format, ...)
- {
- va_list args ;
- static int column = 0 ; /* current screen column for message wrap */
-diff -ur psutils-1.17.orig/pserror.h psutils-1.17/pserror.h
---- psutils-1.17.orig/pserror.h 1997-03-11 23:53:02.000000000 +0100
-+++ psutils-1.17/pserror.h 2009-08-22 22:53:17.000000000 +0200
-@@ -17,4 +17,4 @@
- #define WARN (MESSAGE_NL|MESSAGE_PROGRAM)
- #define LOG 0
-
--extern void message(int flags, char *format, ...) ;
-+extern void message(int flags, const char *format, ...) ;
-diff -ur psutils-1.17.orig/psspec.c psutils-1.17/psspec.c
---- psutils-1.17.orig/psspec.c 1997-03-11 23:53:04.000000000 +0100
-+++ psutils-1.17/psspec.c 2009-08-27 14:47:26.000000000 +0200
-@@ -91,7 +91,7 @@
- return (num);
- }
-
--static char *prologue[] = { /* PStoPS procset */
-+static const char *prologue[] = { /* PStoPS procset */
- #ifndef SHOWPAGE_LOAD
- "userdict begin",
- "[/showpage/erasepage/copypage]{dup where{pop dup load", /* prevent */
-@@ -138,7 +138,7 @@
- {
- int thispg, maxpage;
- int pageindex = 0;
-- char **pro;
-+ const char **pro;
-
- scanpages();
-
-@@ -214,7 +214,6 @@
- }
- writestring("userdict/PStoPSmatrix matrix currentmatrix put\n");
- if (width > 0 && height > 0) {
-- char buffer[BUFSIZ];
- writestring("userdict/PStoPSclip{0 0 moveto\n");
- sprintf(buffer, " %f 0 rlineto 0 %f rlineto -%f 0 rlineto\n",
- width, height, width);
-diff -ur psutils-1.17.orig/psutil.c psutils-1.17/psutil.c
---- psutils-1.17.orig/psutil.c 2006-01-17 22:16:42.000000000 +0100
-+++ psutils-1.17/psutil.c 2009-09-01 13:43:52.000000000 +0200
-@@ -65,7 +65,7 @@
- };
-
- /* return pointer to paper size struct or NULL */
--Paper* findpaper(char *name)
-+Paper* findpaper(const char *name)
- {
- Paper *pp;
- for (pp = papersizes; PaperName(pp); pp++) {
-@@ -233,14 +233,14 @@
-
- /* Output routines. These all update the global variable bytes with the number
- * of bytes written */
--void writestring(char *s)
-+void writestring(const char *s)
- {
- fputs(s, outfile);
- bytes += strlen(s);
- }
-
- /* write page comment */
--void writepageheader(char *label, int page)
-+void writepageheader(const char *label, int page)
- {
- if (verbose)
- message(LOG, "[%d] ", page);
-diff -ur psutils-1.17.orig/psutil.h psutils-1.17/psutil.h
---- psutils-1.17.orig/psutil.h 1997-03-11 23:53:04.000000000 +0100
-+++ psutils-1.17/psutil.h 2009-08-22 22:55:59.000000000 +0200
-@@ -17,7 +17,7 @@
- /* paper size structure; configurability and proper paper resources will have
- to wait until version 2 */
- typedef struct papersize {
-- char *name; /* name of paper size */
-+ const char *name; /* name of paper size */
- int width, height; /* width, height in points */
- } Paper ;
- #define PaperName(p) ((p)->name)
-@@ -25,11 +25,11 @@
- #define PaperHeight(p) ((p)->height)
-
- /* Definitions for functions found in psutil.c */
--extern Paper *findpaper(char *name);
-+extern Paper *findpaper(const char *name);
- extern FILE *seekable(FILE *fp);
- extern void writepage(int p);
- extern void seekpage(int p);
--extern void writepageheader(char *label, int p);
-+extern void writepageheader(const char *label, int p);
- extern void writepagesetup(void);
- extern void writepagebody(int p);
- extern void writeheader(int p);
-@@ -39,7 +39,7 @@
- extern void writetrailer(void);
- extern void writeemptypage(void);
- extern void scanpages(void);
--extern void writestring(char *s);
-+extern void writestring(const char *s);
-
- /* These variables are imported from the client program (e.g. psbook, psnup,
- etc.) */
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-07-TEMPDIR b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-07-TEMPDIR
deleted file mode 100644
index b71a2f76284..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-07-TEMPDIR
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur psutils-1.17.orig/extractres.pl psutils-1.17/extractres.pl
---- psutils-1.17.orig/extractres.pl 1997-03-11 23:52:53.000000000 +0100
-+++ psutils-1.17/extractres.pl 2011-01-09 17:38:03.000000000 +0100
-@@ -27,6 +27,10 @@
-
- if (defined($ENV{TMPDIR})) { # set body file name
- $body = "$ENV{TMPDIR}/body$$.ps";
-+} elsif (defined($ENV{TEMP})) {
-+ $body = "$ENV{TEMP}/body$$.ps";
-+} elsif (defined($ENV{TMP})) {
-+ $body = "$ENV{TMP}/body$$.ps";
- } else {
- $body = "body$$.ps";
- }
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-08-non-free b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-08-non-free
deleted file mode 100644
index 1ca6840037a..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-08-non-free
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur psutils-1.17.orig/includeres.pl psutils-1.17/includeres.pl
---- psutils-1.17.orig/includeres.pl 2006-01-17 22:16:42.000000000 +0100
-+++ psutils-1.17/includeres.pl 2010-12-20 20:15:37.000000000 +0100
-@@ -4,11 +4,6 @@
- # Copyright (C) Angus J. C. Duggan 1991-1995
- # See file LICENSE for details.
-
--use File::Basename;
--
--$predir = `kpsewhich -progname=dvips -format="other text files" md71_0.ps`;
--$inc=`dirname $predir`;
--
- $prog = ($0 =~ s=.*/==);
-
- %extn = ("font", ".pfa", "file", ".ps", "procset", ".ps", # resource extns
-@@ -33,8 +28,7 @@
- local($comment, @res) = split(/\s+/);
- local($type) = defined($type{$comment}) ? $type{$comment} : shift(@res);
- local($name) = &filename(@res);
-- if (open(RES, $name) || open(RES, "$name$extn{$type}") ||
-- open(RES, "$inc/$name") || open(RES, "$inc/$name$extn{$type}")) {
-+ if (open(RES, $name) || open(RES, "$name$extn{$type}")) {
- while (<RES>) {
- print $_;
- }
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-09-PERL b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-09-PERL
deleted file mode 100644
index f184f3712e5..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-09-PERL
+++ /dev/null
@@ -1,41 +0,0 @@
- Required for some perl implementations.
-
-diff -ur psutils-1.17.orig/extractres.pl psutils-1.17/extractres.pl
---- psutils-1.17.orig/extractres.pl 2011-01-09 17:38:03.000000000 +0100
-+++ psutils-1.17/extractres.pl 2011-01-09 17:47:53.000000000 +0100
-@@ -4,7 +4,8 @@
- # Copyright (C) Angus J. C. Duggan 1991-1995
- # See file LICENSE for details.
-
--$prog = ($0 =~ s=.*/==);
-+$0 =~ s=.*/==;
-+$prog = $0;
-
- %resources = (); # list of resources included
- %merge = (); # list of resources extracted this time
-diff -ur psutils-1.17.orig/includeres.pl psutils-1.17/includeres.pl
---- psutils-1.17.orig/includeres.pl 2010-12-20 20:15:37.000000000 +0100
-+++ psutils-1.17/includeres.pl 2011-01-09 17:47:53.000000000 +0100
-@@ -4,7 +4,8 @@
- # Copyright (C) Angus J. C. Duggan 1991-1995
- # See file LICENSE for details.
-
--$prog = ($0 =~ s=.*/==);
-+$0 =~ s=.*/==;
-+$prog = $0;
-
- %extn = ("font", ".pfa", "file", ".ps", "procset", ".ps", # resource extns
- "pattern", ".pat", "form", ".frm", "encoding", ".enc");
-diff -ur psutils-1.17.orig/psmerge.pl psutils-1.17/psmerge.pl
---- psutils-1.17.orig/psmerge.pl 1997-03-11 23:53:02.000000000 +0100
-+++ psutils-1.17/psmerge.pl 2011-01-09 17:47:53.000000000 +0100
-@@ -5,7 +5,8 @@
- # Copyright (C) Angus J. C. Duggan 1991-1995
- # See file LICENSE for details.
-
--$prog = ($0 =~ s=.*/==);
-+$0 =~ s=.*/==;
-+$prog = $0;
-
- while ($ARGV[0] =~ /^-/) {
- $_ = shift;
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-10-binary-mode b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-10-binary-mode
deleted file mode 100644
index e96839b911d..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-10-binary-mode
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur psutils-1.17.orig/psbook.c psutils-1.17/psbook.c
---- psutils-1.17.orig/psbook.c 2008-02-01 12:23:16.000000000 +0100
-+++ psutils-1.17/psbook.c 2011-09-22 19:16:13.000000000 +0200
-@@ -66,7 +66,7 @@
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-- message(FATAL, "can't open input file %s\n", argv[4]);
-+ message(FATAL, "can't reset stdin to binary mode\n");
- }
- if ( outfile == stdout ) {
- int fd = fileno(stdout) ;
-diff -ur psutils-1.17.orig/psnup.c psutils-1.17/psnup.c
---- psutils-1.17.orig/psnup.c 2009-06-24 00:18:08.000000000 +0200
-+++ psutils-1.17/psnup.c 2011-09-22 19:16:16.000000000 +0200
-@@ -195,7 +195,7 @@
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-- message(FATAL, "can't open input file %s\n", argv[4]);
-+ message(FATAL, "can't reset stdin to binary mode\n");
- }
- if ( outfile == stdout ) {
- int fd = fileno(stdout) ;
-diff -ur psutils-1.17.orig/psresize.c psutils-1.17/psresize.c
---- psutils-1.17.orig/psresize.c 2008-02-01 12:23:16.000000000 +0100
-+++ psutils-1.17/psresize.c 2011-09-22 19:16:18.000000000 +0200
-@@ -118,7 +118,7 @@
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-- message(FATAL, "can't open input file %s\n", argv[4]);
-+ message(FATAL, "can't reset stdin to binary mode\n");
- }
- if ( outfile == stdout ) {
- int fd = fileno(stdout) ;
-diff -ur psutils-1.17.orig/psselect.c psutils-1.17/psselect.c
---- psutils-1.17.orig/psselect.c 2008-02-01 12:23:16.000000000 +0100
-+++ psutils-1.17/psselect.c 2011-09-22 19:16:21.000000000 +0200
-@@ -137,7 +137,7 @@
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-- message(FATAL, "can't open input file %s\n", argv[4]);
-+ message(FATAL, "can't reset stdin to binary mode\n");
- }
- if ( outfile == stdout ) {
- int fd = fileno(stdout) ;
-diff -ur psutils-1.17.orig/pstops.c psutils-1.17/pstops.c
---- psutils-1.17.orig/pstops.c 2009-06-24 00:18:08.000000000 +0200
-+++ psutils-1.17/pstops.c 2011-09-22 19:16:24.000000000 +0200
-@@ -181,7 +181,7 @@
- if ( infile == stdin ) {
- int fd = fileno(stdin) ;
- if ( setmode(fd, O_BINARY) < 0 )
-- message(FATAL, "can't open input file %s\n", argv[4]);
-+ message(FATAL, "can't reset stdin to binary mode\n");
- }
- if ( outfile == stdout ) {
- int fd = fileno(stdout) ;
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-11-extern b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-11-extern
deleted file mode 100644
index 35cd5e92bd8..00000000000
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-11-extern
+++ /dev/null
@@ -1,44 +0,0 @@
- Remove extern decls from *.c files.
-
-diff -ur psutils-1.17.orig/epsffit.c psutils-1.17/epsffit.c
---- psutils-1.17.orig/epsffit.c 2009-06-24 00:22:15.000000000 +0200
-+++ psutils-1.17/epsffit.c 2012-03-29 14:25:12.000000000 +0200
-@@ -23,7 +23,7 @@
-
- #include "pserror.h"
- #include "patchlev.h"
--#include "config.h"
-+#include "psutil.h"
-
- #define MIN(x,y) ((x) > (y) ? (y) : (x))
- #define MAX(x,y) ((x) > (y) ? (x) : (y))
-diff -ur psutils-1.17.orig/pserror.c psutils-1.17/pserror.c
---- psutils-1.17.orig/pserror.c 2009-09-01 13:40:27.000000000 +0200
-+++ psutils-1.17/pserror.c 2012-03-29 14:25:12.000000000 +0200
-@@ -5,8 +5,6 @@
- * Warnings and errors for PS programs
- */
-
--extern char *program ; /* Defined by main program, giving program name */
--
- #include "psutil.h"
- #include "pserror.h"
- #include "patchlev.h"
-diff -ur psutils-1.17.orig/psutil.c psutils-1.17/psutil.c
---- psutils-1.17.orig/psutil.c 2009-09-01 13:43:52.000000000 +0200
-+++ psutils-1.17/psutil.c 2012-03-29 14:25:12.000000000 +0200
-@@ -23,14 +23,6 @@
-
- #define iscomment(x,y) (strncmp(x,y,strlen(y)) == 0)
-
--extern char *program ;
--extern int pages;
--extern int verbose;
--extern FILE *infile;
--extern FILE *outfile;
--extern char pagelabel[BUFSIZ];
--extern int pageno;
--
- static char buffer[BUFSIZ];
- static long bytes = 0;
- static long pagescmt = 0;