6 files changed, 11 insertions, 41 deletions

diff --git a/security/duo/Makefile b/security/duo/Makefile
index 98bf8d883efc..eb2989a2224d 100644
--- a/security/duo/Makefile
+++ b/security/duo/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	duo
-PORTVERSION=	1.9.13
-PORTREVISION=	1
+PORTVERSION=	1.9.14
 CATEGORIES=	security
 MASTER_SITES=	https://dl.duosecurity.com/ \
 		http://mirrors.rit.edu/zi/
@@ -27,8 +26,9 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/login_duo/login_duo.8
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pam_duo/pam_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
diff --git a/security/duo/distinfo b/security/duo/distinfo
index f650830d30f3..56ae77f278e7 100644
--- a/security/duo/distinfo
+++ b/security/duo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (duo_unix-1.9.13.tar.gz) = 90397cd756669b22353d2ff024c6042affce23207e803bf9c1341ae3fc2e945a
-SIZE (duo_unix-1.9.13.tar.gz) = 466032
+SHA256 (duo_unix-1.9.14.tar.gz) = 415cf02981f66ba9447df81e2fcf41e004220126640cc5f667720d46c431abf9
+SIZE (duo_unix-1.9.14.tar.gz) = 467560
diff --git a/security/duo/files/patch-login__duo_Makefile.in b/security/duo/files/patch-login__duo_Makefile.in
index 88c0919c01ab..aee3667a27ea 100644
--- a/security/duo/files/patch-login__duo_Makefile.in
+++ b/security/duo/files/patch-login__duo_Makefile.in
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- login_duo/Makefile.in.orig
+--- login_duo/Makefile.in.orig	2015-03-02 13:12:34 UTC
 +++ login_duo/Makefile.in
-@@ -607,16 +607,6 @@
+@@ -714,16 +714,6 @@ install-exec-hook:
  	 chmod 4755 $(DESTDIR)$(sbindir)/login_duo
  
  install-data-local:
diff --git a/security/duo/files/patch-login_duo__login_duo.8 b/security/duo/files/patch-login_duo__login_duo.8
deleted file mode 100644
index f8488c9a51db..000000000000
--- a/security/duo/files/patch-login_duo__login_duo.8
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./login_duo/login_duo.8.orig	2011-07-17 22:00:28.000000000 -0400
-+++ ./login_duo/login_duo.8	2011-07-17 22:00:53.000000000 -0400
-@@ -111,7 +111,7 @@
- .Nm .
- .Sh FILES
- .Bl -tag -width ".Cm failmode"
--.It Pa /etc/duo/login_duo.conf
-+.It Pa %%PREFIX%%/etc/duo/login_duo.conf
- Default configuration file path
- .El
- .Sh AUTHORS
diff --git a/security/duo/files/patch-pam__duo_Makefile.in b/security/duo/files/patch-pam__duo_Makefile.in
index a97ac41b491b..4b443c009c14 100644
--- a/security/duo/files/patch-pam__duo_Makefile.in
+++ b/security/duo/files/patch-pam__duo_Makefile.in
@@ -1,13 +1,8 @@
-
-$FreeBSD$
-
---- pam_duo/Makefile.in.orig
+--- pam_duo/Makefile.in.orig	2015-03-02 13:18:58 UTC
 +++ pam_duo/Makefile.in
-@@ -595,17 +595,7 @@
- 	tags uninstall uninstall-am uninstall-man uninstall-man8 \
- 	uninstall-pam_libLTLIBRARIES
+@@ -713,15 +713,6 @@ semodule-remove:
+ .PHONY: semodule semodule-remove
  
--
  install-data-local:
 -	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
 -	-@if [ ! -f $(DESTDIR)$(sysconfdir)/pam_duo.conf ]; then \
diff --git a/security/duo/files/patch-pam_duo__pam_duo.8 b/security/duo/files/patch-pam_duo__pam_duo.8
deleted file mode 100644
index 1092c633add4..000000000000
--- a/security/duo/files/patch-pam_duo__pam_duo.8
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./pam_duo/pam_duo.8.orig	2011-07-17 22:01:01.000000000 -0400
-+++ ./pam_duo/pam_duo.8	2011-07-17 22:01:12.000000000 -0400
-@@ -60,7 +60,7 @@
- etc.
- .Sh FILES
- .Bl -tag -width ".Cm failmode"
--.It Pa /etc/duo/pam_duo.conf
-+.It Pa %%PREFIX%%/etc/duo/pam_duo.conf
- Default configuration file path
- .El
- .Sh AUTHORS