4 files changed, 30 insertions, 45 deletions
diff --git a/sysutils/logtool/files/patch-aa b/sysutils/logtool/files/patch-aa
deleted file mode 100644
index d48a4d8dc135..000000000000
--- a/sysutils/logtool/files/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
- # These options affect where logtool gets installed
--PREFIX = /usr
--ETCDIR = /etc/logtool
-+PREFIX = %%PREFIX%%
-+ETCDIR = %%PREFIX%%/etc/logtool
- CC = gcc
- 
- INSTALL = /usr/bin/install
-@@ -18,7 +18,8 @@
- # INSTALL = /usr/ucb/install
- 
- # 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 -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
- # CFLAGS = -Wall
-@@ -28,7 +29,7 @@
- 
- ### The main build stuff
- logtool: logtool.o $(OBJS)
--	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) 
-+	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) ${LIBS}
- 	@echo "strip $(PROG)"	
- 	@strip $(PROG)
- 
diff --git a/sysutils/logtool/files/patch-ad b/sysutils/logtool/files/patch-ad
deleted file mode 100644
index 1aa1f880eccd..000000000000
--- a/sysutils/logtool/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
--PREFIX=/usr
-+CFLAGS+= -Wall -Werror -ansi -pedantic
-+PREFIX=%%PREFIX%%
- 
- default: 
- 	$(CC) $(CFLAGS) -o $(PROG) $(SRC)
diff --git a/sysutils/logtool/files/patch-configure b/sysutils/logtool/files/patch-configure
new file mode 100644
index 000000000000..90bf21b57c58
--- /dev/null
+++ b/sysutils/logtool/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Feb 12 00:10:54 2001
++++ configure	Mon Feb 12 00:11:16 2001
+@@ -745,7 +745,7 @@
+ fi
+ 
+ if test -n "$GCC"; then
+-	CFLAGS="-O3 -Wall -Werror -ansi -pedantic"
++	CFLAGS="-ansi -pedantic"
+ fi
+ 
+ 
diff --git a/sysutils/logtool/files/patch-logtool::Makefile.in b/sysutils/logtool/files/patch-logtool::Makefile.in
new file mode 100644
index 000000000000..0f0dbffba0c4
--- /dev/null
+++ b/sysutils/logtool/files/patch-logtool::Makefile.in
@@ -0,0 +1,19 @@
+--- logtool/Makefile.in.orig	Sun Feb 11 23:50:38 2001
++++ logtool/Makefile.in	Sun Feb 11 23:54:02 2001
+@@ -16,6 +16,7 @@
+ CC = @CC@
+ INSTALL = @installprog@
+ CFLAGS= @CFLAGS@ @DEFS@ @LIBS@
++LIBS=	-L/usr/local/lib -lgnugetopt
+ 
+ ### The stuff below is (I hope) no longer needed now that we us autoconf/configure and friends
+ # Solaris users should probably use the following instead (thanks Christoph Krempe <ck@ub.fu-berlin.de>)
+@@ -30,7 +31,7 @@
+ 
+ ### The main build stuff
+ logtool: logtool.o $(OBJS)
+-	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) 
++	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) ${LIBS}
+ 	@echo "strip $(PROG)"	
+ 	@strip $(PROG)
+