6967081 X package names need adjusting nv_144a
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 06 Jul 2010 22:53:47 -0700
changeset 977 46c5e46c27fb
parent 976 e38ba1d6c74f
child 978 de404597ca0c
6967081 X package names need adjusting
open-src/app/Makefile.inc
open-src/app/appres/Makefile
open-src/app/cmap_alloc/Makefile
open-src/app/cmap_compact/Makefile
open-src/app/dispswitch/Makefile
open-src/app/dispswitch/sun-src/dispswitch.man
open-src/app/editres/Makefile
open-src/app/listres/Makefile
open-src/app/oclock/Makefile
open-src/app/rgb/Makefile
open-src/app/viewres/Makefile
open-src/app/xbiff/Makefile
open-src/app/xcalc/Makefile
open-src/app/xclipboard/Makefile
open-src/app/xclock/Makefile
open-src/app/xcmsdb/Makefile
open-src/app/xcolor/Makefile
open-src/app/xgamma/Makefile
open-src/app/xhost/Makefile
open-src/app/xinput/Makefile
open-src/app/xmag_multivis/Makefile
open-src/app/xmakemap/Makefile
open-src/app/xmodmap/Makefile
open-src/app/xpr/Makefile
open-src/app/xprop/Makefile
open-src/app/xrandr/Makefile
open-src/app/xrdb/Makefile
open-src/app/xrefresh/Makefile
open-src/app/xset/Makefile
open-src/app/xsetroot/Makefile
open-src/app/xstdcmap/Makefile
open-src/app/xwd/Makefile
open-src/app/xwud/Makefile
open-src/data/ogl-select/Makefile
open-src/data/ogl-select/ogl-select.man
open-src/lib/libXaw/Makefile
open-src/lib/libXaw4/Makefile
open-src/lib/libXaw5/Makefile
open-src/lib/libXt/Makefile
pkg/Makefile
pkg/X-redistributable.mf
pkg/manifests/compatibility-packages-SUNWxwinc.mf
pkg/manifests/compatibility-packages-SUNWxwman.mf
pkg/manifests/compatibility-packages-SUNWxwopt.mf
pkg/manifests/compatibility-packages-SUNWxwplr.mf
pkg/manifests/compatibility-packages-SUNWxwplt.mf
pkg/manifests/compatibility-packages-SUNWxwpmn.mf
pkg/manifests/service-application-opengl-ogl-select.mf
pkg/manifests/service-opengl-ogl-select.mf
pkg/manifests/system-display-manager-xdm.mf
pkg/manifests/x11-accessory-oclock.mf
pkg/manifests/x11-accessory-xbiff.mf
pkg/manifests/x11-accessory-xcalc.mf
pkg/manifests/x11-accessory-xclipboard.mf
pkg/manifests/x11-accessory-xclock.mf
pkg/manifests/x11-colormap-utilities.mf
pkg/manifests/x11-library-mesa.mf
pkg/manifests/x11-library-toolkit-libxaw4.mf
pkg/manifests/x11-library-toolkit-libxaw5.mf
pkg/manifests/x11-library-toolkit-libxaw7.mf
pkg/manifests/x11-library-toolkit-libxt.mf
pkg/manifests/x11-oclock.mf
pkg/manifests/x11-session-xinit.mf
pkg/manifests/x11-toolkit-libxaw4.mf
pkg/manifests/x11-toolkit-libxaw5.mf
pkg/manifests/x11-toolkit-libxaw7.mf
pkg/manifests/x11-toolkit-libxt-xt-resource-utilities.mf
pkg/manifests/x11-toolkit-libxt.mf
pkg/manifests/x11-transset.mf
pkg/manifests/x11-utility-colormap-utilities.mf
pkg/manifests/x11-utility-transset.mf
pkg/manifests/x11-utility-x11-server-utilities.mf
pkg/manifests/x11-utility-x11-window-dump.mf
pkg/manifests/x11-utility-xconsole.mf
pkg/manifests/x11-utility-xfd.mf
pkg/manifests/x11-utility-xfontsel.mf
pkg/manifests/x11-utility-xkill.mf
pkg/manifests/x11-utility-xlock.mf
pkg/manifests/x11-utility-xmag.mf
pkg/manifests/x11-utility-xman.mf
pkg/manifests/x11-utility-xvidtune.mf
pkg/manifests/x11-x11-server-utilities.mf
pkg/manifests/x11-x11-window-dump.mf
pkg/manifests/x11-xbiff.mf
pkg/manifests/x11-xcalc.mf
pkg/manifests/x11-xclipboard.mf
pkg/manifests/x11-xclock.mf
pkg/manifests/x11-xconsole.mf
pkg/manifests/x11-xfd.mf
pkg/manifests/x11-xfontsel.mf
pkg/manifests/x11-xkill.mf
pkg/manifests/x11-xlock.mf
pkg/manifests/x11-xmag.mf
pkg/manifests/x11-xman.mf
pkg/manifests/x11-xt-resource-utilities.mf
pkg/manifests/x11-xvidtune.mf
--- a/open-src/app/Makefile.inc	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/Makefile.inc	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODTYPE=app
 
 # Hierarchical parent for pkg names in this area
-MODTYPE_PKGHIER=x11/utility
+MODTYPE_PKGHIER=x11
 MODTYPE_PKGHIER_SET=yes
 
 ### Include common definitions
--- a/open-src/app/appres/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/appres/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=appres
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/toolkit/libxt/xt-resource-utilities
+MODULE_PKGNAME=x11/xt-resource-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/cmap_alloc/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/cmap_alloc/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=cmap_alloc
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/colormap-utilities
+MODULE_PKGNAME=x11/colormap-utilities
 MODULE_PKGNAME_SET=yes
 
 # No upstream sources, only local sources
--- a/open-src/app/cmap_compact/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/cmap_compact/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=cmap_compact
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/colormap-utilities
+MODULE_PKGNAME=x11/colormap-utilities
 MODULE_PKGNAME_SET=yes
 
 # No upstream sources, only local sources
--- a/open-src/app/dispswitch/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/dispswitch/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -35,7 +35,7 @@
 ADDITIONAL_SOURCE_DIR=sun-src
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/app/dispswitch/sun-src/dispswitch.man	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/dispswitch/sun-src/dispswitch.man	Tue Jul 06 22:53:47 2010 -0700
@@ -95,7 +95,7 @@
 cw(2.750000i)| cw(2.750000i)
 lw(2.750000i)| lw(2.750000i).
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
-Availability	pkg:/x11/utility/x11-server-utilities
+Availability	pkg:/x11/x11-server-utilities
 Interface Stability	Volatile
 .TE 
 .sp
--- a/open-src/app/editres/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/editres/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=editres
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/toolkit/libxt/xt-resource-utilities
+MODULE_PKGNAME=x11/xt-resource-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/listres/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/listres/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=listres
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/toolkit/libxt/xt-resource-utilities
+MODULE_PKGNAME=x11/xt-resource-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/oclock/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/oclock/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -28,10 +28,6 @@
 # Package name used in tarballs
 MODULE_NAME=oclock
 
-# pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/accessory/$(MODULE_NAME)
-MODULE_PKGNAME_SET=yes
-
 # Package classification (override default)
 MODULE_PKGCLASS=Applications/Accessories
 MODULE_PKGCLASS_SET=yes
--- a/open-src/app/rgb/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/rgb/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=rgb
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/viewres/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/viewres/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=viewres
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/toolkit/libxt/xt-resource-utilities
+MODULE_PKGNAME=x11/xt-resource-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xbiff/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xbiff/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -28,10 +28,6 @@
 # Package name used in tarballs
 MODULE_NAME=xbiff
 
-# pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/accessory/$(MODULE_NAME)
-MODULE_PKGNAME_SET=yes
-
 # Package classification (override default)
 MODULE_PKGCLASS=Applications/Accessories
 MODULE_PKGCLASS_SET=yes
--- a/open-src/app/xcalc/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xcalc/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -28,10 +28,6 @@
 # Package name used in tarballs
 MODULE_NAME=xcalc
 
-# pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/accessory/$(MODULE_NAME)
-MODULE_PKGNAME_SET=yes
-
 # Package classification (override default)
 MODULE_PKGCLASS=Applications/Accessories
 MODULE_PKGCLASS_SET=yes
--- a/open-src/app/xclipboard/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xclipboard/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -28,10 +28,6 @@
 # Package name used in tarballs
 MODULE_NAME=xclipboard
 
-# pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/accessory/$(MODULE_NAME)
-MODULE_PKGNAME_SET=yes
-
 # Package classification (override default)
 MODULE_PKGCLASS=Applications/Accessories
 MODULE_PKGCLASS_SET=yes
--- a/open-src/app/xclock/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xclock/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -28,10 +28,6 @@
 # Package name used in tarballs
 MODULE_NAME=xclock
 
-# pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/accessory/$(MODULE_NAME)
-MODULE_PKGNAME_SET=yes
-
 # Package classification (override default)
 MODULE_PKGCLASS=Applications/Accessories
 MODULE_PKGCLASS_SET=yes
--- a/open-src/app/xcmsdb/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xcmsdb/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xcmsdb
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xcolor/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xcolor/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xcolor
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/colormap-utilities
+MODULE_PKGNAME=x11/colormap-utilities
 MODULE_PKGNAME_SET=yes
 
 # No upstream sources for these files, since they're Solaris-specific
--- a/open-src/app/xgamma/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xgamma/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -39,7 +39,7 @@
 SOURCE_PATCHES = 
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/app/xhost/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xhost/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xhost
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xinput/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xinput/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -36,7 +36,7 @@
 TARBALL_SHA1 = f8f45486de7d44b3d7274dfd24f988035fe05910
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/app/xmag_multivis/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xmag_multivis/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xmag_multivis
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/xmag
+MODULE_PKGNAME=x11/xmag
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xmakemap/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xmakemap/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -25,7 +25,7 @@
 MODULE_NAME=xmakemap
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # No upstream sources for these files, since they're Sun created
--- a/open-src/app/xmodmap/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xmodmap/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xmodmap
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xpr/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xpr/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xpr
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-window-dump
+MODULE_PKGNAME=x11/x11-window-dump
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xprop/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xprop/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -39,7 +39,7 @@
 SOURCE_PATCHES = 
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/app/xrandr/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xrandr/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -36,7 +36,7 @@
 TARBALL_SHA1 = 0e49b0a0889ae8a590452c6cd0d60a2253a8d940
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/app/xrdb/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xrdb/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xrdb
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xrefresh/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xrefresh/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xrefresh
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xset/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xset/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -39,7 +39,7 @@
 SOURCE_PATCHES = xsetfbpm.patch xsetman.patch
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/app/xsetroot/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xsetroot/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xsetroot
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-server-utilities
+MODULE_PKGNAME=x11/x11-server-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xstdcmap/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xstdcmap/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=xstdcmap
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/colormap-utilities
+MODULE_PKGNAME=x11/colormap-utilities
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/open-src/app/xwd/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xwd/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -39,7 +39,7 @@
 SOURCE_PATCHES = 
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-window-dump
+MODULE_PKGNAME=x11/x11-window-dump
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/app/xwud/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/app/xwud/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -39,7 +39,7 @@
 SOURCE_PATCHES = 
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/utility/x11-window-dump
+MODULE_PKGNAME=x11/x11-window-dump
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/data/ogl-select/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/data/ogl-select/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=ogl-select
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=service/application/opengl/ogl-select
+MODULE_PKGNAME=service/opengl/ogl-select
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/data/ogl-select/ogl-select.man	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/data/ogl-select/ogl-select.man	Tue Jul 06 22:53:47 2010 -0700
@@ -21,7 +21,7 @@
 .\" DEALINGS IN THE SOFTWARE.
 .\" 
 .ds q \N'34'
-.TH ogl-select 1 "2 Jul 2010"
+.TH ogl-select 1 "6 Jul 2010"
 .SH NAME
 ogl-select \- boot time selection of OpenGL vendor files 
 .PP
@@ -92,7 +92,7 @@
 l | l .
 ATTRIBUTE TYPE	ATTRIBUTE VALUE
 =
-Availability	pkg:/service/application/opengl/ogl-select
+Availability	pkg:/service/opengl/ogl-select
 Interface Stability	Uncommitted
 .TE
 
--- a/open-src/lib/libXaw/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/lib/libXaw/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -42,7 +42,7 @@
 LIBNAME=Xaw
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/toolkit/libxaw7
+MODULE_PKGNAME=x11/library/toolkit/libxaw7
 MODULE_PKGNAME_SET=yes
 
 # ARC cases that covered this module
--- a/open-src/lib/libXaw4/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/lib/libXaw4/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -33,7 +33,7 @@
 MODULE_NAME=libXaw4
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/toolkit/libxaw4
+MODULE_PKGNAME=x11/library/toolkit/libxaw4
 MODULE_PKGNAME_SET=yes
 
 # No upstream sources, only local sources
--- a/open-src/lib/libXaw5/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/lib/libXaw5/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -28,7 +28,7 @@
 MODULE_NAME=libXaw5
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/toolkit/libxaw5
+MODULE_PKGNAME=x11/library/toolkit/libxaw5
 MODULE_PKGNAME_SET=yes
 
 # No upstream sources, only local sources
--- a/open-src/lib/libXt/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/open-src/lib/libXt/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -29,7 +29,7 @@
 MODULE_NAME=libXt
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=x11/toolkit/libxt
+MODULE_PKGNAME=x11/library/toolkit/libxt
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
--- a/pkg/Makefile	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/Makefile	Tue Jul 06 22:53:47 2010 -0700
@@ -105,7 +105,7 @@
 # build rules and dependencies.  The synthetic and real packages use
 # different sets of transforms and macros for pkgmogrify.
 #
-SYNTH_PKGS= X-incorporation X-consolidation
+SYNTH_PKGS= X-incorporation X-redistributable
 
 # Any given package list may be empty, but we can only determine that 
 # dynamically, so we always generate all lists.
@@ -272,7 +272,7 @@
 # dependency types, so that they can be included by either an
 # incorporation or a group package.
 #
-$(PDIR)/X-consolidation.mog:= PKGDEP_TYPE= require
+$(PDIR)/X-redistributable.mog:= PKGDEP_TYPE= require
 $(PDIR)/X-incorporation.mog:= PKGDEP_TYPE= incorporate
 
 # rule to build the synthetic manifests
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/X-redistributable.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+set name=pkg.fmri value=pkg:/consolidation/X/X-redistributable@$(OSPKGVERS)
+set name=pkg.description value="This group package installs all packages from the X Window System consolidation."
+set name=pkg.summary value="X consolidation group package"
+<include packages.current>
--- a/pkg/manifests/compatibility-packages-SUNWxwinc.mf	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwinc.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -119,4 +119,4 @@
 depend fmri=pkg:/x11/library/xtrans type=require
 
 # lib/libXt
-depend fmri=pkg:/x11/toolkit/libxt type=require
+depend fmri=pkg:/x11/library/toolkit/libxt type=require
--- a/pkg/manifests/compatibility-packages-SUNWxwman.mf	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwman.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -77,16 +77,16 @@
 depend fmri=pkg:/web/browser/firefox/plugin/firefox-xrx type=require
 
 # app/oclock
-depend fmri=pkg:/x11/accessory/oclock type=require
+depend fmri=pkg:/x11/oclock type=require
 
 # app/xbiff
-depend fmri=pkg:/x11/accessory/xbiff type=require
+depend fmri=pkg:/x11/xbiff type=require
 
 # app/xcalc
-depend fmri=pkg:/x11/accessory/xcalc type=require
+depend fmri=pkg:/x11/xcalc type=require
 
 # app/xclipboard
-depend fmri=pkg:/x11/accessory/xclipboard type=require
+depend fmri=pkg:/x11/xclipboard type=require
 
 # app/ico, xeyes, xgc, xlogo
 depend fmri=pkg:/x11/demo type=require
@@ -134,37 +134,37 @@
 depend fmri=pkg:/x11/session/xinit type=require
 
 # app/appres, editres, listres, viewres
