--- a/pkg/Makefile	Thu Feb 03 23:51:55 2011 +0000
+++ b/pkg/Makefile	Fri Feb 04 09:49:45 2011 +0000
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2011 Every City Ltd. All rights reserved.
 #
 
 include $(SRC)/Makefile.master
@@ -177,7 +178,7 @@
 # complete reprocessing of all manifests because they'll fail command
 # dependency checking.
 #
-PM_TRANSFORMS_BRANDING= branding_Oracle
+PM_TRANSFORMS_BRANDING= branding_OpenIndiana
 PM_TRANSFORMS_OTHERS= common_actions publish restart_fmri defaults extract_metadata
 PM_TRANSFORMS= $(PM_TRANSFORMS_BRANDING) $(PM_TRANSFORMS_OTHERS)
 PM_INC= transforms
@@ -254,7 +255,6 @@
 MFDIR_CLUSTER= manifests_cluster
 MFDIR_RENAMED= manifests_renamed
 MFDIR_OBSOLETE= manifests_obsolete
-MFDIR_LOCALE= manifests_locale
 MANIFESTS_STATIC.cmd= (cd $(MFDIR_STATIC); echo *.mf)
 MANIFESTS_STATIC= $(MANIFESTS_STATIC.cmd:sh)
 MANIFESTS_CLUSTER.cmd= (cd $(MFDIR_CLUSTER); echo *.mf)
@@ -263,9 +263,7 @@
 MANIFESTS_RENAMED= $(MANIFESTS_RENAMED.cmd:sh)
 MANIFESTS_OBSOLETE.cmd= (cd $(MFDIR_OBSOLETE); echo *.mf)
 MANIFESTS_OBSOLETE= $(MANIFESTS_OBSOLETE.cmd:sh)
-MANIFESTS_LOCALE.cmd= (if [ -d $(MFDIR_LOCALE) ]; then cd $(MFDIR_LOCALE); echo *.mf; fi)
-MANIFESTS_LOCALE= $(MANIFESTS_LOCALE.cmd:sh)
-MANIFESTS= $(MANIFESTS_STATIC) $(MANIFESTS_CLUSTER) $(MANIFESTS_RENAMED) $(MANIFESTS_OBSOLETE) $(MANIFESTS_LOCALE)
+MANIFESTS= $(MANIFESTS_STATIC) $(MANIFESTS_CLUSTER) $(MANIFESTS_RENAMED) $(MANIFESTS_OBSOLETE)
 PKGS= $(MANIFESTS:%.mf=%)
 DEP_PKGS= $(PKGS:%=$(PDIR)/%.dep)
 PROC_PKGS= $(PKGS:%=$(PDIR)/%.mog)
@@ -560,9 +558,6 @@
 $(MANIFESTS_OBSOLETE:%=$(PDIR)/%): $$(@:$(PDIR)/%=$(MFDIR_OBSOLETE)/%)
 	$(CP) $(@:$(PDIR)/%=$(MFDIR_OBSOLETE)/%) $(@)
 
-$(MANIFESTS_LOCALE:%=$(PDIR)/%): $$(@:$(PDIR)/%=$(MFDIR_LOCALE)/%)
-	$(CP) $(@:$(PDIR)/%=$(MFDIR_LOCALE)/%) $(@)
-
 $(PDIR)/%.mog: $(PDIR)/%.mf
 	@echo "Processing manifest $(<F)"
 	$(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/transforms/branding_OpenIndiana	Fri Feb 04 09:49:45 2011 +0000
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2011 Every City Ltd. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+#
+# This file sets branding for Oracle Solaris releases that differs 
+# from other distros
+#
+
+#
+# Defaults for legacy metadata for SVR4 package information
+#
+<transform legacy -> default vendor "OpenIndiana Project">