Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / 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.
6909859 References to /usr/bin/i386/X* should be changed to /usr/bin/i86/X*
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Fri, 11 Dec 2009 17:39:23 -0800
changeset 859 449d89f35385
parent 858 8be44a87f29f
child 860 051d27fd4109
6909859 References to /usr/bin/i386/X* should be changed to /usr/bin/i86/X*
open-src/common/Makefile.init file | annotate | diff | comparison | revisions
open-src/data/smf-rbac/Xserver file | annotate | diff | comparison | revisions
open-src/xserver/xorg/sun-manpage.patch file | annotate | diff | comparison | revisions
packages/SUNWxorg-server/prototype_i386 file | annotate | diff | comparison | revisions
packages/SUNWxvnc/prototype_i386 file | annotate | diff | comparison | revisions 
--- a/open-src/common/Makefile.init	Fri Dec 11 13:36:22 2009 -0800
+++ b/open-src/common/Makefile.init	Fri Dec 11 17:39:23 2009 -0800
@@ -29,7 +29,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident	"@(#)Makefile.init	1.15	09/12/05 SMI"
+# ident	"@(#)Makefile.init	1.16	09/12/11 SMI"
 #
 
 # Use ksh93 for shell commands in Makefiles so that builds are the same
@@ -73,7 +73,7 @@
 
 SUBDIR32_sparc	= sparcv8
 SUBDIR64_sparc 	= sparcv9
-SUBDIR32_i386	= i386
+SUBDIR32_i386	= i86
 SUBDIR64_i386 	= amd64
 
 SUBDIR32 = $(SUBDIR32_$(MACH))
--- a/open-src/data/smf-rbac/Xserver	Fri Dec 11 13:36:22 2009 -0800
+++ b/open-src/data/smf-rbac/Xserver	Fri Dec 11 17:39:23 2009 -0800
@@ -1,6 +1,6 @@
 #!/bin/ksh93
 #
-# ident	"@(#)Xserver	1.9	09/12/05 SMI"
+# ident	"@(#)Xserver	1.10	09/12/11 SMI"
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -163,10 +163,10 @@
     case "$1" in
 	/usr/bin/Xorg)			return 0 ;;
 	/usr/bin/amd64/Xorg)		return 0 ;;
-	/usr/bin/i386/Xorg)		return 0 ;;
+	/usr/bin/i86/Xorg)		return 0 ;;
 	/usr/bin/Xvfb)			return 0 ;;
 	/usr/bin/amd64/Xvfb)		return 0 ;;
-	/usr/bin/i386/Xvfb)		return 0 ;;
+	/usr/bin/i86/Xvfb)		return 0 ;;
 	/usr/bin/Xvnc)			return 0 ;;
 	/usr/openwin/bin/Xsun)		return 0 ;;
 	/usr/openwin/bin/Xvfb)		return 0 ;;
--- a/open-src/xserver/xorg/sun-manpage.patch	Fri Dec 11 13:36:22 2009 -0800
+++ b/open-src/xserver/xorg/sun-manpage.patch	Fri Dec 11 17:39:23 2009 -0800
@@ -15,7 +15,7 @@
 --- doc/Xserver.man.pre	2009-08-10 21:00:22.000000000 -0700
 +++ doc/Xserver.man.pre	2009-11-03 22:28:48.641981596 -0800
 @@ -1,3 +1,33 @@
-+.\" ident	"@(#)sun-manpage.patch	1.11	09/12/06 SMI"
++.\" ident	"@(#)sun-manpage.patch	1.12	09/12/11 SMI"
 +.\" 
 +.\" Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 +.\" Use is subject to license terms.
@@ -187,10 +187,10 @@
 +\fB/usr/openwin/bin/Xsun\fP
 +\fB/usr/openwin/bin/Xvfb\fP
 +\fB/usr/bin/Xorg\fP
-+\fB/usr/bin/i386/Xorg\fP
++\fB/usr/bin/i86/Xorg\fP
 +\fB/usr/bin/amd64/Xorg\fP
 +\fB/usr/bin/Xvfb\fP
-+\fB/usr/bin/i386/Xvfb\fP
++\fB/usr/bin/i86/Xvfb\fP
 +\fB/usr/bin/amd64/Xvfb\fP
 +\fB/usr/bin/Xvnc\fP
 +.fi
--- a/packages/SUNWxorg-server/prototype_i386	Fri Dec 11 13:36:22 2009 -0800
+++ b/packages/SUNWxorg-server/prototype_i386	Fri Dec 11 17:39:23 2009 -0800
@@ -30,7 +30,7 @@
 #
 ###########################################################################
 #
-# ident	"@(#)prototype_i386	1.20	09/12/11 SMI"
+# ident	"@(#)prototype_i386	1.21	09/12/11 SMI"
 #
 # X.Org Foundation X server for Solaris
 
@@ -38,7 +38,7 @@
 
 # Include ISA independent files (prototype_com)
 #
-!XSERVERBINDIR=bin/i386
+!XSERVERBINDIR=bin/i86
 !XSERVERMODDIR=lib/xorg/modules/
 !include prototype_com
 
@@ -47,7 +47,7 @@
 l none bin/Xephyr=../lib/isaexec
 l none bin/Xvfb=../lib/isaexec
 
-!search $HOME/bin/i386
+!search $HOME/bin/i86
 d none bin/i86							0755 root bin
 f none bin/i86/Xorg						4555 root bin
 f none bin/i86/Xephyr						0555 root bin
--- a/packages/SUNWxvnc/prototype_i386	Fri Dec 11 13:36:22 2009 -0800
+++ b/packages/SUNWxvnc/prototype_i386	Fri Dec 11 17:39:23 2009 -0800
@@ -1,6 +1,7 @@
 ###########################################################################
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is 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
@@ -29,7 +30,7 @@
 #
 ###########################################################################
 #
-# ident "@(#)prototype_i386 1.1     07/10/10 SMI"
+# ident	"@(#)prototype_i386	1.2	09/12/11 SMI"
 #
 # Xvnc server for Solaris
 
@@ -37,6 +38,6 @@
 
 # Include ISA independent files (prototype_com)
 #
-!XSERVERBINDIR=bin/i386
+!XSERVERBINDIR=bin/i86
 !XSERVERMODDIR=lib/modules/
 !include prototype_com
upstream/oracle/x-cons/x-s11-update-clone