diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2001-01-29 02:03:50 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2001-01-29 02:03:50 +0000 |
| commit | c6b3241579ac6b86d948e0a50e0847ca98bc3b11 (patch) | |
| tree | ee952e753c90078bb2037eb5e353030cd8e332f9 /sysutils/logtool | |
| parent | 9251523cf9d65c71fddb230db26321f7f604b2a5 (diff) | |
| download | ports-c6b3241579ac6b86d948e0a50e0847ca98bc3b11.tar.gz ports-c6b3241579ac6b86d948e0a50e0847ca98bc3b11.zip | |
fix configuration file path and respect CFLAGS
Submitted by: Sybolt de Boer <bolt@xs4all.nl> (via private mail)
Notes
Notes:
svn path=/head/; revision=37714
Diffstat (limited to 'sysutils/logtool')
| -rw-r--r-- | sysutils/logtool/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/logtool/files/patch-aa | 6 | ||||
| -rw-r--r-- | sysutils/logtool/files/patch-ad | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile index 2fee2b51f16a..0253e77151c5 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 a35ed878c926..d48a4d8dc135 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 792b3a7404bd..1aa1f880eccd 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: |