summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2007-09-27 08:00:19 +0000
committerKeri Harris <keri@gentoo.org>2007-09-27 08:00:19 +0000
commit6fdb16d16c7c6f9ecf36f488fc4e69035a63257e (patch)
treeb947820801a98b8ebef8dce0a10c7f94f10816dc /dev-lang/swi-prolog/files
parentstable x86, security bug #182998 (diff)
downloadgentoo-2-6fdb16d16c7c6f9ecf36f488fc4e69035a63257e.tar.gz
gentoo-2-6fdb16d16c7c6f9ecf36f488fc4e69035a63257e.tar.bz2
gentoo-2-6fdb16d16c7c6f9ecf36f488fc4e69035a63257e.zip
Remove old versions.
(Portage version: 2.1.3.9)
Diffstat (limited to 'dev-lang/swi-prolog/files')
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.253
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.273
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.283
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.293
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.29-r13
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.306
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.316
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.326
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.336
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.346
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.356
-rw-r--r--dev-lang/swi-prolog/files/digest-swi-prolog-5.6.366
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r3.patch339
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r4.patch356
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-O_DEBUG.patch26
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-PLBASE-r2.patch86
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-SGML_CATALOG_FILES.patch90
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-arith-test.patch18
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-cppproxy-r1.patch11
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-errno.patch10
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r2.patch42
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-jpl-PLARCH.patch11
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch30
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-jpl-check_java-r1.patch33
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-jpl-check_java.patch21
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-jpl-junit.patch11
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-ltx2htm.patch68
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-portage-r1.patch29
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-semweb-bitmatrix.patch20
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-set_prolog_IO.patch11
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-sgml-no_attribute.patch11
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-ssl-SIO_FLUSHOUTPUT.patch11
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-ssl-cert.patch12
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-thread-sandbox.patch11
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch78
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-xpce-parallel-build.patch11
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-xpce-test-r1.patch158
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-zlib-test.patch18
38 files changed, 0 insertions, 1579 deletions
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.25 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.25
deleted file mode 100644
index 9faf01aa278d..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.25
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cc14c841424346d2c8389d185f5c3ad1 pl-5.6.25.tar.gz 11651158
-RMD160 298bb9946089276ad3504c7b692ab5b43d81a7b2 pl-5.6.25.tar.gz 11651158
-SHA256 fbe20123e62e630ec85487775fee391f94d51559cb5c24ccbc91e6760da7609e pl-5.6.25.tar.gz 11651158
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.27 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.27
deleted file mode 100644
index b2cdf6681b5b..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.27
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af5e4797d3e3b8b1c086793d07b284fc pl-5.6.27.tar.gz 11661684
-RMD160 e180ad228946b36b2aaba561be25ba294da473af pl-5.6.27.tar.gz 11661684
-SHA256 cef264b0d022ca5c5f07547e5f11f1930cb9761fed7568b2a450978b3128d9a5 pl-5.6.27.tar.gz 11661684
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.28 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.28
deleted file mode 100644
index 397249b4b1d4..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.28
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e7bb84b18b842517c319c13bce0a49ff pl-5.6.28.tar.gz 11687262
-RMD160 8a5113b5c97ab58baa8b6e0a3f92ea078f28f6bb pl-5.6.28.tar.gz 11687262
-SHA256 ae6600e48cfa246a0c81c047e158fe9e68a72bfabea6abba0bcdec40ad67690a pl-5.6.28.tar.gz 11687262
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.29 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.29
deleted file mode 100644
index 678a8b42c630..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.29
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0081dcaef8e3dba722406bc9cd20163 pl-5.6.29.tar.gz 11697773
-RMD160 ac7298a8884a69fc5bb9d4b0656a1845b9d7e1b6 pl-5.6.29.tar.gz 11697773
-SHA256 0390d63fa3090d11569c27322ada7ddfca4dfd7b1e8d32b7f2b44ed192be35ff pl-5.6.29.tar.gz 11697773
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.29-r1 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.29-r1
deleted file mode 100644
index 678a8b42c630..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.29-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0081dcaef8e3dba722406bc9cd20163 pl-5.6.29.tar.gz 11697773
-RMD160 ac7298a8884a69fc5bb9d4b0656a1845b9d7e1b6 pl-5.6.29.tar.gz 11697773
-SHA256 0390d63fa3090d11569c27322ada7ddfca4dfd7b1e8d32b7f2b44ed192be35ff pl-5.6.29.tar.gz 11697773
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30
deleted file mode 100644
index 77457653169e..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a6df5d3e4199a296a8544a7574170f0c pl-5.6.30.tar.gz 11826456
-RMD160 fdfb138a472af9109a4ab3ca91c0f3284a808a15 pl-5.6.30.tar.gz 11826456
-SHA256 7ae6d35b9f3962463c7ec6057661e8c6b3c80f6791e52283c2097b39fee02d91 pl-5.6.30.tar.gz 11826456
-MD5 f8a413d02ccee46a5ef5626d43ee594d swi-prolog-5.6.30-gentoo-patchset.tar.gz 8688
-RMD160 009b92030d05157c1f960e34fbca96ab384c9304 swi-prolog-5.6.30-gentoo-patchset.tar.gz 8688
-SHA256 d9cb3529b7a3dddbef9538502d8bef789f8eea0dc4c1667f6b9a02114fe44c5a swi-prolog-5.6.30-gentoo-patchset.tar.gz 8688
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.31 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.31
deleted file mode 100644
index 3757855130f0..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.31
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c44112d180e9a34647228c4e892a2091 pl-5.6.31.tar.gz 11830975
-RMD160 164392b524d9f6950eb13a85852bdd7c9be19b53 pl-5.6.31.tar.gz 11830975
-SHA256 625817c49737673f7423b44c0e41d6f0011515d1c4f6a33d6ca05a0afd538cb5 pl-5.6.31.tar.gz 11830975
-MD5 f823ef8abc50cfd5ff8846c927d6016d swi-prolog-5.6.31-gentoo-patchset-1.tar.gz 8663
-RMD160 9c3d9125c20d74ab4b7df1e6e96eca25d2cc9231 swi-prolog-5.6.31-gentoo-patchset-1.tar.gz 8663
-SHA256 dd8f213bc5313b57b7cddf6bef77abc41cc18bed928ab2924541389553c0f1a0 swi-prolog-5.6.31-gentoo-patchset-1.tar.gz 8663
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.32 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.32
deleted file mode 100644
index b4c448c201f3..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.32
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3f41c28d9e5584e80867859518c1de47 pl-5.6.32.tar.gz 11822893
-RMD160 02d93364d1b14b4bc42d0842ef367e9a37e0a170 pl-5.6.32.tar.gz 11822893
-SHA256 8c0c782e77d5ede9b004bec87bc216d598ab0494770345e6cf5f3391bdd68a42 pl-5.6.32.tar.gz 11822893
-MD5 a876ff4f03d60fa78d333a7cc05b033c swi-prolog-5.6.32-gentoo-patchset-2.tar.gz 8870
-RMD160 6e9f117658366b1a97950c947f6c34c36646a2b0 swi-prolog-5.6.32-gentoo-patchset-2.tar.gz 8870
-SHA256 4702084b9612b93107b0f36d5da8b80c126ac97b7e26f98c379f216e60583d0b swi-prolog-5.6.32-gentoo-patchset-2.tar.gz 8870
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.33 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.33
deleted file mode 100644
index bb9347b06638..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.33
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 5c2f35f1c1312b282e06c96ae176555c pl-5.6.33.tar.gz 11834163
-RMD160 c809d337a1a376f6cf67f947efcc0823d74cd1f5 pl-5.6.33.tar.gz 11834163
-SHA256 6d75ee07298dd8a3a511ddbfffb4c42b9d81bbbf43230b93343bbfae97d0618e pl-5.6.33.tar.gz 11834163
-MD5 62215c2c8fcf8ea83d656540a75d0e2a swi-prolog-5.6.33-gentoo-patchset-2.tar.gz 8858
-RMD160 ac376778b850e81bac835967f41fafdb03d88bf2 swi-prolog-5.6.33-gentoo-patchset-2.tar.gz 8858
-SHA256 1d029ff41e439f5d36245bfbe1b08f2269e2cafbbcc567ab6e24696560ebba4b swi-prolog-5.6.33-gentoo-patchset-2.tar.gz 8858
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.34 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.34
deleted file mode 100644
index e1d7a327bc07..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.34
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 52e54390fe84c7866f2ad34269f74006 pl-5.6.34.tar.gz 11839668
-RMD160 110996f158c1270a8f89b7880a529f72ff9fbc90 pl-5.6.34.tar.gz 11839668
-SHA256 7c55dc4befa813c04bd208c92acb949e3a77f38245b25b5527cebb05032c0679 pl-5.6.34.tar.gz 11839668
-MD5 a7583672c8be2431744be979650c0890 swi-prolog-5.6.34-gentoo-patchset-2.tar.gz 8885
-RMD160 280708e044e6dea74fd832865ce0b545ff6d3783 swi-prolog-5.6.34-gentoo-patchset-2.tar.gz 8885
-SHA256 b1632b8d08937412f0fea5b9aae33d5c892c67ce5a1297769baa5a89db134361 swi-prolog-5.6.34-gentoo-patchset-2.tar.gz 8885
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.35 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.35
deleted file mode 100644
index deff5bdaaa82..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.35
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0a8f8cea0de58d627a5e9819d1373811 pl-5.6.35.tar.gz 11857353
-RMD160 476dcca1660b28edadf154b89cd28b83a396720a pl-5.6.35.tar.gz 11857353
-SHA256 6883fcccaa3796639167d889d61c3b7735af611df9ca65b3304c92733443d230 pl-5.6.35.tar.gz 11857353
-MD5 5b0854e81cd45c563f2a857bbe97b949 swi-prolog-5.6.35-gentoo-patchset-0.tar.gz 8873
-RMD160 64fa9e66018ee5d657a493a9458e0a99f10c646c swi-prolog-5.6.35-gentoo-patchset-0.tar.gz 8873
-SHA256 106f87a516c0d8b2103d1ac10077bf306419b40b547043ff1978531949b6ce54 swi-prolog-5.6.35-gentoo-patchset-0.tar.gz 8873
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.36 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.36
deleted file mode 100644
index 70b0024ab431..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.36
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b92dc46df9a20a1872df04421addc50b pl-5.6.36.tar.gz 11919972
-RMD160 bba4b6c43a0199c125edb74a0bf213c671e70f4c pl-5.6.36.tar.gz 11919972
-SHA256 92f2dc14a6945f4a716aa74b7cd45bb4de207ba780d54f1f09e30ae48c2fef16 pl-5.6.36.tar.gz 11919972
-MD5 45309c8c0132220b0fd10c5eb710e4ff swi-prolog-5.6.36-gentoo-patchset-1.tar.gz 9210
-RMD160 e9c2fc5df23ebf55b47cbcff939784806b74f9d4 swi-prolog-5.6.36-gentoo-patchset-1.tar.gz 9210
-SHA256 92cdb763935c6e284b0af36e4d3caa3b278f9adbaa95da10270f71f3bcf9b0bf swi-prolog-5.6.36-gentoo-patchset-1.tar.gz 9210
diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r3.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r3.patch
deleted file mode 100644
index bcb4541d1a8c..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r3.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-diff -ur pl-5.6.18.orig/packages/clib/configure pl-5.6.18/packages/clib/configure
---- pl-5.6.18.orig/packages/clib/configure 2006-01-11 09:41:55.000000000 +1300
-+++ pl-5.6.18/packages/clib/configure 2006-09-01 19:39:18.000000000 +1200
-@@ -3117,7 +3117,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3709,7 +3709,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=-Wall
- else
- COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/clib/maildrop/rfc2045/configure pl-5.6.18/packages/clib/maildrop/rfc2045/configure
---- pl-5.6.18.orig/packages/clib/maildrop/rfc2045/configure 2005-07-25 02:37:57.000000000 +1200
-+++ pl-5.6.18/packages/clib/maildrop/rfc2045/configure 2006-09-01 19:40:33.000000000 +1200
-@@ -3155,7 +3155,7 @@
-
- if test "$GCC" = yes ; then
- CXXFLAGS="$CXXFLAGS -Wall"
-- CFLAGS="$CFLAGS -Wall"
-+ CFLAGS="$CFLAGS -fpic -Wall"
- fi
-
-
-diff -ur pl-5.6.18.orig/packages/clib/maildrop/rfc822/configure pl-5.6.18/packages/clib/maildrop/rfc822/configure
---- pl-5.6.18.orig/packages/clib/maildrop/rfc822/configure 2005-07-25 02:37:57.000000000 +1200
-+++ pl-5.6.18/packages/clib/maildrop/rfc822/configure 2006-09-01 19:41:37.000000000 +1200
-@@ -3144,7 +3144,7 @@
-
- if test "$GCC" = yes ; then
- CXXFLAGS="$CXXFLAGS -Wall"
-- CFLAGS="$CFLAGS -Wall"
-+ CFLAGS="$CFLAGS -fpic -Wall"
- fi
-
-
-diff -ur pl-5.6.18.orig/packages/cppproxy/configure pl-5.6.18/packages/cppproxy/configure
---- pl-5.6.18.orig/packages/cppproxy/configure 2006-01-23 22:29:29.000000000 +1300
-+++ pl-5.6.18/packages/cppproxy/configure 2006-09-01 19:42:51.000000000 +1200
-@@ -3111,7 +3111,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3703,7 +3703,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=-Wall
- else
- COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/db/configure pl-5.6.18/packages/db/configure
---- pl-5.6.18.orig/packages/db/configure 2006-07-31 19:54:07.000000000 +1200
-+++ pl-5.6.18/packages/db/configure 2006-09-01 19:44:12.000000000 +1200
-@@ -3139,13 +3139,13 @@
- fi
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=-Wall
- else
- COFLAGS=-O
- CWFLAGS=
- fi
--CFLAGS="$CMFLAGS $CIFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-diff -ur pl-5.6.18.orig/packages/jpl/configure pl-5.6.18/packages/jpl/configure
---- pl-5.6.18.orig/packages/jpl/configure 2006-08-09 19:58:24.000000000 +1200
-+++ pl-5.6.18/packages/jpl/configure 2006-09-01 19:45:49.000000000 +1200
-@@ -3115,12 +3115,12 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -cc-options,-fno-strict-aliasing"
-- CWFLAGS="-Wall"
-+ COFLAGS="$CFLAGS -cc-options,-fno-strict-aliasing"
-+ CWFLAGS="-Wall -Wno-strict-aliasing"
- else
- COFLAGS=-O
- CWFLAGS=
-diff -ur pl-5.6.18.orig/packages/ltx2htm/configure pl-5.6.18/packages/ltx2htm/configure
---- pl-5.6.18.orig/packages/ltx2htm/configure 2004-09-22 02:28:17.000000000 +1200
-+++ pl-5.6.18/packages/ltx2htm/configure 2006-09-01 19:49:17.000000000 +1200
-@@ -1351,7 +1351,7 @@
- CC=$PLLD
- LD=$PLLD
- LDSOFLAGS=-shared
--
-+CMFLAGS=-fpic
- SO="$PLSOEXT"
-
- TARGETS="unix.$SO socket.$SO cgi.$SO memfile.$SO"
-@@ -2925,7 +2925,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3455,7 +3455,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS=-O2
-+ COFLAGS="$CFLAGS"
- CWFLAGS=-Wall
- else
- COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/nlp/configure pl-5.6.18/packages/nlp/configure
---- pl-5.6.18.orig/packages/nlp/configure 2005-11-26 23:54:48.000000000 +1300
-+++ pl-5.6.18/packages/nlp/configure 2006-09-01 19:50:31.000000000 +1200
-@@ -3111,7 +3111,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3703,7 +3703,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=-Wall
- else
- COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/odbc/configure pl-5.6.18/packages/odbc/configure
---- pl-5.6.18.orig/packages/odbc/configure 2006-02-16 09:48:34.000000000 +1300
-+++ pl-5.6.18/packages/odbc/configure 2006-09-01 19:52:33.000000000 +1200
-@@ -3147,7 +3147,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3739,7 +3739,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=-Wall
- else
- COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/semweb/configure pl-5.6.18/packages/semweb/configure
---- pl-5.6.18.orig/packages/semweb/configure 2006-03-08 03:43:04.000000000 +1300
-+++ pl-5.6.18/packages/semweb/configure 2006-09-01 19:53:47.000000000 +1200
-@@ -3145,7 +3145,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -4294,7 +4294,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O3 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=-Wall
- else
- COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/sgml/configure pl-5.6.18/packages/sgml/configure
---- pl-5.6.18.orig/packages/sgml/configure 2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.18/packages/sgml/configure 2006-09-01 19:55:24.000000000 +1200
-@@ -3184,16 +3184,12 @@
- fi
-
- if test ! -z "$GCC"; then
-- if test $gmake = yes; then
-- COFLAGS='$(shell if test -r .coflags; then cat .coflags; else echo "-O2"; fi)'
-- else
-- COFLAGS="-O2 -fno-strict-aliasing"
-- fi
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS="$CWFLAGS -Wall"
- else
- COFLAGS=-O
- fi
--CFLAGS="$CMFLAGS"
-+
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
-diff -ur pl-5.6.18.orig/packages/ssl/configure pl-5.6.18/packages/ssl/configure
---- pl-5.6.18.orig/packages/ssl/configure 2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.18/packages/ssl/configure 2006-09-01 19:56:34.000000000 +1200
-@@ -3147,7 +3147,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3739,7 +3739,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=-Wall
- else
- COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/table/configure pl-5.6.18/packages/table/configure
---- pl-5.6.18.orig/packages/table/configure 2005-01-31 23:47:37.000000000 +1300
-+++ pl-5.6.18/packages/table/configure 2006-09-01 19:58:05.000000000 +1200
-@@ -3112,7 +3112,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3704,7 +3704,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=-Wall
- else
- COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/xpce/src/configure pl-5.6.18/packages/xpce/src/configure
---- pl-5.6.18.orig/packages/xpce/src/configure 2006-04-05 19:29:14.000000000 +1200
-+++ pl-5.6.18/packages/xpce/src/configure 2006-09-01 19:59:11.000000000 +1200
-@@ -4391,7 +4391,7 @@
- fi
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- if test "$ac_cv_header_stdc" = "yes" || test "$syslibh" = "yes"; then
- CWFLAGS=-Wall
- else
-@@ -4401,7 +4401,7 @@
- COFLAGS=-O
- CWFLAGS=
- fi
--CFLAGS="$CMFLAGS"
-+
- echo "$as_me:$LINENO: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-diff -ur pl-5.6.18.orig/src/Makefile.in pl-5.6.18/src/Makefile.in
---- pl-5.6.18.orig/src/Makefile.in 2006-08-25 20:33:32.000000000 +1200
-+++ pl-5.6.18/src/Makefile.in 2006-09-01 19:36:22.000000000 +1200
-@@ -69,7 +69,7 @@
- CWFLAGS=@CWFLAGS@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
--CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS)
- LDFLAGS=@LDFLAGS@
-
- PLFOREIGN=@PLFOREIGN@
-diff -ur pl-5.6.18.orig/src/configure pl-5.6.18/src/configure
---- pl-5.6.18.orig/src/configure 2006-08-07 20:21:19.000000000 +1200
-+++ pl-5.6.18/src/configure 2006-09-01 19:35:33.000000000 +1200
-@@ -3807,7 +3807,7 @@
- esac
- fi
- else
-- COFLAGS=$CFLAGS
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- fi
-
-
-@@ -14816,7 +14816,7 @@
- LNLIBS="$LIBS"
- fi
-
--echo " CFLAGS=$CWFLAGS $COFLAGS $CIFLAGS $CMFLAGS"
-+echo " CFLAGS=$CWFLAGS $COFLAGS $CMFLAGS"
- echo " LDFLAGS=$LDFLAGS"
- echo " LIBS=$LIBS"
-
-diff -ur pl-5.6.18.orig/src/libtai/Makefile.in pl-5.6.18/src/libtai/Makefile.in
---- pl-5.6.18.orig/src/libtai/Makefile.in 2006-07-11 20:41:05.000000000 +1200
-+++ pl-5.6.18/src/libtai/Makefile.in 2006-09-01 19:37:28.000000000 +1200
-@@ -29,7 +29,7 @@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- LDFLAGS=@LDFLAGS@
--CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS)
-
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
-diff -ur pl-5.6.18.orig/src/rc/Makefile.in pl-5.6.18/src/rc/Makefile.in
---- pl-5.6.18.orig/src/rc/Makefile.in 2006-07-11 20:22:28.000000000 +1200
-+++ pl-5.6.18/src/rc/Makefile.in 2006-09-01 19:36:56.000000000 +1200
-@@ -30,7 +30,7 @@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- LDFLAGS=@LDFLAGS@
--CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS)
-
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r4.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r4.patch
deleted file mode 100644
index 374604b49ed4..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r4.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-diff -ur pl-5.6.27.orig/packages/clib/configure pl-5.6.27/packages/clib/configure
---- pl-5.6.27.orig/packages/clib/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/clib/configure 2007-01-27 08:40:04.000000000 +1300
-@@ -3117,7 +3117,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3709,7 +3709,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-diff -ur pl-5.6.27.orig/packages/clib/maildrop/rfc2045/configure pl-5.6.27/packages/clib/maildrop/rfc2045/configure
---- pl-5.6.27.orig/packages/clib/maildrop/rfc2045/configure 2005-07-25 02:37:57.000000000 +1200
-+++ pl-5.6.27/packages/clib/maildrop/rfc2045/configure 2007-01-27 08:41:14.000000000 +1300
-@@ -3155,7 +3155,7 @@
-
- if test "$GCC" = yes ; then
- CXXFLAGS="$CXXFLAGS -Wall"
-- CFLAGS="$CFLAGS -Wall"
-+ CFLAGS="$CFLAGS -fpic -Wall"
- fi
-
-
-diff -ur pl-5.6.27.orig/packages/clib/maildrop/rfc822/configure pl-5.6.27/packages/clib/maildrop/rfc822/configure
---- pl-5.6.27.orig/packages/clib/maildrop/rfc822/configure 2005-07-25 02:37:57.000000000 +1200
-+++ pl-5.6.27/packages/clib/maildrop/rfc822/configure 2007-01-27 08:41:59.000000000 +1300
-@@ -3144,7 +3144,7 @@
-
- if test "$GCC" = yes ; then
- CXXFLAGS="$CXXFLAGS -Wall"
-- CFLAGS="$CFLAGS -Wall"
-+ CFLAGS="$CFLAGS -fpic -Wall"
- fi
-
-
-diff -ur pl-5.6.27.orig/packages/cppproxy/configure pl-5.6.27/packages/cppproxy/configure
---- pl-5.6.27.orig/packages/cppproxy/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/cppproxy/configure 2007-01-27 08:43:26.000000000 +1300
-@@ -3111,7 +3111,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3703,7 +3703,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-diff -ur pl-5.6.27.orig/packages/db/configure pl-5.6.27/packages/db/configure
---- pl-5.6.27.orig/packages/db/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/db/configure 2007-01-27 08:47:59.000000000 +1300
-@@ -3140,13 +3140,13 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
- fi
-
--CFLAGS="$CMFLAGS $CIFLAGS"
-+#CFLAGS="$CMFLAGS $CIFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-diff -ur pl-5.6.27.orig/packages/jpl/configure pl-5.6.27/packages/jpl/configure
---- pl-5.6.27.orig/packages/jpl/configure 2006-12-22 02:41:37.000000000 +1300
-+++ pl-5.6.27/packages/jpl/configure 2007-01-27 08:47:00.000000000 +1300
-@@ -3115,12 +3115,12 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -cc-options,-fno-strict-aliasing"
-- CWFLAGS="-Wall"
-+ COFLAGS="$CFLAGS -cc-options,-fno-strict-aliasing"
-+ CWFLAGS="-Wall -Wno-strict-aliasing"
- else
- COFLAGS=-O
- CWFLAGS=
-diff -ur pl-5.6.27.orig/packages/ltx2htm/configure pl-5.6.27/packages/ltx2htm/configure
---- pl-5.6.27.orig/packages/ltx2htm/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/ltx2htm/configure 2007-01-27 08:49:50.000000000 +1300
-@@ -1384,6 +1384,7 @@
- CC=$PLLD
- LD=$PLLD
- LDSOFLAGS=-shared
-+CMFLAGS=-fpic
-
- SO="$PLSOEXT"
-
-@@ -3048,7 +3049,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3640,7 +3641,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-diff -ur pl-5.6.27.orig/packages/nlp/configure pl-5.6.27/packages/nlp/configure
---- pl-5.6.27.orig/packages/nlp/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/nlp/configure 2007-01-27 08:50:53.000000000 +1300
-@@ -3111,7 +3111,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3703,7 +3703,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-diff -ur pl-5.6.27.orig/packages/odbc/configure pl-5.6.27/packages/odbc/configure
---- pl-5.6.27.orig/packages/odbc/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/odbc/configure 2007-01-27 08:52:04.000000000 +1300
-@@ -3147,7 +3147,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3739,7 +3739,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-diff -ur pl-5.6.27.orig/packages/semweb/configure pl-5.6.27/packages/semweb/configure
---- pl-5.6.27.orig/packages/semweb/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/semweb/configure 2007-01-27 08:52:41.000000000 +1300
-@@ -3145,7 +3145,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -4294,7 +4294,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O3 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-diff -ur pl-5.6.27.orig/packages/sgml/configure pl-5.6.27/packages/sgml/configure
---- pl-5.6.27.orig/packages/sgml/configure 2007-01-25 03:17:48.000000000 +1300
-+++ pl-5.6.27/packages/sgml/configure 2007-01-27 08:53:34.000000000 +1300
-@@ -2394,7 +2394,7 @@
- SO="$PLSOEXT"
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-@@ -3190,7 +3190,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
-diff -ur pl-5.6.27.orig/packages/ssl/configure pl-5.6.27/packages/ssl/configure
---- pl-5.6.27.orig/packages/ssl/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/ssl/configure 2007-01-27 08:54:24.000000000 +1300
-@@ -3110,7 +3110,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3702,7 +3702,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-diff -ur pl-5.6.27.orig/packages/table/configure pl-5.6.27/packages/table/configure
---- pl-5.6.27.orig/packages/table/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/table/configure 2007-01-27 08:55:05.000000000 +1300
-@@ -3112,7 +3112,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3704,7 +3704,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-diff -ur pl-5.6.27.orig/packages/xpce/src/configure pl-5.6.27/packages/xpce/src/configure
---- pl-5.6.27.orig/packages/xpce/src/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/xpce/src/configure 2007-01-27 08:56:24.000000000 +1300
-@@ -6522,13 +6522,13 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- echo "$as_me:$LINENO: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-diff -ur pl-5.6.27.orig/packages/zlib/configure pl-5.6.27/packages/zlib/configure
---- pl-5.6.27.orig/packages/zlib/configure 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.27/packages/zlib/configure 2007-01-27 08:57:11.000000000 +1300
-@@ -3109,7 +3109,7 @@
-
- fi
-
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3701,7 +3701,7 @@
-
-
- if test ! -z "$GCC"; then
-- COFLAGS="-O2 -fno-strict-aliasing"
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- CWFLAGS=${CWFLAGS--Wall}
- else
- COFLAGS=-O
-diff -ur pl-5.6.27.orig/src/Makefile.in pl-5.6.27/src/Makefile.in
---- pl-5.6.27.orig/src/Makefile.in 2007-01-09 02:02:08.000000000 +1300
-+++ pl-5.6.27/src/Makefile.in 2007-01-27 09:03:18.000000000 +1300
-@@ -69,7 +69,7 @@
- CWFLAGS=@CWFLAGS@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
--CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS)
- LDFLAGS=@LDFLAGS@
-
- PLFOREIGN=@PLFOREIGN@
-diff -ur pl-5.6.27.orig/src/configure pl-5.6.27/src/configure
---- pl-5.6.27.orig/src/configure 2007-01-24 22:30:36.000000000 +1300
-+++ pl-5.6.27/src/configure 2007-01-27 09:03:03.000000000 +1300
-@@ -3809,7 +3809,7 @@
- esac
- fi
- else
-- COFLAGS=$CFLAGS
-+ COFLAGS="$CFLAGS -fno-strict-aliasing"
- fi
-
-
-@@ -15607,7 +15607,7 @@
- LNLIBS="$LIBS"
- fi
-
--echo " CFLAGS=$CWFLAGS $COFLAGS $CIFLAGS $CMFLAGS"
-+echo " CFLAGS=$CWFLAGS $COFLAGS $CMFLAGS"
- echo " LDFLAGS=$LDFLAGS"
- echo " LIBS=$LIBS"
-
-diff -ur pl-5.6.27.orig/src/libtai/Makefile.in pl-5.6.27/src/libtai/Makefile.in
---- pl-5.6.27.orig/src/libtai/Makefile.in 2006-07-11 20:41:05.000000000 +1200
-+++ pl-5.6.27/src/libtai/Makefile.in 2007-01-27 09:03:46.000000000 +1300
-@@ -29,7 +29,7 @@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- LDFLAGS=@LDFLAGS@
--CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS)
-
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
-diff -ur pl-5.6.27.orig/src/rc/Makefile.in pl-5.6.27/src/rc/Makefile.in
---- pl-5.6.27.orig/src/rc/Makefile.in 2006-07-11 20:22:28.000000000 +1200
-+++ pl-5.6.27/src/rc/Makefile.in 2007-01-27 09:04:03.000000000 +1300
-@@ -30,7 +30,7 @@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- LDFLAGS=@LDFLAGS@
--CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS)
-
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
diff --git a/dev-lang/swi-prolog/files/swi-prolog-O_DEBUG.patch b/dev-lang/swi-prolog/files/swi-prolog-O_DEBUG.patch
deleted file mode 100644
index 1a1c81ca009d..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-O_DEBUG.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur pl-5.6.29.orig/src/pl-funcs.h pl-5.6.29/src/pl-funcs.h
---- pl-5.6.29.orig/src/pl-funcs.h 2007-02-07 00:24:03.000000000 +1300
-+++ pl-5.6.29/src/pl-funcs.h 2007-03-04 13:53:21.000000000 +1300
-@@ -62,7 +62,7 @@
- COMMON(word) globalIndirectFromCode(Code *PC);
- COMMON(word) makeRef(Word p);
- #ifndef consPtr
--COMMON(word) consPtr(void *p, int ts);
-+COMMON(word) consPtr(void *p, word ts);
- #endif
- COMMON(char *) store_string(const char *s);
- COMMON(void) remove_string(char *s);
-diff -ur pl-5.6.29.orig/src/pl-main.c pl-5.6.29/src/pl-main.c
---- pl-5.6.29.orig/src/pl-main.c 2007-01-23 00:52:23.000000000 +1300
-+++ pl-5.6.29/src/pl-main.c 2007-03-04 14:01:38.000000000 +1300
-@@ -47,6 +47,10 @@
- #include <crtdbg.h>
- #endif
-
-+#if defined(HAVE_MTRACE) && defined(O_MAINTENANCE)
-+#include <mcheck.h>
-+#endif
-+
- static int usage(void);
- static int giveVersionInfo(const char *a);
- static bool vsysError(const char *fm, va_list args);
diff --git a/dev-lang/swi-prolog/files/swi-prolog-PLBASE-r2.patch b/dev-lang/swi-prolog/files/swi-prolog-PLBASE-r2.patch
deleted file mode 100644
index d88e78659e61..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-PLBASE-r2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ur pl-5.6.18.orig/packages/Makefile.in pl-5.6.18/packages/Makefile.in
---- pl-5.6.18.orig/packages/Makefile.in 2006-08-30 20:35:12.000000000 +1200
-+++ pl-5.6.18/packages/Makefile.in 2006-09-01 20:21:48.000000000 +1200
-@@ -30,7 +30,7 @@
- bindir=@bindir@
- PL=@PL@@RT@
- PLVERSION=@PLVERSION@
--PLBASE=$(prefix)/lib/@PL@-$(PLVERSION)
-+PLBASE=@libdir@/@PL@-$(PLVERSION)
- PKGDOC=$(PLBASE)/doc/packages
- PLLIBS=@LIBS@
- PLARCH=@ARCH@
-diff -ur pl-5.6.18.orig/packages/ltx2htm/Makefile.in pl-5.6.18/packages/ltx2htm/Makefile.in
---- pl-5.6.18.orig/packages/ltx2htm/Makefile.in 2006-08-25 21:19:59.000000000 +1200
-+++ pl-5.6.18/packages/ltx2htm/Makefile.in 2006-09-01 20:22:55.000000000 +1200
-@@ -33,7 +33,7 @@
- INSTALL_DATA=@INSTALL_DATA@
-
- # Don't change, this is also in latex2html.in!
--LIBDIR=$(prefix)/lib/latex2html
-+LIBDIR=@libdir@/latex2html
-
- OBJ= tex.o psfile.o
- LIB= latex2html.pl latex.cmd pl.pl pl.cmd xpce.pl xpce.cmd \
-diff -ur pl-5.6.18.orig/src/Makefile.in pl-5.6.18/src/Makefile.in
---- pl-5.6.18.orig/src/Makefile.in 2006-08-25 20:33:32.000000000 +1200
-+++ pl-5.6.18/src/Makefile.in 2006-09-01 20:15:51.000000000 +1200
-@@ -36,6 +36,7 @@
- srcdir=@srcdir@
- @VPATH@ @srcdir@
- bindir=@bindir@
-+libdir=@libdir@
- mandir=@mandir@
- mansec=1
- lmansec=3
-@@ -46,7 +47,7 @@
- PLVERSION=@PLVERSION@
- PL=@PL@@RT@
- PLV=@PL@@RT@-@PLVERSION@
--PLBASE=$(prefix)/lib/@PL@@RT@-@PLVERSION@
-+PLBASE=$(libdir)/@PL@@RT@-@PLVERSION@
- BOOTFILE=@BOOTFILE@
-
- CC=@CC@
-@@ -360,7 +361,7 @@
- $(INSTALL_DATA) libplimp.a $(DESTDIR)$(PLBASE)/lib/$(ARCH)
-
- idirs::
-- if [ ! -d $(DESTDIR)$(prefix)/lib ]; then $(MKDIR) $(DESTDIR)$(prefix)/lib; fi
-+ if [ ! -d $(DESTDIR)$(libdir) ]; then $(MKDIR) $(DESTDIR)$(libdir); fi
- if [ ! -d $(DESTDIR)$(PLBASE) ]; then $(MKDIR) $(DESTDIR)$(PLBASE); fi
- for d in $(installdirs); do \
- if [ ! -d $(DESTDIR)$(PLBASE)/$$d ]; then \
-@@ -430,7 +431,7 @@
- # runtime-only environment installation
- #
-
--RTHOME= $(DESTDIR)$(prefix)/lib/$(PLV)
-+RTHOME= $(DESTDIR)$(libdir)/$(PLV)
- RTDIRS= $(RTHOME) $(RTHOME)/bin $(RTHOME)/lib $(RTHOME)/lib/$(ARCH) \
- $(RTHOME)/man $(RTHOME)/bin/$(ARCH) $(RTHOME)/include
-
-diff -ur pl-5.6.18.orig/src/configure pl-5.6.18/src/configure
---- pl-5.6.18.orig/src/configure 2006-08-07 20:21:19.000000000 +1200
-+++ pl-5.6.18/src/configure 2006-09-01 20:20:23.000000000 +1200
-@@ -2546,7 +2546,7 @@
-
-
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
--PLBASE=$prefix/lib/$PL-$PLVERSION
-+PLBASE=$libdir/$PL-$PLVERSION
-
-
- for ac_prog in gmake make
-diff -ur pl-5.6.18.orig/src/rc/Makefile.in pl-5.6.18/src/rc/Makefile.in
---- pl-5.6.18.orig/src/rc/Makefile.in 2006-07-11 20:22:28.000000000 +1200
-+++ pl-5.6.18/src/rc/Makefile.in 2006-09-01 20:11:08.000000000 +1200
-@@ -14,7 +14,7 @@
- srcdir=@srcdir@
- @VPATH@ @srcdir@
- bindir=$(exec_prefix)/bin
--PLBASE=$(prefix)/lib/@PL@-$(PLVERSION)
-+PLBASE=@libdir@/@PL@-$(PLVERSION)
- man_prefix=$(prefix)/man
- mansec=1
- lmansec=3
diff --git a/dev-lang/swi-prolog/files/swi-prolog-SGML_CATALOG_FILES.patch b/dev-lang/swi-prolog/files/swi-prolog-SGML_CATALOG_FILES.patch
deleted file mode 100644
index 9ee6bca9424f..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-SGML_CATALOG_FILES.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -ur pl-5.6.17.orig/packages/semweb/rdf_db_test.pl pl-5.6.17/packages/semweb/rdf_db_test.pl
---- pl-5.6.17.orig/packages/semweb/rdf_db_test.pl 2006-03-09 03:32:48.000000000 +1300
-+++ pl-5.6.17/packages/semweb/rdf_db_test.pl 2006-10-07 20:32:28.000000000 +1300
-@@ -13,6 +13,8 @@
- :- use_module(rdfs).
- :- use_module(library(xsdp_types)).
-
-+:- unsetenv('SGML_CATALOG_FILES').
-+
- /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- RDF-DB test file. A test is a clause of the form:
-
-diff -ur pl-5.6.17.orig/packages/sgml/RDF/rdf_test.pl pl-5.6.17/packages/sgml/RDF/rdf_test.pl
---- pl-5.6.17.orig/packages/sgml/RDF/rdf_test.pl 2005-07-05 02:07:43.000000000 +1200
-+++ pl-5.6.17/packages/sgml/RDF/rdf_test.pl 2006-10-07 20:31:31.000000000 +1300
-@@ -34,6 +34,8 @@
-
- :- set_prolog_flag(rdf_container, true).
-
-+:- unsetenv('SGML_CATALOG_FILES').
-+
- /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Test file for the SWI-Prolog RDF parser. Toplevel predicates:
-
-diff -ur pl-5.6.17.orig/packages/sgml/Test/test.pl pl-5.6.17/packages/sgml/Test/test.pl
---- pl-5.6.17.orig/packages/sgml/Test/test.pl 2005-03-01 02:49:58.000000000 +1300
-+++ pl-5.6.17/packages/sgml/Test/test.pl 2006-10-07 09:14:41.000000000 +1300
-@@ -25,6 +25,7 @@
- :- asserta(user:file_search_path(foreign, '..')).
- :- use_module(library(sgml)).
-
-+:- unsetenv('SGML_CATALOG_FILES').
-
- test :-
- testdir(.).
-@@ -52,27 +53,27 @@
- -> format('ok')
- ; format('WRONG'),
- format('~NOK:~n'),
-- pp(TermOk),
-+ format('~w~n',[TermOk]),
- format('~NANSWER:~n'),
-- pp(Term)
-+ format('~w~n',[Term])
- ),
- error_terms(Errors),
- ( compare_errors(Errors, ErrorsOk)
- -> true
- ; format(' [Different errors]~nOK:~n'),
-- pp(ErrorsOk),
-+ format('~w~n',[ErrorsOk]),
- format('~NANSWER:~n'),
-- pp(Errors)
-+ format('~w~n',[Errors])
- ),
- nl
- ; show_errors,
- format('Loaded, no validating data~n'),
-- pp(Term)
-+ format('~w~n',[Term])
- ).
-
- show(File) :-
- load_file(File, Term),
-- pp(Term).
-+ format('~w~n',[Term]).
-
- pass(File) :-
- load_file(File, Term),
-diff -ur pl-5.6.17.orig/packages/sgml/Test/wrtest.pl pl-5.6.17/packages/sgml/Test/wrtest.pl
---- pl-5.6.17.orig/packages/sgml/Test/wrtest.pl 2005-03-01 02:49:58.000000000 +1300
-+++ pl-5.6.17/packages/sgml/Test/wrtest.pl 2006-10-07 09:20:18.000000000 +1300
-@@ -19,6 +19,8 @@
- :- use_module(library(sgml)).
- :- use_module(library(sgml_write)).
-
-+:- unsetenv('SGML_CATALOG_FILES').
-+
- test :- % default test
- fp('.').
-
-@@ -114,7 +116,7 @@
- open(File, write, Out, [encoding(iso_latin_1)]),
- current_output(C0),
- set_output(Out),
-- pp(Term),
-+ format('~w~n',[Term]),
- set_output(C0),
- close(Out).
-
diff --git a/dev-lang/swi-prolog/files/swi-prolog-arith-test.patch b/dev-lang/swi-prolog/files/swi-prolog-arith-test.patch
deleted file mode 100644
index fce4a4fa1ecc..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-arith-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- pl-5.6.25.orig/src/test.pl 2006-12-21 23:37:15.000000000 +1300
-+++ pl-5.6.25/src/test.pl 2007-03-10 19:36:58.000000000 +1300
-@@ -329,11 +329,11 @@
- -1 is truncate(-1.9).
- :- if(current_prolog_flag(bounded, false)).
- arithmetic(floor-2) :-
-- A is floor(9223372036854775808.000000),
-- A == 9223372036854775808.
-+ A is floor(9223372036854777856.000000),
-+ A == 9223372036854777856.
- arithmetic(ceil-2) :-
-- A is ceil(9223372036854775808.000000),
-- A == 9223372036854775808.
-+ A is ceil(9223372036854777856.000000),
-+ A == 9223372036854777856.
- :- endif.
- arithmetic(round-2) :-
- A is round(9223372036854775808.000000),
diff --git a/dev-lang/swi-prolog/files/swi-prolog-cppproxy-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-cppproxy-r1.patch
deleted file mode 100644
index 8dae2189e343..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-cppproxy-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.18.orig/packages/Makefile.in 2006-08-30 20:35:12.000000000 +1200
-+++ pl-5.6.18/packages/Makefile.in 2006-09-01 20:31:39.000000000 +1200
-@@ -10,7 +10,7 @@
- # libXPM and libjpeg to compile. This variable is normally overruled
- # from the configure script. MUST be on one line
-
--PKG= clib cpp odbc table xpce sgml sgml/RDF semweb http chr clpqr nlp ssl pldoc plunit jpl
-+PKG= clib cpp cppproxy odbc table xpce sgml sgml/RDF semweb http chr clpqr nlp ssl pldoc plunit jpl
-
- # Define additional config options. If you wish to build the multi-threaded
- # version of SWI-Prolog and pl-mt to the same install-base, you must provide
diff --git a/dev-lang/swi-prolog/files/swi-prolog-errno.patch b/dev-lang/swi-prolog/files/swi-prolog-errno.patch
deleted file mode 100644
index 2e1f300f67ed..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-errno.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pl-5.6.28.orig/src/pl-text.c 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.28/src/pl-text.c 2007-02-13 19:59:07.000000000 +1300
-@@ -25,6 +25,7 @@
- #include "pl-incl.h"
- #include "pl-ctype.h"
- #include "pl-utf8.h"
-+#include <errno.h>
- #include <stdio.h>
- #ifdef __WINDOWS__
- #include "pl-mswchar.h" /* Terrible hack */
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r2.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r2.patch
deleted file mode 100644
index 8b946ebd38c0..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur pl-5.6.25.orig/packages/jpl/Makefile.in pl-5.6.25/packages/jpl/Makefile.in
---- pl-5.6.25.orig/packages/jpl/Makefile.in 2006-11-28 22:16:43.000000000 +1300
-+++ pl-5.6.25/packages/jpl/Makefile.in 2006-12-29 22:03:31.000000000 +1300
-@@ -36,6 +36,7 @@
- JAVA=@JAVA@
- JUNIT=@JUNIT@
- JAVALIBS=@JAVALIBS@
-+JAVALDPATH=@JAVALDPATH@
-
- DOCTOTEX=$(PCEHOME)/bin/doc2tex
- PLTOTEX=$(PCEHOME)/bin/pl2tex
-@@ -75,9 +76,9 @@
- check: check_pl check_java
-
- check_pl::
-- $(PL) -q -f test_jpl.pl -g run_tests,halt -t 'halt(1)'
-+ LD_LIBRARY_PATH=$(JAVALDPATH) $(PL) -q -f test_jpl.pl -g run_tests,halt -t 'halt(1)'
- check_java::
-- CLASSPATH=$(JUNIT):jpl.jar:jpltest.jar $(JAVA) junit.textui.TestRunner jpl.test.TestJUnit
-+ SWI_HOME_DIR=../.. LD_LIBRARY_PATH=.:../../lib/$(PLARCH) CLASSPATH=$(JUNIT):jpl.jar:jpltest.jar $(JAVA) -Xss1m junit.textui.TestRunner jpl.test.TestJUnit
-
- ################################################################
- # Installation
-diff -ur pl-5.6.25.orig/packages/jpl/configure pl-5.6.25/packages/jpl/configure
---- pl-5.6.25.orig/packages/jpl/configure 2006-12-22 02:41:37.000000000 +1300
-+++ pl-5.6.25/packages/jpl/configure 2006-12-29 22:06:00.000000000 +1300
-@@ -4071,6 +4071,7 @@
-
- for d in $JNI_CLIENT_DIRS; do
- LDSOFLAGS="$LDSOFLAGS -L$d"
-+ JAVALDPATH="$JAVALDPATH:$d"
- done
-
- if test "$java_abs_paths" = yes; then
-@@ -5346,6 +5347,7 @@
- s,@LDSOFLAGS@,$LDSOFLAGS,;t t
- s,@JAVA_HOME@,$JAVA_HOME,;t t
- s,@JAVALIBS@,$JAVALIBS,;t t
-+s,@JAVALDPATH@,$JAVALDPATH,;t t
- s,@JUNIT@,$JUNIT,;t t
- s,@PLLD@,$PLLD,;t t
- s,@MAKE@,$MAKE,;t t
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-PLARCH.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-PLARCH.patch
deleted file mode 100644
index 2756e7309548..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-jpl-PLARCH.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.23.orig/packages/jpl/configure 2006-11-11 00:05:45.000000000 +1300
-+++ pl-5.6.23/packages/jpl/configure 2006-11-11 09:23:18.000000000 +1300
-@@ -3093,7 +3093,7 @@
- *darwin*)
- JAVALIBS="-Wl,-framework,JavaVM"
- ;;
-- *powerpc-linux*)
-+ ppc)
- JAVALIBS="-ljava -ljvm"
- ;;
- *)
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch
deleted file mode 100644
index ef42960da2a9..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- pl-5.6.25.orig/packages/jpl/jpl.pl 2006-12-20 21:55:19.000000000 +1300
-+++ pl-5.6.25/packages/jpl/jpl.pl 2007-02-28 20:42:38.000000000 +1300
-@@ -4123,13 +4123,13 @@
- ; I < 2**15 -> T = char_short
- ; I < 2**16 -> T = char_int
- ; I < 2**31 -> T = int
-- ; I < 2**63 -> T = long
-+ ; I =< 9223372036854775807 -> T = long
- ; T = overlong
- )
- ; I >= -(2**7) -> T = byte
- ; I >= -(2**15) -> T = short
- ; I >= -(2**31) -> T = int
-- ; I >= -(2**63) -> T = long
-+ ; I >= -9223372036854775808 -> T = long
- ; T = overlong
- ).
-
---- pl-5.6.25.orig/packages/jpl/test_jpl.pl 2006-11-22 21:38:20.000000000 +1300
-+++ pl-5.6.25/packages/jpl/test_jpl.pl 2007-02-28 20:34:39.000000000 +1300
-@@ -1038,7 +1038,8 @@
- [ setup((
- jpl_new( array(long), 3, A),
- ( current_prolog_flag( bounded, true)
-- -> current_prolog_flag( max_integer, V)
-+ -> current_prolog_flag( max_integer, MI),
-+ V is 10.0*MI
- ; V is 2**63
- )
- )),
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java-r1.patch
deleted file mode 100644
index 2c961414e01f..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java-r1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- pl-5.6.28.orig/packages/jpl/src/java/jpl/test/TestJUnit.java 2007-01-30 22:48:09.000000000 +1300
-+++ pl-5.6.28/packages/jpl/src/java/jpl/test/TestJUnit.java 2007-02-25 13:15:51.000000000 +1300
-@@ -32,7 +32,7 @@
- protected void setUp() {
- // initialization code
- // Prolog.set_default_init_args(new String[] { "libpl.dll", "-f", "none", "-g", "set_prolog_flag(debug_on_error,false)", "-q" });
-- Prolog.set_default_init_args(new String[] { "libpl.dll", "-f", "none", "-g", "true", "-q" });
-+ Prolog.set_default_init_args(new String[] { "libpl.dll", "-x", "../../src/pl.prc", "-f", "none", "-g", "true", "-q" });
- assertTrue((new Query("consult(test_jpl)")).hasSolution());
- }
- protected void tearDown() {
-@@ -50,7 +50,7 @@
- }
- public void testSameLibVersions2() {
- String java_lib_version = JPL.version_string();
-- String pl_lib_version = ((Term) (new Query(new Compound("jpl_pl_lib_version", new Term[] { new Variable("V") })).oneSolution().get("V"))).name();
-+ String pl_lib_version = ((Term) Query.oneSolution("jpl:jpl_pl_lib_version(V)").get("V")).name();
- assertTrue("java_lib_version(" + java_lib_version + ") is same as pl_lib_version(" + pl_lib_version + ")", java_lib_version.equals(pl_lib_version));
- }
- public void testAtomName1() {
-@@ -512,11 +512,9 @@
- assertTrue(array[2].isAtom() && array[2].name().equals("c"));
- }
- public void testJRef1() {
-- System.out.println("java.library.path=" + System.getProperties().get("java.library.path"));
-- System.out.println("jpl.c version = " + jpl.fli.Prolog.get_c_lib_version());
- int i = 76543;
- Integer I = new Integer(i);
-- Query q = new Query("jpl_call(?,intValue,[],I2)", new Term[] {new JRef(I)});
-+ Query q = new Query("use_module(library(jpl)),jpl_call(?,intValue,[],I2)", new Term[] {new JRef(I)});
- Term I2 = (Term) q.oneSolution().get("I2");
- assertTrue(I2.isInteger() && I2.intValue() == i);
- }
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java.patch
deleted file mode 100644
index 631e964cb951..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur pl-5.6.25.orig/packages/jpl/src/java/jpl/test/TestJUnit.java pl-5.6.25/packages/jpl/src/java/jpl/test/TestJUnit.java
---- pl-5.6.25.orig/packages/jpl/src/java/jpl/test/TestJUnit.java 2006-12-20 21:55:19.000000000 +1300
-+++ pl-5.6.25/packages/jpl/src/java/jpl/test/TestJUnit.java 2006-12-29 21:58:25.000000000 +1300
-@@ -31,7 +31,7 @@
- protected void setUp() {
- // initialization code
- // Prolog.set_default_init_args(new String[] { "libpl.dll", "-f", "none", "-g", "set_prolog_flag(debug_on_error,false)", "-q" });
-- Prolog.set_default_init_args(new String[] { "libpl.dll", "-f", "none", "-g", "true", "-q" });
-+ Prolog.set_default_init_args(new String[] { "libpl.dll", "-x", "../../src/pl.prc", "-f", "none", "-g", "true", "-q" });
- assertTrue((new Query("consult(test_jpl)")).hasSolution());
- }
- protected void tearDown() {
-@@ -49,7 +49,7 @@
- }
- public void testSameLibVersions2() {
- String java_lib_version = JPL.version_string();
-- String pl_lib_version = ((Term) (new Query(new Compound("jpl_pl_lib_version", new Term[] { new Variable("V") })).oneSolution().get("V"))).name();
-+ String pl_lib_version = ((Term) Query.oneSolution("jpl:jpl_pl_lib_version(V)").get("V")).name();
- assertTrue("java_lib_version(" + java_lib_version + ") is same as pl_lib_version(" + pl_lib_version + ")", java_lib_version.equals(pl_lib_version));
- }
- public void testAtomName1() {
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-junit.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-junit.patch
deleted file mode 100644
index 5d1692c8011d..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-jpl-junit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.24.orig/packages/jpl/configure 2006-11-28 22:16:44.000000000 +1300
-+++ pl-5.6.24/packages/jpl/configure 2006-11-29 21:55:34.000000000 +1300
-@@ -3986,7 +3987,7 @@
- fi
-
- if test "x$JUNIT" = "x"; then
-- JUNIT=/usr/share/java/junit.jar
-+ JUNIT="$(java-config --classpath junit)"
- fi
-
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
diff --git a/dev-lang/swi-prolog/files/swi-prolog-ltx2htm.patch b/dev-lang/swi-prolog/files/swi-prolog-ltx2htm.patch
deleted file mode 100644
index de6df69900de..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-ltx2htm.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- pl-5.6.4.orig/packages/ltx2htm/doc2tex 1997-01-21 06:39:40.000000000 +1300
-+++ pl-5.6.4/packages/ltx2htm/doc2tex 2006-02-13 23:29:54.000000000 +1300
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- sub printTeX
- { s/`([@\w]+)\s*<->(\w+)/\\index{\l\1,\\both{\2}}`\1 \\both{\2}/g;
---- pl-5.6.17.orig/packages/ltx2htm/Makefile.in 2005-12-02 21:53:05.000000000 +1300
-+++ pl-5.6.17/packages/ltx2htm/Makefile.in 2006-08-26 16:12:20.000000000 +1200
-@@ -11,9 +11,11 @@
-
- MAKE=@MAKE@
-
--PL=@PL@
-+PL=../@PL@.sh
-+PLBASE=@PLBASE@
- PLARCH=@PLARCH@
- PLHOME=@PLHOME@
-+PKGDOC=$(PLBASE)/doc/packages
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
-@@ -38,32 +40,29 @@
- OBJ= tex.o psfile.o
- LIB= latex2html.pl latex.cmd pl.pl pl.cmd xpce.pl xpce.cmd
-
--all:
-- @echo "==============================================================="
-- @echo "Usage:"
-- @echo ""
-- @echo "$(MAKE) install Install the package"
-- @echo "$(MAKE) html Translate the documentation into HTML"
-- @echo "$(MAKE) dvi Translate the documentation into DVI"
-- @echo "==============================================================="
-+all: tex.@SO@
-
- install: tex.@SO@
-- mkdir -p $(DESTDIR)$(LIBDIR)/lib/$(PLARCH)
-- $(INSTALL_DATA) tex.@SO@ $(DESTDIR)$(LIBDIR)/lib/$(PLARCH)
-- $(INSTALL_PROGRAM) latex2html $(DESTDIR)$(bindir)
-- for f in $(LIB); do $(INSTALL_DATA) $$f $(DESTDIR)$(LIBDIR); done
-- mkdir -p $(DESTDIR)$(LIBDIR)/icons
-- for f in icons/*.gif; do $(INSTALL_DATA) $$f $(DESTDIR)$(LIBDIR)/icons; done
-+ mkdir -p $(DESTDIR)$(PLBASE)/lib/$(PLARCH)
-+ $(INSTALL_DATA) -m 755 tex.@SO@ $(DESTDIR)$(PLBASE)/lib/$(PLARCH)
-+ mkdir -p $(DESTDIR)$(PLBASE)/library
-+ for f in $(LIB); do $(INSTALL_DATA) $$f $(DESTDIR)$(PLBASE)/library; done
-
- tex.@SO@: $(OBJ)
- $(LD) $(LDFLAGS) -o $@ $(OBJ)
-
-+html-install: html
-+ mkdir -p $(DESTDIR)$(PKGDOC)/latex2html
-+ for f in manual/*; do $(INSTALL_DATA) $$f $(DESTDIR)$(PKGDOC)/latex2html; done
-+
-+check::
-+
- ################################################################
- # Documentation
- ################################################################
-
- html: manual.tex
-- latex2html manual
-+ $(PL) -p library=. -f none -g "assert(user:file_search_path(foreign, '.')),load_files(library(latex2html),[silent(true)]),latex2html('manual.tex')" -t halt
-
- dvi: manual.tex
- latex manual
diff --git a/dev-lang/swi-prolog/files/swi-prolog-portage-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-portage-r1.patch
deleted file mode 100644
index 4ef650d7b194..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-portage-r1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- pl-5.6.19.orig/packages/Makefile.in 2006-08-30 20:35:12.000000000 +1200
-+++ pl-5.6.19/packages/Makefile.in 2006-09-12 06:46:42.000000000 +1200
-@@ -81,7 +81,7 @@
-
- install::
- for p in $(PKG); do \
-- if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \
-+ if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \
- done
- @echo "*** Forcing update of library index ***"
- rm -f $(DESTDIR)$(PLLIB)/INDEX.pl
-@@ -120,7 +120,7 @@
- echo "**********************"; \
- echo "* Package $$p"; \
- echo "**********************"; \
-- ( cd $$p && $(CONFIG) ); \
-+ ( cd $$p && $(CONFIG) ) || exit 1; \
- fi; \
- done
-
-@@ -137,7 +137,7 @@
-
- check::
- for p in $(PKG); do \
-- if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \
-+ if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \
- done
-
- # test environment
diff --git a/dev-lang/swi-prolog/files/swi-prolog-semweb-bitmatrix.patch b/dev-lang/swi-prolog/files/swi-prolog-semweb-bitmatrix.patch
deleted file mode 100644
index 7a489c3c8d0e..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-semweb-bitmatrix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pl-5.6.25.orig/packages/semweb/rdf_db.c 2006-11-27 22:08:01.000000000 +1300
-+++ pl-5.6.25/packages/semweb/rdf_db.c 2007-01-02 18:30:50.000000000 +1300
-@@ -1025,7 +1025,7 @@
- int word = ij/WSIZE;
- int bit = ij%WSIZE;
-
-- m->bits[word] |= 1<<(bit-1);
-+ m->bits[word] |= 1<<bit;
- }
-
-
-@@ -1035,7 +1035,7 @@
- int word = ij/WSIZE;
- int bit = ij%WSIZE;
-
-- return ((m->bits[word] & (1<<(bit-1))) != 0);
-+ return ((m->bits[word] & (1<<bit)) != 0);
- }
-
-
diff --git a/dev-lang/swi-prolog/files/swi-prolog-set_prolog_IO.patch b/dev-lang/swi-prolog/files/swi-prolog-set_prolog_IO.patch
deleted file mode 100644
index ed2eab29e8fb..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-set_prolog_IO.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.28.orig/src/pl-file.c 2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.28/src/pl-file.c 2007-02-25 16:34:14.000000000 +1300
-@@ -3611,7 +3611,7 @@
- releaseStream(in);
- if ( out )
- releaseStream(out);
-- if ( error && error != out )
-+ if ( error && PL_compare(A2, A3) != 0 )
- releaseStream(error);
-
- return rval;
diff --git a/dev-lang/swi-prolog/files/swi-prolog-sgml-no_attribute.patch b/dev-lang/swi-prolog/files/swi-prolog-sgml-no_attribute.patch
deleted file mode 100644
index e84e88425bb3..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-sgml-no_attribute.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.25.orig/packages/sgml/parser.c 2006-11-11 01:58:12.000000000 +1300
-+++ pl-5.6.25/packages/sgml/parser.c 2007-02-27 20:43:08.000000000 +1300
-@@ -5438,7 +5438,7 @@
- { const wchar_t *elem = va_arg(args, wchar_t *); /* element */
- const wchar_t *attr = va_arg(args, wchar_t *); /* attribute */
-
-- swprintf(buf, 1024, L"Element \"%ls\" has no attribute \"%s\"",
-+ swprintf(buf, 1024, L"Element \"%ls\" has no attribute \"%ls\"",
- elem, attr);
- error.argv[0] = buf;
- error.severity = ERS_WARNING;
diff --git a/dev-lang/swi-prolog/files/swi-prolog-ssl-SIO_FLUSHOUTPUT.patch b/dev-lang/swi-prolog/files/swi-prolog-ssl-SIO_FLUSHOUTPUT.patch
deleted file mode 100644
index 4755ceeac9fa..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-ssl-SIO_FLUSHOUTPUT.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.25.orig/packages/ssl/ssl4pl.c 2006-11-11 03:48:31.000000000 +1300
-+++ pl-5.6.25/packages/ssl/ssl4pl.c 2007-01-01 16:33:49.000000000 +1300
-@@ -540,6 +540,8 @@
- *p = instance->sock;
- return 0;
- }
-+ case SIO_FLUSHOUTPUT:
-+ return 0;
- default:
- return -1;
- }
diff --git a/dev-lang/swi-prolog/files/swi-prolog-ssl-cert.patch b/dev-lang/swi-prolog/files/swi-prolog-ssl-cert.patch
deleted file mode 100644
index 8bf6e63a8890..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-ssl-cert.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- pl-5.6.17.orig/packages/ssl/Makefile.in 2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.17/packages/ssl/Makefile.in 2007-02-24 10:50:04.000000000 +1300
-@@ -128,6 +128,9 @@
- ################################################################
-
- check::
-+ (cd etc && \
-+ openssl ca -batch -policy policy_anything -passin pass:apenoot -out server/server-cert.pem -infiles server/server-key.pem && \
-+ openssl ca -batch -policy policy_anything -passin pass:apenoot -out client/client-cert.pem -infiles client/client-key.pem)
- $(PL) -q -f ssl_test.pl -F none -g test,halt -t 'halt(1)'
-
- ################################################################
diff --git a/dev-lang/swi-prolog/files/swi-prolog-thread-sandbox.patch b/dev-lang/swi-prolog/files/swi-prolog-thread-sandbox.patch
deleted file mode 100644
index eaf86dace88b..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-thread-sandbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.25.orig/src/pl-thread.c 2006-11-02 03:27:21.000000000 +1300
-+++ pl-5.6.25/src/pl-thread.c 2007-02-26 20:16:26.000000000 +1300
-@@ -1004,7 +1004,7 @@
- PL_register_atom(ldnew->prompt.first);
- }
- ldnew->modules = LD->modules;
-- ldnew->IO = LD->IO;
-+ memcpy(&(ldnew->IO), &(LD->IO), sizeof(LD->IO));
- ldnew->_fileerrors = LD->_fileerrors;
- ldnew->float_format = LD->float_format;
- ldnew->encoding = LD->encoding;
diff --git a/dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch
deleted file mode 100644
index 88d6b0f7a484..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur pl-5.6.25.orig/packages/clib/testsocket.pl pl-5.6.25/packages/clib/testsocket.pl
---- pl-5.6.25.orig/packages/clib/testsocket.pl 2004-09-22 02:28:16.000000000 +1200
-+++ pl-5.6.25/packages/clib/testsocket.pl 2007-02-24 08:55:29.000000000 +1300
-@@ -35,6 +35,12 @@
- client/1 % +Address
- ]).
-
-+:- ( current_prolog_flag(threads, true)
-+ -> true
-+ ; format('Disabling tcp_test on single-threaded engine~n~n', []),
-+ halt
-+ ).
-+
- :- asserta(user:file_search_path(foreign, '.')).
-
- :- use_module(socket).
-diff -ur pl-5.6.25.orig/packages/semweb/litmap_test.pl pl-5.6.25/packages/semweb/litmap_test.pl
---- pl-5.6.25.orig/packages/semweb/litmap_test.pl 2006-03-07 02:17:30.000000000 +1300
-+++ pl-5.6.25/packages/semweb/litmap_test.pl 2007-02-24 08:55:29.000000000 +1300
-@@ -3,6 +3,13 @@
- test/1,
- test/2
- ]).
-+
-+:- ( current_prolog_flag(threads, true)
-+ -> true
-+ ; format('Disabling literal map test on single-threaded engine~n~n', []),
-+ halt
-+ ).
-+
- :- use_module(library(debug)).
- :- use_module(library(debug)).
- :- asserta(user:file_search_path(foreign, '../sgml')).
-diff -ur pl-5.6.25.orig/packages/semweb/rdf_db_test.pl pl-5.6.25/packages/semweb/rdf_db_test.pl
---- pl-5.6.25.orig/packages/semweb/rdf_db_test.pl 2006-11-10 22:44:56.000000000 +1300
-+++ pl-5.6.25/packages/semweb/rdf_db_test.pl 2007-02-24 08:55:29.000000000 +1300
-@@ -29,6 +29,12 @@
- the GNU General Public License.
- */
-
-+:- ( current_prolog_flag(threads, true)
-+ -> true
-+ ; format('Disabling RDF_DB test suite on single-threaded engine~n~n', []),
-+ halt
-+ ).
-+
- :- asserta(file_search_path(foreign, '../sgml')).
- :- asserta(file_search_path(library, '../sgml')).
- :- asserta(file_search_path(library, '../sgml/RDF')).
-Only in pl-5.6.25/packages/semweb: rdf_db_test.pl.orig
-diff -ur pl-5.6.25.orig/packages/ssl/ssl_test.pl pl-5.6.25/packages/ssl/ssl_test.pl
---- pl-5.6.25.orig/packages/ssl/ssl_test.pl 2006-06-21 19:51:59.000000000 +1200
-+++ pl-5.6.25/packages/ssl/ssl_test.pl 2007-02-24 08:55:29.000000000 +1300
-@@ -29,6 +29,12 @@
- the GNU General Public License.
- */
-
-+:- ( current_prolog_flag(threads, true)
-+ -> true
-+ ; format('Disabling SSL test on single-threaded engine~n~n', []),
-+ halt
-+ ).
-+
- :- asserta(user:file_search_path(foreign, '.')).
-
- :- use_module(ssl).
-diff -ur pl-5.6.25.orig/packages/zlib/ztest.pl pl-5.6.25/packages/zlib/ztest.pl
---- pl-5.6.25.orig/packages/zlib/ztest.pl 2006-12-06 01:19:44.000000000 +1300
-+++ pl-5.6.25/packages/zlib/ztest.pl 2007-02-24 09:05:57.000000000 +1300
-@@ -56,7 +56,7 @@
-
- % zstream: test compressed stream flushing and processing
-
--test(zstream) :-
-+test(zstream, [condition(current_prolog_flag(threads, true))]) :-
- server(Port),
- debug(server, 'Server at ~w~n', [Port]),
- client(Port),
diff --git a/dev-lang/swi-prolog/files/swi-prolog-xpce-parallel-build.patch b/dev-lang/swi-prolog/files/swi-prolog-xpce-parallel-build.patch
deleted file mode 100644
index 4954b2f63d5c..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-xpce-parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.20.orig/packages/xpce/src/Makefile.in 2006-09-11 00:25:06.000000000 +1200
-+++ pl-5.6.20/packages/xpce/src/Makefile.in 2006-09-24 21:51:35.000000000 +1200
-@@ -298,7 +298,7 @@
- # Building the directories
- ################################################################
-
--prepare: directories names version h/interface.h
-+prepare: directories names h/interface.h
-
- directories: h $(MODULES) $(VWS)
-
diff --git a/dev-lang/swi-prolog/files/swi-prolog-xpce-test-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-xpce-test-r1.patch
deleted file mode 100644
index 42888099633a..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-xpce-test-r1.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -urN pl-5.6.24.orig/packages/xpce/src/Makefile.in pl-5.6.24/packages/xpce/src/Makefile.in
---- pl-5.6.24.orig/packages/xpce/src/Makefile.in 2006-11-11 01:54:39.000000000 +1300
-+++ pl-5.6.24/packages/xpce/src/Makefile.in 2006-11-29 20:56:28.000000000 +1300
-@@ -125,6 +125,7 @@
- PLBINDIR=$(PLBASE)/bin/$(PLARCH)
- PL=@PL@
- PLBUILD=@PLBUILD@
-+PCEBUILD=$(PCEHOME)/src/xpce.sh
- PLNAME=@PLNAME@
- PLLD=@PLLD@
-
-@@ -897,7 +898,8 @@
- ################################################################
-
- check::
-- $(PLBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
-+ $(PCEBUILD) -q -g "['./find_display.pl'],find_display,halt" -t 'halt(0)'
-+ $(PCEBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
-
-
- ################################################################
-diff -urN pl-5.6.24.orig/packages/xpce/src/find_display.pl pl-5.6.24/packages/xpce/src/find_display.pl
---- pl-5.6.24.orig/packages/xpce/src/find_display.pl 1970-01-01 12:00:00.000000000 +1200
-+++ pl-5.6.24/packages/xpce/src/find_display.pl 2006-11-29 20:56:28.000000000 +1300
-@@ -0,0 +1,13 @@
-+:- asserta(library_directory('../prolog/lib')).
-+:- use_module(library(pce)).
-+
-+find_display :-
-+ current_input(InputStream),
-+ open_null_stream(NullStream),
-+ set_prolog_IO(InputStream, NullStream, NullStream),
-+ ( exists_file('display_exists')
-+ -> delete_file('display_exists')
-+ ; true),
-+ get(@display, visual_type, _),
-+ open('display_exists', update, Fd),
-+ close(Fd).
-diff -urN pl-5.6.24.orig/packages/xpce/src/test.pl pl-5.6.24/packages/xpce/src/test.pl
---- pl-5.6.24.orig/packages/xpce/src/test.pl 2006-11-14 21:43:27.000000000 +1300
-+++ pl-5.6.24/packages/xpce/src/test.pl 2006-11-29 20:58:13.000000000 +1300
-@@ -35,11 +35,23 @@
- ?- test.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-+:- asserta(library_directory('../prolog/lib')).
-+:- use_module(library(pce)).
-+:- use_module(library(pce_util)).
-+
- :- get(@pce, version, V),
- format('XPCE/SWI-Prolog test suite. (XPCE version ~w)~n\
- To run all tests run ?- test.~n~n', [V]).
-
-+:- dynamic
-+ display_enabled/0.
-
-+:- format('Checking for usable X server~n', []),
-+ ( exists_file('display_exists')
-+ -> format('X server found.~n~n', []),
-+ assert(display_enabled)
-+ ; format('No usable X server found. Some tests are disabled.~n~n', [])
-+ ).
-
- /*******************************
- * NAMES *
-@@ -163,12 +175,12 @@
- *******************************/
-
- srcsink(contents-1) :-
-- numlist(32, 1000, L),
-+ numlist(32, 255, L),
- tmp_file(test, Tmp),
-- open(Tmp, write, Out, [encoding(utf8)]),
-+ open(Tmp, write, Out, [encoding(iso_latin_1)]),
- maplist(put_code(Out), L),
- close(Out),
-- new(File, file(Tmp, utf8)),
-+ new(File, file(Tmp, iso_latin_1)),
- get(File, contents, String),
- delete_file(Tmp),
- get(String, value, Atom),
-@@ -193,7 +205,7 @@
- *******************************/
-
- foreign(Name) :-
-- atom_codes(Name, [1087, 1083, 1072, 1090, 1085, 1072, 1103]).
-+ atom_codes(Name, [102, 105, 108, 101, 110, 97, 109, 101]).
-
- file(env-1) :-
- new(F, file('$PCEHOME/Defaults')),
-@@ -202,11 +214,6 @@
- get(F, name, PceName),
- same_file(PceName, PlName),
- send(F, same, PlName).
--file(home-1) :-
-- new(F, file('~/foobar')),
-- get(F, name, PceName),
-- expand_file_name('~/foobar', [PlName]),
-- same_file(PceName, PlName).
- file(abs-1) :-
- new(F, file(foobar)),
- get(F, absolute_path, Abs),
-@@ -221,14 +228,16 @@
- -> send(file(F), exists)
- ; \+ send(file(F), exists)
- )).
--file(utf8-1) :-
-+file(ascii-1) :-
- foreign(Name),
- Text = 'Hello world\n',
- new(F, file(Name)),
-+ send(F, encoding, iso_latin_1),
- send(F, open, write),
- send(F, append, Text),
- send(F, close),
- new(F2, file(Name)),
-+ send(F2, encoding, iso_latin_1),
- exists_file(Name),
- send(F2, exists),
- get(F2, contents, string(Text)),
-@@ -313,12 +322,12 @@
- atom_concat(hello, Wide, New).
- textbuffer(file-1) :-
- new(TB, text_buffer),
-- numlist(32, 1000, L),
-+ numlist(32, 255, L),
- atom_codes(WAtom, L),
- send(TB, append, WAtom),
- tmp_file(test, Tmp),
-- send(TB, save, file(Tmp, utf8)),
-- get(file(Tmp, utf8), contents, string(Copy)),
-+ send(TB, save, file(Tmp, iso_latin_1)),
-+ get(file(Tmp, iso_latin_1), contents, string(Copy)),
- delete_file(Tmp),
- Copy == WAtom.
- textbuffer(store-1) :-
-@@ -636,6 +645,10 @@
- testset(regex). % Regular expression matches
- testset(type). % Check type logic
-
-+display_required(bom).
-+display_required(selection).
-+display_required(image).
-+
- % testdir(Dir)
- %
- % Enumerate directories holding tests.
-@@ -684,6 +697,10 @@
- ).
-
- runtest(Name) :-
-+ display_required(Name),
-+ \+display_enabled,
-+ format('Disabling test set "~w"~n', [Name]).
-+runtest(Name) :-
- format('Running test set "~w" ', [Name]),
- flush,
- functor(Head, Name, 1),
diff --git a/dev-lang/swi-prolog/files/swi-prolog-zlib-test.patch b/dev-lang/swi-prolog/files/swi-prolog-zlib-test.patch
deleted file mode 100644
index a6cff4bb9976..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-zlib-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- pl-5.6.25.orig/packages/zlib/ztest.pl 2006-12-06 01:19:44.000000000 +1300
-+++ pl-5.6.25/packages/zlib/ztest.pl 2006-12-23 09:42:51.000000000 +1300
-@@ -2,12 +2,15 @@
- [
- ]).
- :- asserta(user:file_search_path(foreign, '.')).
-+:- asserta(user:file_search_path(foreign, '../clib')).
- :- asserta(user:file_search_path(library, '.')).
- :- asserta(user:file_search_path(library, '../plunit')).
-+:- asserta(user:file_search_path(library, '../clib')).
-
- :- use_module(user:library(zlib)).
- :- use_module(user:library(plunit)).
- :- use_module(user:library(readutil)).
-+:- use_module(user:library(socket)).
-
- read_file_to_codes(File, Codes) :-
- open(File, read, In),