Merge branch 'tinyfugue/5.1.1' into 'master'

user/tinyfugue: move from tf, upgrade to 5.1.1

See merge request adelie/packages!620

9 files changed, 189 insertions, 245 deletions

diff --git a/user/tf/0001-Add-DESTDIR-support.patch b/user/tf/0001-Add-DESTDIR-support.patch
deleted file mode 100644
index e45794bd4..000000000
--- a/user/tf/0001-Add-DESTDIR-support.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- tf-50b8/unix/unix.mak
-+++ tf-50b8.new/unix/unix.mak
-@@ -87,57 +87,65 @@
- 	-test -z "$(STRIP)" || $(STRIP) tf$(X) || true
- 
- PREFIXDIRS:
--	test -d "$(bindir)" || mkdir $(bindir)
--	test -d "$(datadir)" || mkdir $(datadir)
- 
- install_TF $(TF): tf$(X) $(BUILDERS)
--	-@rm -f $(TF)
--	cp tf$(X) $(TF)
--	chmod $(MODE) $(TF)
-+	install -Dm755 tf$(X) $(DESTDIR)$(bindir)/tf
- 
- SYMLINK $(SYMLINK): $(TF)
--	test -z "$(SYMLINK)" || { rm -f $(SYMLINK) && ln -s $(TF) $(SYMLINK); }
- 
- LIBRARY $(TF_LIBDIR): ../tf-lib/tf-help ../tf-lib/tf-help.idx
--	@echo '## Creating library directory...'
--#	@# Overly simplified shell commands, to avoid problems on ultrix
--	-@test -n "$(TF_LIBDIR)" || echo "TF_LIBDIR is undefined."
--	test -n "$(TF_LIBDIR)"
--	test -d "$(TF_LIBDIR)" || mkdir $(TF_LIBDIR)
--	-@test -d "$(TF_LIBDIR)" || echo "Can't make $(TF_LIBDIR) directory.  See if"
--	-@test -d "$(TF_LIBDIR)" || echo "there is already a file with that name."
--	test -d "$(TF_LIBDIR)"
--#
--#	@#rm -f $(TF_LIBDIR)/*;  # wrong: this would remove local.tf, etc.
--	@echo '## Copying library files...'
--	cd ../tf-lib; \
--	for f in *; do test -f $$f && files="$$files $$f"; done; \
--	( cd $(TF_LIBDIR); rm -f $$files tf.help tf.help.index; ); \
--	cp $$files $(TF_LIBDIR); \
--	cd $(TF_LIBDIR); \
--	chmod $(MODE) $$files; chmod ugo-wx $$files
--	-rm -f $(TF_LIBDIR)/CHANGES 
--	cp ../CHANGES $(TF_LIBDIR)
--	chmod $(MODE) $(TF_LIBDIR)/CHANGES; chmod ugo-wx $(TF_LIBDIR)/CHANGES
--	chmod $(MODE) $(TF_LIBDIR)
--	-@cd $(TF_LIBDIR); old=`ls replace.tf 2>/dev/null`; \
--	if [ -n "$$old" ]; then \
--	    echo "## WARNING: Obsolete files found in $(TF_LIBDIR): $$old"; \
--	fi
--	@echo '## Creating links so old library names still work...'
--#	@# note: ln -sf isn't portable.
--	@cd $(TF_LIBDIR); \
--	rm -f bind-bash.tf;    ln -s  kb-bash.tf   bind-bash.tf;    \
--	rm -f bind-emacs.tf;   ln -s  kb-emacs.tf  bind-emacs.tf;   \
--	rm -f completion.tf;   ln -s  complete.tf  completion.tf;   \
--	rm -f factorial.tf;    ln -s  factoral.tf  factorial.tf;    \
--	rm -f file-xfer.tf;    ln -s  filexfer.tf  file-xfer.tf;    \
--	rm -f local.tf.sample; ln -s  local-eg.tf  local.tf.sample; \
--	rm -f pref-shell.tf;   ln -s  psh.tf       pref-shell.tf;   \
--	rm -f space_page.tf;   ln -s  spc-page.tf  space_page.tf;   \
--	rm -f speedwalk.tf;    ln -s  spedwalk.tf  speedwalk.tf;    \
--	rm -f stack_queue.tf;  ln -s  stack-q.tf   stack_queue.tf;  \
--	rm -f worldqueue.tf;   ln -s  world-q.tf   worldqueue.tf;
-+	install -Dm644 ../tf-lib/lisp.tf $(DESTDIR)$(datadir)/tf-lib/lisp.tf
-+	install -Dm644 ../tf-lib/hanoi.tf $(DESTDIR)$(datadir)/tf-lib/hanoi.tf
-+	install -Dm644 ../tf-lib/spell.tf $(DESTDIR)$(datadir)/tf-lib/spell.tf
-+	install -Dm644 ../tf-lib/spedwalk.tf $(DESTDIR)$(datadir)/tf-lib/spedwalk.tf
-+	install -Dm644 ../tf-lib/kb-emacs.tf $(DESTDIR)$(datadir)/tf-lib/kb-emacs.tf
-+	install -Dm644 ../tf-lib/tf-help.idx $(DESTDIR)$(datadir)/tf-lib/tf-help.idx
-+	install -Dm644 ../tf-lib/tools.tf $(DESTDIR)$(datadir)/tf-lib/tools.tf
-+	install -Dm644 ../tf-lib/watch.tf $(DESTDIR)$(datadir)/tf-lib/watch.tf
-+	install -Dm644 ../tf-lib/kb_badterm.tf $(DESTDIR)$(datadir)/tf-lib/kb_badterm.tf
-+	install -Dm644 ../tf-lib/world-q.tf $(DESTDIR)$(datadir)/tf-lib/world-q.tf
-+	install -Dm644 ../tf-lib/changes.tf $(DESTDIR)$(datadir)/tf-lib/changes.tf
-+	install -Dm644 ../tf-lib/stack-q.tf $(DESTDIR)$(datadir)/tf-lib/stack-q.tf
-+	install -Dm644 ../tf-lib/factoral.tf $(DESTDIR)$(datadir)/tf-lib/factoral.tf
-+	install -Dm644 ../tf-lib/cylon.tf $(DESTDIR)$(datadir)/tf-lib/cylon.tf
-+	install -Dm644 ../tf-lib/quoter.tf $(DESTDIR)$(datadir)/tf-lib/quoter.tf
-+	install -Dm644 ../tf-lib/psh.tf $(DESTDIR)$(datadir)/tf-lib/psh.tf
-+	install -Dm644 ../tf-lib/textutil.tf $(DESTDIR)$(datadir)/tf-lib/textutil.tf
-+	install -Dm644 ../tf-lib/finger.tf $(DESTDIR)$(datadir)/tf-lib/finger.tf
-+	install -Dm644 ../tf-lib/savehist.tf $(DESTDIR)$(datadir)/tf-lib/savehist.tf
-+	install -Dm644 ../tf-lib/textencode.tf $(DESTDIR)$(datadir)/tf-lib/textencode.tf
-+	install -Dm644 ../tf-lib/spc-page.tf $(DESTDIR)$(datadir)/tf-lib/spc-page.tf
-+	install -Dm644 ../tf-lib/teraterm.keyboard.cnf $(DESTDIR)$(datadir)/tf-lib/teraterm.keyboard.cnf
-+	install -Dm644 ../tf-lib/testcolor.tf $(DESTDIR)$(datadir)/tf-lib/testcolor.tf
-+	install -Dm644 ../tf-lib/tintin.tf $(DESTDIR)$(datadir)/tf-lib/tintin.tf
-+	install -Dm644 ../tf-lib/grep.tf $(DESTDIR)$(datadir)/tf-lib/grep.tf
-+	install -Dm644 ../tf-lib/tfrc $(DESTDIR)$(datadir)/tf-lib/tfrc
-+	install -Dm644 ../tf-lib/rwho.tf $(DESTDIR)$(datadir)/tf-lib/rwho.tf
-+	install -Dm644 ../tf-lib/alias.tf $(DESTDIR)$(datadir)/tf-lib/alias.tf
-+	install -Dm644 ../tf-lib/kbbind.tf $(DESTDIR)$(datadir)/tf-lib/kbbind.tf
-+	install -Dm644 ../tf-lib/complete.tf $(DESTDIR)$(datadir)/tf-lib/complete.tf
-+	install -Dm644 ../tf-lib/kbregion.tf $(DESTDIR)$(datadir)/tf-lib/kbregion.tf
-+	install -Dm644 ../tf-lib/color.tf $(DESTDIR)$(datadir)/tf-lib/color.tf
-+	install -Dm644 ../tf-lib/kb-bash.tf $(DESTDIR)$(datadir)/tf-lib/kb-bash.tf
-+	install -Dm644 ../tf-lib/kbstack.tf $(DESTDIR)$(datadir)/tf-lib/kbstack.tf
-+	install -Dm644 ../tf-lib/filexfer.tf $(DESTDIR)$(datadir)/tf-lib/filexfer.tf
-+	install -Dm644 ../tf-lib/activity_status.tf $(DESTDIR)$(datadir)/tf-lib/activity_status.tf
-+	install -Dm644 ../tf-lib/tfstatus.tf $(DESTDIR)$(datadir)/tf-lib/tfstatus.tf
-+	install -Dm644 ../tf-lib/relog.tf $(DESTDIR)$(datadir)/tf-lib/relog.tf
-+	install -Dm644 ../tf-lib/local-eg.tf $(DESTDIR)$(datadir)/tf-lib/local-eg.tf
-+	install -Dm644 ../tf-lib/stdlib.tf $(DESTDIR)$(datadir)/tf-lib/stdlib.tf
-+	install -Dm644 ../tf-lib/at.tf $(DESTDIR)$(datadir)/tf-lib/at.tf
-+	install -Dm644 ../tf-lib/tick.tf $(DESTDIR)$(datadir)/tf-lib/tick.tf
-+	install -Dm644 ../tf-lib/kb-os2.tf $(DESTDIR)$(datadir)/tf-lib/kb-os2.tf
-+	install -Dm644 ../tf-lib/kbfunc.tf $(DESTDIR)$(datadir)/tf-lib/kbfunc.tf
-+	install -Dm644 ../tf-lib/pcmd.tf $(DESTDIR)$(datadir)/tf-lib/pcmd.tf
-+	install -Dm644 ../tf-lib/map.tf $(DESTDIR)$(datadir)/tf-lib/map.tf
-+	install -Dm644 ../tf-lib/activity_status2.tf $(DESTDIR)$(datadir)/tf-lib/activity_status2.tf
-+	install -Dm644 ../tf-lib/kb-old.tf $(DESTDIR)$(datadir)/tf-lib/kb-old.tf
-+	install -Dm644 ../tf-lib/tr.tf $(DESTDIR)$(datadir)/tf-lib/tr.tf
-+	install -Dm644 ../CHANGES $(DESTDIR)$(datadir)/tf-lib/CHANGES
-+	install -Dm644 ../README $(DESTDIR)$(datadir)/tf-lib/README
-+	install -Dm644 ../tf-lib/examples.old $(DESTDIR)$(datadir)/tf-lib/examples.old
- 
- makehelp: makehelp.c
- 	$(CC) $(CFLAGS) -o makehelp makehelp.c
diff --git a/user/tf/0002-Correct-use-of-va_list.patch b/user/tf/0002-Correct-use-of-va_list.patch
deleted file mode 100644
index d13fcd854..000000000
--- a/user/tf/0002-Correct-use-of-va_list.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Russ Allbery <rra@debian.org>
-Date: Sun, 17 Feb 2008 22:23:24 -0800
-Subject: Correct use of va_list
-
-va_copy a va_list before using it in vsprintf so that we don't use the
-same va_list repeatedly.  Patch taken from the upstream bug tracker
-and will apparently be in the next release after 5.0beta8.
----
- src/tfio.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/tfio.c b/src/tfio.c
-index 2cd2103..151583e 100644
---- a/src/tfio.c
-+++ b/src/tfio.c
-@@ -497,6 +497,7 @@ void vSprintf(String *buf, int flags, const char *fmt, va_list ap)
-     const conString *Sval;
-     int len, min, max, leftjust, stars;
-     attr_t attrs = buf->attrs;
-+    va_list ap_copy;
- 
-     if (!(flags & SP_APPEND) && buf->data) Stringtrunc(buf, 0);
-     while (*fmt) {
-@@ -522,7 +523,9 @@ void vSprintf(String *buf, int flags, const char *fmt, va_list ap)
-         case 'x': case 'X': case 'u': case 'o':
-         case 'f': case 'e': case 'E': case 'g': case 'G':
-         case 'p':
--            vsprintf(tempbuf, spec, ap);
-+            va_copy(ap_copy, ap);
-+            vsprintf(tempbuf, spec, ap_copy);
-+            va_end(ap_copy);
-             Stringcat(buf, tempbuf);
-             /* eat the arguments used by vsprintf() */
-             while (stars--) (void)va_arg(ap, int);
diff --git a/user/tf/0008-Build-on-musl.patch b/user/tf/0008-Build-on-musl.patch
deleted file mode 100644
index 9ca62290c..000000000
--- a/user/tf/0008-Build-on-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nurd tf-50b8/src/malloc.c tf-50b8.new/src/malloc.c
---- tf-50b8/src/malloc.c	2007-01-13 23:12:39.000000000 +0000
-+++ tf-50b8.new/src/malloc.c	2018-01-24 09:13:08.406519279 +0000
-@@ -12,7 +12,7 @@
- #include "signals.h"
- #include "malloc.h"
- 
--caddr_t mmalloc_base = NULL;
-+void *mmalloc_base = NULL;
- int low_memory_warning = 0;
- static char *reserve = NULL;
- 
-diff -Nurd tf-50b8/src/macro.c tf-50b8.new/src/macro.c
---- tf-50b8/src/macro.c	2007-01-13 23:12:39.000000000 +0000
-+++ tf-50b8.new/src/macro.c	2018-01-24 09:26:18.479836714 +0000
-@@ -893,7 +893,8 @@
-     }
-     spec->attr &= ~F_NONE;
-     if (spec->nsubattr) {
--	int n = pcre_info(spec->trig.ri->re, NULL, NULL);
-+	int n = 0;
-+	pcre_fullinfo(spec->trig.ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
- 	for (i = 0; i < spec->nsubattr; i++) {
- 	    spec->subattr[i].attr &= ~F_NONE;
- 	    if (spec->subattr[i].subexp > n) {
-diff -Nurd tf-50b8/src/pattern.c tf-50b8.new/src/pattern.c
---- tf-50b8/src/pattern.c	2007-01-13 23:12:39.000000000 +0000
-+++ tf-50b8.new/src/pattern.c	2018-01-24 09:28:21.526500904 +0000
-@@ -151,7 +151,7 @@
- 	    emsg ? emsg : "unknown error");
- 	goto tf_reg_compile_error;
-     }
--    n = pcre_info(ri->re, NULL, NULL);
-+    pcre_fullinfo(ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
-     if (n < 0) goto tf_reg_compile_error;
-     ri->ovecsize = 3 * (n + 1);
-     ri->ovector = dmalloc(NULL, sizeof(int) * ri->ovecsize, file, line);
-diff -Nurd tf-50b8/src/pattern.h tf-50b8.new/src/pattern.h
---- tf-50b8/src/pattern.h	2007-01-13 23:12:39.000000000 +0000
-+++ tf-50b8.new/src/pattern.h	2018-01-24 09:28:36.039833945 +0000
-@@ -10,7 +10,7 @@
- #ifndef PATTERN_H
- #define PATTERN_H
- 
--#include "pcre-2.08/pcre.h"
-+#include <pcre.h>
- 
- typedef struct RegInfo {
-     pcre *re;
diff --git a/user/tf/APKBUILD b/user/tf/APKBUILD
deleted file mode 100644
index 35f164eec..000000000
--- a/user/tf/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Sheila Aman <sheila@vulpine.house>
-# Maintainer: Sheila Aman <sheila@vulpine.house>
-pkgname=tf
-pkgver=5.0b8
-_pkgver=${pkgver%.*}${pkgver#*.}
-pkgrel=0
-pkgdesc="Powerful curses-based MUD client"
-url="http://tinyfugue.sourceforge.net/"
-arch="all"
-options="!check"  # No test suite.
-license="GPL-2.0+"
-depends=""
-makedepends="openssl-dev ncurses-dev pcre-dev"
-source="https://sourceforge.net/projects/tinyfugue/files/tinyfugue/5.0%20beta%208/tf-$_pkgver.tar.gz
-	0001-Add-DESTDIR-support.patch
-	0002-Correct-use-of-va_list.patch
-	0003-Minor-man-page-fixes.patch
-	0006-Fix-library-install-path.patch
-	0007-Fix-spelling-errors.patch
-	0008-Build-on-musl.patch
-	"
-builddir="$srcdir/tf-$_pkgver"
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="3b99c039d7a9c6ab7ee7b1040ff7c99fe39cbe991f373333ea7c130d54383f102f14ae33303a415f5419cd43238caffc46114e842c6964329c0999e0f506e3d0  tf-50b8.tar.gz
-e891f5d4fb2db8f1f875fa2c7fa2a4d76c9ae2a54fdcc61c80e906e4f6f2d11e736fd2579d56cb313209e46c7ea01eba46b19ccf4b3f5e007585fd65fc547b34  0001-Add-DESTDIR-support.patch
-7d2b2da0f4213fcfbce86eb9042cb83751c80aba5881861d5f49d4604a4eba52d60b5254c8b119528f0890ae7a68dfe4fea7eb2c94dd0d01676b194bca4db219  0002-Correct-use-of-va_list.patch
-1e8f05d2744b60cc78f494283bb5f9ef7a804a6811d16028d5486a7394658a03aed04962adfd5bc60fe1517d3831b41f4ca1c3956a624f09a2a4b14f5ab91608  0003-Minor-man-page-fixes.patch
-0066bbb3919e6b157eb276c3975cadc258a195037c0f199c3f9db83868d6035f81b79b9a41a743c99f317fd253a2f670dcf122d5f7c449fc1677c56cfaa8bb6a  0006-Fix-library-install-path.patch
-a84aeaf097eb1ec61f9c86f73795ad9f8c111057837b1a0b127905302372e01b6489f9a19f14a29171cef9a787314d511dc98e1140d0c122dd9af5f526eb4bc0  0007-Fix-spelling-errors.patch
-f9eadd1ffb2bc51db5d2bd0e9636573ef560bf849a780c8ee99bccb3870463a1b2caeaa1d3005e11d99c7689ae6ecd8f75056db09cf2d3df084058b4a3db32f0  0008-Build-on-musl.patch"
diff --git a/user/tinyfugue/0001-Add-DESTDIR-support.patch b/user/tinyfugue/0001-Add-DESTDIR-support.patch
new file mode 100644
index 000000000..5495a82f2
--- /dev/null
+++ b/user/tinyfugue/0001-Add-DESTDIR-support.patch
@@ -0,0 +1,143 @@
+--- tinyfugue-5.1.0/unix/unix.mak
++++ tinyfugue-5.1.0.new/unix/unix.mak
+@@ -81,62 +81,71 @@
+ 	-test -z "$(STRIP)" || $(STRIP) tf$(X) || true
+ 
+ PREFIXDIRS:
+-	test -d "$(bindir)" || mkdir $(bindir)
+-	test -d "$(datadir)" || mkdir $(datadir)
+ 
+ install_TF $(TF): tf$(X) $(BUILDERS)
+-	-@rm -f $(TF)
+-	cp tf$(X) $(TF)
+-	chmod $(MODE) $(TF)
++	install -Dm755 tf${X} ${DESTDIR}${bindir}/tf
+ 
+ SYMLINK $(SYMLINK): $(TF)
+-	test -z "$(SYMLINK)" || { rm -f $(SYMLINK) && ln -s $(TF) $(SYMLINK); }
+ 
+ LIBRARY $(TF_LIBDIR): ../lib/tf/tf-help ../lib/tf/tf-help.idx
+-	@echo '## Creating library directory...'
+-#	@# Overly simplified shell commands, to avoid problems on ultrix
+-	-@test -n "$(TF_LIBDIR)" || echo "TF_LIBDIR is undefined."
+-	test -n "$(TF_LIBDIR)"
+-	test -d "$(TF_LIBDIR)" || mkdir $(TF_LIBDIR)
+-	-@test -d "$(TF_LIBDIR)" || echo "Can't make $(TF_LIBDIR) directory.  See if"
+-	-@test -d "$(TF_LIBDIR)" || echo "there is already a file with that name."
+-	test -d "$(TF_LIBDIR)"
+-#
+-#	@#rm -f $(TF_LIBDIR)/*;  # wrong: this would remove local.tf, etc.
+-	@echo '## Copying library files...'
+-	cd ../lib/tf; \
+-	for f in *; do test -f $$f && files="$$files $$f"; done; \
+-	( cd $(TF_LIBDIR); rm -f $$files tf.help tf.help.index; ); \
+-	cp $$files $(TF_LIBDIR); \
+-	cd ../../lib/py; \
+-	for f in *; do test -f $$f && pyfiles="$$pyfiles $$f"; done; \
+-	( cd $(TF_LIBDIR); rm -f $$pyfiles tf.help tf.help.index; ); \
+-	cp $$pyfiles $(TF_LIBDIR); \
+-	cd $(TF_LIBDIR); \
+-	chmod $(MODE) $$files; chmod ugo-wx $$files ;\
+-	chmod $(MODE) $$pyfiles; chmod ugo-wx $$pyfiles
+-	-rm -f $(TF_LIBDIR)/CHANGES 
+-	cp ../CHANGES $(TF_LIBDIR)
+-	chmod $(MODE) $(TF_LIBDIR)/CHANGES; chmod ugo-wx $(TF_LIBDIR)/CHANGES
+-	chmod $(MODE) $(TF_LIBDIR)
+-	-@cd $(TF_LIBDIR); old=`ls replace.tf 2>/dev/null`; \
+-	if [ -n "$$old" ]; then \
+-	    echo "## WARNING: Obsolete files found in $(TF_LIBDIR): $$old"; \
+-	fi
+-	@echo '## Creating links so old library names still work...'
+-#	@# note: ln -sf isn't portable.
+-	@cd $(TF_LIBDIR); \
+-	rm -f bind-bash.tf;    ln -s  kb-bash.tf   bind-bash.tf;    \
+-	rm -f bind-emacs.tf;   ln -s  kb-emacs.tf  bind-emacs.tf;   \
+-	rm -f completion.tf;   ln -s  complete.tf  completion.tf;   \
+-	rm -f factorial.tf;    ln -s  factoral.tf  factorial.tf;    \
+-	rm -f file-xfer.tf;    ln -s  filexfer.tf  file-xfer.tf;    \
+-	rm -f local.tf.sample; ln -s  local-eg.tf  local.tf.sample; \
+-	rm -f pref-shell.tf;   ln -s  psh.tf       pref-shell.tf;   \
+-	rm -f space_page.tf;   ln -s  spc-page.tf  space_page.tf;   \
+-	rm -f speedwalk.tf;    ln -s  spedwalk.tf  speedwalk.tf;    \
+-	rm -f stack_queue.tf;  ln -s  stack-q.tf   stack_queue.tf;  \
+-	rm -f worldqueue.tf;   ln -s  world-q.tf   worldqueue.tf;
++	install -Dm644 ../lib/tf/lisp.tf ${DESTDIR}${datadir}/tf-lib/lisp.tf
++	install -Dm644 ../lib/tf/hanoi.tf ${DESTDIR}${datadir}/tf-lib/hanoi.tf
++	install -Dm644 ../lib/tf/spell.tf ${DESTDIR}${datadir}/tf-lib/spell.tf
++	install -Dm644 ../lib/tf/spedwalk.tf ${DESTDIR}${datadir}/tf-lib/spedwalk.tf
++	install -Dm644 ../lib/tf/kb-emacs.tf ${DESTDIR}${datadir}/tf-lib/kb-emacs.tf
++	install -Dm644 ../lib/tf/tf-help.idx ${DESTDIR}${datadir}/tf-lib/tf-help.idx
++	install -Dm644 ../lib/tf/tools.tf ${DESTDIR}${datadir}/tf-lib/tools.tf
++	install -Dm644 ../lib/tf/watch.tf ${DESTDIR}${datadir}/tf-lib/watch.tf
++	install -Dm644 ../lib/tf/kb_badterm.tf ${DESTDIR}${datadir}/tf-lib/kb_badterm.tf
++	install -Dm644 ../lib/tf/world-q.tf ${DESTDIR}${datadir}/tf-lib/world-q.tf
++	install -Dm644 ../lib/tf/changes.tf ${DESTDIR}${datadir}/tf-lib/changes.tf
++	install -Dm644 ../lib/tf/stack-q.tf ${DESTDIR}${datadir}/tf-lib/stack-q.tf
++	install -Dm644 ../lib/tf/factoral.tf ${DESTDIR}${datadir}/tf-lib/factoral.tf
++	install -Dm644 ../lib/tf/cylon.tf ${DESTDIR}${datadir}/tf-lib/cylon.tf
++	install -Dm644 ../lib/tf/quoter.tf ${DESTDIR}${datadir}/tf-lib/quoter.tf
++	install -Dm644 ../lib/tf/psh.tf ${DESTDIR}${datadir}/tf-lib/psh.tf
++	install -Dm644 ../lib/tf/textutil.tf ${DESTDIR}${datadir}/tf-lib/textutil.tf
++	install -Dm644 ../lib/tf/finger.tf ${DESTDIR}${datadir}/tf-lib/finger.tf
++	install -Dm644 ../lib/tf/savehist.tf ${DESTDIR}${datadir}/tf-lib/savehist.tf
++	install -Dm644 ../lib/tf/textencode.tf ${DESTDIR}${datadir}/tf-lib/textencode.tf
++	install -Dm644 ../lib/tf/spc-page.tf ${DESTDIR}${datadir}/tf-lib/spc-page.tf
++	install -Dm644 ../lib/tf/teraterm.keyboard.cnf ${DESTDIR}${datadir}/tf-lib/teraterm.keyboard.cnf
++	install -Dm644 ../lib/tf/testcolor.tf ${DESTDIR}${datadir}/tf-lib/testcolor.tf
++	install -Dm644 ../lib/tf/tintin.tf ${DESTDIR}${datadir}/tf-lib/tintin.tf
++	install -Dm644 ../lib/tf/grep.tf ${DESTDIR}${datadir}/tf-lib/grep.tf
++	install -Dm644 ../lib/tf/tfrc ${DESTDIR}${datadir}/tf-lib/tfrc
++	install -Dm644 ../lib/tf/rwho.tf ${DESTDIR}${datadir}/tf-lib/rwho.tf
++	install -Dm644 ../lib/tf/alias.tf ${DESTDIR}${datadir}/tf-lib/alias.tf
++	install -Dm644 ../lib/tf/kbbind.tf ${DESTDIR}${datadir}/tf-lib/kbbind.tf
++	install -Dm644 ../lib/tf/complete.tf ${DESTDIR}${datadir}/tf-lib/complete.tf
++	install -Dm644 ../lib/tf/kbregion.tf ${DESTDIR}${datadir}/tf-lib/kbregion.tf
++	install -Dm644 ../lib/tf/color.tf ${DESTDIR}${datadir}/tf-lib/color.tf
++	install -Dm644 ../lib/tf/kb-bash.tf ${DESTDIR}${datadir}/tf-lib/kb-bash.tf
++	install -Dm644 ../lib/tf/kbstack.tf ${DESTDIR}${datadir}/tf-lib/kbstack.tf
++	install -Dm644 ../lib/tf/filexfer.tf ${DESTDIR}${datadir}/tf-lib/filexfer.tf
++	install -Dm644 ../lib/tf/activity_status.tf ${DESTDIR}${datadir}/tf-lib/activity_status.tf
++	install -Dm644 ../lib/tf/tfstatus.tf ${DESTDIR}${datadir}/tf-lib/tfstatus.tf
++	install -Dm644 ../lib/tf/relog.tf ${DESTDIR}${datadir}/tf-lib/relog.tf
++	install -Dm644 ../lib/tf/local-eg.tf ${DESTDIR}${datadir}/tf-lib/local-eg.tf
++	install -Dm644 ../lib/tf/stdlib.tf ${DESTDIR}${datadir}/tf-lib/stdlib.tf
++	install -Dm644 ../lib/tf/at.tf ${DESTDIR}${datadir}/tf-lib/at.tf
++	install -Dm644 ../lib/tf/tick.tf ${DESTDIR}${datadir}/tf-lib/tick.tf
++	install -Dm644 ../lib/tf/kb-os2.tf ${DESTDIR}${datadir}/tf-lib/kb-os2.tf
++	install -Dm644 ../lib/tf/kbfunc.tf ${DESTDIR}${datadir}/tf-lib/kbfunc.tf
++	install -Dm644 ../lib/tf/pcmd.tf ${DESTDIR}${datadir}/tf-lib/pcmd.tf
++	install -Dm644 ../lib/tf/map.tf ${DESTDIR}${datadir}/tf-lib/map.tf
++	install -Dm644 ../lib/tf/activity_status2.tf ${DESTDIR}${datadir}/tf-lib/activity_status2.tf
++	install -Dm644 ../lib/tf/kb-old.tf ${DESTDIR}${datadir}/tf-lib/kb-old.tf
++	install -Dm644 ../lib/tf/tr.tf ${DESTDIR}${datadir}/tf-lib/tr.tf
++	install -Dm644 ../CHANGES ${DESTDIR}${datadir}/tf-lib/CHANGES
++	install -Dm644 ../README.md ${DESTDIR}${datadir}/tf-lib/README
++	install -Dm644 ../lib/tf/examples.old ${DESTDIR}${datadir}/tf-lib/examples.old
++	install -Dm644 ../lib/py/config.py ${DESTDIR}${datadir}/tf-lib/config.py
++	install -Dm644 ../lib/py/diffedit.py ${DESTDIR}${datadir}/tf-lib/diffedit.py
++	install -Dm644 ../lib/py/tf.py ${DESTDIR}${datadir}/tf-lib/tf.py
++	install -Dm644 ../lib/py/tf4.py ${DESTDIR}${datadir}/tf-lib/tf4.py
++	install -Dm644 ../lib/py/tfutil.py ${DESTDIR}${datadir}/tf-lib/tfutil.py
++	install -Dm644 ../lib/py/urlwatch.py ${DESTDIR}${datadir}/tf-lib/urlwatch.py
+ 
+ makehelp: makehelp.c
+ 	$(CC) $(CFLAGS) -o makehelp makehelp.c
+--- tinyfugue-5.1.0/unix/vars.mak.in
++++ tinyfugue-5.1.0.new/unix/vars.mak.in
+@@ -12,11 +12,11 @@
+ 
+ # @configure_input@
+ 
+-prefix     = ${DESTDIR}@prefix@
+-exec_prefix= ${DESTDIR}@exec_prefix@
+-bindir     = ${DESTDIR}@bindir@
+-datadir    = ${DESTDIR}@datadir@
+-mandir     = ${DESTDIR}@mandir@
++prefix     = @prefix@
++exec_prefix= @exec_prefix@
++bindir     = @bindir@
++datadir    = @datadir@
++mandir     = @mandir@
+ 
+ TFVERSION  = @TFVERSION@
+ X          = @EXEEXT@
diff --git a/user/tf/0003-Minor-man-page-fixes.patch b/user/tinyfugue/0003-Minor-man-page-fixes.patch
index 9611744a5..9611744a5 100644
--- a/user/tf/0003-Minor-man-page-fixes.patch
+++ b/user/tinyfugue/0003-Minor-man-page-fixes.patch
diff --git a/user/tf/0006-Fix-library-install-path.patch b/user/tinyfugue/0006-Fix-library-install-path.patch
index 52c8e885f..c43b3873e 100644
--- a/user/tf/0006-Fix-library-install-path.patch
+++ b/user/tinyfugue/0006-Fix-library-install-path.patch
@@ -5,13 +5,13 @@ Subject: Fix library install path
 The upstream top-level configure script doesn't correctly handle
 --program-suffix without this tweak.
 ---
- configure.in | 5 +++--
+ configure.ac | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/configure.in b/configure.in
+diff --git a/configure.ac b/configure.ac
 index e783564..c938531 100644
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -599,13 +599,13 @@ fi
  dnl The "right" way of using program_transform_name, program_prefix, and
  dnl program_suffix expects you to use AC_ARG_PROGRAM here and do transformation
diff --git a/user/tf/0007-Fix-spelling-errors.patch b/user/tinyfugue/0007-Fix-spelling-errors.patch
index 8e78721b7..8e78721b7 100644
--- a/user/tf/0007-Fix-spelling-errors.patch
+++ b/user/tinyfugue/0007-Fix-spelling-errors.patch
diff --git a/user/tinyfugue/APKBUILD b/user/tinyfugue/APKBUILD
new file mode 100644
index 000000000..235308518
--- /dev/null
+++ b/user/tinyfugue/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
+pkgname=tinyfugue
+pkgver=5.1.1
+pkgrel=0
+pkgdesc="Powerful curses-based MUD client"
+url="https://github.com/ingwarsw/tinyfugue"
+arch="all"
+options="!check" # no testsuite
+license="GPL-2.0-or-later"
+makedepends="openssl-dev ncurses-dev pcre-dev icu-dev python3-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/ingwarsw/tinyfugue/archive/refs/tags/$pkgver.tar.gz
+	0001-Add-DESTDIR-support.patch
+	0003-Minor-man-page-fixes.patch
+	0006-Fix-library-install-path.patch
+	0007-Fix-spelling-errors.patch
+	"
+
+build() {
+	CFLAGS="$CFLAGS -fcommon" ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--enable-atcp \
+		--enable-gmcp \
+		--enable-option102 \
+		--enable-python
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="9eca9f75781847f39699b0c691b80c181e9cfafc4808b743a9579d608ac84b6ea11903f388128cb946b4bfae7e082739df3a37d6b5704cd3f8d2478e66c20c69  tinyfugue-5.1.1.tar.gz
+60c29831079bb866f48121a5502d0d5aa138dac3cfbd4f5dd5aac8d39183c022d032747868d187e26c51986d0a9b7044cd3d0ef26f0e3b4d6dd667a29efedce1  0001-Add-DESTDIR-support.patch
+1e8f05d2744b60cc78f494283bb5f9ef7a804a6811d16028d5486a7394658a03aed04962adfd5bc60fe1517d3831b41f4ca1c3956a624f09a2a4b14f5ab91608  0003-Minor-man-page-fixes.patch
+13cbf27207a1d59afc74a54c9585d05386bf8860cf87eab39873c978bf1525d2abe3a6fcf1da2a8cd7ee17f09644c25ba156e9a69294216c5439175d55e426b6  0006-Fix-library-install-path.patch
+a84aeaf097eb1ec61f9c86f73795ad9f8c111057837b1a0b127905302372e01b6489f9a19f14a29171cef9a787314d511dc98e1140d0c122dd9af5f526eb4bc0  0007-Fix-spelling-errors.patch"