From 51e1811550456a6d37fa01cd1e4fec371cbb8e01 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Wed, 30 Jun 2010 04:58:42 +0000
Subject: [PATCH] build updates for xterm-261.  resize also uses terminfo now.

---
 external/mit/xorg/bin/xterm/Makefile        | 16 ++++++++--------
 external/mit/xorg/bin/xterm/resize/Makefile |  5 ++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/external/mit/xorg/bin/xterm/Makefile b/external/mit/xorg/bin/xterm/Makefile
index 82958651e5a1..cc13cf6ebe07 100644
--- a/external/mit/xorg/bin/xterm/Makefile
+++ b/external/mit/xorg/bin/xterm/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2010/02/04 13:22:34 tron Exp $
+#	$NetBSD: Makefile,v 1.7 2010/06/30 04:58:42 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -10,12 +10,12 @@ SRCS=	button.c charproc.c charsets.c cursor.c data.c doublechr.c \
 	wcwidth.c xutf8.c cachedGCs.c xtermcap.c
 
 CPPFLAGS+=	-I${X11SRCDIR.${PROG}} \
+		-I${X11SRCDIR.${PROG}}/../include \
 		-I${DESTDIR}${X11INCDIR}/freetype2 \
-		-DSCROLLBAR_RIGHT -DOPT_WIDE_CHARS \
-		-DXRENDERFONT -DXFREE86_FT2 -DOPT_PASTE64 \
-		-DPROJECTROOT=${X11ROOTDIR} -DHAVE_TERMCAP_H
-
-CPPFLAGS.main.c=-DUTMP -DUSE_TTY_GROUP ${X11FLAGS.VERSION}
+		-DPROJECTROOT=${X11ROOTDIR} \
+		-DHAVE_CONFIG_H \
+		-D_REENTRANT \
+		${X11FLAGS.VERSION}
 
 APPDEFS=XTerm.ad XTerm-color.ad
 
@@ -23,9 +23,9 @@ BUILDSYMLINKS=	XTerm-col.ad XTerm-color.ad
 
 LDADD+=	-lXft -lfontconfig -lfreetype -lexpat -lXrender
 DPADD+=	${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
-LDADD+=	-lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lterminfo -lutil
+LDADD+=	-lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
 DPADD+=	${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
-	${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBTERMINFO} ${LIBUTIL}
+	${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
 
 SUBDIR=	resize uxterm
 
diff --git a/external/mit/xorg/bin/xterm/resize/Makefile b/external/mit/xorg/bin/xterm/resize/Makefile
index c4557a531701..f6254605d248 100644
--- a/external/mit/xorg/bin/xterm/resize/Makefile
+++ b/external/mit/xorg/bin/xterm/resize/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2010/06/30 04:58:42 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,5 +9,8 @@ CPPFLAGS+=-I${X11SRCDIR.xterm}
 
 .PATH:	${X11SRCDIR.xterm}
 
+LDADD+=	-lterminfo
+DPADD+=	${LIBTERMINFO} 
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>