updates for libX11 1.6.3 - "xlocale" is removed.
This commit is contained in:
parent
e0cef65194
commit
14b386c679
@ -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
|
||||
|
@ -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
|
||||
|
4
external/mit/xorg/lib/libX11/Makefile
vendored
4
external/mit/xorg/lib/libX11/Makefile
vendored
@ -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 \
|
||||
|
18
external/mit/xorg/lib/libX11/Makefile.xlocale
vendored
18
external/mit/xorg/lib/libX11/Makefile.xlocale
vendored
@ -1,18 +0,0 @@
|
||||
# $NetBSD: Makefile.xlocale,v 1.1 2008/09/07 13:15:11 rtr Exp $
|
||||
|
||||
.PATH: ${X11SRCDIR.X11}/modules/lc/xlocale
|
||||
|
||||
SRCS.xlocale= \
|
||||
lcEuc.c \
|
||||
lcJis.c \
|
||||
lcSjis.c
|
||||
|
||||
CPPFLAGS+= \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${X11SRCDIR.X11}/src/xlocale
|
||||
|
||||
CPPFLAGS+= \
|
||||
${X11FLAGS.THREADS} \
|
||||
-DHASXDMAUTH
|
||||
|
||||
.include <bsd.lib.mk>
|
14
external/mit/xorg/lib/libX11/xlocale/Makefile
vendored
14
external/mit/xorg/lib/libX11/xlocale/Makefile
vendored
@ -1,14 +0,0 @@
|
||||
# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $
|
||||
|
||||
LIBISMODULE= yes
|
||||
SHLIB_MAJOR= 2 # XXX
|
||||
SHLIB_MINOR= 0
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.x11.mk>
|
||||
|
||||
LIB= xlocale
|
||||
LIBDIR= ${X11LIBDIR}/locale/lib/common
|
||||
SRCS= ${SRCS.xlocale}
|
||||
|
||||
.include "../Makefile.xlocale"
|
Loading…
Reference in New Issue
Block a user