Update to 0.4.0 and modernize port.

3 files changed, 133 insertions, 125 deletions

diff --git a/devel/libfreefare/Makefile b/devel/libfreefare/Makefile
index 5d1ff563f676..827f91d0f10a 100644
--- a/devel/libfreefare/Makefile
+++ b/devel/libfreefare/Makefile
@@ -2,140 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	libfreefare
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	devel
-MASTER_SITES=	http://nfc-tools.googlecode.com/files/ \
+MASTER_SITES=	http://${PORTNAME}.googlecode.com/files/ \
 		http://romain.blogreen.org/distfiles/
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	MIFARE contactless tag access library
 
-LIB_DEPENDS=	nfc.1:${PORTSDIR}/devel/libnfc
+LIB_DEPENDS=	libnfc.so:${PORTSDIR}/devel/libnfc
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=	pathfix gmake pkgconfig
-
-MAN3=		freefare.3 freefare_error.3 mad.3 mifare_application.3 \
-		mifare_classic.3 mifare_desfire.3 mifare_desfire_aid.3 \
-		mifare_desfire_key.3  mifare_ultralight.3 tlv.3
-
-MLINKS=		freefare.3 freefare_free_tags.3 \
-		freefare.3 freefare_get_tag_friendly_name.3 \
-		freefare.3 freefare_get_tag_type.3 \
-		freefare.3 freefare_get_tag_uid.3 \
-		freefare.3 freefare_get_tags.3 \
-		freefare_error.3 freefare_perror.3 \
-		freefare_error.3 freefare_strerror.3 \
-		freefare_error.3 freefare_strerror_r.3 \
-		mad.3 mad_free.3 \
-		mad.3 mad_get_aid.3 \
-		mad.3 mad_get_card_publisher_sector.3 \
-		mad.3 mad_get_version.3 \
-		mad.3 mad_new.3 \
-		mad.3 mad_read.3 \
-		mad.3 mad_set_aid.3 \
-		mad.3 mad_set_card_publisher_sector.3 \
-		mad.3 mad_set_version.3 \
-		mad.3 mad_write.3 \
-		mifare_application.3 mifare_application_alloc.3 \
-		mifare_application.3 mifare_application_find.3 \
-		mifare_application.3 mifare_application_free.3 \
-		mifare_application.3 mifare_application_read.3 \
-		mifare_application.3 mifare_application_write.3 \
-		mifare_classic.3 mifare_classic_authenticate.3 \
-		mifare_classic.3 mifare_classic_connect.3 \
-		mifare_classic.3 mifare_classic_decrement.3 \
-		mifare_classic.3 mifare_classic_disconnect.3 \
-		mifare_classic.3 mifare_classic_format_sector.3 \
-		mifare_classic.3 mifare_classic_get_data_block_permission.3 \
-		mifare_classic.3 mifare_classic_get_trailer_block_permission.3 \
-		mifare_classic.3 mifare_classic_get_uid.3 \
-		mifare_classic.3 mifare_classic_increment.3 \
-		mifare_classic.3 mifare_classic_init_value.3 \
-		mifare_classic.3 mifare_classic_read.3 \
-		mifare_classic.3 mifare_classic_read_value.3 \
-		mifare_classic.3 mifare_classic_restore.3 \
-		mifare_classic.3 mifare_classic_trailer_block.3 \
-		mifare_classic.3 mifare_classic_transfer.3 \
-		mifare_classic.3 mifare_classic_write.3 \
-		mifare_desfire.3 mifare_desfire_3k3des_key_new.3 \
-		mifare_desfire.3 mifare_desfire_3k3des_key_new_with_version.3 \
-		mifare_desfire.3 mifare_desfire_abort_transaction.3 \
-		mifare_desfire.3 mifare_desfire_aes_key_new.3 \
-		mifare_desfire.3 mifare_desfire_aes_key_new_with_version.3 \
-		mifare_desfire.3 mifare_desfire_aid_get_aid.3 \
-		mifare_desfire.3 mifare_desfire_authenticate.3 \
-		mifare_desfire.3 mifare_desfire_authenticate_aes.3 \
-		mifare_desfire.3 mifare_desfire_authenticate_iso.3 \
-		mifare_desfire.3 mifare_desfire_change_file_settings.3 \
-		mifare_desfire.3 mifare_desfire_change_key.3 \
-		mifare_desfire.3 mifare_desfire_change_key_settings.3 \
-		mifare_desfire.3 mifare_desfire_clear_record_file.3 \
-		mifare_desfire.3 mifare_desfire_commit_transaction.3 \
-		mifare_desfire.3 mifare_desfire_connect.3 \
-		mifare_desfire.3 mifare_desfire_create_application.3 \
-		mifare_desfire.3 mifare_desfire_create_backup_data_file.3 \
-		mifare_desfire.3 mifare_desfire_create_cyclic_record_file.3 \
-		mifare_desfire.3 mifare_desfire_create_linear_record_file.3 \
-		mifare_desfire.3 mifare_desfire_create_std_data_file.3 \
-		mifare_desfire.3 mifare_desfire_create_value_file.3 \
-		mifare_desfire.3 mifare_desfire_credit.3 \
-		mifare_desfire.3 mifare_desfire_credit_ex.3 \
-		mifare_desfire.3 mifare_desfire_debit.3 \
-		mifare_desfire.3 mifare_desfire_debit_ex.3 \
-		mifare_desfire.3 mifare_desfire_delete_application.3 \
-		mifare_desfire.3 mifare_desfire_delete_file.3 \
-		mifare_desfire.3 mifare_desfire_disconnect.3 \
-		mifare_desfire.3 mifare_desfire_format_picc.3 \
-		mifare_desfire.3 mifare_desfire_free_application_ids.3 \
-		mifare_desfire.3 mifare_desfire_free_mem.3 \
-		mifare_desfire.3 mifare_desfire_get_application_ids.3 \
-		mifare_desfire.3 mifare_desfire_get_card_uid.3 \
-		mifare_desfire.3 mifare_desfire_get_file_ids.3 \
-		mifare_desfire.3 mifare_desfire_get_file_settings.3 \
-		mifare_desfire.3 mifare_desfire_get_key_settings.3 \
-		mifare_desfire.3 mifare_desfire_get_key_version.3 \
-		mifare_desfire.3 mifare_desfire_get_value.3 \
-		mifare_desfire.3 mifare_desfire_get_value_ex.3 \
-		mifare_desfire.3 mifare_desfire_get_version.3 \
-		mifare_desfire.3 mifare_desfire_last_pcd_error.3 \
-		mifare_desfire.3 mifare_desfire_last_picc_error.3 \
-		mifare_desfire.3 mifare_desfire_limited_credit.3 \
-		mifare_desfire.3 mifare_desfire_limited_credit_ex.3 \
-		mifare_desfire.3 mifare_desfire_read_data.3 \
-		mifare_desfire.3 mifare_desfire_read_data_ex.3 \
-		mifare_desfire.3 mifare_desfire_read_records.3 \
-		mifare_desfire.3 mifare_desfire_read_records_ex.3 \
-		mifare_desfire.3 mifare_desfire_select_application.3 \
-		mifare_desfire.3 mifare_desfire_set_ats.3 \
-		mifare_desfire.3 mifare_desfire_set_configuration.3 \
-		mifare_desfire.3 mifare_desfire_set_default_key.3 \
-		mifare_desfire.3 mifare_desfire_write_data.3 \
-		mifare_desfire.3 mifare_desfire_write_data_ex.3 \
-		mifare_desfire.3 mifare_desfire_write_record.3 \
-		mifare_desfire.3 mifare_desfire_write_record_ex.3 \
-		mifare_desfire_aid.3 mifare_desfire_aid_new.3 \
-		mifare_desfire_aid.3 mifare_desfire_aid_new_with_mad_aid.3 \
-		mifare_desfire_key.3 mifare_desfire_3des_key_new.3 \
-		mifare_desfire_key.3 mifare_desfire_3des_key_new_with_version.3 \
-		mifare_desfire_key.3 mifare_desfire_des_key_new.3 \
-		mifare_desfire_key.3 mifare_desfire_des_key_new_with_version.3 \
-		mifare_desfire_key.3 mifare_desfire_key_free.3 \
-		mifare_desfire_key.3 mifare_desfire_key_get_version.3 \
-		mifare_desfire_key.3 mifare_desfire_key_set_version.3 \
-		mifare_ultralight.3 mifare_ultralight_connect.3 \
-		mifare_ultralight.3 mifare_ultralight_disconnect.3 \
-		mifare_ultralight.3 mifare_ultralight_get_uid.3 \
-		mifare_ultralight.3 mifare_ultralight_read.3 \
-		mifare_ultralight.3 mifare_ultralight_write.3 \
-		mifare_ultralight.3 mifare_ultralightc_authenticate.3 \
-		tlv.3 tlv_decode.3 \
-		tlv.3 tlv_encode.3
+USES=		pathfix gmake 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 <bsd.port.mk>
diff --git a/devel/libfreefare/distinfo b/devel/libfreefare/distinfo
index b76329f237cc..19b3b0fe2e84 100644
--- a/devel/libfreefare/distinfo
+++ b/devel/libfreefare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libfreefare-0.3.1.tar.gz) = 724e8340dff8bb8e632820b4c52363bff1efa40e0a345ced148e2790e124fe81
-SIZE (libfreefare-0.3.1.tar.gz) = 458221
+SHA256 (libfreefare-0.4.0.tar.bz2) = bfa31d14a99a1247f5ed49195d6373de512e3eb75bf1627658b40cf7f876bc64
+SIZE (libfreefare-0.4.0.tar.bz2) = 386294
diff --git a/devel/libfreefare/pkg-plist b/devel/libfreefare/pkg-plist
index 0fdefceeabc9..8d9e793c3e30 100644
--- a/devel/libfreefare/pkg-plist
+++ b/devel/libfreefare/pkg-plist
@@ -1,15 +1,141 @@
 bin/mifare-classic-format
