# HG changeset patch # User Norm Jacobs # Date 1291876942 28800 # Node ID e398cb2c4b45347db364f9e660a956f08ddfbfb9 # Parent 709174c893d4479184c9fd6ccd3fe727fa57cf62 7004049 SUNWa2ps should move to userland with a2ps 7004051 userland-incorporation isn't needed at this time diff -r 709174c893d4 -r e398cb2c4b45 Makefile --- a/Makefile Fri Nov 26 22:36:15 2010 -0600 +++ b/Makefile Wed Dec 08 22:42:22 2010 -0800 @@ -23,7 +23,7 @@ include make-rules/shared-macros.mk -SUBDIRS += components incorporations +SUBDIRS += components download: TARGET = download prep: TARGET = prep @@ -42,6 +42,4 @@ $(SUBDIRS): FORCE +echo "$(TARGET) $@" ; $(GMAKE) -C $@ $(TARGET) -incorporations: components - FORCE: diff -r 709174c893d4 -r e398cb2c4b45 components/Makefile --- a/components/Makefile Fri Nov 26 22:36:15 2010 -0600 +++ b/components/Makefile Wed Dec 08 22:42:22 2010 -0800 @@ -61,7 +61,7 @@ $(RM) components.mk depends.mk .profile clobber: $(COMPONENT_DIRS:%=%.nosetup) clean - $(RM) -r $(WS_REPO) $(WS_LOGS) + $(RM) -r $(WS_REPO) $(WS_LOGS) $(WS_LINT_CACHE) setup: $(WS_LOGS) repo tools .profile diff -r 709174c893d4 -r e398cb2c4b45 components/a2ps/Makefile --- a/components/a2ps/Makefile Fri Nov 26 22:36:15 2010 -0600 +++ b/components/a2ps/Makefile Wed Dec 08 22:42:22 2010 -0800 @@ -53,8 +53,6 @@ ln -s ../../doc/make-authors.pl ; \ ln -s ../../doc/translators.txt) -PKGMOGRIFY_TRANSFORMS += $(WS_TOP)/transforms/libtool-drop - SFWPROGS = a2ps card composeglyphs fixnt fixps ogonkify pdiff psmandup \ psset texi2dvi4a2ps PROTOSFWLINKS = $(SFWPROGS:%=$(PROTOSFWBIN)/%) diff -r 709174c893d4 -r e398cb2c4b45 components/a2ps/SUNWa2ps.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/a2ps/SUNWa2ps.p5m Wed Dec 08 22:42:22 2010 -0800 @@ -0,0 +1,36 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# Legacy package information for renamed SUNWa2ps package +# + +set name=pkg.fmri value=pkg:/SUNWa2ps@4.13,5.11-0.133 +set name=pkg.renamed value=true + +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +set name=variant.opensolaris.zone value=global value=nonglobal +set name=variant.arch value=$(ARCH) + +depend fmri=print/lp/filter/a2ps@4.13-0.133 type=require diff -r 709174c893d4 -r e398cb2c4b45 components/a2ps/a2ps.p5m --- a/components/a2ps/a2ps.p5m Fri Nov 26 22:36:15 2010 -0600 +++ b/components/a2ps/a2ps.p5m Wed Dec 08 22:42:22 2010 -0800 @@ -20,6 +20,15 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +set name=pkg.fmri value=pkg:/print/lp/filter/a2ps@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="$(COMPONENT_SUMMARY) " +set name=pkg.description value="$(COMPONENT_DESCRIPTION) " +set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) " +set name=info.upstream_url value=$(COMPONENT_PROJECT_URL) +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +set variant.arch=$(ARCH) + dir path=etc dir path=etc/gnu dir path=etc/lp @@ -81,8 +90,8 @@ dir path=usr/share/ogonkify dir path=usr/share/ogonkify/afm dir path=usr/share/ogonkify/fonts -file NOHASH path=etc/gnu/a2ps-site.cfg preserve=true original_name=SUNWa2ps:etc/gnu/a2ps-site.cfg -file NOHASH path=etc/gnu/a2ps.cfg preserve=true original_name=SUNWa2ps:etc/gnu/a2ps.cfg +file NOHASH path=etc/gnu/a2ps-site.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps-site.cfg +file NOHASH path=etc/gnu/a2ps.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps.cfg file NOHASH path=etc/lp/fd/a2ps.fd file NOHASH path=usr/bin/a2ps variant.arch=$(ARCH) file NOHASH path=usr/bin/card @@ -108,7 +117,7 @@ link path=usr/sfw/bin/texi2dvi4a2ps target=../../bin/texi2dvi4a2ps file NOHASH path=usr/share/a2ps/README file NOHASH path=usr/share/a2ps/afm/fonts.map -file NOHASH path=usr/share/a2ps/afm/make_fonts_map.sh +file NOHASH path=usr/share/a2ps/afm/make_fonts_map.sh mode=0555 file NOHASH path=usr/share/a2ps/afm/pbkd.afm file NOHASH path=usr/share/a2ps/afm/pbkdi.afm file NOHASH path=usr/share/a2ps/afm/pbkl.afm @@ -288,7 +297,6 @@ file NOHASH path=usr/share/info/a2ps.info-4 file NOHASH path=usr/share/info/a2ps.info-5 file NOHASH path=usr/share/info/a2ps.info-6 -file NOHASH path=usr/share/info/dir file NOHASH path=usr/share/info/ogonkify.info file NOHASH path=usr/share/info/regex.info file NOHASH path=usr/share/info/regex.info-1 @@ -384,7 +392,7 @@ name="a2ps - GNU Any to PostScript filter (root)" \ desc="a2ps - GNU Any to PostScript filter (root) 4.13b" \ hotline="Please contact your local service provider" \ - pkg=SUNWa2psu variant.arch=$(ARCH) vendor="Oracle Corporation" \ + pkg=SUNWa2psr variant.arch=$(ARCH) vendor="Oracle Corporation" \ version=11.11.0,REV=2010.09.30.04.23 legacy arch=$(ARCH) category=system \ diff -r 709174c893d4 -r e398cb2c4b45 incorporations/Makefile --- a/incorporations/Makefile Fri Nov 26 22:36:15 2010 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2010, Oracle and/or it's affiliates. All rights reserved. -# - -include ../make-rules/shared-macros.mk - -SUBDIRS = userland - -publish: TARGET = publish-incorporation -clean: TARGET = clean -clobber: TARGET = clobber - -# No action: -download prep build install install-packages validate: - -.DEFAULT: publish - -publish clean clobber: $(SUBDIRS) - -$(SUBDIRS): FORCE - gmake -C $@ $(TARGET) - -FORCE: diff -r 709174c893d4 -r e398cb2c4b45 incorporations/userland/Makefile --- a/incorporations/userland/Makefile Fri Nov 26 22:36:15 2010 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2010, Oracle and/or it's affiliates. All rights reserved. -# - -include $(WS_TOP)/make-rules/shared-macros.mk -include $(WS_TOP)/make-rules/ips.mk - -FRAGMENTS= $(wildcard *.fragment) - -userland.mogrified: userland.p5m - $(PKGMOGRIFY) $(PKG_OPTIONS) $< $(PUBLISH_TRANSFORMS) | \ - sed -e '/^$$/d' -e '/^#.*$$/d' | uniq >$@ - -userland.published: userland.mogrified $(FRAGMENTS) - cat userland.mogrified $(FRAGMENTS) >$@ - $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest -d . $@ - -install: - -publish-incorporation: userland.published - -clean:: - $(RM) userland.mogrified userland.published - -clobber:: clean - $(RM) $(FRAGMENTS) diff -r 709174c893d4 -r e398cb2c4b45 incorporations/userland/userland.p5m --- a/incorporations/userland/userland.p5m Fri Nov 26 22:36:15 2010 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2010, Oracle and/or it's affiliates. All rights reserved. -# - -set name=pkg.fmri value=pkg:/consolidation/userland/userland-incorporation@0.$(OS_VERSION),$(BUILD_VERSION) -set name=pkg.summary value="userland consolidation incorporation " -set name=pkg.description value="This incorporation constrains packages from the userland consolidation. " -set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -set variant.arch=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff -r 709174c893d4 -r e398cb2c4b45 make-rules/ips.mk --- a/make-rules/ips.mk Fri Nov 26 22:36:15 2010 -0600 +++ b/make-rules/ips.mk Wed Dec 08 22:42:22 2010 -0800 @@ -119,30 +119,30 @@ cat $(METADATA_TEMPLATE) $< >$@ # mogrify the manifest -$(MANIFEST_BASE)-%.mogrified: %.p5m $(METADATA_TEMPLATE) canonical-manifests - $(PKGMOGRIFY) $(PKG_OPTIONS) $(METADATA_TEMPLATE) $< \ +$(MANIFEST_BASE)-%.mogrified: %.p5m canonical-manifests + $(PKGMOGRIFY) $(PKG_OPTIONS) $< \ $(PUBLISH_TRANSFORMS) | \ sed -e '/^$$/d' -e '/^#.*$$/d' | uniq >$@ # generate dependencies, drop variant.arch in set and depend actions because # "pkgdepend resolve" fails when it's present. $(MANIFEST_BASE)-%.depend: $(MANIFEST_BASE)-%.mogrified - $(PKGDEPEND) generate -m $< $(PROTO_DIR) | \ - $(PKGMOGRIFY) /dev/fd/0 $(WS_TOP)/transforms/drop-variant.arch >$@ + $(PKGDEPEND) generate -m $< $(PROTO_DIR) >$@ # resolve dependencies, prepend the mogrified manifest, less the unresolved # dependencies to the result. $(MANIFEST_BASE)-%.resolved: $(MANIFEST_BASE)-%.depend - $(PKGMOGRIFY) $(@:%.resolved=%.mogrified) \ + ($(PKGMOGRIFY) $(@:%.resolved=%.mogrified) \ $(WS_TOP)/transforms/drop-unresolved-dependencies | \ - sed -e '/^$$/d' -e '/^#.*$$/d' | uniq >$@ - echo "depend fmri=consolidation/$(CONSOLIDATION)/$(CONSOLIDATION)-incorporation type=require">>$@ - $(PKGDEPEND) resolve -o $< | sed -e '1d' >>$@ + sed -e '/^$$/d' -e '/^#.*$$/d' ; \ + $(PKGDEPEND) resolve -o $< | sed -e '1d') | uniq >$@ # lint the manifest before we publish with it. $(MANIFEST_BASE)-%.linted: $(MANIFEST_BASE)-%.resolved @echo "VALIDATING MANIFEST CONTENT: $<" - PYTHONPATH=$(WS_TOP)/tools/python $(PKGLINT) -f $(WS_TOP)/tools/pkglintrc $< + PYTHONPATH=$(WS_TOOLS)/python $(PKGLINT) \ + $(CANONICAL_REPO:%=-r % -c $(WS_LINT_CACHE)) \ + -f $(WS_TOOLS)/pkglintrc $< $(PKGFMT) <$< >$@ # published @@ -150,9 +150,6 @@ $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \ -d $(PROTO_DIR) -d $(@D) -d . $< $(PKGFMT) <$< >$@ - $(PKGMOGRIFY) $(PKG_OPTIONS) $@ \ - $(WS_TOP)/transforms/print-consolidation-depend | \ - sed -e '/^$$/d' -e '/^#.*$$/d' | sort -u > $(WS_INCORPORATIONS)/userland/$(@:$(MANIFEST_BASE)-%.published=%.fragment) $(COMPONENT_SRC)/.published: $(PUBLISHED) $(TOUCH) $@ diff -r 709174c893d4 -r e398cb2c4b45 make-rules/shared-macros.mk --- a/make-rules/shared-macros.mk Fri Nov 26 22:36:15 2010 -0600 +++ b/make-rules/shared-macros.mk Wed Dec 08 22:42:22 2010 -0800 @@ -50,6 +50,7 @@ WS_MAKE_RULES = $(WS_TOP)/make-rules WS_COMPONENTS = $(WS_TOP)/components WS_INCORPORATIONS = $(WS_TOP)/incorporations +WS_LINT_CACHE = $(WS_TOP)/cache BASS_O_MATIC = $(WS_TOOLS)/bass-o-matic diff -r 709174c893d4 -r e398cb2c4b45 transforms/defaults --- a/transforms/defaults Fri Nov 26 22:36:15 2010 -0600 +++ b/transforms/defaults Wed Dec 08 22:42:22 2010 -0800 @@ -20,9 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or it's affiliates. All rights reserved. +# + + default group sys> + +# +# LP print service # + default owner root> + default mode 0755> + default owner lp> + default group lp> + default mode 0775> + + default group sys> + default group sys> + default group other> # # programs & shared objects should generally have mode 0555 diff -r 709174c893d4 -r e398cb2c4b45 transforms/drop-variant.arch --- a/transforms/drop-variant.arch Fri Nov 26 22:36:15 2010 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# -# This file contains transforms that are applied to a manifest while dependency -# generation is being performed because variant.arch causes pkgdepend to fail. -# - drop> - delete variant.arch .*> diff -r 709174c893d4 -r e398cb2c4b45 transforms/locale --- a/transforms/locale Fri Nov 26 22:36:15 2010 -0600 +++ b/transforms/locale Wed Dec 08 22:42:22 2010 -0800 @@ -25,686 +25,8 @@ # # general locale - default facet.locale true> - - -# The fix for -# Bug 16156 -# pkgmogrify should allow backreferences in operation to match criteria -# will allow something like -# \ -# default facet.locale.%<\1> true> -# to replace the rest of the transforms in this file + default facet.locale true> -# specific locale dirs - \ - default facet.locale.af true> - \ - default facet.locale.af_ZA.UTF-8 true> - \ - default facet.locale.am true> - \ - default facet.locale.ang true> - \ - default facet.locale.ar true> - \ - default facet.locale.ar_AE.UTF-8 true> - \ - default facet.locale.ar_BH.UTF-8 true> - \ - default facet.locale.ar_DZ.UTF-8 true> - \ - default facet.locale.ar_EG.ISO8859-6 true> - \ - default facet.locale.ar_EG.UTF-8 true> - \ - default facet.locale.ar_IQ.UTF-8 true> - \ - default facet.locale.ar_JO.UTF-8 true> - \ - default facet.locale.ar_KW.UTF-8 true> - \ - default facet.locale.ar_LY.UTF-8 true> - \ - default facet.locale.ar_MA.UTF-8 true> - \ - default facet.locale.ar_OM.UTF-8 true> - \ - default facet.locale.ar_QA.UTF-8 true> - \ - default facet.locale.ar_SA.UTF-8 true> - \ - default facet.locale.ar_TN.UTF-8 true> - \ - default facet.locale.ar_YE.UTF-8 true> - \ - default facet.locale.as true> - \ - default facet.locale.as_IN.UTF-8 true> - \ - default facet.locale.ast true> - \ - default facet.locale.az true> - \ - default facet.locale.az_AZ.UTF-8 true> - \ - default facet.locale.az_IR true> - \ - default facet.locale.be true> - \ - default facet.locale.be_BY.UTF-8 true> - \ - default facet.locale.be-tarask true> - \ - default facet.locale.be@latin true> - \ - default facet.locale.bem true> - \ - default facet.locale.bg true> - \ - default facet.locale.bg_BG.ISO8859-5 true> - \ - default facet.locale.bg_BG.UTF-8 true> - \ - default facet.locale.bn true> - \ - default facet.locale.bn_IN true> - \ - default facet.locale.bn_IN.UTF-8 true> - \ - default facet.locale.br true> - \ - default facet.locale.bs true> - \ - default facet.locale.byn true> - \ - default facet.locale.C true> - \ - default facet.locale.ca true> - \ - default facet.locale.ca_ES.UTF-8 true> - \ - default facet.locale.ca@valencia true> - \ - default facet.locale.ckb true> - \ - default facet.locale.crh true> - \ - default facet.locale.cs true> - \ - default facet.locale.cs_CZ.ISO8859-2 true> - \ - default facet.locale.cs_CZ.UTF-8 true> - \ - default facet.locale.csb true> - \ - default facet.locale.cy true> - \ - default facet.locale.da true> - \ - default facet.locale.da_DK.ISO8859-1 true> - \ - default facet.locale.da_DK.ISO8859-15 true> - \ - default facet.locale.da_DK.ISO8859-15@euro true> - \ - default facet.locale.da_DK.UTF-8 true> - \ - default facet.locale.de true> - \ - default facet.locale.de_BE.UTF-8 true> - \ - default facet.locale.de_LI.UTF-8 true> - \ - default facet.locale.de.UTF-8 true> - \ - default facet.locale.dv true> - \ - default facet.locale.dz true> - \ - default facet.locale.el true> - \ - default facet.locale.el_CY.UTF-8 true> - \ - default facet.locale.el_GR.ISO8859-7 true> - \ - default facet.locale.el_GR.UTF-8 true> - \ - default facet.locale.el.UTF-8 true> - \ - default facet.locale.en true> - \ - default facet.locale.en_AU.ISO8859-1 true> - \ - default facet.locale.en_AU.UTF-8 true> - \ - default facet.locale.en_BW.UTF-8 true> - \ - default facet.locale.en_CA true> - \ - default facet.locale.en_CA.ISO8859-1 true> - \ - default facet.locale.en_CA.UTF-8 true> - \ - default facet.locale.en_GB true> - \ - default facet.locale.en_GB.ISO8859-1 true> - \ - default facet.locale.en_GB.ISO8859-15 true> - \ - default facet.locale.en_GB.ISO8859-15@euro true> - \ - default facet.locale.en_GB.UTF-8 true> - \ - default facet.locale.en_HK.UTF-8 true> - \ - default facet.locale.en_IE.ISO8859-1 true> - \ - default facet.locale.en_IE.ISO8859-15 true> - \ - default facet.locale.en_IE.UTF-8 true> - \ - default facet.locale.en_IN.UTF-8 true> - \ - default facet.locale.en_MT.UTF-8 true> - \ - default facet.locale.en_NZ.ISO8859-1 true> - \ - default facet.locale.en_NZ.UTF-8 true> - \ - default facet.locale.en_PH.UTF-8 true> - \ - default facet.locale.en_SG.UTF-8 true> - \ - default facet.locale.en_US true> - \ - default facet.locale.en_US.ISO8859-1 true> - \ - default facet.locale.en_US.ISO8859-15 true> - \ - default facet.locale.en_US.ISO8859-15@euro true> - \ - default facet.locale.en_US.UTF-8 true> - \ - default facet.locale.en_ZW.UTF-8 true> - \ - default facet.locale.en@boldquot true> - \ - default facet.locale.en@quot true> - \ - default facet.locale.eo true> - \ - default facet.locale.es true> - \ - default facet.locale.es_AR true> - \ - default facet.locale.es_CL true> - \ - default facet.locale.es_CO true> - \ - default facet.locale.es_CR true> - \ - default facet.locale.es_DO true> - \ - default facet.locale.es_DO.UTF-8 true> - \ - default facet.locale.es_EC true> - \ - default facet.locale.es_ES true> - \ - default facet.locale.es_GT true> - \ - default facet.locale.es_HN true> - \ - default facet.locale.es_HN.UTF-8 true> - \ - default facet.locale.es_MX true> - \ - default facet.locale.es_NI true> - \ - default facet.locale.es_PA true> - \ - default facet.locale.es_PE true> - \ - default facet.locale.es_PR true> - \ - default facet.locale.es_PR.UTF-8 true> - \ - default facet.locale.es_SV true> - \ - default facet.locale.es_UY true> - \ - default facet.locale.es_VE true> - \ - default facet.locale.es.UTF-8 true> - \ - default facet.locale.et true> - \ - default facet.locale.et_EE.ISO8859-15 true> - \ - default facet.locale.et_EE.UTF-8 true> - \ - default facet.locale.eu true> - \ - default facet.locale.fa true> - \ - default facet.locale.fi true> - \ - default facet.locale.fi_FI.ISO8859-1 true> - \ - default facet.locale.fi_FI.ISO8859-15 true> - \ - default facet.locale.fi_FI.UTF-8 true> - \ - default facet.locale.fil true> - \ - default facet.locale.fo true> - \ - default facet.locale.fr true> - \ - default facet.locale.fr.UTF-8 true> - \ - default facet.locale.fur true> - \ - default facet.locale.fy true> - \ - default facet.locale.ga true> - \ - default facet.locale.gez true> - \ - default facet.locale.gl true> - \ - default facet.locale.gn true> - \ - default facet.locale.gr true> - \ - default facet.locale.gu true> - \ - default facet.locale.gu_IN.UTF-8 true> - \ - default facet.locale.ha true> - \ - default facet.locale.haw true> - \ - default facet.locale.he true> - \ - default facet.locale.he_IL.UTF-8 true> - \ - default facet.locale.hi true> - \ - default facet.locale.hi_IN.UTF-8 true> - \ - default facet.locale.hr true> - \ - default facet.locale.hr_HR.ISO8859-2 true> - \ - default facet.locale.hr_HR.UTF-8 true> - \ - default facet.locale.hu true> - \ - default facet.locale.hu_HU.ISO8859-2 true> - \ - default facet.locale.hu_HU.UTF-8 true> - \ - default facet.locale.hy true> - \ - default facet.locale.hy_AM.UTF-8 true> - \ - default facet.locale.ia true> - \ - default facet.locale.id true> - \ - default facet.locale.id_ID.UTF-8 true> - \ - default facet.locale.ig true> - \ - default facet.locale.io true> - \ - default facet.locale.is true> - \ - default facet.locale.is_IS.ISO8859-1 true> - \ - default facet.locale.is_IS.UTF-8 true> - \ - default facet.locale.it true> - \ - default facet.locale.it_CH.UTF-8 true> - \ - default facet.locale.it.UTF-8 true> - \ - default facet.locale.ja true> - \ - default facet.locale.ja_JP.eucJP true> - \ - default facet.locale.ja_JP.PCK true> - \ - default facet.locale.ja_JP.UTF-8 true> - \ - default facet.locale.jv true> - \ - default facet.locale.ka true> - \ - default facet.locale.ka_GE.UTF-8 true> - \ - default facet.locale.kab true> - \ - default facet.locale.kk true> - \ - default facet.locale.kk_KZ.UTF-8 true> - \ - default facet.locale.km true> - \ - default facet.locale.kn true> - \ - default facet.locale.kn_IN.UTF-8 true> - \ - default facet.locale.ko true> - \ - default facet.locale.ko.UTF-8 true> - \ - default facet.locale.kok true> - \ - default facet.locale.ks true> - \ - default facet.locale.ks_IN.UTF-8 true> - \ - default facet.locale.ku true> - \ - default facet.locale.ku_TR.UTF-8 true> - \ - default facet.locale.ku_TR.UTF-8@sorani true> - \ - default facet.locale.ky true> - \ - default facet.locale.ky_KG.UTF-8 true> - \ - default facet.locale.la true> - \ - default facet.locale.lg true> - \ - default facet.locale.li true> - \ - default facet.locale.lo true> - \ - default facet.locale.lt true> - \ - default facet.locale.lt_LT.ISO8859-13 true> - \ - default facet.locale.lt_LT.UTF-8 true> - \ - default facet.locale.lv true> - \ - default facet.locale.lv_LV.ISO8859-13 true> - \ - default facet.locale.lv_LV.UTF-8 true> - \ - default facet.locale.mai true> - \ - default facet.locale.md true> - \ - default facet.locale.mg true> - \ - default facet.locale.mi true> - \ - default facet.locale.mk true> - \ - default facet.locale.mk_MK.ISO8859-5 true> - \ - default facet.locale.mk_MK.UTF-8 true> - \ - default facet.locale.ml true> - \ - default facet.locale.ml_IN.UTF-8 true> - \ - default facet.locale.mn true> - \ - default facet.locale.mr true> - \ - default facet.locale.mr_IN.UTF-8 true> - \ - default facet.locale.ms true> - \ - default facet.locale.ms_MY true> - \ - default facet.locale.ms_MY.UTF-8 true> - \ - default facet.locale.mt true> - \ - default facet.locale.mt_MT.UTF-8 true> - \ - default facet.locale.my true> - \ - default facet.locale.my_MM true> - \ - default facet.locale.nb true> - \ - default facet.locale.nb_NO.UTF-8 true> - \ - default facet.locale.nds true> - \ - default facet.locale.ne true> - \ - default facet.locale.nl true> - \ - default facet.locale.nl_BE.ISO8859-1 true> - \ - default facet.locale.nl_BE.ISO8859-15 true> - \ - default facet.locale.nl_BE.UTF-8 true> - \ - default facet.locale.nl_NL.ISO8859-1 true> - \ - default facet.locale.nl_NL.ISO8859-15 true> - \ - default facet.locale.nl_NL.UTF-8 true> - \ - default facet.locale.nn true> - \ - default facet.locale.nn_NO.UTF-8 true> - \ - default facet.locale.no true> - \ - default facet.locale.no_NO.ISO8859-1@bokmal true> - \ - default facet.locale.no_NO.ISO8859-1@nynorsk true> - \ - default facet.locale.nso true> - \ - default facet.locale.oc true> - \ - default facet.locale.or true> - \ - default facet.locale.or_IN.UTF-8 true> - \ - default facet.locale.pa true> - \ - default facet.locale.pa_IN.UTF-8 true> - \ - default facet.locale.pl true> - \ - default facet.locale.pl_PL.ISO8859-2 true> - \ - default facet.locale.pl_PL.UTF-8 true> - \ - default facet.locale.ps true> - \ - default facet.locale.pt true> - \ - default facet.locale.pt_BR true> - \ - default facet.locale.pt_BR.ISO8859-1 true> - \ - default facet.locale.pt_BR.UTF-8 true> - \ - default facet.locale.pt_PT true> - \ - default facet.locale.pt_PT.ISO8859-1 true> - \ - default facet.locale.pt_PT.ISO8859-15 true> - \ - default facet.locale.pt_PT.UTF-8 true> - \ - default facet.locale.rm true> - \ - default facet.locale.ro true> - \ - default facet.locale.ro_RO.ISO8859-2 true> - \ - default facet.locale.ro_RO.UTF-8 true> - \ - default facet.locale.ru true> - \ - default facet.locale.ru_RU.ANSI1251 true> - \ - default facet.locale.ru_RU.ISO8859-5 true> - \ - default facet.locale.ru_RU.KOI8-R true> - \ - default facet.locale.ru_RU.UTF-8 true> - \ - default facet.locale.ru_UA.UTF-8 true> - \ - default facet.locale.rw true> - \ - default facet.locale.sa_IN.UTF-8 true> - \ - default facet.locale.sh_BA.ISO8859-2@bosnia true> - \ - default facet.locale.sh_BA.UTF-8 true> - \ - default facet.locale.si true> - \ - default facet.locale.sk true> - \ - default facet.locale.sk_SK.ISO8859-2 true> - \ - default facet.locale.sk_SK.UTF-8 true> - \ - default facet.locale.sl true> - \ - default facet.locale.sl_SI.ISO8859-2 true> - \ - default facet.locale.sl_SI.UTF-8 true> - \ - default facet.locale.so true> - \ - default facet.locale.sq true> - \ - default facet.locale.sq_AL.ISO8859-2 true> - \ - default facet.locale.sq_AL.UTF-8 true> - \ - default facet.locale.sr true> - \ - default facet.locale.sr_CS.UTF-8 true> - \ - default facet.locale.sr_ME.UTF-8 true> - \ - default facet.locale.sr_ME.UTF-8@latin true> - \ - default facet.locale.sr_RS.UTF-8 true> - \ - default facet.locale.sr_RS.UTF-8@latin true> - \ - default facet.locale.sr_YU.ISO8859-5 true> - \ - default facet.locale.sr@ije true> - \ - default facet.locale.sr@latin true> - \ - default facet.locale.sr@Latn true> - \ - default facet.locale.sv true> - \ - default facet.locale.sv_SE.ISO8859-15@euro true> - \ - default facet.locale.sv_SE.UTF-8@euro true> - \ - default facet.locale.sv.UTF-8 true> - \ - default facet.locale.sw true> - \ - default facet.locale.ta true> - \ - default facet.locale.ta_IN.UTF-8 true> - \ - default facet.locale.te true> - \ - default facet.locale.te_IN.UTF-8 true> - \ - default facet.locale.tg true> - \ - default facet.locale.th true> - \ - default facet.locale.th_TH true> - \ - default facet.locale.th_TH.UTF-8 true> - \ - default facet.locale.ti true> - \ - default facet.locale.tig true> - \ - default facet.locale.tk true> - \ - default facet.locale.tl true> - \ - default facet.locale.tr true> - \ - default facet.locale.tr_TR.ISO8859-9 true> - \ - default facet.locale.tr_TR.UTF-8 true> - \ - default facet.locale.tt true> - \ - default facet.locale.ug true> - \ - default facet.locale.uk true> - \ - default facet.locale.uk_UA.UTF-8 true> - \ - default facet.locale.ur true> - \ - default facet.locale.ur_PK true> - \ - default facet.locale.uz true> - \ - default facet.locale.uz@cyrillic true> - \ - default facet.locale.ve true> - \ - default facet.locale.vi true> - \ - default facet.locale.vi_VN.UTF-8 true> - \ - default facet.locale.wa true> - \ - default facet.locale.wal true> - \ - default facet.locale.wo true> - \ - default facet.locale.xh true> - \ - default facet.locale.yi true> - \ - default facet.locale.yo true> - \ - default facet.locale.zh true> - \ - default facet.locale.zh_CN true> - \ - default facet.locale.zh_HK true> - \ - default facet.locale.zh_SG.UTF-8 true> - \ - default facet.locale.zh_TW true> - \ - default facet.locale.zh_TW.BIG5 true> - \ - default facet.locale.zh_TW.UTF-8 true> - \ - default facet.locale.zh.GBK true> - \ - default facet.locale.zh.UTF-8 true> - \ - default facet.locale.zu true> + \ + default facet.locale.%<\1> true> diff -r 709174c893d4 -r e398cb2c4b45 transforms/print-consolidation-depend --- a/transforms/print-consolidation-depend Fri Nov 26 22:36:15 2010 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# These transforms print only the package name from the manifest. -# - - print depend fmri=%<1> type=require > - drop>