-depend fmri=pkg:/x11/toolkit/libxt/xt-resource-utilities type=require
+depend fmri=pkg:/x11/xt-resource-utilities type=require
 
 # app/cmap_alloc, cmap_compact, xcolor, xstdcmap
-depend fmri=pkg:/x11/utility/colormap-utilities type=require
+depend fmri=pkg:/x11/colormap-utilities type=require
 
 # app/rgb, xcmsdb, xhost, xmodmap, xprop, xrdb, xrefresh, xset, xsetroot
-depend fmri=pkg:/x11/utility/x11-server-utilities type=require
+depend fmri=pkg:/x11/x11-server-utilities type=require
 
 # app/xpr, xwd, xwud
-depend fmri=pkg:/x11/utility/x11-window-dump type=require
+depend fmri=pkg:/x11/x11-window-dump type=require
 
 # app/xconsole
-depend fmri=pkg:/x11/utility/xconsole type=require
+depend fmri=pkg:/x11/xconsole type=require
 
 # app/xfd
-depend fmri=pkg:/x11/utility/xfd type=require
+depend fmri=pkg:/x11/xfd type=require
 
 # app/xfontsel
-depend fmri=pkg:/x11/utility/xfontsel type=require
+depend fmri=pkg:/x11/xfontsel type=require
 
 # app/xkill
-depend fmri=pkg:/x11/utility/xkill type=require
+depend fmri=pkg:/x11/xkill type=require
 
 # app/xlock
-depend fmri=pkg:/x11/utility/xlock type=require
+depend fmri=pkg:/x11/xlock type=require
 
 # app/xmag, xmag_multivis
-depend fmri=pkg:/x11/utility/xmag type=require
+depend fmri=pkg:/x11/xmag type=require
 
 # app/xman
-depend fmri=pkg:/x11/utility/xman type=require
+depend fmri=pkg:/x11/xman type=require
 
 # app/xfs
 depend fmri=pkg:/x11/xfs type=require
--- a/pkg/manifests/compatibility-packages-SUNWxwopt.mf	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwopt.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -58,34 +58,34 @@
 depend fmri=pkg:/web/browser/firefox/plugin/firefox-xrx type=require
 
 # oclock
-depend fmri=pkg:/x11/accessory/oclock type=require
+depend fmri=pkg:/x11/oclock type=require
 
 # xbiff
-depend fmri=pkg:/x11/accessory/xbiff type=require
+depend fmri=pkg:/x11/xbiff type=require
 
 # xclipboard
-depend fmri=pkg:/x11/accessory/xclipboard type=require
+depend fmri=pkg:/x11/xclipboard type=require
 
 # xclock
-depend fmri=pkg:/x11/accessory/xclock type=require
+depend fmri=pkg:/x11/xclock type=require
 
 # lbxproxy, proxymngr, xfindproxy, xfwp
 depend fmri=pkg:/x11/network/x11-network-proxies type=require
 
 # appres, editres, listres, viewres
-depend fmri=pkg:/x11/toolkit/libxt/xt-resource-utilities type=require
+depend fmri=pkg:/x11/xt-resource-utilities type=require
 
 # xcolor
-depend fmri=pkg:/x11/utility/colormap-utilities type=require
+depend fmri=pkg:/x11/colormap-utilities type=require
 
 # rgb, xcmsdb
-depend fmri=pkg:/x11/utility/x11-server-utilities type=require
+depend fmri=pkg:/x11/x11-server-utilities type=require
 
 # xconsole
-depend fmri=pkg:/x11/utility/xconsole type=require
+depend fmri=pkg:/x11/xconsole type=require
 
 # xfontsel
-depend fmri=pkg:/x11/utility/xfontsel type=require
+depend fmri=pkg:/x11/xfontsel type=require
 
 # xman
-depend fmri=pkg:/x11/utility/xman type=require
+depend fmri=pkg:/x11/xman type=require
--- a/pkg/manifests/compatibility-packages-SUNWxwplr.mf	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwplr.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -31,7 +31,7 @@
 ### Depends on packages split out of the old SVR4 versions
 
 # application/opengl/ogl-select SMF service
-depend fmri=pkg:/service/application/opengl/ogl-select type=require
+depend fmri=pkg:/service/opengl/ogl-select type=require
 
 # etc/security/auth_attr entries for solaris.smf.manage.font
 depend fmri=pkg:/system/library/fontconfig type=require
--- a/pkg/manifests/compatibility-packages-SUNWxwplt.mf	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwplt.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -56,7 +56,7 @@
 depend fmri=pkg:/terminal/xterm type=require
 
 # app/xcalc
-depend fmri=pkg:/x11/accessory/xcalc type=require
+depend fmri=pkg:/x11/xcalc type=require
 
 # data/workspace-patterns
 depend fmri=pkg:/x11/data/workspace-patterns type=require
@@ -183,44 +183,44 @@
 depend fmri=pkg:/x11/session/xinit type=require
 
 # lib/libXaw4
-depend fmri=pkg:/x11/toolkit/libxaw4 type=require
+depend fmri=pkg:/x11/library/toolkit/libxaw4 type=require
 
 # lib/libXaw5
-depend fmri=pkg:/x11/toolkit/libxaw5 type=require
+depend fmri=pkg:/x11/library/toolkit/libxaw5 type=require
 
 # lib/libXaw
-depend fmri=pkg:/x11/toolkit/libxaw7 type=require
+depend fmri=pkg:/x11/library/toolkit/libxaw7 type=require
 
 # lib/libXt
-depend fmri=pkg:/x11/toolkit/libxt type=require
+depend fmri=pkg:/x11/library/toolkit/libxt type=require
 
 # lib/libXtsol
 depend fmri=pkg:/x11/trusted/libxtsol type=require
 
 # app/cmap_alloc, cmap_compact, xstdcmap
-depend fmri=pkg:/x11/utility/colormap-utilities type=require
+depend fmri=pkg:/x11/colormap-utilities type=require
 
 # app/rgb, xgamma, xhost, xinput, xmodmap, xprop, xrandr, xrdb
 # xrefresh, xset, xsetroot
-depend fmri=pkg:/x11/utility/x11-server-utilities type=require
+depend fmri=pkg:/x11/x11-server-utilities type=require
 
 # app/xpr, xwd, xwud
-depend fmri=pkg:/x11/utility/x11-window-dump type=require
+depend fmri=pkg:/x11/x11-window-dump type=require
 
 # app/xfd
-depend fmri=pkg:/x11/utility/xfd type=require
+depend fmri=pkg:/x11/xfd type=require
 
 # app/xkill
-depend fmri=pkg:/x11/utility/xkill type=require
+depend fmri=pkg:/x11/xkill type=require
 
 # app/xlock
-depend fmri=pkg:/x11/utility/xlock type=require
+depend fmri=pkg:/x11/xlock type=require
 
 # app/xmag
-depend fmri=pkg:/x11/utility/xmag type=require
+depend fmri=pkg:/x11/xmag type=require
 
 # app/xvidtune
-depend fmri=pkg:/x11/utility/xvidtune type=require
+depend fmri=pkg:/x11/xvidtune type=require
 
 # app/fslsfonts, fstobdf, showfont, xfsinfo
 depend fmri=pkg:/x11/xfs/xfs-utilities type=require
--- a/pkg/manifests/compatibility-packages-SUNWxwpmn.mf	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwpmn.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -81,4 +81,4 @@
 depend fmri=pkg:/x11/library/libxv type=require
 
 # lib/libXt
-depend fmri=pkg:/x11/toolkit/libxt type=require
+depend fmri=pkg:/x11/library/toolkit/libxt type=require
--- a/pkg/manifests/service-application-opengl-ogl-select.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri \
-    value=pkg:/service/application/opengl/ogl-select@$(OSPKGVERS)
-set name=pkg.description \
-    value="ogl-select is a SMF service that determines at boot time which vendor supplied OpenGL headers and libraries will be used, based on the hardware and drivers installed in the system."
-set name=pkg.summary \
-    value="ogl-select - boot time selection of OpenGL vendor files"
-dir path=lib
-dir path=lib/opengl
-dir path=lib/opengl/ogl_select
-dir path=lib/svc
-dir path=lib/svc/method
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/include
-dir path=usr/X11/lib
-dir path=usr/X11/lib/$(ARCH64)
-dir path=usr/include
-dir path=usr/include/GL
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/GL
-dir path=usr/lib/GL/$(ARCH64)
-dir path=usr/lib/xorg
-dir path=usr/lib/xorg/modules
-dir path=usr/lib/xorg/modules/extensions
-$(i386_ONLY)dir path=usr/lib/xorg/modules/extensions/$(ARCH64)
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=var
-dir path=var/svc
-dir path=var/svc/manifest
-dir path=var/svc/manifest/application
-dir path=var/svc/manifest/application/opengl
-file path=lib/opengl/ogl_select/mesa_vendor_select mode=0555
-$(i386_ONLY)file path=lib/opengl/ogl_select/nvidia_vendor_select mode=0555
-$(sparc_ONLY)file path=lib/opengl/ogl_select/sun_vendor_select mode=0555
-file path=lib/svc/method/ogl-select
-file path=usr/share/man/man1/ogl-select.1
-file path=var/svc/manifest/application/opengl/ogl-select.xml
-link path=usr/X11/include/GL target=../../include/GL
-link path=usr/X11/lib/$(ARCH64)/libGL.so target=libGL.so.1
-link path=usr/X11/lib/$(ARCH64)/libGL.so.1 target=../GL/$(ARCH64)/libGL.so.1
-link path=usr/X11/lib/64 target=$(ARCH64)
-link path=usr/X11/lib/GL target=../../lib/GL
-link path=usr/X11/lib/libGL.so target=libGL.so.1
-link path=usr/X11/lib/libGL.so.1 target=GL/libGL.so.1
-link path=usr/include/GL/gl.h target=../../../var/run/opengl/include/gl.h
-link path=usr/include/GL/glext.h \
-    target=../../../var/run/opengl/include/glext.h
-link path=usr/include/GL/glx.h target=../../../var/run/opengl/include/glx.h
-link path=usr/include/GL/glxext.h \
-    target=../../../var/run/opengl/include/glxext.h
-link path=usr/lib/$(ARCH64)/libGL.so target=libGL.so.1
-link path=usr/lib/$(ARCH64)/libGL.so.1 target=../GL/$(ARCH64)/libGL.so.1
-link path=usr/lib/GL/$(ARCH64)/libGL.so target=libGL.so.1
-link path=usr/lib/GL/$(ARCH64)/libGL.so.1 \
-    target=../../../../var/run/opengl/lib/$(ARCH64)/libGL.so.1
-link path=usr/lib/GL/64 target=$(ARCH64)
-link path=usr/lib/GL/libGL.so target=libGL.so.1
-link path=usr/lib/GL/libGL.so.1 target=../../../var/run/opengl/lib/libGL.so.1
-link path=usr/lib/libGL.so target=libGL.so.1
-link path=usr/lib/libGL.so.1 target=GL/libGL.so.1
-$(i386_ONLY)link path=usr/lib/xorg/modules/extensions/$(ARCH64)/libglx.so \
-    target=../../../../../../var/run/opengl/server/$(ARCH64)/libglx.so
-link path=usr/lib/xorg/modules/extensions/libglx.so \
-    target=../../../../../var/run/opengl/server/libglx.so
-# constype is required to detect which vendor_select script to run
-depend fmri=pkg:/diagnostic/constype type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/service-opengl-ogl-select.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,90 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri \
+    value=pkg:/service/opengl/ogl-select@$(OSPKGVERS)
+set name=pkg.description \
+    value="ogl-select is a SMF service that determines at boot time which vendor supplied OpenGL headers and libraries will be used, based on the hardware and drivers installed in the system."
+set name=pkg.summary \
+    value="ogl-select - boot time selection of OpenGL vendor files"
+dir path=lib
+dir path=lib/opengl
+dir path=lib/opengl/ogl_select
+dir path=lib/svc
+dir path=lib/svc/method
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/include
+dir path=usr/X11/lib
+dir path=usr/X11/lib/$(ARCH64)
+dir path=usr/include
+dir path=usr/include/GL
+dir path=usr/lib
+dir path=usr/lib/$(ARCH64)
+dir path=usr/lib/GL
+dir path=usr/lib/GL/$(ARCH64)
+dir path=usr/lib/xorg
+dir path=usr/lib/xorg/modules
+dir path=usr/lib/xorg/modules/extensions
+$(i386_ONLY)dir path=usr/lib/xorg/modules/extensions/$(ARCH64)
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+dir path=var
+dir path=var/svc
+dir path=var/svc/manifest
+dir path=var/svc/manifest/application
+dir path=var/svc/manifest/application/opengl
+file path=lib/opengl/ogl_select/mesa_vendor_select mode=0555
+$(i386_ONLY)file path=lib/opengl/ogl_select/nvidia_vendor_select mode=0555
+$(sparc_ONLY)file path=lib/opengl/ogl_select/sun_vendor_select mode=0555
+file path=lib/svc/method/ogl-select
+file path=usr/share/man/man1/ogl-select.1
+file path=var/svc/manifest/application/opengl/ogl-select.xml
+link path=usr/X11/include/GL target=../../include/GL
+link path=usr/X11/lib/$(ARCH64)/libGL.so target=libGL.so.1
+link path=usr/X11/lib/$(ARCH64)/libGL.so.1 target=../GL/$(ARCH64)/libGL.so.1
+link path=usr/X11/lib/64 target=$(ARCH64)
+link path=usr/X11/lib/GL target=../../lib/GL
+link path=usr/X11/lib/libGL.so target=libGL.so.1
+link path=usr/X11/lib/libGL.so.1 target=GL/libGL.so.1
+link path=usr/include/GL/gl.h target=../../../var/run/opengl/include/gl.h
+link path=usr/include/GL/glext.h \
+    target=../../../var/run/opengl/include/glext.h
+link path=usr/include/GL/glx.h target=../../../var/run/opengl/include/glx.h
+link path=usr/include/GL/glxext.h \
+    target=../../../var/run/opengl/include/glxext.h
+link path=usr/lib/$(ARCH64)/libGL.so target=libGL.so.1
+link path=usr/lib/$(ARCH64)/libGL.so.1 target=../GL/$(ARCH64)/libGL.so.1
+link path=usr/lib/GL/$(ARCH64)/libGL.so target=libGL.so.1
+link path=usr/lib/GL/$(ARCH64)/libGL.so.1 \
+    target=../../../../var/run/opengl/lib/$(ARCH64)/libGL.so.1
+link path=usr/lib/GL/64 target=$(ARCH64)
+link path=usr/lib/GL/libGL.so target=libGL.so.1
+link path=usr/lib/GL/libGL.so.1 target=../../../var/run/opengl/lib/libGL.so.1
+link path=usr/lib/libGL.so target=libGL.so.1
+link path=usr/lib/libGL.so.1 target=GL/libGL.so.1
+$(i386_ONLY)link path=usr/lib/xorg/modules/extensions/$(ARCH64)/libglx.so \
+    target=../../../../../../var/run/opengl/server/$(ARCH64)/libglx.so
+link path=usr/lib/xorg/modules/extensions/libglx.so \
+    target=../../../../../var/run/opengl/server/libglx.so
+# constype is required to detect which vendor_select script to run
+depend fmri=pkg:/diagnostic/constype type=require
--- a/pkg/manifests/system-display-manager-xdm.mf	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/manifests/system-display-manager-xdm.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -83,6 +83,6 @@
 # xdm calls sessreg for utmpx/wtmpx updates
 depend fmri=pkg:/x11/session/sessreg type=require
 # Default xdm session uses xrdb
-depend fmri=pkg:/x11/utility/x11-server-utilities type=require
+depend fmri=pkg:/x11/x11-server-utilities type=require
 # xdm runs xconsole for messages on login screen
