Mercurial Mercurial > sustaining > oi_151a > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6731756 Change to the open source version of xbiff
authorJay Cotton <Jay.Cotton@Sun.COM>
Wed, 30 Jul 2008 14:38:19 -0700
changeset 474 fbaaafd4b803
parent 473 1154e40b3946
child 475 054a8ab64c3a
6731756 Change to the open source version of xbiff
open-src/app/Makefile file | annotate | diff | comparison | revisions
open-src/app/xbiff/COPYING file | annotate | diff | comparison | revisions
open-src/app/xbiff/Makefile file | annotate | diff | comparison | revisions
packages/SUNWxwman/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwman/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwopt/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwopt/prototype file | annotate | diff | comparison | revisions 
--- a/open-src/app/Makefile	Mon Jul 28 21:00:00 2008 -0700
+++ b/open-src/app/Makefile	Wed Jul 30 14:38:19 2008 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.60	08/07/22
+# @(#)Makefile	1.61	08/07/30
 #
 ###############################################################################
 
@@ -57,6 +57,7 @@
 	viewres \
 	x11perf \
 	xauth \
+	xbiff \
 	xcalc \
 	xclipboard \
 	xclock \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xbiff/COPYING	Wed Jul 30 14:38:19 2008 -0700
@@ -0,0 +1,27 @@
+Copyright (c) 1988  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/xbiff/Makefile	Wed Jul 30 14:38:19 2008 -0700
@@ -0,0 +1,57 @@
+###############################################################################
+#
+# xbiff 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=xbiff
+
+# Version number (used in path names)
+APP_VERS=1.0.1
+
+# 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, SUNWxwopt} {Interface Stability, Committed}'
+
+# Specify which cpp to use instead of depending on builder's $PATH
+APP_CONFIG_OPTS = 
+
+
+include ../Makefile.inc
+
+
--- a/packages/SUNWxwman/copyright.add	Mon Jul 28 21:00:00 2008 -0700
+++ b/packages/SUNWxwman/copyright.add	Wed Jul 30 14:38:19 2008 -0700
@@ -347,3 +347,9 @@
 
 include app/xrx/COPYING
 
+--------------------------------------------------------------------
+
+Files from the app/xbiff package are covered by the following notice:
+
+include app/xbiff/COPYING
+
--- a/packages/SUNWxwman/prototype_com	Mon Jul 28 21:00:00 2008 -0700
+++ b/packages/SUNWxwman/prototype_com	Wed Jul 30 14:38:19 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 35.89     08/07/22 SMI"
+# ident "@(#)prototype_com 35.90     08/07/30 SMI"
 #
 #  X Window System online user man pages
 
@@ -78,7 +78,6 @@
 f none openwin/share/man/man1/pswrap.1 0444 root bin
 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/xbiff.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
@@ -327,3 +326,6 @@
 
 # open-src/app/winsysck
 f none X11/share/man/man1/winsysck.1 	0444 root bin
+
+# open-src/app/xbiff
+f none X11/share/man/man1/xbiff.1 	0444 root bin
--- a/packages/SUNWxwopt/copyright.add	Mon Jul 28 21:00:00 2008 -0700
+++ b/packages/SUNWxwopt/copyright.add	Wed Jul 30 14:38:19 2008 -0700
@@ -125,3 +125,9 @@
 
 include app/xclock/COPYING
 
+--------------------------------------------------------------------
+
+Files from the app/xbiff package are covered by the following notice:
+
+include app/xbiff/COPYING
+
--- a/packages/SUNWxwopt/prototype	Mon Jul 28 21:00:00 2008 -0700
+++ b/packages/SUNWxwopt/prototype	Wed Jul 30 14:38:19 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype	35.58	08/07/16 SMI"
+# ident "@(#)prototype	35.59	08/07/30 SMI"
 ##
 #  nonessential X core clients and server extensions
 
@@ -46,7 +46,6 @@
 f none openwin/bin/mkdirhier	0755 root bin
 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/xcolor	0755 root bin
 f none openwin/bin/xditview	0755 root bin
 f none openwin/bin/xdm		0755 root bin
@@ -165,6 +164,8 @@
 f none X11/bin/xconsole				0755 root bin
 f none X11/bin/xcutsel				0755 root bin
 f none X11/bin/xload				0755 root sys
+f none X11/bin/xbiff				0755 root bin
+s none openwin/bin/xbiff=../../X11/bin/xbiff
 s none openwin/bin/xload=../../X11/bin/xload
 s none openwin/bin/appres=../../X11/bin/appres
 s none openwin/bin/atobm=../../X11/bin/atobm
sustaining/oi_151a/xnv