--- a/open-src/app/Makefile Fri Feb 08 14:36:23 2008 -0800
+++ b/open-src/app/Makefile Mon Feb 11 14:26:50 2008 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.22 08/02/08
+# @(#)Makefile 1.23 08/02/11
#
###############################################################################
@@ -37,6 +37,7 @@
editres \
mesa-demos \
mkfontscale \
+ x11perf \
xcalc \
xclipboard \
xconsole \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/x11perf/Makefile Mon Feb 11 14:26:50 2008 -0800
@@ -0,0 +1,50 @@
+###############################################################################
+#
+# x11perf 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/02/11
+#
+
+# Package name used in tarballs
+APP_NAME=x11perf
+
+# Version number (used in path names)
+APP_VERS=1.4.1
+
+# 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 Feb 08 14:36:23 2008 -0800
+++ b/packages/SUNWxwman/prototype_com Mon Feb 11 14:26:50 2008 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.48 08/02/08 SMI"
+# ident "@(#)prototype_com 35.49 08/02/11 SMI"
#
# X Window System online user man pages
@@ -180,6 +180,15 @@
# open-src/app/editres
f none X11/share/man/man1/editres.1 0444 root bin
+# open-src/app/x11perf
+f none X11/share/man/man1/x11perf.1 0444 root bin
+
+# open-src/app/x11perfcomp
+f none X11/share/man/man1/x11perfcomp.1 0444 root bin
+
+# open-src/app/Xmark
+f none X11/share/man/man1/Xmark.1 0444 root bin
+
# open-src/app/xcalc
f none X11/share/man/man1/xcalc.1 0444 root bin
--- a/packages/SUNWxwplt/prototype_com Fri Feb 08 14:36:23 2008 -0800
+++ b/packages/SUNWxwplt/prototype_com Mon Feb 11 14:26:50 2008 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.149 08/02/08 Sun Microsystems"
+# "@(#)prototype_com 35.150 08/02/11 Sun Microsystems"
#
# X Window System required core package
@@ -103,6 +103,12 @@
f none X11/bin/constype 0755 root bin
s none openwin/bin/constype=../../X11/bin/constype
+# open-src/app/x11perf
+f none X11/bin/x11perf 0755 root bin
+
+# open-src/app/x11perfcomp
+f none X11/bin/x11perfcomp 0755 root bin
+
# open-src/app/xcalc
f none X11/bin/xcalc 0755 root bin
s none openwin/bin/xcalc=../../X11/bin/xcalc
@@ -690,6 +696,13 @@
f none X11/lib/X11/app-defaults/XConsole 0644 root bin
f none X11/lib/X11/app-defaults/Xmag 0644 root bin
+!search $HOME/X11/lib/X11/x11perfcomp
+d none X11/lib/X11/x11perfcomp 0755 root bin
+f none X11/lib/X11/x11perfcomp/fillblnk 0755 root bin
+f none X11/lib/X11/x11perfcomp/perfboth 0755 root bin
+f none X11/lib/X11/x11perfcomp/perfratio 0755 root bin
+f none X11/lib/X11/x11perfcomp/Xmark 0755 root bin
+
# Create links back to openwin
s none openwin/lib/app-defaults/Editres=../../../X11/lib/X11/app-defaults/Editres
s none openwin/lib/app-defaults/Editres-color=../../../X11/lib/X11/app-defaults/Editres-color