CVS commit: pkgsrc/security/lynis

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Thu Jan 18 16:26:05 UTC 2018

Modified Files:
        pkgsrc/security/lynis: Makefile

Log Message:
Make sure .orig files aren't installed


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/lynis/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/lynis/Makefile
diff -u pkgsrc/security/lynis/Makefile:1.1 pkgsrc/security/lynis/Makefile:1.2
--- pkgsrc/security/lynis/Makefile:1.1  Mon Jan 15 12:38:37 2018
+++ pkgsrc/security/lynis/Makefile      Thu Jan 18 16:26:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/01/15 12:38:37 sborrill Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/18 16:26:05 sborrill Exp $
 #
 
 DISTNAME=      lynis-2.5.9
@@ -11,7 +11,7 @@ COMMENT=      Perform security health scans f
 LICENSE=       gnu-gpl-v3
 
 NO_BUILD=      yes
-USE_TOOLS+=    pax
+USE_TOOLS+=    pax rm
 
 SUBST_CLASSES+=                libdir
 SUBST_STAGE.libdir=    pre-install
@@ -41,7 +41,7 @@ EGDIR=                ${PREFIX}/share/examples/${PKGBA
 
 BUILD_DEFS+=   PKG_SYSCONFBASE
 BUILD_DEFS+=   VARBASE
-AUTO_MKDIRS=                   yes
+AUTO_MKDIRS=   yes
 
 PKG_SYSCONFSUBDIR=     lynis
 CONF_FILES+=   share/examples/lynis/default.prf \
@@ -63,6 +63,8 @@ do-install:
        cd ${WRKSRC}/extras &&                                  \
                ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/extras
        cd ${WRKSRC}/include &&                                 \
+               ${RM} *.orig
+       cd ${WRKSRC}/include &&                                 \
                ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/include
        cd ${WRKSRC}/plugins &&                                 \
                ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/plugins