--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/BigReqs/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=bigreqsproto
+
+# Version number (used in path names)
+VERSION=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Composite/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=compositeproto
+
+# Version number (used in path names)
+VERSION=0.3.1
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Damage/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=damageproto
+
+# Version number (used in path names)
+VERSION=1.0.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/EvIE/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=evieext
+
+# Version number (used in path names)
+VERSION=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Fixes/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=fixesproto
+
+# Version number (used in path names)
+VERSION=3.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Fontcache/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=fontcacheproto
+
+# Version number (used in path names)
+VERSION=0.1.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Fonts/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=fontsproto
+
+# Version number (used in path names)
+VERSION=2.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	Xsun-findfont.patch
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Fonts/Xsun-findfont.patch	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,229 @@
+Font header changes required for Xsun to maintain libfont ABI compatibility and
+fix for:
+	4424766 Xsun should select fonts more intelligently
+	<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4424766>
+
+--- font.h	Wed Apr 19 11:54:33 2006
++++ font.h	Wed Apr 19 13:54:56 2006
+@@ -24,6 +24,40 @@
+ /* $XFree86: xc/include/fonts/font.h,v 3.4 2000/11/27 00:10:02 dawes Exp $ */
+ /* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */
+ 
++#ifdef XSUN
++/************************************************************************
++ * Xsun additions for preferring non-scaled bitmaps (not used in Xorg
++ * which has a different mechanism using font path names)
++ *
++ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
++ *
++ * 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.
++ */
++#endif /* XSUN */
++
+ #ifndef FONT_H
+ #define FONT_H
+ 
+@@ -76,6 +110,11 @@
+ #define	BadCharRange	87
+ #define	BadFontFormat	88
+ #define	FPEResetFailed	89	/* for when an FPE reset won't work */
++#ifdef XSUN
++#define FontNameScalable 90
++#define FontNameBitmap   91
++#define FontNameMatch    92
++#endif
+ 
+ /* OpenFont flags */
+ #define FontLoadInfo	0x0001
+@@ -96,7 +135,11 @@
+ #define CACHING_OFF 0
+ #define CACHE_16_BIT_GLYPHS 1
+ #define CACHE_ALL_GLYPHS 2
++#ifdef XSUN
++#define DEFAULT_GLYPH_CACHING_MODE CACHING_OFF
++#else
+ #define DEFAULT_GLYPH_CACHING_MODE CACHE_16_BIT_GLYPHS
++#endif
+ extern int glyphCachingMode;
+ 
+ struct _Client;
+
+--- fontproto.h	Wed Apr 19 11:54:33 2006
++++ fontproto.h	Wed Apr 19 13:55:08 2006
+@@ -22,6 +22,41 @@
+ authorization from The XFree86 Project Inc..
+ 
+ */
++#ifdef XSUN
++/************************************************************************
++ * Xsun additions for preferring non-scaled bitmaps (not used in Xorg
++ * which has a different mechanism using font path names)
++ *
++ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
++ *
++ * 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.
++ */
++#endif /* XSUN */
++
++
+ #ifndef _FONTPROTO_H
+ #define _FONTPROTO_H
+ 
+@@ -41,8 +76,14 @@
+ 				  LoadGlyphsFunc load_glyphs, 
+ 				  StartLaFunc start_list_alias_func, 
+ 				  NextLaFunc next_list_alias_func, 
++#ifdef XSUN
++				  SetPathFunc set_path_func,
++  				  FindFontFunc find_font_fonc);
++#else
+ 				  SetPathFunc set_path_func);
++#endif
+ 
++
+ extern int GetDefaultPointSize ( void );
+ 
+ extern int init_fs_handlers ( FontPathElementPtr fpe, 
+
+--- fontstruct.h	Wed Apr 19 11:54:33 2006
++++ fontstruct.h	Wed Apr 19 13:55:49 2006
+@@ -23,6 +23,41 @@
+ ******************************************************************/
+ /* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp $ */
+ 
++#ifdef XSUN
++/************************************************************************
++ * Xsun additions for preferring non-scaled bitmaps (not used in Xorg
++ * which has a different mechanism using font path names) and preserving
++ * binary compatibility with existing Xsun/libfont ABI.
++ *
++ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
++ *
++ * 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.
++ */
++#endif /* XSUN */
++
+ #ifndef FONTSTR_H
+ #define FONTSTR_H
+ 
+@@ -122,7 +157,10 @@
+ 				unsigned long * /* count */,
+ 				xCharInfo **    /* glyphs */);
+     void        (*unload_font) (FontPtr         /* font */);
++#ifndef XSUN
++/* Moved to the end to preserve binary compatibility. */
+     void        (*unload_glyphs) (FontPtr         /* font */);
++#endif
+     FontPathElementPtr fpe;
+     pointer     svrPrivate;
+     pointer     fontPrivate;
+@@ -129,6 +167,10 @@
+     pointer     fpePrivate;
+     int		maxPrivate;
+     pointer	*devPrivates;
++#ifdef XSUN
++/* Moved to the end to preserve binary compatibility. */
++    void        (*unload_glyphs) (FontPtr         /* font */);
++#endif
+ }           FontRec;
+ 
+ #define FontGetPrivate(pFont,n) ((n) > (pFont)->maxPrivate ? (pointer) 0 : \
+@@ -222,6 +264,19 @@
+ 
+ typedef void (*SetPathFunc)(void);
+ 
++#ifdef XSUN
++typedef int (*FindFontFunc) ( pointer client,
++			      FontPathElementPtr fpe,
++			      Mask flags,
++			      char* name,
++			      int namelen,
++			      fsBitmapFormat format,
++			      fsBitmapFormatMask fmask,
++			      XID id,
++			      char** aliasName,
++			      FontPtr non_cachable_font);
++#endif
++
+ typedef struct _FPEFunctions {
+     NameCheckFunc       name_check;
+     InitFpeFunc 	init_fpe;
+@@ -246,6 +301,9 @@
+ 			data = list of fsChar2b's */
+     LoadGlyphsFunc	load_glyphs;
+     SetPathFunc		set_path_hook;
++#ifdef XSUN
++    FindFontFunc	find_font;
++#endif
+ } FPEFunctionsRec, FPEFunctions;
+ 
+ /*

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Input/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=inputproto
+
+# Version number (used in path names)
+VERSION=1.3.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/KB/5077065.patch	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,56 @@
+# Copyright 2006 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.
+#
+# @(#)5077065.patch	1.1	06/06/12
+
+Part of fix for bug 5077065: Events appear even if XevieSendEvent is not called
+
+--- XKBsrv.h	Thu Sep  1 12:56:14 2005
++++ XKBsrv.h	Fri Apr 21 19:31:12 2006
+@@ -293,6 +293,7 @@
+ 
+ extern CARD32	xkbDebugFlags;
+ extern CARD32	xkbDebugCtrls;
++extern int	xkbDevicePrivateIndex;
+ 
+ #define	_XkbAlloc(s)		xalloc((s))
+ #define	_XkbCalloc(n,s)		Xcalloc((n)*(s))
+@@ -768,6 +769,13 @@
+     int 			/* count */
+ );
+ 
++extern void xkbUnwrapProc(
++    DeviceIntPtr		/* device */,
++    DeviceHandleProc 		/* unwrap proc */,
++    pointer 			/* data */
++);
++
++
+ extern Bool XkbEnableDisableControls(
+     XkbSrvInfoPtr	/* xkbi */,
+     unsigned long	/* change */,

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/KB/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=kbproto
+
+# Version number (used in path names)
+VERSION=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	5077065.patch
+
+### Include common rulesets
+include ../Makefile.inc

--- a/open-src/proto/Makefile	Mon Jun 12 13:53:11 2006 -0700
+++ b/open-src/proto/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -28,11 +28,13 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	06/04/11
+# @(#)Makefile	1.2	06/06/12
 #
 ###############################################################################
 
-OS_SUBDIRS = X11 
+OS_SUBDIRS = X11 BigReqs Composite Damage EvIE Fixes Fontcache Fonts \
+	Input KB PM Randr Record Render Resource ScrnSaver Video \
+	XCMisc XExt XF86BigFont XF86Misc XF86VidMode Xinerama
 
 # Need to install to proto area by default for inter-package dependencies to
 # work right.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Makefile.inc	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,70 @@
+###############################################################################
+#
+# Copyright 2006 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.inc	1.1	06/06/12
+#
+
+### Makefile settings/rules common to all X.Org protocol modules
+
+PWD:sh=pwd
+TOP=$(PWD)/../..
+
+# Not really 32 or 64-bit, but we call it 32-bit to avoid subdirs
+BUILD_TYPES=32 
+
+# Source tarball
+SOURCE_TARBALL_NAME=$(PROTO_NAME)-$(VERSION).tar.bz2
+
+# Download site for source
+SOURCE_URL=$(XORG_RELEASES_URL)/proto/$(SOURCE_TARBALL_NAME)
+
+# Directory created by unpacking source
+SOURCE_DIR=$(BUILD_DIR)/$(PROTO_NAME)-$(VERSION)
+
+### Include common rulesets
+include $(TOP)/common/Makefile.inc
+
+# Command line options to GNU autoconf configure script
+PROTO_CFG=--prefix=$(X11_DIR)
+
+build_gen: $(SOURCE_DIR)/Makefile
+
+# Run configure script
+$(SOURCE_DIR)/Makefile: $(UNPACK_TARGET)
+	(cd $(SOURCE_DIR) ; \
+	 chmod a+x configure ; \
+	 CC=$(CC) CFLAGS="$(LIB_CFLAGS)" LD="$(CC) $(LIB_CFLAGS) $(LDFLAGS)" LDFLAGS="$(LIB_LDFLAGS)" ./configure $(PROTO_CFG) )
+
+# Install
+install_gen:: $(SOURCE_DIR)/Makefile
+	(cd $(SOURCE_DIR) ; $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) install)
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/PM/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=xproxymanagementprotocol
+
+# Version number (used in path names)
+VERSION=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Randr/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=randrproto
+
+# Version number (used in path names)
+VERSION=1.1.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Record/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=recordproto
+
+# Version number (used in path names)
+VERSION=1.13.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Render/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=renderproto
+
+# Version number (used in path names)
+VERSION=0.9.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Resource/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=resourceproto
+
+# Version number (used in path names)
+VERSION=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/ScrnSaver/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=scrnsaverproto
+
+# Version number (used in path names)
+VERSION=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Video/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=videoproto
+
+# Version number (used in path names)
+VERSION=2.2.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- a/open-src/proto/X11/Makefile	Mon Jun 12 13:53:11 2006 -0700
+++ b/open-src/proto/X11/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -28,51 +28,23 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2	06/05/15
+# @(#)Makefile	1.3	06/06/12
 #
 
