diff --git a/net/Makefile b/net/Makefile
index 5a3bcd8001d..216d7a56cbd 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 1998/04/09 21:52:52 marc Exp $
+# $OpenBSD: Makefile,v 1.7 1998/04/12 04:29:05 marc Exp $
 # $FreeBSD: Makefile,v 1.129 1997/11/20 13:47:40 itojun Exp $
 #
 
      SUBDIR += archie
      SUBDIR += arpwatch
-     SUBDIR += ascend-radius
+#    SUBDIR += ascend-radius
 #    SUBDIR += bb
      SUBDIR += bing
 #    SUBDIR += cap
diff --git a/net/archie/Makefile b/net/archie/Makefile
index 820bf59ad2d..649ff3e15b8 100644
--- a/net/archie/Makefile
+++ b/net/archie/Makefile
@@ -3,12 +3,14 @@
 # Date created:		10 Nov 1997
 # Whom:			ejovi
 #
-# $OpenBSD: Makefile,v 1.2 1997/11/17 21:47:34 joey Exp $
+# $OpenBSD: Makefile,v 1.3 1998/04/12 04:29:07 marc Exp $
 #
 
 DISTNAME=	c-archie-1.4.1-FIXED
 PKGNAME=	archie-1.4.1
 CATEGORIES=	net
+NO_CDROM=	"NOFEE:	Can not sell"
+
 MASTER_SITES=	ftp://ftp.uu.net/networking/info-service/archie/clients/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/net/ascend-radius/Makefile b/net/ascend-radius/Makefile
