Merge head from 7/28

4 files changed, 13 insertions, 38 deletions

diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 637dcc8..c2bfa66 100644
--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR = history readline
+SUBDIR = readline
 
 .include <bsd.subdir.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index fab4aa2..ce1fec1 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-SUBDIR= doc
-
 LIB=    readline
-MAN=    doc/readline.3
-SHLIBDIR?=	/lib
+INTERNALLIB=	yes
+NO_MAN=	yes
 
 TILDESRC= tilde.c
 SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
@@ -15,13 +13,17 @@ SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
 INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 		   rlstdc.h rlconf.h rltypedefs.h
 
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
-
-INCSDIR=${INCLUDEDIR}/readline
+CFLAGS+=	-I${.OBJDIR}/..
+SRCDIR=	${.CURDIR}/../../../../contrib/libreadline
 
-.for hdr in ${INSTALLED_HEADERS}
-INCS+=	${SRCDIR}/${hdr}
+CLEANFILES+= ${INSTALLED_HEADERS}
+beforebuild: ${INSTALLED_HEADERS}
+.for h in ${INSTALLED_HEADERS}
+$h: ${SRCDIR}/$h
+	ln -sf ${SRCDIR}/$h $h
 .endfor
 
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
+
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile.depend b/gnu/lib/libreadline/readline/Makefile.depend
index c234020..bc5416f 100644
--- a/gnu/lib/libreadline/readline/Makefile.depend
+++ b/gnu/lib/libreadline/readline/Makefile.depend
@@ -3,16 +3,9 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/ncurses/ncurses \
 	lib/ncurses/ncursesw \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libreadline/readline/doc/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
deleted file mode 100644
index 7028971..0000000
--- a/gnu/lib/libreadline/readline/doc/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
-
-INFO = readline rluserman
-
-INFOSECTION= "Programming & development tools."
-INFOENTRY_readline= "* Readline: (readline).		The GNU Readline library"
-INFOENTRY_rluserman= "* Readline: (readline).       The GNU readline library API"
-
-CLEANFILES += readline.texi
-
-readline.info: rlman.texi rluser.texi rltech.texi version.texi fdl.texi
-
-readline.texi: rlman.texi
-	cp -f ${SRCDIR}/rlman.texi ${.TARGET}
-
-rluserman.info: rluserman.texi version.texi rluser.texi fdl.texi
-
-.include <bsd.info.mk>