--- a/open-src/common/Makefile.inc	Fri Jul 22 16:05:14 2011 -0700
+++ b/open-src/common/Makefile.inc	Thu Jul 28 15:21:03 2011 -0700
@@ -686,6 +686,7 @@
 $(MANIFEST_TMP): $(MANIFEST_DEST) $(PKGFMT)
 	$(PERL) $(TOP)/open-src/common/pkg-manifest-generate.pl \
 		input_manifest='$(MODULE_PKG_MANIFEST)' \
+		exception_manifest='$(PKG_SRC_DIR)/exceptions-validate_pkg.p5m' \
 		manifest_license='$(PKG_LICENSE_DIR)/cr_Oracle' \
 		manifest_license='$(PKG_LICENSE_DIR)/lic_X11' \
 		pkg_name='$(MODULE_PKGNAME)' \

--- a/open-src/common/pkg-manifest-generate.pl	Fri Jul 22 16:05:14 2011 -0700
+++ b/open-src/common/pkg-manifest-generate.pl	Thu Jul 28 15:21:03 2011 -0700
@@ -66,34 +66,60 @@
 my %actions_seen = ();
 my @manifest_header;
 
+sub next_action_seen {
+    my ($FH) = @_;
+    my $action = "";
+
+    while (my $l = <$FH>) {
+      chomp($l);
+      if ($l =~ m{^(.*)\\$}) {  # Line continues
+	$action .= $1 . " ";
+      } else {
+	$action .= $l;
+
+	$action =~ s{\s+}{ }g;
+
+	next if $action =~ m{^\s*$};
+
+	if ($action =~ m{ path=(\S+)}) {
+	  $actions_seen{$1} = $action;
+	} else {
+	  $actions_seen{$action} = $action;
+	}
+
+	return $action;
+      }
+    }
+
+    return undef;
+}
+
 # Check if there is an existing manifest to merge with
 if (exists $options{'input_manifest'}) {
   foreach my $mf (@{$options{'input_manifest'}}) {
     next if (! -f $mf);
     open my $INPUT_MF, '<', $mf or die "Cannot open input_manifest $mf: $!\n";
     my $action = "";
-    while (my $im = <$INPUT_MF>) {
-      chomp($im);
-      if ($im =~ m{^(.*)\\$}) {  # Line continues
-	$action .= $1 . " ";
-      } else {
-	$action .= $im;
+    while (my $action = next_action_seen($INPUT_MF)) {
 	push @manifest_header, $action;
-
-	$action =~ s{\s+}{ }g;
-	if ($action =~ m{ path=(\S+)}) {
-	  $actions_seen{$1} = $action;
-	} else {
-	  $actions_seen{$action} = $action;
-	}
-
-	$action = "";
-      }
     }
     close $INPUT_MF;
   }
 }
 
+# Manifest listing entries not to include in manifest
+if (exists $options{'exception_manifest'}) {
+  foreach my $mf (@{$options{'exception_manifest'}}) {
+    next if (! -f $mf);
+    open my $EXCEPT_MF, '<', $mf or 
+	die "Cannot open exception_manifest $mf: $!\n";
+    while (my $action = next_action_seen($EXCEPT_MF)) {
+	# Just adding it to action_seen, nothing more to do 
+    }
+    close $EXCEPT_MF;
+  }
+}
+
 # Generate a manifest header if not merging into an existing file
 if (!@manifest_header) {
 

--- a/pkg/Makefile	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/Makefile	Thu Jul 28 15:21:03 2011 -0700
@@ -109,6 +109,9 @@
 SYNTH_PKGS= X-incorporation X-all
 SYNTH_MANIFESTS = $(SYNTH_PKGS:%=%.p5m)
 
+# Special manifest for exceptions to pass to pkglint & validate_pkg
+EXCEPTION_MANIFESTS = exceptions-validate_pkg.p5m
+
 # Manifests are in either manifests or legacy directory - merge in $(PDIR)
 $(PDIR)/%.p5m: manifests/%.p5m
 	$(PKGDEBUG)$(LN) -s ../$< $@
@@ -120,12 +123,12 @@
 	$(PKGDEBUG)$(LN) -s ../$< $@
 
 PMANIFESTS = $(MANIFESTS:%=$(PDIR)/%)
-manifests: $(PMANIFESTS)
-$(PMANIFESTS): $(PDIR)
+SMANIFESTS = $(SYNTH_MANIFESTS:%=$(PDIR)/%)
+EMANIFESTS = $(EXCEPTION_MANIFESTS:%=$(PDIR)/%)
 
-SMANIFESTS = $(SYNTH_MANIFESTS:%=$(PDIR)/%)
-manifests: $(SMANIFESTS)
-$(SMANIFESTS): $(PDIR)
+ALL_MANIFESTS = $(PMANIFESTS) $(SMANIFESTS) $(EMANIFESTS)
+manifests: $(ALL_MANIFESTS)
+$(ALL_MANIFESTS): $(PDIR)
 
 ### Additional metadata generation
 
@@ -202,6 +205,7 @@
 PROC_CURRENT_PKGS = $(CURRENT_MANIFESTS:%.p5m=$(PDIR)/%.mog)
 PROC_LEGACY_PKGS = $(LEGACY_MANIFESTS:%.p5m=$(PDIR)/%.mog)
 PROC_SYNTH_PKGS = $(SYNTH_MANIFESTS:%.p5m=$(PDIR)/%.mog)
+PROC_EXCEPTIONS = $(EXCEPTION_MANIFESTS:%.p5m=$(PDIR)/%.mog)
 
 # Default transformations to apply
 PM_TRANSFORMS = $(PKG_BRANDING_TRANSFORMS) \
@@ -210,9 +214,10 @@
 PM_INC = transforms
 
 # Additional transforms for specific types of packages
-$(PROC_CURRENT_PKGS) $(PROC_SYNTH_PKGS) := EXTRA_TRANSFORMS = defaults
+$(PROC_CURRENT_PKGS) $(PROC_SYNTH_PKGS) $(PROC_EXCEPTIONS) := \
+	EXTRA_TRANSFORMS = defaults
 
-mogrify: $(PROC_PKGS)
+mogrify: $(PROC_PKGS) $(PROC_EXCEPTIONS)
 $(PROC_PKGS) $(PROC_SYNTH_PKGS): $(PDIR)/versions
 
 # Combine & uniq metadata & license attributes generated during build
@@ -353,7 +358,7 @@
 		fi; \
 	done; \
 	if [[ -n "$${CHECK_PKGS}" ]]; then \
-		$(PKGLINT) -f $(PKGLINTRC) $${CHECK_PKGS} \
+		$(PKGLINT) -f $(PKGLINTRC) $${CHECK_PKGS} $(PROC_EXCEPTIONS) \
 		    2> $(PDIR)/pkglint-output.txt; \
 	fi ; \
 	if grep '^ERROR' $(PDIR)/pkglint-output.txt; then \
@@ -443,11 +448,7 @@
 $(PDIR)/generated-exceptions:
 	$(PKGDEBUG)(cd $(PKGROOT) ; find . -name '*-uninstalled.pc') > $@
 
-# Handle exceptions list exceptions-validate_pkg.p5m
-EXCEPTIONS_MOG = $(PDIR)/exceptions-validate_pkg.mog
-$(EXCEPTIONS_MOG):= EXTRA_TRANSFORMS = defaults
-
-protocmp: $(PROC_PKGS) $(EXCEPTIONS) $(EXCEPTIONS_MOG) fix_perms
+protocmp: $(PROC_PKGS) $(EXCEPTIONS) $(PROC_EXCEPTIONS) fix_perms
 	$(PKGDEBUG)validate_pkg -a $(PKGMACH) -v $(EXCEPTIONS:%=-e %) \
 		-m $(PDIR) -p $(PKGROOT)
 

--- a/pkg/exceptions-validate_pkg.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/exceptions-validate_pkg.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,16 +23,74 @@
 
 # This manifest exists solely to provide a list of directories that
 # validate_pkg can match against, since the actions that define them
-# are provided in other consolidations.
+# are provided in other consolidations.   We don't need to deliver
+# dir actions in the X packages for every directory we deliver files into.
+# For those directories already defined in packages we depend on, we can
+# just rely on them providing an appropriate definition and not worry about
+# ensuring we specify the same owner/permissions in our packages.
 #
 # These can't be included in exception_lists/packaging since that causes
 # all files under these directories to be flagged as errors for being
 # included in packages.
 
+dir path=etc
+dir path=etc/hal
+dir path=etc/hal/fdi
+dir path=etc/hal/fdi/policy
+dir path=etc/hal/fdi/policy/10osvendor
+dir path=etc/hal/fdi/preprobe
+dir path=etc/hal/fdi/preprobe/10osvendor
+dir path=etc/security
+dir path=etc/security/auth_attr.d
+dir path=etc/security/exec_attr.d
+dir path=etc/security/prof_attr.d
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/manifest
+dir path=lib/svc/manifest/application
+dir path=lib/svc/method
 dir path=system
 dir path=system/volatile
+dir path=usr
+dir path=usr/bin
+dir path=usr/bin/$(ARCH64)
+dir path=usr/demo
+dir path=usr/include
+dir path=usr/lib
+dir path=usr/lib/$(ARCH64)
+dir path=usr/lib/$(ARCH64)/pkgconfig
+dir path=usr/lib/hal
+dir path=usr/lib/help
+dir path=usr/lib/help/auths
+dir path=usr/lib/help/auths/locale
+dir path=usr/lib/help/auths/locale/C
+dir path=usr/lib/help/profiles
+dir path=usr/lib/help/profiles/locale
+dir path=usr/lib/help/profiles/locale/C
 dir path=usr/lib/mdb
 dir path=usr/lib/mdb/proc
-$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
-$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
+dir path=usr/lib/mdb/proc/$(ARCH64)
+dir path=usr/lib/pkgconfig
+dir path=usr/lib/python$(PYTHON_PATH_VERSION)
+dir path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages
+dir path=usr/sbin
+dir path=usr/share
+dir path=usr/share/aclocal
 dir path=usr/share/applications
+dir path=usr/share/doc
+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
+dir path=usr/share/man/man3
+dir path=usr/share/man/man3lib
+dir path=usr/share/man/man4
+dir path=usr/share/man/man5
+dir path=usr/share/man/man7
+dir path=usr/share/pixmaps
+dir path=usr/share/pkgconfig
+dir path=usr/share/sgml
+dir path=var
+dir path=var/cache
+dir path=var/log

--- a/pkg/manifests/benchmark-x11perf.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/benchmark-x11perf.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,16 +23,7 @@
 set name=pkg.description \
     value="The x11perf program runs one or more performance tests and reports how fast an X server can execute the tests."
 set name=pkg.summary value="x11perf - X11 server performance test program"
-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/lib/X11/x11perfcomp
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
 file path=usr/bin/x11perf
 file path=usr/bin/x11perfcomp
 file path=usr/lib/X11/x11perfcomp/Xmark mode=0555

--- a/pkg/manifests/desktop-remote-desktop-tigervnc.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/desktop-remote-desktop-tigervnc.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,11 +24,6 @@
 set name=pkg.description \
     value="VNC client based on the TigerVNC open source release that displays a session over RFB protocol from a VNC server"
 set name=pkg.summary value="TigerVNC client"
-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/vncviewer
 file path=usr/share/man/man1/vncviewer.1
 legacy pkg=SUNWvncviewer \

--- a/pkg/manifests/desktop-synergy.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/desktop-synergy.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,9 +23,6 @@
 set name=pkg.description \
     value="Synergy lets you easily share a single mouse and keyboard between multiple computers with different operating systems, each with its own display, without special hardware.  It's intended for users with multiple computers on their desk since each system uses its own display."
 set name=pkg.summary value="Synergy: Mouse and Keyboard Sharing"
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
 file path=usr/bin/synergyc
 file path=usr/bin/synergys
 legacy pkg=SUNWsynergy \

--- a/pkg/manifests/desktop-window-manager-twm.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/desktop-window-manager-twm.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,15 +23,7 @@
 set name=pkg.description \
     value="Twm is a simple window manager for the X Window System.  It provides titlebars, shaped windows, several forms of icon management, user-defined macro functions, click-to-type  and pointer-driven  keyboard  focus,  and user-specified key and pointer button bindings."
 set name=pkg.summary value="twm - Tab Window Manager for the X Window System"
-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/twm
-dir path=usr/share/man
-dir path=usr/share/man/man1
 file path=usr/bin/twm
 file path=usr/share/X11/twm/system.twmrc
 file path=usr/share/man/man1/twm.1

--- a/pkg/manifests/desktop-window-manager-xcompmgr.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/desktop-window-manager-xcompmgr.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,11 +24,6 @@
 set name=pkg.description \
     value="xcompmgr is a sample compositing manager for X servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions.  It enables basic eye-candy effects."
 set name=pkg.summary value="xcompmgr - sample X compositing manager"
-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/xcompmgr
 file path=usr/share/man/man1/xcompmgr.1
 legacy pkg=SUNWcompmgr \

--- a/pkg/manifests/developer-build-autoconf-xorg-macros.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/developer-build-autoconf-xorg-macros.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,10 +24,6 @@
 set name=pkg.description \
     value="This is a set of autoconf macros used by the configure.ac scripts in other Xorg modular packages, and is needed to generate new versions of their configure scripts with autoconf."
 set name=pkg.summary value="GNU autoconf macros for X.Org software packages"
-dir path=usr
-dir path=usr/share
-dir path=usr/share/aclocal
-dir path=usr/share/pkgconfig
 dir path=usr/share/xorg-macros
 file path=usr/share/aclocal/xorg-macros.m4
 file path=usr/share/pkgconfig/xorg-macros.pc

--- a/pkg/manifests/developer-build-imake.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/developer-build-imake.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,16 +23,8 @@
 set name=pkg.description \
     value="Imake is used to generate Makefiles from a template, a set of cpp macro functions, and a per-directory input file called an Imakefile. This allows machine dependencies (such as compiler options, alternate command names, and special make rules) to be kept separate from the descriptions of the various items to be built."
 set name=pkg.summary value="imake - makefile generation tool from X.Org"
-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/lib/X11/config
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
 file path=usr/bin/imake
 file path=usr/bin/mkdirhier
 file path=usr/bin/xmkmf

--- a/pkg/manifests/developer-build-makedepend.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/developer-build-makedepend.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="The makedepend program reads source code and parses it like a C-preprocessor, so that it can correctly tell which #include directives would be used in a compilation, and then updates a Makefile with the discovered dependencies."
 set name=pkg.summary value="makedepend - create dependencies in makefiles"
-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/makedepend
 file path=usr/share/man/man1/makedepend.1
 link path=usr/X11/bin/makedepend target=../../bin/makedepend

--- a/pkg/manifests/diagnostic-constype.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/diagnostic-constype.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="constype prints on the standard output the identifier code for the type of display that the specified console device is."
 set name=pkg.summary value="constype - print type of console"
-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/constype
 file path=usr/share/man/man1/constype.1
 link path=usr/X11/bin/constype target=../../bin/constype

--- a/pkg/manifests/diagnostic-scanpci.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/diagnostic-scanpci.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,21 +24,6 @@
     value="libpciaccess is a generic PCI device access library.  scanpci is a sample tool that uses libpciaccess to list the PCI devices installed in a system."
 set name=pkg.summary \
     value="scanpci and libpciaccess - generic PCI access software"
-dir path=etc
-dir path=etc/security
-dir path=etc/security/exec_attr.d
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/include
-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
 file path=etc/security/exec_attr.d/scanpci group=sys
 file path=usr/bin/scanpci
 file path=usr/include/pciaccess.h

--- a/pkg/manifests/diagnostic-xload.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/diagnostic-xload.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,18 +23,6 @@
 set name=pkg.description \
     value="The xload program displays a periodically updating histogram of the system load average in an X11 window."
 set name=pkg.summary value="xload - system load average display 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/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/xload
 file path=usr/share/X11/app-defaults/XLoad
 file path=usr/share/locale/C/LC_MESSAGES/xload.po

--- a/pkg/manifests/document-viewer-xditview.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/document-viewer-xditview.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,18 +23,6 @@
 set name=pkg.description \
     value="The xditview program displays ditroff output on an X display."
 set name=pkg.summary value="xditview - display ditroff output"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/X11
-dir path=usr/include/X11/bitmaps
-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/xditview
 file path=usr/include/X11/bitmaps/ldblarrow
 file path=usr/include/X11/bitmaps/rdblarrow

--- a/pkg/manifests/editor-xedit.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/editor-xedit.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,20 +23,9 @@
 set name=pkg.description \
     value="Xedit is a simple Xaw toolkit text editor for X, with extensible modes for editing various programming languages."
 set name=pkg.summary value="xedit - simple text editor for X"
-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/lib/X11/xedit
 dir path=usr/lib/X11/xedit/lisp
 dir path=usr/lib/X11/xedit/lisp/progmodes
-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/xedit
 file path=usr/lib/X11/xedit/lisp/indent.lsp
 file path=usr/lib/X11/xedit/lisp/lisp.lsp

--- a/pkg/manifests/file-lndir.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/file-lndir.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,10 +24,5 @@
     value="The lndir program makes a shadow copy of a directory tree, except that the shadow is not populated with real files but instead with symbolic links pointing at the real files.  This is usually useful for maintaining source code for different machine architectures. "
 set name=pkg.summary \
     value="lndir - create a shadow directory of symbolic links to another directory tree"
-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/lndir
 file path=usr/share/man/man1/lndir.1

--- a/pkg/manifests/image-editor-bitmap.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/image-editor-bitmap.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,18 +24,8 @@
     value="The bitmap program is a rudimentary tool for creating or editing XBM format bitmap images. The bmtoa and atobm filters convert XBM format bitmap files to and from ASCII strings. They are most commonly used to quickly print out bitmaps and to generate versions for including in text."
 set name=pkg.summary \
     value="bitmap, bmtoa, atobm - X bitmap (XBM) editor and converter utilities"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/X11
-dir path=usr/include/X11/bitmaps
-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/atobm
 file path=usr/bin/bitmap
 file path=usr/bin/bmtoa

--- a/pkg/manifests/image-xcursorgen.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/image-xcursorgen.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,6 @@
     value="xcursorgen creates an X cursor set file from a collection of PNG images and a metadata file."
 set name=pkg.summary \
     value="xcursorgen prepares X11 cursor sets for use with libXcursor."
-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/xcursorgen
 file path=usr/share/man/man1/xcursorgen.1
 link path=usr/X11/bin/xcursorgen target=../../bin/xcursorgen

--- a/pkg/manifests/library-graphics-pixman.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/library-graphics-pixman.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,7 @@
     value="pixman is a library that provides low-level pixel manipulation features such as image compositing and trapezoid rasterization."
 set name=pkg.summary \
     value="Pixman: The pixel-manipulation library for X and Cairo."
-dir path=usr
-dir path=usr/include
 dir path=usr/include/pixman-1
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
 file path=usr/include/pixman-1/pixman-version.h
 file path=usr/include/pixman-1/pixman.h
 file path=usr/lib/$(ARCH64)/libpixman-1.so.0

--- a/pkg/manifests/library-motif-libdpstkxm.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/library-motif-libdpstkxm.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,11 +24,6 @@
     value="Libraries provided for binary compatibility with Motif clients designed to connect to servers supporting the DPS extension."
 set name=pkg.summary \
     value="X Window System DPS extension Motif client compatibility libraries"
-dir path=usr
-dir path=usr/lib
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
 file path=usr/lib/libdpstkXm.so.5
 file path=usr/share/X11/app-defaults/ColorSelect
 file path=usr/share/X11/app-defaults/FontSelect

--- a/pkg/manifests/service-opengl-ogl-select.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/service-opengl-ogl-select.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -27,31 +27,15 @@
     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/manifest
-dir path=lib/svc/manifest/application
 dir path=lib/svc/manifest/application/opengl
-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
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
 # These dirs are used to resolve dependencies during the build but are not
 # published in the packages as they're created at runtime by the SMF service
 dir path=system/volatile/opengl
@@ -65,7 +49,6 @@
 file path=lib/svc/manifest/application/opengl/ogl-select.xml
 file path=lib/svc/method/ogl-select
 file path=usr/share/man/man1/ogl-select.1
-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)

--- a/pkg/manifests/system-display-manager-xdm.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-display-manager-xdm.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,20 +24,10 @@
     value="xdm is an Xaw-based display manager for a collection of X displays, which may be on the local host or remote servers."
 set name=pkg.summary \
     value="xdm - X Display Manager with support for XDMCP and host chooser"
-dir path=etc group=sys
 dir path=etc/X11 group=sys
 dir path=etc/X11/xdm group=sys
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/X11
 dir path=usr/lib/X11/xdm
 dir path=usr/lib/X11/xdm/pixmaps
-dir path=usr/sbin
-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=etc/X11/xdm/Xaccess group=sys \
     original_name=SUNWxdm:etc/X11/xdm/Xaccess preserve=true
 file path=etc/X11/xdm/Xresources group=sys \

--- a/pkg/manifests/system-font-daewoo-misc.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-daewoo-misc.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,7 @@
 set name=pkg.description \
     value="X Window System font files contributed to X.Org Foundation open source release by Daewoo Electronics"
 set name=pkg.summary value="Korean bitmap fonts from Daewoo Electronics"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
+
 dir path=usr/share/fonts/X11/daewoo
 file path=usr/share/fonts/X11/daewoo/fonts.dir
 file path=usr/share/fonts/X11/daewoo/hanglg16.pcf

--- a/pkg/manifests/system-font-isas-misc.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-isas-misc.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,7 @@
     value="X Window System font files for GB2312-80 encoded Chinese characters from The Institute of Software, Academia Sinica"
 set name=pkg.summary \
     value="Institute of Software, Academia Sinica GB2312-80 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
+
 dir path=usr/share/fonts/X11/isas
 file path=usr/share/fonts/X11/isas/fonts.dir
 file path=usr/share/fonts/X11/isas/gb16fs.pcf

--- a/pkg/manifests/system-font-jis-misc.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-jis-misc.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,6 @@
     value="X Window System font files based on Japanese Industrial Standard, JIS X 9051-1984: 16-dots Matrix Character Patterns for Display Devices"
 set name=pkg.summary \
     value="Japanese Industrial Standard 9051-1984 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/jiskan
 file path=usr/share/fonts/X11/jiskan/fonts.dir
 file path=usr/share/fonts/X11/jiskan/jiskan16.pcf

--- a/pkg/manifests/system-font-misc-ethiopic.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-misc-ethiopic.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -25,13 +25,8 @@
     value="TrueType and OpenType fonts for Ethiopic scripts released as open source by the Ge'ez Frontier Foundation"
 set name=pkg.summary \
     value="Ethiopic language fonts from the Ge'ez Frontiers Foundation"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/TrueType
+
+
 dir path=usr/share/fonts/TrueType/ethiopic
 file path=usr/share/fonts/TrueType/ethiopic/GohaTibebZemen.otf
 file path=usr/share/fonts/TrueType/ethiopic/GohaTibebZemen.ttf

--- a/pkg/manifests/system-font-misc-meltho.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-misc-meltho.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,7 @@
 set name=pkg.description \
     value="OpenType font files for Syraic languages from Project Meltho at Beth Mardutho: The Syriac Computing Institute"
 set name=pkg.summary value="Meltho Syriac fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/TrueType
+
 dir path=usr/share/fonts/TrueType/syriac
 file path=usr/share/fonts/TrueType/syriac/SyrCOMAdiabene.otf
 file path=usr/share/fonts/TrueType/syriac/SyrCOMAntioch.otf

--- a/pkg/manifests/system-font-truetype-bh-luxi.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-truetype-bh-luxi.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,16 +24,6 @@
 set name=pkg.description \
     value="Luxi family of TrueType fonts designed by Bigelow & Holmes for the XFree86 Project"
 set name=pkg.summary value="Luxi font family from Bigelow & Holmes"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=etc/fonts
-dir path=etc/fonts/conf.avail
-dir path=etc/fonts/conf.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/TrueType
 dir path=usr/share/fonts/TrueType/bh-luxi
 file path=etc/fonts/conf.avail/42-luxi-mono.conf
 file path=usr/share/fonts/TrueType/bh-luxi/fonts.dir

--- a/pkg/manifests/system-font-truetype-bitstream-vera.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-truetype-bitstream-vera.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,6 @@
 set name=pkg.description \
     value="TrueType font files for the Vera family of redistributable fonts from Bitstream, Inc."
 set name=pkg.summary value="Bitstream Vera fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/TrueType
 dir path=usr/share/fonts/TrueType/bitstream-vera
 file path=usr/share/fonts/TrueType/bitstream-vera/COPYRIGHT.TXT
 file path=usr/share/fonts/TrueType/bitstream-vera/Vera.ttf

--- a/pkg/manifests/system-font-truetype-dejavu.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-truetype-dejavu.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,15 +24,6 @@
 set name=pkg.description \
     value="The DejaVu fonts are a TrueType font family based on the Vera Fonts. Its purpose is to provide a wider range of characters while maintaining the original look and feel through the process of collaborative development under a Free license."
 set name=pkg.summary value="DejaVu fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=etc/fonts
-dir path=etc/fonts/conf.avail
-dir path=etc/fonts/conf.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
 dir path=usr/share/fonts/TrueType
 dir path=usr/share/fonts/TrueType/dejavu
 file path=etc/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf

--- a/pkg/manifests/system-font-truetype-google-droid.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-truetype-google-droid.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -27,13 +27,6 @@
 set name=pkg.description \
     value="TrueType fonts designed by Ascender Corp for the Android mobile platform from Google"
 set name=pkg.summary value="Droid font family from Google's Android project"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/TrueType
 dir path=usr/share/fonts/TrueType/google-droid
 file path=usr/share/fonts/TrueType/google-droid/DroidSans-Bold.ttf
 file path=usr/share/fonts/TrueType/google-droid/DroidSans.ttf

--- a/pkg/manifests/system-font-truetype-liberation.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-truetype-liberation.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,6 @@
 set name=pkg.description \
     value="TrueType font files for the Liberation family of open source fonts designed by Ascender and released by Red Hat.  The Liberation Fonts are intended to be open font replacements for the three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and Courier New."
 set name=pkg.summary value="Liberation fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/TrueType
 dir path=usr/share/fonts/TrueType/liberation
 file path=usr/share/fonts/TrueType/liberation/LiberationMono-Bold.ttf
 file path=usr/share/fonts/TrueType/liberation/LiberationMono-BoldItalic.ttf

--- a/pkg/manifests/system-font-xorg-cyrillic.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-cyrillic.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -27,13 +27,6 @@
 set name=pkg.description \
     value="X Window System font files for Cyrillic scripts from X.Org Foundation open source release"
 set name=pkg.summary value="Cyrillic bitmap fonts from X.Org Foundation"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/cyrillic
 file path=usr/share/fonts/X11/cyrillic/crox1c.pcf
 file path=usr/share/fonts/X11/cyrillic/crox1cb.pcf

--- a/pkg/manifests/system-font-xorg-iso8859-1.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-1.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,12 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-1 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
 dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi-ISO8859-1
 dir path=usr/share/fonts/X11/75dpi-ISO8859-1

--- a/pkg/manifests/system-font-xorg-iso8859-10.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-10.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-10 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi-ISO8859-10
 dir path=usr/share/fonts/X11/75dpi-ISO8859-10
 dir path=usr/share/fonts/X11/misc-ISO8859-10

--- a/pkg/manifests/system-font-xorg-iso8859-11.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-11.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-11 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/misc-ISO8859-11
 file path=usr/share/fonts/X11/misc-ISO8859-11/10x20-ISO8859-11.pcf
 file path=usr/share/fonts/X11/misc-ISO8859-11/6x13-ISO8859-11.pcf

--- a/pkg/manifests/system-font-xorg-iso8859-13.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-13.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-13 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi-ISO8859-13
 dir path=usr/share/fonts/X11/75dpi-ISO8859-13
 dir path=usr/share/fonts/X11/misc-ISO8859-13

--- a/pkg/manifests/system-font-xorg-iso8859-14.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-14.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-14 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi-ISO8859-14
 dir path=usr/share/fonts/X11/75dpi-ISO8859-14
 dir path=usr/share/fonts/X11/misc-ISO8859-14

--- a/pkg/manifests/system-font-xorg-iso8859-15.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-15.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-15 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi-ISO8859-15
 dir path=usr/share/fonts/X11/75dpi-ISO8859-15
 dir path=usr/share/fonts/X11/misc-ISO8859-15

--- a/pkg/manifests/system-font-xorg-iso8859-16.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-16.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-16 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/misc-ISO8859-16
 file path=usr/share/fonts/X11/misc-ISO8859-16/10x20-ISO8859-16.pcf
 file path=usr/share/fonts/X11/misc-ISO8859-16/4x6-ISO8859-16.pcf

--- a/pkg/manifests/system-font-xorg-iso8859-2.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-2.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-2 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi-ISO8859-2
 dir path=usr/share/fonts/X11/75dpi-ISO8859-2
 dir path=usr/share/fonts/X11/misc-ISO8859-2

--- a/pkg/manifests/system-font-xorg-iso8859-3.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-3.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-3 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi-ISO8859-3
 dir path=usr/share/fonts/X11/75dpi-ISO8859-3
 dir path=usr/share/fonts/X11/misc-ISO8859-3

--- a/pkg/manifests/system-font-xorg-iso8859-4.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-4.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-4 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi-ISO8859-4
 dir path=usr/share/fonts/X11/75dpi-ISO8859-4
 dir path=usr/share/fonts/X11/misc-ISO8859-4

--- a/pkg/manifests/system-font-xorg-iso8859-5.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-5.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-5 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/misc-ISO8859-5
 file path=usr/share/fonts/X11/misc-ISO8859-5/10x20-ISO8859-5.pcf
 file path=usr/share/fonts/X11/misc-ISO8859-5/4x6-ISO8859-5.pcf

--- a/pkg/manifests/system-font-xorg-iso8859-7.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-7.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-7 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/misc-ISO8859-7
 file path=usr/share/fonts/X11/misc-ISO8859-7/10x20-ISO8859-7.pcf
 file path=usr/share/fonts/X11/misc-ISO8859-7/4x6-ISO8859-7.pcf

--- a/pkg/manifests/system-font-xorg-iso8859-8.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-8.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-8 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/misc-ISO8859-8
 file path=usr/share/fonts/X11/misc-ISO8859-8/10x20-ISO8859-8.pcf
 file path=usr/share/fonts/X11/misc-ISO8859-8/4x6-ISO8859-8.pcf

--- a/pkg/manifests/system-font-xorg-iso8859-9.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-9.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="X Window System bitmap font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 iso8859-9 bitmap fonts"
-dir path=etc
-dir path=etc/X11
-dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/share
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi-ISO8859-9
 dir path=usr/share/fonts/X11/75dpi-ISO8859-9
 dir path=usr/share/fonts/X11/misc-ISO8859-9

--- a/pkg/manifests/system-font-xorg-xorg-core.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-font-xorg-xorg-core.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,15 +24,9 @@
 set name=pkg.description \
     value="X Window System bitmap & scalable font files based on X.Org Foundation open source release"
 set name=pkg.summary value="X.Org Foundation X11 core fonts"
-dir path=etc
-dir path=etc/X11
 dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/lib
 dir path=usr/X11/lib/X11
 dir path=usr/X11/lib/X11/fonts
-dir path=usr/share
 dir path=usr/share/fonts
 dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/100dpi
@@ -40,6 +34,7 @@
 dir path=usr/share/fonts/X11/Type1
 dir path=usr/share/fonts/X11/cyrillic
 dir path=usr/share/fonts/X11/misc
+
 file path=usr/share/fonts/X11/100dpi/UTBI__10.pcf
 file path=usr/share/fonts/X11/100dpi/UTBI__12.pcf
 file path=usr/share/fonts/X11/100dpi/UTBI__14.pcf

--- a/pkg/manifests/system-keyboard-kbd_mode.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-keyboard-kbd_mode.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="kbd_mode sets the translation mode of the console's keyboard (/dev/kbd) to one of the four values defined for KIOCTRANS in kb(7M). This is useful when a program, such as an X server, that resets the translation mode terminates abnormally and fails to restore the original translation mode."
 set name=pkg.summary value="kbd_mode - change the keyboard translation mode"
-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/kbd_mode
 file path=usr/share/man/man1/kbd_mode.1
 link path=usr/X11/bin/kbd_mode target=../../bin/kbd_mode

--- a/pkg/manifests/system-library-fontconfig.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-library-fontconfig.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,43 +24,13 @@
     value="Fontconfig is a library for configuring and customizing font access. Information about fontconfig and open source releases may be found at http://www.fontconfig.org/"
 set name=pkg.summary \
     value="Fontconfig - Font configuration and customization library"
-dir path=etc
 dir path=etc/fonts
 dir path=etc/fonts/conf.avail
 dir path=etc/fonts/conf.d
-dir path=etc/security
-dir path=etc/security/auth_attr.d
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest
-dir path=lib/svc/manifest/application
 dir path=lib/svc/manifest/application/font
-dir path=lib/svc/method
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(ARCH64)
-dir path=usr/include
 dir path=usr/include/fontconfig
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/help
-dir path=usr/lib/help/auths
-dir path=usr/lib/help/auths/locale
-dir path=usr/lib/help/auths/locale/C
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/doc
 dir path=usr/share/doc/fontconfig
 dir path=usr/share/doc/fontconfig/fontconfig-devel
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
-dir path=usr/share/man/man3lib
-dir path=usr/share/man/man4
-dir path=usr/share/man/man5
-dir path=var
-dir path=var/cache
 dir path=var/cache/fontconfig
 file path=etc/fonts/conf.avail/10-autohint.conf
 file path=etc/fonts/conf.avail/10-no-sub-pixel.conf

--- a/pkg/manifests/system-library-freetype-2.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/system-library-freetype-2.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,20 +23,9 @@
 set name=pkg.description \
     value="FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well."
 set name=pkg.summary value="FreeType 2 font engine"
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(ARCH64)
-dir path=usr/include
 dir path=usr/include/freetype2
 dir path=usr/include/freetype2/freetype
 dir path=usr/include/freetype2/freetype/config
-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/aclocal
-dir path=usr/share/doc
 dir path=usr/share/doc/freetype
 file path=usr/bin/$(ARCH64)/freetype-config
 file path=usr/bin/freetype-config

--- a/pkg/manifests/terminal-fbconsole.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/terminal-fbconsole.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,9 +23,5 @@
 set name=pkg.description \
     value="This program is intended to address the problem of console messages corrupting a user's frame buffer by providing a program to act as a ``fallback console'' and by arranging for this program to consume output directed to /dev/console when no console window is active."
 set name=pkg.summary value="fbconsole - fallback console"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
 file path=usr/bin/fbconsole
 link path=usr/X11/bin/fbconsole target=../../bin/fbconsole

--- a/pkg/manifests/terminal-luit.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/terminal-luit.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,6 @@
     value="Luit is a filter that can be run between an arbitrary application and a UTF-8 terminal emulator such as xterm.  It will convert application output from the locale's encoding into UTF-8, and convert terminal input from UTF-8 into the locale's encoding."
 set name=pkg.summary \
     value="luit - Locale and ISO 2022 support for Unicode terminals"
-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/luit
 file path=usr/share/man/man1/luit.1
 link path=usr/X11/bin/luit target=../../bin/luit

--- a/pkg/manifests/terminal-resize.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/terminal-resize.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,13 +24,6 @@
     value="Resize prints a shell command for setting the COLUMNS and LINES environment variables to indicate the current size of the terminal window from which the command is run."
 set name=pkg.summary \
     value="resize - adjust terminal settings to current window size"
-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/resize
 file path=usr/share/man/man1/resize.1
 link path=usr/X11/bin/resize target=../../bin/resize

--- a/pkg/manifests/terminal-xterm.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/terminal-xterm.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,18 +23,7 @@
 set name=pkg.description \
     value="The xterm program is a terminal emulator for the X Window System. It provides DEC VT102 and Tektronix 4014 compatible terminals for programs that can't use the window system directly.  This version implements ISO/ANSI colors, Unicode, and most of the control sequences used by DEC VT220 terminals."
 set name=pkg.summary value="xterm - terminal emulator 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/doc
 dir path=usr/share/doc/xterm
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/pixmaps
 file path=usr/bin/koi8rxterm
 file path=usr/bin/uxterm
 file path=usr/bin/xterm

--- a/pkg/manifests/x11-colormap-utilities.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-colormap-utilities.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 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

--- a/pkg/manifests/x11-compatibility-links-svid.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-compatibility-links-svid.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,8 +24,6 @@
     value="Provides the /usr/X -> X11 link required by the SVID3 ABI"
 set name=pkg.summary value="X Window System SVID compatibility links"
 set name=info.classification value=org.opensolaris.category.2008:System/X11
-dir path=usr
-dir path=usr/X11
 legacy pkg=SUNWxwrtl desc="X Window System SVID compatibility links" \
     name="X Window System SVID compatibility links"
 

--- a/pkg/manifests/x11-compatibility-links-xorg.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-compatibility-links-xorg.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,8 +23,6 @@
 set name=pkg.description \
     value="Symbolic links for X Window System software compatibility with other releases"
 set name=pkg.summary value="X Window System platform compatibility links"
-dir path=usr
-dir path=usr/X11
 legacy pkg=SUNWxorg-compatlinks \
     desc="Symbolic links for X Window System software compatibility with other releases" \
     name="X11 Compatibility Links"

--- a/pkg/manifests/x11-data-workspace-patterns.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-data-workspace-patterns.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,8 +23,6 @@
 set name=pkg.description \
     value="The classic Solaris workspace background patterns in X Bitmap (xbm) format"
 set name=pkg.summary value="Bitmap patterns for workspace backgrounds"
-dir path=usr
-dir path=usr/share
 dir path=usr/share/patterns
 file path=usr/share/patterns/attributes
 file path=usr/share/patterns/background.xbm

--- a/pkg/manifests/x11-data-xbitmaps.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-data-xbitmaps.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -33,12 +33,7 @@
 set name=pkg.description \
     value="A set of xbm format bitmap images commonly provided with the X Window System and used by many clients in the X.Org implementation."
 set name=pkg.summary value="X Window System standard bitmaps"
-dir path=usr
-dir path=usr/include
-dir path=usr/include/X11
 dir path=usr/include/X11/bitmaps
-dir path=usr/share
-dir path=usr/share/pkgconfig
 file path=usr/include/X11/bitmaps/1x1
 file path=usr/include/X11/bitmaps/2x2
 file path=usr/include/X11/bitmaps/black

--- a/pkg/manifests/x11-data-xcursor-themes.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-data-xcursor-themes.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,8 +24,6 @@
 set name=pkg.description \
     value="This is a default set of full-color, translucent cursor themes for use with libXcursor, originally created for the XFree86 Project, and now shipped as part of the X.Org software distribution."
 set name=pkg.summary value="X.Org default X11 cursor themes"
-dir path=usr
-dir path=usr/share
 dir path=usr/share/icons
 dir path=usr/share/icons/handhelds
 dir path=usr/share/icons/handhelds/cursors

--- a/pkg/manifests/x11-demo-mesa-demos.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-demo-mesa-demos.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="glxinfo lists information about the GLX extension, OpenGL capable visuals, and the OpenGL renderer on an X server.  glxgears is a GLX demo that draws three rotating gears, and prints out framerate information."
 set name=pkg.summary value="Mesa sample GLX 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/glxgears
 file path=usr/bin/glxinfo
 file path=usr/share/man/man1/glxgears.1

--- a/pkg/manifests/x11-demo.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-demo.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -27,15 +27,6 @@
 #	pkg://solaris/library/java/demo pkg://xnv-devel/x11/
 set name=pkg.linted value=True
 set name=pkg.summary value="X Window System demo programs"
-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/ico
 file path=usr/bin/xeyes
 file path=usr/bin/xgc

--- a/pkg/manifests/x11-diagnostic-x11-info-clients.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-diagnostic-x11-info-clients.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,6 @@
     value="X11 clients that print various information about the current session to terminal output.  Includes xdpyinfo, xdrinfo, xlsatoms, xlsclients, xlsfonts, xlswins, xvinfo and xwininfo."
 set name=pkg.summary \
     value="X Window System diagnostic and information display 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/xdpyinfo
 file path=usr/bin/xdriinfo
 file path=usr/bin/xlsatoms

--- a/pkg/manifests/x11-diagnostic-xev.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-diagnostic-xev.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="xev prints information about X11 events received by a window whenever anything happens to the window (such as it being moved, resized, typed in, clicked in, etc.).  It is useful for seeing what causes events to occur and to display the information that they contain; it is essentially a debugging and development tool."
 set name=pkg.summary value="xev - X11 event monitor"
-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/xev
 file path=usr/share/man/man1/xev.1
 link path=usr/X11/bin/xev target=../../bin/xev

--- a/pkg/manifests/x11-diagnostic-xscope.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-diagnostic-xscope.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="Xscope sits in-between an X11 client and an X11 server and prints the contents of each request, reply, error, or event that is communicated between them. Xscope can decode the core X11 protocol and several extensions, including BIG-REQUESTS, LBX, MIT-SHM, NCD-WinCenterPro, RANDR, and RENDER."
 set name=pkg.summary value="xscope - X Window Protocol Viewer"
-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/xscope
 file path=usr/share/man/man1/xscope.1
 link path=usr/X11/bin/xscope target=../../bin/xscope

--- a/pkg/manifests/x11-documentation-xorg-docs.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-documentation-xorg-docs.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,9 +23,6 @@
 set name=pkg.description \
     value="Documentation for various aspects of the X Window System that is not associated with a more specific package."
 set name=pkg.summary value="X Window System common documentation"
-dir path=usr
-dir path=usr/share
-dir path=usr/share/doc
 dir path=usr/share/doc/X11
 dir path=usr/share/doc/X11/fonts
 dir path=usr/share/doc/X11/graphics
@@ -37,10 +34,6 @@
 dir path=usr/share/doc/X11/specs/XLFD
 dir path=usr/share/doc/X11/specs/Xext
 dir path=usr/share/doc/X11/specs/Xserver
-dir path=usr/share/man
-dir path=usr/share/man/man5
-dir path=usr/share/pkgconfig
-dir path=usr/share/sgml
 dir path=usr/share/sgml/X11
 dir path=usr/share/sgml/X11/dbs
 file path=usr/share/doc/X11/License.html

--- a/pkg/manifests/x11-font-utilities.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-font-utilities.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,20 +23,7 @@
 set name=pkg.description \
     value="Utilities for building and installing X font and font metadata files."
 set name=pkg.summary value="X Window System font utilities"
-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/aclocal
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/util
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/pkgconfig
 file path=usr/bin/bdftopcf
 file path=usr/bin/bdftruncate
 file path=usr/bin/mkfontdir

--- a/pkg/manifests/x11-header-rasterfile.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-header-rasterfile.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,11 +23,6 @@
 set name=pkg.description \
     value="Documentation and C language definition of Sun rasterfile image format"
 set name=pkg.summary value="Sun rasterfile image format"
-dir path=usr
-dir path=usr/include
 dir path=usr/include/pixrect
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man4
 file path=usr/include/pixrect/rasterfile.h
 file path=usr/share/man/man4/rasterfile.4

--- a/pkg/manifests/x11-header-x11-protocols.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-header-x11-protocols.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,10 +23,7 @@
 set name=pkg.description \
     value="Developer documentation and C language definitions of X11, X extension, and related protocols"
 set name=pkg.summary value="X Window System protocol definitions"
-dir path=usr
-dir path=usr/X11
 dir path=usr/X11/include
-dir path=usr/include
 dir path=usr/include/GL
 dir path=usr/include/GL/internal
 dir path=usr/include/X11
@@ -34,8 +31,6 @@
 dir path=usr/include/X11/dri
 dir path=usr/include/X11/extensions
 dir path=usr/include/X11/fonts
-dir path=usr/share
-dir path=usr/share/doc
 dir path=usr/share/doc/bigreqsproto
 dir path=usr/share/doc/compositeproto
 dir path=usr/share/doc/damageproto
@@ -51,7 +46,6 @@
 dir path=usr/share/doc/xextproto
 dir path=usr/share/doc/xproto
 dir path=usr/share/doc/xproxymanagementprotocol
-dir path=usr/share/pkgconfig
 file path=usr/include/GL/glxint.h
 file path=usr/include/GL/glxmd.h
 file path=usr/include/GL/glxproto.h

--- a/pkg/manifests/x11-keyboard-accessx.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-keyboard-accessx.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,17 +24,7 @@
     value="accessx is a graphical user interface to configure available enhancements that provide the keyboard with additional capabilities which are primarily designed to aid users with disabilities who are unable to use a keyboard or mouse in the usual fashion."
 set name=pkg.summary \
     value="AccessX keyboard accessibilty configuration 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/locale
-dir path=usr/share/X11/locale/C
 dir path=usr/share/X11/locale/C/accessx
-dir path=usr/share/man
-dir path=usr/share/man/man1
 file path=usr/bin/accessx
 file path=usr/share/X11/locale/C/accessx/accessx.hlp
 file path=usr/share/X11/locale/C/accessx/accessx.uid

--- a/pkg/manifests/x11-keyboard-xkb-utilities.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-keyboard-xkb-utilities.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,6 @@
     value="This a collection of small utilities utilizing the XKeyboard (XKB) extension to the X11 protocol.  It includes utilities to display & monitor xkb state, generate XKB bell events, and set XKB keymap layouts and options."
 set name=pkg.summary \
     value="X Window System X Keyboard Extension (XKB) Utilties"
-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/setxkbmap
 file path=usr/bin/xkbbell
 file path=usr/bin/xkbprint

--- a/pkg/manifests/x11-keyboard-xkbcomp.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-keyboard-xkbcomp.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,13 +23,6 @@
 set name=pkg.description \
     value="The xkbcomp keymap compiler converts a description of an XKB keymap into one of several output formats, including the one used by X servers to load keymap data."
 set name=pkg.summary value="X Keyboard Extension data compiler"
-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/xkbcomp
 file path=usr/share/man/man1/xkbcomp.1
 link path=usr/X11/bin/xkbcomp target=../../bin/xkbcomp

--- a/pkg/manifests/x11-library-dps.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-dps.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,14 +24,6 @@
     value="Libraries provided for binary compatibility with X clients designed to connect to servers supporting the DPS extension."
 set name=pkg.summary \
     value="X Window System DPS extension client compatibility libraries"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/share
-dir path=usr/share/X11
-dir path=usr/share/X11/app-defaults
 file path=usr/bin/makepsres
 file path=usr/bin/pswrap
 file path=usr/lib/libdps.so.5

--- a/pkg/manifests/x11-library-freeglut.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-freeglut.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -28,15 +28,6 @@
 set name=pkg.summary \
     value="FreeGLUT - an open-source implementation of the GLUT specification"
 #
-dir path=usr
-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/share
-dir path=usr/share/doc
 dir path=usr/share/doc/glut
 #
 file path=usr/include/GL/freeglut.h

--- a/pkg/manifests/x11-library-libdga.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libdga.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,11 +24,6 @@
     value="Libraries provided for binary compatibility with X clients designed to connect to Xsun servers supporting the SUN-DGA extension."
 set name=pkg.summary \
     value="X Window System SUN-DGA extension client compatibility libraries"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/lib
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
 # sparc only since Xsun/DGA was already obsolete before amd64 was added
 $(sparc_ONLY)file path=usr/lib/$(ARCH64)/libdga.so.1
 file path=usr/lib/libdga.so.1

--- a/pkg/manifests/x11-library-libdmx.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libdmx.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,17 +24,6 @@
     value="libdmx is an interface to the DMX extension for X, which allows a single server to be set up as a proxy spanning multiple servers -- not unlike Xinerama across discrete physical machines. It can be reconfigured on the fly to change the layout, and it is presented as a single logical display to clients."
 set name=pkg.summary \
     value="libdmx - X Window System DMX (Distributed Multihead X) extension library"
-dir path=usr
-dir path=usr/include
-dir path=usr/include/X11
-dir path=usr/include/X11/extensions
-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/man3
 file path=usr/include/X11/extensions/dmxext.h
 file path=usr/lib/$(ARCH64)/pkgconfig/dmx.pc
 file path=usr/lib/pkgconfig/dmx.pc

--- a/pkg/manifests/x11-library-libdrm.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libdrm.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,18 +24,8 @@
     value="User-space library interface to kernel modules using the Direct Rendering Infrastructure (DRI) and Kernel Mode-Setting (KMS) interfaces"
 set name=pkg.summary \
     value="Direct Rendering Module (DRM) client libraries/interface"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/include
-dir path=usr/include
 dir path=usr/include/libdrm
 dir path=usr/include/libkms
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/xorg
-dir path=usr/lib/xorg/$(ARCH64)
 file path=usr/include/libdrm/drm.h
 file path=usr/include/libdrm/drm_mode.h
 file path=usr/include/libdrm/drm_sarea.h

--- a/pkg/manifests/x11-library-libfontenc.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libfontenc.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,17 +23,8 @@
 set name=pkg.description \
     value="Library and data files used by X servers and utilities for handling fonts encoded for different character sets."
 set name=pkg.summary value="libfontenc - font encoding library"
-dir path=usr
-dir path=usr/include
-dir path=usr/include/X11
-dir path=usr/include/X11/fonts
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
 dir path=usr/lib/xorg
 dir path=usr/lib/xorg/$(ARCH64)
-dir path=usr/share
 dir path=usr/share/fonts
 dir path=usr/share/fonts/X11
 dir path=usr/share/fonts/X11/encodings

--- a/pkg/manifests/x11-library-libfs.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libfs.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,19 +23,6 @@
 set name=pkg.description \
     value="Library used by X servers and clients to retreive font data from xfs font servers."
 set name=pkg.summary value="libFS - X Font Service client library"
-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/fonts
-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/libFS
 file path=usr/include/X11/fonts/FSlib.h
 file path=usr/lib/$(ARCH64)/libFS.so.5

--- a/pkg/manifests/x11-library-libice.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libice.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,24 +24,8 @@
 set name=pkg.description \
     value="Library and utilities to support the X Window System Inter-Client Exchange (ICE) protocol"
 set name=pkg.summary value="libICE - Inter-Client Exchange Library"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/X11/lib
-dir path=usr/X11/lib/$(ARCH64)
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/X11
 dir path=usr/include/X11/ICE
-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/libICE
-dir path=usr/share/man
-dir path=usr/share/man/man1
 file path=usr/bin/iceauth
 file path=usr/include/X11/ICE/ICE.h
 file path=usr/include/X11/ICE/ICEconn.h

--- a/pkg/manifests/x11-library-libowconfig.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libowconfig.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,13 +24,6 @@
     value="libowconfig is provided for binary compatibility with programs such as fbconfig that were written to read or write the now-obsolete OWconfig file used by the Xsun X server."
 set name=pkg.summary \
     value="libowconfig - library for Xsun OWconfig file handling"
-dir path=usr
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/lib
-dir path=usr/include
-dir path=usr/include/X11
-dir path=usr/lib
 file path=usr/include/X11/Sunowconfig.h
 file path=usr/lib/libowconfig.so.0
 link path=usr/X11/lib/libowconfig.so target=../../lib/libowconfig.so

--- a/pkg/manifests/x11-library-libpthread-stubs.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libpthread-stubs.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -25,10 +25,5 @@
     value="This library provides weak aliases for pthread functions not provided in libc or otherwise available by default.  Libraries like libxcb rely on pthread stubs to use pthreads optionally, becoming thread-safe when linked to libpthread, while avoiding any performance hit when running single-threaded. libpthread-stubs supports this behavior even on platforms which do not supply all the necessary pthread stubs.  On platforms (such as Solaris) which already supply all the necessary pthread stubs, this package ships only the pkg-config file pthread-stubs.pc, to allow libraries to unconditionally express a dependency on pthread-stubs and still obtain correct behavior."
 set name=pkg.summary \
     value="pthread-stubs - pkg-config data file for building software using POSIX threads"
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
 file path=usr/lib/$(ARCH64)/pkgconfig/pthread-stubs.pc
 file path=usr/lib/pkgconfig/pthread-stubs.pc

--- a/pkg/manifests/x11-library-libsm.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libsm.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,19 +24,7 @@
 set name=pkg.description \
     value="The purpose of the X Session Management Protocol (XSMP) is to provide a uniform mechanism for users to save and restore their sessions.  The Session Management Library (SMlib) is a low-level C language interface to XSMP. It is expected that higher level toolkits will hide many of the details of session management from clients."
 set name=pkg.summary value="libSM - X Session Management Library"
-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/SM
-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/libSM
 file path=usr/include/X11/SM/SM.h
 file path=usr/include/X11/SM/SMlib.h

--- a/pkg/manifests/x11-library-libx11.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libx11.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -23,23 +23,13 @@
 set name=pkg.description \
     value="libX11 provides the basic API most X11 clients use to communicate with an X server."
 set name=pkg.summary value="libX11 - X11 core protocol client library"
-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/extensions
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
+
+
 dir path=usr/lib/X11
 dir path=usr/lib/X11/locale
 dir path=usr/lib/X11/locale/$(ARCH64)
 dir path=usr/lib/X11/locale/$(ARCH64)/common
 dir path=usr/lib/X11/locale/common
-dir path=usr/lib/pkgconfig
-dir path=usr/share
 dir path=usr/share/X11
 dir path=usr/share/X11/locale
 dir path=usr/share/X11/locale/C
@@ -102,7 +92,6 @@
 dir path=usr/share/X11/locale/zh_TW
 dir path=usr/share/X11/locale/zh_TW.UTF-8
 dir path=usr/share/X11/locale/zh_TW.big5
-dir path=usr/share/doc
 dir path=usr/share/doc/libX11
 dir path=usr/share/doc/libX11/Compose
 dir path=usr/share/doc/libX11/XIM
@@ -112,9 +101,7 @@
 dir path=usr/share/doc/libX11/i18n/localedb
 dir path=usr/share/doc/libX11/i18n/trans
 dir path=usr/share/doc/libX11/libX11
-dir path=usr/share/man
 dir path=usr/share/man/man3x11
-dir path=usr/share/man/man4
 file path=usr/include/X11/ImUtil.h
 file path=usr/include/X11/XKBlib.h
 file path=usr/include/X11/Xcms.h

--- a/pkg/manifests/x11-library-libxau.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxau.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,18 +23,13 @@
 set name=pkg.description \
     value="This library provides a basic API for reading and writing authentication data entries for X server connections in .Xauthority files."
 set name=pkg.summary value="libXau - X authorization database library"
-dir path=usr
+
+# Since libXau is the base of the dependency tree for all libX11 & libxcb
+# libraries, and all X servers, this package provides the central definition
+# for a number of directories that all the other X packages deliver files to.
 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/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/man3xau
 file path=usr/include/X11/Xauth.h
 file path=usr/lib/$(ARCH64)/libXau.so.6

--- a/pkg/manifests/x11-library-libxcb.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxcb.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -37,21 +37,10 @@
 set name=pkg.description \
     value="XCB - The X11 C Protocol Bindings."
 set name=pkg.summary value="libxcb - The X11 C protocol bindings"
-dir path=usr
-dir path=usr/include
 dir path=usr/include/xcb
-dir path=usr/lib
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/python$(PYTHON_PATH_VERSION)
-dir path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages
 dir path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/share
-dir path=usr/share/doc
 dir path=usr/share/doc/libxcb
 dir path=usr/share/doc/libxcb/tutorial
-dir path=usr/share/pkgconfig
 dir path=usr/share/xcb
 #
 file path=usr/lib/libxcb-composite.so.0

--- a/pkg/manifests/x11-library-libxcomposite.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxcomposite.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -25,19 +25,6 @@
     value="Xlib-based client API for the Composite extension to the X11 protocol"
 set name=pkg.summary \
     value="libXcomposite - X Composite extension client library"
-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/extensions
-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/man3xcomposite
 file path=usr/include/X11/extensions/Xcomposite.h
 file path=usr/lib/$(ARCH64)/libXcomposite.so.1

--- a/pkg/manifests/x11-library-libxcursor.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxcursor.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,19 +24,7 @@
     value="Xcursor is a simple library designed to help locate and load cursors.  When the Render extension is available in the X server, cursors can be full 32-bit color images, including alpha channels for translucency."
 set name=pkg.summary \
     value="libXcursor - X Window System Cursor management library"
-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/Xcursor
-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/man3xcursor
 file path=usr/include/X11/Xcursor/Xcursor.h
 file path=usr/lib/$(ARCH64)/libXcursor.so.1

--- a/pkg/manifests/x11-library-libxdamage.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxdamage.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,17 +23,6 @@
 set name=pkg.description \
     value="Xlib-based client API for the Damage extension to the X11 protocol"
 set name=pkg.summary value="libXdamage - X Damage extension client library"
-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/extensions
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
 file path=usr/include/X11/extensions/Xdamage.h
 file path=usr/lib/$(ARCH64)/libXdamage.so.1
 file path=usr/lib/$(ARCH64)/pkgconfig/xdamage.pc

--- a/pkg/manifests/x11-library-libxdmcp.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxdmcp.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,18 +24,6 @@
     value="Library used by X clients and servers to support the XDMCP protocol for remote X session setup."
 set name=pkg.summary \
     value="libXdmcp - X Display Manager Control Protocol (XDMCP) library"
-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/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/libXdmcp
 file path=usr/include/X11/Xdmcp.h
 file path=usr/lib/$(ARCH64)/libXdmcp.so.6

--- a/pkg/manifests/x11-library-libxevie.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxevie.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,19 +24,6 @@
     value="Xlib-based client API for the X Event Interception Extension (XEvIE) extension to the X11 protocol"
 set name=pkg.summary \
     value="libXevie - X Event Interception Extension (XEvIE) client library"
-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/extensions
-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/man3xevie
 file path=usr/include/X11/extensions/Xevie.h
 file path=usr/lib/$(ARCH64)/libXevie.so.1

--- a/pkg/manifests/x11-library-libxext.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxext.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -25,21 +25,7 @@
     value="Xlib-based client API for a number of common extensions to the X11 protocol, including SHAPE, MIT-SHM, DPMS, Sync, GenericEvent and more.   Also includes common extension framework used by other Xlib-based extension libraries."
 set name=pkg.summary \
     value="libXext - X11 protocol common extensions client library"
-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/extensions
-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/libXext
-dir path=usr/share/man
 dir path=usr/share/man/man3xext
 file path=usr/include/X11/extensions/MITMisc.h
 file path=usr/include/X11/extensions/XEVI.h

--- a/pkg/manifests/x11-library-libxfixes.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxfixes.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,20 +23,6 @@
 set name=pkg.description \
     value="Xlib-based client API for the XFIXES extension to the X11 protocol"
 set name=pkg.summary value="libXfixes - XFIXES extension client library"
-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/extensions
-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/man3
 file path=usr/include/X11/extensions/Xfixes.h
 file path=usr/lib/$(ARCH64)/libXfixes.so.1
 file path=usr/lib/$(ARCH64)/pkgconfig/xfixes.pc

--- a/pkg/manifests/x11-library-libxfont.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxfont.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,19 +24,8 @@
     value="libXfont provides the core of the legacy X11 font system, handling the index files (fonts.dir, fonts.alias, fonts.scale), the various font file formats, and rasterizing them.   It is used by the X servers, the X Font Server (xfs), and some font utilities (bdftopcf for instance), but should not be used by normal X11 clients.  X11 clients access fonts via either the new API's in libXft, or the legacy API's in libX11."
 set name=pkg.summary \
     value="libXfont - library for X servers and utilities to access font files"
-dir path=etc
 dir path=etc/X11
 dir path=etc/X11/fontpath.d
-dir path=usr
-dir path=usr/include
-dir path=usr/include/X11
-dir path=usr/include/X11/fonts
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/xorg
-dir path=usr/lib/xorg/$(ARCH64)
 file path=usr/include/X11/fonts/bdfint.h
 file path=usr/include/X11/fonts/bitmap.h
 file path=usr/include/X11/fonts/bufio.h

--- a/pkg/manifests/x11-library-libxft.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxft.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,23 +23,7 @@
 set name=pkg.description \
     value="Xft is a simple library designed to interface the FreeType rasterizer with the X Rendering Extension.   X11 clients and toolkits use it to render text with modern features such as antialiasing."
 set name=pkg.summary value="libXft - X FreeType 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/include/X11/Xft
-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/man3
 file path=usr/include/X11/Xft/Xft.h
 file path=usr/include/X11/Xft/XftCompat.h
 file path=usr/lib/$(ARCH64)/libXft.so.2

--- a/pkg/manifests/x11-library-libxi.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxi.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,22 +24,8 @@
 set name=pkg.description \
     value="Xlib-based client API for the X Input extension to the X11 protocol"
 set name=pkg.summary value="libXi - X Input extension client library"
-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/extensions
-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/libXi
 dir path=usr/share/doc/libXi/specs
-dir path=usr/share/man
 dir path=usr/share/man/man3xi
 file path=usr/include/X11/extensions/XInput.h
 file path=usr/include/X11/extensions/XInput2.h

--- a/pkg/manifests/x11-library-libxinerama.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxinerama.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,19 +23,6 @@
 set name=pkg.description \
     value="Xlib-based client API for the Xinerama extension to the X11 protocol"
 set name=pkg.summary value="libXinerama - Xinerama extension client library"
-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/extensions
-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/man3xinerama
 file path=usr/include/X11/extensions/Xinerama.h
 file path=usr/include/X11/extensions/panoramiXext.h

--- a/pkg/manifests/x11-library-libxkbfile.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxkbfile.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,17 +24,6 @@
     value="libxkbfile is used by X servers and utilities to access the data files for XKB layout information.  It also contains some utility routines used by some Xlib-based clients when used with the XKB extension."
 set name=pkg.summary \
     value="libxkbfile - library for the X Keyboard (XKB) extension"
-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/extensions
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
 file path=usr/include/X11/extensions/XKBbells.h
 file path=usr/include/X11/extensions/XKBconfig.h
 file path=usr/include/X11/extensions/XKBfile.h

--- a/pkg/manifests/x11-library-libxmu.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxmu.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,21 +24,7 @@
     value="This library contains miscellaneous utilities and is not part of the Xlib standard.  It contains routines which only use public interfaces so that it may be layered on top of any proprietary implementation of Xlib or Xt."
 set name=pkg.summary \
     value="libXmu - miscellaneous utility functions for Xaw and Xt clients"
-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/Xmu
-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/libXmu
-dir path=usr/share/man
 dir path=usr/share/man/man3xmu
 file path=usr/include/X11/Xmu/Atoms.h
 file path=usr/include/X11/Xmu/CloseHook.h

--- a/pkg/manifests/x11-library-libxmuu.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxmuu.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,17 +24,7 @@
     value="This library contains miscellaneous utilities and is not part of the Xlib standard.  It contains the subset of libXmu routines that do not require libXaw or libXt."
 set name=pkg.summary \
     value="libXmuu - miscellaneous utility functions for Xlib clients"
-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/Xmu
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/pkgconfig
 file path=usr/include/X11/Xmu/CharSet.h
 file path=usr/include/X11/Xmu/CurUtil.h
 file path=usr/include/X11/Xmu/Error.h

--- a/pkg/manifests/x11-library-libxp.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxp.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,16 +23,6 @@
 set name=pkg.description \
     value="Xlib-based client API for the X Print extension to the X11 protocol"
 set name=pkg.summary value="libXp - X Print Client Library"
-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)
-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/man3xp
 file path=usr/lib/$(ARCH64)/libXp.so.1
 file path=usr/lib/$(ARCH64)/pkgconfig/xp.pc

