6724748 replace demo/xeyes with open source version from X.org
authorSam Lau <Sam.Lau@Sun.COM>
Tue, 15 Jul 2008 09:21:57 -0700
changeset 462 60e6f21a78a1
parent 461 0dfa99decf9e
child 463 5e3c653a947a
6724748 replace demo/xeyes with open source version from X.org
open-src/app/Makefile
open-src/app/xeyes/COPYING
open-src/app/xeyes/Makefile
packages/SUNWxwdem/copyright.add
packages/SUNWxwdem/prototype
packages/SUNWxwman/copyright.add
packages/SUNWxwman/prototype_com
--- a/open-src/app/Makefile	Thu Jul 10 17:06:00 2008 -0700
+++ b/open-src/app/Makefile	Tue Jul 15 09:21:57 2008 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.55	08/07/03
+# @(#)Makefile	1.56	08/07/14
 #
 ###############################################################################
 
@@ -97,6 +97,7 @@
 	xwud \
 	xscreensaver \
 	rss-glx \
+	xeyes \
         xterm
 
 OS_SUBDIRS_sparc = $(OS_SUBDIRS_common)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xeyes/COPYING	Tue Jul 15 09:21:57 2008 -0700
@@ -0,0 +1,27 @@
+
+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/xeyes/Makefile	Tue Jul 15 09:21:57 2008 -0700
@@ -0,0 +1,49 @@
+###############################################################################
+#
+# xeyes 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=xeyes
+
+# 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, SUNWxwdem} {Interface Stability, Committed}'
+
+include ../Makefile.inc
--- a/packages/SUNWxwdem/copyright.add	Thu Jul 10 17:06:00 2008 -0700
+++ b/packages/SUNWxwdem/copyright.add	Tue Jul 15 09:21:57 2008 -0700
@@ -7,6 +7,12 @@
 
 --------------------------------------------------------------------
 
+Files from the app/xeyes package are covered by the following notice:
+
+include app/xeyes/COPYING
+
+--------------------------------------------------------------------
+
 Files from the app/xgc package are covered by the following notice:
 
 include app/xgc/COPYING
--- a/packages/SUNWxwdem/prototype	Thu Jul 10 17:06:00 2008 -0700
+++ b/packages/SUNWxwdem/prototype	Tue Jul 15 09:21:57 2008 -0700
@@ -29,7 +29,7 @@
 #
 ###########################################################################
 #
-#	@(#)prototype	35.20	08/04/11
+#	@(#)prototype	35.22	08/07/15
 #
 #  X Window System demo programs
 
@@ -54,7 +54,6 @@
 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/xeyes		0755 root bin
 f none openwin/demo/xmac		0755 root bin
 f none openwin/demo/xmag_multivis	0755 root bin
 f none openwin/demo/xscope		0755 root bin
@@ -70,6 +69,10 @@
 f none X11/bin/xev 			0755 root bin
 s none openwin/demo/xev=../../X11/bin/xev
 
+# open-src/app/xeyes
+f none X11/bin/xeyes                    0755 root bin
+s none openwin/demo/xeyes=../../X11/bin/xeyes
+
 # 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	Thu Jul 10 17:06:00 2008 -0700
+++ b/packages/SUNWxwman/copyright.add	Tue Jul 15 09:21:57 2008 -0700
@@ -163,6 +163,12 @@
 
 --------------------------------------------------------------------
 
+Files from the app/xeyes package are covered by the following notice:
+
+include app/xeyes/COPYING
+
+--------------------------------------------------------------------
+
 Files from the app/xfd package are covered by the following notice:
 
 include app/xfd/COPYING
--- a/packages/SUNWxwman/prototype_com	Thu Jul 10 17:06:00 2008 -0700
+++ b/packages/SUNWxwman/prototype_com	Tue Jul 15 09:21:57 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 35.81     08/07/08 SMI"
+# ident "@(#)prototype_com 35.84     08/07/15 SMI"
 #
 #  X Window System online user man pages
 
@@ -69,7 +69,6 @@
 f none openwin/share/man/man1/cmap_compact.1 0444 root bin
 f none openwin/share/man/man1/fs.1 0444 root bin
 f none openwin/share/man/man1/fsadmin.1 0444 root bin
-f none openwin/share/man/man1/htt.1 0444 root bin
 f none openwin/share/man/man1/imake.1 0444 root bin
 f none openwin/share/man/man1/kbd_mode.1 0444 root bin
 f none openwin/share/man/man1/makedepend.1 0444 root bin
@@ -115,7 +114,6 @@
 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/xev.6 0444 root bin
-f none openwin/share/man/man6/xeyes.6 0444 root bin
 f none openwin/share/man/man6/xmac.6 0444 root bin
 f none openwin/share/man/man6/xmag_multivis.6 0444 root bin
 f none openwin/share/man/man6/xscope.6 0444 root bin
@@ -231,6 +229,9 @@
 # open-src/app/xev
 f none X11/share/man/man1/xev.1 	0444 root bin
 
+# open-src/app/xeyes
+f none X11/share/man/man1/xeyes.1 	0444 root bin
+
 # open-src/app/xfd
 f none X11/share/man/man1/xfd.1 	0444 root bin