From b821fcec887e79fe05dbd9673042630da5914887 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Thu, 25 Nov 1999 01:50:41 +0000
Subject: zzufed

---
 net/zephyr/files/patch-sum  |  31 ++++++-
 net/zephyr/patches/patch-aa | 194 +++--------------------------------------
 net/zephyr/patches/patch-ab |  75 +++-------------
 net/zephyr/patches/patch-ac | 206 +-------------------------------------------
 net/zephyr/patches/patch-ad |  14 +++
 net/zephyr/patches/patch-ae |  14 +++
 net/zephyr/patches/patch-af |  14 +++
 net/zephyr/patches/patch-ag |  14 +++
 net/zephyr/patches/patch-ah |  14 +++
 net/zephyr/patches/patch-ai |  14 +++
 net/zephyr/patches/patch-aj |  14 +++
 net/zephyr/patches/patch-ak |  14 +++
 net/zephyr/patches/patch-al |  26 ++++++
 net/zephyr/patches/patch-am |  16 ++++
 net/zephyr/patches/patch-an |  14 +++
 net/zephyr/patches/patch-ao |  14 +++
 net/zephyr/patches/patch-ap |  14 +++
 net/zephyr/patches/patch-aq |  14 +++
 net/zephyr/patches/patch-ar |  13 +++
 net/zephyr/patches/patch-as |  33 +++++++
 net/zephyr/patches/patch-at |  72 ++++++++++++++++
 net/zephyr/patches/patch-au |  14 +++
 net/zephyr/patches/patch-av |  31 +++++++
 net/zephyr/patches/patch-aw |  14 +++
 net/zephyr/patches/patch-ax |  14 +++
 net/zephyr/patches/patch-ay |  12 +++
 net/zephyr/patches/patch-az |  15 ++++
 27 files changed, 485 insertions(+), 449 deletions(-)
 create mode 100644 net/zephyr/patches/patch-ad
 create mode 100644 net/zephyr/patches/patch-ae
 create mode 100644 net/zephyr/patches/patch-af
 create mode 100644 net/zephyr/patches/patch-ag
 create mode 100644 net/zephyr/patches/patch-ah
 create mode 100644 net/zephyr/patches/patch-ai
 create mode 100644 net/zephyr/patches/patch-aj
 create mode 100644 net/zephyr/patches/patch-ak
 create mode 100644 net/zephyr/patches/patch-al
 create mode 100644 net/zephyr/patches/patch-am
 create mode 100644 net/zephyr/patches/patch-an
 create mode 100644 net/zephyr/patches/patch-ao
 create mode 100644 net/zephyr/patches/patch-ap
 create mode 100644 net/zephyr/patches/patch-aq
 create mode 100644 net/zephyr/patches/patch-ar
 create mode 100644 net/zephyr/patches/patch-as
 create mode 100644 net/zephyr/patches/patch-at
 create mode 100644 net/zephyr/patches/patch-au
 create mode 100644 net/zephyr/patches/patch-av
 create mode 100644 net/zephyr/patches/patch-aw
 create mode 100644 net/zephyr/patches/patch-ax
 create mode 100644 net/zephyr/patches/patch-ay
 create mode 100644 net/zephyr/patches/patch-az

(limited to 'net/zephyr')

diff --git a/net/zephyr/files/patch-sum b/net/zephyr/files/patch-sum
index e54f135082f..ae074bdfeda 100644
--- a/net/zephyr/files/patch-sum
+++ b/net/zephyr/files/patch-sum
@@ -1,5 +1,28 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:33 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/25 01:50:41 hubertf Exp $
 
-MD5 (patch-aa) = 10768464f422ebc21a85af5696035517
-MD5 (patch-ab) = a60b7819b1bb673fea4b72a227f6ff6c
-MD5 (patch-ac) = 499f4fff92d57404b942f70593308d07
+MD5 (patch-aa) = 8fc42ee4ddacc99b59e39444cd8fd5a3
+MD5 (patch-ab) = 46cc6361198cdd6e81bb4a151a9ecd55
+MD5 (patch-ac) = 09aeacb841b4a6d5e19a97f18642ff2a
+MD5 (patch-ad) = 9f9d46127a0e4144a6c6eb92e9a9bc6e
+MD5 (patch-ae) = 7ccb7beea58cca17d7e875017274acf2
+MD5 (patch-af) = 8b510b58e2221c448683df6c54bd3dae
+MD5 (patch-ag) = 9f93f28a2eacfc1340eb208ed27c5ab3
+MD5 (patch-ah) = bf54189a79e14256d33d1a45eec9623b
+MD5 (patch-ai) = 199270b23a3d467c278179b2909a6a1c
+MD5 (patch-aj) = 5a498c2617b8cf458686ce40fd30c08b
+MD5 (patch-ak) = daebf31ce4c0ff62d54c7b6b7317f822
+MD5 (patch-al) = ed02bcbc25d0ebf7a375772d3e5ab070
+MD5 (patch-am) = f20852d993f8736c9a5a7ad06d8480bb
+MD5 (patch-an) = 2439e638beb3c04dd90e9a7c926fcf65
+MD5 (patch-ao) = e5a76338b3e7563909a6a1fe0f4f2285
+MD5 (patch-ap) = 65b90eb6fc8f7b67d644e8a68c084adc
+MD5 (patch-aq) = 12352b7e34dde6cc822988fcba13b2ec
+MD5 (patch-ar) = f7fbd7397d450baafbb1797dca58840a
+MD5 (patch-as) = d8e751f50d2dc5b47108c30d81388f3b
+MD5 (patch-at) = 6077c44f7e6f2d1e2dc82213eb839f9f
+MD5 (patch-au) = 1c2fbfd0f0be6f3898601b7442e30d8c
+MD5 (patch-av) = bf67a29712094a430458c7ef6f87130f
+MD5 (patch-aw) = 69cbe6aca0bd280a342bc25f6d205502
+MD5 (patch-ax) = dece96852b3805c996555129680f4ddc
+MD5 (patch-ay) = 5180dfc073f323dd68701d7ca4769efa
+MD5 (patch-az) = 88f2a75d0088bebd4032f1b8b8266e8d
diff --git a/net/zephyr/patches/patch-aa b/net/zephyr/patches/patch-aa
index 413bf4fd9b8..672dbf90c22 100644
--- a/net/zephyr/patches/patch-aa
+++ b/net/zephyr/patches/patch-aa
@@ -1,182 +1,14 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:11:07 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/11/25 01:50:42 hubertf Exp $
 
