Module Name: src
Committed By: mrg
Date: Sat Jul 23 23:42:02 UTC 2011
Modified Files:
src/external/mit/xorg/bin/bdftopcf: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
link against bz2 where necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/bdftopcf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/mkfontscale/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/bin/bdftopcf/Makefile
diff -u src/external/mit/xorg/bin/bdftopcf/Makefile:1.1.1.1 src/external/mit/xorg/bin/bdftopcf/Makefile:1.2
--- src/external/mit/xorg/bin/bdftopcf/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/bdftopcf/Makefile Sat Jul 23 23:42:02 2011
@@ -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}}
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.3 src/external/mit/xorg/tools/fc-cache/Makefile:1.4
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.3 Sat Sep 13 21:37:07 2008
+++ src/external/mit/xorg/tools/fc-cache/Makefile Sat Jul 23 23:42:02 2011
@@ -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"
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.2 src/external/mit/xorg/tools/mkfontscale/Makefile:1.3
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.2 Sat Sep 13 21:37:07 2008
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Sat Jul 23 23:42:02 2011
@@ -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 \
