Index: branches/2017Q2/security/duo/Makefile
===================================================================
--- branches/2017Q2/security/duo/Makefile	(revision 440068)
+++ branches/2017Q2/security/duo/Makefile	(revision 440069)
@@ -1,40 +1,39 @@
 # Created by: Ryan Steinmetz <zi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	duo
-PORTVERSION=	1.9.19
+PORTVERSION=	1.9.20
 CATEGORIES=	security
 MASTER_SITES=	https://dl.duosecurity.com/ \
 		http://mirrors.rit.edu/zi/
 DISTNAME=	${PORTNAME}_unix-${PORTVERSION}
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Duo unix integration package
 
 LICENSE=	GPLv2
 
 CONFIGURE_ARGS=	--with-pam=${PREFIX}/lib/security --sysconfdir=${PREFIX}/etc \
 		--docdir=${DOCSDIR} --includedir=${PREFIX}/include/${PORTNAME}
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix ssl
 USE_LDCONFIG=	yes
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's| /etc| ${PREFIX}/etc|g' \
-	    ${WRKSRC}/pam_duo/pam_duo.8 \
-	    ${WRKSRC}/login_duo/login_duo.8
+	${REINPLACE_CMD} -e 's| /etc| ${PREFIX}/etc|g' \
+		${WRKSRC}/pam_duo/pam_duo.8 \
+		${WRKSRC}/login_duo/login_duo.8
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libduo.so.3
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/security/pam_duo.so
 	${INSTALL_DATA} ${WRKSRC}/login_duo/login_duo.conf \
-	    ${STAGEDIR}${PREFIX}/etc/login_duo.conf.sample
+		${STAGEDIR}${PREFIX}/etc/login_duo.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/pam_duo/pam_duo.conf \
-	    ${STAGEDIR}${PREFIX}/etc/pam_duo.conf.sample
+		${STAGEDIR}${PREFIX}/etc/pam_duo.conf.sample
 
 .include <bsd.port.mk>
Index: branches/2017Q2/security/duo/distinfo
===================================================================
--- branches/2017Q2/security/duo/distinfo	(revision 440068)
+++ branches/2017Q2/security/duo/distinfo	(revision 440069)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471562725
-SHA256 (duo_unix-1.9.19.tar.gz) = 2d23f9700f091da1c9113b45919203b37fac6392a9e24a666c7b0269a7571b0a
-SIZE (duo_unix-1.9.19.tar.gz) = 470432
+TIMESTAMP = 1493852286
+SHA256 (duo_unix-1.9.20.tar.gz) = 1297ddfa62fa6f8ae9589cbe9bd0bc337d0ad6d8b2fbf2f09268a2f856bbb97f
+SIZE (duo_unix-1.9.20.tar.gz) = 470354
Index: branches/2017Q2/security/duo/files/patch-pam__duo_Makefile.in
===================================================================
--- branches/2017Q2/security/duo/files/patch-pam__duo_Makefile.in	(revision 440068)
+++ branches/2017Q2/security/duo/files/patch-pam__duo_Makefile.in	(revision 440069)
@@ -1,18 +1,23 @@
---- pam_duo/Makefile.in.orig	2015-03-02 13:18:58 UTC
+--- pam_duo/Makefile.in.orig	2017-05-03 23:03:21 UTC
 +++ pam_duo/Makefile.in
-@@ -713,15 +713,6 @@ semodule-remove:
- .PHONY: semodule semodule-remove
+@@ -725,20 +725,6 @@ clean-local-semodule:
+ .PHONY: semodule semodule-enable semodule-install semodule-remove clean-local-semodule
  
  install-data-local:
 -	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
 -	-@if [ ! -f $(DESTDIR)$(sysconfdir)/pam_duo.conf ]; then \
 -		cp pam_duo.conf $(DESTDIR)$(sysconfdir)/pam_duo.conf; \
 -		echo "Created ${DESTDIR}$(sysconfdir)/pam_duo.conf"; \
 -		echo "Please edit it to add your Duo integration and secret keys"; \
 -	else \
 -		echo "Found existing ${DESTDIR}$(sysconfdir)/pam_duo.conf - updating permissions"; \
 -	fi
 -	-chmod 600 $(DESTDIR)$(sysconfdir)/pam_duo.conf
+-	-@if test "x$(IS_AIX)" = "xyes"; then \
+-		rm -f $(PAMDIR)/pam_duo.so; \
+-		ar x $(top_builddir)/pam_duo/.libs/pam_duo.a $(PAMDIR)/pam_duo.so; \
+-		echo "Extracting shared object ${PAMDIR}/pam_duo.so from $(top_builddir)/pam_duo/.libs/pam_duo.a"; \
+-	fi
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ uninstall-local:
+ 	-@if test "x$(IS_AIX)" = "xyes"; then \
Index: branches/2017Q2/security/duo/pkg-plist
===================================================================
--- branches/2017Q2/security/duo/pkg-plist	(revision 440068)
+++ branches/2017Q2/security/duo/pkg-plist	(revision 440069)
@@ -1,19 +1,15 @@
 @sample(sshd,,0600) etc/login_duo.conf.sample
 @sample(,,0600) etc/pam_duo.conf.sample
 include/duo/duo.h
 include/duo/util.h
 include/duo/shell.h
-lib/libduo.so.3.0.0
-lib/libduo.so.3
-lib/libduo.so
-lib/libduo.a
 libdata/pkgconfig/libduo.pc
 lib/security/pam_duo.so
 man/man3/duo.3.gz
 man/man8/login_duo.8.gz
 man/man8/pam_duo.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 sbin/login_duo
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 440068)
+++ branches/2017Q2	(revision 440069)

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