Module Name: src
Committed By: mrg
Date: Sun Mar 11 09:43:39 UTC 2018
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/lib: Makefile
Added Files:
src/external/mit/xorg/lib/libXfont2: Makefile
Log Message:
build and install libXfont2.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.193 -r1.194 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.41 -r1.42 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXfont2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.80 src/distrib/sets/lists/xbase/shl.mi:1.81
--- src/distrib/sets/lists/xbase/shl.mi:1.80 Sun Mar 11 07:18:49 2018
+++ src/distrib/sets/lists/xbase/shl.mi Sun Mar 11 09:43:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.80 2018/03/11 07:18:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.81 2018/03/11 09:43:39 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -89,6 +89,9 @@
./usr/X11R7/lib/libXfixes.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libXfixes.so.4 -unknown- xorg,compatx11file
./usr/X11R7/lib/libXfixes.so.4.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfont2.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfont2.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfont2.so.2.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/libXfont.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libXfont.so.3 -unknown- xorg,compatx11file
./usr/X11R7/lib/libXfont.so.3.0 -unknown- xorg,compatx11file
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.193 src/distrib/sets/lists/xcomp/mi:1.194
--- src/distrib/sets/lists/xcomp/mi:1.193 Sun Mar 11 07:18:49 2018
+++ src/distrib/sets/lists/xcomp/mi Sun Mar 11 09:43:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.193 2018/03/11 07:18:49 mrg Exp $
+# $NetBSD: mi,v 1.194 2018/03/11 09:43:39 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -516,6 +516,7 @@
./usr/X11R7/include/X11/fonts/fsmasks.h -unknown- xorg
./usr/X11R7/include/X11/fonts/ft.h -unknown- xorg
./usr/X11R7/include/X11/fonts/ftfuncs.h -unknown- xorg
+./usr/X11R7/include/X11/fonts/libxfont2.h -unknown- xorg
./usr/X11R7/include/X11/fonts/pcf.h -unknown- xorg
./usr/X11R7/include/X11/keysym.h -unknown- xorg
./usr/X11R7/include/X11/keysymdef.h -unknown- xorg
@@ -1136,6 +1137,8 @@
./usr/X11R7/lib/libXext_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libXfixes.a -unknown- xorg,compatx11file
./usr/X11R7/lib/libXfixes_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXfont2.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfont2_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libXfont.a -unknown- xorg,compatx11file
./usr/X11R7/lib/libXfont_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libXfontcache.a -unknown- obsolete
@@ -1389,6 +1392,7 @@
./usr/X11R7/lib/pkgconfig/xf86miscproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xf86vidmodeproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xfixes.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xfont2.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xfont.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xfontcache.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xft.pc -unknown- xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.49 src/distrib/sets/lists/xcomp/shl.mi:1.50
--- src/distrib/sets/lists/xcomp/shl.mi:1.49 Sun Mar 11 07:18:49 2018
+++ src/distrib/sets/lists/xcomp/shl.mi Sun Mar 11 09:43:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.49 2018/03/11 07:18:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.50 2018/03/11 09:43:39 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -24,6 +24,7 @@
./usr/X11R7/lib/libXevie_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libXext_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libXfixes_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXfont2_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libXfont_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libXfontcache_pic.a -unknown- obsolete
./usr/X11R7/lib/libXft_pic.a -unknown- xorg,picinstall,compatx11file
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.27 src/distrib/sets/lists/xdebug/mi:1.28
--- src/distrib/sets/lists/xdebug/mi:1.27 Sun Mar 11 07:18:49 2018
+++ src/distrib/sets/lists/xdebug/mi Sun Mar 11 09:43:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.27 2018/03/11 07:18:49 mrg Exp $
+# $NetBSD: mi,v 1.28 2018/03/11 09:43:39 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R7/lib -unknown- debuglib,xorg,compatx11dir
./usr/X11R7/lib/libFS_g.a -unknown- debuglib,xorg,compatx11file
@@ -24,6 +24,7 @@
./usr/X11R7/lib/libXevie_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXext_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXfixes_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXfont2_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXfont_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXfontcache_g.a -unknown- obsolete
./usr/X11R7/lib/libXft_g.a -unknown- debuglib,xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.42 src/distrib/sets/lists/xdebug/shl.mi:1.43
--- src/distrib/sets/lists/xdebug/shl.mi:1.42 Sun Mar 11 07:18:49 2018
+++ src/distrib/sets/lists/xdebug/shl.mi Sun Mar 11 09:43:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.42 2018/03/11 07:18:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.43 2018/03/11 09:43:39 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete xorg,obsolete
@@ -34,6 +34,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXevie.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXext.so.7.1.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXfixes.so.4.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXfont2.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/libXft.so.3.0.debug -unknown- xorg,debug,compatx11file
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.41 src/external/mit/xorg/lib/Makefile:1.42
--- src/external/mit/xorg/lib/Makefile:1.41 Sun Mar 11 07:18:49 2018
+++ src/external/mit/xorg/lib/Makefile Sun Mar 11 09:43:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2018/03/11 07:18:49 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2018/03/11 09:43:38 mrg Exp $
# build libraries for xorg
@@ -28,7 +28,7 @@ SUBDIR+=fontconfig libSM libX11 \
.WAIT \
libXi libXxf86vm \
.WAIT \
- libGL libXScrnSaver libXTrap libXevie libXfont \
+ libGL libXScrnSaver libXTrap libXevie libXfont libXfont2 \
libXinerama libXmu libXmuu libXpm libXrender \
libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \
libxkbui \
Added files:
Index: src/external/mit/xorg/lib/libXfont2/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libXfont2/Makefile:1.1
--- /dev/null Sun Mar 11 09:43:39 2018
+++ src/external/mit/xorg/lib/libXfont2/Makefile Sun Mar 11 09:43:38 2018
@@ -0,0 +1,117 @@
+# $NetBSD: Makefile,v 1.1 2018/03/11 09:43:38 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= Xfont2
+XFONT2DIR= ${X11SRCDIR.${LIB}}
+
+SHLIB_MAJOR= 2
+SHLIB_MINOR= 0
+
+.PATH: ${XFONT2DIR}/include/X11/fonts
+.PATH: ${XFONT2DIR}/../include
+
+SRCS.stubs= \
+ atom.c \
+ libxfontstubs.c
+.PATH: ${XFONT2DIR}/src/stubs
+
+SRCS.util= \
+ fontaccel.c \
+ fontnames.c \
+ fontutil.c \
+ fontxlfd.c \
+ format.c \
+ miscutil.c \
+ patcache.c \
+ private.c \
+ utilbitmap.c
+.PATH: ${XFONT2DIR}/src/util
+
+SRCS.fontfile= \
+ bitsource.c \
+ bufio.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 \
+ catalogue.c \
+ bunzip2.c
+.PATH: ${XFONT2DIR}/src/fontfile
+
+SRCS.FreeType= \
+ ftenc.c \
+ ftfuncs.c \
+ fttools.c \
+ xttcap.c
+.PATH: ${XFONT2DIR}/src/FreeType
+
+SRCS.bitmap= \
+ ftenc.c \
+ ftfuncs.c \
+ fttools.c \
+ xttcap.c \
+ bdfread.c \
+ bdfutils.c \
+ pcfread.c \
+ pcfwrite.c \
+ snfread.c
+.PATH: ${XFONT2DIR}/src/bitmap
+
+SRCS.builtins= \
+ dir.c \
+ file.c \
+ fonts.c \
+ fpe.c \
+ render.c
+.PATH: ${XFONT2DIR}/src/builtins
+
+SRCS.fc= \
+ fsconvert.c \
+ fserve.c \
+ fsio.c \
+ fstrans.c
+.PATH: ${XFONT2DIR}/src/fc
+
+.for dir in stubs util fontfile FreeType bitmap builtins fc
+SRCS+= ${SRCS.${dir}}
+.endfor
+
+INCS= libxfont2.h
+INCSDIR=${X11INCDIR}/X11/fonts
+
+CPPFLAGS+= ${X11FLAGS.THREADLIB} ${X11FLAGS.CONNECTION}
+CPPFLAGS+= -DHAS_SNPRINTF -DHAVE_CONFIG_H
+CPPFLAGS+= -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION
+CPPFLAGS+= -DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\"
+CPPFLAGS+= -I${XFONT2DIR}/src/stubs
+CPPFLAGS+= -I${XFONT2DIR}/include
+CPPFLAGS+= -I${XFONT2DIR}/../include
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
+
+LIBDPLIBS=\
+ Xt ${.CURDIR}/../libXt \
+ SM ${.CURDIR}/../libSM \
+ ICE ${.CURDIR}/../libICE \
+ Xext ${.CURDIR}/../libXext \
+ fontenc ${.CURDIR}/../libfontenc \
+ freetype ${.CURDIR}/../freetype \
+ X11 ${.CURDIR}/../libX11/dynamic \
+ m ${.CURDIR}/../../../../../lib/libm \
+ z ${.CURDIR}/../../../../../lib/libz \
+ bz2 ${.CURDIR}/../../../../../lib/libbz2
+
+PKGDIST= ${LIB}
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
