Module Name: src
Committed By: snj
Date: Wed Mar 11 07:21:15 UTC 2015
Modified Files:
src/distrib/sets/lists/xcomp [netbsd-7]: mi
src/external/mit/xorg/include/xtrans [netbsd-7]: Makefile
src/external/mit/xorg/lib/libXfont [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #585):
distrib/sets/lists/xcomp/mi: revision 1.157
external/mit/xorg/include/xtrans/Makefile: revision 1.4
external/mit/xorg/lib/libXfont/Makefile: revision 1.10
don't install Xtransdnet.c or Xtransos2.c, which were last part of xtrans
1.2.1.
--
update for libXfont 1.5.0
To generate a diff of this commit:
cvs rdiff -u -r1.152.2.4 -r1.152.2.5 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.3 -r1.3.4.1 src/external/mit/xorg/include/xtrans/Makefile
cvs rdiff -u -r1.9 -r1.9.10.1 src/external/mit/xorg/lib/libXfont/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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.152.2.4 src/distrib/sets/lists/xcomp/mi:1.152.2.5
--- src/distrib/sets/lists/xcomp/mi:1.152.2.4 Sat Feb 21 19:30:41 2015
+++ src/distrib/sets/lists/xcomp/mi Wed Mar 11 07:21:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.152.2.4 2015/02/21 19:30:41 martin Exp $
+# $NetBSD: mi,v 1.152.2.5 2015/03/11 07:21:15 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5332,10 +5332,10 @@
./usr/X11R7/include/X11/Xtos.h -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtrans.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtrans.h -unknown- xorg
-./usr/X11R7/include/X11/Xtrans/Xtransdnet.c -unknown- xorg
+./usr/X11R7/include/X11/Xtrans/Xtransdnet.c -obsolete- obsolete
./usr/X11R7/include/X11/Xtrans/Xtransint.h -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtranslcl.c -unknown- xorg
-./usr/X11R7/include/X11/Xtrans/Xtransos2.c -unknown- xorg
+./usr/X11R7/include/X11/Xtrans/Xtransos2.c -obsolete- obsolete
./usr/X11R7/include/X11/Xtrans/Xtranssock.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtranstli.c -obsolete- obsolete
./usr/X11R7/include/X11/Xtrans/Xtransutil.c -unknown- xorg
Index: src/external/mit/xorg/include/xtrans/Makefile
diff -u src/external/mit/xorg/include/xtrans/Makefile:1.3 src/external/mit/xorg/include/xtrans/Makefile:1.3.4.1
--- src/external/mit/xorg/include/xtrans/Makefile:1.3 Mon Mar 17 01:09:07 2014
+++ src/external/mit/xorg/include/xtrans/Makefile Wed Mar 11 07:21:15 2015
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2014/03/17 01:09:07 mrg Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2015/03/11 07:21:15 snj Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xtrans}
-INCS= Xtrans.c Xtrans.h Xtransdnet.c Xtransint.h Xtranslcl.c \
- Xtransos2.c Xtranssock.c Xtransutil.c transport.c
+INCS= Xtrans.c Xtrans.h Xtransint.h Xtranslcl.c \
+ Xtranssock.c Xtransutil.c transport.c
INCSDIR=${X11INCDIR}/X11/Xtrans
NOOBJ= # defined
Index: src/external/mit/xorg/lib/libXfont/Makefile
diff -u src/external/mit/xorg/lib/libXfont/Makefile:1.9 src/external/mit/xorg/lib/libXfont/Makefile:1.9.10.1
--- src/external/mit/xorg/lib/libXfont/Makefile:1.9 Wed Apr 4 10:59:45 2012
+++ src/external/mit/xorg/lib/libXfont/Makefile Wed Mar 11 07:21:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/04/04 10:59:45 joerg Exp $
+# $NetBSD: Makefile,v 1.9.10.1 2015/03/11 07:21:15 snj Exp $
.include <bsd.own.mk>
@@ -25,11 +25,11 @@ SRCS= ftenc.c ftfuncs.c fttools.c xttcap
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 \
+ csignal.c delfntcid.c errorf.c findoldfnt.c \
getcres.c getdefptsize.c getnewfntcid.c gettime.c initfshdl.c \
regfpefunc.c rmfshdl.c servclient.c setfntauth.c stfntcfnt.c \
atom.c fontaccel.c fontnames.c fontutil.c fontxlfd.c \
- format.c miscutil.c patcache.c private.c utilbitmap.c
+ format.c miscutil.c patcache.c private.c utilbitmap.c stubsinit.c
INCS= bdfint.h bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h \
fontconf.h fontencc.h fontmisc.h fontshow.h \
