From 354dc209f95f1c7a02e56db9662c53195c42619d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 06:15:56 -0600
Subject: [PATCH 1/2] mfoc: revbump for libnfc

Correct license, should be GPL-2.0-or-later
not GPL-3.0
---
 srcpkgs/mfoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mfoc/template b/srcpkgs/mfoc/template
index 7ddd3e9adf8..4f80126ca91 100644
--- a/srcpkgs/mfoc/template
+++ b/srcpkgs/mfoc/template
@@ -1,14 +1,14 @@
 # Template file for 'mfoc'
 pkgname=mfoc
 version=0.10.7
-revision=3
+revision=4
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="libnfc-devel"
 short_desc="Mifare Classic Offline Cracker"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://nfc-tools.org"
 distfiles="https://github.com/nfc-tools/mfoc/archive/${pkgname}-${version}.tar.gz"
 checksum=2dfd8ffa4a8b357807680d190a91c8cf3db54b4211a781edc1108af401dbaad7

From 7010d57db0015b615d168264fb38c957b2beae50 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 04:03:10 -0600
Subject: [PATCH 2/2] libnfc: update to 1.8.0.

---
 common/shlibs           |  2 +-
 srcpkgs/libnfc/template | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 30b88c76902..bdbc777772e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2203,7 +2203,7 @@ libudns.so.0 udns-0.4_1
 libcriu.so.2 criu-3.13_2
 libcompel.so.1 criu-3.13_2
 libwebsockets.so.15 libwebsockets-3.2.0_1
-libnfc.so.0 libnfc-1.7.1_1
+libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
 libsfml-network.so.2.5 SFML-2.5.0_1
diff --git a/srcpkgs/libnfc/template b/srcpkgs/libnfc/template
index 0cbcee8e106..d32f87f9e63 100644
--- a/srcpkgs/libnfc/template
+++ b/srcpkgs/libnfc/template
@@ -1,24 +1,25 @@
 # Template file for 'libnfc'
 pkgname=libnfc
-version=1.7.1
-revision=3
+version=1.8.0
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
-short_desc="Low level NFC SDK and Programmers API"
 hostmakedepends="pkg-config"
 makedepends="libusb-devel libusb-compat-devel"
+short_desc="Low level NFC SDK and Programmers API"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://nfc-tools.org/"
 distfiles="https://github.com/nfc-tools/libnfc/archive/libnfc-${version}.tar.gz"
-checksum=30de35b4f1af3f57dab40d91ffb2275664a35859ff2b014ba7b226aa3f5465f5
+checksum=0ab7d9b41442e7edc2af7c54630396edc73ce51128aa28a5c6e4135dc5595495
 CFLAGS="-D_GNU_SOURCE"
 
 pre_configure() {
-	sed -i "s|MODE=\"0664\", GROUP=\"plugdev\"|TAG+=\"uaccess\"|g" contrib/udev/42-pn53x.rules
+	vsed -i "s|MODE=\"0664\", GROUP=\"plugdev\"|TAG+=\"uaccess\"|g" \
+		contrib/udev/93-pn53x.rules
 }
 post_install() {
-	vinstall contrib/udev/42-pn53x.rules         644 usr/lib/udev/rules.d/
+	vinstall contrib/udev/93-pn53x.rules         644 usr/lib/udev/rules.d/
 	vinstall contrib/linux/blacklist-libnfc.conf 644 usr/lib/modprobe.d/
 }
 libnfc-devel_package() {
@@ -26,6 +27,7 @@ libnfc-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 	}