libedit: 20141030-3.1 -> 20191025_3.1

3 files changed, 64 insertions, 43 deletions

diff --git a/libedit/.footprint b/libedit/.footprint
index 94fb18a48..397e205ca 100644
--- a/libedit/.footprint
+++ b/libedit/.footprint
@@ -6,35 +6,56 @@ drwxr-xr-x	root/root	usr/include/editline/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libedit.a
 -rwxr-xr-x	root/root	usr/lib/libedit.la
-lrwxrwxrwx	root/root	usr/lib/libedit.so -> libedit.so.0.0.52
-lrwxrwxrwx	root/root	usr/lib/libedit.so.0 -> libedit.so.0.0.52
--rwxr-xr-x	root/root	usr/lib/libedit.so.0.0.52
+lrwxrwxrwx	root/root	usr/lib/libedit.so -> libedit.so.0.0.61
+lrwxrwxrwx	root/root	usr/lib/libedit.so.0 -> libedit.so.0.0.61
+-rwxr-xr-x	root/root	usr/lib/libedit.so.0.0.61
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libedit.pc
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man3/
--rw-r--r--	root/root	usr/man/man3/editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_deletestr.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_end.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_get.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_getc.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_gets.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_history.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_history_end.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_history_init.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_init.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_insertstr.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_line.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_parse.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_push.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_reset.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_resize.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_set.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_source.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_tok_end.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_tok_init.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_tok_line.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_tok_reset.3.gz -> editline.3.gz
-lrwxrwxrwx	root/root	usr/man/man3/el_tok_str.3.gz -> editline.3.gz
-drwxr-xr-x	root/root	usr/man/man5/
--rw-r--r--	root/root	usr/man/man5/editrc.5.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man3/
+-rw-r--r--	root/root	usr/share/man/man3/editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_deletestr.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_end.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_get.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_getc.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_gets.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_init.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_init_fd.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_insertstr.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_line.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_parse.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_push.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_reset.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_resize.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_set.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_source.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_wdeletestr.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_wget.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_wgetc.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_wgets.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_winsertstr.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_wline.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_wparse.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_wpush.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/el_wset.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/history_end.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/history_init.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/history_w.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/history_wend.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/history_winit.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_end.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_init.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_line.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_reset.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_str.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_wend.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_winit.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_wline.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_wreset.3.gz -> editline.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/tok_wstr.3.gz -> editline.3.gz
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/editrc.5.gz
+drwxr-xr-x	root/root	usr/share/man/man7/
+-rw-r--r--	root/root	usr/share/man/man7/editline.7.gz
diff --git a/libedit/.signature b/libedit/.signature
index eecaab91f..543b93819 100644
--- a/libedit/.signature
+++ b/libedit/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Rej4XwA3FyqqrngPn2NRPW4ZtQkj8OM5l4o7jXgvWxaLklb7BntsQ7IzQ38IdC+VihP/wXQO2d6cBStVnOCcQo=
-SHA256 (Pkgfile) = 60ab6f4b61eb82c36658c23739d99a617519392dac71a11c4f63f9abd78856c2
-SHA256 (.footprint) = bd46a7e4b4e4adcc6826aa3a6085df5bd2cdbf0e51f278c2002b41c057efa575
-SHA256 (libedit-20141030-3.1.tar.gz) = 9701e16570fb8f7fa407b506986652221b701a9dd61defc05bb7d1c61cdf5a40
+RWSE3ohX2g5d/Q5jjEK3EDNby72Ve5kce74EaFeTI064bD5K6VgnqId4lrbe8/wwAe1qdJVDtswTMI7Yq+EaS5wrFUoC3VmY4gs=
+SHA256 (Pkgfile) = 71028c756c2936d88ff8e17200178b553bf14a3c6c7fada762700b3909408735
+SHA256 (.footprint) = 78fab11792d6905b80b114768f4414a7f1504a219f5887ceef9c638d6ed8ef48
+SHA256 (libedit-20191025-3.1.tar.gz) = 6dff036660d478bfaa14e407fc5de26d22da1087118c897b1a3ad2e90cb7bf39
diff --git a/libedit/Pkgfile b/libedit/Pkgfile
index 0e0daf24a..287ccc941 100644
--- a/libedit/Pkgfile
+++ b/libedit/Pkgfile
@@ -1,20 +1,20 @@
-# Description: An autotool- and libtoolized port of the NetBSD Editline library.
-# URL: http://thrysoee.dk/editline/
-# Packager: Oleksiy Khilkevich, grim at asu dot ntu-kpi dot kiev dot ua
+# Description: Command line editor library providing generic line editing, history, and tokenization functions
+# URL: https://thrysoee.dk/editline/
 # Maintainer: Danny Rawlins, crux at romster dot me
 
 name=libedit
-version=20141030-3.1
+version=20191025_3.1
 release=1
-source=(http://thrysoee.dk/editline/$name-$version.tar.gz)
+source=(https://thrysoee.dk/editline/$name-${version/_/-}.tar.gz)
 
 build() {
-	cd $name-20141029-3.1
+	cd $name-${version/_/-}
 
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/man
+	./configure --prefix=/usr
 
 	make
 	make DESTDIR=$PKG install
+
+	rm $PKG/usr/share/man/man3/history.3 # conflicts with readline
+	ln -s editline.3 $PKG/usr/share/man/man3/el.3
 }