diff options
| author | Brian Callahan <ibara@users.noreply.github.com> | 2020-02-01 14:54:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 20:54:04 +0100 |
| commit | c90409533380b59e7e0f1e26b51823ce296ab579 (patch) | |
| tree | 3278910a558f4db8984db9d721d4613aaa22e4f5 | |
| parent | d0c230855d4b9e656b51771c33d665e7c129f223 (diff) | |
| download | serenity-c90409533380b59e7e0f1e26b51823ce296ab579.zip | |
Ports: Add ed port (#1159)
| -rwxr-xr-x | Ports/ed/package.sh | 10 | ||||
| -rw-r--r-- | Ports/ed/patches/fix-Makefile-in.patch | 11 | ||||
| -rw-r--r-- | Ports/ed/patches/fix-ed.patch | 12 | ||||
| -rw-r--r-- | Ports/ed/patches/fix-regex.patch | 11 |
4 files changed, 44 insertions, 0 deletions
diff --git a/Ports/ed/package.sh b/Ports/ed/package.sh new file mode 100755 index 0000000000..8832756232 --- /dev/null +++ b/Ports/ed/package.sh @@ -0,0 +1,10 @@ +#!/bin/bash ../.port_include.sh +port=ed +version=1.15 +files="https://ftp.gnu.org/gnu/ed/ed-1.15.tar.lz ed-1.15.tar.lz" +useconfigure=true +depends=pcre2 + +configure() { + run ./"$configscript" CC=i686-pc-serenity-gcc +} diff --git a/Ports/ed/patches/fix-Makefile-in.patch b/Ports/ed/patches/fix-Makefile-in.patch new file mode 100644 index 0000000000..60ec8235bf --- /dev/null +++ b/Ports/ed/patches/fix-Makefile-in.patch @@ -0,0 +1,11 @@ +--- ed-1.15/Makefile.in.orig Sat Feb 1 14:22:52 2020 ++++ ed-1.15/Makefile.in Sat Feb 1 14:23:06 2020 +@@ -20,7 +20,7 @@ + all : $(progname) r$(progname) + + $(progname) : $(objs) +- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) -lpcre2-posix -lpcre2-8 + + r$(progname) : r$(progname).in + cat $(VPATH)/r$(progname).in > $@ diff --git a/Ports/ed/patches/fix-ed.patch b/Ports/ed/patches/fix-ed.patch new file mode 100644 index 0000000000..f19c5a2b2d --- /dev/null +++ b/Ports/ed/patches/fix-ed.patch @@ -0,0 +1,12 @@ +--- ed-1.15/ed.h.orig Sat Feb 1 14:19:01 2020 ++++ ed-1.15/ed.h Sat Feb 1 14:19:17 2020 +@@ -18,8 +18,7 @@ + */ + + #ifndef __cplusplus +-enum Bool { false = 0, true = 1 }; +-typedef enum Bool bool; ++#include <stdbool.h> + #endif + + enum Pflags /* print suffixes */ diff --git a/Ports/ed/patches/fix-regex.patch b/Ports/ed/patches/fix-regex.patch new file mode 100644 index 0000000000..c88deaf90a --- /dev/null +++ b/Ports/ed/patches/fix-regex.patch @@ -0,0 +1,11 @@ +--- ed-1.15/regex.c.orig Sat Feb 1 14:17:22 2020 ++++ ed-1.15/regex.c Sat Feb 1 14:17:34 2020 +@@ -19,7 +19,7 @@ + + #include <stddef.h> + #include <errno.h> +-#include <regex.h> ++#include <pcre2posix.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> |