Module Name: src
Committed By: riz
Date: Fri Jan 7 23:57:05 UTC 2011
Modified Files:
src/external/mit/xorg/tools/bdftopcf [netbsd-5]: Makefile
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 \
src/external/mit/xorg/tools/bdftopcf/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/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.1.1.1.8.1 src/external/mit/xorg/tools/bdftopcf/Makefile:1.1.1.1.8.2
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.1.1.1.8.1 Thu Sep 17 04:24:42 2009
+++ src/external/mit/xorg/tools/bdftopcf/Makefile Fri Jan 7 23:57:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1.8.1 2009/09/17 04:24:42 snj Exp $
+# $NetBSD: Makefile,v 1.1.1.1.8.2 2011/01/07 23:57:04 riz 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 miscutil.c private.c utilbitmap.c
-LDADD+= -lz -lbz2
+LDADD+= -lz
.include <bsd.x11.mk>
.include <bsd.hostprog.mk>
