[src/trunk]: src/external/mit/xorg link against bz2 where necessary.

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

details:   https://anonhg.NetBSD.org/src/rev/14ab6c0745ed
branches:  trunk
changeset: 767602:14ab6c0745ed
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jul 23 23:42:02 2011 +0000

description:
link against bz2 where necessary.

diffstat:

 external/mit/xorg/bin/bdftopcf/Makefile      |  6 +++---
 external/mit/xorg/tools/fc-cache/Makefile    |  7 ++++++-
 external/mit/xorg/tools/mkfontscale/Makefile |  7 +++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (74 lines):

diff -r b5efa2e8a151 -r 14ab6c0745ed external/mit/xorg/bin/bdftopcf/Makefile
--- a/external/mit/xorg/bin/bdftopcf/Makefile   Sat Jul 23 23:38:19 2011 +0000
+++ b/external/mit/xorg/bin/bdftopcf/Makefile   Sat Jul 23 23:42:02 2011 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2011/07/23 23:42:02 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  bdftopcf
 
-LDADD+=        -lXfont -lfontenc -lfreetype -lm -lz
-DPADD+=        ${LIBXFONT} ${LIBFONTENC} ${LIBFREETYPE} ${LIBM} ${LIBZ}
+LDADD+=        -lXfont -lfontenc -lfreetype -lm -lz -lbz2
+DPADD+=        ${LIBXFONT} ${LIBFONTENC} ${LIBFREETYPE} ${LIBM} ${LIBZ} ${LIBBZ2}
 
 .PATH: ${X11SRCDIR.${PROG}}
 
diff -r b5efa2e8a151 -r 14ab6c0745ed external/mit/xorg/tools/fc-cache/Makefile
--- a/external/mit/xorg/tools/fc-cache/Makefile Sat Jul 23 23:38:19 2011 +0000
+++ b/external/mit/xorg/tools/fc-cache/Makefile Sat Jul 23 23:42:02 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2008/09/13 21:37:07 hubertf Exp $
+#      $NetBSD: Makefile,v 1.4 2011/07/23 23:42:02 mrg Exp $
 
 NOMAN=         1
 
@@ -39,6 +39,9 @@
 .PATH: ${FREETYPE}/src/gzip
 SRCS.freetype+=        ftgzip.c
 
+.PATH: ${FREETYPE}/src/bzip2
+SRCS.freetype+=        ftbzip2.c
+
 .PATH: ${FREETYPE}/src/lzw
 SRCS.freetype+=        ftlzw.c
 
@@ -102,6 +105,8 @@
                -I${FONTCONFIG}/../include \
                -I${DESTDIR}${X11INCDIR} -I.
 
+LDADD= -lz -lbz2
+
 FCARCH_DEPFILE=        fc-cache.c
 .include "../../lib/fontconfig/src/Makefile.fcarch"
 
diff -r b5efa2e8a151 -r 14ab6c0745ed external/mit/xorg/tools/mkfontscale/Makefile
--- a/external/mit/xorg/tools/mkfontscale/Makefile      Sat Jul 23 23:38:19 2011 +0000
+++ b/external/mit/xorg/tools/mkfontscale/Makefile      Sat Jul 23 23:42:02 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/09/13 21:37:07 hubertf Exp $
+#      $NetBSD: Makefile,v 1.3 2011/07/23 23:42:02 mrg Exp $
 
 NOMAN=         1
 
@@ -31,6 +31,9 @@
 .PATH: ${FREETYPE}/src/gzip
 SRCS.freetype+=        ftgzip.c
 
+.PATH: ${FREETYPE}/src/bzip2
+SRCS.freetype+=        ftbzip2.c
+
 .PATH: ${FREETYPE}/src/lzw
 SRCS.freetype+=        ftlzw.c
 
@@ -75,7 +78,7 @@
 
 SRCS+= ${SRCS.mkfontscale} ${SRCS.freetype} ${SRCS.fontenc}
 
-LDADD= -lz
+LDADD= -lz -lbz2
 
 HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
                -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \