From 807b972302f2c370cabc4eb519fdafaecc25b87f Mon Sep 17 00:00:00 2001
From: Kysh <42900317+Kyshman@users.noreply.github.com>
Date: Fri, 7 Feb 2025 22:30:25 +0300
Subject: [PATCH 1/6] Update README.md to include setup via MacPorts for macOS

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index fcd054e..28e17e9 100644
--- a/README.md
+++ b/README.md
@@ -194,6 +194,16 @@ brew install \
 
 **Note** An additional Python package dependency may need to be installed to use [`ykman`](https://support.yubico.com/support/solutions/articles/15000012643-yubikey-manager-cli-ykman-user-guide) - `pip install yubikey-manager`
 
+Or 
+
+Install [MacPorts](https://www.macports.org/install.php) and the following packages:
+
+```console
+sudo port install gnupg2 yubikey-manager pinentry wget
+```
+
+**Optional** [Yubikey Manager - Qt](https://www.yubico.com/support/download/yubikey-manager/) which is the supported version of the Yubikey Personalization.
+
 **NixOS**
 
 Build an air-gapped NixOS LiveCD image:

From 9c23d5933dbee574572f28b800977c10c18b4540 Mon Sep 17 00:00:00 2001
From: Kysh <42900317+Kyshman@users.noreply.github.com>
Date: Sat, 8 Feb 2025 00:26:24 +0300
Subject: [PATCH 2/6] Update README.md added macOS with MacPorts to usage
 section

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 28e17e9..24ea024 100644
--- a/README.md
+++ b/README.md
@@ -970,6 +970,12 @@ sudo apt update
 sudo apt install -y gnupg gnupg-agent scdaemon pcscd
 ```
 
+**macOS**
+
+```console
+sudo port install gnupg2 pcsc-tools
+```
+
 **OpenBSD**
 
 ```console
@@ -1012,6 +1018,8 @@ gpg --recv $KEYID
 
 Or with the URL on YubiKey, retrieve the public key:
 
+using the command `gpg-card`
+
 ```console
 gpg/card> fetch
 

From fcd28fe97b419bf2667d25e22cb4f4e2580c96d4 Mon Sep 17 00:00:00 2001
From: Kysh <42900317+Kyshman@users.noreply.github.com>
Date: Sat, 8 Feb 2025 00:46:42 +0300
Subject: [PATCH 3/6] Update README.md section SSH for MacPorts

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 24ea024..89f86b6 100644
--- a/README.md
+++ b/README.md
@@ -1225,10 +1225,10 @@ wget https://raw.githubusercontent.com/drduh/config/master/gpg-agent.conf
 
 **macOS**
 
-Install pinentry with `brew install pinentry-mac` then edit `gpg-agent.conf` to set the `pinentry-program` path to:
+Install pinentry with `brew install pinentry-mac` or `sudo port install pinentry` then edit `gpg-agent.conf` to set the `pinentry-program` path to:
 
 * Apple Silicon Macs: `/opt/homebrew/bin/pinentry-mac`
-* Intel Macs: `/usr/local/bin/pinentry-mac`
+* Intel Macs: `/usr/local/bin/pinentry-mac` or `/opt/local/bin/pinentry` (MacPorts)
 * MacGPG Suite: `/usr/local/MacGPG2/libexec/pinentry-mac.app/Contents/MacOS/pinentry-mac`
 
 Then run `gpgconf --kill gpg-agent` for the change to take effect.

From 30054aadab0facceac6e7b39ec19bbc5896a9594 Mon Sep 17 00:00:00 2001
From: Kysh <42900317+Kyshman@users.noreply.github.com>
Date: Wed, 19 Feb 2025 22:31:25 +0300
Subject: [PATCH 4/6] Update README.md for Arch package installation

Added `--needed` to avoid reinstalling already installed & upto date packages
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 89f86b6..de3e39a 100644
--- a/README.md
+++ b/README.md
@@ -253,7 +253,7 @@ qemu-system-x86_64 \
 **Arch**
 
 ```console
-sudo pacman -Syu gnupg pcsclite ccid yubikey-personalization
+sudo pacman -Syu --needed gnupg pcsclite ccid yubikey-personalization
 ```
 
 **RHEL7**

From 9ff60ea8c5a9d7ef6609eceece3cb8b5a367ea5b Mon Sep 17 00:00:00 2001
From: Kysh <42900317+Kyshman@users.noreply.github.com>
Date: Sun, 30 Mar 2025 19:51:37 +0300
Subject: [PATCH 5/6] Update README.md

updated for arch specific steps
---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index de3e39a..a2e7511 100644
--- a/README.md
+++ b/README.md
@@ -970,6 +970,13 @@ sudo apt update
 sudo apt install -y gnupg gnupg-agent scdaemon pcscd
 ```
 
+**Arch**
+
+```console
+sudo pacman -S --needed gnupg pcsc-tools
+sudo systemctl enable --now pcscd.service
+```
+
 **macOS**
 
 ```console

From 16550af94c9c04f22052f0cea98d3a5484005d9a Mon Sep 17 00:00:00 2001
From: Kysh <42900317+Kyshman@users.noreply.github.com>
Date: Sat, 12 Apr 2025 14:35:05 +0300
Subject: [PATCH 6/6] Remove reference to EOL tool - Yubikey-Managet-QT

Addresses review comment by @nvmd [regarding](https://github.com/drduh/YubiKey-Guide/pull/478/files/acdcb192bbd8cf10fce1812580be79ff6dd2da9f#r2036016628) EOL GUI tool in [PR #478](https://github.com/drduh/YubiKey-Guide/pull/478)
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 861953f..5b08e03 100644
--- a/README.md
+++ b/README.md
@@ -204,8 +204,6 @@ Install [MacPorts](https://www.macports.org/install.php) and the following packa
 sudo port install gnupg2 yubikey-manager pinentry wget
 ```
 
-**Optional** [Yubikey Manager - Qt](https://www.yubico.com/support/download/yubikey-manager/) which is the supported version of the Yubikey Personalization.
-
 **NixOS**
 
 Build an air-gapped NixOS LiveCD image: