diff --git a/dev-embedded/2cdt/2cdt-2014.01.03.recipe b/dev-embedded/2cdt/2cdt-2016.06.17.recipe similarity index 91% rename from dev-embedded/2cdt/2cdt-2014.01.03.recipe rename to dev-embedded/2cdt/2cdt-2016.06.17.recipe index c8ffa8251..3305bc25c 100644 --- a/dev-embedded/2cdt/2cdt-2014.01.03.recipe +++ b/dev-embedded/2cdt/2cdt-2016.06.17.recipe @@ -26,9 +26,10 @@ COPYRIGHT="2000-2014 Kevin Thacker" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://cpctech.cpc-live.com/download/2cdt.zip" -CHECKSUM_SHA256="e6a4e69de46b256df51c9c265c6b9a50f8016264bfb3d35f5958152b91500e56" +SOURCE_FILENAME="2cdt-$portVersion.zip" +CHECKSUM_SHA256="8511b28e4d0a02950a3392942a792f86bf029ca92aa116d23c8f3b969d84c9c8" SOURCE_DIR="2cdt" -PATCHES="2cdt-$portVersion.patchet" +PATCHES="2cdt-$portVersion.patchset" ARCHITECTURES="x86_gcc2" diff --git a/dev-embedded/2cdt/patches/2cdt-2014.01.03.patchset b/dev-embedded/2cdt/patches/2cdt-2014.01.03.patchset deleted file mode 100644 index 01161ecfd..000000000 --- a/dev-embedded/2cdt/patches/2cdt-2014.01.03.patchset +++ /dev/null @@ -1,27 +0,0 @@ -From aa1d8d68e3b5539717e3f804cf877407051ad2e8 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 9 Aug 2015 10:31:43 +0200 -Subject: Remove useless include. - - -diff --git a/src/2cdt.c b/src/2cdt.c -index c3fb520..35e5a1c 100644 ---- a/src/2cdt.c -+++ b/src/2cdt.c -@@ -23,11 +23,13 @@ on the PC */ - #include - #include - #include -+#ifndef __HAIKU__ - #ifdef UNIX - #include - #else - #include - #endif -+#endif - #include "defs.h" - #include "tzxfile.h" - #include "getopt.h" --- -2.2.2 - diff --git a/dev-embedded/2cdt/patches/2cdt-2016.06.17.patchset b/dev-embedded/2cdt/patches/2cdt-2016.06.17.patchset new file mode 100644 index 000000000..73cbc6e36 --- /dev/null +++ b/dev-embedded/2cdt/patches/2cdt-2016.06.17.patchset @@ -0,0 +1,50 @@ +From 00e1c8d348aa0fad7918a3b3905809cffbfc661e Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 + #include + #include ++#ifndef __HAIKU__ + #ifdef UNIX + #include + #else + #include + #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 +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 +