[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / security / logcheck / patches

File: [cvs.NetBSD.org] / pkgsrc / security / logcheck / patches / patch-aa (download)

Revision 1.3, Fri Nov 10 10:34:51 2017 UTC (4 years, 2 months ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, HEAD
Changes since 1.2: +11 -13 lines

logcheck: Remove unnecessary TMPDIR handling to be MAKE_JOBS safe.

$NetBSD: patch-aa,v 1.3 2017/11/10 10:34:51 jperkin Exp $

--- Makefile.orig	1999-10-31 15:07:29.000000000 +0000
+++ Makefile
@@ -5,13 +5,15 @@
 # Thanks to rbulling@obscure.org for cleaning this Makefile up..
 #
 
+SYSTYPE=freebsd
+
 # Generic compiler
- CC = cc
+ CC ?= cc
 # GNU..
 # CC = gcc 
 
 # Normal systems flags
-CFLAGS = -O
+CFLAGS ?= -O
 # Braindead HPUX compiler flags
 #CFLAGS = -O -Aa
 
@@ -19,35 +21,19 @@ CFLAGS = -O
 # the new paths!!
 
 # This is where keyword files go.
-INSTALLDIR = /usr/local/etc
+INSTALLDIR = /usr/local/share/examples/logcheck
 
 # This is where logtail will go
 INSTALLDIR_BIN = /usr/local/bin
 
 # Some people want the logcheck.sh in /usr/local/bin. Uncomment this
 # if you want this. /usr/local/etc was kept for compatibility reasons.
-#INSTALLDIR_SH = /usr/local/bin
-INSTALLDIR_SH = /usr/local/etc
-
-# The scratch directory for logcheck files.
-TMPDIR = /usr/local/etc/tmp
+INSTALLDIR_SH = /usr/local/bin
 
 # Debug mode for logtail
 # CFLAGS = -g -DDEBUG
 
-all:
-		@echo "Usage: make <systype>"
-		@echo "<systype> is one of: "
-		@echo "  linux, bsdos, freebsd, sun, generic, hpux, digital"
-		@echo "" 
-		@echo "NOTE: This will make and install the package in these" 
-		@echo "      directories:" 
-		@echo "        logcheck configuration files : $(INSTALLDIR)" 
-		@echo "        logcheck.sh shell script     : $(INSTALLDIR_SH)" 
-		@echo "        logtail program              : $(INSTALLDIR_BIN)" 
-		@echo "" 
-		@echo "Edit the makefile if you wish to change these paths." 
-		@echo "Any existing files will be overwritten."
+all: build
 
 clean:		
 		/bin/rm ./src/logtail ./src/logtail.o
@@ -60,19 +46,17 @@ uninstall:	
 		/bin/rm $(INSTALLDIR)/logcheck.violations.ignore
 		/bin/rm $(INSTALLDIR_BIN)/logtail
 
-install:	
+build:	
 		@echo "Making $(SYSTYPE)"
 		$(CC) $(CFLAGS) -o ./src/logtail ./src/logtail.c
-		@echo "Creating temp directory $(TMPDIR)"
-		@if [ ! -d $(TMPDIR) ]; then /bin/mkdir $(TMPDIR); fi
-		@echo "Setting temp directory permissions"
-		chmod 700 $(TMPDIR)
+
+install:
 		@echo "Copying files"
-		cp ./systems/$(SYSTYPE)/logcheck.hacking $(INSTALLDIR)
-		cp ./systems/$(SYSTYPE)/logcheck.violations $(INSTALLDIR)
-		cp ./systems/$(SYSTYPE)/logcheck.violations.ignore $(INSTALLDIR)
-		cp ./systems/$(SYSTYPE)/logcheck.ignore $(INSTALLDIR)
-		cp ./systems/$(SYSTYPE)/logcheck.sh $(INSTALLDIR_SH)
+		cp ./systems/$(SYSTYPE)/logcheck.hacking $(INSTALLDIR)/logcheck.hacking
+		cp ./systems/$(SYSTYPE)/logcheck.violations $(INSTALLDIR)/logcheck.violations
+		cp ./systems/$(SYSTYPE)/logcheck.violations.ignore $(INSTALLDIR)/logcheck.violations.ignore
+		cp ./systems/$(SYSTYPE)/logcheck.ignore $(INSTALLDIR)/logcheck.ignore
+		cp ./systems/$(SYSTYPE)/logcheck.sh $(INSTALLDIR_SH)/logcheck.sh
 		cp ./src/logtail $(INSTALLDIR_BIN)
 		@echo "Setting permissions"
 		chmod 700 $(INSTALLDIR_SH)/logcheck.sh