--- a/components/samba/samba/samba.p5m	Wed Oct 28 15:35:51 2015 -0700
+++ b/components/samba/samba/samba.p5m	Wed Oct 28 16:29:11 2015 -0700
@@ -177,6 +177,3 @@
 
 # resourced of Samba4 and Samba 3.6 are mediated so we need this dep.
 depend type=require fmri=pkg:/service/network/samba/samba36
-
-# Samba can be used in Asian multibyte language envs. so we need this
-depend type=require fmri=pkg:/system/library/iconv

--- a/components/samba/samba/samba.p5m.common	Wed Oct 28 15:35:51 2015 -0700
+++ b/components/samba/samba/samba.p5m.common	Wed Oct 28 16:29:11 2015 -0700
@@ -106,4 +106,5 @@
 dir  path=var/spool/samba mode=1777
 
 # Samba can be used in Asian multibyte language envs. so we need this
-depend type=require fmri=pkg:/system/library/iconv
+$(SOLARIS_12_ONLY)depend type=require fmri=pkg:/system/library/iconv
+$(SOLARIS_11_ONLY)depend type=require fmri=pkg:/system/library/iconv/unicode

--- a/components/samba/samba36/samba36.p5m	Wed Oct 28 15:35:51 2015 -0700
+++ b/components/samba/samba36/samba36.p5m	Wed Oct 28 16:29:11 2015 -0700
@@ -142,6 +142,3 @@
 
 # dependency can be removed later (after initial push)
 depend type=require fmri=library/samba/libsmbclient
-
-# Samba can be used in Asian multibyte language envs. so we need this
-depend type=require fmri=pkg:/system/library/iconv

--- a/components/trousers/trousers.p5m	Wed Oct 28 15:35:51 2015 -0700
+++ b/components/trousers/trousers.p5m	Wed Oct 28 16:29:11 2015 -0700
@@ -179,4 +179,5 @@
 # by package iconv-core. This is for function Trspi_Native_To_UNICODE() which
 # calls iconv_open()
 #
-depend type=require fmri=pkg:/system/library/iconv/iconv-core
+$(SOLARIS_12_ONLY)depend type=require fmri=pkg:/system/library/iconv/iconv-core
+$(SOLARIS_11_ONLY)depend type=require fmri=pkg:/system/library/iconv/utf-8