--- a/open-src/app/Makefile	Wed Aug 06 15:06:17 2008 -0700
+++ b/open-src/app/Makefile	Wed Aug 06 16:48:34 2008 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.63	08/07/31
+# @(#)Makefile	1.64	08/08/06
 #
 ###############################################################################
 
@@ -105,7 +105,12 @@
 	xscreensaver \
 	rss-glx \
 	xeyes \
-        xterm
+        xterm \
+        xfindproxy \
+        smproxy \
+        xditview \
+        xfontsel \
+        ico
 
 OS_SUBDIRS_sparc = $(OS_SUBDIRS_common)
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/ico/Makefile	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,49 @@
+###############################################################################
+#
+# ico 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=ico
+
+# Version number (used in path names)
+APP_VERS=1.0.2
+
+# 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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/smproxy/COPYING	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,26 @@
+/******************************************************************************
+
+Copyright 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Author:  Ralph Mor, X Consortium
+******************************************************************************/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/smproxy/Makefile	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,49 @@
+###############################################################################
+#
+# smproxy 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=smproxy
+
+# Version number (used in path names)
+APP_VERS=1.0.2
+
+# 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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xditview/COPYING	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,25 @@
+Copyright (c) 1991  X Consortium
+
+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, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+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.
+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from the X Consortium.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xditview/Makefile	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,49 @@
+###############################################################################
+#
+# xditview 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=xditview
+
+# Version number (used in path names)
+APP_VERS=1.0.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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xfindproxy/COPYING	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,24 @@
+Copyright 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+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.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xfindproxy/Makefile	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,49 @@
+###############################################################################
+#
+# xfindproxy 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=xfindproxy
+
+# Version number (used in path names)
+APP_VERS=1.0.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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xfontsel/Makefile	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,58 @@
+###############################################################################
+#
+# xfontsel 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=xfontsel
+
+# Version number (used in path names)
+APP_VERS=1.0.2
+
+# Source tarball
+SOURCE_TARBALL_NAME=$(APP_NAME)-$(APP_VERS).tar.gz
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = \
+	xfontsel.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, Committed}'
+
+include ../Makefile.inc
+
+install_gen:: install_po
+install_po:
+	mkdir -p $(PROTODIR)/usr/X11/share/locale/C/LC_MESSAGES
+	cp -f xfontsel.po $(PROTODIR)/usr/X11/share/locale/C/LC_MESSAGES

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xfontsel/xfontsel.patch	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,155 @@
+--- xfontsel.c	Mon Jul 10 19:52:48 2006
++++ xfontsel.latest.c	Thu Aug  7 14:02:31 2008
+@@ -54,6 +54,9 @@
+ #include <X11/Xfuncs.h>
+ #include "ULabel.h"
+ 
++#include <libintl.h>
++#include <X11/Xlocale.h>
++
+ #define MIN_APP_DEFAULTS_VERSION 1
+ #define FIELD_COUNT 14
+ #define DELIM '-'
+@@ -153,24 +156,25 @@
+ static void Syntax(call)
+     char *call;
+ {
+-    fprintf (stderr, "usage:  %s [-options ...] -fn font\n\n", call);
+-    fprintf (stderr, "where options include:\n");
+-    fprintf (stderr,
+-	"    -display dpy           X server to contact\n");
+-    fprintf (stderr, 
+-	"    -geometry geom         size and location of window\n");
+-    fprintf (stderr, 
+-	"    -pattern fontspec      font name pattern to match against\n");
+-    fprintf (stderr, 
+-	"    -print                 print selected font name on exit\n");
+-    fprintf (stderr, 
+-	"    -sample string         sample text to use for 1-byte fonts\n");
+-    fprintf (stderr, 
+-	"    -sample16 string       sample text to use for 2-byte fonts\n");
+-    fprintf (stderr,
+-	"    -sampleUCS string      sample text to use for ISO10646 fonts\n");
+-    fprintf (stderr, 
+-	"    -scaled                use scaled instances of fonts\n");
++    /* Internationalize these strings for Bug:      4363521 Jhobson 6/9/00 */
++    fprintf (stderr, gettext("usage:  %s [-options ...] -fn font\n\n"), call);
++    fprintf (stderr, gettext("where options include:\n"));
++    fprintf (stderr, "    -display ");
++    fprintf (stderr, gettext("display       X server to contact\n"));
++    fprintf (stderr, "    -geometry ");
++    fprintf (stderr, gettext("geometry     size and location of window\n"));
++    fprintf (stderr, "    -pattern ");
++    fprintf (stderr, gettext("fontspec      font name pattern to match against\n"));
++    fprintf (stderr, "    -print ");
++    fprintf (stderr, gettext("print selected font name on exit\n"));
++    fprintf (stderr, "    -sample ");
++    fprintf (stderr, gettext("string         sample text to use for 1-byte fonts\n"));
++    fprintf (stderr, "    -sample16 ");
++    fprintf (stderr, gettext("string       sample text to use for 2-byte fonts\n"));
++    fprintf (stderr, "    -sampleUCS ");
++    fprintf (stderr, gettext("string      sample text to use for ISO10646 fonts\n"));
++    fprintf (stderr, "    -scaled ");
++    fprintf (stderr, gettext("do use scaled instances of fonts\n"));
+     fprintf (stderr, "\n");
+     exit (1);
+ }
+@@ -266,11 +270,29 @@
+ {
+     Widget topLevel, pane;
+ 
++    /*
++     * Set up internationalize message for bug: 4363521   Jhobson 8/23/00
++     */
++    char *domaindir;
++
+     XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
+ 
+     topLevel = XtAppInitialize(&appCtx, "XFontSel", options, XtNumber(options),
+ 			       &argc, argv, NULL, NULL, 0);
++    /*
++     * Set up internationalize message for bug: 4363521    Jhobson 8/23/00
++     *
++     * Do this after the AppInitialize since setlocale is setup
++     * by XtSetLanguageProc, but does not occur until XtAppInitialize
++     * happens. (Goofy X server)
++     */
++    textdomain("xfontsel");
+ 
++    if((domaindir = getenv("TEXTDOMAINDIR")) == NULL){
++        domaindir = getenv("XLOCALEDIR");
++    }
++    bindtextdomain("xfontsel", domaindir);
++
+     if (argc != 1) Syntax(argv[0]);
+ 
+     XtAppAddActions(appCtx, xfontsel_actions, XtNumber(xfontsel_actions));
+@@ -280,12 +302,15 @@
+     XtGetApplicationResources( topLevel, (XtPointer)&AppRes,
+ 			       resources, XtNumber(resources), NZ );
+     if (AppRes.app_defaults_version < MIN_APP_DEFAULTS_VERSION) {
++        char message[200];
++        char full_message[300];
+ 	XrmDatabase rdb = XtDatabase(XtDisplay(topLevel));
+-	XtWarning( "app-defaults file not properly installed." );
+-	XrmPutLineResource( &rdb,
+-"*sampleText*UCSLabel:XFontSel app-defaults file not properly installed;\\n\
+-see 'xfontsel' manual page."
+-			  );
++        sprintf( message, gettext("app-defaults file not properly installed.") );
++        sprintf( full_message, gettext("%s %s;\\nsee '%s' manual page."),
++                "*sampleText*UCSLabel:XFontSel", message, "xfontsel" );
++
++        XtWarning( message );
++	XrmPutLineResource( &rdb, full_message);
+     }
+ 
+     ScheduleWork(GetFontNames, (XtPointer)XtDisplay(topLevel), 0);
+@@ -532,7 +557,7 @@
+ 	    }
+ 	    else
+ 		XtAppWarning( appCtx, 
+-		    "internal error; pattern didn't match first font" );
++		    gettext("internal error; pattern didn't match first font" ));
+ 	}
+ 	else {
+ 	    SetNoFonts();
+@@ -1048,11 +1073,11 @@
+     char label[80];
+     Arg args[1];
+     if (matchingFontCount == 1)
+-	strcpy( label, "1 name matches" );
++	strcpy( label, gettext("1 name matches") );
+     else if (matchingFontCount)
+-	sprintf( label, "%d names match", matchingFontCount );
++	sprintf( label, gettext("%d names match"), matchingFontCount);
+     else
+-	strcpy( label, "no names match" );
++	strcpy( label, gettext("no names match") );
+     XtSetArg( args[0], XtNlabel, label );
+     XtSetValues( countLabel, args, ONE );
+ }
+@@ -1063,9 +1088,9 @@
+     char label[80];
+     Arg args[1];
+     if (count == 1)
+-	strcpy( label, "1 name to parse" );
++	strcpy( label, gettext("1 name to parse") );
+     else
+-	sprintf( label, "%d names to parse", count );
++	sprintf( label, gettext("%d names to parse"), count );
+     XtSetArg( args[0], XtNlabel, label );
+     XtSetValues( countLabel, args, ONE );
+     FlushXqueue(XtDisplay(countLabel));
+@@ -1282,9 +1307,9 @@
+     int field = (long)closure;
+     FieldValue *values = fieldValues[field]->value;
+     int count = fieldValues[field]->count;
+-    printf( "field %d:\n", field );
++    printf(gettext("field %d:\n"), field );
+     while (count--) {
+-	printf( " %s: %d fonts\n", values->string, values->count );
++	printf( gettext(" %s: %d fonts\n"), values->string, values->count );
+ 	values++;
+     }
+     printf( "\n" );

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xfontsel/xfontsel.po	Wed Aug 06 16:48:34 2008 -0700
@@ -0,0 +1,40 @@
+domain "xfontsel"
+msgid  "usage:  %s [-options ...] %s font\n\n"
+msgstr
+msgid  "where options include:\n"
+msgstr
+msgid  "display       X server to contact\n"
+msgstr
+msgid  "geometry     size and location of window\n"
+msgstr
+msgid  "fontspec      font name pattern to match against\n"
+msgstr
+msgid  "print selected font name on exit\n"
+msgstr
+msgid  "do not use scaled instances of fonts\n"
+msgstr
+msgid  "string         sample text to use for 1-byte fonts\n"
+msgstr
+msgid  "string       sample text to use for 2-byte fonts\n"
+msgstr
+# File:xfontsel.c, line:258, textdomain("xfontsel");
+msgid  "app-defaults file not properly installed."
+msgstr
+msgid  "%s %s;\\nsee '%s' manual page."
+msgstr
+msgid  "internal error; pattern didn't match first font"
+msgstr
+msgid  "1 name matches"
+msgstr
+msgid  "%d names match"
+msgstr
+msgid  "no names match"
+msgstr
+msgid  "1 name to parse"
+msgstr
+msgid  "%d names to parse"
+msgstr
+msgid  "field %d:\n"
+msgstr
+msgid  " %s: %d fonts\n"
+msgstr

