Ports: Update awk's patches to use git patches

4 files changed, 46 insertions, 16 deletions

diff --git a/Ports/awk/patches/build.patch b/Ports/awk/patches/0001-Make-it-possible-to-override-HOSTCC-and-CC-from-the-.patch
index 8d9ee4a74a..c2dc8c75ac 100644
--- a/Ports/awk/patches/build.patch
+++ b/Ports/awk/patches/0001-Make-it-possible-to-override-HOSTCC-and-CC-from-the-.patch
@@ -1,3 +1,13 @@
+From 54cc5812382bc7d3b5e2d1ef0c3a18a60fa896b7 Mon Sep 17 00:00:00 2001
+From: Mattias Nilsson <mattias.nilsson@nshift.com>
+Date: Mon, 4 Apr 2022 22:05:38 +0200
+Subject: [PATCH 1/2] Make it possible to override HOSTCC and CC from the
+ environment
+
+---
+ makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/makefile b/makefile
 index 9ceaaad..6b9dff5 100644
 --- a/makefile
@@ -13,3 +23,6 @@ index 9ceaaad..6b9dff5 100644
  
  # By fiat, to make our lives easier, yacc is now defined to be bison.
  # If you want something else, you're on your own.
+-- 
+2.36.1
+
diff --git a/Ports/awk/patches/0002-Make-the-version-descriptor-match-the-built-tag.patch b/Ports/awk/patches/0002-Make-the-version-descriptor-match-the-built-tag.patch
new file mode 100644
index 0000000000..0144fb6d39
--- /dev/null
+++ b/Ports/awk/patches/0002-Make-the-version-descriptor-match-the-built-tag.patch
@@ -0,0 +1,25 @@
+From 8228e4130e9c373b24f87458bc7248272146bbac Mon Sep 17 00:00:00 2001
+From: Mattias Nilsson <mattias.nilsson@nshift.com>
+Date: Mon, 4 Apr 2022 22:05:38 +0200
+Subject: [PATCH 2/2] Make the version descriptor match the built tag
+
+---
+ main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main.c b/main.c
+index 986f1a3..e22f097 100644
+--- a/main.c
++++ b/main.c
+@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+ THIS SOFTWARE.
+ ****************************************************************/
+ 
+-const char	*version = "version 20211208";
++const char	*version = "version 20220122";
+ 
+ #define DEBUG
+ #include <stdio.h>
+-- 
+2.36.1
+
diff --git a/Ports/awk/patches/ReadMe.md b/Ports/awk/patches/ReadMe.md
index d86d2af038..a7b28837bf 100644
--- a/Ports/awk/patches/ReadMe.md
+++ b/Ports/awk/patches/ReadMe.md
@@ -1,9 +1,12 @@
-# Patches for the one true AWK
+# Patches for awk on SerenityOS
 
-## `build.patch`
+## `0001-Make-it-possible-to-override-HOSTCC-and-CC-from-the-.patch`
 
-Patched the assigning of CC to allow override from environment
+Make it possible to override HOSTCC and CC from the environment
+
+
+## `0002-Make-the-version-descriptor-match-the-built-tag.patch`
+
+Make the version descriptor match the built tag
 
-## `version.patch`
 
-Patch the version descriptor in `main.c` to reflect the tag built
diff --git a/Ports/awk/patches/version.patch b/Ports/awk/patches/version.patch
deleted file mode 100644
index 482e027d8b..0000000000
--- a/Ports/awk/patches/version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -22,7 +22,7 @@
- THIS SOFTWARE.
- ****************************************************************/
- 
--const char	*version = "version 20211208";
-+const char	*version = "version 20220122";
- 
- #define DEBUG
- #include <stdio.h>