--- a/components/timezone/Makefile	Thu Oct 01 13:23:24 2015 -0700
+++ b/components/timezone/Makefile	Tue Oct 13 09:18:46 2015 -0700
@@ -33,6 +33,14 @@
 
 TPNO=			24066
 
+# Build info part of pkg(5) FMRI dropped ",$(OS_VERSION)" between 11 and 12;
+# needed for evaluation repo where we build the default repo from 12 on 11.
+ifeq ($(OS_VERSION),5.11)
+OS_META_VERSION=	,$(OS_VERSION)-$(OS_VERSION)
+else
+OS_META_VERSION=	-$(OS_VERSION)
+endif
+
 # "etcetera" must be listed before "backward" because it sets up links that
 # "backward" needs.
 TZFILES= africa antarctica asia australasia etcetera europe \
@@ -42,6 +50,8 @@
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+PKG_MACROS +=		OS_META_VERSION=$(OS_META_VERSION)
+
 POFILE=zoneinfo.po
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)

--- a/components/timezone/system-data-timezone-message-files.p5m	Thu Oct 01 13:23:24 2015 -0700
+++ b/components/timezone/system-data-timezone-message-files.p5m	Tue Oct 13 09:18:46 2015 -0700
@@ -22,7 +22,7 @@
 # Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 
 set name=pkg.fmri \
-    value=pkg://$(PUBLISHER_LOCALIZABLE)/system/data/timezone-message-files@$(IPS_COMPONENT_VERSION)-$(OS_VERSION)
+    value=pkg://$(PUBLISHER_LOCALIZABLE)/system/data/timezone-message-files@$(IPS_COMPONENT_VERSION)$(OS_META_VERSION)
 set name=pkg.summary value="Translatable content for Timezone Definition"
 set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.linted.opensolaris.manifest001.1 value=true
@@ -31,7 +31,7 @@
 set name=pkg.linted.userland.manifest001.0 value=true
 set name=com.oracle.info.description \
     value="the translatable content for Timezone Definition"
-set name=com.oracle.info.version value=$(HUMAN_VERSION)
+$(SOLARIS_12_ONLY)set name=com.oracle.info.version value=$(HUMAN_VERSION)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file zoneinfo.po \
     path=usr/lib/locale/__LOCALE__/LC_MESSAGES/SUNW_OST_ZONEINFO.po group=sys

--- a/components/timezone/system-data-timezone.p5m	Thu Oct 01 13:23:24 2015 -0700
+++ b/components/timezone/system-data-timezone.p5m	Tue Oct 13 09:18:46 2015 -0700
@@ -23,13 +23,13 @@
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
-    value=pkg:/system/data/timezone@$(IPS_COMPONENT_VERSION)-$(OS_VERSION)
+    value=pkg:/system/data/timezone@$(IPS_COMPONENT_VERSION)$(OS_META_VERSION)
 set name=pkg.summary value="Timezone Definition"
 set name=pkg.description value="Timezone definition files"
 set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=com.oracle.info.description value="the timezone definition files"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=com.oracle.info.version value=$(HUMAN_VERSION)
+$(SOLARIS_12_ONLY)set name=com.oracle.info.version value=$(HUMAN_VERSION)
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=org.opensolaris.arc-caseid value=LSARC/2001/015
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)