--- a/pkg/manifests/x11-library-libxpm.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxpm.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,26 +23,7 @@
 set name=pkg.description \
     value="Xlib-based client API for handling images in the X Pixmap (XPM) format."
 set name=pkg.summary value="libXpm - X Pixmap (XPM) image file format library"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/X11/lib
-dir path=usr/X11/lib/$(ARCH64)
-dir path=usr/bin
-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/doc
 dir path=usr/share/doc/libXpm
-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/cxpm
 file path=usr/bin/sxpm
 file path=usr/include/X11/xpm.h

--- a/pkg/manifests/x11-library-libxrandr.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxrandr.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,19 +24,6 @@
     value="Xlib-based client API for the RANDR extension to the X11 protocol"
 set name=pkg.summary \
     value="libXrandr - X Resize, Rotate and Reflection extension client library"
-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/extensions
-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/man3xrandr
 file path=usr/include/X11/extensions/Xrandr.h
 file path=usr/lib/$(ARCH64)/libXrandr.so.2

--- a/pkg/manifests/x11-library-libxrender.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxrender.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,19 +24,6 @@
     value="Xlib-based client API for the RENDER extension to the X11 protocol"
 set name=pkg.summary \
     value="libXrender - library for the Render Extension to the X11 protocol"
-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/extensions
-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/libXrender
 file path=usr/include/X11/extensions/Xrender.h
 file path=usr/lib/$(ARCH64)/libXrender.so.1