--- a/packages/SUNWxwdem/copyright.add	Wed Aug 06 15:06:17 2008 -0700
+++ b/packages/SUNWxwdem/copyright.add	Wed Aug 06 16:48:34 2008 -0700
@@ -1,3 +1,7 @@
+
+Files from the app/ico package are covered by the following notice:
+
+include app/ico/COPYING
 
 --------------------------------------------------------------------
 

--- a/packages/SUNWxwdem/prototype	Wed Aug 06 15:06:17 2008 -0700
+++ b/packages/SUNWxwdem/prototype	Wed Aug 06 16:48:34 2008 -0700
@@ -29,7 +29,7 @@
 #
 ###########################################################################
 #
-#	@(#)prototype	35.23	08/07/21
+#	@(#)prototype	35.24	08/08/04
 #
 #  X Window System demo programs
 
@@ -45,18 +45,9 @@
 !search       $HOME/openwin/demo
 d none openwin/demo			0755 root bin
 f none openwin/demo/dpsexec 		0755 root bin
-f none openwin/demo/ico			0755 root bin
-f none openwin/demo/ico2		0755 root bin
-f none openwin/demo/maze		0755 root bin
-f none openwin/demo/muncher		0755 root bin
-f none openwin/demo/plaid		0755 root bin
-f none openwin/demo/puzzle		0755 root bin
 f none openwin/demo/texteroids		0755 root bin
