CVS commit: pkgsrc/sysutils/logrider

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Oct 26 12:28:51 UTC 2019

Modified Files:
        pkgsrc/sysutils/logrider: Makefile distinfo
        pkgsrc/sysutils/logrider/patches: patch-logtail.sh

Log Message:
sysutils/logrider: clean up Makefile

No functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/logrider/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/logrider/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/logrider/patches/patch-logtail.sh

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

Modified files:

Index: pkgsrc/sysutils/logrider/Makefile
diff -u pkgsrc/sysutils/logrider/Makefile:1.1 pkgsrc/sysutils/logrider/Makefile:1.2
--- pkgsrc/sysutils/logrider/Makefile:1.1       Tue May  7 08:49:28 2013
+++ pkgsrc/sysutils/logrider/Makefile   Sat Oct 26 12:28:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/05/07 08:49:28 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/26 12:28:50 rillig Exp $
 #
 
 DISTNAME=      logrider-0.2
@@ -6,66 +6,43 @@ CATEGORIES=   sysutils
 MASTER_SITES=  http://ilya-evseev.narod.ru/posix/logrider/
 EXTRACT_SUFX=  .zip
 
-MAINTAINER=     francksys%free.fr@localhost
+MAINTAINER=    francksys%free.fr@localhost
 HOMEPAGE=      http://ilya-evseev.narod.ru/posix/logrider/
 COMMENT=       Monitor system logs for alerts
 LICENSE=       gnu-gpl-v2
 
-NO_CHECKSUM=yes
+NO_CHECKSUM=   yes
 EXTRACT_DIR=   ${WRKDIR}/${DISTNAME}
 USE_LANGUAGES= # none
 
 NO_BUILD=      YES
 USE_TOOLS+=    bash
 REPLACE_BASH=  logrider.sh logtail.sh
-PATCH_STRIP=    -p1
-
-SUBST_CLASSES+=               config_dir
-SUBST_STAGE.config_dir=      post-extract
-SUBST_MESSAGE.config_dir=    Replacing directories
-SUBST_FILES.config_dir=      logrider.conf logrider.sh
-SUBST_SED.config_dir=        -E -e 's|CONF_DIR(:?)=/etc|CONF_DIR\1=${PKG_SYSCONFDIR}|'
-
-SUBST_CLASSES+=                 conf_bin_tail
-SUBST_STAGE.conf_bin_tail=      post-extract
-SUBST_MESSAGE.conf_bin_tail=    Replacing directories
-SUBST_FILES.conf_bin_tail=      logrider.conf logrider.sh
-SUBST_SED.conf_bin_tail=        -E -e 's|LOGTAIL(:?)=/usr|LOGTAIL\1=${PREFIX}|'
+PATCH_STRIP=   -p1
 
+SUBST_CLASSES+=                dirs
+SUBST_STAGE.dirs=      post-extract
+SUBST_MESSAGE.dirs=    Replacing directories
+SUBST_FILES.dirs=      logrider.conf logrider.sh
+SUBST_SED.dirs=                -E
+SUBST_SED.dirs+=       -e 's|CONF_DIR(:?)=/etc|CONF_DIR\1=${PKG_SYSCONFDIR}|'
+SUBST_SED.dirs+=       -e 's|LOGTAIL(:?)=/usr|LOGTAIL\1=${PREFIX}|'
 
 BUILD_DEFS+=           VARBASE
 EGDIR=                 ${PREFIX}/share/examples/logrider
 INSTALLATION_DIRS=     bin ${EGDIR} ${EGDIR}/violations_ignore
 OWN_DIRS=              ${PKG_SYSCONFDIR}/logrider ${PKG_SYSCONFDIR}/logrider/violations_ignore ${VARBASE}/lib/logrider
 
