49 files changed, 809 insertions, 0 deletions

diff --git a/net-mgmt/annextools/Makefile b/net-mgmt/annextools/Makefile
new file mode 100644
index 000000000000..fa73c51aa02e
--- /dev/null
+++ b/net-mgmt/annextools/Makefile
@@ -0,0 +1,57 @@
+# New ports collection makefile for:    annextools
+# Date created:         17 September 2003
+# Whom:                 Bruce M Simpson <bms@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=       annextools
+PORTVERSION=	10.0
+PORTREVISION=	0
+CATEGORIES=     net
+MASTER_SITES=   ftp://ftp-support.baynetworks.com/pub/swcode/remacc/microannex_xl/
+DISTNAME=	R10.0B-R2.3
+EXTRACT_SUFX=	.tar.Z
+DIST_SUBDIR=	microannex_xl
+
+MAINTAINER=     bms@FreeBSD.org
+COMMENT=	"BSD tools for the MicroAnnex-XL Terminal Server"
+
+WRKSRC=		${WRKDIR}/src
+
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - src
+
+post-extract:
+	${FIND} ${WRKDIR}/src -type d -exec ${CHMOD} u+w \{\} \;
+
+do-install:
+	${MKDIR} ${PREFIX}/annex/sbin ${PREFIX}/annex/snmp ${PREFIX}/annex/examples
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/acplint ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/ch_passwd ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/erpcd ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/spy ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/tms_convert ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/tms_dbm ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/na/na ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/rtelnet/rtelnet ${PREFIX}/annex/sbin
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-anx.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-callmgmt.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-modem.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-ports.mib ${PREFIX}/annex/snmp
+
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-protocol.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-trpobj.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-wan.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo.cap ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo.smi ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo.trp ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/laser ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/lprinterface ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/macro1 ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/macro2 ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/map3270 ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/modem.configs ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/rotary ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/termcap ${PREFIX}/annex/examples
+
+.include <bsd.port.mk>
diff --git a/net-mgmt/annextools/distinfo b/net-mgmt/annextools/distinfo
new file mode 100644
index 000000000000..5652d7ec0c66
--- /dev/null
+++ b/net-mgmt/annextools/distinfo
@@ -0,0 +1 @@
+MD5 (microannex_xl/R10.0B-R2.3.tar.Z) = 60e08b649c964282d412d449e80f9c92
diff --git a/net-mgmt/annextools/files/patch-Makefile b/net-mgmt/annextools/files/patch-Makefile
new file mode 100644
index 000000000000..95857646d432
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- 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-mgmt/annextools/files/patch-erpcd::Makefile b/net-mgmt/annextools/files/patch-erpcd::Makefile
new file mode 100644
index 000000000000..d3c1347b5264
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-erpcd::Makefile
@@ -0,0 +1,12 @@
+--- erpcd/Makefile.orig	Wed Jun 24 17:23:53 1998
++++ erpcd/Makefile	Thu Sep 18 20:10:32 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
diff --git a/net-mgmt/annextools/files/patch-erpcd::acp.c b/net-mgmt/annextools/files/patch-erpcd::acp.c
new file mode 100644
index 000000000000..08ec79704808
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-erpcd::acp.c
@@ -0,0 +1,13 @@
+--- 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-mgmt/annextools/files/patch-erpcd::acp_lib.c b/net-mgmt/annextools/files/patch-erpcd::acp_lib.c
new file mode 100644
index 000000000000..7f0f63beb618
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-erpcd::acp_lib.c
@@ -0,0 +1,11 @@
+--- 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-mgmt/annextools/files/patch-erpcd::acp_lib.h b/net-mgmt/annextools/files/patch-erpcd::acp_lib.h
new file mode 100644
index 000000000000..fd328e5b1b5a
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-erpcd::acp_lib.h
@@ -0,0 +1,11 @@
+--- 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-mgmt/annextools/files/patch-erpcd::env_parser.c b/net-mgmt/annextools/files/patch-erpcd::env_parser.c
new file mode 100644
index 000000000000..a19c80690c25
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-erpcd::env_parser.c
@@ -0,0 +1,11 @@
+--- 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-mgmt/annextools/files/patch-erpcd::erpcd.c b/net-mgmt/annextools/files/patch-erpcd::erpcd.c
new file mode 100644
index 000000000000..a46f707a89b3
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-erpcd::erpcd.c
@@ -0,0 +1,14 @@
+--- 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-mgmt/annextools/files/patch-erpcd::session_dbunx.c b/net-mgmt/annextools/files/patch-erpcd::session_dbunx.c
new file mode 100644
index 000000000000..03a1b2e26636
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-erpcd::session_dbunx.c
@@ -0,0 +1,26 @@
+--- 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-mgmt/annextools/files/patch-erpcd::spy.c b/net-mgmt/annextools/files/patch-erpcd::spy.c
new file mode 100644
index 000000000000..1083a10a912a
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-erpcd::spy.c
@@ -0,0 +1,13 @@
+--- 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-mgmt/annextools/files/patch-inc::na::cmd.h b/net-mgmt/annextools/files/patch-inc::na::cmd.h
new file mode 100644
index 000000000000..0b539124758e
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-inc::na::cmd.h
@@ -0,0 +1,17 @@
+--- 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-mgmt/annextools/files/patch-inc::na::help.h b/net-mgmt/annextools/files/patch-inc::na::help.h
new file mode 100644
index 000000000000..32740dbee04a
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-inc::na::help.h
@@ -0,0 +1,18 @@
+--- 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-mgmt/annextools/files/patch-inc::slip::slip_user.h b/net-mgmt/annextools/files/patch-inc::slip::slip_user.h
new file mode 100644
index 000000000000..fba7295c37d3
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-inc::slip::slip_user.h
@@ -0,0 +1,11 @@
+--- 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-mgmt/annextools/files/patch-libannex::Makefile b/net-mgmt/annextools/files/patch-libannex::Makefile
new file mode 100644
index 000000000000..17ed05f31acb
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-libannex::Makefile
@@ -0,0 +1,13 @@
+--- 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-mgmt/annextools/files/patch-libannex::ip_layer.c b/net-mgmt/annextools/files/patch-libannex::ip_layer.c
new file mode 100644
index 000000000000..f76d070caac7
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-libannex::ip_layer.c
@@ -0,0 +1,11 @@
+--- 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-mgmt/annextools/files/patch-libannex::slip_layer.c b/net-mgmt/annextools/files/patch-libannex::slip_layer.c
new file mode 100644
index 000000000000..1a9056d6b998
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-libannex::slip_layer.c
@@ -0,0 +1,23 @@
+--- 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-mgmt/annextools/files/patch-libannex::socket_layer.c b/net-mgmt/annextools/files/patch-libannex::socket_layer.c
new file mode 100644
index 000000000000..58f62727d159
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-libannex::socket_layer.c
@@ -0,0 +1,38 @@
+--- 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-mgmt/annextools/files/patch-libannex::udp_layer.c b/net-mgmt/annextools/files/patch-libannex::udp_layer.c
new file mode 100644
index 000000000000..3376b80d0c22
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-libannex::udp_layer.c
@@ -0,0 +1,12 @@
+--- 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-mgmt/annextools/files/patch-make.config b/net-mgmt/annextools/files/patch-make.config
new file mode 100644
index 000000000000..988713f3fdb8
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-make.config
@@ -0,0 +1,5 @@
+--- 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-mgmt/annextools/files/patch-na::Makefile b/net-mgmt/annextools/files/patch-na::Makefile
new file mode 100644
index 000000000000..9812f8f692f3
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-na::Makefile
@@ -0,0 +1,20 @@
+--- 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-mgmt/annextools/files/patch-netadm::Makefile b/net-mgmt/annextools/files/patch-netadm::Makefile
new file mode 100644
index 000000000000..31330ffae6de
--- /dev/null
+++ b/net-mgmt/annextools/files/patch-netadm::Makefile
@@ -0,0 +1,19 @@
+--- 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-mgmt/annextools/pkg-descr b/net-mgmt/annextools/pkg-descr
new file mode 100644
index 000000000000..e195895f8a72
--- /dev/null
+++ b/net-mgmt/annextools/pkg-descr
@@ -0,0 +1,8 @@
+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-mgmt/annextools/pkg-plist b/net-mgmt/annextools/pkg-plist
new file mode 100644
index 000000000000..03f74f17e7e3
--- /dev/null
+++ b/net-mgmt/annextools/pkg-plist
@@ -0,0 +1,30 @@
+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
diff --git a/net/Makefile b/net/Makefile
index a9da71c88775..9876907a49c9 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -17,6 +17,7 @@
     SUBDIR += airport
     SUBDIR += amsn
     SUBDIR += angst
