--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/pinentry/pinentry-gtk.p5m	Tue Nov 29 09:40:41 2016 -0800
@@ -0,0 +1,55 @@
+#
+# 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) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+#
+# This package requires package pinentry to be installed. To help
+# pkgdepend find that relationship without hardwiring an fmri, specify
+# a dependency on a file known to always be present in the core package,
+# and allow pkgdepend to generate the fmri.
+#
+# Mediation: the mediated options are by default sorted in the order:
+#	priority, version, implementation-order, implementation
+# where "implementation" is sorted lexically.
+# The goal is to give priority of package pinentry-gtk over package pinentry.
+#
+set name=pkg.fmri \
+    value=pkg:/security/pinentry-gtk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="A small X11 utility for entering passwords."
+set name=pkg.description \
+    value="A X11 (GTK toolkit) dialog program that allows GnuPG to read passphrases and PIN numbers in a secure manner."
+set name=com.oracle.info.description value="pinentry utility for X11 GTK"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/397
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/lib/pinentry target=pinentry-gtk-2 mediator=pinentry \
+    mediator-implementation=default mediator-priority=vendor
+file path=usr/lib/pinentry-gtk-2 mode=0555
+license pinentry.license license=GPLv2
+depend type=optional fmri=crypto/[email protected]
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/share/info/pinentry.info \
+    pkg.debug.reason=usr/lib/pinentry-gtk-2

--- a/components/pinentry/pinentry.p5m	Thu Sep 29 13:01:01 2016 -0700
+++ b/components/pinentry/pinentry.p5m	Tue Nov 29 09:40:41 2016 -0800
@@ -18,14 +18,22 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+#
+# Mediation: the mediated options are by default sorted in the order:
+#	priority, version, implementation-order, implementation
+# where "implementation" is sorted lexically.
+# The goal is to give priority of package pinentry-gtk over package pinentry.
 #
 set name=pkg.fmri \
     value=pkg:/security/pinentry@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="A small utility for entering passwords."
+set name=pkg.summary \
+    value="A small command line utility for entering passwords."
 set name=pkg.description \
-    value="A small collection of dialog programs that allow GnuPG to read passphrases and PIN numbers in a secure manner."
-set name=com.oracle.info.description value="the pinentry utility"
+    value="A command line curses dialog program that allows GnuPG to read passphrases and PIN numbers in a secure manner."
+set name=com.oracle.info.description value="pinentry utility for command line"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
@@ -33,13 +41,9 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#
-link path=usr/lib/pinentry target=pinentry-gtk-2
-#
-#
+link path=usr/lib/pinentry target=pinentry-curses mediator=pinentry \
+    mediator-implementation=pinentry-curses mediator-priority=vendor
 file path=usr/lib/pinentry-curses mode=0555
-file path=usr/lib/pinentry-gtk-2 mode=0555
 file path=usr/share/info/pinentry.info
-#
 license pinentry.license license=GPLv2
 depend type=optional fmri=crypto/[email protected]