-f none openwin/demo/worm		0755 root bin
 f none openwin/demo/xepsf		0755 root bin
-f none openwin/demo/xmac		0755 root bin
 f none openwin/demo/xscope		0755 root bin
-f none openwin/demo/xsol		0755 root bin
 !search       $HOME/openwin/bin
 f none openwin/demo/xieperf		0755 root bin
 
@@ -72,6 +63,10 @@
 f none X11/bin/xeyes                    0755 root bin
 s none openwin/demo/xeyes=../../X11/bin/xeyes
 
+# open-src/app/ico
+f none X11/bin/ico 			0755 root bin
+s none openwin/demo/ico=../../X11/bin/ico
+
 # open-src/app/xgc
 f none X11/bin/xgc 			0755 root bin
 s none openwin/demo/xgc=../../X11/bin/xgc

--- a/packages/SUNWxwman/copyright.add	Wed Aug 06 15:06:17 2008 -0700
+++ b/packages/SUNWxwman/copyright.add	Wed Aug 06 16:48:34 2008 -0700
@@ -1,3 +1,31 @@
+
+Files from the app/ico package are covered by the following notice:
+
+include app/ico/COPYING
+
+--------------------------------------------------------------------
+
+Files from the app/xfindproxy package are covered by the following notice:
+
+include app/xfindproxy/COPYING
+
+--------------------------------------------------------------------
+
+Files from the app/smproxy package are covered by the following notice:
+
+include app/smproxy/COPYING
+
+--------------------------------------------------------------------
+
+Files from the app/xditview package are covered by the following notice:
+
+include app/xditview/COPYING
+
+--------------------------------------------------------------------
+
+Files from the app/xfontsel package are covered by the following notice:
+
+include app/xfontsel/COPYING
 
 --------------------------------------------------------------------
 

