--- a/open-src/app/Makefile Fri Jan 18 18:13:44 2008 -0800
+++ b/open-src/app/Makefile Fri Jan 18 16:04:55 2008 -0800
@@ -1,6 +1,6 @@
# Makefile for X Consolidation Open Source Application modules
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# 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
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.14 08/01/17
+# @(#)Makefile 1.15 08/01/18
#
###############################################################################
@@ -41,6 +41,7 @@
xgamma \
xkbcomp \
xkill \
+ xmodmap \
xpm \
xrandr \
xrefresh \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xmodmap/Makefile Fri Jan 18 16:04:55 2008 -0800
@@ -0,0 +1,50 @@
+###############################################################################
+#
+# xmodmap 1.x Makefile
+#
+# 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.
+#
+# @(#)Makefile 1.1 08/01/18
+#
+
+# Package name used in tarballs
+APP_NAME=xmodmap
+
+# Version number (used in path names)
+APP_VERS=1.0.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES =
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUNTOUCH_MAN_FLAGS= \
+ -a '{Availability, SUNWxwplt} {Interface Stability, Committed}'
+
+include ../Makefile.inc
--- a/packages/SUNWxwman/prototype_com Fri Jan 18 18:13:44 2008 -0800
+++ b/packages/SUNWxwman/prototype_com Fri Jan 18 16:04:55 2008 -0800
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.38 08/01/17 SMI"
+# ident "@(#)prototype_com 35.39 08/01/18 SMI"
#
# X Window System online user man pages
@@ -135,7 +135,6 @@
f none openwin/share/man/man1/xman.1 0444 root bin
f none openwin/share/man/man1/xmh.1 0444 root bin
f none openwin/share/man/man1/xmkmf.1 0444 root bin
-f none openwin/share/man/man1/xmodmap.1 0444 root bin
f none openwin/share/man/man1/xpr.1 0444 root bin
f none openwin/share/man/man1/xprop.1 0444 root bin
f none openwin/share/man/man1/xrdb.1 0444 root bin
@@ -195,6 +194,9 @@
# open-src/app/xdpyinfo
f none X11/share/man/man1/xdpyinfo.1 0444 root bin
+# open-src/app/xmodmap
+f none X11/share/man/man1/xmodmap.1 0444 root bin
+
# open-src/app/xpm
f none X11/share/man/man1/cxpm.1 0444 root bin
f none X11/share/man/man1/sxpm.1 0444 root bin
--- a/packages/SUNWxwplt/prototype_com Fri Jan 18 18:13:44 2008 -0800
+++ b/packages/SUNWxwplt/prototype_com Fri Jan 18 16:04:55 2008 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.138 08/01/17 Sun Microsystems"
+# "@(#)prototype_com 35.139 08/01/18 Sun Microsystems"
#
# X Window System required core package
@@ -78,7 +78,6 @@
f none openwin/bin/xlswins 0755 root bin
f none openwin/bin/xmag 0755 root bin
f none openwin/bin/xmakemap 0755 root bin
-f none openwin/bin/xmodmap 0755 root bin
f none openwin/bin/xpr 0755 root bin
f none openwin/bin/xprop 0755 root bin
f none openwin/bin/xrdb 0755 root bin
@@ -116,6 +115,10 @@
f none X11/bin/xdpyinfo 0755 root bin
s none openwin/bin/xdpyinfo=../../X11/bin/xdpyinfo
+# open-src/app/xmodmap
+f none X11/bin/xmodmap 0755 root bin
+s none openwin/bin/xmodmap=../../X11/bin/xmodmap
+
# open-src/app/xpm
f none X11/bin/cxpm 0755 root bin
f none X11/bin/sxpm 0755 root bin