diff --git a/devel/libfreefare/Makefile b/devel/libfreefare/Makefile index ce32310bd214..a32a4e1575f7 100644 --- a/devel/libfreefare/Makefile +++ b/devel/libfreefare/Makefile @@ -1,27 +1,27 @@ PORTNAME= libfreefare PORTVERSION= 0.4.0 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= romain@FreeBSD.org COMMENT= MIFARE contactless tag access library WWW= https://github.com/nfc-tools/libfreefare/ LICENSE= LGPL3+ LIB_DEPENDS= libnfc.so:devel/libnfc USE_GITHUB= yes GH_ACCOUNT= nfc-tools GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= autoreconf gmake libtool pathfix pkgconfig ssl MAKE_ENV= INSTALL_STRIP_FLAG="${STRIP}" LDFLAGS+= -L${OPENSSLLIB} CFLAGS+= -I${OPENSSLINC} # Restrict to stable (even) versions, indicated by the second component. PORTSCOUT= limitw:1,even .include diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile index 4394e47970e1..f5c604c0ec3e 100644 --- a/devel/libnfc/Makefile +++ b/devel/libnfc/Makefile @@ -1,99 +1,97 @@ PORTNAME= libnfc -PORTVERSION= 1.7.1 -PORTREVISION= 5 +PORTVERSION= 1.8.0 CATEGORIES= devel -MASTER_SITES= http://dl.bintray.com/nfc-tools/sources/ \ - http://romain.blogreen.org/distfiles/ +MASTER_SITES= https://github.com/nfc-tools/libnfc/releases/download/libnfc-${PORTVERSION}/ MAINTAINER= romain@FreeBSD.org COMMENT= Near Field Communication (NFC) library WWW= http://www.libnfc.org LICENSE= LGPL3+ #OPTIONS_DEFINE= ACR122_PCSC ACR122_USB ACR122S ARYGON PN532_I2C PN532_SPI PN532_UART PN53X_USB #OPTIONS_DEFAULT=ACR122_USB ACR122S ARYGON PN532_I2C PN532_SPI PN532_UART PN53X_USB OPTIONS_DEFINE= ACR122_PCSC ACR122_USB ACR122S ARYGON PN532_UART PN53X_USB EXAMPLES OPTIONS_DEFAULT=ACR122_USB ACR122S ARYGON PN532_UART PN53X_USB ACR122_PCSC_DESC=ACR122 driver (PC/SC) ACR122_USB_DESC=ACR122 driver (USB) ACR122S_DESC= ACR122 driver (UART) ARYGON_DESC= Arygon driver #PN532_I2C_DESC=PN532 I2C driver #PN532_SPI_DESC=PN532 SPI driver PN532_UART_DESC=PN532 UART driver PN53X_USB_DESC= PN53X USB driver GNU_CONFIGURE= yes -USE_LDCONFIG= yes USES= gmake libtool pathfix pkgconfig readline tar:bzip2 +USE_LDCONFIG= yes MAKE_ENV= INSTALL_STRIP_FLAG="${STRIP}" CFLAGS+= -D__BSD_VISIBLE # Restrict to stable (even) versions, indicated by the second component. PORTSCOUT= limitw:1,even .include .if ${PORT_OPTIONS:MACR122_PCSC} ACR122_PCSC_DRIVER= acr122_pcsc, .else ACR122_PCSC_DRIVER= .endif .if ${PORT_OPTIONS:MACR122_USB} ACR122_USB_DRIVER= acr122_usb, .else ACR122_USB_DRIVER= .endif .if ${PORT_OPTIONS:MACR122S} ACR122S_DRIVER= acr122s, .else ACR122S_DRIVER= .endif .if ${PORT_OPTIONS:MARYGON} ARYGON_DRIVER= arygon, .else ARYGON_DRIVER= .endif #.if ${PORT_OPTIONS:MPN532_I2C} #PN532_I2C_DRIVER=pn532_i2c, #.else #PN532_I2C_DRIVER= #.endif #.if ${PORT_OPTIONS:MPN532_SPI} #PN532_SPI_DRIVER=pn532_spi, #.else #PN532_SPI_DRIVER= #.endif .if ${PORT_OPTIONS:MPN532_UART} PN532_UART_DRIVER=pn532_uart, .else PN532_UART_DRIVER= .endif .if ${PORT_OPTIONS:MPN53X_USB} PN53X_USB_DRIVER=pn53x_usb, .else PN53X_USB_DRIVER= .endif CONFIGURE_ARGS+=--with-drivers="${ACR122_PCSC_DRIVER}${ACR122_USB_DRIVER}${ACR122S_DRIVER}${ARYGON_DRIVER}${PN532_I2C_DRIVER}${PN532_SPI_DRIVER}${PN532_UART_DRIVER}${PN53X_USB_DRIVER}" .if ${PORT_OPTIONS:MACR122_PCSC} LIB_DEPENDS+= libpcsclite.so:devel/pcsc-lite RUN_DEPENDS+= ${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so:devel/libccid .endif post-install: .if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/contrib/devd/pn53x.conf ${STAGEDIR}/${EXAMPLESDIR} .endif .include diff --git a/devel/libnfc/distinfo b/devel/libnfc/distinfo index efdc3cc7a755..c9134874ad22 100644 --- a/devel/libnfc/distinfo +++ b/devel/libnfc/distinfo @@ -1,2 +1,3 @@ -SHA256 (libnfc-1.7.1.tar.bz2) = 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072 -SIZE (libnfc-1.7.1.tar.bz2) = 484309 +TIMESTAMP = 1643747630 +SHA256 (libnfc-1.8.0.tar.bz2) = 6d9ad31c86408711f0a60f05b1933101c7497683c2e0d8917d1611a3feba3dd5 +SIZE (libnfc-1.8.0.tar.bz2) = 553511 diff --git a/devel/libnfc/files/patch-libnfc_drivers_acr122__usb.c b/devel/libnfc/files/patch-libnfc_drivers_acr122__usb.c new file mode 100644 index 000000000000..c4e7373cdc2f --- /dev/null +++ b/devel/libnfc/files/patch-libnfc_drivers_acr122__usb.c @@ -0,0 +1,12 @@ +--- libnfc/drivers/acr122_usb.c.orig 2022-02-01 22:26:36 UTC ++++ libnfc/drivers/acr122_usb.c +@@ -419,6 +419,9 @@ acr122_usb_open(const nfc_context *context, const nfc_ + continue; + // Reset device + usb_reset(data.pudh); ++ // Reopen the device ++ if ((data.pudh = usb_open(dev)) == NULL) ++ continue; + // Retrieve end points + acr122_usb_get_end_points(dev, &data); + // Claim interface diff --git a/devel/libnfc/pkg-plist b/devel/libnfc/pkg-plist index 983103eb9cf7..0d8148ec5d9e 100644 --- a/devel/libnfc/pkg-plist +++ b/devel/libnfc/pkg-plist @@ -1,49 +1,51 @@ bin/nfc-anticol +bin/nfc-barcode bin/nfc-dep-initiator bin/nfc-dep-target bin/nfc-emulate-forum-tag2 bin/nfc-emulate-forum-tag4 bin/nfc-emulate-tag bin/nfc-emulate-uid bin/nfc-jewel bin/nfc-list bin/nfc-mfclassic bin/nfc-mfsetuid bin/nfc-mfultralight bin/nfc-poll bin/nfc-read-forum-tag3 bin/nfc-relay bin/nfc-relay-picc bin/nfc-scan-device bin/pn53x-diagnose bin/pn53x-sam bin/pn53x-tamashell include/nfc/nfc-emulation.h include/nfc/nfc-types.h include/nfc/nfc.h lib/libnfc.a lib/libnfc.so -lib/libnfc.so.5 -lib/libnfc.so.5.0.1 +lib/libnfc.so.6 +lib/libnfc.so.6.0.0 libdata/pkgconfig/libnfc.pc man/man1/nfc-anticol.1.gz +man/man1/nfc-barcode.1.gz man/man1/nfc-dep-initiator.1.gz man/man1/nfc-dep-target.1.gz man/man1/nfc-emulate-forum-tag2.1.gz man/man1/nfc-emulate-forum-tag4.1.gz man/man1/nfc-emulate-tag.1.gz man/man1/nfc-emulate-uid.1.gz man/man1/nfc-jewel.1.gz man/man1/nfc-list.1.gz man/man1/nfc-mfclassic.1.gz man/man1/nfc-mfsetuid.1.gz man/man1/nfc-mfultralight.1.gz man/man1/nfc-poll.1.gz man/man1/nfc-read-forum-tag3.1.gz man/man1/nfc-relay-picc.1.gz man/man1/nfc-relay.1.gz man/man1/nfc-scan-device.1.gz man/man1/pn53x-diagnose.1.gz man/man1/pn53x-sam.1.gz man/man1/pn53x-tamashell.1.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pn53x.conf diff --git a/sysutils/nfcutils/Makefile b/sysutils/nfcutils/Makefile index 9f9ab8d916db..b0ae9cf38f44 100644 --- a/sysutils/nfcutils/Makefile +++ b/sysutils/nfcutils/Makefile @@ -1,24 +1,25 @@ PORTNAME= nfcutils PORTVERSION= 0.1.2 +PORTREVISION= 1 DISTVERSIONPREFIX=v CATEGORIES= sysutils MAINTAINER= dengtooling@gmail.com COMMENT= Listing NFC devices and in-field tags or targets WWW= https://github.com/nfc-tools/nfcutils/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libnfc.so:devel/libnfc USES= autoreconf gmake libtool pkgconfig USE_GITHUB= yes GH_ACCOUNT= terence-deng MAKE_ENV+= MKDIR="${MKDIR}" HAS_CONFIGURE= true PLIST_FILES= bin/lsnfc .include