--- a/pkg/manifests/x11-library-libxres.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxres.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,19 +23,6 @@
 set name=pkg.description \
     value="Xlib-based client API for the X-Resource extension to the X11 protocol"
 set name=pkg.summary value="libXRes - X-Resource extension client library"
-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/extensions
-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/man3xres
 file path=usr/include/X11/extensions/XRes.h
 file path=usr/lib/$(ARCH64)/libXRes.so.1

--- a/pkg/manifests/x11-library-libxscrnsaver.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxscrnsaver.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -25,19 +25,6 @@
     value="Xlib-based client API for the MIT-SCREEN-SAVER extension to the X11 protocol"
 set name=pkg.summary \
     value="libXss - X11 Screen Saver extension client library"
-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/extensions
-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/man3xss
 file path=usr/include/X11/extensions/scrnsaver.h
 file path=usr/lib/$(ARCH64)/libXss.so.1

--- a/pkg/manifests/x11-library-libxtst.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxtst.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,21 +24,7 @@
     value="Xlib-based client API for the XTEST and RECORD extensions to the X11 protocol"
 set name=pkg.summary \
     value="libXtst - X Test and Record extensions client library"
-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/extensions
-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/libXtst
-dir path=usr/share/man
 dir path=usr/share/man/man3xtst
 file path=usr/include/X11/extensions/XTest.h
 file path=usr/include/X11/extensions/record.h

