From 00c9607c976d95ff5d7a66a612f0cd69a5c204d8 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 26 Mar 2020 10:40:31 +0000
Subject: [PATCH] Allow for OpenSC variants on macOS

See ukf/ukf-meta#221.
---
 macosx.properties              |  9 +++++++++
 mdx/uk/opensc-mac-macports.cfg | 15 +++++++++++++++
 mdx/uk/opensc-mac.cfg          | 13 +++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 mdx/uk/opensc-mac-macports.cfg

diff --git a/macosx.properties b/macosx.properties
index 0b062e2e..31d66d14 100644
--- a/macosx.properties
+++ b/macosx.properties
@@ -9,7 +9,16 @@
 #
 # Location of the PKCS#11 configuration file for OpenSC on Mac OS X.
 #
+# This varies depending on which version of OpenSC is installed.
+#
+# If the standard installer was used:
+#
 sign.uk.pkcs11Config = ${basedir}/mdx/uk/opensc-mac.cfg
+#
+# If the MacPorts system was used, override this by placing the following
+# definition in the local build.properties file:
+#
+#sign.uk.pkcs11Config = ${basedir}/mdx/uk/opensc-mac-macports.cfg
 
 #
 # Signing key alias within the keystore.
diff --git a/mdx/uk/opensc-mac-macports.cfg b/mdx/uk/opensc-mac-macports.cfg
new file mode 100644
index 00000000..1c6a556f
--- /dev/null
+++ b/mdx/uk/opensc-mac-macports.cfg
@@ -0,0 +1,15 @@
+#
+# PKCS#11 provider configuration for for OpenSC running under Mac OS X
+#
+# Note: this configuration assumes that OpenSC has been installed using
+# the MacPorts system.
+#
+#    sudo port install opensc
+#
+# This version installs in /opt/local.
+#
+# If OpenSC has been installed using the standard installer, use opensc-mac.cfg
+# instead.
+#
+name = OpenSC
+library = /opt/local/lib/pkcs11/opensc-pkcs11.so
diff --git a/mdx/uk/opensc-mac.cfg b/mdx/uk/opensc-mac.cfg
index afad28fc..9068246e 100644
--- a/mdx/uk/opensc-mac.cfg
+++ b/mdx/uk/opensc-mac.cfg
@@ -1,3 +1,16 @@
+#
 # PKCS#11 provider configuration for for OpenSC running under Mac OS X
+#
+# Note: this configuration assumes that OpenSC has been installed using
+# the standard installer as described here:
+#
+#    https://github.com/OpenSC/OpenSC/wiki/macOS-Quick-Start
+#
+# This version installs in /Library/OpenSC and /usr/local, and
+# includes a token driver.
+#
+# If OpenSC has been installed using MacPorts, use opensc-mac-macports.cfg
+# instead.
+#
 name = OpenSC
 library = /Library/OpenSC/lib/pkcs11/opensc-pkcs11.so