Module Name: src
Committed By: mrg
Date: Mon Jun 10 05:04:01 UTC 2013
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
src/distrib/sets/lists/xcomp: mi
Log Message:
add support for MKXORG_DRIVERS/xorg_drivers keyword, and use it to
mark the xf86-input-mouse files not all platforms use.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/sets.subr
cvs rdiff -u -r1.141 -r1.142 src/distrib/sets/lists/xcomp/mi
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/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.10 src/distrib/sets/mkvars.mk:1.11
--- src/distrib/sets/mkvars.mk:1.10 Tue Apr 30 20:54:22 2013
+++ src/distrib/sets/mkvars.mk Mon Jun 10 05:04:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.10 2013/04/30 20:54:22 matt Exp $
+# $NetBSD: mkvars.mk,v 1.11 2013/06/10 05:04:00 mrg Exp $
MKEXTRAVARS= \
MACHINE \
@@ -19,6 +19,7 @@ MKEXTRAVARS= \
MKSLJIT \
MKSOFTFLOAT \
MKXORG \
+ MKXORG_DRIVERS \
X11FLAVOR \
USE_INET6 \
USE_KERBEROS \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.149 src/distrib/sets/sets.subr:1.150
--- src/distrib/sets/sets.subr:1.149 Mon May 6 20:38:42 2013
+++ src/distrib/sets/sets.subr Mon Jun 10 05:04:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.149 2013/05/06 20:38:42 joerg Exp $
+# $NetBSD: sets.subr,v 1.150 2013/06/10 05:04:00 mrg Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.149 2013/05/06 20:38:42 joerg Exp $
+# # $NetBSD: sets.subr,v 1.150 2013/06/10 05:04:00 mrg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -257,6 +257,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# tpm ${MKTPM} != no
# x11 ${MKX11} != no && ${X11FLAVOUR} != "Xorg"
# xorg ${MKX11} != no && ${X11FLAVOUR} == "Xorg"
+# xorg_drivers ${MKXORG_DRIVERS} != no
# yp ${MKYP} != no
# zfs ${MKZFS} != no
#
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.141 src/distrib/sets/lists/xcomp/mi:1.142
--- src/distrib/sets/lists/xcomp/mi:1.141 Wed Jun 5 09:06:21 2013
+++ src/distrib/sets/lists/xcomp/mi Mon Jun 10 05:04:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.141 2013/06/05 09:06:21 mrg Exp $
+# $NetBSD: mi,v 1.142 2013/06/10 05:04:00 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5934,7 +5934,7 @@
./usr/X11R7/include/xorg/xaarop.h -unknown- xorg
./usr/X11R7/include/xorg/xf1bpp.h -unknown- obsolete
./usr/X11R7/include/xorg/xf4bpp.h -unknown- obsolete
-./usr/X11R7/include/xorg/xf86-mouse-properties.h -unknown- xorg
+./usr/X11R7/include/xorg/xf86-mouse-properties.h -unknown- xorg,xorg_drivers
./usr/X11R7/include/xorg/xf86.h -unknown- xorg
./usr/X11R7/include/xorg/xf86Crtc.h -unknown- xorg
./usr/X11R7/include/xorg/xf86Cursor.h -unknown- xorg
@@ -6371,7 +6371,7 @@
./usr/X11R7/lib/pkgconfig/xkeyboard-config.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xmu.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xmuu.pc -unknown- xorg
-./usr/X11R7/lib/pkgconfig/xorg-mouse.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xorg-mouse.pc -unknown- xorg,xorg_drivers
./usr/X11R7/lib/pkgconfig/xorg-server.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xp.pc -obsolete- obsolete
./usr/X11R7/lib/pkgconfig/xpm.pc -unknown- xorg