--- a/pkg/manifests/x11-library-libxv.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxv.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,19 +23,6 @@
 set name=pkg.description \
     value="Xlib-based client API for the X Video (Xv) extension to the X11 protocol"
 set name=pkg.summary value="libXv - X Video (Xv) extension client library"
-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/extensions
-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/man3xv
 file path=usr/include/X11/extensions/Xvlib.h
 file path=usr/lib/$(ARCH64)/libXv.so.1

--- a/pkg/manifests/x11-library-libxvmc.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxvmc.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,19 +24,6 @@
     value="Xlib-based client API for the XVideo-MotionCompensation extension to the X11 protocol"
 set name=pkg.summary \
     value="libXvMC - X Video Motion Compensation extension client library"
-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/extensions
-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/libXvMC
 file path=usr/include/X11/extensions/XvMClib.h
 file path=usr/lib/$(ARCH64)/libXvMC.so.1

--- a/pkg/manifests/x11-library-libxxf86misc.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxxf86misc.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,16 +24,6 @@
     value="Xlib-based client API for the XFree86-Misc extension to the X11 protocol"
 set name=pkg.summary \
     value="libXxf86misc - XFree86-Misc X extension client library"
-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)
-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/man3xxf86misc
 file path=usr/lib/$(ARCH64)/libXxf86misc.so.1
 file path=usr/lib/$(ARCH64)/pkgconfig/xxf86misc.pc

