Port net/zephyr has an unfetchable distfile. The included patch fixes the

port, updating it to the latest (and final) version. Patches from the
previous version are merged.

PR:		23728
Submitted by:	George Reid <greid@ukug.uk.freebsd.org>

8 files changed, 69 insertions, 338 deletions

diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index 1785e576b857..df5a56acc2c2 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	zephyr
-PORTVERSION=	2.0.4
+PORTVERSION=	20000421
 CATEGORIES=	net
-MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/old/
+MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/
 
 MAINTAINER=	ports@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/zephyr
+
 USE_XLIB=	yes
 .if exists(/usr/lib/libkrb.a) && defined(MAKE_EBONES)
 CONFIGURE_ARGS="--with-krb4"
@@ -20,8 +22,7 @@ CONFIGURE_ARGS="--with-krb4"
 HAS_CONFIGURE=	yes
 MAN1=		zephyr.1 xzwrite.1 zaway.1 zctl.1 zleave.1 zlocate.1 \
 		zmailnotify.1 znol.1 zwgc.1 zwrite.1
-MAN8=		syslogd.8 zpopnotify.8 zshutdown_notify.8 zstat.8 \
-		zephyrd.8 zhm.8
+MAN8=		zpopnotify.8 zshutdown_notify.8 zstat.8 zephyrd.8 zhm.8
 
 ZEPHYR_RCDIR=	${PREFIX}/etc/rc.d
 ZEPHYR_DOCDIR=	${PREFIX}/share/doc/zephyr