-depend fmri=pkg:/x11/utility/xconsole type=require
+depend fmri=pkg:/x11/xconsole type=require
--- a/pkg/manifests/x11-accessory-oclock.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/accessory/oclock@__version:oclock__
-set name=pkg.description \
-    value="Oclock simply displays the current time on an analog display in a rounded window."
-set name=pkg.summary value="oclock - round X clock"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/oclock
-file path=usr/share/X11/app-defaults/Clock-color
-file path=usr/share/man/man1/oclock.1
-link path=usr/X11/bin/oclock target=../../bin/oclock
--- a/pkg/manifests/x11-accessory-xbiff.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/accessory/xbiff@__version:xbiff__
-set name=pkg.description \
-    value="xbiff displays whether a local mailbox has new mail."
-set name=pkg.summary value="xbiff - mailbox flag for X"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xbiff
-file path=usr/share/man/man1/xbiff.1
-link path=usr/X11/bin/xbiff target=../../bin/xbiff
-# xbiff loads the "flagup" and "flagdown" bitmaps from xbitmaps
-depend fmri=pkg:/x11/data/xbitmaps type=require
--- a/pkg/manifests/x11-accessory-xcalc.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/accessory/xcalc@__version:xcalc__
-set name=pkg.description \
-    value="xcalc is a scientific calculator desktop accessory that can emulate a TI-30 or an HP-10C."
-set name=pkg.summary value="xcalc - scientific calculator for X"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xcalc
-file path=usr/share/X11/app-defaults/XCalc
-file path=usr/share/X11/app-defaults/XCalc-color
-file path=usr/share/man/man1/xcalc.1
-link path=usr/X11/bin/xcalc target=../../bin/xcalc
-# XCalc app-defaults specifies -adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-* font
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
--- a/pkg/manifests/x11-accessory-xclipboard.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/accessory/xclipboard@__version:xclipboard__
-set name=pkg.description \
-    value="xclipboard is used to collect and display text selections that are sent to the CLIPBOARD by other clients.  It is typically used to save CLIPBOARD selections for later use.  It stores each CLIPBOARD selection as a separate string, each of which can be selected.  The xcutsel program is used to copy the current selection into a cut buffer and to make a selection that contains the current contents of the cut buffer.  It acts as a bridge between applications that don't support selections and those that do."
-set name=pkg.summary \
-    value="xclipboard & xcutsel tools for clipboard management"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xclipboard
-file path=usr/bin/xcutsel
-file path=usr/share/X11/app-defaults/XClipboard
-file path=usr/share/man/man1/xclipboard.1
-file path=usr/share/man/man1/xcutsel.1
-link path=usr/X11/bin/xclipboard target=../../bin/xclipboard
-link path=usr/X11/bin/xcutsel target=../../bin/xcutsel
-# XClipboard app-defaults specifies helvetica & courier fonts
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
--- a/pkg/manifests/x11-accessory-xclock.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/accessory/xclock@__version:xclock__
-set name=pkg.description \
-    value="xclock is the classic X Window System clock utility.  It displays the time in analog or digital form, continuously updated at a frequency which may be specified by the user."
-set name=pkg.summary value="xclock - analog / digital clock for X"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xclock
-file path=usr/share/X11/app-defaults/XClock
-file path=usr/share/X11/app-defaults/XClock-color
-file path=usr/share/man/man1/xclock.1
-link path=usr/X11/bin/xclock target=../../bin/xclock
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-colormap-utilities.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,44 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/colormap-utilities@$(X11PKGVERS)
+set name=pkg.description \
+    value="Utilties for viewing and manipulating entries in X colormaps, especially those associated with low bit-depth visuals."
+set name=pkg.summary value="X Colormap Utilities"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/cmap_alloc
+file path=usr/bin/cmap_compact
+file path=usr/bin/xcolor
+file path=usr/bin/xstdcmap
+file path=usr/share/man/man1/cmap_alloc.1
+file path=usr/share/man/man1/cmap_compact.1
+file path=usr/share/man/man1/xcolor.1
+file path=usr/share/man/man1/xstdcmap.1
+link path=usr/X11/bin/cmap_alloc target=../../bin/cmap_alloc
+link path=usr/X11/bin/cmap_compact target=../../bin/cmap_compact
+link path=usr/X11/bin/xcolor target=../../bin/xcolor
+link path=usr/X11/bin/xstdcmap target=../../bin/xstdcmap
--- a/pkg/manifests/x11-library-mesa.mf	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/manifests/x11-library-mesa.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -135,5 +135,5 @@
 link path=usr/lib/mesa/libGL.so target=libGL.so.1
 link path=usr/lib/mesa/libGLU.so target=libGLU.so.1
 link path=usr/lib/mesa/libGLw.so target=libGLw.so.1
-depend fmri=pkg:/service/application/opengl/ogl-select type=require
+depend fmri=pkg:/service/opengl/ogl-select type=require
 depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-library-toolkit-libxaw4.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,32 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/library/toolkit/libxaw4@$(OSPKGVERS)