+    SUBDIR += annextools
     SUBDIR += ap-utils
     SUBDIR += apinger
     SUBDIR += archie
diff --git a/net/annextools/Makefile b/net/annextools/Makefile
new file mode 100644
index 000000000000..fa73c51aa02e
--- /dev/null
+++ b/net/annextools/Makefile
@@ -0,0 +1,57 @@
+# New ports collection makefile for:    annextools
+# Date created:         17 September 2003
+# Whom:                 Bruce M Simpson <bms@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=       annextools
+PORTVERSION=	10.0
+PORTREVISION=	0
+CATEGORIES=     net
+MASTER_SITES=   ftp://ftp-support.baynetworks.com/pub/swcode/remacc/microannex_xl/
+DISTNAME=	R10.0B-R2.3
+EXTRACT_SUFX=	.tar.Z
+DIST_SUBDIR=	microannex_xl
+
+MAINTAINER=     bms@FreeBSD.org
+COMMENT=	"BSD tools for the MicroAnnex-XL Terminal Server"
+
+WRKSRC=		${WRKDIR}/src
+
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - src
+
+post-extract:
+	${FIND} ${WRKDIR}/src -type d -exec ${CHMOD} u+w \{\} \;
+
+do-install:
+	${MKDIR} ${PREFIX}/annex/sbin ${PREFIX}/annex/snmp ${PREFIX}/annex/examples
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/acplint ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/ch_passwd ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/erpcd ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/spy ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/tms_convert ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/erpcd/tms_dbm ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/na/na ${PREFIX}/annex/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/rtelnet/rtelnet ${PREFIX}/annex/sbin
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-anx.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-callmgmt.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-modem.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-ports.mib ${PREFIX}/annex/snmp
+
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-protocol.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-trpobj.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo-wan.mib ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo.cap ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo.smi ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/snmp/xylo.trp ${PREFIX}/annex/snmp
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/laser ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/lprinterface ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/macro1 ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/macro2 ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/map3270 ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/modem.configs ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/rotary ${PREFIX}/annex/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/misc/termcap ${PREFIX}/annex/examples
+
+.include <bsd.port.mk>
diff --git a/net/annextools/distinfo b/net/annextools/distinfo
new file mode 100644
index 000000000000..5652d7ec0c66
--- /dev/null
+++ b/net/annextools/distinfo
@@ -0,0 +1 @@
+MD5 (microannex_xl/R10.0B-R2.3.tar.Z) = 60e08b649c964282d412d449e80f9c92
diff --git a/net/annextools/files/patch-Makefile b/net/annextools/files/patch-Makefile
new file mode 100644
index 000000000000..95857646d432
--- /dev/null
+++ b/net/annextools/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..d3c1347b5264
--- /dev/null
+++ b/net/annextools/files/patch-erpcd::Makefile
@@ -0,0 +1,12 @@
+--- erpcd/Makefile.orig	Wed Jun 24 17:23:53 1998
++++ erpcd/Makefile	Thu Sep 18 20:10:32 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
diff --git a/net/annextools/files/patch-erpcd::acp.c b/net/annextools/files/patch-erpcd::acp.c
new file mode 100644
index 000000000000..08ec79704808
--- /dev/null
+++ b/net/annextools/files/patch-erpcd::acp.c
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000000000000..7f0f63beb618
--- /dev/null
+++ b/net/annextools/files/patch-erpcd::acp_lib.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..fd328e5b1b5a
--- /dev/null
+++ b/net/annextools/files/patch-erpcd::acp_lib.h
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..a19c80690c25
--- /dev/null
+++ b/net/annextools/files/patch-erpcd::env_parser.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..a46f707a89b3
--- /dev/null
+++ b/net/annextools/files/patch-erpcd::erpcd.c
@@ -0,0 +1,14 @@
+--- 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
new file mode 100644
index 000000000000..03a1b2e26636
--- /dev/null
+++ b/net/annextools/files/patch-erpcd::session_dbunx.c
@@ -0,0 +1,26 @@
+--- 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
new file mode 100644
index 000000000000..1083a10a912a
--- /dev/null
+++ b/net/annextools/files/patch-erpcd::spy.c
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000000000000..0b539124758e
--- /dev/null
+++ b/net/annextools/files/patch-inc::na::cmd.h
@@ -0,0 +1,17 @@
+--- 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
new file mode 100644
index 000000000000..32740dbee04a
--- /dev/null
+++ b/net/annextools/files/patch-inc::na::help.h
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 000000000000..fba7295c37d3
--- /dev/null
+++ b/net/annextools/files/patch-inc::slip::slip_user.h
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..17ed05f31acb
--- /dev/null
+++ b/net/annextools/files/patch-libannex::Makefile
@@ -0,0 +1,13 @@
+--- 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::ip_layer.c b/net/annextools/files/patch-libannex::ip_layer.c
new file mode 100644
index 000000000000..f76d070caac7
--- /dev/null
+++ b/net/annextools/files/patch-libannex::ip_layer.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..1a9056d6b998
--- /dev/null
+++ b/net/annextools/files/patch-libannex::slip_layer.c
@@ -0,0 +1,23 @@
+--- 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
new file mode 100644
index 000000000000..58f62727d159
--- /dev/null
+++ b/net/annextools/files/patch-libannex::socket_layer.c
@@ -0,0 +1,38 @@
+--- 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
new file mode 100644
index 000000000000..3376b80d0c22
--- /dev/null
+++ b/net/annextools/files/patch-libannex::udp_layer.c
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..988713f3fdb8
--- /dev/null
+++ b/net/annextools/files/patch-make.config
@@ -0,0 +1,5 @@
+--- 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
new file mode 100644
index 000000000000..9812f8f692f3
--- /dev/null
+++ b/net/annextools/files/patch-na::Makefile
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 000000000000..31330ffae6de
--- /dev/null
+++ b/net/annextools/files/patch-netadm::Makefile
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000000..e195895f8a72
--- /dev/null
+++ b/net/annextools/pkg-descr
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000000..03f74f17e7e3
--- /dev/null
+++ b/net/annextools/pkg-plist
@@ -0,0 +1,30 @@
+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