--- a/pkg/manifests/x11-library-libxxf86vm.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-libxxf86vm.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,19 +24,6 @@
     value="Xlib-based client API for the XFree86-VidMode extension to the X11 protocol"
 set name=pkg.summary \
     value="libXxf86vm - XFree86-VidMode X extension client library"
-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/extensions
-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/man3xxf86vm
 file path=usr/include/X11/extensions/xf86vmode.h
 file path=usr/lib/$(ARCH64)/libXxf86vm.so.1

--- a/pkg/manifests/x11-library-mesa.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-mesa.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -24,29 +24,16 @@
     value="The Mesa 3-D graphics library is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics."
 set name=pkg.summary \
     value="Mesa - open-source implementation of the OpenGL specification"
-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/include/GL/internal
 dir path=usr/include/mesa
 dir path=usr/include/mesa/internal
-dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/$(ARCH64)/pkgconfig
 dir path=usr/lib/GL
 dir path=usr/lib/GL/$(ARCH64)
 dir path=usr/lib/mesa
 dir path=usr/lib/mesa/$(ARCH64)
 dir path=usr/lib/mesa/modules
 dir path=usr/lib/mesa/modules/extensions
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/xorg
-dir path=usr/lib/xorg/modules
-dir path=usr/lib/xorg/modules/dri
 file path=usr/include/mesa/GLwDrawA.h
 file path=usr/include/mesa/GLwDrawAP.h
 file path=usr/include/mesa/GLwMDrawA.h

