4 files changed, 18 insertions, 19 deletions

diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index 44e077765db5..fa2345f63498 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	logcheck
-PORTVERSION=	1.3.16
+PORTVERSION=	1.3.17
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -72,34 +72,34 @@ do-build:
 		${WRKSRC}/etc/logcheck.logfiles
 
 do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/detectrotate \
+		  ${STAGEDIR}${DBDIR} \
+		  ${STAGEDIR}${DOCSDIR} \
+		  ${STAGEDIR}${ETCDIR} \
+		  ${STAGEDIR}${EXAMPLESDIR} \
+		  ${STAGEDIR}${RUNDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/src/logcheck ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/logtail ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/logtail2 ${STAGEDIR}${PREFIX}/sbin
-	@${INSTALL} -d ${STAGEDIR}${DBDIR} ${STAGEDIR}${RUNDIR}
-	@${INSTALL} -d ${STAGEDIR}${ETCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/etc/logcheck.conf \
+	${INSTALL_DATA} ${WRKSRC}/etc/logcheck.conf \
 		${STAGEDIR}${ETCDIR}/logcheck.conf.sample
-	@${INSTALL_DATA} ${WRKSRC}/etc/logcheck.logfiles \
+	${INSTALL_DATA} ${WRKSRC}/etc/logcheck.logfiles \
 		${STAGEDIR}${ETCDIR}/logcheck.logfiles.sample
 .for i in ${CONFIG_DIRS}
-	@${INSTALL} -d ${STAGEDIR}${ETCDIR}/${i}
-	@${INSTALL_DATA} ${WRKSRC}/rulefiles/linux/${i}/* \
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/${i}
+	${INSTALL_DATA} ${WRKSRC}/rulefiles/linux/${i}/* \
 		${STAGEDIR}${ETCDIR}/${i}
 .endfor
-	@${INSTALL} -d ${STAGEDIR}${DATADIR}/detectrotate
-	@${INSTALL_DATA} ${WRKSRC}/src/detectrotate/*.dtr \
+	${INSTALL_DATA} ${WRKSRC}/src/detectrotate/*.dtr \
 		${STAGEDIR}${DATADIR}/detectrotate
-	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \
+	${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \
 		${STAGEDIR}${EXAMPLESDIR}/crontab.in
 	@${ECHO_CMD} '@exec ${CHGRP} -R ${LOGCHECK_GROUP} \
 		${ETCDIR:S|^${PREFIX}/|%D/|} \
 		${DATADIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
 .for i in ${MAN_FILES}
-	@${INSTALL_MAN} ${WRKSRC}/docs/$i ${STAGEDIR}${MAN8PREFIX}/man/man8
-	@${GZIP_CMD} ${STAGEDIR}${MAN8PREFIX}/man/man8/$i
+	${INSTALL_MAN} ${WRKSRC}/docs/$i ${STAGEDIR}${MAN8PREFIX}/man/man8
 .endfor
-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/security/logcheck/distinfo b/security/logcheck/distinfo
index 46ddd1586cf6..7daf3ac6ee56 100644
--- a/security/logcheck/distinfo
+++ b/security/logcheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (logcheck_1.3.16.tar.xz) = 3eea6f4d25b5cba59d30b8edd35e392389b8e4966d0aceac11c220e98426b8e6
-SIZE (logcheck_1.3.16.tar.xz) = 131832
+SHA256 (logcheck_1.3.17.tar.xz) = c2d3fc323e8c6555e91d956385dbfd0f67b55872ed0f6a7ad8ad2526a9faf03a
+SIZE (logcheck_1.3.17.tar.xz) = 130956
diff --git a/security/logcheck/files/extra-patch-src__logcheck.in b/security/logcheck/files/extra-patch-src__logcheck.in
index e9194228e284..d4dc8582a938 100644
--- a/security/logcheck/files/extra-patch-src__logcheck.in
+++ b/security/logcheck/files/extra-patch-src__logcheck.in
@@ -43,7 +43,7 @@
  SORTUNIQ=0
  SUPPORT_CRACKING_IGNORE=0
  SYSLOGSUMMARY=0
--LOCKDIR=/var/lock/logcheck
+-LOCKDIR=/run/lock/logcheck
 +LOCKDIR=/var/run/logcheck
  LOCKFILE="$LOCKDIR/logcheck"
  
diff --git a/security/logcheck/pkg-plist b/security/logcheck/pkg-plist
index 6baa5fc6f1b1..5b536bf0f127 100644
--- a/security/logcheck/pkg-plist
+++ b/security/logcheck/pkg-plist
@@ -47,7 +47,6 @@
 %%ETCDIR%%/ignore.d.server/dhcp
 %%ETCDIR%%/ignore.d.server/dictd
 %%ETCDIR%%/ignore.d.server/dkfilter
-%%ETCDIR%%/ignore.d.server/dkim-filter
 %%ETCDIR%%/ignore.d.server/dnsmasq
 %%ETCDIR%%/ignore.d.server/dovecot
 %%ETCDIR%%/ignore.d.server/dropbear