-CONF_FILES= ${EGDIR}/logrider.conf ${PKG_SYSCONFDIR}/logrider/logrider.conf
-CONF_FILES+= ${EGDIR}/hacking ${PKG_SYSCONFDIR}/logrider/hacking
-CONF_FILES+= ${EGDIR}/ignore ${PKG_SYSCONFDIR}/logrider/ignore
-CONF_FILES+= ${EGDIR}/violations ${PKG_SYSCONFDIR}/logrider/violations
-CONF_FILES+= ${EGDIR}/violations_ignore/cvspserver ${PKG_SYSCONFDIR}/logrider/violations_ignore/cvspserver
-CONF_FILES+= ${EGDIR}/violations_ignore/ftp ${PKG_SYSCONFDIR}/logrider/violations_ignore/ftp
-CONF_FILES+= ${EGDIR}/violations_ignore/misc ${PKG_SYSCONFDIR}/logrider/violations_ignore/misc
-CONF_FILES+= ${EGDIR}/violations_ignore/nsfbackup ${PKG_SYSCONFDIR}/logrider/violations_ignore/nsfbackup
-CONF_FILES+= ${EGDIR}/violations_ignore/postfix ${PKG_SYSCONFDIR}/logrider/violations_ignore/postfix
-CONF_FILES+= ${EGDIR}/violations_ignore/drweb-postfix ${PKG_SYSCONFDIR}/logrider/violations_ignore/drweb-postfix
-CONF_FILES+= ${EGDIR}/violations_ignore/microbackup ${PKG_SYSCONFDIR}/logrider/violations_ignore/microbackup
-CONF_FILES+= ${EGDIR}/violations_ignore/named ${PKG_SYSCONFDIR}/logrider/violations_ignore/named
-CONF_FILES+= ${EGDIR}/violations_ignore/pam ${PKG_SYSCONFDIR}/logrider/violations_ignore/pam
-CONF_FILES+= ${EGDIR}/violations_ignore/sshd ${PKG_SYSCONFDIR}/logrider/violations_ignore/sshd
-
-V_IGNORE=              ${WRKSRC}/violations_ignore
+.for file in logrider.conf hacking ignore violations
+CONF_FILES+=   ${EGDIR}/${file} ${PKG_SYSCONFDIR}/logrider/${file}
+.endfor
+.for file in cvspserver ftp misc nsfbackup postfix drweb-postfix microbackup named pam sshd
+CONF_FILES+=   ${EGDIR}/violations_ignore/${file} ${PKG_SYSCONFDIR}/logrider/violations_ignore/${file}
+.endfor
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/logtail.sh ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/logrider.sh ${DESTDIR}${PREFIX}/bin
-
-       ${INSTALL_DATA} ${WRKSRC}/ignore ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/logrider.conf ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/hacking ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/violations ${DESTDIR}${EGDIR}
-
-       cd ${V_IGNORE} && for example in *; do \
-                       ${INSTALL_DATA} "$${example}" ${DESTDIR}${EGDIR}/violations_ignore; \
-                       done
+       cd ${WRKSRC} && ${INSTALL_SCRIPT} logtail.sh logrider.sh ${DESTDIR}${PREFIX}/bin
+       cd ${WRKSRC} && ${INSTALL_DATA} ignore logrider.conf hacking violations ${DESTDIR}${EGDIR}
+       cd ${WRKSRC}/violations_ignore && ${INSTALL_DATA} * ${DESTDIR}${EGDIR}/violations_ignore
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/logrider/distinfo
diff -u pkgsrc/sysutils/logrider/distinfo:1.2 pkgsrc/sysutils/logrider/distinfo:1.3
--- pkgsrc/sysutils/logrider/distinfo:1.2       Wed Nov  4 01:32:20 2015
+++ pkgsrc/sysutils/logrider/distinfo   Sat Oct 26 12:28:50 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:32:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/10/26 12:28:50 rillig Exp $
 
 SHA1 (logrider-0.2.zip) = d23c030d29f5776a8897a393cb4f61f37cde128d
 RMD160 (logrider-0.2.zip) = 5f63fea34cf322b28f30eb291f6409178f489f4a
 SHA512 (logrider-0.2.zip) = 04eebca51c141f0a787f435b71f5b8c6e4ed33cbdb68e237a9decf1a4ce1351ce9df1643b8fed7301dc16b743da16c78f871c9e88c4c1fe72af6c086a5dc2242
 Size (logrider-0.2.zip) = 12242 bytes
-SHA1 (patch-logtail.sh) = cdf37c97607654124b8bdd341606e25e47444e0e
+SHA1 (patch-logtail.sh) = 8502f2b6b7e09c5d8478e1d87713d9ca236c248b

Index: pkgsrc/sysutils/logrider/patches/patch-logtail.sh
diff -u pkgsrc/sysutils/logrider/patches/patch-logtail.sh:1.1 pkgsrc/sysutils/logrider/patches/patch-logtail.sh:1.2
--- pkgsrc/sysutils/logrider/patches/patch-logtail.sh:1.1       Tue May  7 08:49:28 2013
+++ pkgsrc/sysutils/logrider/patches/patch-logtail.sh   Sat Oct 26 12:28:50 2019
@@ -1,6 +1,7 @@
-$NetBSD: patch-logtail.sh,v 1.1 2013/05/07 08:49:28 wiz Exp $
+$NetBSD: patch-logtail.sh,v 1.2 2019/10/26 12:28:50 rillig Exp $
 
 # Replace stat arguments with NetBSD ones
+
 --- work/logtail.sh.orig       2003-04-14 00:56:00.000000000 +0000
 +++ work/logtail.sh    2013-05-05 07:23:46.000000000 +0000
 @@ -29,9 +29,9 @@