From 786ec473315d6960a65c4efdb64f71774b902f5b Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Thu, 1 Jan 2015 12:06:28 +0000
Subject: Move the slightly conflicting patches into per-target locations to
 stop the patcher complaining.

---
 .../libpbl/m68k-unknown-amigaos/no-malloc.h.p      | 154 +++++++++++++++++++++
 sdk/recipes/patches/libpbl/no-malloc.h.p           | 154 ---------------------
 sdk/recipes/patches/libpbl/no-memory.h.p           | 108 ---------------
 .../patches/libpbl/ppc-amigaos/no-memory.h.p       | 108 +++++++++++++++
 4 files changed, 262 insertions(+), 262 deletions(-)
 create mode 100644 sdk/recipes/patches/libpbl/m68k-unknown-amigaos/no-malloc.h.p
 delete mode 100644 sdk/recipes/patches/libpbl/no-malloc.h.p
 delete mode 100644 sdk/recipes/patches/libpbl/no-memory.h.p
 create mode 100644 sdk/recipes/patches/libpbl/ppc-amigaos/no-memory.h.p

diff --git a/sdk/recipes/patches/libpbl/m68k-unknown-amigaos/no-malloc.h.p b/sdk/recipes/patches/libpbl/m68k-unknown-amigaos/no-malloc.h.p
new file mode 100644
index 0000000..f73f7b4
--- /dev/null
+++ b/sdk/recipes/patches/libpbl/m68k-unknown-amigaos/no-malloc.h.p
@@ -0,0 +1,154 @@
+--- src/pbl.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pbl.c	2014-12-19 18:53:46.340018151 +0000
+@@ -51,7 +51,7 @@ char* pbl_c_id = "$Id: pbl.c,v 1.15 2010
+ #include <string.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblCollection.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblCollection.c	2014-12-19 18:53:05.372018271 +0000
+@@ -45,7 +45,7 @@ char* pblCollection_c_id = "$Id: pblColl
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblhash.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblhash.c	2014-12-19 18:52:56.652018298 +0000
+@@ -66,7 +66,7 @@ char* pblhash_c_id = "$Id: pblhash.c,v 1
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblHeap.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblHeap.c	2014-12-19 18:53:14.144018245 +0000
+@@ -38,7 +38,7 @@ char* pblHeap_c_id = "$Id: pblHeap.c,v 1
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblhttst.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblhttst.c	2014-12-19 18:52:47.260018324 +0000
+@@ -56,7 +56,7 @@ char* pblhttst_c_id = "$Id: pblhttst.c,v
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblIterator.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblIterator.c	2014-12-19 18:53:22.556018222 +0000
+@@ -50,7 +50,7 @@ char * PblIteratorMagic = "PblIteratorMa
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblList.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblList.c	2014-12-19 18:54:17.436018060 +0000
+@@ -54,7 +54,7 @@ char * PblLinkedListMagic = "PblLinkedLi
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblMap.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblMap.c	2014-12-19 18:53:54.336018129 +0000
+@@ -56,7 +56,7 @@ char* pblMap_c_id = "$Id: pblMap.c,v 1.7
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblMapTest.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblMapTest.c	2014-12-19 18:52:28.496018379 +0000
+@@ -48,7 +48,7 @@ char* pblMapTest_c_id =
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblPerform.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblPerform.c	2014-12-19 18:53:35.700018182 +0000
+@@ -60,7 +60,7 @@ char* pblPerform_c_id =
+ #include <memory.h>
+ #include <sys/time.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblPriorityQueue.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblPriorityQueue.c	2014-12-19 18:54:14.628018068 +0000
+@@ -45,7 +45,7 @@ char* pblPriorityQueue_c_id =
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblPriorityQueueTest.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblPriorityQueueTest.c	2014-12-19 18:52:37.076018355 +0000
+@@ -45,7 +45,7 @@ char* pblPriorityQueueTest_c_id =
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pblSet.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pblSet.c	2014-12-19 18:52:19.716018406 +0000
+@@ -64,7 +64,7 @@ char * PblTreeSetMagic = "PblTreeSetMagi
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
+--- src/pbltest.c	2010-10-18 22:45:22.000000000 +0100
++++ src/pbltest.c	2014-12-19 18:51:55.048018477 +0000
+@@ -57,7 +57,7 @@ char* pbltest_c_id = "$Id: pbltest.c,v 1
+ #include <stdio.h>
+ #include <memory.h>
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(AMIGA)
+ #include <malloc.h>
+ #endif
+ 
diff --git a/sdk/recipes/patches/libpbl/no-malloc.h.p b/sdk/recipes/patches/libpbl/no-malloc.h.p
deleted file mode 100644
index f73f7b4..0000000
--- a/sdk/recipes/patches/libpbl/no-malloc.h.p
+++ /dev/null
@@ -1,154 +0,0 @@
---- src/pbl.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pbl.c	2014-12-19 18:53:46.340018151 +0000
-@@ -51,7 +51,7 @@ char* pbl_c_id = "$Id: pbl.c,v 1.15 2010
- #include <string.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblCollection.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblCollection.c	2014-12-19 18:53:05.372018271 +0000
-@@ -45,7 +45,7 @@ char* pblCollection_c_id = "$Id: pblColl
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblhash.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblhash.c	2014-12-19 18:52:56.652018298 +0000
-@@ -66,7 +66,7 @@ char* pblhash_c_id = "$Id: pblhash.c,v 1
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblHeap.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblHeap.c	2014-12-19 18:53:14.144018245 +0000
-@@ -38,7 +38,7 @@ char* pblHeap_c_id = "$Id: pblHeap.c,v 1
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblhttst.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblhttst.c	2014-12-19 18:52:47.260018324 +0000
-@@ -56,7 +56,7 @@ char* pblhttst_c_id = "$Id: pblhttst.c,v
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblIterator.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblIterator.c	2014-12-19 18:53:22.556018222 +0000
-@@ -50,7 +50,7 @@ char * PblIteratorMagic = "PblIteratorMa
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblList.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblList.c	2014-12-19 18:54:17.436018060 +0000
-@@ -54,7 +54,7 @@ char * PblLinkedListMagic = "PblLinkedLi
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblMap.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblMap.c	2014-12-19 18:53:54.336018129 +0000
-@@ -56,7 +56,7 @@ char* pblMap_c_id = "$Id: pblMap.c,v 1.7
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblMapTest.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblMapTest.c	2014-12-19 18:52:28.496018379 +0000
-@@ -48,7 +48,7 @@ char* pblMapTest_c_id =
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblPerform.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblPerform.c	2014-12-19 18:53:35.700018182 +0000
-@@ -60,7 +60,7 @@ char* pblPerform_c_id =
- #include <memory.h>
- #include <sys/time.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblPriorityQueue.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblPriorityQueue.c	2014-12-19 18:54:14.628018068 +0000
-@@ -45,7 +45,7 @@ char* pblPriorityQueue_c_id =
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblPriorityQueueTest.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblPriorityQueueTest.c	2014-12-19 18:52:37.076018355 +0000
-@@ -45,7 +45,7 @@ char* pblPriorityQueueTest_c_id =
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pblSet.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pblSet.c	2014-12-19 18:52:19.716018406 +0000
-@@ -64,7 +64,7 @@ char * PblTreeSetMagic = "PblTreeSetMagi
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
---- src/pbltest.c	2010-10-18 22:45:22.000000000 +0100
-+++ src/pbltest.c	2014-12-19 18:51:55.048018477 +0000
-@@ -57,7 +57,7 @@ char* pbltest_c_id = "$Id: pbltest.c,v 1
- #include <stdio.h>
- #include <memory.h>
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(AMIGA)
- #include <malloc.h>
- #endif
- 
diff --git a/sdk/recipes/patches/libpbl/no-memory.h.p b/sdk/recipes/patches/libpbl/no-memory.h.p
deleted file mode 100644
index 0bd374d..0000000
--- a/sdk/recipes/patches/libpbl/no-memory.h.p
+++ /dev/null
@@ -1,108 +0,0 @@
---- src/pbl.c.orig	2012-08-04 20:29:29.000000000 +0100
-+++ src/pbl.c	2012-08-04 20:29:37.000000000 +0100
-@@ -49,7 +49,6 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include <memory.h>
- 
- #ifndef __APPLE__
- #include <malloc.h>
---- src/pblCollection.c.orig	2012-08-04 20:27:49.000000000 +0100
-+++ src/pblCollection.c	2012-08-04 20:28:00.000000000 +0100
-@@ -43,7 +43,7 @@
- char* pblCollection_c_id = "$Id: pblCollection.c,v 1.13 2010/05/19 22:38:45 peter Exp $";
- 
- #include <stdio.h>
--#include <memory.h>
-+#include <string.h>
- 
- #ifndef __APPLE__
- #include <malloc.h>
---- src/pblhash.c.orig	2012-08-04 20:29:03.000000000 +0100
-+++ src/pblhash.c	2012-08-04 20:29:19.000000000 +0100
-@@ -64,7 +64,7 @@
- char* pblhash_c_id = "$Id: pblhash.c,v 1.18 2010/05/30 20:06:45 peter Exp $";
- 
- #include <stdio.h>
--#include <memory.h>
-+#include <string.h>
- 
- #ifndef __APPLE__
- #include <malloc.h>
---- src/pblHeap.c.orig	2012-08-04 20:25:40.000000000 +0100
-+++ src/pblHeap.c	2012-08-04 20:25:52.000000000 +0100
-@@ -36,7 +36,7 @@
- char* pblHeap_c_id = "$Id: pblHeap.c,v 1.5 2010/08/31 21:06:20 peter Exp $";
- 
- #include <stdio.h>
--#include <memory.h>
-+#include <string.h>
- 
- #ifndef __APPLE__
- #include <malloc.h>
---- src/pblIterator.c.orig	2012-08-04 20:28:11.000000000 +0100
-+++ src/pblIterator.c	2012-08-04 20:28:21.000000000 +0100
-@@ -48,7 +48,7 @@
- char * PblIteratorMagic = "PblIteratorMagic";
- 
- #include <stdio.h>
--#include <memory.h>
-+#include <string.h>
- 
- #ifndef __APPLE__
- #include <malloc.h>
---- src/pblkf.c.orig	2012-08-04 20:28:37.000000000 +0100
-+++ src/pblkf.c	2012-08-04 20:28:47.000000000 +0100
-@@ -72,7 +72,6 @@
- #include <sys/stat.h>
- 
- #include <fcntl.h>
--#include <memory.h>
- #include <string.h>
- 
- 
---- src/pblList.c.orig	2012-08-04 20:27:23.000000000 +0100
-+++ src/pblList.c	2012-08-04 20:27:35.000000000 +0100
-@@ -52,7 +52,7 @@
- char * PblLinkedListMagic = "PblLinkedListMagic";
- 
- #include <stdio.h>
--#include <memory.h>
-+#include <string.h>
- 
- #ifndef __APPLE__
- #include <malloc.h>
---- src/pblMap.c.orig	2012-08-04 20:26:15.000000000 +0100
-+++ src/pblMap.c	2012-08-04 20:26:29.000000000 +0100
-@@ -54,7 +54,7 @@
- char* pblMap_c_id = "$Id: pblMap.c,v 1.7 2010/05/30 20:06:45 peter Exp $";
- 
- #include <stdio.h>
--#include <memory.h>
-+#include <string.h>
- 
- #ifndef __APPLE__
- #include <malloc.h>
---- src/pblPriorityQueue.c.orig	2012-08-04 20:22:41.000000000 +0100
-+++ src/pblPriorityQueue.c	2012-08-04 20:22:56.000000000 +0100
-@@ -43,7 +43,7 @@
-         "$Id: pblPriorityQueue.c,v 1.12 2010/10/01 20:44:31 peter Exp $";
- 
- #include <stdio.h>
--#include <memory.h>
-+#include <string.h>
- 
- #ifndef __APPLE__
- #include <malloc.h>
---- src/pblSet.c.orig	2012-08-04 20:26:54.000000000 +0100
-+++ src/pblSet.c	2012-08-04 20:27:07.000000000 +0100
-@@ -62,7 +62,7 @@
- 
- 
- #include <stdio.h>
--#include <memory.h>
-+#include <string.h>
- 
- #ifndef __APPLE__
- #include <malloc.h>
diff --git a/sdk/recipes/patches/libpbl/ppc-amigaos/no-memory.h.p b/sdk/recipes/patches/libpbl/ppc-amigaos/no-memory.h.p
new file mode 100644
index 0000000..0bd374d
--- /dev/null
+++ b/sdk/recipes/patches/libpbl/ppc-amigaos/no-memory.h.p
@@ -0,0 +1,108 @@
+--- src/pbl.c.orig	2012-08-04 20:29:29.000000000 +0100
++++ src/pbl.c	2012-08-04 20:29:37.000000000 +0100
+@@ -49,7 +49,6 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <memory.h>
+ 
+ #ifndef __APPLE__
+ #include <malloc.h>
+--- src/pblCollection.c.orig	2012-08-04 20:27:49.000000000 +0100
++++ src/pblCollection.c	2012-08-04 20:28:00.000000000 +0100
+@@ -43,7 +43,7 @@
+ char* pblCollection_c_id = "$Id: pblCollection.c,v 1.13 2010/05/19 22:38:45 peter Exp $";
+ 
+ #include <stdio.h>
+-#include <memory.h>
++#include <string.h>
+ 
+ #ifndef __APPLE__
+ #include <malloc.h>
+--- src/pblhash.c.orig	2012-08-04 20:29:03.000000000 +0100
++++ src/pblhash.c	2012-08-04 20:29:19.000000000 +0100
+@@ -64,7 +64,7 @@
+ char* pblhash_c_id = "$Id: pblhash.c,v 1.18 2010/05/30 20:06:45 peter Exp $";
+ 
+ #include <stdio.h>
+-#include <memory.h>
++#include <string.h>
+ 
+ #ifndef __APPLE__
+ #include <malloc.h>
+--- src/pblHeap.c.orig	2012-08-04 20:25:40.000000000 +0100
++++ src/pblHeap.c	2012-08-04 20:25:52.000000000 +0100
+@@ -36,7 +36,7 @@
+ char* pblHeap_c_id = "$Id: pblHeap.c,v 1.5 2010/08/31 21:06:20 peter Exp $";
+ 
+ #include <stdio.h>
+-#include <memory.h>
++#include <string.h>
+ 
+ #ifndef __APPLE__
+ #include <malloc.h>
+--- src/pblIterator.c.orig	2012-08-04 20:28:11.000000000 +0100
++++ src/pblIterator.c	2012-08-04 20:28:21.000000000 +0100
+@@ -48,7 +48,7 @@
+ char * PblIteratorMagic = "PblIteratorMagic";
+ 
+ #include <stdio.h>
+-#include <memory.h>
++#include <string.h>
+ 
+ #ifndef __APPLE__
+ #include <malloc.h>
+--- src/pblkf.c.orig	2012-08-04 20:28:37.000000000 +0100
++++ src/pblkf.c	2012-08-04 20:28:47.000000000 +0100
+@@ -72,7 +72,6 @@
+ #include <sys/stat.h>
+ 
+ #include <fcntl.h>
+-#include <memory.h>
+ #include <string.h>
+ 
+ 
+--- src/pblList.c.orig	2012-08-04 20:27:23.000000000 +0100
++++ src/pblList.c	2012-08-04 20:27:35.000000000 +0100
+@@ -52,7 +52,7 @@
+ char * PblLinkedListMagic = "PblLinkedListMagic";
+ 
+ #include <stdio.h>
+-#include <memory.h>
++#include <string.h>
+ 
+ #ifndef __APPLE__
+ #include <malloc.h>
+--- src/pblMap.c.orig	2012-08-04 20:26:15.000000000 +0100
++++ src/pblMap.c	2012-08-04 20:26:29.000000000 +0100
+@@ -54,7 +54,7 @@
+ char* pblMap_c_id = "$Id: pblMap.c,v 1.7 2010/05/30 20:06:45 peter Exp $";
+ 
+ #include <stdio.h>
+-#include <memory.h>
++#include <string.h>
+ 
+ #ifndef __APPLE__
+ #include <malloc.h>
+--- src/pblPriorityQueue.c.orig	2012-08-04 20:22:41.000000000 +0100
++++ src/pblPriorityQueue.c	2012-08-04 20:22:56.000000000 +0100
+@@ -43,7 +43,7 @@
+         "$Id: pblPriorityQueue.c,v 1.12 2010/10/01 20:44:31 peter Exp $";
+ 
+ #include <stdio.h>
+-#include <memory.h>
++#include <string.h>
+ 
+ #ifndef __APPLE__
+ #include <malloc.h>
+--- src/pblSet.c.orig	2012-08-04 20:26:54.000000000 +0100
++++ src/pblSet.c	2012-08-04 20:27:07.000000000 +0100
+@@ -62,7 +62,7 @@
+ 
+ 
+ #include <stdio.h>
+-#include <memory.h>
++#include <string.h>
+ 
+ #ifndef __APPLE__
+ #include <malloc.h>
-- 
cgit v1.2.3