--- a/open-src/app/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ b/open-src/app/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.9 07/10/08
+# @(#)Makefile 1.10 07/11/16
#
###############################################################################
@@ -71,6 +71,6 @@
@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
for i in $(OS_SUBDIRS) ;\
do \
- (cd $$i ; echo "## making" $(OS_TARGET) "in open-src/proto/$$i..."; \
+ (cd $$i ; echo "## making" $(OS_TARGET) "in open-src/app/$$i..."; \
$(MAKE) $(MFLAGS) CDEBUGFLAGS="$(CDEBUGFLAGS)" $(OS_TARGET)); \
done
--- a/open-src/common/Makefile.inc Wed Nov 21 09:43:21 2007 +0000
+++ b/open-src/common/Makefile.inc Wed Nov 21 15:19:48 2007 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.80 07/11/02
+# @(#)Makefile.inc 1.81 07/11/20
#
# Borrowed from Solaris OS/Net makefile.master:
@@ -344,8 +344,8 @@
XPROTO_DEP=$(PROTODIR)/usr/lib/$(ARCHLIBSUBDIR)/pkgconfig/xproto.pc
$(XPROTO_DEP):
- @echo "Installing dependency proto/X11"
- (cd $(TOP)/proto/X11 ; make install)
+ @echo "Installing dependency proto/x11proto"
+ (cd $(TOP)/proto/x11proto ; make install)
### Useful rules for maintaining patch sets
--- a/open-src/data/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ b/open-src/data/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.1 07/09/04
+# @(#)Makefile 1.2 07/11/16
#
###############################################################################
@@ -55,6 +55,6 @@
@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
for i in $(OS_SUBDIRS) ;\
do \
- (cd $$i ; echo "## making" $(OS_TARGET) "in open-src/proto/$$i..."; \
+ (cd $$i ; echo "## making" $(OS_TARGET) "in open-src/data/$$i..."; \
$(MAKE) $(MFLAGS) CDEBUGFLAGS="$(CDEBUGFLAGS)" $(OS_TARGET)); \
done
--- a/open-src/font/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ b/open-src/font/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.3 07/09/14
+# @(#)Makefile 1.4 07/11/16
#
###############################################################################
@@ -56,6 +56,6 @@
@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
for i in $(OS_SUBDIRS) ;\
do \
- (cd $$i ; echo "## making" $(OS_TARGET) "in open-src/proto/$$i..."; \
+ (cd $$i ; echo "## making" $(OS_TARGET) "in open-src/font/$$i..."; \
$(MAKE) $(MFLAGS) CDEBUGFLAGS="$(CDEBUGFLAGS)" $(OS_TARGET)); \
done
--- a/open-src/proto/BigReqs/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Composite/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Damage/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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.2 07/07/20
-#
-
-# Package name used in tarballs
-PROTO_NAME=damageproto
-
-# Version number (used in path names)
-VERSION=1.1.0
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=
-
-### Include common rulesets
-include ../Makefile.inc
--- a/open-src/proto/EvIE/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Fixes/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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.2 06/11/20
-#
-
-# Package name used in tarballs
-PROTO_NAME=fixesproto
-
-# Version number (used in path names)
-VERSION=4.0
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=
-
-### Include common rulesets
-include ../Makefile.inc
--- a/open-src/proto/Fontcache/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Fonts/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Fonts/Xsun-findfont.patch Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-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;
-
- /*
--- a/open-src/proto/Input/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/KB/5077065.patch Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-# 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 */,
--- a/open-src/proto/KB/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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.2 06/11/20
-#
-
-# Package name used in tarballs
-PROTO_NAME=kbproto
-
-# Version number (used in path names)
-VERSION=1.0.3
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES= 5077065.patch
-
-### Include common rulesets
-include ../Makefile.inc
--- a/open-src/proto/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ b/open-src/proto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -28,13 +28,16 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.6 07/05/15
+# @(#)Makefile 1.7 07/11/20
#
###############################################################################
-OS_SUBDIRS_common = X11 BigReqs Composite Damage EvIE Fixes Fontcache Fonts \
- Input KB PM Randr Record Render Resource ScrnSaver Trap Video \
- XCMisc XExt XF86BigFont XF86DGA XF86Misc XF86VidMode Xinerama \
+OS_SUBDIRS_common = \
+ x11proto bigreqsproto compositeproto damageproto evieproto \
+ fixesproto fontcacheproto fontsproto inputproto kbproto pmproto \
+ randrproto recordproto renderproto resourceproto scrnsaverproto \
+ trapproto videoproto xcmiscproto xextproto xf86bigfontproto \
+ xf86dgaproto xf86miscproto xf86vidmodeproto xineramaproto \
lg3dproto
OS_SUBDIRS_sparc = $(OS_SUBDIRS_common)
--- a/open-src/proto/PM/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Randr/B32.patch Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-commit d1c5739ae19f7cc01a6a5603d3fae93e1f9ee3d1
-Author: Alan Coopersmith <[email protected]>
-Date: Mon Apr 9 14:31:10 2007 -0700
-
- Delete duplicate B32's in xRRScreenChangeNotifyEvent
-
- Caused compiler warnings:
- "randrproto.h", line 567: warning: syntax error: empty member declaration
- "randrproto.h", line 568: warning: syntax error: empty member declaration
-
-diff --git a/randrproto.h b/randrproto.h
-index abca369..cf7a022 100644
---- a/randrproto.h
-+++ b/randrproto.h
-@@ -564,8 +564,8 @@ typedef struct {
- CARD8 type; /* always evBase + ScreenChangeNotify */
- CARD8 rotation; /* new rotation */
- CARD16 sequenceNumber B16;
-- Time timestamp B32; B32; /* time screen was changed */
-- Time configTimestamp B32; B32; /* time config data was changed */
-+ Time timestamp B32; /* time screen was changed */
-+ Time configTimestamp B32; /* time config data was changed */
- Window root B32; /* root window */
- Window window B32; /* window requesting notification */
- SizeID sizeID B16; /* new size ID */
--- a/open-src/proto/Randr/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.2 07/07/25
-#
-
-# Package name used in tarballs
-PROTO_NAME=randrproto
-
-# Version number (used in path names)
-VERSION=1.2.1
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES= B32.patch,-p1
-
-### Include common rulesets
-include ../Makefile.inc
--- a/open-src/proto/Record/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Render/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Resource/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/ScrnSaver/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# Copyright 2007 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.3 07/01/31
-#
-
-# Package name used in tarballs
-PROTO_NAME=scrnsaverproto
-
-# Version number (used in path names)
-VERSION=1.1.0
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=
-
-### Include common rulesets
-include ../Makefile.inc
--- a/open-src/proto/Trap/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.2 07/01/31
-#
-
-# Package name used in tarballs
-PROTO_NAME=trapproto
-
-# Version number (used in path names)
-VERSION=3.4.3
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=
-
-### Include common rulesets
-include ../Makefile.inc
--- a/open-src/proto/Video/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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 Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-###############################################################################
-#
-# 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.5 07/11/02
-#
-
-# Package name used in tarballs
-PROTO_NAME=xproto
-
-# Version number (used in path names)
-VERSION=7.0.10
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES= Xos.h-patch Xpoll.h-patch X.h-patch \
- Xalloca.h-patch,-p1
-
-### Include common rulesets
-include ../Makefile.inc
-
-# 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
--- a/open-src/proto/X11/X.h-patch Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Need to retain FamilyInternetV6 for backwards compatibility with CDE and other
-sources written to the original X11/IPv6 draft which was included in Solaris 9.
-
---- X.h Mon Apr 10 17:55:35 2006
-+++ X.h Mon Apr 10 18:46:35 2006
-@@ -303,6 +303,7 @@
- #define FamilyDECnet 1
- #define FamilyChaos 2
- #define FamilyInternet6 6 /* IPv6 */
-+#define FamilyInternetV6 6 /* SUNSOFT - retained for backwards compatibility with original IPv6 draft */
-
- /* authentication families not tied to a specific protocol */
- #define FamilyServerInterpreted 5
--- a/open-src/proto/X11/Xalloca.h-patch Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1
-Author: Alan Coopersmith <[email protected]>
-Date: Tue Oct 30 18:44:49 2007 -0700
-
- Make Xalloca.h work with Sun C++ compiler
-
-diff --git a/Xalloca.h b/Xalloca.h
-index 67f2671..c561718 100644
---- a/Xalloca.h
-+++ b/Xalloca.h
-@@ -62,7 +62,8 @@ #ifndef XALLOCA_H
- #define XALLOCA_H 1
-
- #ifndef INCLUDE_ALLOCA_H
--# if defined(__SUNPRO_C) /* Need to add more here to match Imake *.cf's */
-+/* Need to add more here to match Imake *.cf's */
-+# if defined(HAVE_ALLOCA_H) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- # define INCLUDE_ALLOCA_H
- # endif
- #endif
-@@ -111,16 +112,14 @@ # if defined(vax) || defined(sun) |
- * decide that you don't want to use alloca, you might want to fix it here.
- */
- /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
--# ifndef __sgi /* IRIX 5/6 has definition */
--# ifndef __QNX__
-+# if !defined(__sgi) && !defined(__QNX__) && !defined(__cplusplus)
- # define __Xnullarg /* as nothing */
- # ifndef X_NOT_STDC_ENV
- extern void *alloca(__Xnullarg);
- # else
- extern char *alloca(__Xnullarg);
- # endif
--# endif /* __QNX__ */
--# endif /* __sgi */
-+# endif /* !__sgi && !__QNX && !__cplusplus */
- # define ALLOCATE_LOCAL(size) alloca((int)(size))
- # endif /* who does alloca */
- # endif /* NCR */
--- a/open-src/proto/X11/Xos.h-patch Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- Xos.h Mon Nov 7 22:33:25 2005
-+++ Xos.h Fri Apr 7 11:06:30 2006
-@@ -92,12 +92,9 @@
- #ifndef X_NOT_STDC_ENV
-
- #include <string.h>
--#if defined(__SCO__) || defined(__UNIXWARE__)
-+#if defined(__SCO__) || defined(__UNIXWARE__) || (defined(sun) && defined(__SVR4))
- #include <strings.h>
- #else
--#if (defined(sun) && defined(__SVR4))
--#include <strings.h>
--#endif
- #ifdef __STDC__
- #ifndef index
- #define index(s,c) (strchr((s),(c)))
--- a/open-src/proto/X11/Xpoll.h-patch Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-Add extended versions of select() mask macros needed for Xsun for dynamic
-1024-client support (4185418: the X server should support more connections)
-
---- Xpoll.h.in Thu Apr 6 18:46:55 2006
-+++ Xpoll.h.in Fri Apr 7 13:25:05 2006
-@@ -252,4 +252,126 @@
-
- #endif /* WIN32 */
-
-+#ifdef SUNSOFT
-+/* 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.
-+ */
-+
-+/* Extended macros used by Xsun's 1024 client/file descriptor enhancement */
-+
-+#define XFD_SETSIZE_1024 1024
-+#define XFD_SETSIZE_F(f) (f ? XFD_SETSIZE_1024 : XFD_SETSIZE)
-+
-+#ifndef FD_SETSIZE_F
-+#define FD_SETSIZE_F(f) XFD_SETSIZE_F(f)
-+#endif
-+
-+#define XFD_ANYSET_1024(p) \
-+ ((__XFDS_BITS(p, 0)) || (__XFDS_BITS(p, 1)) || \
-+ (__XFDS_BITS(p, 2)) || (__XFDS_BITS(p, 3)) || \
-+ (__XFDS_BITS(p, 4)) || (__XFDS_BITS(p, 5)) || \
-+ (__XFDS_BITS(p, 6)) || (__XFDS_BITS(p, 7)) || \
-+ (__XFDS_BITS(p, 8)) || (__XFDS_BITS(p, 9)) || \
-+ (__XFDS_BITS(p, 10)) || (__XFDS_BITS(p, 11)) || \
-+ (__XFDS_BITS(p, 12)) || (__XFDS_BITS(p, 13)) || \
-+ (__XFDS_BITS(p, 14)) || (__XFDS_BITS(p, 15)) || \
-+ (__XFDS_BITS(p, 16)) || (__XFDS_BITS(p, 17)) || \
-+ (__XFDS_BITS(p, 18)) || (__XFDS_BITS(p, 19)) || \
-+ (__XFDS_BITS(p, 20)) || (__XFDS_BITS(p, 21)) || \
-+ (__XFDS_BITS(p, 22)) || (__XFDS_BITS(p, 23)) || \
-+ (__XFDS_BITS(p, 24)) || (__XFDS_BITS(p, 25)) || \
-+ (__XFDS_BITS(p, 26)) || (__XFDS_BITS(p, 27)) || \
-+ (__XFDS_BITS(p, 28)) || (__XFDS_BITS(p, 29)) || \
-+ (__XFDS_BITS(p, 30)) || (__XFDS_BITS(p, 31)) )
-+
-+#define XFD_ANYSET_F(p,f) \
-+ (XFD_ANYSET(p) || (!f ? 0 : ( \
-+ (__XFDS_BITS(p, 8)) || (__XFDS_BITS(p, 9)) || \
-+ (__XFDS_BITS(p, 10)) || (__XFDS_BITS(p, 11)) || \
-+ (__XFDS_BITS(p, 12)) || (__XFDS_BITS(p, 13)) || \
-+ (__XFDS_BITS(p, 14)) || (__XFDS_BITS(p, 15)) || \
-+ (__XFDS_BITS(p, 16)) || (__XFDS_BITS(p, 17)) || \
-+ (__XFDS_BITS(p, 18)) || (__XFDS_BITS(p, 19)) || \
-+ (__XFDS_BITS(p, 20)) || (__XFDS_BITS(p, 21)) || \
-+ (__XFDS_BITS(p, 22)) || (__XFDS_BITS(p, 23)) || \
-+ (__XFDS_BITS(p, 24)) || (__XFDS_BITS(p, 25)) || \
-+ (__XFDS_BITS(p, 26)) || (__XFDS_BITS(p, 27)) || \
-+ (__XFDS_BITS(p, 28)) || (__XFDS_BITS(p, 29)) || \
-+ (__XFDS_BITS(p, 30)) || (__XFDS_BITS(p, 31)) )))
-+
-+#define XFD_COPYSET_1024(src,dst) { \
-+ int __i__; \
-+ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
-+ __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
-+ }
-+
-+#define XFD_COPYSET_F(src,dst,f) { \
-+ int __i__; \
-+ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
-+ __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
-+ }
-+
-+#define XFD_ANDSET_1024(dst,b1,b2) { \
-+ int __i__; \
-+ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
-+ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
-+ }
-+
-+#define XFD_ANDSET_F(dst,b1,b2,f) { \
-+ int __i__; \
-+ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
-+ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
-+ }
-+
-+
-+#define XFD_ORSET_1024(dst,b1,b2) { \
-+ int __i__; \
-+ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
-+ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
-+ }
-+
-+#define XFD_ORSET_F(dst,b1,b2,f) { \
-+ int __i__; \
-+ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
-+ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
-+ }
-+
-+#define XFD_UNSET_1024(dst,b1) { \
-+ int __i__; \
-+ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
-+ __XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
-+ }
-+
-+#define XFD_UNSET_F(dst,b1,f) { \
-+ int __i__; \
-+ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
-+ __XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
-+ }
-+
-+#endif /* SUNSOFT additions */
-+
- #endif /* _XPOLL_H_ */
--- a/open-src/proto/XCMisc/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/XExt/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/XExt/Xsun-mbx-abi.patch Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
---- 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 */
-
--- a/open-src/proto/XF86BigFont/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/XF86DGA/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.2 07/01/31
-#
-
-# Package name used in tarballs
-PROTO_NAME=xf86dgaproto
-
-# Version number (used in path names)
-VERSION=2.0.2
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=
-
-### Include common rulesets
-include ../Makefile.inc
--- a/open-src/proto/XF86Misc/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/XF86VidMode/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Xinerama/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###############################################################################
-#
-# 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
--- a/open-src/proto/Xinerama/Xsun-extended-proto.patch Wed Nov 21 09:43:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/bigreqsproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/compositeproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/damageproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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.2 07/07/20
+#
+
+# Package name used in tarballs
+PROTO_NAME=damageproto
+
+# Version number (used in path names)
+VERSION=1.1.0
+
+# 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/evieproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/fixesproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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.2 06/11/20
+#
+
+# Package name used in tarballs
+PROTO_NAME=fixesproto
+
+# Version number (used in path names)
+VERSION=4.0
+
+# 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/fontcacheproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/fontsproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/fontsproto/Xsun-findfont.patch Wed Nov 21 15:19:48 2007 -0800
@@ -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/inputproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/kbproto/5077065.patch Wed Nov 21 15:19:48 2007 -0800
@@ -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/kbproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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.2 06/11/20
+#
+
+# Package name used in tarballs
+PROTO_NAME=kbproto
+
+# Version number (used in path names)
+VERSION=1.0.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES= 5077065.patch
+
+### Include common rulesets
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/pmproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/randrproto/B32.patch Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,25 @@
+commit d1c5739ae19f7cc01a6a5603d3fae93e1f9ee3d1
+Author: Alan Coopersmith <[email protected]>
+Date: Mon Apr 9 14:31:10 2007 -0700
+
+ Delete duplicate B32's in xRRScreenChangeNotifyEvent
+
+ Caused compiler warnings:
+ "randrproto.h", line 567: warning: syntax error: empty member declaration
+ "randrproto.h", line 568: warning: syntax error: empty member declaration
+
+diff --git a/randrproto.h b/randrproto.h
+index abca369..cf7a022 100644
+--- a/randrproto.h
++++ b/randrproto.h
+@@ -564,8 +564,8 @@ typedef struct {
+ CARD8 type; /* always evBase + ScreenChangeNotify */
+ CARD8 rotation; /* new rotation */
+ CARD16 sequenceNumber B16;
+- Time timestamp B32; B32; /* time screen was changed */
+- Time configTimestamp B32; B32; /* time config data was changed */
++ Time timestamp B32; /* time screen was changed */
++ Time configTimestamp B32; /* time config data was changed */
+ Window root B32; /* root window */
+ Window window B32; /* window requesting notification */
+ SizeID sizeID B16; /* new size ID */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/randrproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.2 07/07/25
+#
+
+# Package name used in tarballs
+PROTO_NAME=randrproto
+
+# Version number (used in path names)
+VERSION=1.2.1
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES= B32.patch,-p1
+
+### Include common rulesets
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/recordproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/renderproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/resourceproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/scrnsaverproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2007 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.3 07/01/31
+#
+
+# Package name used in tarballs
+PROTO_NAME=scrnsaverproto
+
+# Version number (used in path names)
+VERSION=1.1.0
+
+# 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/trapproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.2 07/01/31
+#
+
+# Package name used in tarballs
+PROTO_NAME=trapproto
+
+# Version number (used in path names)
+VERSION=3.4.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/videoproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/x11proto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,51 @@
+###############################################################################
+#
+# 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.5 07/11/02
+#
+
+# Package name used in tarballs
+PROTO_NAME=xproto
+
+# Version number (used in path names)
+VERSION=7.0.10
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES= Xos.h-patch Xpoll.h-patch X.h-patch \
+ Xalloca.h-patch,-p1
+
+### Include common rulesets
+include ../Makefile.inc
+
+# 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/x11proto/X.h-patch Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,13 @@
+Need to retain FamilyInternetV6 for backwards compatibility with CDE and other
+sources written to the original X11/IPv6 draft which was included in Solaris 9.
+
+--- X.h Mon Apr 10 17:55:35 2006
++++ X.h Mon Apr 10 18:46:35 2006
+@@ -303,6 +303,7 @@
+ #define FamilyDECnet 1
+ #define FamilyChaos 2
+ #define FamilyInternet6 6 /* IPv6 */
++#define FamilyInternetV6 6 /* SUNSOFT - retained for backwards compatibility with original IPv6 draft */
+
+ /* authentication families not tied to a specific protocol */
+ #define FamilyServerInterpreted 5
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/x11proto/Xalloca.h-patch Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,39 @@
+commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1
+Author: Alan Coopersmith <[email protected]>
+Date: Tue Oct 30 18:44:49 2007 -0700
+
+ Make Xalloca.h work with Sun C++ compiler
+
+diff --git a/Xalloca.h b/Xalloca.h
+index 67f2671..c561718 100644
+--- a/Xalloca.h
++++ b/Xalloca.h
+@@ -62,7 +62,8 @@ #ifndef XALLOCA_H
+ #define XALLOCA_H 1
+
+ #ifndef INCLUDE_ALLOCA_H
+-# if defined(__SUNPRO_C) /* Need to add more here to match Imake *.cf's */
++/* Need to add more here to match Imake *.cf's */
++# if defined(HAVE_ALLOCA_H) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ # define INCLUDE_ALLOCA_H
+ # endif
+ #endif
+@@ -111,16 +112,14 @@ # if defined(vax) || defined(sun) |
+ * decide that you don't want to use alloca, you might want to fix it here.
+ */
+ /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
+-# ifndef __sgi /* IRIX 5/6 has definition */
+-# ifndef __QNX__
++# if !defined(__sgi) && !defined(__QNX__) && !defined(__cplusplus)
+ # define __Xnullarg /* as nothing */
+ # ifndef X_NOT_STDC_ENV
+ extern void *alloca(__Xnullarg);
+ # else
+ extern char *alloca(__Xnullarg);
+ # endif
+-# endif /* __QNX__ */
+-# endif /* __sgi */
++# endif /* !__sgi && !__QNX && !__cplusplus */
+ # define ALLOCATE_LOCAL(size) alloca((int)(size))
+ # endif /* who does alloca */
+ # endif /* NCR */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/x11proto/Xos.h-patch Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,16 @@
+--- Xos.h Mon Nov 7 22:33:25 2005
++++ Xos.h Fri Apr 7 11:06:30 2006
+@@ -92,12 +92,9 @@
+ #ifndef X_NOT_STDC_ENV
+
+ #include <string.h>
+-#if defined(__SCO__) || defined(__UNIXWARE__)
++#if defined(__SCO__) || defined(__UNIXWARE__) || (defined(sun) && defined(__SVR4))
+ #include <strings.h>
+ #else
+-#if (defined(sun) && defined(__SVR4))
+-#include <strings.h>
+-#endif
+ #ifdef __STDC__
+ #ifndef index
+ #define index(s,c) (strchr((s),(c)))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/x11proto/Xpoll.h-patch Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,132 @@
+Add extended versions of select() mask macros needed for Xsun for dynamic
+1024-client support (4185418: the X server should support more connections)
+
+--- Xpoll.h.in Thu Apr 6 18:46:55 2006
++++ Xpoll.h.in Fri Apr 7 13:25:05 2006
+@@ -252,4 +252,126 @@
+
+ #endif /* WIN32 */
+
++#ifdef SUNSOFT
++/* 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.
++ */
++
++/* Extended macros used by Xsun's 1024 client/file descriptor enhancement */
++
++#define XFD_SETSIZE_1024 1024
++#define XFD_SETSIZE_F(f) (f ? XFD_SETSIZE_1024 : XFD_SETSIZE)
++
++#ifndef FD_SETSIZE_F
++#define FD_SETSIZE_F(f) XFD_SETSIZE_F(f)
++#endif
++
++#define XFD_ANYSET_1024(p) \
++ ((__XFDS_BITS(p, 0)) || (__XFDS_BITS(p, 1)) || \
++ (__XFDS_BITS(p, 2)) || (__XFDS_BITS(p, 3)) || \
++ (__XFDS_BITS(p, 4)) || (__XFDS_BITS(p, 5)) || \
++ (__XFDS_BITS(p, 6)) || (__XFDS_BITS(p, 7)) || \
++ (__XFDS_BITS(p, 8)) || (__XFDS_BITS(p, 9)) || \
++ (__XFDS_BITS(p, 10)) || (__XFDS_BITS(p, 11)) || \
++ (__XFDS_BITS(p, 12)) || (__XFDS_BITS(p, 13)) || \
++ (__XFDS_BITS(p, 14)) || (__XFDS_BITS(p, 15)) || \
++ (__XFDS_BITS(p, 16)) || (__XFDS_BITS(p, 17)) || \
++ (__XFDS_BITS(p, 18)) || (__XFDS_BITS(p, 19)) || \
++ (__XFDS_BITS(p, 20)) || (__XFDS_BITS(p, 21)) || \
++ (__XFDS_BITS(p, 22)) || (__XFDS_BITS(p, 23)) || \
++ (__XFDS_BITS(p, 24)) || (__XFDS_BITS(p, 25)) || \
++ (__XFDS_BITS(p, 26)) || (__XFDS_BITS(p, 27)) || \
++ (__XFDS_BITS(p, 28)) || (__XFDS_BITS(p, 29)) || \
++ (__XFDS_BITS(p, 30)) || (__XFDS_BITS(p, 31)) )
++
++#define XFD_ANYSET_F(p,f) \
++ (XFD_ANYSET(p) || (!f ? 0 : ( \
++ (__XFDS_BITS(p, 8)) || (__XFDS_BITS(p, 9)) || \
++ (__XFDS_BITS(p, 10)) || (__XFDS_BITS(p, 11)) || \
++ (__XFDS_BITS(p, 12)) || (__XFDS_BITS(p, 13)) || \
++ (__XFDS_BITS(p, 14)) || (__XFDS_BITS(p, 15)) || \
++ (__XFDS_BITS(p, 16)) || (__XFDS_BITS(p, 17)) || \
++ (__XFDS_BITS(p, 18)) || (__XFDS_BITS(p, 19)) || \
++ (__XFDS_BITS(p, 20)) || (__XFDS_BITS(p, 21)) || \
++ (__XFDS_BITS(p, 22)) || (__XFDS_BITS(p, 23)) || \
++ (__XFDS_BITS(p, 24)) || (__XFDS_BITS(p, 25)) || \
++ (__XFDS_BITS(p, 26)) || (__XFDS_BITS(p, 27)) || \
++ (__XFDS_BITS(p, 28)) || (__XFDS_BITS(p, 29)) || \
++ (__XFDS_BITS(p, 30)) || (__XFDS_BITS(p, 31)) )))
++
++#define XFD_COPYSET_1024(src,dst) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
++ }
++
++#define XFD_COPYSET_F(src,dst,f) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
++ }
++
++#define XFD_ANDSET_1024(dst,b1,b2) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
++ }
++
++#define XFD_ANDSET_F(dst,b1,b2,f) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
++ }
++
++
++#define XFD_ORSET_1024(dst,b1,b2) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
++ }
++
++#define XFD_ORSET_F(dst,b1,b2,f) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
++ }
++
++#define XFD_UNSET_1024(dst,b1) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_1024, NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
++ }
++
++#define XFD_UNSET_F(dst,b1,f) { \
++ int __i__; \
++ for (__i__ = 0; __i__ < howmany(XFD_SETSIZE_F(f), NFDBITS); __i__++) \
++ __XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
++ }
++
++#endif /* SUNSOFT additions */
++
+ #endif /* _XPOLL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/xcmiscproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/xextproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/xextproto/Xsun-mbx-abi.patch Wed Nov 21 15:19:48 2007 -0800
@@ -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/xf86bigfontproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/xf86dgaproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.2 07/01/31
+#
+
+# Package name used in tarballs
+PROTO_NAME=xf86dgaproto
+
+# Version number (used in path names)
+VERSION=2.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/xf86miscproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/xf86vidmodeproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/xineramaproto/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -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/xineramaproto/Xsun-extended-proto.patch Wed Nov 21 15:19:48 2007 -0800
@@ -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
--- a/open-src/xserver/Makefile Wed Nov 21 09:43:21 2007 +0000
+++ b/open-src/xserver/Makefile Wed Nov 21 15:19:48 2007 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.1 07/10/10
+# @(#)Makefile 1.2 07/11/16
#
###############################################################################
@@ -52,6 +52,6 @@
@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
for i in $(OS_SUBDIRS) ;\
do \
- (cd $$i ; echo "## making" $(OS_TARGET) "in open-src/proto/$$i..."; \
+ (cd $$i ; echo "## making" $(OS_TARGET) "in open-src/xserver/$$i..."; \
$(MAKE) $(MFLAGS) CDEBUGFLAGS="$(CDEBUGFLAGS)" $(OS_TARGET)); \
done