4 files changed, 10 insertions, 49 deletions

diff --git a/security/duo/Makefile b/security/duo/Makefile
index 56641bde6895..4f72e2cb3e14 100644
--- a/security/duo/Makefile
+++ b/security/duo/Makefile
@@ -16,39 +16,23 @@ LICENSE=	GPLv2
 CONFIGURE_ARGS=	--with-pam=${PREFIX}/lib/security --sysconfdir=${PREFIX}/etc \
 		--docdir=${DOCSDIR} --includedir=${PREFIX}/include/${PORTNAME}
 
+USES=		libtool pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} >= 1000000
-USE_GCC=	yes
-.endif
-
 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
-.if !${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's|README AUTHORS CHANGES LICENSE||g' ${WRKSRC}/Makefile.in
-.endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libduo.so.3
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/security/pam_duo.so
-	@${INSTALL} -o sshd -g wheel -m 700 ${WRKSRC}/login_duo/login_duo.conf \
+	${INSTALL_DATA} ${WRKSRC}/login_duo/login_duo.conf \
 	    ${STAGEDIR}${PREFIX}/etc/login_duo.conf.sample
-	@${INSTALL_DATA} -m 700 ${WRKSRC}/pam_duo/pam_duo.conf \
+	${INSTALL_DATA} ${WRKSRC}/pam_duo/pam_duo.conf \
 	    ${STAGEDIR}${PREFIX}/etc/pam_duo.conf.sample
-	@if [ ! -f ${PREFIX}/etc/login_duo.conf ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/login_duo.conf.sample \
-		    ${STAGEDIR}${PREFIX}/etc/login_duo.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/pam_duo.conf ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/pam_duo.conf.sample \
-		    ${STAGEDIR}${PREFIX}/etc/pam_duo.conf ; \
-	fi
 
 .include <bsd.port.mk>
diff --git a/security/duo/files/patch-lib__Makefile.am b/security/duo/files/patch-lib__Makefile.am
deleted file mode 100644
index 2be9bd6b89f4..000000000000
--- a/security/duo/files/patch-lib__Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/Makefile.am.orig	2011-03-28 16:38:36.000000000 -0400
-+++ ./lib/Makefile.am	2011-07-17 21:47:03.000000000 -0400
-@@ -18,7 +18,7 @@
- 
- notrans_dist_man3_MANS = duo.3
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libduo.pc
- 
- noinst_PROGRAMS = testduo
diff --git a/security/duo/files/patch-lib__Makefile.in b/security/duo/files/patch-lib__Makefile.in
deleted file mode 100644
index 422859d63748..000000000000
--- a/security/duo/files/patch-lib__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/Makefile.in.orig	2011-07-17 21:47:09.000000000 -0400
-+++ ./lib/Makefile.in	2011-07-17 21:47:16.000000000 -0400
-@@ -252,7 +252,7 @@
- libduo_la_includedir = $(includedir)
- libduo_la_include_HEADERS = duo.h
- notrans_dist_man3_MANS = duo.3
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libduo.pc
- testduo_LDADD = libduo.la
- all: all-am
diff --git a/security/duo/pkg-plist b/security/duo/pkg-plist
index b58815861324..50cf034844fb 100644
--- a/security/duo/pkg-plist
+++ b/security/duo/pkg-plist
@@ -1,18 +1,17 @@
-@unexec if cmp -s %D/etc/login_duo.conf.sample %D/etc/login_duo.conf; then rm -f %D/etc/login_duo.conf; fi
-etc/login_duo.conf.sample
-@exec if [ ! -f %D/etc/login_duo.conf ] ; then cp -p %D/%F %B/login_duo.conf; fi
-@unexec if cmp -s %D/etc/pam_duo.conf.sample %D/etc/pam_duo.conf; then rm -f %D/etc/pam_duo.conf; fi
-etc/pam_duo.conf.sample
-@exec if [ ! -f %D/etc/pam_duo.conf ] ; then cp -p %D/%F %B/pam_duo.conf; fi
+@mode 600
+@owner sshd
+@sample etc/login_duo.conf.sample
+@owner
+@sample etc/pam_duo.conf.sample
+@mode
 include/duo/duo.h
 include/duo/util.h
+lib/libduo.so.3.0.0
 lib/libduo.so.3
 lib/libduo.so
-lib/libduo.la
 lib/libduo.a
 libdata/pkgconfig/libduo.pc
 lib/security/pam_duo.so
-lib/security/pam_duo.la
 man/man3/duo.3.gz
 man/man8/login_duo.8.gz
 man/man8/pam_duo.8.gz