From 901c47baaf1f4e0cd891d1b3484db7453c56ff63 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 10 May 2017 21:26:24 +0200
Subject: [PATCH] 2cdt: update to current version.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove older one as the sourcefile doesn't change names in upstream, it
just gets replaced… fortunately, not too often.
---
 ...16.06.17.recipe => 2cdt-2016.10.16.recipe} |  4 +-
 .../2cdt/patches/2cdt-2016.06.17.patchset     | 50 -------------------
 .../2cdt/patches/2cdt-2016.10.16.patchset     | 27 ++++++++++
 3 files changed, 29 insertions(+), 52 deletions(-)
 rename dev-embedded/2cdt/{2cdt-2016.06.17.recipe => 2cdt-2016.10.16.recipe} (93%)
 delete mode 100644 dev-embedded/2cdt/patches/2cdt-2016.06.17.patchset
 create mode 100644 dev-embedded/2cdt/patches/2cdt-2016.10.16.patchset

diff --git a/dev-embedded/2cdt/2cdt-2016.06.17.recipe b/dev-embedded/2cdt/2cdt-2016.10.16.recipe
similarity index 93%
rename from dev-embedded/2cdt/2cdt-2016.06.17.recipe
rename to dev-embedded/2cdt/2cdt-2016.10.16.recipe
index 3305bc25c..236b7d540 100644
--- a/dev-embedded/2cdt/2cdt-2016.06.17.recipe
+++ b/dev-embedded/2cdt/2cdt-2016.10.16.recipe
@@ -27,9 +27,9 @@ LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://cpctech.cpc-live.com/download/2cdt.zip"
 SOURCE_FILENAME="2cdt-$portVersion.zip"
-CHECKSUM_SHA256="8511b28e4d0a02950a3392942a792f86bf029ca92aa116d23c8f3b969d84c9c8"
+CHECKSUM_SHA256="490bba3a1ecac40392093943e52471d6a35df0bbccfb223481060da28bc3a1af"
 SOURCE_DIR="2cdt"
-PATCHES="2cdt-$portVersion.patchset"
+#PATCHES="2cdt-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2"
 
diff --git a/dev-embedded/2cdt/patches/2cdt-2016.06.17.patchset b/dev-embedded/2cdt/patches/2cdt-2016.06.17.patchset
deleted file mode 100644
index 73cbc6e36..000000000
--- a/dev-embedded/2cdt/patches/2cdt-2016.06.17.patchset
+++ /dev/null
@@ -1,50 +0,0 @@
-From 00e1c8d348aa0fad7918a3b3905809cffbfc661e Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Fri, 22 Jul 2016 07:12:04 +0200
-Subject: Remove useless include.
-
-
-diff --git a/src/2cdt.c b/src/2cdt.c
-index fb1f61b..946977a 100644
---- a/src/2cdt.c
-+++ b/src/2cdt.c
-@@ -23,11 +23,13 @@ on the PC */
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __HAIKU__
- #ifdef UNIX
- #include <sys/io.h>
- #else
- #include <io.h>
- #endif
-+#endif
- #include "defs.h"
- #include "tzxfile.h"
- #include "opth.h"
--- 
-2.7.0
-
-
-From 4e61020433213eb286630b776809f557c54108ec Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Fri, 22 Jul 2016 22:07:13 +0200
-Subject: Makefile: add missing source.
-
-
-diff --git a/Makefile b/Makefile
-index 379c9c6..983170f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@ CFLAGS = -O2 -O3 -DUNIX
- LFLAGS1 =
- LFLAGS2 = -s 
- 
--CDT_O=	src/2cdt.o src/tzxfile.o
-+CDT_O=	src/2cdt.o src/tzxfile.o src/opth.c
- 
- 2cdt:	$(CDT_O) 
- 	$(BIND)  $(CDT_O) -o 2cdt $(LFLAGS1) $(LFLAGS2) $(LIBS)
--- 
-2.7.0
-
diff --git a/dev-embedded/2cdt/patches/2cdt-2016.10.16.patchset b/dev-embedded/2cdt/patches/2cdt-2016.10.16.patchset
new file mode 100644
index 000000000..544fa1860
--- /dev/null
+++ b/dev-embedded/2cdt/patches/2cdt-2016.10.16.patchset
@@ -0,0 +1,27 @@
+From 1240bcb688b89dba024ccacbdd26896415b78296 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Wed, 10 May 2017 21:24:37 +0200
+Subject: Haiku build fix.
+
+
+diff --git a/src/2cdt.c b/src/2cdt.c
+index dd35af1..c7320a6 100644
+--- a/src/2cdt.c
++++ b/src/2cdt.c
+@@ -24,11 +24,13 @@ on the PC */
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __HAIKU__
+ #ifdef UNIX
+ #include <sys/io.h>
+ #else
+ #include <io.h>
+ #endif
++#endif
+ #include "defs.h"
+ #include "tzxfile.h"
+ #include "opth.h"
+-- 
+2.12.2
+