Module Name: src
Committed By: mrg
Date: Sun Jul 19 08:18:33 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libX11: Makefile
Removed Files:
src/external/mit/xorg/lib/libX11: Makefile.xlocale
src/external/mit/xorg/lib/libX11/xlocale: Makefile
Log Message:
updates for libX11 1.6.3 - "xlocale" is removed.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/libX11/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/libX11/Makefile.xlocale
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/libX11/xlocale/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.63 src/distrib/sets/lists/xbase/shl.mi:1.64
--- src/distrib/sets/lists/xbase/shl.mi:1.63 Sat Jun 27 16:21:08 2015
+++ src/distrib/sets/lists/xbase/shl.mi Sun Jul 19 08:18:32 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.63 2015/06/27 16:21:08 matt Exp $
+# $NetBSD: shl.mi,v 1.64 2015/07/19 08:18:32 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -159,9 +159,9 @@
./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2 -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0 -unknown- xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlocale.so -unknown- xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2 -unknown- xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0 -unknown- xorg
+./usr/X11R7/lib/X11/locale/lib/common/xlocale.so -unknown- xorg,obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2 -unknown- xorg,obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0 -unknown- xorg,obsolete
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2 -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0 -unknown- xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.25 src/distrib/sets/lists/xdebug/shl.mi:1.26
--- src/distrib/sets/lists/xdebug/shl.mi:1.25 Sat Jun 27 16:21:08 2015
+++ src/distrib/sets/lists/xdebug/shl.mi Sun Jul 19 08:18:32 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.25 2015/06/27 16:21:08 matt Exp $
+# $NetBSD: shl.mi,v 1.26 2015/07/19 08:18:32 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -57,7 +57,7 @@
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libFS.so.7.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libGL.so.2.0.debug -unknown- xorg,debug,compatx11file
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.12 src/external/mit/xorg/lib/libX11/Makefile:1.13
--- src/external/mit/xorg/lib/libX11/Makefile:1.12 Sun Aug 24 18:27:16 2014
+++ src/external/mit/xorg/lib/libX11/Makefile Sun Jul 19 08:18:32 2015
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2014/08/24 18:27:16 apb Exp $
+# $NetBSD: Makefile,v 1.13 2015/07/19 08:18:32 mrg Exp $
.include <bsd.own.mk>
SUBDIR= dynamic .WAIT libX11-xcb static \
- ximcp xlcDef xlcUTF8Load xlibi18n xlocale xomGeneric
+ ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric
INCS= ImUtil.h XKBlib.h Xcms.h Xlib-xcb.h Xlib.h XlibConf.h \
Xlibint.h Xlocale.h Xregion.h Xresource.h Xutil.h \