+set name=pkg.description \
+    value="This package provides a libXaw.so.4 binary for backwards compatibility with programs compiled on older releases of Solaris."
+set name=pkg.summary \
+    value="libXaw4 - X Athena Widgets Toolkit (X11R4 binary compatibility version)"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/lib
+dir path=usr/lib
+file path=usr/lib/libXaw.so.4
+link path=usr/X11/lib/libXaw.so.4 target=../../lib/libXaw.so.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-library-toolkit-libxaw5.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,37 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/library/toolkit/libxaw5@$(OSPKGVERS)
+set name=pkg.description \
+    value="This package provides a libXaw.so.5 binary for backwards compatibility with programs compiled on older releases of Solaris."
+set name=pkg.summary \
+    value="libXaw5 - X Athena Widgets Toolkit (X11R5/X11R6 binary compatibility version)"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/lib
+dir path=usr/X11/lib/$(ARCH64)
+dir path=usr/lib
+dir path=usr/lib/$(ARCH64)
+file path=usr/lib/$(ARCH64)/libXaw.so.5
+file path=usr/lib/libXaw.so.5
+link path=usr/X11/lib/$(ARCH64)/libXaw.so.5 \
+    target=../../../lib/$(ARCH64)/libXaw.so.5
+link path=usr/X11/lib/libXaw.so.5 target=../../lib/libXaw.so.5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-library-toolkit-libxaw7.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,141 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/library/toolkit/libxaw7@__version:libXaw__
+set name=pkg.description \
+    value="Xaw is the X Athena Widget Set. Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library."
+set name=pkg.summary \
+    value="libXaw7 - X Athena Widgets Toolkit (current/X11R7 version)"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/lib
+dir path=usr/X11/lib/$(ARCH64)
+dir path=usr/include
+dir path=usr/include/X11
+dir path=usr/include/X11/Xaw
+dir path=usr/lib
+dir path=usr/lib/$(ARCH64)
+dir path=usr/lib/$(ARCH64)/pkgconfig
+dir path=usr/lib/pkgconfig
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/libXaw
+dir path=usr/share/man
+dir path=usr/share/man/man3xaw
+file path=usr/include/X11/Xaw/AllWidgets.h
+file path=usr/include/X11/Xaw/AsciiSink.h
+file path=usr/include/X11/Xaw/AsciiSinkP.h
+file path=usr/include/X11/Xaw/AsciiSrc.h
+file path=usr/include/X11/Xaw/AsciiSrcP.h
+file path=usr/include/X11/Xaw/AsciiText.h
+file path=usr/include/X11/Xaw/AsciiTextP.h
+file path=usr/include/X11/Xaw/Box.h
+file path=usr/include/X11/Xaw/BoxP.h
+file path=usr/include/X11/Xaw/Cardinals.h
+file path=usr/include/X11/Xaw/Command.h
+file path=usr/include/X11/Xaw/CommandP.h
+file path=usr/include/X11/Xaw/Dialog.h
+file path=usr/include/X11/Xaw/DialogP.h
+file path=usr/include/X11/Xaw/Form.h
+file path=usr/include/X11/Xaw/FormP.h
+file path=usr/include/X11/Xaw/Grip.h
+file path=usr/include/X11/Xaw/GripP.h
+file path=usr/include/X11/Xaw/Label.h
+file path=usr/include/X11/Xaw/LabelP.h
+file path=usr/include/X11/Xaw/List.h
+file path=usr/include/X11/Xaw/ListP.h
+file path=usr/include/X11/Xaw/MenuButtoP.h
+file path=usr/include/X11/Xaw/MenuButton.h
+file path=usr/include/X11/Xaw/MultiSink.h
+file path=usr/include/X11/Xaw/MultiSinkP.h
+file path=usr/include/X11/Xaw/MultiSrc.h
+file path=usr/include/X11/Xaw/MultiSrcP.h
+file path=usr/include/X11/Xaw/Paned.h
+file path=usr/include/X11/Xaw/PanedP.h
+file path=usr/include/X11/Xaw/Panner.h
+file path=usr/include/X11/Xaw/PannerP.h
+file path=usr/include/X11/Xaw/Porthole.h
+file path=usr/include/X11/Xaw/PortholeP.h
+file path=usr/include/X11/Xaw/Repeater.h
+file path=usr/include/X11/Xaw/RepeaterP.h
+file path=usr/include/X11/Xaw/Reports.h
+file path=usr/include/X11/Xaw/Scrollbar.h
+file path=usr/include/X11/Xaw/ScrollbarP.h
+file path=usr/include/X11/Xaw/Simple.h
+file path=usr/include/X11/Xaw/SimpleMenP.h
+file path=usr/include/X11/Xaw/SimpleMenu.h
+file path=usr/include/X11/Xaw/SimpleP.h
+file path=usr/include/X11/Xaw/Sme.h
+file path=usr/include/X11/Xaw/SmeBSB.h
+file path=usr/include/X11/Xaw/SmeBSBP.h
+file path=usr/include/X11/Xaw/SmeLine.h
+file path=usr/include/X11/Xaw/SmeLineP.h
+file path=usr/include/X11/Xaw/SmeP.h
+file path=usr/include/X11/Xaw/StripCharP.h
+file path=usr/include/X11/Xaw/StripChart.h
+file path=usr/include/X11/Xaw/Template.c facet.devel=true
+file path=usr/include/X11/Xaw/Template.h
+file path=usr/include/X11/Xaw/TemplateP.h
+file path=usr/include/X11/Xaw/Text.h
+file path=usr/include/X11/Xaw/TextP.h
+file path=usr/include/X11/Xaw/TextSink.h
+file path=usr/include/X11/Xaw/TextSinkP.h
+file path=usr/include/X11/Xaw/TextSrc.h
+file path=usr/include/X11/Xaw/TextSrcP.h
+file path=usr/include/X11/Xaw/Tip.h
+file path=usr/include/X11/Xaw/TipP.h
+file path=usr/include/X11/Xaw/Toggle.h
+file path=usr/include/X11/Xaw/ToggleP.h
+file path=usr/include/X11/Xaw/Tree.h
+file path=usr/include/X11/Xaw/TreeP.h
+file path=usr/include/X11/Xaw/VendorEP.h
+file path=usr/include/X11/Xaw/Viewport.h
+file path=usr/include/X11/Xaw/ViewportP.h
+file path=usr/include/X11/Xaw/XawImP.h
+file path=usr/include/X11/Xaw/XawInit.h
+file path=usr/lib/$(ARCH64)/libXaw7.so.7
+file path=usr/lib/$(ARCH64)/pkgconfig/xaw7.pc
+file path=usr/lib/libXaw7.so.7
+file path=usr/lib/pkgconfig/xaw7.pc
+file path=usr/share/doc/libXaw/widgets.html facet.devel=true
+file path=usr/share/doc/libXaw/widgets.index.ps facet.devel=true
+file path=usr/share/doc/libXaw/widgets.ps facet.devel=true
+file path=usr/share/doc/libXaw/widgets.txt facet.devel=true
+file path=usr/share/man/man3xaw/Xaw.3xaw
+link path=usr/X11/lib/$(ARCH64)/libXaw.so \
+    target=../../../lib/$(ARCH64)/libXaw.so
+link path=usr/X11/lib/$(ARCH64)/libXaw.so.7 \
+    target=../../../lib/$(ARCH64)/libXaw.so.7
+link path=usr/X11/lib/$(ARCH64)/libXaw7.so \
+    target=../../../lib/$(ARCH64)/libXaw7.so
+link path=usr/X11/lib/$(ARCH64)/libXaw7.so.7 \
+    target=../../../lib/$(ARCH64)/libXaw7.so.7
+link path=usr/X11/lib/libXaw.so target=../../lib/libXaw.so
+link path=usr/X11/lib/libXaw.so.7 target=../../lib/libXaw.so.7
+link path=usr/X11/lib/libXaw7.so target=../../lib/libXaw7.so
+link path=usr/X11/lib/libXaw7.so.7 target=../../lib/libXaw7.so.7
+link path=usr/lib/$(ARCH64)/libXaw.so target=libXaw7.so
+link path=usr/lib/$(ARCH64)/libXaw.so.7 target=libXaw7.so.7
+link path=usr/lib/$(ARCH64)/libXaw7.so target=libXaw7.so.7
+link path=usr/lib/libXaw.so target=libXaw7.so
+link path=usr/lib/libXaw.so.7 target=libXaw7.so.7
+link path=usr/lib/libXaw7.so target=libXaw7.so.7
+depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-library-toolkit-libxt.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,360 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/library/toolkit/libxt@__version:libXt__
+set name=pkg.description \
+    value="The X Toolkit Intrinsics are a programming library tailored to the special requirements of user interface construction within a network window system, specifically the X Window System.  The X Toolkit Intrinsics and a widget set such as the Athena Widgets (Xaw) or Motif (Xm) make up an X Toolkit."
+set name=pkg.summary value="libXt - X Toolkit Intrinsics library"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/lib
+dir path=usr/X11/lib/$(ARCH64)
+dir path=usr/bin
+dir path=usr/bin/$(ARCH64)
+dir path=usr/include
+dir path=usr/include/X11
+dir path=usr/lib
+dir path=usr/lib/$(ARCH64)
+dir path=usr/lib/$(ARCH64)/pkgconfig
+dir path=usr/lib/pkgconfig
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+dir path=usr/share/man/man3xt
+file path=usr/include/X11/CallbackI.h
+file path=usr/include/X11/Composite.h
+file path=usr/include/X11/CompositeP.h
+file path=usr/include/X11/ConstrainP.h
+file path=usr/include/X11/Constraint.h
+file path=usr/include/X11/ConvertI.h
+file path=usr/include/X11/Core.h
+file path=usr/include/X11/CoreP.h
+file path=usr/include/X11/CreateI.h
+file path=usr/include/X11/EventI.h
+file path=usr/include/X11/HookObjI.h
+file path=usr/include/X11/InitialI.h
+file path=usr/include/X11/Intrinsic.h
+file path=usr/include/X11/IntrinsicI.h
+file path=usr/include/X11/IntrinsicP.h
+file path=usr/include/X11/Object.h
+file path=usr/include/X11/ObjectP.h
+file path=usr/include/X11/PassivGraI.h
+file path=usr/include/X11/RectObj.h
+file path=usr/include/X11/RectObjP.h
+file path=usr/include/X11/ResConfigP.h
+file path=usr/include/X11/ResourceI.h
+file path=usr/include/X11/SelectionI.h
+file path=usr/include/X11/Shell.h
+file path=usr/include/X11/ShellI.h
+file path=usr/include/X11/ShellP.h
+file path=usr/include/X11/StringDefs.h
+file path=usr/include/X11/ThreadsI.h
+file path=usr/include/X11/TranslateI.h
+file path=usr/include/X11/VarargsI.h
+file path=usr/include/X11/Vendor.h
+file path=usr/include/X11/VendorP.h
+file path=usr/include/X11/Xtos.h
+file path=usr/lib/$(ARCH64)/libXt.so.4
+file path=usr/lib/$(ARCH64)/pkgconfig/xt.pc
+file path=usr/lib/libXt.so.4
+file path=usr/lib/pkgconfig/xt.pc
+file path=usr/share/man/man3xt/MenuPopdown.3xt
+file path=usr/share/man/man3xt/MenuPopup.3xt
+file path=usr/share/man/man3xt/XtAddActions.3xt
+file path=usr/share/man/man3xt/XtAddCallback.3xt
+file path=usr/share/man/man3xt/XtAddCallbacks.3xt
+file path=usr/share/man/man3xt/XtAddConverter.3xt
+file path=usr/share/man/man3xt/XtAddEventHandler.3xt
+file path=usr/share/man/man3xt/XtAddExposureToRegion.3xt
+file path=usr/share/man/man3xt/XtAddGrab.3xt
+file path=usr/share/man/man3xt/XtAddInput.3xt
+file path=usr/share/man/man3xt/XtAddRawEventHandler.3xt
+file path=usr/share/man/man3xt/XtAddTimeOut.3xt
+file path=usr/share/man/man3xt/XtAddWorkProc.3xt
+file path=usr/share/man/man3xt/XtAllocateGC.3xt
+file path=usr/share/man/man3xt/XtAppAddActionHook.3xt
+file path=usr/share/man/man3xt/XtAppAddActions.3xt
+file path=usr/share/man/man3xt/XtAppAddBlockHook.3xt
+file path=usr/share/man/man3xt/XtAppAddConverter.3xt
+file path=usr/share/man/man3xt/XtAppAddInput.3xt
+file path=usr/share/man/man3xt/XtAppAddSignal.3xt
+file path=usr/share/man/man3xt/XtAppAddTimeOut.3xt
+file path=usr/share/man/man3xt/XtAppAddWorkProc.3xt
+file path=usr/share/man/man3xt/XtAppCreateShell.3xt
+file path=usr/share/man/man3xt/XtAppError.3xt
+file path=usr/share/man/man3xt/XtAppErrorMsg.3xt
+file path=usr/share/man/man3xt/XtAppGetErrorDatabase.3xt
+file path=usr/share/man/man3xt/XtAppGetErrorDatabaseText.3xt
+file path=usr/share/man/man3xt/XtAppGetExitFlag.3xt
+file path=usr/share/man/man3xt/XtAppGetSelectionTimeout.3xt
+file path=usr/share/man/man3xt/XtAppInitialize.3xt
+file path=usr/share/man/man3xt/XtAppLock.3xt
+file path=usr/share/man/man3xt/XtAppMainLoop.3xt
+file path=usr/share/man/man3xt/XtAppNextEvent.3xt
+file path=usr/share/man/man3xt/XtAppPeekEvent.3xt
+file path=usr/share/man/man3xt/XtAppPending.3xt
+file path=usr/share/man/man3xt/XtAppProcessEvent.3xt
+file path=usr/share/man/man3xt/XtAppReleaseCacheRefs.3xt
+file path=usr/share/man/man3xt/XtAppSetErrorHandler.3xt
+file path=usr/share/man/man3xt/XtAppSetErrorMsgHandler.3xt
+file path=usr/share/man/man3xt/XtAppSetExitFlag.3xt
+file path=usr/share/man/man3xt/XtAppSetFallbackResources.3xt
+file path=usr/share/man/man3xt/XtAppSetSelectionTimeout.3xt
+file path=usr/share/man/man3xt/XtAppSetTypeConverter.3xt
+file path=usr/share/man/man3xt/XtAppSetWarningHandler.3xt
+file path=usr/share/man/man3xt/XtAppSetWarningMsgHandler.3xt
+file path=usr/share/man/man3xt/XtAppUnlock.3xt
+file path=usr/share/man/man3xt/XtAppWarning.3xt
+file path=usr/share/man/man3xt/XtAppWarningMsg.3xt
+file path=usr/share/man/man3xt/XtAugmentTranslations.3xt
+file path=usr/share/man/man3xt/XtBuildEventMask.3xt
+file path=usr/share/man/man3xt/XtCallAcceptFocus.3xt
+file path=usr/share/man/man3xt/XtCallActionProc.3xt
+file path=usr/share/man/man3xt/XtCallCallbackList.3xt
+file path=usr/share/man/man3xt/XtCallCallbacks.3xt
+file path=usr/share/man/man3xt/XtCallConverter.3xt
+file path=usr/share/man/man3xt/XtCallbackExclusive.3xt
+file path=usr/share/man/man3xt/XtCallbackNone.3xt
+file path=usr/share/man/man3xt/XtCallbackNonexclusive.3xt
+file path=usr/share/man/man3xt/XtCallbackPopdown.3xt
+file path=usr/share/man/man3xt/XtCalloc.3xt
+file path=usr/share/man/man3xt/XtCancelSelectionRequest.3xt
+file path=usr/share/man/man3xt/XtChangeManagedSet.3xt
+file path=usr/share/man/man3xt/XtCheckSubclass.3xt
+file path=usr/share/man/man3xt/XtClass.3xt
+file path=usr/share/man/man3xt/XtCloseDisplay.3xt
+file path=usr/share/man/man3xt/XtConfigureWidget.3xt
+file path=usr/share/man/man3xt/XtConvert.3xt
+file path=usr/share/man/man3xt/XtConvertAndStore.3xt
+file path=usr/share/man/man3xt/XtConvertCase.3xt
+file path=usr/share/man/man3xt/XtCreateApplicationContext.3xt
+file path=usr/share/man/man3xt/XtCreateApplicationShell.3xt
+file path=usr/share/man/man3xt/XtCreateManagedWidget.3xt
+file path=usr/share/man/man3xt/XtCreatePopupShell.3xt
+file path=usr/share/man/man3xt/XtCreateSelectionRequest.3xt
+file path=usr/share/man/man3xt/XtCreateWidget.3xt
+file path=usr/share/man/man3xt/XtCreateWindow.3xt
+file path=usr/share/man/man3xt/XtDatabase.3xt
+file path=usr/share/man/man3xt/XtDestroyApplicationContext.3xt
+file path=usr/share/man/man3xt/XtDestroyWidget.3xt
+file path=usr/share/man/man3xt/XtDirectConvert.3xt
+file path=usr/share/man/man3xt/XtDisownSelection.3xt
+file path=usr/share/man/man3xt/XtDispatchEvent.3xt
+file path=usr/share/man/man3xt/XtDispatchEventToWidget.3xt
+file path=usr/share/man/man3xt/XtDisplay.3xt
+file path=usr/share/man/man3xt/XtDisplayInitialize.3xt
+file path=usr/share/man/man3xt/XtDisplayOfObject.3xt
+file path=usr/share/man/man3xt/XtDisplayStringConversionWarning.3xt
+file path=usr/share/man/man3xt/XtDisplayToApplicationContext.3xt
+file path=usr/share/man/man3xt/XtError.3xt
+file path=usr/share/man/man3xt/XtErrorMsg.3xt
+file path=usr/share/man/man3xt/XtFindFile.3xt
+file path=usr/share/man/man3xt/XtFree.3xt
+file path=usr/share/man/man3xt/XtGetActionKeysym.3xt
+file path=usr/share/man/man3xt/XtGetActionList.3xt
+file path=usr/share/man/man3xt/XtGetApplicationNameAndClass.3xt
+file path=usr/share/man/man3xt/XtGetApplicationResources.3xt
+file path=usr/share/man/man3xt/XtGetClassExtension.3xt
+file path=usr/share/man/man3xt/XtGetConstraintResourceList.3xt
+file path=usr/share/man/man3xt/XtGetDisplays.3xt
+file path=usr/share/man/man3xt/XtGetErrorDatabase.3xt
+file path=usr/share/man/man3xt/XtGetErrorDatabaseText.3xt
+file path=usr/share/man/man3xt/XtGetGC.3xt
+file path=usr/share/man/man3xt/XtGetKeyboardFocusWidget.3xt
+file path=usr/share/man/man3xt/XtGetKeysymTable.3xt
+file path=usr/share/man/man3xt/XtGetMultiClickTime.3xt
+file path=usr/share/man/man3xt/XtGetResourceList.3xt
+file path=usr/share/man/man3xt/XtGetSelectionParameters.3xt
+file path=usr/share/man/man3xt/XtGetSelectionRequest.3xt
+file path=usr/share/man/man3xt/XtGetSelectionTimeout.3xt
+file path=usr/share/man/man3xt/XtGetSelectionValue.3xt
+file path=usr/share/man/man3xt/XtGetSelectionValueIncremental.3xt
+file path=usr/share/man/man3xt/XtGetSelectionValues.3xt
+file path=usr/share/man/man3xt/XtGetSelectionValuesIncremental.3xt
+file path=usr/share/man/man3xt/XtGetSubresources.3xt
+file path=usr/share/man/man3xt/XtGetSubvalues.3xt
+file path=usr/share/man/man3xt/XtGetValues.3xt
+file path=usr/share/man/man3xt/XtGrabButton.3xt
+file path=usr/share/man/man3xt/XtGrabKey.3xt
+file path=usr/share/man/man3xt/XtGrabKeyboard.3xt
+file path=usr/share/man/man3xt/XtGrabPointer.3xt
+file path=usr/share/man/man3xt/XtHasCallbacks.3xt
+file path=usr/share/man/man3xt/XtHooksOfDisplay.3xt
+file path=usr/share/man/man3xt/XtInitialize.3xt
+file path=usr/share/man/man3xt/XtInitializeWidgetClass.3xt
+file path=usr/share/man/man3xt/XtInsertEventHandler.3xt
+file path=usr/share/man/man3xt/XtInsertEventTypeHandler.3xt
+file path=usr/share/man/man3xt/XtInsertRawEventHandler.3xt
+file path=usr/share/man/man3xt/XtInstallAccelerators.3xt
+file path=usr/share/man/man3xt/XtInstallAllAccelerators.3xt
+file path=usr/share/man/man3xt/XtIsApplicationShell.3xt
+file path=usr/share/man/man3xt/XtIsComposite.3xt
+file path=usr/share/man/man3xt/XtIsConstraint.3xt
+file path=usr/share/man/man3xt/XtIsManaged.3xt
+file path=usr/share/man/man3xt/XtIsObject.3xt
+file path=usr/share/man/man3xt/XtIsOverrideShell.3xt
+file path=usr/share/man/man3xt/XtIsRealized.3xt
+file path=usr/share/man/man3xt/XtIsRectObj.3xt
+file path=usr/share/man/man3xt/XtIsSensitive.3xt
+file path=usr/share/man/man3xt/XtIsSessionShell.3xt
+file path=usr/share/man/man3xt/XtIsShell.3xt
+file path=usr/share/man/man3xt/XtIsSubclass.3xt
+file path=usr/share/man/man3xt/XtIsTopLevelShell.3xt
+file path=usr/share/man/man3xt/XtIsTransientShell.3xt
+file path=usr/share/man/man3xt/XtIsVendorShell.3xt
+file path=usr/share/man/man3xt/XtIsWMShell.3xt
+file path=usr/share/man/man3xt/XtIsWidget.3xt
+file path=usr/share/man/man3xt/XtKeysymToKeycodeList.3xt
+file path=usr/share/man/man3xt/XtLastEventProcessed.3xt
+file path=usr/share/man/man3xt/XtLastTimestampProcessed.3xt
+file path=usr/share/man/man3xt/XtMainLoop.3xt
+file path=usr/share/man/man3xt/XtMakeGeometryRequest.3xt
+file path=usr/share/man/man3xt/XtMakeResizeRequest.3xt
+file path=usr/share/man/man3xt/XtMalloc.3xt
+file path=usr/share/man/man3xt/XtManageChild.3xt
+file path=usr/share/man/man3xt/XtManageChildren.3xt
+file path=usr/share/man/man3xt/XtMapWidget.3xt
+file path=usr/share/man/man3xt/XtMergeArgLists.3xt
+file path=usr/share/man/man3xt/XtMoveWidget.3xt
+file path=usr/share/man/man3xt/XtName.3xt
+file path=usr/share/man/man3xt/XtNameToWidget.3xt
+file path=usr/share/man/man3xt/XtNew.3xt
+file path=usr/share/man/man3xt/XtNewString.3xt
+file path=usr/share/man/man3xt/XtNextEvent.3xt
+file path=usr/share/man/man3xt/XtNoticeSignal.3xt
+file path=usr/share/man/man3xt/XtNumber.3xt
+file path=usr/share/man/man3xt/XtOffset.3xt
+file path=usr/share/man/man3xt/XtOffsetOf.3xt
+file path=usr/share/man/man3xt/XtOpenApplication.3xt
+file path=usr/share/man/man3xt/XtOpenDisplay.3xt
+file path=usr/share/man/man3xt/XtOverrideTranslations.3xt
+file path=usr/share/man/man3xt/XtOwnSelection.3xt
+file path=usr/share/man/man3xt/XtOwnSelectionIncremental.3xt
+file path=usr/share/man/man3xt/XtParent.3xt
+file path=usr/share/man/man3xt/XtParseAcceleratorTable.3xt
+file path=usr/share/man/man3xt/XtParseTranslationTable.3xt
+file path=usr/share/man/man3xt/XtPeekEvent.3xt
+file path=usr/share/man/man3xt/XtPending.3xt
+file path=usr/share/man/man3xt/XtPopdown.3xt
+file path=usr/share/man/man3xt/XtPopup.3xt
+file path=usr/share/man/man3xt/XtPopupSpringLoaded.3xt
+file path=usr/share/man/man3xt/XtProcessEvent.3xt
+file path=usr/share/man/man3xt/XtProcessLock.3xt
+file path=usr/share/man/man3xt/XtProcessUnlock.3xt
+file path=usr/share/man/man3xt/XtQueryGeometry.3xt
+file path=usr/share/man/man3xt/XtRealizeWidget.3xt
+file path=usr/share/man/man3xt/XtRealloc.3xt
+file path=usr/share/man/man3xt/XtRegisterCaseConverter.3xt
+file path=usr/share/man/man3xt/XtRegisterDrawable.3xt
+file path=usr/share/man/man3xt/XtRegisterExtensionSelector.3xt
+file path=usr/share/man/man3xt/XtRegisterGrabAction.3xt
+file path=usr/share/man/man3xt/XtReleaseGC.3xt
+file path=usr/share/man/man3xt/XtReleasePropertyAtom.3xt
+file path=usr/share/man/man3xt/XtRemoveActionHook.3xt
+file path=usr/share/man/man3xt/XtRemoveAllCallbacks.3xt
+file path=usr/share/man/man3xt/XtRemoveBlockHook.3xt
+file path=usr/share/man/man3xt/XtRemoveCallback.3xt
+file path=usr/share/man/man3xt/XtRemoveCallbacks.3xt
+file path=usr/share/man/man3xt/XtRemoveEventHandler.3xt
+file path=usr/share/man/man3xt/XtRemoveEventTypeHandler.3xt
+file path=usr/share/man/man3xt/XtRemoveGrab.3xt
+file path=usr/share/man/man3xt/XtRemoveInput.3xt
+file path=usr/share/man/man3xt/XtRemoveRawEventHandler.3xt
+file path=usr/share/man/man3xt/XtRemoveSignal.3xt
+file path=usr/share/man/man3xt/XtRemoveTimeOut.3xt
+file path=usr/share/man/man3xt/XtRemoveWorkProc.3xt
+file path=usr/share/man/man3xt/XtReservePropertyAtom.3xt
+file path=usr/share/man/man3xt/XtResizeWidget.3xt
+file path=usr/share/man/man3xt/XtResolvePathname.3xt
+file path=usr/share/man/man3xt/XtScreen.3xt
+file path=usr/share/man/man3xt/XtScreenDatabase.3xt
+file path=usr/share/man/man3xt/XtScreenOfObject.3xt
+file path=usr/share/man/man3xt/XtSendSelectionRequest.3xt
+file path=usr/share/man/man3xt/XtSessionGetToken.3xt
+file path=usr/share/man/man3xt/XtSessionReturnToken.3xt
+file path=usr/share/man/man3xt/XtSetArg.3xt
+file path=usr/share/man/man3xt/XtSetErrorHandler.3xt
+file path=usr/share/man/man3xt/XtSetErrorMsgHandler.3xt
+file path=usr/share/man/man3xt/XtSetEventDispatcher.3xt
+file path=usr/share/man/man3xt/XtSetKeyTranslator.3xt
+file path=usr/share/man/man3xt/XtSetKeyboardFocus.3xt
+file path=usr/share/man/man3xt/XtSetLanguageProc.3xt
+file path=usr/share/man/man3xt/XtSetMappedWhenManaged.3xt
+file path=usr/share/man/man3xt/XtSetMultiClickTime.3xt
+file path=usr/share/man/man3xt/XtSetSelectionParameters.3xt
+file path=usr/share/man/man3xt/XtSetSelectionTimeout.3xt
+file path=usr/share/man/man3xt/XtSetSensitive.3xt
+file path=usr/share/man/man3xt/XtSetSubvalues.3xt
+file path=usr/share/man/man3xt/XtSetTypeConverter.3xt
+file path=usr/share/man/man3xt/XtSetValues.3xt
+file path=usr/share/man/man3xt/XtSetWMColormapWindows.3xt
+file path=usr/share/man/man3xt/XtSetWarningHandler.3xt
+file path=usr/share/man/man3xt/XtSetWarningMsgHandler.3xt
+file path=usr/share/man/man3xt/XtStringConversionWarning.3xt
+file path=usr/share/man/man3xt/XtSuperclass.3xt
+file path=usr/share/man/man3xt/XtToolkitInitialize.3xt
+file path=usr/share/man/man3xt/XtToolkitThreadInitialize.3xt
+file path=usr/share/man/man3xt/XtTranslateCoords.3xt
+file path=usr/share/man/man3xt/XtTranslateKeycode.3xt
+file path=usr/share/man/man3xt/XtUngrabButton.3xt
+file path=usr/share/man/man3xt/XtUngrabKey.3xt
+file path=usr/share/man/man3xt/XtUngrabKeyboard.3xt
+file path=usr/share/man/man3xt/XtUngrabPointer.3xt
+file path=usr/share/man/man3xt/XtUninstallTranslations.3xt
+file path=usr/share/man/man3xt/XtUnmanageChild.3xt
+file path=usr/share/man/man3xt/XtUnmanageChildren.3xt
+file path=usr/share/man/man3xt/XtUnmapWidget.3xt
+file path=usr/share/man/man3xt/XtUnrealizeWidget.3xt
+file path=usr/share/man/man3xt/XtUnregisterDrawable.3xt
+file path=usr/share/man/man3xt/XtVaAppCreateShell.3xt
+file path=usr/share/man/man3xt/XtVaAppInitialize.3xt
+file path=usr/share/man/man3xt/XtVaCreateArgsList.3xt
+file path=usr/share/man/man3xt/XtVaCreateManagedWidget.3xt
+file path=usr/share/man/man3xt/XtVaCreatePopupShell.3xt
+file path=usr/share/man/man3xt/XtVaCreateWidget.3xt
+file path=usr/share/man/man3xt/XtVaGetApplicationResources.3xt
+file path=usr/share/man/man3xt/XtVaGetSubresources.3xt
+file path=usr/share/man/man3xt/XtVaGetSubvalues.3xt
+file path=usr/share/man/man3xt/XtVaGetValues.3xt
+file path=usr/share/man/man3xt/XtVaOpenApplication.3xt
+file path=usr/share/man/man3xt/XtVaSetSubvalues.3xt
+file path=usr/share/man/man3xt/XtVaSetValues.3xt
+file path=usr/share/man/man3xt/XtWarning.3xt
+file path=usr/share/man/man3xt/XtWarningMsg.3xt
+file path=usr/share/man/man3xt/XtWidgetToApplicationContext.3xt
+file path=usr/share/man/man3xt/XtWindow.3xt
+file path=usr/share/man/man3xt/XtWindowOfObject.3xt
+file path=usr/share/man/man3xt/XtWindowToWidget.3xt
+link path=usr/X11/lib/$(ARCH64)/libXt.so \
+    target=../../../lib/$(ARCH64)/libXt.so
+link path=usr/X11/lib/$(ARCH64)/libXt.so.4 \
+    target=../../../lib/$(ARCH64)/libXt.so.4
+link path=usr/X11/lib/$(ARCH64)/libXt.so.5 \
+    target=../../../lib/$(ARCH64)/libXt.so.5
+link path=usr/X11/lib/libXt.so target=../../lib/libXt.so
+link path=usr/X11/lib/libXt.so.4 target=../../lib/libXt.so.4
+link path=usr/X11/lib/libXt.so.5 target=../../lib/libXt.so.5
+link path=usr/lib/$(ARCH64)/libXt.so target=libXt.so.4
+link path=usr/lib/$(ARCH64)/libXt.so.5 target=libXt.so.4
+link path=usr/lib/libXt.so target=libXt.so.4
+# Additional link required by SVID ABI (see PSARC/1997/141)
+link path=usr/lib/libXt.so.5 target=libXt.so.4
+depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-oclock.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,38 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/oclock@__version:oclock__
+set name=pkg.description \
+    value="Oclock simply displays the current time on an analog display in a rounded window."
+set name=pkg.summary value="oclock - round X clock"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/oclock
+file path=usr/share/X11/app-defaults/Clock-color
+file path=usr/share/man/man1/oclock.1
+link path=usr/X11/bin/oclock target=../../bin/oclock
--- a/pkg/manifests/x11-session-xinit.mf	Sun Jul 04 22:48:04 2010 -0700
+++ b/pkg/manifests/x11-session-xinit.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -52,4 +52,4 @@
 # startx runs xauth to save cookies to .Xauthority
 depend fmri=pkg:/x11/session/xauth type=require
 # Default xinit session uses xrdb & xmodmap
