Module Name: src
Committed By: mrg
Date: Mon Mar 17 01:09:07 UTC 2014
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/include/xtrans: Makefile
Log Message:
merge xtrans 1.3.3 (deletes Xtranstli.c -- so sad, bye bye.)
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/include/xtrans/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.145 src/distrib/sets/lists/xcomp/mi:1.146
--- src/distrib/sets/lists/xcomp/mi:1.145 Sun Mar 16 23:25:15 2014
+++ src/distrib/sets/lists/xcomp/mi Mon Mar 17 01:09:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.145 2014/03/16 23:25:15 mrg Exp $
+# $NetBSD: mi,v 1.146 2014/03/17 01:09:07 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5334,7 +5334,7 @@
./usr/X11R7/include/X11/Xtrans/Xtranslcl.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtransos2.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtranssock.c -unknown- xorg
-./usr/X11R7/include/X11/Xtrans/Xtranstli.c -unknown- xorg
+./usr/X11R7/include/X11/Xtrans/Xtranstli.c -obsolete- obsolete
./usr/X11R7/include/X11/Xtrans/Xtransutil.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/transport.c -unknown- xorg
./usr/X11R7/include/X11/Xutil.h -unknown- xorg
Index: src/external/mit/xorg/include/xtrans/Makefile
diff -u src/external/mit/xorg/include/xtrans/Makefile:1.2 src/external/mit/xorg/include/xtrans/Makefile:1.3
--- src/external/mit/xorg/include/xtrans/Makefile:1.2 Sat Sep 13 04:32:29 2008
+++ src/external/mit/xorg/include/xtrans/Makefile Mon Mar 17 01:09:07 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/17 01:09:07 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xtrans}
INCS= Xtrans.c Xtrans.h Xtransdnet.c Xtransint.h Xtranslcl.c \
- Xtransos2.c Xtranssock.c Xtranstli.c Xtransutil.c transport.c
+ Xtransos2.c Xtranssock.c Xtransutil.c transport.c
INCSDIR=${X11INCDIR}/X11/Xtrans
NOOBJ= # defined
