Module Name: src
Committed By: mrg
Date: Wed Jun 30 04:58:42 UTC 2010
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
src/external/mit/xorg/bin/xterm/resize: Makefile
Log Message:
build updates for xterm-261. resize also uses terminfo now.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xterm/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xterm/resize/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.6 src/external/mit/xorg/bin/xterm/Makefile:1.7
--- src/external/mit/xorg/bin/xterm/Makefile:1.6 Thu Feb 4 13:22:34 2010
+++ src/external/mit/xorg/bin/xterm/Makefile Wed Jun 30 04:58:42 2010
@@ -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 @@
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 @@
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
Index: src/external/mit/xorg/bin/xterm/resize/Makefile
diff -u src/external/mit/xorg/bin/xterm/resize/Makefile:1.1.1.1 src/external/mit/xorg/bin/xterm/resize/Makefile:1.2
--- src/external/mit/xorg/bin/xterm/resize/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xterm/resize/Makefile Wed Jun 30 04:58:42 2010
@@ -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 @@
.PATH: ${X11SRCDIR.xterm}
+LDADD+= -lterminfo
+DPADD+= ${LIBTERMINFO}
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
