10 files changed, 7 insertions, 26 deletions
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 7d0e0ea..d103c20 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -29,8 +29,8 @@ UPSTREAM_CLIB2_VERSION := 1_214
 UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz
 UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_TARBALL)
 
-UPSTREAM_NDK_TARBALL := NDK3.2R3.lha
-UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php/downloads?view=download&format=raw&file=123"
+UPSTREAM_NDK_TARBALL := NDK3.2R4.lha
+UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php/downloads?view=download&format=raw&file=126"
 
 UPSTREAM_OPENURL_VERSION := 7.16
 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION)
@@ -125,8 +125,11 @@ $(BUILDSTEPS)/clib2-src.d: $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL)
 ###
 
 $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL)
-	mkdir -p $(BUILDDIR)/ndk
-	lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
+	mkdir -p $(BUILDDIR)/ndk/NDK3.2
+	lha xw=$(BUILDDIR)/ndk/NDK3.2 $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
+	for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d $(BUILDDIR)/ndk -p0 <$$p || exit $0 ; done
+	for dir in `find $(RECIPES)/files/ndk/ -type d | grep -v '\.svn' | sed 's#$(RECIPES)/files/ndk##'` ; do mkdir -p $(BUILDDIR)/ndk/NDK3.2$$dir ; done
+	for file in `find $(RECIPES)/files/ndk/ -type f | grep -v '\.svn' | sed 's#$(RECIPES)/files/ndk##'` ; do cp -p $(RECIPES)/files/ndk$$file $(BUILDDIR)/ndk/NDK3.2$$file ; done
 	mkdir -p $(PREFIX)/$(TARGET_NAME)/sys-include
 	cp -r $(BUILDDIR)/ndk/NDK3.2/Include_H/* $(PREFIX)/$(TARGET_NAME)/sys-include
 	mkdir -p $(BUILDDIR)/openurl
diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/Picasso96.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/Picasso96.h
index 74443cb..74443cb 100644
--- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/Picasso96.h
+++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/Picasso96.h
diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/guigfx.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/guigfx.h
index a12650a..a12650a 100644
--- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/guigfx.h
+++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/guigfx.h
diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/macros.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/macros.h
index 2a07ae6..2a07ae6 100644
--- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/macros.h
+++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/macros.h
diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubbas.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubbas.h
index 8b711db..8b711db 100644
--- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubbas.h
+++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubbas.h
diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubtrans.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubtrans.h
index 0ccfa69..0ccfa69 100644
--- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubtrans.h
+++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubtrans.h
diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/libraries/Picasso96.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/libraries/Picasso96.h
index a9fcd49..a9fcd49 100644
--- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/libraries/Picasso96.h
+++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/libraries/Picasso96.h
diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/proto/Picasso96API.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/proto/Picasso96API.h
index 8ba2f0c..8ba2f0c 100644
--- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/proto/Picasso96API.h
+++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/proto/Picasso96API.h
diff --git a/m68k-unknown-amigaos/recipes/patches/clib2/amiga_invertstring.c.p b/m68k-unknown-amigaos/recipes/patches/clib2/amiga_invertstring.c.p
deleted file mode 100644
index 9f74bd9..0000000
--- a/m68k-unknown-amigaos/recipes/patches/clib2/amiga_invertstring.c.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./builddir/clib2/amiga_invertstring.c	2017-05-01 17:06:23.000000000 +0100
-+++ ./amiga_invertstring.c	2021-06-08 14:18:03.132632551 +0100
-@@ -138,7 +138,7 @@ extern VOID FreeIEvents(struct InputEven
- /****************************************************************************/
- 
- struct InputEvent *
--InvertString(CONST_STRPTR str, CONST struct KeyMap *km)
-+InvertString(STRPTR str, CONST struct KeyMap *km)
- {
- 	/* bugs:
- 	   can't escape '>'
diff --git a/m68k-unknown-amigaos/recipes/patches/ndk/ndk.inline.intuition.h.p b/m68k-unknown-amigaos/recipes/patches/ndk/ndk.inline.intuition.h.p
deleted file mode 100644
index c322504..0000000
--- a/m68k-unknown-amigaos/recipes/patches/ndk/ndk.inline.intuition.h.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- sys-include/inline/intuition.h	2006-05-10 18:29:23.000000000 +0100
-+++ sys-include/inline/intuition.h	2016-02-29 00:06:48.824015807 +0000
-@@ -448,7 +448,7 @@
- 	LP3(0x27c, APTR, NewObjectA, struct IClass *, classPtr, a0, CONST_STRPTR, classID, a1, const struct TagItem *, tagList, a2, \
- 	, INTUITION_BASE_NAME)
- 
--#ifndef NO_INLINE_STDARG
-+#if 0
- __inline APTR NewObject(struct IClass * classPtr, CONST_STRPTR classID, ULONG tagList, ...)
- {
-   return NewObjectA(classPtr, classID, (const struct TagItem *) &tagList);