--- a/open-src/app/Makefile Sat Feb 23 18:36:05 2008 -0800
+++ b/open-src/app/Makefile Sun Feb 24 08:43:52 2008 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.30 08/02/22
+# @(#)Makefile 1.32 08/02/24
#
###############################################################################
@@ -39,15 +39,16 @@
editres \
iceauth \
listres \
+ luit \
mesa-demos \
mkfontscale \
twm \
x11perf \
xauth \
xcalc \
- xclipboard \
- xcmsdb \
- xconsole \
+ xclipboard \
+ xcmsdb \
+ xconsole \
xcursorgen \
xdpyinfo \
xev \
@@ -65,8 +66,8 @@
xrdb \
xrefresh \
xset \
- xsetroot \
- xstdcmap \
+ xsetroot \
+ xstdcmap \
xvidtune \
xvinfo \
xwd \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/luit/Makefile Sun Feb 24 08:43:52 2008 -0800
@@ -0,0 +1,57 @@
+###############################################################################
+#
+# luit 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.
+#
+#
+
+# Package name used in tarballs
+APP_NAME=luit
+
+# Version number (used in path names)
+APP_VERS=1.0.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = solaris-man.patch
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUNTOUCH_MAN_FLAGS= -p $(APP_prefix)/bin/ \
+ -a '{Availability, SUNWxwopt} {Interface Stability, Uncommitted}'
+
+# Additional flags to pass to configure script
+APP_CONFIG_OPTS = --with-localealiasfile=/usr/openwin/lib/locale/locale.alias
+
+# Need to link with libfontenc in server private directory
+APP_ADD_LDFLAGS=-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
+ -R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
+
+include ../Makefile.inc
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/luit/solaris-man.patch Sun Feb 24 08:43:52 2008 -0800
@@ -0,0 +1,18 @@
+Update See Also section of man page to remove man pages not found on Solaris
+and to not overflow the number of words Solaris nroff can have in a .I macro.
+
+--- luit.man 2008-01-28 18:26:16.083034000 -0800
++++ luit.man 2008-01-28 18:27:34.635445000 -0800
+@@ -213,9 +213,9 @@
+ Selecting alternate sets of control characters is not supported and
+ will never be.
+ .SH SEE ALSO
+-xterm(1), unicode(7), utf-8(7), charsets(7).
+-.I Character Code Structure and Extension Techniques (ISO\ 2022, ECMA-35).
+-.I Control Functions for Coded Character Sets (ISO\ 6429, ECMA-48).
++xterm(1),
++\fICharacter Code Structure and Extension Techniques (ISO\ 2022, ECMA-35)\fR,
++\fIControl Functions for Coded Character Sets (ISO\ 6429, ECMA-48)\fR.
+ .SH AUTHOR
+ The version of
+ .B Luit
--- a/packages/SUNWxwman/prototype_com Sat Feb 23 18:36:05 2008 -0800
+++ b/packages/SUNWxwman/prototype_com Sun Feb 24 08:43:52 2008 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.56 08/02/23 SMI"
+# ident "@(#)prototype_com 35.57 08/02/24 SMI"
#
# X Window System online user man pages
@@ -184,6 +184,9 @@
# open-src/app/listres
f none X11/share/man/man1/listres.1 0444 root bin
+# open-src/app/luit
+f none X11/share/man/man1/luit.1 0444 root bin
+
# open-src/app/twm
f none X11/share/man/man1/twm.1 0444 root bin
--- a/packages/SUNWxwopt/prototype Sat Feb 23 18:36:05 2008 -0800
+++ b/packages/SUNWxwopt/prototype Sun Feb 24 08:43:52 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 35.42 08/02/22 SMI"
+# ident "@(#)prototype 35.43 08/02/24 SMI"
##
# nonessential X core clients and server extensions
@@ -164,15 +164,6 @@
f none X11/bin/bitmap 0755 root bin
f none X11/bin/bmtoa 0755 root bin
f none X11/bin/editres 0755 root bin
-
-# open-src/bin/listres
-f none X11/bin/listres 0755 root bin
-s none openwin/bin/listres=../../X11/bin/listres
-
-# open-src/bin/twm
-f none X11/bin/twm 0755 root bin
-s none openwin/bin/twm=../../X11/bin/twm
-
f none X11/bin/xcursorgen 0755 root bin
f none X11/bin/xkill 0755 root bin
f none X11/bin/xclipboard 0755 root bin
@@ -190,3 +181,15 @@
s none openwin/bin/xconsole=../../X11/bin/xconsole
s none openwin/bin/xcutsel=../../X11/bin/xcutsel
+# open-src/app/listres
+f none X11/bin/listres 0755 root bin
+s none openwin/bin/listres=../../X11/bin/listres
+
+# open-src/app/twm
+f none X11/bin/twm 0755 root bin
+s none openwin/bin/twm=../../X11/bin/twm
+
+# open-src/app/luit
+# no openwin link since it was never delivered into /usr/openwin
+f none X11/bin/luit 0755 root bin
+