-*** h/zephyr/zephyr.h.in.orig	1996/06/12 04:42:56
---- h/zephyr/zephyr.h.in	1996/11/22 22:04:51
-***************
-*** 73,78 ****
-  /* Unique ID format */
-  typedef struct _ZUnique_Id_t {
-!     struct	in_addr zuid_addr;
-!     struct	timeval	tv;
-  } ZUnique_Id_t;
-  
---- 73,78 ----
-  /* Unique ID format */
-  typedef struct _ZUnique_Id_t {
-!     struct		in_addr zuid_addr;
-!     ZEPHYR_INT32	zuid_sec, zuid_usec;
-  } ZUnique_Id_t;
-  
-*** lib/zephyr/ZParseNot.c.orig	1995/07/18 20:28:07
---- lib/zephyr/ZParseNot.c	1996/11/22 22:04:52
-***************
-*** 154,161 ****
-      if (numfields) {
-  	if (ZReadAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid,
-! 		       sizeof(ZUnique_Id_t)) == ZERR_BADFIELD)
-  	    BAD_PACKET;
-! 	notice->z_time.tv_sec = ntohl((u_long) notice->z_uid.tv.tv_sec);
-! 	notice->z_time.tv_usec = ntohl((u_long) notice->z_uid.tv.tv_usec);
-  	numfields--;
-  	next_field (ptr);
---- 154,161 ----
-      if (numfields) {
-  	if (ZReadAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid,
-! 		       sizeof(notice->z_uid)) == ZERR_BADFIELD)
-  	    BAD_PACKET;
-! 	notice->z_time.tv_sec = ntohl((u_long) notice->z_uid.zuid_sec);
-! 	notice->z_time.tv_usec = ntohl((u_long) notice->z_uid.zuid_usec);
-  	numfields--;
-  	next_field (ptr);
-***************
-*** 268,275 ****
-      if (numfields) {
-  	if (ZReadAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid,
-! 		       sizeof(ZUnique_Id_t)) == ZERR_BADFIELD)
-  	    BAD_PACKET;
-! 	notice->z_time.tv_sec = ntohl((u_long) notice->z_multiuid.tv.tv_sec);
-! 	notice->z_time.tv_usec = ntohl((u_long) notice->z_multiuid.tv.tv_usec);
-  	numfields--;
-  	next_field (ptr);
---- 268,275 ----
-      if (numfields) {
-  	if (ZReadAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid,
-! 		       sizeof(notice->z_multiuid)) == ZERR_BADFIELD)
-  	    BAD_PACKET;
-! 	notice->z_time.tv_sec = ntohl((u_long) notice->z_multiuid.zuid_sec);
-! 	notice->z_time.tv_usec = ntohl((u_long) notice->z_multiuid.zuid_usec);
-  	numfields--;
-  	next_field (ptr);
-*** lib/zephyr/Zinternal.c.orig	1995/07/18 20:28:17
---- lib/zephyr/Zinternal.c	1996/11/22 22:04:52
-***************
-*** 609,612 ****
---- 609,613 ----
-      static char version[BUFSIZ]; /* default init should be all \0 */
-      struct sockaddr_in name;
-+     struct timeval tv;
-      int namelen = sizeof(name);
-  
-***************
-*** 628,634 ****
-      notice->z_multinotice = "";
-      
-!     (void) gettimeofday(&notice->z_uid.tv, (struct timezone *)0);
-!     notice->z_uid.tv.tv_sec = htonl((u_long) notice->z_uid.tv.tv_sec);
-!     notice->z_uid.tv.tv_usec = htonl((u_long) notice->z_uid.tv.tv_usec);
-      
-      if ((retval = Z_GetMyAddr()) != ZERR_NONE)
---- 629,635 ----
-      notice->z_multinotice = "";
-      
-!     (void) gettimeofday(&tv, (struct timezone *)0);
-!     notice->z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
-!     notice->z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
-      
-      if ((retval = Z_GetMyAddr()) != ZERR_NONE)
-***************
-*** 710,715 ****
-      ptr += strlen(ptr)+1;
-  
-!     if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid, 
-! 		   sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
-  	return (ZERR_HEADERLEN);
-      ptr += strlen(ptr)+1;
---- 711,716 ----
-      ptr += strlen(ptr)+1;
-  
-!     if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid,
-! 		   sizeof(notice->z_uid)) == ZERR_FIELDLEN)
-  	return (ZERR_HEADERLEN);
-      ptr += strlen(ptr)+1;
-***************
-*** 761,766 ****
-  	return (ZERR_HEADERLEN);
-  
-!     if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid, 
-! 		   sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
-  	return (ZERR_HEADERLEN);
-      ptr += strlen(ptr)+1;
---- 762,767 ----
-  	return (ZERR_HEADERLEN);
-  
-!     if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid,
-! 		   sizeof(notice->z_multiuid)) == ZERR_FIELDLEN)
-  	return (ZERR_HEADERLEN);
-      ptr += strlen(ptr)+1;
-***************
-*** 882,885 ****
---- 883,887 ----
-      int offset, hdrsize, fragsize, ret_len, message_len, waitforack;
-      Code_t retval;
-+     struct timeval tv;
-      
-      hdrsize = len-notice->z_message_len;
-***************
-*** 897,906 ****
-  	partnotice.z_multinotice = multi;
-  	if (offset > 0) {
-! 	    (void) gettimeofday(&partnotice.z_uid.tv,
-! 				(struct timezone *)0);
-! 	    partnotice.z_uid.tv.tv_sec =
-! 		htonl((u_long) partnotice.z_uid.tv.tv_sec);
-! 	    partnotice.z_uid.tv.tv_usec =
-! 		htonl((u_long) partnotice.z_uid.tv.tv_usec);
-  	    if ((retval = Z_GetMyAddr()) != ZERR_NONE)
-  		return (retval);
---- 899,905 ----
-  	partnotice.z_multinotice = multi;
-  	if (offset > 0) {
-! 	    (void) gettimeofday(&tv, (struct timezone *)0);
-! 	    partnotice.z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
-! 	    partnotice.z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
-  	    if ((retval = Z_GetMyAddr()) != ZERR_NONE)
-  		return (retval);
-*** server/dispatch.c.orig	1996/06/06 05:56:58
---- server/dispatch.c	1996/11/22 22:04:52
-***************
-*** 828,834 ****
-      /* search the not-yet-acked table for this packet, and flush it. */
-  #if 0
-!     zdbug((LOG_DEBUG, "nack_cancel: %s:%08X,%08X",
-  	   inet_ntoa(notice->z_uid.zuid_addr),
-! 	   notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
-  #endif
-      hashval = NACKTAB_HASHVAL(*who, notice->z_uid);
---- 828,835 ----
-      /* search the not-yet-acked table for this packet, and flush it. */
-  #if 0
-!     zdbug((LOG_DEBUG, "nack_cancel: %s:%08lX,%08lX",
-  	   inet_ntoa(notice->z_uid.zuid_addr),
-! 	   (u_long) notice->z_uid.zuid_sec,
-! 	   (u_long) notice->z_uid.zuid_usec));
-  #endif
-      hashval = NACKTAB_HASHVAL(*who, notice->z_uid);
-***************
-*** 846,852 ****
-  
-  #if 1
-!     zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08X,%08X",
-  	   inet_ntoa (notice->z_uid.zuid_addr),
-! 	   notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
-  #endif
-  }
---- 847,854 ----
-  
-  #if 1
-!     zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08lX,%08lX",
-  	   inet_ntoa (notice->z_uid.zuid_addr),
-! 	   (u_long) notice->z_uid.zuid_sec,
-! 	   (u_long) notice->z_uid.zuid_usec));
-  #endif
-  }
+diff -x *.orig -urN ./clients/syslogd/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/syslogd/Makefile.in
+--- ./clients/syslogd/Makefile.in	Fri Jul  7 23:54:11 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/syslogd/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -19,7 +19,7 @@
+ INSTALL=@INSTALL@
+ SYSLOG_CONFPREFIX=n
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(srcdir) -I$(top_srcdir)/h -I$(BUILDTOP)/h \
+ 	-DCONFPREFIX=\"$(SYSLOG_CONFPREFIX)\" @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
diff --git a/net/zephyr/patches/patch-ab b/net/zephyr/patches/patch-ab
index 54a8b7113c7..8cac6b1a560 100644
--- a/net/zephyr/patches/patch-ab
+++ b/net/zephyr/patches/patch-ab
@@ -1,63 +1,14 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:11:07 agc Exp $
+$NetBSD: patch-ab,v 1.3 1999/11/25 01:50:42 hubertf Exp $
 
