Remove net/zephyr: it was superseded by chat/zephyr-current (now chat/zephyr).

Implicit approval by maintainer, mycroft@, deduced from a conversation
about 2 years ago ;)

33 files changed, 0 insertions, 769 deletions

diff --git a/net/zephyr/DESCR b/net/zephyr/DESCR
deleted file mode 100644
index 1ba8749384f..00000000000
--- a/net/zephyr/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Zephyr is a messaging service for securely delivering notification messages.
-It is intended to be a sort of network equivalent of wall, only you can
-target messages to particular users or classes of users rather than being
-forced to broadcast to everybody regardless of whether or not they are
-interested.  Messages are typically recieved either by the X client, zwgc,
-or by the emacs client.
diff --git a/net/zephyr/HEADER b/net/zephyr/HEADER
deleted file mode 100644
index e003320b582..00000000000
--- a/net/zephyr/HEADER
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: HEADER,v 1.1 2003/07/30 10:53:00 jmmv Exp $
-
-EGDIR="${PKG_PREFIX}/share/examples/zephyr"
-
-for f in \
-	acl/class-registry.acl \
-	acl/iui-filsrv.acl \
-	acl/iui-hm_ctl.acl \
-	acl/iui-hm_stat.acl \
-	acl/iui-login.acl \
-	acl/iui-operations.acl \
-	acl/iui-ops.acl \
-	acl/iui-user_locate.acl \
-	acl/iui-wg_ctl.acl \
-	acl/iui-zephyr_admin.acl \
-	acl/iui-zephyr_ctl.acl \
-	acl/iui-zmatch_all.acl \
-	acl/iws-filsrv.acl \
-	acl/iws-hm_ctl.acl \
-	acl/iws-hm_stat.acl \
-	acl/iws-login.acl \
-	acl/iws-operations.acl \
-	acl/iws-ops.acl \
-	acl/iws-user_locate.acl \
-	acl/iws-wg_ctl.acl \
-	acl/iws-zephyr_admin.acl \
-	acl/iws-zephyr_ctl.acl \
-	acl/iws-zmatch_all.acl \
-	acl/sub-filsrv.acl \
-	acl/sub-hm_ctl.acl \
-	acl/sub-hm_stat.acl \
-	acl/sub-login.acl \
-	acl/sub-operations.acl \
-	acl/sub-ops.acl \
-	acl/sub-user_locate.acl \
-	acl/sub-wg_ctl.acl \
-	acl/sub-zephyr_admin.acl \
-	acl/sub-zephyr_ctl.acl \
-	acl/sub-zmatch_all.acl \
-	acl/xmt-filsrv.acl \
-	acl/xmt-hm_ctl.acl \
-	acl/xmt-hm_stat.acl \
-	acl/xmt-login.acl \
-	acl/xmt-operations.acl \
-	acl/xmt-ops.acl \
-	acl/xmt-user_locate.acl \
-	acl/xmt-wg_ctl.acl \
-	acl/xmt-zephyr_admin.acl \
-	acl/xmt-zephyr_ctl.acl \
-	acl/xmt-zmatch_all.acl \
-	default.subscriptions \
-	zephyr.vars;
-do
-	CONF_FILES="${CONF_FILES} ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f"
-done
diff --git a/net/zephyr/MESSAGE b/net/zephyr/MESSAGE
deleted file mode 100644
index 3d760075b00..00000000000
--- a/net/zephyr/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2003/07/30 10:53:02 jmmv Exp $
-
-Zephyr requires a single master server, and then a host server for every
-host that supports zephyr.  You must start these out of your rc script.
-
-===========================================================================
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
deleted file mode 100644
index d2c96d07fcf..00000000000
--- a/net/zephyr/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2003/07/30 10:53:02 jmmv Exp $
-#
-
-DISTNAME=	zephyr-2.0.4
-PKGREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/dist/
-
-MAINTAINER=	mycroft@NetBSD.org
-HOMEPAGE=	http://web.mit.edu/olh/Zephyr/index.html
-COMMENT=	Zephyr Messaging Service
-
-CONFLICTS+=	kth-krb4-[0-9]*
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(KERBEROS)
-PKG_USE_KERBEROS=	yes
-CONFIGURE_ARGS+="--with-krb4"
-CPPFLAGS+=	-I/usr/include/kerberosIV
-.else
-CONFIGURE_ARGS+="--without-krb4"
-.endif
-
-USE_BUILDLINK2=	yes
-USE_PKGINSTALL=	yes
-USE_X11=	yes
-GNU_CONFIGURE=	yes
-
-ZEPHYR_DOCDIR=	${PREFIX}/share/doc/zephyr
-ZEPHYR_DOCS=	INSTALL NOTES OPERATING README USING
-
-RCD_SCRIPTS=	zhm
-
-CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
-PKG_SYSCONFSUBDIR=	zephyr
-OWN_DIRS=		${PKG_SYSCONFDIR}/acl
-EGDIR=			${PREFIX}/share/examples/zephyr
-CONF_FILES=		# Contents set in HEADER file
-
-pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}/acl
-	${INSTALL_DATA_DIR} ${ZEPHYR_DOCDIR}
-.for f in ${ZEPHYR_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/$f ${ZEPHYR_DOCDIR}
-.endfor
-.undef f
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/zephyr/PLIST b/net/zephyr/PLIST
deleted file mode 100644
index 565a0ffc8d5..00000000000
--- a/net/zephyr/PLIST
+++ /dev/null
@@ -1,100 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/07/30 10:53:02 jmmv Exp $
-bin/xzwrite
-bin/zaway
-bin/zctl
-bin/zleave
-bin/zlocate
-bin/znol
-bin/zstat
-bin/zwgc
-bin/zwrite
-etc/rc.d/zhm
-include/com_err.h
-include/zephyr/mit-copyright.h
-include/zephyr/zephyr.h
-include/zephyr/zephyr_err.h
-lib/libcom_err.a
-lib/libzephyr.a
-man/man1/xzwrite.1
-man/man1/zaway.1
-man/man1/zctl.1
-man/man1/zephyr.1
-man/man1/zleave.1
-man/man1/zlocate.1
-man/man1/zmailnotify.1
-man/man1/znol.1
-man/man1/zwgc.1
-man/man1/zwrite.1
-man/man3/com_err.3
-man/man8/syslogd.8
-man/man8/zephyrd.8
-man/man8/zhm.8
-man/man8/zpopnotify.8
-man/man8/zshutdown_notify.8
-man/man8/zstat.8
-sbin/syslogd
-sbin/zephyrd
-sbin/zhm
-sbin/zmailnotify
-sbin/zpopnotify
-sbin/zshutdown_notify
-share/XZwrite
-share/xzwrite.bitmap
-share/zwgc.desc
-share/zwgc_resources
-share/doc/zephyr/INSTALL
-share/doc/zephyr/NOTES
-share/doc/zephyr/OPERATING
-share/doc/zephyr/README
-share/doc/zephyr/USING
-share/examples/zephyr/acl/class-registry.acl
-share/examples/zephyr/acl/iui-filsrv.acl
-share/examples/zephyr/acl/iui-hm_ctl.acl
-share/examples/zephyr/acl/iui-hm_stat.acl
-share/examples/zephyr/acl/iui-login.acl
-share/examples/zephyr/acl/iui-operations.acl
-share/examples/zephyr/acl/iui-ops.acl
-share/examples/zephyr/acl/iui-user_locate.acl
-share/examples/zephyr/acl/iui-wg_ctl.acl
-share/examples/zephyr/acl/iui-zephyr_admin.acl
-share/examples/zephyr/acl/iui-zephyr_ctl.acl
-share/examples/zephyr/acl/iui-zmatch_all.acl
-share/examples/zephyr/acl/iws-filsrv.acl
-share/examples/zephyr/acl/iws-hm_ctl.acl
-share/examples/zephyr/acl/iws-hm_stat.acl
-share/examples/zephyr/acl/iws-login.acl
-share/examples/zephyr/acl/iws-operations.acl
-share/examples/zephyr/acl/iws-ops.acl
-share/examples/zephyr/acl/iws-user_locate.acl
-share/examples/zephyr/acl/iws-wg_ctl.acl
-share/examples/zephyr/acl/iws-zephyr_admin.acl
-share/examples/zephyr/acl/iws-zephyr_ctl.acl
-share/examples/zephyr/acl/iws-zmatch_all.acl
-share/examples/zephyr/acl/sub-filsrv.acl
-share/examples/zephyr/acl/sub-hm_ctl.acl
-share/examples/zephyr/acl/sub-hm_stat.acl
-share/examples/zephyr/acl/sub-login.acl
-share/examples/zephyr/acl/sub-operations.acl
-share/examples/zephyr/acl/sub-ops.acl
-share/examples/zephyr/acl/sub-user_locate.acl
-share/examples/zephyr/acl/sub-wg_ctl.acl
-share/examples/zephyr/acl/sub-zephyr_admin.acl
-share/examples/zephyr/acl/sub-zephyr_ctl.acl
-share/examples/zephyr/acl/sub-zmatch_all.acl
-share/examples/zephyr/acl/xmt-filsrv.acl
-share/examples/zephyr/acl/xmt-hm_ctl.acl
-share/examples/zephyr/acl/xmt-hm_stat.acl
-share/examples/zephyr/acl/xmt-login.acl
-share/examples/zephyr/acl/xmt-operations.acl
-share/examples/zephyr/acl/xmt-ops.acl
-share/examples/zephyr/acl/xmt-user_locate.acl
-share/examples/zephyr/acl/xmt-wg_ctl.acl
-share/examples/zephyr/acl/xmt-zephyr_admin.acl
-share/examples/zephyr/acl/xmt-zephyr_ctl.acl
-share/examples/zephyr/acl/xmt-zmatch_all.acl
-share/examples/zephyr/default.subscriptions
-share/examples/zephyr/zephyr.vars
-@dirrm share/examples/zephyr/acl
-@dirrm share/examples/zephyr
-@dirrm share/doc/zephyr
-@dirrm include/zephyr
diff --git a/net/zephyr/distinfo b/net/zephyr/distinfo
deleted file mode 100644
index 81a3e24d0b2..00000000000
--- a/net/zephyr/distinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: distinfo,v 1.3 2003/07/30 10:53:02 jmmv Exp $
-
-SHA1 (zephyr-2.0.4.tar.gz) = df0e3f6da42d54fc218787c4e7eb9934f5bf5548
-Size (zephyr-2.0.4.tar.gz) = 435872 bytes
-SHA1 (patch-aa) = 074ea7b81c7c3265d80c19805a3e3a217d386ab4
-SHA1 (patch-ab) = 8f232d5b7ad82c6a656bc19e19ee1bcdcd6eb509
-SHA1 (patch-ac) = 2976c91ec491016fcdc82f0bcaed45d81f4d40dc
-SHA1 (patch-ad) = de8d583f1e5919fc6f337a98f401b53cefab7483
-SHA1 (patch-ae) = 49e7f8ee7a507bf86cc5f86ee09b9d421e34e237
-SHA1 (patch-af) = 916f07244f23ea0fbe20cb9f39cd86c6e4e80aba
-SHA1 (patch-ag) = abf58efa9da47405f277a80c5b098087ccb3d6dd
-SHA1 (patch-ah) = 1d181663cf85dea3635392886c68dac2f8950e10
-SHA1 (patch-ai) = 2a55884f62c016a592b27342433dc8c624883a4a
-SHA1 (patch-aj) = a458b70331ecc996c71eae07d9e2f64d340cd028
-SHA1 (patch-ak) = 2f22602c2dbca980872c6b7dffafb709c05a7a22
-SHA1 (patch-al) = ea69bec71bfac6c0093a4b46840f1eedc89f12b1
-SHA1 (patch-am) = e1158c4f45d8a1d92f91df9c0c102e9c9bc2b523
-SHA1 (patch-an) = 9b3ee33c50072835ff899732c9ba19b9d5784ddd
-SHA1 (patch-ao) = af1d162cf8a0cf7367a9d7717ac8e7045f7113e5
-SHA1 (patch-ap) = 0e46cdab29cbd05e34d3d7e64d73eefb37472bae
-SHA1 (patch-aq) = ce0283541623070e43558c3cc9460d17deaae663
-SHA1 (patch-ar) = 7bfcadad0ae701051a5784710805e9c18a71581c
-SHA1 (patch-as) = 14858ff528c9e38a947a1215aad388e46a8863c4
-SHA1 (patch-at) = ad95c4d16d6344afe53ddfec16165b8a85562a64
-SHA1 (patch-au) = bf64536800c30f698c7d2264551364dcd07bd616
-SHA1 (patch-av) = 741c1429955d08a56ee05ebeb79ee24aedf396f8
-SHA1 (patch-aw) = 5ba3962c76037364577894596cdde5a051bf2e2d
-SHA1 (patch-ax) = 3b66feaf74e5c97d880d7ea8eb6cf2b3acced06b
-SHA1 (patch-ay) = 160065ba97a074af47e9047fc03a9912259e326f
-SHA1 (patch-az) = 3f7aa8ed9f891777809063e7b9875240a8c84a09
diff --git a/net/zephyr/files/zhm.sh b/net/zephyr/files/zhm.sh
deleted file mode 100644
index 5c230870c2d..00000000000
--- a/net/zephyr/files/zhm.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: zhm.sh,v 1.4 2003/07/30 10:53:03 jmmv Exp $
-#
-# PROVIDE: zhm
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="zhm"
-rcvar="$name"
-command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/server.list"
-start_precmd="zhm_precmd"
-
-zhm_precmd()
-{
-	_flags="`cat @PKG_SYSCONFDIR@/server.list`"
-}
-load_rc_config "$name"
-run_rc_command "$1"
diff --git a/net/zephyr/patches/patch-aa b/net/zephyr/patches/patch-aa
deleted file mode 100644
index 672dbf90c22..00000000000
--- a/net/zephyr/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/11/25 01:50:42 hubertf Exp $
-
-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
deleted file mode 100644
index 8cac6b1a560..00000000000
--- a/net/zephyr/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/11/25 01:50:42 hubertf Exp $
-
-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
deleted file mode 100644
index 46e58019bca..00000000000
--- a/net/zephyr/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1999/11/25 01:50:42 hubertf Exp $
-
-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@
- 
--DEBUG=-O
-+DEBUG=-O2
- 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
diff --git a/net/zephyr/patches/patch-ad b/net/zephyr/patches/patch-ad
deleted file mode 100644
index 20549d6bcc8..00000000000
--- a/net/zephyr/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index a251ff168f6..00000000000
--- a/net/zephyr/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 2eebe4c1f51..00000000000
--- a/net/zephyr/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 9207a1c7b15..00000000000
--- a/net/zephyr/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index c239bee9567..00000000000
--- a/net/zephyr/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 5fb9108036e..00000000000
--- a/net/zephyr/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 7b2bb72aecd..00000000000
--- a/net/zephyr/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2003/07/30 10:53:03 jmmv Exp $
-
---- clients/zwgc/Makefile.in.orig	1995-07-07 23:59:07.000000000 +0200
-+++ clients/zwgc/Makefile.in
-@@ -20,7 +20,7 @@ YACC=@YACC@
- 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
-@@ -73,7 +73,7 @@ install: zwgc
- 	$(INSTALL) -m 644 $(srcdir)/zwgc.1 $(mandir)/man1
- 	$(INSTALL) -m 644 $(srcdir)/zwgc.desc $(datadir)
- 	$(INSTALL) -m 644 $(srcdir)/zwgc_resources $(datadir)
--	$(INSTALL) -m 644 zephyr.vars $(confdir)
-+	$(INSTALL) -m 644 zephyr.vars $(datadir)/examples/zephyr
- 
- clean:
- 	rm -f $(OBJS) zwgc port_dictionary.[ch] pointer_dictionary.[ch]
diff --git a/net/zephyr/patches/patch-ak b/net/zephyr/patches/patch-ak
deleted file mode 100644
index 42dfe9e3bf7..00000000000
--- a/net/zephyr/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index defb53b6803..00000000000
--- a/net/zephyr/patches/patch-al
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-al,v 1.2 2003/07/30 10:53:03 jmmv Exp $
-
---- configure.orig	1996-04-04 01:42:30.000000000 +0200
-+++ configure
-@@ -502,7 +502,7 @@ else
- 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;
-@@ -559,6 +559,7 @@ else
- 	       cp ${srcdir}/lib/et/com_err.h h
- 	       cp ${srcdir}/lib/ss/*.h h/ss
- fi
-+confdir=${PKG_SYSCONFDIR}
- 
- 
- 
-@@ -767,9 +768,9 @@ fi
- 
- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
-     if test $ac_cv_prog_gcc_g = yes; then
--      CFLAGS="-g -O"
-+      CFLAGS="$CFLAGS -g -O2"
-     else
--      CFLAGS="-O"
-+      CFLAGS="$CFLAGS -O2"
-     fi
-   fi
- else
diff --git a/net/zephyr/patches/patch-am b/net/zephyr/patches/patch-am
deleted file mode 100644
index 6e4acd44e48..00000000000
--- a/net/zephyr/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index 97e8878de90..00000000000
--- a/net/zephyr/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index d6a83fa24fa..00000000000
--- a/net/zephyr/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 88e1e64fb67..00000000000
--- a/net/zephyr/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index afc9bd7c519..00000000000
--- a/net/zephyr/patches/patch-aq
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 4cbee9cc1bf..00000000000
--- a/net/zephyr/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 9eeb585ee24..00000000000
--- a/net/zephyr/patches/patch-as
+++ /dev/null
@@ -1,33 +0,0 @@
-$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
deleted file mode 100644
index 014945cb958..00000000000
--- a/net/zephyr/patches/patch-at
+++ /dev/null
@@ -1,72 +0,0 @@
-$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
deleted file mode 100644
index e2cf9a6afc0..00000000000
--- a/net/zephyr/patches/patch-au
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-au,v 1.2 2003/07/30 10:53:04 jmmv Exp $
-
---- server/Makefile.in.orig	1996-04-04 01:41:13.000000000 +0200
-+++ server/Makefile.in
-@@ -19,7 +19,7 @@ CC=@CC@
- 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@
-@@ -48,10 +48,10 @@ check:
- install:
- 	$(INSTALL) -m 755 -s zephyrd $(sbindir)
- 	$(INSTALL) -m 644 $(srcdir)/zephyrd.8 $(mandir)/man8
--	$(INSTALL) -m 644 $(srcdir)/default.subscriptions $(confdir)
--	rm -f $(confdir)/acl/?*.acl
--	cp $(srcdir)/acl/?*.acl $(confdir)/acl
--	chmod 644 $(confdir)/acl/*
-+	$(INSTALL) -m 644 $(srcdir)/default.subscriptions $(datadir)/examples/zephyr
-+	for f in $(srcdir)/acl/?*.acl; do \
-+		$(INSTALL) -m 644 $$f $(datadir)/examples/zephyr/acl; \
-+	done
- 
- clean:
- 	rm -f $(OBJS) zephyrd zsrv_err.[ch]
diff --git a/net/zephyr/patches/patch-av b/net/zephyr/patches/patch-av
deleted file mode 100644
index 53619b4177c..00000000000
--- a/net/zephyr/patches/patch-av
+++ /dev/null
@@ -1,31 +0,0 @@
-$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
deleted file mode 100644
index 1d8f37325d4..00000000000
--- a/net/zephyr/patches/patch-aw
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index bfa6be40150..00000000000
--- a/net/zephyr/patches/patch-ax
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index aa548ca73aa..00000000000
--- a/net/zephyr/patches/patch-ay
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index fe8e89675a6..00000000000
--- a/net/zephyr/patches/patch-az
+++ /dev/null
@@ -1,15 +0,0 @@
-$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@
-