- LICENSE is gnu-gpl-v2

- Added DESTDIR support. All permission settings were kept as before.
- TEMPDIR is now changeable in the Makefile (see patch-ab).

3 files changed, 29 insertions, 11 deletions

diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index 419ed8929e9..e137017b0a4 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/10/29 20:36:10 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/11 19:48:21 heinz Exp $
 
 DISTNAME=	logcheck-1.1.1
 PKGREVISION=	1
@@ -8,15 +8,19 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sentrytools/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/sentrytools/
 COMMENT=	Auditing tool for system logs on Unix boxes
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NOT_FOR_UNPRIVILEGED=	yes
-OWN_DIRS=	/var/adm/tmp /var/adm
 
 PKG_SYSCONFSUBDIR=	logcheck
-EGDIR=		${PREFIX}/share/examples/logcheck
-CONF_FILES=
+EGDIR=			${PREFIX}/share/examples/logcheck
+TEMPDIR=		${VARBASE}/adm/tmp
+
 .for f in hacking ignore violations violations.ignore
-CONF_FILES+=	${EGDIR}/logcheck.${f} ${PKG_SYSCONFDIR}/logcheck.${f}
+CONF_FILES_PERMS+=	${EGDIR}/logcheck.${f} ${PKG_SYSCONFDIR}/logcheck.${f}\
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
 .endfor
 
 SUBST_CLASSES+=		prefix
@@ -25,9 +29,23 @@ SUBST_MESSAGE.prefix=	Fixing hard-coded paths.
 SUBST_FILES.prefix=	Makefile systems/freebsd/logcheck.sh
 SUBST_SED.prefix=	-e "s+/usr/local+${PREFIX}+g"
 SUBST_SED.prefix+=	-e "s+@PKG_SYSCONFDIR@+${PKG_SYSCONFDIR}+g"
+SUBST_SED.prefix+=	-e "s+@TEMPDIR@+${TEMPDIR}+g"
+
+INSTALLATION_DIRS+=	bin ${EGDIR}
+
+OWN_DIRS_PERMS+=	${TEMPDIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 
-pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
+SPECIAL_PERMS+=		${PREFIX}/bin/logcheck.sh ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
+SPECIAL_PERMS+=		${PREFIX}/bin/logtail ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/logtail ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/systems/freebsd/logcheck.sh \
+		${DESTDIR}${PREFIX}/bin
+.for f in hacking ignore violations violations.ignore
+	${INSTALL_DATA} ${WRKSRC}/systems/freebsd/logcheck.${f} \
+		${DESTDIR}${EGDIR}
+.endfor
 
 .include "../../devel/sysexits/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/logcheck/distinfo b/security/logcheck/distinfo
index 1cb26993e83..8ae8ae65158 100644
--- a/security/logcheck/distinfo
+++ b/security/logcheck/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:10:08 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/12/11 19:48:21 heinz Exp $
 
 SHA1 (logcheck-1.1.1.tar.gz) = 18f89f0dacfe9ff31076c006d58e1bcfedaa7f22
 RMD160 (logcheck-1.1.1.tar.gz) = 1865f598b4bf32af466d4aec5e0803249a61c442
 Size (logcheck-1.1.1.tar.gz) = 30267 bytes
 SHA1 (patch-aa) = 692e07b102925cad20e4e3e1ccea498d1aac72d5
-SHA1 (patch-ab) = 8392ffb3aea380869ed8ba33e58af3301708da41
+SHA1 (patch-ab) = 768a1193e38513bc848a0b622ab06a1d47f54ff3
diff --git a/security/logcheck/patches/patch-ab b/security/logcheck/patches/patch-ab
index 5e0b806bf5a..bc6d0da4f9b 100644
--- a/security/logcheck/patches/patch-ab
+++ b/security/logcheck/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2003/05/01 20:43:42 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/11 19:48:21 heinz Exp $
 
 --- systems/freebsd/logcheck.sh.orig	1999-10-31 16:07:29.000000000 +0100
 +++ systems/freebsd/logcheck.sh
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.3 2003/05/01 20:43:42 jmmv Exp $
  # use this directory for their "scratch" area. 
  
 -TMPDIR=/usr/local/etc/tmp
-+TMPDIR=/var/adm/tmp
++TMPDIR=@TEMPDIR@
  
  # The 'grep' command. This command MUST support the
  # '-i' '-v' and '-f' flags!! The GNU grep does this by default (that's