--- a/packages/SUNWxwman/prototype_com	Wed Aug 06 15:06:17 2008 -0700
+++ b/packages/SUNWxwman/prototype_com	Wed Aug 06 16:48:34 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 35.96     08/08/06 SMI"
+# ident "@(#)prototype_com 35.97     08/08/06 SMI"
 #
 #  X Window System online user man pages
 
@@ -51,7 +51,6 @@
 !search            $HOME/man1
 d none openwin/share/man/man1 0755 root bin
 f none openwin/share/man/man1/proxymngr.1 0444 root bin
-f none openwin/share/man/man1/xfindproxy.1 0444 root bin
 f none openwin/share/man/man1/rstart.1 0444 root bin
 f none openwin/share/man/man1/rstartd.1 0444 root bin
 f none openwin/share/man/man1/xkbcomp.1 0444 root bin
@@ -77,9 +76,7 @@
 f none openwin/share/man/man1/redxblue.1 0444 root bin
 f none openwin/share/man/man1/showsnf.1 0444 root bin
 f none openwin/share/man/man1/xcolor.1 0444 root bin
-f none openwin/share/man/man1/xditview.1 0444 root bin
 f none openwin/share/man/man1/xdm.1 0444 root bin
-f none openwin/share/man/man1/xfontsel.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/xlswins.1 0444 root bin
@@ -94,18 +91,9 @@
 !search            $HOME/man6
 d none openwin/share/man/man6 0755 root bin
 f none openwin/share/man/man6/dpsexec.6 0444 root bin
