Update to readline-6.3 with patches.

Tested by me with Octave and jca@ tested with lftp and cgdb.

Okay jca@.
This commit is contained in:
pirofti 2015-11-05 12:43:20 +00:00
parent 7185a51497
commit db16df85ba
6 changed files with 54 additions and 36 deletions

View File

@ -1,19 +1,22 @@
# $OpenBSD: Makefile,v 1.12 2014/07/12 20:34:36 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2015/11/05 12:43:20 pirofti Exp $
COMMENT = library to edit command lines as they are typed in
V = 6.2
V = 6.3
DISTNAME = readline-${V}
PKGNAME = readline-${V}pl4
PATCHFILES = readline62-001:0 \
readline62-002:0 \
readline62-003:0 \
readline62-004:0
PKGNAME = readline-${V}
PATCHFILES = readline63-001:0 \
readline63-002:0 \
readline63-003:0 \
readline63-004:0 \
readline63-005:0 \
readline63-006:0 \
readline63-007:0 \
readline63-008:0
LIBV = 0.1
LIBV = 1.0
SHARED_LIBS += ehistory ${LIBV}
SHARED_LIBS += ereadline ${LIBV}
REVISION = 2
CATEGORIES = devel

View File

@ -1,10 +1,18 @@
SHA256 (readline-6.2.tar.gz) = eaaWBwoFjCM8ct1qxpcCHMZKvV7VHlnbhn1m0Zaok4E=
SHA256 (readline62-001) = OKhsQXQ3aS2wEGnIq0CpqPVI5nrZrwOQIhsCSxw5tOM=
SHA256 (readline62-002) = HmNJEoy1cxcgY+oAfGeveSVoicgJlzACymbF38UDx9Q=
SHA256 (readline62-003) = yyEx/zUtbl+C7cCXVRkfdCILFfAmvbbFJiSTHHliI3Q=
SHA256 (readline62-004) = Cb00JHnqW7i2QRv999MC+rLlIdHSQby4NE07rV2fVHY=
SIZE (readline-6.2.tar.gz) = 2277926
SIZE (readline62-001) = 1388
SIZE (readline62-002) = 1714
SIZE (readline62-003) = 1911
SIZE (readline62-004) = 3335
SHA256 (readline-6.3.tar.gz) = VrpgcblGL5gMWnKrACOJO2W6beu07rR116Vj3GXK/UM=
SHA256 (readline63-001) = Gnm7turudQ4Nb389BZswpF/FTo44io4F6cOuWYWQFG8=
SHA256 (readline63-002) = OeMEx6UmiI+eES5zOEghVzb7e51UBym54x8zR7eh4KU=
SHA256 (readline63-003) = 7EG92LAP2IToR3CFE99B1RsSQ87LaAGJ4xtxc9AcpS8=
SHA256 (readline63-004) = RUe5BvslcIZsIYh4B95d7hmDimChr7ZjhbJyFV5DVcw=
SHA256 (readline63-005) = h3eI+SKNGpkHpLz+PW3QQ5wI1yiUlFi0EgjZv5BgJ0s=
SHA256 (readline63-006) = XCN6s8bJfCPPUrKhGK3CZbf7QRtXyTpffCIdUPr75VY=
SHA256 (readline63-007) = TXm1oq3sPC6BFMvT1jwXcffGz2QDU2hiSQPSVwFPW+o=
SHA256 (readline63-008) = O8CTz1Js6sI+uAJWsOyH+hc1VA1ll0IQe2KE1jXEN4c=
SIZE (readline-6.3.tar.gz) = 2468560
SIZE (readline63-001) = 1366
SIZE (readline63-002) = 1297
SIZE (readline63-003) = 985
SIZE (readline63-004) = 1363
SIZE (readline63-005) = 1664
SIZE (readline63-006) = 1982
SIZE (readline63-007) = 1428
SIZE (readline63-008) = 1452

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2013/04/18 15:08:01 sthen Exp $
--- Makefile.in.orig Mon Oct 11 16:53:52 2010
+++ Makefile.in Thu Apr 18 11:55:26 2013
@@ -97,8 +97,8 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT_FLAGS) @CFLAG
$OpenBSD: patch-Makefile_in,v 1.3 2015/11/05 12:43:20 pirofti Exp $
--- Makefile.in.orig Mon Jan 27 16:52:00 2014
+++ Makefile.in Sat Oct 31 12:58:35 2015
@@ -101,8 +101,8 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT_FLAGS) @CFLAG
$(CC) -c $(CCFLAGS) $<
# The name of the main library target.
@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2013/04/18 15:08:01 sthen Exp $
# The C code source files for this library.
CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
@@ -154,12 +154,12 @@ everything: all examples
@@ -164,12 +164,12 @@ everything: all examples
static: $(STATIC_LIBS)
@ -27,7 +27,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2013/04/18 15:08:01 sthen Exp $
$(RM) $@
$(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o xfree.o
-test -n "$(RANLIB)" && $(RANLIB) $@
@@ -225,12 +225,12 @@ uninstall-headers:
@@ -235,12 +235,12 @@ uninstall-headers:
maybe-uninstall-headers: uninstall-headers
install-static: installdirs $(STATIC_LIBS) install-headers install-doc install-examples

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2010/07/23 14:51:11 laurent Exp $
--- doc/Makefile.in.orig Wed Dec 23 16:42:59 2009
+++ doc/Makefile.in Tue Jul 13 10:56:08 2010
@@ -201,30 +201,30 @@ installdirs: $(topdir)/support/mkdirs
$OpenBSD: patch-doc_Makefile_in,v 1.2 2015/11/05 12:43:20 pirofti Exp $
--- doc/Makefile.in.orig Mon Mar 4 18:19:05 2013
+++ doc/Makefile.in Sat Oct 31 12:58:35 2015
@@ -204,30 +204,30 @@ installdirs: $(topdir)/support/mkdirs
install: installdirs
if test -f readline.info; then \

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-support_shobj-conf,v 1.1 2013/04/18 15:08:01 sthen Exp $
--- support/shobj-conf.orig Thu Apr 18 12:16:39 2013
+++ support/shobj-conf Thu Apr 18 12:17:33 2013
@@ -197,7 +197,16 @@ darwin*|macosx*)
$OpenBSD: patch-support_shobj-conf,v 1.2 2015/11/05 12:43:20 pirofti Exp $
--- support/shobj-conf.orig Mon Feb 24 04:06:29 2014
+++ support/shobj-conf Sat Oct 31 13:00:38 2015
@@ -212,7 +212,16 @@ darwin*)
SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
;;
-openbsd*|netbsd*)
-openbsd*|netbsd*|mirbsd*)
+openbsd*)
+ SHOBJ_CFLAGS=-fPIC
+ SHOBJ_LD='${CC}'
@ -15,7 +15,7 @@ $OpenBSD: patch-support_shobj-conf,v 1.1 2013/04/18 15:08:01 sthen Exp $
+ SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(RL_SHLIB_V)'
+ ;;
+
+netbsd*)
+netbsd*|mirbsd*)
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
SHOBJ_LDFLAGS='-shared'

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2014/07/12 20:34:36 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2015/11/05 12:43:20 pirofti Exp $
include/ereadline/
include/ereadline/readline/
include/ereadline/readline/chardefs.h
@ -18,11 +18,18 @@ lib/libereadline.a
@lib lib/libereadline.so.${LIBereadline_VERSION}
@man man/man3/ehistory.3
@man man/man3/ereadline.3
share/doc/readline/
share/doc/readline/CHANGES
share/doc/readline/INSTALL
share/doc/readline/README
share/readline/
share/readline/excallback.c
share/readline/fileman.c
share/readline/hist_erasedups.c
share/readline/hist_purgecmd.c
share/readline/histexamp.c
share/readline/manexamp.c
share/readline/rl-callbacktest.c
share/readline/rl-fgets.c
share/readline/rl.c
share/readline/rlcat.c