--- a/open-src/app/Makefile Tue Jul 15 10:45:50 2008 -0700
+++ b/open-src/app/Makefile Wed Jul 16 14:01:09 2008 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.57 08/07/15
+# @(#)Makefile 1.58 08/07/16
#
###############################################################################
@@ -58,6 +58,7 @@
xauth \
xcalc \
xclipboard \
+ xclock \
xcmsdb \
xconsole \
xcursorgen \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xclock/COPYING Wed Jul 16 14:01:09 2008 -0700
@@ -0,0 +1,103 @@
+Copyright 1989, 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.
+
+ * Copyright 2004 Sun Microsystems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of Sun Microsystems, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ *
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR
+ * LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE,
+ * MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES.
+ * IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
+ * PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
+ * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
+ * THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE
+ * SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * Authors: I18N - Steve Swales - March 2000
+ * bgpixmap - Alan Coopersmith (as part of STSF project) - Sept. 2001
+
+**********************************************************
+
+Copyright 1987, 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.
+
+
+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+ All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR 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.
+
+*****************************************************************
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xclock/Makefile Wed Jul 16 14:01:09 2008 -0700
@@ -0,0 +1,52 @@
+###############################################################################
+#
+# xclock 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.2 08/01/24
+#
+
+# Package name used in tarballs
+APP_NAME=xclock
+
+# Version number (used in path names)
+APP_VERS=1.0.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES =
+
+LIB_ADD_LD_OPTIONS += -L$(PROTODIR)$(X11_DIR)/lib/xorgcfg
+
+# 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/SUNW0xwplt/prototype Tue Jul 15 10:45:50 2008 -0700
+++ b/packages/SUNW0xwplt/prototype Wed Jul 16 14:01:09 2008 -0700
@@ -29,7 +29,7 @@
#
##########################################################################
#
-# ident "@(#)prototype 1.19 08/05/20 SMI"
+# ident "@(#)prototype 1.20 08/07/16 SMI"
#
# X Window System required core package localizable files
@@ -50,7 +50,6 @@
d none openwin/lib/locale/C 0755 root bin
d none openwin/lib/locale/C/app-defaults 0755 root bin
f none openwin/lib/locale/C/app-defaults/Chooser 0644 root bin
-f none openwin/lib/locale/C/app-defaults/XClock 0644 root bin
f none openwin/lib/locale/C/app-defaults/XLock 0644 root bin
f none openwin/lib/locale/C/app-defaults/Xmh 0644 root bin
@@ -71,6 +70,7 @@
d none X11/lib/X11/app-defaults 0755 root bin
d none X11/lib/X11/app-defaults/C 0755 root bin
f none X11/lib/X11/app-defaults/C/Bitmap 0444 root bin
+f none X11/lib/X11/app-defaults/XClock 0444 root bin
f none X11/lib/X11/app-defaults/C/Bitmap-color 0444 root bin
f none X11/lib/X11/app-defaults/C/Bitmap-nocase 0444 root bin
f none X11/lib/X11/app-defaults/C/Clock-color 0444 root bin
--- a/packages/SUNWxwman/prototype_com Tue Jul 15 10:45:50 2008 -0700
+++ b/packages/SUNWxwman/prototype_com Wed Jul 16 14:01:09 2008 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.85 08/07/15 SMI"
+# ident "@(#)prototype_com 35.86 08/07/16 SMI"
#
# X Window System online user man pages
@@ -80,7 +80,6 @@
f none openwin/share/man/man1/showsnf.1 0444 root bin
f none openwin/share/man/man1/winsysck.1 0444 root bin
f none openwin/share/man/man1/xbiff.1 0444 root bin
-f none openwin/share/man/man1/xclock.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
@@ -225,6 +224,9 @@
# open-src/app/xcutsel
f none X11/share/man/man1/xcutsel.1 0444 root bin
+# open-src/app/xclock
+f none X11/share/man/man1/xclock.1 0444 root bin
+
# open-src/app/xdpyinfo
f none X11/share/man/man1/xdpyinfo.1 0444 root bin
--- a/packages/SUNWxwopt/copyright.add Tue Jul 15 10:45:50 2008 -0700
+++ b/packages/SUNWxwopt/copyright.add Wed Jul 16 14:01:09 2008 -0700
@@ -119,3 +119,9 @@
include app/xload/COPYING
+--------------------------------------------------------------------
+
+Files from the app/xclock package are covered by the following notice:
+
+include app/xclock/COPYING
+
--- a/packages/SUNWxwopt/prototype Tue Jul 15 10:45:50 2008 -0700
+++ b/packages/SUNWxwopt/prototype Wed Jul 16 14:01:09 2008 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype 35.57 08/07/15 SMI"
+# ident "@(#)prototype 35.58 08/07/16 SMI"
##
# nonessential X core clients and server extensions
@@ -47,7 +47,6 @@
f none openwin/bin/pswrap 0755 root bin
f none openwin/bin/showsnf 0755 root bin
f none openwin/bin/xbiff 0755 root bin
-f none openwin/bin/xclock 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
@@ -203,6 +202,10 @@
# no openwin link since it was never delivered into /usr/openwin
f none X11/bin/luit 0755 root bin
+#open-src/app/xclock
+f none X11/bin/xclock 0755 root bin
+s non openwin/bin/xclock=../../X11/bin/xclock
+
!search $HOME/X11/lib/X11/app-defaults
d none X11/lib 0755 root bin
d none X11/lib/X11 0755 root bin
--- a/packages/SUNWxwplt/prototype_com Tue Jul 15 10:45:50 2008 -0700
+++ b/packages/SUNWxwplt/prototype_com Wed Jul 16 14:01:09 2008 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.188 08/07/03 Sun Microsystems"
+# "@(#)prototype_com 35.189 08/07/16 Sun Microsystems"
#
# X Window System required core package
@@ -537,7 +537,6 @@
d none openwin/lib/app-defaults 0755 root bin
s none openwin/lib/X11/app-defaults=../app-defaults
f none openwin/lib/app-defaults/Chooser 0644 root bin
-f none openwin/lib/app-defaults/XClock 0644 root bin
f none openwin/lib/app-defaults/XLock 0644 root bin
f none openwin/lib/app-defaults/Xmh 0644 root bin
@@ -1211,6 +1210,7 @@
f none X11/lib/X11/app-defaults/XCalc 0644 root bin
f none X11/lib/X11/app-defaults/XCalc-color 0644 root bin
f none X11/lib/X11/app-defaults/XClipboard 0644 root bin
+f none X11/lib/X11/app-defaults/XClock 0644 root bin
f none X11/lib/X11/app-defaults/XConsole 0644 root bin
f none X11/lib/X11/app-defaults/Xfd 0644 root bin
f none X11/lib/X11/app-defaults/XLogo 0644 root bin
@@ -1238,6 +1238,7 @@
f none X11/lib/X11/lbxproxy/AtomControl 0755 root bin
# Create links back to openwin
+s none openwin/lib/app-defaults/XClock=../../../X11/lib/X11/app-defaults/XClock
s none openwin/lib/app-defaults/Bitmap=../../../X11/lib/X11/app-defaults/Bitmap
s none openwin/lib/app-defaults/Bitmap-color=../../../X11/lib/X11/app-defaults/Bitmap-color
s none openwin/lib/app-defaults/Bitmap-nocase=../../../X11/lib/X11/app-defaults/Bitmap-nocase