-f none openwin/share/man/man6/ico.6 0444 root bin
-f none openwin/share/man/man6/ico2.6 0444 root bin
-f none openwin/share/man/man6/maze.6 0444 root bin
-f none openwin/share/man/man6/muncher.6 0444 root bin
-f none openwin/share/man/man6/plaid.6 0444 root bin
-f none openwin/share/man/man6/puzzle.6 0444 root bin
 f none openwin/share/man/man6/texteroids.6 0444 root bin
-f none openwin/share/man/man6/worm.6 0444 root bin
 f none openwin/share/man/man6/xepsf.6 0444 root bin
-f none openwin/share/man/man6/xmac.6 0444 root bin
 f none openwin/share/man/man6/xscope.6 0444 root bin
-f none openwin/share/man/man6/xsol.6 0444 root bin
 
 
 !search            $HOME/man5
@@ -314,6 +302,21 @@
 f none X11/share/man/man1/xterm.1 	0444 root bin
 f none X11/share/man/man1/resize.1 	0444 root bin
 
+# open-src/app/xditview
+f none X11/share/man/man1/xditview.1    0444 root bin
+
+# open-src/app/xfontsel
+f none X11/share/man/man1/xfontsel.1    0444 root bin
+
+# open-src/app/xfindproxy
+f none X11/share/man/man1/xfindproxy.1  0444 root bin
+
+# open-src/app/smproxy
+f none X11/share/man/man1/smproxy.1     0444 root bin
+
+# open-src/app/ico
+f none X11/share/man/man1/ico.1     0444 root bin
+
 # open-src/app/xwd
 f none X11/share/man/man1/xwd.1 	0444 root bin
 

--- a/packages/SUNWxwopt/copyright.add	Wed Aug 06 15:06:17 2008 -0700
+++ b/packages/SUNWxwopt/copyright.add	Wed Aug 06 16:48:34 2008 -0700
@@ -1,3 +1,14 @@
+--------------------------------------------------------------------
+
+Files from the app/xditview package are covered by the following notice:
+
+include app/xditview/COPYING
+
+--------------------------------------------------------------------
+
+Files from the app/xfontsel package are covered by the following notice:
+
+include app/xfontsel/COPYING
 
 --------------------------------------------------------------------
 

--- a/packages/SUNWxwopt/prototype	Wed Aug 06 15:06:17 2008 -0700
+++ b/packages/SUNWxwopt/prototype	Wed Aug 06 16:48:34 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype	35.61	08/08/05 SMI"
+# ident "@(#)prototype	35.63	08/08/06 SMI"
 ##
 #  nonessential X core clients and server extensions
 
@@ -45,10 +45,8 @@
 f none openwin/bin/pswrap	0755 root bin
 f none openwin/bin/showsnf	0755 root bin
 f none openwin/bin/xcolor	0755 root bin
-f none openwin/bin/xditview	0755 root bin
 f none openwin/bin/xdm		0755 root bin
 f none openwin/bin/xdmshell	0755 root bin
-f none openwin/bin/xfontsel	0755 root bin
 f none openwin/bin/xmh		0755 root bin
 
 d none openwin/lib 0755 root bin
@@ -56,10 +54,6 @@
 d none openwin/lib/app-defaults 0755 root bin
 s none openwin/lib/X11/app-defaults/= ../app-defaults
 
-!search  $HOME/openwin/lib/X11/app-defaults
-f none openwin/lib/app-defaults/XFontSel 0644 root bin
-f none openwin/lib/app-defaults/Xditview 0644 root bin
-
 # modified from original
 !search $HOME/X11/share/X11/twm
 d none X11/share 0755 root bin
@@ -169,6 +163,8 @@
 f none X11/bin/xman				0755 root bin
 f none X11/bin/xterm				0755 root bin
 f none X11/bin/resize				0755 root bin
+f none X11/bin/xditview                         0755 root bin
+f none X11/bin/xfontsel                         0755 root bin
 f none X11/bin/viewres				0755 root bin
 f none X11/bin/xcursorgen			0755 root bin
 f none X11/bin/xkill				0755 root bin
