Skip to content

Commit

Permalink
libedit: Upgrade NetBSD version 2011-03-11
Browse files Browse the repository at this point in the history
As NetBSD has properly packaged regular releases of their libedit
library (readline replacement), a new vendor branch has been created
for it.  Libedit was last synchronized with NetBSD 4 years ago, to
the week.

During that time, a new function was added to the DragonFly version
that still doesn't exist on NetBSD.  It is necessary to support GDB
7.x, so the addition of rl_completion_word_break_hook function has
been carried over to this update.
  • Loading branch information
jrmarino committed May 10, 2012
1 parent edce0eb commit c22639f
Show file tree
Hide file tree
Showing 47 changed files with 539 additions and 18,758 deletions.
80 changes: 2 additions & 78 deletions lib/libedit/Makefile
@@ -1,79 +1,3 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD: src/lib/libedit/Makefile,v 1.18.2.2 2002/07/23 10:20:19 ru Exp $
# $DragonFly: src/lib/libedit/Makefile,v 1.6 2008/06/27 08:06:48 corecode Exp $
SUBDIR= readline libedit

LIB= edit
SHLIB_MAJOR= 5

OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c hist.c \
key.c map.c parse.c prompt.c read.c refresh.c search.c sig.c term.c \
tty.c vi.c

DPADD= ${LIBNCURSES}
LDADD= -lncurses

WARNS?= 2

MAN= editline.3 editrc.5

MLINKS= editline.3 el_init.3 editline.3 el_end.3 editline.3 el_reset.3 \
editline.3 el_gets.3 editline.3 el_getc.3 editline.3 el_push.3 \
editline.3 el_parse.3 editline.3 el_set.3 editline.3 el_get.3 \
editline.3 el_source.3 editline.3 el_resize.3 editline.3 el_line.3 \
editline.3 el_insertstr.3 editline.3 el_deletestr.3 \
editline.3 history_init.3 editline.3 history_end.3 \
editline.3 history.3 \
editline.3 tok_init.3 editline.3 tok_end.3 editline.3 tok_reset.3 \
editline.3 tok_line.3 editline.3 tok_str.3

# For speed and debugging
#SRCS= ${OSRCS} tokenizer.c history.c
# For protection
SRCS= editline.c tokenizer.c history.c readline.c

SRCS+= common.h emacs.h fcns.h help.h vi.h

CLEANFILES+=common.h editline.c emacs.h fcns.c fcns.h help.c help.h vi.h
CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=#-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
CFLAGS+=#-DDEBUG_PASTE

AHDR=vi.h emacs.h common.h
ASRC=${.CURDIR}/vi.c ${.CURDIR}/emacs.c ${.CURDIR}/common.c

SUBDIR= readline

vi.h: vi.c makelist
sh ${.CURDIR}/makelist -h ${.CURDIR}/vi.c > ${.TARGET}

emacs.h: emacs.c makelist
sh ${.CURDIR}/makelist -h ${.CURDIR}/emacs.c > ${.TARGET}

common.h: common.c makelist
sh ${.CURDIR}/makelist -h ${.CURDIR}/common.c > ${.TARGET}

fcns.h: ${AHDR} makelist
sh ${.CURDIR}/makelist -fh ${AHDR} > ${.TARGET}

fcns.c: ${AHDR} fcns.h help.h makelist
sh ${.CURDIR}/makelist -fc ${AHDR} > ${.TARGET}

help.c: ${ASRC} makelist
sh ${.CURDIR}/makelist -bc ${ASRC} > ${.TARGET}

help.h: ${ASRC} makelist
sh ${.CURDIR}/makelist -bh ${ASRC} > ${.TARGET}

editline.c: ${OSRCS} makelist
sh ${.CURDIR}/makelist -e ${OSRCS} > ${.TARGET}

beforedepend editline.o editline.po editline.So: \
vi.h emacs.h common.h fcns.h fcns.c help.h help.c

# Not up to date
#test.o: ${.CURDIR}/TEST/test.c
#
#test: test.o libedit.a ${DPADD} ${LIBTERMCAP}
# ${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD}

.include <bsd.lib.mk>
.include <bsd.subdir.mk>
1 change: 1 addition & 0 deletions lib/libedit/Makefile.inc
@@ -0,0 +1 @@
BASEDIR= ${.CURDIR}/${RELATIVE}../../../contrib/libedit
14 changes: 0 additions & 14 deletions lib/libedit/TEST/Makefile

This file was deleted.

295 changes: 0 additions & 295 deletions lib/libedit/TEST/test.c

This file was deleted.

0 comments on commit c22639f

Please sign in to comment.