svn commit: r360401 - in head/security/duo: . files

[Jason E. Hale]

Author: jhale
Date: Thu Jul  3 16:16:49 2014
New Revision: 360401
URL: http://svnweb.freebsd.org/changeset/ports/360401
QAT: https://qat.redports.org/buildarchive/r360401/

Log:
  - Fix perms/owner of config files
  - USES=pathfix instead of patches
  - USES=libtool, drop .la files
  - Remove PORTDOCS hack
  - Remove USE_GCC, it builds fine with clang
  
  PR:		191580 (based on)
  Submitted by:	Ben <public at niessen.ch>
  Approved by:	zi (maintainer)

Deleted:
  head/security/duo/files/patch-lib__Makefile.am
  head/security/duo/files/patch-lib__Makefile.in
Modified:
  head/security/duo/Makefile
  head/security/duo/pkg-plist

Modified: head/security/duo/Makefile
==============================================================================
--- head/security/duo/Makefile	Thu Jul  3 16:15:20 2014	(r360400)
+++ head/security/duo/Makefile	Thu Jul  3 16:16:49 2014	(r360401)
@@ -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>

Modified: head/security/duo/pkg-plist
==============================================================================
--- head/security/duo/pkg-plist	Thu Jul  3 16:15:20 2014	(r360400)
+++ head/security/duo/pkg-plist	Thu Jul  3 16:16:49 2014	(r360401)
@@ -1,18 +1,17 @@
- at 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
- at exec if [ ! -f %D/etc/login_duo.conf ] ; then cp -p %D/%F %B/login_duo.conf; fi
- at 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
- at exec if [ ! -f %D/etc/pam_duo.conf ] ; then cp -p %D/%F %B/pam_duo.conf; fi
+ at mode 600
+ at owner sshd
+ at sample etc/login_duo.conf.sample
+ at owner
+ at sample etc/pam_duo.conf.sample
+ at 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