Module Name: src
Committed By: mrg
Date: Wed Jun 10 07:52:07 UTC 2009
Modified Files:
src/external/mit/xorg/lib/libXfont: Makefile shlib_version
src/external/mit/xorg/tools/bdftopcf: Makefile
Log Message:
merge libXfont 1.4.0.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXfont/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXfont/shlib_version
cvs rdiff -u -r1.2 -r1.3 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/lib/libXfont/Makefile
diff -u src/external/mit/xorg/lib/libXfont/Makefile:1.5 src/external/mit/xorg/lib/libXfont/Makefile:1.6
--- src/external/mit/xorg/lib/libXfont/Makefile:1.5 Wed Jun 10 02:04:20 2009
+++ src/external/mit/xorg/lib/libXfont/Makefile Wed Jun 10 07:52:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/06/10 02:04:20 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/10 07:52:07 mrg Exp $
.include <bsd.own.mk>
@@ -6,8 +6,8 @@
XFONTDIR= ${X11SRCDIR.${LIB}}
.PATH: ${XFONTDIR}/src
.PATH: ${XFONTDIR}/src/FreeType
-.PATH: ${XFONTDIR}/src/Speedo
-.PATH: ${XFONTDIR}/src/Type1
+#.PATH: ${XFONTDIR}/src/Speedo
+#.PATH: ${XFONTDIR}/src/Type1
.PATH: ${XFONTDIR}/src/bitmap
.PATH: ${XFONTDIR}/src/builtins
.PATH: ${XFONTDIR}/src/fc
@@ -18,26 +18,21 @@
.PATH: ${XFONTDIR}/include/X11/fonts
.PATH: ${XFONTDIR}/../include
-SRCS= ftenc.c ftfuncs.c fttools.c xttcap.c bics-unicode.c do_char.c \
- do_trns.c out_bl2d.c out_blk.c out_outl.c out_scrn.c out_util.c \
- reset.c set_spcs.c set_trns.c spencode.c sperr.c spfile.c spfont.c \
- spfuncs.c spglyph.c spinfo.c arith.c curves.c fontfcn.c hints.c \
- lines.c objects.c paths.c regions.c scanfont.c spaces.c t1funcs.c \
- t1info.c t1io.c t1malloc.c t1snap.c t1unicode.c token.c type1.c \
- util.c bdfread.c bdfutils.c bitmap.c bitmapfunc.c bitmaputil.c \
+SRCS= ftenc.c ftfuncs.c fttools.c xttcap.c \
+ bdfread.c bdfutils.c bitmap.c bitmapfunc.c bitmaputil.c \
bitscale.c fontink.c pcfread.c pcfwrite.c snfread.c dir.c file.c \
fonts.c fpe.c render.c fsconvert.c fserve.c fsio.c fstrans.c \
- fontcache.c bitsource.c bufio.c catalogue.c decompress.c defaults.c \
- dirfile.c ffcheck.c fileio.c filewr.c fontdir.c fontencc.c fontfile.c \
- fontscale.c gunzip.c printerfont.c register.c renderers.c cauthgen.c \
- csignal.c delfntcid.c errorf.c fatalerror.c findoldfnt.c fontmod.c \
+ bitsource.c bufio.c catalogue.c decompress.c defaults.c \
+ dirfile.c fileio.c filewr.c fontdir.c fontencc.c fontfile.c \
+ fontscale.c gunzip.c register.c renderers.c bunzip2.c cauthgen.c \
+ csignal.c delfntcid.c errorf.c fatalerror.c findoldfnt.c \
getcres.c getdefptsize.c getnewfntcid.c gettime.c initfshdl.c \
regfpefunc.c rmfshdl.c servclient.c setfntauth.c stfntcfnt.c \
- xpstubs.c atom.c fontaccel.c fontnames.c fontutil.c fontxlfd.c \
+ atom.c fontaccel.c fontnames.c fontutil.c fontxlfd.c \
format.c miscutil.c patcache.c private.c utilbitmap.c
INCS= bdfint.h bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h \
- fontconf.h fontencc.h fontmisc.h fontmod.h fontshow.h \
+ fontconf.h fontencc.h fontmisc.h fontshow.h \
fontutil.h fontxlfd.h ft.h ftfuncs.h pcf.h
INCSDIR=${X11INCDIR}/X11/fonts
Index: src/external/mit/xorg/lib/libXfont/shlib_version
diff -u src/external/mit/xorg/lib/libXfont/shlib_version:1.2 src/external/mit/xorg/lib/libXfont/shlib_version:1.3
--- src/external/mit/xorg/lib/libXfont/shlib_version:1.2 Sun Jan 11 03:10:11 2009
+++ src/external/mit/xorg/lib/libXfont/shlib_version Wed Jun 10 07:52:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:11 christos Exp $
+# $NetBSD: shlib_version,v 1.3 2009/06/10 07:52:07 mrg Exp $
#
-major=2
+major=3
minor=0
Index: src/external/mit/xorg/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.2 src/external/mit/xorg/tools/bdftopcf/Makefile:1.3
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.2 Wed Jun 10 02:01:39 2009
+++ src/external/mit/xorg/tools/bdftopcf/Makefile Wed Jun 10 07:52:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/06/10 02:01:39 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/10 07:52:07 mrg Exp $
NOMAN= 1
@@ -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
+SRCS+= bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c bunzip2.c
.PATH: ${X11SRCDIR.Xfont}/src/util
SRCS+= atom.c fontaccel.c miscutil.c private.c utilbitmap.c
-LDADD+= -lz
+LDADD+= -lz -lbz2
.include <bsd.x11.mk>
.include <bsd.hostprog.mk>
