Thu Jan 18 16:26:05 2018 UTC ()
Make sure .orig files aren't installed


(sborrill)
diff -r1.1 -r1.2 pkgsrc/security/lynis/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/security/lynis/Makefile (expand / switch to unified diff)

--- pkgsrc/security/lynis/Makefile 2018/01/15 12:38:37 1.1
+++ pkgsrc/security/lynis/Makefile 2018/01/18 16:26:05 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.1 2018/01/15 12:38:37 sborrill Exp $ 1# $NetBSD: Makefile,v 1.2 2018/01/18 16:26:05 sborrill Exp $
2# 2#
3 3
4DISTNAME= lynis-2.5.9 4DISTNAME= lynis-2.5.9
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= https://cisofy.com/files/ 6MASTER_SITES= https://cisofy.com/files/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://cisofy.com/solutions/ 9HOMEPAGE= https://cisofy.com/solutions/
10COMMENT= Perform security health scans for Linux, macOS, and Unix 10COMMENT= Perform security health scans for Linux, macOS, and Unix
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13NO_BUILD= yes 13NO_BUILD= yes
14USE_TOOLS+= pax 14USE_TOOLS+= pax rm
15 15
16SUBST_CLASSES+= libdir 16SUBST_CLASSES+= libdir
17SUBST_STAGE.libdir= pre-install 17SUBST_STAGE.libdir= pre-install
18SUBST_MESSAGE.libdir= Fixing lib path 18SUBST_MESSAGE.libdir= Fixing lib path
19SUBST_FILES.libdir= lynis 19SUBST_FILES.libdir= lynis
20SUBST_SED.libdir= -e "s,@PREFIX@,${PREFIX}," 20SUBST_SED.libdir= -e "s,@PREFIX@,${PREFIX},"
21 21
22SUBST_CLASSES+= vardir 22SUBST_CLASSES+= vardir
23SUBST_STAGE.vardir= pre-install 23SUBST_STAGE.vardir= pre-install
24SUBST_MESSAGE.vardir= Fixing var path 24SUBST_MESSAGE.vardir= Fixing var path
25SUBST_FILES.vardir= lynis 25SUBST_FILES.vardir= lynis
26SUBST_SED.vardir= -e "s,@VARBASE@,${VARBASE}," 26SUBST_SED.vardir= -e "s,@VARBASE@,${VARBASE},"
27 27
@@ -31,40 +31,42 @@ SUBST_MESSAGE.confdir= Fixing conf path @@ -31,40 +31,42 @@ SUBST_MESSAGE.confdir= Fixing conf path
31SUBST_FILES.confdir= include/functions 31SUBST_FILES.confdir= include/functions
32SUBST_SED.confdir= -e "s,@CONFDIR@,${PKG_SYSCONFDIR}," 32SUBST_SED.confdir= -e "s,@CONFDIR@,${PKG_SYSCONFDIR},"
33 33
34WRKSRC= ${WRKDIR}/lynis 34WRKSRC= ${WRKDIR}/lynis
35INSTALLATION_DIRS+= bin ${PKGMANDIR}/man8 35INSTALLATION_DIRS+= bin ${PKGMANDIR}/man8
36INSTALLATION_DIRS+= share/examples/lynis 36INSTALLATION_DIRS+= share/examples/lynis
37INSTALLATION_DIRS+= lib/lynis/db lib/lynis/extras 37INSTALLATION_DIRS+= lib/lynis/db lib/lynis/extras
38INSTALLATION_DIRS+= lib/lynis/include lib/lynis/plugins 38INSTALLATION_DIRS+= lib/lynis/include lib/lynis/plugins
39 39
40EGDIR= ${PREFIX}/share/examples/${PKGBASE} 40EGDIR= ${PREFIX}/share/examples/${PKGBASE}
41 41
42BUILD_DEFS+= PKG_SYSCONFBASE 42BUILD_DEFS+= PKG_SYSCONFBASE
43BUILD_DEFS+= VARBASE 43BUILD_DEFS+= VARBASE
44AUTO_MKDIRS= yes 44AUTO_MKDIRS= yes
45 45
46PKG_SYSCONFSUBDIR= lynis 46PKG_SYSCONFSUBDIR= lynis
47CONF_FILES+= share/examples/lynis/default.prf \ 47CONF_FILES+= share/examples/lynis/default.prf \
48 ${PKG_SYSCONFDIR}/default.prf 48 ${PKG_SYSCONFDIR}/default.prf
49CONF_FILES+= share/examples/lynis/developer.prf \ 49CONF_FILES+= share/examples/lynis/developer.prf \
50 ${PKG_SYSCONFDIR}/developer.prf 50 ${PKG_SYSCONFDIR}/developer.prf
51 51
52do-install: 52do-install:
53 ${INSTALL_SCRIPT} ${WRKSRC}/lynis \ 53 ${INSTALL_SCRIPT} ${WRKSRC}/lynis \
54 ${DESTDIR}${PREFIX}/bin/lynis 54 ${DESTDIR}${PREFIX}/bin/lynis
55 ${INSTALL_MAN} ${WRKSRC}/lynis.8 \ 55 ${INSTALL_MAN} ${WRKSRC}/lynis.8 \
56 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/lynis.8 56 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/lynis.8
57 ${INSTALL_DATA} ${WRKSRC}/default.prf \ 57 ${INSTALL_DATA} ${WRKSRC}/default.prf \
58 ${DESTDIR}${EGDIR}/default.prf 58 ${DESTDIR}${EGDIR}/default.prf
59 ${INSTALL_DATA} ${WRKSRC}/developer.prf \ 59 ${INSTALL_DATA} ${WRKSRC}/developer.prf \
60 ${DESTDIR}${EGDIR}/developer.prf 60 ${DESTDIR}${EGDIR}/developer.prf
61 cd ${WRKSRC}/db && \ 61 cd ${WRKSRC}/db && \
62 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/db 62 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/db
63 cd ${WRKSRC}/extras && \ 63 cd ${WRKSRC}/extras && \
64 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/extras 64 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/extras
65 cd ${WRKSRC}/include && \ 65 cd ${WRKSRC}/include && \
 66 ${RM} *.orig
 67 cd ${WRKSRC}/include && \
66 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/include 68 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/include
67 cd ${WRKSRC}/plugins && \ 69 cd ${WRKSRC}/plugins && \
68 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/plugins 70 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/lynis/plugins
69 71
70.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"