Mon Sep 28 02:02:50 2009 UTC ()
Pull up following revision(s) (requested by mrg in ticket #1034):
	external/mit/xorg/bin/xterm/Makefile: revision 1.4
Update for new xterm.


(snj)
diff -r1.2.4.1 -r1.2.4.2 src/external/mit/xorg/bin/xterm/Makefile
cvs diff -r1.2.4.1 -r1.2.4.2 src/external/mit/xorg/bin/xterm/Makefile (switch to unified diff)

--- src/external/mit/xorg/bin/xterm/Makefile 2009/04/20 23:20:57 1.2.4.1
+++ src/external/mit/xorg/bin/xterm/Makefile 2009/09/28 02:02:50 1.2.4.2
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.2.4.1 2009/04/20 23:20:57 snj Exp $ 1# $NetBSD: Makefile,v 1.2.4.2 2009/09/28 02:02:50 snj Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xterm 5PROG= xterm
6SRCS= button.c charproc.c charsets.c cursor.c data.c doublechr.c \ 6SRCS= button.c charproc.c charsets.c cursor.c data.c doublechr.c \
7 fontutils.c input.c menu.c misc.c print.c ptydata.c screen.c \ 7 fontutils.c input.c linedata.c menu.c misc.c print.c ptydata.c \
8 scrollbar.c tabs.c util.c xstrings.c TekPrsTbl.c Tekproc.c VTPrsTbl.c \ 8 screen.c scrollback.c scrollbar.c tabs.c util.c xstrings.c \
9 main.c charclass.c precompose.c wcwidth.c xutf8.c cachedGCs.c \ 9 TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \
10 xtermcap.c 10 wcwidth.c xutf8.c cachedGCs.c xtermcap.c
11 11
12CPPFLAGS+= -I${X11SRCDIR.${PROG}} \ 12CPPFLAGS+= -I${X11SRCDIR.${PROG}} \
13 -I${DESTDIR}${X11INCDIR}/freetype2 \ 13 -I${DESTDIR}${X11INCDIR}/freetype2 \
14 -DSCROLLBAR_RIGHT -DOPT_WIDE_CHARS \ 14 -DSCROLLBAR_RIGHT -DOPT_WIDE_CHARS \
15 -DXRENDERFONT -DXFREE86_FT2 -DOPT_PASTE64 \ 15 -DXRENDERFONT -DXFREE86_FT2 -DOPT_PASTE64 \
16 -DPROJECTROOT=${X11ROOTDIR} 16 -DPROJECTROOT=${X11ROOTDIR}
17 17
18CPPFLAGS.main.c=-DUTMP -DUSE_TTY_GROUP ${X11FLAGS.VERSION} 18CPPFLAGS.main.c=-DUTMP -DUSE_TTY_GROUP ${X11FLAGS.VERSION}
19 19
20APPDEFS=XTerm.ad XTerm-color.ad 20APPDEFS=XTerm.ad XTerm-color.ad
21 21
22BUILDSYMLINKS= XTerm-col.ad XTerm-color.ad 22BUILDSYMLINKS= XTerm-col.ad XTerm-color.ad
23 23
24LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender 24LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
25DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER} 25DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
26LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -ltermcap -lutil 26LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -ltermcap -lutil
27DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ 27DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
28 ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBTERMCAP} ${LIBUTIL} 28 ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBTERMCAP} ${LIBUTIL}
29 29
30SUBDIR= resize uxterm 30SUBDIR= resize uxterm
31 31
32.PATH: ${X11SRCDIR.${PROG}} 32.PATH: ${X11SRCDIR.${PROG}}
33 33
34.include "Makefile.inc" 34.include "Makefile.inc"
35 35
36.include <bsd.x11.mk> 36.include <bsd.x11.mk>
37.include <bsd.prog.mk> 37.include <bsd.prog.mk>
38.include <bsd.subdir.mk> 38.include <bsd.subdir.mk>