--- a/open-src/app/Makefile Thu Sep 18 19:20:00 2008 -0700
+++ b/open-src/app/Makefile Thu Sep 18 19:39:00 2008 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.78 08/09/18
+# @(#)Makefile 1.79 08/09/18
#
###############################################################################
@@ -101,6 +101,7 @@
xlswins \
xmag_multivis \
xmag \
+ xmakemap \
xman \
xmodmap \
xpm \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xmakemap/Makefile Thu Sep 18 19:39:00 2008 -0700
@@ -0,0 +1,65 @@
+###############################################################################
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+MODULE_NAME=xmakemap
+
+# No upstream sources for these files, since they're Sun created
+MODULE_VERSION=src
+SOURCE_TARBALL_NAME=NONE
+SOURCE_TARBALL_NAME_SET=yes
+ADDITIONAL_SOURCE_DIR=sun-src
+
+# Don't need default targets for make build or make install, since there's
+# nothing to build, and the install rule follows here
+BUILD_TARGETS = $(SOURCE_TARGETS)
+BUILD_TARGETS_SET=yes
+
+INSTALL_TARGETS =
+INSTALL_TARGETS_SET=yes
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUN_PACKAGE=SUNWxwman
+MODULE_STABILITY=Committed
+
+### Include common rulesets
+include ../Makefile.inc
+
+DESTDIR=$(PROTODIR)
+INSTDIR=$(DESTDIR)/$(X11_DIR)
+
+install_gen::
+ mkdir -p $(INSTDIR)/bin $(INSTDIR)/share/man/man1
+ $(INSTALL_SCRIPT) -m 0755 $(SOURCE_DIR)/xmakemap \
+ $(PROTODIR)$(X11_DIR)/bin
+ $(INSTALL_SCRIPT) $(SOURCE_DIR)/xmakemap.man \
+ $(PROTODIR)$(X11_DIR)/share/man/man1/xmakemap.1
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xmakemap/sun-src/xmakemap Thu Sep 18 19:39:00 2008 -0700
@@ -0,0 +1,138 @@
+#! /bin/sh
+#
+# Copyright 1992 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# ident "@(#)xmakemap 1.2 08/09/11 SMI"
+#
+
+# xmakemap -- make a keyboard mapping to be used as input to xmodmap
+#
+# Usage: xmakemap > $HOME/.xmodmaprc
+#
+# Notes:
+# OpenWindows (i.e., an X server) must be running to use xmakemap.
+# Run xmakemap and edit $HOME/.xmodmaprc to customize it as desired
+# (read "Notes" in $HOME/.xmodmaprc).
+#
+
+echo '! File:
+! .xmodmaprc
+!
+! Goal:
+! Customize keyboard mappings
+!
+! Location (where to put this file):
+! $HOME/.xmodmaprc
+!
+! Usage:
+! xmodmap $HOME/.xmodmaprc
+!
+! Notes:
+! - If you would like your keytable to be customized each time OW
+! is run, you should place the appropriate command in $HOME/.xinitrc.
+! For example:
+!
+! if [ -f $HOME/.xmodmaprc ]; then
+! xmodmap $HOME/.xmodmaprc
+! fi
+!
+! - This file should be customized as desired, commenting out each
+! unneeded entry with '!'. Note that all clients will be notified
+! when the keytable changes and the keytable will be distributed to
+! all clients upon their request. Since distribution takes time for
+! each client, users should place the command *first* in .xinitrc
+! (before most clients are running) and should *not* place the
+! command in the background.
+!
+! - Refer to man page for xmodmap(1) for more information.
+!
+
+!
+! clear modifier groups
+!
+
+clear shift
+clear lock
+clear control
+clear mod1
+clear mod2
+clear mod3
+clear mod4
+clear mod5
+
+!
+! set up keys
+!
+! Key Unshifted Shifted AltGraph AltGraph-Shifted
+! --- --------------- --------------- --------------- ----------------
+'
+xmodmap -pk | awk ' { \
+ { \
+ x = $1; \
+ if (x >= 7 && x <= 132 && NF > 1) { \
+ $3 = substr($3, 2, length($3)-2); \
+ $5 = substr($5, 2, length($5)-2); \
+ $7 = substr($7, 2, length($7)-2); \
+ $9 = substr($9, 2, length($9)-2); \
+ printf("keycode %3s = %-15s %-15s %-15s %-15s\n",$1,$3,$5,$7,$9); \
+ } \
+ } \
+} '
+
+echo '
+!
+! set modifier groups
+!
+'
+xmodmap | awk ' { \
+ if ($1 == "shift") { \
+ printf "add %-7s = %s %s %s %s\n", $1, $2, $4, $6, $8 \
+ } \
+ if ($1 == "lock") {
+ printf "add %-7s = %s %s %s %s\n", $1, $2, $4, $6, $8 \
+ } \
+ if ($1 == "control") {
+ printf "add %-7s = %s %s %s %s\n", $1, $2, $4, $6, $8 \
+ } \
+ if ($1 == "mod1") {
+ printf "add %-7s = %s %s %s %s\n", $1, $2, $4, $6, $8 \
+ } \
+ if ($1 == "mod2") {
+ printf "add %-7s = %s %s %s %s\n", $1, $2, $4, $6, $8 \
+ } \
+ if ($1 == "mod3") {
+ printf "add %-7s = %s %s %s %s\n", $1, $2, $4, $6, $8 \
+ } \
+ if ($1 == "mod4") {
+ printf "add %-7s = %s %s %s %s\n", $1, $2, $4, $6, $8 \
+ } \
+ if ($1 == "mod5") {
+ printf "add %-7s = %s %s %s %s\n", $1, $2, $4, $6, $8 \
+ } \
+} '
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xmakemap/sun-src/xmakemap.man Thu Sep 18 19:39:00 2008 -0700
@@ -0,0 +1,78 @@
+.\"
+.\" Copyright 2001 Sun Microsystems, Inc. All rights reserved.
+.\" Use subject to license terms.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, and/or sell copies of the Software, and to permit persons
+.\" to whom the Software is furnished to do so, provided that the above
+.\" copyright notice(s) and this permission notice appear in all copies of
+.\" the Software and that both the above copyright notice(s) and this
+.\" permission notice appear in supporting documentation.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of a copyright holder
+.\" shall not be used in advertising or otherwise to promote the sale, use
+.\" or other dealings in this Software without prior written authorization
+.\" of the copyright holder.
+.\"
+.TH xmakemap 1 "23 August 2001"
+.SH NAME
+xmakemap \- make a keyboard mapping to be used as input to xmodmap
+.SH SYNOPSIS
+.B xmakemap
+.SH DESCRIPTION
+.PP
+.B xmakemap
+will produce a keyboard mapping in a form that is suitable
+as input to the
+.BR xmodmap (1)
+command.
+.B xmakemap
+writes its output to stdout.
+Typical usage of
+.B xmakemap
+is to redirect output from
+.B xmakemap
+to a file (e.g., $HOME/.xmodmaprc), edit this file to make
+necessary customizations, and then run
+.B xmodmap
+on the file (i.e., $HOME/.xmodmaprc).
+.TP
+For example:
+.IP
+.nf
+\fLxmakemap > $HOME/.xmodmaprc
+[... make necessary customization to $HOME/.xmodmaprc ...]
+xmodmap $HOME/.xmodmaprc\fP
+.fi
+.LP
+If you would like your keytable to be customized each time you start
+an X session, you should place the appropriate command in the session
+startup file for your desktop environment.
+.TP
+For example:
+.IP
+.nf
+\fLif [ -f $HOME/.xmodmaprc ]; then
+ xmodmap $HOME/.xmodmaprc
+fi\fP
+.LP
+.SH NOTES
+An X server must be running to use
+.BR xmakemap .
+.br
+Read "Notes" in $HOME/.xmodmaprc.
+.SH SEE ALSO
+.BR xmodmap (1)
--- a/packages/SUNWxwman/prototype_com Thu Sep 18 19:20:00 2008 -0700
+++ b/packages/SUNWxwman/prototype_com Thu Sep 18 19:39:00 2008 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.108 08/09/18 SMI"
+# ident "@(#)prototype_com 35.109 08/09/18 SMI"
#
# X Window System online user man pages
@@ -68,7 +68,6 @@
f none openwin/share/man/man1/xdm.1 0444 root bin
f none openwin/share/man/man1/xfs.1 0444 root bin
f none openwin/share/man/man1/xlock.1 0444 root bin
-f none openwin/share/man/man1/xmakemap.1 0444 root bin
f none openwin/share/man/man1/xmh.1 0444 root bin
!search $HOME/man4
@@ -270,6 +269,9 @@
# open-src/app/xmag_multivis
f none X11/share/man/man1/xmag_multivis.1 0444 root bin
+# open-src/app/xmakemap
+f none X11/share/man/man1/xmakemap.1 0444 root bin
+
# open-src/app/xman
f none X11/share/man/man1/xman.1 0444 root bin
--- a/packages/SUNWxwplt/prototype_com Thu Sep 18 19:20:00 2008 -0700
+++ b/packages/SUNWxwplt/prototype_com Thu Sep 18 19:39:00 2008 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.203 08/09/15 Sun Microsystems"
+# "@(#)prototype_com 35.204 08/09/18 Sun Microsystems"
#
# X Window System required core package
@@ -57,7 +57,6 @@
f none openwin/bin/pclcomp 0755 root bin
f none openwin/bin/redxblue 0755 root bin
f none openwin/bin/xlock 4755 root bin
-f none openwin/bin/xmakemap 0755 root bin
#### applications replaced with new versions from open-src/app
@@ -190,6 +189,10 @@
f none X11/bin/xmag 0755 root bin
s none openwin/bin/xmag=../../X11/bin/xmag
+# open-src/app/xmakemap
+f none X11/bin/xmakemap 0755 root bin
+s none openwin/bin/xmakemap=../../X11/bin/xmakemap
+
# open-src/app/xmodmap
f none X11/bin/xmodmap 0755 root bin
s none openwin/bin/xmodmap=../../X11/bin/xmodmap