summaryrefslogtreecommitdiffstats
path: root/sysutils/logtool
diff options
context:
space:
mode:
authorijliao <ijliao@FreeBSD.org>2001-01-29 02:03:50 +0000
committerijliao <ijliao@FreeBSD.org>2001-01-29 02:03:50 +0000
commite3f961fa206a68685e8e49c7befb295f5927ab12 (patch)
tree60088d4096146331a89bd7b6b01b2b07cf2bb46d /sysutils/logtool
parentda7c7237331c2aec545583ae095ab34ed2efe780 (diff)
downloadFreeBSD-ports-e3f961fa206a68685e8e49c7befb295f5927ab12.zip
FreeBSD-ports-e3f961fa206a68685e8e49c7befb295f5927ab12.tar.gz
fix configuration file path and respect CFLAGS
Submitted by: Sybolt de Boer <bolt@xs4all.nl> (via private mail)
Diffstat (limited to 'sysutils/logtool')
-rw-r--r--sysutils/logtool/Makefile4
-rw-r--r--sysutils/logtool/files/patch-aa6
-rw-r--r--sysutils/logtool/files/patch-ad10
3 files changed, 12 insertions, 8 deletions
diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile
index 2fee2b5..0253e77 100644
--- a/sysutils/logtool/Makefile
+++ b/sysutils/logtool/Makefile
@@ -24,7 +24,9 @@ post-patch:
.for file in logtool/Makefile logtail/Makefile
@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
.endfor
- @${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/logtool/config.h
+.for file in logtool/config.h conf/logtool.conf
+ @${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/${file}
+.endfor
post-install:
.if !defined(NOPORTDOCS)
diff --git a/sysutils/logtool/files/patch-aa b/sysutils/logtool/files/patch-aa
index a35ed87..d48a4d8 100644
--- a/sysutils/logtool/files/patch-aa
+++ b/sysutils/logtool/files/patch-aa
@@ -1,5 +1,5 @@
---- logtool/Makefile.orig Sat Jan 13 14:56:21 2001
-+++ logtool/Makefile Sat Jan 13 14:58:01 2001
+--- logtool/Makefile.orig Wed Jan 10 08:27:16 2001
++++ logtool/Makefile Sun Jan 28 22:36:49 2001
@@ -9,8 +9,8 @@
csv.o html.o raw.o logtool.o main.o
SRC = logtool.c
@@ -16,7 +16,7 @@
# For RedHat (and most other) Linux'es, this should be ideal
-CFLAGS= -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
-+CFLAGS= -I/usr/local/include -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
++CFLAGS+= -I/usr/local/include -Wall -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
+LIBS= -L/usr/local/lib -lgnugetopt
# For portability to non-linux'es/non-standard-linux'es, try this
diff --git a/sysutils/logtool/files/patch-ad b/sysutils/logtool/files/patch-ad
index 792b3a7..1aa1f88 100644
--- a/sysutils/logtool/files/patch-ad
+++ b/sysutils/logtool/files/patch-ad
@@ -1,10 +1,12 @@
---- logtail/Makefile.orig Sat Dec 30 20:17:09 2000
-+++ logtail/Makefile Sat Dec 30 20:17:35 2000
-@@ -2,7 +2,7 @@
+--- logtail/Makefile.orig Mon Dec 25 19:24:25 2000
++++ logtail/Makefile Sun Jan 28 22:40:44 2001
+@@ -1,8 +1,8 @@
+ SRC= logtail.c
PROG= logtail
CC= gcc
- CFLAGS= -Wall -Werror -O3 -ansi -pedantic
+-CFLAGS= -Wall -Werror -O3 -ansi -pedantic
-PREFIX=/usr
++CFLAGS+= -Wall -Werror -ansi -pedantic
+PREFIX=%%PREFIX%%
default:
OpenPOWER on IntegriCloud