-PWD:sh=pwd
-TOP=$(PWD)/../..
-
-# Not really 32 or 64-bit, but we call it 32-bit to avoid subdirs
-BUILD_TYPES=32 
+# Package name used in tarballs
+PROTO_NAME=xproto
 
 # Version number (used in path names)
 VERSION=7.0.5
 
-# Source tarball
-SOURCE_TARBALL_NAME=xproto-$(VERSION).tar.bz2
-
-# Download site for source
-SOURCE_URL=$(XORG_RELEASES_URL)/proto/$(SOURCE_TARBALL_NAME)
-
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=	Xos.h-patch Xpoll.h-patch X.h-patch
 
-# Directory created by unpacking source
-SOURCE_DIR=$(BUILD_DIR)/xproto-$(VERSION)
-
 ### Include common rulesets
-include $(TOP)/common/Makefile.inc
-
-### Rules specific to this directory:
-
-# Command line options to GNU autoconf configure script
-XPROTO_CFG=--prefix=$(X11_DIR)
+include ../Makefile.inc
 
-build_gen: $(SOURCE_DIR)/Makefile
-
-# Run configure script
-$(SOURCE_DIR)/Makefile: $(UNPACK_TARGET)
-	(cd $(SOURCE_DIR) ; \
-	 chmod a+x configure ; \
-	 CC=$(CC) CFLAGS="$(LIB_CFLAGS)" LD="$(CC) $(LIB_CFLAGS) $(LDFLAGS)" LDFLAGS="$(LIB_LDFLAGS)" ./configure $(XPROTO_CFG) )
-
-# Install - first is for packages, second is for building the old monolith
-install_gen: $(SOURCE_DIR)/Makefile
-	(cd $(SOURCE_DIR) ; $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) install)
+# Extra install for bootstrapping the old monolith
+install_gen:: $(SOURCE_DIR)/Makefile
 	@if [ -d $(PROTODIR)/../xc/include ] ; then \
 		(set -x ; cd $(SOURCE_DIR) ; $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) xprotodir=/../xc/include install) ;\
 	fi