diff --git a/net/zephyr/distinfo b/net/zephyr/distinfo
index 1de9ac3bb3ea..29cb78fc3ea6 100644
--- a/net/zephyr/distinfo
+++ b/net/zephyr/distinfo
@@ -1 +1 @@
-MD5 (zephyr-2.0.4.tar.gz) = 866c287c45da2fa353484297ad570cf4
+MD5 (zephyr-20000421.tar.gz) = 7b7c50ece90fbf294af82b8fec63c0f1
diff --git a/net/zephyr/files/patch-aa b/net/zephyr/files/patch-aa
index 53bf45a7093a..f869bce8bc6a 100644
--- a/net/zephyr/files/patch-aa
+++ b/net/zephyr/files/patch-aa
@@ -1,59 +1,13 @@
-*** configure.orig	Wed Mar  3 20:37:09 1999
---- configure	Wed Mar  3 20:39:35 1999
-***************
-*** 44,50 ****
-  bindir='${exec_prefix}/bin'
-  sbindir='${exec_prefix}/sbin'
-  libexecdir='${exec_prefix}/libexec'
-! datadir='${prefix}/share'
-  sysconfdir='${prefix}/etc'
-  sharedstatedir='${prefix}/com'
-  localstatedir='${prefix}/var'
---- 44,50 ----
-  bindir='${exec_prefix}/bin'
-  sbindir='${exec_prefix}/sbin'
-  libexecdir='${exec_prefix}/libexec'
-! datadir='${prefix}/share/zephyr'
-  sysconfdir='${prefix}/etc'
-  sharedstatedir='${prefix}/com'
-  localstatedir='${prefix}/var'
-***************
-*** 547,563 ****
-  	       confdir=${confdir-'$(prefix)/etc/zephyr'}
-  	       sbindir=${sbindir-'$(exec_prefix)/sbin'}
-  	       lsbindir=${lsbindir-'$(exec_prefix)/sbin'}
-! 	       SUPPORT_LIBS="et ss"
-! 	       ET_LDFLAGS='-L$(BUILDTOP)/lib/et'
-! 	       ETDEP='$(BUILDTOP)/lib/et/libcom_err.a'
-! 	       SS_LDFLAGS='-L$(BUILDTOP)/lib/ss'
-! 	       SSDEP='$(BUILDTOP)/lib/ss/libss.a'
-! 	       COMPILE_ET='$(BUILDTOP)/lib/et/compile_et'
-! 	       MK_CMDS='$(BUILDTOP)/lib/ss/mk_cmds'
-  	       INITPROGS=true
-! 	       if test ! -d h/ss; then mkdir h/ss; fi
-! 	       cp ${srcdir}/lib/et/com_err.h h
-! 	       cp ${srcdir}/lib/ss/*.h h/ss
-  fi
-  
-  
---- 547,566 ----
-  	       confdir=${confdir-'$(prefix)/etc/zephyr'}
-  	       sbindir=${sbindir-'$(exec_prefix)/sbin'}
-  	       lsbindir=${lsbindir-'$(exec_prefix)/sbin'}
-! #	       SUPPORT_LIBS="et ss"
-! #	       ET_LDFLAGS='-L$(BUILDTOP)/lib/et'
-! #	       ETDEP='$(BUILDTOP)/lib/et/libcom_err.a'
-! #	       SS_LDFLAGS='-L$(BUILDTOP)/lib/ss'
-! #	       SSDEP='$(BUILDTOP)/lib/ss/libss.a'
-! #	       COMPILE_ET='$(BUILDTOP)/lib/et/compile_et'
-! #	       MK_CMDS='$(BUILDTOP)/lib/ss/mk_cmds'
-  	       INITPROGS=true
-! #	       if test ! -d h/ss; then mkdir h/ss; fi
-! #	       cp ${srcdir}/lib/et/com_err.h h
-! #	       cp ${srcdir}/lib/ss/*.h h/ss
-! 	       CPPFLAGS="${CPPFLAGS} -I/usr/include/kerberosIV"
-! 	       COMPILE_ET=compile_et
-! 	       MK_CMDS=mk_cmds
-  fi
-  
-  
+--- clients/xzwrite/Makefile.in.orig	Wed May 26 17:22:09 1999
++++ clients/xzwrite/Makefile.in		Thu Dec 21 21:57:19 2000
+@@ -50,8 +50,8 @@
+ install: xzwrite XZwrite
+ 	${INSTALL} -m 755 -s xzwrite ${DESTDIR}${bindir}
+ 	${INSTALL} -m 644 ${srcdir}/xzwrite.1 ${DESTDIR}${mandir}/man1
+-	${INSTALL} -m 644 XZwrite ${DESTDIR}${datadir}/zephyr
+-	${INSTALL} -m 644 ${srcdir}/xzwrite.bitmap ${DESTDIR}${datadir}/zephyr
++	${INSTALL} -m 644 XZwrite ${DESTDIR}${datadir}
++	${INSTALL} -m 644 ${srcdir}/xzwrite.bitmap ${DESTDIR}${datadir}
+ 
+ clean:
+ 	rm -f ${OBJS} xzwrite
diff --git a/net/zephyr/files/patch-ab b/net/zephyr/files/patch-ab
index c4d2bb673dcc..18a08c48e0c1 100644
--- a/net/zephyr/files/patch-ab
+++ b/net/zephyr/files/patch-ab
@@ -1,20 +1,13 @@
---- clients/xzwrite/Makefile.in.orig	Fri Jul  7 23:55:14 1995
-+++ clients/xzwrite/Makefile.in	Wed Mar  3 19:29:01 1999
-@@ -17,6 +17,7 @@
- VPATH=@srcdir@
- CC=@CC@
- INSTALL=@INSTALL@
-+SED=/usr/bin/sed
- 
- DEBUG=-O
- CFLAGS=$(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
-@@ -41,7 +42,8 @@
- install: xzwrite XZwrite
- 	$(INSTALL) -m 755 -s xzwrite $(bindir)
- 	$(INSTALL) -m 644 $(srcdir)/xzwrite.1 $(mandir)/man1
--	$(INSTALL) -m 644 XZwrite $(datadir)
-+	$(SED) -e 's#XX_PREFIX_XX#$(prefix)#' < XZwrite >XZwrite.tmp
-+	$(INSTALL) -m 644 XZwrite.tmp $(datadir)/XZwrite
- 	$(INSTALL) -m 644 $(srcdir)/xzwrite.bitmap $(datadir)
- 
- clean:
+--- Makefile.in.orig	Thu Jun 11 20:10:02 1998
++++ Makefile.in		Thu Dec 21 22:08:19 2000
+@@ -30,9 +30,8 @@
+ 	${ENSUREDIR} ${DESTDIR}${bindir} 755
+ 	${ENSUREDIR} ${DESTDIR}${libdir} 755
+ 	${ENSUREDIR} ${DESTDIR}${datadir} 755
+-	${ENSUREDIR} ${DESTDIR}${datadir}/zephyr 755
+ 	${ENSUREDIR} ${DESTDIR}${sysconfdir} 755
+-	${ENSUREDIR} ${DESTDIR}${sysconfdir}/zephyr/acl 755
++	${ENSUREDIR} ${DESTDIR}${sysconfdir}/zephyr 755
+ 	${ENSUREDIR} ${DESTDIR}${sbindir} 755
+ 	${ENSUREDIR} ${DESTDIR}${includedir} 755
+ 	${ENSUREDIR} ${DESTDIR}${includedir}/zephyr 755
diff --git a/net/zephyr/files/patch-ac b/net/zephyr/files/patch-ac
index af98ae5bcc71..69a41fa3b411 100644
--- a/net/zephyr/files/patch-ac
+++ b/net/zephyr/files/patch-ac
@@ -1,11 +1,11 @@
---- clients/xzwrite/XZwrite.in.orig	Wed Mar  3 19:57:39 1999
-+++ clients/xzwrite/XZwrite.in	Wed Mar  3 20:05:46 1999
-@@ -17,7 +17,7 @@
- *readAnyone:		on
- *readXzwrite:		on
- 
--*icon.bitmap:		@datadir@/xzwrite.bitmap
-+*icon.bitmap:		XX_PREFIX_XX/share/zephyr/xzwrite.bitmap
- *icon.translations:	#override\
- 	<BtnDown>:	set() \n\
- 	<Btn1Up>:	OpenSend() unset() \n\
+--- configure.orig	Fri Apr 21 22:30:15 2000
++++ configure		Thu Dec 21 20:19:25 2000
+@@ -50,7 +50,7 @@
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datadir='${prefix}/share/zephyr'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
diff --git a/net/zephyr/files/patch-ad b/net/zephyr/files/patch-ad
index 413bf4fd9b85..d1e072fb1470 100644
--- a/net/zephyr/files/patch-ad
+++ b/net/zephyr/files/patch-ad
@@ -1,182 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:11:07 agc 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
-  }
+--- h/zephyr/zephyr.h.orig	Fri Jan 22 23:18:59 1999
++++ h/zephyr/zephyr.h		Thu Dec 21 20:25:44 2000
+@@ -64,8 +64,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/files/patch-ae b/net/zephyr/files/patch-ae
index 802feb3c091a..9cdc49a5e835 100644
--- a/net/zephyr/files/patch-ae
+++ b/net/zephyr/files/patch-ae
@@ -1,11 +1,11 @@
---- lib/zephyr/Makefile.in.orig	Sun Sep 19 17:17:01 1999
-+++ lib/zephyr/Makefile.in	Sun Sep 19 17:17:21 1999
-@@ -21,7 +21,7 @@
- 
- DEBUG=-O
- CFLAGS= $(DEBUG) -DCONFDIR=\"$(confdir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
--	@X_CFLAGS@ @CPPFLAGS@
-+	-I$(top_srcdir)/h/zephyr @X_CFLAGS@ @CPPFLAGS@
+--- lib/Makefile.in.orig	Sat Jan 31 23:55:07 1998
++++ lib/Makefile.in		Thu Dec 21 20:36:28 2000
+@@ -22,7 +22,7 @@
+ CPPFLAGS=@CPPFLAGS@
+ CFLAGS=@CFLAGS@
+ ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \
+-	-I${BUILDTOP}/h ${CPPFLAGS}
++	-I ${BUILDTOP}/h/zephyr -I${BUILDTOP}/h ${CPPFLAGS}
  
  OBJS =	zephyr_err.o ZAsyncLocate.o ZCkAuth.o ZCkIfNot.o ZClosePort.o \
  	ZCmpUID.o ZCmpUIDP.o ZFlsLocs.o ZFlsSubs.o ZFmtAuth.o ZFmtList.o \
diff --git a/net/zephyr/pkg-plist b/net/zephyr/pkg-plist
index efacbcb52bf6..3a19af7b85a2 100644
--- a/net/zephyr/pkg-plist
+++ b/net/zephyr/pkg-plist
@@ -4,68 +4,21 @@ bin/zaway
 bin/zctl
 bin/zleave
 bin/zlocate
+bin/zmailnotify
 bin/znol
 bin/zstat
-bin/zwgc
 bin/zwrite
-etc/rc.d/zhm.sh
-etc/zephyr/acl/class-registry.acl
-etc/zephyr/acl/iui-filsrv.acl
-etc/zephyr/acl/iui-hm_ctl.acl
-etc/zephyr/acl/iui-hm_stat.acl
-etc/zephyr/acl/iui-login.acl
-etc/zephyr/acl/iui-operations.acl
-etc/zephyr/acl/iui-ops.acl
-etc/zephyr/acl/iui-user_locate.acl
-etc/zephyr/acl/iui-wg_ctl.acl
-etc/zephyr/acl/iui-zephyr_admin.acl
-etc/zephyr/acl/iui-zephyr_ctl.acl
-etc/zephyr/acl/iui-zmatch_all.acl
-etc/zephyr/acl/iws-filsrv.acl
-etc/zephyr/acl/iws-hm_ctl.acl
-etc/zephyr/acl/iws-hm_stat.acl
-etc/zephyr/acl/iws-login.acl
-etc/zephyr/acl/iws-operations.acl
-etc/zephyr/acl/iws-ops.acl
-etc/zephyr/acl/iws-user_locate.acl
-etc/zephyr/acl/iws-wg_ctl.acl
-etc/zephyr/acl/iws-zephyr_admin.acl
-etc/zephyr/acl/iws-zephyr_ctl.acl
-etc/zephyr/acl/iws-zmatch_all.acl
-etc/zephyr/acl/sub-filsrv.acl
-etc/zephyr/acl/sub-hm_ctl.acl
-etc/zephyr/acl/sub-hm_stat.acl
-etc/zephyr/acl/sub-login.acl
-etc/zephyr/acl/sub-operations.acl
-etc/zephyr/acl/sub-ops.acl
-etc/zephyr/acl/sub-user_locate.acl
-etc/zephyr/acl/sub-wg_ctl.acl
-etc/zephyr/acl/sub-zephyr_admin.acl
-etc/zephyr/acl/sub-zephyr_ctl.acl
-etc/zephyr/acl/sub-zmatch_all.acl
-etc/zephyr/acl/xmt-filsrv.acl
-etc/zephyr/acl/xmt-hm_ctl.acl
-etc/zephyr/acl/xmt-hm_stat.acl
-etc/zephyr/acl/xmt-login.acl
-etc/zephyr/acl/xmt-operations.acl
-etc/zephyr/acl/xmt-ops.acl
-etc/zephyr/acl/xmt-user_locate.acl
-etc/zephyr/acl/xmt-wg_ctl.acl
-etc/zephyr/acl/xmt-zephyr_admin.acl
-etc/zephyr/acl/xmt-zephyr_ctl.acl
-etc/zephyr/acl/xmt-zmatch_all.acl
+bin/zwgc
 etc/zephyr/default.subscriptions
-etc/zephyr/zephyr.vars
+etc/rc.d/zhm.sh
 include/zephyr/mit-copyright.h
 include/zephyr/zephyr.h
 include/zephyr/zephyr_err.h
 lib/libzephyr.a
-sbin/syslogd
+sbin/zshutdown_notify
+sbin/zpopnotify
 sbin/zephyrd
 sbin/zhm
-sbin/zmailnotify
-sbin/zpopnotify
-sbin/zshutdown_notify
 share/zephyr/XZwrite
 share/doc/zephyr/INSTALL
 share/doc/zephyr/NOTES
@@ -75,7 +28,6 @@ share/doc/zephyr/USING
 share/zephyr/xzwrite.bitmap
 share/zephyr/zwgc.desc
 share/zephyr/zwgc_resources
-@dirrm etc/zephyr/acl
 @dirrm etc/zephyr
 @dirrm include/zephyr
 @dirrm share/doc/zephyr