@@ -191,6 +187,8 @@
 s none openwin/bin/xman=../../X11/bin/xman
 s none openwin/bin/xterm=../../X11/bin/xterm
 s none openwin/bin/resize=../../X11/bin/resize
+s none openwin/bin/xfontsel=../../X11/bin/xfontsel
+s none openwin/bin/xditview=../../X11/bin/xditview
 s none openwin/bin/viewres=../../X11/bin/viewres
 s none openwin/bin/xkill=../../X11/bin/xkill
 s none openwin/bin/xclipboard=../../X11/bin/xclipboard
@@ -230,11 +228,15 @@
 f none X11/lib/X11/app-defaults/Xman		0644 root bin
 f none X11/lib/X11/app-defaults/Viewres		0644 root bin
 f none X11/lib/X11/app-defaults/Xedit 		0644 root bin
+f none X11/lib/X11/app-defaults/XFontSel 	0644 root bin
+f none X11/lib/X11/app-defaults/Xditview 	0644 root bin
 
 # Create links back to openwin
 s none openwin/lib/app-defaults/Viewres=../../../X11/lib/X11/app-defaults/Viewres
 s none openwin/lib/app-defaults/XLoad=../../../X11/lib/X11/app-defaults/XLoad
 s none openwin/lib/app-defaults/Xman=../../../X11/lib/X11/app-defaults/Xman
+s none openwin/lib/app-defaults/XFontSel=../../../X11/lib/X11/app-defaults/XFontSel
+s none openwin/lib/app-defaults/Xditview=../../../X11/lib/X11/app-defaults/Xditview
 
 d none share					0755 root sys
 !search $HOME/share/pixmaps

--- a/packages/SUNWxwplt/copyright.add	Wed Aug 06 15:06:17 2008 -0700
+++ b/packages/SUNWxwplt/copyright.add	Wed Aug 06 16:48:34 2008 -0700
@@ -159,6 +159,17 @@
 in this Software without prior written authorization from GROUPE BULL.
 
 --------------------------------------------------------------------
+Files from the app/xfindproxy package are covered by the following notice:
+
+include app/xfindproxy/COPYING
+
+--------------------------------------------------------------------
+
+Files from the app/smproxy package are covered by the following notice:
+
+include app/smproxy/COPYING
+
+--------------------------------------------------------------------
 
 Files from the app/bdftopcf package are covered by the following notice:
 

--- a/packages/SUNWxwplt/prototype_com	Wed Aug 06 15:06:17 2008 -0700
+++ b/packages/SUNWxwplt/prototype_com	Wed Aug 06 16:48:34 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#      "@(#)prototype_com	35.191    08/07/30   Sun Microsystems"
+#      "@(#)prototype_com	35.192    08/08/05   Sun Microsystems"
 #
 # X Window System required core package
 
@@ -68,7 +68,6 @@
 f none openwin/bin/xkbvleds     0755 root bin
 f none openwin/bin/xkbwatch     0755 root bin
 f none openwin/bin/rstart	0755 root bin
-f none openwin/bin/xfindproxy	0755 root bin
 
 #### applications replaced with new versions from open-src/app
 
@@ -161,6 +160,14 @@
 f none X11/bin/xlsfonts	        0755 root bin
 s none openwin/bin/xlsfonts=../../X11/bin/xlsfonts
 
+# open-src/app/xfindproxy
+f none X11/bin/xfindproxy       0755 root bin
+s none openwin/bin/xfindproxy=../../X11/bin/xfindproxy
+
+# open-src/app/smproxy
+f none X11/bin/smproxy  0755 root bin
+s none openwin/bin/smproxy=../../X11/bin/smproxy
+
 # open-src/app/xmag
 f none X11/bin/xmag 		0755 root bin
 s none openwin/bin/xmag=../../X11/bin/xmag