Index: head/security/lynis/Makefile
===================================================================
--- head/security/lynis/Makefile	(revision 370831)
+++ head/security/lynis/Makefile	(revision 370832)
@@ -1,33 +1,38 @@
 # Created by: Cory McIntire (loon@noncensored.com)
 # $FreeBSD$
 
 PORTNAME=	lynis
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.2
 CATEGORIES=	security
 MASTER_SITES=	http://cisofy.com/files/
 
-MAINTAINER=	loon@noncensored.com
+MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Security and system auditing tool
 
 LICENSE=	GPLv3
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
 PORTDOCS=	FAQ LICENSE README
 
 post-patch:
 	@${REINPLACE_CMD} -e '/tINCLUDE_TARGETS/ s|".*"|"${DATADIR}/include"|; \
 		/tPLUGIN_TARGETS/ s|".*"|"${DATADIR}/plugins"|; \
 		/tDB_TARGETS/ s|".*"|"${DATADIR}/db"|' ${WRKSRC}/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/lynis
-	${INSTALL_DATA} ${WRKSRC}/default.prf ${STAGEDIR}${PREFIX}/etc/lynis
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/default.prf \
+		${STAGEDIR}${PREFIX}/etc/${PORTNAME}/default.prf.sample
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "include db dev plugins" ${STAGEDIR}${DATADIR}/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "include db plugins" ${STAGEDIR}${DATADIR}/
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/bash_completion.d
+	${INSTALL_DATA} ${WRKSRC}/dev/bash_completion.d/${PORTNAME} \
+		${STAGEDIR}${EXAMPLESDIR}/bash_completion.d/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/lynis/distinfo
===================================================================
--- head/security/lynis/distinfo	(revision 370831)
+++ head/security/lynis/distinfo	(revision 370832)
@@ -1,2 +1,2 @@
-SHA256 (lynis-1.5.0.tar.gz) = dc5035b49b065bb7d1f6b75b387127c9306526774bb87f9aa8c8e6d2363a51b1
-SIZE (lynis-1.5.0.tar.gz) = 145407
+SHA256 (lynis-1.6.2.tar.gz) = fdaaabd9e2d159af7677b8012a1ac6e0230e357918707732d7ca9d8b1156c135
+SIZE (lynis-1.6.2.tar.gz) = 166513
Index: head/security/lynis/pkg-plist
===================================================================
--- head/security/lynis/pkg-plist	(revision 370831)
+++ head/security/lynis/pkg-plist	(revision 370832)
@@ -1,74 +1,63 @@
 bin/lynis
-etc/lynis/default.prf
+@sample etc/lynis/default.prf.sample
 man/man8/lynis.8.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bash_completion.d/lynis
 %%DATADIR%%/db/fileperms.db
 %%DATADIR%%/db/hints.db
 %%DATADIR%%/db/integrity.db
 %%DATADIR%%/db/malware.db
 %%DATADIR%%/db/malware-susp.db
 %%DATADIR%%/db/sbl.db
-%%DATADIR%%/dev/TODO
-%%DATADIR%%/dev/README
-%%DATADIR%%/dev/build-lynis.sh
-%%DATADIR%%/dev/check-lynis.sh
-%%DATADIR%%/dev/files.dat
-%%DATADIR%%/dev/openbsd/+CONTENTS
 %%DATADIR%%/plugins/custom_plugin.template
 %%DATADIR%%/plugins/README
+@mode 0400
 %%DATADIR%%/include/binaries
 %%DATADIR%%/include/consts
+%%DATADIR%%/include/data_upload
 %%DATADIR%%/include/functions
 %%DATADIR%%/include/osdetection
 %%DATADIR%%/include/parameters
 %%DATADIR%%/include/profiles
 %%DATADIR%%/include/report
-@mode 0400
 %%DATADIR%%/include/tests_accounting
 %%DATADIR%%/include/tests_authentication
 %%DATADIR%%/include/tests_banners
 %%DATADIR%%/include/tests_boot_services
 %%DATADIR%%/include/tests_crypto
 %%DATADIR%%/include/tests_custom.template
 %%DATADIR%%/include/tests_databases
 %%DATADIR%%/include/tests_file_integrity
 %%DATADIR%%/include/tests_file_permissions
 %%DATADIR%%/include/tests_filesystems
 %%DATADIR%%/include/tests_firewalls
 %%DATADIR%%/include/tests_hardening_tools
 %%DATADIR%%/include/tests_hardening
 %%DATADIR%%/include/tests_homedirs
 %%DATADIR%%/include/tests_insecure_services
 %%DATADIR%%/include/tests_kernel
 %%DATADIR%%/include/tests_kernel_hardening
 %%DATADIR%%/include/tests_ldap
 %%DATADIR%%/include/tests_logging
 %%DATADIR%%/include/tests_mac_frameworks
 %%DATADIR%%/include/tests_mail_messaging
 %%DATADIR%%/include/tests_malware
 %%DATADIR%%/include/tests_memory_processes
 %%DATADIR%%/include/tests_nameservices
 %%DATADIR%%/include/tests_networking
 %%DATADIR%%/include/tests_php
 %%DATADIR%%/include/tests_ports_packages
 %%DATADIR%%/include/tests_printers_spools
 %%DATADIR%%/include/tests_scheduling
 %%DATADIR%%/include/tests_shells
 %%DATADIR%%/include/tests_snmp
 %%DATADIR%%/include/tests_solaris
 %%DATADIR%%/include/tests_squid
 %%DATADIR%%/include/tests_ssh
 %%DATADIR%%/include/tests_storage
 %%DATADIR%%/include/tests_storage_nfs
 %%DATADIR%%/include/tests_tcpwrappers
 %%DATADIR%%/include/tests_time
 %%DATADIR%%/include/tests_tooling
 %%DATADIR%%/include/tests_virtualization
 %%DATADIR%%/include/tests_webservers
 @mode
-@dirrm %%DATADIR%%/include
-@dirrm %%DATADIR%%/dev/openbsd
-@dirrm %%DATADIR%%/dev
-@dirrm %%DATADIR%%/db
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%
-@dirrm etc/lynis