deleted file mode 100644
index 1ff3086db46..00000000000
--- a/net/ascend-radius/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# OpenBSD makefile for:	ascend-radius
-# Version required:			970424 (v1.16)
-# Date created:				10 Nov 1997
-# Whom:	      				ejovi
-#
-# $OpenBSD: Makefile,v 1.3 1998/01/18 17:20:07 niklas Exp $
-#
-
-#DISTNAME=	radius-970424
-PKGNAME=	ascend-radius-970424
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.ascend.com/pub/Software-Releases/Radius/Current/ \
-		ftp://ftp.ascend.com/pub/Software-Releases/Radius/Current/doc/ \
-		ftp://ftp.ascend.com/pub/Software-Releases/Radius/Archive/ \
-		ftp://ftp.ascend.com/pub/Software-Releases/Radius/Archive/doc/
-DISTFILES=	radius-970424.tar.gz \
-		radius.ps \
-		radius.pdf \
-		rradius.ps \
-		rradius.pdf
-EXTRACT_ONLY=	radius-970424.tar.gz
-
-MAINTAINER=	joey@OpenBSD.ORG
-
-WRKPREFIX=	radius-970424/radius-ascend/radius-1.16-ascend
-WRKSRC=		${WRKDIR}/${WRKPREFIX}/ascendd
-
-ALL_TARGET=	all dbm
-MAN1=		builddbm.1 users-file-syntax.1
-
-do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/radiusd ${PREFIX}/sbin
-		${INSTALL_PROGRAM} ${WRKSRC}/radiusd.dbm ${PREFIX}/sbin
-		${INSTALL_PROGRAM} ${WRKSRC}/builddbm ${PREFIX}/sbin
-		${INSTALL_MAN} ${WRKDIR}/${WRKPREFIX}/man1/users-file-syntax.1 ${PREFIX}/man/man1
-		${INSTALL_MAN} ${WRKDIR}/${WRKPREFIX}/man1/builddbm.1 ${PREFIX}/man/man1
-.ifndef NOPORTDOCS
-		@ ${MKDIR} ${PREFIX}/share/doc/ascend-radius
-		for file in ascend.doc draft-ietf-radius-accounting-01.txt draft-ietf-radius-radius-03.txt draft-ietf-radius-radius-04.txt; do \
-			${INSTALL_DATA} ${WRKDIR}/${WRKPREFIX}/doc/$$file ${PREFIX}/share/doc/ascend-radius; \
-		done
-		for file in ChangeLog README README.cexample README.dict; do \
-			${INSTALL_DATA} ${WRKDIR}/${WRKPREFIX}/$$file ${PREFIX}/share/doc/ascend-radius; \
-		done
-		${INSTALL_DATA} ${DISTDIR}/radius.ps ${PREFIX}/share/doc/ascend-radius
-		${INSTALL_DATA} ${DISTDIR}/radius.pdf ${PREFIX}/share/doc/ascend-radius
-		${INSTALL_DATA} ${DISTDIR}/rradius.ps ${PREFIX}/share/doc/ascend-radius
-		${INSTALL_DATA} ${DISTDIR}/rradius.pdf ${PREFIX}/share/doc/ascend-radius
-.endif
-		@ ${MKDIR} ${PREFIX}/etc/raddb
-		@ /usr/sbin/chown root.wheel ${PREFIX}/etc/raddb
-		@ chmod 700 ${PREFIX}/etc/raddb
-		for file in clients.example dictionary users.example; do \
-			${INSTALL} -c -o root -g wheel -m 0400 ${WRKDIR}/${WRKPREFIX}/raddb/$$file ${PREFIX}/etc/raddb; \
-		done
-		@ ${MKDIR} /var/log/radacct
-		@ /usr/sbin/chown root.wheel /var/log/radacct
-		@ chmod 700 /var/log/radacct
-
-.include <bsd.port.mk>
diff --git a/net/ascend-radius/files/md5 b/net/ascend-radius/files/md5
deleted file mode 100644
index bec61a4ef16..00000000000
--- a/net/ascend-radius/files/md5
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (radius-970424.tar.gz) = 3e7de1fd9cd3bb69fdf4d3a3ef228cbb
-MD5 (radius.ps) = ca2a732ba76c912e37affa35e2b725d6
-MD5 (radius.pdf) = 3fd800184323d0cd1fb9be2018d676a8
-MD5 (rradius.ps) = 358ac1cafc1fd9ea0b40878399f43d02
-MD5 (rradius.pdf) = eebcf3565e5e5fe041ff842188d78c95
diff --git a/net/ascend-radius/patches/patch-aa b/net/ascend-radius/patches/patch-aa
deleted file mode 100644
index 2bdf0f52b60..00000000000
--- a/net/ascend-radius/patches/patch-aa
+++ /dev/null
@@ -1,50 +0,0 @@
---- Makefile.orig	Tue Oct 29 14:44:07 1996
-+++ Makefile	Fri Jan 24 05:00:19 1997
-@@ -111,8 +111,8 @@
- # Pick your compiler
- #
- #CC=	gcc -ansi -Wall	# set the GCC compiler to ANSI mode and picky
--CC=	gcc -ansi	# set the GCC compiler to ANSI mode
--#CC=	gcc		# set the GCC compiler for BSDI and friends
-+#CC=	gcc -ansi	# set the GCC compiler to ANSI mode
-+CC=	gcc		# set the GCC compiler for BSDI and friends
- #CC=	cc -Xc -v -fd	# set the SUN compiler to full-whine ANSI mode
- #CC=	cc -Xc -v	# set the SUN compiler to partial-whine ANSI mode
- #CC=	cc -Xc		# set the SUN compiler to ANSI mode
-@@ -132,7 +132,7 @@
- #	use this for BSDI
- #CFLAGS= -O -DNOSHADOW -DBSDI -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
- #	use this for SunOS
--CFLAGS= -O -DNOSHADOW -DOSUN -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
-+#CFLAGS= -O -DNOSHADOW -DOSUN -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
- #	use this for Solaris 2.1 - 2.4
- #CFLAGS= -O -Dsys5 -DSOLARIS -D_SVID_GETTOD -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
- #	use this for Solaris 2.5
-@@ -140,7 +140,7 @@
- #	use this for Linux
- #CFLAGS= -g -Dsys5 -DNOSHADOW -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
- #	use this for FreeBSD
--#CFLAGS= -O -DNOSHADOW -DFreeBSD -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
-+CFLAGS= -O -DNOSHADOW -D_HAVE_PARAM_H -DUSE_NDBM -DFreeBSD -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
- 
- # Pick any load options and the load libraries.  The AUTH_LIBS
- # are selected above
-@@ -150,14 +150,14 @@
- # See above for the things you may need to add here
- #
- #LIBS= $(AUTH_LIBS)			# use this for Linux, BSDI and friends
--LIBS= -lnsl $(AUTH_LIBS)		# use this for SunOS
-+#LIBS= -lnsl $(AUTH_LIBS)		# use this for SunOS
- #LIBS= -lnsl -lsocket $(AUTH_LIBS)	# use this for Solaris 2.x
--#LIBS= -lcrypt $(AUTH_LIBS)		# use this for FreeBSD
-+LIBS= -lcrypt $(AUTH_LIBS)		# use this for FreeBSD
- 
- #       use this for SunOs. Linux, BSDI, FreeBSD
--DBMLIBS= -ldbm
-+#DBMLIBS= -ldbm
- #       use this for Solaris
--#DBMLIBS=
-+DBMLIBS=
- 
- CMN_OBJS=radiusd.o dict.o util.o md5.o attrprint.o filters.o \
- 	 usr_read.o cache.o des.o radipa.o strerror.o
diff --git a/net/ascend-radius/patches/patch-ab b/net/ascend-radius/patches/patch-ab
deleted file mode 100644
index ae43b7bf59c..00000000000
--- a/net/ascend-radius/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- cache.c.orig	Tue Oct 29 14:41:54 1996
-+++ cache.c	Fri Jan 24 05:02:11 1997
-@@ -12,6 +12,10 @@
-  *	FOR A PARTICULAR PURPOSE.
-  */
- 
-+#if defined(_HAVE_PARAM_H)
-+#include	<sys/param.h>
-+#endif
-+
- #include	<sys/types.h>
- #include	<ctype.h>
- #if defined(BSDI) || defined(FreeBSD)
diff --git a/net/ascend-radius/patches/patch-ac b/net/ascend-radius/patches/patch-ac
deleted file mode 100644
index 98b8203fd0b..00000000000
--- a/net/ascend-radius/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- conf.h.orig	Tue Oct 29 14:41:54 1996
-+++ conf.h	Fri Jan 24 05:02:40 1997
-@@ -27,6 +27,10 @@
-  *
-  */
- 
-+#if defined(_HAVE_PARAM_H)
-+#include <sys/param.h>
-+#endif
-+
- #ifndef _conf_h_
- #define _conf_h_
- 
diff --git a/net/ascend-radius/patches/patch-ad b/net/ascend-radius/patches/patch-ad
deleted file mode 100644
index ae358b7f5a2..00000000000
--- a/net/ascend-radius/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
---- radiusd.c.orig	Thu Sep 19 20:20:38 1996
-+++ radiusd.c	Mon Sep 23 21:42:03 1996
-@@ -40,6 +40,10 @@
- static char sccsid[] =
- "@(#)radiusd.c	1.17 Copyright 1992 Livingston Enterprises Inc";
- 
-+#if defined(_HAVE_PARAM_H)
-+#include <sys/param.h>
-+#endif
-+
- #include	<sys/types.h>
- #include	<sys/socket.h>
- #include	<sys/file.h>
-@@ -151,8 +155,10 @@
- #if defined(sys5) || defined(BSDI)
- extern char *crypt P__((CONST char *, CONST char *));
- #else
-+#if ! defined(__FreeBSD__)
- extern char *crypt P__((u_char *, u_char *));
- #endif
-+#endif
- static void insertValuePair P__((VALUE_PAIR** list, VALUE_PAIR* pair));
- static VALUE_PAIR *copyValuePair P__((VALUE_PAIR* source));
- static AUTH_HDR *prepare_send_buffer P__((AUTH_REQ *authreq, int code));
-@@ -1727,7 +1733,8 @@
-      VALUE_PAIR	*checkList;
-      VALUE_PAIR	*replyList;
- {
--	pairfree(authInfo->cutList);
-+	if (authInfo->cutList != authInfo->authreq->request)
-+		pairfree(authInfo->cutList);
- 	authInfo->cutList = (VALUE_PAIR *)0;
- 	pairfree( checkList );
- 	pairfree( replyList );
diff --git a/net/ascend-radius/patches/patch-ae b/net/ascend-radius/patches/patch-ae
deleted file mode 100644
index eb3e1348aca..00000000000
--- a/net/ascend-radius/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- radius.h.orig	Tue Oct 29 14:41:54 1996
-+++ radius.h	Fri Jan 24 05:05:08 1997
-@@ -224,7 +224,7 @@
- 
- /* Default Database File Names */
- 
--#define RADIUS_DIR		"/etc/raddb"
-+#define RADIUS_DIR		"@@PREFIX@@/etc/raddb"
- #ifdef FreeBSD
- #define RADACCT_DIR		"/var/log/radacct"
- #else
diff --git a/net/ascend-radius/patches/patch-af b/net/ascend-radius/patches/patch-af
deleted file mode 100644
index a5d2ca238c2..00000000000
--- a/net/ascend-radius/patches/patch-af
+++ /dev/null
@@ -1,96 +0,0 @@
---- users.c.orig	Thu Sep 19 20:04:29 1996
-+++ users.c	Mon Sep 23 21:44:51 1996
-@@ -30,6 +30,10 @@
- static char sccsid[] =
- "@(#)users.c	1.12 Copyright 1992 Livingston Enterprises Inc";
- 
-+#if defined(_HAVE_PARAM_H)
-+#include	<sys/param.h>
-+#endif
-+
- #include	<sys/types.h>
- #include	<sys/socket.h>
- #include	<sys/time.h>
-@@ -48,18 +52,30 @@
- #	if defined(SOLARIS)
- #		include	</usr/ucbinclude/dbm.h>
- #	else
-+#	if defined(USE_NDBM)
-+#		include <ndbm.h>
-+#	else
- #		include	<dbm.h>
-+#	endif
- #	endif	/* SOLARIS */
- #endif /* DBM_MODE */
- 
- #include	"radius.h"
- #include	"protos.h"
- 
-+#if (defined(BSD) && (BSD>=199306))
-+#include	<fcntl.h>
-+#endif
-+
- extern char		*progname;
- extern int		debug_flag;
- extern char		*radius_dir;
- extern char		*radius_users;
- 
-+#if (defined(DBM_MODE) && defined(USE_NDBM))
-+DBM			*dbp;
-+#endif
-+
- static int parse_record P__((char *name, char *linep,
- 	VALUE_PAIR **check_first, VALUE_PAIR **reply_first));
- extern int user_read P__((FILE **userfd, char *name, char *content));
-@@ -97,7 +113,15 @@
- {
- #if defined(DBM_MODE)
- 	(void)userfd;
-+#if defined(USE_NDBM)
-+	if(!(dbp=dbm_open(infoname, O_RDONLY, NULL))) {
-+		return(-1);
-+	} else {
-+		return(0);
-+	}
-+#else
- 	return dbminit(infoname);
-+#endif
- #else
- 	*userfd = fopen(infoname, "r");
- 	return *userfd == (FILE *)NULL;
-@@ -120,7 +144,11 @@
- {
- #if defined(DBM_MODE)
- 	(void)userfd;
-+#if defined(USE_NDBM)
-+	dbm_close(dbp);
-+#else
- 	dbmclose();
-+#endif
- #else
- 	fclose(userfd);
- #endif
-@@ -210,7 +238,11 @@
- #ifdef DBM_MODE
- 	named.dptr = name;
- 	named.dsize = strlen(name)+1;
-+#if defined(USE_NDBM)
-+	contentd = dbm_fetch(dbp,named);
-+#else
- 	contentd = fetch(named);
-+#endif
- 	if(contentd.dsize != 0) {	/* name found */
- 		*user_data = contentd.dptr;
- 		userinfo_close(userfd);
-@@ -219,7 +251,11 @@
- 
- 	named.dptr = "DEFAULT";
- 	named.dsize = sizeof("DEFAULT");
-+#if defined(USE_NDBM)
-+	contentd = dbm_fetch(dbp,named);
-+#else
- 	contentd = fetch(named);
-+#endif
- 	if(contentd.dsize != 0) {	/* DEFAULT found */
- 		*user_data = contentd.dptr;
- 		userinfo_close(userfd);
diff --git a/net/ascend-radius/patches/patch-ag b/net/ascend-radius/patches/patch-ag
deleted file mode 100644
index 45c7b7d4499..00000000000
--- a/net/ascend-radius/patches/patch-ag
+++ /dev/null
@@ -1,103 +0,0 @@
---- builddbm.c.orig	Wed May 22 20:30:36 1996
-+++ builddbm.c	Mon Sep 23 21:48:02 1996
-@@ -30,6 +30,10 @@
- static char sccsid[] =
- "@(#)builddbm.c	1.4 Copyright 1992 Livingston Enterprises Inc";
- 
-+#if defined(_HAVE_PARAM_H)
-+#include	<sys/param.h>
-+#endif
-+
- #if defined(SOLARIS)
- #       include <sys/uio.h>
- #       include <unistd.h>
-@@ -37,7 +41,11 @@
- #       include <fcntl.h>
- #       include </usr/ucbinclude/dbm.h>
- #else
-+#if defined(USE_NDBM)
-+#	include <ndbm.h>
-+#else
- #       include <dbm.h>
-+#endif
- #endif  /* SOLARIS */
- 
- #include	<sys/types.h>
-@@ -59,8 +67,13 @@
- char		*progname;
- char		*radius_dir;
- char		*radius_users;
-+#if defined(USE_NDBM)
-+char		dbfile[256];
-+DBM		*dbp;
-+#else
- char		pagfile[256];
- char		dirfile[256];
-+#endif
- char		dbmname[256];
- FILE		*userfd;
- FILE		*errf;
-@@ -124,6 +137,20 @@
- 		}
- 	}
- 
-+#if defined(USE_NDBM)
-+	sprintf(dbfile, "%s/%s.db", radius_dir, radius_users);
-+	if((fd = open(dbfile, O_WRONLY | O_CREAT | O_TRUNC, 0600)) < 0) {
-+		fprintf(errf, "%s: Couldn't open %s for writing\n",
-+			progname, dbfile);
-+		exit(-1);
-+	}
-+	close(fd);
-+	sprintf(dbmname, "%s/%s", radius_dir, radius_users);
-+	if(!(dbp=dbm_open(dbmname, O_RDWR | O_CREAT | O_TRUNC, 0600))) {
-+		fprintf(errf, "%s: Couldn't dbm_open(%s)\n",
-+			progname, dbmname);
-+	}
-+#else
- 	sprintf(pagfile, "%s/%s.pag", radius_dir, radius_users);
- 	if((fd = open(pagfile, O_WRONLY | O_CREAT | O_TRUNC, 0600)) < 0) {
- 		fprintf(errf, "%s: Couldn't open %s for writing\n",
-@@ -143,7 +170,7 @@
- 		fprintf(errf, "%s: Couldn't dbminit(%s)\n", progname, dbmname);
- 		exit(-1);
- 	}
--
-+#endif
- 	userfd = (FILE *)NULL;
- 	curParseLine = 0;
- 	while(user_read(&userfd, name, content) == 0) {
-@@ -153,7 +180,11 @@
- 		}
- 		named.dptr = name;
- 		named.dsize = strlen(name)+1;
-+#if defined(USE_NDBM)
-+		contentd = dbm_fetch(dbp,named);
-+#else
- 		contentd = fetch(named);
-+#endif
- 		if(contentd.dsize != 0) {	/* name found */
- 			warn("Skipping duplicate record\n\tfor user '%s'", name);
- 			continue;
-@@ -162,13 +193,21 @@
- 		named.dsize = strlen(name)+1;
- 		contentd.dptr = content;
- 		contentd.dsize = strlen(content)+1;
-+#if defined(USE_NDBM)
-+		if(dbm_store(dbp, named, contentd, DBM_INSERT) < 0) {
-+#else
- 		if(store(named, contentd) != 0) {
-+#endif
- 			fprintf(errf, "%s: Couldn't store datum for %s\n",
- 				progname, name);
- 			exit(-1);
- 		}
- 	}
-+#if defined(USE_NDBM)
-+	dbm_close(dbp);
-+#else
- 	dbmclose();
-+#endif
- 	exit(0);
- }
- 
diff --git a/net/ascend-radius/patches/patch-ah b/net/ascend-radius/patches/patch-ah
deleted file mode 100644
index 2900533fe27..00000000000
--- a/net/ascend-radius/patches/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Mon Nov 10 17:06:23 1997
-+++ Makefile	Mon Nov 10 17:06:38 1997
-@@ -152,7 +152,7 @@
- #LIBS= $(AUTH_LIBS)			# use this for Linux, BSDI and friends
- #LIBS= -lnsl $(AUTH_LIBS)		# use this for SunOS
- #LIBS= -lnsl -lsocket $(AUTH_LIBS)	# use this for Solaris 2.x
--LIBS= -lcrypt $(AUTH_LIBS)		# use this for FreeBSD
-+#LIBS= -lcrypt $(AUTH_LIBS)		# use this for FreeBSD
- 
- #       use this for SunOs. Linux, BSDI, FreeBSD
- #DBMLIBS= -ldbm
diff --git a/net/ascend-radius/patches/patch-ai b/net/ascend-radius/patches/patch-ai
deleted file mode 100644
index a13be6bf649..00000000000
--- a/net/ascend-radius/patches/patch-ai
+++ /dev/null
@@ -1,53 +0,0 @@
---- radipad.c.orig	Thu Jan 29 22:57:40 1998
-+++ radipad.c	Thu Jan 29 23:00:19 1998
-@@ -164,10 +164,10 @@
- void inform (); /* varargs */
- void debug (); /* varargs */
- #endif
--void error_stdio P__((int error_number, char CONST *format, void *args));
--void error_syslog P__((int error_number, char CONST *format, void *args));
--void inform_stdio P__((char CONST *format, void *args));
--void inform_syslog P__((char CONST *format, void *args));
-+void error_stdio P__((int error_number, char CONST *format, va_list args));
-+void error_syslog P__((int error_number, char CONST *format, va_list args));
-+void inform_stdio P__((char CONST *format, va_list args));
-+void inform_syslog P__((char CONST *format, va_list args));
- void prefix_date_time P__((FILE *stream));
- 
- #define PAGE_LENGTH 1024
-@@ -1381,7 +1381,7 @@
- error_stdio (error_number, format, args)
-      int error_number;
-      char CONST *format;
--     void *args;
-+     va_list args;
- {
-   fflush (stdout);
-   prefix_date_time (stderr);
-@@ -1396,7 +1396,7 @@
- error_syslog (error_number, format, args)
-      int error_number;
-      char CONST *format;
--     void *args;
-+     va_list args;
- {
-   char format_buf[BUFSIZ];
-   if (error_number)
-@@ -1434,7 +1434,7 @@
- void
- inform_stdio (format, args)
-      char CONST *format;
--     void *args;
-+     va_list args;
- {
-   fflush (stderr);
-   prefix_date_time (stdout);
-@@ -1446,7 +1446,7 @@
- void
- inform_syslog (format, args)
-      char CONST *format;
--     void *args;
-+     va_list args;
- {
-   vsyslog (LOG_INFO, format, args);
- }
diff --git a/net/ascend-radius/pkg/COMMENT b/net/ascend-radius/pkg/COMMENT
deleted file mode 100644
index 2ec1e09d044..00000000000
--- a/net/ascend-radius/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Ascend modified Radius Daemon
\ No newline at end of file
diff --git a/net/ascend-radius/pkg/DESCR b/net/ascend-radius/pkg/DESCR
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/net/ascend-radius/pkg/PLIST b/net/ascend-radius/pkg/PLIST
deleted file mode 100644
index 9d8d949e0db..00000000000
--- a/net/ascend-radius/pkg/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-sbin/radiusd
-sbin/radiusd.dbm
-sbin/builddbm
-man/man1/users-file-syntax.1
-man/man1/builddbm.1
-share/doc/ascend-radius/ascend.doc
-share/doc/ascend-radius/draft-ietf-radius-accounting-01.txt
-share/doc/ascend-radius/draft-ietf-radius-radius-03.txt
-share/doc/ascend-radius/draft-ietf-radius-radius-04.txt
-share/doc/ascend-radius/ChangeLog
-share/doc/ascend-radius/README
-share/doc/ascend-radius/README.cexample
-share/doc/ascend-radius/README.dict
-share/doc/ascend-radius/radius.ps
-share/doc/ascend-radius/radius.pdf
-share/doc/ascend-radius/rradius.ps
-share/doc/ascend-radius/rradius.pdf
-etc/raddb/clients.example
-etc/raddb/dictionary
-etc/raddb/users.example
-@dirrm share/doc/ascend-radius
-@dirrm etc/raddb
diff --git a/net/ascend-radius/scripts/configure b/net/ascend-radius/scripts/configure
deleted file mode 100644
index 5adf036a513..00000000000
--- a/net/ascend-radius/scripts/configure
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cd $WRKSRC || exit 1
-
-cp radius.h radius.h.old
-sed -e "s:@@PREFIX@@:$PREFIX:g" < radius.h.old > radius.h
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 89385035a76..b6bf35497f0 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -3,12 +3,13 @@
 # Date created:		21 Nov 1997
 # Whom:			joey
 #
-# $OpenBSD: Makefile,v 1.1.1.1 1997/11/22 23:57:31 joey Exp $
+# $OpenBSD: Makefile,v 1.2 1998/04/12 04:29:29 marc Exp $
 #
 
 DISTNAME=       gated-3-5-7
 PKGNAME=        gated-3.5.7
 CATEGORIES=	net
+NO_CDROM=	"LIC: requires licence for redistribution"
 MASTER_SITES=   ftp://ftp.gated.merit.edu/net-research/gated/
 
 MAINTAINER=	joey@OpenBSD.ORG