RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 07:47:37 +00:00
Code Issues Activity Actions

Ports/ed: Update ed to version 1.18

Browse source
This commit is contained in:
EWouters 2022-04-01 02:54:00 +02:00 • committed by Brian Gianforcaro
parent 8828b038f5
commit e6172445e2
4 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -40,7 +40,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`dreamweb`](dreamweb/) | DreamWeb | 1.1 | https://www.scummvm.org/games/#games-dreamweb | | [`dreamweb`](dreamweb/) | DreamWeb | 1.1 | https://www.scummvm.org/games/#games-dreamweb |
| [`dropbear`](dropbear/) | Dropbear SSH | 2019.78 | https://dropbear.nl/mirror/dropbear.html | | [`dropbear`](dropbear/) | Dropbear SSH | 2019.78 | https://dropbear.nl/mirror/dropbear.html |
| [`dungeonrush`](dungeonrush/) | DungeonRush | 1.1-beta | https://github.com/Rapiz1/DungeonRush | | [`dungeonrush`](dungeonrush/) | DungeonRush | 1.1-beta | https://github.com/Rapiz1/DungeonRush |
| [`ed`](ed/) | GNU ed | 1.15 | https://www.gnu.org/software/ed/ | | [`ed`](ed/) | GNU ed | 1.18 | https://www.gnu.org/software/ed/ |
| [`emu2`](emu2/) | emu2 DOS emulator | 2021.01 | https://github.com/dmsc/emu2 | | [`emu2`](emu2/) | emu2 DOS emulator | 2021.01 | https://github.com/dmsc/emu2 |
| [`epsilon`](epsilon/) | graphical calculator simulator | 15.5.0 | https://github.com/numworks/epsilon | | [`epsilon`](epsilon/) | graphical calculator simulator | 15.5.0 | https://github.com/numworks/epsilon |
| [`fheroes2`](fheroes2/) | Free Heroes of Might and Magic II | 0.9.13 | https://github.com/ihhub/fheroes2 | | [`fheroes2`](fheroes2/) | Free Heroes of Might and Magic II | 0.9.13 | https://github.com/ihhub/fheroes2 |

2
Ports/ed/package.sh
View file

@ -1,6 +1,6 @@
#!/usr/bin/env -S bash ../.port_include.sh #!/usr/bin/env -S bash ../.port_include.sh
port=ed port=ed
version=1.15 version=1.18
files="https://ftpmirror.gnu.org/gnu/ed/ed-${version}.tar.lz ed-${version}.tar.lz 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/ed/ed-${version}.tar.lz.sig ed-${version}.tar.lz.sig
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"

8
Ports/ed/patches/fix-Makefile-in.patch
View file

@ -1,11 +1,11 @@
--- ed-1.15/Makefile.in.orig Sat Feb 1 14:22:52 2020 --- ed-1.18/Makefile.in.og 2022-03-31 22:53:17.000000000 +0200
+++ ed-1.15/Makefile.in Sat Feb 1 14:23:06 2020 +++ ed-1.18/Makefile.in 2022-03-31 22:54:31.000000000 +0200
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
all : $(progname) r$(progname) all : $(progname) r$(progname)
$(progname) : $(objs) $(progname) : $(objs)
- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs) -lpcre2-posix -lpcre2-8 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) -lpcre2-posix -lpcre2-8
r$(progname) : r$(progname).in r$(progname) : r$(progname).in
cat $(VPATH)/r$(progname).in > $@ cat $(VPATH)/r$(progname).in > $@

20
Ports/ed/patches/fix-configure.patch
View file

@ -1,8 +1,6 @@
--- ed-1.15/configure.old 2021-08-10 00:18:06.612959086 +0800 --- ed-1.18/configure.og 2022-03-31 22:58:11.000000000 +0200
+++ ed-1.15/configure 2021-08-10 00:18:31.035115395 +0800 +++ ed-1.18/configure 2022-03-31 23:01:31.000000000 +0200
@@ -19,14 +19,14 @@ @@ -21,10 +21,10 @@
bindir='$(exec_prefix)/bin'
datarootdir='$(prefix)/share'
infodir='$(datarootdir)/info' infodir='$(datarootdir)/info'
mandir='$(datarootdir)/man' mandir='$(datarootdir)/man'
program_prefix= program_prefix=
@ -10,12 +8,10 @@
-CPPFLAGS= -CPPFLAGS=
-CFLAGS='-Wall -W -O2' -CFLAGS='-Wall -W -O2'
-LDFLAGS= -LDFLAGS=
+CC=${CC-gcc} +CC?=gcc
+CPPFLAGS=${CPPFLAGS-} +CPPFLAGS?=
+CFLAGS=${CFLAGS-"-Wall -W -O2"} +CFLAGS?='-Wall -W -O2'
+LDFLAGS=${LDFLAGS-} +LDFLAGS?=
# checking whether we are using GNU C. # checking whether we are using GNU C.
/bin/sh -c "${CC} --version" > /dev/null 2>&1 || /bin/sh -c "${CC} --version" > /dev/null 2>&1 || { CC=cc ; CFLAGS=-O2 ; }
{
CC=cc