[src/netbsd-7]: src Pull up following revision(s) (requested by mrg in ticket...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d32e8f08a153
branches:  netbsd-7
changeset: 799073:d32e8f08a153
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Mar 11 07:21:15 2015 +0000

description:
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

diffstat:

 distrib/sets/lists/xcomp/mi               |  6 +++---
 external/mit/xorg/include/xtrans/Makefile |  6 +++---
 external/mit/xorg/lib/libXfont/Makefile   |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (63 lines):

diff -r 0fce5d2605c6 -r d32e8f08a153 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Mon Mar 09 17:46:33 2015 +0000
+++ b/distrib/sets/lists/xcomp/mi       Wed Mar 11 07:21:15 2015 +0000
@@ -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
diff -r 0fce5d2605c6 -r d32e8f08a153 external/mit/xorg/include/xtrans/Makefile
--- a/external/mit/xorg/include/xtrans/Makefile Mon Mar 09 17:46:33 2015 +0000
+++ b/external/mit/xorg/include/xtrans/Makefile Wed Mar 11 07:21:15 2015 +0000
@@ -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
diff -r 0fce5d2605c6 -r d32e8f08a153 external/mit/xorg/lib/libXfont/Makefile
--- a/external/mit/xorg/lib/libXfont/Makefile   Mon Mar 09 17:46:33 2015 +0000
+++ b/external/mit/xorg/lib/libXfont/Makefile   Wed Mar 11 07:21:15 2015 +0000
@@ -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 @@
        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 \