As announced on 27 March 2003 in <20030328052350.GA18971@rot13.obsecurity.org>,

remove these ports that have been broken for >4 months (in many cases much
longer) with no sign of a fix.

46 files changed, 0 insertions, 1111 deletions

diff --git a/net/coda_client/Makefile b/net/coda_client/Makefile
deleted file mode 100644
index 3511244078ea..000000000000
--- a/net/coda_client/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	coda
-# Date created:				19 June 1998
-# Whom:					hmpierce <hmpierce@cs.cmu.edu>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	coda-client
-PORTVERSION=	4.6.6.1
-CATEGORIES=	net
-#MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS
-DISTNAME=	coda-4.6.6
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	rvb@cs.cmu.edu
-COMMENT=	An experimental, replicated, high-performance network file system
-
-BROKEN=		"Does not build"
-
-BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
-
-ALL_TARGET=	coda
-INSTALL_TARGET=	client-install
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
-NO_LATEST_LINK=	yes
-
-.include <bsd.port.mk>
diff --git a/net/coda_client/distinfo b/net/coda_client/distinfo
deleted file mode 100644
index a130c080665c..000000000000
--- a/net/coda_client/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (coda-4.6.6.tgz) = e05c12cbe7bd20619a253ea24b4f951e
diff --git a/net/coda_client/pkg-descr b/net/coda_client/pkg-descr
deleted file mode 100644
index 32580d907cf0..000000000000
--- a/net/coda_client/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Coda is a distributed file system.  Among its features are disconnected
-operation, good security model, server replication and persistent client
-side caching. 
-
-This package builds the entire source tree but only installs(/packages) the
-client side programs.
-
-For more info, contact <coda@cs.cmu.edu> or visit the website.
-
-WWW: http://www.coda.cs.cmu.edu/
diff --git a/net/coda_client/pkg-plist b/net/coda_client/pkg-plist
deleted file mode 100644
index 9a0816ca0a76..000000000000
--- a/net/coda_client/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-lib/coda/Advice.tcl
-lib/coda/CodaConsole
-lib/coda/Consider.tcl
-lib/coda/ConsiderAdding.tcl
-lib/coda/ConsiderRemoving.tcl
-lib/coda/ControlPanel.tcl
-lib/coda/Date.tcl
-lib/coda/DiscoMiss.tcl
-lib/coda/Events.tcl
-lib/coda/Globals.tcl
-lib/coda/Helper.tcl
-lib/coda/HoardWalk.tcl
-lib/coda/HoardWalkAdvice.tcl
-lib/coda/Indicators.tcl
-lib/coda/Initialization.tcl
-lib/coda/Lock.tcl
-lib/coda/Log.tcl
-lib/coda/Network.tcl
-lib/coda/OutsideWorld.tcl
-lib/coda/ReadMiss.tcl
-lib/coda/Reconnection.tcl
-lib/coda/Reintegration.tcl
-lib/coda/Repair.tcl
-lib/coda/Space.tcl
-lib/coda/Task.tcl
-lib/coda/Timing.tcl
-lib/coda/Tokens.tcl
-lib/coda/WeakMiss.tcl
-lib/coda/tixCodaMeter.tcl
-sbin/au
-sbin/venus
-sbin/venus-setup
-sbin/volmunge
-sbin/vutil
-bin/advice_srv
-bin/cfs
-bin/clog
-bin/cmon
-bin/codacon
-bin/cpasswd
-bin/ctokens
-bin/cunlog
-bin/filcon
-bin/filerepair
-bin/hoard
-bin/logbandwidth
-bin/logcmls
-bin/logreintegration
-bin/parser
-bin/removeinc
-bin/repair
-bin/replay
-bin/spy
-bin/xaskuser
-bin/xfrepair
-@dirrm lib/coda
diff --git a/net/coda_server/Makefile b/net/coda_server/Makefile
deleted file mode 100644
index bf3c61686133..000000000000
--- a/net/coda_server/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	coda
-# Date created:				19 June 1998
-# Whom:					hmpierce <hmpierce@cs.cmu.edu>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	coda-server
-PORTVERSION=	4.6.6.1
-CATEGORIES=	net
-#MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS
-DISTNAME=	coda-4.6.6
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	rvb@cs.cmu.edu
-COMMENT=	An experimental, replicated, high-performance network file system
-
-BROKEN=		"Does not build"
-
-BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
-
-ALL_TARGET=	coda
-INSTALL_TARGET=	server-install
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
-NO_LATEST_LINK=	yes
-
-.include <bsd.port.mk>
diff --git a/net/coda_server/distinfo b/net/coda_server/distinfo
deleted file mode 100644
index a130c080665c..000000000000
--- a/net/coda_server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (coda-4.6.6.tgz) = e05c12cbe7bd20619a253ea24b4f951e
diff --git a/net/coda_server/pkg-descr b/net/coda_server/pkg-descr
deleted file mode 100644
index 9b554b83c011..000000000000
--- a/net/coda_server/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Coda is a distributed file system.  Among its features are disconnected
-operation, good security model, server replication and persistent client
-side caching. 
-
-This package builds the entire source tree but only installs(/packages) the
-server side programs.
-
-For more info, contact <coda@cs.cmu.edu> or visit the website.
-
-WWW: http://www.coda.cs.cmu.edu/
diff --git a/net/coda_server/pkg-plist b/net/coda_server/pkg-plist
deleted file mode 100644
index 64aea2a44aba..000000000000
--- a/net/coda_server/pkg-plist
+++ /dev/null
@@ -1,40 +0,0 @@
-bin/filcon
-bin/norton
-bin/norton-reinit
-bin/reinit
-sbin/auth2
-sbin/backup
-sbin/backup.sh
-sbin/bldvldb.sh
-sbin/codasrv
-sbin/createvol_rep
-sbin/initpw
-sbin/inoder
-sbin/makeftree
-sbin/merge
-sbin/mvdb
-sbin/parserecdump
-sbin/partial-reinit.sh
-sbin/pcfgen
-sbin/printvrdb
-sbin/purgevol
-sbin/purgevol_rep
-sbin/pwd2pdb
-sbin/rdsinit
-sbin/readdump
-sbin/rpc2portmap
-sbin/rvmutl
-sbin/startserver
-sbin/tape.pl
-sbin/updateclnt
-sbin/updatefetch
-sbin/updatesrv
-sbin/vice-killvolumes
-sbin/vice-setup
-sbin/vice-setup-ports
-sbin/vice-setup-rvm
-sbin/vice-setup-scm
-sbin/vice-setup-srvdir
-sbin/vice-setup-user
-sbin/volutil
-etc/rc.vice
diff --git a/net/gtk+licq/Makefile b/net/gtk+licq/Makefile
deleted file mode 100644
index 5c6bba4a2453..000000000000
--- a/net/gtk+licq/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# New ports collection makefile for:    gtk+licq
-# Date created:                         17 Oct 2000
-# Whom:                                 Jeremy Norris <ishmael27@home.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gtk+licq
-PORTVERSION=	0.51
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://gtk.licq.org/download/
-
-MAINTAINER=	roman@xpert.com
-COMMENT=	Gtk+ plugin for licq
-
-BUILD_DEPENDS=	${LOCALBASE}/include/licq/licq_icqd.h:${PORTSDIR}/net/licq
-LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell \
-		iconv.3:${PORTSDIR}/converters/libiconv
-RUN_DEPENDS=	licq:${PORTSDIR}/net/licq
-
-BROKEN=		'does not support licq >= 1.2.0'
-
-# It breaks the build for some reason
-#USE_LIBTOOL=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gtk12
-WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mlibcapplet}!=""
-USE_GNOME+=	libcapplet
-PKGNAMESUFFIX=	-gnome
-CONFIGURE_ARGS+=	--enable-gnome
-.else
-CONFIGURE_ARGS+=	--disable-gnome
-.endif
-
-post-patch:
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL5} -pi -e \
-		's|-D_REENTRANT|${PTHREAD_CFLAGS} -D_REENTRANT|g ; \
-		s|^localedir =.*|localedir = \$$(prefix)/share/locale| ; \
-		s|^gtklicq_helpdir =.*|gtklicq_helpdir = \
-		\$$(datadir)/help/gtk+licq/C|'
-.if !defined(HAVE_GNOME)
-	@${PERL5} -pi -e \
-		's|^SUBDIRS =.*|SUBDIRS =|' ${WRKSRC}/doc/Makefile.in
-	@${PERL5} -pi -e \
-		's|\sinstall-menuDATA||;s|\sinstall-ximianmenuDATA||' ${WRKSRC}/Makefile.in
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/gtk+licq/distinfo b/net/gtk+licq/distinfo
deleted file mode 100644
index 8a96e3fa9980..000000000000
--- a/net/gtk+licq/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gtk+licq-0.51.tar.gz) = be09ec38ef2c5f7b078ff31f81371a38
diff --git a/net/gtk+licq/files/patch-configure b/net/gtk+licq/files/patch-configure
deleted file mode 100644
index 77badda9fcd3..000000000000
--- a/net/gtk+licq/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Aug  6 15:13:06 2001
-+++ configure	Fri Nov 30 14:54:15 2001
-@@ -7956,7 +7956,7 @@
-         XSS_LIBS=""
-     fi
-     LDFLAGS="$LDFLAGS_old"
--    CPPFLAGS="$LDFLAGS_old"
-+    CPPFLAGS="$CPPFLAGS_old"
- else
-     USE_XSS_LIBS="no"
-     XSS_LIBS=""
diff --git a/net/gtk+licq/files/patch-src::functions.cpp b/net/gtk+licq/files/patch-src::functions.cpp
deleted file mode 100644
index c8ee50072d05..000000000000
--- a/net/gtk+licq/files/patch-src::functions.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/functions.cpp	2001/04/23 21:07:27	1.97
-+++ src/functions.cpp	2001/05/17 08:34:51	1.98
-@@ -989,7 +989,11 @@
- {
-     unsigned long   *uinptr;
-     GtkWidget       *parent=NULL;
--
-+    
-+    if (widget == NULL) {
-+        return(0);
-+    }
-+    
-     for (;;)
-     {
-         if (GTK_IS_MENU (widget)) {
diff --git a/net/gtk+licq/files/patch-src::options_dialog.cpp b/net/gtk+licq/files/patch-src::options_dialog.cpp
deleted file mode 100644
index cfeba9e882a5..000000000000
--- a/net/gtk+licq/files/patch-src::options_dialog.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/options_dialog.cpp.orig	Sat Jul  1 10:55:29 2000
-+++ src/options_dialog.cpp	Tue Sep 19 21:47:10 2000
-@@ -1,5 +1,6 @@
- #include "gtk-gui.h"
- 
-+#include <unistd.h>
- #include <sys/time.h>
- #include <stdio.h>
- #include <sys/types.h>
diff --git a/net/gtk+licq/files/patch-src::plugin_dialog.cpp b/net/gtk+licq/files/patch-src::plugin_dialog.cpp
deleted file mode 100644
index 3946cb9a74b3..000000000000
--- a/net/gtk+licq/files/patch-src::plugin_dialog.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/plugin_dialog.cpp.orig	Mon Mar 27 17:59:06 2000
-+++ src/plugin_dialog.cpp	Tue Sep 19 21:47:13 2000
-@@ -1,5 +1,6 @@
- #include "gtk-gui.h"
- 
-+#include <unistd.h>
- #include <sys/time.h>
- #include <stdio.h>
- #include <sys/types.h>
diff --git a/net/gtk+licq/pkg-descr b/net/gtk+licq/pkg-descr
deleted file mode 100644
index 137173d73976..000000000000
--- a/net/gtk+licq/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A gtk+ gui plugin for the popular icq clone licq.
-
-WWW: http://gtk.licq.org/
diff --git a/net/gtk+licq/pkg-plist b/net/gtk+licq/pkg-plist
deleted file mode 100644
index 9e754ef07de9..000000000000
--- a/net/gtk+licq/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-bin/gtklicq
-%%GNOME:%%lib/licq/licq_gnome_gui.so
-%%GNOME:%%lib/licq/licq_gnome_gui.la
-%%GNOME:%%share/gnome/help/gtk+licq/C/arvancedusage.html
-%%GNOME:%%share/gnome/help/gtk+licq/C/authors.html
-%%GNOME:%%share/gnome/help/gtk+licq/C/bugs.html
-%%GNOME:%%share/gnome/help/gtk+licq/C/docbook.css
-%%GNOME:%%share/gnome/help/gtk+licq/C/goodstuff.html
-%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_applet.png
-%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_chatwindow.png
-%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_infowindow.png
-%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_mainwindow.png
-%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_optionwindow.png
-%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_regwindow.png
-%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_searchwindow.png
-%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_sendwindow.png
-%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_viewwindow.png
-%%GNOME:%%share/gnome/help/gtk+licq/C/index.html
-%%GNOME:%%share/gnome/help/gtk+licq/C/license.html
-%%GNOME:%%share/gnome/help/gtk+licq/C/prefs.html
-%%GNOME:%%share/gnome/help/gtk+licq/C/topic.dat
-%%GNOME:%%share/gnome/help/gtk+licq/C/usage.html
-%%NOGNOME:%%lib/licq/licq_gtk_gui.so
-share/licq/gtk-gui/pixmaps/arrow.xpm
-share/licq/gtk-gui/pixmaps/chatBeep.xpm
-share/licq/gtk-gui/pixmaps/chatBold.xpm
-share/licq/gtk-gui/pixmaps/chatChangeBg.xpm
-share/licq/gtk-gui/pixmaps/chatChangeFg.xpm
-share/licq/gtk-gui/pixmaps/chatClose.xpm
-share/licq/gtk-gui/pixmaps/chatItalic.xpm
-share/licq/gtk-gui/pixmaps/chatUnder.xpm
-share/licq/gtk-gui/pixmaps/close.xpm
-share/licq/gtk-gui/pixmaps/history.xpm
-share/licq/gtk-gui/pixmaps/info.xpm
-share/licq/gtk-gui/pixmaps/logo.xpm
-share/licq/gtk-gui/pixmaps/not_secure_on.xpm
-share/licq/gtk-gui/pixmaps/reglogo.xpm
-share/licq/gtk-gui/pixmaps/search.xpm
-share/licq/gtk-gui/pixmaps/secure_off.xpm
-share/licq/gtk-gui/pixmaps/secure_on.xpm
-share/licq/gtk-gui/pixmaps/sideways_strippeddownlogo.xpm
-share/locale/de/LC_MESSAGES/gtk+licq.mo
-share/locale/pt/LC_MESSAGES/gtk+licq.mo
-share/locale/pt_BR/LC_MESSAGES/gtk+licq.mo
-share/locale/ru/LC_MESSAGES/gtk+licq.mo
-share/locale/sv/LC_MESSAGES/gtk+licq.mo
-%%GNOME:%%@dirrm share/gnome/help/gtk+licq/C/images
-%%GNOME:%%@dirrm share/gnome/help/gtk+licq/C
-%%GNOME:%%@dirrm share/gnome/help/gtk+licq
-@dirrm share/licq/gtk-gui/pixmaps
-@dirrm share/licq/gtk-gui
diff --git a/net/icukrell/Makefile b/net/icukrell/Makefile
deleted file mode 100644
index 9d0dd07e0460..000000000000
--- a/net/icukrell/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	icukrell
-# Date Created:		2 July 2001
-# Whom:			Peter van Heusden <pvh@egenetics.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	icukrell
-PORTVERSION=	0.1.3
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	pvh@wfeet.za.net
-COMMENT=	GKrellM plugin which shows status of gnomeICU
-
-BROKEN=		"Does not compile"
-
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm \
-		gnomeicu:${PORTSDIR}/net/gnomeicu
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomelibs
-
-post-patch:
-	@${PERL} -pi -ne "s!/usr/local/!${PREFIX}/!" ${WRKSRC}/config.h
-
-do-install:
-	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \
-		${PREFIX}/libexec/gkrellm/plugins
-	@${INSTALL_DATA} ${WRKSRC}/icukrell.so ${PREFIX}/libexec/gkrellm/plugins
-	@${INSTALL_PROGRAM} ${WRKSRC}/icukrell-client ${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/net/icukrell/distinfo b/net/icukrell/distinfo
deleted file mode 100644
index 15775ea3854e..000000000000
--- a/net/icukrell/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (icukrell-0.1.3.tar.gz) = 8f442cec0a00d490ccc30ce89bf4a90b
diff --git a/net/icukrell/files/patch-Makefile b/net/icukrell/files/patch-Makefile
deleted file mode 100644
index 356a7ed7a8d9..000000000000
--- a/net/icukrell/files/patch-Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.orig	Sun May  6 18:03:12 2001
-+++ Makefile	Mon Jul  2 23:07:45 2001
-@@ -2,24 +2,25 @@
- # Makefile for IcuKrell 0.1.3
- #
- 
--GTK_INCLUDE = `gtk-config --cflags`
--GTK_LIB = `gtk-config --libs`
-+GTK_INCLUDE = `$(GTK_CONFIG) --cflags`
-+GTK_LIB = `$(GTK_CONFIG) --libs`
- 
--GNOME_INCLUDE = `gnome-config --cflags gnorba gnomeui`
--GNOME_LIB = `gnome-config --libs gnorba gnomeui`
-+GNOME_INCLUDE = `$(GNOME_CONFIG) --cflags gnorba gnomeui`
-+GNOME_LIB = `$(GNOME_CONFIG) --libs gnorba gnomeui`
- 
--IMLIB_INCLUDE = `imlib-config --cflags-gdk`
--IMLIB_LIBS = `imlib-config --libs-gdk`
-+IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk`
-+IMLIB_LIBS = `$(IMLIB_CONFIG) --libs-gdk`
- 
--CFLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(GNOME_INCLUDE) $(IMLIB_INCLUDE)
--LIBS = $(GTK_LIB) $(GNOME_LIBS) $(IMLIB_LIBS)
--LFLAGS = -shared -lpthread
-+CFLAGS += -Wall -fPIC $(GTK_INCLUDE) $(GNOME_INCLUDE) $(IMLIB_INCLUDE) $(PTHREAD_CFLAGS)
-+LIBS = $(GTK_LIB) $(GNOME_LIBS) $(IMLIB_LIBS) $(PTHREAD_LIBS)
-+LFLAGS = -shared 
- 
--CC = gcc $(CFLAGS) $(FLAGS)
-+CC += $(CFLAGS) $(FLAGS)
- 
--OBJS =  src/action.o src/options.o src/icukrell.o src/themes.o
-+OBJS =  action.o options.o icukrell.o themes.o
- CLIENT_OBJS = client/icukrell-client.c
- 
-+VPATH=src
- ICUKRELL_PROGS = icukrell.so icukrell-client
- 
- all: $(ICUKRELL_PROGS)
-@@ -35,12 +36,12 @@
- 	rm -f icukrell-client
- 
- install:
--	install -c -s -m 755 icukrell.so /usr/share/gkrellm/plugins
--	install -c -s -m 755 icukrell-client/icukrell-client /usr/local/bin
-+	$(BSD_INSTALL_DATA) icukrell.so /usr/share/gkrellm/plugins
-+	$(BSD_INSTALL_PROGRAM) icukrell-client/icukrell-client /usr/local/bin
- 
- install-user:
--	install -c -s -m 755 icukrell.so $(HOME)/.gkrellm/plugins
--	install -c -s -m 755 icukrell-client/icukrell-client /usr/local/bin
-+	$(BSD_INSTALL_DATA) icukrell.so $(HOME)/.gkrellm/plugins
-+	$(BSD_INSTALL_PROGRAM) icukrell-client/icukrell-client /usr/local/bin
- 
- icukrell.c.o: icukrell.c
- options.c.o: options.c
diff --git a/net/icukrell/files/patch-src::themes.c b/net/icukrell/files/patch-src::themes.c
deleted file mode 100644
index f9341c4efedd..000000000000
--- a/net/icukrell/files/patch-src::themes.c
+++ /dev/null
@@ -1,83 +0,0 @@
---- src/themes.c.orig	Sun May  6 18:02:50 2001
-+++ src/themes.c	Mon Jul  2 22:49:07 2001
-@@ -43,6 +43,8 @@
- #endif
- 	make_file_name("gnomeicu-offline.png");
- 	im = gdk_imlib_load_image(full_file);
-+	if (im == NULL) 
-+	  return FALSE;
- 	gdk_imlib_render(im, im->rgb_width, im->rgb_height);
-         offline_pixmap = gdk_imlib_copy_image(im);
-         offline_bitmap = gdk_imlib_copy_mask(im);
-@@ -53,6 +55,8 @@
- #endif
- 	make_file_name("gnomeicu-online.png");
- 	im = gdk_imlib_load_image(full_file);
-+	if (im == NULL) 
-+	  return FALSE;
- 	gdk_imlib_render(im, im->rgb_width, im->rgb_height);
-         online_pixmap = gdk_imlib_copy_image(im);
-         online_bitmap = gdk_imlib_copy_mask(im);
-@@ -63,6 +67,8 @@
- #endif
- 	make_file_name("gnomeicu-inv.png");
- 	im = gdk_imlib_load_image(full_file);
-+	if (im == NULL) 
-+	  return FALSE;
- 	gdk_imlib_render(im, im->rgb_width, im->rgb_height);
-         inv_pixmap = gdk_imlib_copy_image(im);
-         inv_bitmap = gdk_imlib_copy_mask(im);
-@@ -73,6 +79,8 @@
- #endif
- 	make_file_name("gnomeicu-na.png");
- 	im = gdk_imlib_load_image(full_file);
-+	if (im == NULL) 
-+	  return FALSE;
- 	gdk_imlib_render(im, im->rgb_width, im->rgb_height);
-         na_pixmap = gdk_imlib_copy_image(im);
-         na_bitmap = gdk_imlib_copy_mask(im);
-@@ -83,6 +91,8 @@
- #endif
- 	make_file_name("gnomeicu-ffc.png");
- 	im = gdk_imlib_load_image(full_file);
-+	if (im == NULL) 
-+	  return FALSE;
- 	gdk_imlib_render(im, im->rgb_width, im->rgb_height);
-         chat_pixmap = gdk_imlib_copy_image(im);
-         chat_bitmap = gdk_imlib_copy_mask(im);
-@@ -93,6 +103,8 @@
- #endif
- 	make_file_name("gnomeicu-occ.png");
- 	im = gdk_imlib_load_image(full_file);
-+	if (im == NULL) 
-+	  return FALSE;
- 	gdk_imlib_render(im, im->rgb_width, im->rgb_height);
-         occ_pixmap = gdk_imlib_copy_image(im);
-         occ_bitmap = gdk_imlib_copy_mask(im);
-@@ -103,6 +115,8 @@
- #endif
- 	make_file_name("gnomeicu-away.png");
- 	im = gdk_imlib_load_image(full_file);
-+	if (im == NULL) 
-+	  return FALSE;
- 	gdk_imlib_render(im, im->rgb_width, im->rgb_height);
-         away_pixmap = gdk_imlib_copy_image(im);
-         away_bitmap = gdk_imlib_copy_mask(im);
-@@ -113,6 +127,8 @@
- #endif
- 	make_file_name("gnomeicu-dnd.png");
- 	im = gdk_imlib_load_image(full_file);
-+	if (im == NULL) 
-+	  return FALSE;
- 	gdk_imlib_render(im, im->rgb_width, im->rgb_height);
-         dnd_pixmap = gdk_imlib_copy_image(im);
-         dnd_bitmap = gdk_imlib_copy_mask(im);
-@@ -123,6 +139,8 @@
- #endif
- 	make_file_name("gnomeicu-message.png");
- 	im = gdk_imlib_load_image(full_file);
-+	if (im == NULL) 
-+	  return FALSE;
- 	gdk_imlib_render(im, im->rgb_width, im->rgb_height);
- 	message_pixmap = gdk_imlib_copy_image(im);
-         message_bitmap = gdk_imlib_copy_mask(im);
diff --git a/net/icukrell/pkg-descr b/net/icukrell/pkg-descr
deleted file mode 100644
index 23c9755714ab..000000000000
--- a/net/icukrell/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-GKrellM plugin which shows status of gnomeICU
-
-A plugin for gkrellm, that keeps track of the status of gnomeICU,
-the gnome ICQ client.
-
-Author: drJeckyll <drJeckyll@hotmail.com>
-WWW: http://icukrell.sourceforge.net/
diff --git a/net/icukrell/pkg-plist b/net/icukrell/pkg-plist
deleted file mode 100644
index e798229a091b..000000000000
--- a/net/icukrell/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/icukrell-client
-libexec/gkrellm/plugins/icukrell.so
diff --git a/net/macipgw/Makefile b/net/macipgw/Makefile
deleted file mode 100644
index f2e18b93e940..000000000000
--- a/net/macipgw/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Ports collection makefile for:    macipgw
-# Date created:         25 Nov 1997
-# Whom:                 stb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	macipgw
-PORTVERSION=	1.0
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.hanse.de/sites/transit/netatalk/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	stb/netatalk
-
-MAINTAINER=	ports@freebsd.org
-COMMENT=	MacIP Gateway to allow IP-access from AppleTalk-only networks
-
-BROKEN=		"Does not build"
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libatalk.a:${PORTSDIR}/net/netatalk \
-		${LOCALBASE}/include/atalk/ddp.h:${PORTSDIR}/net/netatalk
-RUN_DEPENDS=	${LOCALBASE}/libexec/atalkd:${PORTSDIR}/net/netatalk
-
-.include <bsd.port.mk>
diff --git a/net/macipgw/distinfo b/net/macipgw/distinfo
deleted file mode 100644
index 90fe180a3486..000000000000
--- a/net/macipgw/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (macipgw-1.0.tar.gz) = 4ea100374884be316240b8dd0e517308
diff --git a/net/macipgw/files/patch-aa b/net/macipgw/files/patch-aa
deleted file mode 100644
index ef2c52f54714..000000000000
--- a/net/macipgw/files/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
---- main.c.old	Thu Feb  3 15:39:27 2000
-+++ main.c	Thu Feb  3 16:52:18 2000
-@@ -160,8 +160,8 @@
- 	exit (EX_USAGE);
- }
- 
- 
--void main(int argc, char *argv[]) {
-+int main(int argc, char *argv[]) {
- 	struct sigaction	sv;
- 	u_long			net=0, mask=0, ns=0;
- 	char 			*zone = "*";
-@@ -209,7 +208,7 @@
- 	openlog ("macipgw", LOG_PID | gDebug ? LOG_PERROR : 0, LOG_DAEMON);
- 
- 	sv.sa_handler = die;
--	sv.sa_mask = 0;
-+	sigemptyset(&(sv.sa_mask));
- 	sv.sa_flags = 0;
- 	if (sigaction( SIGTERM, &sv, 0 ) < 0 ) {
- 		syslog( LOG_ERR, "sigaction: %m" );
-@@ -243,5 +242,6 @@
- 	server();
- 
- 	die (0);
-+	return(0);
- }
- 
diff --git a/net/macipgw/pkg-descr b/net/macipgw/pkg-descr
deleted file mode 100644
index 03e14c3d04ab..000000000000
--- a/net/macipgw/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-macipgw - MacIP gateway to allow IP-access for AppleTalk-only networks
-
-MacIP is a protocol that allows the encapsulation of IP packets in AppleTalk
-packets, thus allowing Macs connected through an AppleTalk-only network
-(such as LocalTalk or Apple Remote Access) to use TCP/IP-based services.
diff --git a/net/macipgw/pkg-plist b/net/macipgw/pkg-plist
deleted file mode 100644
index 1d3369ad3de9..000000000000
--- a/net/macipgw/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-libexec/macipgw
-man/man8/macipgw.8.gz
diff --git a/net/trafcount/Makefile b/net/trafcount/Makefile
deleted file mode 100644
index 4b190ab73f7e..000000000000
--- a/net/trafcount/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:    trafcount
-# Date created:         Sat Jun  2 16:29:22 IDT 2001
-# Whom:                 amir@boom.org.il
-#
-# $FreeBSD$
-#
-
-PORTNAME=		trafcount
-PORTVERSION=		0.2.1
-CATEGORIES=		net
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	trafcount
-
-MAINTAINER=		amir@boom.org.il
-COMMENT=	Ethernet Traffic Counter
-
-BROKEN=			"Does not compile"
-
-STARTUP=		trafcount.sh
-MAN1=			trafcount.1
-
-MAN_COMPRESSED=		no
-USE_REINPLACE=		yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's@kmoddir=/modules@kmoddir=${PREFIX}/libexec@g' \
-		${WRKSRC}/trafcount.sh
-	@${REINPLACE_CMD} -e 's@/usr/local@${PREFIX}@g' \
-		${WRKSRC}/client/Makefile ${WRKSRC}/module/Makefile \
-		${WRKSRC}/Makefile
-
-.if !exists(/usr/src/sys/Makefile)
-BROKEN=			"Kernel source files required"
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/trafcount/distinfo b/net/trafcount/distinfo
deleted file mode 100644
index b3959cb838f3..000000000000
--- a/net/trafcount/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (trafcount-0.2.1.tar.gz) = 18ab6b5f82ac70567121c6e92a14050d
diff --git a/net/trafcount/files/patch-client-Makefile b/net/trafcount/files/patch-client-Makefile
deleted file mode 100644
index cedb05588dfe..000000000000
--- a/net/trafcount/files/patch-client-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/Makefile.orig	Fri Jun  1 11:58:57 2001
-+++ client/Makefile	Sun Jun 17 18:29:15 2001
-@@ -1,6 +1,8 @@
- PROG	=	trafcount
- SRCS	=	trafcount.c ../include/trafcount.h
- BINDIR ?=	/usr/local/bin
-+MANDIR	=	/usr/local/man/man
- CFLAGS += 	-Wall
-+NOMANCOMPRESS = yes
- 
- .include <bsd.prog.mk>
diff --git a/net/trafcount/files/patch-module-Makefile b/net/trafcount/files/patch-module-Makefile
deleted file mode 100644
index 3f56bbea4252..000000000000
--- a/net/trafcount/files/patch-module-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- module/Makefile.orig	Fri Jun  1 11:20:26 2001
-+++ module/Makefile	Sun Jun 17 18:15:28 2001
-@@ -1,4 +1,5 @@
- KMOD	=	trafcount
- SRCS	=	trafcount.c ../include/trafcount.h
-+KMODDIR	=	/usr/local/libexec
- 
- .include <bsd.kmod.mk>
diff --git a/net/trafcount/files/patch-module-trafcount.c b/net/trafcount/files/patch-module-trafcount.c
deleted file mode 100644
index fbaea991023a..000000000000
--- a/net/trafcount/files/patch-module-trafcount.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- module/trafcount.c.orig	Mon Dec 24 15:34:22 2001
-+++ module/trafcount.c	Mon Dec 24 15:34:55 2001
-@@ -37,7 +37,7 @@
- static ip_fw_chk_t *trafcount_old_chk_ptr;
- static int	trafcount_ip_fw_chk __P((struct ip **pip, int hlen,
- 			struct ifnet *oif, u_int16_t *cookie, struct mbuf **m,
--			struct ip_fw_chain **flow_id,
-+			struct ip_fw **flow_id,
- 			struct sockaddr_in **next_hop));
- 
- LIST_HEAD(rulechain_head, rulechain) trafcount_rulechain; /* defines the rule list */
-@@ -86,7 +86,7 @@
- static int
- trafcount_ip_fw_chk(struct ip **pip, int hlen,
- 	struct ifnet *oif, u_int16_t *cookie, struct mbuf **m,
--	struct ip_fw_chain **flow_id,
-+	struct ip_fw **flow_id,
-         struct sockaddr_in **next_hop)
- {
- 	struct ip *ip = *pip;
diff --git a/net/trafcount/pkg-descr b/net/trafcount/pkg-descr
deleted file mode 100644
index 38f1e404b6e7..000000000000
--- a/net/trafcount/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Trafcount is a loadable kernel module that provides you the option to
-measure the total amount of bandwidth that is consumed by each of
-your users.
diff --git a/net/trafcount/pkg-plist b/net/trafcount/pkg-plist
deleted file mode 100644
index e1b31ce470ad..000000000000
--- a/net/trafcount/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/trafcount
-etc/rc.d/trafcount.sh
-libexec/trafcount.ko
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
deleted file mode 100644
index 172a07c51601..000000000000
--- a/net/zephyr/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for:	zephry
-# Date created:		1-Aug-1995
-# Whom:			pst
-#
-# $FreeBSD$
-#
-
-PORTNAME=	zephyr
-PORTVERSION=	20000421
-CATEGORIES=	net
-MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/ \
-		ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/old/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Real time message passing and notification service
-
-WRKSRC=		${WRKDIR}/zephyr
-
-USE_XLIB=	yes
-USE_BISON=	yes
-
-GNU_CONFIGURE=	yes
-.if exists(/usr/lib/libkrb.a) && defined(MAKE_EBONES)
-CONFIGURE_ARGS="--with-krb4"
-.endif
-
-MAN1=		zephyr.1 xzwrite.1 zaway.1 zctl.1 zleave.1 zlocate.1 \
-		zmailnotify.1 znol.1 zwgc.1 zwrite.1
-MAN8=		zpopnotify.8 zshutdown_notify.8 zstat.8 zephyrd.8 zhm.8
-
-ZEPHYR_RCDIR=	${PREFIX}/etc/rc.d
-ZEPHYR_DOCDIR=	${PREFIX}/share/doc/zephyr
-ZEPHYR_DOCS=	INSTALL NOTES OPERATING README USING
-
-post-install:
-	${MKDIR} ${ZEPHYR_RCDIR}
-	${INSTALL_SCRIPT} ${FILESDIR}/zhm.sh ${ZEPHYR_RCDIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${ZEPHYR_DOCDIR}
-	for file in ${ZEPHYR_DOCS} ; do \
-	    ${INSTALL_DATA} ${WRKSRC}/$$file ${ZEPHYR_DOCDIR} ; \
-	    done
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 450000
-BROKEN=		Broken due to lack of libss since FreeBSD 4.6
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/zephyr/distinfo b/net/zephyr/distinfo
deleted file mode 100644
index 29cb78fc3ea6..000000000000
--- a/net/zephyr/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (zephyr-20000421.tar.gz) = 7b7c50ece90fbf294af82b8fec63c0f1
diff --git a/net/zephyr/files/patch-aa b/net/zephyr/files/patch-aa
deleted file mode 100644
index 1f20e69de1e0..000000000000
--- a/net/zephyr/files/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
---- zwgc/Makefile.in.orig	Mon Mar 12 14:51:08 2001
-+++ zwgc/Makefile.in	Mon Mar 12 14:51:38 2001
-@@ -85,8 +85,8 @@
- install: zwgc
- 	${INSTALL} -m 755 -s zwgc ${DESTDIR}${bindir}
- 	${INSTALL} -m 644 ${srcdir}/zwgc.1 ${DESTDIR}${mandir}/man1
--	${INSTALL} -m 644 ${srcdir}/zwgc.desc ${DESTDIR}${datadir}/zephyr
--	${INSTALL} -m 644 ${srcdir}/zwgc_resources ${DESTDIR}${datadir}/zephyr
-+	${INSTALL} -m 644 ${srcdir}/zwgc.desc ${DESTDIR}${datadir}
-+	${INSTALL} -m 644 ${srcdir}/zwgc_resources ${DESTDIR}${datadir}
- 
- clean:
- 	rm -f ${OBJS} zwgc port_dictionary.[ch] pointer_dictionary.[ch]
diff --git a/net/zephyr/files/patch-ab b/net/zephyr/files/patch-ab
deleted file mode 100644
index 18a08c48e0c1..000000000000
--- a/net/zephyr/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 69a41fa3b411..000000000000
--- a/net/zephyr/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 0b7a7d33efd6..000000000000
--- a/net/zephyr/files/patch-ad
+++ /dev/null
@@ -1,209 +0,0 @@
---- 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 */
---- lib/ZParseNot.c.orig	Thu Aug 12 20:19:44 1999
-+++ lib/ZParseNot.c	Sun Mar 11 23:18:38 2001
-@@ -151,10 +151,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);
-     }
-@@ -265,10 +265,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);
-     }
---- lib/Zinternal.c.orig	Sun Mar 11 23:20:05 2001
-+++ lib/Zinternal.c	Sun Mar 11 23:46:57 2001
-@@ -585,6 +585,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)
-@@ -604,9 +605,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);
-     
-     (void) memcpy(&notice->z_uid.zuid_addr, &__My_addr, sizeof(__My_addr));
- 
-@@ -684,7 +685,7 @@
-     ptr += strlen(ptr)+1;
- 
-     if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid, 
--		   sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
-+		   sizeof(notice->z_uid)) == ZERR_FIELDLEN)
- 	return (ZERR_HEADERLEN);
-     ptr += strlen(ptr)+1;
- 
-@@ -738,7 +739,7 @@
- 	return (ZERR_HEADERLEN);
- 
-     if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid, 
--		   sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
-+		   sizeof(notice->z_multiuid)) == ZERR_FIELDLEN)
- 	return (ZERR_HEADERLEN);
-     ptr += strlen(ptr)+1;
- 	
-@@ -858,6 +859,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;
-@@ -873,12 +875,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);
- 	    (void) memcpy((char *)&partnotice.z_uid.zuid_addr, &__My_addr, 
- 			  sizeof(__My_addr));
- 	}
---- server/dispatch.c.orig	Sun Mar 11 23:27:40 2001
-+++ server/dispatch.c	Sun Mar 11 23:34:42 2001
-@@ -25,8 +25,8 @@
- #define NACKTAB_HASHVAL(sockaddr, uid)	(((sockaddr).sin_addr.s_addr ^ \
- 					  (sockaddr).sin_port ^ \
- 					  (uid).zuid_addr.s_addr ^ \
--					  (uid).tv.tv_sec ^ \
--					  (uid).tv.tv_usec) % NACKTAB_HASHSIZE)
-+					  (uid).zuid_sec ^ \
-+					  (uid).zuid_usec) % NACKTAB_HASHSIZE)
- #define HOSTS_SIZE_INIT			256
- 
- #ifdef DEBUG
-@@ -820,9 +820,10 @@
- 
-     /* search the not-yet-acked table 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
-     hashval = NACKTAB_HASHVAL(*who, notice->z_uid);
-     for (nacked = nacktab[hashval]; nacked; nacked = nacked->next) {
-@@ -840,9 +841,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
- }
- 
---- server/realm.c.orig	Sun Mar 11 23:35:16 2001
-+++ server/realm.c	Sun Mar 11 23:40:06 2001
-@@ -240,9 +240,10 @@
-   ZPacket_t retval;
-   
- #if 0
--    zdbug((LOG_DEBUG, "rlm_nack_cancel: %s:%08X,%08X",
-+    zdbug((LOG_DEBUG, "rlm_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
-   if (!which) {
-     syslog(LOG_ERR, "non-realm ack?");
-@@ -266,9 +267,10 @@
-     }
-   }
- #if 0
--    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
-   return;
- }
-@@ -743,6 +745,7 @@
-   int buffer_len, hdrlen, offset, fragsize, ret_len, message_len;
-   int origoffset, origlen;
-   Code_t retval;
-+  struct timeval tv;
-   Unacked *nacked;
-   char buf[1024], multi[64];
-   CREDENTIALS cred;
-@@ -857,11 +860,9 @@
-       (void) sprintf(multi, "%d/%d", offset+origoffset, origlen);
-       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);
-         (void) memcpy((char *)&partnotice.z_uid.zuid_addr, &__My_addr, 
-                       sizeof(__My_addr));
-       }
---- server/server.c.orig	Sun Mar 11 23:40:14 2001
-+++ server/server.c	Sun Mar 11 23:40:44 2001
-@@ -22,7 +22,7 @@
- 
- #define SRV_NACKTAB_HASHSIZE		1023
- #define SRV_NACKTAB_HASHVAL(which, uid)	(((which) ^ (uid).zuid_addr.s_addr ^ \
--					  (uid).tv.tv_sec ^ (uid).tv.tv_usec) \
-+					  (uid).zuid_sec ^ (uid).zuid_usec) \
- 					 % SRV_NACKTAB_HASHSIZE)
- /*
-  * Server manager.  Deal with  traffic to and from other servers.
diff --git a/net/zephyr/files/patch-ae b/net/zephyr/files/patch-ae
deleted file mode 100644
index 9cdc49a5e835..000000000000
--- a/net/zephyr/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-af b/net/zephyr/files/patch-af
deleted file mode 100644
index ac3987a520d2..000000000000
--- a/net/zephyr/files/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
---- zwgc/main.c.orig	Fri Jan 22 18:20:22 1999
-+++ zwgc/main.c	Tue Nov 20 13:57:24 2001
-@@ -141,7 +141,7 @@
- 
- /*    var_clear_all_variables(); <<<>>> */
- 
--    sprintf(defdesc, "%s/zephyr/%s", DATADIR, DEFDESC);
-+    sprintf(defdesc, "%s/%s", DATADIR, DEFDESC);
-     input_file = locate_file(description_filename_override, USRDESC, defdesc);
-     if (input_file)
-       program = parse_file(input_file);
---- zwgc/X_driver.c.orig	Fri Jan 22 18:20:06 1999
-+++ zwgc/X_driver.c	Tue Nov 20 13:57:56 2001
-@@ -264,7 +264,7 @@
-       return(1);
- 
-     /* Read in our application-specific resources: */
--    sprintf(dbasename, "%s/zephyr/zwgc_resources", DATADIR);
-+    sprintf(dbasename, "%s/zwgc_resources", DATADIR);
-     temp_db1 = XrmGetFileDatabase(dbasename);
- 
-     /*
---- clients/xzwrite/interface.c.orig	Thu Apr 30 16:03:32 1998
-+++ clients/xzwrite/interface.c	Tue Nov 20 13:58:24 2001
-@@ -140,11 +140,11 @@
- 				  strlen(DATADIR) + 12);
- 	  if (path2 != NULL) {
- #ifdef HAVE_PUTENV
--	       sprintf(path2, "XFILESEARCHPATH=%s:%s/zephyr/%%N", path1,
-+	       sprintf(path2, "XFILESEARCHPATH=%s:%s/%%N", path1,
- 		       DATADIR);
- 	       putenv(path2);
- #else
--	       sprintf(path2, "%s:%s/zephyr/%%N", path1, DATADIR);
-+	       sprintf(path2, "%s:%s/%%N", path1, DATADIR);
- 	       setenv("XFILESEARCHPATH", path2, 1);
- 	       free(path2);
- #endif
diff --git a/net/zephyr/files/patch-ag b/net/zephyr/files/patch-ag
deleted file mode 100644
index 2585114f395a..000000000000
--- a/net/zephyr/files/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
---- lib/ZInit.c.orig Fri Jan 22 18:19:14 1999
-+++ lib/ZInit.c	Wed Nov 21 16:32:06 2001
-@@ -36,6 +36,7 @@
-     int s, sinsize = sizeof(sin);
-     Code_t code;
-     ZNotice_t notice;
-+    char *realm = NULL;
- #ifdef HAVE_KRB4
-     char *krealm = NULL;
-     int krbval;
-@@ -104,7 +105,11 @@
- 	return (krbval);
-     }
- #else
--    strcpy(__Zephyr_realm, "local-realm");
-+    realm = ZGetVariable("realm");
-+    if (realm)
-+       strcpy(__Zephyr_realm, realm);
-+    else
-+       strcpy(__Zephyr_realm, "local-realm");
- #endif
- 
-     __My_addr.s_addr = INADDR_NONE;
---- lib/ZVariables.c.orig	Thu Jun  3 10:51:42 1999
-+++ lib/ZVariables.c	Mon Nov 26 08:51:56 2001
-@@ -36,7 +36,7 @@
-     if ((ret = get_varval(varfile, var)) != ZERR_NONE)
- 	return (ret);
- 
--    sprintf(varfile, "%s/zephyr.vars", SYSCONFDIR);
-+    sprintf(varfile, "%s/zephyr/zephyr.vars", SYSCONFDIR);
-     return (get_varval(varfile, var));
- }
- 
diff --git a/net/zephyr/files/zhm.sh b/net/zephyr/files/zhm.sh
deleted file mode 100644
index c516ccd6adff..000000000000
--- a/net/zephyr/files/zhm.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-PREFIX=${PREFIX-/usr/local}
-
-case $1 in
-start)
-	if [ -x ${PREFIX}/sbin/zhm -a -f ${PREFIX}/etc/zephyr/server.list ] ; then
-	     PATH=${PREFIX}/sbin:${PREFIX}/bin:$PATH ; export PATH
-	     zhm `cat ${PREFIX}/etc/zephyr/server.list` && echo -n ' zhm'
-	fi
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/net/zephyr/pkg-descr b/net/zephyr/pkg-descr
deleted file mode 100644
index 24efb608fa56..000000000000
--- a/net/zephyr/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-zephyr - a system to pass messages for users and services (such as syslog)
-between a distributed group of workstations.
diff --git a/net/zephyr/pkg-plist b/net/zephyr/pkg-plist
deleted file mode 100644
index 0b3c705a0533..000000000000
--- a/net/zephyr/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-bin/xzwrite
-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/default.subscriptions
-include/zephyr/mit-copyright.h
-include/zephyr/zephyr.h
-include/zephyr/zephyr_err.h
-lib/libzephyr.a
-sbin/zephyrd
-sbin/zhm
-sbin/zpopnotify
-sbin/zshutdown_notify
-%%PORTDOCS%%share/doc/zephyr/INSTALL
-%%PORTDOCS%%share/doc/zephyr/NOTES
-%%PORTDOCS%%share/doc/zephyr/OPERATING
-%%PORTDOCS%%share/doc/zephyr/README
-%%PORTDOCS%%share/doc/zephyr/USING
-share/zephyr/XZwrite
-share/zephyr/xzwrite.bitmap
-share/zephyr/zwgc.desc
-share/zephyr/zwgc_resources
-@dirrm etc/zephyr
-@dirrm include/zephyr
-%%PORTDOCS%%@dirrm share/doc/zephyr
-@dirrm share/zephyr