Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync to changes made in XFree86 4.4 and add -DXFREE86_FT2 appropriately.

Browse Source
This commit is contained in:
lukem 2004-04-29 05:18:25 +00:00
parent befd757743
commit d2df9b79b4
10 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/bin/x11perf/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2003/09/30 06:41:30 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/04/29 05:18:25 lukem Exp $
.include <bsd.own.mk>
@ -7,7 +7,8 @@ SRCS= x11perf.c bitmaps.c do_tests.c do_simple.c do_rects.c do_valgc.c \
do_lines.c do_segs.c do_dots.c do_windows.c do_movewin.c do_text.c \
do_blt.c do_arcs.c do_tris.c do_complex.c do_traps.c
CPPFLAGS+= -DMITSHM -DXFT -DXRENDER -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DMITSHM -DXRENDER
CPPFLAGS+= -DXFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
MAN= Xmark.1 x11perf.1 x11perfcomp.1

4
x11/bin/xclock/Makefile
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.4 2004/04/28 14:17:56 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/04/29 05:18:25 lukem Exp $
.include <bsd.own.mk>
PROG= xclock
SRCS= xclock.c Clock.c
CPPFLAGS+=-DXRENDER -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+=-DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
APPDEFS=XClock.ad XClock-color.ad

5
x11/bin/xditview/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/01/05 13:08:57 rtr Exp $
# $NetBSD: Makefile,v 1.6 2004/04/29 05:18:25 lukem Exp $
.include <bsd.own.mk>
@ -6,7 +6,8 @@ PROG= xditview
SRCS= xditview.c Dvi.c draw.c font.c lex.c page.c parse.c \
XFontName.c DviChar.c
CPPFLAGS+=-DHAS_MKSTEMP -DUSE_XFT -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DHAS_MKSTEMP
CPPFLAGS+= -DUSE_XFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
APPDEFS=Xditview.ad Xditview-chrtr.ad

4
x11/bin/xfd/Makefile
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.3 2003/09/30 06:41:30 lukem Exp $
# $NetBSD: Makefile,v 1.4 2004/04/29 05:18:25 lukem Exp $
.include <bsd.own.mk>
PROG= xfd
SRCS= xfd.c grid.c
CPPFLAGS+=-DXRENDER -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
APPDEFS=Xfd.ad

4
x11/bin/xlogo/Makefile
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.4 2003/09/30 06:41:30 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/04/29 05:18:25 lukem Exp $
.include <bsd.own.mk>
PROG= xlogo
SRCS= xlogo.c Logo.c RenderLogo.c
CPPFLAGS+=-DXRENDER -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
APPDEFS=XLogo.ad XLogo-color.ad

5
x11/bin/xterm/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/01/19 00:30:01 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/04/29 05:18:25 lukem Exp $
.include <bsd.own.mk>
@ -13,7 +13,8 @@ BINMODE=4555
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/xterm \
-I${DESTDIR}${X11INCDIR}/freetype2 \
-DSCROLLBAR_RIGHT -DOPT_WIDE_CHARS -DXRENDERFONT \
-DSCROLLBAR_RIGHT -DOPT_WIDE_CHARS \
-DXRENDERFONT -DXFREE86_FT2 \
-DPROJECTROOT=${X11ROOTDIR}
CPPFLAGS.main.c=-DUTMP -DUSE_TTY_GROUP ${X11FLAGS.VERSION}

4
x11/lib/Xft/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2004/03/12 03:59:42 rtr Exp $
# $NetBSD: Makefile,v 1.8 2004/04/29 05:18:25 lukem Exp $
.include <bsd.own.mk>
@ -15,7 +15,7 @@ INCSDIR=${X11INCDIR}/X11/Xft
MAN= Xft.3
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
# XXX it would be really swell if SCRIPTS was available from bsd.lib.mk
FILES= xft.pc xft-config

4
x11/lib/Xft1/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/01/23 14:32:02 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/04/29 05:18:26 lukem Exp $
NOCHECKVER= yes # we want to install an older version ...
MKLINKLIB= no
@ -14,7 +14,7 @@ SRCS= xftcfg.c xftcolor.c xftcore.c xftdbg.c xftdir.c xftdpy.c \
xftname.c xftpat.c xftrender.c xftstr.c xftxlfd.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
.include <bsd.x11.mk>
.include <bsd.lib.mk>

3
x11/lib/fontconfig/src/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/03/06 03:05:40 rtr Exp $
# $NetBSD: Makefile,v 1.6 2004/04/29 05:18:26 lukem Exp $
.include <bsd.own.mk>
@ -18,6 +18,7 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
-I${X11SRCDIR.xc}/extras/expat/lib
CPPFLAGS+= -DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' -DHAVE_EXPAT
CPPFLAGS+= -DXFREE86_FT2
.include <bsd.x11.mk>
.include <bsd.lib.mk>

4
x11/lib/freetype2/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2004/04/28 14:17:57 lukem Exp $
# $NetBSD: Makefile,v 1.7 2004/04/29 05:18:26 lukem Exp $
.include <bsd.own.mk>
@ -19,7 +19,7 @@ INCS= ft2build.h
INCSDIR=${X11INCDIR}
.PATH: ${FREETYPETOP}/include
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADLIB} -DXFREE86_FT2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
.if defined(MKTTINTERP) && ${MKTTINTERP} != "no"