+bin/mifare-classic-read-ndef
 bin/mifare-classic-write-ndef
 bin/mifare-desfire-access
+bin/mifare-desfire-create-ndef
 bin/mifare-desfire-ev1-configure-ats
 bin/mifare-desfire-ev1-configure-default-key
 bin/mifare-desfire-ev1-configure-random-uid
 bin/mifare-desfire-format
 bin/mifare-desfire-info
+bin/mifare-desfire-read-ndef
 bin/mifare-desfire-write-ndef
+bin/mifare-ultralight-info
 include/freefare.h
 lib/libfreefare.a
 lib/libfreefare.la
 lib/libfreefare.so
 lib/libfreefare.so.0
 libdata/pkgconfig/libfreefare.pc
+man/man3/freefare.3.gz
+man/man3/freefare_error.3.gz
+man/man3/freefare_free_tags.3.gz
+man/man3/freefare_get_tag_friendly_name.3.gz
+man/man3/freefare_get_tag_type.3.gz
+man/man3/freefare_get_tag_uid.3.gz
+man/man3/freefare_get_tags.3.gz
+man/man3/freefare_perror.3.gz
+man/man3/freefare_strerror.3.gz
+man/man3/freefare_strerror_r.3.gz
+man/man3/mad.3.gz
+man/man3/mad_free.3.gz
+man/man3/mad_get_aid.3.gz
+man/man3/mad_get_card_publisher_sector.3.gz
+man/man3/mad_get_version.3.gz
+man/man3/mad_new.3.gz
+man/man3/mad_read.3.gz
+man/man3/mad_set_aid.3.gz
+man/man3/mad_set_card_publisher_sector.3.gz
+man/man3/mad_set_version.3.gz
+man/man3/mad_write.3.gz
+man/man3/mifare_application.3.gz
+man/man3/mifare_application_alloc.3.gz
+man/man3/mifare_application_find.3.gz
+man/man3/mifare_application_free.3.gz
+man/man3/mifare_application_read.3.gz
+man/man3/mifare_application_write.3.gz
+man/man3/mifare_classic.3.gz
+man/man3/mifare_classic_authenticate.3.gz
+man/man3/mifare_classic_connect.3.gz
+man/man3/mifare_classic_decrement.3.gz
+man/man3/mifare_classic_disconnect.3.gz
+man/man3/mifare_classic_format_sector.3.gz
+man/man3/mifare_classic_get_data_block_permission.3.gz
+man/man3/mifare_classic_get_trailer_block_permission.3.gz
+man/man3/mifare_classic_get_uid.3.gz
+man/man3/mifare_classic_increment.3.gz
+man/man3/mifare_classic_init_value.3.gz
+man/man3/mifare_classic_read.3.gz
+man/man3/mifare_classic_read_value.3.gz
+man/man3/mifare_classic_restore.3.gz
+man/man3/mifare_classic_trailer_block.3.gz
+man/man3/mifare_classic_transfer.3.gz
+man/man3/mifare_classic_write.3.gz
+man/man3/mifare_desfire.3.gz
+man/man3/mifare_desfire_3des_key_new.3.gz
+man/man3/mifare_desfire_3des_key_new_with_version.3.gz
+man/man3/mifare_desfire_3k3des_key_new.3.gz
+man/man3/mifare_desfire_3k3des_key_new_with_version.3.gz
+man/man3/mifare_desfire_abort_transaction.3.gz
+man/man3/mifare_desfire_aes_key_new.3.gz
+man/man3/mifare_desfire_aes_key_new_with_version.3.gz
+man/man3/mifare_desfire_aid.3.gz
+man/man3/mifare_desfire_aid_get_aid.3.gz
+man/man3/mifare_desfire_aid_new.3.gz
+man/man3/mifare_desfire_aid_new_with_mad_aid.3.gz
+man/man3/mifare_desfire_authenticate.3.gz
+man/man3/mifare_desfire_authenticate_aes.3.gz
+man/man3/mifare_desfire_authenticate_iso.3.gz
+man/man3/mifare_desfire_change_file_settings.3.gz
+man/man3/mifare_desfire_change_key.3.gz
+man/man3/mifare_desfire_change_key_settings.3.gz
+man/man3/mifare_desfire_clear_record_file.3.gz
+man/man3/mifare_desfire_commit_transaction.3.gz
+man/man3/mifare_desfire_connect.3.gz
+man/man3/mifare_desfire_create_application.3.gz
+man/man3/mifare_desfire_create_backup_data_file.3.gz
+man/man3/mifare_desfire_create_cyclic_record_file.3.gz
+man/man3/mifare_desfire_create_linear_record_file.3.gz
+man/man3/mifare_desfire_create_std_data_file.3.gz
+man/man3/mifare_desfire_create_value_file.3.gz
+man/man3/mifare_desfire_credit.3.gz
+man/man3/mifare_desfire_credit_ex.3.gz
+man/man3/mifare_desfire_debit.3.gz
+man/man3/mifare_desfire_debit_ex.3.gz
+man/man3/mifare_desfire_delete_application.3.gz
+man/man3/mifare_desfire_delete_file.3.gz
+man/man3/mifare_desfire_des_key_new.3.gz
+man/man3/mifare_desfire_des_key_new_with_version.3.gz
+man/man3/mifare_desfire_disconnect.3.gz
+man/man3/mifare_desfire_format_picc.3.gz
+man/man3/mifare_desfire_free_application_ids.3.gz
+man/man3/mifare_desfire_free_mem.3.gz
+man/man3/mifare_desfire_get_application_ids.3.gz
+man/man3/mifare_desfire_get_card_uid.3.gz
+man/man3/mifare_desfire_get_file_ids.3.gz
+man/man3/mifare_desfire_get_file_settings.3.gz
+man/man3/mifare_desfire_get_key_settings.3.gz
+man/man3/mifare_desfire_get_key_version.3.gz
+man/man3/mifare_desfire_get_value.3.gz
+man/man3/mifare_desfire_get_value_ex.3.gz
+man/man3/mifare_desfire_get_version.3.gz
+man/man3/mifare_desfire_key.3.gz
+man/man3/mifare_desfire_key_free.3.gz
+man/man3/mifare_desfire_key_get_version.3.gz
+man/man3/mifare_desfire_key_set_version.3.gz
+man/man3/mifare_desfire_last_pcd_error.3.gz
+man/man3/mifare_desfire_last_picc_error.3.gz
+man/man3/mifare_desfire_limited_credit.3.gz
+man/man3/mifare_desfire_limited_credit_ex.3.gz
+man/man3/mifare_desfire_read_data.3.gz
+man/man3/mifare_desfire_read_data_ex.3.gz
+man/man3/mifare_desfire_read_records.3.gz
+man/man3/mifare_desfire_read_records_ex.3.gz
+man/man3/mifare_desfire_select_application.3.gz
+man/man3/mifare_desfire_set_ats.3.gz
+man/man3/mifare_desfire_set_configuration.3.gz
+man/man3/mifare_desfire_set_default_key.3.gz
+man/man3/mifare_desfire_write_data.3.gz
+man/man3/mifare_desfire_write_data_ex.3.gz
+man/man3/mifare_desfire_write_record.3.gz
+man/man3/mifare_desfire_write_record_ex.3.gz
+man/man3/mifare_ultralight.3.gz
+man/man3/mifare_ultralight_connect.3.gz
+man/man3/mifare_ultralight_disconnect.3.gz
+man/man3/mifare_ultralight_get_uid.3.gz
+man/man3/mifare_ultralight_read.3.gz
+man/man3/mifare_ultralight_write.3.gz
+man/man3/mifare_ultralightc_authenticate.3.gz
+man/man3/tlv.3.gz
+man/man3/tlv_decode.3.gz
+man/man3/tlv_encode.3.gz