security/lynis: update to 1.3.0

- Update to 1.3.0 [1]
- Allow staging

PR:		ports/182016 [1]
Submitted by:	Kozlov Sergey <kozlov.sergey.404 gmail.com> [1]
Approved by:	maintainer (timeout)

3 files changed, 16 insertions, 24 deletions

diff --git a/security/lynis/Makefile b/security/lynis/Makefile
index 819bced7109a..c6188e917cc8 100644
--- a/security/lynis/Makefile
+++ b/security/lynis/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lynis
-PORTVERSION=	1.2.9
+PORTVERSION=	1.3.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.rootkit.nl/files/ \
 		http://downloads.rootkit.nl/
@@ -12,29 +12,21 @@ COMMENT=	Security and system auditing tool
 
 NO_BUILD=	yes
 
-PORTDOCS=	*
-MAN8=		lynis.8
+PORTDOCS=	CHANGELOG INSTALL FAQ LICENSE README
 
-NO_STAGE=	yes
 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} ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${MANPREFIX}/man/man8
-	${MKDIR} ${PREFIX}/etc/lynis
-	${INSTALL_DATA} ${WRKSRC}/default.prf ${PREFIX}/etc/lynis
-	${MKDIR} ${DATADIR}
-.for dir in include db dev plugins
-	cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DATADIR}/
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in CHANGELOG INSTALL FAQ LICENSE README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	${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}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "include db dev plugins" ${STAGEDIR}${DATADIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/lynis/distinfo b/security/lynis/distinfo
index 14c1ebf3e2af..902439ce0973 100644
--- a/security/lynis/distinfo
+++ b/security/lynis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lynis-1.2.9.tar.gz) = 51e69e0d45d6a879a0a22ba1144a49207dad7ed45764172769d67f21f60f5b79
-SIZE (lynis-1.2.9.tar.gz) = 117107
+SHA256 (lynis-1.3.0.tar.gz) = fe265965eb1ce8fac352e0bddea1d5ec6508c319bf88a5f63c2edecf2af6de54
+SIZE (lynis-1.3.0.tar.gz) = 119797
diff --git a/security/lynis/pkg-plist b/security/lynis/pkg-plist
index c1d7ecbda280..18385c1e245f 100644
--- a/security/lynis/pkg-plist
+++ b/security/lynis/pkg-plist
@@ -1,5 +1,6 @@
 bin/lynis
 etc/lynis/default.prf
+man/man8/lynis.8.gz
 %%DATADIR%%/db/fileperms.db
 %%DATADIR%%/db/hints.db
 %%DATADIR%%/db/integrity.db
@@ -12,11 +13,8 @@ etc/lynis/default.prf
 %%DATADIR%%/dev/check-lynis.sh
 %%DATADIR%%/dev/files.dat
 %%DATADIR%%/dev/openbsd/+CONTENTS
+%%DATADIR%%/plugins/custom_plugin.template
 %%DATADIR%%/plugins/README
-%%DATADIR%%/plugins/plugin_access_files
-%%DATADIR%%/plugins/plugin_compliance_pci
-%%DATADIR%%/plugins/plugin_homedirs
-%%DATADIR%%/plugins/plugin_webserver_data
 %%DATADIR%%/include/binaries
 %%DATADIR%%/include/consts
 %%DATADIR%%/include/functions
@@ -59,7 +57,9 @@ etc/lynis/default.prf
 %%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
 @dirrm %%DATADIR%%/include