Say hello to the new "net-mgmt" category. There are probably more

ports that belong here than the ones I have identified and moved in
this, first, pass.

Approved in principle by: marcus

24 files changed, 0 insertions, 444 deletions

diff --git a/net/annextools/distinfo b/net/annextools/distinfo
deleted file mode 100644
index 5652d7ec0c66..000000000000
--- a/net/annextools/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (microannex_xl/R10.0B-R2.3.tar.Z) = 60e08b649c964282d412d449e80f9c92
diff --git a/net/annextools/files/patch-Makefile b/net/annextools/files/patch-Makefile
deleted file mode 100644
index 95857646d432..000000000000
--- a/net/annextools/files/patch-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	Thu Sep 18 20:10:32 2003
-+++ Makefile	Thu Sep 18 20:10:32 2003
-@@ -0,0 +1,7 @@
-+SUBDIR=		libannex
-+SUBDIR+=	netadm
-+SUBDIR+=	erpcd
-+SUBDIR+=	na
-+SUBDIR+=	rtelnet
-+
-+.include <bsd.subdir.mk>
diff --git a/net/annextools/files/patch-erpcd::Makefile b/net/annextools/files/patch-erpcd::Makefile
deleted file mode 100644
index 523512e5583e..000000000000
--- a/net/annextools/files/patch-erpcd::Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
---- erpcd/Makefile.orig	Wed Jun 24 17:23:53 1998
-+++ erpcd/Makefile	Sun Sep 28 00:23:28 2003
-@@ -227,6 +227,9 @@
- CDBCFILES = acp_dbm_lib.c
- CDBOFILES = acp_dbm_lib.o
- 
-+CFLAGS += -I../inc
-+LIBFLAG = -lcrypt
-+
- CFILES =	${ERPCFILES} ch_passwd.c convert.c ${COMCFILES} ${STUBCFILES}\
- 		${CDBCFILES} ${SECURIDCFILES} ${ENIGMACFILES} acp_dbm.c \
- 		tms_dbm.c tms_convert.c spy.c
-@@ -262,58 +265,58 @@
- erpcd:	${ERPOFILES} ${COMOFILES} ../libannex/libannex.a ../netadm/netadm.a \
- 	${ENIGMAFILES} ${SECURIDFILES} ${KERBEROSLIB} ${STUBLFILES}\
- 		${CDBOFILES} ${SECURIDOFILES} ${ENIGMAOFILES}
--		@/bin/echo "*** Building erpcd utility ***" > /dev/tty
-+		@/bin/echo "*** Building erpcd utility ***"
- 		${CC} ${BUILD_CORRECTION} ${CFLAGS} -o erpcd \
- 			${ERPOFILES} ${SECURIDOFILES} ${COMOFILES} \
- 			${ENIGMAOFILES} ${CDBOFILES}\
- 			../libannex/libannex.a ../netadm/netadm.a \
- 			${SECURIDFILES} ${KERBEROSLIB} ${ENIGMAFILES} \
- 			${STUBLINKING} ${LIBFLAG}
--		@/bin/echo "*** Done building erpcd utility ***" > /dev/tty
-+		@/bin/echo "*** Done building erpcd utility ***"
- 
- ch_passwd:	ch_passwd.o ${COMOFILES} ${CDBOFILES} ../libannex/libannex.a 
--		@/bin/echo "*** Building ch_passwd utility ***" > /dev/tty
-+		@/bin/echo "*** Building ch_passwd utility ***"
- 		${CC} ${CFLAGS} -o ch_passwd ch_passwd.o ${COMOFILES} \
- 	        ${CDBOFILES} ../libannex/libannex.a ${LIBFLAG}
--		@/bin/echo "*** Done building ch_passwd utility ***" > /dev/tty
-+		@/bin/echo "*** Done building ch_passwd utility ***"
- 
- convert:	convert.o ${COMOFILES} ../libannex/libannex.a
--		@/bin/echo "*** Building convert utility ***" > /dev/tty
-+		@/bin/echo "*** Building convert utility ***"
- 		${CC} ${CFLAGS} -o convert convert.o ${COMOFILES} \
- 			../libannex/libannex.a ${LIBFLAG}
--		@/bin/echo "*** Done building convert utility ***" > /dev/tty
-+		@/bin/echo "*** Done building convert utility ***"
- 
- acp_dbm:        acp_dbm.o ${CDBOFILES} ../libannex/libannex.a
--		@/bin/echo "*** Building acp_dbm utility ***" > /dev/tty
-+		@/bin/echo "*** Building acp_dbm utility ***"
- 		${CC} ${CFLAGS} -o acp_dbm acp_dbm.o ${CDBOFILES} \
-                         ../libannex/libannex.a ${LIBFLAG}
--		@/bin/echo "*** Done building acp_dbm utility ***" > /dev/tty
-+		@/bin/echo "*** Done building acp_dbm utility ***"
- 
- tms_dbm:        tms_dbm.o tms_lib.o ../libannex/libannex.a ../netadm/netadm.a
--		@/bin/echo "*** Building tms_dbm utility ***" > /dev/tty
-+		@/bin/echo "*** Building tms_dbm utility ***"
- 		${CC} ${CFLAGS} -o tms_dbm tms_dbm.o tms_lib.o \
- 		../libannex/libannex.a  ../netadm/netadm.a ${LIBFLAG}
--		@/bin/echo "*** Done building tms_dbm utility ***" > /dev/tty
-+		@/bin/echo "*** Done building tms_dbm utility ***"
- 
- tms_convert:    tms_convert.o tms_lib.o ../libannex/libannex.a \
- 		../netadm/netadm.a
--		@/bin/echo "*** Building tms_convert utility ***" > /dev/tty
-+		@/bin/echo "*** Building tms_convert utility ***"
- 		${CC} ${CFLAGS} -o tms_convert tms_convert.o tms_lib.o \
- 		../libannex/libannex.a  ../netadm/netadm.a ${LIBFLAG}
--		@/bin/echo "*** Done building tms_convert utility ***" > /dev/tty
-+		@/bin/echo "*** Done building tms_convert utility ***"
- 
- spy:            spy.o ../libannex/erpc_subr.o ../libannex/libannex.a \
- 		../netadm/netadm.a
--		@/bin/echo "*** Building spy utility ***" > /dev/tty
-+		@/bin/echo "*** Building spy utility ***"
- 		${CC} ${CFLAGS} -o spy spy.o ../libannex/erpc_subr.o \
- 		../libannex/libannex.a  ../netadm/netadm.a ${LIBFLAG}
--		@/bin/echo "*** Done building spy utility ***" > /dev/tty
-+		@/bin/echo "*** Done building spy utility ***"
- 
- acplint:	acplint.o getacpuser.o getacpstubs.o env_parser.o time_parser.o
--		@/bin/echo "*** Building acplint utility ***" > /dev/tty
-+		@/bin/echo "*** Building acplint utility ***"
- 		${CC} ${CFLAGS} -g -o acplint acplint.o getacpuser.o getacpstubs.o \
- 			env_parser.o time_parser.o ../libannex/libannex.a ${LIBFLAG}
--		@/bin/echo "*** Done building acplint utility ***" > /dev/tty
-+		@/bin/echo "*** Done building acplint utility ***"
-  
- lintup:
- 		lint ${ALLFLAGS} ${ERPCFILES} ${COMCFILES} ${CDBCFILES}
-@@ -346,7 +349,7 @@
- STOPPREFIX = /etc/rc0.d/K09
- 
- install-initd:
--	@echo "*** Installing init.d start and stop script ***" > /dev/tty
-+	@echo "*** Installing init.d start and stop script ***"
- 	$(INSTALL) sysexec $(INITD) $(ANNEXINIT)
- 	$(RM) -f /etc/rc[20].d/[SK][0-9][0-9]$(ANNEXINIT)
- 	ln $(INITD)/$(ANNEXINIT) $(STARTPREFIX)$(ANNEXINIT)
diff --git a/net/annextools/files/patch-erpcd::acp.c b/net/annextools/files/patch-erpcd::acp.c
deleted file mode 100644
index 08ec79704808..000000000000
--- a/net/annextools/files/patch-erpcd::acp.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- erpcd/acp.c.orig	Tue Dec  2 14:49:05 1997
-+++ erpcd/acp.c	Thu Sep 18 20:10:32 2003
-@@ -40,10 +40,6 @@
- #include <signal.h>
- #include <errno.h>
- 
--#ifndef _WIN32
--extern int sys_nerr;
--#endif /* not _WIN32 */
--
- #include "../libannex/api_if.h"
- #include "../libannex/srpc.h"
- #include "../inc/courier/courier.h"
diff --git a/net/annextools/files/patch-erpcd::acp_lib.c b/net/annextools/files/patch-erpcd::acp_lib.c
deleted file mode 100644
index 7f0f63beb618..000000000000
--- a/net/annextools/files/patch-erpcd::acp_lib.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- erpcd/acp_lib.c.orig	Thu Feb  5 15:14:00 1998
-+++ erpcd/acp_lib.c	Thu Sep 18 20:10:32 2003
-@@ -2437,7 +2437,7 @@
- int acp_annex_status_return(msg)
- struct annex_status_return *msg;
- {
--if (msg->errno == ESUCCESS)return(TRUE);
-+if (msg->xerrno == ESUCCESS)return(TRUE);
- else return(FALSE);
- 
- }
diff --git a/net/annextools/files/patch-erpcd::acp_lib.h b/net/annextools/files/patch-erpcd::acp_lib.h
deleted file mode 100644
index fd328e5b1b5a..000000000000
--- a/net/annextools/files/patch-erpcd::acp_lib.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- erpcd/acp_lib.h.orig	Tue Jan 27 17:46:14 1998
-+++ erpcd/acp_lib.h	Thu Sep 18 20:10:32 2003
-@@ -9,7 +9,7 @@
- 
- #ifndef _WIN32		/* is this needed at all? */
- struct annex_status_return {
--  int errno;
-+  int xerrno;
- }; 
- #endif /* not _WIN32 */
- 
diff --git a/net/annextools/files/patch-erpcd::env_parser.c b/net/annextools/files/patch-erpcd::env_parser.c
deleted file mode 100644
index a19c80690c25..000000000000
--- a/net/annextools/files/patch-erpcd::env_parser.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- erpcd/env_parser.c.orig	Fri Apr  3 15:36:47 1998
-+++ erpcd/env_parser.c	Thu Sep 18 20:10:32 2003
-@@ -29,6 +29,8 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <net/if.h>
-+#include <net/if_var.h>
-+#include <netinet/in.h>
- #include <netinet/in_var.h>
- #include <netinet/if_ether.h>
- #include <syslog.h>
diff --git a/net/annextools/files/patch-erpcd::erpcd.c b/net/annextools/files/patch-erpcd::erpcd.c
deleted file mode 100644
index a46f707a89b3..000000000000
--- a/net/annextools/files/patch-erpcd::erpcd.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- erpcd/erpcd.c.orig	Sat Jan 31 17:38:06 1998
-+++ erpcd/erpcd.c	Thu Sep 18 20:10:32 2003
-@@ -2108,11 +2108,7 @@
- {
-     int savederrno = errno;
-     int i,j;
--#ifdef SYS_V
-     int status;
--#else
--    union wait status;
--#endif
- 
- #ifdef SYS_V
-     /* decrement child_count for each status successfully returned */
diff --git a/net/annextools/files/patch-erpcd::session_dbunx.c b/net/annextools/files/patch-erpcd::session_dbunx.c
deleted file mode 100644
index 03a1b2e26636..000000000000
--- a/net/annextools/files/patch-erpcd::session_dbunx.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- erpcd/session_dbunx.c.orig	Wed Oct 15 13:50:46 1997
-+++ erpcd/session_dbunx.c	Thu Sep 18 20:10:32 2003
-@@ -117,7 +117,11 @@
- key_t sem_key = 0;          /* semaphore key */
- int Asemid;		/* Access semaphore id */
- 
-+#if defined(__FreeBSD__)
-+int ctlinit;
-+#else
- union semun ctlinit;	/* arg struct for semctl */
-+#endif
- 						/* sembuf elements: index, op, flag */
- struct sembuf sopwait = {0,-1, SEM_UNDO};	/* wait for semaphore */
- struct sembuf soppost = {0, 1, SEM_UNDO};	/* set value to available */
-@@ -290,7 +294,11 @@
- 	return errno;
-       }
-     }
-+#if defined(__FreeBSD__)
-+    ctlinit = 1;
-+#else
-     ctlinit.val = 1;
-+#endif
-     if (semctl(Asemid, 0, SETVAL, ctlinit) == -1) {
- #ifdef USE_SYSLOG
-       syslog(LOG_CRIT, "%s: Set semaphore, semctl error %d. No database access.", appname, errno);
diff --git a/net/annextools/files/patch-erpcd::spy.c b/net/annextools/files/patch-erpcd::spy.c
deleted file mode 100644
index 1083a10a912a..000000000000
--- a/net/annextools/files/patch-erpcd::spy.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- erpcd/spy.c.orig	Mon May  5 16:09:35 1997
-+++ erpcd/spy.c	Thu Sep 18 20:10:32 2003
-@@ -34,8 +34,10 @@
- 
- int debug = 0;
- 
-+#if !defined(__FreeBSD__)
- extern int errno;
- extern char *sys_errlist[];	/* errno strings */
-+#endif
- 
- static void timeout();
- 
diff --git a/net/annextools/files/patch-inc::na::cmd.h b/net/annextools/files/patch-inc::na::cmd.h
deleted file mode 100644
index 0b539124758e..000000000000
--- a/net/annextools/files/patch-inc::na::cmd.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- inc/na/cmd.h.orig	Tue Aug 18 18:39:14 1998
-+++ inc/na/cmd.h	Thu Sep 18 20:10:32 2003
-@@ -1881,13 +1881,12 @@
-         , { 0, 0, 0, V_BIG_BIRD_N, V_BIG_BIRD_N, 0, V_BIG_BIRD_N, V_PRIMATE_N }
- #endif
- },
--#ifndef NA
-+/* XXXCDC: was ifndef NA, need this or indexs off by 1! */
- {ARPT_TTKILLC, DFE_CAT, DFE_ARPT_TTKILLC , B_GENERIC_CAT, CARDINAL_P, CNV_BYTE
- #ifdef NA
- 	, { 0, 0, 0, 0, 0, 0, 0, 0 }
- #endif
- },
--#endif
- {FAIL_TO_CONNECT, DFE_CAT, DFE_FAIL_TO_CONNECT, B_GENERIC_CAT, CARDINAL_P, CNV_INT
- #ifdef NA
-         , { 0, 0, 0, V_14_0_N, V_14_0_N, 0, 0, V_14_0_N }
diff --git a/net/annextools/files/patch-inc::na::help.h b/net/annextools/files/patch-inc::na::help.h
deleted file mode 100644
index 32740dbee04a..000000000000
--- a/net/annextools/files/patch-inc::na::help.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- inc/na/help.h.orig	Tue Aug 18 18:40:40 1998
-+++ inc/na/help.h	Thu Sep 18 20:10:32 2003
-@@ -298,14 +298,13 @@
- , "Show the AppleTalk subset of port parameters"
- #endif /* NA */
- },
--#ifndef NA
-+/* XXXCDC: was ifndef NA, need this or annex_params[26] is null! */
- {"arpt_kill_timer",	BOX_PARAM,	ARPT_TTKILLC
- #ifdef NA
- , "Time for a temporary created entry in an ARP Table to remain active.\n\t\
- Value in minutes: range 1 to 255, default value is 20 minutes."
- #endif /* NA */
- },
--#endif
- {"arap_v42bis",		PORT_PARAM,	P_ARAP_V42BIS
- #ifdef NA
- , "Allow the enabling of V.42bis compression\n\t\
diff --git a/net/annextools/files/patch-inc::slip::slip_user.h b/net/annextools/files/patch-inc::slip::slip_user.h
deleted file mode 100644
index fba7295c37d3..000000000000
--- a/net/annextools/files/patch-inc::slip::slip_user.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- inc/slip/slip_user.h.orig	Wed Apr  5 19:48:20 1989
-+++ inc/slip/slip_user.h	Thu Sep 18 20:10:32 2003
-@@ -46,7 +46,7 @@
-  *									     *
-  *****************************************************************************/
- 
--#define CFGFILE		INSTALL_DIR/slipcfg"
-+#define CFGFILE		INSTALL_DIR "/slipcfg"
- #define SLIPDATA	"/usr/spool/slipd/D.%d"
- #define OUTPIPE		"/usr/spool/slipd/outpipe"
- #define PORTLOCK	"/usr/spool/slipd/portlock"
diff --git a/net/annextools/files/patch-libannex::Makefile b/net/annextools/files/patch-libannex::Makefile
deleted file mode 100644
index 17ed05f31acb..000000000000
--- a/net/annextools/files/patch-libannex::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- libannex/Makefile.orig	Tue Oct  1 12:46:00 1996
-+++ libannex/Makefile	Thu Sep 18 20:10:32 2003
-@@ -29,6 +29,10 @@
- #  REVISION:	$Revision: 1.12 $
- #
- 
-+CFLAGS += -I../inc
-+
-+LIBANX_O = bcopy.o dup2.o erpc_subr.o srpc.o hostname.o in_cksum.o inet.o ip_layer.o sendrecv.o slip_layer.o socket_layer.o udp_layer.o api_if.o asn1.o conv.o proctitle.o random.o servname.o
-+
- LIBANX_OT = ${LIBANX_O} .
- 
- GFLG =
diff --git a/net/annextools/files/patch-libannex::api_if.c b/net/annextools/files/patch-libannex::api_if.c
deleted file mode 100644
index 146fb7cf2f2e..000000000000
--- a/net/annextools/files/patch-libannex::api_if.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libannex/api_if.c.orig	Mon Oct 13 01:49:30 2003
-+++ libannex/api_if.c	Mon Oct 13 01:49:51 2003
-@@ -180,8 +180,10 @@
- #define recvmsg_func recvmsg
- #endif
- 
-+#ifndef __FreeBSD__
- extern int sendmsg_func();
- extern int recvmsg_func();
-+#endif
- 
- #ifdef _WIN32
- #define XylogicsWSAGetLastError()	\
diff --git a/net/annextools/files/patch-libannex::ip_layer.c b/net/annextools/files/patch-libannex::ip_layer.c
deleted file mode 100644
index f76d070caac7..000000000000
--- a/net/annextools/files/patch-libannex::ip_layer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libannex/ip_layer.c.orig	Thu Aug  4 15:57:47 1994
-+++ libannex/ip_layer.c	Thu Sep 18 20:18:15 2003
-@@ -63,6 +63,8 @@
-  *****************************************************************************/
- 
- #include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <stdio.h>
- #include "../inc/config.h"
- #include "port/port.h"
diff --git a/net/annextools/files/patch-libannex::slip_layer.c b/net/annextools/files/patch-libannex::slip_layer.c
deleted file mode 100644
index 1a9056d6b998..000000000000
--- a/net/annextools/files/patch-libannex::slip_layer.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- libannex/slip_layer.c.orig	Thu Aug  4 15:58:46 1994
-+++ libannex/slip_layer.c	Thu Sep 18 20:18:34 2003
-@@ -70,6 +70,8 @@
- #include "port/port.h"
- #include <sys/stat.h>
- #include <sys/fcntl.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <stdio.h>
- #include <errno.h>
- #include "../inc/slip/slip_user.h"
-@@ -101,10 +103,7 @@
-  *****************************************************************************/
- 
- extern int debug;
--extern errno_t errno;
--
--extern UINT32 inet_addr();
--
-+extern int errno;
- 
- /*****************************************************************************
-  *									     *
diff --git a/net/annextools/files/patch-libannex::socket_layer.c b/net/annextools/files/patch-libannex::socket_layer.c
deleted file mode 100644
index 58f62727d159..000000000000
--- a/net/annextools/files/patch-libannex::socket_layer.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- libannex/socket_layer.c.orig	Thu Aug  4 15:58:59 1994
-+++ libannex/socket_layer.c	Thu Sep 18 20:10:32 2003
-@@ -74,6 +74,8 @@
- #include <ctype.h>
- #include <errno.h>
- #include <signal.h>
-+#include <netdb.h>
-+#include <netinet/in.h>
- #include "../inc/config.h"
- #include "../inc/slip/slip_user.h"
- 
-@@ -189,7 +191,7 @@
- int protocol;		/* IPPROTO_UDP only */
- {
-     struct sockinf *s;
--    errno_t error;
-+    int error;
-     int i;
- 
-     /* Check arguments */
-@@ -260,7 +262,7 @@
- {
-     struct sockinf *t, *u;
-     int port;
--    errno_t error;
-+    int error;
- 
-     if(!(t = sockinf_bynumber(s, FALSE))) {
- 	errno = EBADF;
-@@ -300,7 +302,7 @@
- {
-     struct sockinf *t, *u;
-     int port;
--    errno_t error;
-+    int error;
- 
-     if(!(t = sockinf_bynumber(s, FALSE))) {
- 	errno = EBADF;
diff --git a/net/annextools/files/patch-libannex::udp_layer.c b/net/annextools/files/patch-libannex::udp_layer.c
deleted file mode 100644
index 3376b80d0c22..000000000000
--- a/net/annextools/files/patch-libannex::udp_layer.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libannex/udp_layer.c.orig	Thu Aug  4 15:59:14 1994
-+++ libannex/udp_layer.c	Thu Sep 18 20:10:32 2003
-@@ -63,7 +63,9 @@
-  *****************************************************************************/
- 
- #include <stdio.h>
-+#include <errno.h>
- #include <sys/types.h>
-+#include <netinet/in.h>
- #include "../inc/config.h"
- #include "port/port.h"
- #include "../inc/slip/slip_user.h"
diff --git a/net/annextools/files/patch-make.config b/net/annextools/files/patch-make.config
deleted file mode 100644
index 988713f3fdb8..000000000000
--- a/net/annextools/files/patch-make.config
+++ /dev/null
@@ -1,5 +0,0 @@
---- make.config.orig	Thu Sep 18 20:10:32 2003
-+++ make.config	Thu Sep 18 20:10:32 2003
-@@ -0,0 +1,2 @@
-+
-+CFLAGS += -D_NFILE=65536 -DHAS_CTRL_NOT_ACC=1 -DINSTALL_DIR=\"/usr/local/annex\" -DMIN_SLIP_ERR=10 -DMAX_SLIP_ERR=10 -DFREEBSD=1
diff --git a/net/annextools/files/patch-na::Makefile b/net/annextools/files/patch-na::Makefile
deleted file mode 100644
index 9812f8f692f3..000000000000
--- a/net/annextools/files/patch-na::Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- na/Makefile.orig	Mon Jun  3 15:45:07 1996
-+++ na/Makefile	Thu Sep 18 20:10:32 2003
-@@ -50,7 +50,7 @@
- 
- OFILES	= main.o cmd.o parse.o do.o sub.o conv.o conv2.o pager.o
- CFILES	= main.c cmd.c parse.c do.c sub.c conv.c conv2.c pager.c
--AFILES	= ../netadm/netadm.a ../libannex/libannex.a
-+AFILES	= ../libannex/libannex.a ../netadm/netadm.a
- EFILES	= na
- 
- all:
-@@ -72,7 +72,7 @@
- 	${RM} -f ${OFILES} ${EFILES}
- 
- na:		${OFILES} ${AFILES}
--	${CC} ${NACFLAGS} -o na ${OFILES} ${AFILES} ${LIBFLAG}
-+	${CC} ${NACFLAGS} -o na ${OFILES} -L../libannex -L../netadm -lnetadm -lannex
- 
- ../libannex/libannex.a:
- 	cd ../libannex; $(MAKE)
diff --git a/net/annextools/files/patch-netadm::Makefile b/net/annextools/files/patch-netadm::Makefile
deleted file mode 100644
index 31330ffae6de..000000000000
--- a/net/annextools/files/patch-netadm::Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- netadm/Makefile.orig	Wed May 15 15:37:44 1996
-+++ netadm/Makefile	Thu Sep 18 20:10:32 2003
-@@ -28,6 +28,8 @@
- #  REVISION:	$Revision: 1.24 $
- #
- 
-+CFLAGS += -I../inc
-+
- OFILES = boot.o reset_all.o reset_line.o set_inet_add.o \
- 	read_memory.o get_da_param.o set_da_param.o get_ln_param.o \
- 	set_ln_param.o broadcast.o get_anx_rev.o get_anx_opt.o \
-@@ -73,6 +75,7 @@
- netadm.a:	${OFILES}
- 	${AR} ${ARFLAGS} netadm.a $(OFILES)
- 	${RANLIB} netadm.a
-+	cp netadm.a libnetadm.a
- 
- install:	all
- 
diff --git a/net/annextools/pkg-descr b/net/annextools/pkg-descr
deleted file mode 100644
index e195895f8a72..000000000000
--- a/net/annextools/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This port will install the original management tools from Nortel
-Networks (formerly Bay Networks, formerly Xylogics) for the popular
-Annex range of terminal servers.
-
-WWW: http://www25.nortelnetworks.com/library/tpubs/nav/remote/ra51.htm
-
-Bruce
-bms@spc.org
diff --git a/net/annextools/pkg-plist b/net/annextools/pkg-plist
deleted file mode 100644
index 03f74f17e7e3..000000000000
--- a/net/annextools/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-annex/sbin/acplint
-annex/sbin/ch_passwd
-annex/sbin/erpcd
-annex/sbin/spy
-annex/sbin/tms_convert
-annex/sbin/tms_dbm
-annex/sbin/na
-annex/sbin/rtelnet
-@dirrm annex/sbin
-annex/snmp/xylo-anx.mib
-annex/snmp/xylo-callmgmt.mib
-annex/snmp/xylo-modem.mib
-annex/snmp/xylo-ports.mib
-annex/snmp/xylo-protocol.mib
-annex/snmp/xylo-trpobj.mib
-annex/snmp/xylo-wan.mib
-annex/snmp/xylo.cap
-annex/snmp/xylo.smi
-annex/snmp/xylo.trp
-@dirrm annex/snmp
-annex/examples/laser
-annex/examples/lprinterface
-annex/examples/macro1
-annex/examples/macro2
-annex/examples/map3270
-annex/examples/modem.configs
-annex/examples/rotary
-annex/examples/termcap
-@dirrm annex/examples
-@dirrm annex