--- a/packages/SUNWxorg-headers/prototype Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxorg-headers/prototype Wed May 13 16:52:41 2009 -0700
@@ -29,9 +29,9 @@
#
##########################################################################
#
-# ident "@(#)prototype 1.12 09/01/14 SMI"
+# ident "@(#)prototype 1.13 09/05/13 SMI"
#
-# X.Org Foundation X client libraries for Solaris
+# Xorg server DDK headers
!HOME=../usr
@@ -39,114 +39,12 @@
i depend
i copyright
-d none X11 0755 root bin
-
-d none X11/include 0755 root bin
-d none X11/include/X11 0755 root bin
-d none X11/include/xorg 0755 root bin
-
-!search $HOME/X11/include/X11/extensions
-d none X11/include/X11/extensions 0755 root bin
-f none X11/include/X11/extensions/Xv.h 0444 root bin
-f none X11/include/X11/extensions/Xvlib.h 0444 root bin
-f none X11/include/X11/extensions/Xvproto.h 0444 root bin
-f none X11/include/X11/extensions/XvMC.h 0444 root bin
-f none X11/include/X11/extensions/XvMClib.h 0444 root bin
-f none X11/include/X11/extensions/XvMCproto.h 0444 root bin
-
-f none X11/include/X11/extensions/Xrandr.h 0444 root bin
-f none X11/include/X11/extensions/randr.h 0444 root bin
-f none X11/include/X11/extensions/randrproto.h 0444 root bin
-
-# libxkbfile
-f none X11/include/X11/extensions/XKBbells.h 0444 root bin
-f none X11/include/X11/extensions/XKBconfig.h 0444 root bin
-f none X11/include/X11/extensions/XKBfile.h 0444 root bin
-f none X11/include/X11/extensions/XKBrules.h 0444 root bin
-f none X11/include/X11/extensions/XKBsrv.h 0444 root bin
-
-f none X11/include/X11/extensions/xf86dgastr.h 0444 root bin
-f none X11/include/X11/extensions/xf86dga1str.h 0444 root bin
-f none X11/include/X11/extensions/xf86misc.h 0444 root bin
-f none X11/include/X11/extensions/xf86mscstr.h 0444 root bin
-f none X11/include/X11/extensions/xf86vmode.h 0444 root bin
-f none X11/include/X11/extensions/xf86vmstr.h 0444 root bin
-
-f none X11/include/X11/extensions/panoramiXproto.h 0444 root bin
+d none X11 0755 root bin
-!search $HOME/X11/include/X11/fonts
-d none X11/include/X11/fonts 0755 root bin
-f none X11/include/X11/fonts/font.h 0444 root bin
-f none X11/include/X11/fonts/FS.h 0444 root bin
-f none X11/include/X11/fonts/FSlib.h 0444 root bin
-f none X11/include/X11/fonts/FSproto.h 0444 root bin
-f none X11/include/X11/fonts/bdfint.h 0444 root bin
-f none X11/include/X11/fonts/bitmap.h 0444 root bin
-f none X11/include/X11/fonts/bufio.h 0444 root bin
-f none X11/include/X11/fonts/fntfil.h 0444 root bin
-f none X11/include/X11/fonts/fntfilio.h 0444 root bin
-f none X11/include/X11/fonts/fntfilst.h 0444 root bin
-f none X11/include/X11/fonts/fontconf.h 0444 root bin
-f none X11/include/X11/fonts/fontenc.h 0444 root bin
-f none X11/include/X11/fonts/fontencc.h 0444 root bin
-f none X11/include/X11/fonts/fontmisc.h 0444 root bin
-f none X11/include/X11/fonts/fontmod.h 0444 root bin
-f none X11/include/X11/fonts/fontproto.h 0444 root bin
-f none X11/include/X11/fonts/fontshow.h 0444 root bin
-f none X11/include/X11/fonts/fontstruct.h 0444 root bin
-f none X11/include/X11/fonts/fontutil.h 0444 root bin
-f none X11/include/X11/fonts/fontxlfd.h 0444 root bin
-f none X11/include/X11/fonts/fsmasks.h 0444 root bin
-f none X11/include/X11/fonts/ft.h 0444 root bin
-f none X11/include/X11/fonts/ftfuncs.h 0444 root bin
-f none X11/include/X11/fonts/pcf.h 0444 root bin
-
-# pkgconfig data files for X modular protocols & libraries
-
-## 32-bit versions
-!search $HOME/lib/pkgconfig
-d none lib 0755 root bin
-d none lib/pkgconfig 0755 root other
-
-# Protocol headers
-f none lib/pkgconfig/randrproto.pc 0444 root bin
-f none lib/pkgconfig/videoproto.pc 0444 root bin
-f none lib/pkgconfig/xf86miscproto.pc 0444 root bin
-f none lib/pkgconfig/xf86vidmodeproto.pc 0444 root bin
-
-# Libraries
-
-f none lib/pkgconfig/libfs.pc 0444 root bin
-f none lib/pkgconfig/xrandr.pc 0444 root bin
-f none lib/pkgconfig/xv.pc 0444 root bin
-f none lib/pkgconfig/xvmc.pc 0444 root bin
-f none lib/pkgconfig/xxf86misc.pc 0444 root bin
-f none lib/pkgconfig/xxf86vm.pc 0444 root bin
-f none lib/pkgconfig/xorg-server.pc 0444 root bin
-
-## 64-bit versions
-!search $HOME/lib/$plat_64/pkgconfig
-d none lib/$plat_64 0755 root bin
-d none lib/$plat_64/pkgconfig 0755 root other
-
-# Protocol headers are the same in 32-bit & 64-bit
-s none lib/$plat_64/pkgconfig/randrproto.pc=../../pkgconfig/randrproto.pc
-s none lib/$plat_64/pkgconfig/videoproto.pc=../../pkgconfig/videoproto.pc
-s none lib/$plat_64/pkgconfig/xf86miscproto.pc=../../pkgconfig/xf86miscproto.pc
-s none lib/$plat_64/pkgconfig/xf86vidmodeproto.pc=../../pkgconfig/xf86vidmodeproto.pc
-
-# Libraries need separate ones for 64-bit to get library paths right
-
-f none lib/$plat_64/pkgconfig/libfs.pc 0444 root bin
-f none lib/$plat_64/pkgconfig/xrandr.pc 0444 root bin
-f none lib/$plat_64/pkgconfig/xv.pc 0444 root bin
-f none lib/$plat_64/pkgconfig/xvmc.pc 0444 root bin
-f none lib/$plat_64/pkgconfig/xxf86misc.pc 0444 root bin
-f none lib/$plat_64/pkgconfig/xxf86vm.pc 0444 root bin
-f none lib/$plat_64/pkgconfig/xorg-server.pc 0444 root bin
-
-# Headers needed to build a Xorg ddx
+# Headers needed to build a Xorg loadable module
!search $HOME/X11/include/xorg
+d none X11/include 0755 root bin
+d none X11/include/xorg 0755 root bin
f none X11/include/xorg/BT.h 0444 root bin
f none X11/include/xorg/IBM.h 0444 root bin
f none X11/include/xorg/TI.h 0444 root bin
@@ -304,3 +202,23 @@
f none X11/include/xorg/xorgVersion.h 0444 root bin
f none X11/include/xorg/xvdix.h 0444 root bin
f none X11/include/xorg/xvmcext.h 0444 root bin
+
+# pkgconfig data files
+
+## 32-bit versions
+!search $HOME/lib/pkgconfig
+d none lib 0755 root bin
+d none lib/pkgconfig 0755 root other
+f none lib/pkgconfig/xorg-server.pc 0444 root bin
+
+## 64-bit versions
+!search $HOME/lib/$plat_64/pkgconfig
+d none lib/$plat_64 0755 root bin
+d none lib/$plat_64/pkgconfig 0755 root other
+f none lib/$plat_64/pkgconfig/xorg-server.pc 0444 root bin
+
+# Autoconf macro files
+!search $HOME/X11/share/aclocal
+d none share 0755 root sys
+d none share/aclocal 0755 root other
+f none share/aclocal/xorg-server.m4 0444 root bin