From da03fa1645f86f95aa86daf5a24c5bf68b6e72b3 Mon Sep 17 00:00:00 2001
From: Clement Laforet <clement@FreeBSD.org>
Date: Sun, 16 Jan 2005 18:56:48 +0000
Subject: - Be nicer with CFLAGS - Preserve autobench.conf by installing
 autobench.conf-dist

---
 benchmarks/autobench/files/patch-Makefile | 19 ++++++++++++++-----
 benchmarks/autobench/pkg-plist            |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/benchmarks/autobench/files/patch-Makefile b/benchmarks/autobench/files/patch-Makefile
index c142a3f5f832..74ea5a45bd7f 100644
--- a/benchmarks/autobench/files/patch-Makefile
+++ b/benchmarks/autobench/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Nov  1 17:15:35 2003
-+++ Makefile	Sat Nov  1 17:16:01 2003
+--- Makefile.orig	Thu May 27 18:59:27 2004
++++ Makefile	Sun Jan 16 19:44:14 2005
 @@ -20,9 +20,9 @@
  endif
  
@@ -8,8 +8,17 @@
 -CFLAGS=-O2 -Wall
 -DEBUG_FLAGS=-Wall -g
 +CC?=gcc
-+CFLAGS?=-O2 -Wall
-+DEBUG_FLAGSi?=-Wall -g
++CFLAGS+= -Wall
++DEBUG_FLAGS?=-Wall -g
  
- all: crfile sesslog
+ #---------------------------------------------------------------------------
+ # Release related 
+@@ -55,7 +55,7 @@
+ 	perl -pi -e 's/my \$$MASTER_CONFIG =.*$$/my \$$MASTER_CONFIG = "$$ENV{AB_CFG}";/' autobench
+ 	cp crfile autobench autobenchd autobench_admin sesslog bench2graph $(BINDIR)
+ 	cp autobenchd.1 autobench_admin.1 crfile.1 autobench.1 sesslog.1 bench2graph.1 $(MANDIR)
+-	cp autobench.conf $(ETCDIR)
++	cp autobench.conf $(ETCDIR)/autobench.conf-dist
  
+ clean: 
+ 	rm -f crfile sesslog
diff --git a/benchmarks/autobench/pkg-plist b/benchmarks/autobench/pkg-plist
index 89abdec94138..a493a37196b1 100644
--- a/benchmarks/autobench/pkg-plist
+++ b/benchmarks/autobench/pkg-plist
@@ -4,4 +4,4 @@ bin/autobenchd
 bin/bench2graph
 bin/crfile
 bin/sesslog
-etc/autobench.conf
+etc/autobench.conf-dist
-- 
cgit v1.2.3