Sun Mar 11 10:17:10 2018 UTC ()
fix libXfont2 sources list.  update for xfs 1.2.0.


(mrg)
diff -r1.13 -r1.14 src/external/mit/xorg/bin/xfs/Makefile
diff -r1.1 -r1.2 src/external/mit/xorg/lib/libXfont2/Makefile
cvs diff -r1.13 -r1.14 src/external/mit/xorg/bin/xfs/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xfs/Makefile 2018/03/03 03:34:17 1.13
+++ src/external/mit/xorg/bin/xfs/Makefile 2018/03/11 10:17:10 1.14
@@ -1,36 +1,34 @@ @@ -1,36 +1,34 @@
1# $NetBSD: Makefile,v 1.13 2018/03/03 03:34:17 mrg Exp $ 1# $NetBSD: Makefile,v 1.14 2018/03/11 10:17:10 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xfs 5PROG= xfs
6 6
7XFSDIR= ${X11SRCDIR.${PROG}} 7XFSDIR= ${X11SRCDIR.${PROG}}
8 8
9.PATH: ${XFSDIR}/man 9.PATH: ${XFSDIR}/man
10 10
11.PATH: ${XFSDIR}/difs 11.PATH: ${XFSDIR}/difs
12SRCS= atom.c charinfo.c difsutils.c dispatch.c events.c \ 12SRCS= atom.c charinfo.c difsutils.c dispatch.c events.c \
13 extensions.c fontinfo.c fonts.c globals.c initfonts.c main.c \ 13 extensions.c fontinfo.c fonts.c globals.c initfonts.c main.c \
14 resource.c swaprep.c swapreq.c tables.c 14 resource.c swaprep.c swapreq.c tables.c
15 15
16.PATH: ${XFSDIR}/os 16.PATH: ${XFSDIR}/os
17SRCS+= access.c config.c connection.c daemon.c error.c io.c osglue.c \ 17SRCS+= access.c config.c connection.c daemon.c error.c io.c osglue.c \
18 osinit.c utils.c waitfor.c xfstrans.c 18 osinit.c utils.c waitfor.c xfstrans.c
19 19
20CPPFLAGS+= -I${XFSDIR}/include \ 20CPPFLAGS+= -I${XFSDIR}/include \
21 -I${DESTDIR}${X11INCDIR}/X11/FS \ 21 -I${DESTDIR}${X11INCDIR}/X11/FS \
22 -I${X11SRCDIR.libXfont}/include \ 
23 -I${X11SRCDIR.libXfont}/bitmap \ 
24 -I${XFSDIR}/../include \ 22 -I${XFSDIR}/../include \
25 -DHAVE_DAEMON 23 -DHAVE_DAEMON
26 24
27CONN_DEFINES= ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \ 25CONN_DEFINES= ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
28 -DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT 26 -DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
29 27
30XFSCONFIGDIR= ${X11ETCDIR}/fs 28XFSCONFIGDIR= ${X11ETCDIR}/fs
31 29
32CPPFLAGS.initfonts.c= -DFONT_PCF -DFONT_FS -DFONT_SPEEDO 30CPPFLAGS.initfonts.c= -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
33CPPFLAGS.connection.c= ${CONN_DEFINES} -DBSD44SOCKETS \ 31CPPFLAGS.connection.c= ${CONN_DEFINES} -DBSD44SOCKETS \
34 ${X11FLAGS.OS_DEFINES} 32 ${X11FLAGS.OS_DEFINES}
35CPPFLAGS.xfstrans.c= ${CONN_DEFINES} -DBSD44SOCKETS \ 33CPPFLAGS.xfstrans.c= ${CONN_DEFINES} -DBSD44SOCKETS \
36 ${X11FLAGS.OS_DEFINES} 34 ${X11FLAGS.OS_DEFINES}
@@ -49,21 +47,21 @@ X11EXTRAMANDEFS+= -e 's%__configfilepath @@ -49,21 +47,21 @@ X11EXTRAMANDEFS+= -e 's%__configfilepath
49 47
50 48
51.PATH: ${XFSDIR}/config 49.PATH: ${XFSDIR}/config
52BUILDSYMLINKS= config.cpp fsconfig.cpp 50BUILDSYMLINKS= config.cpp fsconfig.cpp
53CPPSCRIPTS= fsconfig 51CPPSCRIPTS= fsconfig
54CPPSCRIPTFLAGS= -DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Type1/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \ 52CPPSCRIPTFLAGS= -DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Type1/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
55 -DFSERRORS=/var/log/xfs.log -D__appmansuffix__=1 53 -DFSERRORS=/var/log/xfs.log -D__appmansuffix__=1
56 54
57CONFIGFILES= fsconfig 55CONFIGFILES= fsconfig
58FILESNAME= config 56FILESNAME= config
59FILESDIR= ${XFSCONFIGDIR} 57FILESDIR= ${XFSCONFIGDIR}
60 58
61 59
62LDADD+= -lXfont -lfontenc -lXext -lX11 -lfreetype -lm -lz 60LDADD+= -lXfont2 -lfontenc -lXext -lX11 -lfreetype -lm -lz
63DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBXEXT} ${LIBX11} \ 61DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBXEXT} ${LIBX11} \
64 ${LIBFREETYPE} ${LIBM} ${LIBZ} 62 ${LIBFREETYPE} ${LIBM} ${LIBZ}
65 63
66.PATH: ${XFSDIR} 64.PATH: ${XFSDIR}
67 65
68.include <bsd.x11.mk> 66.include <bsd.x11.mk>
69.include <bsd.prog.mk> 67.include <bsd.prog.mk>
cvs diff -r1.1 -r1.2 src/external/mit/xorg/lib/libXfont2/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libXfont2/Makefile 2018/03/11 09:43:38 1.1
+++ src/external/mit/xorg/lib/libXfont2/Makefile 2018/03/11 10:17:10 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2018/03/11 09:43:38 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2018/03/11 10:17:10 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= Xfont2 5LIB= Xfont2
6XFONT2DIR= ${X11SRCDIR.${LIB}} 6XFONT2DIR= ${X11SRCDIR.${LIB}}
7 7
8SHLIB_MAJOR= 2 8SHLIB_MAJOR= 2
9SHLIB_MINOR= 0 9SHLIB_MINOR= 0
10 10
11.PATH: ${XFONT2DIR}/include/X11/fonts 11.PATH: ${XFONT2DIR}/include/X11/fonts
12.PATH: ${XFONT2DIR}/../include 12.PATH: ${XFONT2DIR}/../include
13 13
14SRCS.stubs= \ 14SRCS.stubs= \
@@ -45,35 +45,44 @@ SRCS.fontfile= \ @@ -45,35 +45,44 @@ SRCS.fontfile= \
45 renderers.c \ 45 renderers.c \
46 catalogue.c \ 46 catalogue.c \
47 bunzip2.c 47 bunzip2.c
48.PATH: ${XFONT2DIR}/src/fontfile 48.PATH: ${XFONT2DIR}/src/fontfile
49 49
50SRCS.FreeType= \ 50SRCS.FreeType= \
51 ftenc.c \ 51 ftenc.c \
52 ftfuncs.c \ 52 ftfuncs.c \
53 fttools.c \ 53 fttools.c \
54 xttcap.c 54 xttcap.c
55.PATH: ${XFONT2DIR}/src/FreeType 55.PATH: ${XFONT2DIR}/src/FreeType
56 56
57SRCS.bitmap= \ 57SRCS.bitmap= \
58 ftenc.c \ 58 bitmap.c \
59 ftfuncs.c \ 59 bitmapfunc.c \
60 fttools.c \ 60 bitmaputil.c \
61 xttcap.c \ 61 bitscale.c \
 62 fontink.c \
 63 bitmap.c \
 64 bitmapfunc.c \
 65 bitmaputil.c \
 66 bitscale.c \
 67 fontink.c \
62 bdfread.c \ 68 bdfread.c \
63 bdfutils.c \ 69 bdfutils.c \
64 pcfread.c \ 70 pcfread.c
 71.if 0
 72SRCS.bitmap+= \
65 pcfwrite.c \ 73 pcfwrite.c \
66 snfread.c 74 snfread.c
 75.endif
67.PATH: ${XFONT2DIR}/src/bitmap 76.PATH: ${XFONT2DIR}/src/bitmap
68 77
69SRCS.builtins= \ 78SRCS.builtins= \
70 dir.c \ 79 dir.c \
71 file.c \ 80 file.c \
72 fonts.c \ 81 fonts.c \
73 fpe.c \ 82 fpe.c \
74 render.c 83 render.c
75.PATH: ${XFONT2DIR}/src/builtins 84.PATH: ${XFONT2DIR}/src/builtins
76 85
77SRCS.fc= \ 86SRCS.fc= \
78 fsconvert.c \ 87 fsconvert.c \
79 fserve.c \ 88 fserve.c \