diff options
| author | EWouters <6179932+EWouters@users.noreply.github.com> | 2022-04-01 02:54:00 +0200 |
|---|---|---|
| committer | Brian Gianforcaro <b.gianfo@gmail.com> | 2022-04-11 19:43:56 -0700 |
| commit | e6172445e21dc5f50b8adc5ff2b10ef8243dbef9 (patch) | |
| tree | cb54759939214c110d6d5b8a2efcd3a05d18823b /Ports/ed | |
| parent | 8828b038f58a0f23a2b12b69b7c4c33fdb17c579 (diff) | |
| download | serenity-e6172445e21dc5f50b8adc5ff2b10ef8243dbef9.zip | |
Ports/ed: Update ed to version 1.18
Diffstat (limited to 'Ports/ed')
| -rwxr-xr-x | Ports/ed/package.sh | 2 | ||||
| -rw-r--r-- | Ports/ed/patches/fix-Makefile-in.patch | 8 | ||||
| -rw-r--r-- | Ports/ed/patches/fix-configure.patch | 20 |
3 files changed, 13 insertions, 17 deletions
diff --git a/Ports/ed/package.sh b/Ports/ed/package.sh index 5eabd352a9..a398bd99ed 100755 --- a/Ports/ed/package.sh +++ b/Ports/ed/package.sh @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash ../.port_include.sh port=ed -version=1.15 +version=1.18 files="https://ftpmirror.gnu.org/gnu/ed/ed-${version}.tar.lz ed-${version}.tar.lz https://ftpmirror.gnu.org/gnu/ed/ed-${version}.tar.lz.sig ed-${version}.tar.lz.sig https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" diff --git a/Ports/ed/patches/fix-Makefile-in.patch b/Ports/ed/patches/fix-Makefile-in.patch index 60ec8235bf..4405b62389 100644 --- a/Ports/ed/patches/fix-Makefile-in.patch +++ b/Ports/ed/patches/fix-Makefile-in.patch @@ -1,11 +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 +--- ed-1.18/Makefile.in.og 2022-03-31 22:53:17.000000000 +0200 ++++ ed-1.18/Makefile.in 2022-03-31 22:54:31.000000000 +0200 @@ -20,7 +20,7 @@ all : $(progname) r$(progname) $(progname) : $(objs) -- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) -lpcre2-posix -lpcre2-8 +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) -lpcre2-posix -lpcre2-8 r$(progname) : r$(progname).in cat $(VPATH)/r$(progname).in > $@ diff --git a/Ports/ed/patches/fix-configure.patch b/Ports/ed/patches/fix-configure.patch index ab9ac10a99..f3c556db15 100644 --- a/Ports/ed/patches/fix-configure.patch +++ b/Ports/ed/patches/fix-configure.patch @@ -1,8 +1,6 @@ ---- ed-1.15/configure.old 2021-08-10 00:18:06.612959086 +0800 -+++ ed-1.15/configure 2021-08-10 00:18:31.035115395 +0800 -@@ -19,14 +19,14 @@ - bindir='$(exec_prefix)/bin' - datarootdir='$(prefix)/share' +--- ed-1.18/configure.og 2022-03-31 22:58:11.000000000 +0200 ++++ ed-1.18/configure 2022-03-31 23:01:31.000000000 +0200 +@@ -21,10 +21,10 @@ infodir='$(datarootdir)/info' mandir='$(datarootdir)/man' program_prefix= @@ -10,12 +8,10 @@ -CPPFLAGS= -CFLAGS='-Wall -W -O2' -LDFLAGS= -+CC=${CC-gcc} -+CPPFLAGS=${CPPFLAGS-} -+CFLAGS=${CFLAGS-"-Wall -W -O2"} -+LDFLAGS=${LDFLAGS-} ++CC?=gcc ++CPPFLAGS?= ++CFLAGS?='-Wall -W -O2' ++LDFLAGS?= # checking whether we are using GNU C. - /bin/sh -c "${CC} --version" > /dev/null 2>&1 || - { - CC=cc + /bin/sh -c "${CC} --version" > /dev/null 2>&1 || { CC=cc ; CFLAGS=-O2 ; } |