Anonymous <[email protected]> writes:
> Anonymous <[email protected]> writes:
>
>> Baptiste Daroussin <[email protected]> writes:
> [...]
>>> You can find the patch against current here:
>>> http://people.freebsd.org/~bapt/update-libedit.patch
>>
>> $ make depend
>> /usr/src/lib/libedit/makelist -h /usr/src/lib/libedit/vi.c > vi.h.tmp &&
>> mv vi.h.tmp vi.h
>> /usr/src/lib/libedit/makelist: Permission denied
>> *** Error code 126
>>
>> I guess HOST_SH is defined by build.sh on NetBSD.
>
> libgdb doesn't build, too
Aww, a few more changes were needed to make buildworld happy.
%%
Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc (revision 214854)
+++ ObsoleteFiles.inc (working copy)
@@ -14,6 +14,36 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# XXXXXXXX: readline removed, ports should use devel/readline ;)
+OLD_FILES+=usr/include/readline/chardefs.h
+OLD_FILES+=usr/include/readline/keymaps.h
+OLD_FILES+=usr/include/readline/rlconf.h
+OLD_FILES+=usr/include/readline/rlstdc.h
+OLD_FILES+=usr/include/readline/rltypedefs.h
+OLD_FILES+=usr/include/readline/tilde.h
+OLD_FILES+=usr/lib/libhistory.a
+OLD_FILES+=usr/lib/libhistory_p.a
+OLD_FILES+=usr/lib/libreadline.a
+OLD_FILES+=usr/lib/libreadline_p.a
+OLD_FILES+=usr/share/info/history.info.gz
+OLD_FILES+=usr/share/info/readline.info.gz
+OLD_FILES+=usr/share/info/rluserman.info.gz
+OLD_FILES+=usr/share/man/man3/readline.3.gz
+OLD_FILES+=usr/share/man/man3/rlhistory.3.gz
+OLD_LIBS+=lib/libreadline.so.8
+OLD_LIBS+=usr/lib/libhistory.so
+OLD_LIBS+=usr/lib/libhistory.so.8
+OLD_LIBS+=usr/lib/libreadline.so
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libhistory.a
+OLD_FILES+=usr/lib32/libhistory_p.a
+OLD_FILES+=usr/lib32/libreadline.a
+OLD_FILES+=usr/lib32/libreadline_p.a
+OLD_LIBS+=usr/lib32/libhistory.so
+OLD_LIBS+=usr/lib32/libhistory.so.8
+OLD_LIBS+=usr/lib32/libreadline.so
+OLD_LIBS+=usr/lib32/libreadline.so.8
+.endif
# 20101101: headers moved to machine/ to x86/
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
OLD_FILES+=usr/include/machine/apicreg.h
Index: contrib/gdb/gdb/cli/cli-cmds.c
===================================================================
--- contrib/gdb/gdb/cli/cli-cmds.c (revision 214854)
+++ contrib/gdb/gdb/cli/cli-cmds.c (working copy)
@@ -21,7 +21,6 @@
#include "defs.h"
#include "readline/readline.h"
-#include "readline/tilde.h"
#include "completer.h"
#include "target.h" /* For baud_rate, remote_debug and remote_timeout */
#include "gdb_wait.h" /* For shell escape implementation */
Index: contrib/gdb/gdb/cli/cli-setshow.c
===================================================================
--- contrib/gdb/gdb/cli/cli-setshow.c (revision 214854)
+++ contrib/gdb/gdb/cli/cli-setshow.c (working copy)
@@ -18,7 +18,6 @@
Boston, MA 02111-1307, USA. */
#include "defs.h"
-#include "readline/tilde.h"
#include "value.h"
#include <ctype.h>
#include "gdb_string.h"
Index: contrib/gdb/gdb/event-top.c
===================================================================
--- contrib/gdb/gdb/event-top.c (revision 214854)
+++ contrib/gdb/gdb/event-top.c (working copy)
@@ -34,7 +34,6 @@
/* readline include files */
#include "readline/readline.h"
-#include "readline/history.h"
/* readline defines this. */
#undef savestring
Index: contrib/gdb/gdb/top.c
===================================================================
--- contrib/gdb/gdb/top.c (revision 214854)
+++ contrib/gdb/gdb/top.c (working copy)
@@ -48,7 +48,6 @@
/* readline include files */
#include "readline/readline.h"
-#include "readline/history.h"
/* readline defines this. */
#undef savestring
Index: contrib/gdb/gdb/tracepoint.c
===================================================================
--- contrib/gdb/gdb/tracepoint.c (revision 214854)
+++ contrib/gdb/gdb/tracepoint.c (working copy)
@@ -45,7 +45,6 @@
/* readline include files */
#include "readline/readline.h"
-#include "readline/history.h"
/* readline defines this. */
#undef savestring
Index: contrib/gdb/gdb/tui/tui-io.c
===================================================================
--- contrib/gdb/gdb/tui/tui-io.c (revision 214854)
+++ contrib/gdb/gdb/tui/tui-io.c (working copy)
@@ -397,8 +397,6 @@ static void
tui_rl_display_match_list (char **matches, int len, int max)
{
typedef int QSFUNC (const void *, const void *);
- extern int _rl_qsort_string_compare (const void*, const void*);
- extern int _rl_print_completions_horizontally;
int count, limit, printed_len;
int i, j, k, l;
Index: gnu/lib/Makefile
===================================================================
--- gnu/lib/Makefile (revision 214854)
+++ gnu/lib/Makefile (working copy)
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline libssp
+SUBDIR= csu libgcc libgcov libdialog libgomp libregex libssp
# libsupc++ uses libstdc++ headers, although 'make includes' should
# have taken care of that already.
Index: include/Makefile
===================================================================
--- include/Makefile (revision 214854)
+++ include/Makefile (working copy)
@@ -11,7 +11,7 @@ INCS= a.out.h ar.h assert.h bitstring.h complex.h
db.h \
dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
- histedit.h ieeefp.h ifaddrs.h \
+ ieeefp.h ifaddrs.h \
inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
ndbm.h netconfig.h \
Index: lib/libedit/Makefile
===================================================================
--- lib/libedit/Makefile (revision 214856)
+++ lib/libedit/Makefile (working copy)
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2005/05/28 12:02:53 lukem Exp $
# $NetBSD: Makefile,v 1.41 2010/02/03 15:34:43 roy Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-WIDECHAR ?= yes
+WIDECHAR ?= no
WARNS?= 3
LIB= edit
SHLIB_MAJOR= 7
@@ -40,6 +40,7 @@ CFLAGS+=-DWIDECHAR
.endif
LIBEDITDIR?=${.CURDIR}
+HOST_SH?=sh
INCS= histedit.h
INCSDIR=/usr/include
Index: lib/libedit/readline/Makefile
===================================================================
--- lib/libedit/readline/Makefile (revision 0)
+++ lib/libedit/readline/Makefile (revision 0)
@@ -5,10 +5,8 @@
.include <bsd.own.mk>
-.PATH: ${NETBSDSRCDIR}/lib/libedit
-
INCS= readline.h
INCSDIR= /usr/include/readline
-INCSYMLINKS= readline.h ${INCSDIR}/history.h
+INCSLINKS= readline.h ${INCSDIR}/history.h
.include <bsd.prog.mk>
Index: rescue/rescue/Makefile
===================================================================
--- rescue/rescue/Makefile (revision 214854)
+++ rescue/rescue/Makefile (working copy)
@@ -143,7 +143,7 @@ CRUNCH_LIBS+= -lipx
.if ${MK_ZFS} != "no"
CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
.endif
-CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
+CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs -lz
.if ${MACHINE_CPUARCH} == "i386"
CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
Index: sbin/gvinum/Makefile
===================================================================
--- sbin/gvinum/Makefile (revision 214854)
+++ sbin/gvinum/Makefile (working copy)
@@ -7,8 +7,8 @@ MAN= gvinum.8
WARNS?= 2
CFLAGS+= -I${.CURDIR}/../../sys
-DPADD= ${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
-LDADD= -lreadline -ltermcap -ldevstat -lkvm -lgeom
+DPADD= ${LIBEDIT} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
+LDADD= -ledit -ltermcap -ldevstat -lkvm -lgeom
.PATH: ${.CURDIR}/../../sys/geom/vinum
Index: sbin/gvinum/gvinum.c
===================================================================
--- sbin/gvinum/gvinum.c (revision 214854)
+++ sbin/gvinum/gvinum.c (working copy)
@@ -52,7 +52,6 @@
#include <stdlib.h>
#include <paths.h>
#include <readline/readline.h>
-#include <readline/history.h>
#include <unistd.h>
#include "gvinum.h"
%%
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "[email protected]"