-depend fmri=pkg:/x11/utility/x11-server-utilities type=require
+depend fmri=pkg:/x11/x11-server-utilities type=require
--- a/pkg/manifests/x11-toolkit-libxaw4.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/toolkit/libxaw4@$(OSPKGVERS)
-set name=pkg.description \
-    value="This package provides a libXaw.so.4 binary for backwards compatibility with programs compiled on older releases of Solaris."
-set name=pkg.summary \
-    value="libXaw4 - X Athena Widgets Toolkit (X11R4 binary compatibility version)"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/lib
-dir path=usr/lib
-file path=usr/lib/libXaw.so.4
-link path=usr/X11/lib/libXaw.so.4 target=../../lib/libXaw.so.4
--- a/pkg/manifests/x11-toolkit-libxaw5.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/toolkit/libxaw5@$(OSPKGVERS)
-set name=pkg.description \
-    value="This package provides a libXaw.so.5 binary for backwards compatibility with programs compiled on older releases of Solaris."
-set name=pkg.summary \
-    value="libXaw5 - X Athena Widgets Toolkit (X11R5/X11R6 binary compatibility version)"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/lib
-dir path=usr/X11/lib/$(ARCH64)
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-file path=usr/lib/$(ARCH64)/libXaw.so.5
-file path=usr/lib/libXaw.so.5
-link path=usr/X11/lib/$(ARCH64)/libXaw.so.5 \
-    target=../../../lib/$(ARCH64)/libXaw.so.5
-link path=usr/X11/lib/libXaw.so.5 target=../../lib/libXaw.so.5
--- a/pkg/manifests/x11-toolkit-libxaw7.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/toolkit/libxaw7@__version:libXaw__
-set name=pkg.description \
-    value="Xaw is the X Athena Widget Set. Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library."
-set name=pkg.summary \
-    value="libXaw7 - X Athena Widgets Toolkit (current/X11R7 version)"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/lib
-dir path=usr/X11/lib/$(ARCH64)
-dir path=usr/include
-dir path=usr/include/X11
-dir path=usr/include/X11/Xaw
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/libXaw
-dir path=usr/share/man
-dir path=usr/share/man/man3xaw
-file path=usr/include/X11/Xaw/AllWidgets.h
-file path=usr/include/X11/Xaw/AsciiSink.h
-file path=usr/include/X11/Xaw/AsciiSinkP.h
-file path=usr/include/X11/Xaw/AsciiSrc.h
-file path=usr/include/X11/Xaw/AsciiSrcP.h
-file path=usr/include/X11/Xaw/AsciiText.h
-file path=usr/include/X11/Xaw/AsciiTextP.h
-file path=usr/include/X11/Xaw/Box.h
-file path=usr/include/X11/Xaw/BoxP.h
-file path=usr/include/X11/Xaw/Cardinals.h
-file path=usr/include/X11/Xaw/Command.h
-file path=usr/include/X11/Xaw/CommandP.h
-file path=usr/include/X11/Xaw/Dialog.h
-file path=usr/include/X11/Xaw/DialogP.h
-file path=usr/include/X11/Xaw/Form.h
-file path=usr/include/X11/Xaw/FormP.h
-file path=usr/include/X11/Xaw/Grip.h
-file path=usr/include/X11/Xaw/GripP.h
-file path=usr/include/X11/Xaw/Label.h
-file path=usr/include/X11/Xaw/LabelP.h
-file path=usr/include/X11/Xaw/List.h
-file path=usr/include/X11/Xaw/ListP.h
-file path=usr/include/X11/Xaw/MenuButtoP.h
-file path=usr/include/X11/Xaw/MenuButton.h
-file path=usr/include/X11/Xaw/MultiSink.h
-file path=usr/include/X11/Xaw/MultiSinkP.h
-file path=usr/include/X11/Xaw/MultiSrc.h
-file path=usr/include/X11/Xaw/MultiSrcP.h
-file path=usr/include/X11/Xaw/Paned.h
-file path=usr/include/X11/Xaw/PanedP.h
-file path=usr/include/X11/Xaw/Panner.h
-file path=usr/include/X11/Xaw/PannerP.h
-file path=usr/include/X11/Xaw/Porthole.h
-file path=usr/include/X11/Xaw/PortholeP.h
-file path=usr/include/X11/Xaw/Repeater.h
-file path=usr/include/X11/Xaw/RepeaterP.h
-file path=usr/include/X11/Xaw/Reports.h
-file path=usr/include/X11/Xaw/Scrollbar.h
-file path=usr/include/X11/Xaw/ScrollbarP.h
-file path=usr/include/X11/Xaw/Simple.h
-file path=usr/include/X11/Xaw/SimpleMenP.h
-file path=usr/include/X11/Xaw/SimpleMenu.h
-file path=usr/include/X11/Xaw/SimpleP.h
-file path=usr/include/X11/Xaw/Sme.h
-file path=usr/include/X11/Xaw/SmeBSB.h
-file path=usr/include/X11/Xaw/SmeBSBP.h
-file path=usr/include/X11/Xaw/SmeLine.h
-file path=usr/include/X11/Xaw/SmeLineP.h
-file path=usr/include/X11/Xaw/SmeP.h
-file path=usr/include/X11/Xaw/StripCharP.h
-file path=usr/include/X11/Xaw/StripChart.h
-file path=usr/include/X11/Xaw/Template.c facet.devel=true
-file path=usr/include/X11/Xaw/Template.h
-file path=usr/include/X11/Xaw/TemplateP.h
-file path=usr/include/X11/Xaw/Text.h
-file path=usr/include/X11/Xaw/TextP.h
-file path=usr/include/X11/Xaw/TextSink.h
-file path=usr/include/X11/Xaw/TextSinkP.h
-file path=usr/include/X11/Xaw/TextSrc.h
-file path=usr/include/X11/Xaw/TextSrcP.h
-file path=usr/include/X11/Xaw/Tip.h
-file path=usr/include/X11/Xaw/TipP.h
-file path=usr/include/X11/Xaw/Toggle.h
-file path=usr/include/X11/Xaw/ToggleP.h
-file path=usr/include/X11/Xaw/Tree.h
-file path=usr/include/X11/Xaw/TreeP.h
-file path=usr/include/X11/Xaw/VendorEP.h
-file path=usr/include/X11/Xaw/Viewport.h
-file path=usr/include/X11/Xaw/ViewportP.h
-file path=usr/include/X11/Xaw/XawImP.h
-file path=usr/include/X11/Xaw/XawInit.h
-file path=usr/lib/$(ARCH64)/libXaw7.so.7
-file path=usr/lib/$(ARCH64)/pkgconfig/xaw7.pc
-file path=usr/lib/libXaw7.so.7
-file path=usr/lib/pkgconfig/xaw7.pc
-file path=usr/share/doc/libXaw/widgets.html facet.devel=true
-file path=usr/share/doc/libXaw/widgets.index.ps facet.devel=true
-file path=usr/share/doc/libXaw/widgets.ps facet.devel=true
-file path=usr/share/doc/libXaw/widgets.txt facet.devel=true
-file path=usr/share/man/man3xaw/Xaw.3xaw
-link path=usr/X11/lib/$(ARCH64)/libXaw.so \
-    target=../../../lib/$(ARCH64)/libXaw.so
-link path=usr/X11/lib/$(ARCH64)/libXaw.so.7 \
-    target=../../../lib/$(ARCH64)/libXaw.so.7
-link path=usr/X11/lib/$(ARCH64)/libXaw7.so \
-    target=../../../lib/$(ARCH64)/libXaw7.so
-link path=usr/X11/lib/$(ARCH64)/libXaw7.so.7 \
-    target=../../../lib/$(ARCH64)/libXaw7.so.7
-link path=usr/X11/lib/libXaw.so target=../../lib/libXaw.so
-link path=usr/X11/lib/libXaw.so.7 target=../../lib/libXaw.so.7
-link path=usr/X11/lib/libXaw7.so target=../../lib/libXaw7.so
-link path=usr/X11/lib/libXaw7.so.7 target=../../lib/libXaw7.so.7
-link path=usr/lib/$(ARCH64)/libXaw.so target=libXaw7.so
-link path=usr/lib/$(ARCH64)/libXaw.so.7 target=libXaw7.so.7
-link path=usr/lib/$(ARCH64)/libXaw7.so target=libXaw7.so.7
-link path=usr/lib/libXaw.so target=libXaw7.so
-link path=usr/lib/libXaw.so.7 target=libXaw7.so.7
-link path=usr/lib/libXaw7.so target=libXaw7.so.7
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
--- a/pkg/manifests/x11-toolkit-libxt-xt-resource-utilities.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri \
-    value=pkg:/x11/toolkit/libxt/xt-resource-utilities@$(X11PKGVERS)
-set name=pkg.description \
-    value="Utilties to view and edit the configuration resources used by applications based on toolkits such as Athena Widgets (Xaw) and Motif (Xm) that utilize the X Toolkit Intrinsics (libXt)."
-set name=pkg.summary value="X Toolkit Resource utilities"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/appres
-file path=usr/bin/editres
-file path=usr/bin/listres
-file path=usr/bin/viewres
-file path=usr/share/X11/app-defaults/Editres
-file path=usr/share/X11/app-defaults/Editres-color
-file path=usr/share/X11/app-defaults/Viewres
-file path=usr/share/X11/app-defaults/Viewres-color
-file path=usr/share/man/man1/appres.1
-file path=usr/share/man/man1/editres.1
-file path=usr/share/man/man1/listres.1
-file path=usr/share/man/man1/viewres.1
-link path=usr/X11/bin/appres target=../../bin/appres
-link path=usr/X11/bin/editres target=../../bin/editres
-link path=usr/X11/bin/listres target=../../bin/listres
-link path=usr/X11/bin/viewres target=../../bin/viewres
-# Editres app-defaults specifies -*-new century schoolbook-...-*-* font
-# Viewres app-defaults specifies -adobe-helvetica-....-iso*-* font
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
--- a/pkg/manifests/x11-toolkit-libxt.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,360 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/toolkit/libxt@__version:libXt__
-set name=pkg.description \
-    value="The X Toolkit Intrinsics are a programming library tailored to the special requirements of user interface construction within a network window system, specifically the X Window System.  The X Toolkit Intrinsics and a widget set such as the Athena Widgets (Xaw) or Motif (Xm) make up an X Toolkit."
-set name=pkg.summary value="libXt - X Toolkit Intrinsics library"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/lib
-dir path=usr/X11/lib/$(ARCH64)
-dir path=usr/bin
-dir path=usr/bin/$(ARCH64)
-dir path=usr/include
-dir path=usr/include/X11
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3xt
-file path=usr/include/X11/CallbackI.h
-file path=usr/include/X11/Composite.h
-file path=usr/include/X11/CompositeP.h
-file path=usr/include/X11/ConstrainP.h
-file path=usr/include/X11/Constraint.h
-file path=usr/include/X11/ConvertI.h
-file path=usr/include/X11/Core.h
-file path=usr/include/X11/CoreP.h
-file path=usr/include/X11/CreateI.h
-file path=usr/include/X11/EventI.h
-file path=usr/include/X11/HookObjI.h
-file path=usr/include/X11/InitialI.h
-file path=usr/include/X11/Intrinsic.h
-file path=usr/include/X11/IntrinsicI.h
-file path=usr/include/X11/IntrinsicP.h
-file path=usr/include/X11/Object.h
-file path=usr/include/X11/ObjectP.h
-file path=usr/include/X11/PassivGraI.h
-file path=usr/include/X11/RectObj.h
-file path=usr/include/X11/RectObjP.h
-file path=usr/include/X11/ResConfigP.h
-file path=usr/include/X11/ResourceI.h
-file path=usr/include/X11/SelectionI.h
-file path=usr/include/X11/Shell.h
-file path=usr/include/X11/ShellI.h
-file path=usr/include/X11/ShellP.h
-file path=usr/include/X11/StringDefs.h
-file path=usr/include/X11/ThreadsI.h
-file path=usr/include/X11/TranslateI.h
-file path=usr/include/X11/VarargsI.h
-file path=usr/include/X11/Vendor.h
-file path=usr/include/X11/VendorP.h
-file path=usr/include/X11/Xtos.h
-file path=usr/lib/$(ARCH64)/libXt.so.4
-file path=usr/lib/$(ARCH64)/pkgconfig/xt.pc
-file path=usr/lib/libXt.so.4
-file path=usr/lib/pkgconfig/xt.pc
-file path=usr/share/man/man3xt/MenuPopdown.3xt
-file path=usr/share/man/man3xt/MenuPopup.3xt
-file path=usr/share/man/man3xt/XtAddActions.3xt
-file path=usr/share/man/man3xt/XtAddCallback.3xt
-file path=usr/share/man/man3xt/XtAddCallbacks.3xt
-file path=usr/share/man/man3xt/XtAddConverter.3xt
-file path=usr/share/man/man3xt/XtAddEventHandler.3xt
-file path=usr/share/man/man3xt/XtAddExposureToRegion.3xt
-file path=usr/share/man/man3xt/XtAddGrab.3xt
-file path=usr/share/man/man3xt/XtAddInput.3xt
-file path=usr/share/man/man3xt/XtAddRawEventHandler.3xt
-file path=usr/share/man/man3xt/XtAddTimeOut.3xt
-file path=usr/share/man/man3xt/XtAddWorkProc.3xt
-file path=usr/share/man/man3xt/XtAllocateGC.3xt
-file path=usr/share/man/man3xt/XtAppAddActionHook.3xt
-file path=usr/share/man/man3xt/XtAppAddActions.3xt
-file path=usr/share/man/man3xt/XtAppAddBlockHook.3xt
-file path=usr/share/man/man3xt/XtAppAddConverter.3xt
-file path=usr/share/man/man3xt/XtAppAddInput.3xt
-file path=usr/share/man/man3xt/XtAppAddSignal.3xt
-file path=usr/share/man/man3xt/XtAppAddTimeOut.3xt
-file path=usr/share/man/man3xt/XtAppAddWorkProc.3xt
-file path=usr/share/man/man3xt/XtAppCreateShell.3xt
-file path=usr/share/man/man3xt/XtAppError.3xt
-file path=usr/share/man/man3xt/XtAppErrorMsg.3xt
-file path=usr/share/man/man3xt/XtAppGetErrorDatabase.3xt
-file path=usr/share/man/man3xt/XtAppGetErrorDatabaseText.3xt
-file path=usr/share/man/man3xt/XtAppGetExitFlag.3xt
-file path=usr/share/man/man3xt/XtAppGetSelectionTimeout.3xt
-file path=usr/share/man/man3xt/XtAppInitialize.3xt
-file path=usr/share/man/man3xt/XtAppLock.3xt
-file path=usr/share/man/man3xt/XtAppMainLoop.3xt
-file path=usr/share/man/man3xt/XtAppNextEvent.3xt
-file path=usr/share/man/man3xt/XtAppPeekEvent.3xt
-file path=usr/share/man/man3xt/XtAppPending.3xt
-file path=usr/share/man/man3xt/XtAppProcessEvent.3xt
-file path=usr/share/man/man3xt/XtAppReleaseCacheRefs.3xt
-file path=usr/share/man/man3xt/XtAppSetErrorHandler.3xt
-file path=usr/share/man/man3xt/XtAppSetErrorMsgHandler.3xt
-file path=usr/share/man/man3xt/XtAppSetExitFlag.3xt
-file path=usr/share/man/man3xt/XtAppSetFallbackResources.3xt
-file path=usr/share/man/man3xt/XtAppSetSelectionTimeout.3xt
-file path=usr/share/man/man3xt/XtAppSetTypeConverter.3xt
-file path=usr/share/man/man3xt/XtAppSetWarningHandler.3xt
-file path=usr/share/man/man3xt/XtAppSetWarningMsgHandler.3xt
-file path=usr/share/man/man3xt/XtAppUnlock.3xt
-file path=usr/share/man/man3xt/XtAppWarning.3xt
-file path=usr/share/man/man3xt/XtAppWarningMsg.3xt
-file path=usr/share/man/man3xt/XtAugmentTranslations.3xt
-file path=usr/share/man/man3xt/XtBuildEventMask.3xt
-file path=usr/share/man/man3xt/XtCallAcceptFocus.3xt
-file path=usr/share/man/man3xt/XtCallActionProc.3xt
-file path=usr/share/man/man3xt/XtCallCallbackList.3xt
-file path=usr/share/man/man3xt/XtCallCallbacks.3xt
-file path=usr/share/man/man3xt/XtCallConverter.3xt
-file path=usr/share/man/man3xt/XtCallbackExclusive.3xt
-file path=usr/share/man/man3xt/XtCallbackNone.3xt
-file path=usr/share/man/man3xt/XtCallbackNonexclusive.3xt
-file path=usr/share/man/man3xt/XtCallbackPopdown.3xt
-file path=usr/share/man/man3xt/XtCalloc.3xt
-file path=usr/share/man/man3xt/XtCancelSelectionRequest.3xt
-file path=usr/share/man/man3xt/XtChangeManagedSet.3xt
-file path=usr/share/man/man3xt/XtCheckSubclass.3xt
-file path=usr/share/man/man3xt/XtClass.3xt
-file path=usr/share/man/man3xt/XtCloseDisplay.3xt
-file path=usr/share/man/man3xt/XtConfigureWidget.3xt
-file path=usr/share/man/man3xt/XtConvert.3xt
-file path=usr/share/man/man3xt/XtConvertAndStore.3xt
-file path=usr/share/man/man3xt/XtConvertCase.3xt
-file path=usr/share/man/man3xt/XtCreateApplicationContext.3xt
-file path=usr/share/man/man3xt/XtCreateApplicationShell.3xt
-file path=usr/share/man/man3xt/XtCreateManagedWidget.3xt
-file path=usr/share/man/man3xt/XtCreatePopupShell.3xt
-file path=usr/share/man/man3xt/XtCreateSelectionRequest.3xt
-file path=usr/share/man/man3xt/XtCreateWidget.3xt
-file path=usr/share/man/man3xt/XtCreateWindow.3xt
-file path=usr/share/man/man3xt/XtDatabase.3xt
-file path=usr/share/man/man3xt/XtDestroyApplicationContext.3xt
-file path=usr/share/man/man3xt/XtDestroyWidget.3xt
-file path=usr/share/man/man3xt/XtDirectConvert.3xt
-file path=usr/share/man/man3xt/XtDisownSelection.3xt
-file path=usr/share/man/man3xt/XtDispatchEvent.3xt
-file path=usr/share/man/man3xt/XtDispatchEventToWidget.3xt
-file path=usr/share/man/man3xt/XtDisplay.3xt
-file path=usr/share/man/man3xt/XtDisplayInitialize.3xt
-file path=usr/share/man/man3xt/XtDisplayOfObject.3xt
-file path=usr/share/man/man3xt/XtDisplayStringConversionWarning.3xt
-file path=usr/share/man/man3xt/XtDisplayToApplicationContext.3xt
-file path=usr/share/man/man3xt/XtError.3xt
-file path=usr/share/man/man3xt/XtErrorMsg.3xt
-file path=usr/share/man/man3xt/XtFindFile.3xt
-file path=usr/share/man/man3xt/XtFree.3xt
-file path=usr/share/man/man3xt/XtGetActionKeysym.3xt
-file path=usr/share/man/man3xt/XtGetActionList.3xt
-file path=usr/share/man/man3xt/XtGetApplicationNameAndClass.3xt
-file path=usr/share/man/man3xt/XtGetApplicationResources.3xt
-file path=usr/share/man/man3xt/XtGetClassExtension.3xt
-file path=usr/share/man/man3xt/XtGetConstraintResourceList.3xt
-file path=usr/share/man/man3xt/XtGetDisplays.3xt
-file path=usr/share/man/man3xt/XtGetErrorDatabase.3xt
-file path=usr/share/man/man3xt/XtGetErrorDatabaseText.3xt
-file path=usr/share/man/man3xt/XtGetGC.3xt
-file path=usr/share/man/man3xt/XtGetKeyboardFocusWidget.3xt
-file path=usr/share/man/man3xt/XtGetKeysymTable.3xt
-file path=usr/share/man/man3xt/XtGetMultiClickTime.3xt
-file path=usr/share/man/man3xt/XtGetResourceList.3xt
-file path=usr/share/man/man3xt/XtGetSelectionParameters.3xt
-file path=usr/share/man/man3xt/XtGetSelectionRequest.3xt
-file path=usr/share/man/man3xt/XtGetSelectionTimeout.3xt
-file path=usr/share/man/man3xt/XtGetSelectionValue.3xt
-file path=usr/share/man/man3xt/XtGetSelectionValueIncremental.3xt
-file path=usr/share/man/man3xt/XtGetSelectionValues.3xt
-file path=usr/share/man/man3xt/XtGetSelectionValuesIncremental.3xt
-file path=usr/share/man/man3xt/XtGetSubresources.3xt
-file path=usr/share/man/man3xt/XtGetSubvalues.3xt
-file path=usr/share/man/man3xt/XtGetValues.3xt
-file path=usr/share/man/man3xt/XtGrabButton.3xt
-file path=usr/share/man/man3xt/XtGrabKey.3xt
-file path=usr/share/man/man3xt/XtGrabKeyboard.3xt
-file path=usr/share/man/man3xt/XtGrabPointer.3xt
-file path=usr/share/man/man3xt/XtHasCallbacks.3xt
-file path=usr/share/man/man3xt/XtHooksOfDisplay.3xt
-file path=usr/share/man/man3xt/XtInitialize.3xt
-file path=usr/share/man/man3xt/XtInitializeWidgetClass.3xt
-file path=usr/share/man/man3xt/XtInsertEventHandler.3xt
-file path=usr/share/man/man3xt/XtInsertEventTypeHandler.3xt
-file path=usr/share/man/man3xt/XtInsertRawEventHandler.3xt
-file path=usr/share/man/man3xt/XtInstallAccelerators.3xt
-file path=usr/share/man/man3xt/XtInstallAllAccelerators.3xt
-file path=usr/share/man/man3xt/XtIsApplicationShell.3xt
-file path=usr/share/man/man3xt/XtIsComposite.3xt
-file path=usr/share/man/man3xt/XtIsConstraint.3xt
-file path=usr/share/man/man3xt/XtIsManaged.3xt
-file path=usr/share/man/man3xt/XtIsObject.3xt
-file path=usr/share/man/man3xt/XtIsOverrideShell.3xt
-file path=usr/share/man/man3xt/XtIsRealized.3xt
-file path=usr/share/man/man3xt/XtIsRectObj.3xt
-file path=usr/share/man/man3xt/XtIsSensitive.3xt
-file path=usr/share/man/man3xt/XtIsSessionShell.3xt
-file path=usr/share/man/man3xt/XtIsShell.3xt
-file path=usr/share/man/man3xt/XtIsSubclass.3xt
-file path=usr/share/man/man3xt/XtIsTopLevelShell.3xt
-file path=usr/share/man/man3xt/XtIsTransientShell.3xt
-file path=usr/share/man/man3xt/XtIsVendorShell.3xt
-file path=usr/share/man/man3xt/XtIsWMShell.3xt
-file path=usr/share/man/man3xt/XtIsWidget.3xt
-file path=usr/share/man/man3xt/XtKeysymToKeycodeList.3xt
-file path=usr/share/man/man3xt/XtLastEventProcessed.3xt
-file path=usr/share/man/man3xt/XtLastTimestampProcessed.3xt
-file path=usr/share/man/man3xt/XtMainLoop.3xt
-file path=usr/share/man/man3xt/XtMakeGeometryRequest.3xt
-file path=usr/share/man/man3xt/XtMakeResizeRequest.3xt
-file path=usr/share/man/man3xt/XtMalloc.3xt
-file path=usr/share/man/man3xt/XtManageChild.3xt
-file path=usr/share/man/man3xt/XtManageChildren.3xt
-file path=usr/share/man/man3xt/XtMapWidget.3xt
-file path=usr/share/man/man3xt/XtMergeArgLists.3xt
-file path=usr/share/man/man3xt/XtMoveWidget.3xt
-file path=usr/share/man/man3xt/XtName.3xt
-file path=usr/share/man/man3xt/XtNameToWidget.3xt
-file path=usr/share/man/man3xt/XtNew.3xt
-file path=usr/share/man/man3xt/XtNewString.3xt
-file path=usr/share/man/man3xt/XtNextEvent.3xt
-file path=usr/share/man/man3xt/XtNoticeSignal.3xt
-file path=usr/share/man/man3xt/XtNumber.3xt
-file path=usr/share/man/man3xt/XtOffset.3xt
-file path=usr/share/man/man3xt/XtOffsetOf.3xt
-file path=usr/share/man/man3xt/XtOpenApplication.3xt
-file path=usr/share/man/man3xt/XtOpenDisplay.3xt
-file path=usr/share/man/man3xt/XtOverrideTranslations.3xt
-file path=usr/share/man/man3xt/XtOwnSelection.3xt
-file path=usr/share/man/man3xt/XtOwnSelectionIncremental.3xt
-file path=usr/share/man/man3xt/XtParent.3xt
-file path=usr/share/man/man3xt/XtParseAcceleratorTable.3xt
-file path=usr/share/man/man3xt/XtParseTranslationTable.3xt
-file path=usr/share/man/man3xt/XtPeekEvent.3xt
-file path=usr/share/man/man3xt/XtPending.3xt
-file path=usr/share/man/man3xt/XtPopdown.3xt
-file path=usr/share/man/man3xt/XtPopup.3xt
-file path=usr/share/man/man3xt/XtPopupSpringLoaded.3xt
-file path=usr/share/man/man3xt/XtProcessEvent.3xt
-file path=usr/share/man/man3xt/XtProcessLock.3xt
-file path=usr/share/man/man3xt/XtProcessUnlock.3xt
-file path=usr/share/man/man3xt/XtQueryGeometry.3xt
-file path=usr/share/man/man3xt/XtRealizeWidget.3xt
-file path=usr/share/man/man3xt/XtRealloc.3xt
-file path=usr/share/man/man3xt/XtRegisterCaseConverter.3xt
-file path=usr/share/man/man3xt/XtRegisterDrawable.3xt
-file path=usr/share/man/man3xt/XtRegisterExtensionSelector.3xt
-file path=usr/share/man/man3xt/XtRegisterGrabAction.3xt
-file path=usr/share/man/man3xt/XtReleaseGC.3xt
-file path=usr/share/man/man3xt/XtReleasePropertyAtom.3xt
-file path=usr/share/man/man3xt/XtRemoveActionHook.3xt
-file path=usr/share/man/man3xt/XtRemoveAllCallbacks.3xt
-file path=usr/share/man/man3xt/XtRemoveBlockHook.3xt
-file path=usr/share/man/man3xt/XtRemoveCallback.3xt
-file path=usr/share/man/man3xt/XtRemoveCallbacks.3xt
-file path=usr/share/man/man3xt/XtRemoveEventHandler.3xt
-file path=usr/share/man/man3xt/XtRemoveEventTypeHandler.3xt
-file path=usr/share/man/man3xt/XtRemoveGrab.3xt
-file path=usr/share/man/man3xt/XtRemoveInput.3xt
-file path=usr/share/man/man3xt/XtRemoveRawEventHandler.3xt
-file path=usr/share/man/man3xt/XtRemoveSignal.3xt
-file path=usr/share/man/man3xt/XtRemoveTimeOut.3xt
-file path=usr/share/man/man3xt/XtRemoveWorkProc.3xt
-file path=usr/share/man/man3xt/XtReservePropertyAtom.3xt
-file path=usr/share/man/man3xt/XtResizeWidget.3xt
-file path=usr/share/man/man3xt/XtResolvePathname.3xt
-file path=usr/share/man/man3xt/XtScreen.3xt
-file path=usr/share/man/man3xt/XtScreenDatabase.3xt
-file path=usr/share/man/man3xt/XtScreenOfObject.3xt
-file path=usr/share/man/man3xt/XtSendSelectionRequest.3xt
-file path=usr/share/man/man3xt/XtSessionGetToken.3xt
-file path=usr/share/man/man3xt/XtSessionReturnToken.3xt
-file path=usr/share/man/man3xt/XtSetArg.3xt
-file path=usr/share/man/man3xt/XtSetErrorHandler.3xt
-file path=usr/share/man/man3xt/XtSetErrorMsgHandler.3xt
-file path=usr/share/man/man3xt/XtSetEventDispatcher.3xt
-file path=usr/share/man/man3xt/XtSetKeyTranslator.3xt
-file path=usr/share/man/man3xt/XtSetKeyboardFocus.3xt
-file path=usr/share/man/man3xt/XtSetLanguageProc.3xt
-file path=usr/share/man/man3xt/XtSetMappedWhenManaged.3xt
-file path=usr/share/man/man3xt/XtSetMultiClickTime.3xt
-file path=usr/share/man/man3xt/XtSetSelectionParameters.3xt
-file path=usr/share/man/man3xt/XtSetSelectionTimeout.3xt
-file path=usr/share/man/man3xt/XtSetSensitive.3xt
-file path=usr/share/man/man3xt/XtSetSubvalues.3xt
-file path=usr/share/man/man3xt/XtSetTypeConverter.3xt
-file path=usr/share/man/man3xt/XtSetValues.3xt
-file path=usr/share/man/man3xt/XtSetWMColormapWindows.3xt
-file path=usr/share/man/man3xt/XtSetWarningHandler.3xt
-file path=usr/share/man/man3xt/XtSetWarningMsgHandler.3xt
-file path=usr/share/man/man3xt/XtStringConversionWarning.3xt
-file path=usr/share/man/man3xt/XtSuperclass.3xt
-file path=usr/share/man/man3xt/XtToolkitInitialize.3xt
-file path=usr/share/man/man3xt/XtToolkitThreadInitialize.3xt
-file path=usr/share/man/man3xt/XtTranslateCoords.3xt
-file path=usr/share/man/man3xt/XtTranslateKeycode.3xt
-file path=usr/share/man/man3xt/XtUngrabButton.3xt
-file path=usr/share/man/man3xt/XtUngrabKey.3xt
-file path=usr/share/man/man3xt/XtUngrabKeyboard.3xt
-file path=usr/share/man/man3xt/XtUngrabPointer.3xt
-file path=usr/share/man/man3xt/XtUninstallTranslations.3xt
-file path=usr/share/man/man3xt/XtUnmanageChild.3xt
-file path=usr/share/man/man3xt/XtUnmanageChildren.3xt
-file path=usr/share/man/man3xt/XtUnmapWidget.3xt
-file path=usr/share/man/man3xt/XtUnrealizeWidget.3xt
-file path=usr/share/man/man3xt/XtUnregisterDrawable.3xt
-file path=usr/share/man/man3xt/XtVaAppCreateShell.3xt
-file path=usr/share/man/man3xt/XtVaAppInitialize.3xt
-file path=usr/share/man/man3xt/XtVaCreateArgsList.3xt
-file path=usr/share/man/man3xt/XtVaCreateManagedWidget.3xt
-file path=usr/share/man/man3xt/XtVaCreatePopupShell.3xt
-file path=usr/share/man/man3xt/XtVaCreateWidget.3xt
-file path=usr/share/man/man3xt/XtVaGetApplicationResources.3xt
-file path=usr/share/man/man3xt/XtVaGetSubresources.3xt
-file path=usr/share/man/man3xt/XtVaGetSubvalues.3xt
-file path=usr/share/man/man3xt/XtVaGetValues.3xt
-file path=usr/share/man/man3xt/XtVaOpenApplication.3xt
-file path=usr/share/man/man3xt/XtVaSetSubvalues.3xt
-file path=usr/share/man/man3xt/XtVaSetValues.3xt
-file path=usr/share/man/man3xt/XtWarning.3xt
-file path=usr/share/man/man3xt/XtWarningMsg.3xt
-file path=usr/share/man/man3xt/XtWidgetToApplicationContext.3xt
-file path=usr/share/man/man3xt/XtWindow.3xt
-file path=usr/share/man/man3xt/XtWindowOfObject.3xt
-file path=usr/share/man/man3xt/XtWindowToWidget.3xt
-link path=usr/X11/lib/$(ARCH64)/libXt.so \
-    target=../../../lib/$(ARCH64)/libXt.so
-link path=usr/X11/lib/$(ARCH64)/libXt.so.4 \
-    target=../../../lib/$(ARCH64)/libXt.so.4
-link path=usr/X11/lib/$(ARCH64)/libXt.so.5 \
-    target=../../../lib/$(ARCH64)/libXt.so.5
-link path=usr/X11/lib/libXt.so target=../../lib/libXt.so
-link path=usr/X11/lib/libXt.so.4 target=../../lib/libXt.so.4
-link path=usr/X11/lib/libXt.so.5 target=../../lib/libXt.so.5
-link path=usr/lib/$(ARCH64)/libXt.so target=libXt.so.4
-link path=usr/lib/$(ARCH64)/libXt.so.5 target=libXt.so.4
-link path=usr/lib/libXt.so target=libXt.so.4
-# Additional link required by SVID ABI (see PSARC/1997/141)
-link path=usr/lib/libXt.so.5 target=libXt.so.4
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-transset.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,32 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/transset@__version:transset__
+set name=pkg.description \
+    value="transset is a simple program for use with X sessions utilizing a compositing manager such as xcompmgr or compiz.  It lets the user set the transparency on a window."
+set name=pkg.summary value="transset - Set transparency on a window"
+dir path=usr
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/transset
+file path=usr/share/man/man1/transset.1
--- a/pkg/manifests/x11-utility-colormap-utilities.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/colormap-utilities@$(X11PKGVERS)
-set name=pkg.description \
-    value="Utilties for viewing and manipulating entries in X colormaps, especially those associated with low bit-depth visuals."
-set name=pkg.summary value="X Colormap Utilities"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/cmap_alloc
-file path=usr/bin/cmap_compact
-file path=usr/bin/xcolor
-file path=usr/bin/xstdcmap
-file path=usr/share/man/man1/cmap_alloc.1
-file path=usr/share/man/man1/cmap_compact.1
-file path=usr/share/man/man1/xcolor.1
-file path=usr/share/man/man1/xstdcmap.1
-link path=usr/X11/bin/cmap_alloc target=../../bin/cmap_alloc
-link path=usr/X11/bin/cmap_compact target=../../bin/cmap_compact
-link path=usr/X11/bin/xcolor target=../../bin/xcolor
-link path=usr/X11/bin/xstdcmap target=../../bin/xstdcmap
--- a/pkg/manifests/x11-utility-transset.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/transset@__version:transset__
-set name=pkg.description \
-    value="transset is a simple program for use with X sessions utilizing a compositing manager such as xcompmgr or compiz.  It lets the user set the transparency on a window."
-set name=pkg.summary value="transset - Set transparency on a window"
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/transset
-file path=usr/share/man/man1/transset.1
--- a/pkg/manifests/x11-utility-x11-server-utilities.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/x11-server-utilities@$(X11PKGVERS)
-set name=pkg.description \
-    value="A collection of common utilities for manipulating the state of an X server in a running X session."
-set name=pkg.summary value="X11 server state utilities"
-dir path=etc
-dir path=etc/xdg
-dir path=etc/xdg/autostart
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/X11
-dir path=usr/share
-dir path=usr/share/locale
-dir path=usr/share/locale/C
-dir path=usr/share/locale/C/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=etc/xdg/autostart/gnome-dispswitch.desktop
-file path=usr/bin/dispswitch
-file path=usr/bin/rgb
-file path=usr/bin/showrgb
-file path=usr/bin/xcmsdb
-file path=usr/bin/xgamma
-file path=usr/bin/xhost
-file path=usr/bin/xinput
-file path=usr/bin/xmakemap
-file path=usr/bin/xmodmap
-file path=usr/bin/xprop
-file path=usr/bin/xrandr
-file path=usr/bin/xrdb
-file path=usr/bin/xrefresh
-file path=usr/bin/xset
-file path=usr/bin/xsetroot
-file path=usr/lib/X11/rgb.dir
-file path=usr/lib/X11/rgb.pag
-file path=usr/lib/X11/rgb.txt
-file path=usr/share/locale/C/LC_MESSAGES/xhost.po
-file path=usr/share/man/man1/dispswitch.1
-file path=usr/share/man/man1/rgb.1
-file path=usr/share/man/man1/showrgb.1
-file path=usr/share/man/man1/xcmsdb.1
-file path=usr/share/man/man1/xgamma.1
-file path=usr/share/man/man1/xhost.1
-file path=usr/share/man/man1/xinput.1
-file path=usr/share/man/man1/xmakemap.1
-file path=usr/share/man/man1/xmodmap.1
-file path=usr/share/man/man1/xprop.1
-file path=usr/share/man/man1/xrandr.1
-file path=usr/share/man/man1/xrdb.1
-file path=usr/share/man/man1/xrefresh.1
-file path=usr/share/man/man1/xset.1
-file path=usr/share/man/man1/xsetroot.1
-link path=usr/X11/bin/dispswitch target=../../bin/dispswitch
-link path=usr/X11/bin/rgb target=../../bin/rgb
-link path=usr/X11/bin/showrgb target=../../bin/showrgb
-link path=usr/X11/bin/xcmsdb target=../../bin/xcmsdb
-link path=usr/X11/bin/xgamma target=../../bin/xgamma
-link path=usr/X11/bin/xhost target=../../bin/xhost
-link path=usr/X11/bin/xinput target=../../bin/xinput
-link path=usr/X11/bin/xmakemap target=../../bin/xmakemap
-link path=usr/X11/bin/xmodmap target=../../bin/xmodmap
-link path=usr/X11/bin/xprop target=../../bin/xprop
-link path=usr/X11/bin/xrandr target=../../bin/xrandr
-link path=usr/X11/bin/xrdb target=../../bin/xrdb
-link path=usr/X11/bin/xrefresh target=../../bin/xrefresh
-link path=usr/X11/bin/xset target=../../bin/xset
-link path=usr/X11/bin/xsetroot target=../../bin/xsetroot
-# xrdb requires cpp
-depend fmri=pkg:/developer/macro/cpp type=require
--- a/pkg/manifests/x11-utility-x11-window-dump.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/x11-window-dump@__version:xwd__
-set name=pkg.description \
-    value="A collection of utilities to dump an image of a window on screen to a XWD format image file, and to view or print such files."
-set name=pkg.summary value="X11 Window Dump (screenshot) utilities"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xdpr
-file path=usr/bin/xpr
-file path=usr/bin/xwd
-file path=usr/bin/xwud
-file path=usr/share/man/man1/xdpr.1
-file path=usr/share/man/man1/xpr.1
-file path=usr/share/man/man1/xwd.1
-file path=usr/share/man/man1/xwud.1
-link path=usr/X11/bin/xdpr target=../../bin/xdpr
-link path=usr/X11/bin/xpr target=../../bin/xpr
-link path=usr/X11/bin/xwd target=../../bin/xwd
-link path=usr/X11/bin/xwud target=../../bin/xwud
--- a/pkg/manifests/x11-utility-xconsole.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/xconsole@__version:xconsole__
-set name=pkg.description \
-    value="The xconsole program displays in a X window the messages which are usually sent to /dev/console."
-set name=pkg.summary value="xconsole - monitor system console messages with X"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xconsole
-file path=usr/share/X11/app-defaults/XConsole
-file path=usr/share/man/man1/xconsole.1
-link path=usr/X11/bin/xconsole target=../../bin/xconsole
--- a/pkg/manifests/x11-utility-xfd.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/xfd@__version:xfd__
-set name=pkg.description \
-    value="The xfd utility creates a window containing the name of the font being displayed, a row of command buttons, several lines of text for displaying character metrics, and a grid containing one glyph per cell."
-set name=pkg.summary value="xfd - display all the characters in an X font"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/locale
-dir path=usr/share/locale/C
-dir path=usr/share/locale/C/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xfd
-file path=usr/share/X11/app-defaults/Xfd
-file path=usr/share/locale/C/LC_MESSAGES/xfd.po
-file path=usr/share/man/man1/xfd.1
-link path=usr/X11/bin/xfd target=../../bin/xfd
--- a/pkg/manifests/x11-utility-xfontsel.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/xfontsel@__version:xfontsel__
-set name=pkg.description \
-    value="The xfontsel application provides a simple way to display the fonts known to your X server, examine samples of each, and retrieve the X Logical Font Description (XLFD) full name for a font."
-set name=pkg.summary \
-    value="xfontsel - point and click selection of X11 font names"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/locale
-dir path=usr/share/locale/C
-dir path=usr/share/locale/C/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xfontsel
-file path=usr/share/X11/app-defaults/XFontSel
-file path=usr/share/locale/C/LC_MESSAGES/xfontsel.po
-file path=usr/share/man/man1/xfontsel.1
-link path=usr/X11/bin/xfontsel target=../../bin/xfontsel
--- a/pkg/manifests/x11-utility-xkill.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/xkill@__version:xkill__
-set name=pkg.description \
-    value="xkill is a utility for forcing the X server to close connections to clients.  This program is very dangerous, but is useful for aborting programs that have displayed undesired windows on a user's screen."
-set name=pkg.summary value="xkill - utility to forcibly close X11 clients"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xkill
-file path=usr/share/man/man1/xkill.1
-link path=usr/X11/bin/xkill target=../../bin/xkill
--- a/pkg/manifests/x11-utility-xlock.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/xlock@$(OSPKGVERS)
-set name=pkg.description \
-    value="xlock locks the X server till the user enters their password at the keyboard. While xlock is running, all new server connections are refused, the screen is blanked and a changing pattern is put on the screen."
-set name=pkg.summary value="xlock - X display screen lock"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/man
-dir path=usr/share/man/man1
-# Must be setuid root to authenticate local users with passwds in /etc/shadow
-file path=usr/bin/xlock mode=4555 owner=root
-file path=usr/share/X11/app-defaults/XLock
-file path=usr/share/man/man1/xlock.1
-link path=usr/X11/bin/xlock target=../../bin/xlock
-# XLock app-defaults specifies font:
-# -b&h-lucida-medium-r-normal-sans-24-*-*-*-*-*-iso8859-1
-depend fmri=pkg:/system/font/xorg/iso8859-1 type=require
--- a/pkg/manifests/x11-utility-xmag.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/xmag@__version:xmag__
-set name=pkg.description \
-    value="The xmag program allows you to capture a static image of a portion of an X screen, and display it magnified."
-set name=pkg.summary value="xmag - magnify parts of the screen"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xmag
-file path=usr/bin/xmag_multivis
-file path=usr/share/X11/app-defaults/Xmag
-file path=usr/share/man/man1/xmag.1
-file path=usr/share/man/man1/xmag_multivis.1
-link path=usr/X11/bin/xmag target=../../bin/xmag
-link path=usr/X11/bin/xmag_multivis target=../../bin/xmag_multivis
-# Xmag app-defaults specifies font: 8x13bold
-depend fmri=pkg:/system/font/xorg/iso8859-1 type=require
--- a/pkg/manifests/x11-utility-xman.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/xman@__version:xman__
-set name=pkg.description \
-    value="xman is a graphical manual page browser using the Athena Widgets (Xaw) toolkit."
-set name=pkg.summary value="xman - graphical manual page display program"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/locale
-dir path=usr/share/locale/C
-dir path=usr/share/locale/C/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xman
-file path=usr/share/X11/app-defaults/Xman
-file path=usr/share/X11/xman.help
-file path=usr/share/locale/C/LC_MESSAGES/xman.po
-file path=usr/share/man/man1/xman.1
-link path=usr/X11/bin/xman target=../../bin/xman
-# Xman app-defaults uses fonts including courier, symbol, helvetica, lucida
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
--- a/pkg/manifests/x11-utility-xvidtune.mf	Sun Jul 04 22:48:04 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-set name=pkg.fmri value=pkg:/x11/utility/xvidtune@__version:xvidtune__
-set name=pkg.description \
-    value="Xvidtune is a client interface to the X server video mode extension (XFree86-VidModeExtension), allowing a user to interactively adjust existing video modes."
-set name=pkg.summary value="xvidtune - video mode tuner for Xorg servers"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xvidtune
-file path=usr/share/X11/app-defaults/Xvidtune
-file path=usr/share/man/man1/xvidtune.1
-link path=usr/X11/bin/xvidtune target=../../bin/xvidtune
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-x11-server-utilities.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,92 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/x11-server-utilities@$(X11PKGVERS)
+set name=pkg.description \
+    value="A collection of common utilities for manipulating the state of an X server in a running X session."
+set name=pkg.summary value="X11 server state utilities"
+dir path=etc
+dir path=etc/xdg
+dir path=etc/xdg/autostart
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/lib
+dir path=usr/lib/X11
+dir path=usr/share
+dir path=usr/share/locale
+dir path=usr/share/locale/C
+dir path=usr/share/locale/C/LC_MESSAGES
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=etc/xdg/autostart/gnome-dispswitch.desktop
+file path=usr/bin/dispswitch
+file path=usr/bin/rgb
+file path=usr/bin/showrgb
+file path=usr/bin/xcmsdb
+file path=usr/bin/xgamma
+file path=usr/bin/xhost
+file path=usr/bin/xinput
+file path=usr/bin/xmakemap
+file path=usr/bin/xmodmap
+file path=usr/bin/xprop
+file path=usr/bin/xrandr
+file path=usr/bin/xrdb
+file path=usr/bin/xrefresh
+file path=usr/bin/xset
+file path=usr/bin/xsetroot
+file path=usr/lib/X11/rgb.dir
+file path=usr/lib/X11/rgb.pag
+file path=usr/lib/X11/rgb.txt
+file path=usr/share/locale/C/LC_MESSAGES/xhost.po
+file path=usr/share/man/man1/dispswitch.1
+file path=usr/share/man/man1/rgb.1
+file path=usr/share/man/man1/showrgb.1
+file path=usr/share/man/man1/xcmsdb.1
+file path=usr/share/man/man1/xgamma.1
+file path=usr/share/man/man1/xhost.1
+file path=usr/share/man/man1/xinput.1
+file path=usr/share/man/man1/xmakemap.1
+file path=usr/share/man/man1/xmodmap.1
+file path=usr/share/man/man1/xprop.1
+file path=usr/share/man/man1/xrandr.1
+file path=usr/share/man/man1/xrdb.1
+file path=usr/share/man/man1/xrefresh.1
+file path=usr/share/man/man1/xset.1
+file path=usr/share/man/man1/xsetroot.1
+link path=usr/X11/bin/dispswitch target=../../bin/dispswitch
+link path=usr/X11/bin/rgb target=../../bin/rgb
+link path=usr/X11/bin/showrgb target=../../bin/showrgb
+link path=usr/X11/bin/xcmsdb target=../../bin/xcmsdb
+link path=usr/X11/bin/xgamma target=../../bin/xgamma
+link path=usr/X11/bin/xhost target=../../bin/xhost
+link path=usr/X11/bin/xinput target=../../bin/xinput
+link path=usr/X11/bin/xmakemap target=../../bin/xmakemap
+link path=usr/X11/bin/xmodmap target=../../bin/xmodmap
+link path=usr/X11/bin/xprop target=../../bin/xprop
+link path=usr/X11/bin/xrandr target=../../bin/xrandr
+link path=usr/X11/bin/xrdb target=../../bin/xrdb
+link path=usr/X11/bin/xrefresh target=../../bin/xrefresh
+link path=usr/X11/bin/xset target=../../bin/xset
+link path=usr/X11/bin/xsetroot target=../../bin/xsetroot
+# xrdb requires cpp
+depend fmri=pkg:/developer/macro/cpp type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-x11-window-dump.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,44 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/x11-window-dump@__version:xwd__
+set name=pkg.description \
+    value="A collection of utilities to dump an image of a window on screen to a XWD format image file, and to view or print such files."
+set name=pkg.summary value="X11 Window Dump (screenshot) utilities"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xdpr
+file path=usr/bin/xpr
+file path=usr/bin/xwd
+file path=usr/bin/xwud
+file path=usr/share/man/man1/xdpr.1
+file path=usr/share/man/man1/xpr.1
+file path=usr/share/man/man1/xwd.1
+file path=usr/share/man/man1/xwud.1
+link path=usr/X11/bin/xdpr target=../../bin/xdpr
+link path=usr/X11/bin/xpr target=../../bin/xpr
+link path=usr/X11/bin/xwd target=../../bin/xwd
+link path=usr/X11/bin/xwud target=../../bin/xwud
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xbiff.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,37 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xbiff@__version:xbiff__
+set name=pkg.description \
+    value="xbiff displays whether a local mailbox has new mail."
+set name=pkg.summary value="xbiff - mailbox flag for X"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xbiff
+file path=usr/share/man/man1/xbiff.1
+link path=usr/X11/bin/xbiff target=../../bin/xbiff
+# xbiff loads the "flagup" and "flagdown" bitmaps from xbitmaps
+depend fmri=pkg:/x11/data/xbitmaps type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xcalc.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,41 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xcalc@__version:xcalc__
+set name=pkg.description \
+    value="xcalc is a scientific calculator desktop accessory that can emulate a TI-30 or an HP-10C."
+set name=pkg.summary value="xcalc - scientific calculator for X"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xcalc
+file path=usr/share/X11/app-defaults/XCalc
+file path=usr/share/X11/app-defaults/XCalc-color
+file path=usr/share/man/man1/xcalc.1
+link path=usr/X11/bin/xcalc target=../../bin/xcalc
+# XCalc app-defaults specifies -adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-* font
+depend fmri=pkg:/system/font/xorg/xorg-core type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xclipboard.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,44 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xclipboard@__version:xclipboard__
+set name=pkg.description \
+    value="xclipboard is used to collect and display text selections that are sent to the CLIPBOARD by other clients.  It is typically used to save CLIPBOARD selections for later use.  It stores each CLIPBOARD selection as a separate string, each of which can be selected.  The xcutsel program is used to copy the current selection into a cut buffer and to make a selection that contains the current contents of the cut buffer.  It acts as a bridge between applications that don't support selections and those that do."
+set name=pkg.summary \
+    value="xclipboard & xcutsel tools for clipboard management"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xclipboard
+file path=usr/bin/xcutsel
+file path=usr/share/X11/app-defaults/XClipboard
+file path=usr/share/man/man1/xclipboard.1
+file path=usr/share/man/man1/xcutsel.1
+link path=usr/X11/bin/xclipboard target=../../bin/xclipboard
+link path=usr/X11/bin/xcutsel target=../../bin/xcutsel
+# XClipboard app-defaults specifies helvetica & courier fonts
+depend fmri=pkg:/system/font/xorg/xorg-core type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xclock.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,39 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xclock@__version:xclock__
+set name=pkg.description \
+    value="xclock is the classic X Window System clock utility.  It displays the time in analog or digital form, continuously updated at a frequency which may be specified by the user."
+set name=pkg.summary value="xclock - analog / digital clock for X"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xclock
+file path=usr/share/X11/app-defaults/XClock
+file path=usr/share/X11/app-defaults/XClock-color
+file path=usr/share/man/man1/xclock.1
+link path=usr/X11/bin/xclock target=../../bin/xclock
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xconsole.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,38 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xconsole@__version:xconsole__
+set name=pkg.description \
+    value="The xconsole program displays in a X window the messages which are usually sent to /dev/console."
+set name=pkg.summary value="xconsole - monitor system console messages with X"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xconsole
+file path=usr/share/X11/app-defaults/XConsole
+file path=usr/share/man/man1/xconsole.1
+link path=usr/X11/bin/xconsole target=../../bin/xconsole
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xfd.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,42 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xfd@__version:xfd__
+set name=pkg.description \
+    value="The xfd utility creates a window containing the name of the font being displayed, a row of command buttons, several lines of text for displaying character metrics, and a grid containing one glyph per cell."
+set name=pkg.summary value="xfd - display all the characters in an X font"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/locale
+dir path=usr/share/locale/C
+dir path=usr/share/locale/C/LC_MESSAGES
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xfd
+file path=usr/share/X11/app-defaults/Xfd
+file path=usr/share/locale/C/LC_MESSAGES/xfd.po
+file path=usr/share/man/man1/xfd.1
+link path=usr/X11/bin/xfd target=../../bin/xfd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xfontsel.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,43 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xfontsel@__version:xfontsel__
+set name=pkg.description \
+    value="The xfontsel application provides a simple way to display the fonts known to your X server, examine samples of each, and retrieve the X Logical Font Description (XLFD) full name for a font."
+set name=pkg.summary \
+    value="xfontsel - point and click selection of X11 font names"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/locale
+dir path=usr/share/locale/C
+dir path=usr/share/locale/C/LC_MESSAGES
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xfontsel
+file path=usr/share/X11/app-defaults/XFontSel
+file path=usr/share/locale/C/LC_MESSAGES/xfontsel.po
+file path=usr/share/man/man1/xfontsel.1
+link path=usr/X11/bin/xfontsel target=../../bin/xfontsel
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xkill.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,35 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xkill@__version:xkill__
+set name=pkg.description \
+    value="xkill is a utility for forcing the X server to close connections to clients.  This program is very dangerous, but is useful for aborting programs that have displayed undesired windows on a user's screen."
+set name=pkg.summary value="xkill - utility to forcibly close X11 clients"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xkill
+file path=usr/share/man/man1/xkill.1
+link path=usr/X11/bin/xkill target=../../bin/xkill
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xlock.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,42 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xlock@$(OSPKGVERS)
+set name=pkg.description \
+    value="xlock locks the X server till the user enters their password at the keyboard. While xlock is running, all new server connections are refused, the screen is blanked and a changing pattern is put on the screen."
+set name=pkg.summary value="xlock - X display screen lock"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man
+dir path=usr/share/man/man1
+# Must be setuid root to authenticate local users with passwds in /etc/shadow
+file path=usr/bin/xlock mode=4555 owner=root
+file path=usr/share/X11/app-defaults/XLock
+file path=usr/share/man/man1/xlock.1
+link path=usr/X11/bin/xlock target=../../bin/xlock
+# XLock app-defaults specifies font:
+# -b&h-lucida-medium-r-normal-sans-24-*-*-*-*-*-iso8859-1
+depend fmri=pkg:/system/font/xorg/iso8859-1 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xmag.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,43 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xmag@__version:xmag__
+set name=pkg.description \
+    value="The xmag program allows you to capture a static image of a portion of an X screen, and display it magnified."
+set name=pkg.summary value="xmag - magnify parts of the screen"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xmag
+file path=usr/bin/xmag_multivis
+file path=usr/share/X11/app-defaults/Xmag
+file path=usr/share/man/man1/xmag.1
+file path=usr/share/man/man1/xmag_multivis.1
+link path=usr/X11/bin/xmag target=../../bin/xmag
+link path=usr/X11/bin/xmag_multivis target=../../bin/xmag_multivis
+# Xmag app-defaults specifies font: 8x13bold
+depend fmri=pkg:/system/font/xorg/iso8859-1 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xman.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,45 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xman@__version:xman__
+set name=pkg.description \
+    value="xman is a graphical manual page browser using the Athena Widgets (Xaw) toolkit."
+set name=pkg.summary value="xman - graphical manual page display program"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/locale
+dir path=usr/share/locale/C
+dir path=usr/share/locale/C/LC_MESSAGES
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xman
+file path=usr/share/X11/app-defaults/Xman
+file path=usr/share/X11/xman.help
+file path=usr/share/locale/C/LC_MESSAGES/xman.po
+file path=usr/share/man/man1/xman.1
+link path=usr/X11/bin/xman target=../../bin/xman
+# Xman app-defaults uses fonts including courier, symbol, helvetica, lucida
+depend fmri=pkg:/system/font/xorg/xorg-core type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xt-resource-utilities.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,54 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri \
+    value=pkg:/x11/xt-resource-utilities@$(X11PKGVERS)
+set name=pkg.description \
+    value="Utilties to view and edit the configuration resources used by applications based on toolkits such as Athena Widgets (Xaw) and Motif (Xm) that utilize the X Toolkit Intrinsics (libXt)."
+set name=pkg.summary value="X Toolkit Resource utilities"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/appres
+file path=usr/bin/editres
+file path=usr/bin/listres
+file path=usr/bin/viewres
+file path=usr/share/X11/app-defaults/Editres
+file path=usr/share/X11/app-defaults/Editres-color
+file path=usr/share/X11/app-defaults/Viewres
+file path=usr/share/X11/app-defaults/Viewres-color
+file path=usr/share/man/man1/appres.1
+file path=usr/share/man/man1/editres.1
+file path=usr/share/man/man1/listres.1
+file path=usr/share/man/man1/viewres.1
+link path=usr/X11/bin/appres target=../../bin/appres
+link path=usr/X11/bin/editres target=../../bin/editres
+link path=usr/X11/bin/listres target=../../bin/listres
+link path=usr/X11/bin/viewres target=../../bin/viewres
+# Editres app-defaults specifies -*-new century schoolbook-...-*-* font
+# Viewres app-defaults specifies -adobe-helvetica-....-iso*-* font
+depend fmri=pkg:/system/font/xorg/xorg-core type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-xvidtune.mf	Tue Jul 06 22:53:47 2010 -0700
@@ -0,0 +1,38 @@
+# Copyright (c) 2010, Oracle and/or its affiliates. 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, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri value=pkg:/x11/xvidtune@__version:xvidtune__
+set name=pkg.description \
+    value="Xvidtune is a client interface to the X server video mode extension (XFree86-VidModeExtension), allowing a user to interactively adjust existing video modes."
+set name=pkg.summary value="xvidtune - video mode tuner for Xorg servers"
+dir path=usr
+dir path=usr/X11
+dir path=usr/X11/bin
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/X11
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/xvidtune
+file path=usr/share/X11/app-defaults/Xvidtune
+file path=usr/share/man/man1/xvidtune.1
+link path=usr/X11/bin/xvidtune target=../../bin/xvidtune