oksh: bump to 6.9

6 files changed, 7 insertions, 95 deletions

diff --git a/extra/oksh/build b/extra/oksh/build
index fe6d6ef1..cdabf582 100755
--- a/extra/oksh/build
+++ b/extra/oksh/build
@@ -1,5 +1,8 @@
 #!/bin/sh -e
 
-# We use a custom Makefile, instead of running ./configure
+./configure \
+    --prefix=/usr \
+    --enable-static
+
 make
 make DESTDIR="$1" install
diff --git a/extra/oksh/checksums b/extra/oksh/checksums
index b2e003ba..aaa45fa6 100644
--- a/extra/oksh/checksums
+++ b/extra/oksh/checksums
@@ -1,3 +1 @@
-ddd2b27b99009a4ee58ddf58da73edf83962018066ccf33b2fe1f570a00917b0  oksh-6.8.1.tar.gz
-f5baec63d5de85ea73b85523ea1a8be126c08a82977dce485a44b02a2d481887  pconfig.h
-19c97bd33b917b2552dcec55b68a4c27915a0c0af94ed083a7c4cad934eeda2c  Makefile
+c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35  oksh-6.9.tar.gz
diff --git a/extra/oksh/files/Makefile b/extra/oksh/files/Makefile
deleted file mode 100644
index 7337f98f..00000000
--- a/extra/oksh/files/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-.SUFFIXES:
-.SUFFIXES: .o .c
-
-PREFIX = /usr
-BINDIR = ${PREFIX}/bin
-MANPREFIX = ${PREFIX}/share/man
-
-CPPFLAGS = -D_GNU_SOURCE -DEMACS -DVI -I.
-CC = cc
-LDFLAGS = -static
-SRC = \
-	alloc.c \
-	asprintf.c \
-	c_ksh.c \
-	c_sh.c \
-	c_test.c \
-	c_ulimit.c \
-	confstr.c \
-	edit.c \
-	emacs.c \
-	eval.c \
-	exec.c \
-	expr.c \
-	history.c \
-	io.c \
-	jobs.c \
-	lex.c \
-	mail.c \
-	main.c \
-	misc.c \
-	path.c \
-	reallocarray.c \
-	shf.c \
-	siglist.c \
-	signame.c \
-	strlcat.c \
-	strlcpy.c \
-	strtonum.c \
-	syn.c \
-	table.c \
-	trap.c \
-	tree.c \
-	tty.c \
-	unvis.c \
-	var.c \
-	version.c \
-	vi.c \
-	vis.c \
-
-LIBS = -lc -lncursesw
-
-OBJ = ${SRC:.c=.o}
-BIN = ksh
-
-all: ${BIN}
-
-${BIN}: ${OBJ}
-	${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
-
-.c.o:
-	${CC} -c ${CFLAGS} ${CPPFLAGS} -o $@ $<
-
-clean:
-	rm -f ${OBJ} ksh
-
-install: all
-	mkdir -p ${DESTDIR}${BINDIR} ${DESTDIR}${MANPREFIX}/man1
-	cp ksh ${DESTDIR}${BINDIR}
-	chmod 755 ${DESTDIR}${BINDIR}/ksh
-	cp sh.1 ${DESTDIR}${MANPREFIX}/man1/ksh.1
-	chmod 644 ${DESTDIR}${MANPREFIX}/man1/ksh.1
-
-.PHONY: all clean install
diff --git a/extra/oksh/files/pconfig.h b/extra/oksh/files/pconfig.h
deleted file mode 100644
index 0a7a9485..00000000
--- a/extra/oksh/files/pconfig.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This file automatically generated by configure.  */
-
-#define __dead __attribute__((__noreturn__))
-#define HAVE_ASPRINTF
-#define HAVE_CONFSTR
-#define HAVE_CURSES
-#define HAVE_SETRESGID
-#define HAVE_SETRESUID
-#define HAVE_SIG_T
-#define HAVE_ST_MTIM
-#define HAVE_STRLCAT
-#define HAVE_STRLCPY
-#define HAVE_TIMERADD
-#define HAVE_TIMERSUB
diff --git a/extra/oksh/sources b/extra/oksh/sources
index 1d63880b..67e2b3a1 100644
--- a/extra/oksh/sources
+++ b/extra/oksh/sources
@@ -1,3 +1 @@
-https://github.com/ibara/oksh/releases/download/oksh-6.8.1/oksh-6.8.1.tar.gz
-files/pconfig.h
-files/Makefile
+https://github.com/ibara/oksh/releases/download/oksh-6.9/oksh-6.9.tar.gz
diff --git a/extra/oksh/version b/extra/oksh/version
index b0a3ed87..3957d4e4 100644
--- a/extra/oksh/version
+++ b/extra/oksh/version
@@ -1 +1 @@
-6.8.1 1
+6.9 1