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/ChangeLog8
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/TL-Changes4
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-01-binary6
-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-endings6
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-04-MSVC-complex6
-rw-r--r--Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-05-FreeBSD-off_t6
7 files changed, 22 insertions, 33 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
index 783c0504d7a..bc303f33655 100644
--- a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported pmx-2.6.18 source tree from:
+ http://www.ctan.org/tex-archive/support/pmx/
+ * patch-02-bugfix (removed): Obsolete.
+ * patch-01-binary, patch-03-DOS-line-endings,
+ patch-04-MSVC-complex, patch-05-FreeBSD-off_t: Adapted.
+
2012-04-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-05-FreeBSD-off_t (new): Build fix for FreeBSD.
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
index 8e04162140c..de64539b668 100644
--- a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/TL-Changes
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/TL-Changes
@@ -6,8 +6,8 @@ Remove:
aclocal.m4
configure
depcomp
+ f2c.h
install-sh
missing
+ arith.h
-(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
index 16819f76212..64947854a75 100644
--- 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
@@ -2,9 +2,9 @@
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
+diff -ur pmx-2.6.18.orig/libf2c/open.c pmx-2.6.18/libf2c/open.c
+--- pmx-2.6.18.orig/libf2c/open.c 2012-04-09 18:24:12.000000000 +0200
++++ pmx-2.6.18/libf2c/open.c 2012-05-19 18:46:29.225582726 +0200
@@ -30,6 +30,9 @@
#ifdef NON_ANSI_RW_MODES
char *f__r_mode[2] = {"r", "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
deleted file mode 100644
index 58de7f58ef1..00000000000
--- a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-02-bugfix
+++ /dev/null
@@ -1,19 +0,0 @@
- 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
index 5e36c101b5a..1332d7c63dd 100644
--- 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
@@ -2,9 +2,9 @@
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
+diff -ur pmx-2.6.18.orig/libf2c/fio.h pmx-2.6.18/libf2c/fio.h
+--- pmx-2.6.18.orig/libf2c/fio.h 2012-04-09 18:24:12.000000000 +0200
++++ pmx-2.6.18/libf2c/fio.h 2012-05-19 18:47:56.503874316 +0200
@@ -2,6 +2,10 @@
#include "sysdep1.h"
#endif
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
index 4017e79ac99..a536dbbf03e 100644
--- 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
@@ -3,9 +3,9 @@
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
+diff -ur pmx-2.6.18.orig/libf2c/f2c.h pmx-2.6.18/libf2c/f2c.h
+--- pmx-2.6.18.orig/libf2c/f2c.h 2012-04-09 18:24:12.000000000 +0200
++++ pmx-2.6.18/libf2c/f2c.h 2012-05-19 18:49:12.286432193 +0200
@@ -13,6 +13,9 @@
typedef short int shortint;
typedef float real;
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
index 8131c75d023..c26347aec6d 100644
--- 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
@@ -1,8 +1,8 @@
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
+diff -ur pmx-2.6.18.orig/libf2c/fio.h pmx-2.6.18/libf2c/fio.h
+--- pmx-2.6.18.orig/libf2c/fio.h 2012-05-19 18:47:56.000000000 +0200
++++ pmx-2.6.18/libf2c/fio.h 2012-05-19 18:50:13.501421172 +0200
@@ -1,6 +1,7 @@
#ifndef SYSDEP_H_INCLUDED
#include "sysdep1.h"