4 files changed, 12 insertions, 16 deletions
diff --git a/net/ztelnet/files/patch-aa b/net/ztelnet/files/patch-aa
index 9d60203b0f15..5020f0d5e6c2 100644
--- a/net/ztelnet/files/patch-aa
+++ b/net/ztelnet/files/patch-aa
@@ -1,9 +1,8 @@
-diff -uNr ../ztelnet/Makefile ./Makefile
---- ../ztelnet/Makefile	Tue Sep 19 20:02:01 1995
-+++ ./Makefile	Wed Dec  3 05:42:19 1997
+--- ../ztelnet/Makefile	Tue Sep 19 13:02:01 1995
++++ ./Makefile	Thu Jun  6 23:22:18 2002
 @@ -1,10 +1,11 @@
 -CC=cc
-+CC=gcc
++CC?=gcc
  all:
 -	cd zmodem; make CC="${CC}"
  	cd libtelnet; make CC="${CC}"
diff --git a/net/ztelnet/files/patch-ai b/net/ztelnet/files/patch-ai
index 853ad0a054d5..476f3637479b 100644
--- a/net/ztelnet/files/patch-ai
+++ b/net/ztelnet/files/patch-ai
@@ -1,6 +1,5 @@
-diff -uNr --exclude=*.orig work.old/ztelnet/libtelnet/Makefile.generic work/ztelnet/libtelnet/Makefile.generic
---- work.old/ztelnet/libtelnet/Makefile.generic	Thu Sep 21 04:52:44 1995
-+++ work/ztelnet/libtelnet/Makefile.generic	Tue Jun 20 22:58:31 2000
+--- work.old/ztelnet/libtelnet/Makefile.generic.orig	Wed Sep 20 12:52:44 1995
++++ work/ztelnet/libtelnet/Makefile.generic	Thu Jun  6 23:23:00 2002
 @@ -19,32 +19,24 @@
  #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
  #
@@ -28,7 +27,7 @@ diff -uNr --exclude=*.orig work.old/ztelnet/libtelnet/Makefile.generic work/ztel
 -endif
 +TELNET_H= ../arpa/telnet.h
 +
-+CFLAGS= -O2 ${DEFINES} ${INCLUDES}
++CFLAGS+= ${DEFINES} ${INCLUDES}
  
  ${LIB}: ${OBJS}
  	rm -f ${LIB}
diff --git a/net/ztelnet/files/patch-ak b/net/ztelnet/files/patch-ak
index fd3b149045ac..7cbc4386d494 100644
--- a/net/ztelnet/files/patch-ak
+++ b/net/ztelnet/files/patch-ak
@@ -1,6 +1,5 @@
-diff -uNr --exclude=*.orig work.old/ztelnet/telnet/Makefile.generic work/ztelnet/telnet/Makefile.generic
---- work.old/ztelnet/telnet/Makefile.generic	Thu Sep 21 04:42:39 1995
-+++ work/ztelnet/telnet/Makefile.generic	Tue Jun 20 22:58:31 2000
+--- work.old/ztelnet/telnet/Makefile.generic.orig	Wed Sep 20 12:42:39 1995
++++ work/ztelnet/telnet/Makefile.generic	Thu Jun  6 23:23:29 2002
 @@ -19,28 +19,22 @@
  #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
  #
@@ -21,7 +20,7 @@ diff -uNr --exclude=*.orig work.old/ztelnet/telnet/Makefile.generic work/ztelnet
  	sys_bsd.c telnet.c terminal.c \
  	utilities.c ${GETOPT_SRC}
  
-+CFLAGS=	-O2 ${INCLUDES} ${DEFINES}
++CFLAGS+=	${INCLUDES} ${DEFINES}
  
  ALLHC=	${SRCS} \
  	defines.h externs.h fdset.h general.h \
diff --git a/net/ztelnet/files/patch-ar b/net/ztelnet/files/patch-ar
index 4b98a04a5143..e777eda45c59 100644
--- a/net/ztelnet/files/patch-ar
+++ b/net/ztelnet/files/patch-ar
@@ -1,6 +1,5 @@
-diff -uNr --exclude=*.orig work.old/ztelnet/zmodem/Makefile work/ztelnet/zmodem/Makefile
---- work.old/ztelnet/zmodem/Makefile	Wed Sep 20 09:20:41 1995
-+++ work/ztelnet/zmodem/Makefile	Tue Jun 20 22:58:32 2000
+--- work.old/ztelnet/zmodem/Makefile.orig	Tue Sep 19 17:20:41 1995
++++ work/ztelnet/zmodem/Makefile	Thu Jun  6 23:23:16 2002
 @@ -1,142 +1,19 @@
 -# Makefile for Unix/Xenix rz and sz programs
 -# the makefile is not too well tested yet
@@ -42,7 +41,7 @@ diff -uNr --exclude=*.orig work.old/ztelnet/zmodem/Makefile work/ztelnet/zmodem/
 -	shar -c -a -n rzsz -o /tmp/rzsz -l64 \
 -	  README Makefile zmodem.h zm.c rz.c rbsb.c \
 -	 crc.c crctab.c minirb.c mailer.rz zmr.c *.doc gz sz.c *.t 
-+CFLAGS= -O2 ${DEFINES} ${INCLUDES}
++CFLAGS+= ${DEFINES} ${INCLUDES}
  
 -shar:doc
 -	shar -c README Makefile zmodem.h zm.c \