--- a/open-src/common/Makefile.inc Thu Sep 08 16:06:46 2011 -0700
+++ b/open-src/common/Makefile.inc Fri Sep 09 20:42:44 2011 -0700
@@ -676,8 +676,6 @@
MANIFEST_DEST=$(PWD)/tmp-proto-$(MACH)
MANIFEST_TMP=$(PWD)/tmp.p5m
-PKGFMT=/usr/bin/pkgfmt
-
MANIFEST_TARGETS_DEFAULT = $(MANIFEST_TARGETS_SET:yes=$(POUND_SIGN))
$(MANIFEST_TARGETS_DEFAULT) MANIFEST_TARGETS=$(MODULE_PKG_MANIFEST)
@@ -692,7 +690,7 @@
/usr/xpg4/bin/make $(MAKEFLAGS) install $(MANIFEST_INSTALL_RULES) \
|| (rm -rf $(MANIFEST_DEST) ; exit 1)
-$(MANIFEST_TMP): $(MANIFEST_DEST) $(PKGFMT)
+$(MANIFEST_TMP): $(MANIFEST_DEST)
$(PERL) $(TOP)/open-src/common/pkg-manifest-generate.pl \
input_manifest='$(MODULE_PKG_MANIFEST)' \
exception_manifest='$(PKG_SRC_DIR)/exceptions-validate_pkg.p5m' \
--- a/open-src/common/Makefile.init Thu Sep 08 16:06:46 2011 -0700
+++ b/open-src/common/Makefile.init Fri Sep 09 20:42:44 2011 -0700
@@ -374,6 +374,10 @@
# in each minor release train (1.8, 1.9, etc.)
NEXT_XSERVER_VERS=1.10.99
+# Version of pkgfmt output rules to apply
+PKGFMT_OUTPUT=v2
+PKGFMT= PKGFMT_OUTPUT=$(PKGFMT_OUTPUT) /usr/bin/pkgfmt
+
### Misc rules
# For use in debugging or calling from scripts like the code review helper
--- a/open-src/util/build-tools/find-build-errors Thu Sep 08 16:06:46 2011 -0700
+++ b/open-src/util/build-tools/find-build-errors Fri Sep 09 20:42:44 2011 -0700
@@ -352,6 +352,11 @@
$publisher = $1;
}
+ # Make pkgfmt issues better match the other patterns
+ if ($issue_type =~ m{pkgfmt}) {
+ $l =~ s{^pkgfmt:}{};
+ }
+
# Clear saved lines for each new class of issue
if (($l =~ m{^\S+ .*:+$}ms) || ($l =~ m{^\#\# })) {
$issue_type = $l;
--- a/pkg/Makefile Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/Makefile Fri Sep 09 20:42:44 2011 -0700
@@ -457,7 +457,12 @@
pmodes: $(PROC_PKGS) fix_perms
$(PKGDEBUG)validate_pkg -a $(PKGMACH) -M -m $(PDIR)
-check: protocmp pmodes lint
+check-pkgfmt: $(ALL_MANIFESTS)
+ @print "## Checking for manifests not in pkgfmt expected form"
+ $(PKGDEBUG)$(PKGFMT) -c $(ALL_MANIFESTS) || true
+ @print ""
+
+check: protocmp pmodes lint check-pkgfmt
# Instead of fixing all the upstream packages to follow our permission rules
# just fix the proto area to match our rules
--- a/pkg/X-all.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/X-all.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -22,8 +22,8 @@
#
set name=pkg.fmri value=pkg:/consolidation/X/X-all@$(OSPKGVERS)
+set name=pkg.summary value="X consolidation group package"
set name=pkg.description \
value="This group package installs all packages from the X Window System consolidation."
-set name=pkg.summary value="X consolidation group package"
set name=info.classification \
value="org.opensolaris.category.2008:Meta Packages/Group Packages"
--- a/pkg/X-incorporation.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/X-incorporation.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -22,9 +22,9 @@
#
set name=pkg.fmri value=pkg:/consolidation/X/X-incorporation@$(OSPKGVERS)
-set name=pkg.depend.install-hold value=core-os.X
+set name=pkg.summary value="X consolidation incorporation"
set name=pkg.description \
value="This incorporation constrains packages from the X Window System consolidation."
-set name=pkg.summary value="X consolidation incorporation"
+set name=pkg.depend.install-hold value=core-os.X
set name=info.classification \
value="org.opensolaris.category.2008:Meta Packages/Incorporations"
--- a/pkg/exceptions-validate_pkg.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/exceptions-validate_pkg.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -33,66 +33,67 @@
# 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
-$(i386_ONLY)dir path=etc/hal/fdi/policy
-$(i386_ONLY)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
-$(i386_ONLY)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
-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/doc/X11/specs/Xext
-dir path=usr/share/doc/X11/specs/Xserver
-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
+dir path=etc
+dir path=etc/hal
+dir path=etc/hal/fdi
+$(i386_ONLY)dir path=etc/hal/fdi/policy
+$(i386_ONLY)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
+$(i386_ONLY)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
+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/doc/X11/graphics
+dir path=usr/share/doc/X11/specs/Xext
+dir path=usr/share/doc/X11/specs/Xserver
+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/legacy/FSWxorg-fonts-core.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-core.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,10 +22,10 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-cyrillic.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-cyrillic.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-daewoo.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-daewoo.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-ethiopic.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-ethiopic.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-iso8859-10.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-iso8859-10.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-iso8859-13.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-iso8859-13.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-iso8859-14.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-iso8859-14.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-iso8859-16.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-iso8859-16.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-iso8859-2.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-iso8859-2.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-iso8859-3.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-iso8859-3.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-iso8859-4.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-iso8859-4.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-iso8859-9.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-iso8859-9.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-jiskan.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-jiskan.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-syriac.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-syriac.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts-vera.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts-vera.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/FSWxorg-fonts.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/FSWxorg-fonts.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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,18 @@
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
set name=variant.arch value=i386
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/SUNWastfbcf.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWastfbcf.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -23,4 +23,4 @@
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
set name=variant.arch value=sparc
-depend fmri=system/graphics/fbconfig/[email protected] type=require
+depend type=require fmri=system/graphics/fbconfig/[email protected]
--- a/pkg/legacy/SUNWefbcf.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWefbcf.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -23,4 +23,4 @@
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
set name=variant.arch value=sparc
-depend fmri=system/graphics/fbconfig/[email protected] type=require
+depend type=require fmri=system/graphics/fbconfig/[email protected]
--- a/pkg/legacy/SUNWefbw.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWefbw.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -23,4 +23,4 @@
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
set name=variant.arch value=sparc
-depend fmri=pkg:/x11/server/xorg/driver/[email protected] type=require
+depend type=require fmri=pkg:/x11/server/xorg/driver/[email protected]
--- a/pkg/legacy/SUNWfbc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfbc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -23,4 +23,4 @@
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
set name=variant.arch value=sparc
-depend fmri=system/graphics/[email protected] type=require
+depend type=require fmri=system/graphics/[email protected]
--- a/pkg/legacy/SUNWfont-daewoo-misc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-daewoo-misc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/[email protected] type=require
+depend type=require fmri=pkg:/system/font/[email protected]
--- a/pkg/legacy/SUNWfont-isas-misc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-isas-misc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/[email protected] type=require
+depend type=require fmri=pkg:/system/font/[email protected]
--- a/pkg/legacy/SUNWfont-jis-misc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-jis-misc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/[email protected] type=require
+depend type=require fmri=pkg:/system/font/[email protected]
--- a/pkg/legacy/SUNWfont-misc-ethiopic.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-misc-ethiopic.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/[email protected] type=require
+depend type=require fmri=pkg:/system/font/[email protected]
--- a/pkg/legacy/SUNWfont-misc-meltho.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-misc-meltho.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/[email protected] type=require
+depend type=require fmri=pkg:/system/font/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-core.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-core.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-cyrillic.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-cyrillic.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-1.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-1.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-10.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-10.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-11.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-11.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-13.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-13.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-14.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-14.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-15.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-15.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-16.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-16.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-2.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-2.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-3.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-3.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-4.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-4.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-5.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-5.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-7.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-7.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-8.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-8.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfont-xorg-iso8859-9.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfont-xorg-iso8859-9.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/xorg/[email protected] type=require
+depend type=require fmri=pkg:/system/font/xorg/[email protected]
--- a/pkg/legacy/SUNWfontconfig-docs.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfontconfig-docs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,5 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/library/fontconfig/[email protected] \
- type=require
+depend type=require \
+ fmri=pkg:/system/library/fontconfig/[email protected]
--- a/pkg/legacy/SUNWfontconfig.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfontconfig.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/library/[email protected] type=require
+depend type=require fmri=pkg:/system/library/[email protected]
--- a/pkg/legacy/SUNWfreetype2.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWfreetype2.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/library/[email protected] type=require
+depend type=require fmri=pkg:/system/library/[email protected]
--- a/pkg/legacy/SUNWpciaccess.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWpciaccess.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/diagnostic/[email protected] type=require
+depend type=require fmri=pkg:/diagnostic/[email protected]
--- a/pkg/legacy/SUNWpixman.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWpixman.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/library/graphics/[email protected] type=require
+depend type=require fmri=pkg:/library/graphics/[email protected]
--- a/pkg/legacy/SUNWsynergy.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWsynergy.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/desktop/[email protected] type=require
+depend type=require fmri=pkg:/desktop/[email protected]
--- a/pkg/legacy/SUNWttf-bh-luxi.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWttf-bh-luxi.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/truetype/[email protected] type=require
+depend type=require fmri=pkg:/system/font/truetype/[email protected]
--- a/pkg/legacy/SUNWttf-bitstream-vera.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWttf-bitstream-vera.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/truetype/[email protected] type=require
+depend type=require fmri=pkg:/system/font/truetype/[email protected]
--- a/pkg/legacy/SUNWttf-dejavu.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWttf-dejavu.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/truetype/[email protected] type=require
+depend type=require fmri=pkg:/system/font/truetype/[email protected]
--- a/pkg/legacy/SUNWttf-google-droid.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWttf-google-droid.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/truetype/[email protected] type=require
+depend type=require fmri=pkg:/system/font/truetype/[email protected]
--- a/pkg/legacy/SUNWttf-liberation.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWttf-liberation.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/system/font/truetype/[email protected] type=require
+depend type=require fmri=pkg:/system/font/truetype/[email protected]
--- a/pkg/legacy/SUNWvncviewer.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWvncviewer.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/desktop/remote-desktop/[email protected] type=require
+depend type=require fmri=pkg:/desktop/remote-desktop/[email protected]
--- a/pkg/legacy/SUNWxcompmgr.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxcompmgr.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxcursor-themes.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxcursor-themes.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/data/[email protected] type=require
+depend type=require fmri=pkg:/x11/data/[email protected]
--- a/pkg/legacy/SUNWxdm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxdm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/session/[email protected] type=require
+depend type=require fmri=pkg:/x11/session/[email protected]
--- a/pkg/legacy/SUNWxorg-client-docs.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-client-docs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/extension-clients/[email protected] type=require
+depend type=require fmri=pkg:/x11/extension-clients/[email protected]
--- a/pkg/legacy/SUNWxorg-client-programs.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-client-programs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxorg-clientlibs.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-clientlibs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/library/[email protected] type=require
+depend type=require fmri=pkg:/x11/library/[email protected]
--- a/pkg/legacy/SUNWxorg-compatlinks.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-compatlinks.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/compatibility/[email protected] type=require
+depend type=require fmri=pkg:/x11/compatibility/[email protected]
--- a/pkg/legacy/SUNWxorg-devel-docs.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-devel-docs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/SUNWxorg-doc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-doc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,5 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.130
set name=pkg.renamed value=true
-depend fmri=pkg:/[email protected] type=require
-depend fmri=pkg:/[email protected] type=require
+depend type=require fmri=pkg:/[email protected]
+depend type=require fmri=pkg:/[email protected]
--- a/pkg/legacy/SUNWxorg-graphics-ddx.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-graphics-ddx.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/server/xorg/driver/[email protected] type=require
+depend type=require fmri=pkg:/x11/server/xorg/driver/[email protected]
--- a/pkg/legacy/SUNWxorg-headers.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-headers.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/header/[email protected] type=require
+depend type=require fmri=pkg:/x11/header/[email protected]
--- a/pkg/legacy/SUNWxorg-mesa.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-mesa.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/library/[email protected] type=require
+depend type=require fmri=pkg:/x11/library/[email protected]
--- a/pkg/legacy/SUNWxorg-server.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-server.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/server/[email protected] type=require
+depend type=require fmri=pkg:/x11/server/[email protected]
--- a/pkg/legacy/SUNWxorg-tsol-module.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxorg-tsol-module.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/trusted/[email protected] type=require
+depend type=require fmri=pkg:/x11/trusted/[email protected]
--- a/pkg/legacy/SUNWxvnc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxvnc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/server/[email protected] type=require
+depend type=require fmri=pkg:/x11/server/[email protected]
--- a/pkg/legacy/SUNWxwacx.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwacx.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/keyboard/[email protected] type=require
+depend type=require fmri=pkg:/x11/keyboard/[email protected]
--- a/pkg/legacy/SUNWxwdem.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwdem.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxwdxm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwdxm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/library/motif/[email protected] type=require
+depend type=require fmri=pkg:/library/motif/[email protected]
--- a/pkg/legacy/SUNWxwfs.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwfs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxwfsw.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwfsw.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxwice.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwice.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/library/[email protected] type=require
+depend type=require fmri=pkg:/x11/library/[email protected]
--- a/pkg/legacy/SUNWxwinc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwinc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxwman.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwman.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxwopt.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwopt.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxwplr.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwplr.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxwplt.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwplt.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/[email protected] type=require
+depend type=require fmri=pkg:/x11/[email protected]
--- a/pkg/legacy/SUNWxwpmn.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwpmn.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/developer/[email protected] type=require
+depend type=require fmri=pkg:/x11/developer/[email protected]
--- a/pkg/legacy/SUNWxwrtl.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwrtl.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/compatibility/[email protected] type=require
+depend type=require fmri=pkg:/x11/compatibility/[email protected]
--- a/pkg/legacy/SUNWxwslb.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwslb.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/library/[email protected] type=require
+depend type=require fmri=pkg:/x11/library/[email protected]
--- a/pkg/legacy/SUNWxwxft.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/SUNWxwxft.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/library/[email protected] type=require
+depend type=require fmri=pkg:/x11/library/[email protected]
--- a/pkg/legacy/X-redistributable.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/X-redistributable.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,7 +21,6 @@
# DEALINGS IN THE SOFTWARE.
#
-set name=pkg.fmri \
- value=pkg:/consolidation/X/[email protected],5.11-0.170
+set name=pkg.fmri value=pkg:/consolidation/X/[email protected],5.11-0.170
set name=pkg.renamed value=true
-depend fmri=pkg:/consolidation/X/[email protected],5.11-0.170 type=require
+depend type=require fmri=pkg:/consolidation/X/[email protected],5.11-0.170
--- a/pkg/legacy/library-motif-libdpstkXm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/library-motif-libdpstkXm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,4 +22,4 @@
#
set name=pkg.fmri value=pkg:/library/motif/[email protected],5.11-0.134
set name=pkg.renamed value=true
-depend fmri=pkg:/library/motif/[email protected] type=require
+depend type=require fmri=pkg:/library/motif/[email protected]
--- a/pkg/legacy/system-library-fontconfig-documentation.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/system-library-fontconfig-documentation.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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,5 +23,5 @@
set name=pkg.fmri \
value=pkg:/system/library/fontconfig/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/system/library/[email protected] type=require \
+depend type=require fmri=pkg:/system/library/[email protected] \
facet.doc=true
--- a/pkg/legacy/x11-clients.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-clients.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-developer-manual.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-developer-manual.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/developer/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-extension-clients-manual.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-extension-clients-manual.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/extension-clients/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-extension-clients.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-extension-clients.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-header-header-xorg.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-header-header-xorg.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/header/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/x11/server/[email protected],5.11-0.144 type=require \
- facet.devel=true
+depend type=require fmri=pkg:/x11/server/[email protected],5.11-0.144 facet.devel=true
--- a/pkg/legacy/x11-header.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-header.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-library-extension-clients.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-library-extension-clients.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/library/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-library-lint.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-library-lint.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/library/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-manual.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-manual.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-optional-clients.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-optional-clients.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -22,5 +22,4 @@
#
set name=pkg.fmri value=pkg:/x11/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-server-xorg-driver-xorg-misc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-server-xorg-driver-xorg-misc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,47 +20,35 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
-set name=pkg.fmri \
- value=pkg:/x11/server/xorg/driver/[email protected],5.11-0.167
+set name=pkg.fmri value=pkg:/x11/server/xorg/driver/[email protected],5.11-0.167
set name=pkg.renamed value=true
# Depends on packages for video drivers split out of this package in snv_144
# and remaining after the removal of the EOF drivers in 153 & 162.
-depend fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-$(i386_ONLY)depend \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152 \
- type=require
-depend fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.167 \
- type=require
+depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+$(i386_ONLY)depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
+depend type=require \
+ fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.167
--- a/pkg/legacy/x11-server-xorg-driver-xorg-video-radeonhd.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-server-xorg-driver-xorg-video-radeonhd.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,5 +21,5 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/[email protected],5.11-0.162
+set name=pkg.obsolete value=true
set name=variant.arch value=i386
-set name=pkg.obsolete value=true
--- a/pkg/legacy/x11-session-xdm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-session-xdm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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,4 +23,4 @@
set name=pkg.fmri value=pkg:/x11/session/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/system/display-manager/[email protected],5.11-0.144 type=require
+depend type=require fmri=pkg:/system/display-manager/[email protected],5.11-0.144
--- a/pkg/legacy/x11-x11-config.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-x11-config.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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,5 +23,4 @@
set name=pkg.fmri value=pkg:/x11/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/compatibility/packages/[email protected],5.11-0.144 \
- type=require
+depend type=require fmri=pkg:/compatibility/packages/[email protected],5.11-0.144
--- a/pkg/legacy/x11-xcompmgr.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/legacy/x11-xcompmgr.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -1,5 +1,5 @@
#
-# 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,4 +23,4 @@
set name=pkg.fmri value=pkg:/x11/[email protected],5.11-0.144
set name=pkg.renamed value=true
-depend fmri=pkg:/desktop/window-manager/[email protected],5.11-0.144 type=require
+depend type=require fmri=pkg:/desktop/window-manager/[email protected],5.11-0.144
--- a/pkg/manifests/benchmark-x11perf.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/benchmark-x11perf.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/benchmark/x11perf@__version:x11perf__
+set name=pkg.summary value="x11perf - X11 server performance test program"
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/lib/X11/x11perfcomp
+link path=usr/X11/bin/x11perf target=../../bin/x11perf
+link path=usr/X11/bin/x11perfcomp target=../../bin/x11perfcomp
file path=usr/bin/x11perf
file path=usr/bin/x11perfcomp
+dir path=usr/lib/X11/x11perfcomp
file path=usr/lib/X11/x11perfcomp/Xmark mode=0555
file path=usr/lib/X11/x11perfcomp/fillblnk mode=0555
file path=usr/lib/X11/x11perfcomp/perfboth mode=0555
@@ -33,5 +35,3 @@
file path=usr/share/man/man1/Xmark.1
file path=usr/share/man/man1/x11perf.1
file path=usr/share/man/man1/x11perfcomp.1
-link path=usr/X11/bin/x11perf target=../../bin/x11perf
-link path=usr/X11/bin/x11perfcomp target=../../bin/x11perfcomp
--- a/pkg/manifests/compatibility-packages-SUNWxwinc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwinc.p5m Fri Sep 09 20:42:44 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,13 @@
# Headers are part of the developer facet
<transform depend -> set facet.devel true>
+
set name=pkg.fmri value=pkg:/compatibility/packages/SUNWxwinc@$(OSPKGVERS)
+set name=pkg.summary value="X Window System include files group"
set name=pkg.description \
value="A group package that provides the same core set of X11 headers and developer files as the SUNWxwinc package for prior Solaris releases"
-set name=pkg.summary value="X Window System include files group"
set name=facet.devel value=true
-set name=info.classification \
- value=org.opensolaris.category.2008:Development/X11
+set name=info.classification value=org.opensolaris.category.2008:Development/X11
legacy pkg=SUNWxwinc \
desc="X Window System header & pkgconfig files needed to build software" \
name="X Window System include files"
@@ -37,86 +37,86 @@
### Depends on packages split out of the old SVR4 versions
# util/util-macros
-depend fmri=pkg:/developer/build/autoconf/xorg-macros type=require
+depend type=require fmri=pkg:/developer/build/autoconf/xorg-macros
# data/xbitmaps
-depend fmri=pkg:/x11/data/xbitmaps type=require
+depend type=require fmri=pkg:/x11/data/xbitmaps
# proto/*
-depend fmri=pkg:/x11/header/x11-protocols type=require
+depend type=require fmri=pkg:/x11/header/x11-protocols
# lib/libfontenc
-depend fmri=pkg:/x11/library/libfontenc type=require
+depend type=require fmri=pkg:/x11/library/libfontenc
# lib/libFS
-depend fmri=pkg:/x11/library/libfs type=require
+depend type=require fmri=pkg:/x11/library/libfs
# lib/libICE
-depend fmri=pkg:/x11/library/libice type=require
+depend type=require fmri=pkg:/x11/library/libice
# lib/libSM
-depend fmri=pkg:/x11/library/libsm type=require
+depend type=require fmri=pkg:/x11/library/libsm
# lib/libX11
-depend fmri=pkg:/x11/library/libx11 type=require
+depend type=require fmri=pkg:/x11/library/libx11
# lib/libXau
-depend fmri=pkg:/x11/library/libxau type=require
+depend type=require fmri=pkg:/x11/library/libxau
# lib/libXcomposite
-depend fmri=pkg:/x11/library/libxcomposite type=require
+depend type=require fmri=pkg:/x11/library/libxcomposite
# lib/libXcursor
-depend fmri=pkg:/x11/library/libxcursor type=require
+depend type=require fmri=pkg:/x11/library/libxcursor
# lib/libXdamage
-depend fmri=pkg:/x11/library/libxdamage type=require
+depend type=require fmri=pkg:/x11/library/libxdamage
# lib/libXdmcp
-depend fmri=pkg:/x11/library/libxdmcp type=require
+depend type=require fmri=pkg:/x11/library/libxdmcp
# lib/libXevie
-depend fmri=pkg:/x11/library/libxevie type=require
+depend type=require fmri=pkg:/x11/library/libxevie
# lib/libXfixes
-depend fmri=pkg:/x11/library/libxfixes type=require
+depend type=require fmri=pkg:/x11/library/libxfixes
# lib/libXfont
-depend fmri=pkg:/x11/library/libxfont type=require
+depend type=require fmri=pkg:/x11/library/libxfont
# lib/libxkbfile
-depend fmri=pkg:/x11/library/libxkbfile type=require
+depend type=require fmri=pkg:/x11/library/libxkbfile
# lib/libXmu
-depend fmri=pkg:/x11/library/libxmu type=require
-depend fmri=pkg:/x11/library/libxmuu type=require
+depend type=require fmri=pkg:/x11/library/libxmu
+depend type=require fmri=pkg:/x11/library/libxmuu
# lib/libXp
-depend fmri=pkg:/x11/library/libxp type=require
+depend type=require fmri=pkg:/x11/library/libxp
# lib/libXpm
-depend fmri=pkg:/x11/library/libxpm type=require
+depend type=require fmri=pkg:/x11/library/libxpm
# lib/libXrandr
-depend fmri=pkg:/x11/library/libxrandr type=require
+depend type=require fmri=pkg:/x11/library/libxrandr
# lib/libXrender
-depend fmri=pkg:/x11/library/libxrender type=require
+depend type=require fmri=pkg:/x11/library/libxrender
# lib/libXres
-depend fmri=pkg:/x11/library/libxres type=require
+depend type=require fmri=pkg:/x11/library/libxres
# lib/libXtst
-depend fmri=pkg:/x11/library/libxtst type=require
+depend type=require fmri=pkg:/x11/library/libxtst
# lib/libXv
-depend fmri=pkg:/x11/library/libxv type=require
+depend type=require fmri=pkg:/x11/library/libxv
# lib/libXvMC
-depend fmri=pkg:/x11/library/libxvmc type=require
+depend type=require fmri=pkg:/x11/library/libxvmc
+
+# lib/libXt
+depend type=require fmri=pkg:/x11/library/toolkit/libxt
# lib/libxtrans
-depend fmri=pkg:/x11/library/xtrans type=require
-
-# lib/libXt
-depend fmri=pkg:/x11/library/toolkit/libxt type=require
+depend type=require fmri=pkg:/x11/library/xtrans
--- a/pkg/manifests/compatibility-packages-SUNWxwman.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwman.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -23,10 +23,11 @@
# Man pages are part of the man page facet
<transform depend -> set facet.doc.man true>
+
set name=pkg.fmri value=pkg:/compatibility/packages/SUNWxwman@$(OSPKGVERS)
+set name=pkg.summary value="X Window System user man pages group"
set name=pkg.description \
value="A group package that provides the same core set of X11 user manual pages as the SUNWxwman & SUNWxorg-client-docs package for prior Solaris releases"
-set name=pkg.summary value="X Window System user man pages group"
set name=facet.doc.man value=true
set name=info.classification value=org.opensolaris.category.2008:System/X11
legacy pkg=SUNWxorg-client-docs \
@@ -38,130 +39,130 @@
### Depends on packages split out of the old SVR4 versions
# app/x11perf
-depend fmri=pkg:/benchmark/x11perf type=require
+depend type=require fmri=pkg:/benchmark/x11perf
# app/twm
-depend fmri=pkg:/desktop/window-manager/twm type=require
+depend type=require fmri=pkg:/desktop/window-manager/twm
# util/imake, xorg-cf-files
-depend fmri=pkg:/developer/build/imake type=require
+depend type=require fmri=pkg:/developer/build/imake
# util/makedepend
-depend fmri=pkg:/developer/build/makedepend type=require
+depend type=require fmri=pkg:/developer/build/makedepend
# app/constype
-depend fmri=pkg:/diagnostic/constype type=require
+depend type=require fmri=pkg:/diagnostic/constype
# app/xload
-depend fmri=pkg:/diagnostic/xload type=require
+depend type=require fmri=pkg:/diagnostic/xload
# app/xditview
-depend fmri=pkg:/document/viewer/xditview type=require
+depend type=require fmri=pkg:/document/viewer/xditview
# app/xedit
-depend fmri=pkg:/editor/xedit type=require
+depend type=require fmri=pkg:/editor/xedit
# app/bitmap
-depend fmri=pkg:/image/editor/bitmap type=require
+depend type=require fmri=pkg:/image/editor/bitmap
# app/xcursorgen
-depend fmri=pkg:/image/xcursorgen type=require
+depend type=require fmri=pkg:/image/xcursorgen
# app/luit
-depend fmri=pkg:/terminal/luit type=require
+depend type=require fmri=pkg:/terminal/luit
# app/xterm
-depend fmri=pkg:/terminal/xterm type=require
-
-# app/oclock
-depend fmri=pkg:/x11/oclock type=require
+depend type=require fmri=pkg:/terminal/xterm
-# app/xbiff
-depend fmri=pkg:/x11/xbiff type=require
-
-# app/xcalc
-depend fmri=pkg:/x11/xcalc type=require
-
-# app/xclipboard
-depend fmri=pkg:/x11/xclipboard type=require
+# app/cmap_alloc, cmap_compact, xcolor, xstdcmap
+depend type=require fmri=pkg:/x11/colormap-utilities
# app/ico, xeyes, xgc, xlogo
-depend fmri=pkg:/x11/demo type=require
+depend type=require fmri=pkg:/x11/demo
# app/xdpyinfo, xdriinfo, xlsatoms, xlsclients, xlsfonts, xlswins, xwininfo
-depend fmri=pkg:/x11/diagnostic/x11-info-clients type=require
+depend type=require fmri=pkg:/x11/diagnostic/x11-info-clients
# app/xev
-depend fmri=pkg:/x11/diagnostic/xev type=require
+depend type=require fmri=pkg:/x11/diagnostic/xev
# app/xscope
-depend fmri=pkg:/x11/diagnostic/xscope type=require
+depend type=require fmri=pkg:/x11/diagnostic/xscope
# doc/xorg-docs
-depend fmri=pkg:/x11/documentation/xorg-docs type=require
+depend type=require fmri=pkg:/x11/documentation/xorg-docs
# app/bdftopcf, mkfontdir, mkfontscale
-depend fmri=pkg:/x11/font-utilities type=require
+depend type=require fmri=pkg:/x11/font-utilities
# app/setxkbmap, xkbprint, xkbutils
-depend fmri=pkg:/x11/keyboard/xkb-utilities type=require
+depend type=require fmri=pkg:/x11/keyboard/xkb-utilities
# app/iceauth
-depend fmri=pkg:/x11/library/libice type=require
+depend type=require fmri=pkg:/x11/library/libice
# lib/libXpm
-depend fmri=pkg:/x11/library/libxpm type=require
+depend type=require fmri=pkg:/x11/library/libxpm
# app/lbxproxy, proxymgr, xfindproxy, xfwp
-depend fmri=pkg:/x11/network/x11-network-proxies type=require
+depend type=require fmri=pkg:/x11/network/x11-network-proxies
+
+# app/oclock
+depend type=require fmri=pkg:/x11/oclock
# app/sessreg
-depend fmri=pkg:/x11/session/sessreg type=require
+depend type=require fmri=pkg:/x11/session/sessreg
# app/smproxy
-depend fmri=pkg:/x11/session/smproxy type=require
+depend type=require fmri=pkg:/x11/session/smproxy
# app/xauth
-depend fmri=pkg:/x11/session/xauth type=require
+depend type=require fmri=pkg:/x11/session/xauth
# app/xinit
-depend fmri=pkg:/x11/session/xinit type=require
+depend type=require fmri=pkg:/x11/session/xinit
+
+# app/rgb, xcmsdb, xhost, xmodmap, xprop, xrdb, xrefresh, xset, xsetroot
+depend type=require fmri=pkg:/x11/x11-server-utilities
+
+# app/xpr, xwd, xwud
+depend type=require fmri=pkg:/x11/x11-window-dump
+
+# app/xbiff
+depend type=require fmri=pkg:/x11/xbiff
+
+# app/xcalc
+depend type=require fmri=pkg:/x11/xcalc
+
+# app/xclipboard
+depend type=require fmri=pkg:/x11/xclipboard
+
+# app/xconsole
+depend type=require fmri=pkg:/x11/xconsole
+
+# app/xfd
+depend type=require fmri=pkg:/x11/xfd
+
+# app/xfontsel
+depend type=require fmri=pkg:/x11/xfontsel
+
+# app/xfs
+depend type=require fmri=pkg:/x11/xfs
+
+# app/fslsfonts, fstobdf, showfont, xfsinfo
+depend type=require fmri=pkg:/x11/xfs/xfs-utilities
+
+# app/xkill
+depend type=require fmri=pkg:/x11/xkill
+
+# app/xlock
+depend type=require fmri=pkg:/x11/xlock
+
+# app/xmag, xmag_multivis
+depend type=require fmri=pkg:/x11/xmag
+
+# app/xman
+depend type=require fmri=pkg:/x11/xman
# app/appres, editres, listres, viewres
-depend fmri=pkg:/x11/xt-resource-utilities type=require
-
-# app/cmap_alloc, cmap_compact, xcolor, xstdcmap
-depend fmri=pkg:/x11/colormap-utilities type=require
-
-# app/rgb, xcmsdb, xhost, xmodmap, xprop, xrdb, xrefresh, xset, xsetroot
-depend fmri=pkg:/x11/x11-server-utilities type=require
-
-# app/xpr, xwd, xwud
-depend fmri=pkg:/x11/x11-window-dump type=require
-
-# app/xconsole
-depend fmri=pkg:/x11/xconsole type=require
-
-# app/xfd
-depend fmri=pkg:/x11/xfd type=require
-
-# app/xfontsel
-depend fmri=pkg:/x11/xfontsel type=require
-
-# app/xkill
-depend fmri=pkg:/x11/xkill type=require
-
-# app/xlock
-depend fmri=pkg:/x11/xlock type=require
-
-# app/xmag, xmag_multivis
-depend fmri=pkg:/x11/xmag type=require
-
-# app/xman
-depend fmri=pkg:/x11/xman type=require
-
-# app/xfs
-depend fmri=pkg:/x11/xfs type=require
-
-# app/fslsfonts, fstobdf, showfont, xfsinfo
-depend fmri=pkg:/x11/xfs/xfs-utilities type=require
+depend type=require fmri=pkg:/x11/xt-resource-utilities
--- a/pkg/manifests/compatibility-packages-SUNWxwopt.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwopt.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/compatibility/packages/SUNWxwopt@$(OSPKGVERS)
+set name=pkg.summary \
+ value="X Window System optional client libraries and applications group"
set name=pkg.description \
value="A group package that provides the same core set of X11 client programs and libraries as the SUNWxwopt package for prior Solaris releases"
-set name=pkg.summary \
- value="X Window System optional client libraries and applications group"
set name=info.classification value=org.opensolaris.category.2008:System/X11
legacy pkg=SUNWxwopt desc="X Window System Optional Clients" \
name="X Window System Optional Clients"
@@ -31,58 +31,58 @@
### Depends on packages split out of the old SVR4 versions
# twm
-depend fmri=pkg:/desktop/window-manager/twm type=require
+depend type=require fmri=pkg:/desktop/window-manager/twm
# imake, xorg-cf-files
-depend fmri=pkg:/developer/build/imake type=require
+depend type=require fmri=pkg:/developer/build/imake
# makedepend
-depend fmri=pkg:/developer/build/makedepend type=require
+depend type=require fmri=pkg:/developer/build/makedepend
# xload
-depend fmri=pkg:/diagnostic/xload type=require
+depend type=require fmri=pkg:/diagnostic/xload
# xditview
-depend fmri=pkg:/document/viewer/xditview type=require
+depend type=require fmri=pkg:/document/viewer/xditview
# xedit
-depend fmri=pkg:/editor/xedit type=require
+depend type=require fmri=pkg:/editor/xedit
# bitmap
-depend fmri=pkg:/image/editor/bitmap type=require
+depend type=require fmri=pkg:/image/editor/bitmap
# xcursorgen
-depend fmri=pkg:/image/xcursorgen type=require
+depend type=require fmri=pkg:/image/xcursorgen
+
+# xcolor
+depend type=require fmri=pkg:/x11/colormap-utilities
+
+# lbxproxy, proxymngr, xfindproxy, xfwp
+depend type=require fmri=pkg:/x11/network/x11-network-proxies
# oclock
-depend fmri=pkg:/x11/oclock type=require
+depend type=require fmri=pkg:/x11/oclock
+
+# rgb, xcmsdb
+depend type=require fmri=pkg:/x11/x11-server-utilities
# xbiff
-depend fmri=pkg:/x11/xbiff type=require
+depend type=require fmri=pkg:/x11/xbiff
# xclipboard
-depend fmri=pkg:/x11/xclipboard type=require
+depend type=require fmri=pkg:/x11/xclipboard
# xclock
-depend fmri=pkg:/x11/xclock type=require
+depend type=require fmri=pkg:/x11/xclock
+
+# xconsole
+depend type=require fmri=pkg:/x11/xconsole
-# lbxproxy, proxymngr, xfindproxy, xfwp
-depend fmri=pkg:/x11/network/x11-network-proxies type=require
+# xfontsel
+depend type=require fmri=pkg:/x11/xfontsel
+
+# xman
+depend type=require fmri=pkg:/x11/xman
# appres, editres, listres, viewres
-depend fmri=pkg:/x11/xt-resource-utilities type=require
-
-# xcolor
-depend fmri=pkg:/x11/colormap-utilities type=require
-
-# rgb, xcmsdb
-depend fmri=pkg:/x11/x11-server-utilities type=require
-
-# xconsole
-depend fmri=pkg:/x11/xconsole type=require
-
-# xfontsel
-depend fmri=pkg:/x11/xfontsel type=require
-
-# xman
-depend fmri=pkg:/x11/xman type=require
+depend type=require fmri=pkg:/x11/xt-resource-utilities
--- a/pkg/manifests/compatibility-packages-SUNWxwplr.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwplr.p5m Fri Sep 09 20:42:44 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"),
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/compatibility/packages/SUNWxwplr@$(OSPKGVERS)
+set name=pkg.summary \
+ value="X Window System platform software configuration group"
set name=pkg.description \
value="A group package that provides the same set of SMF services and configuration files as the SUNWxwplr package for prior Solaris releases"
-set name=pkg.summary \
- value="X Window System platform software configuration group"
set name=info.classification value=org.opensolaris.category.2008:System/X11
legacy pkg=SUNWxwplr desc="X Window System platform software configuration" \
name="X Window System platform software configuration"
@@ -31,14 +31,14 @@
### Depends on packages split out of the old SVR4 versions
# application/opengl/ogl-select SMF service
-depend fmri=pkg:/service/opengl/ogl-select type=require
+depend type=require fmri=pkg:/service/opengl/ogl-select
# etc/security/auth_attr entries for solaris.smf.manage.font
-depend fmri=pkg:/system/library/fontconfig type=require
+depend type=require fmri=pkg:/system/library/fontconfig
# etc/security/auth_attr & prof_attr entries for solaris.smf.manage.x11
# and application/x11/x11-server SMF service
-depend fmri=pkg:/x11/server/xserver-common type=require
+depend type=require fmri=pkg:/x11/server/xserver-common
# application/x11/xfs SMF service, /etc/X11/fontpath.d catalogue directory
-depend fmri=pkg:/x11/xfs type=require
+depend type=require fmri=pkg:/x11/xfs
--- a/pkg/manifests/compatibility-packages-SUNWxwplt.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwplt.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/compatibility/packages/SUNWxwplt@$(OSPKGVERS)
+set name=pkg.summary \
+ value="X Window System core client libraries and applications group"
set name=pkg.description \
value="A group package that provides the same core set of X11 client programs and libraries as the SUNWxwplt and SUNWxorg-client-programs packages for prior Solaris releases"
-set name=pkg.summary \
- value="X Window System core client libraries and applications group"
set name=info.classification value=org.opensolaris.category.2008:System/X11
legacy pkg=SUNWxorg-client-programs \
desc="X Window System client programs based on X.Org Foundation open source release" \
@@ -38,186 +38,186 @@
### Depends on packages split out of the old SVR4 versions
# app/x11perf
-depend fmri=pkg:/benchmark/x11perf type=require
+depend type=require fmri=pkg:/benchmark/x11perf
# app/constype
-depend fmri=pkg:/diagnostic/constype type=require
+depend type=require fmri=pkg:/diagnostic/constype
# app/kbd_mode
-depend fmri=pkg:/system/keyboard/kbd_mode type=require
+depend type=require fmri=pkg:/system/keyboard/kbd_mode
# app/fbconsole
-depend fmri=pkg:/terminal/fbconsole type=require
+depend type=require fmri=pkg:/terminal/fbconsole
# app/luit
-depend fmri=pkg:/terminal/luit type=require
+depend type=require fmri=pkg:/terminal/luit
# app/xterm
-depend fmri=pkg:/terminal/xterm type=require
+depend type=require fmri=pkg:/terminal/xterm
-# app/xcalc
-depend fmri=pkg:/x11/xcalc type=require
+# app/cmap_alloc, cmap_compact, xstdcmap
+depend type=require fmri=pkg:/x11/colormap-utilities
# data/workspace-patterns
-depend fmri=pkg:/x11/data/workspace-patterns type=require
+depend type=require fmri=pkg:/x11/data/workspace-patterns
# data/xbitmaps
-depend fmri=pkg:/x11/data/xbitmaps type=require
+depend type=require fmri=pkg:/x11/data/xbitmaps
# app/xlogo
-depend fmri=pkg:/x11/demo type=require
+depend type=require fmri=pkg:/x11/demo
# app/xdpyinfo, xlsatoms, xlsclients, xlsfonts, xlswins, xvinfo, xwininfo
-depend fmri=pkg:/x11/diagnostic/x11-info-clients type=require
+depend type=require fmri=pkg:/x11/diagnostic/x11-info-clients
# app/bdftopcf
-depend fmri=pkg:/x11/font-utilities type=require
+depend type=require fmri=pkg:/x11/font-utilities
# app/setxkbmap, xkbprint, xkbutils
-depend fmri=pkg:/x11/keyboard/xkb-utilities type=require
+depend type=require fmri=pkg:/x11/keyboard/xkb-utilities
# lib/DPS
-depend fmri=pkg:/x11/library/dps type=require
+depend type=require fmri=pkg:/x11/library/dps
# lib/libdga
-depend fmri=pkg:/x11/library/libdga type=require
+depend type=require fmri=pkg:/x11/library/libdga
# lib/libFS
-depend fmri=pkg:/x11/library/libfs type=require
+depend type=require fmri=pkg:/x11/library/libfs
# lib/libSM
-depend fmri=pkg:/x11/library/libsm type=require
+depend type=require fmri=pkg:/x11/library/libsm
# lib/libX11
-depend fmri=pkg:/x11/library/libx11 type=require
+depend type=require fmri=pkg:/x11/library/libx11
# lib/libXau
-depend fmri=pkg:/x11/library/libxau type=require
+depend type=require fmri=pkg:/x11/library/libxau
# lib/libXcomposite
-depend fmri=pkg:/x11/library/libxcomposite type=require
+depend type=require fmri=pkg:/x11/library/libxcomposite
# lib/libXcursor
-depend fmri=pkg:/x11/library/libxcursor type=require
+depend type=require fmri=pkg:/x11/library/libxcursor
# lib/libXdamage
-depend fmri=pkg:/x11/library/libxdamage type=require
+depend type=require fmri=pkg:/x11/library/libxdamage
# lib/libXdmcp
-depend fmri=pkg:/x11/library/libxdmcp type=require
+depend type=require fmri=pkg:/x11/library/libxdmcp
# lib/libXevie
-depend fmri=pkg:/x11/library/libxevie type=require
+depend type=require fmri=pkg:/x11/library/libxevie
# lib/libXext
-depend fmri=pkg:/x11/library/libxext type=require
+depend type=require fmri=pkg:/x11/library/libxext
# lib/libXfixes
-depend fmri=pkg:/x11/library/libxfixes type=require
+depend type=require fmri=pkg:/x11/library/libxfixes
# lib/libXi
-depend fmri=pkg:/x11/library/libxi type=require
+depend type=require fmri=pkg:/x11/library/libxi
# lib/libXinerama
-depend fmri=pkg:/x11/library/libxinerama type=require
+depend type=require fmri=pkg:/x11/library/libxinerama
# lib/libxkbfile
-depend fmri=pkg:/x11/library/libxkbfile type=require
+depend type=require fmri=pkg:/x11/library/libxkbfile
# lib/libXmu
-depend fmri=pkg:/x11/library/libxmu type=require
-depend fmri=pkg:/x11/library/libxmuu type=require
+depend type=require fmri=pkg:/x11/library/libxmu
+depend type=require fmri=pkg:/x11/library/libxmuu
# lib/libXp
-depend fmri=pkg:/x11/library/libxp type=require
+depend type=require fmri=pkg:/x11/library/libxp
# lib/libXpm
-depend fmri=pkg:/x11/library/libxpm type=require
+depend type=require fmri=pkg:/x11/library/libxpm
# lib/libXrandr
-depend fmri=pkg:/x11/library/libxrandr type=require
+depend type=require fmri=pkg:/x11/library/libxrandr
# lib/libXrender
-depend fmri=pkg:/x11/library/libxrender type=require
+depend type=require fmri=pkg:/x11/library/libxrender
# lib/libXres
-depend fmri=pkg:/x11/library/libxres type=require
+depend type=require fmri=pkg:/x11/library/libxres
# lib/libXScrnSaver
-depend fmri=pkg:/x11/library/libxscrnsaver type=require
+depend type=require fmri=pkg:/x11/library/libxscrnsaver
# lib/libXtst
-depend fmri=pkg:/x11/library/libxtst type=require
+depend type=require fmri=pkg:/x11/library/libxtst
# lib/libXv
-depend fmri=pkg:/x11/library/libxv type=require
+depend type=require fmri=pkg:/x11/library/libxv
# lib/libXvMC
-depend fmri=pkg:/x11/library/libxvmc type=require
+depend type=require fmri=pkg:/x11/library/libxvmc
# lib/libXxf86misc
-depend fmri=pkg:/x11/library/libxxf86misc type=require
+depend type=require fmri=pkg:/x11/library/libxxf86misc
# lib/libXxf86vm
-depend fmri=pkg:/x11/library/libxxf86vm type=require
+depend type=require fmri=pkg:/x11/library/libxxf86vm
+
+# lib/libXaw4
+depend type=require fmri=pkg:/x11/library/toolkit/libxaw4
+
+# lib/libXaw5
+depend type=require fmri=pkg:/x11/library/toolkit/libxaw5
+
+# lib/libXaw
+depend type=require fmri=pkg:/x11/library/toolkit/libxaw7
+
+# lib/libXt
+depend type=require fmri=pkg:/x11/library/toolkit/libxt
# lib/libxtrans
-depend fmri=pkg:/x11/library/xtrans type=require
+depend type=require fmri=pkg:/x11/library/xtrans
# app/sessreg
-depend fmri=pkg:/x11/session/sessreg type=require
+depend type=require fmri=pkg:/x11/session/sessreg
# app/smproxy
-depend fmri=pkg:/x11/session/smproxy type=require
+depend type=require fmri=pkg:/x11/session/smproxy
# app/winsysck
-depend fmri=pkg:/x11/session/winsysck type=require
+depend type=require fmri=pkg:/x11/session/winsysck
# app/mkcookie, xauth
-depend fmri=pkg:/x11/session/xauth type=require
+depend type=require fmri=pkg:/x11/session/xauth
# app/xinit
-depend fmri=pkg:/x11/session/xinit type=require
-
-# lib/libXaw4
-depend fmri=pkg:/x11/library/toolkit/libxaw4 type=require
-
-# lib/libXaw5
-depend fmri=pkg:/x11/library/toolkit/libxaw5 type=require
-
-# lib/libXaw
-depend fmri=pkg:/x11/library/toolkit/libxaw7 type=require
-
-# lib/libXt
-depend fmri=pkg:/x11/library/toolkit/libxt type=require
+depend type=require fmri=pkg:/x11/session/xinit
# lib/libXtsol
-depend fmri=pkg:/x11/trusted/libxtsol type=require
-
-# app/cmap_alloc, cmap_compact, xstdcmap
-depend fmri=pkg:/x11/colormap-utilities type=require
+depend type=require fmri=pkg:/x11/trusted/libxtsol
# app/rgb, xgamma, xhost, xinput, xmodmap, xprop, xrandr, xrdb
# xrefresh, xset, xsetroot
-depend fmri=pkg:/x11/x11-server-utilities type=require
+depend type=require fmri=pkg:/x11/x11-server-utilities
# app/xpr, xwd, xwud
-depend fmri=pkg:/x11/x11-window-dump type=require
+depend type=require fmri=pkg:/x11/x11-window-dump
+
+# app/xcalc
+depend type=require fmri=pkg:/x11/xcalc
# app/xfd
-depend fmri=pkg:/x11/xfd type=require
+depend type=require fmri=pkg:/x11/xfd
+
+# app/fslsfonts, fstobdf, showfont, xfsinfo
+depend type=require fmri=pkg:/x11/xfs/xfs-utilities
# app/xkill
-depend fmri=pkg:/x11/xkill type=require
+depend type=require fmri=pkg:/x11/xkill
# app/xlock
-depend fmri=pkg:/x11/xlock type=require
+depend type=require fmri=pkg:/x11/xlock
# app/xmag
-depend fmri=pkg:/x11/xmag type=require
+depend type=require fmri=pkg:/x11/xmag
# app/xvidtune
-depend fmri=pkg:/x11/xvidtune type=require
-
-# app/fslsfonts, fstobdf, showfont, xfsinfo
-depend fmri=pkg:/x11/xfs/xfs-utilities type=require
+depend type=require fmri=pkg:/x11/xvidtune
--- a/pkg/manifests/compatibility-packages-SUNWxwpmn.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwpmn.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -23,61 +23,61 @@
# Man pages are part of the man page facet
<transform depend fmri=pkg:/x11/library/.* -> set facet.doc.man true>
+
set name=pkg.fmri value=pkg:/compatibility/packages/SUNWxwpmn@$(OSPKGVERS)
+set name=pkg.summary value="X Window System programmers man pages group"
set name=pkg.description \
value="A group package that provides the same core set of X11 developer manual pages as the SUNWxwpmn and SUNWxorg-devel-docs packages for prior Solaris releases"
-set name=pkg.summary value="X Window System programmers man pages group"
-set name=info.classification \
- value=org.opensolaris.category.2008:Development/X11
+set name=info.classification value=org.opensolaris.category.2008:Development/X11
legacy pkg=SUNWxwpmn desc="X Window System programmers reference manual pages" \
name="X Window System programmers man pages"
### Depends on packages split out of the old SVR4 versions
# lib/libX11
-depend fmri=pkg:/x11/library/libx11 type=require
+depend type=require fmri=pkg:/x11/library/libx11
# lib/libXau
-depend fmri=pkg:/x11/library/libxau type=require
+depend type=require fmri=pkg:/x11/library/libxau
# lib/libXcomposite
-depend fmri=pkg:/x11/library/libxcomposite type=require
+depend type=require fmri=pkg:/x11/library/libxcomposite
# lib/libXevie
-depend fmri=pkg:/x11/library/libxevie type=require
+depend type=require fmri=pkg:/x11/library/libxevie
# lib/libXext
-depend fmri=pkg:/x11/library/libxext type=require
+depend type=require fmri=pkg:/x11/library/libxext
# lib/libXfixes
-depend fmri=pkg:/x11/library/libxfixes type=require
+depend type=require fmri=pkg:/x11/library/libxfixes
# lib/libXft
-depend fmri=pkg:/x11/library/libxft type=require
+depend type=require fmri=pkg:/x11/library/libxft
# lib/libXi
-depend fmri=pkg:/x11/library/libxi type=require
+depend type=require fmri=pkg:/x11/library/libxi
# lib/libXinerama
-depend fmri=pkg:/x11/library/libxinerama type=require
+depend type=require fmri=pkg:/x11/library/libxinerama
# lib/libXmu
-depend fmri=pkg:/x11/library/libxmu type=require
+depend type=require fmri=pkg:/x11/library/libxmu
# lib/libXp
-depend fmri=pkg:/x11/library/libxp type=require
+depend type=require fmri=pkg:/x11/library/libxp
# lib/libXrandr
-depend fmri=pkg:/x11/library/libxrandr type=require
+depend type=require fmri=pkg:/x11/library/libxrandr
# lib/libXScrnSaver
-depend fmri=pkg:/x11/library/libxscrnsaver type=require
+depend type=require fmri=pkg:/x11/library/libxscrnsaver
# lib/libXtst
-depend fmri=pkg:/x11/library/libxtst type=require
+depend type=require fmri=pkg:/x11/library/libxtst
# lib/libXv
-depend fmri=pkg:/x11/library/libxv type=require
+depend type=require fmri=pkg:/x11/library/libxv
# lib/libXt
-depend fmri=pkg:/x11/library/toolkit/libxt type=require
+depend type=require fmri=pkg:/x11/library/toolkit/libxt
--- a/pkg/manifests/compatibility-packages-SUNWxwslb.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwslb.p5m Fri Sep 09 20:42:44 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,10 +23,11 @@
# Lint libraries are part of the developer facet
<transform depend fmri=pkg:/x11/library/.* -> set facet.devel true>
+
set name=pkg.fmri value=pkg:/compatibility/packages/SUNWxwslb@$(OSPKGVERS)
+set name=pkg.summary value="X Window System lint libraries group"
set name=pkg.description \
value="A group package that provides the same set of lint libraries for X11 client libraries as the SUNWxwslb package for prior Solaris releases"
-set name=pkg.summary value="X Window System lint libraries group"
set name=info.classification value=org.opensolaris.category.2008:System/X11
legacy pkg=SUNWxwslb desc="X Window System lint libraries" \
name="X Window System lint libraries for programmers."
@@ -34,18 +35,25 @@
### Depends on packages delivering the libraries now
# lib/llib-lFS.ln
-depend fmri=pkg:/x11/library/libfs type=require
+depend type=require fmri=pkg:/x11/library/libfs
+
# lib/llib-lX11.ln
-depend fmri=pkg:/x11/library/libx11 type=require
+depend type=require fmri=pkg:/x11/library/libx11
+
# lib/llib-lXau.ln
-depend fmri=pkg:/x11/library/libxau type=require
+depend type=require fmri=pkg:/x11/library/libxau
+
# lib/llib-lXdmcp.ln
-depend fmri=pkg:/x11/library/libxdmcp type=require
+depend type=require fmri=pkg:/x11/library/libxdmcp
+
# lib/llib-lXext.ln
-depend fmri=pkg:/x11/library/libxext type=require
+depend type=require fmri=pkg:/x11/library/libxext
+
# lib/llib-lXmu.ln, lib/llib-lXmuu.ln
-depend fmri=pkg:/x11/library/libxmu type=require
+depend type=require fmri=pkg:/x11/library/libxmu
+
# lib/llib-lXss.ln
-depend fmri=pkg:/x11/library/libxscrnsaver type=require
+depend type=require fmri=pkg:/x11/library/libxscrnsaver
+
# lib/llib-lXv.ln
-depend fmri=pkg:/x11/library/libxv type=require
+depend type=require fmri=pkg:/x11/library/libxv
--- a/pkg/manifests/desktop-remote-desktop-tigervnc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/desktop-remote-desktop-tigervnc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -29,9 +29,9 @@
set name=pkg.fmri \
value=pkg:/desktop/remote-desktop/tigervnc@__version:tigervnc__
+set name=pkg.summary value="TigerVNC client"
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"
file path=usr/bin/vncviewer
file path=usr/share/man/man1/vncviewer.1
legacy pkg=SUNWvncviewer \
--- a/pkg/manifests/desktop-synergy.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/desktop-synergy.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/desktop/synergy@__version:synergy__
+set name=pkg.summary value="Synergy: Mouse and Keyboard Sharing"
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"
file path=usr/bin/synergyc
file path=usr/bin/synergys
legacy pkg=SUNWsynergy \
--- a/pkg/manifests/desktop-window-manager-twm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/desktop-window-manager-twm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,17 +20,17 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/desktop/window-manager/twm@__version:twm__
+set name=pkg.summary value="twm - Tab Window Manager for the X Window System"
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/share/X11/twm
+link path=usr/X11/bin/twm target=../../bin/twm
file path=usr/bin/twm
+dir path=usr/share/X11/twm
file path=usr/share/X11/twm/system.twmrc
file path=usr/share/man/man1/twm.1
-link path=usr/X11/bin/twm target=../../bin/twm
# system.twmrc uses -adobe-helvetica-* fonts
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
+depend type=require fmri=pkg:/system/font/xorg/xorg-core
# system.twmrc includes an xterm menu item
-depend fmri=pkg:/terminal/xterm type=require
+depend type=require fmri=pkg:/terminal/xterm
# twm loads various bitmaps via XmuLocateBitmapFile
-depend fmri=pkg:/x11/data/xbitmaps type=require
+depend type=require fmri=pkg:/x11/data/xbitmaps
--- a/pkg/manifests/desktop-window-manager-xcompmgr.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/desktop-window-manager-xcompmgr.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/desktop/window-manager/xcompmgr@__version:xcompmgr__
+set name=pkg.summary value="xcompmgr - sample X compositing manager"
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"
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/developer-build-autoconf-xorg-macros.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,10 @@
#
set name=pkg.fmri \
value=pkg:/developer/build/autoconf/xorg-macros@__version:util-macros__
+set name=pkg.summary value="GNU autoconf macros for X.Org software packages"
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/share/xorg-macros
file path=usr/share/aclocal/xorg-macros.m4
file path=usr/share/pkgconfig/xorg-macros.pc
+dir path=usr/share/xorg-macros
file path=usr/share/xorg-macros/INSTALL
--- a/pkg/manifests/developer-build-imake.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/developer-build-imake.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,14 +20,17 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/developer/build/imake@__version:imake__
+set name=pkg.summary value="imake - makefile generation tool from X.Org"
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/lib/X11
-dir path=usr/lib/X11/config
+link path=usr/X11/bin/imake target=../../bin/imake
+link path=usr/X11/bin/mkdirhier target=../../bin/mkdirhier
+link path=usr/X11/bin/xmkmf target=../../bin/xmkmf
file path=usr/bin/imake
file path=usr/bin/mkdirhier
file path=usr/bin/xmkmf
+dir path=usr/lib/X11
+dir path=usr/lib/X11/config
file path=usr/lib/X11/config/Amoeba.cf
file path=usr/lib/X11/config/DGUX.cf
file path=usr/lib/X11/config/DragonFly.cf
@@ -152,6 +155,3 @@
file path=usr/share/man/man1/imake.1
file path=usr/share/man/man1/mkdirhier.1
file path=usr/share/man/man1/xmkmf.1
-link path=usr/X11/bin/imake target=../../bin/imake
-link path=usr/X11/bin/mkdirhier target=../../bin/mkdirhier
-link path=usr/X11/bin/xmkmf target=../../bin/xmkmf
--- a/pkg/manifests/developer-build-makedepend.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/developer-build-makedepend.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/developer/build/makedepend@__version:makedepend__
+set name=pkg.summary value="makedepend - create dependencies in makefiles"
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"
+link path=usr/X11/bin/makedepend target=../../bin/makedepend
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/developer-opensolaris-X.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,8 +20,7 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/developer/opensolaris/X@$(OSPKGVERS)
-set name=pkg.summary \
- value="Dependencies required to build the X Consolidation."
+set name=pkg.summary value="Dependencies required to build the X Consolidation."
set name=info.classification \
value="org.opensolaris.category.2008:Development/Distribution Tools"
@@ -31,153 +30,153 @@
set name=org.opensolaris.noincorp value=true
# Builds need to be able to uncompress upstream tar.bz2 & tar.gz files
-depend fmri=pkg:/compress/bzip2 type=require
-depend fmri=pkg:/compress/gzip type=require
+depend type=require fmri=pkg:/compress/bzip2
+depend type=require fmri=pkg:/compress/gzip
# X.Org ships many docs using the DocBook XML DTD's and stylesheets
-depend fmri=pkg:/data/docbook/docbook-style-dsssl type=require
-depend fmri=pkg:/data/docbook/docbook-style-xsl type=require
-depend fmri=pkg:/data/sgml-common type=require
-depend fmri=pkg:/data/xml-common type=require
+depend type=require fmri=pkg:/data/docbook/docbook-style-dsssl
+depend type=require fmri=pkg:/data/docbook/docbook-style-xsl
+depend type=require fmri=pkg:/data/sgml-common
+depend type=require fmri=pkg:/data/xml-common
# Solaris assembler required by Studio compilers
-depend fmri=pkg:/developer/assembler type=require
+depend type=require fmri=pkg:/developer/assembler
# Basic build utilities - nm, mcs, etc.
-depend fmri=pkg:/developer/base-developer-utilities type=require
+depend type=require fmri=pkg:/developer/base-developer-utilities
# Many packages need to use GNU autotools to rebuild upstream configure files
-depend fmri=pkg:/developer/build/autoconf type=require
-depend fmri=pkg:/developer/build/automake-110 type=require
+depend type=require fmri=pkg:/developer/build/autoconf
+depend type=require fmri=pkg:/developer/build/automake-110
# Some packages need GNU make to build
-depend fmri=pkg:/developer/build/gnu-make type=require
+depend type=require fmri=pkg:/developer/build/gnu-make
# Many packages need to use GNU libtool to rebuild upstream libtool files
-depend fmri=pkg:/developer/build/libtool type=require
+depend type=require fmri=pkg:/developer/build/libtool
# Most of the X gate requires Solaris make to build
-depend fmri=pkg:/developer/build/make type=require
+depend type=require fmri=pkg:/developer/build/make
# The X gate borrows some ON scripts to build, such as validate_pkg
-depend fmri=pkg:/developer/build/onbld type=require
+depend type=require fmri=pkg:/developer/build/onbld
# Xserver build includes mdb modules
-depend fmri=pkg:/developer/debug/mdb type=require
+depend type=require fmri=pkg:/developer/debug/mdb
# Tools needed to process DocBook docs
-depend fmri=pkg:/developer/documentation-tool/openjade type=require
-depend fmri=pkg:/developer/documentation-tool/opensp type=require
+depend type=require fmri=pkg:/developer/documentation-tool/openjade
+depend type=require fmri=pkg:/developer/documentation-tool/opensp
# Xserver build includes dtrace probes
-depend fmri=pkg:/developer/dtrace type=require
+depend type=require fmri=pkg:/developer/dtrace
# Some modules use gcc to build
-depend fmri=pkg:/developer/gcc-3 type=require
+depend type=require fmri=pkg:/developer/gcc-3
# For now, this is the package that delivers pkg-config (Defect #15543)
-depend fmri=pkg:/developer/gnome/gettext type=require
+depend type=require fmri=pkg:/developer/gnome/gettext
# xcb-util needs gperf to generate hash functions
-depend fmri=pkg:/developer/gperf type=require
+depend type=require fmri=pkg:/developer/gperf
# tigervnc builds a java applet with javac
-depend fmri=pkg:/developer/java/jdk type=require
+depend type=require fmri=pkg:/developer/java/jdk
# Various modules need flex to generate lexers
-depend fmri=pkg:/developer/lexer/flex type=require
+depend type=require fmri=pkg:/developer/lexer/flex
# Various libraries build lint libraries, that depend on system lint libs
-depend fmri=pkg:/developer/library/lint type=require
+depend type=require fmri=pkg:/developer/library/lint
# xcb, xcb-util, xcb-util-wm need GNU M4 to build
# (also required by any module running autoconf/autoreconf)
-depend fmri=pkg:/developer/macro/gnu-m4 type=require
+depend type=require fmri=pkg:/developer/macro/gnu-m4
# Xserver build uses flex & bison
-depend fmri=pkg:/developer/parser/bison type=require
+depend type=require fmri=pkg:/developer/parser/bison
# autopoint (from gnu gettext) requires CVS!
-depend fmri=pkg:/developer/versioning/cvs type=require
+depend type=require fmri=pkg:/developer/versioning/cvs
# X gate source is kept in mercurial scm
-depend fmri=pkg:/developer/versioning/mercurial type=require
+depend type=require fmri=pkg:/developer/versioning/mercurial
# Driver packages delivering headers we require
-$(i386_ONLY)depend fmri=pkg:/driver/graphics/agpgart type=require
-depend fmri=pkg:/driver/usb type=require
+$(i386_ONLY)depend type=require fmri=pkg:/driver/graphics/agpgart
+depend type=require fmri=pkg:/driver/usb
# autoconf scripts prefer various gnu utilities (mkdir, install, etc.)
-depend fmri=pkg:/file/gnu-coreutils type=require
+depend type=require fmri=pkg:/file/gnu-coreutils
# tigervnc links with libjpg
-depend fmri=pkg:/image/library/libjpeg type=require
+depend type=require fmri=pkg:/image/library/libjpeg
# app/xcursorgen links with libpng12
-depend fmri=pkg:/image/library/libpng type=require
+depend type=require fmri=pkg:/image/library/libpng
# synergy-plus links against libstdcxx
-depend fmri=pkg:/library/c++/stdcxx type=require
+depend type=require fmri=pkg:/library/c++/stdcxx
# lib/fontconfig links with libexpat
-depend fmri=pkg:/library/expat type=require
+depend type=require fmri=pkg:/library/expat
# xcb-proto runs xmllint
-depend fmri=pkg:/library/libxml2 type=require
+depend type=require fmri=pkg:/library/libxml2
# A number of X packages use xsltproc to process DocBook and other XML files
-depend fmri=pkg:/library/libxslt type=require
+depend type=require fmri=pkg:/library/libxslt
# AccessX & DPS require motif libraries
-depend fmri=pkg:/library/motif type=require
+depend type=require fmri=pkg:/library/motif
# xterm uses ncurses/term.h
-depend fmri=pkg:/library/ncurses type=require
+depend type=require fmri=pkg:/library/ncurses
# Mesa 7.10.2 requires libxml2 python module
-depend fmri=pkg:/library/python-2/libxml2-$(PYTHON_PKG_VERSION) type=require
+depend type=require fmri=pkg:/library/python-2/libxml2-$(PYTHON_PKG_VERSION)
# freetype, libXfont & libfontenc link with libz
-depend fmri=pkg:/library/zlib type=require
+depend type=require fmri=pkg:/library/zlib
# Build runs a number of perl scripts
-depend fmri=pkg:/runtime/perl-$(PERL_PKG_VERSION) type=require
+depend type=require fmri=pkg:/runtime/perl-$(PERL_PKG_VERSION)
# xcb & mesa require python interpreter/compiler
-depend fmri=pkg:/runtime/python-$(PYTHON_PKG_VERSION) type=require
+depend type=require fmri=pkg:/runtime/python-$(PYTHON_PKG_VERSION)
# Xserver currently links with HAL & Dbus
-depend fmri=pkg:/service/hal type=require
+depend type=require fmri=pkg:/service/hal
# Basic system headers & libraries
-depend fmri=pkg:/system/header type=require
-depend fmri=pkg:/system/library type=require
-depend fmri=pkg:/system/library/c++-runtime type=require
-depend fmri=pkg:/system/library/flex-runtime type=require
-depend fmri=pkg:/system/library/gcc-3-runtime type=require
-depend fmri=pkg:/system/library/libdbus type=require
-depend fmri=pkg:/system/library/math type=require
+depend type=require fmri=pkg:/system/header
+depend type=require fmri=pkg:/system/library
+depend type=require fmri=pkg:/system/library/c++-runtime
+depend type=require fmri=pkg:/system/library/flex-runtime
+depend type=require fmri=pkg:/system/library/gcc-3-runtime
+depend type=require fmri=pkg:/system/library/libdbus
+depend type=require fmri=pkg:/system/library/math
# Almost all modules need Solaris ld to link binaries
-depend fmri=pkg:/system/linker type=require
+depend type=require fmri=pkg:/system/linker
# autoconf scripts prefer gnu awk
-depend fmri=pkg:/text/gawk type=require
+depend type=require fmri=pkg:/text/gawk
# Some packages need GNU gettext to process upstream localization data
-depend fmri=pkg:/text/gnu-gettext type=require
+depend type=require fmri=pkg:/text/gnu-gettext
# autoconf scripts prefer gnu grep
-depend fmri=pkg:/text/gnu-grep type=require
+depend type=require fmri=pkg:/text/gnu-grep
# Builds need to be able to apply local patches
-depend fmri=pkg:/text/gnu-patch type=require
+depend type=require fmri=pkg:/text/gnu-patch
# autoconf scripts prefer gnu sed
-depend fmri=pkg:/text/gnu-sed type=require
+depend type=require fmri=pkg:/text/gnu-sed
# w3m is used to convert html docs to text, after generating html from docbook
-depend fmri=pkg:/web/browser/w3m type=require
+depend type=require fmri=pkg:/web/browser/w3m
# Builds need to be able to download upstream sources with wget
-depend fmri=pkg:/web/wget type=require
+depend type=require fmri=pkg:/web/wget
--- a/pkg/manifests/diagnostic-constype.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/diagnostic-constype.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/diagnostic/constype@__version:constype__
+set name=pkg.summary value="constype - print type of console"
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"
+link path=usr/X11/bin/constype target=../../bin/constype
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/diagnostic-scanpci.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,21 +20,21 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/diagnostic/scanpci@__version:libpciaccess__
-set name=pkg.description \
- 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"
+set name=pkg.description \
+ 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."
file path=etc/security/exec_attr.d/scanpci group=sys
+link path=usr/X11/bin/scanpci target=../../bin/scanpci
file path=usr/bin/scanpci
file path=usr/include/pciaccess.h
+link path=usr/lib/$(ARCH64)/libpciaccess.so target=libpciaccess.so.0
file path=usr/lib/$(ARCH64)/libpciaccess.so.0
file path=usr/lib/$(ARCH64)/pkgconfig/pciaccess.pc
+link path=usr/lib/libpciaccess.so target=libpciaccess.so.0
file path=usr/lib/libpciaccess.so.0
file path=usr/lib/pkgconfig/pciaccess.pc
file path=usr/share/man/man1/scanpci.1
legacy pkg=SUNWpciaccess \
desc="Library and tools for accessing PCI bus information" \
name="PCI bus access library and tools"
-link path=usr/X11/bin/scanpci target=../../bin/scanpci
-link path=usr/lib/$(ARCH64)/libpciaccess.so target=libpciaccess.so.0
-link path=usr/lib/libpciaccess.so target=libpciaccess.so.0
--- a/pkg/manifests/diagnostic-xload.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/diagnostic-xload.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,11 +20,11 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/diagnostic/xload@__version:xload__
+set name=pkg.summary value="xload - system load average display for X"
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"
+link path=usr/X11/bin/xload target=../../bin/xload
file path=usr/bin/xload
file path=usr/share/X11/app-defaults/XLoad
file path=usr/share/locale/C/LC_MESSAGES/xload.po
file path=usr/share/man/man1/xload.1
-link path=usr/X11/bin/xload target=../../bin/xload
--- a/pkg/manifests/document-viewer-xditview.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/document-viewer-xditview.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,15 +20,15 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/document/viewer/xditview@__version:xditview__
+set name=pkg.summary value="xditview - display ditroff output"
set name=pkg.description \
value="The xditview program displays ditroff output on an X display."
-set name=pkg.summary value="xditview - display ditroff output"
+link path=usr/X11/bin/xditview target=../../bin/xditview
file path=usr/bin/xditview
file path=usr/include/X11/bitmaps/ldblarrow
file path=usr/include/X11/bitmaps/rdblarrow
file path=usr/share/X11/app-defaults/Xditview
file path=usr/share/X11/app-defaults/Xditview-chrtr
file path=usr/share/man/man1/xditview.1
-link path=usr/X11/bin/xditview target=../../bin/xditview
# xditview app-defaults specifies helvetica & courier fonts
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
+depend type=require fmri=pkg:/system/font/xorg/xorg-core
--- a/pkg/manifests/editor-xedit.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/editor-xedit.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,15 +20,16 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/editor/xedit@__version:xedit__
+set name=pkg.summary value="xedit - simple text editor for X"
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/lib/X11/xedit
-dir path=usr/lib/X11/xedit/lisp
-dir path=usr/lib/X11/xedit/lisp/progmodes
+link path=usr/X11/bin/xedit target=../../bin/xedit
file path=usr/bin/xedit
+dir path=usr/lib/X11/xedit
+dir path=usr/lib/X11/xedit/lisp
file path=usr/lib/X11/xedit/lisp/indent.lsp
file path=usr/lib/X11/xedit/lisp/lisp.lsp
+dir path=usr/lib/X11/xedit/lisp/progmodes
file path=usr/lib/X11/xedit/lisp/progmodes/auto.lsp
file path=usr/lib/X11/xedit/lisp/progmodes/c.lsp
file path=usr/lib/X11/xedit/lisp/progmodes/html.lsp
@@ -50,6 +51,5 @@
file path=usr/share/X11/app-defaults/Xedit
file path=usr/share/X11/app-defaults/Xedit-color
file path=usr/share/man/man1/xedit.1
-link path=usr/X11/bin/xedit target=../../bin/xedit
# Xedit app-defaults references icons in xbitmaps
-depend fmri=pkg:/x11/data/xbitmaps type=require
+depend type=require fmri=pkg:/x11/data/xbitmaps
--- a/pkg/manifests/file-lndir.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/file-lndir.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/file/lndir@__version:lndir__
+set name=pkg.summary \
+ value="lndir: create a shadow directory of symbolic links to another directory tree"
set name=pkg.description \
- 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"
+ value="This 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."
file path=usr/bin/lndir
file path=usr/share/man/man1/lndir.1
--- a/pkg/manifests/image-editor-bitmap.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/image-editor-bitmap.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,15 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/image/editor/bitmap@__version:bitmap__
+set name=pkg.summary \
+ value="bitmap, bmtoa, atobm - X bitmap (XBM) editor and converter utilities"
set name=pkg.description \
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"
+link path=usr/X11/bin/atobm target=../../bin/atobm
+link path=usr/X11/bin/bitmap target=../../bin/bitmap
+link path=usr/X11/bin/bmtoa target=../../bin/bmtoa
file path=usr/bin/atobm
file path=usr/bin/bitmap
file path=usr/bin/bmtoa
@@ -48,6 +51,3 @@
file path=usr/share/man/man1/atobm.1
file path=usr/share/man/man1/bitmap.1
file path=usr/share/man/man1/bmtoa.1
-link path=usr/X11/bin/atobm target=../../bin/atobm
-link path=usr/X11/bin/bitmap target=../../bin/bitmap
-link path=usr/X11/bin/bmtoa target=../../bin/bmtoa
--- a/pkg/manifests/image-xcursorgen.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/image-xcursorgen.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/image/xcursorgen@__version:xcursorgen__
-set name=pkg.description \
- 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."
+set name=pkg.description \
+ value="xcursorgen creates an X cursor set file from a collection of PNG images and a metadata file."
+link path=usr/X11/bin/xcursorgen target=../../bin/xcursorgen
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/library-graphics-pixman.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,17 +20,17 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/library/graphics/pixman@__version:pixman__
-set name=pkg.description \
- 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/include/pixman-1
+set name=pkg.description \
+ value="pixman is a library that provides low-level pixel manipulation features such as image compositing and trapezoid rasterization."
+dir path=usr/include/pixman-1
file path=usr/include/pixman-1/pixman-version.h
file path=usr/include/pixman-1/pixman.h
+link path=usr/lib/$(ARCH64)/libpixman-1.so target=libpixman-1.so.0
file path=usr/lib/$(ARCH64)/libpixman-1.so.0
file path=usr/lib/$(ARCH64)/pkgconfig/pixman-1.pc
+link path=usr/lib/libpixman-1.so target=libpixman-1.so.0
file path=usr/lib/libpixman-1.so.0
file path=usr/lib/pkgconfig/pixman-1.pc
legacy pkg=SUNWpixman desc="Pixman library" name="Pixman library"
-link path=usr/lib/$(ARCH64)/libpixman-1.so target=libpixman-1.so.0
-link path=usr/lib/libpixman-1.so target=libpixman-1.so.0
--- a/pkg/manifests/library-motif-libdpstkxm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/library-motif-libdpstkxm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,13 +20,13 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/library/motif/libdpstkxm@$(OSPKGVERS)
+set name=pkg.summary \
+ value="X Window System DPS extension Motif client compatibility libraries"
set name=pkg.description \
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"
file path=usr/lib/libdpstkXm.so.5
file path=usr/share/X11/app-defaults/ColorSelect
file path=usr/share/X11/app-defaults/FontSelect
legacy pkg=SUNWxwdxm desc="DPS Motif library" name="DPS Motif library"
# ColorSelect & FontSelect use -adobe-helvetica-....-iso8859-1 font
-depend fmri=pkg:/system/font/xorg/iso8859-1 type=require
+depend type=require fmri=pkg:/system/font/xorg/iso8859-1
--- a/pkg/manifests/service-opengl-ogl-select.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/service-opengl-ogl-select.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -22,72 +22,84 @@
# Mark /system/volatile/* paths to be removed after pkgdepend, before publishing
<transform dir link path=system/volatile.* -> set org.opensolaris.nopublish true>
+
+
set name=pkg.fmri value=pkg:/service/opengl/ogl-select@$(OSPKGVERS)
-set name=pkg.description \
- value="ogl-select is a SMF service that determines at boot time which vendor supplied OpenGL headers and libraries will be used, based on the hardware and drivers installed in the system."
set name=pkg.summary \
value="ogl-select - boot time selection of OpenGL vendor files"
-dir path=lib/opengl
-dir path=lib/opengl/ogl_select
-dir path=lib/svc/manifest/application/opengl
-dir path=usr/include/GL
-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
-# 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
-dir path=system/volatile/opengl/include
-dir path=system/volatile/opengl/lib
-dir path=system/volatile/opengl/lib/$(ARCH64)
-dir path=system/volatile/opengl/server
+set name=pkg.description \
+ value="ogl-select is a SMF service that determines at boot time which vendor supplied OpenGL headers and libraries will be used, based on the hardware and drivers installed in the system."
+
+
+dir path=lib/opengl
+dir path=lib/opengl/ogl_select
file path=lib/opengl/ogl_select/mesa_vendor_select mode=0555
$(i386_ONLY)file path=lib/opengl/ogl_select/nvidia_vendor_select mode=0555
$(sparc_ONLY)file path=lib/opengl/ogl_select/sun_vendor_select mode=0555
+dir path=lib/svc/manifest/application/opengl
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
+
+
+# These dirs & links in /system/volatile 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
+dir path=system/volatile/opengl/include
+link path=system/volatile/opengl/include/gl.h \
+ target=../../../../usr/include/mesa/gl.h
+link path=system/volatile/opengl/include/glext.h \
+ target=../../../../usr/include/mesa/glext.h
+link path=system/volatile/opengl/include/glx.h \
+ target=../../../../usr/include/mesa/glx.h
+link path=system/volatile/opengl/include/glxext.h \
+ target=../../../../usr/include/mesa/glxext.h
+dir path=system/volatile/opengl/lib
+dir path=system/volatile/opengl/lib/$(ARCH64)
+link path=system/volatile/opengl/lib/$(ARCH64)/libGL.so.1 \
+ target=../../../../../usr/lib/mesa/$(ARCH64)/libGL.so.1
+link path=system/volatile/opengl/lib/64 target=$(ARCH64)
+link path=system/volatile/opengl/lib/libGL.so.1 \
+ target=../../../../usr/lib/mesa/libGL.so.1
+dir path=system/volatile/opengl/server
+link path=system/volatile/opengl/server/libglx.so \
+ target=../../../../usr/lib/mesa/modules/extensions/libglx.so
+
+
link path=usr/X11/lib/$(ARCH64)/libGL.so target=libGL.so.1
link path=usr/X11/lib/$(ARCH64)/libGL.so.1 target=../GL/$(ARCH64)/libGL.so.1
link path=usr/X11/lib/64 target=$(ARCH64)
link path=usr/X11/lib/GL target=../../lib/GL
link path=usr/X11/lib/libGL.so target=libGL.so.1
link path=usr/X11/lib/libGL.so.1 target=GL/libGL.so.1
-link path=usr/include/GL/gl.h target=../../../system/volatile/opengl/include/gl.h
+dir path=usr/include/GL
+link path=usr/include/GL/gl.h \
+ target=../../../system/volatile/opengl/include/gl.h
link path=usr/include/GL/glext.h \
target=../../../system/volatile/opengl/include/glext.h
-link path=usr/include/GL/glx.h target=../../../system/volatile/opengl/include/glx.h
+link path=usr/include/GL/glx.h \
+ target=../../../system/volatile/opengl/include/glx.h
link path=usr/include/GL/glxext.h \
target=../../../system/volatile/opengl/include/glxext.h
link path=usr/lib/$(ARCH64)/libGL.so target=libGL.so.1
link path=usr/lib/$(ARCH64)/libGL.so.1 target=../GL/$(ARCH64)/libGL.so.1
+dir path=usr/lib/GL
+dir path=usr/lib/GL/$(ARCH64)
link path=usr/lib/GL/$(ARCH64)/libGL.so target=libGL.so.1
link path=usr/lib/GL/$(ARCH64)/libGL.so.1 \
target=../../../../system/volatile/opengl/lib/$(ARCH64)/libGL.so.1
link path=usr/lib/GL/64 target=$(ARCH64)
link path=usr/lib/GL/libGL.so target=libGL.so.1
-link path=usr/lib/GL/libGL.so.1 target=../../../system/volatile/opengl/lib/libGL.so.1
+link path=usr/lib/GL/libGL.so.1 \
+ target=../../../system/volatile/opengl/lib/libGL.so.1
link path=usr/lib/libGL.so target=libGL.so.1
link path=usr/lib/libGL.so.1 target=GL/libGL.so.1
+dir path=usr/lib/xorg
+dir path=usr/lib/xorg/modules
+dir path=usr/lib/xorg/modules/extensions
link path=usr/lib/xorg/modules/extensions/libglx.so \
target=../../../../../system/volatile/opengl/server/libglx.so
-# These links 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
-link path=system/volatile/opengl/include/gl.h target=../../../../usr/include/mesa/gl.h
-link path=system/volatile/opengl/include/glext.h \
- target=../../../../usr/include/mesa/glext.h
-link path=system/volatile/opengl/include/glx.h \
- target=../../../../usr/include/mesa/glx.h
-link path=system/volatile/opengl/include/glxext.h \
- target=../../../../usr/include/mesa/glxext.h
-link path=system/volatile/opengl/lib/$(ARCH64)/libGL.so.1 \
- target=../../../../../usr/lib/mesa/$(ARCH64)/libGL.so.1
-link path=system/volatile/opengl/lib/64 target=$(ARCH64)
-link path=system/volatile/opengl/lib/libGL.so.1 \
- target=../../../../usr/lib/mesa/libGL.so.1
-link path=system/volatile/opengl/server/libglx.so \
- target=../../../../usr/lib/mesa/modules/extensions/libglx.so
+file path=usr/share/man/man1/ogl-select.1
+
# constype is required to detect which vendor_select script to run
-depend fmri=pkg:/diagnostic/constype type=require
+depend type=require fmri=pkg:/diagnostic/constype
--- a/pkg/manifests/system-display-manager-xdm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-display-manager-xdm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -19,15 +19,16 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
+
set name=pkg.fmri value=pkg:/system/display-manager/xdm@__version:xdm__
-set name=pkg.description \
- 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/X11 group=sys
-dir path=etc/X11/xdm group=sys
-dir path=usr/lib/X11/xdm
-dir path=usr/lib/X11/xdm/pixmaps
+set name=pkg.description \
+ value="xdm is an Xaw-based display manager for a collection of X displays, which may be on the local host or remote servers."
+
+
+dir path=etc/X11 group=sys
+dir path=etc/X11/xdm group=sys
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 \
@@ -36,6 +37,7 @@
original_name=SUNWxdm:etc/X11/xdm/Xservers preserve=true
file path=etc/X11/xdm/xdm-config group=sys \
original_name=SUNWxdm:etc/X11/xdm/xdm-config preserve=true
+dir path=usr/lib/X11/xdm
file path=usr/lib/X11/xdm/GiveConsole mode=0555
file path=usr/lib/X11/xdm/README
file path=usr/lib/X11/xdm/TakeConsole mode=0555
@@ -49,6 +51,7 @@
file path=usr/lib/X11/xdm/Xwilling mode=0555
file path=usr/lib/X11/xdm/chooser mode=0555
file path=usr/lib/X11/xdm/libXdmGreet.so
+dir path=usr/lib/X11/xdm/pixmaps
file path=usr/lib/X11/xdm/pixmaps/xorg-bw.xpm
file path=usr/lib/X11/xdm/pixmaps/xorg.xpm
file path=usr/lib/X11/xdm/xdm-config
@@ -62,17 +65,17 @@
desc="X Window System xdm Display Manager components located outside of /usr" \
name="xdm Display Manager - / filesystem"
# Default xdm session uses twm for the window manager
-depend fmri=pkg:/desktop/window-manager/twm type=require
+depend type=require fmri=pkg:/desktop/window-manager/twm
# xdm Xresources specifies fonts including:
# -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
# *-new century schoolbook-bold-i-normal-*-240-*
# fixed
-depend fmri=pkg:/system/font/xorg/iso8859-1 type=require
+depend type=require fmri=pkg:/system/font/xorg/iso8859-1
# Default xdm session runs an xterm
-depend fmri=pkg:/terminal/xterm type=require
+depend type=require fmri=pkg:/terminal/xterm
# xdm calls sessreg for utmpx/wtmpx updates
-depend fmri=pkg:/x11/session/sessreg type=require
+depend type=require fmri=pkg:/x11/session/sessreg
# Default xdm session uses xrdb
-depend fmri=pkg:/x11/x11-server-utilities type=require
+depend type=require fmri=pkg:/x11/x11-server-utilities
# xdm runs xconsole for messages on login screen
-depend fmri=pkg:/x11/xconsole type=require
+depend type=require fmri=pkg:/x11/xconsole
--- a/pkg/manifests/system-font-daewoo-misc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-daewoo-misc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,11 +21,14 @@
#
set name=pkg.fmri \
value=pkg:/system/font/daewoo-misc@__version:font-daewoo-misc__
+set name=pkg.summary value="Korean bitmap fonts from Daewoo Electronics"
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=usr/share/fonts/X11/daewoo
+link path=etc/X11/fontpath.d/daewoo:pri=75 \
+ target=../../../usr/share/fonts/X11/daewoo
+link path=etc/X11/fontpath.d/daewoo:unscaled:pri=30 \
+ target=../../../usr/share/fonts/X11/daewoo
+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
file path=usr/share/fonts/X11/daewoo/hanglm16.pcf
@@ -33,7 +36,3 @@
legacy pkg=SUNWfont-daewoo-misc \
desc="X Window System font files contributed to X.Org Foundation open source release by Daewoo Electronics" \
name="Korean bitmap fonts from Daewoo Electronics"
-link path=etc/X11/fontpath.d/daewoo:pri=75 \
- target=../../../usr/share/fonts/X11/daewoo
-link path=etc/X11/fontpath.d/daewoo:unscaled:pri=30 \
- target=../../../usr/share/fonts/X11/daewoo
--- a/pkg/manifests/system-font-isas-misc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-isas-misc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,15 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/isas-misc@__version:font-isas-misc__
+set name=pkg.summary \
+ value="Institute of Software, Academia Sinica GB2312-80 bitmap fonts"
set name=pkg.description \
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=usr/share/fonts/X11/isas
+link path=etc/X11/fontpath.d/isas:pri=84 \
+ target=../../../usr/share/fonts/X11/isas
+link path=etc/X11/fontpath.d/isas:unscaled:pri=14 \
+ target=../../../usr/share/fonts/X11/isas
+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
file path=usr/share/fonts/X11/isas/gb16st.pcf
@@ -33,7 +36,3 @@
legacy pkg=SUNWfont-isas-misc \
desc="X Window System font files for GB2312-80 encoded Chinese characters from The Institute of Software, Academia Sinica" \
name="Institute of Software, Academia Sinica GB2312-80 bitmap fonts"
-link path=etc/X11/fontpath.d/isas:pri=84 \
- target=../../../usr/share/fonts/X11/isas
-link path=etc/X11/fontpath.d/isas:unscaled:pri=14 \
- target=../../../usr/share/fonts/X11/isas
--- a/pkg/manifests/system-font-jis-misc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-jis-misc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,18 +20,17 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/jis-misc@__version:font-jis-misc__
+set name=pkg.summary value="Japanese Industrial Standard 9051-1984 bitmap fonts"
set name=pkg.description \
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=usr/share/fonts/X11/jiskan
+link path=etc/X11/fontpath.d/jiskan:pri=84 \
+ target=../../../usr/share/fonts/X11/jiskan
+link path=etc/X11/fontpath.d/jiskan:unscaled:pri=14 \
+ target=../../../usr/share/fonts/X11/jiskan
+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
file path=usr/share/fonts/X11/jiskan/jiskan24.pcf
legacy pkg=SUNWfont-jis-misc \
desc="X Window System font files based on Japanese Industrial Standard, JIS X 9051-1984: 16-dots Matrix Character Patterns for Display Devices" \
name="Japanese Industrial Standard 9051-1984 bitmap fonts"
-link path=etc/X11/fontpath.d/jiskan:pri=84 \
- target=../../../usr/share/fonts/X11/jiskan
-link path=etc/X11/fontpath.d/jiskan:unscaled:pri=14 \
- target=../../../usr/share/fonts/X11/jiskan
--- a/pkg/manifests/system-font-misc-ethiopic.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-misc-ethiopic.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,13 +21,13 @@
#
set name=pkg.fmri \
value=pkg:/system/font/misc-ethiopic@__version:font-misc-ethiopic__
-set name=pkg.description \
- 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=usr/share/fonts/TrueType/ethiopic
+set name=pkg.description \
+ value="TrueType and OpenType fonts for Ethiopic scripts released as open source by the Ge'ez Frontier Foundation"
+link path=etc/X11/fontpath.d/ethiopic:pri=60 \
+ target=../../../usr/share/fonts/TrueType/ethiopic
+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
file path=usr/share/fonts/TrueType/ethiopic/fonts.dir
@@ -35,5 +35,3 @@
legacy pkg=SUNWfont-misc-ethiopic \
desc="TrueType and OpenType fonts for Ethiopic scripts released as open source by the Ge'ez Frontier Foundation" \
name="Ethiopic language fonts from the Ge'ez Frontiers Foundation"
-link path=etc/X11/fontpath.d/ethiopic:pri=60 \
- target=../../../usr/share/fonts/TrueType/ethiopic
--- a/pkg/manifests/system-font-misc-meltho.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-misc-meltho.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,11 +21,12 @@
#
set name=pkg.fmri \
value=pkg:/system/font/misc-meltho@__version:font-misc-meltho__
+set name=pkg.summary value="Meltho Syriac fonts"
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=usr/share/fonts/TrueType/syriac
+link path=etc/X11/fontpath.d/syriac:pri=61 \
+ target=../../../usr/share/fonts/TrueType/syriac
+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
file path=usr/share/fonts/TrueType/syriac/SyrCOMBatnan.otf
@@ -53,5 +54,3 @@
legacy pkg=SUNWfont-misc-meltho \
desc="OpenType font files for Syraic languages from Project Meltho at Beth Mardutho: The Syriac Computing Institute" \
name="Meltho Syriac fonts"
-link path=etc/X11/fontpath.d/syriac:pri=61 \
- target=../../../usr/share/fonts/TrueType/syriac
--- a/pkg/manifests/system-font-truetype-bh-luxi.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-truetype-bh-luxi.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,11 +21,15 @@
#
set name=pkg.fmri \
value=pkg:/system/font/truetype/bh-luxi@__version:font-bh-ttf__
+set name=pkg.summary value="Luxi font family from Bigelow & Holmes"
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=usr/share/fonts/TrueType/bh-luxi
+link path=etc/X11/fontpath.d/bh-luxi:pri=42 \
+ target=../../../usr/share/fonts/TrueType/bh-luxi
file path=etc/fonts/conf.avail/42-luxi-mono.conf
+link path=etc/fonts/conf.d/42-luxi-mono.conf \
+ target=../conf.avail/42-luxi-mono.conf
+dir path=usr/share/fonts/TrueType/bh-luxi
file path=usr/share/fonts/TrueType/bh-luxi/fonts.dir
file path=usr/share/fonts/TrueType/bh-luxi/fonts.scale
file path=usr/share/fonts/TrueType/bh-luxi/luximb.ttf
@@ -43,7 +47,3 @@
legacy pkg=SUNWttf-bh-luxi \
desc="Luxi family of TrueType fonts designed by Bigelow & Holmes for the XFree86 Project" \
name="Luxi font family from Bigelow & Holmes"
-link path=etc/X11/fontpath.d/bh-luxi:pri=42 \
- target=../../../usr/share/fonts/TrueType/bh-luxi
-link path=etc/fonts/conf.d/42-luxi-mono.conf \
- target=../conf.avail/42-luxi-mono.conf
--- a/pkg/manifests/system-font-truetype-bitstream-vera.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-truetype-bitstream-vera.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,12 @@
#
set name=pkg.fmri \
value=pkg:/system/font/truetype/bitstream-vera@__version:ttf-bitstream-vera__
+set name=pkg.summary value="Bitstream Vera fonts"
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=usr/share/fonts/TrueType/bitstream-vera
+link path=etc/X11/fontpath.d/bitstream-vera:pri=42 \
+ target=../../../usr/share/fonts/TrueType/bitstream-vera
+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
file path=usr/share/fonts/TrueType/bitstream-vera/VeraBI.ttf
@@ -41,5 +43,3 @@
legacy pkg=SUNWttf-bitstream-vera \
desc="TrueType font files for the Vera family of redistributable fonts from Bitstream, Inc." \
name="Bitstream Vera fonts"
-link path=etc/X11/fontpath.d/bitstream-vera:pri=42 \
- target=../../../usr/share/fonts/TrueType/bitstream-vera
--- a/pkg/manifests/system-font-truetype-dejavu.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-truetype-dejavu.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,17 +21,32 @@
#
set name=pkg.fmri \
value=pkg:/system/font/truetype/dejavu@__version:dejavu-fonts-ttf__
+set name=pkg.summary value="DejaVu fonts"
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=usr/share/fonts/TrueType
-dir path=usr/share/fonts/TrueType/dejavu
+link path=etc/X11/fontpath.d/dejavu:pri=42 \
+ target=../../../usr/share/fonts/TrueType/dejavu
file path=etc/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf
file path=etc/fonts/conf.avail/20-unhint-small-dejavu-sans.conf
file path=etc/fonts/conf.avail/20-unhint-small-dejavu-serif.conf
file path=etc/fonts/conf.avail/57-dejavu-sans-mono.conf
file path=etc/fonts/conf.avail/57-dejavu-sans.conf
file path=etc/fonts/conf.avail/57-dejavu-serif.conf
+link path=etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf \
+ target=../conf.avail/20-unhint-small-dejavu-sans-mono.conf
+link path=etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf \
+ target=../conf.avail/20-unhint-small-dejavu-sans.conf
+link path=etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf \
+ target=../conf.avail/20-unhint-small-dejavu-serif.conf
+link path=etc/fonts/conf.d/57-dejavu-sans-mono.conf \
+ target=../conf.avail/57-dejavu-sans-mono.conf
+link path=etc/fonts/conf.d/57-dejavu-sans.conf \
+ target=../conf.avail/57-dejavu-sans.conf
+link path=etc/fonts/conf.d/57-dejavu-serif.conf \
+ target=../conf.avail/57-dejavu-serif.conf
+link path=usr/X11/lib/X11/fonts/TrueType target=../../../../share/fonts/TrueType
+dir path=usr/share/fonts/TrueType
+dir path=usr/share/fonts/TrueType/dejavu
file path=usr/share/fonts/TrueType/dejavu/DejaVuSans-Bold.ttf
file path=usr/share/fonts/TrueType/dejavu/DejaVuSans-BoldOblique.ttf
file path=usr/share/fonts/TrueType/dejavu/DejaVuSans-ExtraLight.ttf
@@ -60,19 +75,3 @@
legacy pkg=SUNWttf-dejavu \
desc="TrueType font files for the DejaVu family of open source fonts" \
name="DejaVu fonts"
-link path=etc/X11/fontpath.d/dejavu:pri=42 \
- target=../../../usr/share/fonts/TrueType/dejavu
-link path=etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf \
- target=../conf.avail/20-unhint-small-dejavu-sans-mono.conf
-link path=etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf \
- target=../conf.avail/20-unhint-small-dejavu-sans.conf
-link path=etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf \
- target=../conf.avail/20-unhint-small-dejavu-serif.conf
-link path=etc/fonts/conf.d/57-dejavu-sans-mono.conf \
- target=../conf.avail/57-dejavu-sans-mono.conf
-link path=etc/fonts/conf.d/57-dejavu-sans.conf \
- target=../conf.avail/57-dejavu-sans.conf
-link path=etc/fonts/conf.d/57-dejavu-serif.conf \
- target=../conf.avail/57-dejavu-serif.conf
-link path=usr/X11/lib/X11/fonts/TrueType \
- target=../../../../share/fonts/TrueType
--- a/pkg/manifests/system-font-truetype-google-droid.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-truetype-google-droid.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -24,10 +24,12 @@
# ourselves, and upstream may someday provide their own version number
set name=pkg.fmri \
value=pkg:/system/font/truetype/google-droid@0.__version:google-droid-fonts__
+set name=pkg.summary value="Droid font family from Google's Android project"
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=usr/share/fonts/TrueType/google-droid
+link path=etc/X11/fontpath.d/google-droid:pri=42 \
+ target=../../../usr/share/fonts/TrueType/google-droid
+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
file path=usr/share/fonts/TrueType/google-droid/DroidSansFallback.ttf
@@ -42,5 +44,3 @@
legacy pkg=SUNWttf-google-droid \
desc="TrueType fonts designed by Ascender Corp for the Android mobile platform from Google" \
name="Droid font family from Google's Android project"
-link path=etc/X11/fontpath.d/google-droid:pri=42 \
- target=../../../usr/share/fonts/TrueType/google-droid
--- a/pkg/manifests/system-font-truetype-liberation.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-truetype-liberation.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,12 @@
#
set name=pkg.fmri \
value=pkg:/system/font/truetype/liberation@__version:liberation-fonts__
+set name=pkg.summary value="Liberation fonts"
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=usr/share/fonts/TrueType/liberation
+link path=etc/X11/fontpath.d/liberation:pri=42 \
+ target=../../../usr/share/fonts/TrueType/liberation
+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
file path=usr/share/fonts/TrueType/liberation/LiberationMono-Italic.ttf
@@ -43,5 +45,3 @@
legacy pkg=SUNWttf-liberation \
desc="TrueType font files for the Liberation family of open source fonts" \
name="Liberation fonts"
-link path=etc/X11/fontpath.d/liberation:pri=42 \
- target=../../../usr/share/fonts/TrueType/liberation
--- a/pkg/manifests/system-font-xorg-cyrillic.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-cyrillic.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -24,10 +24,12 @@
# at this time (1.0.2), while others are 1.0.1
set name=pkg.fmri \
value=pkg:/system/font/xorg/cyrillic@__version:font-screen-cyrillic__
+set name=pkg.summary value="Cyrillic bitmap fonts from X.Org Foundation"
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=usr/share/fonts/X11/cyrillic
+link path=etc/X11/fontpath.d/cyrillic:pri=75 \
+ target=../../../usr/share/fonts/X11/cyrillic
+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
file path=usr/share/fonts/X11/cyrillic/crox1cbo.pcf
@@ -114,5 +116,3 @@
legacy pkg=SUNWfont-xorg-cyrillic \
desc="X Window System font files for Cyrillic scripts based on X.Org Foundation open source release" \
name="Cyrillic bitmap fonts from X.Org Foundation"
-link path=etc/X11/fontpath.d/cyrillic:pri=75 \
- target=../../../usr/share/fonts/X11/cyrillic
--- a/pkg/manifests/system-font-xorg-iso8859-1.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-1.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,13 +20,27 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-1@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-1 bitmap fonts"
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=usr/share/fonts/X11
-dir path=usr/share/fonts/X11/100dpi-ISO8859-1
-dir path=usr/share/fonts/X11/75dpi-ISO8859-1
-dir path=usr/share/fonts/X11/misc-ISO8859-1
+link path=etc/X11/fontpath.d/100dpi-ISO8859-1:pri=90 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-1
+link path=etc/X11/fontpath.d/100dpi-ISO8859-1:unscaled:pri=20 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-1
+link path=etc/X11/fontpath.d/75dpi-ISO8859-1:pri=95 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-1
+link path=etc/X11/fontpath.d/75dpi-ISO8859-1:unscaled:pri=25 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-1
+link path=etc/X11/fontpath.d/misc-ISO8859-1:pri=85 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-1
+link path=etc/X11/fontpath.d/misc-ISO8859-1:unscaled:pri=15 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-1
+link path=usr/X11/lib/X11/fonts/100dpi \
+ target=../../../../share/fonts/X11/100dpi-ISO8859-1
+link path=usr/X11/lib/X11/fonts/75dpi \
+ target=../../../../share/fonts/X11/75dpi-ISO8859-1
+dir path=usr/share/fonts/X11
+dir path=usr/share/fonts/X11/100dpi-ISO8859-1
file path=usr/share/fonts/X11/100dpi-ISO8859-1/UTBI__10-ISO8859-1.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-1/UTBI__12-ISO8859-1.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-1/UTBI__14-ISO8859-1.pcf
@@ -216,6 +230,7 @@
file path=usr/share/fonts/X11/100dpi-ISO8859-1/timR14-ISO8859-1.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-1/timR18-ISO8859-1.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-1/timR24-ISO8859-1.pcf
+dir path=usr/share/fonts/X11/75dpi-ISO8859-1
file path=usr/share/fonts/X11/75dpi-ISO8859-1/UTBI__10-ISO8859-1.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-1/UTBI__12-ISO8859-1.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-1/UTBI__14-ISO8859-1.pcf
@@ -405,6 +420,7 @@
file path=usr/share/fonts/X11/75dpi-ISO8859-1/timR14-ISO8859-1.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-1/timR18-ISO8859-1.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-1/timR24-ISO8859-1.pcf
+dir path=usr/share/fonts/X11/misc-ISO8859-1
file path=usr/share/fonts/X11/misc-ISO8859-1/10x20-ISO8859-1.pcf
file path=usr/share/fonts/X11/misc-ISO8859-1/4x6-ISO8859-1.pcf
file path=usr/share/fonts/X11/misc-ISO8859-1/5x7-ISO8859-1.pcf
@@ -434,19 +450,3 @@
legacy pkg=SUNWfont-xorg-iso8859-1 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-1 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-1:pri=90 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-1
-link path=etc/X11/fontpath.d/100dpi-ISO8859-1:unscaled:pri=20 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-1
-link path=etc/X11/fontpath.d/75dpi-ISO8859-1:pri=95 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-1
-link path=etc/X11/fontpath.d/75dpi-ISO8859-1:unscaled:pri=25 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-1
-link path=etc/X11/fontpath.d/misc-ISO8859-1:pri=85 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-1
-link path=etc/X11/fontpath.d/misc-ISO8859-1:unscaled:pri=15 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-1
-link path=usr/X11/lib/X11/fonts/100dpi \
- target=../../../../share/fonts/X11/100dpi-ISO8859-1
-link path=usr/X11/lib/X11/fonts/75dpi \
- target=../../../../share/fonts/X11/75dpi-ISO8859-1
--- a/pkg/manifests/system-font-xorg-iso8859-10.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-10.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,22 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-10@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-10 bitmap fonts"
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=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
+link path=etc/X11/fontpath.d/100dpi-ISO8859-10:pri=91 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-10
+link path=etc/X11/fontpath.d/100dpi-ISO8859-10:unscaled:pri=21 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-10
+link path=etc/X11/fontpath.d/75dpi-ISO8859-10:pri=96 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-10
+link path=etc/X11/fontpath.d/75dpi-ISO8859-10:unscaled:pri=26 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-10
+link path=etc/X11/fontpath.d/misc-ISO8859-10:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-10
+link path=etc/X11/fontpath.d/misc-ISO8859-10:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-10
+dir path=usr/share/fonts/X11/100dpi-ISO8859-10
file path=usr/share/fonts/X11/100dpi-ISO8859-10/UTBI__10-ISO8859-10.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-10/UTBI__12-ISO8859-10.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-10/UTBI__14-ISO8859-10.pcf
@@ -213,6 +223,7 @@
file path=usr/share/fonts/X11/100dpi-ISO8859-10/timR14-ISO8859-10.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-10/timR18-ISO8859-10.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-10/timR24-ISO8859-10.pcf
+dir path=usr/share/fonts/X11/75dpi-ISO8859-10
file path=usr/share/fonts/X11/75dpi-ISO8859-10/UTBI__10-ISO8859-10.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-10/UTBI__12-ISO8859-10.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-10/UTBI__14-ISO8859-10.pcf
@@ -400,6 +411,7 @@
file path=usr/share/fonts/X11/75dpi-ISO8859-10/timR14-ISO8859-10.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-10/timR18-ISO8859-10.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-10/timR24-ISO8859-10.pcf
+dir path=usr/share/fonts/X11/misc-ISO8859-10
file path=usr/share/fonts/X11/misc-ISO8859-10/10x20-ISO8859-10.pcf
file path=usr/share/fonts/X11/misc-ISO8859-10/4x6-ISO8859-10.pcf
file path=usr/share/fonts/X11/misc-ISO8859-10/5x7-ISO8859-10.pcf
@@ -427,15 +439,3 @@
legacy pkg=SUNWfont-xorg-iso8859-10 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-10 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-10:pri=91 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-10
-link path=etc/X11/fontpath.d/100dpi-ISO8859-10:unscaled:pri=21 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-10
-link path=etc/X11/fontpath.d/75dpi-ISO8859-10:pri=96 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-10
-link path=etc/X11/fontpath.d/75dpi-ISO8859-10:unscaled:pri=26 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-10
-link path=etc/X11/fontpath.d/misc-ISO8859-10:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-10
-link path=etc/X11/fontpath.d/misc-ISO8859-10:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-10
--- a/pkg/manifests/system-font-xorg-iso8859-11.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-11.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-11@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-11 bitmap fonts"
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=usr/share/fonts/X11/misc-ISO8859-11
+link path=etc/X11/fontpath.d/misc-ISO8859-11:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-11
+link path=etc/X11/fontpath.d/misc-ISO8859-11:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-11
+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
file path=usr/share/fonts/X11/misc-ISO8859-11/7x13-ISO8859-11.pcf
@@ -38,7 +42,3 @@
legacy pkg=SUNWfont-xorg-iso8859-11 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-11 fonts"
-link path=etc/X11/fontpath.d/misc-ISO8859-11:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-11
-link path=etc/X11/fontpath.d/misc-ISO8859-11:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-11
--- a/pkg/manifests/system-font-xorg-iso8859-13.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-13.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,22 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-13@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-13 bitmap fonts"
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=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
+link path=etc/X11/fontpath.d/100dpi-ISO8859-13:pri=91 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-13
+link path=etc/X11/fontpath.d/100dpi-ISO8859-13:unscaled:pri=21 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-13
+link path=etc/X11/fontpath.d/75dpi-ISO8859-13:pri=96 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-13
+link path=etc/X11/fontpath.d/75dpi-ISO8859-13:unscaled:pri=26 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-13
+link path=etc/X11/fontpath.d/misc-ISO8859-13:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-13
+link path=etc/X11/fontpath.d/misc-ISO8859-13:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-13
+dir path=usr/share/fonts/X11/100dpi-ISO8859-13
file path=usr/share/fonts/X11/100dpi-ISO8859-13/UTBI__10-ISO8859-13.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-13/UTBI__12-ISO8859-13.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-13/UTBI__14-ISO8859-13.pcf
@@ -213,6 +223,7 @@
file path=usr/share/fonts/X11/100dpi-ISO8859-13/timR14-ISO8859-13.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-13/timR18-ISO8859-13.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-13/timR24-ISO8859-13.pcf
+dir path=usr/share/fonts/X11/75dpi-ISO8859-13
file path=usr/share/fonts/X11/75dpi-ISO8859-13/UTBI__10-ISO8859-13.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-13/UTBI__12-ISO8859-13.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-13/UTBI__14-ISO8859-13.pcf
@@ -400,6 +411,7 @@
file path=usr/share/fonts/X11/75dpi-ISO8859-13/timR14-ISO8859-13.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-13/timR18-ISO8859-13.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-13/timR24-ISO8859-13.pcf
+dir path=usr/share/fonts/X11/misc-ISO8859-13
file path=usr/share/fonts/X11/misc-ISO8859-13/10x20-ISO8859-13.pcf
file path=usr/share/fonts/X11/misc-ISO8859-13/4x6-ISO8859-13.pcf
file path=usr/share/fonts/X11/misc-ISO8859-13/5x7-ISO8859-13.pcf
@@ -427,15 +439,3 @@
legacy pkg=SUNWfont-xorg-iso8859-13 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-13 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-13:pri=91 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-13
-link path=etc/X11/fontpath.d/100dpi-ISO8859-13:unscaled:pri=21 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-13
-link path=etc/X11/fontpath.d/75dpi-ISO8859-13:pri=96 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-13
-link path=etc/X11/fontpath.d/75dpi-ISO8859-13:unscaled:pri=26 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-13
-link path=etc/X11/fontpath.d/misc-ISO8859-13:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-13
-link path=etc/X11/fontpath.d/misc-ISO8859-13:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-13
--- a/pkg/manifests/system-font-xorg-iso8859-14.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-14.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,22 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-14@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-14 bitmap fonts"
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=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
+link path=etc/X11/fontpath.d/100dpi-ISO8859-14:pri=91 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-14
+link path=etc/X11/fontpath.d/100dpi-ISO8859-14:unscaled:pri=21 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-14
+link path=etc/X11/fontpath.d/75dpi-ISO8859-14:pri=96 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-14
+link path=etc/X11/fontpath.d/75dpi-ISO8859-14:unscaled:pri=26 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-14
+link path=etc/X11/fontpath.d/misc-ISO8859-14:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-14
+link path=etc/X11/fontpath.d/misc-ISO8859-14:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-14
+dir path=usr/share/fonts/X11/100dpi-ISO8859-14
file path=usr/share/fonts/X11/100dpi-ISO8859-14/UTBI__10-ISO8859-14.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-14/UTBI__12-ISO8859-14.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-14/UTBI__14-ISO8859-14.pcf
@@ -213,6 +223,7 @@
file path=usr/share/fonts/X11/100dpi-ISO8859-14/timR14-ISO8859-14.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-14/timR18-ISO8859-14.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-14/timR24-ISO8859-14.pcf
+dir path=usr/share/fonts/X11/75dpi-ISO8859-14
file path=usr/share/fonts/X11/75dpi-ISO8859-14/UTBI__10-ISO8859-14.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-14/UTBI__12-ISO8859-14.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-14/UTBI__14-ISO8859-14.pcf
@@ -400,6 +411,7 @@
file path=usr/share/fonts/X11/75dpi-ISO8859-14/timR14-ISO8859-14.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-14/timR18-ISO8859-14.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-14/timR24-ISO8859-14.pcf
+dir path=usr/share/fonts/X11/misc-ISO8859-14
file path=usr/share/fonts/X11/misc-ISO8859-14/10x20-ISO8859-14.pcf
file path=usr/share/fonts/X11/misc-ISO8859-14/4x6-ISO8859-14.pcf
file path=usr/share/fonts/X11/misc-ISO8859-14/5x7-ISO8859-14.pcf
@@ -427,15 +439,3 @@
legacy pkg=SUNWfont-xorg-iso8859-14 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-14 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-14:pri=91 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-14
-link path=etc/X11/fontpath.d/100dpi-ISO8859-14:unscaled:pri=21 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-14
-link path=etc/X11/fontpath.d/75dpi-ISO8859-14:pri=96 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-14
-link path=etc/X11/fontpath.d/75dpi-ISO8859-14:unscaled:pri=26 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-14
-link path=etc/X11/fontpath.d/misc-ISO8859-14:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-14
-link path=etc/X11/fontpath.d/misc-ISO8859-14:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-14
--- a/pkg/manifests/system-font-xorg-iso8859-15.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-15.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,22 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-15@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-15 bitmap fonts"
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=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
+link path=etc/X11/fontpath.d/100dpi-ISO8859-15:pri=91 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-15
+link path=etc/X11/fontpath.d/100dpi-ISO8859-15:unscaled:pri=21 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-15
+link path=etc/X11/fontpath.d/75dpi-ISO8859-15:pri=96 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-15
+link path=etc/X11/fontpath.d/75dpi-ISO8859-15:unscaled:pri=26 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-15
+link path=etc/X11/fontpath.d/misc-ISO8859-15:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-15
+link path=etc/X11/fontpath.d/misc-ISO8859-15:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-15
+dir path=usr/share/fonts/X11/100dpi-ISO8859-15
file path=usr/share/fonts/X11/100dpi-ISO8859-15/UTBI__10-ISO8859-15.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-15/UTBI__12-ISO8859-15.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-15/UTBI__14-ISO8859-15.pcf
@@ -213,6 +223,7 @@
file path=usr/share/fonts/X11/100dpi-ISO8859-15/timR14-ISO8859-15.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-15/timR18-ISO8859-15.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-15/timR24-ISO8859-15.pcf
+dir path=usr/share/fonts/X11/75dpi-ISO8859-15
file path=usr/share/fonts/X11/75dpi-ISO8859-15/UTBI__10-ISO8859-15.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-15/UTBI__12-ISO8859-15.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-15/UTBI__14-ISO8859-15.pcf
@@ -400,6 +411,7 @@
file path=usr/share/fonts/X11/75dpi-ISO8859-15/timR14-ISO8859-15.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-15/timR18-ISO8859-15.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-15/timR24-ISO8859-15.pcf
+dir path=usr/share/fonts/X11/misc-ISO8859-15
file path=usr/share/fonts/X11/misc-ISO8859-15/10x20-ISO8859-15.pcf
file path=usr/share/fonts/X11/misc-ISO8859-15/4x6-ISO8859-15.pcf
file path=usr/share/fonts/X11/misc-ISO8859-15/5x7-ISO8859-15.pcf
@@ -427,15 +439,3 @@
legacy pkg=SUNWfont-xorg-iso8859-15 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-15 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-15:pri=91 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-15
-link path=etc/X11/fontpath.d/100dpi-ISO8859-15:unscaled:pri=21 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-15
-link path=etc/X11/fontpath.d/75dpi-ISO8859-15:pri=96 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-15
-link path=etc/X11/fontpath.d/75dpi-ISO8859-15:unscaled:pri=26 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-15
-link path=etc/X11/fontpath.d/misc-ISO8859-15:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-15
-link path=etc/X11/fontpath.d/misc-ISO8859-15:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-15
--- a/pkg/manifests/system-font-xorg-iso8859-16.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-16.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-16@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-16 bitmap fonts"
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=usr/share/fonts/X11/misc-ISO8859-16
+link path=etc/X11/fontpath.d/misc-ISO8859-16:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-16
+link path=etc/X11/fontpath.d/misc-ISO8859-16:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-16
+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
file path=usr/share/fonts/X11/misc-ISO8859-16/5x7-ISO8859-16.pcf
@@ -51,7 +55,3 @@
legacy pkg=SUNWfont-xorg-iso8859-16 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-16 fonts"
-link path=etc/X11/fontpath.d/misc-ISO8859-16:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-16
-link path=etc/X11/fontpath.d/misc-ISO8859-16:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-16
--- a/pkg/manifests/system-font-xorg-iso8859-2.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-2.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,22 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-2@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-2 bitmap fonts"
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=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
+link path=etc/X11/fontpath.d/100dpi-ISO8859-2:pri=91 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-2
+link path=etc/X11/fontpath.d/100dpi-ISO8859-2:unscaled:pri=21 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-2
+link path=etc/X11/fontpath.d/75dpi-ISO8859-2:pri=96 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-2
+link path=etc/X11/fontpath.d/75dpi-ISO8859-2:unscaled:pri=26 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-2
+link path=etc/X11/fontpath.d/misc-ISO8859-2:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-2
+link path=etc/X11/fontpath.d/misc-ISO8859-2:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-2
+dir path=usr/share/fonts/X11/100dpi-ISO8859-2
file path=usr/share/fonts/X11/100dpi-ISO8859-2/UTBI__10-ISO8859-2.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-2/UTBI__12-ISO8859-2.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-2/UTBI__14-ISO8859-2.pcf
@@ -213,6 +223,7 @@
file path=usr/share/fonts/X11/100dpi-ISO8859-2/timR14-ISO8859-2.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-2/timR18-ISO8859-2.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-2/timR24-ISO8859-2.pcf
+dir path=usr/share/fonts/X11/75dpi-ISO8859-2
file path=usr/share/fonts/X11/75dpi-ISO8859-2/UTBI__10-ISO8859-2.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-2/UTBI__12-ISO8859-2.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-2/UTBI__14-ISO8859-2.pcf
@@ -400,6 +411,7 @@
file path=usr/share/fonts/X11/75dpi-ISO8859-2/timR14-ISO8859-2.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-2/timR18-ISO8859-2.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-2/timR24-ISO8859-2.pcf
+dir path=usr/share/fonts/X11/misc-ISO8859-2
file path=usr/share/fonts/X11/misc-ISO8859-2/10x20-ISO8859-2.pcf
file path=usr/share/fonts/X11/misc-ISO8859-2/4x6-ISO8859-2.pcf
file path=usr/share/fonts/X11/misc-ISO8859-2/5x7-ISO8859-2.pcf
@@ -427,15 +439,3 @@
legacy pkg=SUNWfont-xorg-iso8859-2 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-2 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-2:pri=91 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-2
-link path=etc/X11/fontpath.d/100dpi-ISO8859-2:unscaled:pri=21 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-2
-link path=etc/X11/fontpath.d/75dpi-ISO8859-2:pri=96 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-2
-link path=etc/X11/fontpath.d/75dpi-ISO8859-2:unscaled:pri=26 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-2
-link path=etc/X11/fontpath.d/misc-ISO8859-2:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-2
-link path=etc/X11/fontpath.d/misc-ISO8859-2:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-2
--- a/pkg/manifests/system-font-xorg-iso8859-3.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-3.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,22 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-3@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-3 bitmap fonts"
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=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
+link path=etc/X11/fontpath.d/100dpi-ISO8859-3:pri=91 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-3
+link path=etc/X11/fontpath.d/100dpi-ISO8859-3:unscaled:pri=21 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-3
+link path=etc/X11/fontpath.d/75dpi-ISO8859-3:pri=96 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-3
+link path=etc/X11/fontpath.d/75dpi-ISO8859-3:unscaled:pri=26 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-3
+link path=etc/X11/fontpath.d/misc-ISO8859-3:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-3
+link path=etc/X11/fontpath.d/misc-ISO8859-3:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-3
+dir path=usr/share/fonts/X11/100dpi-ISO8859-3
file path=usr/share/fonts/X11/100dpi-ISO8859-3/UTBI__10-ISO8859-3.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-3/UTBI__12-ISO8859-3.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-3/UTBI__14-ISO8859-3.pcf
@@ -213,6 +223,7 @@
file path=usr/share/fonts/X11/100dpi-ISO8859-3/timR14-ISO8859-3.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-3/timR18-ISO8859-3.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-3/timR24-ISO8859-3.pcf
+dir path=usr/share/fonts/X11/75dpi-ISO8859-3
file path=usr/share/fonts/X11/75dpi-ISO8859-3/UTBI__10-ISO8859-3.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-3/UTBI__12-ISO8859-3.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-3/UTBI__14-ISO8859-3.pcf
@@ -400,6 +411,7 @@
file path=usr/share/fonts/X11/75dpi-ISO8859-3/timR14-ISO8859-3.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-3/timR18-ISO8859-3.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-3/timR24-ISO8859-3.pcf
+dir path=usr/share/fonts/X11/misc-ISO8859-3
file path=usr/share/fonts/X11/misc-ISO8859-3/10x20-ISO8859-3.pcf
file path=usr/share/fonts/X11/misc-ISO8859-3/4x6-ISO8859-3.pcf
file path=usr/share/fonts/X11/misc-ISO8859-3/5x7-ISO8859-3.pcf
@@ -427,15 +439,3 @@
legacy pkg=SUNWfont-xorg-iso8859-3 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-3 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-3:pri=91 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-3
-link path=etc/X11/fontpath.d/100dpi-ISO8859-3:unscaled:pri=21 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-3
-link path=etc/X11/fontpath.d/75dpi-ISO8859-3:pri=96 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-3
-link path=etc/X11/fontpath.d/75dpi-ISO8859-3:unscaled:pri=26 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-3
-link path=etc/X11/fontpath.d/misc-ISO8859-3:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-3
-link path=etc/X11/fontpath.d/misc-ISO8859-3:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-3
--- a/pkg/manifests/system-font-xorg-iso8859-4.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-4.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,22 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-4@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-4 bitmap fonts"
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=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
+link path=etc/X11/fontpath.d/100dpi-ISO8859-4:pri=91 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-4
+link path=etc/X11/fontpath.d/100dpi-ISO8859-4:unscaled:pri=21 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-4
+link path=etc/X11/fontpath.d/75dpi-ISO8859-4:pri=96 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-4
+link path=etc/X11/fontpath.d/75dpi-ISO8859-4:unscaled:pri=26 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-4
+link path=etc/X11/fontpath.d/misc-ISO8859-4:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-4
+link path=etc/X11/fontpath.d/misc-ISO8859-4:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-4
+dir path=usr/share/fonts/X11/100dpi-ISO8859-4
file path=usr/share/fonts/X11/100dpi-ISO8859-4/UTBI__10-ISO8859-4.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-4/UTBI__12-ISO8859-4.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-4/UTBI__14-ISO8859-4.pcf
@@ -213,6 +223,7 @@
file path=usr/share/fonts/X11/100dpi-ISO8859-4/timR14-ISO8859-4.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-4/timR18-ISO8859-4.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-4/timR24-ISO8859-4.pcf
+dir path=usr/share/fonts/X11/75dpi-ISO8859-4
file path=usr/share/fonts/X11/75dpi-ISO8859-4/UTBI__10-ISO8859-4.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-4/UTBI__12-ISO8859-4.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-4/UTBI__14-ISO8859-4.pcf
@@ -400,6 +411,7 @@
file path=usr/share/fonts/X11/75dpi-ISO8859-4/timR14-ISO8859-4.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-4/timR18-ISO8859-4.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-4/timR24-ISO8859-4.pcf
+dir path=usr/share/fonts/X11/misc-ISO8859-4
file path=usr/share/fonts/X11/misc-ISO8859-4/10x20-ISO8859-4.pcf
file path=usr/share/fonts/X11/misc-ISO8859-4/4x6-ISO8859-4.pcf
file path=usr/share/fonts/X11/misc-ISO8859-4/5x7-ISO8859-4.pcf
@@ -427,15 +439,3 @@
legacy pkg=SUNWfont-xorg-iso8859-4 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-4 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-4:pri=91 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-4
-link path=etc/X11/fontpath.d/100dpi-ISO8859-4:unscaled:pri=21 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-4
-link path=etc/X11/fontpath.d/75dpi-ISO8859-4:pri=96 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-4
-link path=etc/X11/fontpath.d/75dpi-ISO8859-4:unscaled:pri=26 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-4
-link path=etc/X11/fontpath.d/misc-ISO8859-4:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-4
-link path=etc/X11/fontpath.d/misc-ISO8859-4:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-4
--- a/pkg/manifests/system-font-xorg-iso8859-5.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-5.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-5@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-5 bitmap fonts"
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=usr/share/fonts/X11/misc-ISO8859-5
+link path=etc/X11/fontpath.d/misc-ISO8859-5:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-5
+link path=etc/X11/fontpath.d/misc-ISO8859-5:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-5
+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
file path=usr/share/fonts/X11/misc-ISO8859-5/5x7-ISO8859-5.pcf
@@ -51,7 +55,3 @@
legacy pkg=SUNWfont-xorg-iso8859-5 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-5 fonts"
-link path=etc/X11/fontpath.d/misc-ISO8859-5:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-5
-link path=etc/X11/fontpath.d/misc-ISO8859-5:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-5
--- a/pkg/manifests/system-font-xorg-iso8859-7.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-7.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-7@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-7 bitmap fonts"
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=usr/share/fonts/X11/misc-ISO8859-7
+link path=etc/X11/fontpath.d/misc-ISO8859-7:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-7
+link path=etc/X11/fontpath.d/misc-ISO8859-7:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-7
+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
file path=usr/share/fonts/X11/misc-ISO8859-7/5x7-ISO8859-7.pcf
@@ -51,7 +55,3 @@
legacy pkg=SUNWfont-xorg-iso8859-7 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-7 fonts"
-link path=etc/X11/fontpath.d/misc-ISO8859-7:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-7
-link path=etc/X11/fontpath.d/misc-ISO8859-7:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-7
--- a/pkg/manifests/system-font-xorg-iso8859-8.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-8.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-8@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-8 bitmap fonts"
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=usr/share/fonts/X11/misc-ISO8859-8
+link path=etc/X11/fontpath.d/misc-ISO8859-8:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-8
+link path=etc/X11/fontpath.d/misc-ISO8859-8:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-8
+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
file path=usr/share/fonts/X11/misc-ISO8859-8/5x7-ISO8859-8.pcf
@@ -48,7 +52,3 @@
legacy pkg=SUNWfont-xorg-iso8859-8 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-8 fonts"
-link path=etc/X11/fontpath.d/misc-ISO8859-8:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-8
-link path=etc/X11/fontpath.d/misc-ISO8859-8:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-8
--- a/pkg/manifests/system-font-xorg-iso8859-9.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-9.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,22 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/font/xorg/iso8859-9@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 iso8859-9 bitmap fonts"
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=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
+link path=etc/X11/fontpath.d/100dpi-ISO8859-9:pri=91 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-9
+link path=etc/X11/fontpath.d/100dpi-ISO8859-9:unscaled:pri=21 \
+ target=../../../usr/share/fonts/X11/100dpi-ISO8859-9
+link path=etc/X11/fontpath.d/75dpi-ISO8859-9:pri=96 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-9
+link path=etc/X11/fontpath.d/75dpi-ISO8859-9:unscaled:pri=26 \
+ target=../../../usr/share/fonts/X11/75dpi-ISO8859-9
+link path=etc/X11/fontpath.d/misc-ISO8859-9:pri=86 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-9
+link path=etc/X11/fontpath.d/misc-ISO8859-9:unscaled:pri=16 \
+ target=../../../usr/share/fonts/X11/misc-ISO8859-9
+dir path=usr/share/fonts/X11/100dpi-ISO8859-9
file path=usr/share/fonts/X11/100dpi-ISO8859-9/UTBI__10-ISO8859-9.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-9/UTBI__12-ISO8859-9.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-9/UTBI__14-ISO8859-9.pcf
@@ -213,6 +223,7 @@
file path=usr/share/fonts/X11/100dpi-ISO8859-9/timR14-ISO8859-9.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-9/timR18-ISO8859-9.pcf
file path=usr/share/fonts/X11/100dpi-ISO8859-9/timR24-ISO8859-9.pcf
+dir path=usr/share/fonts/X11/75dpi-ISO8859-9
file path=usr/share/fonts/X11/75dpi-ISO8859-9/UTBI__10-ISO8859-9.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-9/UTBI__12-ISO8859-9.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-9/UTBI__14-ISO8859-9.pcf
@@ -400,6 +411,7 @@
file path=usr/share/fonts/X11/75dpi-ISO8859-9/timR14-ISO8859-9.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-9/timR18-ISO8859-9.pcf
file path=usr/share/fonts/X11/75dpi-ISO8859-9/timR24-ISO8859-9.pcf
+dir path=usr/share/fonts/X11/misc-ISO8859-9
file path=usr/share/fonts/X11/misc-ISO8859-9/10x20-ISO8859-9.pcf
file path=usr/share/fonts/X11/misc-ISO8859-9/4x6-ISO8859-9.pcf
file path=usr/share/fonts/X11/misc-ISO8859-9/5x7-ISO8859-9.pcf
@@ -427,15 +439,3 @@
legacy pkg=SUNWfont-xorg-iso8859-9 \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 iso8859-9 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-9:pri=91 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-9
-link path=etc/X11/fontpath.d/100dpi-ISO8859-9:unscaled:pri=21 \
- target=../../../usr/share/fonts/X11/100dpi-ISO8859-9
-link path=etc/X11/fontpath.d/75dpi-ISO8859-9:pri=96 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-9
-link path=etc/X11/fontpath.d/75dpi-ISO8859-9:unscaled:pri=26 \
- target=../../../usr/share/fonts/X11/75dpi-ISO8859-9
-link path=etc/X11/fontpath.d/misc-ISO8859-9:pri=86 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-9
-link path=etc/X11/fontpath.d/misc-ISO8859-9:unscaled:pri=16 \
- target=../../../usr/share/fonts/X11/misc-ISO8859-9
--- a/pkg/manifests/system-font-xorg-xorg-core.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-font-xorg-xorg-core.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,20 +21,30 @@
#
set name=pkg.fmri value=pkg:/system/font/xorg/xorg-core@$(X11PKGVERS)
+set name=pkg.summary value="X.Org Foundation X11 core fonts"
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/X11/fontpath.d
-dir path=usr/X11/lib/X11
-dir path=usr/X11/lib/X11/fonts
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
-dir path=usr/share/fonts/X11/100dpi
-dir path=usr/share/fonts/X11/75dpi
-dir path=usr/share/fonts/X11/Type1
-dir path=usr/share/fonts/X11/cyrillic
-dir path=usr/share/fonts/X11/misc
-
+dir path=etc/X11/fontpath.d
+link path=etc/X11/fontpath.d/100dpi:pri=92 \
+ target=../../../usr/share/fonts/X11/100dpi
+link path=etc/X11/fontpath.d/100dpi:unscaled:pri=22 \
+ target=../../../usr/share/fonts/X11/100dpi
+link path=etc/X11/fontpath.d/75dpi:pri=97 \
+ target=../../../usr/share/fonts/X11/75dpi
+link path=etc/X11/fontpath.d/75dpi:unscaled:pri=27 \
+ target=../../../usr/share/fonts/X11/75dpi
+link path=etc/X11/fontpath.d/Type1:pri=45 \
+ target=../../../usr/share/fonts/X11/Type1
+link path=etc/X11/fontpath.d/misc:pri=87 \
+ target=../../../usr/share/fonts/X11/misc
+link path=etc/X11/fontpath.d/misc:unscaled:pri=17 \
+ target=../../../usr/share/fonts/X11/misc
+dir path=usr/X11/lib/X11
+dir path=usr/X11/lib/X11/fonts
+link path=usr/X11/lib/X11/fonts/misc target=../../../../share/fonts/X11/misc
+dir path=usr/share/fonts
+dir path=usr/share/fonts/X11
+dir path=usr/share/fonts/X11/100dpi
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
@@ -258,6 +268,7 @@
file path=usr/share/fonts/X11/100dpi/timR14.pcf
file path=usr/share/fonts/X11/100dpi/timR18.pcf
file path=usr/share/fonts/X11/100dpi/timR24.pcf
+dir path=usr/share/fonts/X11/75dpi
file path=usr/share/fonts/X11/75dpi/UTBI__10.pcf
file path=usr/share/fonts/X11/75dpi/UTBI__12.pcf
file path=usr/share/fonts/X11/75dpi/UTBI__14.pcf
@@ -481,6 +492,7 @@
file path=usr/share/fonts/X11/75dpi/timR14.pcf
file path=usr/share/fonts/X11/75dpi/timR18.pcf
file path=usr/share/fonts/X11/75dpi/timR24.pcf
+dir path=usr/share/fonts/X11/Type1
file path=usr/share/fonts/X11/Type1/UTBI____.afm
file path=usr/share/fonts/X11/Type1/UTBI____.pfa
file path=usr/share/fonts/X11/Type1/UTB_____.afm
@@ -542,7 +554,9 @@
file path=usr/share/fonts/X11/Type1/l049033t.pfa
file path=usr/share/fonts/X11/Type1/l049036t.afm
file path=usr/share/fonts/X11/Type1/l049036t.pfa
+dir path=usr/share/fonts/X11/cyrillic
file path=usr/share/fonts/X11/cyrillic/fonts.alias
+dir path=usr/share/fonts/X11/misc
file path=usr/share/fonts/X11/misc/10x20-KOI8-R.pcf
file path=usr/share/fonts/X11/misc/10x20.pcf
file path=usr/share/fonts/X11/misc/12x13ja.pcf
@@ -644,18 +658,3 @@
legacy pkg=SUNWfont-xorg-core \
desc="X Window System font files based on X.Org Foundation open source release" \
name="X.Org Foundation X11 core fonts"
-link path=etc/X11/fontpath.d/100dpi:pri=92 \
- target=../../../usr/share/fonts/X11/100dpi
-link path=etc/X11/fontpath.d/100dpi:unscaled:pri=22 \
- target=../../../usr/share/fonts/X11/100dpi
-link path=etc/X11/fontpath.d/75dpi:pri=97 \
- target=../../../usr/share/fonts/X11/75dpi
-link path=etc/X11/fontpath.d/75dpi:unscaled:pri=27 \
- target=../../../usr/share/fonts/X11/75dpi
-link path=etc/X11/fontpath.d/Type1:pri=45 \
- target=../../../usr/share/fonts/X11/Type1
-link path=etc/X11/fontpath.d/misc:pri=87 \
- target=../../../usr/share/fonts/X11/misc
-link path=etc/X11/fontpath.d/misc:unscaled:pri=17 \
- target=../../../usr/share/fonts/X11/misc
-link path=usr/X11/lib/X11/fonts/misc target=../../../../share/fonts/X11/misc
--- a/pkg/manifests/system-graphics-fbconfig-fbconfig-ast.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-graphics-fbconfig-fbconfig-ast.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,20 +20,18 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
-set name=pkg.fmri \
- value=pkg:/system/graphics/fbconfig/fbconfig-ast@$(OSPKGVERS)
+set name=pkg.fmri value=pkg:/system/graphics/fbconfig/fbconfig-ast@$(OSPKGVERS)
+set name=pkg.summary value="AST Graphics Configuration and Diagnostics Software"
set name=pkg.description \
value="Plugins for fbconfig configuration and Oracle VTS diagnostics software for AST graphics"
-set name=pkg.summary \
- value="AST Graphics Configuration and Diagnostics Software"
set name=variant.arch value=sparc
+link path=usr/lib/fbconfig/libSUNWast_conf.so target=libSUNWast_conf.so.1
file path=usr/lib/fbconfig/libSUNWast_conf.so.1
file path=usr/lib/sparcv9/libvtsSUNWast.so.1
legacy pkg=SUNWastfbcf arch=sparc category=application,graphics \
desc="Configuration and diagnostics software for AST graphics" \
name="AST Graphics Configuration and Diagnostics Software" \
version=11.0.0,REV=2010.10.22
-link path=usr/lib/fbconfig/libSUNWast_conf.so target=libSUNWast_conf.so.1
# Requires kernel driver for astfb
-depend fmri=pkg:/driver/graphics/ast type=require
+depend type=require fmri=pkg:/driver/graphics/ast
--- a/pkg/manifests/system-graphics-fbconfig-fbconfig-efb.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-graphics-fbconfig-fbconfig-efb.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,13 +20,13 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
-set name=pkg.fmri \
- value=pkg:/system/graphics/fbconfig/fbconfig-efb@$(OSPKGVERS)
+set name=pkg.fmri value=pkg:/system/graphics/fbconfig/fbconfig-efb@$(OSPKGVERS)
+set name=pkg.summary \
+ value="Sun XVR-300, XVR-100, XVR-50 Graphics Configuration and Diagnostics Software"
set name=pkg.description \
value="Plugins for fbconfig configuration and Oracle VTS diagnostics software for the Sun XVR-300, XVR-100, and XVR-50 graphics accelerators"
-set name=pkg.summary \
- value="Sun XVR-300, XVR-100, XVR-50 Graphics Configuration and Diagnostics Software"
set name=variant.arch value=sparc
+link path=usr/lib/fbconfig/libSUNWefb_conf.so target=libSUNWefb_conf.so.1
file path=usr/lib/fbconfig/libSUNWefb_conf.so.1
file path=usr/lib/sparcv9/libvtsSUNWefb.so.1
legacy pkg=SUNWefbcf arch=sparc category=application,graphics \
@@ -34,7 +34,6 @@
hotline="Please contact your local service provider" \
name="Sun XVR-300, XVR-100, XVR-50 Graphics Configuration Software" \
version=11.0.0,REV=2011.03.15
-link path=usr/lib/fbconfig/libSUNWefb_conf.so target=libSUNWefb_conf.so.1
# Requires kernel driver for efb
-depend fmri=pkg:/driver/graphics/efb type=require
+depend type=require fmri=pkg:/driver/graphics/efb
--- a/pkg/manifests/system-graphics-fbconfig.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-graphics-fbconfig.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,16 +21,16 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/graphics/fbconfig@$(OSPKGVERS)
+set name=pkg.summary value="Frame Buffer Configuration Utility"
set name=pkg.description value="Generic frame buffer configuration utility"
-set name=pkg.summary value="Frame Buffer Configuration Utility"
set name=variant.arch value=sparc
-dir path=usr/lib/fbconfig
file path=etc/security/exec_attr.d/fbconfig group=sys
+dir path=usr/lib/fbconfig
file path=usr/lib/fbconfig/SunModes_xorg.conf
file path=usr/lib/fbconfig/fbconf_xorg mode=0555
+link path=usr/lib/fbconfig/libfbconf_xorg.so target=libfbconf_xorg.so.1
file path=usr/lib/fbconfig/libfbconf_xorg.so.1
file path=usr/sbin/fbconfig
legacy pkg=SUNWfbc arch=sparc category=application,graphics \
desc="Generic frame buffer configuration utility" \
name="Frame Buffer Configuration Utility" version=11.0.0,REV=2010.08.02
-link path=usr/lib/fbconfig/libfbconf_xorg.so target=libfbconf_xorg.so.1
--- a/pkg/manifests/system-keyboard-kbd_mode.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-keyboard-kbd_mode.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/keyboard/kbd_mode@$(OSPKGVERS)
+set name=pkg.summary value="kbd_mode - change the keyboard translation mode"
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"
+link path=usr/X11/bin/kbd_mode target=../../bin/kbd_mode
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-library-fontconfig.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,18 +20,12 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/library/fontconfig@__version:fontconfig__
-set name=pkg.description \
- 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/fonts
-dir path=etc/fonts/conf.avail
-dir path=etc/fonts/conf.d
-dir path=lib/svc/manifest/application/font
-dir path=usr/include/fontconfig
-dir path=usr/share/doc/fontconfig
-dir path=usr/share/doc/fontconfig/fontconfig-devel facet.doc.html=true
-dir path=var/cache/fontconfig
+set name=pkg.description \
+ 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/"
+dir path=etc/fonts
+dir path=etc/fonts/conf.avail
file path=etc/fonts/conf.avail/10-autohint.conf
file path=etc/fonts/conf.avail/10-no-sub-pixel.conf
file path=etc/fonts/conf.avail/10-sub-pixel-bgr.conf
@@ -61,10 +55,42 @@
file path=etc/fonts/conf.avail/80-delicious.conf
file path=etc/fonts/conf.avail/90-sun-prefer-bitmap.conf
file path=etc/fonts/conf.avail/90-synthetic.conf
+dir path=etc/fonts/conf.d
+link path=etc/fonts/conf.d/20-fix-globaladvance.conf \
+ target=../conf.avail/20-fix-globaladvance.conf
+link path=etc/fonts/conf.d/20-indic.conf target=../conf.avail/20-indic.conf
+link path=etc/fonts/conf.d/20-unhint-small-vera.conf \
+ target=../conf.avail/20-unhint-small-vera.conf
+link path=etc/fonts/conf.d/30-metric-aliases.conf \
+ target=../conf.avail/30-metric-aliases.conf
+link path=etc/fonts/conf.d/30-urw-aliases.conf \
+ target=../conf.avail/30-urw-aliases.conf
+link path=etc/fonts/conf.d/40-nonlatin.conf \
+ target=../conf.avail/40-nonlatin.conf
+link path=etc/fonts/conf.d/45-latin.conf target=../conf.avail/45-latin.conf
+link path=etc/fonts/conf.d/49-sansserif.conf \
+ target=../conf.avail/49-sansserif.conf
+link path=etc/fonts/conf.d/49-sun-preuser.conf \
+ target=../conf.avail/49-sun-preuser.conf
+link path=etc/fonts/conf.d/50-user.conf target=../conf.avail/50-user.conf
+link path=etc/fonts/conf.d/51-local.conf target=../conf.avail/51-local.conf
+link path=etc/fonts/conf.d/60-latin.conf target=../conf.avail/60-latin.conf
+link path=etc/fonts/conf.d/65-fonts-persian.conf \
+ target=../conf.avail/65-fonts-persian.conf
+link path=etc/fonts/conf.d/65-nonlatin.conf \
+ target=../conf.avail/65-nonlatin.conf
+link path=etc/fonts/conf.d/69-unifont.conf target=../conf.avail/69-unifont.conf
+link path=etc/fonts/conf.d/80-delicious.conf \
+ target=../conf.avail/80-delicious.conf
+link path=etc/fonts/conf.d/90-sun-prefer-bitmap.conf \
+ target=../conf.avail/90-sun-prefer-bitmap.conf
+link path=etc/fonts/conf.d/90-synthetic.conf \
+ target=../conf.avail/90-synthetic.conf
file path=etc/fonts/conf.d/README
file path=etc/fonts/fonts.conf
file path=etc/fonts/fonts.dtd
file path=etc/security/auth_attr.d/fontconfig group=sys
+dir path=lib/svc/manifest/application/font
file path=lib/svc/manifest/application/font/fc-cache.xml
file path=lib/svc/method/fc-cache
file path=usr/bin/$(ARCH64)/fc-cache
@@ -79,14 +105,19 @@
file path=usr/bin/fc-match
file path=usr/bin/fc-query
file path=usr/bin/fc-scan
+dir path=usr/include/fontconfig
file path=usr/include/fontconfig/fcfreetype.h
file path=usr/include/fontconfig/fcprivate.h
file path=usr/include/fontconfig/fontconfig.h
+link path=usr/lib/$(ARCH64)/libfontconfig.so target=libfontconfig.so.1
file path=usr/lib/$(ARCH64)/libfontconfig.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/fontconfig.pc
file path=usr/lib/help/auths/locale/C/FontStates.html
+link path=usr/lib/libfontconfig.so target=libfontconfig.so.1
file path=usr/lib/libfontconfig.so.1
file path=usr/lib/pkgconfig/fontconfig.pc
+dir path=usr/share/doc/fontconfig
+dir path=usr/share/doc/fontconfig/fontconfig-devel facet.doc.html=true
file path=usr/share/doc/fontconfig/fontconfig-devel.pdf
file path=usr/share/doc/fontconfig/fontconfig-devel.txt
file path=usr/share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html
@@ -116,19 +147,16 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsethaschar.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersect.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersectcount.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersectcount.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetissubset.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetmerge.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetnew.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetnextpage.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtract.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtractcount.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtractcount.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetunion.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontadddir.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontaddfile.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontaddfile.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontclear.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigbuildfonts.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigcreate.html
@@ -139,22 +167,18 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcache.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcachedirs.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigdirs.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcurrent.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfighome.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigparseandload.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigreference.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetcurrent.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcdircacheload.html
@@ -182,8 +206,7 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcfontsort.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharindex.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharset.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcgetlangs.html
@@ -191,8 +214,7 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcinit.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcinitbringuptodate.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfig.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcinitreinitialize.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcislower.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcisupper.html
@@ -218,15 +240,11 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcnamegetconstant.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcnamegetobjecttype.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcnameparse.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterconstants.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterobjecttypes.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterconstants.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterobjecttypes.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcnameunparse.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterconstants.html
-file \
- path=usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterobjecttypes.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterconstants.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterobjecttypes.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetadd.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetbuild.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetcreate.html
@@ -475,42 +493,10 @@
file path=usr/share/man/man3lib/libfontconfig.3lib
file path=usr/share/man/man4/fonts.conf.4
file path=usr/share/man/man5/fonts-conf.5
+dir path=var/cache/fontconfig
legacy pkg=SUNWfontconfig desc="Fontconfig library" name="Fontconfig library"
legacy pkg=SUNWfontconfig-docs desc="Fontconfig library documentation" \
name="Fontconfig library documentation" facet.doc=true
legacy pkg=SUNWfontconfig-root \
desc="Fontconfig library configuration files (/etc/fonts)" \
name="Fontconfig library configuration files"
-link path=etc/fonts/conf.d/20-fix-globaladvance.conf \
- target=../conf.avail/20-fix-globaladvance.conf
-link path=etc/fonts/conf.d/20-indic.conf target=../conf.avail/20-indic.conf
-link path=etc/fonts/conf.d/20-unhint-small-vera.conf \
- target=../conf.avail/20-unhint-small-vera.conf
-link path=etc/fonts/conf.d/30-metric-aliases.conf \
- target=../conf.avail/30-metric-aliases.conf
-link path=etc/fonts/conf.d/30-urw-aliases.conf \
- target=../conf.avail/30-urw-aliases.conf
-link path=etc/fonts/conf.d/40-nonlatin.conf \
- target=../conf.avail/40-nonlatin.conf
-link path=etc/fonts/conf.d/45-latin.conf target=../conf.avail/45-latin.conf
-link path=etc/fonts/conf.d/49-sansserif.conf \
- target=../conf.avail/49-sansserif.conf
-link path=etc/fonts/conf.d/49-sun-preuser.conf \
- target=../conf.avail/49-sun-preuser.conf
-link path=etc/fonts/conf.d/50-user.conf target=../conf.avail/50-user.conf
-link path=etc/fonts/conf.d/51-local.conf target=../conf.avail/51-local.conf
-link path=etc/fonts/conf.d/60-latin.conf target=../conf.avail/60-latin.conf
-link path=etc/fonts/conf.d/65-fonts-persian.conf \
- target=../conf.avail/65-fonts-persian.conf
-link path=etc/fonts/conf.d/65-nonlatin.conf \
- target=../conf.avail/65-nonlatin.conf
-link path=etc/fonts/conf.d/69-unifont.conf \
- target=../conf.avail/69-unifont.conf
-link path=etc/fonts/conf.d/80-delicious.conf \
- target=../conf.avail/80-delicious.conf
-link path=etc/fonts/conf.d/90-sun-prefer-bitmap.conf \
- target=../conf.avail/90-sun-prefer-bitmap.conf
-link path=etc/fonts/conf.d/90-synthetic.conf \
- target=../conf.avail/90-synthetic.conf
-link path=usr/lib/$(ARCH64)/libfontconfig.so target=libfontconfig.so.1
-link path=usr/lib/libfontconfig.so target=libfontconfig.so.1
--- a/pkg/manifests/system-library-freetype-2.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/system-library-freetype-2.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,15 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/system/library/freetype-2@__version:freetype__
+set name=pkg.summary value="FreeType 2 font engine"
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/include/freetype2
-dir path=usr/include/freetype2/freetype
-dir path=usr/include/freetype2/freetype/config
-dir path=usr/share/doc/freetype
file path=usr/bin/$(ARCH64)/freetype-config
file path=usr/bin/freetype-config
+dir path=usr/include/freetype2
+dir path=usr/include/freetype2/freetype
+dir path=usr/include/freetype2/freetype/config
file path=usr/include/freetype2/freetype/config/ftconfig.h
file path=usr/include/freetype2/freetype/config/ftheader.h
file path=usr/include/freetype2/freetype/config/ftmodule.h
@@ -77,11 +76,14 @@
file path=usr/include/freetype2/freetype/tttags.h
file path=usr/include/freetype2/freetype/ttunpat.h
file path=usr/include/ft2build.h
+link path=usr/lib/$(ARCH64)/libfreetype.so target=libfreetype.so.6
file path=usr/lib/$(ARCH64)/libfreetype.so.6
file path=usr/lib/$(ARCH64)/pkgconfig/freetype2.pc
+link path=usr/lib/libfreetype.so target=libfreetype.so.6
file path=usr/lib/libfreetype.so.6
file path=usr/lib/pkgconfig/freetype2.pc
file path=usr/share/aclocal/freetype2.m4
+dir path=usr/share/doc/freetype
file path=usr/share/doc/freetype/VERSION.DLL
file path=usr/share/doc/freetype/formats.txt
file path=usr/share/doc/freetype/ft2-base_interface.html
@@ -123,9 +125,7 @@
file path=usr/share/doc/freetype/ft2-user_allocation.html
file path=usr/share/doc/freetype/ft2-version.html
file path=usr/share/doc/freetype/ft2-winfnt_fonts.html
+link path=usr/share/doc/freetype/index.html target=ft2-toc.html
legacy pkg=SUNWfreetype2 \
desc="FreeType2 font handling library and rendering engine" \
name="FreeType2 Font library"
-link path=usr/lib/$(ARCH64)/libfreetype.so target=libfreetype.so.6
-link path=usr/lib/libfreetype.so target=libfreetype.so.6
-link path=usr/share/doc/freetype/index.html target=ft2-toc.html
--- a/pkg/manifests/terminal-fbconsole.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/terminal-fbconsole.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,8 +20,8 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/terminal/fbconsole@$(OSPKGVERS)
+set name=pkg.summary value="fbconsole - fallback console"
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"
+link path=usr/X11/bin/fbconsole target=../../bin/fbconsole
file path=usr/bin/fbconsole
-link path=usr/X11/bin/fbconsole target=../../bin/fbconsole
--- a/pkg/manifests/terminal-luit.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/terminal-luit.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/terminal/luit@__version:luit__
-set name=pkg.description \
- 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"
+set name=pkg.description \
+ 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."
+link path=usr/X11/bin/luit target=../../bin/luit
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/terminal-resize.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/terminal/resize@0.__version:xterm__
-set name=pkg.description \
- 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"
+set name=pkg.description \
+ 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."
+link path=usr/X11/bin/resize target=../../bin/resize
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/terminal-xterm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/terminal/xterm@__version:xterm__
+set name=pkg.summary value="xterm - terminal emulator for X"
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/share/doc/xterm
+link path=usr/X11/bin/xterm target=../../bin/xterm
file path=usr/bin/koi8rxterm
file path=usr/bin/uxterm
file path=usr/bin/xterm
@@ -34,6 +34,7 @@
file path=usr/share/X11/app-defaults/XTerm
file path=usr/share/X11/app-defaults/XTerm-color
file path=usr/share/applications/xterm.desktop
+dir path=usr/share/doc/xterm
file path=usr/share/doc/xterm/ctlseqs.txt
file path=usr/share/man/man1/koi8rxterm.1
file path=usr/share/man/man1/uxterm.1
@@ -42,11 +43,10 @@
file path=usr/share/pixmaps/xterm-color_48x48.xpm
file path=usr/share/pixmaps/xterm_32x32.xpm
file path=usr/share/pixmaps/xterm_48x48.xpm
-link path=usr/X11/bin/xterm target=../../bin/xterm
# xterm app-defaults specifies fonts including:
# -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
-depend fmri=pkg:/system/font/xorg/iso8859-1 type=require
+depend type=require fmri=pkg:/system/font/xorg/iso8859-1
# -misc-fixed-medium-r-normal--<various sizes>-iso10646-1
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
-depend fmri=pkg:/terminal/luit type=require
-depend fmri=pkg:/terminal/resize type=require
+depend type=require fmri=pkg:/system/font/xorg/xorg-core
+depend type=require fmri=pkg:/terminal/luit
+depend type=require fmri=pkg:/terminal/resize
--- a/pkg/manifests/x11-colormap-utilities.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-colormap-utilities.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,13 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/colormap-utilities@$(X11PKGVERS)
+set name=pkg.summary value="X Colormap Utilities"
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"
+link path=usr/X11/bin/cmap_alloc target=../../bin/cmap_alloc
+link path=usr/X11/bin/cmap_compact target=../../bin/cmap_compact
+link path=usr/X11/bin/xcolor target=../../bin/xcolor
+link path=usr/X11/bin/xstdcmap target=../../bin/xstdcmap
file path=usr/bin/cmap_alloc
file path=usr/bin/cmap_compact
file path=usr/bin/xcolor
@@ -31,7 +35,3 @@
file path=usr/share/man/man1/cmap_compact.1
file path=usr/share/man/man1/xcolor.1
file path=usr/share/man/man1/xstdcmap.1
-link path=usr/X11/bin/cmap_alloc target=../../bin/cmap_alloc
-link path=usr/X11/bin/cmap_compact target=../../bin/cmap_compact
-link path=usr/X11/bin/xcolor target=../../bin/xcolor
-link path=usr/X11/bin/xstdcmap target=../../bin/xstdcmap
--- a/pkg/manifests/x11-compatibility-links-svid.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-compatibility-links-svid.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,12 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/compatibility/links-svid@$(OSPKGVERS)
+set name=pkg.summary value="X Window System SVID compatibility links"
set name=pkg.description \
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
-legacy pkg=SUNWxwrtl desc="X Window System SVID compatibility links" \
- name="X Window System SVID compatibility links"
# This link is required by the SVID3 ABI
link path=usr/X target=./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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-compatibility-links-xorg.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,11 +20,11 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/compatibility/links-xorg@$(OSPKGVERS)
+set name=pkg.summary value="X Window System platform compatibility links"
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"
+link path=usr/X11R6 target=X11 facet.compat.x11-links=true
+link path=usr/openwin target=X11 facet.compat.x11-links=true
legacy pkg=SUNWxorg-compatlinks \
desc="Symbolic links for X Window System software compatibility with other releases" \
name="X11 Compatibility Links"
-link path=usr/X11R6 target=X11 facet.compat.x11-links=true
-link path=usr/openwin target=X11 facet.compat.x11-links=true
--- a/pkg/manifests/x11-data-workspace-patterns.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-data-workspace-patterns.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/data/workspace-patterns@$(OSPKGVERS)
+set name=pkg.summary value="Bitmap patterns for workspace backgrounds"
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/share/patterns
+dir path=usr/share/patterns
file path=usr/share/patterns/attributes
file path=usr/share/patterns/background.xbm
file path=usr/share/patterns/bricks.xbm
--- a/pkg/manifests/x11-data-xbitmaps.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-data-xbitmaps.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -26,14 +26,14 @@
# runtime, so we need to override the default devel facet tagging on
# the bitmap files & directories
#
-<transform dir path=usr/include.* -> set facet.devel false>
-<transform file path=usr/include/.* -> set facet.devel false>
+<transform dir file path=usr/include.* -> set facet.devel false>
+
set name=pkg.fmri value=pkg:/x11/data/xbitmaps@__version:xbitmaps__
+set name=pkg.summary value="X Window System standard bitmaps"
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/include/X11/bitmaps
+dir path=usr/include/X11/bitmaps
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-data-xcursor-themes.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -19,18 +19,13 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
-set name=pkg.fmri \
- value=pkg:/x11/data/xcursor-themes@__version:xcursor-themes__
+set name=pkg.fmri value=pkg:/x11/data/xcursor-themes@__version:xcursor-themes__
+set name=pkg.summary value="X.Org default X11 cursor themes"
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/share/icons
-dir path=usr/share/icons/handhelds
-dir path=usr/share/icons/handhelds/cursors
-dir path=usr/share/icons/redglass
-dir path=usr/share/icons/redglass/cursors
-dir path=usr/share/icons/whiteglass
-dir path=usr/share/icons/whiteglass/cursors
+dir path=usr/share/icons
+dir path=usr/share/icons/handhelds
+dir path=usr/share/icons/handhelds/cursors
file path=usr/share/icons/handhelds/cursors/X_cursor
file path=usr/share/icons/handhelds/cursors/based_arrow_down
file path=usr/share/icons/handhelds/cursors/based_arrow_up
@@ -68,6 +63,8 @@
file path=usr/share/icons/handhelds/cursors/top_tee
file path=usr/share/icons/handhelds/cursors/watch
file path=usr/share/icons/handhelds/cursors/xterm
+dir path=usr/share/icons/redglass
+dir path=usr/share/icons/redglass/cursors
file path=usr/share/icons/redglass/cursors/X_cursor
file path=usr/share/icons/redglass/cursors/based_arrow_down
file path=usr/share/icons/redglass/cursors/based_arrow_up
@@ -105,6 +102,8 @@
file path=usr/share/icons/redglass/cursors/top_tee
file path=usr/share/icons/redglass/cursors/watch
file path=usr/share/icons/redglass/cursors/xterm
+dir path=usr/share/icons/whiteglass
+dir path=usr/share/icons/whiteglass/cursors
file path=usr/share/icons/whiteglass/cursors/X_cursor
file path=usr/share/icons/whiteglass/cursors/base_arrow_down
file path=usr/share/icons/whiteglass/cursors/base_arrow_up
--- a/pkg/manifests/x11-demo-mesa-demos.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-demo-mesa-demos.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,11 +20,11 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/demo/mesa-demos@__version:mesa-demos__
+set name=pkg.summary value="Mesa sample GLX clients"
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"
+link path=usr/X11/bin/glxinfo target=../../bin/glxinfo
file path=usr/bin/glxgears
file path=usr/bin/glxinfo
file path=usr/share/man/man1/glxgears.1
file path=usr/share/man/man1/glxinfo.1
-link path=usr/X11/bin/glxinfo target=../../bin/glxinfo
--- a/pkg/manifests/x11-demo.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-demo.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,13 +20,17 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/demo@$(X11PKGVERS)
+set name=pkg.summary value="X Window System demo programs"
set name=pkg.description \
value="ico, xeyes, xgc, and xlogo sample clients to demonstrate or test various X operations."
# Silence pkglint WARNING pkglint.manifest004:
# last name component demo in package name clashes across
# 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"
+link path=usr/X11/bin/ico target=../../bin/ico
+link path=usr/X11/bin/xeyes target=../../bin/xeyes
+link path=usr/X11/bin/xgc target=../../bin/xgc
+link path=usr/X11/bin/xlogo target=../../bin/xlogo
file path=usr/bin/ico
file path=usr/bin/xeyes
file path=usr/bin/xgc
@@ -41,10 +45,6 @@
file path=usr/share/man/man1/xlogo.1
legacy pkg=SUNWxwdem desc="X Window System demo programs" \
name="X Window System demo programs"
-link path=usr/X11/bin/ico target=../../bin/ico
-link path=usr/X11/bin/xeyes target=../../bin/xeyes
-link path=usr/X11/bin/xgc target=../../bin/xgc
-link path=usr/X11/bin/xlogo target=../../bin/xlogo
# Xlogo app-defaults references icons in xbitmaps
-depend fmri=pkg:/x11/data/xbitmaps type=require
+depend type=require fmri=pkg:/x11/data/xbitmaps
--- a/pkg/manifests/x11-diagnostic-x11-info-clients.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-diagnostic-x11-info-clients.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,18 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/diagnostic/x11-info-clients@$(X11PKGVERS)
+set name=pkg.summary \
+ value="X Window System diagnostic and information display clients"
set name=pkg.description \
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"
+link path=usr/X11/bin/xdpyinfo target=../../bin/xdpyinfo
+link path=usr/X11/bin/xdriinfo target=../../bin/xdriinfo
+link path=usr/X11/bin/xlsatoms target=../../bin/xlsatoms
+link path=usr/X11/bin/xlsclients target=../../bin/xlsclients
+link path=usr/X11/bin/xlsfonts target=../../bin/xlsfonts
+link path=usr/X11/bin/xlswins target=../../bin/xlswins
+link path=usr/X11/bin/xvinfo target=../../bin/xvinfo
+link path=usr/X11/bin/xwininfo target=../../bin/xwininfo
file path=usr/bin/xdpyinfo
file path=usr/bin/xdriinfo
file path=usr/bin/xlsatoms
@@ -40,11 +48,3 @@
file path=usr/share/man/man1/xlswins.1
file path=usr/share/man/man1/xvinfo.1
file path=usr/share/man/man1/xwininfo.1
-link path=usr/X11/bin/xdpyinfo target=../../bin/xdpyinfo
-link path=usr/X11/bin/xdriinfo target=../../bin/xdriinfo
-link path=usr/X11/bin/xlsatoms target=../../bin/xlsatoms
-link path=usr/X11/bin/xlsclients target=../../bin/xlsclients
-link path=usr/X11/bin/xlsfonts target=../../bin/xlsfonts
-link path=usr/X11/bin/xlswins target=../../bin/xlswins
-link path=usr/X11/bin/xvinfo target=../../bin/xvinfo
-link path=usr/X11/bin/xwininfo target=../../bin/xwininfo
--- a/pkg/manifests/x11-diagnostic-xev.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-diagnostic-xev.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/diagnostic/xev@__version:xev__
+set name=pkg.summary value="xev - X11 event monitor"
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"
+link path=usr/X11/bin/xev target=../../bin/xev
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-diagnostic-xscope.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/diagnostic/xscope@__version:xscope__
+set name=pkg.summary value="xscope - X Window Protocol Viewer"
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"
+link path=usr/X11/bin/xscope target=../../bin/xscope
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-documentation-xorg-docs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,20 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/documentation/xorg-docs@__version:xorg-docs__
+set name=pkg.summary value="X Window System common documentation"
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/share/doc/X11
-dir path=usr/share/doc/X11/fonts
-dir path=usr/share/doc/X11/graphics
-dir path=usr/share/doc/X11/input
-dir path=usr/share/doc/X11/platforms
-dir path=usr/share/doc/X11/specs
-dir path=usr/share/doc/X11/specs/CTEXT
-dir path=usr/share/doc/X11/specs/ICCCM
-dir path=usr/share/doc/X11/specs/XLFD
-dir path=usr/share/sgml/X11
-dir path=usr/share/sgml/X11/dbs
+dir path=usr/share/doc/X11
file path=usr/share/doc/X11/License.html
file path=usr/share/doc/X11/License.txt
file path=usr/share/doc/X11/License.xml
@@ -46,24 +36,31 @@
file path=usr/share/doc/X11/Versions.html
file path=usr/share/doc/X11/Versions.txt
file path=usr/share/doc/X11/Versions.xml
+dir path=usr/share/doc/X11/fonts
file path=usr/share/doc/X11/fonts/fonts.html
file path=usr/share/doc/X11/fonts/fonts.txt
file path=usr/share/doc/X11/fonts/fonts.xml
+dir path=usr/share/doc/X11/input
file path=usr/share/doc/X11/input/XKB-Config.html
file path=usr/share/doc/X11/input/XKB-Config.txt
file path=usr/share/doc/X11/input/XKB-Config.xml
file path=usr/share/doc/X11/input/XKB-Enhancing.html
file path=usr/share/doc/X11/input/XKB-Enhancing.txt
file path=usr/share/doc/X11/input/XKB-Enhancing.xml
+dir path=usr/share/doc/X11/platforms
file path=usr/share/doc/X11/platforms/Solaris.html
file path=usr/share/doc/X11/platforms/Solaris.txt
file path=usr/share/doc/X11/platforms/Solaris.xml
+dir path=usr/share/doc/X11/specs
+dir path=usr/share/doc/X11/specs/CTEXT
file path=usr/share/doc/X11/specs/CTEXT/ctext.html
file path=usr/share/doc/X11/specs/CTEXT/ctext.txt
file path=usr/share/doc/X11/specs/CTEXT/ctext.xml
+dir path=usr/share/doc/X11/specs/ICCCM
file path=usr/share/doc/X11/specs/ICCCM/icccm.html
file path=usr/share/doc/X11/specs/ICCCM/icccm.txt
file path=usr/share/doc/X11/specs/ICCCM/icccm.xml
+dir path=usr/share/doc/X11/specs/XLFD
file path=usr/share/doc/X11/specs/XLFD/xlfd.html
file path=usr/share/doc/X11/specs/XLFD/xlfd.txt
file path=usr/share/doc/X11/specs/XLFD/xlfd.xml
@@ -74,6 +71,8 @@
file path=usr/share/man/man5/Xprint.5
file path=usr/share/man/man5/Xsecurity.5
file path=usr/share/pkgconfig/xorg-sgml-doctools.pc
+dir path=usr/share/sgml/X11
+dir path=usr/share/sgml/X11/dbs
file path=usr/share/sgml/X11/dbs/masterdb.html.xml
file path=usr/share/sgml/X11/dbs/masterdb.pdf.xml
file path=usr/share/sgml/X11/dbs/masterdb.ps.xml
--- a/pkg/manifests/x11-font-utilities.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-font-utilities.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,12 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/font-utilities@$(X11PKGVERS)
+set name=pkg.summary value="X Window System font utilities"
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/share/fonts/X11/util
+link path=usr/X11/bin/bdftopcf target=../../bin/bdftopcf
+link path=usr/X11/bin/mkfontdir target=../../bin/mkfontdir
+link path=usr/X11/bin/mkfontscale target=../../bin/mkfontscale
file path=usr/bin/bdftopcf
file path=usr/bin/bdftruncate
file path=usr/bin/mkfontdir
@@ -31,6 +33,7 @@
file path=usr/bin/ucs2any
file path=usr/lib/X11/installalias mode=0555
file path=usr/share/aclocal/fontutil.m4
+dir path=usr/share/fonts/X11/util
file path=usr/share/fonts/X11/util/map-ISO8859-1
file path=usr/share/fonts/X11/util/map-ISO8859-10
file path=usr/share/fonts/X11/util/map-ISO8859-11
@@ -61,6 +64,3 @@
#
legacy pkg=SUNWxwfsw desc="X Window System required font software" \
name="X Window System platform required font software"
-link path=usr/X11/bin/bdftopcf target=../../bin/bdftopcf
-link path=usr/X11/bin/mkfontdir target=../../bin/mkfontdir
-link path=usr/X11/bin/mkfontscale target=../../bin/mkfontscale
--- a/pkg/manifests/x11-header-rasterfile.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-header-rasterfile.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/header/rasterfile@$(OSPKGVERS)
+set name=pkg.summary value="Sun rasterfile image format"
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/include/pixrect
+dir path=usr/include/pixrect
file path=usr/include/pixrect/rasterfile.h
file path=usr/share/man/man4/rasterfile.4
--- a/pkg/manifests/x11-header-x11-protocols.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-header-x11-protocols.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,39 +20,23 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/header/x11-protocols@$(X11PKGVERS)
+set name=pkg.summary value="X Window System protocol definitions"
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/X11/include
-dir path=usr/include/GL
-dir path=usr/include/GL/internal
-dir path=usr/include/X11
-dir path=usr/include/X11/PM
-dir path=usr/include/X11/dri
-dir path=usr/include/X11/extensions
-dir path=usr/include/X11/fonts
-dir path=usr/share/doc/bigreqsproto
-dir path=usr/share/doc/compositeproto
-dir path=usr/share/doc/damageproto
-dir path=usr/share/doc/fixesproto
-dir path=usr/share/doc/fontsproto
-dir path=usr/share/doc/inputproto
-dir path=usr/share/doc/randrproto
-dir path=usr/share/doc/recordproto
-dir path=usr/share/doc/renderproto
-dir path=usr/share/doc/scrnsaverproto
-dir path=usr/share/doc/videoproto
-dir path=usr/share/doc/xcmiscproto
-dir path=usr/share/doc/xextproto
-dir path=usr/share/doc/xproto
-dir path=usr/share/doc/xproxymanagementprotocol
+dir path=usr/X11/include
+link path=usr/X11/include/GL target=../../include/GL
+link path=usr/X11/include/X11 target=../../include/X11
+dir path=usr/include/GL
file path=usr/include/GL/glxint.h
file path=usr/include/GL/glxmd.h
file path=usr/include/GL/glxproto.h
file path=usr/include/GL/glxtokens.h
+dir path=usr/include/GL/internal
file path=usr/include/GL/internal/glcore.h
+dir path=usr/include/X11
file path=usr/include/X11/DECkeysym.h
file path=usr/include/X11/HPkeysym.h
+dir path=usr/include/X11/PM
file path=usr/include/X11/PM/PM.h
file path=usr/include/X11/PM/PMproto.h
file path=usr/include/X11/Sunkeysym.h
@@ -77,9 +61,11 @@
file path=usr/include/X11/Xwindows.h
file path=usr/include/X11/Xwinsock.h
file path=usr/include/X11/ap_keysym.h
+dir path=usr/include/X11/dri
file path=usr/include/X11/dri/xf86dri.h
file path=usr/include/X11/dri/xf86driproto.h
file path=usr/include/X11/dri/xf86dristr.h
+dir path=usr/include/X11/extensions
file path=usr/include/X11/extensions/EVI.h
file path=usr/include/X11/extensions/EVIproto.h
file path=usr/include/X11/extensions/Print.h
@@ -178,6 +164,7 @@
file path=usr/include/X11/extensions/xtestext1const.h
file path=usr/include/X11/extensions/xtestext1proto.h
file path=usr/include/X11/extensions/xtestproto.h
+dir path=usr/include/X11/fonts
file path=usr/include/X11/fonts/FS.h
file path=usr/include/X11/fonts/FSproto.h
file path=usr/include/X11/fonts/font.h
@@ -186,19 +173,32 @@
file path=usr/include/X11/fonts/fsmasks.h
file path=usr/include/X11/keysym.h
file path=usr/include/X11/keysymdef.h
+dir path=usr/share/doc/bigreqsproto
file path=usr/share/doc/bigreqsproto/bigreq.xml
+dir path=usr/share/doc/compositeproto
file path=usr/share/doc/compositeproto/compositeproto.txt
+dir path=usr/share/doc/damageproto
file path=usr/share/doc/damageproto/damageproto.txt
+dir path=usr/share/doc/fixesproto
file path=usr/share/doc/fixesproto/fixesproto.txt
+dir path=usr/share/doc/fontsproto
file path=usr/share/doc/fontsproto/fsproto.xml
+dir path=usr/share/doc/inputproto
file path=usr/share/doc/inputproto/XI2proto.txt
file path=usr/share/doc/inputproto/XIproto.txt
+dir path=usr/share/doc/randrproto
file path=usr/share/doc/randrproto/randrproto.txt
+dir path=usr/share/doc/recordproto
file path=usr/share/doc/recordproto/record.xml
+dir path=usr/share/doc/renderproto
file path=usr/share/doc/renderproto/renderproto.txt
+dir path=usr/share/doc/scrnsaverproto
file path=usr/share/doc/scrnsaverproto/saver.xml
+dir path=usr/share/doc/videoproto
file path=usr/share/doc/videoproto/xv-protocol-v2.txt
+dir path=usr/share/doc/xcmiscproto
file path=usr/share/doc/xcmiscproto/xc-misc.xml
+dir path=usr/share/doc/xextproto
file path=usr/share/doc/xextproto/appendix.xml
file path=usr/share/doc/xextproto/appgrp.xml
file path=usr/share/doc/xextproto/dbe.xml
@@ -213,11 +213,13 @@
file path=usr/share/doc/xextproto/sync.xml
file path=usr/share/doc/xextproto/tog-cup.xml
file path=usr/share/doc/xextproto/xtest.xml
+dir path=usr/share/doc/xproto
file path=usr/share/doc/xproto/encoding.xml
file path=usr/share/doc/xproto/glossary.xml
file path=usr/share/doc/xproto/keysyms.xml
file path=usr/share/doc/xproto/sect1-9.xml
file path=usr/share/doc/xproto/x11protocol.xml
+dir path=usr/share/doc/xproxymanagementprotocol
file path=usr/share/doc/xproxymanagementprotocol/PM_spec
file path=usr/share/pkgconfig/bigreqsproto.pc
file path=usr/share/pkgconfig/compositeproto.pc
@@ -246,5 +248,3 @@
file path=usr/share/pkgconfig/xineramaproto.pc
file path=usr/share/pkgconfig/xproto.pc
file path=usr/share/pkgconfig/xproxymngproto.pc
-link path=usr/X11/include/GL target=../../include/GL
-link path=usr/X11/include/X11 target=../../include/X11
--- a/pkg/manifests/x11-keyboard-accessx.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-keyboard-accessx.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,17 +20,16 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/keyboard/accessx@$(OSPKGVERS)
+set name=pkg.summary \
+ value="AccessX keyboard accessibilty configuration program."
set name=pkg.description \
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/share/X11/locale/C/accessx
+link path=usr/X11/bin/accessx target=../../bin/accessx
file path=usr/bin/accessx
+dir path=usr/share/X11/locale/C/accessx
file path=usr/share/X11/locale/C/accessx/accessx.hlp
file path=usr/share/X11/locale/C/accessx/accessx.uid
file path=usr/share/X11/locale/C/accessx/accessx.uil
file path=usr/share/X11/locale/C/accessx/accessxstrings.uil
file path=usr/share/man/man1/accessx.1
-legacy pkg=SUNWxwacx desc="AccessX client program" \
- name="AccessX client program"
-link path=usr/X11/bin/accessx target=../../bin/accessx
+legacy pkg=SUNWxwacx desc="AccessX client program" name="AccessX client program"
--- a/pkg/manifests/x11-keyboard-xkb-utilities.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-keyboard-xkb-utilities.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/keyboard/xkb-utilities@$(X11PKGVERS)
+set name=pkg.summary value="X Window System X Keyboard Extension (XKB) Utilties"
set name=pkg.description \
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"
+link path=usr/X11/bin/setxkbmap target=../../bin/setxkbmap
+link path=usr/X11/bin/xkbbell target=../../bin/xkbbell
+link path=usr/X11/bin/xkbprint target=../../bin/xkbprint
+link path=usr/X11/bin/xkbvleds target=../../bin/xkbvleds
+link path=usr/X11/bin/xkbwatch target=../../bin/xkbwatch
file path=usr/bin/setxkbmap
file path=usr/bin/xkbbell
file path=usr/bin/xkbprint
@@ -34,8 +38,3 @@
file path=usr/share/man/man1/xkbprint.1
file path=usr/share/man/man1/xkbvleds.1
file path=usr/share/man/man1/xkbwatch.1
-link path=usr/X11/bin/setxkbmap target=../../bin/setxkbmap
-link path=usr/X11/bin/xkbbell target=../../bin/xkbbell
-link path=usr/X11/bin/xkbprint target=../../bin/xkbprint
-link path=usr/X11/bin/xkbvleds target=../../bin/xkbvleds
-link path=usr/X11/bin/xkbwatch target=../../bin/xkbwatch
--- a/pkg/manifests/x11-keyboard-xkbcomp.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-keyboard-xkbcomp.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/keyboard/xkbcomp@__version:xkbcomp__
+set name=pkg.summary value="X Keyboard Extension data compiler"
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"
+link path=usr/X11/bin/xkbcomp target=../../bin/xkbcomp
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-dps.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,14 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/dps@$(X11PKGVERS)
+set name=pkg.summary \
+ value="X Window System DPS extension client compatibility libraries"
set name=pkg.description \
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"
+link path=usr/X11/bin/makepsres target=../../bin/makepsres
+link path=usr/X11/bin/pswrap target=../../bin/pswrap
file path=usr/bin/makepsres
file path=usr/bin/pswrap
file path=usr/lib/libdps.so.5
file path=usr/lib/libdpstk.so.5
file path=usr/lib/libpsres.so.5
-link path=usr/X11/bin/makepsres target=../../bin/makepsres
-link path=usr/X11/bin/pswrap target=../../bin/pswrap
--- a/pkg/manifests/x11-library-freeglut.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-freeglut.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,34 +20,36 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/freeglut@__version:freeglut__
+set name=pkg.summary \
+ value="FreeGLUT - an open-source implementation of the GLUT specification"
set name=pkg.description \
value="FreeGLUT 2.6.0 is an open-source implementation of the GLUT specification - a collection of useful API wrappers around OpenGL."
-set name=pkg.summary \
- value="FreeGLUT - an open-source implementation of the GLUT specification"
-#
-dir path=usr/share/doc/freeglut facet.doc.html=true
#
file path=usr/include/GL/freeglut.h
file path=usr/include/GL/freeglut_ext.h
file path=usr/include/GL/freeglut_std.h
file path=usr/include/GL/glut.h
+link path=usr/lib/$(ARCH64)/libglut.so target=./libglut.so.3.9.0
+link path=usr/lib/$(ARCH64)/libglut.so.3 target=./libglut.so.3.9.0
+file path=usr/lib/$(ARCH64)/libglut.so.3.9.0
+link path=usr/lib/GL/$(ARCH64)/libglut.so \
+ target=../../$(ARCH64)/libglut.so.3.9.0
+link path=usr/lib/GL/$(ARCH64)/libglut.so.3 \
+ target=../../$(ARCH64)/libglut.so.3.9.0
+link path=usr/lib/GL/libglut.so target=../libglut.so.3.9.0
#
-file path=usr/lib/libglut.so.3.9.0
-file path=usr/lib/$(ARCH64)/libglut.so.3.9.0
+link path=usr/lib/GL/libglut.so.3 target=../libglut.so.3.9.0
+link path=usr/lib/libglut.so target=./libglut.so.3.9.0
#
link path=usr/lib/libglut.so.3 target=./libglut.so.3.9.0
-link path=usr/lib/libglut.so target=./libglut.so.3.9.0
-link path=usr/lib/$(ARCH64)/libglut.so.3 target=./libglut.so.3.9.0
-link path=usr/lib/$(ARCH64)/libglut.so target=./libglut.so.3.9.0
#
-link path=usr/lib/GL/libglut.so.3 target=../libglut.so.3.9.0
-link path=usr/lib/GL/libglut.so target=../libglut.so.3.9.0
-link path=usr/lib/GL/$(ARCH64)/libglut.so.3 target=../../$(ARCH64)/libglut.so.3.9.0
-link path=usr/lib/GL/$(ARCH64)/libglut.so target=../../$(ARCH64)/libglut.so.3.9.0
+file path=usr/lib/libglut.so.3.9.0
+#
+dir path=usr/share/doc/freeglut facet.doc.html=true
#
file path=usr/share/doc/freeglut/freeglut_user_interface.html
#
# Autodetected for now:
# depend fmri=pkg:/service/opengl/ogl-select type=require
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libdga.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libdga.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,13 +20,13 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libdga@$(OSPKGVERS)
+set name=pkg.summary \
+ value="X Window System SUN-DGA extension client compatibility libraries"
set name=pkg.description \
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"
+link path=usr/X11/lib/libdga.so.1 target=../../lib/libdga.so.1
+$(sparc_ONLY)link path=usr/X11/lib/sparcv9/libdga.so.1 \
+ target=../../../lib/sparcv9/libdga.so.1
# 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
-link path=usr/X11/lib/libdga.so.1 target=../../lib/libdga.so.1
-$(sparc_ONLY)link path=usr/X11/lib/sparcv9/libdga.so.1 \
- target=../../../lib/sparcv9/libdga.so.1
--- a/pkg/manifests/x11-library-libdmx.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libdmx.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,15 +20,17 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libdmx@__version:libdmx__
-set name=pkg.description \
- 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"
+set name=pkg.description \
+ 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."
file path=usr/include/X11/extensions/dmxext.h
+link path=usr/lib/$(ARCH64)/libdmx.so target=libdmx.so.1
+file path=usr/lib/$(ARCH64)/libdmx.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/dmx.pc
+link path=usr/lib/libdmx.so target=libdmx.so.1
+file path=usr/lib/libdmx.so.1
file path=usr/lib/pkgconfig/dmx.pc
-file path=usr/lib/$(ARCH64)/libdmx.so.1
-file path=usr/lib/libdmx.so.1
file path=usr/share/man/man3/DMX.3
file path=usr/share/man/man3/DMXAddInput.3
file path=usr/share/man/man3/DMXAddScreen.3
@@ -46,6 +48,4 @@
file path=usr/share/man/man3/DMXRemoveInput.3
file path=usr/share/man/man3/DMXRemoveScreen.3
file path=usr/share/man/man3/DMXSync.3
-link path=usr/lib/$(ARCH64)/libdmx.so target=libdmx.so.1
-link path=usr/lib/libdmx.so target=libdmx.so.1
--- a/pkg/manifests/x11-library-libdrm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libdrm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,13 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libdrm@__version:libdrm__
+set name=pkg.summary \
+ value="Direct Rendering Module (DRM) client libraries/interface"
set name=pkg.description \
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/include/libdrm
-dir path=usr/include/libkms
+link path=usr/X11/include/drm target=../../include/drm
+link path=usr/include/drm target=libdrm
+dir path=usr/include/libdrm
file path=usr/include/libdrm/drm.h
file path=usr/include/libdrm/drm_mode.h
file path=usr/include/libdrm/drm_sarea.h
@@ -39,6 +40,7 @@
file path=usr/include/libdrm/savage_drm.h
file path=usr/include/libdrm/sis_drm.h
file path=usr/include/libdrm/via_drm.h
+dir path=usr/include/libkms
file path=usr/include/libkms/libkms.h
file path=usr/include/xf86drm.h
file path=usr/include/xf86drmMode.h
@@ -48,19 +50,17 @@
file path=usr/lib/pkgconfig/libdrm.pc
$(i386_ONLY)file path=usr/lib/pkgconfig/libdrm_intel.pc
file path=usr/lib/pkgconfig/libkms.pc
+link path=usr/lib/xorg/$(ARCH64)/libdrm.so target=libdrm.so.2
file path=usr/lib/xorg/$(ARCH64)/libdrm.so.2
-$(i386_ONLY)file path=usr/lib/xorg/$(ARCH64)/libdrm_intel.so.1
-file path=usr/lib/xorg/$(ARCH64)/libkms.so.1
-file path=usr/lib/xorg/libdrm.so.2
-$(i386_ONLY)file path=usr/lib/xorg/libdrm_intel.so.1
-file path=usr/lib/xorg/libkms.so.1
-link path=usr/X11/include/drm target=../../include/drm
-link path=usr/include/drm target=libdrm
-link path=usr/lib/xorg/$(ARCH64)/libdrm.so target=libdrm.so.2
$(i386_ONLY)link path=usr/lib/xorg/$(ARCH64)/libdrm_intel.so \
target=libdrm_intel.so.1
+$(i386_ONLY)file path=usr/lib/xorg/$(ARCH64)/libdrm_intel.so.1
link path=usr/lib/xorg/$(ARCH64)/libkms.so target=libkms.so.1
+file path=usr/lib/xorg/$(ARCH64)/libkms.so.1
link path=usr/lib/xorg/libdrm.so target=libdrm.so.2
+file path=usr/lib/xorg/libdrm.so.2
$(i386_ONLY)link path=usr/lib/xorg/libdrm_intel.so target=libdrm_intel.so.1
+$(i386_ONLY)file path=usr/lib/xorg/libdrm_intel.so.1
link path=usr/lib/xorg/libkms.so target=libkms.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/xorg/libkms.so.1
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libfontenc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libfontenc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,20 +20,21 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libfontenc@__version:libfontenc__
+set name=pkg.summary value="libfontenc - font encoding library"
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/lib/xorg
-dir path=usr/lib/xorg/$(ARCH64)
-dir path=usr/share/fonts
-dir path=usr/share/fonts/X11
-dir path=usr/share/fonts/X11/encodings
-dir path=usr/share/fonts/X11/encodings/large
file path=usr/include/X11/fonts/fontenc.h
file path=usr/lib/$(ARCH64)/pkgconfig/fontenc.pc
file path=usr/lib/pkgconfig/fontenc.pc
+dir path=usr/lib/xorg
+dir path=usr/lib/xorg/$(ARCH64)
+link path=usr/lib/xorg/$(ARCH64)/libfontenc.so target=libfontenc.so.1
file path=usr/lib/xorg/$(ARCH64)/libfontenc.so.1
+link path=usr/lib/xorg/libfontenc.so target=libfontenc.so.1
file path=usr/lib/xorg/libfontenc.so.1
+dir path=usr/share/fonts
+dir path=usr/share/fonts/X11
+dir path=usr/share/fonts/X11/encodings
file path=usr/share/fonts/X11/encodings/adobe-dingbats.enc
file path=usr/share/fonts/X11/encodings/adobe-standard.enc
file path=usr/share/fonts/X11/encodings/adobe-symbol.enc
@@ -50,6 +51,7 @@
file path=usr/share/fonts/X11/encodings/iso8859-16.enc
file path=usr/share/fonts/X11/encodings/iso8859-6.16.enc
file path=usr/share/fonts/X11/encodings/iso8859-6.8x.enc
+dir path=usr/share/fonts/X11/encodings/large
file path=usr/share/fonts/X11/encodings/large/big5.eten-0.enc
file path=usr/share/fonts/X11/encodings/large/big5hkscs-0.enc
file path=usr/share/fonts/X11/encodings/large/cns11643-1.enc
@@ -85,6 +87,4 @@
file path=usr/share/fonts/X11/encodings/tcvn-0.enc
file path=usr/share/fonts/X11/encodings/tis620-2.enc
file path=usr/share/fonts/X11/encodings/viscii1.1-1.enc
-link path=usr/lib/xorg/$(ARCH64)/libfontenc.so target=libfontenc.so.1
-link path=usr/lib/xorg/libfontenc.so target=libfontenc.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libfs.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libfs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,24 +20,23 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libfs@__version:libFS__
+set name=pkg.summary value="libFS - X Font Service client library"
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/share/doc/libFS
-file path=usr/include/X11/fonts/FSlib.h
-file path=usr/lib/$(ARCH64)/libFS.so.5
-file path=usr/lib/$(ARCH64)/llib-lFS.ln
-file path=usr/lib/$(ARCH64)/pkgconfig/libfs.pc
-file path=usr/lib/libFS.so.5
-file path=usr/lib/llib-lFS.ln
-file path=usr/lib/pkgconfig/libfs.pc
-file path=usr/share/doc/libFS/FSlib.txt
-link path=usr/X11/lib/$(ARCH64)/libFS.so \
- target=../../../lib/$(ARCH64)/libFS.so
+link path=usr/X11/lib/$(ARCH64)/libFS.so target=../../../lib/$(ARCH64)/libFS.so
link path=usr/X11/lib/$(ARCH64)/libFS.so.5 \
target=../../../lib/$(ARCH64)/libFS.so.5
link path=usr/X11/lib/libFS.so target=../../lib/libFS.so
link path=usr/X11/lib/libFS.so.5 target=../../lib/libFS.so.5
+file path=usr/include/X11/fonts/FSlib.h
link path=usr/lib/$(ARCH64)/libFS.so target=libFS.so.5
+file path=usr/lib/$(ARCH64)/libFS.so.5
+file path=usr/lib/$(ARCH64)/llib-lFS.ln
+file path=usr/lib/$(ARCH64)/pkgconfig/libfs.pc
link path=usr/lib/libFS.so target=libFS.so.5
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libFS.so.5
+file path=usr/lib/llib-lFS.ln
+file path=usr/lib/pkgconfig/libfs.pc
+dir path=usr/share/doc/libFS
+file path=usr/share/doc/libFS/FSlib.txt
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libice.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libice.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,28 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libice@__version:libICE__
+set name=pkg.summary value="libICE - Inter-Client Exchange Library"
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/include/X11/ICE
-dir path=usr/share/doc/libICE
-file path=usr/bin/iceauth
-file path=usr/include/X11/ICE/ICE.h
-file path=usr/include/X11/ICE/ICEconn.h
-file path=usr/include/X11/ICE/ICElib.h
-file path=usr/include/X11/ICE/ICEmsg.h
-file path=usr/include/X11/ICE/ICEproto.h
-file path=usr/include/X11/ICE/ICEutil.h
-file path=usr/lib/$(ARCH64)/libICE.so.6
-file path=usr/lib/$(ARCH64)/pkgconfig/ice.pc
-file path=usr/lib/libICE.so.6
-file path=usr/lib/pkgconfig/ice.pc
-file path=usr/share/doc/libICE/ICElib.xml
-file path=usr/share/doc/libICE/ice.xml
-file path=usr/share/man/man1/iceauth.1
-legacy pkg=SUNWxwice \
- desc="Library and utilities to support the X Window System Inter-Client Exchange (ICE) protocol" \
- name="X Window System Inter-Client Exchange (ICE) Components"
link path=usr/X11/bin/iceauth target=../../bin/iceauth
link path=usr/X11/lib/$(ARCH64)/libICE.so \
target=../../../lib/$(ARCH64)/libICE.so
@@ -49,6 +30,25 @@
target=../../../lib/$(ARCH64)/libICE.so.6
link path=usr/X11/lib/libICE.so target=../../lib/libICE.so
link path=usr/X11/lib/libICE.so.6 target=../../lib/libICE.so.6
+file path=usr/bin/iceauth
+dir path=usr/include/X11/ICE
+file path=usr/include/X11/ICE/ICE.h
+file path=usr/include/X11/ICE/ICEconn.h
+file path=usr/include/X11/ICE/ICElib.h
+file path=usr/include/X11/ICE/ICEmsg.h
+file path=usr/include/X11/ICE/ICEproto.h
+file path=usr/include/X11/ICE/ICEutil.h
link path=usr/lib/$(ARCH64)/libICE.so target=libICE.so.6
+file path=usr/lib/$(ARCH64)/libICE.so.6
+file path=usr/lib/$(ARCH64)/pkgconfig/ice.pc
link path=usr/lib/libICE.so target=libICE.so.6
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libICE.so.6
+file path=usr/lib/pkgconfig/ice.pc
+dir path=usr/share/doc/libICE
+file path=usr/share/doc/libICE/ICElib.xml
+file path=usr/share/doc/libICE/ice.xml
+file path=usr/share/man/man1/iceauth.1
+legacy pkg=SUNWxwice \
+ desc="Library and utilities to support the X Window System Inter-Client Exchange (ICE) protocol" \
+ name="X Window System Inter-Client Exchange (ICE) Components"
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libowconfig.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libowconfig.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,12 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libowconfig@$(OSPKGVERS)
-set name=pkg.description \
- 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"
-file path=usr/include/X11/Sunowconfig.h
-file path=usr/lib/libowconfig.so.0
+set name=pkg.description \
+ 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."
link path=usr/X11/lib/libowconfig.so target=../../lib/libowconfig.so
link path=usr/X11/lib/libowconfig.so.0 target=../../lib/libowconfig.so.0
+file path=usr/include/X11/Sunowconfig.h
link path=usr/lib/libowconfig.so target=libowconfig.so.0
+file path=usr/lib/libowconfig.so.0
--- a/pkg/manifests/x11-library-libpthread-stubs.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libpthread-stubs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/x11/library/libpthread-stubs@__version:libpthread-stubs__
+set name=pkg.summary \
+ value="pthread-stubs - pkg-config data file for building software using POSIX threads"
set name=pkg.description \
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"
file path=usr/lib/$(ARCH64)/pkgconfig/pthread-stubs.pc
file path=usr/lib/pkgconfig/pthread-stubs.pc
--- a/pkg/manifests/x11-library-libsm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libsm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,26 +20,25 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libsm@__version:libSM__
+set name=pkg.summary value="libSM - X Session Management Library"
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/include/X11/SM
-dir path=usr/share/doc/libSM
-file path=usr/include/X11/SM/SM.h
-file path=usr/include/X11/SM/SMlib.h
-file path=usr/include/X11/SM/SMproto.h
-file path=usr/lib/$(ARCH64)/libSM.so.6
-file path=usr/lib/$(ARCH64)/pkgconfig/sm.pc
-file path=usr/lib/libSM.so.6
-file path=usr/lib/pkgconfig/sm.pc
-file path=usr/share/doc/libSM/SMlib.xml
-file path=usr/share/doc/libSM/xsmp.xml
-link path=usr/X11/lib/$(ARCH64)/libSM.so \
- target=../../../lib/$(ARCH64)/libSM.so
+link path=usr/X11/lib/$(ARCH64)/libSM.so target=../../../lib/$(ARCH64)/libSM.so
link path=usr/X11/lib/$(ARCH64)/libSM.so.6 \
target=../../../lib/$(ARCH64)/libSM.so.6
link path=usr/X11/lib/libSM.so target=../../lib/libSM.so
link path=usr/X11/lib/libSM.so.6 target=../../lib/libSM.so.6
+dir path=usr/include/X11/SM
+file path=usr/include/X11/SM/SM.h
+file path=usr/include/X11/SM/SMlib.h
+file path=usr/include/X11/SM/SMproto.h
link path=usr/lib/$(ARCH64)/libSM.so target=libSM.so.6
+file path=usr/lib/$(ARCH64)/libSM.so.6
+file path=usr/lib/$(ARCH64)/pkgconfig/sm.pc
link path=usr/lib/libSM.so target=libSM.so.6
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libSM.so.6
+file path=usr/lib/pkgconfig/sm.pc
+dir path=usr/share/doc/libSM
+file path=usr/share/doc/libSM/SMlib.xml
+file path=usr/share/doc/libSM/xsmp.xml
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libx11.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libx11.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,88 +20,23 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libx11@__version:libX11__
+set name=pkg.summary value="libX11 - X11 core protocol client library"
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/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/share/X11
-dir path=usr/share/X11/locale
-dir path=usr/share/X11/locale/C
-dir path=usr/share/X11/locale/am_ET.UTF-8
-dir path=usr/share/X11/locale/armscii-8
-dir path=usr/share/X11/locale/el_GR.UTF-8
-dir path=usr/share/X11/locale/en_US.UTF-8
-dir path=usr/share/X11/locale/fi_FI.UTF-8
-dir path=usr/share/X11/locale/georgian-academy
-dir path=usr/share/X11/locale/georgian-ps
-dir path=usr/share/X11/locale/ibm-cp1133
-dir path=usr/share/X11/locale/iscii-dev
-dir path=usr/share/X11/locale/isiri-3342
-dir path=usr/share/X11/locale/iso8859-1
-dir path=usr/share/X11/locale/iso8859-10
-dir path=usr/share/X11/locale/iso8859-11
-dir path=usr/share/X11/locale/iso8859-13
-dir path=usr/share/X11/locale/iso8859-14
-dir path=usr/share/X11/locale/iso8859-15
-dir path=usr/share/X11/locale/iso8859-2
-dir path=usr/share/X11/locale/iso8859-3
-dir path=usr/share/X11/locale/iso8859-4
-dir path=usr/share/X11/locale/iso8859-5
-dir path=usr/share/X11/locale/iso8859-6
-dir path=usr/share/X11/locale/iso8859-7
-dir path=usr/share/X11/locale/iso8859-8
-dir path=usr/share/X11/locale/iso8859-9
-dir path=usr/share/X11/locale/iso8859-9e
-dir path=usr/share/X11/locale/ja
-dir path=usr/share/X11/locale/ja.JIS
-dir path=usr/share/X11/locale/ja.S90
-dir path=usr/share/X11/locale/ja.SJIS
-dir path=usr/share/X11/locale/ja.U90
-dir path=usr/share/X11/locale/ja_JP.UTF-8
-dir path=usr/share/X11/locale/ko
-dir path=usr/share/X11/locale/ko_KR.UTF-8
-dir path=usr/share/X11/locale/koi8-c
-dir path=usr/share/X11/locale/koi8-r
-dir path=usr/share/X11/locale/koi8-u
-dir path=usr/share/X11/locale/microsoft-cp1251
-dir path=usr/share/X11/locale/microsoft-cp1255
-dir path=usr/share/X11/locale/microsoft-cp1256
-dir path=usr/share/X11/locale/mulelao-1
-dir path=usr/share/X11/locale/nokhchi-1
-dir path=usr/share/X11/locale/pt_BR.UTF-8
-dir path=usr/share/X11/locale/ru_RU.UTF-8
-dir path=usr/share/X11/locale/tatar-cyr
-dir path=usr/share/X11/locale/th_TH
-dir path=usr/share/X11/locale/th_TH.UTF-8
-dir path=usr/share/X11/locale/tscii-0
-dir path=usr/share/X11/locale/vi_VN.tcvn
-dir path=usr/share/X11/locale/vi_VN.viscii
-dir path=usr/share/X11/locale/zh_CN
-dir path=usr/share/X11/locale/zh_CN.UTF-8
-dir path=usr/share/X11/locale/zh_CN.gb18030
-dir path=usr/share/X11/locale/zh_CN.gbk
-dir path=usr/share/X11/locale/zh_HK.UTF-8
-dir path=usr/share/X11/locale/zh_HK.big5
-dir path=usr/share/X11/locale/zh_HK.big5hkscs
-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/libX11
-dir path=usr/share/doc/libX11/Compose
-dir path=usr/share/doc/libX11/XIM
-dir path=usr/share/doc/libX11/XKB
-dir path=usr/share/doc/libX11/i18n
-dir path=usr/share/doc/libX11/i18n/framework
-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/man3x11
+link path=usr/X11/lib/$(ARCH64)/libX.so target=../../../lib/$(ARCH64)/libX.so
+link path=usr/X11/lib/$(ARCH64)/libX.so.4 \
+ target=../../../lib/$(ARCH64)/libX.so.4
+link path=usr/X11/lib/$(ARCH64)/libX11.so \
+ target=../../../lib/$(ARCH64)/libX11.so
+link path=usr/X11/lib/$(ARCH64)/libX11.so.4 \
+ target=../../../lib/$(ARCH64)/libX11.so.4
+link path=usr/X11/lib/$(ARCH64)/libX11.so.5 \
+ target=../../../lib/$(ARCH64)/libX11.so.5
+link path=usr/X11/lib/libX.so target=../../lib/libX.so
+link path=usr/X11/lib/libX.so.4 target=../../lib/libX.so.4
+link path=usr/X11/lib/libX11.so target=../../lib/libX11.so
+link path=usr/X11/lib/libX11.so.4 target=../../lib/libX11.so.4
+link path=usr/X11/lib/libX11.so.5 target=../../lib/libX11.so.5
file path=usr/include/X11/ImUtil.h
file path=usr/include/X11/XKBlib.h
file path=usr/include/X11/Xcms.h
@@ -120,215 +55,315 @@
file path=usr/include/X11/Xvarargs.h
file path=usr/include/X11/cursorfont.h
file path=usr/include/X11/extensions/XInteractive.h
+link path=usr/lib/$(ARCH64)/libX.so target=libX11.so.4
+link path=usr/lib/$(ARCH64)/libX.so.4 target=libX11.so.4
+link path=usr/lib/$(ARCH64)/libX11-xcb.so target=libX11-xcb.so.1
file path=usr/lib/$(ARCH64)/libX11-xcb.so.1
+link path=usr/lib/$(ARCH64)/libX11.so target=libX11.so.4
file path=usr/lib/$(ARCH64)/libX11.so.4
+link path=usr/lib/$(ARCH64)/libX11.so.5 target=libX11.so.4
file path=usr/lib/$(ARCH64)/llib-lX11.ln
file path=usr/lib/$(ARCH64)/pkgconfig/x11-xcb.pc
file path=usr/lib/$(ARCH64)/pkgconfig/x11.pc
+
+
+dir path=usr/lib/X11
file path=usr/lib/X11/Xcms.txt
+dir path=usr/lib/X11/locale
+dir path=usr/lib/X11/locale/$(ARCH64)
+dir path=usr/lib/X11/locale/$(ARCH64)/common
+link path=usr/lib/X11/locale/$(ARCH64)/common/ximcp.so target=ximcp.so.2
file path=usr/lib/X11/locale/$(ARCH64)/common/ximcp.so.2
+link path=usr/lib/X11/locale/$(ARCH64)/common/xlcDef.so target=xlcDef.so.2
file path=usr/lib/X11/locale/$(ARCH64)/common/xlcDef.so.2
+link path=usr/lib/X11/locale/$(ARCH64)/common/xlcGB18030.so \
+ target=xlcGB18030.so.2
file path=usr/lib/X11/locale/$(ARCH64)/common/xlcGB18030.so.2
+link path=usr/lib/X11/locale/$(ARCH64)/common/xlcUTF8Load.so \
+ target=xlcUTF8Load.so.2
file path=usr/lib/X11/locale/$(ARCH64)/common/xlcUTF8Load.so.2
+link path=usr/lib/X11/locale/$(ARCH64)/common/xlibi18n.so target=xlibi18n.so.2
file path=usr/lib/X11/locale/$(ARCH64)/common/xlibi18n.so.2
+link path=usr/lib/X11/locale/$(ARCH64)/common/xlocale.so target=xlocale.so.2
file path=usr/lib/X11/locale/$(ARCH64)/common/xlocale.so.2
+link path=usr/lib/X11/locale/$(ARCH64)/common/xomGeneric.so \
+ target=xomGeneric.so.2
file path=usr/lib/X11/locale/$(ARCH64)/common/xomGeneric.so.2
+dir path=usr/lib/X11/locale/common
+link path=usr/lib/X11/locale/common/ximcp.so target=ximcp.so.2
file path=usr/lib/X11/locale/common/ximcp.so.2
+link path=usr/lib/X11/locale/common/xlcDef.so target=xlcDef.so.2
file path=usr/lib/X11/locale/common/xlcDef.so.2
+link path=usr/lib/X11/locale/common/xlcGB18030.so target=xlcGB18030.so.2
file path=usr/lib/X11/locale/common/xlcGB18030.so.2
+link path=usr/lib/X11/locale/common/xlcUTF8Load.so target=xlcUTF8Load.so.2
file path=usr/lib/X11/locale/common/xlcUTF8Load.so.2
+link path=usr/lib/X11/locale/common/xlibi18n.so target=xlibi18n.so.2
file path=usr/lib/X11/locale/common/xlibi18n.so.2
+link path=usr/lib/X11/locale/common/xlocale.so target=xlocale.so.2
file path=usr/lib/X11/locale/common/xlocale.so.2
+link path=usr/lib/X11/locale/common/xomGeneric.so target=xomGeneric.so.2
file path=usr/lib/X11/locale/common/xomGeneric.so.2
+link path=usr/lib/libX.so target=libX11.so.4
+link path=usr/lib/libX.so.4 target=libX11.so.4
+link path=usr/lib/libX11-xcb.so target=libX11-xcb.so.1
file path=usr/lib/libX11-xcb.so.1
+link path=usr/lib/libX11.so target=libX11.so.4
file path=usr/lib/libX11.so.4
+# Additional link required by SVID ABI (see PSARC/1997/141)
+link path=usr/lib/libX11.so.5 target=libX11.so.4
file path=usr/lib/llib-lX11.ln
file path=usr/lib/pkgconfig/x11-xcb.pc
file path=usr/lib/pkgconfig/x11.pc
+dir path=usr/share/X11
file path=usr/share/X11/XErrorDB
+dir path=usr/share/X11/locale
+dir path=usr/share/X11/locale/C
file path=usr/share/X11/locale/C/Compose
file path=usr/share/X11/locale/C/XI18N_OBJS
file path=usr/share/X11/locale/C/XLC_LOCALE
+dir path=usr/share/X11/locale/am_ET.UTF-8
file path=usr/share/X11/locale/am_ET.UTF-8/Compose
file path=usr/share/X11/locale/am_ET.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/am_ET.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/armscii-8
file path=usr/share/X11/locale/armscii-8/Compose
file path=usr/share/X11/locale/armscii-8/XI18N_OBJS
file path=usr/share/X11/locale/armscii-8/XLC_LOCALE
file path=usr/share/X11/locale/compose.dir
+dir path=usr/share/X11/locale/el_GR.UTF-8
file path=usr/share/X11/locale/el_GR.UTF-8/Compose
file path=usr/share/X11/locale/el_GR.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/el_GR.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/en_US.UTF-8
file path=usr/share/X11/locale/en_US.UTF-8/Compose
file path=usr/share/X11/locale/en_US.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/en_US.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/fi_FI.UTF-8
file path=usr/share/X11/locale/fi_FI.UTF-8/Compose
file path=usr/share/X11/locale/fi_FI.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/fi_FI.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/georgian-academy
file path=usr/share/X11/locale/georgian-academy/Compose
file path=usr/share/X11/locale/georgian-academy/XI18N_OBJS
file path=usr/share/X11/locale/georgian-academy/XLC_LOCALE
+dir path=usr/share/X11/locale/georgian-ps
file path=usr/share/X11/locale/georgian-ps/Compose
file path=usr/share/X11/locale/georgian-ps/XI18N_OBJS
file path=usr/share/X11/locale/georgian-ps/XLC_LOCALE
+dir path=usr/share/X11/locale/ibm-cp1133
file path=usr/share/X11/locale/ibm-cp1133/Compose
file path=usr/share/X11/locale/ibm-cp1133/XI18N_OBJS
file path=usr/share/X11/locale/ibm-cp1133/XLC_LOCALE
+dir path=usr/share/X11/locale/iscii-dev
file path=usr/share/X11/locale/iscii-dev/Compose
file path=usr/share/X11/locale/iscii-dev/XI18N_OBJS
file path=usr/share/X11/locale/iscii-dev/XLC_LOCALE
+dir path=usr/share/X11/locale/isiri-3342
file path=usr/share/X11/locale/isiri-3342/Compose
file path=usr/share/X11/locale/isiri-3342/XI18N_OBJS
file path=usr/share/X11/locale/isiri-3342/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-1
file path=usr/share/X11/locale/iso8859-1/Compose
file path=usr/share/X11/locale/iso8859-1/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-1/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-10
file path=usr/share/X11/locale/iso8859-10/Compose
file path=usr/share/X11/locale/iso8859-10/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-10/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-11
file path=usr/share/X11/locale/iso8859-11/Compose
file path=usr/share/X11/locale/iso8859-11/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-11/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-13
file path=usr/share/X11/locale/iso8859-13/Compose
file path=usr/share/X11/locale/iso8859-13/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-13/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-14
file path=usr/share/X11/locale/iso8859-14/Compose
file path=usr/share/X11/locale/iso8859-14/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-14/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-15
file path=usr/share/X11/locale/iso8859-15/Compose
file path=usr/share/X11/locale/iso8859-15/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-15/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-2
file path=usr/share/X11/locale/iso8859-2/Compose
file path=usr/share/X11/locale/iso8859-2/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-2/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-3
file path=usr/share/X11/locale/iso8859-3/Compose
file path=usr/share/X11/locale/iso8859-3/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-3/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-4
file path=usr/share/X11/locale/iso8859-4/Compose
file path=usr/share/X11/locale/iso8859-4/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-4/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-5
file path=usr/share/X11/locale/iso8859-5/Compose
file path=usr/share/X11/locale/iso8859-5/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-5/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-6
file path=usr/share/X11/locale/iso8859-6/Compose
file path=usr/share/X11/locale/iso8859-6/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-6/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-7
file path=usr/share/X11/locale/iso8859-7/Compose
file path=usr/share/X11/locale/iso8859-7/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-7/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-8
file path=usr/share/X11/locale/iso8859-8/Compose
file path=usr/share/X11/locale/iso8859-8/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-8/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-9
file path=usr/share/X11/locale/iso8859-9/Compose
file path=usr/share/X11/locale/iso8859-9/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-9/XLC_LOCALE
+dir path=usr/share/X11/locale/iso8859-9e
file path=usr/share/X11/locale/iso8859-9e/Compose
file path=usr/share/X11/locale/iso8859-9e/XI18N_OBJS
file path=usr/share/X11/locale/iso8859-9e/XLC_LOCALE
+dir path=usr/share/X11/locale/ja
+dir path=usr/share/X11/locale/ja.JIS
file path=usr/share/X11/locale/ja.JIS/Compose
file path=usr/share/X11/locale/ja.JIS/XI18N_OBJS
file path=usr/share/X11/locale/ja.JIS/XLC_LOCALE
+dir path=usr/share/X11/locale/ja.S90
file path=usr/share/X11/locale/ja.S90/Compose
file path=usr/share/X11/locale/ja.S90/XI18N_OBJS
file path=usr/share/X11/locale/ja.S90/XLC_LOCALE
+dir path=usr/share/X11/locale/ja.SJIS
file path=usr/share/X11/locale/ja.SJIS/Compose
file path=usr/share/X11/locale/ja.SJIS/XI18N_OBJS
file path=usr/share/X11/locale/ja.SJIS/XLC_LOCALE
+dir path=usr/share/X11/locale/ja.U90
file path=usr/share/X11/locale/ja.U90/Compose
file path=usr/share/X11/locale/ja.U90/XI18N_OBJS
file path=usr/share/X11/locale/ja.U90/XLC_LOCALE
file path=usr/share/X11/locale/ja/Compose
file path=usr/share/X11/locale/ja/XI18N_OBJS
file path=usr/share/X11/locale/ja/XLC_LOCALE
+dir path=usr/share/X11/locale/ja_JP.UTF-8
file path=usr/share/X11/locale/ja_JP.UTF-8/Compose
file path=usr/share/X11/locale/ja_JP.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/ko
file path=usr/share/X11/locale/ko/Compose
file path=usr/share/X11/locale/ko/XI18N_OBJS
file path=usr/share/X11/locale/ko/XLC_LOCALE
+dir path=usr/share/X11/locale/ko_KR.UTF-8
file path=usr/share/X11/locale/ko_KR.UTF-8/Compose
file path=usr/share/X11/locale/ko_KR.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/koi8-c
file path=usr/share/X11/locale/koi8-c/Compose
file path=usr/share/X11/locale/koi8-c/XI18N_OBJS
file path=usr/share/X11/locale/koi8-c/XLC_LOCALE
+dir path=usr/share/X11/locale/koi8-r
file path=usr/share/X11/locale/koi8-r/Compose
file path=usr/share/X11/locale/koi8-r/XI18N_OBJS
file path=usr/share/X11/locale/koi8-r/XLC_LOCALE
+dir path=usr/share/X11/locale/koi8-u
file path=usr/share/X11/locale/koi8-u/Compose
file path=usr/share/X11/locale/koi8-u/XI18N_OBJS
file path=usr/share/X11/locale/koi8-u/XLC_LOCALE
file path=usr/share/X11/locale/locale.alias
file path=usr/share/X11/locale/locale.dir
+dir path=usr/share/X11/locale/microsoft-cp1251
file path=usr/share/X11/locale/microsoft-cp1251/Compose
file path=usr/share/X11/locale/microsoft-cp1251/XI18N_OBJS
file path=usr/share/X11/locale/microsoft-cp1251/XLC_LOCALE
+dir path=usr/share/X11/locale/microsoft-cp1255
file path=usr/share/X11/locale/microsoft-cp1255/Compose
file path=usr/share/X11/locale/microsoft-cp1255/XI18N_OBJS
file path=usr/share/X11/locale/microsoft-cp1255/XLC_LOCALE
+dir path=usr/share/X11/locale/microsoft-cp1256
file path=usr/share/X11/locale/microsoft-cp1256/Compose
file path=usr/share/X11/locale/microsoft-cp1256/XI18N_OBJS
file path=usr/share/X11/locale/microsoft-cp1256/XLC_LOCALE
+dir path=usr/share/X11/locale/mulelao-1
file path=usr/share/X11/locale/mulelao-1/Compose
file path=usr/share/X11/locale/mulelao-1/XI18N_OBJS
file path=usr/share/X11/locale/mulelao-1/XLC_LOCALE
+dir path=usr/share/X11/locale/nokhchi-1
file path=usr/share/X11/locale/nokhchi-1/Compose
file path=usr/share/X11/locale/nokhchi-1/XI18N_OBJS
file path=usr/share/X11/locale/nokhchi-1/XLC_LOCALE
+dir path=usr/share/X11/locale/pt_BR.UTF-8
file path=usr/share/X11/locale/pt_BR.UTF-8/Compose
file path=usr/share/X11/locale/pt_BR.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/ru_RU.UTF-8
file path=usr/share/X11/locale/ru_RU.UTF-8/Compose
file path=usr/share/X11/locale/ru_RU.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/ru_RU.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/tatar-cyr
file path=usr/share/X11/locale/tatar-cyr/Compose
file path=usr/share/X11/locale/tatar-cyr/XI18N_OBJS
file path=usr/share/X11/locale/tatar-cyr/XLC_LOCALE
+dir path=usr/share/X11/locale/th_TH
+dir path=usr/share/X11/locale/th_TH.UTF-8
file path=usr/share/X11/locale/th_TH.UTF-8/Compose
file path=usr/share/X11/locale/th_TH.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/th_TH.UTF-8/XLC_LOCALE
file path=usr/share/X11/locale/th_TH/Compose
file path=usr/share/X11/locale/th_TH/XI18N_OBJS
file path=usr/share/X11/locale/th_TH/XLC_LOCALE
+dir path=usr/share/X11/locale/tscii-0
file path=usr/share/X11/locale/tscii-0/Compose
file path=usr/share/X11/locale/tscii-0/XI18N_OBJS
file path=usr/share/X11/locale/tscii-0/XLC_LOCALE
+dir path=usr/share/X11/locale/vi_VN.tcvn
file path=usr/share/X11/locale/vi_VN.tcvn/Compose
file path=usr/share/X11/locale/vi_VN.tcvn/XI18N_OBJS
file path=usr/share/X11/locale/vi_VN.tcvn/XLC_LOCALE
+dir path=usr/share/X11/locale/vi_VN.viscii
file path=usr/share/X11/locale/vi_VN.viscii/Compose
file path=usr/share/X11/locale/vi_VN.viscii/XI18N_OBJS
file path=usr/share/X11/locale/vi_VN.viscii/XLC_LOCALE
+dir path=usr/share/X11/locale/zh_CN
+dir path=usr/share/X11/locale/zh_CN.UTF-8
file path=usr/share/X11/locale/zh_CN.UTF-8/Compose
file path=usr/share/X11/locale/zh_CN.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/zh_CN.gb18030
file path=usr/share/X11/locale/zh_CN.gb18030/Compose
file path=usr/share/X11/locale/zh_CN.gb18030/XI18N_OBJS
file path=usr/share/X11/locale/zh_CN.gb18030/XLC_LOCALE
+dir path=usr/share/X11/locale/zh_CN.gbk
file path=usr/share/X11/locale/zh_CN.gbk/Compose
file path=usr/share/X11/locale/zh_CN.gbk/XI18N_OBJS
file path=usr/share/X11/locale/zh_CN.gbk/XLC_LOCALE
file path=usr/share/X11/locale/zh_CN/Compose
file path=usr/share/X11/locale/zh_CN/XI18N_OBJS
file path=usr/share/X11/locale/zh_CN/XLC_LOCALE
+dir path=usr/share/X11/locale/zh_HK.UTF-8
file path=usr/share/X11/locale/zh_HK.UTF-8/Compose
file path=usr/share/X11/locale/zh_HK.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/zh_HK.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/zh_HK.big5
file path=usr/share/X11/locale/zh_HK.big5/Compose
file path=usr/share/X11/locale/zh_HK.big5/XI18N_OBJS
file path=usr/share/X11/locale/zh_HK.big5/XLC_LOCALE
+dir path=usr/share/X11/locale/zh_HK.big5hkscs
file path=usr/share/X11/locale/zh_HK.big5hkscs/Compose
file path=usr/share/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
file path=usr/share/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
+dir path=usr/share/X11/locale/zh_TW
+dir path=usr/share/X11/locale/zh_TW.UTF-8
file path=usr/share/X11/locale/zh_TW.UTF-8/Compose
file path=usr/share/X11/locale/zh_TW.UTF-8/XI18N_OBJS
file path=usr/share/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+dir path=usr/share/X11/locale/zh_TW.big5
file path=usr/share/X11/locale/zh_TW.big5/Compose
file path=usr/share/X11/locale/zh_TW.big5/XI18N_OBJS
file path=usr/share/X11/locale/zh_TW.big5/XLC_LOCALE
file path=usr/share/X11/locale/zh_TW/Compose
file path=usr/share/X11/locale/zh_TW/XI18N_OBJS
file path=usr/share/X11/locale/zh_TW/XLC_LOCALE
+dir path=usr/share/doc/libX11
+dir path=usr/share/doc/libX11/Compose
+dir path=usr/share/doc/libX11/XIM
file path=usr/share/doc/libX11/XIM/dynamicflow.svg
file path=usr/share/doc/libX11/XIM/dynamicflowsampleseq.svg
file path=usr/share/doc/libX11/XIM/eventflow.svg
@@ -337,6 +372,7 @@
file path=usr/share/doc/libX11/XIM/staticflow.svg
file path=usr/share/doc/libX11/XIM/staticflowsampleseq.svg
file path=usr/share/doc/libX11/XIM/xim.xml
+dir path=usr/share/doc/libX11/XKB
file path=usr/share/doc/libX11/XKB/XKBlib-1.svg
file path=usr/share/doc/libX11/XKB/XKBlib-10.svg
file path=usr/share/doc/libX11/XKB/XKBlib-11.svg
@@ -383,10 +419,15 @@
file path=usr/share/doc/libX11/XKB/ch22.xml
file path=usr/share/doc/libX11/XKB/glossary.xml
file path=usr/share/doc/libX11/XKB/xkblib.xml
+dir path=usr/share/doc/libX11/i18n
+dir path=usr/share/doc/libX11/i18n/framework
file path=usr/share/doc/libX11/i18n/framework/framework.svg
file path=usr/share/doc/libX11/i18n/framework/framework.xml
+dir path=usr/share/doc/libX11/i18n/localedb
file path=usr/share/doc/libX11/i18n/localedb/localedb.xml
+dir path=usr/share/doc/libX11/i18n/trans
file path=usr/share/doc/libX11/i18n/trans/trans.xml
+dir path=usr/share/doc/libX11/libX11
file path=usr/share/doc/libX11/libX11/AppA.xml
file path=usr/share/doc/libX11/libX11/AppB.xml
file path=usr/share/doc/libX11/libX11/AppC.xml
@@ -410,6 +451,7 @@
file path=usr/share/doc/libX11/libX11/credits.xml
file path=usr/share/doc/libX11/libX11/glossary.xml
file path=usr/share/doc/libX11/libX11/libX11.xml
+dir path=usr/share/man/man3x11
file path=usr/share/man/man3x11/AllPlanes.3x11
file path=usr/share/man/man3x11/BitmapBitOrder.3x11
file path=usr/share/man/man3x11/BitmapPad.3x11
@@ -1229,46 +1271,4 @@
file path=usr/share/man/man3x11/XwcTextPropertyToTextList.3x11
file path=usr/share/man/man4/Compose.4
file path=usr/share/man/man4/XCompose.4
-link path=usr/X11/lib/$(ARCH64)/libX.so target=../../../lib/$(ARCH64)/libX.so
-link path=usr/X11/lib/$(ARCH64)/libX.so.4 \
- target=../../../lib/$(ARCH64)/libX.so.4
-link path=usr/X11/lib/$(ARCH64)/libX11.so \
- target=../../../lib/$(ARCH64)/libX11.so
-link path=usr/X11/lib/$(ARCH64)/libX11.so.4 \
- target=../../../lib/$(ARCH64)/libX11.so.4
-link path=usr/X11/lib/$(ARCH64)/libX11.so.5 \
- target=../../../lib/$(ARCH64)/libX11.so.5
-link path=usr/X11/lib/libX.so target=../../lib/libX.so
-link path=usr/X11/lib/libX.so.4 target=../../lib/libX.so.4
-link path=usr/X11/lib/libX11.so target=../../lib/libX11.so
-link path=usr/X11/lib/libX11.so.4 target=../../lib/libX11.so.4
-link path=usr/X11/lib/libX11.so.5 target=../../lib/libX11.so.5
-link path=usr/lib/$(ARCH64)/libX.so target=libX11.so.4
-link path=usr/lib/$(ARCH64)/libX.so.4 target=libX11.so.4
-link path=usr/lib/$(ARCH64)/libX11-xcb.so target=libX11-xcb.so.1
-link path=usr/lib/$(ARCH64)/libX11.so target=libX11.so.4
-link path=usr/lib/$(ARCH64)/libX11.so.5 target=libX11.so.4
-link path=usr/lib/X11/locale/$(ARCH64)/common/ximcp.so target=ximcp.so.2
-link path=usr/lib/X11/locale/$(ARCH64)/common/xlcDef.so target=xlcDef.so.2
-link path=usr/lib/X11/locale/$(ARCH64)/common/xlcGB18030.so \
- target=xlcGB18030.so.2
-link path=usr/lib/X11/locale/$(ARCH64)/common/xlcUTF8Load.so \
- target=xlcUTF8Load.so.2
-link path=usr/lib/X11/locale/$(ARCH64)/common/xlibi18n.so target=xlibi18n.so.2
-link path=usr/lib/X11/locale/$(ARCH64)/common/xlocale.so target=xlocale.so.2
-link path=usr/lib/X11/locale/$(ARCH64)/common/xomGeneric.so \
- target=xomGeneric.so.2
-link path=usr/lib/X11/locale/common/ximcp.so target=ximcp.so.2
-link path=usr/lib/X11/locale/common/xlcDef.so target=xlcDef.so.2
-link path=usr/lib/X11/locale/common/xlcGB18030.so target=xlcGB18030.so.2
-link path=usr/lib/X11/locale/common/xlcUTF8Load.so target=xlcUTF8Load.so.2
-link path=usr/lib/X11/locale/common/xlibi18n.so target=xlibi18n.so.2
-link path=usr/lib/X11/locale/common/xlocale.so target=xlocale.so.2
-link path=usr/lib/X11/locale/common/xomGeneric.so target=xomGeneric.so.2
-link path=usr/lib/libX.so target=libX11.so.4
-link path=usr/lib/libX.so.4 target=libX11.so.4
-link path=usr/lib/libX11-xcb.so target=libX11-xcb.so.1
-link path=usr/lib/libX11.so target=libX11.so.4
-# Additional link required by SVID ABI (see PSARC/1997/141)
-link path=usr/lib/libX11.so.5 target=libX11.so.4
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxau.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxau.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,24 +20,32 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxau@__version:libXau__
+set name=pkg.summary value="libXau - X authorization database library"
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"
# 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/share/man/man3xau
+dir path=usr/X11
+dir path=usr/X11/lib
+dir path=usr/X11/lib/$(ARCH64)
+link path=usr/X11/lib/$(ARCH64)/libXau.so \
+ target=../../../lib/$(ARCH64)/libXau.so
+link path=usr/X11/lib/$(ARCH64)/libXau.so.6 \
+ target=../../../lib/$(ARCH64)/libXau.so.6
+link path=usr/X11/lib/libXau.so target=../../lib/libXau.so
+link path=usr/X11/lib/libXau.so.6 target=../../lib/libXau.so.6
file path=usr/include/X11/Xauth.h
+link path=usr/lib/$(ARCH64)/libXau.so target=libXau.so.6
file path=usr/lib/$(ARCH64)/libXau.so.6
file path=usr/lib/$(ARCH64)/llib-lXau.ln
file path=usr/lib/$(ARCH64)/pkgconfig/xau.pc
+link path=usr/lib/libXau.so target=libXau.so.6
file path=usr/lib/libXau.so.6
file path=usr/lib/llib-lXau.ln
file path=usr/lib/pkgconfig/xau.pc
+dir path=usr/share/man/man3xau
file path=usr/share/man/man3xau/Xau.3xau
file path=usr/share/man/man3xau/XauDisposeAuth.3xau
file path=usr/share/man/man3xau/XauFileName.3xau
@@ -47,12 +55,4 @@
file path=usr/share/man/man3xau/XauReadAuth.3xau
file path=usr/share/man/man3xau/XauUnlockAuth.3xau
file path=usr/share/man/man3xau/XauWriteAuth.3xau
-link path=usr/X11/lib/$(ARCH64)/libXau.so \
- target=../../../lib/$(ARCH64)/libXau.so
-link path=usr/X11/lib/$(ARCH64)/libXau.so.6 \
- target=../../../lib/$(ARCH64)/libXau.so.6
-link path=usr/X11/lib/libXau.so target=../../lib/libXau.so
-link path=usr/X11/lib/libXau.so.6 target=../../lib/libXau.so.6
-link path=usr/lib/$(ARCH64)/libXau.so target=libXau.so.6
-link path=usr/lib/libXau.so target=libXau.so.6
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxcb.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxcb.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,116 +21,20 @@
#
<transform dir file path=usr/share/xcb -> default facet.devel true>
-<transform file path=usr/lib/python.*/vendor-packages/xcbgen/.* -> default facet.devel true>
+<transform file path=usr/lib/python.*/vendor-packages/xcbgen/.* -> \
+ default facet.devel true>
+
# Autogenerate *.pyc manifest entries for each *.py file
<transform file path=.*\.py$ -> emit file path=%(path)c>
+
set name=pkg.fmri value=pkg:/x11/library/libxcb@__version:libxcb__
+set name=pkg.summary value="libxcb - The X11 protocol C Binding"
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/include/xcb
-dir path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen
-dir path=usr/share/doc/libxcb facet.doc.html=true
-dir path=usr/share/doc/libxcb/tutorial facet.doc.html=true
-dir path=usr/share/xcb
-#
-file path=usr/lib/libxcb-composite.so.0
-file path=usr/lib/libxcb-damage.so.0
-file path=usr/lib/libxcb-dpms.so.0
-file path=usr/lib/libxcb-dri2.so.0
-file path=usr/lib/libxcb-glx.so.0
-file path=usr/lib/libxcb-randr.so.0
-file path=usr/lib/libxcb-record.so.0
-file path=usr/lib/libxcb-render.so.0
-file path=usr/lib/libxcb-res.so.0
-file path=usr/lib/libxcb-screensaver.so.0
-file path=usr/lib/libxcb-shape.so.0
-file path=usr/lib/libxcb-shm.so.0
-file path=usr/lib/libxcb.so.1
-file path=usr/lib/libxcb-sync.so.0
-file path=usr/lib/libxcb-xevie.so.0
-file path=usr/lib/libxcb-xf86dri.so.0
-file path=usr/lib/libxcb-xfixes.so.0
-file path=usr/lib/libxcb-xinerama.so.0
-file path=usr/lib/libxcb-xinput.so.0
-file path=usr/lib/libxcb-xprint.so.0
-file path=usr/lib/libxcb-xtest.so.0
-file path=usr/lib/libxcb-xvmc.so.0
-file path=usr/lib/libxcb-xv.so.0
+ value="The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility."
+
#
-link path=usr/lib/libxcb-composite.so target=./libxcb-composite.so.0
-link path=usr/lib/libxcb-damage.so target=./libxcb-damage.so.0
-link path=usr/lib/libxcb-dpms.so target=./libxcb-dpms.so.0
-link path=usr/lib/libxcb-dri2.so target=./libxcb-dri2.so.0
-link path=usr/lib/libxcb-glx.so target=./libxcb-glx.so.0
-link path=usr/lib/libxcb-randr.so target=./libxcb-randr.so.0
-link path=usr/lib/libxcb-record.so target=./libxcb-record.so.0
-link path=usr/lib/libxcb-render.so target=./libxcb-render.so.0
-link path=usr/lib/libxcb-res.so target=./libxcb-res.so.0
-link path=usr/lib/libxcb-screensaver.so target=./libxcb-screensaver.so.0
-link path=usr/lib/libxcb-shape.so target=./libxcb-shape.so.0
-link path=usr/lib/libxcb-shm.so target=./libxcb-shm.so.0
-link path=usr/lib/libxcb.so target=./libxcb.so.1
-link path=usr/lib/libxcb-sync.so target=./libxcb-sync.so.0
-link path=usr/lib/libxcb-xevie.so target=./libxcb-xevie.so.0
-link path=usr/lib/libxcb-xf86dri.so target=./libxcb-xf86dri.so.0
-link path=usr/lib/libxcb-xfixes.so target=./libxcb-xfixes.so.0
-link path=usr/lib/libxcb-xinerama.so target=./libxcb-xinerama.so.0
-link path=usr/lib/libxcb-xinput.so target=./libxcb-xinput.so.0
-link path=usr/lib/libxcb-xprint.so target=./libxcb-xprint.so.0
-link path=usr/lib/libxcb-xtest.so target=./libxcb-xtest.so.0
-link path=usr/lib/libxcb-xvmc.so target=./libxcb-xvmc.so.0
-link path=usr/lib/libxcb-xv.so target=./libxcb-xv.so.0
-#
-file path=usr/lib/$(ARCH64)/libxcb-composite.so.0
-file path=usr/lib/$(ARCH64)/libxcb-damage.so.0
-file path=usr/lib/$(ARCH64)/libxcb-dpms.so.0
-file path=usr/lib/$(ARCH64)/libxcb-dri2.so.0
-file path=usr/lib/$(ARCH64)/libxcb-glx.so.0
-file path=usr/lib/$(ARCH64)/libxcb-randr.so.0
-file path=usr/lib/$(ARCH64)/libxcb-record.so.0
-file path=usr/lib/$(ARCH64)/libxcb-render.so.0
-file path=usr/lib/$(ARCH64)/libxcb-res.so.0
-file path=usr/lib/$(ARCH64)/libxcb-screensaver.so.0
-file path=usr/lib/$(ARCH64)/libxcb-shape.so.0
-file path=usr/lib/$(ARCH64)/libxcb-shm.so.0
-file path=usr/lib/$(ARCH64)/libxcb.so.1
-file path=usr/lib/$(ARCH64)/libxcb-sync.so.0
-file path=usr/lib/$(ARCH64)/libxcb-xevie.so.0
-file path=usr/lib/$(ARCH64)/libxcb-xf86dri.so.0
-file path=usr/lib/$(ARCH64)/libxcb-xfixes.so.0
-file path=usr/lib/$(ARCH64)/libxcb-xinerama.so.0
-file path=usr/lib/$(ARCH64)/libxcb-xinput.so.0
-file path=usr/lib/$(ARCH64)/libxcb-xprint.so.0
-file path=usr/lib/$(ARCH64)/libxcb-xtest.so.0
-file path=usr/lib/$(ARCH64)/libxcb-xvmc.so.0
-file path=usr/lib/$(ARCH64)/libxcb-xv.so.0
-#
-link path=usr/lib/$(ARCH64)/libxcb-composite.so target=./libxcb-composite.so.0
-link path=usr/lib/$(ARCH64)/libxcb-damage.so target=./libxcb-damage.so.0
-link path=usr/lib/$(ARCH64)/libxcb-dpms.so target=./libxcb-dpms.so.0
-link path=usr/lib/$(ARCH64)/libxcb-dri2.so target=./libxcb-dri2.so.0
-link path=usr/lib/$(ARCH64)/libxcb-glx.so target=./libxcb-glx.so.0
-link path=usr/lib/$(ARCH64)/libxcb-randr.so target=./libxcb-randr.so.0
-link path=usr/lib/$(ARCH64)/libxcb-record.so target=./libxcb-record.so.0
-link path=usr/lib/$(ARCH64)/libxcb-render.so target=./libxcb-render.so.0
-link path=usr/lib/$(ARCH64)/libxcb-res.so target=./libxcb-res.so.0
-link path=usr/lib/$(ARCH64)/libxcb-screensaver.so target=./libxcb-screensaver.so.0
-link path=usr/lib/$(ARCH64)/libxcb-shape.so target=./libxcb-shape.so.0
-link path=usr/lib/$(ARCH64)/libxcb-shm.so target=./libxcb-shm.so.0
-link path=usr/lib/$(ARCH64)/libxcb.so target=./libxcb.so.1
-link path=usr/lib/$(ARCH64)/libxcb-sync.so target=./libxcb-sync.so.0
-link path=usr/lib/$(ARCH64)/libxcb-xevie.so target=./libxcb-xevie.so.0
-link path=usr/lib/$(ARCH64)/libxcb-xf86dri.so target=./libxcb-xf86dri.so.0
-link path=usr/lib/$(ARCH64)/libxcb-xfixes.so target=./libxcb-xfixes.so.0
-link path=usr/lib/$(ARCH64)/libxcb-xinerama.so target=./libxcb-xinerama.so.0
-link path=usr/lib/$(ARCH64)/libxcb-xinput.so target=./libxcb-xinput.so.0
-link path=usr/lib/$(ARCH64)/libxcb-xprint.so target=./libxcb-xprint.so.0
-link path=usr/lib/$(ARCH64)/libxcb-xtest.so target=./libxcb-xtest.so.0
-link path=usr/lib/$(ARCH64)/libxcb-xvmc.so target=./libxcb-xvmc.so.0
-link path=usr/lib/$(ARCH64)/libxcb-xv.so target=./libxcb-xv.so.0
-#
+dir path=usr/include/xcb
file path=usr/include/xcb/bigreq.h
file path=usr/include/xcb/composite.h
file path=usr/include/xcb/damage.h
@@ -145,9 +49,9 @@
file path=usr/include/xcb/shape.h
file path=usr/include/xcb/shm.h
file path=usr/include/xcb/sync.h
-file path=usr/include/xcb/xcbext.h
+file path=usr/include/xcb/xc_misc.h
file path=usr/include/xcb/xcb.h
-file path=usr/include/xcb/xc_misc.h
+file path=usr/include/xcb/xcbext.h
file path=usr/include/xcb/xevie.h
file path=usr/include/xcb/xf86dri.h
file path=usr/include/xcb/xfixes.h
@@ -160,12 +64,130 @@
file path=usr/include/xcb/xv.h
file path=usr/include/xcb/xvmc.h
#
+link path=usr/lib/$(ARCH64)/libxcb-composite.so target=./libxcb-composite.so.0
+file path=usr/lib/$(ARCH64)/libxcb-composite.so.0
+link path=usr/lib/$(ARCH64)/libxcb-damage.so target=./libxcb-damage.so.0
+file path=usr/lib/$(ARCH64)/libxcb-damage.so.0
+link path=usr/lib/$(ARCH64)/libxcb-dpms.so target=./libxcb-dpms.so.0
+file path=usr/lib/$(ARCH64)/libxcb-dpms.so.0
+link path=usr/lib/$(ARCH64)/libxcb-dri2.so target=./libxcb-dri2.so.0
+file path=usr/lib/$(ARCH64)/libxcb-dri2.so.0
+link path=usr/lib/$(ARCH64)/libxcb-glx.so target=./libxcb-glx.so.0
+file path=usr/lib/$(ARCH64)/libxcb-glx.so.0
+link path=usr/lib/$(ARCH64)/libxcb-randr.so target=./libxcb-randr.so.0
+file path=usr/lib/$(ARCH64)/libxcb-randr.so.0
+link path=usr/lib/$(ARCH64)/libxcb-record.so target=./libxcb-record.so.0
+file path=usr/lib/$(ARCH64)/libxcb-record.so.0
+link path=usr/lib/$(ARCH64)/libxcb-render.so target=./libxcb-render.so.0
+file path=usr/lib/$(ARCH64)/libxcb-render.so.0
+link path=usr/lib/$(ARCH64)/libxcb-res.so target=./libxcb-res.so.0
+file path=usr/lib/$(ARCH64)/libxcb-res.so.0
+link path=usr/lib/$(ARCH64)/libxcb-screensaver.so \
+ target=./libxcb-screensaver.so.0
+file path=usr/lib/$(ARCH64)/libxcb-screensaver.so.0
+link path=usr/lib/$(ARCH64)/libxcb-shape.so target=./libxcb-shape.so.0
+file path=usr/lib/$(ARCH64)/libxcb-shape.so.0
+link path=usr/lib/$(ARCH64)/libxcb-shm.so target=./libxcb-shm.so.0
+file path=usr/lib/$(ARCH64)/libxcb-shm.so.0
+link path=usr/lib/$(ARCH64)/libxcb-sync.so target=./libxcb-sync.so.0
+file path=usr/lib/$(ARCH64)/libxcb-sync.so.0
+link path=usr/lib/$(ARCH64)/libxcb-xevie.so target=./libxcb-xevie.so.0
+file path=usr/lib/$(ARCH64)/libxcb-xevie.so.0
+link path=usr/lib/$(ARCH64)/libxcb-xf86dri.so target=./libxcb-xf86dri.so.0
+file path=usr/lib/$(ARCH64)/libxcb-xf86dri.so.0
+link path=usr/lib/$(ARCH64)/libxcb-xfixes.so target=./libxcb-xfixes.so.0
+file path=usr/lib/$(ARCH64)/libxcb-xfixes.so.0
+link path=usr/lib/$(ARCH64)/libxcb-xinerama.so target=./libxcb-xinerama.so.0
+file path=usr/lib/$(ARCH64)/libxcb-xinerama.so.0
+link path=usr/lib/$(ARCH64)/libxcb-xinput.so target=./libxcb-xinput.so.0
+file path=usr/lib/$(ARCH64)/libxcb-xinput.so.0
+link path=usr/lib/$(ARCH64)/libxcb-xprint.so target=./libxcb-xprint.so.0
+file path=usr/lib/$(ARCH64)/libxcb-xprint.so.0
+link path=usr/lib/$(ARCH64)/libxcb-xtest.so target=./libxcb-xtest.so.0
+file path=usr/lib/$(ARCH64)/libxcb-xtest.so.0
+link path=usr/lib/$(ARCH64)/libxcb-xv.so target=./libxcb-xv.so.0
+file path=usr/lib/$(ARCH64)/libxcb-xv.so.0
+link path=usr/lib/$(ARCH64)/libxcb-xvmc.so target=./libxcb-xvmc.so.0
+file path=usr/lib/$(ARCH64)/libxcb-xvmc.so.0
+link path=usr/lib/$(ARCH64)/libxcb.so target=./libxcb.so.1
+file path=usr/lib/$(ARCH64)/libxcb.so.1
+#
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-composite.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-damage.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-dpms.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-dri2.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-glx.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-randr.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-record.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-render.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-res.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-screensaver.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-shape.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-shm.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-sync.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xevie.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xf86dri.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xfixes.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xinerama.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xinput.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xprint.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xtest.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xv.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xvmc.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/xcb.pc
+#
+link path=usr/lib/libxcb-composite.so target=./libxcb-composite.so.0
+file path=usr/lib/libxcb-composite.so.0
+link path=usr/lib/libxcb-damage.so target=./libxcb-damage.so.0
+file path=usr/lib/libxcb-damage.so.0
+link path=usr/lib/libxcb-dpms.so target=./libxcb-dpms.so.0
+file path=usr/lib/libxcb-dpms.so.0
+link path=usr/lib/libxcb-dri2.so target=./libxcb-dri2.so.0
+file path=usr/lib/libxcb-dri2.so.0
+link path=usr/lib/libxcb-glx.so target=./libxcb-glx.so.0
+file path=usr/lib/libxcb-glx.so.0
+link path=usr/lib/libxcb-randr.so target=./libxcb-randr.so.0
+file path=usr/lib/libxcb-randr.so.0
+link path=usr/lib/libxcb-record.so target=./libxcb-record.so.0
+file path=usr/lib/libxcb-record.so.0
+link path=usr/lib/libxcb-render.so target=./libxcb-render.so.0
+file path=usr/lib/libxcb-render.so.0
+link path=usr/lib/libxcb-res.so target=./libxcb-res.so.0
+file path=usr/lib/libxcb-res.so.0
+link path=usr/lib/libxcb-screensaver.so target=./libxcb-screensaver.so.0
+file path=usr/lib/libxcb-screensaver.so.0
+link path=usr/lib/libxcb-shape.so target=./libxcb-shape.so.0
+file path=usr/lib/libxcb-shape.so.0
+link path=usr/lib/libxcb-shm.so target=./libxcb-shm.so.0
+file path=usr/lib/libxcb-shm.so.0
+link path=usr/lib/libxcb-sync.so target=./libxcb-sync.so.0
+file path=usr/lib/libxcb-sync.so.0
+link path=usr/lib/libxcb-xevie.so target=./libxcb-xevie.so.0
+file path=usr/lib/libxcb-xevie.so.0
+link path=usr/lib/libxcb-xf86dri.so target=./libxcb-xf86dri.so.0
+file path=usr/lib/libxcb-xf86dri.so.0
+link path=usr/lib/libxcb-xfixes.so target=./libxcb-xfixes.so.0
+file path=usr/lib/libxcb-xfixes.so.0
+link path=usr/lib/libxcb-xinerama.so target=./libxcb-xinerama.so.0
+file path=usr/lib/libxcb-xinerama.so.0
+link path=usr/lib/libxcb-xinput.so target=./libxcb-xinput.so.0
+file path=usr/lib/libxcb-xinput.so.0
+link path=usr/lib/libxcb-xprint.so target=./libxcb-xprint.so.0
+file path=usr/lib/libxcb-xprint.so.0
+link path=usr/lib/libxcb-xtest.so target=./libxcb-xtest.so.0
+file path=usr/lib/libxcb-xtest.so.0
+link path=usr/lib/libxcb-xv.so target=./libxcb-xv.so.0
+file path=usr/lib/libxcb-xv.so.0
+link path=usr/lib/libxcb-xvmc.so target=./libxcb-xvmc.so.0
+file path=usr/lib/libxcb-xvmc.so.0
+link path=usr/lib/libxcb.so target=./libxcb.so.1
+file path=usr/lib/libxcb.so.1
+#
file path=usr/lib/pkgconfig/xcb-composite.pc
file path=usr/lib/pkgconfig/xcb-damage.pc
file path=usr/lib/pkgconfig/xcb-dpms.pc
file path=usr/lib/pkgconfig/xcb-dri2.pc
file path=usr/lib/pkgconfig/xcb-glx.pc
-file path=usr/lib/pkgconfig/xcb.pc
file path=usr/lib/pkgconfig/xcb-randr.pc
file path=usr/lib/pkgconfig/xcb-record.pc
file path=usr/lib/pkgconfig/xcb-render.pc
@@ -181,37 +203,26 @@
file path=usr/lib/pkgconfig/xcb-xinput.pc
file path=usr/lib/pkgconfig/xcb-xprint.pc
file path=usr/lib/pkgconfig/xcb-xtest.pc
+file path=usr/lib/pkgconfig/xcb-xv.pc
file path=usr/lib/pkgconfig/xcb-xvmc.pc
-file path=usr/lib/pkgconfig/xcb-xv.pc
+file path=usr/lib/pkgconfig/xcb.pc
#
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-composite.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-damage.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-dpms.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-dri2.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-glx.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-randr.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-record.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-render.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-res.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-screensaver.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-shape.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-shm.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-sync.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xevie.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xf86dri.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xfixes.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xinerama.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xinput.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xprint.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xtest.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xvmc.pc
-file path=usr/lib/$(ARCH64)/pkgconfig/xcb-xv.pc
+dir path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/__init__.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/error.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/expr.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/matcher.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/state.py
+file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/xtypes.py
#
+dir path=usr/share/doc/libxcb facet.doc.html=true
+dir path=usr/share/doc/libxcb/tutorial facet.doc.html=true
file path=usr/share/doc/libxcb/tutorial/index.html
file path=usr/share/doc/libxcb/tutorial/xcb.css
#
file path=usr/share/pkgconfig/xcb-proto.pc
+#
+dir path=usr/share/xcb
file path=usr/share/xcb/bigreq.xml
file path=usr/share/xcb/composite.xml
file path=usr/share/xcb/damage.xml
@@ -227,6 +238,7 @@
file path=usr/share/xcb/shm.xml
file path=usr/share/xcb/sync.xml
file path=usr/share/xcb/xc_misc.xml
+file path=usr/share/xcb/xcb.xsd
file path=usr/share/xcb/xevie.xml
file path=usr/share/xcb/xf86dri.xml
file path=usr/share/xcb/xfixes.xml
@@ -236,17 +248,9 @@
file path=usr/share/xcb/xprint.xml
file path=usr/share/xcb/xproto.xml
file path=usr/share/xcb/xtest.xml
+file path=usr/share/xcb/xv.xml
file path=usr/share/xcb/xvmc.xml
-file path=usr/share/xcb/xv.xml
-file path=usr/share/xcb/xcb.xsd
#
-file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/__init__.py
-file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/error.py
-file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/expr.py
-file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/matcher.py
-file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/state.py
-file path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages/xcbgen/xtypes.py
-#
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
# pkg-config dependency from xcb.pc
-depend fmri=pkg:/x11/library/libpthread-stubs type=require facet.devel=true
+depend type=require fmri=pkg:/x11/library/libpthread-stubs facet.devel=true
--- a/pkg/manifests/x11-library-libxcomposite.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxcomposite.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -19,40 +19,35 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
-set name=pkg.fmri \
- value=pkg:/x11/library/libxcomposite@__version:libXcomposite__
-set name=pkg.description \
- value="Xlib-based client API for the Composite extension to the X11 protocol"
+set name=pkg.fmri value=pkg:/x11/library/libxcomposite@__version:libXcomposite__
set name=pkg.summary \
value="libXcomposite - X Composite extension client library"
-dir path=usr/share/man/man3xcomposite
-file path=usr/include/X11/extensions/Xcomposite.h
-file path=usr/lib/$(ARCH64)/libXcomposite.so.1
-file path=usr/lib/$(ARCH64)/pkgconfig/xcomposite.pc
-file path=usr/lib/libXcomposite.so.1
-file path=usr/lib/pkgconfig/xcomposite.pc
-file \
- path=usr/share/man/man3xcomposite/XCompositeCreateRegionFromBorderClip.3xcomposite
-file path=usr/share/man/man3xcomposite/XCompositeGetOverlayWindow.3xcomposite
-file path=usr/share/man/man3xcomposite/XCompositeNameWindowPixmap.3xcomposite
-file path=usr/share/man/man3xcomposite/XCompositeQueryExtension.3xcomposite
-file path=usr/share/man/man3xcomposite/XCompositeQueryVersion.3xcomposite
-file \
- path=usr/share/man/man3xcomposite/XCompositeRedirectSubwindows.3xcomposite
-file path=usr/share/man/man3xcomposite/XCompositeRedirectWindow.3xcomposite
-file \
- path=usr/share/man/man3xcomposite/XCompositeReleaseOverlayWindow.3xcomposite
-file \
- path=usr/share/man/man3xcomposite/XCompositeUnredirectSubwindows.3xcomposite
-file path=usr/share/man/man3xcomposite/XCompositeUnredirectWindow.3xcomposite
-file path=usr/share/man/man3xcomposite/XCompositeVersion.3xcomposite
-file path=usr/share/man/man3xcomposite/Xcomposite.3xcomposite
+set name=pkg.description \
+ value="Xlib-based client API for the Composite extension to the X11 protocol"
link path=usr/X11/lib/$(ARCH64)/libXcomposite.so \
target=../../../lib/$(ARCH64)/libXcomposite.so
link path=usr/X11/lib/$(ARCH64)/libXcomposite.so.1 \
target=../../../lib/$(ARCH64)/libXcomposite.so.1
link path=usr/X11/lib/libXcomposite.so target=../../lib/libXcomposite.so
link path=usr/X11/lib/libXcomposite.so.1 target=../../lib/libXcomposite.so.1
+file path=usr/include/X11/extensions/Xcomposite.h
link path=usr/lib/$(ARCH64)/libXcomposite.so target=libXcomposite.so.1
+file path=usr/lib/$(ARCH64)/libXcomposite.so.1
+file path=usr/lib/$(ARCH64)/pkgconfig/xcomposite.pc
link path=usr/lib/libXcomposite.so target=libXcomposite.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXcomposite.so.1
+file path=usr/lib/pkgconfig/xcomposite.pc
+dir path=usr/share/man/man3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeCreateRegionFromBorderClip.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeGetOverlayWindow.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeNameWindowPixmap.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeQueryExtension.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeQueryVersion.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeRedirectSubwindows.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeRedirectWindow.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeReleaseOverlayWindow.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeUnredirectSubwindows.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeUnredirectWindow.3xcomposite
+file path=usr/share/man/man3xcomposite/XCompositeVersion.3xcomposite
+file path=usr/share/man/man3xcomposite/Xcomposite.3xcomposite
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxcursor.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxcursor.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,17 +20,25 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxcursor@__version:libXcursor__
-set name=pkg.description \
- 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/include/X11/Xcursor
-dir path=usr/share/man/man3xcursor
+set name=pkg.description \
+ 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."
+link path=usr/X11/lib/$(ARCH64)/libXcursor.so \
+ target=../../../lib/$(ARCH64)/libXcursor.so
+link path=usr/X11/lib/$(ARCH64)/libXcursor.so.1 \
+ target=../../../lib/$(ARCH64)/libXcursor.so.1
+link path=usr/X11/lib/libXcursor.so target=../../lib/libXcursor.so
+link path=usr/X11/lib/libXcursor.so.1 target=../../lib/libXcursor.so.1
+dir path=usr/include/X11/Xcursor
file path=usr/include/X11/Xcursor/Xcursor.h
+link path=usr/lib/$(ARCH64)/libXcursor.so target=libXcursor.so.1
file path=usr/lib/$(ARCH64)/libXcursor.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/xcursor.pc
+link path=usr/lib/libXcursor.so target=libXcursor.so.1
file path=usr/lib/libXcursor.so.1
file path=usr/lib/pkgconfig/xcursor.pc
+dir path=usr/share/man/man3xcursor
file path=usr/share/man/man3xcursor/Xcursor.3xcursor
file path=usr/share/man/man3xcursor/XcursorCursorsCreate.3xcursor
file path=usr/share/man/man3xcursor/XcursorCursorsDestroy.3xcursor
@@ -63,12 +71,4 @@
file path=usr/share/man/man3xcursor/XcursorXcFileLoadImage.3xcursor
file path=usr/share/man/man3xcursor/XcursorXcFileLoadImages.3xcursor
file path=usr/share/man/man3xcursor/XcursorXcFileSave.3xcursor
-link path=usr/X11/lib/$(ARCH64)/libXcursor.so \
- target=../../../lib/$(ARCH64)/libXcursor.so
-link path=usr/X11/lib/$(ARCH64)/libXcursor.so.1 \
- target=../../../lib/$(ARCH64)/libXcursor.so.1
-link path=usr/X11/lib/libXcursor.so target=../../lib/libXcursor.so
-link path=usr/X11/lib/libXcursor.so.1 target=../../lib/libXcursor.so.1
-link path=usr/lib/$(ARCH64)/libXcursor.so target=libXcursor.so.1
-link path=usr/lib/libXcursor.so target=libXcursor.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxdamage.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxdamage.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,20 +20,20 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxdamage@__version:libXdamage__
+set name=pkg.summary value="libXdamage - X Damage extension client library"
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"
-file path=usr/include/X11/extensions/Xdamage.h
-file path=usr/lib/$(ARCH64)/libXdamage.so.1
-file path=usr/lib/$(ARCH64)/pkgconfig/xdamage.pc
-file path=usr/lib/libXdamage.so.1
-file path=usr/lib/pkgconfig/xdamage.pc
link path=usr/X11/lib/$(ARCH64)/libXdamage.so \
target=../../../lib/$(ARCH64)/libXdamage.so
link path=usr/X11/lib/$(ARCH64)/libXdamage.so.1 \
target=../../../lib/$(ARCH64)/libXdamage.so.1
link path=usr/X11/lib/libXdamage.so target=../../lib/libXdamage.so
link path=usr/X11/lib/libXdamage.so.1 target=../../lib/libXdamage.so.1
+file path=usr/include/X11/extensions/Xdamage.h
link path=usr/lib/$(ARCH64)/libXdamage.so target=libXdamage.so.1
+file path=usr/lib/$(ARCH64)/libXdamage.so.1
+file path=usr/lib/$(ARCH64)/pkgconfig/xdamage.pc
link path=usr/lib/libXdamage.so target=libXdamage.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXdamage.so.1
+file path=usr/lib/pkgconfig/xdamage.pc
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxdmcp.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxdmcp.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,25 +20,25 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxdmcp@__version:libXdmcp__
-set name=pkg.description \
- 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/share/doc/libXdmcp
-file path=usr/include/X11/Xdmcp.h
-file path=usr/lib/$(ARCH64)/libXdmcp.so.6
-file path=usr/lib/$(ARCH64)/llib-lXdmcp.ln
-file path=usr/lib/$(ARCH64)/pkgconfig/xdmcp.pc
-file path=usr/lib/libXdmcp.so.6
-file path=usr/lib/llib-lXdmcp.ln
-file path=usr/lib/pkgconfig/xdmcp.pc
-file path=usr/share/doc/libXdmcp/xdmcp.xml
+set name=pkg.description \
+ value="Library used by X clients and servers to support the XDMCP protocol for remote X session setup."
link path=usr/X11/lib/$(ARCH64)/libXdmcp.so \
target=../../../lib/$(ARCH64)/libXdmcp.so
link path=usr/X11/lib/$(ARCH64)/libXdmcp.so.6 \
target=../../../lib/$(ARCH64)/libXdmcp.so.6
link path=usr/X11/lib/libXdmcp.so target=../../lib/libXdmcp.so
link path=usr/X11/lib/libXdmcp.so.6 target=../../lib/libXdmcp.so.6
+file path=usr/include/X11/Xdmcp.h
link path=usr/lib/$(ARCH64)/libXdmcp.so target=libXdmcp.so.6
+file path=usr/lib/$(ARCH64)/libXdmcp.so.6
+file path=usr/lib/$(ARCH64)/llib-lXdmcp.ln
+file path=usr/lib/$(ARCH64)/pkgconfig/xdmcp.pc
link path=usr/lib/libXdmcp.so target=libXdmcp.so.6
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXdmcp.so.6
+file path=usr/lib/llib-lXdmcp.ln
+file path=usr/lib/pkgconfig/xdmcp.pc
+dir path=usr/share/doc/libXdmcp
+file path=usr/share/doc/libXdmcp/xdmcp.xml
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxevie.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxevie.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,30 +20,30 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxevie@__version:libXevie__
+set name=pkg.summary \
+ value="libXevie - X Event Interception Extension (XEvIE) client library"
set name=pkg.description \
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/share/man/man3xevie
+link path=usr/X11/lib/$(ARCH64)/libXevie.so \
+ target=../../../lib/$(ARCH64)/libXevie.so
+link path=usr/X11/lib/$(ARCH64)/libXevie.so.1 \
+ target=../../../lib/$(ARCH64)/libXevie.so.1
+link path=usr/X11/lib/libXevie.so target=../../lib/libXevie.so
+link path=usr/X11/lib/libXevie.so.1 target=../../lib/libXevie.so.1
file path=usr/include/X11/extensions/Xevie.h
+link path=usr/lib/$(ARCH64)/libXevie.so target=libXevie.so.1
file path=usr/lib/$(ARCH64)/libXevie.so.1
file path=usr/lib/$(ARCH64)/llib-lXevie.ln
file path=usr/lib/$(ARCH64)/pkgconfig/xevie.pc
+link path=usr/lib/libXevie.so target=libXevie.so.1
file path=usr/lib/libXevie.so.1
file path=usr/lib/llib-lXevie.ln
file path=usr/lib/pkgconfig/xevie.pc
+dir path=usr/share/man/man3xevie
file path=usr/share/man/man3xevie/Xevie.3xevie
file path=usr/share/man/man3xevie/XevieEnd.3xevie
file path=usr/share/man/man3xevie/XevieQueryVersion.3xevie
file path=usr/share/man/man3xevie/XevieSelectInput.3xevie
file path=usr/share/man/man3xevie/XevieSendEvent.3xevie
file path=usr/share/man/man3xevie/XevieStart.3xevie
-link path=usr/X11/lib/$(ARCH64)/libXevie.so \
- target=../../../lib/$(ARCH64)/libXevie.so
-link path=usr/X11/lib/$(ARCH64)/libXevie.so.1 \
- target=../../../lib/$(ARCH64)/libXevie.so.1
-link path=usr/X11/lib/libXevie.so target=../../lib/libXevie.so
-link path=usr/X11/lib/libXevie.so.1 target=../../lib/libXevie.so.1
-link path=usr/lib/$(ARCH64)/libXevie.so target=libXevie.so.1
-link path=usr/lib/libXevie.so target=libXevie.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxext.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxext.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,16 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxext@__version:libXext__
+set name=pkg.summary \
+ value="libXext - X11 protocol common extensions client library"
set name=pkg.description \
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/share/doc/libXext
-dir path=usr/share/man/man3xext
+link path=usr/X11/lib/$(ARCH64)/libXext.so \
+ target=../../../lib/$(ARCH64)/libXext.so
+link path=usr/X11/lib/$(ARCH64)/libXext.so.0 \
+ target=../../../lib/$(ARCH64)/libXext.so.0
+link path=usr/X11/lib/libXext.so target=../../lib/libXext.so
+link path=usr/X11/lib/libXext.so.0 target=../../lib/libXext.so.0
file path=usr/include/X11/extensions/MITMisc.h
file path=usr/include/X11/extensions/XEVI.h
file path=usr/include/X11/extensions/XLbx.h
@@ -43,17 +47,21 @@
file path=usr/include/X11/extensions/sync.h
file path=usr/include/X11/extensions/xinerama.h
file path=usr/include/X11/extensions/xtestext1.h
+link path=usr/lib/$(ARCH64)/libXext.so target=libXext.so.0
file path=usr/lib/$(ARCH64)/libXext.so.0
file path=usr/lib/$(ARCH64)/llib-lXext.ln
file path=usr/lib/$(ARCH64)/pkgconfig/xext.pc
+link path=usr/lib/libXext.so target=libXext.so.0
file path=usr/lib/libXext.so.0
file path=usr/lib/llib-lXext.ln
file path=usr/lib/pkgconfig/xext.pc
+dir path=usr/share/doc/libXext
file path=usr/share/doc/libXext/dbelib.xml
file path=usr/share/doc/libXext/dpmslib.xml
file path=usr/share/doc/libXext/shapelib.xml
file path=usr/share/doc/libXext/synclib.xml
file path=usr/share/doc/libXext/xtest1.xml
+dir path=usr/share/man/man3xext
file path=usr/share/man/man3xext/DBE.3xext
file path=usr/share/man/man3xext/DPMSCapable.3xext
file path=usr/share/man/man3xext/DPMSDisable.3xext
@@ -125,12 +133,4 @@
file path=usr/share/man/man3xext/XmbufGetVersion.3xext
file path=usr/share/man/man3xext/XmbufGetWindowAttributes.3xext
file path=usr/share/man/man3xext/XmbufQueryExtension.3xext
-link path=usr/X11/lib/$(ARCH64)/libXext.so \
- target=../../../lib/$(ARCH64)/libXext.so
-link path=usr/X11/lib/$(ARCH64)/libXext.so.0 \
- target=../../../lib/$(ARCH64)/libXext.so.0
-link path=usr/X11/lib/libXext.so target=../../lib/libXext.so
-link path=usr/X11/lib/libXext.so.0 target=../../lib/libXext.so.0
-link path=usr/lib/$(ARCH64)/libXext.so target=libXext.so.0
-link path=usr/lib/libXext.so target=libXext.so.0
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxfixes.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxfixes.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,21 +20,21 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxfixes@__version:libXfixes__
+set name=pkg.summary value="libXfixes - XFIXES extension client library"
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"
-file path=usr/include/X11/extensions/Xfixes.h
-file path=usr/lib/$(ARCH64)/libXfixes.so.1
-file path=usr/lib/$(ARCH64)/pkgconfig/xfixes.pc
-file path=usr/lib/libXfixes.so.1
-file path=usr/lib/pkgconfig/xfixes.pc
-file path=usr/share/man/man3/Xfixes.3
link path=usr/X11/lib/$(ARCH64)/libXfixes.so \
target=../../../lib/$(ARCH64)/libXfixes.so
link path=usr/X11/lib/$(ARCH64)/libXfixes.so.1 \
target=../../../lib/$(ARCH64)/libXfixes.so.1
link path=usr/X11/lib/libXfixes.so target=../../lib/libXfixes.so
link path=usr/X11/lib/libXfixes.so.1 target=../../lib/libXfixes.so.1
+file path=usr/include/X11/extensions/Xfixes.h
link path=usr/lib/$(ARCH64)/libXfixes.so target=libXfixes.so.1
+file path=usr/lib/$(ARCH64)/libXfixes.so.1
+file path=usr/lib/$(ARCH64)/pkgconfig/xfixes.pc
link path=usr/lib/libXfixes.so target=libXfixes.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXfixes.so.1
+file path=usr/lib/pkgconfig/xfixes.pc
+file path=usr/share/man/man3/Xfixes.3
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxfont.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxfont.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,12 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxfont@__version:libXfont__
+set name=pkg.summary \
+ value="libXfont - library for X servers and utilities to access font files"
set name=pkg.description \
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/X11
-dir path=etc/X11/fontpath.d
+dir path=etc/X11
+dir path=etc/X11/fontpath.d
file path=usr/include/X11/fonts/bdfint.h
file path=usr/include/X11/fonts/bitmap.h
file path=usr/include/X11/fonts/bufio.h
@@ -43,8 +43,8 @@
file path=usr/include/X11/fonts/pcf.h
file path=usr/lib/$(ARCH64)/pkgconfig/xfont.pc
file path=usr/lib/pkgconfig/xfont.pc
+link path=usr/lib/xorg/$(ARCH64)/libXfont.so target=libXfont.so.1
file path=usr/lib/xorg/$(ARCH64)/libXfont.so.1
+link path=usr/lib/xorg/libXfont.so target=libXfont.so.1
file path=usr/lib/xorg/libXfont.so.1
-link path=usr/lib/xorg/$(ARCH64)/libXfont.so target=libXfont.so.1
-link path=usr/lib/xorg/libXfont.so target=libXfont.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxft.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxft.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,25 +20,25 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxft@__version:libXft__
+set name=pkg.summary value="libXft - X FreeType library"
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/include/X11/Xft
-file path=usr/include/X11/Xft/Xft.h
-file path=usr/include/X11/Xft/XftCompat.h
-file path=usr/lib/$(ARCH64)/libXft.so.2
-file path=usr/lib/$(ARCH64)/pkgconfig/xft.pc
-file path=usr/lib/libXft.so.2
-file path=usr/lib/pkgconfig/xft.pc
-file path=usr/share/man/man3/Xft.3
-legacy pkg=SUNWxwxft desc="Xft (X Freetype) Library" \
- name="Xft (X Freetype) Library"
link path=usr/X11/lib/$(ARCH64)/libXft.so \
target=../../../lib/$(ARCH64)/libXft.so
link path=usr/X11/lib/$(ARCH64)/libXft.so.2 \
target=../../../lib/$(ARCH64)/libXft.so.2
link path=usr/X11/lib/libXft.so target=../../lib/libXft.so
link path=usr/X11/lib/libXft.so.2 target=../../lib/libXft.so.2
+dir path=usr/include/X11/Xft
+file path=usr/include/X11/Xft/Xft.h
+file path=usr/include/X11/Xft/XftCompat.h
link path=usr/lib/$(ARCH64)/libXft.so target=libXft.so.2
+file path=usr/lib/$(ARCH64)/libXft.so.2
+file path=usr/lib/$(ARCH64)/pkgconfig/xft.pc
link path=usr/lib/libXft.so target=libXft.so.2
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXft.so.2
+file path=usr/lib/pkgconfig/xft.pc
+file path=usr/share/man/man3/Xft.3
+legacy pkg=SUNWxwxft desc="Xft (X Freetype) Library" \
+ name="Xft (X Freetype) Library"
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxi.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxi.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,21 +20,28 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxi@__version:libXi__
+set name=pkg.summary value="libXi - X Input extension client library"
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/share/doc/libXi
-dir path=usr/share/doc/libXi/specs
-dir path=usr/share/man/man3xi
+link path=usr/X11/lib/$(ARCH64)/libXi.so target=../../../lib/$(ARCH64)/libXi.so
+link path=usr/X11/lib/$(ARCH64)/libXi.so.5 \
+ target=../../../lib/$(ARCH64)/libXi.so.5
+link path=usr/X11/lib/libXi.so target=../../lib/libXi.so
+link path=usr/X11/lib/libXi.so.5 target=../../lib/libXi.so.5
file path=usr/include/X11/extensions/XInput.h
file path=usr/include/X11/extensions/XInput2.h
+link path=usr/lib/$(ARCH64)/libXi.so target=libXi.so.5
file path=usr/lib/$(ARCH64)/libXi.so.5
file path=usr/lib/$(ARCH64)/pkgconfig/xi.pc
+link path=usr/lib/libXi.so target=libXi.so.5
file path=usr/lib/libXi.so.5
file path=usr/lib/pkgconfig/xi.pc
+dir path=usr/share/doc/libXi
+dir path=usr/share/doc/libXi/specs
file path=usr/share/doc/libXi/specs/encoding.xml
file path=usr/share/doc/libXi/specs/inputlib.xml
file path=usr/share/doc/libXi/specs/library.xml
+dir path=usr/share/man/man3xi
file path=usr/share/man/man3xi/XAllowDeviceEvents.3xi
file path=usr/share/man/man3xi/XChangeDeviceControl.3xi
file path=usr/share/man/man3xi/XChangeDeviceDontPropagateList.3xi
@@ -104,12 +111,4 @@
file path=usr/share/man/man3xi/XUngrabDevice.3xi
file path=usr/share/man/man3xi/XUngrabDeviceButton.3xi
file path=usr/share/man/man3xi/XUngrabDeviceKey.3xi
-link path=usr/X11/lib/$(ARCH64)/libXi.so \
- target=../../../lib/$(ARCH64)/libXi.so
-link path=usr/X11/lib/$(ARCH64)/libXi.so.5 \
- target=../../../lib/$(ARCH64)/libXi.so.5
-link path=usr/X11/lib/libXi.so target=../../lib/libXi.so
-link path=usr/X11/lib/libXi.so.5 target=../../lib/libXi.so.5
-link path=usr/lib/$(ARCH64)/libXi.so target=libXi.so.5
-link path=usr/lib/libXi.so target=libXi.so.5
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxinerama.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxinerama.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,27 +20,27 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxinerama@__version:libXinerama__
+set name=pkg.summary value="libXinerama - Xinerama extension client library"
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/share/man/man3xinerama
-file path=usr/include/X11/extensions/Xinerama.h
-file path=usr/include/X11/extensions/panoramiXext.h
-file path=usr/lib/$(ARCH64)/libXinerama.so.1
-file path=usr/lib/$(ARCH64)/pkgconfig/xinerama.pc
-file path=usr/lib/libXinerama.so.1
-file path=usr/lib/pkgconfig/xinerama.pc
-file path=usr/share/man/man3xinerama/Xinerama.3xinerama
-file path=usr/share/man/man3xinerama/XineramaIsActive.3xinerama
-file path=usr/share/man/man3xinerama/XineramaQueryExtension.3xinerama
-file path=usr/share/man/man3xinerama/XineramaQueryScreens.3xinerama
-file path=usr/share/man/man3xinerama/XineramaQueryVersion.3xinerama
link path=usr/X11/lib/$(ARCH64)/libXinerama.so \
target=../../../lib/$(ARCH64)/libXinerama.so
link path=usr/X11/lib/$(ARCH64)/libXinerama.so.1 \
target=../../../lib/$(ARCH64)/libXinerama.so.1
link path=usr/X11/lib/libXinerama.so target=../../lib/libXinerama.so
link path=usr/X11/lib/libXinerama.so.1 target=../../lib/libXinerama.so.1
+file path=usr/include/X11/extensions/Xinerama.h
+file path=usr/include/X11/extensions/panoramiXext.h
link path=usr/lib/$(ARCH64)/libXinerama.so target=libXinerama.so.1
+file path=usr/lib/$(ARCH64)/libXinerama.so.1
+file path=usr/lib/$(ARCH64)/pkgconfig/xinerama.pc
link path=usr/lib/libXinerama.so target=libXinerama.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXinerama.so.1
+file path=usr/lib/pkgconfig/xinerama.pc
+dir path=usr/share/man/man3xinerama
+file path=usr/share/man/man3xinerama/Xinerama.3xinerama
+file path=usr/share/man/man3xinerama/XineramaIsActive.3xinerama
+file path=usr/share/man/man3xinerama/XineramaQueryExtension.3xinerama
+file path=usr/share/man/man3xinerama/XineramaQueryScreens.3xinerama
+file path=usr/share/man/man3xinerama/XineramaQueryVersion.3xinerama
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxkbfile.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxkbfile.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,26 +20,26 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxkbfile@__version:libxkbfile__
+set name=pkg.summary \
+ value="libxkbfile - library for the X Keyboard (XKB) extension"
set name=pkg.description \
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"
+link path=usr/X11/lib/$(ARCH64)/libxkbfile.so \
+ target=../../../lib/$(ARCH64)/libxkbfile.so
+link path=usr/X11/lib/$(ARCH64)/libxkbfile.so.5 \
+ target=../../../lib/$(ARCH64)/libxkbfile.so.5
+link path=usr/X11/lib/libxkbfile.so target=../../lib/libxkbfile.so
+link path=usr/X11/lib/libxkbfile.so.5 target=../../lib/libxkbfile.so.5
file path=usr/include/X11/extensions/XKBbells.h
file path=usr/include/X11/extensions/XKBconfig.h
file path=usr/include/X11/extensions/XKBfile.h
file path=usr/include/X11/extensions/XKBrules.h
file path=usr/include/X11/extensions/XKM.h
file path=usr/include/X11/extensions/XKMformat.h
+link path=usr/lib/$(ARCH64)/libxkbfile.so target=libxkbfile.so.5
file path=usr/lib/$(ARCH64)/libxkbfile.so.5
file path=usr/lib/$(ARCH64)/pkgconfig/xkbfile.pc
+link path=usr/lib/libxkbfile.so target=libxkbfile.so.5
file path=usr/lib/libxkbfile.so.5
file path=usr/lib/pkgconfig/xkbfile.pc
-link path=usr/X11/lib/$(ARCH64)/libxkbfile.so \
- target=../../../lib/$(ARCH64)/libxkbfile.so
-link path=usr/X11/lib/$(ARCH64)/libxkbfile.so.5 \
- target=../../../lib/$(ARCH64)/libxkbfile.so.5
-link path=usr/X11/lib/libxkbfile.so target=../../lib/libxkbfile.so
-link path=usr/X11/lib/libxkbfile.so.5 target=../../lib/libxkbfile.so.5
-link path=usr/lib/$(ARCH64)/libxkbfile.so target=libxkbfile.so.5
-link path=usr/lib/libxkbfile.so target=libxkbfile.so.5
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxmu.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxmu.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,16 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxmu@__version:libXmu__
+set name=pkg.summary \
+ value="libXmu - miscellaneous utility functions for Xaw and Xt clients"
set name=pkg.description \
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/share/doc/libXmu
-dir path=usr/share/man/man3xmu
+link path=usr/X11/lib/$(ARCH64)/libXmu.so \
+ target=../../../lib/$(ARCH64)/libXmu.so
+link path=usr/X11/lib/$(ARCH64)/libXmu.so.4 \
+ target=../../../lib/$(ARCH64)/libXmu.so.4
+link path=usr/X11/lib/libXmu.so target=../../lib/libXmu.so
+link path=usr/X11/lib/libXmu.so.4 target=../../lib/libXmu.so.4
file path=usr/include/X11/Xmu/Atoms.h
file path=usr/include/X11/Xmu/CloseHook.h
file path=usr/include/X11/Xmu/Converters.h
@@ -45,22 +49,18 @@
file path=usr/include/X11/Xmu/Xct.h
file path=usr/include/X11/Xmu/Xmu.h
file path=usr/include/X11/Xmu/XmuSolaris.h
+link path=usr/lib/$(ARCH64)/libXmu.so target=libXmu.so.4
file path=usr/lib/$(ARCH64)/libXmu.so.4
file path=usr/lib/$(ARCH64)/llib-lXmu.ln
file path=usr/lib/$(ARCH64)/pkgconfig/xmu.pc
+link path=usr/lib/libXmu.so target=libXmu.so.4
file path=usr/lib/libXmu.so.4
file path=usr/lib/llib-lXmu.ln
file path=usr/lib/pkgconfig/xmu.pc
+dir path=usr/share/doc/libXmu
file path=usr/share/doc/libXmu/Xmu.xml
file path=usr/share/doc/libXmu/xlogo.svg
+dir path=usr/share/man/man3xmu
file path=usr/share/man/man3xmu/XSolarisCheckColormapEquivalence.3xmu
file path=usr/share/man/man3xmu/XSolarisGetVisualGamma.3xmu
-link path=usr/X11/lib/$(ARCH64)/libXmu.so \
- target=../../../lib/$(ARCH64)/libXmu.so
-link path=usr/X11/lib/$(ARCH64)/libXmu.so.4 \
- target=../../../lib/$(ARCH64)/libXmu.so.4
-link path=usr/X11/lib/libXmu.so target=../../lib/libXmu.so
-link path=usr/X11/lib/libXmu.so.4 target=../../lib/libXmu.so.4
-link path=usr/lib/$(ARCH64)/libXmu.so target=libXmu.so.4
-link path=usr/lib/libXmu.so target=libXmu.so.4
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxmuu.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxmuu.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,28 +20,28 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxmuu@__version:libXmu__
-set name=pkg.description \
- 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/include/X11/Xmu
-file path=usr/include/X11/Xmu/CharSet.h
-file path=usr/include/X11/Xmu/CurUtil.h
-file path=usr/include/X11/Xmu/Error.h
-file path=usr/include/X11/Xmu/SysUtil.h
-file path=usr/include/X11/Xmu/WinUtil.h
-file path=usr/lib/$(ARCH64)/libXmuu.so.1
-file path=usr/lib/$(ARCH64)/llib-lXmuu.ln
-file path=usr/lib/$(ARCH64)/pkgconfig/xmuu.pc
-file path=usr/lib/libXmuu.so.1
-file path=usr/lib/llib-lXmuu.ln
-file path=usr/lib/pkgconfig/xmuu.pc
+set name=pkg.description \
+ 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."
link path=usr/X11/lib/$(ARCH64)/libXmuu.so \
target=../../../lib/$(ARCH64)/libXmuu.so
link path=usr/X11/lib/$(ARCH64)/libXmuu.so.1 \
target=../../../lib/$(ARCH64)/libXmuu.so.1
link path=usr/X11/lib/libXmuu.so target=../../lib/libXmuu.so
link path=usr/X11/lib/libXmuu.so.1 target=../../lib/libXmuu.so.1
+dir path=usr/include/X11/Xmu
+file path=usr/include/X11/Xmu/CharSet.h
+file path=usr/include/X11/Xmu/CurUtil.h
+file path=usr/include/X11/Xmu/Error.h
+file path=usr/include/X11/Xmu/SysUtil.h
+file path=usr/include/X11/Xmu/WinUtil.h
link path=usr/lib/$(ARCH64)/libXmuu.so target=libXmuu.so.1
+file path=usr/lib/$(ARCH64)/libXmuu.so.1
+file path=usr/lib/$(ARCH64)/llib-lXmuu.ln
+file path=usr/lib/$(ARCH64)/pkgconfig/xmuu.pc
link path=usr/lib/libXmuu.so target=libXmuu.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXmuu.so.1
+file path=usr/lib/llib-lXmuu.ln
+file path=usr/lib/pkgconfig/xmuu.pc
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxp.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxp.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,14 +20,21 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxp@__version:libXp__
+set name=pkg.summary value="libXp - X Print Client Library"
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/share/man/man3xp
+link path=usr/X11/lib/$(ARCH64)/libXp.so target=../../../lib/$(ARCH64)/libXp.so
+link path=usr/X11/lib/$(ARCH64)/libXp.so.1 \
+ target=../../../lib/$(ARCH64)/libXp.so.1
+link path=usr/X11/lib/libXp.so target=../../lib/libXp.so
+link path=usr/X11/lib/libXp.so.1 target=../../lib/libXp.so.1
+link path=usr/lib/$(ARCH64)/libXp.so target=libXp.so.1
file path=usr/lib/$(ARCH64)/libXp.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/xp.pc
+link path=usr/lib/libXp.so target=libXp.so.1
file path=usr/lib/libXp.so.1
file path=usr/lib/pkgconfig/xp.pc
+dir path=usr/share/man/man3xp
file path=usr/share/man/man3xp/XpCancelDoc.3xp
file path=usr/share/man/man3xp/XpCancelJob.3xp
file path=usr/share/man/man3xp/XpCancelPage.3xp
@@ -62,12 +69,4 @@
file path=usr/share/man/man3xp/XpStartJob.3xp
file path=usr/share/man/man3xp/XpStartPage.3xp
file path=usr/share/man/man3xp/libXp.3xp
-link path=usr/X11/lib/$(ARCH64)/libXp.so \
- target=../../../lib/$(ARCH64)/libXp.so
-link path=usr/X11/lib/$(ARCH64)/libXp.so.1 \
- target=../../../lib/$(ARCH64)/libXp.so.1
-link path=usr/X11/lib/libXp.so target=../../lib/libXp.so
-link path=usr/X11/lib/libXp.so.1 target=../../lib/libXp.so.1
-link path=usr/lib/$(ARCH64)/libXp.so target=libXp.so.1
-link path=usr/lib/libXp.so target=libXp.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxpm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxpm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,22 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxpm@__version:libXpm__
+set name=pkg.summary value="libXpm - X Pixmap (XPM) image file format library"
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/share/doc/libXpm
-file path=usr/bin/cxpm
-file path=usr/bin/sxpm
-file path=usr/include/X11/xpm.h
-file path=usr/lib/$(ARCH64)/libXpm.so.4
-file path=usr/lib/$(ARCH64)/pkgconfig/xpm.pc
-file path=usr/lib/libXpm.so.4
-file path=usr/lib/pkgconfig/xpm.pc
-file path=usr/share/doc/libXpm/xpm.ps
-file path=usr/share/locale/C/LC_MESSAGES/cxpm.po
-file path=usr/share/locale/C/LC_MESSAGES/sxpm.po
-file path=usr/share/man/man1/cxpm.1
-file path=usr/share/man/man1/sxpm.1
link path=usr/X11/bin/cxpm target=../../bin/cxpm
link path=usr/X11/bin/sxpm target=../../bin/sxpm
link path=usr/X11/lib/$(ARCH64)/libXpm.so \
@@ -44,6 +31,19 @@
target=../../../lib/$(ARCH64)/libXpm.so.4
link path=usr/X11/lib/libXpm.so target=../../lib/libXpm.so
link path=usr/X11/lib/libXpm.so.4 target=../../lib/libXpm.so.4
+file path=usr/bin/cxpm
+file path=usr/bin/sxpm
+file path=usr/include/X11/xpm.h
link path=usr/lib/$(ARCH64)/libXpm.so target=libXpm.so.4
+file path=usr/lib/$(ARCH64)/libXpm.so.4
+file path=usr/lib/$(ARCH64)/pkgconfig/xpm.pc
link path=usr/lib/libXpm.so target=libXpm.so.4
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXpm.so.4
+file path=usr/lib/pkgconfig/xpm.pc
+dir path=usr/share/doc/libXpm
+file path=usr/share/doc/libXpm/xpm.ps
+file path=usr/share/locale/C/LC_MESSAGES/cxpm.po
+file path=usr/share/locale/C/LC_MESSAGES/sxpm.po
+file path=usr/share/man/man1/cxpm.1
+file path=usr/share/man/man1/sxpm.1
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxrandr.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxrandr.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,16 +20,24 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxrandr@__version:libXrandr__
-set name=pkg.description \
- 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/share/man/man3xrandr
+set name=pkg.description \
+ value="Xlib-based client API for the RANDR extension to the X11 protocol"
+link path=usr/X11/lib/$(ARCH64)/libXrandr.so \
+ target=../../../lib/$(ARCH64)/libXrandr.so
+link path=usr/X11/lib/$(ARCH64)/libXrandr.so.2 \
+ target=../../../lib/$(ARCH64)/libXrandr.so.2
+link path=usr/X11/lib/libXrandr.so target=../../lib/libXrandr.so
+link path=usr/X11/lib/libXrandr.so.2 target=../../lib/libXrandr.so.2
file path=usr/include/X11/extensions/Xrandr.h
+link path=usr/lib/$(ARCH64)/libXrandr.so target=libXrandr.so.2
file path=usr/lib/$(ARCH64)/libXrandr.so.2
file path=usr/lib/$(ARCH64)/pkgconfig/xrandr.pc
+link path=usr/lib/libXrandr.so target=libXrandr.so.2
file path=usr/lib/libXrandr.so.2
file path=usr/lib/pkgconfig/xrandr.pc
+dir path=usr/share/man/man3xrandr
file path=usr/share/man/man3xrandr/XRRConfigCurrentConfiguration.3xrandr
file path=usr/share/man/man3xrandr/XRRConfigCurrentRate.3xrandr
file path=usr/share/man/man3xrandr/XRRConfigRates.3xrandr
@@ -45,12 +53,4 @@
file path=usr/share/man/man3xrandr/XRRSetScreenConfig.3xrandr
file path=usr/share/man/man3xrandr/XRRSetScreenConfigAndRate.3xrandr
file path=usr/share/man/man3xrandr/Xrandr.3xrandr
-link path=usr/X11/lib/$(ARCH64)/libXrandr.so \
- target=../../../lib/$(ARCH64)/libXrandr.so
-link path=usr/X11/lib/$(ARCH64)/libXrandr.so.2 \
- target=../../../lib/$(ARCH64)/libXrandr.so.2
-link path=usr/X11/lib/libXrandr.so target=../../lib/libXrandr.so
-link path=usr/X11/lib/libXrandr.so.2 target=../../lib/libXrandr.so.2
-link path=usr/lib/$(ARCH64)/libXrandr.so target=libXrandr.so.2
-link path=usr/lib/libXrandr.so target=libXrandr.so.2
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxrender.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxrender.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,23 +20,23 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxrender@__version:libXrender__
-set name=pkg.description \
- 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/share/doc/libXrender
-file path=usr/include/X11/extensions/Xrender.h
-file path=usr/lib/$(ARCH64)/libXrender.so.1
-file path=usr/lib/$(ARCH64)/pkgconfig/xrender.pc
-file path=usr/lib/libXrender.so.1
-file path=usr/lib/pkgconfig/xrender.pc
-file path=usr/share/doc/libXrender/libXrender.txt
+set name=pkg.description \
+ value="Xlib-based client API for the RENDER extension to the X11 protocol"
link path=usr/X11/lib/$(ARCH64)/libXrender.so \
target=../../../lib/$(ARCH64)/libXrender.so
link path=usr/X11/lib/$(ARCH64)/libXrender.so.1 \
target=../../../lib/$(ARCH64)/libXrender.so.1
link path=usr/X11/lib/libXrender.so target=../../lib/libXrender.so
link path=usr/X11/lib/libXrender.so.1 target=../../lib/libXrender.so.1
+file path=usr/include/X11/extensions/Xrender.h
link path=usr/lib/$(ARCH64)/libXrender.so target=libXrender.so.1
+file path=usr/lib/$(ARCH64)/libXrender.so.1
+file path=usr/lib/$(ARCH64)/pkgconfig/xrender.pc
link path=usr/lib/libXrender.so target=libXrender.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXrender.so.1
+file path=usr/lib/pkgconfig/xrender.pc
+dir path=usr/share/doc/libXrender
+file path=usr/share/doc/libXrender/libXrender.txt
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxres.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxres.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,27 +20,27 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxres@__version:libXres__
+set name=pkg.summary value="libXRes - X-Resource extension client library"
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/share/man/man3xres
+link path=usr/X11/lib/$(ARCH64)/libXRes.so \
+ target=../../../lib/$(ARCH64)/libXRes.so
+link path=usr/X11/lib/$(ARCH64)/libXRes.so.1 \
+ target=../../../lib/$(ARCH64)/libXRes.so.1
+link path=usr/X11/lib/libXRes.so target=../../lib/libXRes.so
+link path=usr/X11/lib/libXRes.so.1 target=../../lib/libXRes.so.1
file path=usr/include/X11/extensions/XRes.h
+link path=usr/lib/$(ARCH64)/libXRes.so target=libXRes.so.1
file path=usr/lib/$(ARCH64)/libXRes.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/xres.pc
+link path=usr/lib/libXRes.so target=libXRes.so.1
file path=usr/lib/libXRes.so.1
file path=usr/lib/pkgconfig/xres.pc
+dir path=usr/share/man/man3xres
file path=usr/share/man/man3xres/XRes.3xres
file path=usr/share/man/man3xres/XResQueryClientPixmapBytes.3xres
file path=usr/share/man/man3xres/XResQueryClientResources.3xres
file path=usr/share/man/man3xres/XResQueryClients.3xres
file path=usr/share/man/man3xres/XResQueryExtension.3xres
file path=usr/share/man/man3xres/XResQueryVersion.3xres
-link path=usr/X11/lib/$(ARCH64)/libXRes.so \
- target=../../../lib/$(ARCH64)/libXRes.so
-link path=usr/X11/lib/$(ARCH64)/libXRes.so.1 \
- target=../../../lib/$(ARCH64)/libXRes.so.1
-link path=usr/X11/lib/libXRes.so target=../../lib/libXRes.so
-link path=usr/X11/lib/libXRes.so.1 target=../../lib/libXRes.so.1
-link path=usr/lib/$(ARCH64)/libXRes.so target=libXRes.so.1
-link path=usr/lib/libXRes.so target=libXRes.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxscrnsaver.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxscrnsaver.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -19,20 +19,26 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
-set name=pkg.fmri \
- value=pkg:/x11/library/libxscrnsaver@__version:libXScrnSaver__
+set name=pkg.fmri value=pkg:/x11/library/libxscrnsaver@__version:libXScrnSaver__
+set name=pkg.summary value="libXss - X11 Screen Saver extension client library"
set name=pkg.description \
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/share/man/man3xss
+link path=usr/X11/lib/$(ARCH64)/libXss.so \
+ target=../../../lib/$(ARCH64)/libXss.so
+link path=usr/X11/lib/$(ARCH64)/libXss.so.1 \
+ target=../../../lib/$(ARCH64)/libXss.so.1
+link path=usr/X11/lib/libXss.so target=../../lib/libXss.so
+link path=usr/X11/lib/libXss.so.1 target=../../lib/libXss.so.1
file path=usr/include/X11/extensions/scrnsaver.h
+link path=usr/lib/$(ARCH64)/libXss.so target=libXss.so.1
file path=usr/lib/$(ARCH64)/libXss.so.1
file path=usr/lib/$(ARCH64)/llib-lXss.ln
file path=usr/lib/$(ARCH64)/pkgconfig/xscrnsaver.pc
+link path=usr/lib/libXss.so target=libXss.so.1
file path=usr/lib/libXss.so.1
file path=usr/lib/llib-lXss.ln
file path=usr/lib/pkgconfig/xscrnsaver.pc
+dir path=usr/share/man/man3xss
file path=usr/share/man/man3xss/XScreenSaverAllocInfo.3xss
file path=usr/share/man/man3xss/XScreenSaverGetRegistered.3xss
file path=usr/share/man/man3xss/XScreenSaverQueryExtension.3xss
@@ -45,12 +51,4 @@
file path=usr/share/man/man3xss/XScreenSaverUnregister.3xss
file path=usr/share/man/man3xss/XScreenSaverUnsetAttributes.3xss
file path=usr/share/man/man3xss/Xss.3xss
-link path=usr/X11/lib/$(ARCH64)/libXss.so \
- target=../../../lib/$(ARCH64)/libXss.so
-link path=usr/X11/lib/$(ARCH64)/libXss.so.1 \
- target=../../../lib/$(ARCH64)/libXss.so.1
-link path=usr/X11/lib/libXss.so target=../../lib/libXss.so
-link path=usr/X11/lib/libXss.so.1 target=../../lib/libXss.so.1
-link path=usr/lib/$(ARCH64)/libXss.so target=libXss.so.1
-link path=usr/lib/libXss.so target=libXss.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxtst.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxtst.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,20 +20,28 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxtst@__version:libXtst__
-set name=pkg.description \
- 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/share/doc/libXtst
-dir path=usr/share/man/man3xtst
+set name=pkg.description \
+ value="Xlib-based client API for the XTEST and RECORD extensions to the X11 protocol"
+link path=usr/X11/lib/$(ARCH64)/libXtst.so \
+ target=../../../lib/$(ARCH64)/libXtst.so
+link path=usr/X11/lib/$(ARCH64)/libXtst.so.1 \
+ target=../../../lib/$(ARCH64)/libXtst.so.1
+link path=usr/X11/lib/libXtst.so target=../../lib/libXtst.so
+link path=usr/X11/lib/libXtst.so.1 target=../../lib/libXtst.so.1
file path=usr/include/X11/extensions/XTest.h
file path=usr/include/X11/extensions/record.h
+link path=usr/lib/$(ARCH64)/libXtst.so target=libXtst.so.1
file path=usr/lib/$(ARCH64)/libXtst.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/xtst.pc
+link path=usr/lib/libXtst.so target=libXtst.so.1
file path=usr/lib/libXtst.so.1
file path=usr/lib/pkgconfig/xtst.pc
+dir path=usr/share/doc/libXtst
file path=usr/share/doc/libXtst/recordlib.xml
file path=usr/share/doc/libXtst/xtestlib.xml
+dir path=usr/share/man/man3xtst
file path=usr/share/man/man3xtst/XTestCompareCurrentCursorWithWindow.3xtst
file path=usr/share/man/man3xtst/XTestCompareCursorWithWindow.3xtst
file path=usr/share/man/man3xtst/XTestDiscard.3xtst
@@ -45,12 +53,4 @@
file path=usr/share/man/man3xtst/XTestQueryExtension.3xtst
file path=usr/share/man/man3xtst/XTestSetGContextOfGC.3xtst
file path=usr/share/man/man3xtst/XTestSetVisualIDOfVisual.3xtst
-link path=usr/X11/lib/$(ARCH64)/libXtst.so \
- target=../../../lib/$(ARCH64)/libXtst.so
-link path=usr/X11/lib/$(ARCH64)/libXtst.so.1 \
- target=../../../lib/$(ARCH64)/libXtst.so.1
-link path=usr/X11/lib/libXtst.so target=../../lib/libXtst.so
-link path=usr/X11/lib/libXtst.so.1 target=../../lib/libXtst.so.1
-link path=usr/lib/$(ARCH64)/libXtst.so target=libXtst.so.1
-link path=usr/lib/libXtst.so target=libXtst.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxv.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxv.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,17 +20,24 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxv@__version:libXv__
+set name=pkg.summary value="libXv - X Video (Xv) extension client library"
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/share/man/man3xv
+link path=usr/X11/lib/$(ARCH64)/libXv.so target=../../../lib/$(ARCH64)/libXv.so
+link path=usr/X11/lib/$(ARCH64)/libXv.so.1 \
+ target=../../../lib/$(ARCH64)/libXv.so.1
+link path=usr/X11/lib/libXv.so target=../../lib/libXv.so
+link path=usr/X11/lib/libXv.so.1 target=../../lib/libXv.so.1
file path=usr/include/X11/extensions/Xvlib.h
+link path=usr/lib/$(ARCH64)/libXv.so target=libXv.so.1
file path=usr/lib/$(ARCH64)/libXv.so.1
file path=usr/lib/$(ARCH64)/llib-lXv.ln
file path=usr/lib/$(ARCH64)/pkgconfig/xv.pc
+link path=usr/lib/libXv.so target=libXv.so.1
file path=usr/lib/libXv.so.1
file path=usr/lib/llib-lXv.ln
file path=usr/lib/pkgconfig/xv.pc
+dir path=usr/share/man/man3xv
file path=usr/share/man/man3xv/Xv.3xv
file path=usr/share/man/man3xv/XvCreateImage.3xv
file path=usr/share/man/man3xv/XvFreeAdaptorInfo.3xv
@@ -57,12 +64,4 @@
file path=usr/share/man/man3xv/XvStopVideo.3xv
file path=usr/share/man/man3xv/XvUngrabPort.3xv
file path=usr/share/man/man3xv/XvVideoNotify.3xv
-link path=usr/X11/lib/$(ARCH64)/libXv.so \
- target=../../../lib/$(ARCH64)/libXv.so
-link path=usr/X11/lib/$(ARCH64)/libXv.so.1 \
- target=../../../lib/$(ARCH64)/libXv.so.1
-link path=usr/X11/lib/libXv.so target=../../lib/libXv.so
-link path=usr/X11/lib/libXv.so.1 target=../../lib/libXv.so.1
-link path=usr/lib/$(ARCH64)/libXv.so target=libXv.so.1
-link path=usr/lib/libXv.so target=libXv.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxvmc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxvmc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,19 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxvmc@__version:libXvMC__
-set name=pkg.description \
- 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/share/doc/libXvMC
-file path=usr/include/X11/extensions/XvMClib.h
-file path=usr/lib/$(ARCH64)/libXvMC.so.1
-file path=usr/lib/$(ARCH64)/libXvMCW.so.1
-file path=usr/lib/$(ARCH64)/pkgconfig/xvmc.pc
-file path=usr/lib/libXvMC.so.1
-file path=usr/lib/libXvMCW.so.1
-file path=usr/lib/pkgconfig/xvmc.pc
-file path=usr/share/doc/libXvMC/XvMC_API.txt
+set name=pkg.description \
+ value="Xlib-based client API for the XVideo-MotionCompensation extension to the X11 protocol"
link path=usr/X11/lib/$(ARCH64)/libXvMC.so \
target=../../../lib/$(ARCH64)/libXvMC.so
link path=usr/X11/lib/$(ARCH64)/libXvMC.so.1 \
@@ -45,8 +36,17 @@
link path=usr/X11/lib/libXvMC.so.1 target=../../lib/libXvMC.so.1
link path=usr/X11/lib/libXvMCW.so target=../../lib/libXvMCW.so
link path=usr/X11/lib/libXvMCW.so.1 target=../../lib/libXvMCW.so.1
+file path=usr/include/X11/extensions/XvMClib.h
link path=usr/lib/$(ARCH64)/libXvMC.so target=libXvMC.so.1
+file path=usr/lib/$(ARCH64)/libXvMC.so.1
link path=usr/lib/$(ARCH64)/libXvMCW.so target=libXvMCW.so.1
+file path=usr/lib/$(ARCH64)/libXvMCW.so.1
+file path=usr/lib/$(ARCH64)/pkgconfig/xvmc.pc
link path=usr/lib/libXvMC.so target=libXvMC.so.1
+file path=usr/lib/libXvMC.so.1
link path=usr/lib/libXvMCW.so target=libXvMCW.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXvMCW.so.1
+file path=usr/lib/pkgconfig/xvmc.pc
+dir path=usr/share/doc/libXvMC
+file path=usr/share/doc/libXvMC/XvMC_API.txt
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxxf86misc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxxf86misc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,15 +20,23 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxxf86misc@__version:libXxf86misc__
-set name=pkg.description \
- 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/share/man/man3xxf86misc
+set name=pkg.description \
+ value="Xlib-based client API for the XFree86-Misc extension to the X11 protocol"
+link path=usr/X11/lib/$(ARCH64)/libXxf86misc.so \
+ target=../../../lib/$(ARCH64)/libXxf86misc.so
+link path=usr/X11/lib/$(ARCH64)/libXxf86misc.so.1 \
+ target=../../../lib/$(ARCH64)/libXxf86misc.so.1
+link path=usr/X11/lib/libXxf86misc.so target=../../lib/libXxf86misc.so
+link path=usr/X11/lib/libXxf86misc.so.1 target=../../lib/libXxf86misc.so.1
+link path=usr/lib/$(ARCH64)/libXxf86misc.so target=libXxf86misc.so.1
file path=usr/lib/$(ARCH64)/libXxf86misc.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/xxf86misc.pc
+link path=usr/lib/libXxf86misc.so target=libXxf86misc.so.1
file path=usr/lib/libXxf86misc.so.1
file path=usr/lib/pkgconfig/xxf86misc.pc
+dir path=usr/share/man/man3xxf86misc
file path=usr/share/man/man3xxf86misc/XF86Misc.3xxf86misc
file path=usr/share/man/man3xxf86misc/XF86MiscGetKbdSettings.3xxf86misc
file path=usr/share/man/man3xxf86misc/XF86MiscGetMouseSettings.3xxf86misc
@@ -38,12 +46,4 @@
file path=usr/share/man/man3xxf86misc/XF86MiscSetKbdSettings.3xxf86misc
file path=usr/share/man/man3xxf86misc/XF86MiscSetMouseSettings.3xxf86misc
file path=usr/share/man/man3xxf86misc/XF86MiscSetSaver.3xxf86misc
-link path=usr/X11/lib/$(ARCH64)/libXxf86misc.so \
- target=../../../lib/$(ARCH64)/libXxf86misc.so
-link path=usr/X11/lib/$(ARCH64)/libXxf86misc.so.1 \
- target=../../../lib/$(ARCH64)/libXxf86misc.so.1
-link path=usr/X11/lib/libXxf86misc.so target=../../lib/libXxf86misc.so
-link path=usr/X11/lib/libXxf86misc.so.1 target=../../lib/libXxf86misc.so.1
-link path=usr/lib/$(ARCH64)/libXxf86misc.so target=libXxf86misc.so.1
-link path=usr/lib/libXxf86misc.so target=libXxf86misc.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-libxxf86vm.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-libxxf86vm.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,16 +20,24 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/libxxf86vm@__version:libXxf86vm__
-set name=pkg.description \
- 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/share/man/man3xxf86vm
+set name=pkg.description \
+ value="Xlib-based client API for the XFree86-VidMode extension to the X11 protocol"
+link path=usr/X11/lib/$(ARCH64)/libXxf86vm.so \
+ target=../../../lib/$(ARCH64)/libXxf86vm.so
+link path=usr/X11/lib/$(ARCH64)/libXxf86vm.so.1 \
+ target=../../../lib/$(ARCH64)/libXxf86vm.so.1
+link path=usr/X11/lib/libXxf86vm.so target=../../lib/libXxf86vm.so
+link path=usr/X11/lib/libXxf86vm.so.1 target=../../lib/libXxf86vm.so.1
file path=usr/include/X11/extensions/xf86vmode.h
+link path=usr/lib/$(ARCH64)/libXxf86vm.so target=libXxf86vm.so.1
file path=usr/lib/$(ARCH64)/libXxf86vm.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/xxf86vm.pc
+link path=usr/lib/libXxf86vm.so target=libXxf86vm.so.1
file path=usr/lib/libXxf86vm.so.1
file path=usr/lib/pkgconfig/xxf86vm.pc
+dir path=usr/share/man/man3xxf86vm
file path=usr/share/man/man3xxf86vm/XF86VM.3xxf86vm
file path=usr/share/man/man3xxf86vm/XF86VidModeDeleteModeLine.3xxf86vm
file path=usr/share/man/man3xxf86vm/XF86VidModeGetAllModeLines.3xxf86vm
@@ -52,12 +60,4 @@
file path=usr/share/man/man3xxf86vm/XF86VidModeSwitchMode.3xxf86vm
file path=usr/share/man/man3xxf86vm/XF86VidModeSwitchToMode.3xxf86vm
file path=usr/share/man/man3xxf86vm/XF86VidModeValidateModeLine.3xxf86vm
-link path=usr/X11/lib/$(ARCH64)/libXxf86vm.so \
- target=../../../lib/$(ARCH64)/libXxf86vm.so
-link path=usr/X11/lib/$(ARCH64)/libXxf86vm.so.1 \
- target=../../../lib/$(ARCH64)/libXxf86vm.so.1
-link path=usr/X11/lib/libXxf86vm.so target=../../lib/libXxf86vm.so
-link path=usr/X11/lib/libXxf86vm.so.1 target=../../lib/libXxf86vm.so.1
-link path=usr/lib/$(ARCH64)/libXxf86vm.so target=libXxf86vm.so.1
-link path=usr/lib/libXxf86vm.so target=libXxf86vm.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-mesa.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-mesa.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,20 +20,31 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/mesa@__version:mesa__
-set name=pkg.description \
- 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/include/GL
-dir path=usr/include/GL/internal
-dir path=usr/include/mesa
-dir path=usr/include/mesa/internal
-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
+set name=pkg.description \
+ value="The Mesa 3-D graphics library is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics."
+link path=usr/X11/include/mesa target=../../include/mesa
+link path=usr/X11/lib/$(ARCH64)/libGLU.so target=libGLU.so.1
+link path=usr/X11/lib/$(ARCH64)/libGLU.so.1 target=../GL/$(ARCH64)/libGLU.so.1
+link path=usr/X11/lib/$(ARCH64)/libGLw.so target=libGLw.so.1
+link path=usr/X11/lib/$(ARCH64)/libGLw.so.1 target=../GL/$(ARCH64)/libGLw.so.1
+link path=usr/X11/lib/libGLU.so target=libGLU.so.1
+link path=usr/X11/lib/libGLU.so.1 target=GL/libGLU.so.1
+link path=usr/X11/lib/libGLw.so target=libGLw.so.1
+link path=usr/X11/lib/libGLw.so.1 target=GL/libGLw.so.1
+link path=usr/X11/lib/mesa target=../../lib/mesa
+dir path=usr/include/GL
+link path=usr/include/GL/GLwDrawA.h target=../mesa/GLwDrawA.h
+link path=usr/include/GL/GLwDrawAP.h target=../mesa/GLwDrawAP.h
+link path=usr/include/GL/GLwMDrawA.h target=../mesa/GLwMDrawA.h
+link path=usr/include/GL/GLwMDrawAP.h target=../mesa/GLwMDrawAP.h
+link path=usr/include/GL/glu.h target=../mesa/glu.h
+dir path=usr/include/GL/internal
+link path=usr/include/GL/internal/dri_interface.h \
+ target=../../mesa/internal/dri_interface.h
+link path=usr/include/GL/osmesa.h target=../mesa/osmesa.h
+dir path=usr/include/mesa
file path=usr/include/mesa/GLwDrawA.h
file path=usr/include/mesa/GLwDrawAP.h
file path=usr/include/mesa/GLwMDrawA.h
@@ -47,53 +58,23 @@
file path=usr/include/mesa/glx.h
file path=usr/include/mesa/glx_mangle.h
file path=usr/include/mesa/glxext.h
+dir path=usr/include/mesa/internal
file path=usr/include/mesa/internal/dri_interface.h
file path=usr/include/mesa/mesa_wgl.h
file path=usr/include/mesa/osmesa.h
file path=usr/include/mesa/vms_x_fix.h
file path=usr/include/mesa/wglext.h
file path=usr/include/mesa/wmesa.h
+link path=usr/lib/$(ARCH64)/libGLU.so target=libGLU.so.1
+link path=usr/lib/$(ARCH64)/libGLU.so.1 target=../GL/$(ARCH64)/libGLU.so.1
+link path=usr/lib/$(ARCH64)/libGLw.so target=libGLw.so.1
+link path=usr/lib/$(ARCH64)/libGLw.so.1 target=../GL/$(ARCH64)/libGLw.so.1
file path=usr/lib/$(ARCH64)/pkgconfig/dri.pc
file path=usr/lib/$(ARCH64)/pkgconfig/gl.pc
file path=usr/lib/$(ARCH64)/pkgconfig/glu.pc
file path=usr/lib/$(ARCH64)/pkgconfig/glw.pc
-file path=usr/lib/mesa/$(ARCH64)/libGL.so.1
-file path=usr/lib/mesa/$(ARCH64)/libGLU.so.1
-file path=usr/lib/mesa/$(ARCH64)/libGLw.so.1
-file path=usr/lib/mesa/libGL.so.1
-file path=usr/lib/mesa/libGLU.so.1
-file path=usr/lib/mesa/libGLw.so.1
-file path=usr/lib/mesa/modules/extensions/libglx.so
-file path=usr/lib/pkgconfig/dri.pc
-file path=usr/lib/pkgconfig/gl.pc
-file path=usr/lib/pkgconfig/glu.pc
-file path=usr/lib/pkgconfig/glw.pc
-file path=usr/lib/xorg/modules/dri/swrast_dri.so
-legacy pkg=SUNWxorg-mesa \
- desc="Server modules and client libraries for X Window System GLX extension based on Mesa open source project" \
- name="Xorg Server Mesa Modules and Libraries"
-link path=usr/X11/include/mesa target=../../include/mesa
-link path=usr/X11/lib/$(ARCH64)/libGLU.so target=libGLU.so.1
-link path=usr/X11/lib/$(ARCH64)/libGLU.so.1 target=../GL/$(ARCH64)/libGLU.so.1
-link path=usr/X11/lib/$(ARCH64)/libGLw.so target=libGLw.so.1
-link path=usr/X11/lib/$(ARCH64)/libGLw.so.1 target=../GL/$(ARCH64)/libGLw.so.1
-link path=usr/X11/lib/libGLU.so target=libGLU.so.1
-link path=usr/X11/lib/libGLU.so.1 target=GL/libGLU.so.1
-link path=usr/X11/lib/libGLw.so target=libGLw.so.1
-link path=usr/X11/lib/libGLw.so.1 target=GL/libGLw.so.1
-link path=usr/X11/lib/mesa target=../../lib/mesa
-link path=usr/include/GL/GLwDrawA.h target=../mesa/GLwDrawA.h
-link path=usr/include/GL/GLwDrawAP.h target=../mesa/GLwDrawAP.h
-link path=usr/include/GL/GLwMDrawA.h target=../mesa/GLwMDrawA.h
-link path=usr/include/GL/GLwMDrawAP.h target=../mesa/GLwMDrawAP.h
-link path=usr/include/GL/glu.h target=../mesa/glu.h
-link path=usr/include/GL/internal/dri_interface.h \
- target=../../mesa/internal/dri_interface.h
-link path=usr/include/GL/osmesa.h target=../mesa/osmesa.h
-link path=usr/lib/$(ARCH64)/libGLU.so target=libGLU.so.1
-link path=usr/lib/$(ARCH64)/libGLU.so.1 target=../GL/$(ARCH64)/libGLU.so.1
-link path=usr/lib/$(ARCH64)/libGLw.so target=libGLw.so.1
-link path=usr/lib/$(ARCH64)/libGLw.so.1 target=../GL/$(ARCH64)/libGLw.so.1
+dir path=usr/lib/GL
+dir path=usr/lib/GL/$(ARCH64)
link path=usr/lib/GL/$(ARCH64)/libGLU.so target=libGLU.so.1
link path=usr/lib/GL/$(ARCH64)/libGLU.so.1 \
target=../../mesa/$(ARCH64)/libGLU.so.1
@@ -108,13 +89,32 @@
link path=usr/lib/libGLU.so.1 target=GL/libGLU.so.1
link path=usr/lib/libGLw.so target=libGLw.so.1
link path=usr/lib/libGLw.so.1 target=GL/libGLw.so.1
+dir path=usr/lib/mesa
+dir path=usr/lib/mesa/$(ARCH64)
link path=usr/lib/mesa/$(ARCH64)/libGL.so target=libGL.so.1
+file path=usr/lib/mesa/$(ARCH64)/libGL.so.1
link path=usr/lib/mesa/$(ARCH64)/libGLU.so target=libGLU.so.1
+file path=usr/lib/mesa/$(ARCH64)/libGLU.so.1
link path=usr/lib/mesa/$(ARCH64)/libGLw.so target=libGLw.so.1
+file path=usr/lib/mesa/$(ARCH64)/libGLw.so.1
link path=usr/lib/mesa/64 target=$(ARCH64)
link path=usr/lib/mesa/libGL.so target=libGL.so.1
+file path=usr/lib/mesa/libGL.so.1
link path=usr/lib/mesa/libGLU.so target=libGLU.so.1
+file path=usr/lib/mesa/libGLU.so.1
link path=usr/lib/mesa/libGLw.so target=libGLw.so.1
+file path=usr/lib/mesa/libGLw.so.1
+dir path=usr/lib/mesa/modules
+dir path=usr/lib/mesa/modules/extensions
+file path=usr/lib/mesa/modules/extensions/libglx.so
+file path=usr/lib/pkgconfig/dri.pc
+file path=usr/lib/pkgconfig/gl.pc
+file path=usr/lib/pkgconfig/glu.pc
+file path=usr/lib/pkgconfig/glw.pc
+file path=usr/lib/xorg/modules/dri/swrast_dri.so
+legacy pkg=SUNWxorg-mesa \
+ desc="Server modules and client libraries for X Window System GLX extension based on Mesa open source project" \
+ name="Xorg Server Mesa Modules and Libraries"
# Autodetected for now
# depend fmri=pkg:/service/opengl/ogl-select type=require
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-toolkit-libxaw4.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-toolkit-libxaw4.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/toolkit/libxaw4@$(OSPKGVERS)
+set name=pkg.summary \
+ value="libXaw4 - X Athena Widgets Toolkit (X11R4 binary compatibility version)"
set name=pkg.description \
value="This package provides a libXaw.so.4 binary for backwards compatibility with programs compiled on older releases of Solaris."
-set name=pkg.summary \
- value="libXaw4 - X Athena Widgets Toolkit (X11R4 binary compatibility version)"
+link path=usr/X11/lib/libXaw.so.4 target=../../lib/libXaw.so.4
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 Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-toolkit-libxaw5.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,12 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/toolkit/libxaw5@$(OSPKGVERS)
+set name=pkg.summary \
+ value="libXaw5 - X Athena Widgets Toolkit (X11R5/X11R6 binary compatibility version)"
set name=pkg.description \
value="This package provides a libXaw.so.5 binary for backwards compatibility with programs compiled on older releases of Solaris."
-set name=pkg.summary \
- value="libXaw5 - X Athena Widgets Toolkit (X11R5/X11R6 binary compatibility version)"
-file path=usr/lib/$(ARCH64)/libXaw.so.5
-file path=usr/lib/libXaw.so.5
link path=usr/X11/lib/$(ARCH64)/libXaw.so.5 \
target=../../../lib/$(ARCH64)/libXaw.so.5
link path=usr/X11/lib/libXaw.so.5 target=../../lib/libXaw.so.5
+file path=usr/lib/$(ARCH64)/libXaw.so.5
+file path=usr/lib/libXaw.so.5
--- a/pkg/manifests/x11-library-toolkit-libxaw7.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-toolkit-libxaw7.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,13 +20,23 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/toolkit/libxaw7@__version:libXaw__
-set name=pkg.description \
- value="Xaw is the X Athena Widget Set. Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library."
set name=pkg.summary \
value="libXaw7 - X Athena Widgets Toolkit (current/X11R7 version)"
-dir path=usr/include/X11/Xaw
-dir path=usr/share/doc/libXaw
-dir path=usr/share/man/man3xaw
+set name=pkg.description \
+ value="Xaw is the X Athena Widget Set. Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library."
+link path=usr/X11/lib/$(ARCH64)/libXaw.so \
+ target=../../../lib/$(ARCH64)/libXaw.so
+link path=usr/X11/lib/$(ARCH64)/libXaw.so.7 \
+ target=../../../lib/$(ARCH64)/libXaw.so.7
+link path=usr/X11/lib/$(ARCH64)/libXaw7.so \
+ target=../../../lib/$(ARCH64)/libXaw7.so
+link path=usr/X11/lib/$(ARCH64)/libXaw7.so.7 \
+ target=../../../lib/$(ARCH64)/libXaw7.so.7
+link path=usr/X11/lib/libXaw.so target=../../lib/libXaw.so
+link path=usr/X11/lib/libXaw.so.7 target=../../lib/libXaw.so.7
+link path=usr/X11/lib/libXaw7.so target=../../lib/libXaw7.so
+link path=usr/X11/lib/libXaw7.so.7 target=../../lib/libXaw7.so.7
+dir path=usr/include/X11/Xaw
file path=usr/include/X11/Xaw/AllWidgets.h
file path=usr/include/X11/Xaw/AsciiSink.h
file path=usr/include/X11/Xaw/AsciiSinkP.h
@@ -98,10 +108,17 @@
file path=usr/include/X11/Xaw/ViewportP.h
file path=usr/include/X11/Xaw/XawImP.h
file path=usr/include/X11/Xaw/XawInit.h
+link path=usr/lib/$(ARCH64)/libXaw.so target=libXaw7.so
+link path=usr/lib/$(ARCH64)/libXaw.so.7 target=libXaw7.so.7
+link path=usr/lib/$(ARCH64)/libXaw7.so target=libXaw7.so.7
file path=usr/lib/$(ARCH64)/libXaw7.so.7
file path=usr/lib/$(ARCH64)/pkgconfig/xaw7.pc
+link path=usr/lib/libXaw.so target=libXaw7.so
+link path=usr/lib/libXaw.so.7 target=libXaw7.so.7
+link path=usr/lib/libXaw7.so target=libXaw7.so.7
file path=usr/lib/libXaw7.so.7
file path=usr/lib/pkgconfig/xaw7.pc
+dir path=usr/share/doc/libXaw
file path=usr/share/doc/libXaw/AsciiSink.xml
file path=usr/share/doc/libXaw/AsciiSource.xml
file path=usr/share/doc/libXaw/AsciiText.xml
@@ -148,23 +165,6 @@
file path=usr/share/doc/libXaw/Tree.xml
file path=usr/share/doc/libXaw/Viewport.xml
file path=usr/share/doc/libXaw/libXaw.xml
+dir path=usr/share/man/man3xaw
file path=usr/share/man/man3xaw/Xaw.3xaw
-link path=usr/X11/lib/$(ARCH64)/libXaw.so \
- target=../../../lib/$(ARCH64)/libXaw.so
-link path=usr/X11/lib/$(ARCH64)/libXaw.so.7 \
- target=../../../lib/$(ARCH64)/libXaw.so.7
-link path=usr/X11/lib/$(ARCH64)/libXaw7.so \
- target=../../../lib/$(ARCH64)/libXaw7.so
-link path=usr/X11/lib/$(ARCH64)/libXaw7.so.7 \
- target=../../../lib/$(ARCH64)/libXaw7.so.7
-link path=usr/X11/lib/libXaw.so target=../../lib/libXaw.so
-link path=usr/X11/lib/libXaw.so.7 target=../../lib/libXaw.so.7
-link path=usr/X11/lib/libXaw7.so target=../../lib/libXaw7.so
-link path=usr/X11/lib/libXaw7.so.7 target=../../lib/libXaw7.so.7
-link path=usr/lib/$(ARCH64)/libXaw.so target=libXaw7.so
-link path=usr/lib/$(ARCH64)/libXaw.so.7 target=libXaw7.so.7
-link path=usr/lib/$(ARCH64)/libXaw7.so target=libXaw7.so.7
-link path=usr/lib/libXaw.so target=libXaw7.so
-link path=usr/lib/libXaw.so.7 target=libXaw7.so.7
-link path=usr/lib/libXaw7.so target=libXaw7.so.7
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-toolkit-libxt.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-toolkit-libxt.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,11 +20,17 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/library/toolkit/libxt@__version:libXt__
+set name=pkg.summary value="libXt - X Toolkit Intrinsics library"
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/share/X11/app-defaults
-dir path=usr/share/man/man3xt
+link path=usr/X11/lib/$(ARCH64)/libXt.so target=../../../lib/$(ARCH64)/libXt.so
+link path=usr/X11/lib/$(ARCH64)/libXt.so.4 \
+ target=../../../lib/$(ARCH64)/libXt.so.4
+link path=usr/X11/lib/$(ARCH64)/libXt.so.5 \
+ target=../../../lib/$(ARCH64)/libXt.so.5
+link path=usr/X11/lib/libXt.so target=../../lib/libXt.so
+link path=usr/X11/lib/libXt.so.4 target=../../lib/libXt.so.4
+link path=usr/X11/lib/libXt.so.5 target=../../lib/libXt.so.5
file path=usr/include/X11/CallbackI.h
file path=usr/include/X11/Composite.h
file path=usr/include/X11/CompositeP.h
@@ -58,10 +64,17 @@
file path=usr/include/X11/Vendor.h
file path=usr/include/X11/VendorP.h
file path=usr/include/X11/Xtos.h
+link path=usr/lib/$(ARCH64)/libXt.so target=libXt.so.4
file path=usr/lib/$(ARCH64)/libXt.so.4
+link path=usr/lib/$(ARCH64)/libXt.so.5 target=libXt.so.4
file path=usr/lib/$(ARCH64)/pkgconfig/xt.pc
+link path=usr/lib/libXt.so target=libXt.so.4
file path=usr/lib/libXt.so.4
+# Additional link required by SVID ABI (see PSARC/1997/141)
+link path=usr/lib/libXt.so.5 target=libXt.so.4
file path=usr/lib/pkgconfig/xt.pc
+dir path=usr/share/X11/app-defaults
+dir path=usr/share/man/man3xt
file path=usr/share/man/man3xt/MenuPopdown.3xt
file path=usr/share/man/man3xt/MenuPopup.3xt
file path=usr/share/man/man3xt/XtAddActions.3xt
@@ -329,18 +342,4 @@
file path=usr/share/man/man3xt/XtWindow.3xt
file path=usr/share/man/man3xt/XtWindowOfObject.3xt
file path=usr/share/man/man3xt/XtWindowToWidget.3xt
-link path=usr/X11/lib/$(ARCH64)/libXt.so \
- target=../../../lib/$(ARCH64)/libXt.so
-link path=usr/X11/lib/$(ARCH64)/libXt.so.4 \
- target=../../../lib/$(ARCH64)/libXt.so.4
-link path=usr/X11/lib/$(ARCH64)/libXt.so.5 \
- target=../../../lib/$(ARCH64)/libXt.so.5
-link path=usr/X11/lib/libXt.so target=../../lib/libXt.so
-link path=usr/X11/lib/libXt.so.4 target=../../lib/libXt.so.4
-link path=usr/X11/lib/libXt.so.5 target=../../lib/libXt.so.5
-link path=usr/lib/$(ARCH64)/libXt.so target=libXt.so.4
-link path=usr/lib/$(ARCH64)/libXt.so.5 target=libXt.so.4
-link path=usr/lib/libXt.so target=libXt.so.4
-# Additional link required by SVID ABI (see PSARC/1997/141)
-link path=usr/lib/libXt.so.5 target=libXt.so.4
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-library-xcb-util.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-xcb-util.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,12 +21,16 @@
#
<transform dir path=usr/share/xcb.* -> default facet.devel true>
<transform file path=usr/share/xcb/.*\.xml$ -> default facet.devel true>
-<transform file path=usr/lib/python.*/vendor-packages/xcbgen/.* -> default facet.devel true>
+<transform set name=info.upstream-url -> \
+ set value "http://xcb.freedesktop.org/XcbUtil/">
+<transform file path=usr/lib/python.*/vendor-packages/xcbgen/.* -> \
+ default facet.devel true>
#
set name=pkg.fmri value=pkg:/x11/library/xcb-util@__version:xcb-util__
+set name=pkg.summary \
+ value="xcb-util - The X11 protocol C bindings utility libraries"
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"
+ value="The xcb-util module provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. These experimental libraries provide convenience functions and interfaces which make the raw X protocol more usable. Some of the libraries also provide client-side code which is not strictly part of the X protocol but which have traditionally been provided by Xlib."
#
file path=usr/include/xcb/xcb_atom.h
file path=usr/include/xcb/xcb_aux.h
@@ -40,11 +44,17 @@
file path=usr/include/xcb/xcb_renderutil.h
file path=usr/include/xcb/xcb_util.h
#
+link path=usr/lib/$(ARCH64)/libxcb-ewmh.so target=libxcb-ewmh.so.1
file path=usr/lib/$(ARCH64)/libxcb-ewmh.so.1
+link path=usr/lib/$(ARCH64)/libxcb-icccm.so target=libxcb-icccm.so.4
file path=usr/lib/$(ARCH64)/libxcb-icccm.so.4
+link path=usr/lib/$(ARCH64)/libxcb-image.so target=libxcb-image.so.0
file path=usr/lib/$(ARCH64)/libxcb-image.so.0
+link path=usr/lib/$(ARCH64)/libxcb-keysyms.so target=libxcb-keysyms.so.1
file path=usr/lib/$(ARCH64)/libxcb-keysyms.so.1
+link path=usr/lib/$(ARCH64)/libxcb-render-util.so target=libxcb-render-util.so.0
file path=usr/lib/$(ARCH64)/libxcb-render-util.so.0
+link path=usr/lib/$(ARCH64)/libxcb-util.so target=libxcb-util.so.0
file path=usr/lib/$(ARCH64)/libxcb-util.so.0
#
file path=usr/lib/$(ARCH64)/pkgconfig/xcb-atom.pc
@@ -57,11 +67,17 @@
file path=usr/lib/$(ARCH64)/pkgconfig/xcb-renderutil.pc
file path=usr/lib/$(ARCH64)/pkgconfig/xcb-util.pc
#
+link path=usr/lib/libxcb-ewmh.so target=libxcb-ewmh.so.1
file path=usr/lib/libxcb-ewmh.so.1
+link path=usr/lib/libxcb-icccm.so target=libxcb-icccm.so.4
file path=usr/lib/libxcb-icccm.so.4
+link path=usr/lib/libxcb-image.so target=libxcb-image.so.0
file path=usr/lib/libxcb-image.so.0
+link path=usr/lib/libxcb-keysyms.so target=libxcb-keysyms.so.1
file path=usr/lib/libxcb-keysyms.so.1
+link path=usr/lib/libxcb-render-util.so target=libxcb-render-util.so.0
file path=usr/lib/libxcb-render-util.so.0
+link path=usr/lib/libxcb-util.so target=libxcb-util.so.0
file path=usr/lib/libxcb-util.so.0
#
file path=usr/lib/pkgconfig/xcb-atom.pc
@@ -73,18 +89,3 @@
file path=usr/lib/pkgconfig/xcb-keysyms.pc
file path=usr/lib/pkgconfig/xcb-renderutil.pc
file path=usr/lib/pkgconfig/xcb-util.pc
-#
-link path=usr/lib/$(ARCH64)/libxcb-ewmh.so target=libxcb-ewmh.so.1
-link path=usr/lib/$(ARCH64)/libxcb-icccm.so target=libxcb-icccm.so.4
-link path=usr/lib/$(ARCH64)/libxcb-image.so target=libxcb-image.so.0
-link path=usr/lib/$(ARCH64)/libxcb-keysyms.so target=libxcb-keysyms.so.1
-link path=usr/lib/$(ARCH64)/libxcb-render-util.so \
- target=libxcb-render-util.so.0
-link path=usr/lib/$(ARCH64)/libxcb-util.so target=libxcb-util.so.0
-#
-link path=usr/lib/libxcb-ewmh.so target=libxcb-ewmh.so.1
-link path=usr/lib/libxcb-icccm.so target=libxcb-icccm.so.4
-link path=usr/lib/libxcb-image.so target=libxcb-image.so.0
-link path=usr/lib/libxcb-keysyms.so target=libxcb-keysyms.so.1
-link path=usr/lib/libxcb-render-util.so target=libxcb-render-util.so.0
-link path=usr/lib/libxcb-util.so target=libxcb-util.so.0
--- a/pkg/manifests/x11-library-xtrans.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-library-xtrans.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -25,13 +25,12 @@
# the developer facet, except for the documentation, which is facet.doc.
<transform dir file path=usr/include/X11/Xtrans -> set facet.devel true>
set name=pkg.fmri value=pkg:/x11/library/xtrans@__version:xtrans__
-set name=pkg.description \
- value="xtrans is a library of code that is shared among various X packages to handle network protocol transport in a modular fashion, allowing a single place to add new transport types. It is used by the X server, libX11, libICE, the X font server, and related components."
set name=pkg.summary \
value="xtrans - X network protocol transport layer development files"
+set name=pkg.description \
+ value="xtrans is a library of code that is shared among various X packages to handle network protocol transport in a modular fashion, allowing a single place to add new transport types. It is used by the X server, libX11, libICE, the X font server, and related components."
set name=facet.devel value=true
-dir path=usr/include/X11/Xtrans
-dir path=usr/share/doc/xtrans
+dir path=usr/include/X11/Xtrans
file path=usr/include/X11/Xtrans/Xtrans.c
file path=usr/include/X11/Xtrans/Xtrans.h
file path=usr/include/X11/Xtrans/Xtransint.h
@@ -41,6 +40,7 @@
file path=usr/include/X11/Xtrans/Xtransutil.c
file path=usr/include/X11/Xtrans/transport.c
file path=usr/share/aclocal/xtrans.m4
+dir path=usr/share/doc/xtrans
file path=usr/share/doc/xtrans/xtrans.xml
file path=usr/share/pkgconfig/xtrans.pc
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-network-x11-network-proxies.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-network-x11-network-proxies.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,24 +20,24 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/network/x11-network-proxies@$(X11PKGVERS)
+set name=pkg.summary \
+ value="X11 Network Proxy utilities - lbxproxy, xfwp, xfindproxy, proxymngr"
set name=pkg.description \
value="A collection of programs to proxy X11 protocol over the network and to find and manage running X11 network proxies. In modern environments, ssh X forwarding is generally recommended for use instead of these."
-set name=pkg.summary \
- value="X11 Network Proxy utilities - lbxproxy, xfwp, xfindproxy, proxymngr"
-dir path=usr/lib/X11/lbxproxy
-dir path=usr/lib/X11/proxymngr
+link path=usr/X11/bin/lbxproxy target=../../bin/lbxproxy
+link path=usr/X11/bin/proxymngr target=../../bin/proxymngr
+link path=usr/X11/bin/xfindproxy target=../../bin/xfindproxy
+link path=usr/X11/bin/xfwp target=../../bin/xfwp
file path=usr/bin/lbxproxy
file path=usr/bin/proxymngr
file path=usr/bin/xfindproxy
file path=usr/bin/xfwp
+dir path=usr/lib/X11/lbxproxy
file path=usr/lib/X11/lbxproxy/AtomControl
+dir path=usr/lib/X11/proxymngr
file path=usr/lib/X11/proxymngr/pmconfig
file path=usr/share/man/man1/lbxproxy.1
file path=usr/share/man/man1/proxymngr.1
file path=usr/share/man/man1/xfindproxy.1
file path=usr/share/man/man1/xfwp.1
-link path=usr/X11/bin/lbxproxy target=../../bin/lbxproxy
-link path=usr/X11/bin/proxymngr target=../../bin/proxymngr
-link path=usr/X11/bin/xfindproxy target=../../bin/xfindproxy
-link path=usr/X11/bin/xfwp target=../../bin/xfwp
--- a/pkg/manifests/x11-oclock.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-oclock.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/oclock@__version:oclock__
+set name=pkg.summary value="oclock - round X clock"
set name=pkg.description \
value="Oclock simply displays the current time on an analog display in a rounded window."
-set name=pkg.summary value="oclock - round X clock"
+link path=usr/X11/bin/oclock target=../../bin/oclock
file path=usr/bin/oclock
file path=usr/share/X11/app-defaults/Clock-color
file path=usr/share/man/man1/oclock.1
-link path=usr/X11/bin/oclock target=../../bin/oclock
--- a/pkg/manifests/x11-server-xdmx.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xdmx.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,11 +20,11 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/server/xdmx@__version:xorg-server__
+set name=pkg.summary value="Xdmx - Distributed Multihead X"
set name=pkg.description \
value="Xdmx is an X server that can tie several local or remote X servers into one multihead X server"
-set name=pkg.summary value="Xdmx - Distributed Multihead X"
+$(i386_ONLY)link path=usr/bin/$(ARCH64)/Xdmx target=../Xdmx
file path=usr/bin/Xdmx
-
file path=usr/bin/dmxaddinput
file path=usr/bin/dmxaddscreen
file path=usr/bin/dmxinfo
@@ -36,14 +36,12 @@
file path=usr/bin/dmxwininfo
file path=usr/bin/vdltodmx
file path=usr/bin/xdmxconfig
-
+link path=usr/lib/mdb/proc/$(ARCH64)/Xdmx.so target=Xserver.so
file path=usr/share/man/man1/Xdmx.1
file path=usr/share/man/man1/dmxtodmx.1
file path=usr/share/man/man1/vdltodmx.1
file path=usr/share/man/man1/xdmxconfig.1
-$(i386_ONLY)link path=usr/bin/$(ARCH64)/Xdmx target=../Xdmx
-link path=usr/lib/mdb/proc/$(ARCH64)/Xdmx.so target=Xserver.so
# X servers require xkbcomp & data-xkb for keyboard layouts
-depend fmri=pkg:/x11/keyboard/data-xkb type=require
-depend fmri=pkg:/x11/keyboard/xkbcomp type=require
+depend type=require fmri=pkg:/x11/keyboard/data-xkb
+depend type=require fmri=pkg:/x11/keyboard/xkbcomp
--- a/pkg/manifests/x11-server-xephyr.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xephyr.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,15 +20,15 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/server/xephyr@__version:xorg-server__
-set name=pkg.description \
- value="Xephyr is a X11 server that outputs to a window on a pre-existing host X display. Think Xnest but with support for modern extensions like composite, damage and randr."
set name=pkg.summary \
value="Xephyr - X server displaying to a window on a pre-existing X display"
-file path=usr/bin/Xephyr
-file path=usr/share/man/man1/Xephyr.1
-$(i386_ONLY)link path=usr/bin/$(ARCH64)/Xephyr target=../Xephyr
+set name=pkg.description \
+ value="Xephyr is a X11 server that outputs to a window on a pre-existing host X display. Think Xnest but with support for modern extensions like composite, damage and randr."
link path=usr/X11/bin/Xephyr target=../../bin/Xephyr
+$(i386_ONLY)link path=usr/bin/$(ARCH64)/Xephyr target=../Xephyr
+file path=usr/bin/Xephyr
link path=usr/lib/mdb/proc/$(ARCH64)/Xephyr.so target=Xserver.so
+file path=usr/share/man/man1/Xephyr.1
# X servers require xkbcomp & data-xkb for keyboard layouts
-depend fmri=pkg:/x11/keyboard/data-xkb type=require
-depend fmri=pkg:/x11/keyboard/xkbcomp type=require
+depend type=require fmri=pkg:/x11/keyboard/data-xkb
+depend type=require fmri=pkg:/x11/keyboard/xkbcomp
--- a/pkg/manifests/x11-server-xorg-driver-xorg-efb.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-efb.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/server/xorg/driver/xorg-efb@$(OSPKGVERS)
+set name=pkg.summary \
+ value="efb - Sun XVR-300, XVR-100, XVR-50 video driver for the Xorg X server"
set name=pkg.description \
value="Xorg video driver for Sun XVR-300, XVR-100, XVR-50 Graphics"
-set name=pkg.summary \
- value="efb - Sun XVR-300, XVR-100, XVR-50 video driver for the Xorg X server"
set name=variant.arch value=sparc
file path=usr/lib/xorg/modules/drivers/efb_drv.so
legacy pkg=SUNWefbw arch=sparc category=application,graphics \
@@ -33,4 +33,4 @@
version=11.0.0,REV=2011.03.15
# Requires kernel driver for efb
-depend fmri=pkg:/driver/graphics/efb type=require
+depend type=require fmri=pkg:/driver/graphics/efb
--- a/pkg/manifests/x11-server-xorg-driver-xorg-input-acecad.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-input-acecad.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,10 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-input-acecad@__version:xf86-input-acecad__
-set name=pkg.description value="Xorg input driver for Acecad Flair devices"
set name=pkg.summary \
- value="xf86-input-acecad - Acecad Flair input driver for the Xorg X server"
+ value="xf86-input-acecad - Acecad Flair tablet input driver for the Xorg X server"
+set name=pkg.description \
+ value="Xorg input driver for Acecad Flair pen-based graphics tablets"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/input/acecad_drv.so
file path=usr/share/man/man7/acecad.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-input-hotkey.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-input-hotkey.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-input-hotkey@$(OSPKGVERS)
+set name=pkg.summary \
+ value="xf86-input-hotkey - ACPI hotkey input driver for the Xorg server"
set name=pkg.description \
value="Xorg hotkey driver handles ACPI hotkey events for display/output selection hotkeys on certain laptop models."
-set name=pkg.summary \
- value="xf86-input-hotkey: ACPI hotkey input driver for the Xorg server"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/input/hotkey_drv.so
--- a/pkg/manifests/x11-server-xorg-driver-xorg-input-keyboard.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-input-keyboard.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,8 +21,8 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-input-keyboard@__version:xf86-input-keyboard__
-set name=pkg.description value="Xorg keyboard input driver (kbd)"
set name=pkg.summary \
value="xf86-input-kbd - Keyboard input driver for the Xorg X server"
+set name=pkg.description value="Xorg keyboard input driver (kbd)"
file path=usr/lib/xorg/modules/input/kbd_drv.so
file path=usr/share/man/man7/kbd.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-input-mouse.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-input-mouse.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-input-mouse@__version:xf86-input-mouse__
-set name=pkg.description value="Xorg mouse input driver"
set name=pkg.summary \
value="xf86-input-mouse - Mouse input driver for the Xorg X server"
+set name=pkg.description value="Xorg mouse input driver"
file path=usr/lib/xorg/modules/input/mouse_drv.so
file path=usr/share/doc/X11/README.mouse
file path=usr/share/man/man7/mousedrv.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-input-synaptics.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-input-synaptics.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-input-synaptics@__version:xf86-input-synaptics__
-set name=pkg.description value="Xorg laptop touchpad input driver"
set name=pkg.summary \
value="xf86-input-synaptics - Synaptics touchpad driver for X.Org"
+set name=pkg.description value="Xorg laptop touchpad input driver"
set name=variant.arch value=i386
--- a/pkg/manifests/x11-server-xorg-driver-xorg-input-vmmouse.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-input-vmmouse.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,10 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-input-vmmouse@__version:xf86-input-vmmouse__
+set name=pkg.summary \
+ value="xf86-input-vmmouse - VMWare guest mouse input driver for the Xorg X server"
set name=pkg.description \
value="VMMouse driver for Xorg server running in a VMWare guest OS"
-set name=pkg.summary \
- value="xf86-input-vmmouse - VMWare guest mouse input driver for the Xorg X server"
set name=variant.arch value=i386
file path=etc/hal/fdi/policy/10osvendor/11-x11-vmmouse.fdi
file path=usr/lib/hal/hal-probe-vmmouse mode=0555
--- a/pkg/manifests/x11-server-xorg-driver-xorg-input-void.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-input-void.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,8 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-input-void@__version:xf86-input-void__
+set name=pkg.summary value="xf86-input-void - null input driver for Xorg server"
set name=pkg.description \
value="Xorg input driver that doesn't connect to any device and never delivers any events. It functions as both a pointer and keyboard device, and may be used as an X server's core pointer and/or core keyboard."
-set name=pkg.summary \
- value="xf86-input-void - null input driver for Xorg server"
file path=usr/lib/xorg/modules/input/void_drv.so
file path=usr/share/man/man7/void.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-ast.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-ast.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,11 +21,11 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-ast@__version:xf86-video-ast__
-set name=pkg.description \
- value="Xorg video driver for AST remote console/KVM devices in enterprise server service processors."
set name=pkg.summary \
value="xf86-video-ast - ASpeed Technologies graphics driver for Xorg X server"
+set name=pkg.description \
+ value="Xorg video driver for AST remote console/KVM devices in enterprise server service processors, including some models of the Sun/Oracle Integrated Lights-Out Management (ILOM) module."
file path=usr/lib/xorg/modules/drivers/ast_drv.so
# SPARC version requires sparc kernel fb driver
-$(sparc_ONLY)depend fmri=pkg:/driver/graphics/ast type=require
+$(sparc_ONLY)depend type=require fmri=pkg:/driver/graphics/ast
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-ati.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-ati.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,10 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-ati@__version:xf86-video-ati__
+set name=pkg.summary \
+ value="xf86-video-ati - ATI/AMD Radeon video driver for the Xorg X server"
set name=pkg.description \
value="Xorg video driver for ATI Radeon and Radeon HD graphics devices from AMD"
-set name=pkg.summary \
- value="xf86-video-ati - ATI Radeon video driver for the Xorg X server"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/dri/r200_dri.so
file path=usr/lib/xorg/modules/dri/r300_dri.so
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-cirrus.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-cirrus.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-cirrus@__version:xf86-video-cirrus__
-set name=pkg.description value="Xorg driver for Cirrus Logic video chips"
set name=pkg.summary \
value="xf86-video-cirrus - Cirrus Logic video driver for the Xorg X server"
+set name=pkg.description value="Xorg driver for Cirrus Logic video chips"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/drivers/cirrus_alpine.so
file path=usr/lib/xorg/modules/drivers/cirrus_drv.so
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-dummy.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-dummy.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,8 +21,8 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-dummy@__version:xf86-video-dummy__
+set name=pkg.summary \
+ value="xf86-video-dummy - virtual/offscreen frame buffer driver for the Xorg X server"
set name=pkg.description \
value="Xorg virtual graphics driver that doesn't connect to any hardware."
-set name=pkg.summary \
- value="xf86-video-dummy - virtual/offscreen frame buffer driver for the Xorg X server"
file path=usr/lib/xorg/modules/drivers/dummy_drv.so
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-intel.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-intel.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,23 +21,23 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-intel@__version:xf86-video-intel__
-set name=pkg.description \
- value="Xorg driver for Intel integrated graphics chipsets, supporting the i810 and later models."
set name=pkg.summary \
value="xf86-video-intel - Intel integrated graphics chipset driver for the Xorg X server"
+set name=pkg.description \
+ value="Xorg driver for Intel integrated graphics chipsets, supporting the i810 and later models."
set name=variant.arch value=i386
+link path=usr/lib/$(ARCH64)/libI810XvMC.so target=libI810XvMC.so.1
file path=usr/lib/$(ARCH64)/libI810XvMC.so.1
+link path=usr/lib/$(ARCH64)/libIntelXvMC.so target=libIntelXvMC.so.1
file path=usr/lib/$(ARCH64)/libIntelXvMC.so.1
+link path=usr/lib/libI810XvMC.so target=libI810XvMC.so.1
file path=usr/lib/libI810XvMC.so.1
+link path=usr/lib/libIntelXvMC.so target=libIntelXvMC.so.1
file path=usr/lib/libIntelXvMC.so.1
file path=usr/lib/xorg/modules/dri/i915_dri.so
file path=usr/lib/xorg/modules/dri/i965_dri.so
file path=usr/lib/xorg/modules/drivers/intel_drv.so
file path=usr/share/doc/X11/README.intel
file path=usr/share/man/man7/intel.7
-link path=usr/lib/$(ARCH64)/libI810XvMC.so target=libI810XvMC.so.1
-link path=usr/lib/$(ARCH64)/libIntelXvMC.so target=libIntelXvMC.so.1
-link path=usr/lib/libI810XvMC.so target=libI810XvMC.so.1
-link path=usr/lib/libIntelXvMC.so target=libIntelXvMC.so.1
# Intel driver requires Intel DRM kernel module with KMS support
-depend fmri=pkg:/driver/graphics/[email protected] type=require
+depend type=require fmri=pkg:/driver/graphics/[email protected]
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-mach64.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-mach64.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,10 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-mach64@__version:xf86-video-mach64__
-set name=pkg.description \
- value="Xorg video driver for ATI Mach64 graphics devices"
set name=pkg.summary \
value="xf86-video-mach64 - ATI Mach64 driver for the Xorg X server"
+set name=pkg.description \
+ value="Xorg video driver for ATI Mach64 graphics devices, including 3D Rage, Rage II, and Rage XL models."
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/drivers/mach64_drv.so
file path=usr/share/doc/X11/README.ati
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-mga.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-mga.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-mga@__version:xf86-video-mga__
-set name=pkg.description value="Xorg video driver for Matrox graphics devices"
set name=pkg.summary \
value="xf86-video-mga - Matrox video driver for the Xorg X server"
+set name=pkg.description value="Xorg video driver for Matrox graphics devices"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/drivers/mga_drv.so
file path=usr/share/man/man7/mga.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-nv.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-nv.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,10 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-nv@__version:xf86-video-nv__
+set name=pkg.summary \
+ value="xf86-video-nv - NVIDIA video driver for the Xorg X server"
set name=pkg.description \
value="Unaccelerated Xorg driver for NVIDIA video cards"
-set name=pkg.summary \
- value="xf86-video-nv - NVIDIA video driver for the Xorg X server"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/drivers/nv_drv.so
file path=usr/share/man/man7/nv.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-openchrome.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-openchrome.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,10 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-openchrome@__version:xf86-video-openchrome__
+set name=pkg.summary \
+ value="xf86-video-openchrome - VIA Unichrome video driver for the Xorg X server"
set name=pkg.description \
value="openchrome is an Xorg driver for VIA chipsets that have an integrated Unichrome graphics engine."
-set name=pkg.summary \
- value="xf86-video-openchrome - VIA Unichrome video driver for the Xorg X server"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/drivers/openchrome_drv.so
file path=usr/share/man/man7/openchrome.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-r128.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-r128.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-r128@__version:xf86-video-r128__
-set name=pkg.description \
- value="Xorg driver for ATI Rage 128 based video cards"
set name=pkg.summary \
value="xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server"
+set name=pkg.description value="Xorg driver for ATI Rage 128 based video cards"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/drivers/r128_drv.so
file path=usr/share/doc/X11/README.r128
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-trident.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-trident.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-trident@__version:xf86-video-trident__
-set name=pkg.description value="Xorg driver for Trident video cards"
set name=pkg.summary \
value="xf86-video-trident - Trident video driver for the Xorg X server"
+set name=pkg.description value="Xorg driver for Trident video cards"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/drivers/trident_drv.so
file path=usr/share/man/man7/trident.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-vesa.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-vesa.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,10 +21,10 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-vesa@__version:xf86-video-vesa__
+set name=pkg.summary \
+ value="xf86-video-vesa - Generic VESA video driver for the Xorg X server"
set name=pkg.description \
value="Xorg driver for generic VESA video cards. It can drive most VESA-compatible video cards, but only makes use of the basic standard VESA core that is common to these cards."
-set name=pkg.summary \
- value="xf86-video-vesa - Generic VESA video driver for the Xorg X server"
set name=variant.arch value=i386
file path=usr/lib/X11/xorg.conf.vesa
file path=usr/lib/xorg/modules/drivers/vesa_drv.so
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-vmware.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-vmware.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -21,9 +21,9 @@
#
set name=pkg.fmri \
value=pkg:/x11/server/xorg/driver/xorg-video-vmware@__version:xf86-video-vmware__
-set name=pkg.description value="Xorg driver for VMware virtual video cards"
set name=pkg.summary \
value="xf86-video-vmware - VMWare guest video driver for the Xorg X server"
+set name=pkg.description value="Xorg driver for VMware virtual video cards"
set name=variant.arch value=i386
file path=usr/lib/xorg/modules/drivers/vmware_drv.so
file path=usr/lib/xorg/modules/drivers/vmwlegacy_drv.so
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/server/xorg/driver/xorg-video@$(OSPKGVERS)
+set name=pkg.summary value="Xorg server video drivers group"
set name=pkg.description \
value="A group package that provides all of the available Xorg video drivers for a given platform"
-set name=pkg.summary value="Xorg server video drivers group"
set name=info.classification value=org.opensolaris.category.2008:System/X11
legacy pkg=SUNWxorg-graphics-ddx \
desc="Graphics device DDX modules for X Window System server based on X.Org Foundation open source release" \
@@ -31,49 +31,45 @@
### Depends on packages delivering the drivers
# Nvidia driver (from outside the X gate)
-$(i386_ONLY)depend fmri=pkg:/driver/graphics/nvidia type=group
+$(i386_ONLY)depend type=group fmri=pkg:/driver/graphics/nvidia
# driver/efb
-$(sparc_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-efb type=group
+$(sparc_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-efb
# driver/xf86-video-ast
-depend fmri=pkg:/x11/server/xorg/driver/xorg-video-ast type=group
+depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-ast
# driver/xf86-video-ati
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-ati type=group
+$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-ati
# driver/xf86-video-cirrus
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-cirrus \
- type=group
+$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-cirrus
# driver/xf86-video-intel
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-intel \
- type=group
+$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-intel
# driver/xf86-video-mach64
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-mach64 \
- type=group
+$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-mach64
# driver/xf86-video-mga
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-mga type=group
+$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-mga
# driver/xf86-video-nv
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-nv type=group
+$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-nv
# driver/xf86-video-openchrome
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-openchrome \
- type=group
+$(i386_ONLY)depend type=group \
+ fmri=pkg:/x11/server/xorg/driver/xorg-video-openchrome
# driver/xf86-video-r128
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-r128 type=group
+$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-r128
# driver/xf86-video-trident
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-trident \
- type=group
+$(i386_ONLY)depend type=group \
+ fmri=pkg:/x11/server/xorg/driver/xorg-video-trident
# driver/xf86-video-vesa
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-vesa type=group
+$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-vesa
# driver/xf86-video-vmware
-$(i386_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-video-vmware \
- type=group
+$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-vmware
--- a/pkg/manifests/x11-server-xorg.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xorg.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,30 +20,27 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/server/xorg@__version:xorg-server__
+set name=pkg.summary value="Xorg - X11R7 X server"
set name=pkg.description \
value="Xorg is a full featured X server that was originally designed for UNIX and UNIX-like operating systems running on a wide range of hardware and OS platforms."
-set name=pkg.summary value="Xorg - X11R7 X server"
-dir path=etc/X11
-dir path=etc/X11/xorg.conf.avail
-dir path=etc/X11/xorg.conf.d
-dir path=usr/include/xorg
-dir path=usr/lib/xorg
-dir path=usr/lib/xorg/modules
-dir path=usr/lib/xorg/modules/dri
-dir path=usr/lib/xorg/modules/drivers
-dir path=usr/lib/xorg/modules/extensions
-dir path=usr/lib/xorg/modules/input
-dir path=usr/lib/xorg/modules/multimedia
-dir path=usr/share/X11/xorg.conf.d
+dir path=etc/X11
+dir path=etc/X11/xorg.conf.avail
file path=etc/X11/xorg.conf.avail/90-zap.conf
+dir path=etc/X11/xorg.conf.d
file path=etc/hal/fdi/preprobe/10osvendor/10-x11-input.fdi
+link path=usr/X11/bin/Xorg target=../../bin/Xorg
+link path=usr/X11/bin/cvt target=../../bin/cvt
+link path=usr/X11/bin/gtf target=../../bin/gtf
+link path=usr/X11/include/xorg target=../../include/xorg
+$(i386_ONLY)link path=usr/bin/$(ARCH64)/Xorg target=../Xorg
# Xorg must be setuid root on x86 in order to access PCI bus devices
# and make the sysi86 system call to change I/O privilege level (IOPL).
# On SPARC, Xorg only requires setuid root in order to create the
# Xorg.*.log file in /var/log
-file path=usr/bin/Xorg mode=4555 owner=root
+file path=usr/bin/Xorg owner=root mode=4555
file path=usr/bin/cvt
file path=usr/bin/gtf
+dir path=usr/include/xorg
file path=usr/include/xorg/BT.h
file path=usr/include/xorg/IBM.h
file path=usr/include/xorg/TI.h
@@ -148,8 +145,7 @@
file path=usr/include/xorg/shmint.h
file path=usr/include/xorg/site.h
$(i386_ONLY)file path=usr/include/xorg/solaris-amd64.il facet.devel=true
-$(sparc_ONLY)file path=usr/include/xorg/solaris-sparcv8plus.il \
- facet.devel=true
+$(sparc_ONLY)file path=usr/include/xorg/solaris-sparcv8plus.il facet.devel=true
file path=usr/include/xorg/swaprep.h
file path=usr/include/xorg/swapreq.h
file path=usr/include/xorg/syncsdk.h
@@ -212,12 +208,21 @@
file path=usr/include/xorg/xvdix.h
file path=usr/include/xorg/xvmcext.h
file path=usr/lib/$(ARCH64)/pkgconfig/xorg-server.pc
+link path=usr/lib/mdb/proc/$(ARCH64)/Xorg.so target=Xserver.so
+link path=usr/lib/pkgconfig/xorg-server.pc \
+ target=../$(ARCH64)/pkgconfig/xorg-server.pc
+dir path=usr/lib/xorg
+dir path=usr/lib/xorg/modules
+dir path=usr/lib/xorg/modules/dri
+dir path=usr/lib/xorg/modules/drivers
+dir path=usr/lib/xorg/modules/extensions
file path=usr/lib/xorg/modules/extensions/libdbe.so
file path=usr/lib/xorg/modules/extensions/libdri.so
file path=usr/lib/xorg/modules/extensions/libdri2.so
file path=usr/lib/xorg/modules/extensions/libextmod.so
file path=usr/lib/xorg/modules/extensions/libia.so
file path=usr/lib/xorg/modules/extensions/librecord.so
+dir path=usr/lib/xorg/modules/input
file path=usr/lib/xorg/modules/libexa.so
file path=usr/lib/xorg/modules/libfb.so
file path=usr/lib/xorg/modules/libfbdevhw.so
@@ -228,6 +233,7 @@
file path=usr/lib/xorg/modules/libvgahw.so
file path=usr/lib/xorg/modules/libwfb.so
file path=usr/lib/xorg/modules/libxaa.so
+dir path=usr/lib/xorg/modules/multimedia
file path=usr/lib/xorg/modules/multimedia/bt829_drv.so
file path=usr/lib/xorg/modules/multimedia/fi1236_drv.so
file path=usr/lib/xorg/modules/multimedia/msp3430_drv.so
@@ -235,6 +241,7 @@
file path=usr/lib/xorg/modules/multimedia/tda9850_drv.so
file path=usr/lib/xorg/modules/multimedia/tda9885_drv.so
file path=usr/lib/xorg/modules/multimedia/uda1380_drv.so
+dir path=usr/share/X11/xorg.conf.d
file path=usr/share/aclocal/xorg-server.m4
file path=usr/share/man/man1/Xorg.1
file path=usr/share/man/man1/cvt.1
@@ -251,25 +258,17 @@
legacy pkg=SUNWxorg-server \
desc="X Window System server based on X.Org Foundation open source release" \
name="X.Org Foundation Xserver"
-link path=usr/X11/bin/Xorg target=../../bin/Xorg
-link path=usr/X11/bin/cvt target=../../bin/cvt
-link path=usr/X11/bin/gtf target=../../bin/gtf
-link path=usr/X11/include/xorg target=../../include/xorg
-$(i386_ONLY)link path=usr/bin/$(ARCH64)/Xorg target=../Xorg
-link path=usr/lib/mdb/proc/$(ARCH64)/Xorg.so target=Xserver.so
-link path=usr/lib/pkgconfig/xorg-server.pc \
- target=../$(ARCH64)/pkgconfig/xorg-server.pc
-
-# On x86/x64, Xorg requires /dev/xsvc to access video cards
-$(i386_ONLY)depend fmri=pkg:/driver/x11/xsvc type=require
-
-# X servers require xkbcomp & data-xkb for keyboard layouts
-depend fmri=pkg:/x11/keyboard/data-xkb type=require
-depend fmri=pkg:/x11/keyboard/xkbcomp type=require
# keyboard & mouse drivers used to be part of this package, so we preserve
# the dependency to ensure they're not lost on upgrade, and normally installed
# on fresh install, but make it a group dependency, so that users can choose
# to exclude in cases they're not needed (systems with alternate or no input)
-depend fmri=pkg:/x11/server/xorg/driver/xorg-input-keyboard type=group
-depend fmri=pkg:/x11/server/xorg/driver/xorg-input-mouse type=group
+depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-input-keyboard
+depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-input-mouse
+
+# On x86/x64, Xorg requires /dev/xsvc to access video cards
+$(i386_ONLY)depend type=require fmri=pkg:/driver/x11/xsvc
+
+# X servers require xkbcomp & data-xkb for keyboard layouts
+depend type=require fmri=pkg:/x11/keyboard/data-xkb
+depend type=require fmri=pkg:/x11/keyboard/xkbcomp
--- a/pkg/manifests/x11-server-xserver-common.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xserver-common.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -27,20 +27,23 @@
set name=pkg.fmri \
value=pkg:/x11/server/xserver-common@__version:xserver-common__
+set name=pkg.summary value="X server common files"
set name=pkg.description \
value="Files shared by all X server variants based on the X.Org Foundation implementation. Includes the x11-server SMF service for Solaris."
-set name=pkg.summary value="X server common files"
-dir path=lib/svc/manifest/application/x11
-dir path=usr/X11/bin
-dir path=usr/demo/Xserver
-dir path=usr/demo/Xserver/mdb
-dir path=usr/lib/xorg
-dir path=usr/share/doc/Xserver
file path=etc/security/auth_attr.d/xserver-common group=sys
file path=etc/security/prof_attr.d/xserver-common group=sys
+dir path=lib/svc/manifest/application/x11
file path=lib/svc/manifest/application/x11/x11-server.xml
file path=lib/svc/method/x11-server
+dir path=usr/X11/bin
+link path=usr/X11/bin/X target=../../bin/X
+link path=usr/X11/bin/Xserver target=../../bin/Xserver
+$(i386_ONLY)link path=usr/X11/bin/amd64 target=../../bin/amd64
+link path=usr/X11/lib/X11/xserver target=../../../lib/xorg
+link path=usr/bin/X target=Xserver
file path=usr/bin/Xserver
+dir path=usr/demo/Xserver
+dir path=usr/demo/Xserver/mdb
file path=usr/demo/Xserver/mdb/README
file path=usr/demo/Xserver/mdb/list_Xserver_clients mode=0555
file path=usr/demo/Xserver/mdb/list_Xserver_devicegrab_client mode=0555
@@ -48,17 +51,14 @@
file path=usr/lib/help/auths/locale/C/X11States.html
file path=usr/lib/help/profiles/locale/C/RtDesktopConfiguration.html
file path=usr/lib/mdb/proc/$(ARCH64)/Xserver.so
+dir path=usr/lib/xorg
file path=usr/lib/xorg/TrustedExtensionsPolicy
file path=usr/lib/xorg/protocol.txt
+dir path=usr/share/doc/Xserver
file path=usr/share/doc/Xserver/Xserver-DTrace.html
file path=usr/share/doc/Xserver/Xserver-DTrace.txt
file path=usr/share/doc/Xserver/Xserver-DTrace.xml
file path=usr/share/man/man1/Xnest.1
file path=usr/share/man/man1/Xserver.1
-link path=usr/X11/bin/X target=../../bin/X
-link path=usr/X11/bin/Xserver target=../../bin/Xserver
-$(i386_ONLY)link path=usr/X11/bin/amd64 target=../../bin/amd64
-link path=usr/X11/lib/X11/xserver target=../../../lib/xorg
-link path=usr/bin/X target=Xserver
# Xserver script runs /usr/bin/readlink (from GNU coreutils)
-depend fmri=pkg:/file/gnu-coreutils type=require
+depend type=require fmri=pkg:/file/gnu-coreutils
--- a/pkg/manifests/x11-server-xvfb.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xvfb.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,14 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/server/xvfb@__version:xorg-server__
+set name=pkg.summary value="Xvfb - virtual framebuffer X server"
set name=pkg.description \
value="Xvfb is an X server that can run on machines using no display hardware and no physical input devices. It emulates a dumb framebuffer using virtual memory."
-set name=pkg.summary value="Xvfb - virtual framebuffer X server"
-file path=usr/bin/Xvfb
-file path=usr/share/man/man1/Xvfb.1
link path=usr/X11/bin/Xvfb target=../../bin/Xvfb
$(i386_ONLY)link path=usr/bin/$(ARCH64)/Xvfb target=../Xvfb
+file path=usr/bin/Xvfb
link path=usr/lib/mdb/proc/$(ARCH64)/Xvfb.so target=Xserver.so
+file path=usr/share/man/man1/Xvfb.1
# X servers require xkbcomp & data-xkb for keyboard layouts
-depend fmri=pkg:/x11/keyboard/data-xkb type=require
-depend fmri=pkg:/x11/keyboard/xkbcomp type=require
+depend type=require fmri=pkg:/x11/keyboard/data-xkb
+depend type=require fmri=pkg:/x11/keyboard/xkbcomp
--- a/pkg/manifests/x11-server-xvnc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-server-xvnc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,22 +20,25 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/server/xvnc@__version:tigervnc__
+set name=pkg.summary value="TigerVNC X11/VNC server"
set name=pkg.description \
value="X Window System server based on X.Org Foundation open source release and TigerVNC open source release that displays over RFB protocol to a VNC client"
-set name=pkg.summary value="TigerVNC X11/VNC server"
-dir path=usr/share/vnc
-dir path=usr/share/vnc/classes
file path=lib/svc/manifest/application/x11/xvnc-inetd.xml
+link path=usr/X11/bin/Xvnc target=../../bin/Xvnc
+$(i386_ONLY)link path=usr/bin/$(ARCH64)/Xvnc target=../Xvnc
file path=usr/bin/Xvnc group=root mode=2555
file path=usr/bin/vncconfig
file path=usr/bin/vncpasswd
file path=usr/bin/vncserver
file path=usr/bin/x0vncserver
+link path=usr/lib/mdb/proc/$(ARCH64)/Xvnc.so target=Xserver.so
file path=usr/share/man/man1/Xvnc.1
file path=usr/share/man/man1/vncconfig.1
file path=usr/share/man/man1/vncpasswd.1
file path=usr/share/man/man1/vncserver.1
file path=usr/share/man/man1/x0vncserver.1
+dir path=usr/share/vnc
+dir path=usr/share/vnc/classes
file path=usr/share/vnc/classes/LICENCE.TXT
file path=usr/share/vnc/classes/README
file path=usr/share/vnc/classes/VncViewer.jar mode=0555
@@ -45,9 +48,6 @@
legacy pkg=SUNWxvnc \
desc="X Window System server based on X.Org Foundation open source release and TigerVNC open source release that displays over RFB protocol to a VNC client" \
name="X11/VNC server"
-$(i386_ONLY)link path=usr/bin/$(ARCH64)/Xvnc target=../Xvnc
-link path=usr/X11/bin/Xvnc target=../../bin/Xvnc
-link path=usr/lib/mdb/proc/$(ARCH64)/Xvnc.so target=Xserver.so
# X servers require xkbcomp & data-xkb for keyboard layouts
-depend fmri=pkg:/x11/keyboard/data-xkb type=require
-depend fmri=pkg:/x11/keyboard/xkbcomp type=require
+depend type=require fmri=pkg:/x11/keyboard/data-xkb
+depend type=require fmri=pkg:/x11/keyboard/xkbcomp
--- a/pkg/manifests/x11-session-sessreg.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-session-sessreg.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/session/sessreg@__version:sessreg__
+set name=pkg.summary value="sessreg - X session utmp/wtmp registration"
set name=pkg.description \
value="Sessreg is a simple program for managing utmp/wtmp entries for X sessions. It was originally written for use with xdm, but may also be used with other display managers such as gdm or kdm."
-set name=pkg.summary value="sessreg - X session utmp/wtmp registration"
+link path=usr/X11/bin/sessreg target=../../bin/sessreg
file path=usr/bin/sessreg
file path=usr/share/man/man1/sessreg.1
-link path=usr/X11/bin/sessreg target=../../bin/sessreg
--- a/pkg/manifests/x11-session-smproxy.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-session-smproxy.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/session/smproxy@__version:smproxy__
+set name=pkg.summary value="smproxy - X Session Manager Proxy"
set name=pkg.description \
value="smproxy allows X applications that do not support X11R6 session management to participate in an X11R6 session."
-set name=pkg.summary value="smproxy - X Session Manager Proxy"
+link path=usr/X11/bin/smproxy target=../../bin/smproxy
file path=usr/bin/smproxy
file path=usr/share/man/man1/smproxy.1
-link path=usr/X11/bin/smproxy target=../../bin/smproxy
--- a/pkg/manifests/x11-session-winsysck.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-session-winsysck.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/session/winsysck@$(OSPKGVERS)
-set name=pkg.description \
- value="winsysck reports whether a program can connect to a window system such as X11."
set name=pkg.summary \
value="winsysck - check which window system protocols are available"
+set name=pkg.description \
+ value="winsysck reports whether a program can connect to a window system such as X11."
+link path=usr/X11/bin/winsysck target=../../bin/winsysck
file path=usr/bin/winsysck
file path=usr/share/man/man1/winsysck.1
-link path=usr/X11/bin/winsysck target=../../bin/winsysck
--- a/pkg/manifests/x11-session-xauth.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-session-xauth.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/session/xauth@__version:xauth__
+set name=pkg.summary value="xauth - X authority file utility"
set name=pkg.description \
value="The xauth program is used to edit and display the authorization information used in connecting to the X server."
-set name=pkg.summary value="xauth - X authority file utility"
+link path=usr/X11/bin/xauth target=../../bin/xauth
file path=usr/bin/xauth
file path=usr/lib/X11/mkcookie mode=0555
file path=usr/share/man/man1/xauth.1
-link path=usr/X11/bin/xauth target=../../bin/xauth
--- a/pkg/manifests/x11-session-xinit.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-session-xinit.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,28 +20,28 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/session/xinit@__version:xinit__
-set name=pkg.description \
- value="xinit and startx are used to start the X Window System server and clients when a display manager or other startup methods are not in use."
set name=pkg.summary \
value="xinit & startx - X Window System manual session startup"
-dir path=etc/X11
-dir path=etc/X11/xinit
+set name=pkg.description \
+ value="xinit and startx are used to start the X Window System server and clients when a display manager or other startup methods are not in use."
+dir path=etc/X11
+dir path=etc/X11/xinit
file path=etc/X11/xinit/xinitrc preserve=renamenew
+link path=usr/X11/bin/startx target=../../bin/startx
+link path=usr/X11/bin/xinit target=../../bin/xinit
file path=usr/bin/startx
file path=usr/bin/xinit
file path=usr/share/man/man1/startx.1
file path=usr/share/man/man1/xinit.1
-link path=usr/X11/bin/startx target=../../bin/startx
-link path=usr/X11/bin/xinit target=../../bin/xinit
+# startx runs /usr/bin/od to read /dev/urandom
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/od
# Default xinit session uses twm for window manager
-depend fmri=pkg:/desktop/window-manager/twm type=require
-# startx runs /usr/bin/od to read /dev/urandom
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/od type=require
+depend type=require fmri=pkg:/desktop/window-manager/twm
# startx runs kbd_mode to reset kbd state on Xserver exit/crash
-depend fmri=pkg:/system/keyboard/kbd_mode type=require
+depend type=require fmri=pkg:/system/keyboard/kbd_mode
# Default xinit session runs xterm
-depend fmri=pkg:/terminal/xterm type=require
+depend type=require fmri=pkg:/terminal/xterm
# startx runs xauth to save cookies to .Xauthority
-depend fmri=pkg:/x11/session/xauth type=require
+depend type=require fmri=pkg:/x11/session/xauth
# Default xinit session uses xrdb & xmodmap
-depend fmri=pkg:/x11/x11-server-utilities type=require
+depend type=require fmri=pkg:/x11/x11-server-utilities
--- a/pkg/manifests/x11-transset.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-transset.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,8 +20,8 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/transset@__version:transset__
+set name=pkg.summary value="transset - Set transparency on a window"
set name=pkg.description \
value="transset is a simple program for use with X sessions utilizing a compositing manager such as xcompmgr or compiz. It lets the user set the transparency on a window."
-set name=pkg.summary value="transset - Set transparency on a window"
file path=usr/bin/transset
file path=usr/share/man/man1/transset.1
--- a/pkg/manifests/x11-trusted-libxtsol.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-trusted-libxtsol.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,20 +20,20 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/trusted/libxtsol@$(OSPKGVERS)
-set name=pkg.description \
- value="Xlib-based client API for the Solaris Trusted Extensions (SUN_TSOL) extension to the X11 protocol"
set name=pkg.summary \
value="libXtsol - Solaris Trusted Extensions X11 extension client library"
-file path=usr/include/X11/extensions/Xtsol.h
-file path=usr/include/X11/extensions/Xtsolproto.h
-file path=usr/lib/$(ARCH64)/libXtsol.so.1
-file path=usr/lib/libXtsol.so.1
+set name=pkg.description \
+ value="Xlib-based client API for the Solaris Trusted Extensions (SUN_TSOL) extension to the X11 protocol"
link path=usr/X11/lib/$(ARCH64)/libXtsol.so \
target=../../../lib/$(ARCH64)/libXtsol.so
link path=usr/X11/lib/$(ARCH64)/libXtsol.so.1 \
target=../../../lib/$(ARCH64)/libXtsol.so.1
link path=usr/X11/lib/libXtsol.so target=../../lib/libXtsol.so
link path=usr/X11/lib/libXtsol.so.1 target=../../lib/libXtsol.so.1
+file path=usr/include/X11/extensions/Xtsol.h
+file path=usr/include/X11/extensions/Xtsolproto.h
link path=usr/lib/$(ARCH64)/libXtsol.so target=libXtsol.so.1
+file path=usr/lib/$(ARCH64)/libXtsol.so.1
link path=usr/lib/libXtsol.so target=libXtsol.so.1
-depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
+file path=usr/lib/libXtsol.so.1
+depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true
--- a/pkg/manifests/x11-trusted-trusted-xorg.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-trusted-trusted-xorg.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,15 +20,15 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/trusted/trusted-xorg@__version:xorg-server__
+set name=pkg.summary value="Xorg X server - Trusted Extensions support"
set name=pkg.description \
value="Loadable extension module for the Xorg X server to provide the XTSOL extension required to support labeled desktops under Trusted Extensions."
-set name=pkg.summary value="Xorg X server - Trusted Extensions support"
file path=usr/lib/xorg/modules/extensions/libxtsol.so
legacy pkg=SUNWxorg-tsol-module \
desc="Solaris Trusted Extensions, Xorg X Server support" \
name="Trusted Extensions, Xorg"
# Requires Xorg itself of course
-depend fmri=pkg:/x11/server/xorg type=require
+depend type=require fmri=pkg:/x11/server/xorg
# Requires the TrustedExtensionsPolicy file from xserver-common pkg, but
# that is currently auto-added by open-src/xserver/Makefile.inc rules.
# depend fmri=pkg:/x11/server/xserver-common type=require
--- a/pkg/manifests/x11-x11-server-utilities.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-x11-server-utilities.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,27 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/x11-server-utilities@$(X11PKGVERS)
+set name=pkg.summary value="X11 server state utilities"
set name=pkg.description \
value="A collection of common utilities for manipulating the state of an X server in a running X session."
-set name=pkg.summary value="X11 server state utilities"
-dir path=etc/xdg
-dir path=etc/xdg/autostart
+dir path=etc/xdg
+dir path=etc/xdg/autostart
file path=etc/xdg/autostart/gnome-dispswitch.desktop
+link path=usr/X11/bin/dispswitch target=../../bin/dispswitch
+link path=usr/X11/bin/showrgb target=../../bin/showrgb
+link path=usr/X11/bin/xcmsdb target=../../bin/xcmsdb
+link path=usr/X11/bin/xgamma target=../../bin/xgamma
+link path=usr/X11/bin/xhost target=../../bin/xhost
+link path=usr/X11/bin/xinput target=../../bin/xinput
+link path=usr/X11/bin/xmakemap target=../../bin/xmakemap
+link path=usr/X11/bin/xmodmap target=../../bin/xmodmap
+link path=usr/X11/bin/xprop target=../../bin/xprop
+link path=usr/X11/bin/xrandr target=../../bin/xrandr
+link path=usr/X11/bin/xrdb target=../../bin/xrdb
+link path=usr/X11/bin/xrefresh target=../../bin/xrefresh
+link path=usr/X11/bin/xset target=../../bin/xset
+link path=usr/X11/bin/xsetroot target=../../bin/xsetroot
+link path=usr/X11/lib/X11/rgb.txt target=../../../share/X11/rgb.txt
file path=usr/bin/dispswitch
file path=usr/bin/showrgb
file path=usr/bin/xcmsdb
@@ -56,20 +71,5 @@
file path=usr/share/man/man1/xrefresh.1
file path=usr/share/man/man1/xset.1
file path=usr/share/man/man1/xsetroot.1
-link path=usr/X11/bin/dispswitch target=../../bin/dispswitch
-link path=usr/X11/bin/showrgb target=../../bin/showrgb
-link path=usr/X11/bin/xcmsdb target=../../bin/xcmsdb
-link path=usr/X11/bin/xgamma target=../../bin/xgamma
-link path=usr/X11/bin/xhost target=../../bin/xhost
-link path=usr/X11/bin/xinput target=../../bin/xinput
-link path=usr/X11/bin/xmakemap target=../../bin/xmakemap
-link path=usr/X11/bin/xmodmap target=../../bin/xmodmap
-link path=usr/X11/bin/xprop target=../../bin/xprop
-link path=usr/X11/bin/xrandr target=../../bin/xrandr
-link path=usr/X11/bin/xrdb target=../../bin/xrdb
-link path=usr/X11/bin/xrefresh target=../../bin/xrefresh
-link path=usr/X11/bin/xset target=../../bin/xset
-link path=usr/X11/bin/xsetroot target=../../bin/xsetroot
-link path=usr/X11/lib/X11/rgb.txt target=../../../share/X11/rgb.txt
# xrdb requires cpp
-depend fmri=pkg:/developer/macro/cpp type=require
+depend type=require fmri=pkg:/developer/macro/cpp
--- a/pkg/manifests/x11-x11-window-dump.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-x11-window-dump.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,13 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/x11-window-dump@__version:xwd__
+set name=pkg.summary value="X11 Window Dump (screenshot) utilities"
set name=pkg.description \
value="A collection of utilities to dump an image of a window on screen to a XWD format image file, and to view or print such files."
-set name=pkg.summary value="X11 Window Dump (screenshot) utilities"
+link path=usr/X11/bin/xdpr target=../../bin/xdpr
+link path=usr/X11/bin/xpr target=../../bin/xpr
+link path=usr/X11/bin/xwd target=../../bin/xwd
+link path=usr/X11/bin/xwud target=../../bin/xwud
file path=usr/bin/xdpr
file path=usr/bin/xpr
file path=usr/bin/xwd
@@ -31,7 +35,3 @@
file path=usr/share/man/man1/xpr.1
file path=usr/share/man/man1/xwd.1
file path=usr/share/man/man1/xwud.1
-link path=usr/X11/bin/xdpr target=../../bin/xdpr
-link path=usr/X11/bin/xpr target=../../bin/xpr
-link path=usr/X11/bin/xwd target=../../bin/xwd
-link path=usr/X11/bin/xwud target=../../bin/xwud
--- a/pkg/manifests/x11-xbiff.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xbiff.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,11 +20,11 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xbiff@__version:xbiff__
+set name=pkg.summary value="xbiff - mailbox flag for X"
set name=pkg.description \
value="xbiff displays whether a local mailbox has new mail."
-set name=pkg.summary value="xbiff - mailbox flag for X"
+link path=usr/X11/bin/xbiff target=../../bin/xbiff
file path=usr/bin/xbiff
file path=usr/share/man/man1/xbiff.1
-link path=usr/X11/bin/xbiff target=../../bin/xbiff
# xbiff loads the "flagup" and "flagdown" bitmaps from xbitmaps
-depend fmri=pkg:/x11/data/xbitmaps type=require
+depend type=require fmri=pkg:/x11/data/xbitmaps
--- a/pkg/manifests/x11-xcalc.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xcalc.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,13 +20,13 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xcalc@__version:xcalc__
+set name=pkg.summary value="xcalc - scientific calculator for X"
set name=pkg.description \
value="xcalc is a scientific calculator desktop accessory that can emulate a TI-30 or an HP-10C."
-set name=pkg.summary value="xcalc - scientific calculator for X"
+link path=usr/X11/bin/xcalc target=../../bin/xcalc
file path=usr/bin/xcalc
file path=usr/share/X11/app-defaults/XCalc
file path=usr/share/X11/app-defaults/XCalc-color
file path=usr/share/man/man1/xcalc.1
-link path=usr/X11/bin/xcalc target=../../bin/xcalc
# XCalc app-defaults specifies -adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-* font
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
+depend type=require fmri=pkg:/system/font/xorg/xorg-core
--- a/pkg/manifests/x11-xclipboard.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xclipboard.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,16 +20,15 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xclipboard@__version:xclipboard__
+set name=pkg.summary value="xclipboard & xcutsel tools for clipboard management"
set name=pkg.description \
value="xclipboard is used to collect and display text selections that are sent to the CLIPBOARD by other clients. It is typically used to save CLIPBOARD selections for later use. It stores each CLIPBOARD selection as a separate string, each of which can be selected. The xcutsel program is used to copy the current selection into a cut buffer and to make a selection that contains the current contents of the cut buffer. It acts as a bridge between applications that don't support selections and those that do."
-set name=pkg.summary \
- value="xclipboard & xcutsel tools for clipboard management"
+link path=usr/X11/bin/xclipboard target=../../bin/xclipboard
+link path=usr/X11/bin/xcutsel target=../../bin/xcutsel
file path=usr/bin/xclipboard
file path=usr/bin/xcutsel
file path=usr/share/X11/app-defaults/XClipboard
file path=usr/share/man/man1/xclipboard.1
file path=usr/share/man/man1/xcutsel.1
-link path=usr/X11/bin/xclipboard target=../../bin/xclipboard
-link path=usr/X11/bin/xcutsel target=../../bin/xcutsel
# XClipboard app-defaults specifies helvetica & courier fonts
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
+depend type=require fmri=pkg:/system/font/xorg/xorg-core
--- a/pkg/manifests/x11-xclock.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xclock.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,11 +20,11 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xclock@__version:xclock__
+set name=pkg.summary value="xclock - analog / digital clock for X"
set name=pkg.description \
value="xclock is the classic X Window System clock utility. It displays the time in analog or digital form, continuously updated at a frequency which may be specified by the user."
-set name=pkg.summary value="xclock - analog / digital clock for X"
+link path=usr/X11/bin/xclock target=../../bin/xclock
file path=usr/bin/xclock
file path=usr/share/X11/app-defaults/XClock
file path=usr/share/X11/app-defaults/XClock-color
file path=usr/share/man/man1/xclock.1
-link path=usr/X11/bin/xclock target=../../bin/xclock
--- a/pkg/manifests/x11-xconsole.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xconsole.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xconsole@__version:xconsole__
+set name=pkg.summary value="xconsole - monitor system console messages with X"
set name=pkg.description \
value="The xconsole program displays in a X window the messages which are usually sent to /dev/console."
-set name=pkg.summary value="xconsole - monitor system console messages with X"
+link path=usr/X11/bin/xconsole target=../../bin/xconsole
file path=usr/bin/xconsole
file path=usr/share/X11/app-defaults/XConsole
file path=usr/share/man/man1/xconsole.1
-link path=usr/X11/bin/xconsole target=../../bin/xconsole
--- a/pkg/manifests/x11-xfd.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xfd.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,11 +20,11 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xfd@__version:xfd__
+set name=pkg.summary value="xfd - display all the characters in an X font"
set name=pkg.description \
value="The xfd utility creates a window containing the name of the font being displayed, a row of command buttons, several lines of text for displaying character metrics, and a grid containing one glyph per cell."
-set name=pkg.summary value="xfd - display all the characters in an X font"
+link path=usr/X11/bin/xfd target=../../bin/xfd
file path=usr/bin/xfd
file path=usr/share/X11/app-defaults/Xfd
file path=usr/share/locale/C/LC_MESSAGES/xfd.po
file path=usr/share/man/man1/xfd.1
-link path=usr/X11/bin/xfd target=../../bin/xfd
--- a/pkg/manifests/x11-xfontsel.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xfontsel.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,12 +20,12 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xfontsel@__version:xfontsel__
+set name=pkg.summary \
+ value="xfontsel - point and click selection of X11 font names"
set name=pkg.description \
value="The xfontsel application provides a simple way to display the fonts known to your X server, examine samples of each, and retrieve the X Logical Font Description (XLFD) full name for a font."
-set name=pkg.summary \
- value="xfontsel - point and click selection of X11 font names"
+link path=usr/X11/bin/xfontsel target=../../bin/xfontsel
file path=usr/bin/xfontsel
file path=usr/share/X11/app-defaults/XFontSel
file path=usr/share/locale/C/LC_MESSAGES/xfontsel.po
file path=usr/share/man/man1/xfontsel.1
-link path=usr/X11/bin/xfontsel target=../../bin/xfontsel
--- a/pkg/manifests/x11-xfs-xfs-utilities.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xfs-xfs-utilities.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xfs/xfs-utilities@$(X11PKGVERS)
+set name=pkg.summary value="X Font Server utilities"
set name=pkg.description \
value="X Font Server clients to retrieve and display fonts and font information from an xfs server."
-set name=pkg.summary value="X Font Server utilities"
+link path=usr/X11/bin/fsinfo target=../../bin/xfsinfo
+link path=usr/X11/bin/fslsfonts target=../../bin/fslsfonts
+link path=usr/X11/bin/fstobdf target=../../bin/fstobdf
+link path=usr/X11/bin/showfont target=../../bin/showfont
+link path=usr/X11/bin/xfsinfo target=../../bin/xfsinfo
file path=usr/bin/fslsfonts
file path=usr/bin/fstobdf
file path=usr/bin/showfont
@@ -31,8 +36,3 @@
file path=usr/share/man/man1/fstobdf.1
file path=usr/share/man/man1/showfont.1
file path=usr/share/man/man1/xfsinfo.1
-link path=usr/X11/bin/fsinfo target=../../bin/xfsinfo
-link path=usr/X11/bin/fslsfonts target=../../bin/fslsfonts
-link path=usr/X11/bin/fstobdf target=../../bin/fstobdf
-link path=usr/X11/bin/showfont target=../../bin/showfont
-link path=usr/X11/bin/xfsinfo target=../../bin/xfsinfo
--- a/pkg/manifests/x11-xfs.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xfs.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,18 +20,18 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xfs@__version:xfs__
+set name=pkg.summary value="xfs - X Font Server"
set name=pkg.description \
value="xfs is the X Window System font server. It supplies fonts to X Window System display servers on local or remote hosts."
-set name=pkg.summary value="xfs - X Font Server"
-dir path=lib/svc/manifest/application/x11
-dir path=usr/lib/X11/fs
+dir path=lib/svc/manifest/application/x11
file path=lib/svc/manifest/application/x11/xfs.xml
+link path=usr/X11/bin/fsadmin target=../../sbin/fsadmin
+link path=usr/X11/bin/xfs target=../../bin/xfs
file path=usr/bin/xfs
+dir path=usr/lib/X11/fs
file path=usr/lib/X11/fs/config
file path=usr/sbin/fsadmin
file path=usr/share/man/man1/fsadmin.1
file path=usr/share/man/man1/xfs.1
legacy pkg=SUNWxwfs desc="X Window System font server" \
name="X Window System Font server"
-link path=usr/X11/bin/fsadmin target=../../sbin/fsadmin
-link path=usr/X11/bin/xfs target=../../bin/xfs
--- a/pkg/manifests/x11-xkill.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xkill.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,9 +20,9 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xkill@__version:xkill__
+set name=pkg.summary value="xkill - utility to forcibly close X11 clients"
set name=pkg.description \
value="xkill is a utility for forcing the X server to close connections to clients. This program is very dangerous, but is useful for aborting programs that have displayed undesired windows on a user's screen."
-set name=pkg.summary value="xkill - utility to forcibly close X11 clients"
+link path=usr/X11/bin/xkill target=../../bin/xkill
file path=usr/bin/xkill
file path=usr/share/man/man1/xkill.1
-link path=usr/X11/bin/xkill target=../../bin/xkill
--- a/pkg/manifests/x11-xlock.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xlock.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,14 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xlock@$(OSPKGVERS)
+set name=pkg.summary value="xlock - X display screen lock"
set name=pkg.description \
value="xlock locks the X server till the user enters their password at the keyboard. While xlock is running, all new server connections are refused, the screen is blanked and a changing pattern is put on the screen."
-set name=pkg.summary value="xlock - X display screen lock"
+link path=usr/X11/bin/xlock target=../../bin/xlock
# Must be setuid root to authenticate local users with passwds in /etc/shadow
-file path=usr/bin/xlock mode=4555 owner=root
+file path=usr/bin/xlock owner=root mode=4555
file path=usr/share/X11/app-defaults/XLock
file path=usr/share/man/man1/xlock.1
-link path=usr/X11/bin/xlock target=../../bin/xlock
# XLock app-defaults specifies font:
# -b&h-lucida-medium-r-normal-sans-24-*-*-*-*-*-iso8859-1
-depend fmri=pkg:/system/font/xorg/iso8859-1 type=require
+depend type=require fmri=pkg:/system/font/xorg/iso8859-1
--- a/pkg/manifests/x11-xmag.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xmag.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,15 +20,15 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xmag@__version:xmag__
+set name=pkg.summary value="xmag - magnify parts of the screen"
set name=pkg.description \
value="The xmag program allows you to capture a static image of a portion of an X screen, and display it magnified."
-set name=pkg.summary value="xmag - magnify parts of the screen"
+link path=usr/X11/bin/xmag target=../../bin/xmag
+link path=usr/X11/bin/xmag_multivis target=../../bin/xmag_multivis
file path=usr/bin/xmag
file path=usr/bin/xmag_multivis
file path=usr/share/X11/app-defaults/Xmag
file path=usr/share/man/man1/xmag.1
file path=usr/share/man/man1/xmag_multivis.1
-link path=usr/X11/bin/xmag target=../../bin/xmag
-link path=usr/X11/bin/xmag_multivis target=../../bin/xmag_multivis
# Xmag app-defaults specifies font: 8x13bold
-depend fmri=pkg:/system/font/xorg/iso8859-1 type=require
+depend type=require fmri=pkg:/system/font/xorg/iso8859-1
--- a/pkg/manifests/x11-xman.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xman.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,14 +20,14 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xman@__version:xman__
+set name=pkg.summary value="xman - graphical manual page display program"
set name=pkg.description \
value="xman is a graphical manual page browser using the Athena Widgets (Xaw) toolkit."
-set name=pkg.summary value="xman - graphical manual page display program"
+link path=usr/X11/bin/xman target=../../bin/xman
file path=usr/bin/xman
file path=usr/share/X11/app-defaults/Xman
file path=usr/share/X11/xman.help
file path=usr/share/locale/C/LC_MESSAGES/xman.po
file path=usr/share/man/man1/xman.1
-link path=usr/X11/bin/xman target=../../bin/xman
# Xman app-defaults uses fonts including courier, symbol, helvetica, lucida
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
+depend type=require fmri=pkg:/system/font/xorg/xorg-core
--- a/pkg/manifests/x11-xt-resource-utilities.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xt-resource-utilities.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -19,11 +19,14 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
-set name=pkg.fmri \
- value=pkg:/x11/xt-resource-utilities@$(X11PKGVERS)
+set name=pkg.fmri value=pkg:/x11/xt-resource-utilities@$(X11PKGVERS)
+set name=pkg.summary value="X Toolkit Resource utilities"
set name=pkg.description \
value="Utilties to view and edit the configuration resources used by applications based on toolkits such as Athena Widgets (Xaw) and Motif (Xm) that utilize the X Toolkit Intrinsics (libXt)."
-set name=pkg.summary value="X Toolkit Resource utilities"
+link path=usr/X11/bin/appres target=../../bin/appres
+link path=usr/X11/bin/editres target=../../bin/editres
+link path=usr/X11/bin/listres target=../../bin/listres
+link path=usr/X11/bin/viewres target=../../bin/viewres
file path=usr/bin/appres
file path=usr/bin/editres
file path=usr/bin/listres
@@ -36,10 +39,6 @@
file path=usr/share/man/man1/editres.1
file path=usr/share/man/man1/listres.1
file path=usr/share/man/man1/viewres.1
-link path=usr/X11/bin/appres target=../../bin/appres
-link path=usr/X11/bin/editres target=../../bin/editres
-link path=usr/X11/bin/listres target=../../bin/listres
-link path=usr/X11/bin/viewres target=../../bin/viewres
# Editres app-defaults specifies -*-new century schoolbook-...-*-* font
# Viewres app-defaults specifies -adobe-helvetica-....-iso*-* font
-depend fmri=pkg:/system/font/xorg/xorg-core type=require
+depend type=require fmri=pkg:/system/font/xorg/xorg-core
--- a/pkg/manifests/x11-xvidtune.p5m Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/manifests/x11-xvidtune.p5m Fri Sep 09 20:42:44 2011 -0700
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
#
set name=pkg.fmri value=pkg:/x11/xvidtune@__version:xvidtune__
+set name=pkg.summary value="xvidtune - video mode tuner for Xorg servers"
set name=pkg.description \
value="Xvidtune is a client interface to the X server video mode extension (XFree86-VidModeExtension), allowing a user to interactively adjust existing video modes."
-set name=pkg.summary value="xvidtune - video mode tuner for Xorg servers"
+link path=usr/X11/bin/xvidtune target=../../bin/xvidtune
file path=usr/bin/xvidtune
file path=usr/share/X11/app-defaults/Xvidtune
file path=usr/share/man/man1/xvidtune.1
-link path=usr/X11/bin/xvidtune target=../../bin/xvidtune
--- a/pkg/transforms/extract_metadata Thu Sep 08 16:06:46 2011 -0700
+++ b/pkg/transforms/extract_metadata Fri Sep 09 20:42:44 2011 -0700
@@ -51,15 +51,15 @@
<transform pkg org.opensolaris.noincorp=false \
org.opensolaris.version-lock-facet=true -> print \
- %(org.opensolaris.incorporation): depend fmri=%(pkg.fmri) type=incorporate \
+ %(org.opensolaris.incorporation): depend type=incorporate fmri=%(pkg.fmri) \
facet.version-lock.%(pkg.name)=%(org.opensolaris.version-lock-facet)>
<transform pkg org.opensolaris.noincorp=false \
org.opensolaris.version-lock-facet=false -> print \
- %(org.opensolaris.incorporation): depend fmri=%(pkg.fmri) type=incorporate>
+ %(org.opensolaris.incorporation): depend type=incorporate fmri=%(pkg.fmri)>
# Add dependency on the incorporation to each non-obsolete package in it
<transform pkg pkg.obsolete=false org.opensolaris.noincorp=false -> emit \
- depend fmri=%(org.opensolaris.incorporation) type=require>
+ depend type=require fmri=%(org.opensolaris.incorporation)>
<transform set name=org.opensolaris.noincorp -> drop>
<transform set name=org.opensolaris.incorporation -> drop>
@@ -72,5 +72,5 @@
<transform pkg -> default org.opensolaris.nogroup false>
<transform pkg pkg.renamed=false pkg.obsolete=false \
org.opensolaris.nogroup=false pkg.fmri=^(.*)@.* -> print \
- pkg:/consolidation/X/X-all: depend fmri=%<1> type=group>
+ pkg:/consolidation/X/X-all: depend type=group fmri=%<1> >
<transform set name=org.opensolaris.nogroup -> drop>