From owner-svn-ports-all@FreeBSD.ORG Wed Mar 12 20:36:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A69F1201; Wed, 12 Mar 2014 20:36:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 924D6E0B; Wed, 12 Mar 2014 20:36:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2CKaa2o088574; Wed, 12 Mar 2014 20:36:36 GMT (envelope-from romain@svn.freebsd.org) Received: (from romain@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2CKaarn088571; Wed, 12 Mar 2014 20:36:36 GMT (envelope-from romain@svn.freebsd.org) Message-Id: <201403122036.s2CKaarn088571@svn.freebsd.org> From: Romain Tartière Date: Wed, 12 Mar 2014 20:36:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348003 - head/devel/libnfc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 20:36:36 -0000 Author: romain Date: Wed Mar 12 20:36:35 2014 New Revision: 348003 URL: http://svnweb.freebsd.org/changeset/ports/348003 QAT: https://qat.redports.org/buildarchive/r348003/ Log: Update to 1.7.1 and modernize port. Modified: head/devel/libnfc/Makefile head/devel/libnfc/distinfo head/devel/libnfc/pkg-plist Modified: head/devel/libnfc/Makefile ============================================================================== --- head/devel/libnfc/Makefile Wed Mar 12 20:21:56 2014 (r348002) +++ head/devel/libnfc/Makefile Wed Mar 12 20:36:35 2014 (r348003) @@ -2,87 +2,96 @@ # $FreeBSD$ PORTNAME= libnfc -PORTVERSION= 1.4.2 +PORTVERSION= 1.7.1 CATEGORIES= devel -MASTER_SITES= http://${PORTNAME}.googlecode.com/files/ \ +MASTER_SITES= http://dl.bintray.com/nfc-tools/sources/ \ http://romain.blogreen.org/distfiles/ MAINTAINER= romain@FreeBSD.org COMMENT= Near Field Communication (NFC) library -OPTIONS_DEFINE= ACR122 ARYGON PN531USB PN532UART PN533USB SERIALPROBE -OPTIONS_DEFAULT= ACR122 PN531USB PN532UART PN533USB -ACR122_DESC= ACR122 driver +#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 +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 () ARYGON_DESC= Arygon driver -PN531USB_DESC= PN531 USB driver -PN532UART_DESC= PN532 UART driver -PN533USB_DESC= PN533 USB driver -SERIALPROBE_DESC= serial auto-probe +#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_GMAKE= yes USE_LDCONFIG= yes -USES= pathfix pkgconfig - -MAN1= nfc-anticol.1 nfc-dep-initiator.1 nfc-dep-target.1 \ - nfc-emulate-forum-tag4.1 nfc-emulate-tag.1 nfc-emulate-uid.1 \ - nfc-mfclassic.1 nfc-list.1 nfc-mfultralight.1 nfc-poll.1 \ - nfc-relay.1 nfc-relay-picc.1 pn53x-diagnose.1 pn53x-sam.1 \ - pn53x-tamashell.1 +USES= gmake pathfix pkgconfig tar:bzip2 +MAKE_ENV= INSTALL_STRIP_FLAG="${STRIP}" # Restrict to stable (even) versions, indicated by the second component. PORTSCOUT= limitw:1,even -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MACR122} -ACR122_DRIVER= acr122, +.if ${PORT_OPTIONS:MACR122_PCSC} +ACR122_PCSC_DRIVER= acr122_pcsc, .else -ACR122_DRIVER= +ACR122_PCSC_DRIVER= .endif -.if ${PORT_OPTIONS:MARYGON} -ARYGON_DRIVER= arygon, +.if ${PORT_OPTIONS:MACR122_USB} +ACR122_USB_DRIVER= acr122_usb, .else -ARYGON_DRIVER= +ACR122_USB_DRIVER= .endif -.if ${PORT_OPTIONS:MPN531USB} -PN531USB_DRIVER=pn531_usb, +.if ${PORT_OPTIONS:MACR122S} +ACR122S_DRIVER= acr122s, .else -PN531USB_DRIVER= +ACR122S_DRIVER= .endif -.if ${PORT_OPTIONS:MPN532UART} -PN532UART_DRIVER=pn532_uart, +.if ${PORT_OPTIONS:MARYGON} +ARYGON_DRIVER= arygon, .else -PN532UART_DRIVER= +ARYGON_DRIVER= .endif -.if ${PORT_OPTIONS:MPN533USB} -PN533USB_DRIVER=pn533_usb, +#.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 -PN533USB_DRIVER= +PN532_UART_DRIVER= .endif -CONFIGURE_ARGS+=--with-drivers="${ACR122_DRIVER}${ARYGON_DRIVER}${PN531USB_DRIVER}${PN532UART_DRIVER}${PN533USB_DRIVER}" - -.if ${PORT_OPTIONS:MSERIALPROBE} -CONFIGURE_ARGS+=--enable-serial-autoprobe +.if ${PORT_OPTIONS:MPN53X_USB} +PN53X_USB_DRIVER=pn53x_usb, .else -CONFIGURE_ARGS+=--disable-serial-autoprobe +PN53X_USB_DRIVER= .endif -.if ${PORT_OPTIONS:MACR122} -LIB_DEPENDS+= pcsclite.1:${PORTSDIR}/devel/pcsc-lite +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:${PORTSDIR}/devel/pcsc-lite RUN_DEPENDS+= ${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so:${PORTSDIR}/devel/libccid .endif post-install: .if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/pn53x.conf ${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/devd/pn53x.conf ${STAGEDIR}/${EXAMPLESDIR} .endif .include Modified: head/devel/libnfc/distinfo ============================================================================== --- head/devel/libnfc/distinfo Wed Mar 12 20:21:56 2014 (r348002) +++ head/devel/libnfc/distinfo Wed Mar 12 20:36:35 2014 (r348003) @@ -1,2 +1,2 @@ -SHA256 (libnfc-1.4.2.tar.gz) = 295ad8a0dc0e4469d9f10589449a9a04eed284a2e7faf398e91d84a89ca91bfa -SIZE (libnfc-1.4.2.tar.gz) = 487310 +SHA256 (libnfc-1.7.1.tar.bz2) = 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072 +SIZE (libnfc-1.7.1.tar.bz2) = 484309 Modified: head/devel/libnfc/pkg-plist ============================================================================== --- head/devel/libnfc/pkg-plist Wed Mar 12 20:21:56 2014 (r348002) +++ head/devel/libnfc/pkg-plist Wed Mar 12 20:36:35 2014 (r348003) @@ -1,26 +1,51 @@ bin/nfc-anticol 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-messages.h +include/nfc/nfc-emulation.h include/nfc/nfc-types.h include/nfc/nfc.h lib/libnfc.a lib/libnfc.la lib/libnfc.so -lib/libnfc.so.1 +lib/libnfc.so.5 libdata/pkgconfig/libnfc.pc +man/man1/nfc-anticol.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 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrm include/nfc