Sat Jan 8 00:52:28 2011 UTC ()
Pull up following revision(s) (requested by tsutsui in ticket #1512):
	external/mit/xorg/tools/bdftopcf/Makefile: revision 1.5
Disable bzip2 support in tools bdftopcf(1).
We don't use bzip2 fonts on build and some OS doesn't have bzip2 headers.
Ok'ed by mrg@, martin@, fixes PR/44138.
Should be pulled up to netbsd-5 (and netbsd-5-1).


(riz)
diff -r1.1.1.1.8.1 -r1.1.1.1.8.1.2.1 src/external/mit/xorg/tools/bdftopcf/Makefile
cvs diff -r1.1.1.1.8.1 -r1.1.1.1.8.1.2.1 src/external/mit/xorg/tools/bdftopcf/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/tools/bdftopcf/Makefile 2009/09/17 04:24:42 1.1.1.1.8.1
+++ src/external/mit/xorg/tools/bdftopcf/Makefile 2011/01/08 00:52:27 1.1.1.1.8.1.2.1
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.1.1.1.8.1 2009/09/17 04:24:42 snj Exp $ 1# $NetBSD: Makefile,v 1.1.1.1.8.1.2.1 2011/01/08 00:52:27 riz Exp $
2 2
3NOMAN= 1 3NOMAN= 1
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7HOSTPROG= bdftopcf 7HOSTPROG= bdftopcf
8.PATH: ${X11SRCDIR.bdftopcf} 8.PATH: ${X11SRCDIR.bdftopcf}
9 9
10FREETYPE= ${X11SRCDIR.freetype} 10FREETYPE= ${X11SRCDIR.freetype}
11 11
12SRCS= bdftopcf.c 12SRCS= bdftopcf.c
13 13
14HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \ 14HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \
15 -I${DESTDIR}${X11INCDIR} \ 15 -I${DESTDIR}${X11INCDIR} \
16 -I${DESTDIR}${X11INCDIR}/X11/fonts \ 16 -I${DESTDIR}${X11INCDIR}/X11/fonts \
17 -I${DESTDIR}${X11INCDIR}/freetype2 \ 17 -I${DESTDIR}${X11INCDIR}/freetype2 \
18 -I${X11SRCDIR.Xfont}/src/stubs \ 18 -I${X11SRCDIR.Xfont}/src/stubs \
19 -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION \ 19 -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \
20 -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" 20 -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\"
21 21
22.PATH: ${X11SRCDIR.Xfont}/src/bitmap 22.PATH: ${X11SRCDIR.Xfont}/src/bitmap
23SRCS+= bdfread.c bdfutils.c bitmap.c bitmaputil.c fontink.c \ 23SRCS+= bdfread.c bdfutils.c bitmap.c bitmaputil.c fontink.c \
24 pcfread.c pcfwrite.c 24 pcfread.c pcfwrite.c
25 25
26.PATH: ${X11SRCDIR.Xfont}/src/fontfile 26.PATH: ${X11SRCDIR.Xfont}/src/fontfile
27SRCS+= bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c bunzip2.c 27SRCS+= bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c
28 28
29.PATH: ${X11SRCDIR.Xfont}/src/util 29.PATH: ${X11SRCDIR.Xfont}/src/util
30SRCS+= atom.c fontaccel.c miscutil.c private.c utilbitmap.c 30SRCS+= atom.c fontaccel.c miscutil.c private.c utilbitmap.c
31 31
32LDADD+= -lz -lbz2 32LDADD+= -lz
33 33
34.include <bsd.x11.mk> 34.include <bsd.x11.mk>
35.include <bsd.hostprog.mk> 35.include <bsd.hostprog.mk>