1 files changed, 49 insertions, 11 deletions
diff --git a/net/tcptrace/patches/patch-aa b/net/tcptrace/patches/patch-aa
index 3efe9e29e23..cb21464bd34 100644
--- a/net/tcptrace/patches/patch-aa
+++ b/net/tcptrace/patches/patch-aa
@@ -1,12 +1,50 @@
-$NetBSD: patch-aa,v 1.6 1999/09/15 15:43:13 drochner Exp $
---- Makefile.in.orig	Wed Sep  8 03:31:58 1999
-+++ Makefile.in	Wed Sep 15 16:40:36 1999
-@@ -179,7 +179,7 @@
- # easily.
+$NetBSD: patch-aa,v 1.7 2003/08/20 08:28:57 grant Exp $
+
+--- Makefile.in.orig	2003-04-04 09:38:48.000000000 +1000
++++ Makefile.in
+@@ -1,4 +1,4 @@
+-#
++# 
+ # Makefile for tcptrace
  #
- filt_parser.c: filt_parser.y filter.h
--	bison -vd -p filtyy filt_parser.y -o filt_parser.c
-+	yacc -vd -p filtyy -o filt_parser.c filt_parser.y
- 	cp filt_parser.c flex_bison
- 	cp filt_parser.h flex_bison
- filt_scanner.c: filt_scanner.l filter.h filt_parser.h
+ srcdir = @srcdir@
+@@ -34,8 +34,8 @@ DEFINES += -DBUNZIP2="\"bunzip2\""
+ # 
+ ################################################################## 
+ PCAP_LDLIBS = @V_PCAP_LDLIBS@
+-PCAP_INCS    = -I/usr/local/include -I. -I../pcap -I/usr/include/pcap
+-PCAP_LDFLAGS = -L/usr/local/lib -Llib -Lpcap -L../pcap -L./cygwin-libs
++PCAP_INCS    = -I.
++PCAP_LDFLAGS = -Llib -L./cygwin-libs
+ 
+ 
+ 
+@@ -118,8 +118,8 @@ DEFINES += -DGROK_NETSCOUT
+ # 
+ ################################################################## 
+ # Pathname of directory to install the binary
+-BINDIR = /usr/local/bin
+-MANDIR = /usr/local/man/
++BINDIR = ${PREFIX}/bin
++MANDIR = ${PREFIX}/man
+ 
+ 
+ ################################################################## 
+@@ -140,7 +140,7 @@ INCLS = -I. @V_INCLS@ ${PCAP_INCS}
+ # Probably want full optimization
+ # FreeBSD needs	-Ae
+ # HP needs	-Ae
+-CFLAGS = $(CCOPT) $(DEFINES) @DEFS@ @V_DEFINES@ $(INCLS)
++CFLAGS += $(CCOPT) $(DEFINES) @DEFS@ @V_DEFINES@ $(INCLS)
+ 
+ # Standard LIBS
+ LDLIBS = @LIBS@ ${PCAP_LDLIBS}
+@@ -185,7 +185,7 @@ tcptrace: ${OFILES}
+ # your machine, just hack in a quick string below in place of the command.
+ version.o: ${CFILES} Makefile
+ 	${CC} ${CFLAGS} -o version.o -c $(srcdir)/version.c \
+-	-DBUILT_USER="\"`whoami`\"" -DBUILT_HOST="\"`hostname`\"" -DBUILT_DATE="\"`date`\""
++	-DBUILT_USER="\"${USER}\"" -DBUILT_HOST="\"${HOST}\"" -DBUILT_DATE="\"`date`\""
+ 
+ #
+ # special rules for scanner/parser