Index: branches/2016Q2/archivers/libarchive/Makefile
===================================================================
--- branches/2016Q2/archivers/libarchive/Makefile	(revision 417400)
+++ branches/2016Q2/archivers/libarchive/Makefile	(revision 417401)
@@ -1,105 +1,109 @@
 # $FreeBSD$
 
 PORTNAME=	libarchive
-PORTVERSION=	3.2.0
+PORTVERSION=	3.2.1
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://libarchive.org/downloads/
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Library to create and read several streaming archive formats
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	LZO NETTLE
 OPTIONS_DEFAULT=LZO
 
 LZO_DESC=	Support lzo compression via liblzo2
 NETTLE_DESC=	Use Nettle instead of OpenSSL
 
 USES=		cpe iconv libtool pathfix
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--without-xml2
 
 PLIST_FILES=	bin/bsdcat \
 		bin/bsdcpio \
 		bin/bsdtar \
 		include/archive.h \
 		include/archive_entry.h \
 		lib/libarchive.a \
 		lib/libarchive.so \
 		lib/libarchive.so.13 \
-		lib/libarchive.so.13.2.0 \
+		lib/libarchive.so.13.2.1 \
 		libdata/pkgconfig/libarchive.pc \
 		man/man1/bsdcat.1.gz \
 		man/man1/bsdcpio.1.gz \
 		man/man1/bsdtar.1.gz \
 		man/man3/archive_entry.3.gz \
 		man/man3/archive_entry_acl.3.gz \
 		man/man3/archive_entry_linkify.3.gz \
 		man/man3/archive_entry_paths.3.gz \
 		man/man3/archive_entry_perms.3.gz \
 		man/man3/archive_entry_stat.3.gz \
 		man/man3/archive_entry_time.3.gz \
 		man/man3/archive_read.3.gz \
 		man/man3/archive_read_add_passphrase.3.gz \
 		man/man3/archive_read_data.3.gz \
 		man/man3/archive_read_disk.3.gz \
 		man/man3/archive_read_extract.3.gz \
 		man/man3/archive_read_filter.3.gz \
 		man/man3/archive_read_format.3.gz \
 		man/man3/archive_read_free.3.gz \
 		man/man3/archive_read_header.3.gz \
 		man/man3/archive_read_new.3.gz \
 		man/man3/archive_read_open.3.gz \
 		man/man3/archive_read_set_options.3.gz \
 		man/man3/archive_util.3.gz \
 		man/man3/archive_write.3.gz \
 		man/man3/archive_write_blocksize.3.gz \
 		man/man3/archive_write_data.3.gz \
 		man/man3/archive_write_disk.3.gz \
 		man/man3/archive_write_filter.3.gz \
 		man/man3/archive_write_finish_entry.3.gz \
 		man/man3/archive_write_format.3.gz \
 		man/man3/archive_write_free.3.gz \
 		man/man3/archive_write_header.3.gz \
 		man/man3/archive_write_new.3.gz \
 		man/man3/archive_write_open.3.gz \
 		man/man3/archive_write_set_options.3.gz \
 		man/man3/archive_write_set_passphrase.3.gz \
 		man/man3/libarchive.3.gz \
 		man/man3/libarchive_changes.3.gz \
 		man/man3/libarchive_internals.3.gz \
 		man/man5/cpio.5.gz \
 		man/man5/libarchive-formats.5.gz \
 		man/man5/mtree.5.gz \
 		man/man5/tar.5.gz
 
 CFLAGS+=	"-I${LOCALBASE}/include"
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
 
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_WITH=	lzo2
 
 NETTLE_LIB_DEPENDS=	libnettle.so:security/nettle
 NETTLE_CONFIGURE_WITH=	nettle
 NETTLE_CONFIGURE_ON=	--without-openssl
 NETTLE_USE_OFF=		OPENSSL=yes
 NETTLE_CONFIGURE_OFF=	--with-openssl
 
 .include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002504
+CONFIGURE_ENV+=	ac_cv_lzma_has_mt=no
+.endif
 
 .if empty(ICONV_LIB)
 CONFIGURE_ENV+=	ac_cv_header_localcharset_h=no \
 		ac_cv_func_locale_charset=no \
 		ac_cv_lib_charset_locale_charset=no
 .endif
 
 check:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
 
 .include <bsd.port.post.mk>
Index: branches/2016Q2/archivers/libarchive/distinfo
===================================================================
--- branches/2016Q2/archivers/libarchive/distinfo	(revision 417400)
+++ branches/2016Q2/archivers/libarchive/distinfo	(revision 417401)
@@ -1,2 +1,3 @@
-SHA256 (libarchive-3.2.0.tar.gz) = 7bce45fd71ff01dc20d19edd78322d4965583d81b8bed8e26cacb65d6f5baa87
-SIZE (libarchive-3.2.0.tar.gz) = 5448095
+TIMESTAMP = 1466687824
+SHA256 (libarchive-3.2.1.tar.gz) = 72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2
+SIZE (libarchive-3.2.1.tar.gz) = 5448888
Index: branches/2016Q2
===================================================================
--- branches/2016Q2	(revision 417400)
+++ branches/2016Q2	(revision 417401)

Property changes on: branches/2016Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r417400