Module Name: src
Committed By: phx
Date: Mon Dec 6 18:26:29 UTC 2010
Modified Files:
src/distrib/sets/lists/base: md.macppc mi
src/share/wscons/keymaps: Makefile
Log Message:
There should be no MD keymaps in /usr/share/wscons/keymaps. So I made the
PowerBook keymap MI again, after a discussion with <mrg>.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/base/md.macppc
cvs rdiff -u -r1.894 -r1.895 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.17 -r1.18 src/share/wscons/keymaps/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/base/md.macppc
diff -u src/distrib/sets/lists/base/md.macppc:1.29 src/distrib/sets/lists/base/md.macppc:1.30
--- src/distrib/sets/lists/base/md.macppc:1.29 Wed Dec 1 17:48:04 2010
+++ src/distrib/sets/lists/base/md.macppc Mon Dec 6 18:26:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.29 2010/12/01 17:48:04 phx Exp $
+# $NetBSD: md.macppc,v 1.30 2010/12/06 18:26:28 phx Exp $
./sbin/pdisk base-sysutil-root
./usr/mdec/bootxx base-sysutil-bin
./usr/mdec/installboot base-obsolete obsolete
@@ -11,4 +11,3 @@
./usr/sbin/zzz base-sysutil-bin
./usr/sbin/eeprom base-sysutil-bin
./usr/sbin/ofctl base-sysutil-bin
-./usr/share/wscons/keymaps/ukbd.any.powerbook base-util-share
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.894 src/distrib/sets/lists/base/mi:1.895
--- src/distrib/sets/lists/base/mi:1.894 Sun Dec 5 17:37:33 2010
+++ src/distrib/sets/lists/base/mi Mon Dec 6 18:26:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.894 2010/12/05 17:37:33 pooka Exp $
+# $NetBSD: mi,v 1.895 2010/12/06 18:26:28 phx Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -4108,6 +4108,7 @@
./usr/share/wscons/keymaps/pckbd.pl.iso8859-2 base-util-share share
./usr/share/wscons/keymaps/pckbd.ru.koi8-r base-util-share share
./usr/share/wscons/keymaps/pckbd.sv.svascii base-util-share share
+./usr/share/wscons/keymaps/ukbd.any.powerbook base-util-share share
./usr/share/wscons/keymaps/ukbd.be.azerty base-util-share share
./usr/share/zoneinfo base-sys-share
./usr/share/zoneinfo/Africa base-sys-share
Index: src/share/wscons/keymaps/Makefile
diff -u src/share/wscons/keymaps/Makefile:1.17 src/share/wscons/keymaps/Makefile:1.18
--- src/share/wscons/keymaps/Makefile:1.17 Fri Dec 3 17:57:43 2010
+++ src/share/wscons/keymaps/Makefile Mon Dec 6 18:26:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/12/03 17:57:43 phx Exp $
+# $NetBSD: Makefile,v 1.18 2010/12/06 18:26:29 phx Exp $
NOOBJ= # defined
@@ -13,11 +13,8 @@
pckbd.pl.iso8859-2 \
pckbd.ru.koi8-r \
pckbd.sv.svascii \
- ukbd.be.azerty
-
-.if ${MACHINE} == "macppc"
-FILES+= ukbd.any.powerbook
-.endif
+ ukbd.be.azerty \
+ ukbd.any.powerbook
FILESDIR= /usr/share/wscons/keymaps