-*** server/zserver.h.~1~	Tue Jun 18 15:43:02 1996
---- server/zserver.h	Thu Apr  9 13:26:04 1998
-***************
-*** 209,215 ****
-  void add_to_key_sched_cache __P((des_cblock key, Sched *sched));
-  int krb_set_key __P((char *key, int cvt));
-  int krb_rd_req __P((KTEXT authent, char *service, char *instance,
-! 		    unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn));
-  int krb_find_ticket __P((KTEXT authent, KTEXT ticket));
-  int krb_get_lrealm __P((char *r, int n));
-  #endif
---- 209,215 ----
-  void add_to_key_sched_cache __P((des_cblock key, Sched *sched));
-  int krb_set_key __P((char *key, int cvt));
-  int krb_rd_req __P((KTEXT authent, char *service, char *instance,
-! 		    KRB_INT32 from_addr, AUTH_DAT *ad, char *fn));
-  int krb_find_ticket __P((KTEXT authent, KTEXT ticket));
-  int krb_get_lrealm __P((char *r, int n));
-  #endif
-*** server/zsrv_conf.h.~1~	Fri Jun 30 18:11:35 1995
---- server/zsrv_conf.h	Thu Apr  9 13:24:38 1998
-***************
-*** 48,51 ****
---- 48,53 ----
-  #define SWEEP_INTERVAL  3600		/* Time between sweeps of the ticket
-  					   hash table */
-  
-+ #define KRB_INT32 int32_t
-+ 
-  #endif /* __ZSRV_CONF_H__ */
-*** lib/zephyr/ZMkAuth.c.~1~	Tue Jun 18 15:44:46 1996
---- lib/zephyr/ZMkAuth.c	Thu Apr  9 13:31:37 1998
-***************
-*** 44,50 ****
-      char *cstart, *cend;
-      ZChecksum_t checksum;
-      CREDENTIALS cred;
--     extern unsigned long des_quad_cksum();
-  
-      now = time(0);
-      if (last_authent_time == 0 || (now - last_authent_time > 120)) {
---- 44,49 ----
-*** server/kopt.c.~1~	Tue Jun 18 15:43:00 1996
---- server/kopt.c	Thu Apr  9 13:26:24 1998
-***************
-*** 234,240 ****
-      KTEXT authent;			/* The received message */
-      char *service;			/* Service name */
-      char *instance;			/* Service instance */
-!     unsigned KRB_INT32 from_addr;	/* Net address of originating host */
-      AUTH_DAT *ad;			/* Structure to be filled in */
-      char *fn;				/* Filename to get keys from */
-  {
---- 234,240 ----
-      KTEXT authent;			/* The received message */
-      char *service;			/* Service name */
-      char *instance;			/* Service instance */
-!     KRB_INT32 from_addr;		/* Net address of originating host */
-      AUTH_DAT *ad;			/* Structure to be filled in */
-      char *fn;				/* Filename to get keys from */
-  {
+diff -x *.orig -urN ./clients/xzwrite/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/xzwrite/Makefile.in
+--- ./clients/xzwrite/Makefile.in	Fri Jul  7 23:55:14 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/xzwrite/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -18,7 +18,7 @@
+ CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
+ 	@X_CFLAGS@ @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr -L$(BUILDTOP)/lib/dyn @ET_LDFLAGS@ \
diff --git a/net/zephyr/patches/patch-ac b/net/zephyr/patches/patch-ac
index 71a4b8044ce..46e58019bca 100644
--- a/net/zephyr/patches/patch-ac
+++ b/net/zephyr/patches/patch-ac
@@ -1,52 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1998/11/24 05:23:23 mycroft Exp $
+$NetBSD: patch-ac,v 1.3 1999/11/25 01:50:42 hubertf Exp $
 
---- ./configure.BAKKK	Thu Apr  4 01:42:30 1996
-+++ ./configure	Tue Nov 24 00:47:01 1998
-@@ -502,7 +502,7 @@
- fi
- 
- ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+# CFLAGS is not in ac_cpp because -g, -O2, etc. are not valid cpp options.
- ac_cpp='echo $CPP $CPPFLAGS 1>&5;
- $CPP $CPPFLAGS'
- ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5;
-@@ -767,9 +767,9 @@
- 
- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
-     if test $ac_cv_prog_gcc_g = yes; then
--      CFLAGS="-g -O"
-+      CFLAGS="-g -O2"
-     else
--      CFLAGS="-O"
-+      CFLAGS="-O2"
-     fi
-   fi
- else
---- ./clients/syslogd/Makefile.in.BAKKK	Fri Jul  7 23:54:11 1995
-+++ ./clients/syslogd/Makefile.in	Tue Nov 24 00:47:01 1998
-@@ -19,7 +19,7 @@
- INSTALL=@INSTALL@
- SYSLOG_CONFPREFIX=n
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(srcdir) -I$(top_srcdir)/h -I$(BUILDTOP)/h \
- 	-DCONFPREFIX=\"$(SYSLOG_CONFPREFIX)\" @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
---- ./clients/xzwrite/Makefile.in.BAKKK	Fri Jul  7 23:55:14 1995
-+++ ./clients/xzwrite/Makefile.in	Tue Nov 24 00:47:02 1998
-@@ -18,7 +18,7 @@
- CC=@CC@
- INSTALL=@INSTALL@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
- 	@X_CFLAGS@ @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr -L$(BUILDTOP)/lib/dyn @ET_LDFLAGS@ \
---- ./clients/zctl/Makefile.in.BAKKK	Fri Jul  7 23:55:38 1995
-+++ ./clients/zctl/Makefile.in	Tue Nov 24 00:47:02 1998
+diff -x *.orig -urN ./clients/zctl/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zctl/Makefile.in
+--- ./clients/zctl/Makefile.in	Fri Jul  7 23:55:38 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zctl/Makefile.in	Thu Nov 25 02:52:55 1999
 @@ -19,7 +19,7 @@
  INSTALL=@INSTALL@
  MK_CMDS=@MK_CMDS@
@@ -56,157 +12,3 @@ $NetBSD: patch-ac,v 1.2 1998/11/24 05:23:23 mycroft Exp $
  CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
  LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @SS_LDFLAGS@ @LDFLAGS@
  LIBS=-lzephyr -lss @LIBS@ -lcom_err
---- ./clients/zleave/Makefile.in.BAKKK	Fri Jul  7 23:55:52 1995
-+++ ./clients/zleave/Makefile.in	Tue Nov 24 00:47:02 1998
-@@ -18,7 +18,7 @@
- CC=@CC@
- INSTALL=@INSTALL@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
- LIBS=-lzephyr @LIBS@ -lcom_err
---- ./clients/zmailnotify/Makefile.in.BAKKK	Fri Jul  7 23:56:05 1995
-+++ ./clients/zmailnotify/Makefile.in	Tue Nov 24 00:47:02 1998
-@@ -18,7 +18,7 @@
- CC=@CC@
- INSTALL=@INSTALL@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h -DKPOP @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
- LIBS=-lzephyr @LIBS@ -lcom_err
---- ./clients/znol/Makefile.in.BAKKK	Fri Jul  7 23:56:16 1995
-+++ ./clients/znol/Makefile.in	Tue Nov 24 00:47:02 1998
-@@ -18,7 +18,7 @@
- CC=@CC@
- INSTALL=@INSTALL@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
- LIBS=-lzephyr @LIBS@ -lcom_err
---- ./clients/zpopnotify/Makefile.in.BAKKK	Fri Jul  7 23:56:24 1995
-+++ ./clients/zpopnotify/Makefile.in	Tue Nov 24 00:47:02 1998
-@@ -18,7 +18,7 @@
- CC=@CC@
- INSTALL=@INSTALL@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
- LIBS=-lzephyr @LIBS@ -lcom_err
---- ./clients/zshutdown_notify/Makefile.in.BAKKK	Fri Jul  7 23:56:31 1995
-+++ ./clients/zshutdown_notify/Makefile.in	Tue Nov 24 00:47:02 1998
-@@ -19,7 +19,7 @@
- CC=@CC@
- INSTALL=@INSTALL@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
- LIBS=-lzephyr @LIBS@ -lcom_err
---- ./clients/zstat/Makefile.in.BAKKK	Fri Jul  7 23:58:10 1995
-+++ ./clients/zstat/Makefile.in	Tue Nov 24 00:47:02 1998
-@@ -18,7 +18,7 @@
- CC=@CC@
- INSTALL=@INSTALL@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
- LIBS=-lzephyr @LIBS@ -lcom_err
---- ./clients/zwgc/Makefile.in.BAKKK	Fri Jul  7 23:59:07 1995
-+++ ./clients/zwgc/Makefile.in	Tue Nov 24 00:47:03 1998
-@@ -20,7 +20,7 @@
- INSTALL=@INSTALL@
- INSTANTIATE=$(srcdir)/instantiate
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=	$(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
- 	-I$(srcdir) -I. @X_CFLAGS@ @CPPFLAGS@
- YFLAGS=-d
---- ./clients/zwrite/Makefile.in.BAKKK	Sat Jul  8 00:03:50 1995
-+++ ./clients/zwrite/Makefile.in	Tue Nov 24 00:47:03 1998
-@@ -18,7 +18,7 @@
- CC=@CC@
- INSTALL=@INSTALL@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
- LIBS=-lzephyr @LIBS@ -lcom_err
---- ./lib/dyn/Makefile.in.BAKKK	Tue Jun 18 21:47:03 1996
-+++ ./lib/dyn/Makefile.in	Tue Nov 24 00:47:03 1998
-@@ -17,7 +17,7 @@
- CC=@CC@
- RANLIB=@RANLIB@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
- 
- OBJS =	dyn_append.o dyn_create.o dyn_debug.o dyn_delete.o dyn_insert.o \
---- ./lib/et/Makefile.in.BAKKK	Tue Jun 18 21:47:07 1996
-+++ ./lib/et/Makefile.in	Tue Nov 24 00:47:03 1998
-@@ -20,7 +20,7 @@
- INSTALL=@INSTALL@
- RANLIB=@RANLIB@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h -I$(srcdir) -I. @CPPFLAGS@
- 
- OBJS=	com_err.o error_message.o et_name.o init_et.o
---- ./lib/ss/Makefile.in.BAKKK	Tue Jun 18 21:47:10 1996
-+++ ./lib/ss/Makefile.in	Tue Nov 24 00:47:03 1998
-@@ -20,7 +20,7 @@
- RANLIB=@RANLIB@
- COMPILE_ET=@COMPILE_ET@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=$(DEBUG) -I$(srcdir) -I$(top_srcdir)/h -I$(BUILDTOP)/h -I. @CPPFLAGS@
- YFLAGS=-d
- 
---- ./lib/zephyr/Makefile.in.BAKKK	Tue Jun 18 21:47:16 1996
-+++ ./lib/zephyr/Makefile.in	Tue Nov 24 00:47:03 1998
-@@ -19,7 +19,7 @@
- RANLIB=@RANLIB@
- COMPILE_ET=@COMPILE_ET@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS= $(DEBUG) -DCONFDIR=\"$(confdir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
- 	@X_CFLAGS@ @CPPFLAGS@
- 
---- ./server/Makefile.in.BAKKK	Thu Apr  4 01:41:13 1996
-+++ ./server/Makefile.in	Tue Nov 24 00:47:03 1998
-@@ -19,7 +19,7 @@
- INSTALL=@INSTALL@
- COMPILE_ET=@COMPILE_ET@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=	$(DEBUG) -DCONFDIR=\"$(confdir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
- 	-I. @CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
---- ./zhm/Makefile.in.BAKKK	Sat Jul  8 00:17:22 1995
-+++ ./zhm/Makefile.in	Tue Nov 24 00:47:03 1998
-@@ -18,7 +18,7 @@
- CC=@CC@
- INSTALL=@INSTALL@
- 
--DEBUG=-O
-+DEBUG=-O2
- CFLAGS=	$(DEBUG) -DCONFDIR=\"$(confdir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
- 	@CPPFLAGS@
- LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
diff --git a/net/zephyr/patches/patch-ad b/net/zephyr/patches/patch-ad
new file mode 100644
index 00000000000..20549d6bcc8
--- /dev/null
+++ b/net/zephyr/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 1999/11/25 01:50:43 hubertf Exp $
+
+diff -x *.orig -urN ./clients/zleave/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zleave/Makefile.in
+--- ./clients/zleave/Makefile.in	Fri Jul  7 23:55:52 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zleave/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -18,7 +18,7 @@
+ CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+ LIBS=-lzephyr @LIBS@ -lcom_err
diff --git a/net/zephyr/patches/patch-ae b/net/zephyr/patches/patch-ae
new file mode 100644
index 00000000000..a251ff168f6
--- /dev/null
+++ b/net/zephyr/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 1999/11/25 01:50:43 hubertf Exp $
+
+diff -x *.orig -urN ./clients/zmailnotify/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zmailnotify/Makefile.in
+--- ./clients/zmailnotify/Makefile.in	Fri Jul  7 23:56:05 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zmailnotify/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -18,7 +18,7 @@
+ CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h -DKPOP @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+ LIBS=-lzephyr @LIBS@ -lcom_err
diff --git a/net/zephyr/patches/patch-af b/net/zephyr/patches/patch-af
new file mode 100644
index 00000000000..2eebe4c1f51
--- /dev/null
+++ b/net/zephyr/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 1999/11/25 01:50:43 hubertf Exp $
+
+diff -x *.orig -urN ./clients/znol/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/znol/Makefile.in
+--- ./clients/znol/Makefile.in	Fri Jul  7 23:56:16 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/znol/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -18,7 +18,7 @@
+ CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+ LIBS=-lzephyr @LIBS@ -lcom_err
diff --git a/net/zephyr/patches/patch-ag b/net/zephyr/patches/patch-ag
new file mode 100644
index 00000000000..9207a1c7b15
--- /dev/null
+++ b/net/zephyr/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 1999/11/25 01:50:43 hubertf Exp $
+
+diff -x *.orig -urN ./clients/zpopnotify/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zpopnotify/Makefile.in
+--- ./clients/zpopnotify/Makefile.in	Fri Jul  7 23:56:24 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zpopnotify/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -18,7 +18,7 @@
+ CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+ LIBS=-lzephyr @LIBS@ -lcom_err
diff --git a/net/zephyr/patches/patch-ah b/net/zephyr/patches/patch-ah
new file mode 100644
index 00000000000..c239bee9567
--- /dev/null
+++ b/net/zephyr/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 1999/11/25 01:50:43 hubertf Exp $
+
+diff -x *.orig -urN ./clients/zshutdown_notify/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zshutdown_notify/Makefile.in
+--- ./clients/zshutdown_notify/Makefile.in	Fri Jul  7 23:56:31 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zshutdown_notify/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -19,7 +19,7 @@
+ CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+ LIBS=-lzephyr @LIBS@ -lcom_err
diff --git a/net/zephyr/patches/patch-ai b/net/zephyr/patches/patch-ai
new file mode 100644
index 00000000000..5fb9108036e
--- /dev/null
+++ b/net/zephyr/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 1999/11/25 01:50:43 hubertf Exp $
+
+diff -x *.orig -urN ./clients/zstat/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zstat/Makefile.in
+--- ./clients/zstat/Makefile.in	Fri Jul  7 23:58:10 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zstat/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -18,7 +18,7 @@
+ CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+ LIBS=-lzephyr @LIBS@ -lcom_err
diff --git a/net/zephyr/patches/patch-aj b/net/zephyr/patches/patch-aj
new file mode 100644
index 00000000000..b9dc544d774
--- /dev/null
+++ b/net/zephyr/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 1999/11/25 01:50:43 hubertf Exp $
+
+diff -x *.orig -urN ./clients/zwgc/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zwgc/Makefile.in
+--- ./clients/zwgc/Makefile.in	Fri Jul  7 23:59:07 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zwgc/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -20,7 +20,7 @@
+ INSTALL=@INSTALL@
+ INSTANTIATE=$(srcdir)/instantiate
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=	$(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
+ 	-I$(srcdir) -I. @X_CFLAGS@ @CPPFLAGS@
+ YFLAGS=-d
diff --git a/net/zephyr/patches/patch-ak b/net/zephyr/patches/patch-ak
new file mode 100644
index 00000000000..42dfe9e3bf7
--- /dev/null
+++ b/net/zephyr/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 1999/11/25 01:50:43 hubertf Exp $
+
+diff -x *.orig -urN ./clients/zwrite/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zwrite/Makefile.in
+--- ./clients/zwrite/Makefile.in	Sat Jul  8 00:03:50 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zwrite/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -18,7 +18,7 @@
+ CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+ LIBS=-lzephyr @LIBS@ -lcom_err
diff --git a/net/zephyr/patches/patch-al b/net/zephyr/patches/patch-al
new file mode 100644
index 00000000000..aba17bfdd1f
--- /dev/null
+++ b/net/zephyr/patches/patch-al
@@ -0,0 +1,26 @@
+$NetBSD: patch-al,v 1.1 1999/11/25 01:50:44 hubertf Exp $
+
+diff -x *.orig -urN ./configure /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/configure
+--- ./configure	Thu Apr  4 01:42:30 1996
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/configure	Thu Nov 25 02:52:54 1999
+@@ -502,7 +502,7 @@
+ fi
+ 
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++# CFLAGS is not in ac_cpp because -g, -O2, etc. are not valid cpp options.
+ ac_cpp='echo $CPP $CPPFLAGS 1>&5;
+ $CPP $CPPFLAGS'
+ ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5;
+@@ -767,9 +767,9 @@
+ 
+ echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
+     if test $ac_cv_prog_gcc_g = yes; then
+-      CFLAGS="-g -O"
++      CFLAGS="-g -O2"
+     else
+-      CFLAGS="-O"
++      CFLAGS="-O2"
+     fi
+   fi
+ else
diff --git a/net/zephyr/patches/patch-am b/net/zephyr/patches/patch-am
new file mode 100644
index 00000000000..6e4acd44e48
--- /dev/null
+++ b/net/zephyr/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1 1999/11/25 01:50:44 hubertf Exp $
+
+diff -x *.orig -urN ./h/zephyr/zephyr.h.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/h/zephyr/zephyr.h.in
+--- ./h/zephyr/zephyr.h.in	Tue Jul 18 22:26:22 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/h/zephyr/zephyr.h.in	Thu Nov 25 02:52:53 1999
+@@ -72,8 +72,8 @@
+ 
+ /* Unique ID format */
+ typedef struct _ZUnique_Id_t {
+-    struct	in_addr zuid_addr;
+-    struct	timeval	tv;
++    struct		in_addr zuid_addr;
++    ZEPHYR_INT32	zuid_sec, zuid_usec;
+ } ZUnique_Id_t;
+ 
+ /* Checksum */
diff --git a/net/zephyr/patches/patch-an b/net/zephyr/patches/patch-an
new file mode 100644
index 00000000000..97e8878de90
--- /dev/null
+++ b/net/zephyr/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1 1999/11/25 01:50:44 hubertf Exp $
+
+diff -x *.orig -urN ./lib/dyn/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/dyn/Makefile.in
+--- ./lib/dyn/Makefile.in	Tue Jun 18 21:47:03 1996
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/dyn/Makefile.in	Thu Nov 25 02:52:55 1999
+@@ -17,7 +17,7 @@
+ CC=@CC@
+ RANLIB=@RANLIB@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h @CPPFLAGS@
+ 
+ OBJS =	dyn_append.o dyn_create.o dyn_debug.o dyn_delete.o dyn_insert.o \
diff --git a/net/zephyr/patches/patch-ao b/net/zephyr/patches/patch-ao
new file mode 100644
index 00000000000..d6a83fa24fa
--- /dev/null
+++ b/net/zephyr/patches/patch-ao
@@ -0,0 +1,14 @@
+$NetBSD: patch-ao,v 1.1 1999/11/25 01:50:44 hubertf Exp $
+
+diff -x *.orig -urN ./lib/et/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/et/Makefile.in
+--- ./lib/et/Makefile.in	Tue Jun 18 21:47:07 1996
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/et/Makefile.in	Thu Nov 25 02:52:56 1999
+@@ -20,7 +20,7 @@
+ INSTALL=@INSTALL@
+ RANLIB=@RANLIB@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(top_srcdir)/h -I$(BUILDTOP)/h -I$(srcdir) -I. @CPPFLAGS@
+ 
+ OBJS=	com_err.o error_message.o et_name.o init_et.o
diff --git a/net/zephyr/patches/patch-ap b/net/zephyr/patches/patch-ap
new file mode 100644
index 00000000000..88e1e64fb67
--- /dev/null
+++ b/net/zephyr/patches/patch-ap
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.1 1999/11/25 01:50:44 hubertf Exp $
+
+diff -x *.orig -urN ./lib/ss/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/ss/Makefile.in
+--- ./lib/ss/Makefile.in	Tue Jun 18 21:47:10 1996
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/ss/Makefile.in	Thu Nov 25 02:52:56 1999
+@@ -20,7 +20,7 @@
+ RANLIB=@RANLIB@
+ COMPILE_ET=@COMPILE_ET@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=$(DEBUG) -I$(srcdir) -I$(top_srcdir)/h -I$(BUILDTOP)/h -I. @CPPFLAGS@
+ YFLAGS=-d
+ 
diff --git a/net/zephyr/patches/patch-aq b/net/zephyr/patches/patch-aq
new file mode 100644
index 00000000000..afc9bd7c519
--- /dev/null
+++ b/net/zephyr/patches/patch-aq
@@ -0,0 +1,14 @@
+$NetBSD: patch-aq,v 1.1 1999/11/25 01:50:44 hubertf Exp $
+
+diff -x *.orig -urN ./lib/zephyr/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/zephyr/Makefile.in
+--- ./lib/zephyr/Makefile.in	Tue Jun 18 21:47:16 1996
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/zephyr/Makefile.in	Thu Nov 25 02:52:56 1999
+@@ -19,7 +19,7 @@
+ RANLIB=@RANLIB@
+ COMPILE_ET=@COMPILE_ET@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS= $(DEBUG) -DCONFDIR=\"$(confdir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
+ 	@X_CFLAGS@ @CPPFLAGS@
+ 
diff --git a/net/zephyr/patches/patch-ar b/net/zephyr/patches/patch-ar
new file mode 100644
index 00000000000..4cbee9cc1bf
--- /dev/null
+++ b/net/zephyr/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 1999/11/25 01:50:44 hubertf Exp $
+
+diff -x *.orig -urN ./lib/zephyr/ZMkAuth.c /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/zephyr/ZMkAuth.c
+--- ./lib/zephyr/ZMkAuth.c	Tue Jun 18 21:44:46 1996
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/zephyr/ZMkAuth.c	Thu Nov 25 02:52:54 1999
+@@ -44,7 +44,6 @@
+     char *cstart, *cend;
+     ZChecksum_t checksum;
+     CREDENTIALS cred;
+-    extern unsigned long des_quad_cksum();
+ 
+     now = time(0);
+     if (last_authent_time == 0 || (now - last_authent_time > 120)) {
diff --git a/net/zephyr/patches/patch-as b/net/zephyr/patches/patch-as
new file mode 100644
index 00000000000..9eeb585ee24
--- /dev/null
+++ b/net/zephyr/patches/patch-as
@@ -0,0 +1,33 @@
+$NetBSD: patch-as,v 1.1 1999/11/25 01:50:44 hubertf Exp $
+
+diff -x *.orig -urN ./lib/zephyr/ZParseNot.c /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/zephyr/ZParseNot.c
+--- ./lib/zephyr/ZParseNot.c	Tue Jul 18 22:28:07 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/zephyr/ZParseNot.c	Thu Nov 25 02:52:53 1999
+@@ -153,10 +153,10 @@
+ 	
+     if (numfields) {
+ 	if (ZReadAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid,
+-		       sizeof(ZUnique_Id_t)) == ZERR_BADFIELD)
++		       sizeof(notice->z_uid)) == ZERR_BADFIELD)
+ 	    BAD_PACKET;
+-	notice->z_time.tv_sec = ntohl((u_long) notice->z_uid.tv.tv_sec);
+-	notice->z_time.tv_usec = ntohl((u_long) notice->z_uid.tv.tv_usec);
++	notice->z_time.tv_sec = ntohl((u_long) notice->z_uid.zuid_sec);
++	notice->z_time.tv_usec = ntohl((u_long) notice->z_uid.zuid_usec);
+ 	numfields--;
+ 	next_field (ptr);
+     }
+@@ -267,10 +267,10 @@
+ 
+     if (numfields) {
+ 	if (ZReadAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid,
+-		       sizeof(ZUnique_Id_t)) == ZERR_BADFIELD)
++		       sizeof(notice->z_multiuid)) == ZERR_BADFIELD)
+ 	    BAD_PACKET;
+-	notice->z_time.tv_sec = ntohl((u_long) notice->z_multiuid.tv.tv_sec);
+-	notice->z_time.tv_usec = ntohl((u_long) notice->z_multiuid.tv.tv_usec);
++	notice->z_time.tv_sec = ntohl((u_long) notice->z_multiuid.zuid_sec);
++	notice->z_time.tv_usec = ntohl((u_long) notice->z_multiuid.zuid_usec);
+ 	numfields--;
+ 	next_field (ptr);
+     }
diff --git a/net/zephyr/patches/patch-at b/net/zephyr/patches/patch-at
new file mode 100644
index 00000000000..014945cb958
--- /dev/null
+++ b/net/zephyr/patches/patch-at
@@ -0,0 +1,72 @@
+$NetBSD: patch-at,v 1.1 1999/11/25 01:50:45 hubertf Exp $
+
+diff -x *.orig -urN ./lib/zephyr/Zinternal.c /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/zephyr/Zinternal.c
+--- ./lib/zephyr/Zinternal.c	Tue Jul 18 22:28:17 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/lib/zephyr/Zinternal.c	Thu Nov 25 02:52:54 1999
+@@ -608,6 +608,7 @@
+     Code_t retval;
+     static char version[BUFSIZ]; /* default init should be all \0 */
+     struct sockaddr_in name;
++    struct timeval tv;
+     int namelen = sizeof(name);
+ 
+     if (!notice->z_sender)
+@@ -627,9 +628,9 @@
+ 
+     notice->z_multinotice = "";
+     
+-    (void) gettimeofday(&notice->z_uid.tv, (struct timezone *)0);
+-    notice->z_uid.tv.tv_sec = htonl((u_long) notice->z_uid.tv.tv_sec);
+-    notice->z_uid.tv.tv_usec = htonl((u_long) notice->z_uid.tv.tv_usec);
++    (void) gettimeofday(&tv, (struct timezone *)0);
++    notice->z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
++    notice->z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
+     
+     if ((retval = Z_GetMyAddr()) != ZERR_NONE)
+ 	return (retval);
+@@ -709,8 +710,8 @@
+ 	return (ZERR_HEADERLEN);
+     ptr += strlen(ptr)+1;
+ 
+-    if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid, 
+-		   sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
++    if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid,
++		   sizeof(notice->z_uid)) == ZERR_FIELDLEN)
+ 	return (ZERR_HEADERLEN);
+     ptr += strlen(ptr)+1;
+ 
+@@ -760,8 +761,8 @@
+     if (Z_AddField(&ptr, notice->z_multinotice, end))
+ 	return (ZERR_HEADERLEN);
+ 
+-    if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid, 
+-		   sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
++    if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid,
++		   sizeof(notice->z_multiuid)) == ZERR_FIELDLEN)
+ 	return (ZERR_HEADERLEN);
+     ptr += strlen(ptr)+1;
+ 	
+@@ -881,6 +882,7 @@
+     char multi[64];
+     int offset, hdrsize, fragsize, ret_len, message_len, waitforack;
+     Code_t retval;
++    struct timeval tv;
+     
+     hdrsize = len-notice->z_message_len;
+     fragsize = Z_MAXPKTLEN-hdrsize-Z_FRAGFUDGE;
+@@ -896,12 +898,9 @@
+ 	(void) sprintf(multi, "%d/%d", offset, notice->z_message_len);
+ 	partnotice.z_multinotice = multi;
+ 	if (offset > 0) {
+-	    (void) gettimeofday(&partnotice.z_uid.tv,
+-				(struct timezone *)0);
+-	    partnotice.z_uid.tv.tv_sec =
+-		htonl((u_long) partnotice.z_uid.tv.tv_sec);
+-	    partnotice.z_uid.tv.tv_usec =
+-		htonl((u_long) partnotice.z_uid.tv.tv_usec);
++	    (void) gettimeofday(&tv, (struct timezone *)0);
++	    partnotice.z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
++	    partnotice.z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
+ 	    if ((retval = Z_GetMyAddr()) != ZERR_NONE)
+ 		return (retval);
+ 	    (void) memcpy((char *)&partnotice.z_uid.zuid_addr, __My_addr, 
diff --git a/net/zephyr/patches/patch-au b/net/zephyr/patches/patch-au
new file mode 100644
index 00000000000..303cd6d0e7a
--- /dev/null
+++ b/net/zephyr/patches/patch-au
@@ -0,0 +1,14 @@
+$NetBSD: patch-au,v 1.1 1999/11/25 01:50:45 hubertf Exp $
+
+diff -x *.orig -urN ./server/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/Makefile.in
+--- ./server/Makefile.in	Thu Apr  4 01:41:13 1996
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/Makefile.in	Thu Nov 25 02:52:56 1999
+@@ -19,7 +19,7 @@
+ INSTALL=@INSTALL@
+ COMPILE_ET=@COMPILE_ET@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=	$(DEBUG) -DCONFDIR=\"$(confdir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
+ 	-I. @CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
diff --git a/net/zephyr/patches/patch-av b/net/zephyr/patches/patch-av
new file mode 100644
index 00000000000..53619b4177c
--- /dev/null
+++ b/net/zephyr/patches/patch-av
@@ -0,0 +1,31 @@
+$NetBSD: patch-av,v 1.1 1999/11/25 01:50:45 hubertf Exp $
+
+diff -x *.orig -urN ./server/dispatch.c /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/dispatch.c
+--- ./server/dispatch.c	Sat Jul  8 00:12:00 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/dispatch.c	Thu Nov 25 02:52:54 1999
+@@ -761,9 +761,10 @@
+ 
+     /* search the not-yet-acked list for this packet, and flush it. */
+ #if 0
+-    zdbug((LOG_DEBUG, "nack_cancel: %s:%08X,%08X",
++    zdbug((LOG_DEBUG, "nack_cancel: %s:%08lX,%08lX",
+ 	   inet_ntoa(notice->z_uid.zuid_addr),
+-	   notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
++	   (u_long) notice->z_uid.zuid_sec,
++	   (u_long) notice->z_uid.zuid_usec));
+ #endif
+     for (nacked = nacklist; nacked; nacked = nacked->next) {
+ 	if (nacked->dest.addr.sin_addr.s_addr == who->sin_addr.s_addr &&
+@@ -779,9 +780,10 @@
+     }
+ 
+ #if 1
+-    zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08X,%08X",
++    zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08lX,%08lX",
+ 	   inet_ntoa (notice->z_uid.zuid_addr),
+-	   notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
++	   (u_long) notice->z_uid.zuid_sec,
++	   (u_long) notice->z_uid.zuid_usec));
+ #endif
+ }
+ 
diff --git a/net/zephyr/patches/patch-aw b/net/zephyr/patches/patch-aw
new file mode 100644
index 00000000000..1d8f37325d4
--- /dev/null
+++ b/net/zephyr/patches/patch-aw
@@ -0,0 +1,14 @@
+$NetBSD: patch-aw,v 1.1 1999/11/25 01:50:45 hubertf Exp $
+
+diff -x *.orig -urN ./server/kopt.c /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/kopt.c
+--- ./server/kopt.c	Tue Jun 18 21:43:00 1996
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/kopt.c	Thu Nov 25 02:52:54 1999
+@@ -234,7 +234,7 @@
+     KTEXT authent;			/* The received message */
+     char *service;			/* Service name */
+     char *instance;			/* Service instance */
+-    unsigned KRB_INT32 from_addr;	/* Net address of originating host */
++    KRB_INT32 from_addr;		/* Net address of originating host */
+     AUTH_DAT *ad;			/* Structure to be filled in */
+     char *fn;				/* Filename to get keys from */
+ {
diff --git a/net/zephyr/patches/patch-ax b/net/zephyr/patches/patch-ax
new file mode 100644
index 00000000000..bfa6be40150
--- /dev/null
+++ b/net/zephyr/patches/patch-ax
@@ -0,0 +1,14 @@
+$NetBSD: patch-ax,v 1.1 1999/11/25 01:50:45 hubertf Exp $
+
+diff -x *.orig -urN ./server/zserver.h /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/zserver.h
+--- ./server/zserver.h	Tue Jun 18 21:43:02 1996
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/zserver.h	Thu Nov 25 02:52:54 1999
+@@ -209,7 +209,7 @@
+ void add_to_key_sched_cache __P((des_cblock key, Sched *sched));
+ int krb_set_key __P((char *key, int cvt));
+ int krb_rd_req __P((KTEXT authent, char *service, char *instance,
+-		    unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn));
++		    KRB_INT32 from_addr, AUTH_DAT *ad, char *fn));
+ int krb_find_ticket __P((KTEXT authent, KTEXT ticket));
+ int krb_get_lrealm __P((char *r, int n));
+ #endif
diff --git a/net/zephyr/patches/patch-ay b/net/zephyr/patches/patch-ay
new file mode 100644
index 00000000000..aa548ca73aa
--- /dev/null
+++ b/net/zephyr/patches/patch-ay
@@ -0,0 +1,12 @@
+$NetBSD: patch-ay,v 1.1 1999/11/25 01:50:46 hubertf Exp $
+
+diff -x *.orig -urN ./server/zsrv_conf.h /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/zsrv_conf.h
+--- ./server/zsrv_conf.h	Sat Jul  1 00:11:35 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/zsrv_conf.h	Thu Nov 25 02:52:54 1999
+@@ -48,4 +48,6 @@
+ #define SWEEP_INTERVAL  3600		/* Time between sweeps of the ticket
+ 					   hash table */
+ 
++#define KRB_INT32 int32_t
++
+ #endif /* __ZSRV_CONF_H__ */
diff --git a/net/zephyr/patches/patch-az b/net/zephyr/patches/patch-az
new file mode 100644
index 00000000000..fe8e89675a6
--- /dev/null
+++ b/net/zephyr/patches/patch-az
@@ -0,0 +1,15 @@
+$NetBSD: patch-az,v 1.1 1999/11/25 01:50:46 hubertf Exp $
+
+diff -x *.orig -urN ./zhm/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/zhm/Makefile.in
+--- ./zhm/Makefile.in	Sat Jul  8 00:17:22 1995
++++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/zhm/Makefile.in	Thu Nov 25 02:52:56 1999
+@@ -18,7 +18,7 @@
+ CC=@CC@
+ INSTALL=@INSTALL@
+ 
+-DEBUG=-O
++DEBUG=-O2
+ CFLAGS=	$(DEBUG) -DCONFDIR=\"$(confdir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
+ 	@CPPFLAGS@
+ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+
-- 
cgit v1.2.3