Introduce new ncurses build glues which are part of ncurses 5.6 update.

Approved by:	delphij
Inspired by:	DragonFly's and lib/bind

1 files changed, 53 insertions, 35 deletions

diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index 6d828b20c833..977215a832c7 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -1,48 +1,66 @@
 # Makefile for libpanel
 # $FreeBSD$
 
-NCURSES=${.CURDIR}/../../contrib/ncurses
+.include	"${.CURDIR}/../config.mk"
 
-.PATH:	${NCURSES}/panel ${NCURSES}/include
-.PATH:  ${NCURSES}/man
+SRCDIR=		${NCURSES_DIR}/panel
 
-LIB=    panel
-DPADD=	${LIBNCURSES}
-LDADD=	-lncurses
-AWK?=	awk
+LIB=		panel
+DPADD=		${LIBNCURSES}
+LDADD=		-lncurses
 
-SRCS=	ncurses_def.h \
-	p_above.c p_below.c p_bottom.c p_delete.c p_hidden.c \
-	p_hide.c p_move.c p_new.c p_replace.c p_show.c p_top.c \
-	p_update.c p_user.c p_win.c panel.c
-INCS=	${NCURSES}/panel/panel.h
+.PATH:		${SRCDIR}
+SRCS=		\
+		ncurses_def.h \
+		p_above.c \
+		p_below.c \
+		p_bottom.c \
+		p_delete.c \
+		p_hidden.c \
+		p_hide.c \
+		p_move.c \
+		p_new.c \
+		p_replace.c \
+		p_show.c \
+		p_top.c \
+		p_update.c \
+		p_user.c \
+		p_win.c \
+		panel.c
+
+CFLAGS+=	-I${SRCDIR}
+
+INCS=		${SRCDIR}/panel.h
 
 CLEANFILES+=	ncurses_def.h
-CFLAGS+= -I.
-.if exists(${.OBJDIR}/../libncurses)
-CFLAGS+= -I${.OBJDIR}/../libncurses
-.endif
-CFLAGS+= -I${.CURDIR}/../libncurses
-CFLAGS+= -I${NCURSES}/panel -I${NCURSES}/include -I${NCURSES}/ncurses \
-	    -Wall -DNDEBUG -DHAVE_CONFIG_H
-
-ncurses_def.h:	MKncurses_def.sh ncurses_defs
-	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
-	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
 
 # generate MAN
-CLEANFILES+=	panel.3
-MAN=		panel.3
-panel.3: panel.3x
-	cat ${.ALLSRC} > ${.TARGET}
+.PATH:		${NCURSES_DIR}/man
+MANx=		\
+		panel.3x
 
-MLINKS+=panel.3 bottom_panel.3 panel.3 del_panel.3 panel.3 hide_panel.3 \
-	panel.3 move_panel.3 panel.3 new_panel.3 panel.3 panel_above.3 \
-	panel.3 panel_below.3 panel.3 panel_hidden.3 \
-	panel.3 panel_userptr.3 panel.3 panel_window.3 \
-	panel.3 replace_panel.3 panel.3 set_panel_userptr.3 \
-	panel.3 show_panel.3 panel.3 top_panel.3 panel.3 update_panels.3
+# Generate the MAN list from MANx
+.for page in ${MANx}
+CLEANFILES+=	${page:T:S/x$//g}
+MAN+=		${page:T:S/x$//g}
+${page:T:S/x$//g}: ${page}
+	cat ${.ALLSRC} > ${.TARGET}
+.endfor
 
+MLINKS=		panel.3 bottom_panel.3 \
+		panel.3 del_panel.3 \
+		panel.3 hide_panel.3 \
+		panel.3 move_panel.3 \
+		panel.3 new_panel.3 \
+		panel.3 panel_above.3 \
+		panel.3 panel_below.3 \
+		panel.3 panel_hidden.3 \
+		panel.3 panel_userptr.3 \
+		panel.3 panel_window.3 \
+		panel.3 replace_panel.3 \
+		panel.3 set_panel_userptr.3 \
+		panel.3 show_panel.3 \
+		panel.3 top_panel.3 \
+		panel.3 update_panels.3
+	
 .include <bsd.lib.mk>
-
-.SUFFIXES: .3x .3