[src/trunk]: src/external/mit/xorg/tools/bdftopcf Disable bzip2 support in to...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d9d9218da7ee
branches:  trunk
changeset: 759889:d9d9218da7ee
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Dec 19 13:04:54 2010 +0000

description:
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).

diffstat:

 external/mit/xorg/tools/bdftopcf/Makefile |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 29b1e57d988e -r d9d9218da7ee external/mit/xorg/tools/bdftopcf/Makefile
--- a/external/mit/xorg/tools/bdftopcf/Makefile Sun Dec 19 11:05:06 2010 +0000
+++ b/external/mit/xorg/tools/bdftopcf/Makefile Sun Dec 19 13:04:54 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2010/08/14 11:12:16 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2010/12/19 13:04:54 tsutsui Exp $
 
 NOMAN=         1
 
@@ -16,7 +16,7 @@
                -I${DESTDIR}${X11INCDIR}/X11/fonts \
                -I${DESTDIR}${X11INCDIR}/freetype2 \
                -I${X11SRCDIR.Xfont}/src/stubs \
-               -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION \
+               -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \
                -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\"
 
 .PATH:         ${X11SRCDIR.Xfont}/src/bitmap
@@ -24,12 +24,12 @@
                pcfread.c pcfwrite.c
 
 .PATH:         ${X11SRCDIR.Xfont}/src/fontfile
-SRCS+=         bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c bunzip2.c
+SRCS+=         bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c
 
 .PATH:         ${X11SRCDIR.Xfont}/src/util
 SRCS+=         atom.c fontaccel.c private.c utilbitmap.c
 
-LDADD+=                -lz -lbz2
+LDADD+=                -lz
 
 .include <bsd.x11.mk>
 .include <bsd.hostprog.mk>