summaryrefslogtreecommitdiff
path: root/Build/source/utils/pmx/pmx-2.6.18-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils/pmx/pmx-2.6.18-PATCHES')
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog19
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/TL-Changes13
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-01-binary17
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-02-bugfix19
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-03-DOS-line-endings18
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-04-MSVC-complex18
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-05-FreeBSD-off_t13
7 files changed, 117 insertions, 0 deletions
diff --git a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog
new file mode 100644
index 00000000000..783c0504d7a
--- /dev/null
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog
@@ -0,0 +1,19 @@
+2012-04-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-05-FreeBSD-off_t (new): Build fix for FreeBSD.
+ Mail from Nikola Lecic [tlbuild] 21 Apr 2012 20:40:21.
+
+2012-04-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-03-DOS-line-endings, patch-04-MSVC-complex (new): WIN32.
+ Mail from Akira, 31 Mar 2012 21:36:26.
+
+2012-03-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-binary (new): Always use binary mode for WIN32.
+ Mail from Akira, 29 Mar 2012 23:50:53.
+
+ * patch-02-bugfix (new): Bug fix, should be fixed in Fortran.
+
+Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
diff --git a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/TL-Changes b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/TL-Changes
new file mode 100644
index 00000000000..8e04162140c
--- /dev/null
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/TL-Changes
@@ -0,0 +1,13 @@
+Changes applied to the pmx-2.6.18 tree as obtained from:
+ http://www.ctan.org/tex-archive/support/pmx/
+
+Remove:
+ Makefile.in
+ aclocal.m4
+ configure
+ depcomp
+ install-sh
+ missing
+
+(looks like the tests and other things are now in the dist, but have to
+ignore that right now, sorry. --karl)
diff --git a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-01-binary b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-01-binary
new file mode 100644
index 00000000000..16819f76212
--- /dev/null
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-01-binary
@@ -0,0 +1,17 @@
+ On Windows fseek() etc. are meaningful only for binary access.
+
+ Mail from Akira, 29 Mar 2012 23:50:53.
+
+diff -ur pmx-2.6.17.orig/libf2c/open.c pmx-2.6.17/libf2c/open.c
+--- pmx-2.6.17.orig/libf2c/open.c 2012-03-26 12:09:53.000000000 +0200
++++ pmx-2.6.17/libf2c/open.c 2012-03-29 17:12:53.000000000 +0200
+@@ -30,6 +30,9 @@
+ #ifdef NON_ANSI_RW_MODES
+ char *f__r_mode[2] = {"r", "r"};
+ char *f__w_mode[4] = {"w", "w", "r+w", "r+w"};
++#elif defined(WIN32)
++char *f__r_mode[2] = {"rb", "rb"};
++char *f__w_mode[4] = {"wb", "wb", "rb+", "rb+"};
+ #else
+ char *f__r_mode[2] = {"rb", "r"};
+ char *f__w_mode[4] = {"wb", "w", "r+b", "r+"};
diff --git a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-02-bugfix b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-02-bugfix
new file mode 100644
index 00000000000..58de7f58ef1
--- /dev/null
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-02-bugfix
@@ -0,0 +1,19 @@
+ This should really be fixed in the Fortran source.
+
+diff -ur pmx-2.6.17.orig/scor2prt.c pmx-2.6.17/scor2prt.c
+--- pmx-2.6.17.orig/scor2prt.c 2012-03-25 00:00:34.000000000 +0100
++++ pmx-2.6.17/scor2prt.c 2012-03-29 16:59:56.000000000 +0200
+@@ -22,10 +22,10 @@
+ integer nvi[24], nsyst, nvnow;
+ };
+ struct all_2_ {
+- integer noinow, iorig[24], noinst, insetup;
+- real replacing;
++ integer noinow, iorig[24], noinst;
++ logical insetup, replacing;
+ integer instnum[24];
+- real botv[24];
++ logical botv[24];
+ integer nvi[24], nsyst, nvnow;
+ };
+
diff --git a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-03-DOS-line-endings b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-03-DOS-line-endings
new file mode 100644
index 00000000000..5e36c101b5a
--- /dev/null
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-03-DOS-line-endings
@@ -0,0 +1,18 @@
+ Handle DOS line endings (using additional file ../w32getc.c).
+
+ Mail from Akira, 31 Mar 2012 21:36:26.
+
+diff -ur pmx-2.6.17.orig/libf2c/fio.h pmx-2.6.17/libf2c/fio.h
+--- pmx-2.6.17.orig/libf2c/fio.h 2012-03-26 12:09:53.000000000 +0200
++++ pmx-2.6.17/libf2c/fio.h 2012-04-01 14:49:20.000000000 +0200
+@@ -2,6 +2,10 @@
+ #include "sysdep1.h"
+ #endif
+ #include "stdio.h"
++#ifdef WIN32
++extern int w32getc(FILE *f);
++#define getc w32getc
++#endif
+ #include "errno.h"
+ #ifndef NULL
+ /* ANSI C */
diff --git a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-04-MSVC-complex b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-04-MSVC-complex
new file mode 100644
index 00000000000..4017e79ac99
--- /dev/null
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-04-MSVC-complex
@@ -0,0 +1,18 @@
+ _COMPLEX_DEFINED should be defined for MSVC, otherwise
+ complex is redefined inconsistently in <math.h>.
+
+ Mail from Akira, 31 Mar 2012 21:36:26.
+
+diff -ur pmx-2.6.17.orig/libf2c/f2c.h pmx-2.6.17/libf2c/f2c.h
+--- pmx-2.6.17.orig/libf2c/f2c.h 2012-03-26 12:09:53.000000000 +0200
++++ pmx-2.6.17/libf2c/f2c.h 2012-04-01 14:50:19.000000000 +0200
+@@ -13,6 +13,9 @@
+ typedef short int shortint;
+ typedef float real;
+ typedef double doublereal;
++#ifdef WIN32
++#define _COMPLEX_DEFINED 1
++#endif
+ typedef struct { real r, i; } complex;
+ typedef struct { doublereal r, i; } doublecomplex;
+ typedef long int logical;
diff --git a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-05-FreeBSD-off_t b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-05-FreeBSD-off_t
new file mode 100644
index 00000000000..8131c75d023
--- /dev/null
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-05-FreeBSD-off_t
@@ -0,0 +1,13 @@
+ On FreeBSD (and maybe others) we need <sys/types.h> for off_t.
+
+diff -ur pmx-2.6.17.orig/libf2c/fio.h pmx-2.6.17/libf2c/fio.h
+--- pmx-2.6.17.orig/libf2c/fio.h 2012-04-01 14:49:20.000000000 +0200
++++ pmx-2.6.17/libf2c/fio.h 2012-04-23 10:06:01.000000000 +0200
+@@ -1,6 +1,7 @@
+ #ifndef SYSDEP_H_INCLUDED
+ #include "sysdep1.h"
+ #endif
++#include <sys/types.h> /* for off_t */
+ #include "stdio.h"
+ #ifdef WIN32
+ extern int w32getc(FILE *f);