--- a/pkg/manifests/x11-library-toolkit-libxaw4.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-toolkit-libxaw4.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,9 +24,5 @@
     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-library-toolkit-libxaw5.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-toolkit-libxaw5.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -24,12 +24,6 @@
     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 \

--- a/pkg/manifests/x11-library-toolkit-libxaw7.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-toolkit-libxaw7.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -25,21 +25,8 @@
     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

--- a/pkg/manifests/x11-library-toolkit-libxt.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-toolkit-libxt.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -23,21 +23,7 @@
 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/X11/app-defaults
 dir path=usr/share/man/man3xt
 file path=usr/include/X11/CallbackI.h
 file path=usr/include/X11/Composite.h

--- a/pkg/manifests/x11-library-xcb-util.p5m	Fri Jul 22 16:05:14 2011 -0700
+++ b/pkg/manifests/x11-library-xcb-util.p5m	Thu Jul 28 15:21:03 2011 -0700
@@ -27,15 +27,6 @@
 set name=pkg.description \
     value="XCB - The X11 C Protocol Bindings - Utility Libraries."
 set name=pkg.summary value="xcb-util - The X11 C protocol bindings utilities"
-dir path=usr
-dir path=usr/include
-dir path=usr/include/xcb
-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/xcb
 #
 file path=usr/include/xcb/xcb_atom.h
 file path=usr/include/xcb/xcb_aux.h