-
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/XCMisc/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=xcmiscproto
+
+# Version number (used in path names)
+VERSION=1.1.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/XExt/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=xextproto
+
+# Version number (used in path names)
+VERSION=7.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	Xsun-mbx-abi.patch
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/XExt/Xsun-mbx-abi.patch	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,91 @@
+--- multibufst.h	Fri Apr 23 11:43:06 2004
++++ multibufst.h	Fri Apr 21 17:11:23 2006
+@@ -26,6 +26,39 @@
+ 
+ /* $XFree86: xc/include/extensions/multibufst.h,v 3.8 2001/12/19 21:37:29 dawes Exp $ */
+ 
++#ifdef XSUN
++/************************************************************************
++ * Xsun additions to maintain existing Xsun HW MBX ABI
++ *
++ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
++ *
++ * 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.
++ */
++#endif /* XSUN */
++
+ #ifndef _MULTIBUFST_H_
+ #define _MULTIBUFST_H_
+ 
+@@ -378,6 +411,9 @@
+     int		    number;	    /* index of this buffer into array */
+     int		    side;	    /* always Mono */
+     int		    clobber;	    /* Unclobbered, PartiallyClobbered, FullClobbered */
++#ifdef XSUN
++    int		    mode;	    /* Either MBCOPY_FLIP or MBVIDEO_FLIP */
++#endif
+     PixmapPtr	    pPixmap;	    /* associated pixmap */
+ } MultibufferRec, *MultibufferPtr;
+ 
+@@ -407,6 +443,23 @@
+  */
+ typedef struct _MultibufferScreen {
+     PositionWindowProcPtr PositionWindow;		/* pWin, x,y */
++#ifdef XSUN
++    void	(*ClipNotify)(WindowPtr, int, int);
++    void	(*WindowExposures)(WindowPtr, RegionPtr, RegionPtr);
++    void	(*ClearToBackground)(WindowPtr, int, int, int, int, Bool);
++    Bool	inClearToBackground;
++    Bool	(*ChangeWindowAttributes)(WindowPtr, Mask);
++    int         (*TryMpg)(WindowPtr, int, int, int); 
++    PixmapPtr   (*CreateMultibuffer)(WindowPtr, int, int, int, int); 
++    PixmapPtr   (*CreateMultibuffer2)(WindowPtr, int, int, int, int, int *); 
++    void   	(*DestroyMultibuffer)(WindowPtr, PixmapPtr, int, int); 
++    PixmapPtr   (*ResizeMultibuffer)(WindowPtr, int, int, int, int); 
++    void        (*RepositionMultibuffer)(WindowPtr, PixmapPtr, int, int); 
++    int         (*DisplayMultibuffer)(WindowPtr,int); 
++    int         (*SetMultibufferInvisible)(WindowPtr, PixmapPtr); 
++    int         (*SetMultibufferVisible)(WindowPtr, PixmapPtr);
++    void	(*LastUpdateTime)(WindowPtr, u_long, u_long);
++#endif
+ } MultibufferScreenRec, *MultibufferScreenPtr;
+ 
+ /*
+
+--- multibuf.h	Fri Apr 23 11:43:06 2004
++++ multibuf.h	Fri Apr 21 17:23:12 2006
+@@ -304,6 +304,10 @@
+     XID *			/* ids */,
+     int				/* action */,
+     int				/* hint */
++#ifdef XSUN
++    ,
++    int				/* clientid */
++#endif
+ );
+ extern void	DestroyImageBuffers (
+     WindowPtr			/* pWin */
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/XF86BigFont/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=xf86bigfontproto
+
+# Version number (used in path names)
+VERSION=1.1.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/XF86Misc/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=xf86miscproto
+
+# Version number (used in path names)
+VERSION=0.9.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/XF86VidMode/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=xf86vidmodeproto
+
+# Version number (used in path names)
+VERSION=2.2.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Xinerama/Makefile	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2006 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.1	06/06/12
+#
+
+# Package name used in tarballs
+PROTO_NAME=xineramaproto
+
+# Version number (used in path names)
+VERSION=1.1.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=	 Xsun-extended-proto.patch
+
+### Include common rulesets
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Xinerama/Xsun-extended-proto.patch	Mon Jun 12 16:04:09 2006 -0700
@@ -0,0 +1,178 @@
+In the early days of Xinerama, Solaris Xsun extended the protocol in one
+direction, while XFree86 extended differently.   X.Org has adopted the more
+widely adopted XFree86 extensions, and thus the Solaris version is deprecated,
+but Sun maintains backwards compatibility with old versions of Solaris, so
+we still have this here for now.
+
+For more info, see:
+ http://blogs.sun.com/roller/page/alanc?entry=xinerama_protocol_clashes_on_solaris
+
+diff -uwb build_32/xineramaproto-1.1.2/panoramiXext.h ../../../xc/include/extensions//panoramiXext.h
+--- panoramiXext.h	Fri Apr 23 11:43:06 2004
++++ panoramiXext.h	Tue Apr 18 17:41:37 2006
+@@ -46,3 +46,76 @@
+ extern XPanoramiXInfo *XPanoramiXAllocInfo (
+     void
+ );        
++
++#ifdef SUNSOFT
++/************************************************************************
++ * Xsun addition to Xinerama 1.0 protocol, now deprecated in favor of 1.1
++ * protocol.
++ *
++ * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
++ *
++ * 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.
++ */
++
++#define XINERAMA_PLACE_TOP	1
++#define XINERAMA_PLACE_BOTTOM	2
++#define XINERAMA_PLACE_RIGHT	4
++#define XINERAMA_PLACE_LEFT	8
++
++#ifndef _XINERAMAINFO_
++#define _XINERAMAINFO_
++
++#define XinID	int
++#define MAXSCREEN 16
++#define DELTA	int
++#define POINT	int
++
++typedef struct subwid
++{
++	XinID	wid;	/* sub window id */
++	DELTA	dx,dy;	/* delta in screen co-ord from virtual zero */
++	POINT	x,y;	/* location of window in screen co-ord */
++	DELTA 	wdx,wdy;/* size of window in screen co-ord */
++}SubWID, *pSubWID;
++
++typedef struct xineramainfo
++{
++	XinID 	wid;	/* Window ID of requested virtual window */
++	SubWID	subs[MAXSCREEN];	/* there will be 16 slots */
++}XineramaInfo, *pXineramaInfo;
++#endif
++
++#ifndef NO_PROTO_HERE
++Bool XDgaGetXineramaInfo(
++#if NeedFunctionPrototypes
++/* this brakes the server
++Display *, int, XID, XineramaInfo *
++*/
++#endif
++);
++#endif /* SUNSOFT */
++
++#endif
+diff -uwb build_32/xineramaproto-1.1.2/panoramiXproto.h ../../../xc/include/extensions//panoramiXproto.h
+--- panoramiXproto.h	Fri Apr 23 11:43:06 2004
++++ panoramiXproto.h	Tue Apr 18 17:42:17 2006
+@@ -189,4 +189,85 @@
+ } xXineramaScreenInfo;
+ #define sz_XineramaScreenInfo 8
+ 
++#ifdef SUNSOFT
++/************************************************************************
++ * Xsun addition to Xinerama 1.0 protocol, now deprecated in favor of 1.1
++ * protocol.
++ *
++ * Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
++ *
++ * 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.
++ */
++#pragma ident   "@(#)Xsun-extended-proto.patch	1.1	06/06/12 SMI"
++
++#define X_PanoramiXGetInfo	4
++#define X_XineramaInfo		4
++
++#ifndef _XINERAMAINFO_
++#define _XINERAMAINFO_
++#define XinID	int
++#define MAXSCREEN 16
++#define DELTA	int
++#define POINT	int
++
++typedef struct subwid
++{
++	XinID	wid;	/* sub window id */
++	DELTA	dx,dy;	/* delta in screen co-ord from virtual zero */
++	POINT	x,y;	/* location of window in screen co-ord */
++	DELTA 	wdx,wdy;/* size of window in screen co-ord */
++}SubWID, *pSubWID;
++
++typedef struct xineramainfo
++{
++	XinID 	wid;	/* Window ID of requested virtual window */
++	SubWID	subs[MAXSCREEN];	/* there will be 16 slots */
++}XineramaInfo, *pXineramaInfo;
++
++#endif
++
++typedef struct _XXineramaInfoReply
++{
++	BYTE	type;
++	CARD8	unused;
++	CARD16	sequenceNumber B16;
++	CARD32	length B32;
++	XinID 	wid;	/* Window ID of requested virtual window */
++	SubWID	subs[MAXSCREEN];	/* there will be 16 slots */
++}xXineramaInfoReply;
++
++typedef struct _XXineramaInfoReq
++{
++	CARD8	reqType;
++	CARD8	xXineramaReqType;
++	CARD16	length B16;
++	CARD32	visual B32;
++}xXineramaInfoReq;
++
++#define sz_xXineramaInfoReq 8
++#endif /* SUNSOFT */
++
+ #endif