This commit was manufactured by cvs2svn to create tag 'RELEASE_4_2_0'.release/4.2.0

author: cvs2svn <cvs2svn@FreeBSD.org> 2000-11-17 12:19:22 +0000
committer: cvs2svn <cvs2svn@FreeBSD.org> 2000-11-17 12:19:22 +0000
commit: d615f4ca564f838b39bd8b504a3107011d951a03 (patch)
tree: d799b77773a040bd9f634696266507c9072dd071 /net
parent: Remove do-package target that was running "make package" in (diff)
533 files changed, 0 insertions, 23538 deletions
diff --git a/net/arpwatch-devel/Makefile b/net/arpwatch-devel/Makefile
deleted file mode 100644
index c1f97ba715e3..000000000000
--- a/net/arpwatch-devel/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:    arpwatch
-# Date created:         March 24 1997
-# Whom:                 Brian Somers <brian@Awfulhak.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	arpwatch
-PORTVERSION=	2.1.a6
-CATEGORIES=	net
-MASTER_SITES=	http://www.Awfulhak.org/arpwatch/ \
-		ftp://ftp.ee.lbl.gov/ \
-		ftp://ftp.cso.uiuc.edu/pub/security/coast/unix/arpwatch/
-DISTNAME=	arpwatch-2.1a6
-
-MAINTAINER=	brian@Awfulhak.org
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--quiet
-INSTALL_TARGET=	install install-man
-MAN8=		arpwatch.8 arpsnmp.8
-
-post-install:
-	if [ ! -d ${PREFIX}/arpwatch ]; then				\
-		${MKDIR} ${PREFIX}/arpwatch;				\
-		${CHMOD} 775 ${PREFIX}/arpwatch;				\
-		${CHOWN} root.operator ${PREFIX}/arpwatch;			\
-	fi
-	${TOUCH} ${PREFIX}/arpwatch/arp.dat
-	${CHMOD} 644 ${PREFIX}/arpwatch/arp.dat
-	for file in ethercodes.dat d.awk e.awk p.awk; do		\
-		${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/arpwatch/.;	\
-	done
-	${INSTALL_SCRIPT} ${WRKSRC}/arp2ethers ${PREFIX}/arpwatch/.
-	${INSTALL_SCRIPT} ${FILESDIR}/arpwatch.sh ${PREFIX}/etc/rc.d/.
-
-.include <bsd.port.mk>
diff --git a/net/arpwatch-devel/distinfo b/net/arpwatch-devel/distinfo
deleted file mode 100644
index 800463b2e05d..000000000000
--- a/net/arpwatch-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (arpwatch-2.1a6.tar.gz) = fe729b12e8e54133cf24695e4a382952
diff --git a/net/arpwatch-devel/files/arpwatch.sh b/net/arpwatch-devel/files/arpwatch.sh
deleted file mode 100644
index f0c8a797cb54..000000000000
--- a/net/arpwatch-devel/files/arpwatch.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-case $1 in
-start)
-	if [ -x /usr/local/sbin/arpwatch -a -d /usr/local/arpwatch ]; then
-		/usr/local/sbin/arpwatch && echo -n ' arpwatch'
-	fi
-	;;
-stop)
-	killall arpwatch && echo -n ' arpwatch'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/net/arpwatch-devel/files/patch-aa b/net/arpwatch-devel/files/patch-aa
deleted file mode 100644
index c3d51dd3fa46..000000000000
--- a/net/arpwatch-devel/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- arp2ethers.orig	Tue Mar 29 11:44:52 1994
-+++ arp2ethers	Fri Aug 21 10:56:26 1998
-@@ -14,7 +14,7 @@
- #
- 
- sort +2rn arp.dat | \
--    awk -e 'NF == 4 { print }' | \
-+    awk 'NF == 4 { print }' | \
-     awk -f p.awk | \
-     egrep -v '\.[0-9][0-9]*$' | \
-     sed -e 's/	.*	/	/' | \
diff --git a/net/arpwatch-devel/files/patch-ab b/net/arpwatch-devel/files/patch-ab
deleted file mode 100644
index 76cbc814dfaf..000000000000
--- a/net/arpwatch-devel/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Wed Jul 29 06:16:45 1998
-+++ Makefile.in	Fri Aug 21 10:57:51 1998
-@@ -44,7 +44,7 @@
- CC = @CC@
- CCOPT = @V_CCOPT@
- INCLS = -I. @V_INCLS@
--DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
-+DEFS = @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
- 
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
-@@ -109,8 +109,8 @@
- 	$(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil
- 
- install: force
--	$(INSTALL) -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST)
--	$(INSTALL) -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST)
-+	$(INSTALL) -s -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST)
-+	$(INSTALL) -s -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST)
- 
- install-man: force
- 	$(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \
diff --git a/net/arpwatch-devel/files/patch-ad b/net/arpwatch-devel/files/patch-ad
deleted file mode 100644
index 02096d9d63bf..000000000000
--- a/net/arpwatch-devel/files/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
---- report.c.orig	Fri Jun  9 09:54:48 2000
-+++ report.c	Fri Jun  9 10:05:58 2000
-@@ -249,6 +249,9 @@
- 	char *unknown = "<unknown>";
- 	char buf[132];
- 	static int init = 0;
-+#ifdef HAVE_MKSTEMP
-+	int fd;
-+#endif
- 
- 	/* No report until we're initialized */
- 	if (initializing)
-@@ -286,8 +289,16 @@
- 		/* Child */
- 		closelog();
- 		(void)strcpy(tempfile, "/tmp/arpwatch.XXXXXX");
-+#ifndef HAVE_MKSTEMP
- 		(void)mktemp(tempfile);
- 		if ((f = fopen(tempfile, "w+")) == NULL) {
-+#else
-+		if ((fd = mkstemp(tempfile)) == -1) {
-+			syslog(LOG_ERR, "child mkstemp(%s): %m", tempfile);
-+			exit(1);
-+		}
-+		if ((f = fdopen(fd, "w+")) == NULL) {
-+#endif /* HAVE_MKSTEMP */
- 			syslog(LOG_ERR, "child open(%s): %m", tempfile);
- 			exit(1);
- 		}
diff --git a/net/arpwatch-devel/files/patch-ae b/net/arpwatch-devel/files/patch-ae
deleted file mode 100644
index c02ef28aded2..000000000000
--- a/net/arpwatch-devel/files/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Thu Jun 15 01:37:53 2000
-+++ configure	Tue Sep  5 02:57:33 2000
-@@ -649,7 +649,7 @@
-   :
- fi
- 
--    V_CCOPT="-O"
-+#    V_CCOPT="-O"
-     V_INCLS=""
-     if test "${srcdir}" != "." ; then
- 	    V_INCLS="-I\$\(srcdir\)"
-@@ -1207,7 +1207,7 @@
- fi
- 
- 
--for ac_func in dn_skipname
-+for ac_func in dn_skipname mkstemp
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:1214: checking for $ac_func" >&5
-@@ -2599,7 +2599,7 @@
- 		    fi
- 		    V_CCOPT="$V_CCOPT -Wall"
- 		    if test $ac_cv_lbl_gcc_vers -gt 1 ; then
--			    V_CCOPT="$V_CCOPT -Wmissing-prototypes -Wstrict-prototypes"
-+#			    V_CCOPT="$V_CCOPT -Wmissing-prototypes -Wstrict-prototypes"
- 		    fi
- 	    fi
-     else
diff --git a/net/arpwatch-devel/files/patch-af b/net/arpwatch-devel/files/patch-af
deleted file mode 100644
index 0beb9378c27a..000000000000
--- a/net/arpwatch-devel/files/patch-af
+++ /dev/null
@@ -1,8 +0,0 @@
---- ethercodes.dat.orig	Tue Mar 21 02:37:05 2000
-+++ ethercodes.dat	Thu Sep 14 11:18:09 2000
-@@ -897,3 +897,5 @@
- c0:0:0	Western Digital (may be reversed 00 00 C0?)
- e2:c:f	Kingston Technologies
- ec:10:0	Enance Source Co., Ltd.	PC clones(?)
-+0:bd:11	VMWare Inc
-+0:bd:fb	VMWare Inc
diff --git a/net/arpwatch-devel/pkg-comment b/net/arpwatch-devel/pkg-comment
deleted file mode 100644
index 73ccdb9c117c..000000000000
--- a/net/arpwatch-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Monitor arp & rarp requests
diff --git a/net/arpwatch-devel/pkg-descr b/net/arpwatch-devel/pkg-descr
deleted file mode 100644
index 602ba152b2db..000000000000
--- a/net/arpwatch-devel/pkg-descr
+++ /dev/null
@@ -1,33 +0,0 @@
-Maintained under FreeBSD by: brian@awfulhak.org
-
-ARPWATCH 2.0
-Lawrence Berkeley National Laboratory
-Network Research Group
-arpwatch@ee.lbl.gov
-ftp://ftp.ee.lbl.gov/arpwatch.tar.Z
-
-This directory contains source code for arpwatch and arpsnmp, tools
-that monitors ethernet activity and maintain a database of ethernet/ip
-address pairings. It also reports certain changes via email.
-
-Arpwatch uses libpcap, a system-independent interface for user-level
-packet capture.  Before building arpwatch, you must first retrieve and
-build libpcap, also from LBL, in:
-
-	ftp://ftp.ee.lbl.gov/libpcap.tar.Z.
-
-Once libpcap is built (either install it or make sure arpwatch and
-libpcap share the same parent directory), you can build arpwatch using
-the procedure in the INSTALL file.
-
-Arpsnmp has the same database features of arpwatch but relies on an
-external agent to collect the arp data. This distribution contains a
-script, arpfetch, that uses snmpwalk from the CMU SNMP package. This
-package is available from:
-
-	ftp://ftp.net.cmu.edu/pub/snmp-dist/cmu-snmp*.tar.Z
-
-It should be trivial to adaptive the output of any snmp query program
-for use with arpsnmp.
-
-Please send bugs and comments to arpwatch@ee.lbl.gov.
diff --git a/net/arpwatch-devel/pkg-plist b/net/arpwatch-devel/pkg-plist
deleted file mode 100644
index 2d3d476f15f1..000000000000
--- a/net/arpwatch-devel/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-sbin/arpwatch
-sbin/arpsnmp
-@unexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat
-arpwatch/arp2ethers
-arpwatch/ethercodes.dat
-arpwatch/d.awk
-arpwatch/e.awk
-arpwatch/p.awk
-etc/rc.d/arpwatch.sh
-@dirrm arpwatch
diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
deleted file mode 100644
index db143689ef04..000000000000
--- a/net/ayttm/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	everybuddy
-# Date created:			1 Mar 2000
-# Whom:				Jim Mock <jim@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	everybuddy
-PORTVERSION=	0.1.5
-CATEGORIES=	net
-MASTER_SITES=	http://www.everybuddy.com/files/
-
-MAINTAINER=	jim@FreeBSD.org
-
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GTK=	yes
-GNU_CONFIGURE=	yes
-
-MAN1=		everybuddy.1
-
-.include <bsd.port.mk>
diff --git a/net/ayttm/distinfo b/net/ayttm/distinfo
deleted file mode 100644
index fb4ff64545e5..000000000000
--- a/net/ayttm/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (everybuddy-0.1.5.tar.gz) = dc3028a15b00177fc6d0f39d01ec5e2d
diff --git a/net/ayttm/files/patch-aa b/net/ayttm/files/patch-aa
deleted file mode 100644
index 6e88a42c1026..000000000000
--- a/net/ayttm/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure	Sun Nov 12 20:26:46 2000
-+++ configure.orig	Mon Nov 13 22:26:38 2000
-@@ -2407,10 +2407,10 @@
- CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include" 
- 
- EB_CFLAGS="$CFLAGS -I../"
--EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -lpthread -L../libicq -licq"
-+EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -pthread -L../libicq -licq"
- EB_LDADD="$LDADD"
- 
--EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g "
-+EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall"
- # Check whether --with-esd-prefix or --without-esd-prefix was given.
- if test "${with_esd_prefix+set}" = set; then
-   withval="$with_esd_prefix"
diff --git a/net/ayttm/files/patch-ac b/net/ayttm/files/patch-ac
deleted file mode 100644
index 68d436567d4f..000000000000
--- a/net/ayttm/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/main.c.orig	Mon Nov 13 22:28:40 2000
-+++ src/main.c	Mon Nov 13 22:29:36 2000
-@@ -166,6 +166,7 @@
-     } 
- 
- #endif
-+	gtk_set_locale ();
- 	g_snprintf(buff, 1024, "%s/.everybuddy",getenv("HOME"));
- 	services_init();
- 		
diff --git a/net/ayttm/files/patch-ae b/net/ayttm/files/patch-ae
deleted file mode 100644
index 0079b278ac7a..000000000000
--- a/net/ayttm/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.am.orig	Sun Oct 15 13:46:35 2000
-+++ Makefile.am	Sun Oct 15 13:46:52 2000
-@@ -1,8 +1,8 @@
- SUBDIRS = pixmaps m4 libproxy libtoc libicq libyahoo libmsn sounds doc src 
- ACLOCAL_AMFLAGS = -I m4
- 
--Utilitiesdir = /etc/X11/applnk/Internet
--Utilities_DATA = Everybuddy.desktop
-+Utilitiesdir = 
-+Utilities_DATA = 
- 
- 
--EXTRA_DIST = Everybuddy.desktop 
-+EXTRA_DIST = 
diff --git a/net/ayttm/files/patch-af b/net/ayttm/files/patch-af
deleted file mode 100644
index f818a6acca79..000000000000
--- a/net/ayttm/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/config.sh.in.orig	Mon Nov 13 22:35:30 2000
-+++ src/config.sh.in	Mon Nov 13 22:36:18 2000
-@@ -1,6 +1,6 @@
- #!/bin/sh
- rm config.h 2>&1 > /dev/null
--echo \#define BuddyArriveDefault \"@prefix@/share/sounds/everybuddy/BuddyArrive.au\" >> config.h
--echo \#define BuddyLeaveDefault \"@prefix@/share/sounds/everybuddy/BuddyLeave.au\" >> config.h
--echo \#define SendDefault \"@prefix@/share/sounds/everybuddy/Send.au\" >> config.h
--echo \#define RecieveDefault \"@prefix@/share/sounds/everybuddy/Receive.au\" >> config.h
-+echo \#define BuddyArriveDefault \"@datadir@/sounds/everybuddy/BuddyArrive.au\" >> config.h
-+echo \#define BuddyLeaveDefault \"@datadir@/sounds/everybuddy/BuddyLeave.au\" >> config.h
-+echo \#define SendDefault \"@datadir@/sounds/everybuddy/Send.au\" >> config.h
-+echo \#define RecieveDefault \"@datadir@/sounds/everybuddy/Receive.au\" >> config.h
diff --git a/net/ayttm/files/patch-ag b/net/ayttm/files/patch-ag
deleted file mode 100644
index 8c3ec84fbadf..000000000000
--- a/net/ayttm/files/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
---- pixmaps/Makefile.am.orig	Mon Nov 13 22:33:30 2000
-+++ pixmaps/Makefile.am	Mon Nov 13 22:33:40 2000
-@@ -4,5 +4,5 @@
- 	login_icon.xpm logoff_icon.xpm yahoo_away.xpm yahoo_online.xpm \
- 	icq_online.xpm icq_away.xpm aim_online.xpm aim_away.xpm \
- 	msn_online.xpm msn_away.xpm tb_mail_send.xpm tb_search.xpm
--Utilitiesdir = $(datadir)/pixmaps
--Utilities_DATA = ebicon.xpm 
-+Utilitiesdir = 
-+Utilities_DATA = 
diff --git a/net/ayttm/pkg-comment b/net/ayttm/pkg-comment
deleted file mode 100644
index 008ed1484b41..000000000000
--- a/net/ayttm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
diff --git a/net/ayttm/pkg-descr b/net/ayttm/pkg-descr
deleted file mode 100644
index 0451ea2b1ea6..000000000000
--- a/net/ayttm/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Everybuddy is a chat application that "combines" several different ones
-including AIM, ICQ, and Yahoo! Chat.  It also has file transfers between
-other Everybuddy users, and planned support for file transfers to other
-users.
-
-WWW: http://www.everybuddy.com/
-
-- jim <jim@FreeBSD.org>
diff --git a/net/ayttm/pkg-plist b/net/ayttm/pkg-plist
deleted file mode 100644
index 8b4d9455fd85..000000000000
--- a/net/ayttm/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/everybuddy
-bin/update.pl
-bin/contact-update.pl
-share/sounds/everybuddy/BuddyArrive.au
-share/sounds/everybuddy/BuddyLeave.au
-share/sounds/everybuddy/Send.au
-share/sounds/everybuddy/Receive.au
-@dirrm share/sounds/everybuddy
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
deleted file mode 100644
index 07edcab5ef65..000000000000
--- a/net/citrix_xenapp/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	Citrix(R) ICA(R) Client
-# Date created:         20 Sep 1998
-# Whom:                 msmith
-#
-# $FreeBSD$
-#
-
-PORTNAME=	citrix_ica
-PORTVERSION=	3.0.15
-CATEGORIES=	net comms linux
-MASTER_SITES=  
-DISTNAME=	linux
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER=     msmith@FreeBSD.org
-
-RUN_DEPENDS=    /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS=	i386
-RESTRICTED=	"License prohibits redistribution"
-IS_INTERACTIVE=	"Noisy license agreement ignores stdin"
-
-DIST_SUBDIR=	citrix_ica
-NO_WRKSUBDIR=	Yes
-NO_BUILD=       Yes
-
-CDIR=           ${PREFIX}/lib/ICAClient
-BINDIR=		${PREFIX}/bin
-
-.include <bsd.port.pre.mk>
-
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.  You MUST fetch the file manually after reading and agreeing to the license at: http://download.citrix.com/download.asp?client=LINUX   Once ${DISTFILES} has been downloaded, move it to ${DISTDIR}/${DIST_SUBDIR} and then restart this build.'
-.endif
-
-do-install:
-	${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/response \
-		> ${WRKSRC}/response
-	${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \
-		> ${WRKSRC}/wfcmgr.x
-	${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \
-		> ${WRKSRC}/wfica.x
-	cd ${WRKSRC} && ./setupwfc < response
-	${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr
-	${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica
-
-.include <bsd.port.post.mk>
diff --git a/net/citrix_xenapp/distinfo b/net/citrix_xenapp/distinfo
deleted file mode 100644
index 63c68dee24b1..000000000000
--- a/net/citrix_xenapp/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (citrix_ica/linux.tar.Z) = 2317de797885c3702e49314f3de07499
diff --git a/net/citrix_xenapp/files/patch-aa b/net/citrix_xenapp/files/patch-aa
deleted file mode 100644
index 12f5865300e8..000000000000
--- a/net/citrix_xenapp/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** setupwfc.orig	Fri Jan 14 12:53:13 2000
---- setupwfc	Fri Mar 10 13:03:43 2000
-***************
-*** 344,350 ****
-  		PLATFORM=hp
-  		DISP_PLATFORM="Hewlett-Packard (HP-UX)"
-  		;;
-! 	Linux)
-                 # We assume that an Intel-based linux system will have an x86
-                 # processor. We also assume that this is reported by uname -m
-                 # "ix86" where x is some number.
---- 344,350 ----
-  		PLATFORM=hp
-  		DISP_PLATFORM="Hewlett-Packard (HP-UX)"
-  		;;
-! 	Linux|FreeBSD)
-                 # We assume that an Intel-based linux system will have an x86
-                 # processor. We also assume that this is reported by uname -m
-                 # "ix86" where x is some number.
diff --git a/net/citrix_xenapp/files/patch-ab b/net/citrix_xenapp/files/patch-ab
deleted file mode 100644
index 220feeff6e0e..000000000000
--- a/net/citrix_xenapp/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../original/linux/hinst	Wed Sep  9 05:58:37 1998
-+++ linux/hinst	Mon Sep 21 01:47:58 1998
-@@ -714,13 +714,13 @@
- 		echo_no_nl $calcspace3
- 		read dummy
- 
--		/bin/false
-+		/usr/bin/false
- 		return 
- 	fi
- 
- 	$ECHO_CMD $calcspace4
- 
--	/bin/true
-+	/usr/bin/true
- 	return
- }
- #!/bin/sh
diff --git a/net/citrix_xenapp/files/response b/net/citrix_xenapp/files/response
deleted file mode 100644
index 5b78380d06a6..000000000000
--- a/net/citrix_xenapp/files/response
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-DESTINATION
-y
-y
-3
diff --git a/net/citrix_xenapp/files/wfcmgr b/net/citrix_xenapp/files/wfcmgr
deleted file mode 100644
index 70248171d687..000000000000
--- a/net/citrix_xenapp/files/wfcmgr
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export ICAROOT=DESTINATION
-exec $ICAROOT/wfcmgr
diff --git a/net/citrix_xenapp/files/wfica b/net/citrix_xenapp/files/wfica
deleted file mode 100644
index 35be9df3a8b2..000000000000
--- a/net/citrix_xenapp/files/wfica
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export ICAROOT=DESTINATION
-exec $ICAROOT/wfica
diff --git a/net/citrix_xenapp/pkg-comment b/net/citrix_xenapp/pkg-comment
deleted file mode 100644
index 70d23f88a95f..000000000000
--- a/net/citrix_xenapp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Citrix(R) client for the Microsoft Windows Terminal Server
diff --git a/net/citrix_xenapp/pkg-descr b/net/citrix_xenapp/pkg-descr
deleted file mode 100644
index 35b3b42ba57d..000000000000
--- a/net/citrix_xenapp/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Citrix(R) MetaFrame(TM) is thin-client/server system software for
-Microsoft's Windows NT Server 4.0, Terminal Server Edition.
-MetaFrame(TM) delivers a comprehensive thin-client/server solution to
-the enterprise by extending Windows Terminal Server with additional
-client and server functionality - including support for heterogeneous
-computing environments, enterprise-scale management and seamless
-desktop integration. MetaFrame(TM) transforms the way organizations
-deploy, manage and access business applications by providing improved
-application manageability, access, performance and security. Citrix(R)
-MetaFrame(TM) system software, which incorporates Citrix's Independent
-Computing Architecture (ICA)(R), provides a complete
-thin-client/server computing solution for multi-user NT 4.0
-environments.
-
-WWW: http://www.citrix.com/products/metaframe.asp
diff --git a/net/citrix_xenapp/pkg-plist b/net/citrix_xenapp/pkg-plist
deleted file mode 100644
index 42f4157703c7..000000000000
--- a/net/citrix_xenapp/pkg-plist
+++ /dev/null
@@ -1,212 +0,0 @@
-bin/wfcmgr
-bin/wfica
-lib/ICAClient/Wfcmgr
-lib/ICAClient/Wfica
-lib/ICAClient/Wfcmgr.ad
-lib/ICAClient/Wfica.ad
-lib/ICAClient/eula.txt
-lib/ICAClient/install.txt
-lib/ICAClient/readme.txt
-lib/ICAClient/setupwfc
-lib/ICAClient/wfcmgr
-lib/ICAClient/wfica
-lib/ICAClient/.config/appsrv.ini
-lib/ICAClient/.config/keyboard.ini
-lib/ICAClient/.config/module.ini
-lib/ICAClient/.config/wfclient.ini
-lib/ICAClient/config/.server
-lib/ICAClient/config/appsrv.ini
-lib/ICAClient/config/module.ini
-lib/ICAClient/config/wfclient.ini
-lib/ICAClient/help/1a.gif
-lib/ICAClient/help/3a.gif
-lib/ICAClient/help/3b.gif
-lib/ICAClient/help/3c.gif
-lib/ICAClient/help/3d.gif
-lib/ICAClient/help/3f.gif
-lib/ICAClient/help/3g.gif
-lib/ICAClient/help/3h.gif
-lib/ICAClient/help/3i.gif
-lib/ICAClient/help/3l.gif
-lib/ICAClient/help/3m.gif
-lib/ICAClient/help/3n.gif
-lib/ICAClient/help/3o.gif
-lib/ICAClient/help/3p.gif
-lib/ICAClient/help/3q.gif
-lib/ICAClient/help/3r.gif
-lib/ICAClient/help/3s.gif
-lib/ICAClient/help/3t.gif
-lib/ICAClient/help/3u.gif
-lib/ICAClient/help/3v.gif
-lib/ICAClient/help/3w.gif
-lib/ICAClient/help/3x.gif
-lib/ICAClient/help/3y.gif
-lib/ICAClient/help/4a.gif
-lib/ICAClient/help/4b.gif
-lib/ICAClient/help/4c.gif
-lib/ICAClient/help/4d.gif
-lib/ICAClient/help/4e.gif
-lib/ICAClient/help/4f.gif
-lib/ICAClient/help/4g.gif
-lib/ICAClient/help/4h.gif
-lib/ICAClient/help/4i.gif
-lib/ICAClient/help/4k.gif
-lib/ICAClient/help/DIGITAL.gif
-lib/ICAClient/help/HP.gif
-lib/ICAClient/help/IBM.gif
-lib/ICAClient/help/LINUX.gif
-lib/ICAClient/help/SCO.gif
-lib/ICAClient/help/SG.gif
-lib/ICAClient/help/SPARC.gif
-lib/ICAClient/help/contents.gif
-lib/ICAClient/help/contents.htm
-lib/ICAClient/help/ctx00001.htm
-lib/ICAClient/help/ctx00002.htm
-lib/ICAClient/help/ctx00003.htm
-lib/ICAClient/help/ctx00004.htm
-lib/ICAClient/help/ctx00005.htm
-lib/ICAClient/help/ctx00006.htm
-lib/ICAClient/help/ctx00007.htm
-lib/ICAClient/help/ctx00008.htm
-lib/ICAClient/help/ctx00009.htm
-lib/ICAClient/help/ctx00010.htm
-lib/ICAClient/help/ctx00011.htm
-lib/ICAClient/help/ctx00012.htm
-lib/ICAClient/help/ctx00013.htm
-lib/ICAClient/help/ctx00014.htm
-lib/ICAClient/help/ctx00015.htm
-lib/ICAClient/help/ctx00016.htm
-lib/ICAClient/help/ctx00017.htm
-lib/ICAClient/help/ctx00018.htm
-lib/ICAClient/help/ctx00019.htm
-lib/ICAClient/help/ctx00020.htm
-lib/ICAClient/help/ctx00021.htm
-lib/ICAClient/help/ctx00022.htm
-lib/ICAClient/help/ctx00023.htm
-lib/ICAClient/help/ctx00024.htm
-lib/ICAClient/help/ctx00025.htm
-lib/ICAClient/help/ctx00026.htm
-lib/ICAClient/help/ctx00027.htm
-lib/ICAClient/help/ctx00028.htm
-lib/ICAClient/help/ctx00029.htm
-lib/ICAClient/help/ctx00030.htm
-lib/ICAClient/help/ctx00031.htm
-lib/ICAClient/help/ctx00032.htm
-lib/ICAClient/help/ctx00033.htm
-lib/ICAClient/help/ctx00034.htm
-lib/ICAClient/help/ctx00035.htm
-lib/ICAClient/help/ctx00036.htm
-lib/ICAClient/help/ctx00037.htm
-lib/ICAClient/help/ctx00038.htm
-lib/ICAClient/help/ctx00039.htm
-lib/ICAClient/help/ctx00195.htm
-lib/ICAClient/help/ctx00197.htm
-lib/ICAClient/help/ctx00198.htm
-lib/ICAClient/help/ctx00199.htm
-lib/ICAClient/help/ctx00295.htm
-lib/ICAClient/help/index.gif
-lib/ICAClient/help/index.htm
-lib/ICAClient/help/index_a.gif
-lib/ICAClient/help/index_b.gif
-lib/ICAClient/help/index_c.gif
-lib/ICAClient/help/index_d.gif
-lib/ICAClient/help/index_e.gif
-lib/ICAClient/help/index_f.gif
-lib/ICAClient/help/index_g.gif
-lib/ICAClient/help/index_h.gif
-lib/ICAClient/help/index_i.gif
-lib/ICAClient/help/index_j.gif
-lib/ICAClient/help/index_k.gif
-lib/ICAClient/help/index_l.gif
-lib/ICAClient/help/index_m.gif
-lib/ICAClient/help/index_n.gif
-lib/ICAClient/help/index_o.gif
-lib/ICAClient/help/index_p.gif
-lib/ICAClient/help/index_q.gif
-lib/ICAClient/help/index_r.gif
-lib/ICAClient/help/index_s.gif
-lib/ICAClient/help/index_t.gif
-lib/ICAClient/help/index_u.gif
-lib/ICAClient/help/index_v.gif
-lib/ICAClient/help/index_w.gif
-lib/ICAClient/help/index_x.gif
-lib/ICAClient/help/index_y.gif
-lib/ICAClient/help/index_z.gif
-lib/ICAClient/help/next0.gif
-lib/ICAClient/help/next1.gif
-lib/ICAClient/help/prev0.gif
-lib/ICAClient/help/prev1.gif
-lib/ICAClient/help/prop_conn.gif
-lib/ICAClient/help/sett_cache.gif
-lib/ICAClient/help/sett_cdm.gif
-lib/ICAClient/keyboard/age2.kbd
-lib/ICAClient/keyboard/agex2.kbd
-lib/ICAClient/keyboard/automatic.kbd
-lib/ICAClient/keyboard/dcint401.kbd
-lib/ICAClient/keyboard/dcintpcx.kbd
-lib/ICAClient/keyboard/dcus401.kbd
-lib/ICAClient/keyboard/dcuspcx.kbd
-lib/ICAClient/keyboard/dec401.kbd
-lib/ICAClient/keyboard/dec401uk.kbd
-lib/ICAClient/keyboard/decpcx.kbd
-lib/ICAClient/keyboard/decpcxuk.kbd
-lib/ICAClient/keyboard/dg.kbd
-lib/ICAClient/keyboard/dgfr.kbd
-lib/ICAClient/keyboard/dggr.kbd
-lib/ICAClient/keyboard/dguk.kbd
-lib/ICAClient/keyboard/dgus.kbd
-lib/ICAClient/keyboard/hp101.kbd
-lib/ICAClient/keyboard/hpfritf.kbd
-lib/ICAClient/keyboard/hpgritf.kbd
-lib/ICAClient/keyboard/hpint101.kbd
-lib/ICAClient/keyboard/hpintps2.kbd
-lib/ICAClient/keyboard/hpitf.kbd
-lib/ICAClient/keyboard/hpps2.kbd
-lib/ICAClient/keyboard/hpuk101.kbd
-lib/ICAClient/keyboard/hpukitf.kbd
-lib/ICAClient/keyboard/hpukps2.kbd
-lib/ICAClient/keyboard/hpus101.kbd
-lib/ICAClient/keyboard/hpusitf.kbd
-lib/ICAClient/keyboard/hpusps2.kbd
-lib/ICAClient/keyboard/ibm.kbd
-lib/ICAClient/keyboard/keyboard.ini
-lib/ICAClient/keyboard/linux.kbd
-lib/ICAClient/keyboard/mac101.kbd
-lib/ICAClient/keyboard/ncdn-101.kbd
-lib/ICAClient/keyboard/ncdn-102.kbd
-lib/ICAClient/keyboard/scoos5.kbd
-lib/ICAClient/keyboard/scouw2.kbd
-lib/ICAClient/keyboard/sg.kbd
-lib/ICAClient/keyboard/sgindy.kbd
-lib/ICAClient/keyboard/sgindyfr.kbd
-lib/ICAClient/keyboard/sgindygr.kbd
-lib/ICAClient/keyboard/sgindyuk.kbd
-lib/ICAClient/keyboard/sgindyus.kbd
-lib/ICAClient/keyboard/sngr.kbd
-lib/ICAClient/keyboard/sparc3.kbd
-lib/ICAClient/keyboard/sparc4.kbd
-lib/ICAClient/keyboard/sparc5.kbd
-lib/ICAClient/keyboard/sparcfr4.kbd
-lib/ICAClient/keyboard/sparcfr5.kbd
-lib/ICAClient/keyboard/sparcgr4.kbd
-lib/ICAClient/keyboard/sparcgr5.kbd
-lib/ICAClient/keyboard/sparcuk4.kbd
-lib/ICAClient/keyboard/sparcuk5.kbd
-lib/ICAClient/keyboard/sparcus3.kbd
-lib/ICAClient/keyboard/sparcus4.kbd
-lib/ICAClient/keyboard/sparcus5.kbd
-lib/ICAClient/pkginf/F.core.linux
-lib/ICAClient/pkginf/Ver.core.linux
-lib/ICAClient/util/XCapture
-lib/ICAClient/util/XCapture.ad
-lib/ICAClient/util/echo_cmd
-lib/ICAClient/util/hinst
-lib/ICAClient/util/xcapture
-@dirrm lib/ICAClient/.config
-@dirrm lib/ICAClient/config
-@dirrm lib/ICAClient/cache
-@dirrm lib/ICAClient/help
-@dirrm lib/ICAClient/keyboard
-@dirrm lib/ICAClient/pkginf
-@dirrm lib/ICAClient/util
-@dirrm lib/ICAClient
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
deleted file mode 100644
index 033d7f3fb05b..000000000000
--- a/net/gaim-snapshot/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for:	gaim
-# Date created:			26 Mar 1999
-# Whom:				Jim Mock <jim@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=		gaim
-PORTVERSION=		0.10.3
-PORTREVISION=		1
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.marko.net/pub/gaim/ \
-			${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=		jim@FreeBSD.org
-
-USE_BZIP2=		yes
-USE_X_PREFIX=		yes
-USE_GMAKE=		yes
-USE_GTK=		yes
-WANT_ESOUND=		yes
-WANT_GNOME=		yes
-USE_LIBTOOL=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib"
-
-MAN1=			gaim.1
-
-.include <bsd.port.pre.mk>
-
-.if defined(HAVE_GNOME)
-USE_GNOME=		yes
-CONFIGURE_ARGS+=	--enable-gnome --enable-panel
-.else
-CONFIGURE_ARGS+=	--disable-gnome
-.endif
-.if defined(HAVE_ESOUND)
-USE_ESOUND=		yes
-CONFIGURE_ARGS+=	--enable-esd
-.else
-CONFIGURE_ARGS+=	--disable-esd
-.endif
-
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
-		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
-
-.include <bsd.port.post.mk>
diff --git a/net/gaim-snapshot/distinfo b/net/gaim-snapshot/distinfo
deleted file mode 100644
index 9213fb1faa83..000000000000
--- a/net/gaim-snapshot/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gaim-0.10.3.tar.bz2) = 5e7aaf3b3e7f621eb442a18b85ae0cde
diff --git a/net/gaim-snapshot/files/patch-aa b/net/gaim-snapshot/files/patch-aa
deleted file mode 100644
index e01484100cf3..000000000000
--- a/net/gaim-snapshot/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Tue Oct  3 03:12:14 2000
-+++ Makefile.in	Tue Oct  3 03:13:14 2000
-@@ -156,8 +156,8 @@
- @GNOMEBITS_TRUE@bitssounddir = $(bitssysconf)/sound/events
- @GNOMEBITS_TRUE@bitssound_DATA = gaim.soundlist
- 
--pixmapdir = $(datadir)/apps/Internet
--pixmap_DATA = gaim.desktop
-+@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet
-+@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop
- 
- SUBDIRS = m4 libfaim sounds plugins pixmaps doc po intl src
- ACLOCAL_AMFLAGS = -I m4
diff --git a/net/gaim-snapshot/files/patch-ab b/net/gaim-snapshot/files/patch-ab
deleted file mode 100644
index 716dfc9761b5..000000000000
--- a/net/gaim-snapshot/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- pixmaps/Makefile.in.orig	Tue Oct  3 02:42:15 2000
-+++ pixmaps/Makefile.in	Tue Oct  3 02:48:38 2000
-@@ -128,8 +128,8 @@
- EXTRA_DIST = about_small.xpm					add.xpm						add_small.xpm					admin_icon.xpm					aimicon.xpm					aimicon2.xpm					angel.xpm					aol_icon.xpm					away.xpm					away_icon.xpm					away_small.xpm					bgcolor.xpm					big.xpm						bigsmile.xpm					block.xpm					bold.xpm					bsmile.xpm					buddyadd.xpm					buddychat.xpm					buddydel.xpm					burp.xpm					cancel.xpm					close.xpm					close_small.xpm					crossedlips.xpm					cry.xpm						daemon-buddyadd.xpm				daemon-buddychat.xpm				daemon-buddydel.xpm				daemon-im.xpm					daemon-info.xpm					daemon-permadd.xpm				daemon-permdel.xpm				daemon.xpm					dt_icon.xpm					embarrassed.xpm					exit_small.xpm					export_small.xpm				fgcolor.xpm					fontface.xpm					fontface2.xpm					free_icon.xpm					gaim.xpm					gnome_add.xpm					gnome_close.xpm					gnome_preferences.xpm				gnome_remove.xpm 				gnome/devil-connect.png				gnome/devil-offline.png				gnome/devil-online.png				gnome/penguin-connect.png			gnome/penguin-offline.png			gnome/penguin-online.png			group.xpm					im.xpm						import_small.xpm				info.xpm					italic.xpm					join.xpm					kiss.xpm					link.xpm					login_icon.xpm					logo.xpm					logout_icon.xpm					luke03.xpm					moneymouth.xpm					msg_pending.xpm					no_icon.xpm					normal.xpm					offline.xpm					ok.xpm						oneeye.xpm					online.xpm					palette.xpm					peng_frown.xpm					peng_smile.xpm					peng_wink.xpm					permadd.xpm					permdel.xpm					plugins_small.xpm				pounce_small.xpm				prefs_small.xpm					refresh.xpm					sad.xpm						save.xpm					scream.xpm					search_small.xpm				signing_on.xpm					small.xpm					smile.xpm					smile8.xpm					smile_happy.xpm					smile_icon.xpm					smile_sad.xpm					smile_wink.xpm					speaker.xpm					strike.xpm					tb_forward.xpm					tb_search.xpm					think.xpm					tmp_send.xpm					tongue.xpm					underline.xpm					warn.xpm					wink.xpm					wood.xpm					yell.xpm			
- 
- 
--pixmapdir = $(datadir)/pixmaps
--pixmap_DATA = gaim.xpm
-+pixmapdir = $(datadir)/pixmaps/gaim
-+pixmap_DATA = $(EXTRA_DIST)
- 
- #gnomesysconf = `@GNOME_CONFIG@ --sysconfdir`
- @GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
-@@ -187,7 +187,7 @@
- 
- install-pixmapDATA: $(pixmap_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
-+	$(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome
- 	@list='$(pixmap_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \
diff --git a/net/gaim-snapshot/files/patch-ac b/net/gaim-snapshot/files/patch-ac
deleted file mode 100644
index 6c5b292aa4ad..000000000000
--- a/net/gaim-snapshot/files/patch-ac
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/Makefile.in.orig	Tue Oct  3 16:00:11 2000
-+++ src/Makefile.in	Tue Oct  3 16:05:56 2000
-@@ -123,12 +123,12 @@
- l = @l@
- perlpath = @perlpath@
- sedpath = @sedpath@
--@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet
-+@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim
- @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim
--@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c 			aim.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gnome_applet_mgr.c 			gtkhtml.c 			gtkticker.c 			html.c 			idle.c 			network.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
--@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a
--@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gnome_applet_mgr.c 		gtkhtml.c 		gtkticker.c 		html.c 		idle.c 		network.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
--@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = ../libfaim/libfaim.a
-+gaim_applet_SOURCES = about.c 			aim.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			dialogs.c 			gaimrc.c 			gnome_applet_mgr.c 			gtkhtml.c 			gtkticker.c 			html.c 			idle.c 			network.c 			oscar.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			rvous.c 			server.c 			sound.c 			ticker.c 			toc.c 			util.c
-+gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a
-+gaim_SOURCES = about.c 		aim.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		dialogs.c 		gaimrc.c 		gnome_applet_mgr.c 		gtkhtml.c 		gtkticker.c 		html.c 		idle.c 		network.c 		oscar.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		rvous.c 		server.c 		sound.c 		ticker.c 		toc.c 		util.c
-+gaim_DEPENDENCIES = ../libfaim/libfaim.a
- 
- CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(prefix)/share/locale\"
- 
-@@ -142,20 +142,20 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS =  about.o aim.o away.o browser.o \
--@GNOMEAPPLET_TRUE@buddy.o buddy_chat.o conversation.o dialogs.o \
--@GNOMEAPPLET_TRUE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
--@GNOMEAPPLET_TRUE@html.o idle.o network.o oscar.o perl.o plugins.o \
--@GNOMEAPPLET_TRUE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \
--@GNOMEAPPLET_TRUE@toc.o util.o
-+gaim_applet_OBJECTS =  about.o aim.o away.o browser.o \
-+buddy.o buddy_chat.o conversation.o dialogs.o \
-+gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
-+html.o idle.o network.o oscar.o perl.o plugins.o \
-+prefs.o proxy.o rvous.o server.o sound.o ticker.o \
-+toc.o util.o
- gaim_applet_LDADD = $(LDADD)
- gaim_applet_LDFLAGS = 
--@GNOMEAPPLET_FALSE@gaim_OBJECTS =  about.o aim.o away.o browser.o \
--@GNOMEAPPLET_FALSE@buddy.o buddy_chat.o conversation.o dialogs.o \
--@GNOMEAPPLET_FALSE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
--@GNOMEAPPLET_FALSE@html.o idle.o network.o oscar.o perl.o plugins.o \
--@GNOMEAPPLET_FALSE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \
--@GNOMEAPPLET_FALSE@toc.o util.o
-+gaim_OBJECTS =  about.o aim.o away.o browser.o \
-+buddy.o buddy_chat.o conversation.o dialogs.o \
-+gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \
-+html.o idle.o network.o oscar.o perl.o plugins.o \
-+prefs.o proxy.o rvous.o server.o sound.o ticker.o \
-+toc.o util.o
- gaim_LDADD = $(LDADD)
- gaim_LDFLAGS = 
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/net/gaim-snapshot/files/patch-ad b/net/gaim-snapshot/files/patch-ad
deleted file mode 100644
index ba20344ce77b..000000000000
--- a/net/gaim-snapshot/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gtkhtml.c.orig	Mon Oct  9 13:34:59 2000
-+++ src/gtkhtml.c	Tue Nov 14 17:28:27 2000
-@@ -3251,7 +3251,7 @@
- 	GdkFont *cfont;
- 	GdkRectangle area;
- 	char *ws,
--	  tag[BUF_LONG],
-+	  *tag,
- 	 *c,
- 	 *url = NULL;
- 	gint intag = 0,
-@@ -3295,6 +3295,7 @@
- 	c = text;
- 
- 	ws = g_malloc(strlen(text) + 2);
-+	tag = g_malloc(strlen(text) + 2);
- 
- 	while (*c)
- 	{
diff --git a/net/gaim-snapshot/pkg-comment b/net/gaim-snapshot/pkg-comment
deleted file mode 100644
index 4014745a2094..000000000000
--- a/net/gaim-snapshot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk+ open-source 'clone' of AOL's Instant Messenger client
diff --git a/net/gaim-snapshot/pkg-descr b/net/gaim-snapshot/pkg-descr
deleted file mode 100644
index d9136f63a88a..000000000000
--- a/net/gaim-snapshot/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-GAIM is an Open Source 'clone' of America OnLine's Instant Messenger
-client using the GTK+ toolkit. It features most of the functionality
-of the official AIM client while being much smaller and faster.  It
-features multiple groups, group chat, user information fetching and
-registration, time stamping, sound (for when you really do want to be
-interrupted), multiple away messages, and probably a few other things. 
-
-WWW: http://www.marko.net/gaim/
-
-- Jim <jim@FreeBSD.org>
diff --git a/net/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist
deleted file mode 100644
index 55c391f66c08..000000000000
--- a/net/gaim-snapshot/pkg-plist
+++ /dev/null
@@ -1,134 +0,0 @@
-bin/au2h
-bin/gaim
-%%GNOME:%%bin/gaim_applet
-%%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba
-%%GNOME:%%etc/sound/events/gaim.soundlist
-lib/gaim/autorecon.so
-lib/gaim/iconaway.so
-lib/gaim/lagmeter.so
-lib/gaim/notify.so
-lib/gaim/spellchk.so
-%%DATADIR%%/pixmaps/gaim/about_small.xpm
-%%DATADIR%%/pixmaps/gaim/add.xpm
-%%DATADIR%%/pixmaps/gaim/add_small.xpm
-%%DATADIR%%/pixmaps/gaim/admin_icon.xpm
-%%DATADIR%%/pixmaps/gaim/aimicon.xpm
-%%DATADIR%%/pixmaps/gaim/aimicon2.xpm
-%%DATADIR%%/pixmaps/gaim/angel.xpm
-%%DATADIR%%/pixmaps/gaim/aol_icon.xpm
-%%DATADIR%%/pixmaps/gaim/away.xpm
-%%DATADIR%%/pixmaps/gaim/away_icon.xpm
-%%DATADIR%%/pixmaps/gaim/away_small.xpm
-%%DATADIR%%/pixmaps/gaim/bgcolor.xpm
-%%DATADIR%%/pixmaps/gaim/big.xpm
-%%DATADIR%%/pixmaps/gaim/bigsmile.xpm
-%%DATADIR%%/pixmaps/gaim/block.xpm
-%%DATADIR%%/pixmaps/gaim/bold.xpm
-%%DATADIR%%/pixmaps/gaim/bsmile.xpm
-%%DATADIR%%/pixmaps/gaim/buddyadd.xpm
-%%DATADIR%%/pixmaps/gaim/buddychat.xpm
-%%DATADIR%%/pixmaps/gaim/buddydel.xpm
-%%DATADIR%%/pixmaps/gaim/burp.xpm
-%%DATADIR%%/pixmaps/gaim/cancel.xpm
-%%DATADIR%%/pixmaps/gaim/close.xpm
-%%DATADIR%%/pixmaps/gaim/close_small.xpm
-%%DATADIR%%/pixmaps/gaim/crossedlips.xpm
-%%DATADIR%%/pixmaps/gaim/cry.xpm
-%%DATADIR%%/pixmaps/gaim/daemon-buddyadd.xpm
-%%DATADIR%%/pixmaps/gaim/daemon-buddychat.xpm
-%%DATADIR%%/pixmaps/gaim/daemon-buddydel.xpm
-%%DATADIR%%/pixmaps/gaim/daemon-im.xpm
-%%DATADIR%%/pixmaps/gaim/daemon-info.xpm
-%%DATADIR%%/pixmaps/gaim/daemon-permadd.xpm
-%%DATADIR%%/pixmaps/gaim/daemon-permdel.xpm
-%%DATADIR%%/pixmaps/gaim/daemon.xpm
-%%DATADIR%%/pixmaps/gaim/dt_icon.xpm
-%%DATADIR%%/pixmaps/gaim/embarrassed.xpm
-%%DATADIR%%/pixmaps/gaim/exit_small.xpm
-%%DATADIR%%/pixmaps/gaim/export_small.xpm
-%%DATADIR%%/pixmaps/gaim/fgcolor.xpm
-%%DATADIR%%/pixmaps/gaim/fontface.xpm
-%%DATADIR%%/pixmaps/gaim/fontface2.xpm
-%%DATADIR%%/pixmaps/gaim/free_icon.xpm
-%%DATADIR%%/pixmaps/gaim/gaim.xpm
-%%DATADIR%%/pixmaps/gaim/gnome/devil-connect.png
-%%DATADIR%%/pixmaps/gaim/gnome/devil-offline.png
-%%DATADIR%%/pixmaps/gaim/gnome/devil-online.png
-%%DATADIR%%/pixmaps/gaim/gnome/penguin-connect.png
-%%DATADIR%%/pixmaps/gaim/gnome/penguin-offline.png
-%%DATADIR%%/pixmaps/gaim/gnome/penguin-online.png
-%%DATADIR%%/pixmaps/gaim/gnome_add.xpm
-%%DATADIR%%/pixmaps/gaim/gnome_close.xpm
-%%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm
-%%DATADIR%%/pixmaps/gaim/gnome_remove.xpm
-%%DATADIR%%/pixmaps/gaim/group.xpm
-%%DATADIR%%/pixmaps/gaim/im.xpm
-%%DATADIR%%/pixmaps/gaim/import_small.xpm
-%%DATADIR%%/pixmaps/gaim/info.xpm
-%%DATADIR%%/pixmaps/gaim/italic.xpm
-%%DATADIR%%/pixmaps/gaim/join.xpm
-%%DATADIR%%/pixmaps/gaim/kiss.xpm
-%%DATADIR%%/pixmaps/gaim/link.xpm
-%%DATADIR%%/pixmaps/gaim/login_icon.xpm
-%%DATADIR%%/pixmaps/gaim/logo.xpm
-%%DATADIR%%/pixmaps/gaim/logout_icon.xpm
-%%DATADIR%%/pixmaps/gaim/luke03.xpm
-%%DATADIR%%/pixmaps/gaim/moneymouth.xpm
-%%DATADIR%%/pixmaps/gaim/msg_pending.xpm
-%%DATADIR%%/pixmaps/gaim/no_icon.xpm
-%%DATADIR%%/pixmaps/gaim/normal.xpm
-%%DATADIR%%/pixmaps/gaim/offline.xpm
-%%DATADIR%%/pixmaps/gaim/ok.xpm
-%%DATADIR%%/pixmaps/gaim/oneeye.xpm
-%%DATADIR%%/pixmaps/gaim/online.xpm
-%%DATADIR%%/pixmaps/gaim/palette.xpm
-%%DATADIR%%/pixmaps/gaim/peng_frown.xpm
-%%DATADIR%%/pixmaps/gaim/peng_smile.xpm
-%%DATADIR%%/pixmaps/gaim/peng_wink.xpm
-%%DATADIR%%/pixmaps/gaim/permadd.xpm
-%%DATADIR%%/pixmaps/gaim/permdel.xpm
-%%DATADIR%%/pixmaps/gaim/plugins_small.xpm
-%%DATADIR%%/pixmaps/gaim/pounce_small.xpm
-%%DATADIR%%/pixmaps/gaim/prefs_small.xpm
-%%DATADIR%%/pixmaps/gaim/refresh.xpm
-%%DATADIR%%/pixmaps/gaim/sad.xpm
-%%DATADIR%%/pixmaps/gaim/save.xpm
-%%DATADIR%%/pixmaps/gaim/scream.xpm
-%%DATADIR%%/pixmaps/gaim/search_small.xpm
-%%DATADIR%%/pixmaps/gaim/signing_on.xpm
-%%DATADIR%%/pixmaps/gaim/small.xpm
-%%DATADIR%%/pixmaps/gaim/smile.xpm
-%%DATADIR%%/pixmaps/gaim/smile8.xpm
-%%DATADIR%%/pixmaps/gaim/smile_happy.xpm
-%%DATADIR%%/pixmaps/gaim/smile_icon.xpm
-%%DATADIR%%/pixmaps/gaim/smile_sad.xpm
-%%DATADIR%%/pixmaps/gaim/smile_wink.xpm
-%%DATADIR%%/pixmaps/gaim/speaker.xpm
-%%DATADIR%%/pixmaps/gaim/strike.xpm
-%%DATADIR%%/pixmaps/gaim/tb_forward.xpm
-%%DATADIR%%/pixmaps/gaim/tb_search.xpm
-%%DATADIR%%/pixmaps/gaim/think.xpm
-%%DATADIR%%/pixmaps/gaim/tmp_send.xpm
-%%DATADIR%%/pixmaps/gaim/tongue.xpm
-%%DATADIR%%/pixmaps/gaim/underline.xpm
-%%DATADIR%%/pixmaps/gaim/warn.xpm
-%%DATADIR%%/pixmaps/gaim/wink.xpm
-%%DATADIR%%/pixmaps/gaim/wood.xpm
-%%DATADIR%%/pixmaps/gaim/yell.xpm
-%%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop
-%%GNOME:%%share/gnome/apps/Internet/gaim.desktop
-%%GNOME:%%share/gnome/pixmaps/gaim.xpm
-%%GNOME:%%share/gnome/sounds/gaim/BuddyArrive.au
-%%GNOME:%%share/gnome/sounds/gaim/BuddyLeave.au
-%%GNOME:%%share/gnome/sounds/gaim/Receive.au
-%%GNOME:%%share/gnome/sounds/gaim/Send.au
-share/locale/de/LC_MESSAGES/gaim.mo
-share/locale/es/LC_MESSAGES/gaim.mo
-share/locale/fr/LC_MESSAGES/gaim.mo
-share/locale/ko/LC_MESSAGES/gaim.mo
-share/locale/zh_CN/LC_MESSAGES/gaim.mo
-%%GNOME:%%@dirrm share/gnome/sounds/gaim
-@dirrm %%DATADIR%%/pixmaps/gaim/gnome
-@dirrm %%DATADIR%%/pixmaps/gaim
-%%NOGNOME:%%@dirrm %%DATADIR%%/pixmaps
-@dirrm lib/gaim
diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile
deleted file mode 100644
index d693d3a0917d..000000000000
--- a/net/gnet-glib2/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:   gnet
-# Date created:        16 February 2000
-# Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnet
-PORTVERSION=	1.0.3
-CATEGORIES=	net
-MASTER_SITES=	http://www.eecs.umich.edu/~dhelder/misc/gnet/src/
-
-MAINTAINER=	nakai@FreeBSD.org
-
-USE_GLIB=	yes
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-
-.include <bsd.port.mk>
diff --git a/net/gnet-glib2/distinfo b/net/gnet-glib2/distinfo
deleted file mode 100644
index 4d815cf9fd84..000000000000
--- a/net/gnet-glib2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gnet-1.0.3.tar.gz) = b6a7ea73f889f01f2ff467a6b1c9f1e6
diff --git a/net/gnet-glib2/files/patch-ac b/net/gnet-glib2/files/patch-ac
deleted file mode 100644
index 5124d5969ad8..000000000000
--- a/net/gnet-glib2/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Mon Feb 28 18:47:45 2000
-+++ src/Makefile.in	Mon Feb 28 18:48:34 2000
-@@ -93,7 +93,7 @@
- 
- lib_LTLIBRARIES = libgnet.la
- 
--libgnet_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgnet_la_LDFLAGS =  	-version-info 0:0:0 
- 
- 
- libgnet_la_SOURCES =  	gnet.c				gnet-private.c			inetaddr.c			mcast.c				tcp.c				udp.c
diff --git a/net/gnet-glib2/files/patch-ad b/net/gnet-glib2/files/patch-ad
deleted file mode 100644
index 5d8440eba6b3..000000000000
--- a/net/gnet-glib2/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Tue Apr 11 15:56:56 2000
-+++ configure	Thu Jun 15 13:51:43 2000
-@@ -2238,8 +2238,8 @@
-   rm -f conf.glibtest
- 
- 
--glib_cflags=`glib-config --cflags glib`
--glib_libs=`glib-config --libs glib`
-+glib_cflags=`$GLIB_CONFIG --cflags glib`
-+glib_libs=`$GLIB_CONFIG --libs glib`
- 
- 
- 
diff --git a/net/gnet-glib2/pkg-comment b/net/gnet-glib2/pkg-comment
deleted file mode 100644
index 4a87a43a43d2..000000000000
--- a/net/gnet-glib2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple network library built upon Glib
diff --git a/net/gnet-glib2/pkg-descr b/net/gnet-glib2/pkg-descr
deleted file mode 100644
index 4421f71e1e5e..000000000000
--- a/net/gnet-glib2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-a simple network library built upon glib
-
-WWW: http://www.eecs.umich.edu/~dhelder/misc/gnet/
diff --git a/net/gnet-glib2/pkg-plist b/net/gnet-glib2/pkg-plist
deleted file mode 100644
index 2efdfc4a61d8..000000000000
--- a/net/gnet-glib2/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/gnet-config
-include/gnet/gnet.h
-include/gnet/inetaddr.h
-include/gnet/mcast.h
-include/gnet/tcp.h
-include/gnet/udp.h
-lib/libgnet.a
-lib/libgnet.so
-lib/libgnet.so.0
-share/aclocal/gnet.m4
-share/doc/libgnet1.0-dev/html/book1.html
-share/doc/libgnet1.0-dev/html/dnstest.html
-share/doc/libgnet1.0-dev/html/gnet-developers-tips.html
-share/doc/libgnet1.0-dev/html/gnet-developers.html
-share/doc/libgnet1.0-dev/html/gnet-examples.html
-share/doc/libgnet1.0-dev/html/gnet-gnet.html
-share/doc/libgnet1.0-dev/html/gnet-inetaddr.html
-share/doc/libgnet1.0-dev/html/gnet-mcast.html
-share/doc/libgnet1.0-dev/html/gnet-overview.html
-share/doc/libgnet1.0-dev/html/gnet-tcp.html
-share/doc/libgnet1.0-dev/html/gnet-udp.html
-share/doc/libgnet1.0-dev/html/hfetch.html
-share/doc/libgnet1.0-dev/html/hostinfo.html
-share/doc/libgnet1.0-dev/html/index.html
-share/doc/libgnet1.0-dev/html/index.sgml
-share/doc/libgnet1.0-dev/html/jmtransfer.html
-share/doc/libgnet1.0-dev/html/libgnet-reference.html
-share/doc/libgnet1.0-dev/html/ljoust.html
-share/doc/libgnet1.0-dev/html/sdr.html
-@dirrm include/gnet
-@dirrm share/doc/libgnet1.0-dev/html
-@dirrm share/doc/libgnet1.0-dev
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
deleted file mode 100644
index d693d3a0917d..000000000000
--- a/net/gnet2/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:   gnet
-# Date created:        16 February 2000
-# Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnet
-PORTVERSION=	1.0.3
-CATEGORIES=	net
-MASTER_SITES=	http://www.eecs.umich.edu/~dhelder/misc/gnet/src/
-
-MAINTAINER=	nakai@FreeBSD.org
-
-USE_GLIB=	yes
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-
-.include <bsd.port.mk>
diff --git a/net/gnet2/distinfo b/net/gnet2/distinfo
deleted file mode 100644
index 4d815cf9fd84..000000000000
--- a/net/gnet2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gnet-1.0.3.tar.gz) = b6a7ea73f889f01f2ff467a6b1c9f1e6
diff --git a/net/gnet2/files/patch-ac b/net/gnet2/files/patch-ac
deleted file mode 100644
index 5124d5969ad8..000000000000
--- a/net/gnet2/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Mon Feb 28 18:47:45 2000
-+++ src/Makefile.in	Mon Feb 28 18:48:34 2000
-@@ -93,7 +93,7 @@
- 
- lib_LTLIBRARIES = libgnet.la
- 
--libgnet_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgnet_la_LDFLAGS =  	-version-info 0:0:0 
- 
- 
- libgnet_la_SOURCES =  	gnet.c				gnet-private.c			inetaddr.c			mcast.c				tcp.c				udp.c
diff --git a/net/gnet2/files/patch-ad b/net/gnet2/files/patch-ad
deleted file mode 100644
index 5d8440eba6b3..000000000000
--- a/net/gnet2/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Tue Apr 11 15:56:56 2000
-+++ configure	Thu Jun 15 13:51:43 2000
-@@ -2238,8 +2238,8 @@
-   rm -f conf.glibtest
- 
- 
--glib_cflags=`glib-config --cflags glib`
--glib_libs=`glib-config --libs glib`
-+glib_cflags=`$GLIB_CONFIG --cflags glib`
-+glib_libs=`$GLIB_CONFIG --libs glib`
- 
- 
- 
diff --git a/net/gnet2/pkg-comment b/net/gnet2/pkg-comment
deleted file mode 100644
index 4a87a43a43d2..000000000000
--- a/net/gnet2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple network library built upon Glib
diff --git a/net/gnet2/pkg-descr b/net/gnet2/pkg-descr
deleted file mode 100644
index 4421f71e1e5e..000000000000
--- a/net/gnet2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-a simple network library built upon glib
-
-WWW: http://www.eecs.umich.edu/~dhelder/misc/gnet/
diff --git a/net/gnet2/pkg-plist b/net/gnet2/pkg-plist
deleted file mode 100644
index 2efdfc4a61d8..000000000000
--- a/net/gnet2/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/gnet-config
-include/gnet/gnet.h
-include/gnet/inetaddr.h
-include/gnet/mcast.h
-include/gnet/tcp.h
-include/gnet/udp.h
-lib/libgnet.a
-lib/libgnet.so
-lib/libgnet.so.0
-share/aclocal/gnet.m4
-share/doc/libgnet1.0-dev/html/book1.html
-share/doc/libgnet1.0-dev/html/dnstest.html
-share/doc/libgnet1.0-dev/html/gnet-developers-tips.html
-share/doc/libgnet1.0-dev/html/gnet-developers.html
-share/doc/libgnet1.0-dev/html/gnet-examples.html
-share/doc/libgnet1.0-dev/html/gnet-gnet.html
-share/doc/libgnet1.0-dev/html/gnet-inetaddr.html
-share/doc/libgnet1.0-dev/html/gnet-mcast.html
-share/doc/libgnet1.0-dev/html/gnet-overview.html
-share/doc/libgnet1.0-dev/html/gnet-tcp.html
-share/doc/libgnet1.0-dev/html/gnet-udp.html
-share/doc/libgnet1.0-dev/html/hfetch.html
-share/doc/libgnet1.0-dev/html/hostinfo.html
-share/doc/libgnet1.0-dev/html/index.html
-share/doc/libgnet1.0-dev/html/index.sgml
-share/doc/libgnet1.0-dev/html/jmtransfer.html
-share/doc/libgnet1.0-dev/html/libgnet-reference.html
-share/doc/libgnet1.0-dev/html/ljoust.html
-share/doc/libgnet1.0-dev/html/sdr.html
-@dirrm include/gnet
-@dirrm share/doc/libgnet1.0-dev/html
-@dirrm share/doc/libgnet1.0-dev
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
deleted file mode 100644
index b8455d393ae7..000000000000
--- a/net/gnome-mud/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	amcl
-# Date created:				15 Apr 2000
-# Whom:					will
-#
-# $FreeBSD$
-#
-
-PORTNAME=	amcl
-PORTVERSION=	0.7.0
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www.localhost.nu/apps/amcl/tars/ \
-		http://amcl.alliances.org/tars/
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}pl1
-
-MAINTAINER=	will@FreeBSD.org
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_X_PREFIX=	yes
-USE_GTK=	yes
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.mk>
diff --git a/net/gnome-mud/distinfo b/net/gnome-mud/distinfo
deleted file mode 100644
index 0bd27be3f46d..000000000000
--- a/net/gnome-mud/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (amcl-0.7.0pl1.tar.gz) = 6e88daf39a3d2fbe4fa61f375df51031
diff --git a/net/gnome-mud/pkg-comment b/net/gnome-mud/pkg-comment
deleted file mode 100644
index 22b5884542cd..000000000000
--- a/net/gnome-mud/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK-based MUD client with triggers, aliases, colors, etc
diff --git a/net/gnome-mud/pkg-descr b/net/gnome-mud/pkg-descr
deleted file mode 100644
index 6852b4dc4b26..000000000000
--- a/net/gnome-mud/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-AMCL is short for Another MUD CLient. It is based
-on GTK, and offers many features, such as full support
-for ANSI colors, aliases, command history, triggers,
-automapping, multiple connections, and so forth.
-
-WWW: http://www.localhost.nu/apps/amcl/
-Author: Robin Ericsson  <lobbin@localhost.nu>
-
-- Will <andrews@technologist.com>
diff --git a/net/gnome-mud/pkg-plist b/net/gnome-mud/pkg-plist
deleted file mode 100644
index ccbc437e24d8..000000000000
--- a/net/gnome-mud/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/amcl
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
deleted file mode 100644
index 9538aa70c211..000000000000
--- a/net/gnomeicu/gnomeicu/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# Ports collection Makefile for:	GnomeICU
-# Date created:				03/16/1999
-# Whom:					nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomeicu
-PORTVERSION=	0.94.1
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnomeicu
-
-MAINTAINER=	nectar@FreeBSD.org
-
-LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
-		iconv.1:${PORTSDIR}/converters/iconv
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	yes
-GNU_CONFIGURE=	yes
-.if defined(WITH_DANTE)
-LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
-SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
-		-Dgetpeername=Rgetpeername -Daccept=Raccept \
-		-Drresvport=Rrresvport -Dbindresvport=Rbindresvport \
-		-Dgethostbyname=Rgethostbyname \
-		-Dgethostbyname2=Rgethostbyname2 -Dsendto=Rsendto \
-		-Drecvfrom=Rrecvfrom -Drecvfrom=Rrecvfrom -Dwrite=Rwrite \
-		-Dwritev=Rwritev -Dsend=Rsend -Dsendmsg=Rsendmsg \
-		-Dread=Rread -Dreadv=Rreadv -Drecv=Rrecv -Drecvmsg=Rrecvmsg
-SOCKSLIBS=	-lsocks
-.endif
-
-CONFIGURE_ARGS= --with-statusmenu
-CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
-		CFLAGS="${CFLAGS}"
-
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
-.include <bsd.port.mk>
diff --git a/net/gnomeicu/gnomeicu/distinfo b/net/gnomeicu/gnomeicu/distinfo
deleted file mode 100644
index 760c16bd6314..000000000000
--- a/net/gnomeicu/gnomeicu/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gnomeicu-0.94.1.tar.bz2) = 3c8035d682df22a1a9418216343544ec
diff --git a/net/gnomeicu/gnomeicu/files/patch-ac b/net/gnomeicu/gnomeicu/files/patch-ac
deleted file mode 100644
index c0a042787c06..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Sat Jan 29 16:04:07 2000
-+++ po/Makefile.in.in	Sat Jan 29 16:08:19 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/net/gnomeicu/gnomeicu/files/patch-ad b/net/gnomeicu/gnomeicu/files/patch-ad
deleted file mode 100644
index 416be7ad9346..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kanji_conv.c.orig	Sun Oct 29 12:42:04 2000
-+++ src/kanji_conv.c	Sun Oct 29 12:42:15 2000
-@@ -117,7 +117,7 @@
-     return strdup(str);
- }
- gchar *
--kanji_conv(gchar *str, gint from_code, gint to_code)
-+kanji_conv(gchar **str, gint from_code, gint to_code)
- {
- #ifdef TRACE_FUNCTION
-     printf("kanji_conv, did nothing.\n");
diff --git a/net/gnomeicu/gnomeicu/pkg-comment b/net/gnomeicu/gnomeicu/pkg-comment
deleted file mode 100644
index bb39546ca3ca..000000000000
--- a/net/gnomeicu/gnomeicu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME ICQ client
diff --git a/net/gnomeicu/gnomeicu/pkg-descr b/net/gnomeicu/gnomeicu/pkg-descr
deleted file mode 100644
index 1ea707c0865a..000000000000
--- a/net/gnomeicu/gnomeicu/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
- GnomeICU (previously GtkICQ) is an Internet based communications
- program which makes use of ICQ protocol. GnomeICU also makes use of
- Gnome, a growingly popular desktop environment.GnomeICU is released
- under the GNU Public License, and is available free of charge.
-
-WWW: http://gnomeicu.gdev.net/
-
-Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/net/gnomeicu/gnomeicu/pkg-plist b/net/gnomeicu/gnomeicu/pkg-plist
deleted file mode 100644
index 0a84f5e7f909..000000000000
--- a/net/gnomeicu/gnomeicu/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-bin/gnomeicu
-bin/gnomeicu-client
-etc/CORBA/servers/GnomeICU.gnorba
-etc/sound/events/GnomeICU.soundlist
-share/gnome/applets/Network/GnomeICU.desktop
-share/gnome/help/gnomeicu/C/topic.dat
-share/gnome/pixmaps/gnome-gnomeicu.xpm
-share/gnome/pixmaps/gnomeicu/animeyes.png
-share/gnome/pixmaps/gnomeicu/cancel.xpm
-share/gnome/pixmaps/gnomeicu/eye_na.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-auth.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-away.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-blank.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-chat.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-contact.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-dnd.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-ffc.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-file.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-hist.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-info.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-inv.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-message.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-na.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-occ.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-offline.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-online.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-url.xpm
-share/gnome/pixmaps/gnomeicu/ok.xpm
-share/gnome/pixmaps/gnomeicu/rename.xpm
-share/gnome/pixmaps/gnomeicu/watermark.png
-share/gnome/sounds/gnomeicu/message.wav
-share/locale/ca/LC_MESSAGES/gnomeicu.mo
-share/locale/da/LC_MESSAGES/gnomeicu.mo
-share/locale/de/LC_MESSAGES/gnomeicu.mo
-share/locale/el/LC_MESSAGES/gnomeicu.mo
-share/locale/es/LC_MESSAGES/gnomeicu.mo
-share/locale/fr/LC_MESSAGES/gnomeicu.mo
-share/locale/ga/LC_MESSAGES/gnomeicu.mo
-share/locale/gl/LC_MESSAGES/gnomeicu.mo
-share/locale/hu/LC_MESSAGES/gnomeicu.mo
-share/locale/it/LC_MESSAGES/gnomeicu.mo
-share/locale/ja/LC_MESSAGES/gnomeicu.mo
-share/locale/ko/LC_MESSAGES/gnomeicu.mo
-share/locale/lt/LC_MESSAGES/gnomeicu.mo
-share/locale/nl/LC_MESSAGES/gnomeicu.mo
-share/locale/no/LC_MESSAGES/gnomeicu.mo
-share/locale/pl/LC_MESSAGES/gnomeicu.mo
-share/locale/pt/LC_MESSAGES/gnomeicu.mo
-share/locale/pt_BR/LC_MESSAGES/gnomeicu.mo
-share/locale/ru/LC_MESSAGES/gnomeicu.mo
-share/locale/sv/LC_MESSAGES/gnomeicu.mo
-share/locale/tr/LC_MESSAGES/gnomeicu.mo
-share/locale/uk/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/help/gnomeicu/C/images
-@dirrm share/gnome/help/gnomeicu/C
-@dirrm share/gnome/help/gnomeicu
-@dirrm share/gnome/pixmaps/gnomeicu
-@dirrm share/gnome/sounds/gnomeicu
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
deleted file mode 100644
index 9538aa70c211..000000000000
--- a/net/gnomeicu2/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# Ports collection Makefile for:	GnomeICU
-# Date created:				03/16/1999
-# Whom:					nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomeicu
-PORTVERSION=	0.94.1
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnomeicu
-
-MAINTAINER=	nectar@FreeBSD.org
-
-LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
-		iconv.1:${PORTSDIR}/converters/iconv
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	yes
-GNU_CONFIGURE=	yes
-.if defined(WITH_DANTE)
-LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
-SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
-		-Dgetpeername=Rgetpeername -Daccept=Raccept \
-		-Drresvport=Rrresvport -Dbindresvport=Rbindresvport \
-		-Dgethostbyname=Rgethostbyname \
-		-Dgethostbyname2=Rgethostbyname2 -Dsendto=Rsendto \
-		-Drecvfrom=Rrecvfrom -Drecvfrom=Rrecvfrom -Dwrite=Rwrite \
-		-Dwritev=Rwritev -Dsend=Rsend -Dsendmsg=Rsendmsg \
-		-Dread=Rread -Dreadv=Rreadv -Drecv=Rrecv -Drecvmsg=Rrecvmsg
-SOCKSLIBS=	-lsocks
-.endif
-
-CONFIGURE_ARGS= --with-statusmenu
-CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
-		CFLAGS="${CFLAGS}"
-
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
-.include <bsd.port.mk>
diff --git a/net/gnomeicu2/distinfo b/net/gnomeicu2/distinfo
deleted file mode 100644
index 760c16bd6314..000000000000
--- a/net/gnomeicu2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gnomeicu-0.94.1.tar.bz2) = 3c8035d682df22a1a9418216343544ec
diff --git a/net/gnomeicu2/files/patch-ac b/net/gnomeicu2/files/patch-ac
deleted file mode 100644
index c0a042787c06..000000000000
--- a/net/gnomeicu2/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Sat Jan 29 16:04:07 2000
-+++ po/Makefile.in.in	Sat Jan 29 16:08:19 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/net/gnomeicu2/files/patch-ad b/net/gnomeicu2/files/patch-ad
deleted file mode 100644
index 416be7ad9346..000000000000
--- a/net/gnomeicu2/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kanji_conv.c.orig	Sun Oct 29 12:42:04 2000
-+++ src/kanji_conv.c	Sun Oct 29 12:42:15 2000
-@@ -117,7 +117,7 @@
-     return strdup(str);
- }
- gchar *
--kanji_conv(gchar *str, gint from_code, gint to_code)
-+kanji_conv(gchar **str, gint from_code, gint to_code)
- {
- #ifdef TRACE_FUNCTION
-     printf("kanji_conv, did nothing.\n");
diff --git a/net/gnomeicu2/pkg-comment b/net/gnomeicu2/pkg-comment
deleted file mode 100644
index bb39546ca3ca..000000000000
--- a/net/gnomeicu2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME ICQ client
diff --git a/net/gnomeicu2/pkg-descr b/net/gnomeicu2/pkg-descr
deleted file mode 100644
index 1ea707c0865a..000000000000
--- a/net/gnomeicu2/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
- GnomeICU (previously GtkICQ) is an Internet based communications
- program which makes use of ICQ protocol. GnomeICU also makes use of
- Gnome, a growingly popular desktop environment.GnomeICU is released
- under the GNU Public License, and is available free of charge.
-
-WWW: http://gnomeicu.gdev.net/
-
-Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/net/gnomeicu2/pkg-plist b/net/gnomeicu2/pkg-plist
deleted file mode 100644
index 0a84f5e7f909..000000000000
--- a/net/gnomeicu2/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-bin/gnomeicu
-bin/gnomeicu-client
-etc/CORBA/servers/GnomeICU.gnorba
-etc/sound/events/GnomeICU.soundlist
-share/gnome/applets/Network/GnomeICU.desktop
-share/gnome/help/gnomeicu/C/topic.dat
-share/gnome/pixmaps/gnome-gnomeicu.xpm
-share/gnome/pixmaps/gnomeicu/animeyes.png
-share/gnome/pixmaps/gnomeicu/cancel.xpm
-share/gnome/pixmaps/gnomeicu/eye_na.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-auth.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-away.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-blank.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-chat.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-contact.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-dnd.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-ffc.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-file.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-hist.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-info.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-inv.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-message.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-na.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-occ.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-offline.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-online.xpm
-share/gnome/pixmaps/gnomeicu/gnomeicu-url.xpm
-share/gnome/pixmaps/gnomeicu/ok.xpm
-share/gnome/pixmaps/gnomeicu/rename.xpm
-share/gnome/pixmaps/gnomeicu/watermark.png
-share/gnome/sounds/gnomeicu/message.wav
-share/locale/ca/LC_MESSAGES/gnomeicu.mo
-share/locale/da/LC_MESSAGES/gnomeicu.mo
-share/locale/de/LC_MESSAGES/gnomeicu.mo
-share/locale/el/LC_MESSAGES/gnomeicu.mo
-share/locale/es/LC_MESSAGES/gnomeicu.mo
-share/locale/fr/LC_MESSAGES/gnomeicu.mo
-share/locale/ga/LC_MESSAGES/gnomeicu.mo
-share/locale/gl/LC_MESSAGES/gnomeicu.mo
-share/locale/hu/LC_MESSAGES/gnomeicu.mo
-share/locale/it/LC_MESSAGES/gnomeicu.mo
-share/locale/ja/LC_MESSAGES/gnomeicu.mo
-share/locale/ko/LC_MESSAGES/gnomeicu.mo
-share/locale/lt/LC_MESSAGES/gnomeicu.mo
-share/locale/nl/LC_MESSAGES/gnomeicu.mo
-share/locale/no/LC_MESSAGES/gnomeicu.mo
-share/locale/pl/LC_MESSAGES/gnomeicu.mo
-share/locale/pt/LC_MESSAGES/gnomeicu.mo
-share/locale/pt_BR/LC_MESSAGES/gnomeicu.mo
-share/locale/ru/LC_MESSAGES/gnomeicu.mo
-share/locale/sv/LC_MESSAGES/gnomeicu.mo
-share/locale/tr/LC_MESSAGES/gnomeicu.mo
-share/locale/uk/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/help/gnomeicu/C/images
-@dirrm share/gnome/help/gnomeicu/C
-@dirrm share/gnome/help/gnomeicu
-@dirrm share/gnome/pixmaps/gnomeicu
-@dirrm share/gnome/sounds/gnomeicu
diff --git a/net/hping/Makefile b/net/hping/Makefile
deleted file mode 100644
index cd02b973b42c..000000000000
--- a/net/hping/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	hping
-# Date Created:				5 Oct 2000
-# Whom:					Roman Shterenzon <roman@xpert.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	hping
-PORTVERSION=	2b54
-CATEGORIES=	security net
-MASTER_SITES=	http://www.kyuzz.org/antirez/hping2-src/
-DISTNAME=	hping2-beta54
-
-MAINTAINER=	roman@xpert.com
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--force-libpcap
-
-MAN8=	hping.8
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hping2 ${PREFIX}/sbin/hping
-	${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 ${PREFIX}/man/man8/hping.8
-
-.include <bsd.port.mk>
diff --git a/net/hping/distinfo b/net/hping/distinfo
deleted file mode 100644
index 06733487e4a6..000000000000
--- a/net/hping/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (hping2-beta54.tar.gz) = 703f2102b948f214d59d89b41bca9923
diff --git a/net/hping/files/patch-aa b/net/hping/files/patch-aa
deleted file mode 100644
index f60706776698..000000000000
--- a/net/hping/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	Thu Jul  6 20:06:10 2000
-+++ configure	Thu Oct  5 15:33:45 2000
-@@ -65,8 +65,8 @@
- 			;;
- 		*"--force-libpcap")
- 			FORCE_LIBPCAP="-DFORCE_LIBPCAP"
--			PCAP="PCAP=libpcap/libpcap.a"
--			PCAP_INCLUDE="-I./libpcap"
-+			PCAP="PCAP=-lpcap"
-+			PCAP_INCLUDE=""
- 			;;
- 		*"--dont-use-proc")
- 			HAVE_PROC=""
-@@ -92,7 +92,7 @@
- 			-e s/@FORCE_LIBPCAP@/"$FORCE_LIBPCAP"/g \
- 			-e s/@HAVE_PROC@/"$HAVE_PROC"/g \
- 			-e s^@PCAP@^"$PCAP"^g \
--			-e s^@PCAP_INCLUDE@^"$PCAP_INCLUDE$"^g \
-+			-e s^@PCAP_INCLUDE@^"$PCAP_INCLUDE"^g \
- 			-e s^@MANPATH@^"$INSTALL_MANPATH"^g \
- 			> Makefile
- 
diff --git a/net/hping/files/patch-ab b/net/hping/files/patch-ab
deleted file mode 100644
index fcc4cad3fa43..000000000000
--- a/net/hping/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Thu Oct  5 15:22:25 2000
-+++ Makefile.in	Thu Oct  5 15:25:28 2000
-@@ -6,8 +6,8 @@
- # $date: Sun Jul 25 17:56:15 MET DST 1999$ 
- # $rev: 3$ 
- 
--CC= gcc
--CCOPT= -O2 -Wall @PCAP_INCLUDE@
-+CC?= gcc
-+CCOPT= $(CFLAGS) -Wall @PCAP_INCLUDE@
- DEBUG= -g
- #uncomment the following if you need libpcap based build under linux
- #(not raccomanded)
diff --git a/net/hping/files/patch-ac b/net/hping/files/patch-ac
deleted file mode 100644
index 32e9ae6d37e0..000000000000
--- a/net/hping/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- getlhs.c.orig	Thu Oct  5 15:26:31 2000
-+++ getlhs.c	Thu Oct  5 15:26:26 2000
-@@ -73,6 +73,7 @@
- 	else if ( strstr(ifname, "eth") /* ? */
- 	     ||   strstr(ifname, "ed")
- 	     ||   strstr(ifname, "ne")
-+	     ||   strstr(ifname, "xe")	/* Xircom */
- 	     ||   strstr(ifname, "xl")	/* 3com */
- 	     ||   strstr(ifname, "vx")	/* 3com (older model) */
- 	     ||   strstr(ifname, "ep")  /* 3com 3c589 */
diff --git a/net/hping/pkg-comment b/net/hping/pkg-comment
deleted file mode 100644
index 2c244dd70f04..000000000000
--- a/net/hping/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network auditing tool
diff --git a/net/hping/pkg-descr b/net/hping/pkg-descr
deleted file mode 100644
index 3ea23af55788..000000000000
--- a/net/hping/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-hping2 is a network tool able to send custom ICMP/UDP/TCP
-packets and to display target replies like ping do with
-ICMP replies. hping2 handle fragmentation, arbitrary packet
-body and size and can be used in order to transfer files
-under supported protocols. Using hping2 you are able at
-least to perform the following jobs:
-
-	- Test firewall rules
-	- [spoofed] port scanning
-	- Test net performance using different protocols,
-	  packet size, TOS (type of service) and fragmentation.
-	- Path MTU discovery
-	- Files transfering even between really fascist firewall rules.
-	- Traceroute like under different protocols.
-	- Firewalk like usage.
-	- Remote OS fingerprint.
-	- TCP/IP stack auditing.
-	- A lot of others. 
-
-WWW: http://www.kyuzz.org/antirez/hping/
-
--- Roman Shterenzon <roman@xpert.com>
diff --git a/net/hping/pkg-plist b/net/hping/pkg-plist
deleted file mode 100644
index 3e67b27d4975..000000000000
--- a/net/hping/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-sbin/hping
diff --git a/net/imm/Makefile b/net/imm/Makefile
deleted file mode 100644
index 4ca41dd5f326..000000000000
--- a/net/imm/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# New ports collection makefile for:	imm
-# Date created:		13 October 1994
-# Whom:			wollman
-#
-# $FreeBSD$
-#
-
-PORTNAME=	imm
-PORTVERSION=	3.5a1
-CATEGORIES=	mbone tk82
-MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
-DISTNAME=	imm.source
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER=	fenner@freebsd.org
-
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-
-WRKSRC=		${WRKDIR}/mnm
-USE_X_PREFIX=	yes
-
-post-extract:
-	@${MKDIR} ${WRKSRC}/freebsd
-	@${CP} ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile
-	@${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/src
-
-# The included makefile doesn't have an "install" target.
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/freebsd/imm ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/freebsd/immserv ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/freebsd/lscomp ${PREFIX}/bin
-# and no man pages at all yet.
-# But include the very limited documentation
-	${MKDIR} ${PREFIX}/share/doc/imm
-.if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/imm
-	${INSTALL_DATA} ${WRKSRC}/imm_readme.txt ${PREFIX}/share/doc/imm
-.endif
-# The sdr plugin is pretty much required.
-	${INSTALL_DATA} ${WRKSRC}/sdr2.plugin.S53.image.imm ${PREFIX}/share/doc/imm
-
-.include <bsd.port.mk>
diff --git a/net/imm/distinfo b/net/imm/distinfo
deleted file mode 100644
index 672f0d0c6e34..000000000000
--- a/net/imm/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667
diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd
deleted file mode 100644
index ae7ce6434e6f..000000000000
--- a/net/imm/files/Makefile.freebsd
+++ /dev/null
@@ -1,77 +0,0 @@
-# Some versions of make, like SGI's, use the following variable to
-# determine which shell to use for executing commands:
-SHELL = /bin/sh
-INCLUDE_DIR	= -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
-# Libraries to use when linking: 
-LIBS = -lm
-
-TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk82 -ltcl82 -lX11
-
-TARGET		= ../freebsd
-
-CFLAGS		=  -g -DSIG_T=void -DMULTICAST -I. -DERROR_TEST
-
-CC =		gcc
-CC_SWITCHES =	${CFLAGS} 
-
-ROBJS = protocol.o utils.o
-
-SOBJS = protocol.o immserv.o sorttree.o utils.o
-
-MOBJS = protocol.o mnmserver.o sorttree.o utils.o
-
-all: $(TARGET)/imm $(TARGET)/immserv $(TARGET)/lscomp
-
-$(TARGET)/mnm: $(ROBJS) main.o xlopen.o mcl.o
-	$(CC) $(CFLAGS) main.o xlopen.o mcl.o $(ROBJS) $(LIBS) -o $(TARGET)/mnm
-
-$(TARGET)/imm: $(ROBJS) tkAppInit.o imm_init.o imm.o xlopen_imm.o
-	$(CC) $(CFLAGS) tkAppInit.o imm_init.o imm.o  xlopen_imm.o $(ROBJS) $(TKLIBS) $(LIBS) -o $(TARGET)/imm
-
-$(TARGET)/immserv: $(SOBJS)
-	$(CC) $(CFLAGS) $(SOBJS) $(LIBS) -o $(TARGET)/immserv
-
-$(TARGET)/lscomp: lscomp.o protocol.o sorttree.o utils.o
-	$(CC) $(CFLAGS) lscomp.o protocol.o sorttree.o utils.o $(LIBS) -o $(TARGET)/lscomp
-
-clean:
-	rm -f *.o tcl2c $(TARGET)/mnm  $(TARGET)/lscomp $(TARGET)/imm $(TARGET)/immserv
-
-tcl2c: tcl2c.c
-	$(CC) $(CFLAGS) tcl2c.c  $(LIBS) -o tcl2c
-
-imm_init.c: tcl2c imm_def.tcl mcl.tcl Radio.tcl Listbox.tcl viewbox.tcl filebox.tcl mkHostname.tcl
-	./tcl2c IMM_Init < imm_def.tcl > imm_init.c
-	./tcl2c MCL < mcl.tcl >> imm_init.c
-	./tcl2c RADIO < Radio.tcl >> imm_init.c
-	./tcl2c LISTBOX < Listbox.tcl >> imm_init.c
-	./tcl2c VIEWBOX < viewbox.tcl >> imm_init.c
-	./tcl2c FILEBOX < filebox.tcl >> imm_init.c
-	./tcl2c HOSTBOX < mkHostname.tcl >> imm_init.c
-	./tcl2c SERVERBOX < mnmserv.tcl >> imm_init.c
-
-imm_init.o:	imm_init.c
-
-main.o:	main.c
-
-mcl.o:	mcl.c
-
-imm.o:	mcl.c
-	gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c mcl.c -o imm.o
-
-xlopen_imm.o:	xlopen.c
-	gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c xlopen.c -o xlopen_imm.o 
-
-tkAppInit.o:    tkAppInit.c
-	gcc $(CFLAGS) $(INCLUDE_DIR) tkAppInit.c -c
-
-protocol.o:   protocol.c
-
-utils.o: utils.c
-
-lscomp.o: lscomp.c
-
-sorttree.o: sorttree.c immserv.h
-
-immserv.o: immserv.c immserv.h
-
diff --git a/net/imm/files/Makefile.work b/net/imm/files/Makefile.work
deleted file mode 100644
index cb876d343f9e..000000000000
--- a/net/imm/files/Makefile.work
+++ /dev/null
@@ -1,2 +0,0 @@
-all install:
-	cd src; ${MAKE} -f Makefile.freebsd $@
diff --git a/net/imm/files/patch-aa b/net/imm/files/patch-aa
deleted file mode 100644
index f7cb9a9cefc8..000000000000
--- a/net/imm/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mcl.c.orig	Tue Nov 19 12:33:49 1996
-+++ src/mcl.c	Tue Nov 19 12:34:23 1996
-@@ -25,7 +25,7 @@
-  
- #define MAIN
- #include "protocol.h"
--#include <malloc.h>
-+#include <stdlib.h>
- #include <fcntl.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
diff --git a/net/imm/files/patch-ab b/net/imm/files/patch-ab
deleted file mode 100644
index 4b1f038304da..000000000000
--- a/net/imm/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xlopen.c.orig	Tue Nov 19 12:33:53 1996
-+++ src/xlopen.c	Tue Nov 19 12:35:01 1996
-@@ -34,7 +34,7 @@
- extern int optind, opterr;
- extern int useimageloader;
- extern struct hosttype *hosts_tail;
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)	/* XXX */
- extern char *sys_errlist[];
- #endif
- extern unsigned int total;
diff --git a/net/imm/files/patch-ac b/net/imm/files/patch-ac
deleted file mode 100644
index 2da9e3a99e12..000000000000
--- a/net/imm/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/immserv.c.orig	Tue Nov 19 12:36:41 1996
-+++ src/immserv.c	Tue Nov 19 12:37:32 1996
-@@ -1407,7 +1407,7 @@
- /******************************************************************************/
- void setackalarm(int nop) {}
- /******************************************************************************/
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)	/* XXX */
- /* routine to put process to sleep */
- int usleep( wait)
- u_int wait;
diff --git a/net/imm/pkg-comment b/net/imm/pkg-comment
deleted file mode 100644
index 3b8b83a184f7..000000000000
--- a/net/imm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Internet Image(or other data) Multicaster (and receiver)
diff --git a/net/imm/pkg-descr b/net/imm/pkg-descr
deleted file mode 100644
index 339f05932750..000000000000
--- a/net/imm/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-IMM has been designed to efficiently replicate files/file directories
-using a reliable dissemination protocol framework and provide archiving
-and post processing features.  The default mode of operation is for imm
-to receive and display compressed imagery files (e.g., jpg,gif) using
-xv or xloadimage as a post processor.
-
-This release includes an sdr plug-in, named sdr2.plugin.S53.image.imm,
-which must be installed to participate in MBone alpha testing of imm sessions.
-Usually in a directory called ~home/.sdr/plugins to be found by sdr.
-See the sdr help pages for information on installing plugins.
diff --git a/net/imm/pkg-plist b/net/imm/pkg-plist
deleted file mode 100644
index f470d0e00c01..000000000000
--- a/net/imm/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/imm
-bin/immserv
-bin/lscomp
-share/doc/imm/README
-share/doc/imm/imm_readme.txt
-share/doc/imm/sdr2.plugin.S53.image.imm
-@dirrm share/doc/imm
diff --git a/net/irrtoolset/Makefile b/net/irrtoolset/Makefile
deleted file mode 100644
index 1e5a2c29bc26..000000000000
--- a/net/irrtoolset/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	RAToolSet
-# Date created:				May 4th 1997
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ratoolset
-PORTVERSION=	3.5.8
-CATEGORIES=	net tk82
-MASTER_SITES=	ftp://ftp.isi.edu/ra/RAToolSet/
-DISTNAME=	RAToolSet-3.5.8
-
-MAINTAINER=	ports@FreeBSD.org
-
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-
-USE_BISON=	yes
-GNU_CONFIGURE=	Yes
-CONFIGURE_ENV=	TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.2:${PREFIX}/include/tk8.2" \
-		TCL_TK_LIBRARY_DIR=${PREFIX}/lib \
-		TCL_LIBRARY=${PREFIX}/lib/tcl8.2 \
-		TK_LIBRARY=${PREFIX}/lib/tk8.2 \
-		LD_TCL_TK_LIBS="-ltk82 -ltcl82"
-
-MAN1=		CIDRAdvisor.1 aoe.1 pmatch.1 prpath.1 RtConfig.1 peval.1 \
-		prcheck.1 roe.1
-MAN8=		prtraceroute.8 relayd.8
-
-ALL_TARGET=	depend all
-
-.include <bsd.port.mk>
diff --git a/net/irrtoolset/distinfo b/net/irrtoolset/distinfo
deleted file mode 100644
index bf0f43d9ff9e..000000000000
--- a/net/irrtoolset/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (RAToolSet-3.5.8.tar.gz) = 4c7a04539a878ba3bcc5a6de3d12ac38
diff --git a/net/irrtoolset/files/patch-aa b/net/irrtoolset/files/patch-aa
deleted file mode 100644
index b4052b639c36..000000000000
--- a/net/irrtoolset/files/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/misc/net.hh.orig	Wed Jan 28 17:40:42 1998
-+++ src/misc/net.hh	Sat Nov 27 18:11:23 1999
-@@ -86,12 +86,12 @@
- int bind    (...);
- int listen  (...);
- int accept  (...);
--int recvfrom(...);
-+ssize_t recvfrom(...);
- int gethostname (...);
- int setsockopt  (...);
- int select (...);
--int sendto (...);
--int send   (...);
-+ssize_t sendto (...);
-+ssize_t send   (...);
- int gettimeofday (...);
- }
- 
-@@ -132,7 +132,7 @@
- class Timer {
-     struct timeval tv;
-     struct timezone tz;
--    init_time () {
-+    void init_time () {
- 	bzero ((char *) &tv, sizeof (struct timeval));
- 	::gettimeofday (&tv, &tz);
-     }
-@@ -256,7 +256,7 @@
- 	return ptr;
-     }
-     u_long getInaddr () { return hexaddr; }
--    print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); }
-+    void print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); }
- 
-     Error error;
- };
-@@ -331,7 +331,7 @@
- 	    error.warn("listen");
- 	return error();
-     }
--    accept () {
-+    int accept () {
- 	//u_long addrlen;
- 	int addrlen = sizeof (struct sockaddr);
- 	bzero ((char *) &socknew, sizeof (socknew));
diff --git a/net/irrtoolset/files/patch-ab b/net/irrtoolset/files/patch-ab
deleted file mode 100644
index 6566ed2b1af4..000000000000
--- a/net/irrtoolset/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/dbase/Route.hh.orig	Sat Nov 27 18:08:21 1999
-+++ src/dbase/Route.hh	Sat Nov 27 18:08:41 1999
-@@ -92,7 +92,7 @@
-       clear();
-    }
- 
--   clear () {
-+   void clear () {
-       pix = NULL;
-       _dontcare = 0;
-    }
-@@ -248,7 +248,7 @@
-       pref = 0;
-    }
- 
--   set (Pix asn, int p) {
-+   void set (Pix asn, int p) {
-       asno = asn;
-       pref = p;
-    }
diff --git a/net/irrtoolset/files/patch-ac b/net/irrtoolset/files/patch-ac
deleted file mode 100644
index ca2b0e1d8f1f..000000000000
--- a/net/irrtoolset/files/patch-ac
+++ /dev/null
@@ -1,208 +0,0 @@
---- src/dbase/Node.h.orig	Sat Nov 27 18:11:57 1999
-+++ src/dbase/Node.h	Sat Nov 27 18:16:21 1999
-@@ -101,7 +101,7 @@
-   protected:
-    virtual void print(ostream &os) = 0;
-   public:
--   virtual operator== (Node &b) = 0;
-+   virtual int operator== (Node &b) = 0;
-    virtual void InOrderPrint() = 0;
-    virtual void PostOrderPrint() { InOrderPrint(); }
-    virtual ~Node() {};
-@@ -144,7 +144,7 @@
-    virtual void print(ostream &os) = 0;
- 
-   public:
--   virtual Execute(Route &r) = 0;
-+   virtual void Execute(Route &r) = 0;
-    virtual ActionNode *FindFirst(Node_t _type) = 0;
-    int operator< (ActionNode &b);
-    friend ostream &operator<<(ostream &os, ActionNode *an) {
-@@ -172,7 +172,7 @@
-       type = T_ANDNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_ANDNode 
- 	 && left  == ((ANDNode&) b).left
- 	 && right == ((ANDNode&) b).right;
-@@ -200,7 +200,7 @@
-       type = T_ORNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_ORNode 
- 	 && left  == ((ORNode&) b).left
- 	 && right == ((ORNode&) b).right;
-@@ -227,7 +227,7 @@
-       type = T_NotNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_NotNode 
- 	 && left  == ((NotNode&) b).left;
-    }
-@@ -256,7 +256,7 @@
-       type = T_AssignNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_AssignNode 
- 	 && val == ((AssignNode&) b).val
- 	 && left  == ((AssignNode&) b).left;
-@@ -281,7 +281,7 @@
-       type = T_ANYNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_ANYNode;
-    }
- 
-@@ -305,7 +305,7 @@
-       type = T_ASNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_ASNode 
- 	 && val == ((ASNode&) b).val;
-    }
-@@ -330,7 +330,7 @@
-       type = T_ASMacroNode;
-   }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_ASMacroNode 
- 	 && val == ((ASMacroNode&) b).val;
-    }
-@@ -355,7 +355,7 @@
-       type = T_CommNode;
-    }
- 
--    virtual operator== (Node& b) {
-+    virtual int operator== (Node& b) {
-       return b.type == T_CommNode 
- 	 && val == ((CommNode&) b).val;
-    }
-@@ -382,7 +382,7 @@
-       cidr_root = NULL;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_NetListNode 
- 	 && nets == ((NetListNode&) b).nets;
-    }
-@@ -391,7 +391,7 @@
-    virtual NormalExpression *Evaluate(int expand);
-    virtual int match(Route &r, char dontcare);
-    virtual int match_exact_or_more_specific(Route &r, char dontcare);
--   add(Pix pi) { nets.add(pi); }
-+   void add(Pix pi) { nets.add(pi); }
- };
- 
- ////////////////////////////// ASPathNode //////////////////////////////
-@@ -412,7 +412,7 @@
-       type = T_ASPathNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       ASSERT(0);
-       return 0;
-    }
-@@ -438,7 +438,7 @@
-       type = T_RegisterNode;
-    }
- 
--    virtual operator== (Node& b) {
-+    virtual int operator== (Node& b) {
-       return b.type == T_RegisterNode 
- 	 && val == ((RegisterNode&) b).val;
-    }
-@@ -460,13 +460,13 @@
-       type = T_PrefNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_PrefNode 
- 	 && val == ((PrefNode&) b).val;
-    }
- 
-    virtual void InOrderPrint();
--   virtual Execute(Route &r) {
-+   virtual void Execute(Route &r) {
-    }
-    virtual ActionNode *FindFirst(Node_t _type) {
-       if (type == _type)
-@@ -492,13 +492,13 @@
-       type = T_MEDNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_MEDNode 
- 	 && val == ((MEDNode&) b).val;
-    }
- 
-    virtual void InOrderPrint();
--   virtual Execute(Route &r) {
-+   virtual void Execute(Route &r) {
-    }
-    virtual ActionNode *FindFirst(Node_t _type) {
-       if (type == _type)
-@@ -524,13 +524,13 @@
-       type = T_DPANode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_DPANode 
- 	 && val == ((DPANode&) b).val;
-    }
- 
-    virtual void InOrderPrint();
--   virtual Execute(Route &r) {
-+   virtual void Execute(Route &r) {
-    }
-    virtual ActionNode *FindFirst(Node_t _type) {
-       if (type == _type)
-@@ -552,12 +552,12 @@
-       type = T_NoopNode;
-    }
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_NoopNode;
-    }
- 
-    virtual void InOrderPrint();
--   virtual Execute(Route &r) {}
-+   virtual void Execute(Route &r) {}
-    virtual ActionNode *FindFirst(Node_t _type) {
-       if (type == _type)
- 	 return this;
-@@ -581,14 +581,14 @@
-    }
-    virtual ~ComposeNode();
- 
--   virtual operator== (Node& b) {
-+   virtual int operator== (Node& b) {
-       return b.type == T_ComposeNode
- 	 && left  == ((ComposeNode&) b).left
- 	 && right == ((ComposeNode&) b).right;
-    }
- 
-    virtual void InOrderPrint();
--   virtual Execute(Route &r) {}
-+   virtual void Execute(Route &r) {}
-    virtual ActionNode *FindFirst(Node_t _type) {
-       ActionNode *r;
-       if (type == _type)
diff --git a/net/irrtoolset/files/patch-ad b/net/irrtoolset/files/patch-ad
deleted file mode 100644
index d0560a973b2a..000000000000
--- a/net/irrtoolset/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/misc/Error.hh.orig	Sat Nov 27 18:17:24 1999
-+++ src/misc/Error.hh	Sat Nov 27 18:17:31 1999
-@@ -378,7 +378,7 @@
- 	reset();
-     }
- 
--    reset() {
-+    void reset() {
- 	errno = 0;
- 	level_ = ErrorNone;
- 	messages_.clear();
diff --git a/net/irrtoolset/files/patch-ae b/net/irrtoolset/files/patch-ae
deleted file mode 100644
index 8c3005236be0..000000000000
--- a/net/irrtoolset/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/peval/xx_lexer.y.orig	Sat Nov 27 18:18:56 1999
-+++ src/peval/xx_lexer.y	Sat Nov 27 18:19:07 1999
-@@ -94,7 +94,7 @@
- NULL,     ERROR_TKN
- };
- 
--static inline strtoupper(char *c) {
-+static inline void strtoupper(char *c) {
-    for (; *c; c++)
-       if (isascii(*c) && isalpha(*c))
- 	 *c = toupper(*c);
diff --git a/net/irrtoolset/files/patch-af b/net/irrtoolset/files/patch-af
deleted file mode 100644
index 50022888976a..000000000000
--- a/net/irrtoolset/files/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/misc/net.cc.orig	Sat Nov 27 18:20:31 1999
-+++ src/misc/net.cc	Sat Nov 27 18:21:15 1999
-@@ -215,6 +215,7 @@
-     init_server (p);
- }
- 
-+int
- TCP::init_server (int p) {
-     setLocalPort (p);
-     bind();
diff --git a/net/irrtoolset/files/patch-ag b/net/irrtoolset/files/patch-ag
deleted file mode 100644
index f5519df2a198..000000000000
--- a/net/irrtoolset/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dbase/irr_lexer.y.orig	Sat Nov 27 18:22:22 1999
-+++ src/dbase/irr_lexer.y	Sat Nov 27 18:22:44 1999
-@@ -73,7 +73,7 @@
- 
- #include <cctype>
- 
--static inline strtoupper(char *c) {
-+static inline void strtoupper(char *c) {
-    for (; *c; c++)
-       if (isascii(*c) && isalpha(*c))
- 	 *c = toupper(*c);
diff --git a/net/irrtoolset/files/patch-ah b/net/irrtoolset/files/patch-ah
deleted file mode 100644
index 4278782c08ab..000000000000
--- a/net/irrtoolset/files/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/dbase/irr_parser.y.orig	Sat Nov 27 18:23:53 1999
-+++ src/dbase/irr_parser.y	Sat Nov 27 18:25:00 1999
-@@ -90,7 +90,7 @@
- char *error_while_expecting = NULL;
- 
- static regexp_symbol *re_symbol;
--static insert_or_update_filter_action(ListHead<Filter_Action> &l, 
-+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, 
- 			    ActionNode *action, FilterNode *filter);
- static ASPolicy *find_or_insert_peer_as(Pix peer);
- static InterASPolicy *find_or_insert_peering(ASPolicy *p, Pix laddr, Pix raddr);
-@@ -635,7 +635,7 @@
-    return(0);
- }
- 
--static insert_or_update_filter_action(ListHead<Filter_Action> &l, 
-+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, 
- 				      ActionNode *action, FilterNode *filter) {
-    Filter_Action *fap, *fap2;
- 
diff --git a/net/irrtoolset/files/patch-ai b/net/irrtoolset/files/patch-ai
deleted file mode 100644
index 18de9569197e..000000000000
--- a/net/irrtoolset/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/roe/roe_config.hh.orig	Sat Nov 27 18:35:37 1999
-+++ src/roe/roe_config.hh	Sat Nov 27 18:36:14 1999
-@@ -42,7 +42,7 @@
- 
- class Configure {
- public:
--   const int size = 12;
-+   static const int size = 12;
- 
-    class DBUpdate {
-    public:
diff --git a/net/irrtoolset/files/patch-aj b/net/irrtoolset/files/patch-aj
deleted file mode 100644
index 6d190fb677b6..000000000000
--- a/net/irrtoolset/files/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/aoe/TclApp.cc.orig	Sat Nov 27 18:38:25 1999
-+++ src/aoe/TclApp.cc	Sat Nov 27 18:43:51 1999
-@@ -186,9 +186,9 @@
-    // Call Tcl function to create a Tcl command
-    if (Tcl_CreateCommand(ptInterp, 
- 			 pcCommand->getName(), 
--			 TclCommand::command,
-+			 &TclCommand::command,
- 			 (ClientData)pcCommand,
--			 TclCommand::cleanUp) == NULL) return 0;
-+			 &TclCommand::cleanUp) == NULL) return 0;
-    return 1;
- }
- 
diff --git a/net/irrtoolset/files/patch-ak b/net/irrtoolset/files/patch-ak
deleted file mode 100644
index 05060ae5f711..000000000000
--- a/net/irrtoolset/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/aoe/TclLabel.cc.orig	Sat Nov 27 18:45:09 1999
-+++ src/aoe/TclLabel.cc	Sat Nov 27 18:45:24 1999
-@@ -47,7 +47,7 @@
- #include "TclLabel.hh"
- #include "TclApp.hh"
- 
--TclLabel::clear(void)
-+int TclLabel::clear(void)
- {
-   TclApplication *pcApp = (TclApplication *)getExtraArgument();
-   return (pcApp->evalf("%s configure -text {}", getName()));
diff --git a/net/irrtoolset/files/patch-al b/net/irrtoolset/files/patch-al
deleted file mode 100644
index 49b068f99199..000000000000
--- a/net/irrtoolset/files/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/prtraceroute/netraw.hh.orig	Sat Nov 27 18:46:27 1999
-+++ src/prtraceroute/netraw.hh	Sat Nov 27 18:46:49 1999
-@@ -121,7 +121,7 @@
-     rawIP (int protocol = IPPROTO_RAW);
-     rawIP (char *hostname, int protocol = IPPROTO_RAW);
- 
--    setIpaddresses ();		// can be used for incoming packets.
-+    void setIpaddresses ();		// can be used for incoming packets.
- 
-     int write (){return rawPacket::write ((char *) ip_hdr, ip_hdr->ip_len);}
-     int send (){return rawPacket::send ((char *) ip_hdr, ip_hdr->ip_len);}
diff --git a/net/irrtoolset/files/patch-am b/net/irrtoolset/files/patch-am
deleted file mode 100644
index 70e7cb9572ed..000000000000
--- a/net/irrtoolset/files/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/prtraceroute/prtraceroute.hh.orig	Sat Nov 27 18:47:35 1999
-+++ src/prtraceroute/prtraceroute.hh	Sat Nov 27 18:47:45 1999
-@@ -121,7 +121,7 @@
-     u_int  flags;
-     void _add (ipAddr *ipaddr);
- 
--    _hop () {
-+    void _hop () {
- 	ipaddr = (ipAddr *) NULL;
- 	autnum = NULL;
- 	route = new Route();
diff --git a/net/irrtoolset/pkg-comment b/net/irrtoolset/pkg-comment
deleted file mode 100644
index 74aadb1512e4..000000000000
--- a/net/irrtoolset/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A suite of policy analysis tools
diff --git a/net/irrtoolset/pkg-descr b/net/irrtoolset/pkg-descr
deleted file mode 100644
index 5129fb44e3a5..000000000000
--- a/net/irrtoolset/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-RAToolSet is a suite of policy analysis tools.  It is implemented in C++ on a
-UNIX platform.  It has been ported successfully to many platforms including
-Sun Sparc stations running SunOS 4.1.3 or Solaris, FreeBSD, DEC Alphas
-running OSF/1, and BSDI.  It contains the following programs: 
-
-RtConfig	routing policies analyzer and router configuration tool
-
-peval		a low-level policy evaluation tool
-
-roe		route object editor
-
-CIDRAdvisor	suggests safe cidr aggregates
-
-aoe		autonomous system object editor
-
-pmatch		prints matching policies for destinations in aut-num objects
-
-prpath		enumerates a list of patchs between ASes and destinations
-
-prtraceroute	prints route and policy information packets take to a
-		network	host
-
-prcheck 	syntax checks the aut-num objects in the Internet Routing
-		Registry
diff --git a/net/irrtoolset/pkg-plist b/net/irrtoolset/pkg-plist
deleted file mode 100644
index a56f950cdc49..000000000000
--- a/net/irrtoolset/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/peval
-bin/pmatch
-bin/prpath
-bin/RtConfig
-bin/CIDRAdvisor
-bin/prcheck
-bin/irrstat
-bin/roe
-bin/aoe
-bin/relayd
-bin/prtraceroute
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
deleted file mode 100644
index f47dcb85db83..000000000000
--- a/net/isc-dhcp3-server/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         7 Mar 1996
-# Whom:                 se
-#
-# $FreeBSD$
-#
-
-PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b2.9
-CATEGORIES=	net
-MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b2pl${PORTVERSION:S/3.0.b2.//g}
-
-MAINTAINER=	obrien@FreeBSD.org
-
-Y2K=		http://www.isc.org/y2k.html
-
-HAS_CONFIGURE=	yes
-
-MAN3=		dhcpctl.3 omapi.3
-MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
-		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
-		dhcpd.leases.5
-MAN8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
-
-post-patch:
-	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/includes/dhcpd.h
-	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/client/scripts/freebsd
-.for MF in relay/Makefile.dist server/Makefile.dist client/Makefile.dist common/Makefile.dist dhcpctl/Makefile.dist minires/Makefile.dist omapip/Makefile.dist 
-	@${PERL} -pi.fbsd -e 's|^DEBUG[	 ]*=|DEBUG ?=|g ; s|^CFLAGS[	 ]*=|CFLAGS +=|g' ${WRKSRC}/${MF}
-.endfor
-
-post-install:
-	${TOUCH} /var/db/dhcpd.leases
-.for file in dhclient dhcpd dhcrelay
-	if [ -f ${PREFIX}/sbin/${file} ]; then \
-		strip ${PREFIX}/sbin/${file}; \
-	fi
-.endfor
-
-.include <bsd.port.mk>
diff --git a/net/isc-dhcp3-server/distinfo b/net/isc-dhcp3-server/distinfo
deleted file mode 100644
index 3e020dc2ee9a..000000000000
--- a/net/isc-dhcp3-server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (dhcp-3.0b2pl9.tar.gz) = 0081ed18bcd739318898450c80136efe
diff --git a/net/isc-dhcp3-server/files/patch-aj b/net/isc-dhcp3-server/files/patch-aj
deleted file mode 100644
index 14f7db13ff15..000000000000
--- a/net/isc-dhcp3-server/files/patch-aj
+++ /dev/null
@@ -1,43 +0,0 @@
---- includes/dhcpd.h.orig	Wed Feb  2 18:01:17 2000
-+++ includes/dhcpd.h	Mon Jul 17 21:21:04 2000
-@@ -329,7 +329,7 @@
- #endif
- 
- #ifndef CL_DEFAULT_SCRIPT_NAME
--# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
-+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script"
- #endif
- 
- #ifndef CL_DEFAULT_REQUESTED_OPTIONS
-@@ -771,11 +771,11 @@
- #define _PATH_DHCPD_DB		"dhcpd.leases"
- #else
- #ifndef _PATH_DHCPD_CONF
--#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
-+#define _PATH_DHCPD_CONF	"!!PREFIX!!/etc/dhcpd.conf"
- #endif
- 
- #ifndef _PATH_DHCPD_DB
--#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
-+#define _PATH_DHCPD_DB		"!!PREFIX!!/etc/dhcpd.leases"
- #endif
- 
- #ifndef _PATH_DHCPD_PID
-@@ -784,7 +784,7 @@
- #endif
- 
- #ifndef _PATH_DHCLIENT_CONF
--#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
-+#define _PATH_DHCLIENT_CONF	"!!PREFIX!!/etc/dhclient.conf"
- #endif
- 
- #ifndef _PATH_DHCLIENT_PID
-@@ -792,7 +792,7 @@
- #endif
- 
- #ifndef _PATH_DHCLIENT_DB
--#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
-+#define _PATH_DHCLIENT_DB	"!!PREFIX!!/etc/dhclient.leases"
- #endif
- 
- #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp3-server/files/patch-clparse.c b/net/isc-dhcp3-server/files/patch-clparse.c
deleted file mode 100644
index f2da52a15884..000000000000
--- a/net/isc-dhcp3-server/files/patch-clparse.c
+++ /dev/null
@@ -1,5 +0,0 @@
---- client/clparse.c.orig	Wed Jul 19 21:13:10 2000
-+++ client/clparse.c	Thu Jul 20 21:52:53 2000
-@@ -46 +46 @@
--char client_script_name [] = "/etc/dhclient-script";
-+char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;
diff --git a/net/isc-dhcp3-server/files/patch-dhclient.8 b/net/isc-dhcp3-server/files/patch-dhclient.8
deleted file mode 100644
index 160c451e445b..000000000000
--- a/net/isc-dhcp3-server/files/patch-dhclient.8
+++ /dev/null
@@ -1,23 +0,0 @@
---- client/dhclient.8.orig	Wed May 10 02:36:03 2000
-+++ client/dhclient.8	Wed May 10 02:39:43 2000
-@@ -34,7 +34,7 @@
- .B -q
- ]
- [
--.B -c
-+.B -1
- ]
- [
- .B -lf
-@@ -170,6 +170,11 @@
- .B -q
- flag prevents any messages other than errors from being printed to the
- standard error descriptor.
-+.PP
-+The
-+.B -1
-+flag cause dhclient to try once to get a lease.  If it fails, dhclient exits
-+with exit code two.
- .PP
- The DHCP client normally gets its configuration information from
- .B ETCDIR/dhclient.conf,
diff --git a/net/isc-dhcp3-server/files/patch-dhclient.c b/net/isc-dhcp3-server/files/patch-dhclient.c
deleted file mode 100644
index bb43074fbd36..000000000000
--- a/net/isc-dhcp3-server/files/patch-dhclient.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- client/dhclient.c.orig	Thu Sep 14 05:42:01 2000
-+++ client/dhclient.c	Wed Sep 27 03:31:33 2000
-@@ -78,6 +78,7 @@
- u_int16_t remote_port;
- int no_daemon;
- int save_scripts;
-+int onetry;
- 
- static void usage PROTO ((void));
- 
-@@ -176,6 +177,8 @@
- 		} else if (!strcmp (argv [i], "-w")) {
- 			/* do not exit if there are no broadcast interfaces. */
- 			persist = 1;
-+		} else if (!strcmp (argv [i], "-1")) {
-+			onetry = 1;
-  		} else if (argv [i][0] == '-') {
-  		    usage ();
-  		} else {
-@@ -417,7 +420,7 @@
- 	log_info (arr);
- 	log_info (url);
- 
--	log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
-+	log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
- 		   "[-s server]");
- 	log_fatal ("                [-lf lease-file] [-pf pid-file]%s",
- 		   "[-cf config-file] [interface]");
-@@ -1402,6 +1405,10 @@
- 	/* No leases were available, or what was available didn't work, so
- 	   tell the shell script that we failed to allocate an address,
- 	   and try again later. */
-+	if (onetry) {
-+		exit(2);
-+		log_info ("Unable to obtain a lease on first try - exiting.\n");
-+	}
- 	log_info ("No working leases in persistent database - sleeping.");
- 	script_init (client, "FAIL", (struct string_list *)0);
- 	if (client -> alias)
diff --git a/net/isc-dhcp3-server/files/patch-freebsd b/net/isc-dhcp3-server/files/patch-freebsd
deleted file mode 100644
index 293aa2a33130..000000000000
--- a/net/isc-dhcp3-server/files/patch-freebsd
+++ /dev/null
@@ -1,89 +0,0 @@
---- client/scripts/freebsd.orig	Wed Sep 20 02:38:03 2000
-+++ client/scripts/freebsd	Wed Sep 27 03:33:29 2000
-@@ -1,5 +1,11 @@
- #!/bin/sh
- 
-+if [ -x /usr/bin/logger ]; then
-+	LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
-+else
-+	LOGGER=echo
-+fi
-+
- make_resolv_conf() {
-   echo search $new_domain_name >/etc/resolv.conf
-   for nameserver in $new_domain_name_servers; do
-@@ -10,17 +16,17 @@
- # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
- exit_with_hooks() {
-   exit_status=$1
--  if [ -x /etc/dhclient-exit-hooks ]; then
--    . /etc/dhclient-exit-hooks
-+  if [ -x !!PREFIX!!/etc/dhclient-exit-hooks ]; then
-+    . !!PREFIX!!/etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-   exit $exit_status
- }
- 
- # Invoke the local dhcp client enter hooks, if they exist.
--if [ -x /etc/dhclient-enter-hooks ]; then
-+if [ -x !!PREFIX!!/etc/dhclient-enter-hooks ]; then
-   exit_status=0
--  . /etc/dhclient-enter-hooks
-+  . !!PREFIX!!/etc/dhclient-enter-hooks
-   # allow the local script to abort processing of this state
-   # local script must set exit_status variable to nonzero.
-   if [ $exit_status -ne 0 ]; then
-@@ -29,11 +35,10 @@
- fi
- 
- if [ x$new_network_number != x ]; then
--   echo New Network Number: $new_network_number
-+   $LOGGER "New Network Number: $new_network_number"
- fi
- 
- if [ x$new_broadcast_address != x ]; then
-- echo New Broadcast Address: $new_broadcast_address
-   new_broadcast_arg="broadcast $new_broadcast_address"
- fi
- if [ x$old_broadcast_address != x ]; then
-@@ -77,6 +82,7 @@
-      [ x$current_hostname = x$old_host_name ]; then
-     if [ x$current_hostname = x ] || \
-        [ x$new_host_name != x$old_host_name ]; then
-+      $LOGGER "New Hostname: $new_host_name"
-       hostname $new_host_name
-     fi
-   fi
-@@ -105,11 +111,18 @@
-      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
-     ifconfig $interface inet $new_ip_address $new_netmask_arg \
- 					$new_broadcast_arg $medium
-+    $LOGGER "New IP Address($interface): $new_ip_address"
-+    $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
-+    $LOGGER "New Broadcast Address($interface): $new_broadcast_address"
-+    if [ "$new_routers" != "" ]; then
-+      $LOGGER "New Routers: $new_routers"
-+    fi
-     route add $new_ip_address 127.1 >/dev/null 2>&1
-     for router in $new_routers; do
-       route add default $router >/dev/null 2>&1
-     done
-     if [ "$new_static_routes" != "" ]; then
-+      $LOGGER "New Static Routes: $new_static_routes"
-       set $new_static_routes
-       while [ $# -gt 1 ]; do
- 	route add $1 $2
-@@ -161,8 +174,12 @@
-   fi
-   ifconfig $interface inet $new_ip_address $new_netmask_arg \
- 					$new_broadcast_arg $medium
-+  $LOGGER "New IP Address($interface): $new_ip_address"
-+  $LOGGER "New Subnet Mask($interface): $new_subnet_mask"
-+  $LOGGER "New Broadcast Address($interface): $new_broadcast_address"
-   sleep 1
-   if [ "$new_routers" != "" ]; then
-+    $LOGGER "New Routers: $new_routers"
-     set $new_routers
-     if ping -q -c 1 $1; then
-       if [ x$new_ip_address != x$alias_ip_address ] && \
diff --git a/net/isc-dhcp3-server/files/patch-site.conf b/net/isc-dhcp3-server/files/patch-site.conf
deleted file mode 100644
index afe3d066ff89..000000000000
--- a/net/isc-dhcp3-server/files/patch-site.conf
+++ /dev/null
@@ -1,23 +0,0 @@
---- site.conf.orig	Wed Jul  7 08:20:10 1999
-+++ site.conf	Tue Oct  3 08:59:57 2000
-@@ -1,2 +1,20 @@
- # Put local site configuration stuff here to override the default
- # settings in Makefile.conf
-+
-+PREFIX ?=	/usr/local
-+
-+ETC =		$(PREFIX)/etc
-+BINDIR =	$(PREFIX)/sbin
-+CLIENTBINDIR =	$(PREFIX)/sbin
-+MANCAT =	man
-+ADMMANDIR =	$(PREFIX)/man/man8
-+ADMMANEXT =	.8
-+FFMANDIR =	$(PREFIX)/man/man5
-+FFMANEXT =	.5
-+LIBMANDIR =	$(PREFIX)/man/man3
-+LIBMANEXT =	.3
-+
-+DEBUG ?=	#none
-+CFLAGS +=	-DCL_DEFAULT_SCRIPT_NAME=\"$(ETC)/dhclient-script\"
-+CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
-+CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
diff --git a/net/isc-dhcp3-server/pkg-comment b/net/isc-dhcp3-server/pkg-comment
deleted file mode 100644
index 77d728a4ed55..000000000000
--- a/net/isc-dhcp3-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ISC Dynamic Host Configuration Protocol client and server code
diff --git a/net/isc-dhcp3-server/pkg-descr b/net/isc-dhcp3-server/pkg-descr
deleted file mode 100644
index 46bdf5ebae8e..000000000000
--- a/net/isc-dhcp3-server/pkg-descr
+++ /dev/null
@@ -1,28 +0,0 @@
-ISC-DHCP Dynamic Host Configuration Protocol server
-
-This is a release of the Internet Software Consortium
-DHCP Server (ISC dhcpd).  In this release, support for the core
-DHCP protocol is provided.  BOOTP support is also provided for
-backwards compatibility. 
-
-Version 3, Beta 2 of the ISC DHCP Distribution includes the following
-features that are new since version 2.0: 
-
-    * DHCP Failover Protocol support 
-    * OMAPI, an API for accessing and modifying the DHCP
-      server and client state. 
-    * Conditional behaviour 
-    * Storing arbitrary information on leases 
-    * Address pools with access control 
-    * Client classing 
-    * Address allocation restriction by class 
-    * Relay agent information option support 
-    * Dynamic DNS updates 
-    * Many bug fixes, performance enhancements, and minor
-      new DHCP protocol features. 
-
-A fully-featured implementation of dynamic DNS updates is included in
-this release.  There are no build dependencies with any BIND version.
-
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp3-server/pkg-plist b/net/isc-dhcp3-server/pkg-plist
deleted file mode 100644
index 7a882e2ce1c7..000000000000
--- a/net/isc-dhcp3-server/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-etc/dhclient-script
-sbin/dhclient
-sbin/dhcpd
-sbin/dhcrelay
-@exec touch /var/db/dhcpd.leases
-@exec touch %D/etc/dhclient.conf
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
deleted file mode 100644
index f47dcb85db83..000000000000
--- a/net/isc-dhcp30-server/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         7 Mar 1996
-# Whom:                 se
-#
-# $FreeBSD$
-#
-
-PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b2.9
-CATEGORIES=	net
-MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b2pl${PORTVERSION:S/3.0.b2.//g}
-
-MAINTAINER=	obrien@FreeBSD.org
-
-Y2K=		http://www.isc.org/y2k.html
-
-HAS_CONFIGURE=	yes
-
-MAN3=		dhcpctl.3 omapi.3
-MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
-		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
-		dhcpd.leases.5
-MAN8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
-
-post-patch:
-	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/includes/dhcpd.h
-	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/client/scripts/freebsd
-.for MF in relay/Makefile.dist server/Makefile.dist client/Makefile.dist common/Makefile.dist dhcpctl/Makefile.dist minires/Makefile.dist omapip/Makefile.dist 
-	@${PERL} -pi.fbsd -e 's|^DEBUG[	 ]*=|DEBUG ?=|g ; s|^CFLAGS[	 ]*=|CFLAGS +=|g' ${WRKSRC}/${MF}
-.endfor
-
-post-install:
-	${TOUCH} /var/db/dhcpd.leases
-.for file in dhclient dhcpd dhcrelay
-	if [ -f ${PREFIX}/sbin/${file} ]; then \
-		strip ${PREFIX}/sbin/${file}; \
-	fi
-.endfor
-
-.include <bsd.port.mk>
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
deleted file mode 100644
index 3e020dc2ee9a..000000000000
--- a/net/isc-dhcp30-server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (dhcp-3.0b2pl9.tar.gz) = 0081ed18bcd739318898450c80136efe
diff --git a/net/isc-dhcp30-server/files/patch-aj b/net/isc-dhcp30-server/files/patch-aj
deleted file mode 100644
index 14f7db13ff15..000000000000
--- a/net/isc-dhcp30-server/files/patch-aj
+++ /dev/null
@@ -1,43 +0,0 @@
---- includes/dhcpd.h.orig	Wed Feb  2 18:01:17 2000
-+++ includes/dhcpd.h	Mon Jul 17 21:21:04 2000
-@@ -329,7 +329,7 @@
- #endif
- 
- #ifndef CL_DEFAULT_SCRIPT_NAME
--# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
-+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script"
- #endif
- 
- #ifndef CL_DEFAULT_REQUESTED_OPTIONS
-@@ -771,11 +771,11 @@
- #define _PATH_DHCPD_DB		"dhcpd.leases"
- #else
- #ifndef _PATH_DHCPD_CONF
--#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
-+#define _PATH_DHCPD_CONF	"!!PREFIX!!/etc/dhcpd.conf"
- #endif
- 
- #ifndef _PATH_DHCPD_DB
--#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
-+#define _PATH_DHCPD_DB		"!!PREFIX!!/etc/dhcpd.leases"
- #endif
- 
- #ifndef _PATH_DHCPD_PID
-@@ -784,7 +784,7 @@
- #endif
- 
- #ifndef _PATH_DHCLIENT_CONF
--#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
-+#define _PATH_DHCLIENT_CONF	"!!PREFIX!!/etc/dhclient.conf"
- #endif
- 
- #ifndef _PATH_DHCLIENT_PID
-@@ -792,7 +792,7 @@
- #endif
- 
- #ifndef _PATH_DHCLIENT_DB
--#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
-+#define _PATH_DHCLIENT_DB	"!!PREFIX!!/etc/dhclient.leases"
- #endif
- 
- #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp30-server/files/patch-clparse.c b/net/isc-dhcp30-server/files/patch-clparse.c
deleted file mode 100644
index f2da52a15884..000000000000
--- a/net/isc-dhcp30-server/files/patch-clparse.c
+++ /dev/null
@@ -1,5 +0,0 @@
---- client/clparse.c.orig	Wed Jul 19 21:13:10 2000
-+++ client/clparse.c	Thu Jul 20 21:52:53 2000
-@@ -46 +46 @@
--char client_script_name [] = "/etc/dhclient-script";
-+char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;
diff --git a/net/isc-dhcp30-server/files/patch-dhclient.8 b/net/isc-dhcp30-server/files/patch-dhclient.8
deleted file mode 100644
index 160c451e445b..000000000000
--- a/net/isc-dhcp30-server/files/patch-dhclient.8
+++ /dev/null
@@ -1,23 +0,0 @@
---- client/dhclient.8.orig	Wed May 10 02:36:03 2000
-+++ client/dhclient.8	Wed May 10 02:39:43 2000
-@@ -34,7 +34,7 @@
- .B -q
- ]
- [
--.B -c
-+.B -1
- ]
- [
- .B -lf
-@@ -170,6 +170,11 @@
- .B -q
- flag prevents any messages other than errors from being printed to the
- standard error descriptor.
-+.PP
-+The
-+.B -1
-+flag cause dhclient to try once to get a lease.  If it fails, dhclient exits
-+with exit code two.
- .PP
- The DHCP client normally gets its configuration information from
- .B ETCDIR/dhclient.conf,
diff --git a/net/isc-dhcp30-server/files/patch-dhclient.c b/net/isc-dhcp30-server/files/patch-dhclient.c
deleted file mode 100644
index bb43074fbd36..000000000000
--- a/net/isc-dhcp30-server/files/patch-dhclient.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- client/dhclient.c.orig	Thu Sep 14 05:42:01 2000
-+++ client/dhclient.c	Wed Sep 27 03:31:33 2000
-@@ -78,6 +78,7 @@
- u_int16_t remote_port;
- int no_daemon;
- int save_scripts;
-+int onetry;
- 
- static void usage PROTO ((void));
- 
-@@ -176,6 +177,8 @@
- 		} else if (!strcmp (argv [i], "-w")) {
- 			/* do not exit if there are no broadcast interfaces. */
- 			persist = 1;
-+		} else if (!strcmp (argv [i], "-1")) {
-+			onetry = 1;
-  		} else if (argv [i][0] == '-') {
-  		    usage ();
-  		} else {
-@@ -417,7 +420,7 @@
- 	log_info (arr);
- 	log_info (url);
- 
--	log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
-+	log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
- 		   "[-s server]");
- 	log_fatal ("                [-lf lease-file] [-pf pid-file]%s",
- 		   "[-cf config-file] [interface]");
-@@ -1402,6 +1405,10 @@
- 	/* No leases were available, or what was available didn't work, so
- 	   tell the shell script that we failed to allocate an address,
- 	   and try again later. */
-+	if (onetry) {
-+		exit(2);
-+		log_info ("Unable to obtain a lease on first try - exiting.\n");
-+	}
- 	log_info ("No working leases in persistent database - sleeping.");
- 	script_init (client, "FAIL", (struct string_list *)0);
- 	if (client -> alias)
diff --git a/net/isc-dhcp30-server/files/patch-freebsd b/net/isc-dhcp30-server/files/patch-freebsd
deleted file mode 100644
index 293aa2a33130..000000000000
--- a/net/isc-dhcp30-server/files/patch-freebsd
+++ /dev/null
@@ -1,89 +0,0 @@
---- client/scripts/freebsd.orig	Wed Sep 20 02:38:03 2000
-+++ client/scripts/freebsd	Wed Sep 27 03:33:29 2000
-@@ -1,5 +1,11 @@
- #!/bin/sh
- 
-+if [ -x /usr/bin/logger ]; then
-+	LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
-+else
-+	LOGGER=echo
-+fi
-+
- make_resolv_conf() {
-   echo search $new_domain_name >/etc/resolv.conf
-   for nameserver in $new_domain_name_servers; do
-@@ -10,17 +16,17 @@
- # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
- exit_with_hooks() {
-   exit_status=$1
--  if [ -x /etc/dhclient-exit-hooks ]; then
--    . /etc/dhclient-exit-hooks
-+  if [ -x !!PREFIX!!/etc/dhclient-exit-hooks ]; then
-+    . !!PREFIX!!/etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-   exit $exit_status
- }
- 
- # Invoke the local dhcp client enter hooks, if they exist.
--if [ -x /etc/dhclient-enter-hooks ]; then
-+if [ -x !!PREFIX!!/etc/dhclient-enter-hooks ]; then
-   exit_status=0
--  . /etc/dhclient-enter-hooks
-+  . !!PREFIX!!/etc/dhclient-enter-hooks
-   # allow the local script to abort processing of this state
-   # local script must set exit_status variable to nonzero.
-   if [ $exit_status -ne 0 ]; then
-@@ -29,11 +35,10 @@
- fi
- 
- if [ x$new_network_number != x ]; then
--   echo New Network Number: $new_network_number
-+   $LOGGER "New Network Number: $new_network_number"
- fi
- 
- if [ x$new_broadcast_address != x ]; then
-- echo New Broadcast Address: $new_broadcast_address
-   new_broadcast_arg="broadcast $new_broadcast_address"
- fi
- if [ x$old_broadcast_address != x ]; then
-@@ -77,6 +82,7 @@
-      [ x$current_hostname = x$old_host_name ]; then
-     if [ x$current_hostname = x ] || \
-        [ x$new_host_name != x$old_host_name ]; then
-+      $LOGGER "New Hostname: $new_host_name"
-       hostname $new_host_name
-     fi
-   fi
-@@ -105,11 +111,18 @@
-      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
-     ifconfig $interface inet $new_ip_address $new_netmask_arg \
- 					$new_broadcast_arg $medium
-+    $LOGGER "New IP Address($interface): $new_ip_address"
-+    $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
-+    $LOGGER "New Broadcast Address($interface): $new_broadcast_address"
-+    if [ "$new_routers" != "" ]; then
-+      $LOGGER "New Routers: $new_routers"
-+    fi
-     route add $new_ip_address 127.1 >/dev/null 2>&1
-     for router in $new_routers; do
-       route add default $router >/dev/null 2>&1
-     done
-     if [ "$new_static_routes" != "" ]; then
-+      $LOGGER "New Static Routes: $new_static_routes"
-       set $new_static_routes
-       while [ $# -gt 1 ]; do
- 	route add $1 $2
-@@ -161,8 +174,12 @@
-   fi
-   ifconfig $interface inet $new_ip_address $new_netmask_arg \
- 					$new_broadcast_arg $medium
-+  $LOGGER "New IP Address($interface): $new_ip_address"
-+  $LOGGER "New Subnet Mask($interface): $new_subnet_mask"
-+  $LOGGER "New Broadcast Address($interface): $new_broadcast_address"
-   sleep 1
-   if [ "$new_routers" != "" ]; then
-+    $LOGGER "New Routers: $new_routers"
-     set $new_routers
-     if ping -q -c 1 $1; then
-       if [ x$new_ip_address != x$alias_ip_address ] && \
diff --git a/net/isc-dhcp30-server/files/patch-site.conf b/net/isc-dhcp30-server/files/patch-site.conf
deleted file mode 100644
index afe3d066ff89..000000000000
--- a/net/isc-dhcp30-server/files/patch-site.conf
+++ /dev/null
@@ -1,23 +0,0 @@
---- site.conf.orig	Wed Jul  7 08:20:10 1999
-+++ site.conf	Tue Oct  3 08:59:57 2000
-@@ -1,2 +1,20 @@
- # Put local site configuration stuff here to override the default
- # settings in Makefile.conf
-+
-+PREFIX ?=	/usr/local
-+
-+ETC =		$(PREFIX)/etc
-+BINDIR =	$(PREFIX)/sbin
-+CLIENTBINDIR =	$(PREFIX)/sbin
-+MANCAT =	man
-+ADMMANDIR =	$(PREFIX)/man/man8
-+ADMMANEXT =	.8
-+FFMANDIR =	$(PREFIX)/man/man5
-+FFMANEXT =	.5
-+LIBMANDIR =	$(PREFIX)/man/man3
-+LIBMANEXT =	.3
-+
-+DEBUG ?=	#none
-+CFLAGS +=	-DCL_DEFAULT_SCRIPT_NAME=\"$(ETC)/dhclient-script\"
-+CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
-+CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
diff --git a/net/isc-dhcp30-server/pkg-comment b/net/isc-dhcp30-server/pkg-comment
deleted file mode 100644
index 77d728a4ed55..000000000000
--- a/net/isc-dhcp30-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ISC Dynamic Host Configuration Protocol client and server code
diff --git a/net/isc-dhcp30-server/pkg-descr b/net/isc-dhcp30-server/pkg-descr
deleted file mode 100644
index 46bdf5ebae8e..000000000000
--- a/net/isc-dhcp30-server/pkg-descr
+++ /dev/null
@@ -1,28 +0,0 @@
-ISC-DHCP Dynamic Host Configuration Protocol server
-
-This is a release of the Internet Software Consortium
-DHCP Server (ISC dhcpd).  In this release, support for the core
-DHCP protocol is provided.  BOOTP support is also provided for
-backwards compatibility. 
-
-Version 3, Beta 2 of the ISC DHCP Distribution includes the following
-features that are new since version 2.0: 
-
-    * DHCP Failover Protocol support 
-    * OMAPI, an API for accessing and modifying the DHCP
-      server and client state. 
-    * Conditional behaviour 
-    * Storing arbitrary information on leases 
-    * Address pools with access control 
-    * Client classing 
-    * Address allocation restriction by class 
-    * Relay agent information option support 
-    * Dynamic DNS updates 
-    * Many bug fixes, performance enhancements, and minor
-      new DHCP protocol features. 
-
-A fully-featured implementation of dynamic DNS updates is included in
-this release.  There are no build dependencies with any BIND version.
-
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp30-server/pkg-plist b/net/isc-dhcp30-server/pkg-plist
deleted file mode 100644
index 7a882e2ce1c7..000000000000
--- a/net/isc-dhcp30-server/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-etc/dhclient-script
-sbin/dhclient
-sbin/dhcpd
-sbin/dhcrelay
-@exec touch /var/db/dhcpd.leases
-@exec touch %D/etc/dhclient.conf
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
deleted file mode 100644
index f47dcb85db83..000000000000
--- a/net/isc-dhcp31-server/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         7 Mar 1996
-# Whom:                 se
-#
-# $FreeBSD$
-#
-
-PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b2.9
-CATEGORIES=	net
-MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b2pl${PORTVERSION:S/3.0.b2.//g}
-
-MAINTAINER=	obrien@FreeBSD.org
-
-Y2K=		http://www.isc.org/y2k.html
-
-HAS_CONFIGURE=	yes
-
-MAN3=		dhcpctl.3 omapi.3
-MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
-		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
-		dhcpd.leases.5
-MAN8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
-
-post-patch:
-	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/includes/dhcpd.h
-	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/client/scripts/freebsd
-.for MF in relay/Makefile.dist server/Makefile.dist client/Makefile.dist common/Makefile.dist dhcpctl/Makefile.dist minires/Makefile.dist omapip/Makefile.dist 
-	@${PERL} -pi.fbsd -e 's|^DEBUG[	 ]*=|DEBUG ?=|g ; s|^CFLAGS[	 ]*=|CFLAGS +=|g' ${WRKSRC}/${MF}
-.endfor
-
-post-install:
-	${TOUCH} /var/db/dhcpd.leases
-.for file in dhclient dhcpd dhcrelay
-	if [ -f ${PREFIX}/sbin/${file} ]; then \
-		strip ${PREFIX}/sbin/${file}; \
-	fi
-.endfor
-
-.include <bsd.port.mk>
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
deleted file mode 100644
index 3e020dc2ee9a..000000000000
--- a/net/isc-dhcp31-server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (dhcp-3.0b2pl9.tar.gz) = 0081ed18bcd739318898450c80136efe
diff --git a/net/isc-dhcp31-server/files/patch-aj b/net/isc-dhcp31-server/files/patch-aj
deleted file mode 100644
index 14f7db13ff15..000000000000
--- a/net/isc-dhcp31-server/files/patch-aj
+++ /dev/null
@@ -1,43 +0,0 @@
---- includes/dhcpd.h.orig	Wed Feb  2 18:01:17 2000
-+++ includes/dhcpd.h	Mon Jul 17 21:21:04 2000
-@@ -329,7 +329,7 @@
- #endif
- 
- #ifndef CL_DEFAULT_SCRIPT_NAME
--# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
-+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script"
- #endif
- 
- #ifndef CL_DEFAULT_REQUESTED_OPTIONS
-@@ -771,11 +771,11 @@
- #define _PATH_DHCPD_DB		"dhcpd.leases"
- #else
- #ifndef _PATH_DHCPD_CONF
--#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
-+#define _PATH_DHCPD_CONF	"!!PREFIX!!/etc/dhcpd.conf"
- #endif
- 
- #ifndef _PATH_DHCPD_DB
--#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
-+#define _PATH_DHCPD_DB		"!!PREFIX!!/etc/dhcpd.leases"
- #endif
- 
- #ifndef _PATH_DHCPD_PID
-@@ -784,7 +784,7 @@
- #endif
- 
- #ifndef _PATH_DHCLIENT_CONF
--#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
-+#define _PATH_DHCLIENT_CONF	"!!PREFIX!!/etc/dhclient.conf"
- #endif
- 
- #ifndef _PATH_DHCLIENT_PID
-@@ -792,7 +792,7 @@
- #endif
- 
- #ifndef _PATH_DHCLIENT_DB
--#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
-+#define _PATH_DHCLIENT_DB	"!!PREFIX!!/etc/dhclient.leases"
- #endif
- 
- #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp31-server/files/patch-clparse.c b/net/isc-dhcp31-server/files/patch-clparse.c
deleted file mode 100644
index f2da52a15884..000000000000
--- a/net/isc-dhcp31-server/files/patch-clparse.c
+++ /dev/null
@@ -1,5 +0,0 @@
---- client/clparse.c.orig	Wed Jul 19 21:13:10 2000
-+++ client/clparse.c	Thu Jul 20 21:52:53 2000
-@@ -46 +46 @@
--char client_script_name [] = "/etc/dhclient-script";
-+char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;
diff --git a/net/isc-dhcp31-server/files/patch-dhclient.8 b/net/isc-dhcp31-server/files/patch-dhclient.8
deleted file mode 100644
index 160c451e445b..000000000000
--- a/net/isc-dhcp31-server/files/patch-dhclient.8
+++ /dev/null
@@ -1,23 +0,0 @@
---- client/dhclient.8.orig	Wed May 10 02:36:03 2000
-+++ client/dhclient.8	Wed May 10 02:39:43 2000
-@@ -34,7 +34,7 @@
- .B -q
- ]
- [
--.B -c
-+.B -1
- ]
- [
- .B -lf
-@@ -170,6 +170,11 @@
- .B -q
- flag prevents any messages other than errors from being printed to the
- standard error descriptor.
-+.PP
-+The
-+.B -1
-+flag cause dhclient to try once to get a lease.  If it fails, dhclient exits
-+with exit code two.
- .PP
- The DHCP client normally gets its configuration information from
- .B ETCDIR/dhclient.conf,
diff --git a/net/isc-dhcp31-server/files/patch-dhclient.c b/net/isc-dhcp31-server/files/patch-dhclient.c
deleted file mode 100644
index bb43074fbd36..000000000000
--- a/net/isc-dhcp31-server/files/patch-dhclient.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- client/dhclient.c.orig	Thu Sep 14 05:42:01 2000
-+++ client/dhclient.c	Wed Sep 27 03:31:33 2000
-@@ -78,6 +78,7 @@
- u_int16_t remote_port;
- int no_daemon;
- int save_scripts;
-+int onetry;
- 
- static void usage PROTO ((void));
- 
-@@ -176,6 +177,8 @@
- 		} else if (!strcmp (argv [i], "-w")) {
- 			/* do not exit if there are no broadcast interfaces. */
- 			persist = 1;
-+		} else if (!strcmp (argv [i], "-1")) {
-+			onetry = 1;
-  		} else if (argv [i][0] == '-') {
-  		    usage ();
-  		} else {
-@@ -417,7 +420,7 @@
- 	log_info (arr);
- 	log_info (url);
- 
--	log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
-+	log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
- 		   "[-s server]");
- 	log_fatal ("                [-lf lease-file] [-pf pid-file]%s",
- 		   "[-cf config-file] [interface]");
-@@ -1402,6 +1405,10 @@
- 	/* No leases were available, or what was available didn't work, so
- 	   tell the shell script that we failed to allocate an address,
- 	   and try again later. */
-+	if (onetry) {
-+		exit(2);
-+		log_info ("Unable to obtain a lease on first try - exiting.\n");
-+	}
- 	log_info ("No working leases in persistent database - sleeping.");
- 	script_init (client, "FAIL", (struct string_list *)0);
- 	if (client -> alias)
diff --git a/net/isc-dhcp31-server/files/patch-freebsd b/net/isc-dhcp31-server/files/patch-freebsd
deleted file mode 100644
index 293aa2a33130..000000000000
--- a/net/isc-dhcp31-server/files/patch-freebsd
+++ /dev/null
@@ -1,89 +0,0 @@
---- client/scripts/freebsd.orig	Wed Sep 20 02:38:03 2000
-+++ client/scripts/freebsd	Wed Sep 27 03:33:29 2000
-@@ -1,5 +1,11 @@
- #!/bin/sh
- 
-+if [ -x /usr/bin/logger ]; then
-+	LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
-+else
-+	LOGGER=echo
-+fi
-+
- make_resolv_conf() {
-   echo search $new_domain_name >/etc/resolv.conf
-   for nameserver in $new_domain_name_servers; do
-@@ -10,17 +16,17 @@
- # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
- exit_with_hooks() {
-   exit_status=$1
--  if [ -x /etc/dhclient-exit-hooks ]; then
--    . /etc/dhclient-exit-hooks
-+  if [ -x !!PREFIX!!/etc/dhclient-exit-hooks ]; then
-+    . !!PREFIX!!/etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-   exit $exit_status
- }
- 
- # Invoke the local dhcp client enter hooks, if they exist.
--if [ -x /etc/dhclient-enter-hooks ]; then
-+if [ -x !!PREFIX!!/etc/dhclient-enter-hooks ]; then
-   exit_status=0
--  . /etc/dhclient-enter-hooks
-+  . !!PREFIX!!/etc/dhclient-enter-hooks
-   # allow the local script to abort processing of this state
-   # local script must set exit_status variable to nonzero.
-   if [ $exit_status -ne 0 ]; then
-@@ -29,11 +35,10 @@
- fi
- 
- if [ x$new_network_number != x ]; then
--   echo New Network Number: $new_network_number
-+   $LOGGER "New Network Number: $new_network_number"
- fi
- 
- if [ x$new_broadcast_address != x ]; then
-- echo New Broadcast Address: $new_broadcast_address
-   new_broadcast_arg="broadcast $new_broadcast_address"
- fi
- if [ x$old_broadcast_address != x ]; then
-@@ -77,6 +82,7 @@
-      [ x$current_hostname = x$old_host_name ]; then
-     if [ x$current_hostname = x ] || \
-        [ x$new_host_name != x$old_host_name ]; then
-+      $LOGGER "New Hostname: $new_host_name"
-       hostname $new_host_name
-     fi
-   fi
-@@ -105,11 +111,18 @@
-      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
-     ifconfig $interface inet $new_ip_address $new_netmask_arg \
- 					$new_broadcast_arg $medium
-+    $LOGGER "New IP Address($interface): $new_ip_address"
-+    $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
-+    $LOGGER "New Broadcast Address($interface): $new_broadcast_address"
-+    if [ "$new_routers" != "" ]; then
-+      $LOGGER "New Routers: $new_routers"
-+    fi
-     route add $new_ip_address 127.1 >/dev/null 2>&1
-     for router in $new_routers; do
-       route add default $router >/dev/null 2>&1
-     done
-     if [ "$new_static_routes" != "" ]; then
-+      $LOGGER "New Static Routes: $new_static_routes"
-       set $new_static_routes
-       while [ $# -gt 1 ]; do
- 	route add $1 $2
-@@ -161,8 +174,12 @@
-   fi
-   ifconfig $interface inet $new_ip_address $new_netmask_arg \
- 					$new_broadcast_arg $medium
-+  $LOGGER "New IP Address($interface): $new_ip_address"
-+  $LOGGER "New Subnet Mask($interface): $new_subnet_mask"
-+  $LOGGER "New Broadcast Address($interface): $new_broadcast_address"
-   sleep 1
-   if [ "$new_routers" != "" ]; then
-+    $LOGGER "New Routers: $new_routers"
-     set $new_routers
-     if ping -q -c 1 $1; then
-       if [ x$new_ip_address != x$alias_ip_address ] && \
diff --git a/net/isc-dhcp31-server/files/patch-site.conf b/net/isc-dhcp31-server/files/patch-site.conf
deleted file mode 100644
index afe3d066ff89..000000000000
--- a/net/isc-dhcp31-server/files/patch-site.conf
+++ /dev/null
@@ -1,23 +0,0 @@
---- site.conf.orig	Wed Jul  7 08:20:10 1999
-+++ site.conf	Tue Oct  3 08:59:57 2000
-@@ -1,2 +1,20 @@
- # Put local site configuration stuff here to override the default
- # settings in Makefile.conf
-+
-+PREFIX ?=	/usr/local
-+
-+ETC =		$(PREFIX)/etc
-+BINDIR =	$(PREFIX)/sbin
-+CLIENTBINDIR =	$(PREFIX)/sbin
-+MANCAT =	man
-+ADMMANDIR =	$(PREFIX)/man/man8
-+ADMMANEXT =	.8
-+FFMANDIR =	$(PREFIX)/man/man5
-+FFMANEXT =	.5
-+LIBMANDIR =	$(PREFIX)/man/man3
-+LIBMANEXT =	.3
-+
-+DEBUG ?=	#none
-+CFLAGS +=	-DCL_DEFAULT_SCRIPT_NAME=\"$(ETC)/dhclient-script\"
-+CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
-+CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
diff --git a/net/isc-dhcp31-server/pkg-comment b/net/isc-dhcp31-server/pkg-comment
deleted file mode 100644
index 77d728a4ed55..000000000000
--- a/net/isc-dhcp31-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ISC Dynamic Host Configuration Protocol client and server code
diff --git a/net/isc-dhcp31-server/pkg-descr b/net/isc-dhcp31-server/pkg-descr
deleted file mode 100644
index 46bdf5ebae8e..000000000000
--- a/net/isc-dhcp31-server/pkg-descr
+++ /dev/null
@@ -1,28 +0,0 @@
-ISC-DHCP Dynamic Host Configuration Protocol server
-
-This is a release of the Internet Software Consortium
-DHCP Server (ISC dhcpd).  In this release, support for the core
-DHCP protocol is provided.  BOOTP support is also provided for
-backwards compatibility. 
-
-Version 3, Beta 2 of the ISC DHCP Distribution includes the following
-features that are new since version 2.0: 
-
-    * DHCP Failover Protocol support 
-    * OMAPI, an API for accessing and modifying the DHCP
-      server and client state. 
-    * Conditional behaviour 
-    * Storing arbitrary information on leases 
-    * Address pools with access control 
-    * Client classing 
-    * Address allocation restriction by class 
-    * Relay agent information option support 
-    * Dynamic DNS updates 
-    * Many bug fixes, performance enhancements, and minor
-      new DHCP protocol features. 
-
-A fully-featured implementation of dynamic DNS updates is included in
-this release.  There are no build dependencies with any BIND version.
-
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist
deleted file mode 100644
index 7a882e2ce1c7..000000000000
--- a/net/isc-dhcp31-server/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-etc/dhclient-script
-sbin/dhclient
-sbin/dhcpd
-sbin/dhcrelay
-@exec touch /var/db/dhcpd.leases
-@exec touch %D/etc/dhclient.conf
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
deleted file mode 100644
index f47dcb85db83..000000000000
--- a/net/isc-dhcp40-server/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         7 Mar 1996
-# Whom:                 se
-#
-# $FreeBSD$
-#
-
-PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b2.9
-CATEGORIES=	net
-MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b2pl${PORTVERSION:S/3.0.b2.//g}
-
-MAINTAINER=	obrien@FreeBSD.org
-
-Y2K=		http://www.isc.org/y2k.html
-
-HAS_CONFIGURE=	yes
-
-MAN3=		dhcpctl.3 omapi.3
-MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
-		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
-		dhcpd.leases.5
-MAN8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
-
-post-patch:
-	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/includes/dhcpd.h
-	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/client/scripts/freebsd
-.for MF in relay/Makefile.dist server/Makefile.dist client/Makefile.dist common/Makefile.dist dhcpctl/Makefile.dist minires/Makefile.dist omapip/Makefile.dist 
-	@${PERL} -pi.fbsd -e 's|^DEBUG[	 ]*=|DEBUG ?=|g ; s|^CFLAGS[	 ]*=|CFLAGS +=|g' ${WRKSRC}/${MF}
-.endfor
-
-post-install:
-	${TOUCH} /var/db/dhcpd.leases
-.for file in dhclient dhcpd dhcrelay
-	if [ -f ${PREFIX}/sbin/${file} ]; then \
-		strip ${PREFIX}/sbin/${file}; \
-	fi
-.endfor
-
-.include <bsd.port.mk>
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
deleted file mode 100644
index 3e020dc2ee9a..000000000000
--- a/net/isc-dhcp40-server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (dhcp-3.0b2pl9.tar.gz) = 0081ed18bcd739318898450c80136efe
diff --git a/net/isc-dhcp40-server/files/patch-aj b/net/isc-dhcp40-server/files/patch-aj
deleted file mode 100644
index 14f7db13ff15..000000000000
--- a/net/isc-dhcp40-server/files/patch-aj
+++ /dev/null
@@ -1,43 +0,0 @@
---- includes/dhcpd.h.orig	Wed Feb  2 18:01:17 2000
-+++ includes/dhcpd.h	Mon Jul 17 21:21:04 2000
-@@ -329,7 +329,7 @@
- #endif
- 
- #ifndef CL_DEFAULT_SCRIPT_NAME
--# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
-+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script"
- #endif
- 
- #ifndef CL_DEFAULT_REQUESTED_OPTIONS
-@@ -771,11 +771,11 @@
- #define _PATH_DHCPD_DB		"dhcpd.leases"
- #else
- #ifndef _PATH_DHCPD_CONF
--#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
-+#define _PATH_DHCPD_CONF	"!!PREFIX!!/etc/dhcpd.conf"
- #endif
- 
- #ifndef _PATH_DHCPD_DB
--#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
-+#define _PATH_DHCPD_DB		"!!PREFIX!!/etc/dhcpd.leases"
- #endif
- 
- #ifndef _PATH_DHCPD_PID
-@@ -784,7 +784,7 @@
- #endif
- 
- #ifndef _PATH_DHCLIENT_CONF
--#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
-+#define _PATH_DHCLIENT_CONF	"!!PREFIX!!/etc/dhclient.conf"
- #endif
- 
- #ifndef _PATH_DHCLIENT_PID
-@@ -792,7 +792,7 @@
- #endif
- 
- #ifndef _PATH_DHCLIENT_DB
--#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
-+#define _PATH_DHCLIENT_DB	"!!PREFIX!!/etc/dhclient.leases"
- #endif
- 
- #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp40-server/files/patch-clparse.c b/net/isc-dhcp40-server/files/patch-clparse.c
deleted file mode 100644
index f2da52a15884..000000000000
--- a/net/isc-dhcp40-server/files/patch-clparse.c
+++ /dev/null
@@ -1,5 +0,0 @@
---- client/clparse.c.orig	Wed Jul 19 21:13:10 2000
-+++ client/clparse.c	Thu Jul 20 21:52:53 2000
-@@ -46 +46 @@
--char client_script_name [] = "/etc/dhclient-script";
-+char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;
diff --git a/net/isc-dhcp40-server/files/patch-dhclient.8 b/net/isc-dhcp40-server/files/patch-dhclient.8
deleted file mode 100644
index 160c451e445b..000000000000
--- a/net/isc-dhcp40-server/files/patch-dhclient.8
+++ /dev/null
@@ -1,23 +0,0 @@
---- client/dhclient.8.orig	Wed May 10 02:36:03 2000
-+++ client/dhclient.8	Wed May 10 02:39:43 2000
-@@ -34,7 +34,7 @@
- .B -q
- ]
- [
--.B -c
-+.B -1
- ]
- [
- .B -lf
-@@ -170,6 +170,11 @@
- .B -q
- flag prevents any messages other than errors from being printed to the
- standard error descriptor.
-+.PP
-+The
-+.B -1
-+flag cause dhclient to try once to get a lease.  If it fails, dhclient exits
-+with exit code two.
- .PP
- The DHCP client normally gets its configuration information from
- .B ETCDIR/dhclient.conf,
diff --git a/net/isc-dhcp40-server/files/patch-dhclient.c b/net/isc-dhcp40-server/files/patch-dhclient.c
deleted file mode 100644
index bb43074fbd36..000000000000
--- a/net/isc-dhcp40-server/files/patch-dhclient.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- client/dhclient.c.orig	Thu Sep 14 05:42:01 2000
-+++ client/dhclient.c	Wed Sep 27 03:31:33 2000
-@@ -78,6 +78,7 @@
- u_int16_t remote_port;
- int no_daemon;
- int save_scripts;
-+int onetry;
- 
- static void usage PROTO ((void));
- 
-@@ -176,6 +177,8 @@
- 		} else if (!strcmp (argv [i], "-w")) {
- 			/* do not exit if there are no broadcast interfaces. */
- 			persist = 1;
-+		} else if (!strcmp (argv [i], "-1")) {
-+			onetry = 1;
-  		} else if (argv [i][0] == '-') {
-  		    usage ();
-  		} else {
-@@ -417,7 +420,7 @@
- 	log_info (arr);
- 	log_info (url);
- 
--	log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
-+	log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
- 		   "[-s server]");
- 	log_fatal ("                [-lf lease-file] [-pf pid-file]%s",
- 		   "[-cf config-file] [interface]");
-@@ -1402,6 +1405,10 @@
- 	/* No leases were available, or what was available didn't work, so
- 	   tell the shell script that we failed to allocate an address,
- 	   and try again later. */
-+	if (onetry) {
-+		exit(2);
-+		log_info ("Unable to obtain a lease on first try - exiting.\n");
-+	}
- 	log_info ("No working leases in persistent database - sleeping.");
- 	script_init (client, "FAIL", (struct string_list *)0);
- 	if (client -> alias)
diff --git a/net/isc-dhcp40-server/files/patch-freebsd b/net/isc-dhcp40-server/files/patch-freebsd
deleted file mode 100644
index 293aa2a33130..000000000000
--- a/net/isc-dhcp40-server/files/patch-freebsd
+++ /dev/null
@@ -1,89 +0,0 @@
---- client/scripts/freebsd.orig	Wed Sep 20 02:38:03 2000
-+++ client/scripts/freebsd	Wed Sep 27 03:33:29 2000
-@@ -1,5 +1,11 @@
- #!/bin/sh
- 
-+if [ -x /usr/bin/logger ]; then
-+	LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
-+else
-+	LOGGER=echo
-+fi
-+
- make_resolv_conf() {
-   echo search $new_domain_name >/etc/resolv.conf
-   for nameserver in $new_domain_name_servers; do
-@@ -10,17 +16,17 @@
- # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
- exit_with_hooks() {
-   exit_status=$1
--  if [ -x /etc/dhclient-exit-hooks ]; then
--    . /etc/dhclient-exit-hooks
-+  if [ -x !!PREFIX!!/etc/dhclient-exit-hooks ]; then
-+    . !!PREFIX!!/etc/dhclient-exit-hooks
-   fi
- # probably should do something with exit status of the local script
-   exit $exit_status
- }
- 
- # Invoke the local dhcp client enter hooks, if they exist.
--if [ -x /etc/dhclient-enter-hooks ]; then
-+if [ -x !!PREFIX!!/etc/dhclient-enter-hooks ]; then
-   exit_status=0
--  . /etc/dhclient-enter-hooks
-+  . !!PREFIX!!/etc/dhclient-enter-hooks
-   # allow the local script to abort processing of this state
-   # local script must set exit_status variable to nonzero.
-   if [ $exit_status -ne 0 ]; then
-@@ -29,11 +35,10 @@
- fi
- 
- if [ x$new_network_number != x ]; then
--   echo New Network Number: $new_network_number
-+   $LOGGER "New Network Number: $new_network_number"
- fi
- 
- if [ x$new_broadcast_address != x ]; then
-- echo New Broadcast Address: $new_broadcast_address
-   new_broadcast_arg="broadcast $new_broadcast_address"
- fi
- if [ x$old_broadcast_address != x ]; then
-@@ -77,6 +82,7 @@
-      [ x$current_hostname = x$old_host_name ]; then
-     if [ x$current_hostname = x ] || \
-        [ x$new_host_name != x$old_host_name ]; then
-+      $LOGGER "New Hostname: $new_host_name"
-       hostname $new_host_name
-     fi
-   fi
-@@ -105,11 +111,18 @@
-      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
-     ifconfig $interface inet $new_ip_address $new_netmask_arg \
- 					$new_broadcast_arg $medium
-+    $LOGGER "New IP Address($interface): $new_ip_address"
-+    $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
-+    $LOGGER "New Broadcast Address($interface): $new_broadcast_address"
-+    if [ "$new_routers" != "" ]; then
-+      $LOGGER "New Routers: $new_routers"
-+    fi
-     route add $new_ip_address 127.1 >/dev/null 2>&1
-     for router in $new_routers; do
-       route add default $router >/dev/null 2>&1
-     done
-     if [ "$new_static_routes" != "" ]; then
-+      $LOGGER "New Static Routes: $new_static_routes"
-       set $new_static_routes
-       while [ $# -gt 1 ]; do
- 	route add $1 $2
-@@ -161,8 +174,12 @@
-   fi
-   ifconfig $interface inet $new_ip_address $new_netmask_arg \
- 					$new_broadcast_arg $medium
-+  $LOGGER "New IP Address($interface): $new_ip_address"
-+  $LOGGER "New Subnet Mask($interface): $new_subnet_mask"
-+  $LOGGER "New Broadcast Address($interface): $new_broadcast_address"
-   sleep 1
-   if [ "$new_routers" != "" ]; then
-+    $LOGGER "New Routers: $new_routers"
-     set $new_routers
-     if ping -q -c 1 $1; then
-       if [ x$new_ip_address != x$alias_ip_address ] && \
diff --git a/net/isc-dhcp40-server/files/patch-site.conf b/net/isc-dhcp40-server/files/patch-site.conf
deleted file mode 100644
index afe3d066ff89..000000000000
--- a/net/isc-dhcp40-server/files/patch-site.conf
+++ /dev/null
@@ -1,23 +0,0 @@
---- site.conf.orig	Wed Jul  7 08:20:10 1999
-+++ site.conf	Tue Oct  3 08:59:57 2000
-@@ -1,2 +1,20 @@
- # Put local site configuration stuff here to override the default
- # settings in Makefile.conf
-+
-+PREFIX ?=	/usr/local
-+
-+ETC =		$(PREFIX)/etc
-+BINDIR =	$(PREFIX)/sbin
-+CLIENTBINDIR =	$(PREFIX)/sbin
-+MANCAT =	man
-+ADMMANDIR =	$(PREFIX)/man/man8
-+ADMMANEXT =	.8
-+FFMANDIR =	$(PREFIX)/man/man5
-+FFMANEXT =	.5
-+LIBMANDIR =	$(PREFIX)/man/man3
-+LIBMANEXT =	.3
-+
-+DEBUG ?=	#none
-+CFLAGS +=	-DCL_DEFAULT_SCRIPT_NAME=\"$(ETC)/dhclient-script\"
-+CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
-+CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
diff --git a/net/isc-dhcp40-server/pkg-comment b/net/isc-dhcp40-server/pkg-comment
deleted file mode 100644
index 77d728a4ed55..000000000000
--- a/net/isc-dhcp40-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ISC Dynamic Host Configuration Protocol client and server code
diff --git a/net/isc-dhcp40-server/pkg-descr b/net/isc-dhcp40-server/pkg-descr
deleted file mode 100644
index 46bdf5ebae8e..000000000000
--- a/net/isc-dhcp40-server/pkg-descr
+++ /dev/null
@@ -1,28 +0,0 @@
-ISC-DHCP Dynamic Host Configuration Protocol server
-
-This is a release of the Internet Software Consortium
-DHCP Server (ISC dhcpd).  In this release, support for the core
-DHCP protocol is provided.  BOOTP support is also provided for
-backwards compatibility. 
-
-Version 3, Beta 2 of the ISC DHCP Distribution includes the following
-features that are new since version 2.0: 
-
-    * DHCP Failover Protocol support 
-    * OMAPI, an API for accessing and modifying the DHCP
-      server and client state. 
-    * Conditional behaviour 
-    * Storing arbitrary information on leases 
-    * Address pools with access control 
-    * Client classing 
-    * Address allocation restriction by class 
-    * Relay agent information option support 
-    * Dynamic DNS updates 
-    * Many bug fixes, performance enhancements, and minor
-      new DHCP protocol features. 
-
-A fully-featured implementation of dynamic DNS updates is included in
-this release.  There are no build dependencies with any BIND version.
-
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp40-server/pkg-plist b/net/isc-dhcp40-server/pkg-plist
deleted file mode 100644
index 7a882e2ce1c7..000000000000
--- a/net/isc-dhcp40-server/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-etc/dhclient-script
-sbin/dhclient
-sbin/dhcpd
-sbin/dhcrelay
-@exec touch /var/db/dhcpd.leases
-@exec touch %D/etc/dhclient.conf
diff --git a/net/jabber/Makefile b/net/jabber/Makefile
deleted file mode 100644
index 337e90fbfeda..000000000000
--- a/net/jabber/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	jabber-transport
-# Date created:			7 April 2000
-# Whom:				Kostya Lukin <lukin@okbmei.msk.su>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	jabber-transport
-PORTVERSION=	1.0
-CATEGORIES=	net
-MASTER_SITES=	http://download.jabber.org/dists/1.0/final/
-
-MAINTAINER=	lukin@okbmei.msk.su
-
-LIB_DEPENDS=	etherx.1:${PORTSDIR}/net/libetherx
-
-USE_LIBTOOL=	yes
-
-rc=${PREFIX}/etc/rc.d
-
-post-install:
-	@PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${INSTALL_SCRIPT} ${FILESDIR}/jserver.sh ${rc}
-
-.include <bsd.port.mk>
diff --git a/net/jabber/distinfo b/net/jabber/distinfo
deleted file mode 100644
index 8d324feb28c0..000000000000
--- a/net/jabber/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (jabber-transport-1.0.tar.gz) = e28f1b9844e1a93f11b32e0f622dfd01
diff --git a/net/jabber/files/jabberd.sh b/net/jabber/files/jabberd.sh
deleted file mode 100644
index c550ee513139..000000000000
--- a/net/jabber/files/jabberd.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jserver\.sh\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-user=jserver
-rundir=/tmp
-out=${rundir}/jserver.out
-
-export PATH=/bin:/usr/bin:${PREFIX}/bin
-umask 077
-
-test -x ${PREFIX}/bin/jserver || exit 1
-echo -n " jserver"
-cd ${rundir} || exit
-
-arg=${1:-start}
-case $arg in
-start)
-    su -f -m ${user} -c \
-	"jserver" \
-	>>${out} 2>&1 &;;
-
-stop)
-    killall jserver;;
-esac
diff --git a/net/jabber/files/jserver.sh b/net/jabber/files/jserver.sh
deleted file mode 100644
index c550ee513139..000000000000
--- a/net/jabber/files/jserver.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jserver\.sh\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-user=jserver
-rundir=/tmp
-out=${rundir}/jserver.out
-
-export PATH=/bin:/usr/bin:${PREFIX}/bin
-umask 077
-
-test -x ${PREFIX}/bin/jserver || exit 1
-echo -n " jserver"
-cd ${rundir} || exit
-
-arg=${1:-start}
-case $arg in
-start)
-    su -f -m ${user} -c \
-	"jserver" \
-	>>${out} 2>&1 &;;
-
-stop)
-    killall jserver;;
-esac
diff --git a/net/jabber/files/patch-aa b/net/jabber/files/patch-aa
deleted file mode 100644
index 20549a78e67d..000000000000
--- a/net/jabber/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/jserver.xml.in.orig	Mon May  1 11:30:00 2000
-+++ src/jserver.xml.in	Wed May 10 18:22:14 2000
-@@ -37,12 +37,12 @@
-   <log>
- 
-     <!-- replace with <error>syslog</error> to log to syslog instead, remove to log to STDERR -->
--    <error>@prefix@/var/log/jserver.error</error>
-+    <error>/var/log/jserver.error</error>
- 
--    <session>@prefix@/var/log/jserver.log</session>
-+    <session>/var/log/jserver.log</session>
- 
-     <!-- This will log some basic tracking information about every packet of data (TONS!)
--      <packet>@prefix@/var/log/jserver_packet.log</packet>
-+      <packet>/var/log/jserver_packet.log</packet>
-     -->
- 
-   </log>
-@@ -50,7 +50,7 @@
- 
- Data is stored on the filesystem for each user, make sure the folder exists!
- 
--  <spool>@prefix@/var/jspool</spool>
-+  <spool>/var/jspool</spool>
- 
- Registration instructions and fields, remove to disallow registration:
- 
diff --git a/net/jabber/files/patch-ab b/net/jabber/files/patch-ab
deleted file mode 100644
index 6272a4f76e86..000000000000
--- a/net/jabber/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/Makefile.in.orig	Mon May  1 19:47:49 2000
-+++ src/Makefile.in	Wed May 17 17:05:17 2000
-@@ -442,14 +442,8 @@
- 
- 
- install-data-local:
--	$(SH) if test ! -f $(sysconfdir)/jserver.xml; then \
--	$(mkinstalldirs) $(sysconfdir); \
--	$(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \
--	else \
--		echo "You already have a jserver.xml installed, not overwriting"; \
--	fi
--	$(mkinstalldirs) $(prefix)/var/jspool
--	$(mkinstalldirs) $(prefix)/var/log
-+	$(mkinstalldirs) $(sysconfdir);
-+	$(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml.default
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net/jabber/files/patch-ac b/net/jabber/files/patch-ac
deleted file mode 100644
index b2ae73998fab..000000000000
--- a/net/jabber/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun Apr 30 20:32:29 2000
-+++ configure	Sun Apr 30 20:33:08 2000
-@@ -2321,7 +2321,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpth $LIBS"
-+  LIBS="-L$prefix/lib -lpth $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
diff --git a/net/jabber/pkg-comment b/net/jabber/pkg-comment
deleted file mode 100644
index d056377943d4..000000000000
--- a/net/jabber/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Online presence and instant messaging server
diff --git a/net/jabber/pkg-deinstall b/net/jabber/pkg-deinstall
deleted file mode 100644
index 355d51ea398d..000000000000
--- a/net/jabber/pkg-deinstall
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-	read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-	answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-	answer=$(ask "${question}" "${dflt}")
-	case "${answer}" in
-	[Yy]*)		return 0;;
-	[Nn]*)		return 1;;
-	esac
-	echo "Please answer yes or no."
-    done
-}
-
-delete_account() {
-    local u g home
-
-    u=$1
-    g=$2
-    if yesno "Do you want me to remove group \"${g}\"" y; then
-	pw groupdel -n ${g}
-	echo "Done."
-    fi
-    if yesno "Do you want me to remove user \"${u}\"" y; then
-	eval home=~${u}
-	pw userdel -n ${u}
-	echo "Done."
-	if [ -d "${home}" ]; then
-	    echo "Please remember to remove the home directory \"${home}\" as"
-	    echo "well as the mirrored files."
-	fi
-    fi
-}
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-export PATH=/bin:/usr/bin:/usr/sbin
-
-user=jserver
-group=jserver
-
-if ps -axc | grep -q jserver; then
-    if yesno "There are some jserver processes running.  Shall I kill them" y
-    then
-	killall jserver
-	sleep 2
-    else
-	echo "OK ... I hope you know what you are doing."
-    fi
-fi
-
-delete_account ${user} ${group}
diff --git a/net/jabber/pkg-descr b/net/jabber/pkg-descr
deleted file mode 100644
index 02fa0e883a20..000000000000
--- a/net/jabber/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-The Jabber transport (jserver) is a daemon for Jabber clients to connect
-and communicate with. It only handles native Jabber protocol.
-
-After editing $PREFIX/etc/jserver.xml, the server can be started by
-rc.d script.
-
-Complete information about configuration can be found in the Jabber Server
-mini-HOWTO at http://docs.jabber.org/.
-
-You can learn more about Jabber-Transport at
-WWW: http://server.jabber.org/
diff --git a/net/jabber/pkg-install b/net/jabber/pkg-install
deleted file mode 100644
index 9a0bf378ad65..000000000000
--- a/net/jabber/pkg-install
+++ /dev/null
@@ -1,156 +0,0 @@
-#! /bin/sh
-
-chmods_done=" "
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-	read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-	answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-	answer=$(ask "${question}" "${dflt}")
-	case "${answer}" in
-	[Yy]*)		return 0;;
-	[Nn]*)		return 1;;
-	esac
-	echo "Please answer yes or no."
-    done
-}
-
-make_account() {
-    local u g gcos homeopt home
-
-    u=$1
-    g=$2
-    gcos=$3
-    homeopt=${4:+"-d $4"}
-
-    if pw group show "${g}" >/dev/null 2>&1; then
-	echo "You already have a group \"${g}\", so I will use it."
-    else
-	echo "You need a group \"${g}\"."
-	if which -s pw && yesno "Would you like me to create it" y; then
-	    pw groupadd ${g} || exit
-	    echo "Done."
-	else
-	    echo "Please create it, and try again."
-	    if ! grep -q "^${u}:" /etc/passwd; then
-		echo "While you're at it, please create a user \"${u}\" too,"
-		echo "with a default group of \"${g}\"."
-	    fi
-	    exit 1
-	fi
-    fi
-    
-    if pw user show "${u}" >/dev/null 2>&1; then
-	echo "You already have a user \"${u}\", so I will use it."
-    else
-	echo "You need a user \"${u}\"."
-	if which -s pw && yesno "Would you like me to create it" y; then
-	    pw useradd ${u} -g ${g} -h - ${homeopt} \
-		-s /nonexistent -c "${gcos}" || exit
-	    echo "Done."
-	else
-	    echo "Please create it, and try again."
-	    exit 1
-	fi
-    fi
-
-    if [ x"$homeopt" = x ]; then
-	eval home=~${u}
-	if [ ! -d "${home}" ]; then
-	    if yesno \
-		"Would you like me to create ${u}'s home directory (${home})" y
-	    then
-		(umask 77 && \
-		    mkdir -p ${home}) || exit
-		chown -R ${u}:${g} ${home} || exit
-	    else
-		echo "Please create it, and try again."
-		exit 1
-	    fi
-	fi
-    fi
-}
-
-case $2 in
-
-POST-INSTALL)
-    if which -s pw && which -s lockf; then
-	:
-    else
-	cat <<EOF
-
-This system looks like a pre-2.2 version of FreeBSD.  I see that it
-is missing the "lockf" and/or "pw" utilities.  I need these utilities.
-Please get them and install them, and try again.  You can get the
-sources from:
-
-  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.bin/lockf.tar.gz
-  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
-
-EOF
-	exit 1
-    fi
-
-    user=jserver
-    group=jserver
-    spooldir="/var/jspool"
-    etcdir=${PREFIX:-$PKG_PREFIX}/etc
-
-    echo ""
-    make_account ${user} ${group} "Jabber Daemon" "/nonexistent"
-
-    if [ ! -d ${spooldir} ]; then
-	echo "Creating \"${spooldir}\"."
-	mkdir -p ${spooldir}
-    fi
-
-    echo "Fixing ownerships and modes in \"${spooldir}\"."
-    chown -R ${user}:${group} ${spooldir}
-    chmod -R go= ${spooldir}
-
-    if [ ! -f ${etcdir}/jserver.xml ]; then
-	echo "Creating \"${etcdir}/jserver.xml\"."
-	cp -p ${etcdir}/jserver.xml.default ${etcdir}/jserver.xml
-    fi
-
-    echo "Fixing config files ownerships and modes."
-    chown root:${group} ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default
-    chmod 640 ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default
-
-    if [ ! -f /var/log/jserver.log ]; then
-	echo "Creating \"/var/log/jserver.log\"."
-	cp /dev/null /var/log/jserver.log
-    fi
-
-    if [ ! -f /var/log/jserver.error ]; then
-	echo "Creating \"/var/log/jserver.error\"."
-	cp /dev/null /var/log/jserver.error
-    fi
-
-    if [ ! -f /var/log/jserver_packet.log ]; then
-	echo "Creating \"/var/log/jserver_packet.log\"."
-	cp /dev/null /var/log/jserver_packet.log
-    fi
-
-    echo "Fixing log files ownerships and modes."
-    chown ${user}:${group} /var/log/jserver.log /var/log/jserver.error /var/log/jserver_packet.log
-    chmod 600 /var/log/jserver.log /var/log/jserver.error /var/log/jserver_packet.log
-
-    ;;
-esac
diff --git a/net/jabber/pkg-plist b/net/jabber/pkg-plist
deleted file mode 100644
index 57544b72a86f..000000000000
--- a/net/jabber/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/jserver
-etc/jserver.xml.default
-etc/rc.d/jserver.sh
-lib/jabber/mod_echo.so
-lib/jabber/mod_time.so
-lib/jabber/mod_version.so
-lib/jabber/svc_hell.so
-lib/jabber/svc_http.so
-lib/jabber/svc_irc.so
-lib/jabber/svc_telnet.so
-@dirrm lib/jabber
-@unexec rmdir /var/jspool 2>/dev/null || true
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
deleted file mode 100644
index e0c0041dc78a..000000000000
--- a/net/kdenetwork3/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:	kdenetwork2
-# Date created:				Sun May 14 00:55:45
-# Whom:					Will Andrews <will@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kdenetwork
-PORTVERSION=	2.0
-CATEGORIES=	net news kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
-
-MAINTAINER=	will@FreeBSD.org
-
-LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
-USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
-USE_GMAKE=	yes
-
-pre-configure:
-	${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
deleted file mode 100644
index 9ac64c236e7f..000000000000
--- a/net/kdenetwork3/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (kdenetwork-2.0.tar.bz2) = e9330d2a8b937abba44e1eaecec10004
diff --git a/net/kdenetwork3/pkg-comment b/net/kdenetwork3/pkg-comment
deleted file mode 100644
index bf5dcda48324..000000000000
--- a/net/kdenetwork3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network modules for KDE2
diff --git a/net/kdenetwork3/pkg-descr b/net/kdenetwork3/pkg-descr
deleted file mode 100644
index f7425da6373d..000000000000
--- a/net/kdenetwork3/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-KDE provides an integrated X11 based environment, much like CDE.
-This particular port installs the networking components of KDE,
-which includes applications for Internet things like email, web,
-irc, and so forth.  Note that this is for KDE2, not KDE 1.x.
-
-WWW: http://www.kde.org/
diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist
deleted file mode 100644
index fff92a371ade..000000000000
--- a/net/kdenetwork3/pkg-plist
+++ /dev/null
@@ -1,679 +0,0 @@
-bin/dsirc
-bin/keystone
-bin/kit
-bin/kmail
-bin/knode
-bin/korn
-bin/kotalkd
-bin/kppp
-bin/kppplogview
-bin/ksirc
-bin/ksticker
-bin/ktalkd
-bin/ktalkdlg
-bin/mail.local
-include/kmailIface.h
-lib/ksirc.la
-lib/ksirc.so
-lib/libkcm_ktalkd.la
-lib/libkcm_ktalkd.so
-share/applnk/Internet/KMail.desktop
-share/applnk/Internet/KNode.desktop
-share/applnk/Internet/KOrn.desktop
-share/applnk/Internet/Kppp.desktop
-share/applnk/Internet/keystone.desktop
-share/applnk/Internet/kit.desktop
-share/applnk/Internet/kppplogview.desktop
-share/applnk/Internet/ksirc.desktop
-share/applnk/Settings/Network/kcmktalkd.desktop
-share/apps/keystone/keystoneui.rc
-share/apps/kit/eventsrc
-share/apps/kit/icons/locolor/16x16/actions/kit_anonwarning.png
-share/apps/kit/icons/locolor/16x16/actions/kit_away.png
-share/apps/kit/icons/locolor/16x16/actions/kit_bold.png
-share/apps/kit/icons/locolor/16x16/actions/kit_group.png
-share/apps/kit/icons/locolor/16x16/actions/kit_info.png
-share/apps/kit/icons/locolor/16x16/actions/kit_logging.png
-share/apps/kit/icons/locolor/16x16/actions/kit_offline.png
-share/apps/kit/icons/locolor/16x16/actions/kit_online.png
-share/apps/kit/icons/locolor/16x16/actions/kit_sound.png
-share/apps/kit/icons/locolor/16x16/actions/kit_status.png
-share/apps/kit/icons/locolor/16x16/actions/kit_timestamping.png
-share/apps/kit/icons/locolor/16x16/actions/kit_warning.png
-share/apps/kmail/kmcomposerui.rc
-share/apps/kmail/kmmainwin.rc
-share/apps/kmail/pics/abdown.png
-share/apps/kmail/pics/abup.png
-share/apps/kmail/pics/closed.png
-share/apps/kmail/pics/feather_white.png
-share/apps/kmail/pics/green-bullet.png
-share/apps/kmail/pics/kdelogo.xpm
-share/apps/kmail/pics/kmfldin.png
-share/apps/kmail/pics/kmfldout.png
-share/apps/kmail/pics/kmfldsent.png
-share/apps/kmail/pics/kmfolder.png
-share/apps/kmail/pics/kmfolderfull.png
-share/apps/kmail/pics/kminsorgmsg.png
-share/apps/kmail/pics/kmmsgdel.png
-share/apps/kmail/pics/kmmsgforwarded.png
-share/apps/kmail/pics/kmmsgnew.png
-share/apps/kmail/pics/kmmsgold.png
-share/apps/kmail/pics/kmmsgqueued.png
-share/apps/kmail/pics/kmmsgreplied.png
-share/apps/kmail/pics/kmmsgsent.png
-share/apps/kmail/pics/kmmsgunseen.png
-share/apps/kmail/pics/kmtrash.png
-share/apps/kmail/pics/pgp-keys.png
-share/apps/kmail/pics/pub_key_red.png
-share/apps/kmail/pics/red-bullet.png
-share/apps/kmail/pics/stopwatch.xbm
-share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/knode/filters/1.fltr
-share/apps/knode/filters/2.fltr
-share/apps/knode/filters/3.fltr
-share/apps/knode/filters/4.fltr
-share/apps/knode/filters/5.fltr
-share/apps/knode/filters/6.fltr
-share/apps/knode/filters/7.fltr
-share/apps/knode/filters/8.fltr
-share/apps/knode/filters/filters.rc
-share/apps/knode/headers.rc
-share/apps/knode/icons/hicolor/22x22/actions/message_reply.png
-share/apps/knode/icons/hicolor/32x32/actions/message_reply.png
-share/apps/knode/icons/locolor/16x16/actions/message_reply.png
-share/apps/knode/kncomposerui.rc
-share/apps/knode/knodeui.rc
-share/apps/knode/knreaderui.rc
-share/apps/knode/pics/ctlart.png
-share/apps/knode/pics/eyes.png
-share/apps/knode/pics/greyball.png
-share/apps/knode/pics/greyballchk.png
-share/apps/knode/pics/group.png
-share/apps/knode/pics/mail.png
-share/apps/knode/pics/newsubs.png
-share/apps/knode/pics/posting.png
-share/apps/knode/pics/redball.png
-share/apps/knode/pics/redballchk.png
-share/apps/knode/pics/server.png
-share/apps/knode/pics/smile.png
-share/apps/knode/pics/snderr.png
-share/apps/knode/pics/stat_cncl.png
-share/apps/knode/pics/stat_edit.png
-share/apps/knode/pics/stat_saved.png
-share/apps/knode/pics/stat_sent.png
-share/apps/kppp/Provider/Austria/.directory
-share/apps/kppp/Provider/Austria/Simon%032Media
-share/apps/kppp/Provider/Denmark/.directory
-share/apps/kppp/Provider/Denmark/Get2Net
-share/apps/kppp/Provider/Germany/.directory
-share/apps/kppp/Provider/Germany/CityWeb
-share/apps/kppp/Provider/Germany/FH%032Rhein%032Sieg%032%040Informatik%041
-share/apps/kppp/Provider/Germany/MUC%046DE
-share/apps/kppp/Provider/Germany/Netsurf
-share/apps/kppp/Provider/NewZealand/.directory
-share/apps/kppp/Provider/NewZealand/OrconInternet
-share/apps/kppp/Provider/NewZealand/Paradise
-share/apps/kppp/Provider/NewZealand/Voyager
-share/apps/kppp/Provider/NewZealand/XTRA
-share/apps/kppp/Provider/NewZealand/ihug
-share/apps/kppp/Provider/Norway/.directory
-share/apps/kppp/Provider/Norway/BGNett
-share/apps/kppp/Provider/Norway/Institutt%032for%032informatikk
-share/apps/kppp/Provider/Portugal/.directory
-share/apps/kppp/Provider/Portugal/Clix
-share/apps/kppp/Provider/Portugal/Netc
-share/apps/kppp/Provider/Portugal/OniNet
-share/apps/kppp/Provider/Taiwan/.directory
-share/apps/kppp/Provider/Taiwan/EraNet
-share/apps/kppp/Provider/Taiwan/HiNet
-share/apps/kppp/Provider/Taiwan/SeedNet
-share/apps/kppp/Provider/United_Kingdom/.directory
-share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
-share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
-share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
-share/apps/kppp/Provider/United_Kingdom/FreeServe
-share/apps/kppp/Rules/Argentina/Argentina_0610.rst
-share/apps/kppp/Rules/Argentina/Argentina_Local.rst
-share/apps/kppp/Rules/Australia/Local.rst
-share/apps/kppp/Rules/Australia/Optus_Residential.rst
-share/apps/kppp/Rules/Australia/STD_Zone_1_-_25-50_kms.rst
-share/apps/kppp/Rules/Australia/STD_Zone_2_-_50-85_kms.rst
-share/apps/kppp/Rules/Australia/STD_Zone_3_-_85-165_kms.rst
-share/apps/kppp/Rules/Australia/STD_Zone_4_-_165+_kms.rst
-share/apps/kppp/Rules/Austria/Business_1/Local.rst
-share/apps/kppp/Rules/Austria/Business_1/Long_Distance.rst
-share/apps/kppp/Rules/Austria/Business_1/Online.rst
-share/apps/kppp/Rules/Austria/Business_2/Local.rst
-share/apps/kppp/Rules/Austria/Business_2/Long_Distance.rst
-share/apps/kppp/Rules/Austria/Business_2/Online.rst
-share/apps/kppp/Rules/Austria/Minimum/Local.rst
-share/apps/kppp/Rules/Austria/Minimum/Long_Distance.rst
-share/apps/kppp/Rules/Austria/Minimum/Online.rst
-share/apps/kppp/Rules/Austria/Standard/Local.rst
-share/apps/kppp/Rules/Austria/Standard/Long_Distance.rst
-share/apps/kppp/Rules/Austria/Standard/Online.rst
-share/apps/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
-share/apps/kppp/Rules/Bangladesh/ATT00007.rst
-share/apps/kppp/Rules/Bangladesh/ATT00010.rst
-share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
-share/apps/kppp/Rules/Belgium/Belgium_zonal.rst
-share/apps/kppp/Rules/Brasil/Brasil.rst
-share/apps/kppp/Rules/Brasil/SaoPaulo.rst
-share/apps/kppp/Rules/Croatia/CARNet_lokalni_poziv.rst
-share/apps/kppp/Rules/Croatia/CARNet_medjugradski_poziv.rst
-share/apps/kppp/Rules/Croatia/hinet_anonimni_ulaz.rst
-share/apps/kppp/Rules/Croatia/hinet_hpt.rst
-share/apps/kppp/Rules/Croatia/ibm_net.rst
-share/apps/kppp/Rules/Croatia/iskon_lokalni_poziv.rst
-share/apps/kppp/Rules/Croatia/iskon_medjugradski_poziv.rst
-share/apps/kppp/Rules/Croatia/iskon_zagrebacka_zupanija.rst
-share/apps/kppp/Rules/Czechia/Czech_Telecom_City.rst
-share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet2000.rst
-share/apps/kppp/Rules/Denmark/12Move_Analog.rst
-share/apps/kppp/Rules/Denmark/12Move_ISDN.rst
-share/apps/kppp/Rules/Denmark/Cybercity_Friabonnement.rst
-share/apps/kppp/Rules/Denmark/Get2net_Betaling.rst
-share/apps/kppp/Rules/Denmark/Get2net_Gratis.rst
-share/apps/kppp/Rules/Denmark/Mobilix_Wanadoo.rst
-share/apps/kppp/Rules/Denmark/Teledanmark_Basis.rst
-share/apps/kppp/Rules/Denmark/Teledanmark_Favoritinternet.rst
-share/apps/kppp/Rules/Denmark/Worldonline-Analog.rst
-share/apps/kppp/Rules/Denmark/Worldonline-ISDN.rst
-share/apps/kppp/Rules/England/BirminghamCable_Local.rst
-share/apps/kppp/Rules/England/BirminghamCable_National.rst
-share/apps/kppp/Rules/England/BirminghamCable_SameTelco.rst
-share/apps/kppp/Rules/England/BritishTelecom_Local.rst
-share/apps/kppp/Rules/England/BritishTelecom_National.rst
-share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
-share/apps/kppp/Rules/France/France_Telecom_Local.rst
-share/apps/kppp/Rules/France/France_Telecom_Local_Area.rst
-share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
-share/apps/kppp/Rules/France/France_Telecom_National.rst
-share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
-share/apps/kppp/Rules/Germany/Addcom.rst
-share/apps/kppp/Rules/Germany/CallOkaynet.rst
-share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
-share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
-share/apps/kppp/Rules/Germany/MSN.rst
-share/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst
-share/apps/kppp/Rules/Germany/NGI_Call_By_Call.rst
-share/apps/kppp/Rules/Germany/Nikoma.rst
-share/apps/kppp/Rules/Germany/Nikoma_Internet_by_Call.rst
-share/apps/kppp/Rules/Germany/Nikoma_Study_and_Surf.rst
-share/apps/kppp/Rules/Germany/Planet-Interkom_Internet_by_call.rst
-share/apps/kppp/Rules/Germany/Telekom_City_Select_5_30.rst
-share/apps/kppp/Rules/Germany/knUUt-by-Call.rst
-share/apps/kppp/Rules/Germany/talkline_by_call.rst
-share/apps/kppp/Rules/Germany/vossnet_fun.rst
-share/apps/kppp/Rules/Germany/vossnet_fun_light.rst
-share/apps/kppp/Rules/Germany/vossnet_kompl.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone1.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone2.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone3.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_local.rst
-share/apps/kppp/Rules/Greece/Hellas_analog_local.rst
-share/apps/kppp/Rules/Greece/Hellas_digital_local.rst
-share/apps/kppp/Rules/Hong_Kong/Hong_Kong_Telecom.rst
-share/apps/kppp/Rules/Hungary/Local.rst
-share/apps/kppp/Rules/Hungary/LocalTop_MATAV.rst
-share/apps/kppp/Rules/Hungary/Local_MATAV.rst
-share/apps/kppp/Rules/Iceland/Iceland_general.rst
-share/apps/kppp/Rules/India/Vsnl_local.rst
-share/apps/kppp/Rules/Indonesia/Lokal_1_Metropolitan.rst
-share/apps/kppp/Rules/Indonesia/Lokal_2_Metropolitan.rst
-share/apps/kppp/Rules/Indonesia/Lokal_non_metropolitan.rst
-share/apps/kppp/Rules/Ireland/Eircom_Internet.rst
-share/apps/kppp/Rules/Ireland/Eircom_Local.rst
-share/apps/kppp/Rules/Ireland/Eircom_National.rst
-share/apps/kppp/Rules/Ireland/Eircom_Special.rst
-share/apps/kppp/Rules/Israel/Bezeq_Interurban.rst
-share/apps/kppp/Rules/Israel/Bezeq_Local.rst
-share/apps/kppp/Rules/Italy/Telecom_0-15_km.rst
-share/apps/kppp/Rules/Italy/Telecom_15-30_km.rst
-share/apps/kppp/Rules/Italy/Telecom_30-60_km.rst
-share/apps/kppp/Rules/Italy/Telecom_60+_km.rst
-share/apps/kppp/Rules/Italy/Telecom_Distrettuali.rst
-share/apps/kppp/Rules/Italy/Telecom_Interurbana_settoriale.rst
-share/apps/kppp/Rules/Italy/Telecom_TAT.rst
-share/apps/kppp/Rules/Italy/Telecom_TUT.rst
-share/apps/kppp/Rules/Italy/Telecom_Urbana.rst
-share/apps/kppp/Rules/Jamaica/CWJ_InterParish.rst
-share/apps/kppp/Rules/Jamaica/CWJ_Local.rst
-share/apps/kppp/Rules/Japan/NTT_Local.rst
-share/apps/kppp/Rules/Kazakhstan/Akparat_Sprint.rst
-share/apps/kppp/Rules/Luxembourg/Local.rst
-share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst
-share/apps/kppp/Rules/Malaysia/malaysia.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Regio_Nummervoordeel.rst
-share/apps/kppp/Rules/Netherlands/BelBudget_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst
-share/apps/kppp/Rules/Netherlands/NedpointBasis_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/NedpointBelBespaar_Lokaal.rst
-share/apps/kppp/Rules/Norway/Local_Area.rst
-share/apps/kppp/Rules/Norway/Long_Distance.rst
-share/apps/kppp/Rules/Poland/Internetia.rst
-share/apps/kppp/Rules/Poland/Netia_100km_Niebieska.rst
-share/apps/kppp/Rules/Poland/Netia_100km_Zielona.rst
-share/apps/kppp/Rules/Poland/Netia_Lokalne_Niebieska.rst
-share/apps/kppp/Rules/Poland/Netia_Lokalne_Zielona.rst
-share/apps/kppp/Rules/Poland/TPSA.rst
-share/apps/kppp/Rules/Poland/TP_100km.rst
-share/apps/kppp/Rules/Poland/TP_Lokalne.rst
-share/apps/kppp/Rules/Portugal/PT_Local.rst
-share/apps/kppp/Rules/Portugal/PT_Local_Ilhas.rst
-share/apps/kppp/Rules/Portugal/PT_Regional.rst
-share/apps/kppp/Rules/Portugal/PT_Regional_Ilhas.rst
-share/apps/kppp/Rules/Portugal/PT_YesNET.rst
-share/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst
-share/apps/kppp/Rules/Romania/Telecom_GSM.rst
-share/apps/kppp/Rules/Romania/Telecom_Interurban.rst
-share/apps/kppp/Rules/Romania/Telecom_Local.rst
-share/apps/kppp/Rules/Singapore/SingTel_Local.rst
-share/apps/kppp/Rules/Slovakia/Internetovy_tarif_019XY.rst
-share/apps/kppp/Rules/Slovakia/ST_medzimesto_1_pasmo.rst
-share/apps/kppp/Rules/Slovakia/ST_medzimesto_2_pasmo.rst
-share/apps/kppp/Rules/Slovakia/ST_mesto.rst
-share/apps/kppp/Rules/South_Afrika/South_Afrika.rst
-share/apps/kppp/Rules/Spain/Infovia.rst
-share/apps/kppp/Rules/Spain/Infovia_IVA.rst
-share/apps/kppp/Rules/Spain/Telefonica_Interprovincial.rst
-share/apps/kppp/Rules/Spain/Telefonica_Interprovincial_IVA.rst
-share/apps/kppp/Rules/Spain/Telefonica_Local.rst
-share/apps/kppp/Rules/Spain/Telefonica_Metropolitana.rst
-share/apps/kppp/Rules/Spain/Telefonica_Metropolitana_IVA.rst
-share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst
-share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst
-share/apps/kppp/Rules/Spain/Telefonica_Provincial_IVA.rst
-share/apps/kppp/Rules/Sweden/ACN.rst
-share/apps/kppp/Rules/Sweden/Abonnera_com.rst
-share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
-share/apps/kppp/Rules/Sweden/Crossnet-Affinity.rst
-share/apps/kppp/Rules/Sweden/Glocalnet.rst
-share/apps/kppp/Rules/Sweden/Gts.rst
-share/apps/kppp/Rules/Sweden/Home_se.rst
-share/apps/kppp/Rules/Sweden/Nemtel.rst
-share/apps/kppp/Rules/Sweden/Plusenergi.rst
-share/apps/kppp/Rules/Sweden/RSLCom.rst
-share/apps/kppp/Rules/Sweden/Rix_Telecom.rst
-share/apps/kppp/Rules/Sweden/Supertel.rst
-share/apps/kppp/Rules/Sweden/Svensk_Telekom.rst
-share/apps/kppp/Rules/Sweden/Tele1_Europe.rst
-share/apps/kppp/Rules/Sweden/Tele2.rst
-share/apps/kppp/Rules/Sweden/Tele8.rst
-share/apps/kppp/Rules/Sweden/Teleman.rst
-share/apps/kppp/Rules/Sweden/Telenordia.rst
-share/apps/kppp/Rules/Sweden/Telerian.rst
-share/apps/kppp/Rules/Sweden/Telia.rst
-share/apps/kppp/Rules/Sweden/Telia_Telebonus1.rst
-share/apps/kppp/Rules/Sweden/Telia_Telebonus2.rst
-share/apps/kppp/Rules/Sweden/Telitel.rst
-share/apps/kppp/Rules/Sweden/Transnet.rst
-share/apps/kppp/Rules/Sweden/Universal_Telecom.rst
-share/apps/kppp/Rules/Sweden/Utfors.rst
-share/apps/kppp/Rules/Sweden/Vattenfall.rst
-share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
-share/apps/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst
-share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
-share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst
-share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst
-share/apps/kppp/Rules/TEMPLATE
-share/apps/kppp/Rules/checkrules
-share/apps/kppp/pics/dock_both.png
-share/apps/kppp/pics/dock_left.png
-share/apps/kppp/pics/dock_none.png
-share/apps/kppp/pics/dock_right.png
-share/apps/kppp/pics/folder.png
-share/apps/kppp/pics/modemboth.png
-share/apps/kppp/pics/modemleft.png
-share/apps/kppp/pics/modemnone.png
-share/apps/kppp/pics/modemright.png
-share/apps/kppp/pics/phone.png
-share/apps/ksirc/commands-handler.pl
-share/apps/ksirc/commands-perl.pl
-share/apps/ksirc/convert_commands.pl
-share/apps/ksirc/dcc_progress.pm
-share/apps/ksirc/dcc_status.pm
-share/apps/ksirc/filters.pl
-share/apps/ksirc/ksirc.pl
-share/apps/ksirc/ksirclistbox.pm
-share/apps/ksirc/load_all.pm
-share/apps/ksirc/palistbox.pm
-share/apps/ksirc/pbase.pm
-share/apps/ksirc/pboxlayout.pm
-share/apps/ksirc/pbutton.pm
-share/apps/ksirc/pframe.pm
-share/apps/ksirc/pics/arrow.png
-share/apps/ksirc/pics/blueball.png
-share/apps/ksirc/pics/bluepin.png
-share/apps/ksirc/pics/channel.xpm
-share/apps/ksirc/pics/channels.xpm
-share/apps/ksirc/pics/greenpin.png
-share/apps/ksirc/pics/info.png
-share/apps/ksirc/pics/info1.png
-share/apps/ksirc/pics/ksirc.png
-share/apps/ksirc/pics/ksirc_a.xpm
-share/apps/ksirc/pics/ksirc_b.xpm
-share/apps/ksirc/pics/ksirc_dock.xpm
-share/apps/ksirc/pics/madsmiley.png
-share/apps/ksirc/pics/mini-run.png
-share/apps/ksirc/pics/server.xpm
-share/apps/ksirc/pics/smiley.png
-share/apps/ksirc/pics/star.png
-share/apps/ksirc/pkfiledialog.pm
-share/apps/ksirc/plabel.pm
-share/apps/ksirc/plined.pm
-share/apps/ksirc/plistbox.pm
-share/apps/ksirc/pmenudta.pm
-share/apps/ksirc/pobjfinder.pm
-share/apps/ksirc/ppopmenu.pm
-share/apps/ksirc/pprogress.pm
-share/apps/ksirc/ppushbt.pm
-share/apps/ksirc/ptabdialog.pm
-share/apps/ksirc/ptablevw.pm
-share/apps/ksirc/puke.pl
-share/apps/ksirc/pwidget.pm
-share/apps/ksirc/relnotes
-share/apps/ksirc/servers.ini
-share/apps/ksirc/servers.txt
-share/apps/ksirc/sirc.help.gz
-share/apps/ksirc/small.pl
-share/apps/ksirc/test.pl
-share/apps/ksirc/tester.pl
-share/config/ksircrc
-share/config/protocols/vnc.desktop
-share/doc/HTML/en/keystone/.anchors
-share/doc/HTML/en/keystone/index.docbook
-share/doc/HTML/en/keystone/index.html
-share/doc/HTML/en/keystone/introduction.html
-share/doc/HTML/en/kit/.anchors
-share/doc/HTML/en/kit/index.docbook
-share/doc/HTML/en/kit/index.html
-share/doc/HTML/en/kit/introduction.html
-share/doc/HTML/en/kmail/.anchors
-share/doc/HTML/en/kmail/appearancetab.html
-share/doc/HTML/en/kmail/composertab.html
-share/doc/HTML/en/kmail/copyright.html
-share/doc/HTML/en/kmail/documentation.html
-share/doc/HTML/en/kmail/epilogue.html
-share/doc/HTML/en/kmail/faq.html
-share/doc/HTML/en/kmail/filters.html
-share/doc/HTML/en/kmail/index.docbook
-share/doc/HTML/en/kmail/index.html
-share/doc/HTML/en/kmail/misctab.html
-share/doc/HTML/en/kmail/networktab.html
-share/doc/HTML/en/kmail/seccustomizing.html
-share/doc/HTML/en/kmail/secfolders.html
-share/doc/HTML/en/kmail/secgettingstarted.html
-share/doc/HTML/en/kmail/secimporting.html
-share/doc/HTML/en/kmail/secintro.html
-share/doc/HTML/en/kmail/secmenus.html
-share/doc/HTML/en/kmail/secmultipleaccounts.html
-share/doc/HTML/en/kmail/secpgp.html
-share/doc/HTML/en/kmail/securitytab.html
-share/doc/HTML/en/kmail/secusingkmail.html
-share/doc/HTML/en/kmail/settingupyouraccount.html
-share/doc/HTML/en/kmail/team.html
-share/doc/HTML/en/kmail/testingyoursetup.html
-share/doc/HTML/en/kmail/theaddressbook.html
-share/doc/HTML/en/kmail/thecomposerwindow.html
-share/doc/HTML/en/kmail/thecomposerwindow2.html
-share/doc/HTML/en/knode/.anchors
-share/doc/HTML/en/knode/commands.html
-share/doc/HTML/en/knode/compilation.html
-share/doc/HTML/en/knode/configuration.html
-share/doc/HTML/en/knode/credits.html
-share/doc/HTML/en/knode/eyes.png
-share/doc/HTML/en/knode/faq.html
-share/doc/HTML/en/knode/greyball.png
-share/doc/HTML/en/knode/greyballchk.png
-share/doc/HTML/en/knode/index.docbook
-share/doc/HTML/en/knode/index.html
-share/doc/HTML/en/knode/infos-technical.html
-share/doc/HTML/en/knode/infos-testgroups.html
-share/doc/HTML/en/knode/installation.html
-share/doc/HTML/en/knode/introduction.html
-share/doc/HTML/en/knode/knode-cleanup.png
-share/doc/HTML/en/knode/knode-colors-fonts.png
-share/doc/HTML/en/knode/knode-composer-attachments.png
-share/doc/HTML/en/knode/knode-composer-settings.png
-share/doc/HTML/en/knode/knode-edit-filter.png
-share/doc/HTML/en/knode/knode-edit-header1.png
-share/doc/HTML/en/knode/knode-edit-header2.png
-share/doc/HTML/en/knode/knode-editorwindow.html
-share/doc/HTML/en/knode/knode-filters.png
-share/doc/HTML/en/knode/knode-followup.png
-share/doc/HTML/en/knode/knode-header-settings.png
-share/doc/HTML/en/knode/knode-identity.png
-share/doc/HTML/en/knode/knode-journey.html
-share/doc/HTML/en/knode/knode-mail-account.png
-share/doc/HTML/en/knode/knode-more-info.html
-share/doc/HTML/en/knode/knode-new-article.png
-share/doc/HTML/en/knode/knode-news-account.png
-share/doc/HTML/en/knode/knode-post-settings.png
-share/doc/HTML/en/knode/knode-read-news-settings.png
-share/doc/HTML/en/knode/knode-reply.png
-share/doc/HTML/en/knode/knode-search.png
-share/doc/HTML/en/knode/knode-start.png
-share/doc/HTML/en/knode/knode-subscribe.png
-share/doc/HTML/en/knode/knode-views.png
-share/doc/HTML/en/knode/more-knode-features.html
-share/doc/HTML/en/knode/nettiquette.html
-share/doc/HTML/en/knode/newsubs.png
-share/doc/HTML/en/knode/redball.png
-share/doc/HTML/en/knode/redballchk.png
-share/doc/HTML/en/knode/requirements.html
-share/doc/HTML/en/knode/subscribing.html
-share/doc/HTML/en/knode/update-installation.html
-share/doc/HTML/en/knode/usenet-slang.html
-share/doc/HTML/en/knode/using-knode.html
-share/doc/HTML/en/korn/.anchors
-share/doc/HTML/en/korn/index.docbook
-share/doc/HTML/en/korn/index.html
-share/doc/HTML/en/korn/introduction.html
-share/doc/HTML/en/korn/licenses-and-credits.html
-share/doc/HTML/en/korn/the-display-tab.html
-share/doc/HTML/en/korn/the-new-dialog.html
-share/doc/HTML/en/korn/the-preferences-dialog.html
-share/doc/HTML/en/kppp/.anchors
-share/doc/HTML/en/kppp/BackGround.png
-share/doc/HTML/en/kppp/accounting.html
-share/doc/HTML/en/kppp/appendix.html
-share/doc/HTML/en/kppp/autoconfigurehostname.html
-share/doc/HTML/en/kppp/cb.html
-share/doc/HTML/en/kppp/compilationandinstallation.html
-share/doc/HTML/en/kppp/configuringanaccount.html
-share/doc/HTML/en/kppp/costsgraphs.fig
-share/doc/HTML/en/kppp/costsgraphs.png
-share/doc/HTML/en/kppp/dns.html
-share/doc/HTML/en/kppp/gateway.html
-share/doc/HTML/en/kppp/gettingthemodemtohangup.html
-share/doc/HTML/en/kppp/gpl.html
-share/doc/HTML/en/kppp/hayes.html
-share/doc/HTML/en/kppp/howtointerpretthesystemslog.html
-share/doc/HTML/en/kppp/index.cvlog
-share/doc/HTML/en/kppp/index.docbook
-share/doc/HTML/en/kppp/index.html
-share/doc/HTML/en/kppp/installation.html
-share/doc/HTML/en/kppp/introduction.html
-share/doc/HTML/en/kppp/kppp.faq.question
-share/doc/HTML/en/kppp/kppphasthesuidbitonwhataboutsecurity.html
-share/doc/HTML/en/kppp/kppprelatedfiles.html
-share/doc/HTML/en/kppp/licenseandwarranty.html
-share/doc/HTML/en/kppp/lockfiles.html
-share/doc/HTML/en/kppp/loginscript.html
-share/doc/HTML/en/kppp/maintainers.html
-share/doc/HTML/en/kppp/maketonediallingfaster.html
-share/doc/HTML/en/kppp/modem.html
-share/doc/HTML/en/kppp/modemprofiles.html
-share/doc/HTML/en/kppp/modemtrickshints.html
-share/doc/HTML/en/kppp/moreaboutppppppd.html
-share/doc/HTML/en/kppp/pap.html
-share/doc/HTML/en/kppp/papandchap.html
-share/doc/HTML/en/kppp/ppp.html
-share/doc/HTML/en/kppp/preparingyourlinuxsystemforapppconnection.html
-share/doc/HTML/en/kppp/questionsandanswers.html
-share/doc/HTML/en/kppp/reportingproblemswithkppp.html
-share/doc/HTML/en/kppp/requirements.html
-share/doc/HTML/en/kppp/security.html
-share/doc/HTML/en/kppp/settingupkppp.html
-share/doc/HTML/en/kppp/ttyS-cua.txt
-share/doc/HTML/en/kppp/volaccounting.html
-share/doc/HTML/en/kppp/windowsntrascallback.html
-share/doc/HTML/en/ksirc/.anchors
-share/doc/HTML/en/ksirc/addingfilehandlestothemainselectloop.html
-share/doc/HTML/en/ksirc/bots.html
-share/doc/HTML/en/ksirc/colournumbers.html
-share/doc/HTML/en/ksirc/examplesfilters.html
-share/doc/HTML/en/ksirc/examplessetcolors.html
-share/doc/HTML/en/ksirc/filters.html
-share/doc/HTML/en/ksirc/hooks.html
-share/doc/HTML/en/ksirc/index.cvlog
-share/doc/HTML/en/ksirc/index.docbook
-share/doc/HTML/en/ksirc/index.html
-share/doc/HTML/en/ksirc/installation.html
-share/doc/HTML/en/ksirc/keys.html
-share/doc/HTML/en/ksirc/ksirc.png
-share/doc/HTML/en/ksirc/ksircnative.html
-share/doc/HTML/en/ksirc/programmingyoursircclient.html
-share/doc/HTML/en/ksirc/sectcolors.html
-share/doc/HTML/en/ksirc/sendingboldunderlinereverseandcolour.html
-share/doc/HTML/en/ksirc/setvariables.html
-share/doc/HTML/en/ksirc/timers.html
-share/doc/HTML/en/ksirc/userhostrequests.html
-share/doc/HTML/en/ktalkd/.anchors
-share/doc/HTML/en/ktalkd/compilationandinstallation.html
-share/doc/HTML/en/ktalkd/copyright.html
-share/doc/HTML/en/ktalkd/howdoigetdebugoutputfromktalkd.html
-share/doc/HTML/en/ktalkd/index.cvlog
-share/doc/HTML/en/ktalkd/index.docbook
-share/doc/HTML/en/ktalkd/index.html
-share/doc/HTML/en/ktalkd/installation.html
-share/doc/HTML/en/ktalkd/introduction.html
-share/doc/HTML/en/ktalkd/questionsandanswers.html
-share/doc/HTML/en/ktalkd/requirements.html
-share/doc/HTML/en/ktalkd/supportedplatforms.html
-share/doc/HTML/en/ktalkd/usage.html
-share/doc/HTML/en/ktalkd/whydontiasanormaluserreceivekdeannouncements.html
-share/icons/hicolor/22x22/actions/message_get.png
-share/icons/hicolor/32x32/apps/keystone.png
-share/icons/hicolor/32x32/apps/kit.png
-share/icons/hicolor/32x32/apps/kmail.png
-share/icons/hicolor/32x32/apps/knode.png
-share/icons/hicolor/32x32/apps/korn.png
-share/icons/hicolor/32x32/apps/kppp.png
-share/icons/hicolor/32x32/apps/ksirc.png
-share/icons/hicolor/32x32/apps/ktalkd.png
-share/icons/hicolor/48x48/apps/keystone.png
-share/icons/hicolor/48x48/apps/kit.png
-share/icons/hicolor/48x48/apps/kmail.png
-share/icons/hicolor/48x48/apps/knode.png
-share/icons/hicolor/48x48/apps/korn.png
-share/icons/hicolor/48x48/apps/kppp.png
-share/icons/hicolor/48x48/apps/ksirc.png
-share/icons/hicolor/48x48/apps/ktalkd.png
-share/icons/locolor/16x16/apps/keystone.png
-share/icons/locolor/16x16/apps/kit.png
-share/icons/locolor/16x16/apps/kmail.png
-share/icons/locolor/16x16/apps/knode.png
-share/icons/locolor/16x16/apps/korn.png
-share/icons/locolor/16x16/apps/kppp.png
-share/icons/locolor/16x16/apps/ksirc.png
-share/icons/locolor/16x16/apps/ktalkd.png
-share/icons/locolor/32x32/apps/keystone.png
-share/icons/locolor/32x32/apps/kit.png
-share/icons/locolor/32x32/apps/kmail.png
-share/icons/locolor/32x32/apps/knode.png
-share/icons/locolor/32x32/apps/korn.png
-share/icons/locolor/32x32/apps/kppp.png
-share/icons/locolor/32x32/apps/ksirc.png
-share/icons/locolor/32x32/apps/ktalkd.png
-share/sounds/ktalkd.wav
-@dirrm share/doc/HTML/en/ktalkd
-@dirrm share/doc/HTML/en/ksirc
-@dirrm share/doc/HTML/en/kppp
-@dirrm share/doc/HTML/en/korn
-@dirrm share/doc/HTML/en/knode
-@dirrm share/doc/HTML/en/kmail
-@dirrm share/doc/HTML/en/kit
-@dirrm share/doc/HTML/en/keystone
-@dirrm share/apps/ksirc/pics
-@dirrm share/apps/ksirc
-@dirrm share/apps/kppp/pics
-@dirrm share/apps/kppp/Rules/Switzerland
-@dirrm share/apps/kppp/Rules/Sweden
-@dirrm share/apps/kppp/Rules/Spain
-@dirrm share/apps/kppp/Rules/South_Afrika
-@dirrm share/apps/kppp/Rules/Slovakia
-@dirrm share/apps/kppp/Rules/Singapore
-@dirrm share/apps/kppp/Rules/Romania
-@dirrm share/apps/kppp/Rules/Portugal
-@dirrm share/apps/kppp/Rules/Poland
-@dirrm share/apps/kppp/Rules/Norway
-@dirrm share/apps/kppp/Rules/Netherlands
-@dirrm share/apps/kppp/Rules/Malaysia
-@dirrm share/apps/kppp/Rules/Luxembourg
-@dirrm share/apps/kppp/Rules/Kazakhstan
-@dirrm share/apps/kppp/Rules/Japan
-@dirrm share/apps/kppp/Rules/Jamaica
-@dirrm share/apps/kppp/Rules/Italy
-@dirrm share/apps/kppp/Rules/Israel
-@dirrm share/apps/kppp/Rules/Ireland
-@dirrm share/apps/kppp/Rules/Indonesia
-@dirrm share/apps/kppp/Rules/India
-@dirrm share/apps/kppp/Rules/Iceland
-@dirrm share/apps/kppp/Rules/Hungary
-@dirrm share/apps/kppp/Rules/Hong_Kong
-@dirrm share/apps/kppp/Rules/Greece
-@dirrm share/apps/kppp/Rules/Germany
-@dirrm share/apps/kppp/Rules/France
-@dirrm share/apps/kppp/Rules/England
-@dirrm share/apps/kppp/Rules/Denmark
-@dirrm share/apps/kppp/Rules/Czechia
-@dirrm share/apps/kppp/Rules/Croatia
-@dirrm share/apps/kppp/Rules/Brasil
-@dirrm share/apps/kppp/Rules/Belgium
-@dirrm share/apps/kppp/Rules/Bangladesh
-@dirrm share/apps/kppp/Rules/Austria/Standard
-@dirrm share/apps/kppp/Rules/Austria/Minimum
-@dirrm share/apps/kppp/Rules/Austria/Business_2
-@dirrm share/apps/kppp/Rules/Austria/Business_1
-@dirrm share/apps/kppp/Rules/Austria
-@dirrm share/apps/kppp/Rules/Australia
-@dirrm share/apps/kppp/Rules/Argentina
-@dirrm share/apps/kppp/Rules
-@dirrm share/apps/kppp/Provider/United_Kingdom
-@dirrm share/apps/kppp/Provider/Taiwan
-@dirrm share/apps/kppp/Provider/Portugal
-@dirrm share/apps/kppp/Provider/Norway
-@dirrm share/apps/kppp/Provider/NewZealand
-@dirrm share/apps/kppp/Provider/Germany
-@dirrm share/apps/kppp/Provider/Denmark
-@dirrm share/apps/kppp/Provider/Austria
-@dirrm share/apps/kppp/Provider
-@dirrm share/apps/kppp
-@dirrm share/apps/knode/pics
-@dirrm share/apps/knode/icons/locolor/16x16/actions
-@dirrm share/apps/knode/icons/locolor/16x16
-@dirrm share/apps/knode/icons/locolor
-@dirrm share/apps/knode/icons/hicolor/32x32/actions
-@dirrm share/apps/knode/icons/hicolor/32x32
-@dirrm share/apps/knode/icons/hicolor/22x22/actions
-@dirrm share/apps/knode/icons/hicolor/22x22
-@dirrm share/apps/knode/icons/hicolor
-@dirrm share/apps/knode/icons
-@dirrm share/apps/knode/filters
-@dirrm share/apps/knode
-@dirrm share/apps/kmail/pics
-@dirrm share/apps/kmail
-@dirrm share/apps/kit/icons/locolor/16x16/actions
-@dirrm share/apps/kit/icons/locolor/16x16
-@dirrm share/apps/kit/icons/locolor
-@dirrm share/apps/kit/icons
-@dirrm share/apps/kit
-@dirrm share/apps/keystone
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
deleted file mode 100644
index e0c0041dc78a..000000000000
--- a/net/kdenetwork4/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:	kdenetwork2
-# Date created:				Sun May 14 00:55:45
-# Whom:					Will Andrews <will@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kdenetwork
-PORTVERSION=	2.0
-CATEGORIES=	net news kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
-
-MAINTAINER=	will@FreeBSD.org
-
-LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
-USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
-USE_GMAKE=	yes
-
-pre-configure:
-	${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
deleted file mode 100644
index 9ac64c236e7f..000000000000
--- a/net/kdenetwork4/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (kdenetwork-2.0.tar.bz2) = e9330d2a8b937abba44e1eaecec10004
diff --git a/net/kdenetwork4/pkg-comment b/net/kdenetwork4/pkg-comment
deleted file mode 100644
index bf5dcda48324..000000000000
--- a/net/kdenetwork4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network modules for KDE2
diff --git a/net/kdenetwork4/pkg-descr b/net/kdenetwork4/pkg-descr
deleted file mode 100644
index f7425da6373d..000000000000
--- a/net/kdenetwork4/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-KDE provides an integrated X11 based environment, much like CDE.
-This particular port installs the networking components of KDE,
-which includes applications for Internet things like email, web,
-irc, and so forth.  Note that this is for KDE2, not KDE 1.x.
-
-WWW: http://www.kde.org/
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
deleted file mode 100644
index fff92a371ade..000000000000
--- a/net/kdenetwork4/pkg-plist
+++ /dev/null
@@ -1,679 +0,0 @@
-bin/dsirc
-bin/keystone
-bin/kit
-bin/kmail
-bin/knode
-bin/korn
-bin/kotalkd
-bin/kppp
-bin/kppplogview
-bin/ksirc
-bin/ksticker
-bin/ktalkd
-bin/ktalkdlg
-bin/mail.local
-include/kmailIface.h
-lib/ksirc.la
-lib/ksirc.so
-lib/libkcm_ktalkd.la
-lib/libkcm_ktalkd.so
-share/applnk/Internet/KMail.desktop
-share/applnk/Internet/KNode.desktop
-share/applnk/Internet/KOrn.desktop
-share/applnk/Internet/Kppp.desktop
-share/applnk/Internet/keystone.desktop
-share/applnk/Internet/kit.desktop
-share/applnk/Internet/kppplogview.desktop
-share/applnk/Internet/ksirc.desktop
-share/applnk/Settings/Network/kcmktalkd.desktop
-share/apps/keystone/keystoneui.rc
-share/apps/kit/eventsrc
-share/apps/kit/icons/locolor/16x16/actions/kit_anonwarning.png
-share/apps/kit/icons/locolor/16x16/actions/kit_away.png
-share/apps/kit/icons/locolor/16x16/actions/kit_bold.png
-share/apps/kit/icons/locolor/16x16/actions/kit_group.png
-share/apps/kit/icons/locolor/16x16/actions/kit_info.png
-share/apps/kit/icons/locolor/16x16/actions/kit_logging.png
-share/apps/kit/icons/locolor/16x16/actions/kit_offline.png
-share/apps/kit/icons/locolor/16x16/actions/kit_online.png
-share/apps/kit/icons/locolor/16x16/actions/kit_sound.png
-share/apps/kit/icons/locolor/16x16/actions/kit_status.png
-share/apps/kit/icons/locolor/16x16/actions/kit_timestamping.png
-share/apps/kit/icons/locolor/16x16/actions/kit_warning.png
-share/apps/kmail/kmcomposerui.rc
-share/apps/kmail/kmmainwin.rc
-share/apps/kmail/pics/abdown.png
-share/apps/kmail/pics/abup.png
-share/apps/kmail/pics/closed.png
-share/apps/kmail/pics/feather_white.png
-share/apps/kmail/pics/green-bullet.png
-share/apps/kmail/pics/kdelogo.xpm
-share/apps/kmail/pics/kmfldin.png
-share/apps/kmail/pics/kmfldout.png
-share/apps/kmail/pics/kmfldsent.png
-share/apps/kmail/pics/kmfolder.png
-share/apps/kmail/pics/kmfolderfull.png
-share/apps/kmail/pics/kminsorgmsg.png
-share/apps/kmail/pics/kmmsgdel.png
-share/apps/kmail/pics/kmmsgforwarded.png
-share/apps/kmail/pics/kmmsgnew.png
-share/apps/kmail/pics/kmmsgold.png
-share/apps/kmail/pics/kmmsgqueued.png
-share/apps/kmail/pics/kmmsgreplied.png
-share/apps/kmail/pics/kmmsgsent.png
-share/apps/kmail/pics/kmmsgunseen.png
-share/apps/kmail/pics/kmtrash.png
-share/apps/kmail/pics/pgp-keys.png
-share/apps/kmail/pics/pub_key_red.png
-share/apps/kmail/pics/red-bullet.png
-share/apps/kmail/pics/stopwatch.xbm
-share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/knode/filters/1.fltr
-share/apps/knode/filters/2.fltr
-share/apps/knode/filters/3.fltr
-share/apps/knode/filters/4.fltr
-share/apps/knode/filters/5.fltr
-share/apps/knode/filters/6.fltr
-share/apps/knode/filters/7.fltr
-share/apps/knode/filters/8.fltr
-share/apps/knode/filters/filters.rc
-share/apps/knode/headers.rc
-share/apps/knode/icons/hicolor/22x22/actions/message_reply.png
-share/apps/knode/icons/hicolor/32x32/actions/message_reply.png
-share/apps/knode/icons/locolor/16x16/actions/message_reply.png
-share/apps/knode/kncomposerui.rc
-share/apps/knode/knodeui.rc
-share/apps/knode/knreaderui.rc
-share/apps/knode/pics/ctlart.png
-share/apps/knode/pics/eyes.png
-share/apps/knode/pics/greyball.png
-share/apps/knode/pics/greyballchk.png
-share/apps/knode/pics/group.png
-share/apps/knode/pics/mail.png
-share/apps/knode/pics/newsubs.png
-share/apps/knode/pics/posting.png
-share/apps/knode/pics/redball.png
-share/apps/knode/pics/redballchk.png
-share/apps/knode/pics/server.png
-share/apps/knode/pics/smile.png
-share/apps/knode/pics/snderr.png
-share/apps/knode/pics/stat_cncl.png
-share/apps/knode/pics/stat_edit.png
-share/apps/knode/pics/stat_saved.png
-share/apps/knode/pics/stat_sent.png
-share/apps/kppp/Provider/Austria/.directory
-share/apps/kppp/Provider/Austria/Simon%032Media
-share/apps/kppp/Provider/Denmark/.directory
-share/apps/kppp/Provider/Denmark/Get2Net
-share/apps/kppp/Provider/Germany/.directory
-share/apps/kppp/Provider/Germany/CityWeb
-share/apps/kppp/Provider/Germany/FH%032Rhein%032Sieg%032%040Informatik%041
-share/apps/kppp/Provider/Germany/MUC%046DE
-share/apps/kppp/Provider/Germany/Netsurf
-share/apps/kppp/Provider/NewZealand/.directory
-share/apps/kppp/Provider/NewZealand/OrconInternet
-share/apps/kppp/Provider/NewZealand/Paradise
-share/apps/kppp/Provider/NewZealand/Voyager
-share/apps/kppp/Provider/NewZealand/XTRA
-share/apps/kppp/Provider/NewZealand/ihug
-share/apps/kppp/Provider/Norway/.directory
-share/apps/kppp/Provider/Norway/BGNett
-share/apps/kppp/Provider/Norway/Institutt%032for%032informatikk
-share/apps/kppp/Provider/Portugal/.directory
-share/apps/kppp/Provider/Portugal/Clix
-share/apps/kppp/Provider/Portugal/Netc
-share/apps/kppp/Provider/Portugal/OniNet
-share/apps/kppp/Provider/Taiwan/.directory
-share/apps/kppp/Provider/Taiwan/EraNet
-share/apps/kppp/Provider/Taiwan/HiNet
-share/apps/kppp/Provider/Taiwan/SeedNet
-share/apps/kppp/Provider/United_Kingdom/.directory
-share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
-share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
-share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
-share/apps/kppp/Provider/United_Kingdom/FreeServe
-share/apps/kppp/Rules/Argentina/Argentina_0610.rst
-share/apps/kppp/Rules/Argentina/Argentina_Local.rst
-share/apps/kppp/Rules/Australia/Local.rst
-share/apps/kppp/Rules/Australia/Optus_Residential.rst
-share/apps/kppp/Rules/Australia/STD_Zone_1_-_25-50_kms.rst
-share/apps/kppp/Rules/Australia/STD_Zone_2_-_50-85_kms.rst
-share/apps/kppp/Rules/Australia/STD_Zone_3_-_85-165_kms.rst
-share/apps/kppp/Rules/Australia/STD_Zone_4_-_165+_kms.rst
-share/apps/kppp/Rules/Austria/Business_1/Local.rst
-share/apps/kppp/Rules/Austria/Business_1/Long_Distance.rst
-share/apps/kppp/Rules/Austria/Business_1/Online.rst
-share/apps/kppp/Rules/Austria/Business_2/Local.rst
-share/apps/kppp/Rules/Austria/Business_2/Long_Distance.rst
-share/apps/kppp/Rules/Austria/Business_2/Online.rst
-share/apps/kppp/Rules/Austria/Minimum/Local.rst
-share/apps/kppp/Rules/Austria/Minimum/Long_Distance.rst
-share/apps/kppp/Rules/Austria/Minimum/Online.rst
-share/apps/kppp/Rules/Austria/Standard/Local.rst
-share/apps/kppp/Rules/Austria/Standard/Long_Distance.rst
-share/apps/kppp/Rules/Austria/Standard/Online.rst
-share/apps/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
-share/apps/kppp/Rules/Bangladesh/ATT00007.rst
-share/apps/kppp/Rules/Bangladesh/ATT00010.rst
-share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
-share/apps/kppp/Rules/Belgium/Belgium_zonal.rst
-share/apps/kppp/Rules/Brasil/Brasil.rst
-share/apps/kppp/Rules/Brasil/SaoPaulo.rst
-share/apps/kppp/Rules/Croatia/CARNet_lokalni_poziv.rst
-share/apps/kppp/Rules/Croatia/CARNet_medjugradski_poziv.rst
-share/apps/kppp/Rules/Croatia/hinet_anonimni_ulaz.rst
-share/apps/kppp/Rules/Croatia/hinet_hpt.rst
-share/apps/kppp/Rules/Croatia/ibm_net.rst
-share/apps/kppp/Rules/Croatia/iskon_lokalni_poziv.rst
-share/apps/kppp/Rules/Croatia/iskon_medjugradski_poziv.rst
-share/apps/kppp/Rules/Croatia/iskon_zagrebacka_zupanija.rst
-share/apps/kppp/Rules/Czechia/Czech_Telecom_City.rst
-share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet2000.rst
-share/apps/kppp/Rules/Denmark/12Move_Analog.rst
-share/apps/kppp/Rules/Denmark/12Move_ISDN.rst
-share/apps/kppp/Rules/Denmark/Cybercity_Friabonnement.rst
-share/apps/kppp/Rules/Denmark/Get2net_Betaling.rst
-share/apps/kppp/Rules/Denmark/Get2net_Gratis.rst
-share/apps/kppp/Rules/Denmark/Mobilix_Wanadoo.rst
-share/apps/kppp/Rules/Denmark/Teledanmark_Basis.rst
-share/apps/kppp/Rules/Denmark/Teledanmark_Favoritinternet.rst
-share/apps/kppp/Rules/Denmark/Worldonline-Analog.rst
-share/apps/kppp/Rules/Denmark/Worldonline-ISDN.rst
-share/apps/kppp/Rules/England/BirminghamCable_Local.rst
-share/apps/kppp/Rules/England/BirminghamCable_National.rst
-share/apps/kppp/Rules/England/BirminghamCable_SameTelco.rst
-share/apps/kppp/Rules/England/BritishTelecom_Local.rst
-share/apps/kppp/Rules/England/BritishTelecom_National.rst
-share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
-share/apps/kppp/Rules/France/France_Telecom_Local.rst
-share/apps/kppp/Rules/France/France_Telecom_Local_Area.rst
-share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
-share/apps/kppp/Rules/France/France_Telecom_National.rst
-share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
-share/apps/kppp/Rules/Germany/Addcom.rst
-share/apps/kppp/Rules/Germany/CallOkaynet.rst
-share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
-share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
-share/apps/kppp/Rules/Germany/MSN.rst
-share/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst
-share/apps/kppp/Rules/Germany/NGI_Call_By_Call.rst
-share/apps/kppp/Rules/Germany/Nikoma.rst
-share/apps/kppp/Rules/Germany/Nikoma_Internet_by_Call.rst
-share/apps/kppp/Rules/Germany/Nikoma_Study_and_Surf.rst
-share/apps/kppp/Rules/Germany/Planet-Interkom_Internet_by_call.rst
-share/apps/kppp/Rules/Germany/Telekom_City_Select_5_30.rst
-share/apps/kppp/Rules/Germany/knUUt-by-Call.rst
-share/apps/kppp/Rules/Germany/talkline_by_call.rst
-share/apps/kppp/Rules/Germany/vossnet_fun.rst
-share/apps/kppp/Rules/Germany/vossnet_fun_light.rst
-share/apps/kppp/Rules/Germany/vossnet_kompl.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone1.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone2.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone3.rst
-share/apps/kppp/Rules/Greece/Hellas_EPAK_local.rst
-share/apps/kppp/Rules/Greece/Hellas_analog_local.rst
-share/apps/kppp/Rules/Greece/Hellas_digital_local.rst
-share/apps/kppp/Rules/Hong_Kong/Hong_Kong_Telecom.rst
-share/apps/kppp/Rules/Hungary/Local.rst
-share/apps/kppp/Rules/Hungary/LocalTop_MATAV.rst
-share/apps/kppp/Rules/Hungary/Local_MATAV.rst
-share/apps/kppp/Rules/Iceland/Iceland_general.rst
-share/apps/kppp/Rules/India/Vsnl_local.rst
-share/apps/kppp/Rules/Indonesia/Lokal_1_Metropolitan.rst
-share/apps/kppp/Rules/Indonesia/Lokal_2_Metropolitan.rst
-share/apps/kppp/Rules/Indonesia/Lokal_non_metropolitan.rst
-share/apps/kppp/Rules/Ireland/Eircom_Internet.rst
-share/apps/kppp/Rules/Ireland/Eircom_Local.rst
-share/apps/kppp/Rules/Ireland/Eircom_National.rst
-share/apps/kppp/Rules/Ireland/Eircom_Special.rst
-share/apps/kppp/Rules/Israel/Bezeq_Interurban.rst
-share/apps/kppp/Rules/Israel/Bezeq_Local.rst
-share/apps/kppp/Rules/Italy/Telecom_0-15_km.rst
-share/apps/kppp/Rules/Italy/Telecom_15-30_km.rst
-share/apps/kppp/Rules/Italy/Telecom_30-60_km.rst
-share/apps/kppp/Rules/Italy/Telecom_60+_km.rst
-share/apps/kppp/Rules/Italy/Telecom_Distrettuali.rst
-share/apps/kppp/Rules/Italy/Telecom_Interurbana_settoriale.rst
-share/apps/kppp/Rules/Italy/Telecom_TAT.rst
-share/apps/kppp/Rules/Italy/Telecom_TUT.rst
-share/apps/kppp/Rules/Italy/Telecom_Urbana.rst
-share/apps/kppp/Rules/Jamaica/CWJ_InterParish.rst
-share/apps/kppp/Rules/Jamaica/CWJ_Local.rst
-share/apps/kppp/Rules/Japan/NTT_Local.rst
-share/apps/kppp/Rules/Kazakhstan/Akparat_Sprint.rst
-share/apps/kppp/Rules/Luxembourg/Local.rst
-share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst
-share/apps/kppp/Rules/Malaysia/malaysia.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Regio_Nummervoordeel.rst
-share/apps/kppp/Rules/Netherlands/BelBudget_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst
-share/apps/kppp/Rules/Netherlands/NedpointBasis_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/NedpointBelBespaar_Lokaal.rst
-share/apps/kppp/Rules/Norway/Local_Area.rst
-share/apps/kppp/Rules/Norway/Long_Distance.rst
-share/apps/kppp/Rules/Poland/Internetia.rst
-share/apps/kppp/Rules/Poland/Netia_100km_Niebieska.rst
-share/apps/kppp/Rules/Poland/Netia_100km_Zielona.rst
-share/apps/kppp/Rules/Poland/Netia_Lokalne_Niebieska.rst
-share/apps/kppp/Rules/Poland/Netia_Lokalne_Zielona.rst
-share/apps/kppp/Rules/Poland/TPSA.rst
-share/apps/kppp/Rules/Poland/TP_100km.rst
-share/apps/kppp/Rules/Poland/TP_Lokalne.rst
-share/apps/kppp/Rules/Portugal/PT_Local.rst
-share/apps/kppp/Rules/Portugal/PT_Local_Ilhas.rst
-share/apps/kppp/Rules/Portugal/PT_Regional.rst
-share/apps/kppp/Rules/Portugal/PT_Regional_Ilhas.rst
-share/apps/kppp/Rules/Portugal/PT_YesNET.rst
-share/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst
-share/apps/kppp/Rules/Romania/Telecom_GSM.rst
-share/apps/kppp/Rules/Romania/Telecom_Interurban.rst
-share/apps/kppp/Rules/Romania/Telecom_Local.rst
-share/apps/kppp/Rules/Singapore/SingTel_Local.rst
-share/apps/kppp/Rules/Slovakia/Internetovy_tarif_019XY.rst
-share/apps/kppp/Rules/Slovakia/ST_medzimesto_1_pasmo.rst
-share/apps/kppp/Rules/Slovakia/ST_medzimesto_2_pasmo.rst
-share/apps/kppp/Rules/Slovakia/ST_mesto.rst
-share/apps/kppp/Rules/South_Afrika/South_Afrika.rst
-share/apps/kppp/Rules/Spain/Infovia.rst
-share/apps/kppp/Rules/Spain/Infovia_IVA.rst
-share/apps/kppp/Rules/Spain/Telefonica_Interprovincial.rst
-share/apps/kppp/Rules/Spain/Telefonica_Interprovincial_IVA.rst
-share/apps/kppp/Rules/Spain/Telefonica_Local.rst
-share/apps/kppp/Rules/Spain/Telefonica_Metropolitana.rst
-share/apps/kppp/Rules/Spain/Telefonica_Metropolitana_IVA.rst
-share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst
-share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst
-share/apps/kppp/Rules/Spain/Telefonica_Provincial_IVA.rst
-share/apps/kppp/Rules/Sweden/ACN.rst
-share/apps/kppp/Rules/Sweden/Abonnera_com.rst
-share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
-share/apps/kppp/Rules/Sweden/Crossnet-Affinity.rst
-share/apps/kppp/Rules/Sweden/Glocalnet.rst
-share/apps/kppp/Rules/Sweden/Gts.rst
-share/apps/kppp/Rules/Sweden/Home_se.rst
-share/apps/kppp/Rules/Sweden/Nemtel.rst
-share/apps/kppp/Rules/Sweden/Plusenergi.rst
-share/apps/kppp/Rules/Sweden/RSLCom.rst
-share/apps/kppp/Rules/Sweden/Rix_Telecom.rst
-share/apps/kppp/Rules/Sweden/Supertel.rst
-share/apps/kppp/Rules/Sweden/Svensk_Telekom.rst
-share/apps/kppp/Rules/Sweden/Tele1_Europe.rst
-share/apps/kppp/Rules/Sweden/Tele2.rst
-share/apps/kppp/Rules/Sweden/Tele8.rst
-share/apps/kppp/Rules/Sweden/Teleman.rst
-share/apps/kppp/Rules/Sweden/Telenordia.rst
-share/apps/kppp/Rules/Sweden/Telerian.rst
-share/apps/kppp/Rules/Sweden/Telia.rst
-share/apps/kppp/Rules/Sweden/Telia_Telebonus1.rst
-share/apps/kppp/Rules/Sweden/Telia_Telebonus2.rst
-share/apps/kppp/Rules/Sweden/Telitel.rst
-share/apps/kppp/Rules/Sweden/Transnet.rst
-share/apps/kppp/Rules/Sweden/Universal_Telecom.rst
-share/apps/kppp/Rules/Sweden/Utfors.rst
-share/apps/kppp/Rules/Sweden/Vattenfall.rst
-share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
-share/apps/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst
-share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
-share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst
-share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst
-share/apps/kppp/Rules/TEMPLATE
-share/apps/kppp/Rules/checkrules
-share/apps/kppp/pics/dock_both.png
-share/apps/kppp/pics/dock_left.png
-share/apps/kppp/pics/dock_none.png
-share/apps/kppp/pics/dock_right.png
-share/apps/kppp/pics/folder.png
-share/apps/kppp/pics/modemboth.png
-share/apps/kppp/pics/modemleft.png
-share/apps/kppp/pics/modemnone.png
-share/apps/kppp/pics/modemright.png
-share/apps/kppp/pics/phone.png
-share/apps/ksirc/commands-handler.pl
-share/apps/ksirc/commands-perl.pl
-share/apps/ksirc/convert_commands.pl
-share/apps/ksirc/dcc_progress.pm
-share/apps/ksirc/dcc_status.pm
-share/apps/ksirc/filters.pl
-share/apps/ksirc/ksirc.pl
-share/apps/ksirc/ksirclistbox.pm
-share/apps/ksirc/load_all.pm
-share/apps/ksirc/palistbox.pm
-share/apps/ksirc/pbase.pm
-share/apps/ksirc/pboxlayout.pm
-share/apps/ksirc/pbutton.pm
-share/apps/ksirc/pframe.pm
-share/apps/ksirc/pics/arrow.png
-share/apps/ksirc/pics/blueball.png
-share/apps/ksirc/pics/bluepin.png
-share/apps/ksirc/pics/channel.xpm
-share/apps/ksirc/pics/channels.xpm
-share/apps/ksirc/pics/greenpin.png
-share/apps/ksirc/pics/info.png
-share/apps/ksirc/pics/info1.png
-share/apps/ksirc/pics/ksirc.png
-share/apps/ksirc/pics/ksirc_a.xpm
-share/apps/ksirc/pics/ksirc_b.xpm
-share/apps/ksirc/pics/ksirc_dock.xpm
-share/apps/ksirc/pics/madsmiley.png
-share/apps/ksirc/pics/mini-run.png
-share/apps/ksirc/pics/server.xpm
-share/apps/ksirc/pics/smiley.png
-share/apps/ksirc/pics/star.png
-share/apps/ksirc/pkfiledialog.pm
-share/apps/ksirc/plabel.pm
-share/apps/ksirc/plined.pm
-share/apps/ksirc/plistbox.pm
-share/apps/ksirc/pmenudta.pm
-share/apps/ksirc/pobjfinder.pm
-share/apps/ksirc/ppopmenu.pm
-share/apps/ksirc/pprogress.pm
-share/apps/ksirc/ppushbt.pm
-share/apps/ksirc/ptabdialog.pm
-share/apps/ksirc/ptablevw.pm
-share/apps/ksirc/puke.pl
-share/apps/ksirc/pwidget.pm
-share/apps/ksirc/relnotes
-share/apps/ksirc/servers.ini
-share/apps/ksirc/servers.txt
-share/apps/ksirc/sirc.help.gz
-share/apps/ksirc/small.pl
-share/apps/ksirc/test.pl
-share/apps/ksirc/tester.pl
-share/config/ksircrc
-share/config/protocols/vnc.desktop
-share/doc/HTML/en/keystone/.anchors
-share/doc/HTML/en/keystone/index.docbook
-share/doc/HTML/en/keystone/index.html
-share/doc/HTML/en/keystone/introduction.html
-share/doc/HTML/en/kit/.anchors
-share/doc/HTML/en/kit/index.docbook
-share/doc/HTML/en/kit/index.html
-share/doc/HTML/en/kit/introduction.html
-share/doc/HTML/en/kmail/.anchors
-share/doc/HTML/en/kmail/appearancetab.html
-share/doc/HTML/en/kmail/composertab.html
-share/doc/HTML/en/kmail/copyright.html
-share/doc/HTML/en/kmail/documentation.html
-share/doc/HTML/en/kmail/epilogue.html
-share/doc/HTML/en/kmail/faq.html
-share/doc/HTML/en/kmail/filters.html
-share/doc/HTML/en/kmail/index.docbook
-share/doc/HTML/en/kmail/index.html
-share/doc/HTML/en/kmail/misctab.html
-share/doc/HTML/en/kmail/networktab.html
-share/doc/HTML/en/kmail/seccustomizing.html
-share/doc/HTML/en/kmail/secfolders.html
-share/doc/HTML/en/kmail/secgettingstarted.html
-share/doc/HTML/en/kmail/secimporting.html
-share/doc/HTML/en/kmail/secintro.html
-share/doc/HTML/en/kmail/secmenus.html
-share/doc/HTML/en/kmail/secmultipleaccounts.html
-share/doc/HTML/en/kmail/secpgp.html
-share/doc/HTML/en/kmail/securitytab.html
-share/doc/HTML/en/kmail/secusingkmail.html
-share/doc/HTML/en/kmail/settingupyouraccount.html
-share/doc/HTML/en/kmail/team.html
-share/doc/HTML/en/kmail/testingyoursetup.html
-share/doc/HTML/en/kmail/theaddressbook.html
-share/doc/HTML/en/kmail/thecomposerwindow.html
-share/doc/HTML/en/kmail/thecomposerwindow2.html
-share/doc/HTML/en/knode/.anchors
-share/doc/HTML/en/knode/commands.html
-share/doc/HTML/en/knode/compilation.html
-share/doc/HTML/en/knode/configuration.html
-share/doc/HTML/en/knode/credits.html
-share/doc/HTML/en/knode/eyes.png
-share/doc/HTML/en/knode/faq.html
-share/doc/HTML/en/knode/greyball.png
-share/doc/HTML/en/knode/greyballchk.png
-share/doc/HTML/en/knode/index.docbook
-share/doc/HTML/en/knode/index.html
-share/doc/HTML/en/knode/infos-technical.html
-share/doc/HTML/en/knode/infos-testgroups.html
-share/doc/HTML/en/knode/installation.html
-share/doc/HTML/en/knode/introduction.html
-share/doc/HTML/en/knode/knode-cleanup.png
-share/doc/HTML/en/knode/knode-colors-fonts.png
-share/doc/HTML/en/knode/knode-composer-attachments.png
-share/doc/HTML/en/knode/knode-composer-settings.png
-share/doc/HTML/en/knode/knode-edit-filter.png
-share/doc/HTML/en/knode/knode-edit-header1.png
-share/doc/HTML/en/knode/knode-edit-header2.png
-share/doc/HTML/en/knode/knode-editorwindow.html
-share/doc/HTML/en/knode/knode-filters.png
-share/doc/HTML/en/knode/knode-followup.png
-share/doc/HTML/en/knode/knode-header-settings.png
-share/doc/HTML/en/knode/knode-identity.png
-share/doc/HTML/en/knode/knode-journey.html
-share/doc/HTML/en/knode/knode-mail-account.png
-share/doc/HTML/en/knode/knode-more-info.html
-share/doc/HTML/en/knode/knode-new-article.png
-share/doc/HTML/en/knode/knode-news-account.png
-share/doc/HTML/en/knode/knode-post-settings.png
-share/doc/HTML/en/knode/knode-read-news-settings.png
-share/doc/HTML/en/knode/knode-reply.png
-share/doc/HTML/en/knode/knode-search.png
-share/doc/HTML/en/knode/knode-start.png
-share/doc/HTML/en/knode/knode-subscribe.png
-share/doc/HTML/en/knode/knode-views.png
-share/doc/HTML/en/knode/more-knode-features.html
-share/doc/HTML/en/knode/nettiquette.html
-share/doc/HTML/en/knode/newsubs.png
-share/doc/HTML/en/knode/redball.png
-share/doc/HTML/en/knode/redballchk.png
-share/doc/HTML/en/knode/requirements.html
-share/doc/HTML/en/knode/subscribing.html
-share/doc/HTML/en/knode/update-installation.html
-share/doc/HTML/en/knode/usenet-slang.html
-share/doc/HTML/en/knode/using-knode.html
-share/doc/HTML/en/korn/.anchors
-share/doc/HTML/en/korn/index.docbook
-share/doc/HTML/en/korn/index.html
-share/doc/HTML/en/korn/introduction.html
-share/doc/HTML/en/korn/licenses-and-credits.html
-share/doc/HTML/en/korn/the-display-tab.html
-share/doc/HTML/en/korn/the-new-dialog.html
-share/doc/HTML/en/korn/the-preferences-dialog.html
-share/doc/HTML/en/kppp/.anchors
-share/doc/HTML/en/kppp/BackGround.png
-share/doc/HTML/en/kppp/accounting.html
-share/doc/HTML/en/kppp/appendix.html
-share/doc/HTML/en/kppp/autoconfigurehostname.html
-share/doc/HTML/en/kppp/cb.html
-share/doc/HTML/en/kppp/compilationandinstallation.html
-share/doc/HTML/en/kppp/configuringanaccount.html
-share/doc/HTML/en/kppp/costsgraphs.fig
-share/doc/HTML/en/kppp/costsgraphs.png
-share/doc/HTML/en/kppp/dns.html
-share/doc/HTML/en/kppp/gateway.html
-share/doc/HTML/en/kppp/gettingthemodemtohangup.html
-share/doc/HTML/en/kppp/gpl.html
-share/doc/HTML/en/kppp/hayes.html
-share/doc/HTML/en/kppp/howtointerpretthesystemslog.html
-share/doc/HTML/en/kppp/index.cvlog
-share/doc/HTML/en/kppp/index.docbook
-share/doc/HTML/en/kppp/index.html
-share/doc/HTML/en/kppp/installation.html
-share/doc/HTML/en/kppp/introduction.html
-share/doc/HTML/en/kppp/kppp.faq.question
-share/doc/HTML/en/kppp/kppphasthesuidbitonwhataboutsecurity.html
-share/doc/HTML/en/kppp/kppprelatedfiles.html
-share/doc/HTML/en/kppp/licenseandwarranty.html
-share/doc/HTML/en/kppp/lockfiles.html
-share/doc/HTML/en/kppp/loginscript.html
-share/doc/HTML/en/kppp/maintainers.html
-share/doc/HTML/en/kppp/maketonediallingfaster.html
-share/doc/HTML/en/kppp/modem.html
-share/doc/HTML/en/kppp/modemprofiles.html
-share/doc/HTML/en/kppp/modemtrickshints.html
-share/doc/HTML/en/kppp/moreaboutppppppd.html
-share/doc/HTML/en/kppp/pap.html
-share/doc/HTML/en/kppp/papandchap.html
-share/doc/HTML/en/kppp/ppp.html
-share/doc/HTML/en/kppp/preparingyourlinuxsystemforapppconnection.html
-share/doc/HTML/en/kppp/questionsandanswers.html
-share/doc/HTML/en/kppp/reportingproblemswithkppp.html
-share/doc/HTML/en/kppp/requirements.html
-share/doc/HTML/en/kppp/security.html
-share/doc/HTML/en/kppp/settingupkppp.html
-share/doc/HTML/en/kppp/ttyS-cua.txt
-share/doc/HTML/en/kppp/volaccounting.html
-share/doc/HTML/en/kppp/windowsntrascallback.html
-share/doc/HTML/en/ksirc/.anchors
-share/doc/HTML/en/ksirc/addingfilehandlestothemainselectloop.html
-share/doc/HTML/en/ksirc/bots.html
-share/doc/HTML/en/ksirc/colournumbers.html
-share/doc/HTML/en/ksirc/examplesfilters.html
-share/doc/HTML/en/ksirc/examplessetcolors.html
-share/doc/HTML/en/ksirc/filters.html
-share/doc/HTML/en/ksirc/hooks.html
-share/doc/HTML/en/ksirc/index.cvlog
-share/doc/HTML/en/ksirc/index.docbook
-share/doc/HTML/en/ksirc/index.html
-share/doc/HTML/en/ksirc/installation.html
-share/doc/HTML/en/ksirc/keys.html
-share/doc/HTML/en/ksirc/ksirc.png
-share/doc/HTML/en/ksirc/ksircnative.html
-share/doc/HTML/en/ksirc/programmingyoursircclient.html
-share/doc/HTML/en/ksirc/sectcolors.html
-share/doc/HTML/en/ksirc/sendingboldunderlinereverseandcolour.html
-share/doc/HTML/en/ksirc/setvariables.html
-share/doc/HTML/en/ksirc/timers.html
-share/doc/HTML/en/ksirc/userhostrequests.html
-share/doc/HTML/en/ktalkd/.anchors
-share/doc/HTML/en/ktalkd/compilationandinstallation.html
-share/doc/HTML/en/ktalkd/copyright.html
-share/doc/HTML/en/ktalkd/howdoigetdebugoutputfromktalkd.html
-share/doc/HTML/en/ktalkd/index.cvlog
-share/doc/HTML/en/ktalkd/index.docbook
-share/doc/HTML/en/ktalkd/index.html
-share/doc/HTML/en/ktalkd/installation.html
-share/doc/HTML/en/ktalkd/introduction.html
-share/doc/HTML/en/ktalkd/questionsandanswers.html
-share/doc/HTML/en/ktalkd/requirements.html
-share/doc/HTML/en/ktalkd/supportedplatforms.html
-share/doc/HTML/en/ktalkd/usage.html
-share/doc/HTML/en/ktalkd/whydontiasanormaluserreceivekdeannouncements.html
-share/icons/hicolor/22x22/actions/message_get.png
-share/icons/hicolor/32x32/apps/keystone.png
-share/icons/hicolor/32x32/apps/kit.png
-share/icons/hicolor/32x32/apps/kmail.png
-share/icons/hicolor/32x32/apps/knode.png
-share/icons/hicolor/32x32/apps/korn.png
-share/icons/hicolor/32x32/apps/kppp.png
-share/icons/hicolor/32x32/apps/ksirc.png
-share/icons/hicolor/32x32/apps/ktalkd.png
-share/icons/hicolor/48x48/apps/keystone.png
-share/icons/hicolor/48x48/apps/kit.png
-share/icons/hicolor/48x48/apps/kmail.png
-share/icons/hicolor/48x48/apps/knode.png
-share/icons/hicolor/48x48/apps/korn.png
-share/icons/hicolor/48x48/apps/kppp.png
-share/icons/hicolor/48x48/apps/ksirc.png
-share/icons/hicolor/48x48/apps/ktalkd.png
-share/icons/locolor/16x16/apps/keystone.png
-share/icons/locolor/16x16/apps/kit.png
-share/icons/locolor/16x16/apps/kmail.png
-share/icons/locolor/16x16/apps/knode.png
-share/icons/locolor/16x16/apps/korn.png
-share/icons/locolor/16x16/apps/kppp.png
-share/icons/locolor/16x16/apps/ksirc.png
-share/icons/locolor/16x16/apps/ktalkd.png
-share/icons/locolor/32x32/apps/keystone.png
-share/icons/locolor/32x32/apps/kit.png
-share/icons/locolor/32x32/apps/kmail.png
-share/icons/locolor/32x32/apps/knode.png
-share/icons/locolor/32x32/apps/korn.png
-share/icons/locolor/32x32/apps/kppp.png
-share/icons/locolor/32x32/apps/ksirc.png
-share/icons/locolor/32x32/apps/ktalkd.png
-share/sounds/ktalkd.wav
-@dirrm share/doc/HTML/en/ktalkd
-@dirrm share/doc/HTML/en/ksirc
-@dirrm share/doc/HTML/en/kppp
-@dirrm share/doc/HTML/en/korn
-@dirrm share/doc/HTML/en/knode
-@dirrm share/doc/HTML/en/kmail
-@dirrm share/doc/HTML/en/kit
-@dirrm share/doc/HTML/en/keystone
-@dirrm share/apps/ksirc/pics
-@dirrm share/apps/ksirc
-@dirrm share/apps/kppp/pics
-@dirrm share/apps/kppp/Rules/Switzerland
-@dirrm share/apps/kppp/Rules/Sweden
-@dirrm share/apps/kppp/Rules/Spain
-@dirrm share/apps/kppp/Rules/South_Afrika
-@dirrm share/apps/kppp/Rules/Slovakia
-@dirrm share/apps/kppp/Rules/Singapore
-@dirrm share/apps/kppp/Rules/Romania
-@dirrm share/apps/kppp/Rules/Portugal
-@dirrm share/apps/kppp/Rules/Poland
-@dirrm share/apps/kppp/Rules/Norway
-@dirrm share/apps/kppp/Rules/Netherlands
-@dirrm share/apps/kppp/Rules/Malaysia
-@dirrm share/apps/kppp/Rules/Luxembourg
-@dirrm share/apps/kppp/Rules/Kazakhstan
-@dirrm share/apps/kppp/Rules/Japan
-@dirrm share/apps/kppp/Rules/Jamaica
-@dirrm share/apps/kppp/Rules/Italy
-@dirrm share/apps/kppp/Rules/Israel
-@dirrm share/apps/kppp/Rules/Ireland
-@dirrm share/apps/kppp/Rules/Indonesia
-@dirrm share/apps/kppp/Rules/India
-@dirrm share/apps/kppp/Rules/Iceland
-@dirrm share/apps/kppp/Rules/Hungary
-@dirrm share/apps/kppp/Rules/Hong_Kong
-@dirrm share/apps/kppp/Rules/Greece
-@dirrm share/apps/kppp/Rules/Germany
-@dirrm share/apps/kppp/Rules/France
-@dirrm share/apps/kppp/Rules/England
-@dirrm share/apps/kppp/Rules/Denmark
-@dirrm share/apps/kppp/Rules/Czechia
-@dirrm share/apps/kppp/Rules/Croatia
-@dirrm share/apps/kppp/Rules/Brasil
-@dirrm share/apps/kppp/Rules/Belgium
-@dirrm share/apps/kppp/Rules/Bangladesh
-@dirrm share/apps/kppp/Rules/Austria/Standard
-@dirrm share/apps/kppp/Rules/Austria/Minimum
-@dirrm share/apps/kppp/Rules/Austria/Business_2
-@dirrm share/apps/kppp/Rules/Austria/Business_1
-@dirrm share/apps/kppp/Rules/Austria
-@dirrm share/apps/kppp/Rules/Australia
-@dirrm share/apps/kppp/Rules/Argentina
-@dirrm share/apps/kppp/Rules
-@dirrm share/apps/kppp/Provider/United_Kingdom
-@dirrm share/apps/kppp/Provider/Taiwan
-@dirrm share/apps/kppp/Provider/Portugal
-@dirrm share/apps/kppp/Provider/Norway
-@dirrm share/apps/kppp/Provider/NewZealand
-@dirrm share/apps/kppp/Provider/Germany
-@dirrm share/apps/kppp/Provider/Denmark
-@dirrm share/apps/kppp/Provider/Austria
-@dirrm share/apps/kppp/Provider
-@dirrm share/apps/kppp
-@dirrm share/apps/knode/pics
-@dirrm share/apps/knode/icons/locolor/16x16/actions
-@dirrm share/apps/knode/icons/locolor/16x16
-@dirrm share/apps/knode/icons/locolor
-@dirrm share/apps/knode/icons/hicolor/32x32/actions
-@dirrm share/apps/knode/icons/hicolor/32x32
-@dirrm share/apps/knode/icons/hicolor/22x22/actions
-@dirrm share/apps/knode/icons/hicolor/22x22
-@dirrm share/apps/knode/icons/hicolor
-@dirrm share/apps/knode/icons
-@dirrm share/apps/knode/filters
-@dirrm share/apps/knode
-@dirrm share/apps/kmail/pics
-@dirrm share/apps/kmail
-@dirrm share/apps/kit/icons/locolor/16x16/actions
-@dirrm share/apps/kit/icons/locolor/16x16
-@dirrm share/apps/kit/icons/locolor
-@dirrm share/apps/kit/icons
-@dirrm share/apps/kit
-@dirrm share/apps/keystone
diff --git a/net/kxicq-devel/Makefile b/net/kxicq-devel/Makefile
deleted file mode 100644
index a4b23ac103a8..000000000000
--- a/net/kxicq-devel/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# New ports collection makefile for:   kxicq
-# Date created:        10 March 2000
-# Whom:                Andrey Novikov <andrey@novikov.com>
-#
-# $FreeBSD$
-
-PORTNAME=	kxicq
-PORTVERSION=	0.3.97b
-CATEGORIES=	net kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-03132000
-
-MAINTAINER=	andrey@novikov.com
-
-LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
-
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-USE_QT=		yes
-
-DIST_SUBDIR=	kxicq
-
-.if defined(ADDITIONAL_SKINS)
-SKINS=		GoldBlue blueplanet ciasa_boark_inc cyrus
-PLIST=		${WRKDIR}/PLIST
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} GoldBlue.tar.gz \
-		blueplanet-0.1.tar.gz cyrustheme.tar.gz \
-		ciasa_boark_inc-0.4.tar.gz
-.endif
-
-pre-fetch:
-.if !defined(ADDITIONAL_SKINS)
-	@${ECHO}
-	@${ECHO} "You may define INSTALL_ADDITIONAL_SKINS (make ADDITIONAL_SKINS=YES)"
-	@${ECHO} "to fetch and install additional skins for kxicq."
-	@${ECHO}
-	@sleep 1
-.endif
-
-post-extract:
-.if defined(ADDITIONAL_SKINS)
-	@${MKDIR} ${WRKDIR}/ciasa_boark_inc
-	@${TAR} -xz -C ${WRKDIR}/ciasa_boark_inc -f ${WRKDIR}/ciasa_boark_inc-0.4.tar.gz
-.endif
-
-pre-install:
-.if defined(ADDITIONAL_SKINS)
-	@if [ -f ${PLIST} ] ; then \
-		${RM} ${PLIST} ; fi
-.for skin in ${SKINS}
-	@for f in ${WRKDIR}/${skin}/* ; do \
-		file=`${BASENAME} $$f`; \
-		${ECHO} share/apps/kxicq/skins/${skin}/$$file >> ${PLIST} ; done
-	@${ECHO} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm
-.endfor
-	@${CAT} ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm
-	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
-.endif
-
-post-install:
-.if defined(ADDITIONAL_SKINS)
-	@${ECHO} "===>   Installing kxicq additional skins"
-.for skin in ${SKINS}
-	@${MKDIR} ${PREFIX}/share/apps/kxicq/skins/${skin}
-	${INSTALL_DATA} ${WRKDIR}/${skin}/* ${PREFIX}/share/apps/kxicq/skins/${skin}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/kxicq-devel/distinfo b/net/kxicq-devel/distinfo
deleted file mode 100644
index e64887c60eaf..000000000000
--- a/net/kxicq-devel/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (kxicq/kxicq-03132000.tar.gz) = 0690a43dad83d89bbdff7c4143386300
-MD5 (kxicq/GoldBlue.tar.gz) = 401450e4710aebff4b2edad14c0f4cac
-MD5 (kxicq/blueplanet-0.1.tar.gz) = db08ff114c24af4ff185c76820acb04d
-MD5 (kxicq/ciasa_boark_inc-0.4.tar.gz) = b6759abce6e8fd9c69895d28738b63f2
-MD5 (kxicq/cyrustheme.tar.gz) = 0c514e3bdd67f2a2766de43976bc9c2a
diff --git a/net/kxicq-devel/pkg-comment b/net/kxicq-devel/pkg-comment
deleted file mode 100644
index 457c499afbd2..000000000000
--- a/net/kxicq-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ICQ client for KDE
diff --git a/net/kxicq-devel/pkg-descr b/net/kxicq-devel/pkg-descr
deleted file mode 100644
index 1f4fb0b91a55..000000000000
--- a/net/kxicq-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The outstanding ICQ client for KDE having the most features
-of MS Windows(tm) analog and even more.
-
-WWW: http://www.kxicq.org/
-
-- Andrey Novikov <andrey@novikov.com>
diff --git a/net/kxicq-devel/pkg-plist b/net/kxicq-devel/pkg-plist
deleted file mode 100644
index 93d94d9418aa..000000000000
--- a/net/kxicq-devel/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-bin/kxicq
-lib/kxicq/plugins/liblastOnline.so
-lib/kxicq/plugins/liblastOnline.so.0
-lib/kxicq/plugins/librussianConverter.so
-lib/kxicq/plugins/librussianConverter.so.0
-share/locale/nl/LC_MESSAGES/kxicq.mo
-share/locale/ja/LC_MESSAGES/kxicq.mo
-share/locale/de/LC_MESSAGES/kxicq.mo
-share/locale/sv/LC_MESSAGES/kxicq.mo
-share/locale/hr/LC_MESSAGES/kxicq.mo
-share/locale/it/LC_MESSAGES/kxicq.mo
-share/doc/HTML/en/kxicq/index-1.html
-share/doc/HTML/en/kxicq/index-2.html
-share/doc/HTML/en/kxicq/index-3.html
-share/doc/HTML/en/kxicq/index-4.html
-share/doc/HTML/en/kxicq/index-5.html
-share/doc/HTML/en/kxicq/index-6.html
-share/doc/HTML/en/kxicq/index.html
-share/doc/HTML/en/kxicq/index.sgml
-share/doc/HTML/en/kxicq/registration-1.html
-share/doc/HTML/en/kxicq/registration-2-KXicq.html
-share/doc/HTML/en/kxicq/registration-3.html
-share/doc/HTML/en/kxicq/registration-4.html
-share/doc/HTML/en/kxicq/registration-5.html
-share/doc/HTML/en/kxicq/index-7.html
-share/doc/HTML/en/kxicq/layout_default.gif
-share/apps/kxicq/wavs/message.wav
-share/apps/kxicq/icons/default/invisible.xpm
-share/apps/kxicq/icons/default/available.xpm
-share/apps/kxicq/icons/default/send.xpm
-share/apps/kxicq/icons/default/away.xpm
-share/apps/kxicq/icons/default/na.xpm
-share/apps/kxicq/icons/default/dnd.xpm
-share/apps/kxicq/icons/default/occupied.xpm
-share/apps/kxicq/icons/default/ffc.xpm
-share/apps/kxicq/icons/default/exit.xpm
-share/apps/kxicq/icons/default/history.xpm
-share/apps/kxicq/icons/default/newmsg.xpm
-share/apps/kxicq/icons/default/offline.xpm
-share/apps/kxicq/icons/default/online.xpm
-share/apps/kxicq/icons/default/selecttext.xpm
-share/apps/kxicq/icons/default/selectcolor.xpm
-share/apps/kxicq/icons/icq/invisible.xpm
-share/apps/kxicq/icons/icq/available.xpm
-share/apps/kxicq/icons/icq/send.xpm
-share/apps/kxicq/icons/icq/away.xpm
-share/apps/kxicq/icons/icq/na.xpm
-share/apps/kxicq/icons/icq/dnd.xpm
-share/apps/kxicq/icons/icq/occupied.xpm
-share/apps/kxicq/icons/icq/ffc.xpm
-share/apps/kxicq/icons/icq/exit.xpm
-share/apps/kxicq/icons/icq/history.xpm
-share/apps/kxicq/icons/icq/newmsg.xpm
-share/apps/kxicq/icons/icq/offline.xpm
-share/apps/kxicq/icons/icq/online.xpm
-share/apps/kxicq/icons/icq/selecttext.xpm
-share/apps/kxicq/icons/icq/selectcolor.xpm
-share/apps/kxicq/pics/startlogo.bmp
-share/apps/kxicq/skins/computer/computer.kxskin
-share/apps/kxicq/skins/computer/Frame.xpm
-share/apps/kxicq/skins/computer/MenuButtonDown.xpm
-share/apps/kxicq/skins/computer/MenuButtonUp.xpm
-share/apps/kxicq/skins/computer/field.xpm
-share/apps/kxicq/utils/ping.kxutil
-share/apps/kxicq/utils/pine.kxutil
-share/applnk/Applications/kxicq.kdelnk
-include/ltdl.h
-@dirrm share/doc/HTML/en/kxicq
-@dirrm share/apps/kxicq/wavs
-@dirrm share/apps/kxicq/icons/default
-@dirrm share/apps/kxicq/icons/icq
-@dirrm share/apps/kxicq/icons
-@dirrm share/apps/kxicq/utils
-@dirrm share/apps/kxicq/skins/computer
-@dirrm share/apps/kxicq/skins
-@dirrm share/apps/kxicq/pics
-@dirrm share/apps/kxicq
-@dirrm lib/kxicq/plugins
-@dirrm lib/kxicq
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
deleted file mode 100644
index bf5011876143..000000000000
--- a/net/libnet10/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Ports collection makefile for:  libnet
-# Date created:			Sun Feb 3, 1999
-# Whom:				shipley@dis.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libnet
-PORTVERSION=	1.0.1b
-CATEGORIES=	net
-MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
-
-MAINTAINER=	shipley@dis.org
-
-MAN3=		libnet.3
-
-GNU_CONFIGURE=	yes
-
-WRKSRC=         ${WRKDIR}/Libnet-${PORTVERSION}
-MAN3=		libnet.3
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/libnet
-	@${MKDIR} ${PREFIX}/share/doc/libnet/html
-	@${MKDIR} ${PREFIX}/share/doc/libnet/html/examples
-.for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets TODO-1.0 TODO-1.1
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet
-.endfor
-.for i in 1.html 2.html 3.html 4.html 5.html 6.html 7.html contrib.html fig-3a.gif figure-1.gif figure-2.gif figure-3.gif figure-3a.gif lrm.html
-	${INSTALL_DATA} ${WRKSRC}/doc/html/${i} ${PREFIX}/share/doc/libnet/html
-.endfor
-.for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c
-	${INSTALL_DATA} ${WRKSRC}/doc/html/examples/${i} ${PREFIX}/share/doc/libnet/html/examples
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/libnet10/distinfo b/net/libnet10/distinfo
deleted file mode 100644
index bfc76cf8354b..000000000000
--- a/net/libnet10/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (libnet-1.0.1b.tar.gz) = 6eed9efc6c806911721b8830f18b5237
diff --git a/net/libnet10/files/patch-aa b/net/libnet10/files/patch-aa
deleted file mode 100644
index bbdf71b6d0c8..000000000000
--- a/net/libnet10/files/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.orig	Wed Oct 27 11:47:27 1999
-+++ configure	Sat Apr 22 04:01:09 2000
-@@ -903,7 +903,7 @@
- 
- if test $ac_cv_prog_gcc = yes; then
-     CCOPTS='-O3 -funroll-loops -fomit-frame-pointer -Wall'
--    CFLAGS="$CCOPTS"
-+    CFLAGS?="$CCOPTS"
- fi
- 
- # Check whether --with-pf_packet or --without-pf_packet was given.
-@@ -1497,8 +1497,8 @@
- 
-     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP \
-         -DHAVE_SOCKADDR_SA_LEN"
--    MAN_PREFIX="$prefix/man/man3/"
--    LIB_PREFIX="$prefix/lib/aout"
-+    MAN_PREFIX="$prefix/man/"
-+    LIB_PREFIX="$prefix/lib/"
-     INC_PREFIX="$prefix/include/"
-     BIN_PREFIX="$prefix/bin/"
-     echo "$ac_t""Note: support/bpf-lkm/etherspoof contains the lkm source \
-@@ -1517,7 +1517,7 @@
- 
-     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP"
-     MAN_PREFIX="$prefix/man/man3/"
--    LIB_PREFIX="$prefix/lib/aout"
-+    LIB_PREFIX="$prefix/lib/"
-     INC_PREFIX="$prefix/include/"
-     BIN_PREFIX="$prefix/bin/"
-     ;;
diff --git a/net/libnet10/files/patch-ab b/net/libnet10/files/patch-ab
deleted file mode 100644
index 6c877fe42693..000000000000
--- a/net/libnet10/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Oct  7 20:17:43 1999
-+++ Makefile.in	Thu Oct  7 20:17:56 1999
-@@ -104,7 +104,7 @@
- 	$(INSTALL) -c -m 0644 $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL) -c -m 0644 $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL) -c -m 0644 $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL) -c -m 0644 $(MAN) $(DESTDIR)$(MAN_PREFIX)
-+	$(INSTALL) -c -m 0644 $(MAN) $(DESTDIR)$(MAN_PREFIX)/man3
- 	$(INSTALL) -c -m 0755 $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
- 
- clean:
diff --git a/net/libnet10/pkg-comment b/net/libnet10/pkg-comment
deleted file mode 100644
index 92b86b073725..000000000000
--- a/net/libnet10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C library for creating IP packets
diff --git a/net/libnet10/pkg-descr b/net/libnet10/pkg-descr
deleted file mode 100644
index f0db50505d08..000000000000
--- a/net/libnet10/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-Libnet  A C library for portable packet creation 
-
-domains of sockets and protocols.
-
-A C library for portable packet creation 
-
-Included are also simple example test programs
-
-Libnet is a collection of routines to help with the construction
-and handling of network packets. It provides a portable framework
-for low-level network packet writing and handling.
-
-Libnet features portable packet creation interfaces at the IP layer
-and link layer, as well as a host of supplementary and complementary
-functionality.
-
-WWW: http://www.infonexus.com/~daemon9/Projects/Libnet/
diff --git a/net/libnet10/pkg-plist b/net/libnet10/pkg-plist
deleted file mode 100644
index 91658979404f..000000000000
--- a/net/libnet10/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-bin/libnet-config
-include/libnet.h
-include/libnet/libnet-asn1.h
-include/libnet/libnet-functions.h
-include/libnet/libnet-headers.h
-include/libnet/libnet-macros.h
-include/libnet/libnet-ospf.h
-include/libnet/libnet-structures.h
-lib/libnet.a
-lib/libpwrite
-share/doc/libnet/CHANGELOG
-share/doc/libnet/CHANGELOG-NEWFUNCTIONS
-share/doc/libnet/COPYING
-share/doc/libnet/README
-share/doc/libnet/README.asn.1
-share/doc/libnet/README.bpf
-share/doc/libnet/README.legacy-applications
-share/doc/libnet/README.libnet-config
-share/doc/libnet/README.linux
-share/doc/libnet/README.rawsockets
-share/doc/libnet/TODO-1.0
-share/doc/libnet/TODO-1.1
-share/doc/libnet/html/1.html
-share/doc/libnet/html/2.html
-share/doc/libnet/html/3.html
-share/doc/libnet/html/4.html
-share/doc/libnet/html/5.html
-share/doc/libnet/html/6.html
-share/doc/libnet/html/7.html
-share/doc/libnet/html/contrib.html
-share/doc/libnet/html/examples/libnet-example-1.c
-share/doc/libnet/html/examples/libnet-example-2.c
-share/doc/libnet/html/examples/libnet-example-3.c
-share/doc/libnet/html/examples/libnet-example-4.c
-share/doc/libnet/html/fig-3a.gif
-share/doc/libnet/html/figure-1.gif
-share/doc/libnet/html/figure-2.gif
-share/doc/libnet/html/figure-3.gif
-share/doc/libnet/html/figure-3a.gif
-share/doc/libnet/html/lrm.html
-@dirrm share/doc/libnet/html/examples
-@dirrm share/doc/libnet/html
-@dirrm share/doc/libnet
-@dirrm include/libnet
diff --git a/net/licq-devel/Makefile b/net/licq-devel/Makefile
deleted file mode 100644
index c18f7a4c86df..000000000000
--- a/net/licq-devel/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# New ports collection makefile for:    licq
-# Date created:                         2 July 1998
-# Whom:                                 Brian Feldman & Matt Heckaman
-#
-# $FreeBSD$
-#
-
-PORTNAME=	licq
-PORTVERSION=	0.85
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.wibble.net/pub/licq/srcs/ \
-		ftp://licq.darkorb.net/srcs/ \
-		ftp://ftp.fanfic.org/pub/licq/srcs/ \
-		ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
-
-MAINTAINER=	green@FreeBSD.org
-
-BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake
-
-USE_QT2=	yes
-USE_GMAKE=	yes
-USE_AUTOCONF=	yes
-USE_NEWGCC=     yes
-USE_OPENSSL=	yes
-USE_PERL5=      yes
-
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/qt2
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsdelf$(OSREL)
-DATANAME=       licq-data-1.6
-DATAFILES=	${DATANAME}${EXTRACT_SUFX}
-DATADIR=	${WRKDIR}/${DATANAME}
-
-post-configure:
-	@(cd ${WRKSRC}/plugins/qt-gui && ${AUTOCONF})
-	@(cd ${WRKSRC}/plugins/qt-gui && \
-		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
-	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-	    INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
-	    INSTALL_DATA="${INSTALL_DATA}" \
-	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-	    QTBASE="${X11BASE}" \
-	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \
-		--enable-spoofing; then \
-			${ECHO} "===>  Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \
-			${CAT} ${CONFIGURE_LOG}; \
-			${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \
-			${FALSE}; \
-		fi)
-
-post-build:
-	@(cd ${WRKSRC}/plugins/qt-gui;\
-	   ${SETENV} ${MAKE_ENV} \
-	   ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-
-pre-install:
-	${RM} -rf ${PREFIX}/share/licq
-	${MKDIR} -m 700 ${PREFIX}/share/licq
-
-post-install:
-	strip ${PREFIX}/bin/licq
-	cd ${WRKSRC}/plugins/qt-gui;\
-	   ${SETENV} ${MAKE_ENV} \
-	   ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
-	${MKDIR} ${PREFIX}/share/licq/contrib
-	${INSTALL_SCRIPT} ${DATADIR}/contrib/licq.* ${PREFIX}/share/licq/contrib
-	${INSTALL_SCRIPT} ${DATADIR}/contrib/*.sh ${PREFIX}/share/licq/contrib
-	${MKDIR} ${PREFIX}/share/licq/sounds/icq
-	${INSTALL_DATA} ${DATADIR}/sounds/*.wav ${PREFIX}/share/licq/sounds
-	${INSTALL_DATA} ${DATADIR}/sounds/icq/*.wav ${PREFIX}/share/licq/sounds/icq
-	${MKDIR} ${PREFIX}/share/licq/translations
-	${INSTALL_DATA} ${DATADIR}/translations/* ${PREFIX}/share/licq/translations
-	${MKDIR} ${PREFIX}/share/licq/qt-gui
-	cd ${DATADIR}/qt-gui && ${TAR} -chf - * | \
-		${TAR} -xf - -C ${PREFIX}/share/licq/qt-gui
-	${CHMOD} -R a-w ${PREFIX}/share/licq
-	${CHMOD} 555 ${PREFIX}/share/licq
-
-.include <bsd.port.mk>
diff --git a/net/licq-devel/distinfo b/net/licq-devel/distinfo
deleted file mode 100644
index 4619492235ce..000000000000
--- a/net/licq-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (licq-0.85.tar.gz) = abbde101ac967755d07c025e3ab45068
-MD5 (licq-data-1.6.tar.gz) = f94b39990e20c97713562a4e12bb2d50
diff --git a/net/licq-devel/files/patch-aa b/net/licq-devel/files/patch-aa
deleted file mode 100644
index fd53298e4563..000000000000
--- a/net/licq-devel/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/qt-gui/configure.in.orig	Wed Aug  9 14:07:59 2000
-+++ plugins/qt-gui/configure.in	Wed Aug  9 14:15:46 2000
-@@ -51,8 +51,6 @@
- LICQ_CHECK_X11HEADERS
- 
- XSS_LIBS="no"
--AC_CHECK_X_LIB(Xext, XScreenSaverRegister,[XSS_LIBS=""],[], [-lX11 -lXext -lm])
--AC_CHECK_X_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-lXss"],[],[-lX11 -lXext -lm])
- if test \! "$XSS_LIBS" = "no"; then
-   AC_CHECK_X_HEADER(X11/extensions/scrnsaver.h,[AC_DEFINE(USE_SCRNSAVER)])
- else
diff --git a/net/licq-devel/files/patch-ab b/net/licq-devel/files/patch-ab
deleted file mode 100644
index 852716c052a3..000000000000
--- a/net/licq-devel/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
---- plugins/qt-gui/acinclude.m4.in.orig	Sun Jun 18 06:20:57 2000
-+++ plugins/qt-gui/acinclude.m4.in	Mon Jul 24 03:09:28 2000
-@@ -48,7 +48,7 @@
-       fi
- 
-       for qt_dir in $qt_library_dirs; do
--        for qt_check_lib in $qt_dir/libqt.so.2; do
-+        for qt_check_lib in $qt_dir/libqt2.so.3; do
-           if test -r $qt_check_lib; then
-             ac_qt_libraries=$qt_dir
-             break 2
-@@ -68,7 +68,7 @@
-   else
-     have_qt_lib="yes"
-     dnl Check if we have the right lib
--    output=`eval "strings $ac_cv_lib_qtlib/libqt.so | grep -l QCString"`
-+    output=`eval "strings $ac_cv_lib_qtlib/libqt2.so | grep -l QCString"`
-     if test -z "$output"; then
-       AC_MSG_ERROR([
-           The Qt lib directory "$ac_cv_lib_qtlib"
-@@ -185,8 +185,8 @@
- 
-     AC_PATH_PROG(
-       MOC,
--      moc,
--      $QTDIR/bin/moc,
-+      moc2,
-+      $QTDIR/bin/moc2,
-       $QTDIR/bin:/usr/lib/qt2/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH
-     )
-   else
diff --git a/net/licq-devel/files/patch-ac b/net/licq-devel/files/patch-ac
deleted file mode 100644
index d24dbe10a567..000000000000
--- a/net/licq-devel/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/qt-gui/src/Makefile.in.orig	Tue Jul 11 18:54:27 2000
-+++ plugins/qt-gui/src/Makefile.in	Mon Jul 24 03:12:25 2000
-@@ -119,7 +119,7 @@
- 
- licq_qt_gui_la_LDFLAGS = $(X_LIBS) $(QT_LDFLAGS) $(KDE_LDFLAGS) 	-module -avoid-version -rpath $(libdir) -R$(QT_LIBDIR)
- 
--licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt $(X_PRE_LIBS) -lX11 -lXext 	$(XSS_LIBS) $(X_EXTRA_LIBS)
-+licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt2 $(X_PRE_LIBS) -lX11 -lXext 	$(XSS_LIBS) $(X_EXTRA_LIBS)
- 
- 
- #>- METASOURCES = AUTO
diff --git a/net/licq-devel/files/patch-ad b/net/licq-devel/files/patch-ad
deleted file mode 100644
index 7bf734c85ce6..000000000000
--- a/net/licq-devel/files/patch-ad
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/socket.cpp.orig	Tue Jul  4 20:51:50 2000
-+++ src/socket.cpp	Mon Jul 24 03:32:56 2000
-@@ -12,6 +12,7 @@
- #include <netdb.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <osreldate.h>
- 
- #ifndef MSG_DONTWAIT
- #define MSG_DONTWAIT 0
-@@ -288,7 +289,12 @@
- bool INetSocket::SetLocalAddress(bool bIp)
- {
-   // Setup the local structure
-+
-+#if __FreeBSD_version < 400013
-+  int sizeofSockaddr = sizeof(struct sockaddr_in);
-+#else
-   socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
-+#endif
-   if (getsockname(m_nDescriptor, (struct sockaddr *)&m_sLocalAddr, &sizeofSockaddr) < 0)
-   {
-     m_nErrorType = SOCK_ERROR_errno;
-@@ -372,7 +378,11 @@
-   m_sRemoteAddr.sin_family = AF_INET;
- 
-   // if connect fails then call CloseConnection to clean up before returning
-+#if __FreeBSD_version < 400013
-+  int sizeofSockaddr = sizeof(struct sockaddr);
-+#else
-   socklen_t sizeofSockaddr = sizeof(struct sockaddr);
-+#endif
-   if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
-   {
-     // errno has been set
-@@ -504,7 +514,11 @@
-  *---------------------------------------------------------------------------*/
- void TCPSocket::RecvConnection(TCPSocket &newSocket)
- {
--  socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
-+#if __FreeBSD_version < 400013
-+    int sizeofSockaddr = sizeof(struct sockaddr_in);
-+#else
-+    socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
-+#endif
-   newSocket.m_nDescriptor = accept(m_nDescriptor, (struct sockaddr *)&newSocket.m_sRemoteAddr, &sizeofSockaddr);
-   newSocket.SetLocalAddress();
- }
diff --git a/net/licq-devel/files/patch-ae b/net/licq-devel/files/patch-ae
deleted file mode 100644
index e480062becd4..000000000000
--- a/net/licq-devel/files/patch-ae
+++ /dev/null
@@ -1,41 +0,0 @@
---- plugins/qt-gui/aclocal.m4.orig	Wed Jul 12 05:54:25 2000
-+++ plugins/qt-gui/aclocal.m4	Mon Sep 25 14:45:24 2000
-@@ -59,7 +59,7 @@
-       fi
- 
-       for qt_dir in $qt_library_dirs; do
--        for qt_check_lib in $qt_dir/libqt.so.2; do
-+        for qt_check_lib in $qt_dir/libqt2.so.4; do
-           if test -r $qt_check_lib; then
-             ac_qt_libraries=$qt_dir
-             break 2
-@@ -79,17 +79,12 @@
-   else
-     have_qt_lib="yes"
-     dnl Check if we have the right lib
--    output=`eval "strings $ac_cv_lib_qtlib/libqt.so | grep -l QCString"`
-+    output=`eval "strings $ac_cv_lib_qtlib/libqt2.so | grep -l QCString"`
-     if test -z "$output"; then
-       AC_MSG_ERROR([
-           The Qt lib directory "$ac_cv_lib_qtlib"
-           found by configure doesn't contain a Qt 2.1.x library.
- 
--          To overcome special features of the GNU ld (aka bugs), the
--          libqt.so file _needs_ to point to libqt.so.2 which needs
--          to point to a Qt 2.1 library.
--          (this is only needed during compiling and linking, not at runtime)
--
-           Please check your installation.
- 
-           Use the --with-qt-libraries option if we found the wrong Qt lib.
-@@ -196,8 +191,8 @@
- 
-     AC_PATH_PROG(
-       MOC,
--      moc,
--      $QTDIR/bin/moc,
-+      moc2,
-+      $QTDIR/bin/moc2,
-       $QTDIR/bin:/usr/lib/qt2/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH
-     )
-   else
diff --git a/net/licq-devel/pkg-comment b/net/licq-devel/pkg-comment
deleted file mode 100644
index 9d3275098511..000000000000
--- a/net/licq-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 and QT-based ICQ-compatible program
diff --git a/net/licq-devel/pkg-descr b/net/licq-devel/pkg-descr
deleted file mode 100644
index ae3421e48382..000000000000
--- a/net/licq-devel/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is an unofficial ICQ clone, written in C++ for X11 and the QT interface.
-It is in no way endorsed by Mirabilis, and now is the most full-featured
-ICQ-compatible program with the exception of Java ICQ.
diff --git a/net/licq-devel/pkg-plist b/net/licq-devel/pkg-plist
deleted file mode 100644
index ff0d0974d47f..000000000000
--- a/net/licq-devel/pkg-plist
+++ /dev/null
@@ -1,317 +0,0 @@
-bin/licq
-lib/licq/licq_qt-gui.la
-lib/licq/licq_qt-gui.so
-@dirrm lib/licq
-share/licq/utilities/BackOrifice.utility
-share/licq/utilities/finger.utility
-share/licq/utilities/ftp.utility
-share/licq/utilities/gftp.utility
-share/licq/utilities/hostname.utility
-share/licq/utilities/mutt.utility
-share/licq/utilities/netscape.utility
-share/licq/utilities/nmap.utility
-share/licq/utilities/pine.utility
-share/licq/utilities/ping.utility
-share/licq/utilities/queso.utility
-share/licq/utilities/talk.utility
-share/licq/utilities/traceroute.utility
-share/licq/utilities/vnc.utility
-share/licq/utilities/xtraceroute.utility
-@dirrm share/licq/utilities
-share/licq/translations/ASCII
-share/licq/translations/CP437
-share/licq/translations/CP850
-share/licq/translations/DANISH
-share/licq/translations/DEC_MCS
-share/licq/translations/DG_MCS
-share/licq/translations/DUTCH
-share/licq/translations/FINNISH
-share/licq/translations/FRENCH
-share/licq/translations/FRENCH_CANADIAN
-share/licq/translations/GERMAN
-share/licq/translations/HP_MCS
-share/licq/translations/IRV
-share/licq/translations/ITALIAN
-share/licq/translations/JIS
-share/licq/translations/LATIN_2
-share/licq/translations/MACINTOSH
-share/licq/translations/NEXT
-share/licq/translations/NORWEGIAN_1
-share/licq/translations/NORWEGIAN_2
-share/licq/translations/POLISH
-share/licq/translations/POLISH_NOPL
-share/licq/translations/PORTUGUESE
-share/licq/translations/PORTUGUESE_COM
-share/licq/translations/RUSSIAN
-share/licq/translations/RUSSIAN_ALT
-share/licq/translations/RUSSIAN_WIN
-share/licq/translations/SPANISH
-share/licq/translations/SWEDISH
-share/licq/translations/SWEDISH_NAMES
-share/licq/translations/SWEDISH_NAMES_COM
-share/licq/translations/SWISS
-share/licq/translations/UNITED_KINGDOM
-share/licq/translations/UNITED_KINGDOM_COM
-@dirrm share/licq/translations
-share/licq/sounds/fun/Auth.wav
-share/licq/sounds/fun/Chat.wav
-share/licq/sounds/fun/Contact.wav
-share/licq/sounds/fun/File.wav
-share/licq/sounds/fun/Message.wav
-share/licq/sounds/fun/Online.wav
-share/licq/sounds/fun/System.wav
-share/licq/sounds/fun/URL.wav
-@dirrm share/licq/sounds/fun
-share/licq/sounds/icq/Auth.wav
-share/licq/sounds/icq/Chat.wav
-share/licq/sounds/icq/Contact.wav
-share/licq/sounds/icq/File.wav
-share/licq/sounds/icq/Message.wav
-share/licq/sounds/icq/Online.wav
-share/licq/sounds/icq/System.wav
-share/licq/sounds/icq/URL.wav
-@dirrm share/licq/sounds/icq
-share/licq/sounds/Monty-Python.wav
-@dirrm share/licq/sounds
-share/licq/qt-gui/locale/cs_CZ.qm
-share/licq/qt-gui/locale/de.qm
-share/licq/qt-gui/locale/es.qm
-share/licq/qt-gui/locale/it.qm
-share/licq/qt-gui/locale/pl.qm
-share/licq/qt-gui/locale/pt.qm
-share/licq/qt-gui/locale/ru_RU.KOI8-R.qm
-share/licq/qt-gui/locale/ru.qm
-share/licq/qt-gui/locale/cs.qm
-share/licq/qt-gui/locale/sv.qm
-@dirrm share/licq/qt-gui/locale
-share/licq/qt-gui/dock.console/away.xpm
-share/licq/qt-gui/dock.console/bothmsg.xpm
-share/licq/qt-gui/dock.console/console.dock
-share/licq/qt-gui/dock.console/dnd.xpm
-share/licq/qt-gui/dock.console/ffc.xpm
-share/licq/qt-gui/dock.console/invisible.xpm
-share/licq/qt-gui/dock.console/mask.xpm
-share/licq/qt-gui/dock.console/na.xpm
-share/licq/qt-gui/dock.console/nomsg.xpm
-share/licq/qt-gui/dock.console/occupied.xpm
-share/licq/qt-gui/dock.console/offline.xpm
-share/licq/qt-gui/dock.console/online.xpm
-share/licq/qt-gui/dock.console/regmsg.xpm
-share/licq/qt-gui/dock.console/statusmask.xpm
-share/licq/qt-gui/dock.console/sysmsg.xpm
-@dirrm share/licq/qt-gui/dock.console
-share/licq/qt-gui/dock.flower/away.xpm
-share/licq/qt-gui/dock.flower/bothmsg.xpm
-share/licq/qt-gui/dock.flower/dnd.xpm
-share/licq/qt-gui/dock.flower/ffc.xpm
-share/licq/qt-gui/dock.flower/flower.dock
-share/licq/qt-gui/dock.flower/invisible.xpm
-share/licq/qt-gui/dock.flower/mask.xpm
-share/licq/qt-gui/dock.flower/na.xpm
-share/licq/qt-gui/dock.flower/nomsg.xpm
-share/licq/qt-gui/dock.flower/occupied.xpm
-share/licq/qt-gui/dock.flower/offline.xpm
-share/licq/qt-gui/dock.flower/online.xpm
-share/licq/qt-gui/dock.flower/regmsg.xpm
-share/licq/qt-gui/dock.flower/statusmask.xpm
-share/licq/qt-gui/dock.flower/sysmsg.xpm
-@dirrm share/licq/qt-gui/dock.flower
-share/licq/qt-gui/dock.flower-ns/flower-ns.dock
-share/licq/qt-gui/dock.flower-ns/nomsg-mask.xpm
-share/licq/qt-gui/dock.flower-ns/nomsg.xpm
-share/licq/qt-gui/dock.flower-ns/regmsg-mask.xpm
-share/licq/qt-gui/dock.flower-ns/regmsg.xpm
-@dirrm share/licq/qt-gui/dock.flower-ns
-share/licq/qt-gui/dock.glicq/glicq.dock
-share/licq/qt-gui/dock.glicq/msg.xpm
-share/licq/qt-gui/dock.glicq/nomsg.xpm
-share/licq/qt-gui/dock.glicq/sysmsg.xpm
-@dirrm share/licq/qt-gui/dock.glicq
-share/licq/qt-gui/dock.pli/bothmsg.xpm
-share/licq/qt-gui/dock.pli/iconAway.xpm
-share/licq/qt-gui/dock.pli/iconDND.xpm
-share/licq/qt-gui/dock.pli/iconFFC.xpm
-share/licq/qt-gui/dock.pli/iconInvisible.xpm
-share/licq/qt-gui/dock.pli/iconNA.xpm
-share/licq/qt-gui/dock.pli/iconNoMsg.xpm
-share/licq/qt-gui/dock.pli/iconOccupied.xpm
-share/licq/qt-gui/dock.pli/iconOffline.xpm
-share/licq/qt-gui/dock.pli/iconOnline.xpm
-share/licq/qt-gui/dock.pli/mask.xpm
-share/licq/qt-gui/dock.pli/nomsg.xpm
-share/licq/qt-gui/dock.pli/pli.dock
-share/licq/qt-gui/dock.pli/regmsg.xpm
-share/licq/qt-gui/dock.pli/statusmask.xpm
-share/licq/qt-gui/dock.pli/sysmsg.xpm
-@dirrm share/licq/qt-gui/dock.pli
-share/licq/qt-gui/icons.computer/chat.xpm
-share/licq/qt-gui/icons.computer/chess.xpm
-share/licq/qt-gui/icons.computer/computer.icons
-share/licq/qt-gui/icons.computer/cross.xpm
-share/licq/qt-gui/icons.computer/ffchat.xpm
-share/licq/qt-gui/icons.computer/file.xpm
-share/licq/qt-gui/icons.computer/lock.xpm
-share/licq/qt-gui/icons.computer/message.xpm
-share/licq/qt-gui/icons.computer/offline.xpm
-share/licq/qt-gui/icons.computer/online.xpm
-share/licq/qt-gui/icons.computer/private.xpm
-share/licq/qt-gui/icons.computer/sign.xpm
-share/licq/qt-gui/icons.computer/url.xpm
-@dirrm share/licq/qt-gui/icons.computer
-share/licq/qt-gui/icons.icq2/away.xpm
-share/licq/qt-gui/icons.icq2/chat.xpm
-share/licq/qt-gui/icons.icq2/dnd.xpm
-share/licq/qt-gui/icons.icq2/ffc.xpm
-share/licq/qt-gui/icons.icq2/file.xpm
-share/licq/qt-gui/icons.icq2/icq2.icons
-share/licq/qt-gui/icons.icq2/invisible.xpm
-share/licq/qt-gui/icons.icq2/message.xpm
-share/licq/qt-gui/icons.icq2/na.xpm
-share/licq/qt-gui/icons.icq2/occ.xpm
-share/licq/qt-gui/icons.icq2/offline.xpm
-share/licq/qt-gui/icons.icq2/online.xpm
-share/licq/qt-gui/icons.icq2/url.xpm
-@dirrm share/licq/qt-gui/icons.icq2
-share/licq/qt-gui/icons.icq/away.ppm
-share/licq/qt-gui/icons.icq/dnd.ppm
-share/licq/qt-gui/icons.icq/icq.icons
-share/licq/qt-gui/icons.icq/message.ppm
-share/licq/qt-gui/icons.icq/na.ppm
-share/licq/qt-gui/icons.icq/occupied.ppm
-share/licq/qt-gui/icons.icq/offline.ppm
-share/licq/qt-gui/icons.icq/online.ppm
-share/licq/qt-gui/icons.icq/private.ppm
-@dirrm share/licq/qt-gui/icons.icq
-share/licq/qt-gui/icons.mark/away.ppm
-share/licq/qt-gui/icons.mark/chat.ppm
-share/licq/qt-gui/icons.mark/dnd.ppm
-share/licq/qt-gui/icons.mark/ffc.ppm
-share/licq/qt-gui/icons.mark/file.ppm
-share/licq/qt-gui/icons.mark/mark.icons
-share/licq/qt-gui/icons.mark/message.ppm
-share/licq/qt-gui/icons.mark/na.ppm
-share/licq/qt-gui/icons.mark/occupied.ppm
-share/licq/qt-gui/icons.mark/offline.ppm
-share/licq/qt-gui/icons.mark/online.ppm
-share/licq/qt-gui/icons.mark/private.ppm
-share/licq/qt-gui/icons.mark/url.ppm
-@dirrm share/licq/qt-gui/icons.mark
-share/licq/qt-gui/skin.basic/basic.skin
-@dirrm share/licq/qt-gui/skin.basic
-share/licq/qt-gui/skin.basic-ncb/basic-ncb.skin
-@dirrm share/licq/qt-gui/skin.basic-ncb
-share/licq/qt-gui/skin.bheart/Frame.png
-share/licq/qt-gui/skin.bheart/Frame.xpm
-share/licq/qt-gui/skin.bheart/MenuButtonDown.png
-share/licq/qt-gui/skin.bheart/MenuButtonUp.png
-share/licq/qt-gui/skin.bheart/MenuButtonlight.png
-share/licq/qt-gui/skin.bheart/README
-share/licq/qt-gui/skin.bheart/bheart.skin
-@dirrm share/licq/qt-gui/skin.bheart
-share/licq/qt-gui/skin.compact/button.png
-share/licq/qt-gui/skin.compact/compact.skin
-share/licq/qt-gui/skin.compact/frame.png
-share/licq/qt-gui/skin.compact/msg.png
-share/licq/qt-gui/skin.compact/status.png
-share/licq/qt-gui/skin.compact/button.xpm
-share/licq/qt-gui/skin.compact/frame.gif
-share/licq/qt-gui/skin.compact/msg.xpm
-share/licq/qt-gui/skin.compact/status.xpm
-@dirrm share/licq/qt-gui/skin.compact
-share/licq/qt-gui/skin.dim/Frame.png
-share/licq/qt-gui/skin.dim/Label-small.png
-share/licq/qt-gui/skin.dim/MenuDown.png
-share/licq/qt-gui/skin.dim/MenuUpFocus.png
-share/licq/qt-gui/skin.dim/MenuUpNoFocus.png
-share/licq/qt-gui/skin.dim/Status.png
-share/licq/qt-gui/skin.dim/dim.skin
-share/licq/qt-gui/skin.dim/mask.png
-share/licq/qt-gui/skin.dim/Frame.gif
-share/licq/qt-gui/skin.dim/Label-small.xpm
-share/licq/qt-gui/skin.dim/Label.xpm
-share/licq/qt-gui/skin.dim/MenuDown.xpm
-share/licq/qt-gui/skin.dim/MenuUpFocus.xpm
-share/licq/qt-gui/skin.dim/MenuUpNoFocus.xpm
-share/licq/qt-gui/skin.dim/Status.xpm
-share/licq/qt-gui/skin.dim/mask.gif
-@dirrm share/licq/qt-gui/skin.dim
-share/licq/qt-gui/skin.e/butMenu.png
-share/licq/qt-gui/skin.e/butMenuDown.png
-share/licq/qt-gui/skin.e/butMenuFocus.png
-share/licq/qt-gui/skin.e/e.skin
-share/licq/qt-gui/skin.e/frame.png
-share/licq/qt-gui/skin.e/msg.png
-share/licq/qt-gui/skin.e/status.png
-share/licq/qt-gui/skin.e/butMenu.xpm
-share/licq/qt-gui/skin.e/butMenuDown.xpm
-share/licq/qt-gui/skin.e/butMenuFocus.xpm
-share/licq/qt-gui/skin.e/frame.gif
-share/licq/qt-gui/skin.e/msg.xpm
-share/licq/qt-gui/skin.e/status.xpm
-@dirrm share/licq/qt-gui/skin.e
-share/licq/qt-gui/skin.gradient/background.png
-share/licq/qt-gui/skin.gradient/buttonLowered.png
-share/licq/qt-gui/skin.gradient/buttonRaised.png
-share/licq/qt-gui/skin.gradient/gradient.skin
-share/licq/qt-gui/skin.gradient/msg.png
-share/licq/qt-gui/skin.gradient/status.png
-share/licq/qt-gui/skin.gradient/background.gif
-share/licq/qt-gui/skin.gradient/buttonLowered.xpm
-share/licq/qt-gui/skin.gradient/buttonRaised.xpm
-share/licq/qt-gui/skin.gradient/msg.xpm
-share/licq/qt-gui/skin.gradient/status.xpm
-@dirrm share/licq/qt-gui/skin.gradient
-share/licq/qt-gui/skin.icq/icq.skin
-@dirrm share/licq/qt-gui/skin.icq
-share/licq/qt-gui/skin.icq-ncb/icq-ncb.skin
-@dirrm share/licq/qt-gui/skin.icq-ncb
-share/licq/qt-gui/skin.pli/Frame.png
-share/licq/qt-gui/skin.pli/MenuButtonDown.png
-share/licq/qt-gui/skin.pli/MenuButtonUp.png
-share/licq/qt-gui/skin.pli/pli.skin
-share/licq/qt-gui/skin.pli/Frame.gif
-share/licq/qt-gui/skin.pli/MenuButtonDown.xpm
-share/licq/qt-gui/skin.pli/MenuButtonUp.xpm
-@dirrm share/licq/qt-gui/skin.pli
-share/licq/qt-gui/skin.shale/butMenu.png
-share/licq/qt-gui/skin.shale/butMenuDown.png
-share/licq/qt-gui/skin.shale/butMenuFocus.png
-share/licq/qt-gui/skin.shale/frame.png
-share/licq/qt-gui/skin.shale/shale.skin
-share/licq/qt-gui/skin.shale/status.png
-share/licq/qt-gui/skin.shale/butMenu.xpm
-share/licq/qt-gui/skin.shale/butMenuDown.xpm
-share/licq/qt-gui/skin.shale/butMenuFocus.xpm
-share/licq/qt-gui/skin.shale/frame.gif
-share/licq/qt-gui/skin.shale/status.xpm
-@dirrm share/licq/qt-gui/skin.shale
-share/licq/qt-gui/icons.dots/away.xpm
-share/licq/qt-gui/icons.dots/dnd.xpm
-share/licq/qt-gui/icons.dots/dots.icons
-share/licq/qt-gui/icons.dots/message.xpm
-share/licq/qt-gui/icons.dots/na.xpm
-share/licq/qt-gui/icons.dots/occupied.xpm
-share/licq/qt-gui/icons.dots/offline.xpm
-share/licq/qt-gui/icons.dots/online.xpm
-share/licq/qt-gui/icons.dots/online.xpm.d
-share/licq/qt-gui/icons.dots/private.xpm
-@dirrm share/licq/qt-gui/icons.dots
-@dirrm share/licq/qt-gui
-share/licq/contrib/licq.gicqconvert
-share/licq/contrib/licq.javaconvert
-share/licq/contrib/licq.kicqconvert
-share/licq/contrib/licq.micqconvert
-share/licq/contrib/licq.winconvert
-share/licq/contrib/licq.winconvert98
-share/licq/contrib/licq.winconvert99a
-share/licq/contrib/licq.winconvert99b
-share/licq/contrib/licq.zicqconvert
-share/licq/contrib/RecreateUserList.sh
-share/licq/contrib/gnome-menu-install.sh
-share/licq/contrib/remove-null.sh
-share/licq/contrib/viewurl-lynx.sh
-share/licq/contrib/viewurl-ncftp.sh
-share/licq/contrib/viewurl-netscape.sh
-share/licq/contrib/viewurl-w3m.sh
-@dirrm share/licq/contrib
-@dirrm share/licq
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
deleted file mode 100644
index 4f5e86c83415..000000000000
--- a/net/mpich2/Makefile
+++ /dev/null
@@ -1,186 +0,0 @@
-# New ports collection makefile for:	mpich (portable mpi standard imp.)
-# Date created:		2 May 1998
-# Whom:                 dbader@eece.unm.edu
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mpich
-PORTVERSION=	1.2.1
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/
-
-PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/patch/1.2.1/
-PATCHFILES=	5487 5524 5542 5543 5594 5613
-
-MAINTAINER=	dbader@eece.unm.edu
-
-DIST_SUBDIR=	mpich
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-cflags="${CFLAGS}" -prefix=${PREFIX}/mpich
-
-.include <bsd.port.pre.mk>
-
-# To disable ssh client support, build with WITHOUT_SSH set.
-# Use ssh instead of rsh
-.if !defined(WITHOUT_SSH)
-.if ${OSVERSION} >= 400016 && exists(/usr/bin/ssh)
-CONFIGURE_ARGS+= -rsh="/usr/bin/ssh"
-.elif defined(WITH_SSH) || exists(${LOCALBASE}/bin/ssh)
-RUN_DEPENDS+=   ssh:${PORTSDIR}/security/ssh
-CONFIGURE_ARGS+= -rsh="${LOCALBASE}/bin/ssh"
-.endif
-.endif
-
-ALL_TARGET=
-MANPREFIX=	${PREFIX}/mpich
-MAN1=		Jumpshots.1 MPI.1 chp4_servs.1 cleanipcs.1 mpiCC.1 mpicc.1 \
-		mpif77.1 mpif90.1 mpiman.1 mpireconfig.1 mpirun.1 \
-		tstmachines.1
-MAN3=		Constants.3 MPI_2COMPLEX.3 MPI_2DOUBLE_COMPLEX.3 \
-		MPI_2DOUBLE_PRECISION.3 MPI_2INT.3 MPI_2INTEGER.3 \
-		MPI_2REAL.3 MPI_ANY_SOURCE.3 MPI_ANY_TAG.3 MPI_Abort.3 \
-		MPI_Address.3 MPI_Aint.3 MPI_Allgather.3 MPI_Allgatherv.3 \
-		MPI_Allreduce.3 MPI_Alltoall.3 MPI_Alltoallv.3 \
-		MPI_Attr_delete.3 MPI_Attr_get.3 MPI_Attr_put.3 MPI_BAND.3 \
-		MPI_BOR.3 MPI_BOTTOM.3 MPI_BSEND_OVERHEAD.3 MPI_BXOR.3 \
-		MPI_BYTE.3 MPI_Barrier.3 MPI_Bcast.3 MPI_Bsend.3 \
-		MPI_Bsend_init.3 MPI_Buffer_attach.3 MPI_Buffer_detach.3 \
-		MPI_CART.3 MPI_CHAR.3 MPI_COMM_NULL.3 MPI_COMM_SELF.3 \
-		MPI_COMM_WORLD.3 MPI_COMPLEX.3 MPI_CONGRUENT.3 MPI_Cancel.3 \
-		MPI_Cart_coords.3 MPI_Cart_create.3 MPI_Cart_get.3 \
-		MPI_Cart_map.3 MPI_Cart_rank.3 MPI_Cart_shift.3 \
-		MPI_Cart_sub.3 MPI_Cartdim_get.3 MPI_Comm_compare.3 \
-		MPI_Comm_create.3 MPI_Comm_dup.3 MPI_Comm_free.3 \
-		MPI_Comm_group.3 MPI_Comm_rank.3 MPI_Comm_remote_group.3 \
-		MPI_Comm_remote_size.3 MPI_Comm_size.3 MPI_Comm_split.3 \
-		MPI_Comm_test_inter.3 MPI_Copy_function.3 \
-		MPI_DATATYPE_NULL.3 MPI_DOUBLE.3 MPI_DOUBLE_COMPLEX.3 \
-		MPI_DOUBLE_INT.3 MPI_DOUBLE_PRECISION.3 MPI_DUP_FN.3 \
-		MPI_Delete_function.3 MPI_Dims_create.3 \
-		MPI_ERRHANDLER_NULL.3 MPI_ERROR.3 MPI_ERRORS_ARE_FATAL.3 \
-		MPI_ERRORS_RETURN.3 MPI_ERR_ARG.3 MPI_ERR_BAD_ARGS.3 \
-		MPI_ERR_BUFFER.3 MPI_ERR_BUFFER_EXISTS.3 MPI_ERR_COMM.3 \
-		MPI_ERR_COMM_INTER.3 MPI_ERR_COMM_INTRA.3 \
-		MPI_ERR_COMM_NULL.3 MPI_ERR_COUNT.3 MPI_ERR_DIMS.3 \
-		MPI_ERR_ERRORCODE.3 MPI_ERR_EXHAUSTED.3 MPI_ERR_GROUP.3 \
-		MPI_ERR_INIT.3 MPI_ERR_INTERN.3 MPI_ERR_IN_STATUS.3 \
-		MPI_ERR_LASTCODE.3 MPI_ERR_LIMIT.3 MPI_ERR_NOMATCH.3 \
-		MPI_ERR_NULL.3 MPI_ERR_OP.3 MPI_ERR_OTHER.3 \
-		MPI_ERR_PERM_KEY.3 MPI_ERR_PERM_OP.3 MPI_ERR_PERM_TYPE.3 \
-		MPI_ERR_PRE_INIT.3 MPI_ERR_RANK.3 MPI_ERR_REQUEST.3 \
-		MPI_ERR_ROOT.3 MPI_ERR_TAG.3 MPI_ERR_TOPOLOGY.3 \
-		MPI_ERR_TRUNCATE.3 MPI_ERR_TYPE.3 MPI_ERR_UNKNOWN.3 \
-		MPI_Errhandler_create.3 MPI_Errhandler_free.3 \
-		MPI_Errhandler_get.3 MPI_Errhandler_set.3 MPI_Error_class.3 \
-		MPI_Error_string.3 MPI_FLOAT.3 MPI_FLOAT_INT.3 \
-		MPI_Finalize.3 MPI_Finalized.3 MPI_GRAPH.3 MPI_GROUP_EMPTY.3 \
-		MPI_GROUP_NULL.3 MPI_Gather.3 MPI_Gatherv.3 MPI_Get_count.3 \
-		MPI_Get_elements.3 MPI_Get_processor_name.3 \
-		MPI_Get_version.3 MPI_Graph_create.3 MPI_Graph_get.3 \
-		MPI_Graph_map.3 MPI_Graph_neighbors.3 \
-		MPI_Graph_neighbors_count.3 MPI_Graphdims_get.3 \
-		MPI_Group_compare.3 MPI_Group_difference.3 MPI_Group_excl.3 \
-		MPI_Group_free.3 MPI_Group_incl.3 MPI_Group_intersection.3 \
-		MPI_Group_range_excl.3 MPI_Group_range_incl.3 \
-		MPI_Group_rank.3 MPI_Group_size.3 \
-		MPI_Group_translate_ranks.3 MPI_Group_union.3 MPI_HOST.3 \
-		MPI_Handler_function.3 MPI_IDENT.3 MPI_INT.3 MPI_INTEGER.3 \
-		MPI_INTEGER1.3 MPI_INTEGER2.3 MPI_INTEGER4.3 MPI_IO.3 \
-		MPI_Ibsend.3 MPI_Info_delete.3 MPI_Info_dup.3 \
-		MPI_Info_f2c.3 MPI_Info_free.3 MPI_Info_get.3 \
-		MPI_Info_get_nkeys.3 MPI_Info_get_valuelen.3 \
-		MPI_Info_set.3 MPI_Type_create_darray.3 MPI_Init.3 \
-		MPI_Init_thread.3 MPI_Initialized.3 MPI_Int2handle.3 \
-		MPI_Intercomm_create.3 MPI_Intercomm_merge.3 MPI_Iprobe.3 \
-		MPI_Irecv.3 MPI_Irsend.3 MPI_Isend.3 MPI_Issend.3 \
-		MPI_KEYVAL_INVALID.3 MPI_Keyval_create.3 MPI_Keyval_free.3 \
-		MPI_LAND.3 MPI_LB.3 MPI_LOGICAL.3 MPI_LONG.3 \
-		MPI_LONG_DOUBLE.3 MPI_LONG_DOUBLE_INT.3 MPI_LONG_INT.3 \
-		MPI_LONG_LONG_INT.3 MPI_LOR.3 MPI_LXOR.3 MPI_MAX.3 \
-		MPI_MAXLOC.3 MPI_MAX_ERROR_STRING.3 MPI_MAX_PROCESSOR_NAME.3 \
-		MPI_MIN.3 MPI_MINLOC.3 MPI_NULL_COPY_FN.3 \
-		MPI_NULL_DELETE_FN.3 MPI_OP_NULL.3 MPI_Op_create.3 \
-		MPI_Op_free.3 MPI_PACKED.3 MPI_PROC_NULL.3 MPI_PROD.3 \
-		MPI_Pack.3 MPI_Pack_size.3 MPI_Pcontrol.3 MPI_Probe.3 \
-		MPI_REAL.3 MPI_REAL4.3 MPI_REAL8.3 MPI_REQUEST_NULL.3 \
-		MPI_Recv.3 MPI_Recv_init.3 MPI_Reduce.3 MPI_Rsend.3 \
-		MPI_Reduce_scatter.3 MPI_Request_c2f.3 MPI_Request_free.3 \
-		MPI_Rsend_init.3 MPI_SHORT.3 MPI_SHORT_INT.3 MPI_SIMILAR.3 \
-		MPI_SOURCE.3 MPI_SUCCESS.3 MPI_SUM.3 MPI_Scan.3 \
-		MPI_Scatter.3 MPI_Scatterv.3 MPI_Send.3 MPI_Send_init.3 \
-		MPI_Sendrecv.3 MPI_Sendrecv_replace.3 MPI_Ssend.3 \
-		MPI_Ssend_init.3 MPI_Start.3 MPI_Startall.3 MPI_Status_c2f.3 \
-		MPI_Status_set_cancelled.3 \
-		MPI_Status_set_elements.3 MPI_TAG.3 MPI_TAG_UB.3 MPI_Test.3 \
-		MPI_Test_cancelled.3 MPI_Testall.3 MPI_Testany.3 \
-		MPI_Testsome.3 MPI_Topo_test.3 MPI_Type_commit.3 \
-		MPI_Type_contiguous.3 MPI_Type_create_indexed_block.3 \
-		MPI_UB.3 MPI_Type_extent.3 MPI_Type_free.3 \
-		MPI_Type_get_contents.3 MPI_Type_get_envelope.3 \
-		MPI_Type_hindexed.3 MPI_Type_hvector.3 MPI_Type_indexed.3 \
-		MPI_Type_lb.3 MPI_Type_size.3 MPI_Type_struct.3 \
-		MPI_Type_ub.3 MPI_Type_vector.3 MPI_UNDEFINED.3 \
-		MPI_UNDEFINED_RANK.3 MPI_UNEQUAL.3 MPI_UNSIGNED.3 \
-		MPI_UNSIGNED_CHAR.3 MPI_UNSIGNED_LONG.3 MPI_Unpack.3 \
-		MPI_UNSIGNED_SHORT.3 MPI_User_function.3 \
-		MPI_WTIME_IS_GLOBAL.3 MPI_Wait.3 MPI_Waitall.3 MPI_Waitany.3 \
-		MPI_Waitsome.3 MPI_Wtick.3 MPI_Wtime.3 MPIO_Test.3 \
-		MPIO_Wait.3 MPI_File_c2f.3 MPI_File_close.3 \
-		MPI_File_delete.3 MPI_File_f2c.3 \
-		MPI_File_get_amode.3 MPI_File_get_atomicity.3 \
-		MPI_File_get_byte_offset.3 MPI_File_get_group.3 \
-		MPI_File_get_info.3 MPI_File_get_position_shared.3 \
-		MPI_File_get_size.3 MPI_File_get_type_extent.3 \
-		MPI_File_get_view.3 MPI_File_iread.3 \
-		MPI_File_iread_at.3 MPI_File_iread_shared.3 \
-		MPI_File_iwrite.3 MPI_File_iwrite_at.3 \
-		MPI_File_iwrite_shared.3 MPI_File_open.3 \
-		MPI_File_read.3 MPI_File_read_all.3 \
-		MPI_File_read_all_begin.3 MPI_File_read_all_end.3 \
-		MPI_File_read_at.3 MPI_File_read_at_all.3 \
-		MPI_File_read_at_all_end.3 MPI_File_read_ordered.3 \
-		MPI_File_read_ordered_begin.3 \
-		MPI_File_read_ordered_end.3 MPI_File_read_shared.3 \
-		MPI_File_seek.3 MPI_File_seek_shared.3 \
-		MPI_File_set_atomicity.3 MPI_File_set_info.3 \
-		MPI_File_write.3 MPI_File_set_view.3 \
-		MPI_File_sync.3 MPI_File_write_all.3 \
-		MPI_File_write_all_begin.3 MPI_File_write_all_end.3 \
-		MPI_File_write_at.3 MPI_File_write_at_all.3 \
-		MPI_File_write_at_all_end.3 MPI_File_write_ordered.3 \
-		MPI_File_write_ordered_begin.3 \
-		MPI_File_write_ordered_end.3 MPI_File_write_shared.3 \
-		MPI_Info_c2f.3 MPI_Info_create.3 MPIO_Request_c2f.3 \
-		MPIO_Request_f2c.3 MPI_File_get_position.3 \
-		MPI_File_preallocate.3 MPI_File_read_at_all_begin.3 \
-		MPI_File_set_size.3 MPI_File_write_at_all_begin.3 \
-		MPI_Info_get_nthkey.3 MPI_Type_create_subarray.3 \
-		MPI_File_get_errhandler.3 MPI_File_set_errhandler.3
-MAN4=		CLOG_Finalize.4 CLOG_Init.4 CLOG_Output.4 CLOG_commtype.4 \
-		CLOG_cput.4 CLOG_csync.4 CLOG_get_new_event.4 \
-		CLOG_get_new_state.4 CLOG_init_buffers.4 \
-		CLOG_mergelogs.4 CLOG_mergend.4 CLOG_nodebuffer2disk.4 \
-		CLOG_msgtype.4 CLOG_newbuff.4 CLOG_procbuf.4 CLOG_reclen.4 \
-		CLOG_rectype.4 CLOG_reinit_buff.4 \
-		CLOG_treesetup.4 MPE.4 MPE_Add_RGB_color.4 MPE_CaptureFile.4 \
-		MPE_Close_graphics.4 MPE_Comm_global_rank.4 \
-		MPE_Counter_create.4 MPE_Counter_free.4 MPE_Counter_nxtval.4 \
-		MPE_Decomp1d.4 MPE_Describe_event.4 MPE_Describe_state.4 \
-		MPE_Draw_circle.4 MPE_Draw_line.4 MPE_Draw_logic.4 \
-		MPE_Draw_point.4 MPE_Draw_points.4 MPE_Draw_string.4 \
-		MPE_Fill_circle.4 MPE_Fill_rectangle.4 MPE_Finish_log.4 \
-		MPE_GetTags.4 MPE_Get_mouse_press.4 MPE_IO_Stdout_to_file.4 \
-		MPE_Iget_mouse_press.4 MPE_Init_log.4 \
-		MPE_Initialized_logging.4 MPE_Line_thickness.4 \
-		MPE_Log_event.4 MPE_Log_get_event_number.4 MPE_Log_receive.4 \
-		MPE_Log_send.4 MPE_Make_color_array.4 MPE_Num_colors.4 \
-		MPE_Open_graphics.4 MPE_Print_datatype_pack_action.4 \
-		MPE_Print_datatype_unpack_action.4 MPE_ReturnTags.4 \
-		MPE_Seq_begin.4 MPE_Seq_end.4 MPE_Start_log.4 MPE_Stop_log.4 \
-		MPE_TagsEnd.4 MPE_Update.4
-INSTALL_TARGET=	install
-
-.include <bsd.port.post.mk>
diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo
deleted file mode 100644
index 97bd0b73ed5c..000000000000
--- a/net/mpich2/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 (mpich/mpich-1.2.1.tar.gz) = d5efae9f23df2aa6f0f28492a7697c35
-MD5 (mpich/5487) = 42461c77193e018853da18315e44b559
-MD5 (mpich/5524) = 09f2a64db538ca237a63fec28359aa38
-MD5 (mpich/5542) = f7fa831eac2a8c289a8254080d3b2e58
-MD5 (mpich/5543) = 1d2db0f034f263fe94dd20079ac8fef2
-MD5 (mpich/5594) = 6c2982030bcb4d3d0fd001cc8b54e405
-MD5 (mpich/5613) = cb555c9fc26beb1b5452514cdb398c99
diff --git a/net/mpich2/files/patch-aa b/net/mpich2/files/patch-aa
deleted file mode 100644
index 6159ecbb0edf..000000000000
--- a/net/mpich2/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- romio/adio/common/ad_fstype.c-orig	Wed Jul 19 16:38:31 2000
-+++ romio/adio/common/ad_fstype.c	Thu Sep  7 18:47:44 2000
-@@ -26,8 +26,10 @@
- #ifdef SX4
- #include <sys/stat.h>
- #endif
-+#ifndef FREEBSD
- #ifdef PVFS
- #include "pvfs_config.h"
-+#endif
- #endif
- 
- void ADIO_FileSysType(char *filename, int *fstype, int *error_code)
diff --git a/net/mpich2/files/patch-ab b/net/mpich2/files/patch-ab
deleted file mode 100644
index 67d06a0ffd25..000000000000
--- a/net/mpich2/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- mpid/server/configure.orig	Tue Sep 12 07:57:09 2000
-+++ mpid/server/configure	Tue Sep 12 08:01:11 2000
-@@ -1589,8 +1589,8 @@
- 	    ac_find_inc_dir=$dir
- 	    break
- 	fi
--	if test -r $dir/include/ssl.h ; then
--	    ac_find_inc_dir=$dir/include
-+	if test -r $dir/include/openssl/ssl.h ; then
-+	    ac_find_inc_dir=$dir/include/openssl
- 	    break
- 	fi
- done
diff --git a/net/mpich2/pkg-comment b/net/mpich2/pkg-comment
deleted file mode 100644
index efdcf10dd90c..000000000000
--- a/net/mpich2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message Passing Interface (MPI) Library
diff --git a/net/mpich2/pkg-descr b/net/mpich2/pkg-descr
deleted file mode 100644
index fac61bdd06fb..000000000000
--- a/net/mpich2/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-MPICH is a portable implementation of the MPI (Message Passing
-Interface) standard. The goal of MPI, simply stated, is to develop a
-widely used standard for writing message-passing programs. As such the
-interface should establish a practical, portable, efficient, and
-flexible standard for message passing. Included are a full set of
-documents and parallel programming examples.
-
-WWW: http://www.mcs.anl.gov/mpi/mpich/
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
deleted file mode 100644
index 325f0a8f1260..000000000000
--- a/net/mpich2/pkg-plist
+++ /dev/null
@@ -1,487 +0,0 @@
-mpich/examples/MPI-2-C++/Makefile
-mpich/examples/MPI-2-C++/Makefile.in
-mpich/examples/MPI-2-C++/README
-mpich/examples/MPI-2-C++/chapter_10_mpi2.cc
-mpich/examples/MPI-2-C++/hello_world.cc
-mpich/examples/MPI-2-C++/mpirun
-mpich/examples/MPI-2-C++/pi.cc
-mpich/examples/MPI-2-C++/ring.cc
-mpich/examples/MPI-2-C++/topology.cc
-mpich/examples/MPI-2-C++/user_bcast.cc
-mpich/examples/Makefile
-mpich/examples/Makefile.in
-mpich/examples/README
-mpich/examples/cpi.c
-mpich/examples/cpilog.c
-mpich/examples/cpip.c
-mpich/examples/hello++.cc
-mpich/examples/mpirun
-mpich/examples/pi3.f
-mpich/examples/pi3f90.f90
-mpich/examples/pi3p.f
-mpich/examples/simpleio.c
-mpich/bin/execer
-mpich/bin/mpereconfig
-mpich/bin/mpereconfig.dat
-mpich/bin/mpiCC
-mpich/bin/mpicc
-mpich/bin/mpif77
-mpich/bin/mpif90
-mpich/bin/mpiman
-mpich/bin/mpireconfig
-mpich/bin/mpireconfig.dat
-mpich/bin/mpirun
-mpich/bin/mpirun.args
-mpich/bin/mpirun.ch_p4
-mpich/bin/mpirun.ch_p4.args
-mpich/bin/mpirun.p4shmem
-mpich/bin/mpirun.pg
-mpich/bin/serv_p4
-mpich/bin/tarch
-mpich/bin/tdevice
-mpich/bin/clog2alog
-mpich/bin/clog2slog
-mpich/bin/clog_print
-mpich/bin/logviewer
-mpich/bin/mpereconfig.in
-mpich/bin/mpirun.rand
-mpich/bin/mpirun_dbg.dbx
-mpich/bin/mpirun_dbg.ddd
-mpich/bin/mpirun_dbg.gdb
-mpich/bin/mpirun_dbg.totalview
-mpich/bin/mpirun_dbg.xxgdb
-mpich/bin/slog_print
-mpich/doc/guide.ps.gz
-mpich/doc/install.ps.gz
-mpich/include/basex11.h
-mpich/include/mpe.h
-mpich/include/mpe_graphics.h
-mpich/include/mpe_log.h
-mpich/include/mpeexten.h
-mpich/include/mpetools.h
-mpich/include/mpi.h
-mpich/include/mpi_errno.h
-mpich/include/mpi_fortdefs.h
-mpich/include/mpidefs.h
-mpich/include/mpif.h
-mpich/include/mpio.h
-mpich/include/mpiof.h
-mpich/include/protofix.h
-mpich/include/mpi2c++/comm.h
-mpich/include/mpi2c++/comm_inln.h
-mpich/include/mpi2c++/constants.h
-mpich/include/mpi2c++/datatype.h
-mpich/include/mpi2c++/datatype_inln.h
-mpich/include/mpi2c++/errhandler.h
-mpich/include/mpi2c++/errhandler_inln.h
-mpich/include/mpi2c++/exception.h
-mpich/include/mpi2c++/functions.h
-mpich/include/mpi2c++/functions_inln.h
-mpich/include/mpi2c++/group.h
-mpich/include/mpi2c++/group_inln.h
-mpich/include/mpi2c++/intercomm.h
-mpich/include/mpi2c++/intercomm_inln.h
-mpich/include/mpi2c++/intracomm.h
-mpich/include/mpi2c++/intracomm_inln.h
-mpich/include/mpi2c++/mpi++.h
-mpich/include/mpi2c++/op.h
-mpich/include/mpi2c++/op_inln.h
-mpich/include/mpi2c++/pcomm.h
-mpich/include/mpi2c++/pdatatype.h
-mpich/include/mpi2c++/perrhandler.h
-mpich/include/mpi2c++/pexception.h
-mpich/include/mpi2c++/pgroup.h
-mpich/include/mpi2c++/pgroup_inln.h
-mpich/include/mpi2c++/pintercomm.h
-mpich/include/mpi2c++/pintracomm.h
-mpich/include/mpi2c++/pmpi++.h
-mpich/include/mpi2c++/pop.h
-mpich/include/mpi2c++/pop_inln.h
-mpich/include/mpi2c++/prequest.h
-mpich/include/mpi2c++/prequest_inln.h
-mpich/include/mpi2c++/pstatus.h
-mpich/include/mpi2c++/pstatus_inln.h
-mpich/include/mpi2c++/ptopology.h
-mpich/include/mpi2c++/request.h
-mpich/include/mpi2c++/request_inln.h
-mpich/include/mpi2c++/status.h
-mpich/include/mpi2c++/status_inln.h
-mpich/include/mpi2c++/topology.h
-mpich/include/mpi2c++/topology_inln.h
-mpich/include/mpi2c++/mpi2c++_config.h
-mpich/include/mpi2c++/mpi2c++_list.h
-mpich/include/mpi2c++/mpi2c++_map.h
-mpich/lib/libfmpich.a
-mpich/lib/libmpe.a
-mpich/lib/libmpich.a
-mpich/lib/libpmpich.a
-mpich/lib/libampe.a
-mpich/lib/liblmpe.a
-mpich/lib/libmpe_nompi.a
-mpich/lib/libmpichfsup.a
-mpich/lib/libpmpich++.a
-mpich/lib/libtmpe.a
-mpich/lib/mpe_prof.o
-mpich/man/mandesc
-mpich/sbin/chkserv
-mpich/sbin/chp4_servs
-mpich/sbin/cleanipcs
-mpich/sbin/mpiuninstall
-mpich/sbin/tstmachines
-mpich/share/Makefile.sample
-mpich/share/machines.freebsd
-mpich/share/machines.sample
-mpich/share/examples/Makefile
-mpich/share/examples/Makefile.in
-mpich/share/examples/cpi.c
-mpich/share/examples/cpilog.c
-mpich/share/examples/fpi.f
-mpich/share/examples/mpirun
-mpich/share/examples/srtest.c
-mpich/share/upshot/bin/upshot
-mpich/share/upshot/bitmaps/2x2
-mpich/share/upshot/bitmaps/black
-mpich/share/upshot/bitmaps/boxes
-mpich/share/upshot/bitmaps/dimple3
-mpich/share/upshot/bitmaps/dllines3
-mpich/share/upshot/bitmaps/dllines4
-mpich/share/upshot/bitmaps/drlines3
-mpich/share/upshot/bitmaps/drlines4
-mpich/share/upshot/bitmaps/gray
-mpich/share/upshot/bitmaps/gray2
-mpich/share/upshot/bitmaps/gray3
-mpich/share/upshot/bitmaps/hlines2
-mpich/share/upshot/bitmaps/hlines3
-mpich/share/upshot/bitmaps/hlines4
-mpich/share/upshot/bitmaps/light_gray
-mpich/share/upshot/bitmaps/vlines2
-mpich/share/upshot/bitmaps/vlines3
-mpich/share/upshot/bitmaps/vlines4
-mpich/share/upshot/bitmaps/white
-mpich/share/upshot/logfiles/fft.trf
-mpich/share/upshot/logfiles/sam_hyp.16.log
-mpich/etc/mpichconf.h.dat
-mpich/etc/mpichlib.conf
-mpich/etc/mpif77.conf
-mpich/etc/mpif90.conf
-mpich/www/index.html
-mpich/www/www1/Jumpshots.html
-mpich/www/www1/MPI.html
-mpich/www/www1/chp4_servs.html
-mpich/www/www1/cleanipcs.html
-mpich/www/www1/index.html
-mpich/www/www1/mpiCC.html
-mpich/www/www1/mpicc.html
-mpich/www/www1/mpif77.html
-mpich/www/www1/mpif90.html
-mpich/www/www1/mpiman.html
-mpich/www/www1/mpireconfig.html
-mpich/www/www1/mpirun.html
-mpich/www/www1/tstmachines.html
-mpich/www/www3/Constants.html
-mpich/www/www3/MPIO_Request_c2f.html
-mpich/www/www3/MPIO_Request_f2c.html
-mpich/www/www3/MPIO_Test.html
-mpich/www/www3/MPIO_Wait.html
-mpich/www/www3/MPI_Abort.html
-mpich/www/www3/MPI_Address.html
-mpich/www/www3/MPI_Allgather.html
-mpich/www/www3/MPI_Allgatherv.html
-mpich/www/www3/MPI_Allreduce.html
-mpich/www/www3/MPI_Alltoall.html
-mpich/www/www3/MPI_Alltoallv.html
-mpich/www/www3/MPI_Attr_delete.html
-mpich/www/www3/MPI_Attr_get.html
-mpich/www/www3/MPI_Attr_put.html
-mpich/www/www3/MPI_Barrier.html
-mpich/www/www3/MPI_Bcast.html
-mpich/www/www3/index.html
-mpich/www/www3/MPI_Bsend.html
-mpich/www/www3/MPI_Bsend_init.html
-mpich/www/www3/MPI_Buffer_attach.html
-mpich/www/www3/MPI_Buffer_detach.html
-mpich/www/www3/MPI_CHAR.html
-mpich/www/www3/MPI_Cancel.html
-mpich/www/www3/MPI_Cart_coords.html
-mpich/www/www3/MPI_Cart_create.html
-mpich/www/www3/MPI_Cart_get.html
-mpich/www/www3/MPI_Cart_map.html
-mpich/www/www3/MPI_Cart_rank.html
-mpich/www/www3/MPI_Cart_shift.html
-mpich/www/www3/MPI_Cart_sub.html
-mpich/www/www3/MPI_Cartdim_get.html
-mpich/www/www3/MPI_Comm_compare.html
-mpich/www/www3/MPI_Comm_create.html
-mpich/www/www3/MPI_Comm_dup.html
-mpich/www/www3/MPI_Comm_free.html
-mpich/www/www3/MPI_Comm_group.html
-mpich/www/www3/MPI_Comm_rank.html
-mpich/www/www3/MPI_Comm_remote_group.html
-mpich/www/www3/MPI_Comm_remote_size.html
-mpich/www/www3/MPI_Comm_size.html
-mpich/www/www3/MPI_Comm_split.html
-mpich/www/www3/MPI_Comm_test_inter.html
-mpich/www/www3/MPI_DUP_FN.html
-mpich/www/www3/MPI_Dims_create.html
-mpich/www/www3/MPI_Errhandler_create.html
-mpich/www/www3/MPI_Errhandler_free.html
-mpich/www/www3/MPI_Errhandler_get.html
-mpich/www/www3/MPI_Errhandler_set.html
-mpich/www/www3/MPI_Error_class.html
-mpich/www/www3/MPI_Error_string.html
-mpich/www/www3/MPI_File_c2f.html
-mpich/www/www3/MPI_File_close.html
-mpich/www/www3/MPI_File_delete.html
-mpich/www/www3/MPI_File_f2c.html
-mpich/www/www3/MPI_File_get_amode.html
-mpich/www/www3/MPI_File_get_atomicity.html
-mpich/www/www3/MPI_File_get_byte_offset.html
-mpich/www/www3/MPI_File_get_errhandler.html
-mpich/www/www3/MPI_File_get_group.html
-mpich/www/www3/MPI_File_get_info.html
-mpich/www/www3/MPI_File_get_position.html
-mpich/www/www3/MPI_File_get_position_shared.html
-mpich/www/www3/MPI_File_get_size.html
-mpich/www/www3/MPI_File_get_type_extent.html
-mpich/www/www3/MPI_File_get_view.html
-mpich/www/www3/MPI_File_iread.html
-mpich/www/www3/MPI_File_iread_at.html
-mpich/www/www3/MPI_File_iread_shared.html
-mpich/www/www3/MPI_File_iwrite.html
-mpich/www/www3/MPI_File_iwrite_at.html
-mpich/www/www3/MPI_File_iwrite_shared.html
-mpich/www/www3/MPI_File_open.html
-mpich/www/www3/MPI_File_preallocate.html
-mpich/www/www3/MPI_File_read.html
-mpich/www/www3/MPI_File_read_all.html
-mpich/www/www3/MPI_File_read_all_begin.html
-mpich/www/www3/MPI_File_read_all_end.html
-mpich/www/www3/MPI_File_read_at.html
-mpich/www/www3/MPI_File_read_at_all.html
-mpich/www/www3/MPI_File_read_at_all_begin.html
-mpich/www/www3/MPI_File_read_at_all_end.html
-mpich/www/www3/MPI_File_read_ordered.html
-mpich/www/www3/MPI_File_read_ordered_begin.html
-mpich/www/www3/MPI_File_read_ordered_end.html
-mpich/www/www3/MPI_File_read_shared.html
-mpich/www/www3/MPI_File_seek.html
-mpich/www/www3/MPI_File_seek_shared.html
-mpich/www/www3/MPI_File_set_atomicity.html
-mpich/www/www3/MPI_File_set_errhandler.html
-mpich/www/www3/MPI_File_set_info.html
-mpich/www/www3/MPI_File_set_size.html
-mpich/www/www3/MPI_File_set_view.html
-mpich/www/www3/MPI_File_sync.html
-mpich/www/www3/MPI_File_write.html
-mpich/www/www3/MPI_Gather.html
-mpich/www/www3/MPI_File_write_all.html
-mpich/www/www3/MPI_File_write_all_begin.html
-mpich/www/www3/MPI_File_write_all_end.html
-mpich/www/www3/MPI_File_write_at.html
-mpich/www/www3/MPI_File_write_at_all.html
-mpich/www/www3/MPI_File_write_at_all_begin.html
-mpich/www/www3/MPI_File_write_at_all_end.html
-mpich/www/www3/MPI_File_write_ordered.html
-mpich/www/www3/MPI_File_write_ordered_begin.html
-mpich/www/www3/MPI_File_write_ordered_end.html
-mpich/www/www3/MPI_File_write_shared.html
-mpich/www/www3/MPI_Finalize.html
-mpich/www/www3/MPI_Finalized.html
-mpich/www/www3/MPI_Gatherv.html
-mpich/www/www3/MPI_Get_count.html
-mpich/www/www3/MPI_Get_elements.html
-mpich/www/www3/MPI_Get_processor_name.html
-mpich/www/www3/MPI_Get_version.html
-mpich/www/www3/MPI_Graph_create.html
-mpich/www/www3/MPI_Graph_get.html
-mpich/www/www3/MPI_Graph_map.html
-mpich/www/www3/MPI_Graph_neighbors.html
-mpich/www/www3/MPI_Graph_neighbors_count.html
-mpich/www/www3/MPI_Graphdims_get.html
-mpich/www/www3/MPI_Group_compare.html
-mpich/www/www3/MPI_Group_difference.html
-mpich/www/www3/MPI_Group_excl.html
-mpich/www/www3/MPI_Group_free.html
-mpich/www/www3/MPI_Group_incl.html
-mpich/www/www3/MPI_Group_intersection.html
-mpich/www/www3/MPI_Group_range_excl.html
-mpich/www/www3/MPI_Group_range_incl.html
-mpich/www/www3/MPI_Group_rank.html
-mpich/www/www3/MPI_Group_size.html
-mpich/www/www3/MPI_Group_translate_ranks.html
-mpich/www/www3/MPI_Group_union.html
-mpich/www/www3/MPI_Ibsend.html
-mpich/www/www3/MPI_Info_c2f.html
-mpich/www/www3/MPI_Info_create.html
-mpich/www/www3/MPI_Info_delete.html
-mpich/www/www3/MPI_Info_dup.html
-mpich/www/www3/MPI_Info_f2c.html
-mpich/www/www3/MPI_Info_free.html
-mpich/www/www3/MPI_Info_get.html
-mpich/www/www3/MPI_Info_get_nkeys.html
-mpich/www/www3/MPI_Info_get_nthkey.html
-mpich/www/www3/MPI_Info_get_valuelen.html
-mpich/www/www3/MPI_Info_set.html
-mpich/www/www3/MPI_Init.html
-mpich/www/www3/MPI_Init_thread.html
-mpich/www/www3/MPI_Initialized.html
-mpich/www/www3/MPI_Int2handle.html
-mpich/www/www3/MPI_Intercomm_create.html
-mpich/www/www3/MPI_Intercomm_merge.html
-mpich/www/www3/MPI_Iprobe.html
-mpich/www/www3/MPI_Irecv.html
-mpich/www/www3/MPI_Irsend.html
-mpich/www/www3/MPI_Isend.html
-mpich/www/www3/MPI_Issend.html
-mpich/www/www3/MPI_Keyval_create.html
-mpich/www/www3/MPI_Keyval_free.html
-mpich/www/www3/MPI_NULL_COPY_FN.html
-mpich/www/www3/MPI_NULL_DELETE_FN.html
-mpich/www/www3/MPI_Op_create.html
-mpich/www/www3/MPI_Op_free.html
-mpich/www/www3/MPI_Pack.html
-mpich/www/www3/MPI_Pack_size.html
-mpich/www/www3/MPI_Pcontrol.html
-mpich/www/www3/MPI_Probe.html
-mpich/www/www3/MPI_Recv.html
-mpich/www/www3/MPI_Recv_init.html
-mpich/www/www3/MPI_Reduce.html
-mpich/www/www3/MPI_Reduce_scatter.html
-mpich/www/www3/MPI_Request_c2f.html
-mpich/www/www3/MPI_Request_free.html
-mpich/www/www3/MPI_Rsend.html
-mpich/www/www3/MPI_Rsend_init.html
-mpich/www/www3/MPI_Scan.html
-mpich/www/www3/MPI_Scatter.html
-mpich/www/www3/MPI_Scatterv.html
-mpich/www/www3/MPI_Send.html
-mpich/www/www3/MPI_Ssend.html
-mpich/www/www3/MPI_Send_init.html
-mpich/www/www3/MPI_Sendrecv.html
-mpich/www/www3/MPI_Sendrecv_replace.html
-mpich/www/www3/MPI_Ssend_init.html
-mpich/www/www3/MPI_Start.html
-mpich/www/www3/MPI_Startall.html
-mpich/www/www3/MPI_Status_c2f.html
-mpich/www/www3/MPI_Status_set_cancelled.html
-mpich/www/www3/MPI_Status_set_elements.html
-mpich/www/www3/MPI_Test.html
-mpich/www/www3/MPI_Test_cancelled.html
-mpich/www/www3/MPI_Testall.html
-mpich/www/www3/MPI_Testany.html
-mpich/www/www3/MPI_Testsome.html
-mpich/www/www3/MPI_Topo_test.html
-mpich/www/www3/MPI_Type_commit.html
-mpich/www/www3/MPI_Type_extent.html
-mpich/www/www3/MPI_Type_contiguous.html
-mpich/www/www3/MPI_Type_create_darray.html
-mpich/www/www3/MPI_Type_create_indexed_block.html
-mpich/www/www3/MPI_Type_create_subarray.html
-mpich/www/www3/MPI_Type_free.html
-mpich/www/www3/MPI_Type_get_contents.html
-mpich/www/www3/MPI_Type_get_envelope.html
-mpich/www/www3/MPI_Type_hindexed.html
-mpich/www/www3/MPI_Type_hvector.html
-mpich/www/www3/MPI_Type_indexed.html
-mpich/www/www3/MPI_Type_lb.html
-mpich/www/www3/MPI_Type_size.html
-mpich/www/www3/MPI_Type_struct.html
-mpich/www/www3/MPI_Type_ub.html
-mpich/www/www3/MPI_Type_vector.html
-mpich/www/www3/MPI_Unpack.html
-mpich/www/www3/MPI_Wait.html
-mpich/www/www3/MPI_Waitall.html
-mpich/www/www3/MPI_Waitany.html
-mpich/www/www3/MPI_Waitsome.html
-mpich/www/www3/MPI_Wtick.html
-mpich/www/www3/MPI_Wtime.html
-mpich/www/www4/CLOG_Finalize.html
-mpich/www/www4/CLOG_Init.html
-mpich/www/www4/CLOG_Output.html
-mpich/www/www4/CLOG_commtype.html
-mpich/www/www4/CLOG_cput.html
-mpich/www/www4/CLOG_csync.html
-mpich/www/www4/CLOG_get_new_event.html
-mpich/www/www4/CLOG_get_new_state.html
-mpich/www/www4/CLOG_init_buffers.html
-mpich/www/www4/CLOG_mergelogs.html
-mpich/www/www4/CLOG_mergend.html
-mpich/www/www4/CLOG_msgtype.html
-mpich/www/www4/CLOG_newbuff.html
-mpich/www/www4/CLOG_nodebuffer2disk.html
-mpich/www/www4/CLOG_procbuf.html
-mpich/www/www4/CLOG_reclen.html
-mpich/www/www4/CLOG_rectype.html
-mpich/www/www4/CLOG_reinit_buff.html
-mpich/www/www4/CLOG_treesetup.html
-mpich/www/www4/MPE.html
-mpich/www/www4/MPE_Add_RGB_color.html
-mpich/www/www4/MPE_CaptureFile.html
-mpich/www/www4/MPE_Close_graphics.html
-mpich/www/www4/MPE_Comm_global_rank.html
-mpich/www/www4/MPE_Counter_create.html
-mpich/www/www4/MPE_Counter_free.html
-mpich/www/www4/MPE_Counter_nxtval.html
-mpich/www/www4/MPE_Decomp1d.html
-mpich/www/www4/MPE_Describe_event.html
-mpich/www/www4/MPE_Describe_state.html
-mpich/www/www4/MPE_Draw_circle.html
-mpich/www/www4/MPE_Draw_line.html
-mpich/www/www4/MPE_Draw_logic.html
-mpich/www/www4/MPE_Update.html
-mpich/www/www4/MPE_Draw_point.html
-mpich/www/www4/MPE_Draw_points.html
-mpich/www/www4/MPE_Draw_string.html
-mpich/www/www4/MPE_Fill_circle.html
-mpich/www/www4/MPE_Fill_rectangle.html
-mpich/www/www4/MPE_Finish_log.html
-mpich/www/www4/MPE_GetTags.html
-mpich/www/www4/MPE_Get_mouse_press.html
-mpich/www/www4/MPE_IO_Stdout_to_file.html
-mpich/www/www4/MPE_Iget_mouse_press.html
-mpich/www/www4/MPE_Init_log.html
-mpich/www/www4/MPE_Initialized_logging.html
-mpich/www/www4/MPE_Line_thickness.html
-mpich/www/www4/MPE_Log_event.html
-mpich/www/www4/MPE_Log_get_event_number.html
-mpich/www/www4/index.html
-mpich/www/www4/MPE_Log_receive.html
-mpich/www/www4/MPE_Log_send.html
-mpich/www/www4/MPE_Make_color_array.html
-mpich/www/www4/MPE_Num_colors.html
-mpich/www/www4/MPE_Open_graphics.html
-mpich/www/www4/MPE_Print_datatype_pack_action.html
-mpich/www/www4/MPE_Print_datatype_unpack_action.html
-mpich/www/www4/MPE_ReturnTags.html
-mpich/www/www4/MPE_Seq_begin.html
-mpich/www/www4/MPE_Seq_end.html
-mpich/www/www4/MPE_Start_log.html
-mpich/www/www4/MPE_Stop_log.html
-mpich/www/www4/MPE_TagsEnd.html
-@dirrm mpich/bin
-@dirrm mpich/doc
-@dirrm mpich/etc
-@dirrm mpich/examples/MPI-2-C++
-@dirrm mpich/examples
-@dirrm mpich/include/mpi2c++
-@dirrm mpich/include
-@dirrm mpich/lib/shared
-@dirrm mpich/lib
-@dirrm mpich/man/man1
-@dirrm mpich/man/man3
-@dirrm mpich/man/man4
-@dirrm mpich/man
-@dirrm mpich/sbin
-@dirrm mpich/share/examples
-@dirrm mpich/share/upshot/bitmaps
-@dirrm mpich/share/upshot/bin
-@dirrm mpich/share/upshot/logfiles
-@dirrm mpich/share/upshot/sbin
-@dirrm mpich/share/upshot
-@dirrm mpich/share
-@dirrm mpich/www/www1
-@dirrm mpich/www/www3
-@dirrm mpich/www/www4
-@dirrm mpich/www
-@dirrm mpich
-
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
deleted file mode 100644
index b80ee2d2c7f2..000000000000
--- a/net/nagios-plugins/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:	netsaint-plugins
-# Date created:				Wed 12 Jul 2000
-# Whom:					will
-#
-# $FreeBSD$
-#
-
-PORTNAME=	netsaint-plugins
-PORTVERSION=	1.2.8.4
-CATEGORIES=	net
-MASTER_SITES=	http://netsaintplug.sourceforge.net/src/
-DISTNAME=	${PORTNAME}-1.2.8-4
-
-MAINTAINER=	will@FreeBSD.org
-
-# make absolutely sure we have the user/group added!
-BUILD_DEPENDS=	netsaint:${PORTSDIR}/net/netsaint
-RUN_DEPENDS=	netsaint:${PORTSDIR}/net/netsaint
-.if defined(WANT_QSTAT)
-BUILD_DEPENDS+=	qstat:${PORTSDIR}/games/qstat
-RUN_DEPENDS+=	qstat:${PORTSDIR}/games/qstat
-.endif
-.if defined(WANT_FPING)
-BUILD_DEPENDS+=	fping:${PORTSDIR}/net/fping
-RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
-.endif
-.if defined(WANT_SNMP)
-BUILD_DEPENDS+=	snmpcheck:${PORTSDIR}/net/ucd-snmp
-RUN_DEPENDS+=	snmpcheck:${PORTSDIR}/net/ucd-snmp
-.endif
-
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.mk>
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo
deleted file mode 100644
index c23159a62bc9..000000000000
--- a/net/nagios-plugins/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (netsaint-plugins-1.2.8-4.tar.gz) = a08534e928e9355a098ad73a37d1c685
diff --git a/net/nagios-plugins/files/patch-aa b/net/nagios-plugins/files/patch-aa
deleted file mode 100644
index a4e5f9a7fed9..000000000000
--- a/net/nagios-plugins/files/patch-aa
+++ /dev/null
@@ -1,238 +0,0 @@
---- configure	Mon Jun 26 11:49:40 2000
-+++ configure.new	Wed Jul 12 12:17:48 2000
-@@ -11,7 +11,7 @@
- ac_help=
- ac_default_prefix=/usr/local
- # Any additions from configure.in:
--ac_default_prefix=/usr/local/netsaint
-+#ac_default_prefix=/usr/local/netsaint
- ac_help="$ac_help
- --with-cgiurl=<dir> sets URL for cgi programs"
- ac_help="$ac_help
-@@ -47,12 +47,12 @@
- x_includes=NONE
- x_libraries=NONE
- bindir='${exec_prefix}/bin'
--sbindir='${exec_prefix}/sbin'
--libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
--sysconfdir='${prefix}/etc'
-+sbindir='${exec_prefix}/share/netsaint/sbin'
-+libexecdir='${exec_prefix}/libexec/netsaint'
-+datadir='${prefix}/share/netsaint'
-+sysconfdir='${prefix}/etc/netsaint'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='${prefix}/var/netsaint'
- libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
-@@ -3116,15 +3116,15 @@
- EOF
- 
-         echo "      ps syntax... $PATH_TO_PS -eo 's  comm vsz rss user ppid args'"
--elif ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
-+elif ps -axo 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 's user ppid args'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 's user ppid args'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
- 	cat >> confdefs.h <<EOF
--#define PS_COMMAND "$PATH_TO_PS -Ao 's uid ppid comm args'"
-+#define PS_COMMAND "$PATH_TO_PS -axo 's uid ppid comm args'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3132,7 +3132,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS -Ao 'vsz comm'"
-+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3140,23 +3140,23 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define RSS_COMMAND "$PATH_TO_PS -Ao 'rss comm'"
-+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 's comm vsz rss'"
--elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
-+	echo "      ps syntax... $PATH_TO_PS -axo 's comm vsz rss'"
-+elif ps -axo 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 'status user ppid args'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'status user ppid args'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
- 	cat >> confdefs.h <<EOF
--#define PS_COMMAND "$PATH_TO_PS -Ao 'status uid ppid comm args'"
-+#define PS_COMMAND "$PATH_TO_PS -axo 'status uid ppid comm args'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3164,7 +3164,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS -Ao 'vsz comm'"
-+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3172,23 +3172,23 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define RSS_COMMAND "$PATH_TO_PS -Ao 'rss comm'"
-+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'status comm vsz rss'"
--elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
-+	echo "      ps syntax... $PATH_TO_PS -axo 'status comm vsz rss'"
-+elif ps -axo 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 'state user ppid args'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'state user ppid args'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
- 	cat >> confdefs.h <<EOF
--#define PS_COMMAND "$PATH_TO_PS -Ao 'state uid ppid comm args'"
-+#define PS_COMMAND "$PATH_TO_PS -axo 'state uid ppid comm args'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3196,7 +3196,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS -Ao 'vsz comm'"
-+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3204,14 +3204,14 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define RSS_COMMAND "$PATH_TO_PS -Ao 'rss comm'"
-+#define RSS_COMMAND "$PATH_TO_PS -axo 'rss comm'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state comm vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state comm vsz rss'"
- elif ps -ao 'state command vsz rss user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
-@@ -3228,7 +3228,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS -ao 'vsz command'"
-+#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz command'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3243,16 +3243,16 @@
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
--elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
-+elif ps waxo 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS waxco 'state uid ppid command'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS waxo 'state uid ppid command'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
- 	cat >> confdefs.h <<EOF
--#define PS_COMMAND "$PATH_TO_PS waxco 'state uid ppid command'"
-+#define PS_COMMAND "$PATH_TO_PS waxo 'state uid ppid command'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3260,7 +3260,7 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define VSZ_COMMAND "$PATH_TO_PS waxco 'vsz command'"
-+#define VSZ_COMMAND "$PATH_TO_PS waxo 'vsz command'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
-@@ -3268,18 +3268,18 @@
- EOF
- 
- 	cat >> confdefs.h <<EOF
--#define RSS_COMMAND "$PATH_TO_PS waxco 'rss command'"
-+#define RSS_COMMAND "$PATH_TO_PS waxo 'rss command'"
- EOF
- 
- 	cat >> confdefs.h <<EOF
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null
- then
-         cat >> confdefs.h <<EOF
--#define PS_RAW_COMMAND "$PATH_TO_PS waxco 'state user ppid command'"
-+#define PS_RAW_COMMAND "$PATH_TO_PS waxo 'state user ppid command'"
- EOF
- 
- 	EXTRAS="$EXTRAS check_netsaint"
-@@ -3307,7 +3307,7 @@
- #define RSS_FORMAT "%d %s"
- EOF
- 
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- elif ps -el 2>/dev/null | egrep -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null
- then
- 	cat >> confdefs.h <<EOF
-@@ -3597,17 +3597,6 @@
- EOF
- 
- 	echo "      ping syntax... $PATH_TO_PING -n -h <host> -s 56 -c <count>"
--elif ping -n -s 56 -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null
--then
--	cat >> confdefs.h <<EOF
--#define PING_COMMAND "$PATH_TO_PING -n -s 56 -c %d %s"
--EOF
--
--	cat >> confdefs.h <<EOF
--#define PING_PACKETS_FIRST "$PATH_TO_PING -n -s 56 -c %d %s"
--EOF
--
--	echo "      ping syntax... $PATH_TO_PING -n -s 56 -c <count> <host>"
- elif ping -n -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null
- then
- 	cat >> confdefs.h <<EOF
diff --git a/net/nagios-plugins/files/patch-ab b/net/nagios-plugins/files/patch-ab
deleted file mode 100644
index 89a0e0278d51..000000000000
--- a/net/nagios-plugins/files/patch-ab
+++ /dev/null
@@ -1,104 +0,0 @@
---- configure.in	Wed Jul 12 12:18:15 2000
-+++ configure.in.new	Wed Jul 12 12:22:11 2000
-@@ -223,39 +223,39 @@
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -eo 'rss comm'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
-         echo "      ps syntax... $PATH_TO_PS -eo 's  comm vsz rss user ppid args'"
--elif [ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+elif [ps -axo 's comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 's user ppid args'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 's user ppid args'")
- 	EXTRAS="$EXTRAS check_netsaint"
--	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 's uid ppid comm args'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 's uid ppid comm args'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
--	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'")
-+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 's comm vsz rss'"
--elif [ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+	echo "      ps syntax... $PATH_TO_PS -axo 's comm vsz rss'"
-+elif [ps -axo 'status comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'status user ppid args'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'status user ppid args'")
- 	EXTRAS="$EXTRAS check_netsaint"
--	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 'status uid ppid comm args'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'status uid ppid comm args'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
--	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'")
-+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 'status comm vsz rss'"
--elif [ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
-+	echo "      ps syntax... $PATH_TO_PS -axo 'status comm vsz rss'"
-+elif [ps -axo 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'state user ppid args'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'state user ppid args'")
- 	EXTRAS="$EXTRAS check_netsaint"
--	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 'state uid ppid comm args'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'state uid ppid comm args'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
--	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'")
-+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state comm vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state comm vsz rss'"
- elif [ps -ao 'state command vsz rss user ppid args' 2>/dev/null | egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
-         AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -ao 'state user ppid args'")
-@@ -266,23 +266,23 @@
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -ao 'rss command'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- dnl FreeBSD
--elif [ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null]
-+elif [ps waxo 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'")
- 	EXTRAS="$EXTRAS check_netsaint"
--	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
--	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'")
-+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxo 'vsz command'")
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'")
-+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxo 'rss command'")
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
--	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
-+	echo "      ps syntax... $PATH_TO_PS -axo 'state command vsz rss'"
- dnl BSD-like mode in RH 6.1
- elif [ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
- then
--        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxco 'state user ppid command'")
-+        AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state user ppid command'")
- 	EXTRAS="$EXTRAS check_netsaint"
- 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxno 'state uid ppid comm args'")
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s")
-@@ -386,11 +386,6 @@
- then
- 	AC_DEFINE_UNQUOTED(PING_COMMAND,"$PATH_TO_PING -n -h %s -s 56 -c %d")
- 	echo "      ping syntax... $PATH_TO_PING -n -h <host> -s 56 -c <count>"
--elif [ping -n -s 56 -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null]
--then
--	AC_DEFINE_UNQUOTED(PING_COMMAND,"$PATH_TO_PING -n -s 56 -c %d %s")
--	AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PATH_TO_PING -n -s 56 -c %d %s")
--	echo "      ping syntax... $PATH_TO_PING -n -s 56 -c <count> <host>"
- elif [ping -n -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null]
- then
- 	AC_DEFINE_UNQUOTED(PING_COMMAND,"$PATH_TO_PING -n -c %d %s")
diff --git a/net/nagios-plugins/pkg-comment b/net/nagios-plugins/pkg-comment
deleted file mode 100644
index e5f08464789b..000000000000
--- a/net/nagios-plugins/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Plugins for netsaint
diff --git a/net/nagios-plugins/pkg-descr b/net/nagios-plugins/pkg-descr
deleted file mode 100644
index 0abedd7de10a..000000000000
--- a/net/nagios-plugins/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a plugin package for Netsaint.  Quoting from the
-main Netsaint package:
-
-NetSaint is a program that will monitor hosts and services
-on your network. It has the ability to email or page you
-when a problem arises and when it gets resolved. NetSaint
-is written in C and is designed to run under Linux, although
-it should work under most other *NIX variants. It can run
-either as a normal process or as a daemon, intermittently
-running checks on various services that you specify. The
-actual service checks are performed by external "plugins"
-which return service information to NetSaint. Several CGI
-programs are included with NetSaint in order to allow you
-to view the current service status, history, etc. via a web browser. 
-
-WWW: http://www.netsaint.org/
diff --git a/net/nagios-plugins/pkg-plist b/net/nagios-plugins/pkg-plist
deleted file mode 100644
index 854009e56233..000000000000
--- a/net/nagios-plugins/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-libexec/netsaint/check_disk
-libexec/netsaint/check_dns
-libexec/netsaint/check_dummy
-libexec/netsaint/check_ftp
-libexec/netsaint/check_http
-libexec/netsaint/check_imap
-libexec/netsaint/check_load
-libexec/netsaint/check_mrtg
-libexec/netsaint/check_mrtgtraf
-libexec/netsaint/check_netsaint
-libexec/netsaint/check_nntp
-libexec/netsaint/check_nwstat
-libexec/netsaint/check_overcr
-libexec/netsaint/check_ping
-libexec/netsaint/check_pop
-libexec/netsaint/check_procs
-libexec/netsaint/check_real
-libexec/netsaint/check_reply
-libexec/netsaint/check_smtp
-libexec/netsaint/check_ssh
-libexec/netsaint/check_tcp
-libexec/netsaint/check_time
-libexec/netsaint/check_udp
-libexec/netsaint/check_ups
-libexec/netsaint/check_users
-libexec/netsaint/check_vsz
-libexec/netsaint/check_by_ssh
-libexec/netsaint/urlize
-libexec/netsaint/check_game
-libexec/netsaint/check_fping
-libexec/netsaint/check_swap
-libexec/netsaint/check_breeze
-libexec/netsaint/check_disk_smb
-libexec/netsaint/check_flexlm
-libexec/netsaint/check_ircd
-libexec/netsaint/check_log
-libexec/netsaint/check_ntp
-libexec/netsaint/check_oracle
-libexec/netsaint/check_rpc
-libexec/netsaint/check_sensors
-libexec/netsaint/check_wave
-@dirrm libexec/netsaint
diff --git a/net/nagios/Makefile b/net/nagios/Makefile
deleted file mode 100644
index 8deae2a59135..000000000000
--- a/net/nagios/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	netsaint
-# Date created:				Wed 12 Jul 2000
-# Whom:					will
-#
-# $FreeBSD$
-#
-
-PORTNAME=	netsaint
-PORTVERSION=	0.0.5.2
-CATEGORIES=	net
-MASTER_SITES=	http://www.netsaint.org/download/
-DISTNAME=	${PORTNAME}-0.0.5-2
-
-MAINTAINER=	will@FreeBSD.org
-
-LIB_DEPENDS=	gd.1:${PORTSDIR}/graphics/gd
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgd"
-INSTALL_TARGET=	install-all
-
-pre-fetch:
-	@${SH} ${SCRIPTDIR}/checkps
-
-pre-install:
-	${PERL} ${SCRIPTDIR}/createuser
-
-.include <bsd.port.mk>
diff --git a/net/nagios/distinfo b/net/nagios/distinfo
deleted file mode 100644
index b77e807a2a4d..000000000000
--- a/net/nagios/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (netsaint-0.0.5-2.tar.gz) = 19af41fb74ca4efbb1f6a4a915adc76f
diff --git a/net/nagios/files/patch-aa b/net/nagios/files/patch-aa
deleted file mode 100644
index 3eb6719e49f6..000000000000
--- a/net/nagios/files/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.in	Fri Apr  7 11:11:31 2000
-+++ Makefile.in.new	Mon Jun 12 19:33:19 2000
-@@ -36,7 +36,7 @@
- 		@echo "Please supply a command line argument (i.e. 'make all').  Other targets are:"
- 		@echo "   netsaint cgis config"
- 		@echo "   clean distclean devclean"
--		@echo "   install install-html install-config install-init install-daemoninit install-commandmode"
-+		@echo "   install install-html install-config install-init install-daemoninit install-commandmode install-all"
- 		@echo "   uninstall"
- 
- # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999)
-@@ -99,13 +99,17 @@
- 	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(CGIDIR)
- 
- install-init:
--	$(INSTALL) -m 774 -o root -g root init-script /etc/rc.d/init.d/netsaint
-+	$(INSTALL) -m 774 -o root -g wheel init-script /usr/local/etc/rc.d/netsaint.sh
-+	$(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions
- 
- install-daemoninit:
--	$(INSTALL) -m 774 -o root -g root daemon-init /etc/rc.d/init.d/netsaint
-+	$(INSTALL) -m 774 -o root -g wheel daemon-init /usr/local/etc/rc.d/netsaint.sh
-+	$(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions
- 
- install-commandmode:
- 	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(LOGDIR)/rw
- 
- uninstall:
- 	rm -rf $(BINDIR)/netsaint $(CGIDIR)/*.cgi $(CFGDIR)/*.cfg $(HTMLDIR)
-+
-+install-all: all install config install-config install-daemoninit
diff --git a/net/nagios/files/patch-ab b/net/nagios/files/patch-ab
deleted file mode 100644
index f7ce712a1276..000000000000
--- a/net/nagios/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- base/Makefile.in	Fri Apr  7 11:11:32 2000
-+++ base/Makefile.in.new	Sat Jun 10 21:45:15 2000
-@@ -52,5 +52,4 @@
- 	rm -f *~
- 
- install:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR)
- 	$(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(BINDIR)
diff --git a/net/nagios/files/patch-ac b/net/nagios/files/patch-ac
deleted file mode 100644
index 1eb997a043fc..000000000000
--- a/net/nagios/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- common/locations.sub	Wed Apr 26 21:10:13 2000
-+++ common/locations.sub.new	Mon Jun 12 21:29:23 2000
-@@ -19,16 +19,16 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  ************************************************************************/
- 
--#define DEFAULT_TEMP_FILE			"${prefix}/var/netsaint.tmp"
--#define DEFAULT_STATUS_FILE			"${prefix}/var/status.log"
--#define DEFAULT_LOG_FILE			"${prefix}/var/netsaint.log"
--#define DEFAULT_LOG_ARCHIVE_PATH		"${prefix}/var/archives/"
--#define DEFAULT_COMMENT_FILE			"${prefix}/var/comment.log"
--#define DEFAULT_COMMAND_FILE			"${prefix}/var/rw/netsaint.cmd"
--#define DEFAULT_PHYSICAL_HTML_PATH		"${prefix}/share"
-+#define DEFAULT_TEMP_FILE			"${prefix}/var/netsaint/netsaint.tmp"
-+#define DEFAULT_STATUS_FILE			"${prefix}/var/netsaint/status.log"
-+#define DEFAULT_LOG_FILE			"${prefix}/var/netsaint/netsaint.log"
-+#define DEFAULT_LOG_ARCHIVE_PATH		"${prefix}/var/netsaint/archives/"
-+#define DEFAULT_COMMENT_FILE			"${prefix}/var/netsaint/comment.log"
-+#define DEFAULT_COMMAND_FILE			"${prefix}/var/netsaint/rw/netsaint.cmd"
-+#define DEFAULT_PHYSICAL_HTML_PATH		"${prefix}/share/netsaint"
- #define DEFAULT_URL_HTML_PATH			"/netsaint"
--#define DEFAULT_PHYSICAL_CGIBIN_PATH		"${exec_prefix}/sbin"
-+#define DEFAULT_PHYSICAL_CGIBIN_PATH		"${exec_prefix}/share/netsaint/sbin"
- #define DEFAULT_URL_CGIBIN_PATH			"/cgi-bin/netsaint"
--#define DEFAULT_CGI_CONFIG_FILE			"${exec_prefix}/sbin/nscgi.cfg"
-+#define DEFAULT_CGI_CONFIG_FILE			"${exec_prefix}/share/netsaint/sbin/nscgi.cfg"
- 
--#define LOCKFILE				"${prefix}/var/netsaint.lock"
-+#define LOCKFILE				"${prefix}/var/netsaint/netsaint.lock"
diff --git a/net/nagios/files/patch-ad b/net/nagios/files/patch-ad
deleted file mode 100644
index 33826d5aec6c..000000000000
--- a/net/nagios/files/patch-ad
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure	Fri Apr  7 11:11:34 2000
-+++ configure.new	Sat Jun 10 21:21:25 2000
-@@ -11,7 +11,7 @@
- ac_help=
- ac_default_prefix=/usr/local
- # Any additions from configure.in:
--ac_default_prefix=/usr/local/netsaint
-+#ac_default_prefix=/usr/local/netsaint
- ac_help="$ac_help
- --with-netsaint-user=<user> sets user name to run netsaint"
- ac_help="$ac_help
-@@ -61,12 +61,12 @@
- x_includes=NONE
- x_libraries=NONE
- bindir='${exec_prefix}/bin'
--sbindir='${exec_prefix}/sbin'
--libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
--sysconfdir='${prefix}/etc'
-+sbindir='${exec_prefix}/share/netsaint/sbin'
-+libexecdir='${exec_prefix}/libexec/netsaint'
-+datadir='${prefix}/share/netsaint'
-+sysconfdir='${prefix}/etc/netsaint'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='${prefix}/var/netsaint'
- libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
-@@ -505,9 +505,9 @@
- # Prefer explicitly selected file to automatically selected ones.
- if test -z "$CONFIG_SITE"; then
-   if test "x$prefix" != xNONE; then
--    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+    CONFIG_SITE="$prefix/share/netsaint/config.site $prefix/etc/netsaint/config.site"
-   else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+    CONFIG_SITE="$ac_default_prefix/share/netsaint/config.site $ac_default_prefix/etc/netsaint/config.site"
-   fi
- fi
- for ac_site_file in $CONFIG_SITE; do
-@@ -679,6 +679,9 @@
- 	LDFLAGS="${LDFLAGS} -L${withval}"
- 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- 	
-+else
-+	LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-+	LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- fi
- 
- # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -686,6 +689,8 @@
-   withval="$with_gd_inc"
-   
- 	CFLAGS="${CFLAGS} -I${withval}"
-+else
-+	CFLAGS="${CFLAGS} -I/usr/local/include/gd"
- 	
- fi
- 
diff --git a/net/nagios/files/patch-ae b/net/nagios/files/patch-ae
deleted file mode 100644
index 6cbf9e27ebbf..000000000000
--- a/net/nagios/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in	Fri Apr  7 11:11:34 2000
-+++ configure.in.new	Mon Jun  5 16:09:21 2000
-@@ -1,7 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(base/netsaint.c)
- AC_CONFIG_HEADER(common/config.h base/netsaint.h cgi/cgiutils.h)
--AC_PREFIX_DEFAULT(/usr/local/netsaint)
-+AC_PREFIX_DEFAULT(/usr/local)
- 
- dnl Figure out how to invoke "install" and what install options to use.
- 
diff --git a/net/nagios/files/patch-af b/net/nagios/files/patch-af
deleted file mode 100644
index 58d7998ff8d8..000000000000
--- a/net/nagios/files/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
---- daemon-init.in	Fri Apr  7 11:11:34 2000
-+++ daemon-init.in.new	Mon Jun  5 16:11:44 2000
-@@ -27,10 +27,11 @@
-   
- # Source function library
- # Solaris doesn't have an rc.d directory, so do a test first
--if [ -f /etc/rc.d/init.d/functions ]; then
--. /etc/rc.d/init.d/functions
--elif [ -f /etc/init.d/functions ]; then
--. /etc/init.d/functions
-+if [ -f /usr/local/etc/netsaint/functions ]; then
-+. /usr/local/etc/netsaint/functions
-+else
-+   echo "/usr/local/etc/netsaint/functions missing"
-+   exit 1
- fi
- 
- prefix=@prefix@
-@@ -85,4 +86,4 @@
-         exit 1
- esac
-   
--# End of this script
-+# End of this script
diff --git a/net/nagios/files/patch-ag b/net/nagios/files/patch-ag
deleted file mode 100644
index 14027c5d9cc9..000000000000
--- a/net/nagios/files/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
---- functions	Fri Apr  7 11:11:34 2000
-+++ functions.new	Sat Jun 10 13:31:31 2000
-@@ -11,7 +11,7 @@
- #
- 
- # First set up a default search path.
--PATH=/opt/gnu/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
-+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
- export PATH
- 
- # Get a sane screen width
-@@ -174,7 +174,7 @@
- #	fi
- 
- 	# Finally try to extract it from ps
--	pid=`ps -eo pid,ppid,fname | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
-+	pid=`ps -axco pid,ppid,command | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
- 	if [ "$pid" != "" ] ; then
- 	        echo $pid
- 	        return 0
-@@ -206,8 +206,8 @@
- 	        fi
- 	fi
- 
--	# See if /var/lock/subsys/$1 exists
--	if [ -f /var/lock/subsys/$1 ]; then
-+	# See if /var/spool/lock/$1 exists
-+	if [ -f /var/spool/lock/$1 ]; then
- 		echo "$1 dead but subsys locked"
- 		return 2
- 	fi
diff --git a/net/nagios/files/patch-ah b/net/nagios/files/patch-ah
deleted file mode 100644
index a8023ecea7f1..000000000000
--- a/net/nagios/files/patch-ah
+++ /dev/null
@@ -1,71 +0,0 @@
---- hosts.cfg.in	Fri Apr  7 11:11:34 2000
-+++ hosts.cfg.in.new	Thu Jun 15 10:19:42 2000
-@@ -151,10 +151,10 @@
- 
- hostgroup[novell-servers]=All Novell Servers;novell-admins;es-gra,es-esp
- hostgroup[nt-servers]=All NT Servers;nt-admins;rosie,dev,liatris
--hostgroup[linux-boxes]=All Linux Servers;linux-admins;real
-+hostgroup[freebsd-boxes]=All FreeBSD Servers;freebsd-admins;real
- hostgroup[switches]=Switches;switch-admins;switch-4hlan,switch-esplan,switch-gralan,switch-cetslan,switch-hrdlan
- hostgroup[routers]=Routers;router-admins;ageng-router
--hostgroup[printers]=Printers;printer-admins,linux-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000
-+hostgroup[printers]=Printers;printer-admins,freebsd-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000
- 
- 
- ################################################################################
-@@ -183,19 +183,19 @@
- 
- # Service notification command - send email with problem summary
- 
--command[notify-by-email]=/bin/echo -e $SUMMARY$ | /bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$
-+command[notify-by-email]=/usr/bin/printf $SUMMARY$ | /usr/bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$
- 
- # Service notification command - send email to alphanumeric pager gateway
- #       The notify-by-epager command assumes that each contact has a pager email gateway, and
- #       that the address has been entered into the appropriate contact field instead of an
- #       actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager)
- 
--command[notify-by-epager]=/bin/echo -e 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$
-+command[notify-by-epager]=/usr/bin/printf 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /usr/bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$
- 
- # Host notification commands (one for email, one for alphanumeric pager with email gateway)
- 
--command[host-notify-by-email]=/bin/echo -e '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$
--command[host-notify-by-epager]=/bin/echo -e 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$
-+command[host-notify-by-email]=/usr/bin/printf '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$
-+command[host-notify-by-epager]=/usr/bin/printf 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$
- 
- # These are some example service check commands.  See the HTML documentation on the plugins for
- # examples of how to configure command definitions.
-@@ -316,7 +316,7 @@
- 
- contactgroup[novell-admins]=Novell Administrators;@netsaint_user@
- contactgroup[nt-admins]=NT Administrators;@netsaint_user@,jdoe
--contactgroup[linux-admins]=Linux Administrators;@netsaint_user@
-+contactgroup[freebsd-admins]=FreeBSD Administrators;@netsaint_user@
- contactgroup[switch-admins]=Etherswitch Administrators;@netsaint_user@
- contactgroup[router-admins]=Router Technicians;@netsaint_user@
- contactgroup[printer-admins]=Etherswitch Administrators;@netsaint_user@,jdoe
-@@ -428,14 +428,14 @@
- service[liatris]=PING;24x7;3;5;1;maes-admins;240;workhours;1;1;0;;check_ping
- service[liatris]=MAES Publications;24x7;3;2;1;maes-admins;240;workhours;1;1;1;;check_http2!192.168.2.2!/publications
- 
--# Linux Box
--service[real]=PING;24x7;3;5;1;linux-admins;240;24x7;1;1;0;;check_ping
--service[real]=HTTP;24x7;3;2;1;linux-admins;240;24x7;1;1;1;;check_http
--service[real]=Current Users;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_users!75!150
--service[real]=Zombie Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!5!10!Z
--service[real]=Total Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!150!200
--service[real]=Drive 1 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hda1
--service[real]=Drive 2 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2
-+# FreeBSD Box
-+service[real]=PING;24x7;3;5;1;freebsd-admins;240;24x7;1;1;0;;check_ping
-+service[real]=HTTP;24x7;3;2;1;freebsd-admins;240;24x7;1;1;1;;check_http
-+service[real]=Current Users;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_users!75!150
-+service[real]=Zombie Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!5!10!Z
-+service[real]=Total Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!150!200
-+service[real]=Drive 1 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hda1
-+service[real]=Drive 2 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2
- 
- # Switches
- service[switch-esplan]=Traffic Rate;24x7;1;5;6;switch-admins;60;24x7;0;0;0;;traffic_average!/home/httpd/html/mrtg/esp-lan.log!600000!800000!600000!800000
diff --git a/net/nagios/files/patch-ai b/net/nagios/files/patch-ai
deleted file mode 100644
index 7f1b2a014d5e..000000000000
--- a/net/nagios/files/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
---- init-script.in	Fri Apr  7 11:11:37 2000
-+++ init-script.in.new	Mon Jun 12 19:28:55 2000
-@@ -26,11 +26,8 @@
- #
-   
- # Source function library
--# Solaris doesn't have an rc.d directory, so do a test first
--if [ -f /etc/rc.d/init.d/functions ]; then
--. /etc/rc.d/init.d/functions
--elif [ -f /etc/init.d/functions ]; then
--. /etc/init.d/functions
-+if [ -f /usr/local/etc/netsaint/functions ]; then
-+. /usr/local/etc/netsaint/functions
- fi
- 
- prefix=@prefix@
-@@ -92,4 +89,4 @@
-   
- # End of this script
-         
--        
-+        
diff --git a/net/nagios/pkg-comment b/net/nagios/pkg-comment
deleted file mode 100644
index 5641db14d8cc..000000000000
--- a/net/nagios/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extremely powerful network monitoring system
diff --git a/net/nagios/pkg-descr b/net/nagios/pkg-descr
deleted file mode 100644
index e16ce94fefe6..000000000000
--- a/net/nagios/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-NetSaint is a program that will monitor hosts and services
-on your network. It has the ability to email or page you
-when a problem arises and when it gets resolved. NetSaint
-is written in C and is designed to run under Linux, although
-it should work under most other *NIX variants. It can run
-either as a normal process or as a daemon, intermittently
-running checks on various services that you specify. The
-actual service checks are performed by external "plugins"
-which return service information to NetSaint. Several CGI
-programs are included with NetSaint in order to allow you
-to view the current service status, history, etc. via a web browser. 
-
-WWW: http://www.netsaint.org/
diff --git a/net/nagios/pkg-plist b/net/nagios/pkg-plist
deleted file mode 100644
index dac9eed45ef4..000000000000
--- a/net/nagios/pkg-plist
+++ /dev/null
@@ -1,222 +0,0 @@
-bin/netsaint
-etc/netsaint/netsaint.cfg
-etc/netsaint/hosts.cfg
-etc/netsaint/functions
-etc/rc.d/netsaint.sh
-share/netsaint/docs/about.html
-share/netsaint/docs/addons.html
-share/netsaint/docs/cgiauth.html
-share/netsaint/docs/cgis.html
-share/netsaint/docs/config.html
-share/netsaint/docs/configcgi.html
-share/netsaint/docs/confighost.html
-share/netsaint/docs/configmain.html
-share/netsaint/docs/eventhandlers.html
-share/netsaint/docs/extcommands.html
-share/netsaint/docs/faqs.html
-share/netsaint/docs/funstuff.html
-share/netsaint/docs/images/cmd_cgi.gif
-share/netsaint/docs/images/config_cgi.gif
-share/netsaint/docs/images/extinfo_cgi_a.gif
-share/netsaint/docs/images/extinfo_cgi_b.gif
-share/netsaint/docs/images/extinfo_cgi_c.gif
-share/netsaint/docs/images/extinfo_cgi_d.gif
-share/netsaint/docs/images/history_cgi.gif
-share/netsaint/docs/images/logic-host-event-handler.gif
-share/netsaint/docs/images/logic-host-notification.gif
-share/netsaint/docs/images/logic-host-state-handler.gif
-share/netsaint/docs/images/logic-route-check.gif
-share/netsaint/docs/images/logic-service-event-handler.gif
-share/netsaint/docs/images/logic-service-notification.gif
-share/netsaint/docs/images/logic-service-problem.gif
-share/netsaint/docs/images/logic-service-recovery.gif
-share/netsaint/docs/images/logic-top.gif
-share/netsaint/docs/images/network-heirarchy.gif
-share/netsaint/docs/images/notification-process.gif
-share/netsaint/docs/images/notifications_cgi.gif
-share/netsaint/docs/images/physical-network.gif
-share/netsaint/docs/images/redundancy-1.gif
-share/netsaint/docs/images/redundancy-2.gif
-share/netsaint/docs/images/relationship-complex.gif
-share/netsaint/docs/images/relationship-simple.gif
-share/netsaint/docs/images/showlog_cgi.gif
-share/netsaint/docs/images/status_cgi_a.gif
-share/netsaint/docs/images/status_cgi_b.gif
-share/netsaint/docs/images/statusmap_cgi.gif
-share/netsaint/docs/images/statuswrl_cgi.gif
-share/netsaint/docs/index.html
-share/netsaint/docs/installing.html
-share/netsaint/docs/installweb.html
-share/netsaint/docs/macros.html
-share/netsaint/docs/makehtml.html
-share/netsaint/docs/networkreachability.html
-share/netsaint/docs/notifications.html
-share/netsaint/docs/parallelization.html
-share/netsaint/docs/pluginhowto.html
-share/netsaint/docs/plugins.html
-share/netsaint/docs/programmodes.html
-share/netsaint/docs/redundancy.html
-share/netsaint/docs/robots.txt
-share/netsaint/docs/starting.html
-share/netsaint/docs/statetypes.html
-share/netsaint/docs/statuslevels.html
-share/netsaint/docs/stoprestart.html
-share/netsaint/docs/theory-network.html
-share/netsaint/docs/theory-time.html
-share/netsaint/docs/theory.html
-share/netsaint/docs/timeperiods.html
-share/netsaint/docs/verifyconfig.html
-share/netsaint/docs/whatsnew.html
-share/netsaint/images/active.gif
-share/netsaint/images/command.gif
-share/netsaint/images/commandsbar.gif
-share/netsaint/images/comment.gif
-share/netsaint/images/config.gif
-share/netsaint/images/contact.gif
-share/netsaint/images/contactgroup.gif
-share/netsaint/images/contactgroupsbar.gif
-share/netsaint/images/contactsbar.gif
-share/netsaint/images/critical.gif
-share/netsaint/images/delay.gif
-share/netsaint/images/delete.gif
-share/netsaint/images/disabled.gif
-share/netsaint/images/docbar.gif
-share/netsaint/images/enabled.gif
-share/netsaint/images/greendot.gif
-share/netsaint/images/history.gif
-share/netsaint/images/historybar.gif
-share/netsaint/images/homebar.gif
-share/netsaint/images/host.gif
-share/netsaint/images/hostevent.gif
-share/netsaint/images/hostgroupsbar.gif
-share/netsaint/images/hostsbar.gif
-share/netsaint/images/info.gif
-share/netsaint/images/left.gif
-share/netsaint/images/logfilebar.gif
-share/netsaint/images/logofullsize.gif
-share/netsaint/images/logos/aix.gd2
-share/netsaint/images/logos/aix.gif
-share/netsaint/images/logos/amiga.gd2
-share/netsaint/images/logos/amiga.gif
-share/netsaint/images/logos/apple.gd2
-share/netsaint/images/logos/apple.gif
-share/netsaint/images/logos/beos.gd2
-share/netsaint/images/logos/beos.gif
-share/netsaint/images/logos/caldera.gd2
-share/netsaint/images/logos/caldera.gif
-share/netsaint/images/logos/cat1900.gd2
-share/netsaint/images/logos/cat2900.gd2
-share/netsaint/images/logos/cat5000.gd2
-share/netsaint/images/logos/debian.gd2
-share/netsaint/images/logos/debian.gif
-share/netsaint/images/logos/freebsd40.gd2
-share/netsaint/images/logos/freebsd40.gif
-share/netsaint/images/logos/hp-printer40.gd2
-share/netsaint/images/logos/hp-printer40.gif
-share/netsaint/images/logos/hpux.gd2
-share/netsaint/images/logos/hpux.gif
-share/netsaint/images/logos/irix.gd2
-share/netsaint/images/logos/irix.gif
-share/netsaint/images/logos/linux40.gd2
-share/netsaint/images/logos/linux40.gif
-share/netsaint/images/logos/logo.gd2
-share/netsaint/images/logos/mac40.gd2
-share/netsaint/images/logos/mac40.gif
-share/netsaint/images/logos/mandrake.gd2
-share/netsaint/images/logos/mandrake.gif
-share/netsaint/images/logos/next.gd2
-share/netsaint/images/logos/next.gif
-share/netsaint/images/logos/ng-switch40.gd2
-share/netsaint/images/logos/ng-switch40.gif
-share/netsaint/images/logos/novell40.gd2
-share/netsaint/images/logos/novell40.gif
-share/netsaint/images/logos/openbsd.gd2
-share/netsaint/images/logos/openbsd.gif
-share/netsaint/images/logos/redhat.gd2
-share/netsaint/images/logos/redhat.gif
-share/netsaint/images/logos/router40.gd2
-share/netsaint/images/logos/router40.gif
-share/netsaint/images/logos/slackware.gd2
-share/netsaint/images/logos/slackware.gif
-share/netsaint/images/logos/stampede.gd2
-share/netsaint/images/logos/stampede.gif
-share/netsaint/images/logos/storm.gd2
-share/netsaint/images/logos/storm.gif
-share/netsaint/images/logos/sun40.gd2
-share/netsaint/images/logos/sun40.gif
-share/netsaint/images/logos/sunlogo.gd2
-share/netsaint/images/logos/sunlogo.gif
-share/netsaint/images/logos/switch40.gd2
-share/netsaint/images/logos/switch40.gif
-share/netsaint/images/logos/turbolinux.gd2
-share/netsaint/images/logos/turbolinux.gif
-share/netsaint/images/logos/ultrapenguin.gd2
-share/netsaint/images/logos/ultrapenguin.gif
-share/netsaint/images/logos/unicos.gd2
-share/netsaint/images/logos/unicos.gif
-share/netsaint/images/logos/unknown.gd2
-share/netsaint/images/logos/win40.gd2
-share/netsaint/images/logos/win40.gif
-share/netsaint/images/logos/yellowdog.gd2
-share/netsaint/images/logos/yellowdog.gif
-share/netsaint/images/logrotate.gif
-share/netsaint/images/logs.gif
-share/netsaint/images/ndisabled.gif
-share/netsaint/images/networkhealthbar.gif
-share/netsaint/images/notes.gif
-share/netsaint/images/notificationsbar.gif
-share/netsaint/images/notify.gif
-share/netsaint/images/orangedot.gif
-share/netsaint/images/parentup.gif
-share/netsaint/images/processinfobar.gif
-share/netsaint/images/recovery.gif
-share/netsaint/images/restart.gif
-share/netsaint/images/right.gif
-share/netsaint/images/sbbg.gif
-share/netsaint/images/sbconfig.gif
-share/netsaint/images/sbgeneral.gif
-share/netsaint/images/sblogo.gif
-share/netsaint/images/sbmonitor.gif
-share/netsaint/images/scale.gif
-share/netsaint/images/serviceevent.gif
-share/netsaint/images/servicesbar.gif
-share/netsaint/images/standby.gif
-share/netsaint/images/start.gif
-share/netsaint/images/statudetailbar.gif
-share/netsaint/images/status.gif
-share/netsaint/images/status2.gif
-share/netsaint/images/status3.gif
-share/netsaint/images/status4.gif
-share/netsaint/images/statusdetailbar.gif
-share/netsaint/images/statusmapbar.gif
-share/netsaint/images/statusoverviewbar.gif
-share/netsaint/images/statusworldbar.gif
-share/netsaint/images/stop.gif
-share/netsaint/images/thermcrit.gif
-share/netsaint/images/thermok.gif
-share/netsaint/images/thermwarn.gif
-share/netsaint/images/timeperiodsbar.gif
-share/netsaint/images/unknown.gif
-share/netsaint/images/warning.gif
-share/netsaint/images/xinfo.gif
-share/netsaint/images/zombie.gif
-share/netsaint/index.html
-share/netsaint/main.html
-share/netsaint/robots.txt
-share/netsaint/sbin/cmd.cgi
-share/netsaint/sbin/config.cgi
-share/netsaint/sbin/extinfo.cgi
-share/netsaint/sbin/history.cgi
-share/netsaint/sbin/notifications.cgi
-share/netsaint/sbin/nscgi.cfg
-share/netsaint/sbin/showlog.cgi
-share/netsaint/sbin/status.cgi
-share/netsaint/sbin/statusmap.cgi
-share/netsaint/sbin/statuswrl.cgi
-share/netsaint/side.html
-@dirrm share/netsaint/sbin
-@dirrm share/netsaint/images/logos
-@dirrm share/netsaint/images
-@dirrm share/netsaint/docs/images
-@dirrm share/netsaint/docs
-@dirrm share/netsaint
diff --git a/net/nagios/scripts/checkps b/net/nagios/scripts/checkps
deleted file mode 100644
index 61a4d67baaa7..000000000000
--- a/net/nagios/scripts/checkps
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-/bin/ps 999999 2>&1 >/dev/null
-if [ $? = 0 ]; then
-	echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
-	echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
-	echo "return an error code if a PID does not exist.  Netsaint needs this!"
-	exit
-else
-	echo "Great, you have a working ps(1)!  Netsaint can build."
-fi
diff --git a/net/nagios/scripts/createuser b/net/nagios/scripts/createuser
deleted file mode 100644
index ce858d738462..000000000000
--- a/net/nagios/scripts/createuser
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/perl
-#
-
-eval '(exit $?0)' && eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-& eval 'exec /usr/bin/perl -S $0 $argv:q'
-if 0;
-
-if( $> ) {
-	print "\nYou must be root to run this step!\n\n";
-	exit 1;
-} 
-
-if( getpwnam( "netsaint" ) ) {
-	( $null, $null, $nsUID ) = getpwnam( "netsaint" );
-} else {
-	$nsUID = 70;
-	while( getpwuid( $nsUID ) ) {
-		$nsUID++;
-	}
-}
-
-if( getgrnam( "netsaint" ) ) {
-	( $null, $null, $nsGID ) = getgrnam( "netsaint" );
-} else {
-	$nsGID = 70;
-	while( getgrgid( $nsGID ) ) {
-		$nsGID++;
-	}
-	&append_file( "/etc/group", "netsaint:*:$nsGID:" );
-}
-
-print "netsaint user using uid $nsUID and gid $nsGID\n";
-
-system( "/usr/bin/chpass -a \"netsaint:*:$nsUID:$nsGID\:\:0:0:Netsaint pseudo-user:$ENV{'PREFIX'}/netsaint:/bin/sh\"" );
-
-sub append_file {
-	local($file,@list) = @_;
-	local($LOCK_EX) = 2;
-	local($LOCK_NB) = 4;
-	local($LOCK_UN) = 8;
-
-	open(F, ">> $file") || die "$file: $!\n";
-	while( ! flock( F, $LOCK_EX | $LOCK_NB ) ) {
-		exit 1;
-	}
-	print F join( "\n", @list) . "\n";
-	close F;
-	flock( F, $LOCK_UN );
-}
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
deleted file mode 100644
index 62f62e75af7f..000000000000
--- a/net/net-snmp4/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-# New ports collection makefile for:	ucd-snmp
-# Date created:				26 June 1996
-# Whom:					gpalmer
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ucd-snmp
-PORTVERSION=	4.1.2
-CATEGORIES=	net ipv6
-MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
-		ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-
-MAINTAINER=	billf@FreeBSD.org
-
-USE_AUTOCONF=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+= --enable-shared
-.if defined(BATCH)
-CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
-.else
-IS_INTERACTIVE= yes
-.endif
-USE_GMAKE=	YES
-
-MAN1=		snmpbulkget.1 snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 \
-		snmpgetnext.1 snmpinform.1 snmpnetstat.1 snmpset.1 \
-		snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1
-MAN3=		default_store.3 read_config.3 mib_api.3 snmp_agent_api.3 \
-		snmp_alarm.3 snmp_api.3 snmp_close.3 snmp_free_pdu.3 \
-		snmp_open.3 snmp_read.3 snmp_select_info.3 snmp_send.3 \
-		snmp_sess_api.3 snmp_sess_async_send.3 snmp_sess_close.3 \
-		snmp_sess_error.3 snmp_sess_init.3 snmp_sess_open.3 \
-		snmp_sess_read.3 snmp_sess_select_info.3 snmp_sess_send.3 \
-		snmp_sess_session.3 snmp_sess_timeout.3 snmp_timeout.3 \
-		snmp_trap_api.3
-MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
-		snmptrapd.conf.5 variables.5
-MAN8=		snmptrapd.8
-BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
-		snmpstatus snmptest snmptranslate snmptrap snmpwalk
-SBIN=		snmpd snmptrapd
-
-STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 400014
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
-
-SHLIB_VERSION=	4
-PLIST_SUB+=	shlib=${SHLIB_VERSION}
-
-post-patch:
-	@${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
-
-post-install:
-	@( cd ${PREFIX}/bin && strip ${BIN} )
-	@( cd ${PREFIX}/sbin && strip ${SBIN} )
-	@( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * )
-	@( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * )
-	@( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so )
-	@( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so )
-	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
-	@for F in ${WRKSRC}/EXAMPLE.conf  ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \
-		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
-	@if [ ! -f ${STARTUP_FILE} ]; then \
-		${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/snmpd.sh.sample ${STARTUP_FILE}; \
-	 fi
-
-.include <bsd.port.post.mk>
diff --git a/net/net-snmp4/distinfo b/net/net-snmp4/distinfo
deleted file mode 100644
index 8b00c91941d4..000000000000
--- a/net/net-snmp4/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ucd-snmp-4.1.2.tar.gz) = 378c8cf99e0845da4662fb72c956d20d
diff --git a/net/net-snmp4/files/freebsd4.h b/net/net-snmp4/files/freebsd4.h
deleted file mode 100644
index e0774c7e4cd6..000000000000
--- a/net/net-snmp4/files/freebsd4.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "freebsd3.h"
diff --git a/net/net-snmp4/files/patch-aa b/net/net-snmp4/files/patch-aa
deleted file mode 100644
index ce70b47986cb..000000000000
--- a/net/net-snmp4/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- snmplib/Makefile.in~	Tue Mar 16 01:49:10 1999
-+++ snmplib/Makefile.in	Sat Apr  3 13:30:11 1999
-@@ -41,6 +41,10 @@
- 
- libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${OBJS}
- 	$(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS}
-+	ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
-+		-o libsnmp.$(SHLIB_EXTENSION) ${OBJS}
-+	ln -f libsnmp.$(SHLIB_EXTENSION) \
-+		libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 	$(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 
- installdirs:
diff --git a/net/net-snmp4/files/patch-ab b/net/net-snmp4/files/patch-ab
deleted file mode 100644
index 4658da4119df..000000000000
--- a/net/net-snmp4/files/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
---- agent/mibgroup/ucd-snmp/disk.c~	Fri Mar  5 08:45:00 1999
-+++ agent/mibgroup/ucd-snmp/disk.c	Sat Apr  3 13:33:11 1999
-@@ -79,6 +79,7 @@
- #define statvfs statfs
- #endif
- #if HAVE_VM_SWAP_PAGER_H
-+#include <vm/vm.h>
- #include <vm/swap_pager.h>
- #endif
- #if HAVE_SYS_FIXPOINT_H
---- agent/mibgroup/ucd-snmp/errormib.c~	Tue Mar  2 05:27:30 1999
-+++ agent/mibgroup/ucd-snmp/errormib.c	Sat Apr  3 13:33:44 1999
-@@ -93,6 +93,7 @@
- #define statvfs statfs
- #endif
- #if HAVE_VM_SWAP_PAGER_H
-+#include <vm/vm.h>
- #include <vm/swap_pager.h>
- #endif
- #if HAVE_SYS_FIXPOINT_H
---- agent/mibgroup/ucd-snmp/extensible.c~	Fri Mar  5 08:45:01 1999
-+++ agent/mibgroup/ucd-snmp/extensible.c	Sat Apr  3 13:34:13 1999
-@@ -81,6 +81,7 @@
- #define statvfs statfs
- #endif
- #if HAVE_VM_SWAP_PAGER_H
-+#include <vm/vm.h>
- #include <vm/swap_pager.h>
- #endif
- #if HAVE_SYS_FIXPOINT_H
---- agent/mibgroup/ucd-snmp/loadave.c~	Tue Mar 16 08:21:02 1999
-+++ agent/mibgroup/ucd-snmp/loadave.c	Sat Apr  3 13:34:39 1999
-@@ -80,6 +80,7 @@
- #define statvfs statfs
- #endif
- #if HAVE_VM_SWAP_PAGER_H
-+#include <vm/vm.h>
- #include <vm/swap_pager.h>
- #endif
- #if HAVE_SYS_FIXPOINT_H
diff --git a/net/net-snmp4/files/patch-ad b/net/net-snmp4/files/patch-ad
deleted file mode 100644
index 6f28af0a528f..000000000000
--- a/net/net-snmp4/files/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
---- agent/mibgroup/mibII/interfaces.c~	Tue Mar 16 08:46:12 1999
-+++ agent/mibgroup/mibII/interfaces.c	Sat Apr  3 13:49:28 1999
-@@ -1745,10 +1745,18 @@
- 			physaddrbuf = 0;
- 		}
- 		ifm = (struct if_msghdr *)rtm;
-+#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5)
-+		if (physaddrs != 0) physaddrs[naddrs] = (void*)(ifm + 1);
-+		naddrs++;
-+#endif
- 		ilen -= ifm->ifm_msglen;
- 		cp += ifm->ifm_msglen;
- 		rtm = (struct rt_msghdr *)cp;
- 		while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) {
-+#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5)
-+			ilen -= rtm->rtm_msglen;
-+			cp += rtm->rtm_msglen;
-+#else
- 			int is_alias = 0;
- 			ifam = (struct ifa_msghdr *)rtm;
- 			ilen -= sizeof(*ifam);
-@@ -1771,6 +1779,7 @@
- 				}
- 				sa = (struct sockaddr *)cp;
- 			}
-+#endif
- 			rtm = (struct rt_msghdr *)cp;
- 		}
- 	}
diff --git a/net/net-snmp4/files/patch-af b/net/net-snmp4/files/patch-af
deleted file mode 100644
index 546933895230..000000000000
--- a/net/net-snmp4/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
---- agent/mibgroup/ucd_snmp.h.orig	Fri Feb 26 03:03:41 1999
-+++ agent/mibgroup/ucd_snmp.h	Sun Apr  4 13:52:23 1999
-@@ -18,5 +18,11 @@
- config_arch_require(bsdi3, ucd-snmp/memory)
- config_arch_require(linux, ucd-snmp/vmstat)
- config_arch_require(freebsd2, ucd-snmp/vmstat_freebsd2)
-+config_arch_require(freebsd3, ucd-snmp/vmstat_freebsd2)
-+config_arch_require(freebsd4, ucd-snmp/vmstat_freebsd2)
-+config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2)
- config_arch_require(freebsd2, ucd-snmp/memory_freebsd2)
-+config_arch_require(freebsd3, ucd-snmp/memory_freebsd2)
-+config_arch_require(freebsd4, ucd-snmp/memory_freebsd2)
-+config_arch_require(freebsd5, ucd-snmp/memory_freebsd2)
- config_add_mib(UCD-SNMP-MIB) 
diff --git a/net/net-snmp4/files/patch-ag b/net/net-snmp4/files/patch-ag
deleted file mode 100644
index 4f8dbd1fe650..000000000000
--- a/net/net-snmp4/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- snmplib/ucd-snmp-includes.h.orig	Wed Jan 20 18:18:42 1999
-+++ snmplib/ucd-snmp-includes.h	Sat Aug 28 02:13:56 1999
-@@ -4,7 +4,7 @@
- #include <netinet/in.h>
- 
- /* uncomment if you don't have in_addr_t in netinet/in.h */
--/* typedef u_int in_addr_t; */
-+typedef u_int in_addr_t;
- 
- #include <ucd-snmp/asn1.h>
- #include <ucd-snmp/snmp_api.h>
diff --git a/net/net-snmp4/files/patch-ah b/net/net-snmp4/files/patch-ah
deleted file mode 100644
index b80222ba72eb..000000000000
--- a/net/net-snmp4/files/patch-ah
+++ /dev/null
@@ -1,8 +0,0 @@
---- local/tkmib.orig	Wed Jul 21 19:06:52 1999
-+++ local/tkmib	Sat Aug 28 02:37:57 1999
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- 
- require 5;
- 
diff --git a/net/net-snmp4/files/patch-ak b/net/net-snmp4/files/patch-ak
deleted file mode 100644
index 7ca23e85b748..000000000000
--- a/net/net-snmp4/files/patch-ak
+++ /dev/null
@@ -1,21 +0,0 @@
---- agent/Makefile.in.old	Tue May 16 19:58:54 2000
-+++ agent/Makefile.in	Tue May 16 20:00:26 2000
-@@ -51,10 +51,18 @@
- 
- libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 	$(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS}  $(SHLIB_LD_LIBS)
-+	ld -Bshareable -soname libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
-+		-o libucdagent.$(SHLIB_EXTENSION) ${LIBAGENTOBJS}
-+	ln -f libucdagent.$(SHLIB_EXTENSION) \
-+	libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 	$(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 
- libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${MIBOBJS}
- 	$(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS}  $(SHLIB_LD_LIBS)
-+	ld -Bshareable -soname libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
-+		-o libucdmibs.$(SHLIB_EXTENSION) ${MIBOBJS}
-+	ln -f libucdmibs.$(SHLIB_EXTENSION) \
-+	libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 	$(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 
- clean:
diff --git a/net/net-snmp4/files/patch-al b/net/net-snmp4/files/patch-al
deleted file mode 100644
index c2464056b6bc..000000000000
--- a/net/net-snmp4/files/patch-al
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in~	Sat May  6 01:46:26 2000
-+++ configure.in	Wed May 17 11:09:08 2000
-@@ -1286,6 +1286,26 @@
- AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE,
- [
- 
-+dnl 4.4 compatible but renamed on FreeBSD
-+AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#define KERNEL
-+#define _KERNEL
-+#include <sys/socket.h>
-+#undef KERNEL
-+#undef _KERNEL
-+#include <net/route.h>
-+],[
-+
-+#ifndef STRUCT_RTENTRY_HAS_RT_DST
-+#define rt_dst rt_nodes->rn_key
-+#endif
-+
-+  struct rtentry rt; 
-+  rt.rt_nodes[0].rn_bit = 1;
-+  rt.rt_dst;
-+  ], ac_cv_RTENTRY_TYPE="BSD-4.4")
-+
- dnl 4.4 compat
- AC_TRY_COMPILE([
- #include <sys/types.h>
diff --git a/net/net-snmp4/files/patch-am b/net/net-snmp4/files/patch-am
deleted file mode 100644
index 0ad08d546705..000000000000
--- a/net/net-snmp4/files/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~	Sat Dec 18 08:41:14 1999
-+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c	Wed May 17 11:18:59 2000
-@@ -9,6 +9,9 @@
- #include <sys/time.h>
- #include <sys/proc.h>
- #include <sys/dkstat.h>
-+#ifdef freebsd5
-+#include <sys/bio.h>
-+#endif
- #include <sys/buf.h>
- #include <sys/uio.h>
- #include <sys/namei.h>
diff --git a/net/net-snmp4/files/patch-an b/net/net-snmp4/files/patch-an
deleted file mode 100644
index 8153ba8c5653..000000000000
--- a/net/net-snmp4/files/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
---- agent/mibgroup/ucd-snmp/memory_freebsd2.c~	Tue Mar 14 06:27:00 2000
-+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	Wed May 17 11:19:23 2000
-@@ -10,6 +10,9 @@
- #include <sys/time.h>
- #include <sys/proc.h>
- #include <sys/dkstat.h>
-+#ifdef freebsd5
-+#include <sys/bio.h>
-+#endif
- #include <sys/buf.h>
- #include <sys/uio.h>
- #include <sys/namei.h>
diff --git a/net/net-snmp4/files/snmpd.sh.sample b/net/net-snmp4/files/snmpd.sh.sample
deleted file mode 100644
index 71f8b504ce81..000000000000
--- a/net/net-snmp4/files/snmpd.sh.sample
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	[ -x ${PREFIX}/sbin/snmpd ] && ${PREFIX}/sbin/snmpd && echo -n ' snmpd'
-	;;
-stop)
-	killall snmpd && echo -n ' snmpd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/net/net-snmp4/pkg-comment b/net/net-snmp4/pkg-comment
deleted file mode 100644
index fbaaa7ab347c..000000000000
--- a/net/net-snmp4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extendable SNMP implimentation
diff --git a/net/net-snmp4/pkg-descr b/net/net-snmp4/pkg-descr
deleted file mode 100644
index e4aa3d1382a3..000000000000
--- a/net/net-snmp4/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-This is UCD SNMP, a derivative of CMU's SNMP package.
-
-From the README:
-
-This package contains a port and modified code of the CMU 2.1.2.1
-snmp agent.  It has been modified to allow extensibility quickly
-and easily.  It is far from the best and most configurable systems;
-but hey: its free.
-  
-We use this agent here to monitor known system problems before they
-take the machine over.  The agent can be easily configured to
-monitor the number of a given process running, run external scripts
-to check and report functional status.  Examples: mountd(s) under
-Ultrix 4.3 which tend to fork themselves crazy and eventually fill
-up the process table; On our hp700s, "amd" sometimes stops working,
-HP VUE hangs and fails to start X, etc.
-
-WWW: http://ucd-snmp.ucdavis.edu/
diff --git a/net/net-snmp4/pkg-plist b/net/net-snmp4/pkg-plist
deleted file mode 100644
index f14ce4af4ab9..000000000000
--- a/net/net-snmp4/pkg-plist
+++ /dev/null
@@ -1,105 +0,0 @@
-bin/encode_keychange
-bin/snmpbulkget
-bin/snmpbulkwalk
-bin/snmpcheck
-bin/snmpdelta
-bin/snmpget
-bin/snmpgetnext
-bin/snmpinform
-bin/snmpnetstat
-bin/snmpset
-bin/snmpstatus
-bin/snmptable
-bin/snmptest
-bin/snmptranslate
-bin/snmptrap
-bin/snmpusm
-bin/snmpwalk
-bin/tkmib
-etc/rc.d/snmpd.sh.sample
-include/ucd-snmp/agent_read_config.h
-include/ucd-snmp/agent_registry.h
-include/ucd-snmp/agent_trap.h
-include/ucd-snmp/asn1.h
-include/ucd-snmp/auto_nlist.h
-include/ucd-snmp/callback.h
-include/ucd-snmp/default_store.h
-include/ucd-snmp/ds_agent.h
-include/ucd-snmp/header_complex.h
-include/ucd-snmp/int64.h
-include/ucd-snmp/keytools.h
-include/ucd-snmp/mib.h
-include/ucd-snmp/mibincl.h
-include/ucd-snmp/parse.h
-include/ucd-snmp/read_config.h
-include/ucd-snmp/scapi.h
-include/ucd-snmp/snmp.h
-include/ucd-snmp/snmp_agent.h
-include/ucd-snmp/snmp_alarm.h
-include/ucd-snmp/snmp_api.h
-include/ucd-snmp/snmp_client.h
-include/ucd-snmp/snmp_debug.h
-include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp_logging.h
-include/ucd-snmp/snmp_vars.h
-include/ucd-snmp/snmpv3.h
-include/ucd-snmp/struct.h
-include/ucd-snmp/system.h
-include/ucd-snmp/tools.h
-include/ucd-snmp/transform_oids.h
-include/ucd-snmp/ucd-snmp-agent-includes.h
-include/ucd-snmp/ucd-snmp-config.h
-include/ucd-snmp/ucd-snmp-includes.h
-include/ucd-snmp/util_funcs.h
-include/ucd-snmp/var_struct.h
-include/ucd-snmp/version.h
-@dirrm include/ucd-snmp
-lib/libsnmp.so
-lib/libsnmp.so.%%shlib%%
-lib/libucdagent.so
-lib/libucdagent.so.%%shlib%%
-lib/libucdmibs.so
-lib/libucdmibs.so.%%shlib%%
-sbin/snmpd
-sbin/snmptrapd
-share/examples/ucd-snmp/EXAMPLE.conf
-share/examples/ucd-snmp/ucdDemoPublic.conf
-@dirrm share/examples/ucd-snmp
-share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-TYPES.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
-share/snmp/mibs/IPV6-ICMP-MIB.txt
-share/snmp/mibs/IPV6-MIB.txt
-share/snmp/mibs/IPV6-TC.txt
-share/snmp/mibs/IPV6-TCP-MIB.txt
-share/snmp/mibs/IPV6-UDP-MIB.txt
-share/snmp/mibs/RFC1155-SMI.txt
-share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/RMON-MIB.txt
-share/snmp/mibs/SNMP-COMMUNITY-MIB.txt
-share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
-share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
-share/snmp/mibs/SNMP-PROXY-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
-share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
-share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UCD-DEMO-MIB.txt
-share/snmp/mibs/UCD-DISKIO-MIB.txt
-share/snmp/mibs/UCD-DLMOD-MIB.txt
-share/snmp/mibs/UCD-IPFWACC-MIB.txt
-share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-@unexec rm -f %D/share/snmp/mibs/.index
-@dirrm share/snmp/mibs
-@dirrm share/snmp
diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
deleted file mode 100644
index a03d45e6f9a2..000000000000
--- a/net/netatalk-devel/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Ports collection makefile for:    netatalk
-# Date created:         23 Jul 1997
-# Whom:                 stb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	netatalk
-PORTVERSION=	1.4b2
-PORTREVISION=	1
-CATEGORIES=	net print
-MASTER_SITES=   ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
-		${MASTER_SITE_LOCAL} \
-		ftp://ftp.hanse.de/sites/transit/mirror/terminator.rs.itd.umich.edu/unix/netatalk/
-MASTER_SITE_SUBDIR=	stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk
-
-PATCH_SITES=	http://www.umich.edu/~rsug/netatalk/patches/1.4b2/ \
-		${MASTER_SITE_LOCAL} \
-		ftp://ftp.hanse.de/sites/transit/mirror/www.umich.edu/%257Ersug/netatalk/patches/1.4b2/
-PATCH_SITE_SUBDIR=	stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/ \
-PATCHFILES=	afpd-macos8.diff afpd-bfree.diff
-
-MAINTAINER=	stb@freebsd.org
-
-MAN1=		aecho.1 getzones.1 megatron.1 nbp.1 pap.1 psorder.1 hqx2bin.1 \
-		macbinary.1 nbplkup.1 nbprgstr.1 nbpunrgstr.1 \
-		papstatus.1 single2bin.1 unbin.1 unhex.1 unsingle.1
-
-MAN3=		atalk_aton.3 nbp_name.3
-MAN4=		atalk.4
-MAN8=		afpd.8 atalkd.8 papd.8 psf.8
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
deleted file mode 100644
index 3d3050874891..000000000000
--- a/net/netatalk-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (netatalk-1.4b2.tar.gz) = b7541838044e167405bb33236faf4ce7
-MD5 (afpd-macos8.diff) = 55c6943f03c06aa7e1ff195553dcbe98
-MD5 (afpd-bfree.diff) = 54817f22f00471109a88b554097125b2
diff --git a/net/netatalk-devel/files/patch-aa b/net/netatalk-devel/files/patch-aa
deleted file mode 100644
index ae3c38bf154b..000000000000
--- a/net/netatalk-devel/files/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.old	Wed Sep  9 02:42:06 1998
-+++ Makefile	Wed Sep  9 02:42:37 1998
-@@ -1,15 +1,15 @@
- # Root of installation. Subdirectories will be ${DESTDIR}/etc,
- # ${DESTDIR}/bin, and ${DESTDIR}/lib.
--DESTDIR=/usr/local/atalk
-+DESTDIR=$(PREFIX)
- 
- # for system-level binaries
--SBINDIR=$(DESTDIR)/etc
-+SBINDIR=$(DESTDIR)/libexec
- # for user-level binaries
- BINDIR=$(DESTDIR)/bin
- # for program libraries (*.a)
- LIBDIR=$(DESTDIR)/lib
- # for machine-independent resources (pagecount.ps, etc.)
--RESDIR=$(DESTDIR)/etc
-+RESDIR=$(DESTDIR)/share
- # for configuration files (AppleVolumes.system, etc.)
- ETCDIR=$(DESTDIR)/etc
- # for include files
-@@ -54,7 +54,7 @@
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
--	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" $@
-+	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" OPTOPTS="${CFLAGS}" $@
- 
- FRC:
- 
diff --git a/net/netatalk-devel/files/patch-ab b/net/netatalk-devel/files/patch-ab
deleted file mode 100644
index 4c760c2adbbd..000000000000
--- a/net/netatalk-devel/files/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -crP ../netatalk-1.4b2/rc.atalk.freebsd ./rc.atalk.freebsd
-*** ../netatalk-1.4b2/rc.atalk.freebsd	Thu Jan  1 01:00:00 1970
---- ./rc.atalk.freebsd	Thu Jul 24 02:14:39 1997
-***************
-*** 0 ****
---- 1,26 ----
-+ #
-+ # AppleTalk daemons. Make sure not to start atalkd in the background:
-+ # its data structures must have time to stablize before running the
-+ # other processes.
-+ #
-+ PREFIX=/`expr $0 : '/\(.*\)/etc/rc.d/netatalk.sh'`
-+ if [ "x${PREFIX}" = "x/" ]; then
-+ 	printf "\nnetatalk: Cannot determine PREFIX.\n" >&2
-+ 	exit 64
-+ fi
-+ HOSTNAME=`hostname|sed 's/\..*$//'`
-+ 
-+ case $1 in
-+ 	start)	echo -n ' netatalk'
-+ 		${PREFIX}/libexec/atalkd
-+ 		${PREFIX}/bin/nbprgstr -p 4 ${HOSTNAME}:Workstation &
-+ 		${PREFIX}/bin/nbprgstr -p 4 ${HOSTNAME}:netatalk &
-+ 		${PREFIX}/libexec/papd
-+ 		${PREFIX}/libexec/afpd -s ${PREFIX}/etc/AppleVolumes.system \
-+			-f ${PREFIX}/etc/AppleVolumes.default
-+ 		;;
-+ 	stop)	killall afpd
-+ 		killall papd
-+ 		killall atalkd
-+ 		;;
-+ esac
diff --git a/net/netatalk-devel/files/patch-ac b/net/netatalk-devel/files/patch-ac
deleted file mode 100644
index e6ec20e0ab56..000000000000
--- a/net/netatalk-devel/files/patch-ac
+++ /dev/null
@@ -1,43 +0,0 @@
---- sys/freebsd/Makefile.orig	Tue Oct 22 23:31:01 1996
-+++ sys/freebsd/Makefile	Wed Sep  9 02:09:02 1998
-@@ -1,6 +1,5 @@
- # FreeBSD specific defines, passed to subdirectories.
- DEFS=	-DBSD4_4
--OPTOPTS=	-O2
- CC=	gcc
- INSTALL=	install
- ADDLIBS=	-lcrypt
-@@ -21,7 +20,8 @@
- FRC:
- 
- install :
--	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR} \
-+		${ETCDIR}/rc.d ${RESDIR}/examples/netatalk
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-@@ -30,17 +30,16 @@
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
- 		INSTALL="${INSTALL}" $@); \
- 	done
--	rm -f ${ETCDIR}/rc.atalk
- 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
--	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
--	@echo
--	@echo "Install is done.  Don't forget to add lines from"
--	@echo "services.atalk to /etc/services and to call rc.atalk"
--	@echo "in /etc/rc.  See README and README.FREEBSD for more"
--	@echo "information."
-+	    < ../../rc.atalk.freebsd > ${ETCDIR}/rc.d/netatalk.sh
-+	chmod +x ${ETCDIR}/rc.d/netatalk.sh
-+	cp ../../config/AppleVolumes.default ${ETCDIR}/AppleVolumes.default.dist
-+	cp ../../config/AppleVolumes.system ${ETCDIR}/AppleVolumes.system.dist
-+	cp ../../config/atalkd.conf ../../config/papd.conf \
-+		${RESDIR}/examples/netatalk
- 
- clean :
- 	for i in ${ALL}; \
diff --git a/net/netatalk-devel/files/patch-ad b/net/netatalk-devel/files/patch-ad
deleted file mode 100644
index b7b1bf86c691..000000000000
--- a/net/netatalk-devel/files/patch-ad
+++ /dev/null
@@ -1,48 +0,0 @@
-*** etc/atalkd/main.c.orig	Tue Oct 22 00:45:03 1996
---- etc/atalkd/main.c	Wed Feb 25 02:39:21 1998
-***************
-*** 19,24 ****
---- 19,35 ----
-  #include <net/if.h>
-  #include <net/route.h>
-  
-+ #if __FreeBSD__ >= 2
-+ #  include <osreldate.h>
-+ #  if __FreeBSD_version >= 300000
-+ #    define __FreeBSD_CURRENT
-+ #  endif
-+ #endif
-+ 
-+ #ifdef __FreeBSD_CURRENT
-+ #include <net/if_dl.h>
-+ #endif
-+ 
-  #include <signal.h>
-  #include <syslog.h>
-  #include <stdio.h>
-***************
-*** 1150,1158 ****
---- 1161,1183 ----
-  	    }
-  	} else {
-  	    /* configure multicast for this interface */
-+ #ifdef __FreeBSD_CURRENT
-+ 	    struct sockaddr_dl *sdl = (struct sockaddr_dl *)&sa;
-+ 	    bzero( sdl, sizeof( struct sockaddr ));
-+ 	    sdl->sdl_family = AF_LINK;
-+ 	    sdl->sdl_nlen = 0 /* strlen(iface->i_name)*/;
-+ 	    /*strncpy(sdl->sdl_data, iface->i_name, sdl->sdl_nlen);*/
-+ 	    bcopy( ethermulti, LLADDR(sdl), sizeof( ethermulti ));
-+ 	    sdl->sdl_alen = sizeof( ethermulti );
-+ 	    sdl->sdl_len = sizeof(*sdl);
-+ 			/* (sdl->sdl_data + sdl->sdl_alen + sdl->sdl_nlen) 
-+ 				- (char *)sdl; */
-+ 	    if ( ifconfig( iface->i_name, SIOCADDMULTI, sdl )) {
-+ #else
-  	    bzero( &sa, sizeof( struct sockaddr ));
-  	    bcopy( ethermulti, sa.sa_data, sizeof( ethermulti ));
-  	    if ( ifconfig( iface->i_name, SIOCADDMULTI, &sa )) {
-+ #endif
-  		syslog( LOG_ERR, "addmulti: %m" );
-  		exit( 1 );
-  	    }
diff --git a/net/netatalk-devel/files/patch-ae b/net/netatalk-devel/files/patch-ae
deleted file mode 100644
index ccb04e77d285..000000000000
--- a/net/netatalk-devel/files/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-*** etc/atalkd/nbp.c.orig	Sat Oct  5 17:17:53 1996
---- etc/atalkd/nbp.c	Wed Feb 25 18:24:50 1998
-***************
-*** 7,13 ****
---- 7,26 ----
-  #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <sys/ioctl.h>
-+ #include <sys/time.h>
-  #include <net/if.h>
-+ 
-+ #if __FreeBSD__ >= 2
-+ #  include <osreldate.h>
-+ #  if __FreeBSD_version >= 300000
-+ #    define __FreeBSD_CURRENT
-+ #  endif
-+ #endif
-+ 
-+ #ifdef __FreeBSD_CURRENT
-+ #include <net/if_dl.h>
-+ #endif
-+ 
-  #include <netatalk/at.h>
-  #include <atalk/ddp.h>
-  #include <atalk/nbp.h>
-***************
-*** 185,190 ****
---- 198,214 ----
-  		for ( l = iface->i_rt->rt_zt; l; l = l->l_next ) {
-  		    if ( zt == (struct ziptab *)l->l_data ) {
-  			/* add multicast */
-+ #ifdef __FreeBSD_CURRENT
-+ 			struct sockaddr_dl *sdl = (struct sockaddr_dl *)&sa;
-+ 			sdl->sdl_family = AF_LINK;
-+ 			sdl->sdl_nlen = 0;
-+ 			bcopy( zt->zt_bcast, sdl->sdl_data, sizeof(ethermulti));
-+ 			sdl->sdl_alen = sizeof(ethermulti);
-+ 			sdl->sdl_len = sizeof (*sdl);
-+ 				/* (sdl->sdl_data
-+ 				+ sdl->sdl_alen + sdl->sdl_nlen)  
-+ 				- (char *)sdl; */
-+ #endif
-  			if ( ifconfig( iface->i_name, SIOCADDMULTI, &sa )) {
-  			    syslog( LOG_ERR, "addmulti: %m" );
-  			    exit( 1 );
diff --git a/net/netatalk-devel/files/patch-af b/net/netatalk-devel/files/patch-af
deleted file mode 100644
index 9aabbf3a0648..000000000000
--- a/net/netatalk-devel/files/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-*** etc/atalkd/rtmp.c.orig	Wed Feb 25 18:28:16 1998
---- etc/atalkd/rtmp.c	Wed Feb 25 18:28:29 1998
-***************
-*** 7,12 ****
---- 7,13 ----
-  #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <sys/ioctl.h>
-+ #include <sys/time.h>
-  #include <net/if.h>
-  #include <net/route.h>
-  #include <netatalk/endian.h>
diff --git a/net/netatalk-devel/files/patch-ag b/net/netatalk-devel/files/patch-ag
deleted file mode 100644
index 4ce2b52d6ee1..000000000000
--- a/net/netatalk-devel/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
---- libatalk/asp/asp_getsess.c.orig	Tue Aug 25 21:50:54 1998
-+++ libatalk/asp/asp_getsess.c	Tue Aug 25 21:51:05 1998
-@@ -3,10 +3,10 @@
-  * All Rights Reserved.  See COPYRIGHT.
-  */
- 
-+#include <sys/types.h>
- #include <sys/errno.h>
- #include <sys/signal.h>
- #include <sys/time.h>
--#include <sys/types.h>
- #include <sys/uio.h>
- #include <sys/wait.h>
- #include <sys/syslog.h>
diff --git a/net/netatalk-devel/files/patch-ah b/net/netatalk-devel/files/patch-ah
deleted file mode 100644
index 30164e7616fc..000000000000
--- a/net/netatalk-devel/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/afpd/desktop.c.orig	Tue Aug 25 21:59:28 1998
-+++ etc/afpd/desktop.c	Tue Aug 25 22:00:23 1998
-@@ -429,7 +429,7 @@
-     m = mpath;
-     u = upath;
-     while ( *m != '\0' ) {
--	if ( !isascii( *m ) || *m == '/' || ( i == 0 && *m == '.' )) {
-+	if ( !isprint( (unsigned char)*m ) || *m == '/' || ( i == 0 && *m == '.' )) {
- 	    *u++ = ':';
- 	    *u++ = hexdig[ ( *m & 0xf0 ) >> 4 ];
- 	    *u++ = hexdig[ *m & 0x0f ];
diff --git a/net/netatalk-devel/files/patch-ai b/net/netatalk-devel/files/patch-ai
deleted file mode 100644
index d0c82037f226..000000000000
--- a/net/netatalk-devel/files/patch-ai
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.orig	Tue Feb 20 17:38:02 1996
-+++ Makefile	Mon Sep  7 22:23:04 1998
-@@ -1,4 +1,4 @@
--TARGETS=	atalk netatalk
-+TARGETS=	atalk
- 
- INSTALL=	install
- 
diff --git a/net/netatalk-devel/files/patch-aj b/net/netatalk-devel/files/patch-aj
deleted file mode 100644
index 869cb02661a6..000000000000
--- a/net/netatalk-devel/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/man1/Makefile.orig	Tue Feb 20 18:16:24 1996
-+++ man/man1/Makefile	Tue Sep  8 23:40:31 1998
-@@ -1,6 +1,5 @@
--SRC=	aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 nbplkup.1 \
--	pap.1 papstatus.1 psorder.1 megatron.1 unhex.1 unbin.1 \
--	unsingle.1 macbinary.1 hqx2bin.1 single2bin.1
-+SRC=	aecho.1 getzones.1 nbp.1 \
-+	pap.1 psorder.1 megatron.1
- 
- INCPATH=
- CFLAGS=
diff --git a/net/netatalk-devel/files/patch-ak b/net/netatalk-devel/files/patch-ak
deleted file mode 100644
index 96e4fb1be152..000000000000
--- a/net/netatalk-devel/files/patch-ak
+++ /dev/null
@@ -1,20 +0,0 @@
---- etc/psf/Makefile.orig	Thu Apr 18 23:53:09 1996
-+++ etc/psf/Makefile	Sat Oct 10 01:33:08 1998
-@@ -32,14 +32,14 @@
- 
- install : all
- 	-mkdir ${RESDIR}
--	-mkdir ${RESDIR}/filters
-+	-mkdir ${SBINDIR}/filters
- 	${INSTALL} -c psa ${SBINDIR}
- 	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
- 	${INSTALL} -c pagecount.ps ${RESDIR}
- 	${INSTALL} -c psf ${SBINDIR}
- 	for i in ${LINKS} ; do \
--	    rm -f ${RESDIR}/filters/$$i; \
--	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
-+	    rm -f ${SBINDIR}/filters/$$i; \
-+	    ln -s ${SBINDIR}/psf ${SBINDIR}/filters/$$i; \
- 	done
- 
- clean :
diff --git a/net/netatalk-devel/pkg-comment b/net/netatalk-devel/pkg-comment
deleted file mode 100644
index 4eb541bac506..000000000000
--- a/net/netatalk-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File and print server for AppleTalk networks
diff --git a/net/netatalk-devel/pkg-descr b/net/netatalk-devel/pkg-descr
deleted file mode 100644
index 41f3fc770e7a..000000000000
--- a/net/netatalk-devel/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-netatalk - File and Print Server for AppleTalk networks
-
-netatalk is a server software for AppleTalk networks. Features include:
-
-o Access to the UNIX file system for Macintosh and other systems with
-  AppleShare client software.
-
-o Spool PostScript print jobs to the lpd(8) spool system via Printer Access
-  Protocol (PAP).
-
-o Output PostScript print jobs from the lpd(8) spool system via Printer
-  Access Protocol (PAP).
-
-o Filter PostScript, ASCII, and various other formats to PostScript,
-  including banner pages and page reversal.
-
-o Route AppleTalk between multiple Ethernet interfaces.
-
-Requires AppleTalk support in the kernel (FreeBSD 2.2 or newer).
-
-WWW: http://www.umich.edu/~rsug/netatalk/
diff --git a/net/netatalk-devel/pkg-install b/net/netatalk-devel/pkg-install
deleted file mode 100644
index e17a582f1265..000000000000
--- a/net/netatalk-devel/pkg-install
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Check whether config files exist already, and copy the distribution ones
-# if not. Warn the user if the existing ones differ from the distribution,
-# so changes in the distribution can be merged.
-
-checkfile() {
-	diff -bBqw $1 $1.dist >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			;;
-		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version"; 
-			echo "   of the port.  See $1.dist for details."; 
-			;;
-		*)	# no config file exists, copy it
-			install -c -m 644 $1.dist $1
-			;;
-	esac
-}
-
-case $2 in
-	POST-INSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/AppleVolumes.default
-		checkfile ${PKG_PREFIX}/etc/AppleVolumes.system
-
-		# install man page aliases
-		cd man
-		if [ -f man1/megatron.1.gz ]; then
-			MANEXT=.gz
-		fi
-		for i in hqx2bin macbinary single2bin unbin unhex unsingle; do
-			ln -f man1/megatron.1${MANEXT} man1/$i.1${MANEXT}
-		done
-		for i in nbplkup nbprgstr nbpunrgstr; do
-			ln -f man1/nbp.1${MANEXT} man1/$i.1${MANEXT}
-		done
-		ln -f man1/pap.1${MANEXT} man1/papstatus.1${MANEXT}
-		;;
-esac
diff --git a/net/netatalk-devel/pkg-plist b/net/netatalk-devel/pkg-plist
deleted file mode 100644
index 57c2672ea890..000000000000
--- a/net/netatalk-devel/pkg-plist
+++ /dev/null
@@ -1,75 +0,0 @@
-bin/aecho
-bin/getzones
-bin/hqx2bin
-bin/macbinary
-bin/megatron
-bin/nbplkup
-bin/nbprgstr
-bin/nbpunrgstr
-bin/pap
-bin/papstatus
-bin/psorder
-bin/single2bin
-bin/unbin
-bin/unhex
-bin/unsingle
-@unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi
-etc/AppleVolumes.default.dist
-@unexec if cmp -s %D/etc/AppleVolumes.system %D/etc/AppleVolumes.system.dist; then rm -f %D/etc/AppleVolumes.system; fi
-etc/AppleVolumes.system.dist
-etc/rc.d/netatalk.sh
-include/atalk/adouble.h
-include/atalk/aep.h
-include/atalk/afp.h
-include/atalk/asp.h
-include/atalk/atp.h
-include/atalk/compat.h
-include/atalk/ddp.h
-include/atalk/nbp.h
-include/atalk/pap.h
-include/atalk/paths.h
-include/atalk/rtmp.h
-include/atalk/zip.h
-include/netatalk/ddp.h
-include/netatalk/endian.h
-include/netatalk/ddp_var.h
-include/netatalk/phase2.h
-include/netatalk/at_var.h
-include/netatalk/at.h
-include/netatalk/aarp.h
-lib/libatalk.a
-lib/libatalk_p.a
-libexec/afpd
-libexec/atalkd
-libexec/etc2ps
-libexec/papd
-libexec/psa
-libexec/psf
-libexec/filters/ifmpap
-libexec/filters/ifmpaprev
-libexec/filters/ifpap
-libexec/filters/ifpaprev
-libexec/filters/ifwmpap
-libexec/filters/ifwmpaprev
-libexec/filters/ifwpap
-libexec/filters/ifwpaprev
-libexec/filters/ofmpap
-libexec/filters/ofpap
-libexec/filters/ofwmpap
-libexec/filters/ofwpap
-libexec/filters/tfmpap
-libexec/filters/tfmpaprev
-libexec/filters/tfpap
-libexec/filters/tfpaprev
-libexec/filters/tfwmpap
-libexec/filters/tfwmpaprev
-libexec/filters/tfwpap
-libexec/filters/tfwpaprev
-share/examples/netatalk/atalkd.conf
-share/examples/netatalk/papd.conf
-share/pagecount.ps
-@dirrm include/atalk
-@dirrm include/netatalk
-@dirrm libexec/filters
-@dirrm share/examples/netatalk
-
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
deleted file mode 100644
index c92ee9e5ffa5..000000000000
--- a/net/ns2/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for: ns-2
-# Date created:		26 April 1999
-# Whom:			obonilla
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ns
-PORTVERSION=	2.1.b5
-CATEGORIES=	net
-MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/vint/
-DISTNAME=	ns-src-2.1b5
-
-MAINTAINER=	obonilla@fisicc-ufm.edu
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
-
-MAN1=		ns.1
-MANCOMPRESSED=	no
-
-WRKSRC=		${WRKDIR}/ns-2.1b5
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
-
-ALL_TARGET=
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/examples/ns2
-	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${PREFIX}/share/examples/ns2
-.include <bsd.port.mk>
diff --git a/net/ns2/distinfo b/net/ns2/distinfo
deleted file mode 100644
index ddaed37a3634..000000000000
--- a/net/ns2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ns-src-2.1b5.tar.gz) = 6aae46016418c0f5dc54b9b7398c4fc0
diff --git a/net/ns2/files/patch-aa b/net/ns2/files/patch-aa
deleted file mode 100644
index d95a0b774e29..000000000000
--- a/net/ns2/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Apr 26 09:36:25 1999
-+++ configure	Mon Apr 26 09:36:48 1999
-@@ -1898,7 +1898,7 @@
- # $d/unix works if $d is the 8.0 distribution
- # $d/bin is for the ns-allinone distribution (kind of hacky, isn't it?)
- PATH=$PATH:$d/unix:$d/bin
--for ac_prog in tclsh$TCL_VERS tclsh tclsh$TCL_OLD_VERS
-+for ac_prog in tclsh$TCL_VERS tclsh8.2 tclsh$TCL_OLD_VERS
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/net/ns2/pkg-comment b/net/ns2/pkg-comment
deleted file mode 100644
index 0c9bcd737961..000000000000
--- a/net/ns2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The UCB/LBNL Network Simulator Version 2
diff --git a/net/ns2/pkg-descr b/net/ns2/pkg-descr
deleted file mode 100644
index 2b4aa1905c71..000000000000
--- a/net/ns2/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-NS is a discrete event simulator targeted at networking research. 
-Ns provides substantial support for simulation of TCP, routing, and multicast
-protocols. 
-
-WWW: http://www-mash.cs.berkeley.edu/ns/
-
--Oscar <obonilla@fisicc-ufm.edu>
diff --git a/net/ns2/pkg-plist b/net/ns2/pkg-plist
deleted file mode 100644
index c9bf970db0d1..000000000000
--- a/net/ns2/pkg-plist
+++ /dev/null
@@ -1,65 +0,0 @@
-bin/ns
-share/examples/ns2/agent-gen-script.tcl
-share/examples/ns2/agent-gen.tcl
-share/examples/ns2/callback_demo.tcl
-share/examples/ns2/fq-cbr.tcl
-share/examples/ns2/fq.tcl
-share/examples/ns2/hier-rtg-10.tcl
-share/examples/ns2/hier-rtg-100.tcl
-share/examples/ns2/hts100-0.tcl
-share/examples/ns2/lantest.tcl
-share/examples/ns2/mac-test.tcl
-share/examples/ns2/many_tcp.tcl
-share/examples/ns2/manytcp_trmodel.tcl
-share/examples/ns2/mcast.tcl
-share/examples/ns2/nam-example.tcl
-share/examples/ns2/nam-separate-trace.tcl
-share/examples/ns2/nam-simplexlink.tcl
-share/examples/ns2/ranvar.tcl
-share/examples/ns2/rbp_demo.tcl
-share/examples/ns2/rc.tcl
-share/examples/ns2/shuttle-mcast.tcl
-share/examples/ns2/shuttle.tcl
-share/examples/ns2/simple-dyn.tcl
-share/examples/ns2/simple-eqp.tcl
-share/examples/ns2/simple-eqp1.tcl
-share/examples/ns2/simple-heap.tcl
-share/examples/ns2/simple-rtg.tcl
-share/examples/ns2/simple-rtp.tcl
-share/examples/ns2/simple-webcache-comp.tcl
-share/examples/ns2/simple-webcache-trace.tcl
-share/examples/ns2/simple-webcache.tcl
-share/examples/ns2/simple.tcl
-share/examples/ns2/srm-adapt-rep-session.tcl
-share/examples/ns2/srm-adapt-rep.tcl
-share/examples/ns2/srm-adapt-req-session.tcl
-share/examples/ns2/srm-adapt-req.tcl
-share/examples/ns2/srm-chain-session.tcl
-share/examples/ns2/srm-chain.tcl
-share/examples/ns2/srm-demo.tcl
-share/examples/ns2/srm-session.tcl
-share/examples/ns2/srm-star-session.tcl
-share/examples/ns2/srm-star.tcl
-share/examples/ns2/srm.tcl
-share/examples/ns2/ss.tcl
-share/examples/ns2/swp.tcl
-share/examples/ns2/tcp-int.tcl
-share/examples/ns2/tcpecn.tcl
-share/examples/ns2/tcpsrm.tcl
-share/examples/ns2/test-drr.tcl
-share/examples/ns2/test-emulator.tcl
-share/examples/ns2/test-rcvr.tcl
-share/examples/ns2/test-rlm.tcl
-share/examples/ns2/test-suite-intserv.tcl
-share/examples/ns2/test-suite.tcl
-share/examples/ns2/test-tbf.tcl
-share/examples/ns2/tg.tcl
-share/examples/ns2/topo-gen-script.tcl
-share/examples/ns2/topo-gen.tcl
-share/examples/ns2/topo-view.tcl
-share/examples/ns2/virtual-classifier.tcl
-share/examples/ns2/vlantest-flat.tcl
-share/examples/ns2/vlantest-hier.tcl
-share/examples/ns2/vlantest-mcst.tcl
-share/examples/ns2/wireless.tcl
-@dirrm share/examples/ns2
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
deleted file mode 100644
index 23165eabca30..000000000000
--- a/net/ntp-devel/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	ntp
-# Date created:		Di   5 Mai 1998 21:31:03 CEST
-# Whom:			andreas
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ntp
-PORTVERSION=	4.0.99i
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/
-
-MAINTAINER=	ports@FreeBSD.org
-
-# ntp's configure script created by autoconf 2.14.1 doesn't work
-# if GNU_CONFIGURE is defined
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/ntp
-	${TAR} -C ${WRKSRC}/html --exclude '.*' -cf - . | \
-		${TAR} -C ${PREFIX}/share/doc/ntp --unlink -xf -
-	find ${PREFIX}/share/doc/ntp | xargs ${CHOWN} ${SHAREOWN}:${SHAREGRP}
-	find ${PREFIX}/share/doc/ntp -type f | xargs ${CHMOD} ${SHAREMODE}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/ntp-devel/distinfo b/net/ntp-devel/distinfo
deleted file mode 100644
index 69604a29077b..000000000000
--- a/net/ntp-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ntp-4.0.99i.tar.gz) = e663ad2ff13d3f8fe7f9b280e8750fdc
diff --git a/net/ntp-devel/files/patch-ad b/net/ntp-devel/files/patch-ad
deleted file mode 100644
index d6885c485f08..000000000000
--- a/net/ntp-devel/files/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.orig	Sun Feb 27 17:01:04 2000
-+++ configure	Tue Mar  7 05:53:20 2000
-@@ -8273,19 +8273,19 @@
- # there is NO way that I can tell to tell if a given OS is using timespec or
- # timeval so just set it here for the one case that is KNOWN to use timespec.
- 
--case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in
-- *yes*)
--    cat >>confdefs.h <<\EOF
--#define HAVE_PPSAPI 1
--EOF
--
--    ac_cv_var_oncore_ok=yes
--    cat >>confdefs.h <<\EOF
--#define HAVE_TIMESPEC 1
--EOF
--
--    ;;
--esac
-+#case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in
-+# *yes*)
-+#    cat >>confdefs.h <<\EOF
-+##define HAVE_PPSAPI 1
-+#EOF
-+#
-+#    ac_cv_var_oncore_ok=yes
-+#    cat >>confdefs.h <<\EOF
-+##define HAVE_TIMESPEC 1
-+#EOF
-+#
-+#    ;;
-+#esac
- 
- # Check for ioctls TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG
- echo $ac_n "checking for linux/serial.h... $ac_c" 1>&6
diff --git a/net/ntp-devel/pkg-comment b/net/ntp-devel/pkg-comment
deleted file mode 100644
index 28e419a84d98..000000000000
--- a/net/ntp-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Network Time Protocol Distribution
diff --git a/net/ntp-devel/pkg-descr b/net/ntp-devel/pkg-descr
deleted file mode 100644
index 2603446f9d32..000000000000
--- a/net/ntp-devel/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-The Network Time Protocol (NTP) is used to synchronize the time of a
-computer client or server to another server or reference time source,
-such as a radio or satellite receiver or modem.
-
-It provides client accuracies typically within a millisecond on LANs
-and up to a few tens of milliseconds on WANs relative to a primary
-server synchronized to Coordinated Universal Time (UTC) via a Global
-Positioning Service (GPS) receiver, for example.
-
-Typical NTP configurations utilize multiple redundant servers and diverse
-network paths, in order to achieve high accuracy and reliability.
-
-Some configurations include cryptographic authentication to prevent
-accidental or malicious protocol attacks.
-
-See homepage for more infos:
-
-WWW: http://www.eecis.udel.edu/~ntp/
diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist
deleted file mode 100644
index d0291d3b8543..000000000000
--- a/net/ntp-devel/pkg-plist
+++ /dev/null
@@ -1,162 +0,0 @@
-bin/ntpd
-bin/ntpdate
-bin/ntpdc
-bin/ntpq
-bin/ntptime
-bin/ntptimeset
-bin/ntptrace
-bin/tickadj
-share/doc/ntp/Oncore-SHMEM.htm
-share/doc/ntp/accopt.htm
-share/doc/ntp/assoc.htm
-share/doc/ntp/audio.htm
-share/doc/ntp/authopt.htm
-share/doc/ntp/biblio.htm
-share/doc/ntp/build.htm
-share/doc/ntp/clockopt.htm
-share/doc/ntp/config.htm
-share/doc/ntp/confopt.htm
-share/doc/ntp/copyright.htm
-share/doc/ntp/debug.htm
-share/doc/ntp/driver1.htm
-share/doc/ntp/driver10.htm
-share/doc/ntp/driver11.htm
-share/doc/ntp/driver12.htm
-share/doc/ntp/driver16.htm
-share/doc/ntp/driver18.htm
-share/doc/ntp/driver19.htm
-share/doc/ntp/driver2.htm
-share/doc/ntp/driver20.htm
-share/doc/ntp/driver22.htm
-share/doc/ntp/driver23.htm
-share/doc/ntp/driver24.htm
-share/doc/ntp/driver26.htm
-share/doc/ntp/driver27.htm
-share/doc/ntp/driver28.htm
-share/doc/ntp/driver29.htm
-share/doc/ntp/driver3.htm
-share/doc/ntp/driver30.htm
-share/doc/ntp/driver32.htm
-share/doc/ntp/driver33.htm
-share/doc/ntp/driver34.htm
-share/doc/ntp/driver35.htm
-share/doc/ntp/driver36.htm
-share/doc/ntp/driver37.htm
-share/doc/ntp/driver4.htm
-share/doc/ntp/driver5.htm
-share/doc/ntp/driver6.htm
-share/doc/ntp/driver7.htm
-share/doc/ntp/driver8.htm
-share/doc/ntp/driver9.htm
-share/doc/ntp/exec.htm
-share/doc/ntp/extern.htm
-share/doc/ntp/gadget.htm
-share/doc/ntp/genkeys.htm
-share/doc/ntp/hints/a-ux
-share/doc/ntp/hints/aix
-share/doc/ntp/hints/bsdi
-share/doc/ntp/hints/changes
-share/doc/ntp/hints/decosf1
-share/doc/ntp/hints/decosf2
-share/doc/ntp/hints/freebsd
-share/doc/ntp/hints/hpux
-share/doc/ntp/hints/linux
-share/doc/ntp/hints/notes-xntp-v3
-share/doc/ntp/hints/parse
-share/doc/ntp/hints/refclocks
-share/doc/ntp/hints/rs6000
-share/doc/ntp/hints/sco.htm
-share/doc/ntp/hints/sgi
-share/doc/ntp/hints/solaris-dosynctodr.html
-share/doc/ntp/hints/solaris.html
-share/doc/ntp/hints/solaris.xtra.4023118
-share/doc/ntp/hints/solaris.xtra.4095849
-share/doc/ntp/hints/solaris.xtra.S99ntpd
-share/doc/ntp/hints/solaris.xtra.patchfreq
-share/doc/ntp/hints/sun4
-share/doc/ntp/hints/svr4-dell
-share/doc/ntp/hints/svr4_package
-share/doc/ntp/hints/todo
-share/doc/ntp/hints/vxworks.html
-share/doc/ntp/hints/winnt.htm
-share/doc/ntp/hints.htm
-share/doc/ntp/howto.htm
-share/doc/ntp/htmlprimer.htm
-share/doc/ntp/index.htm
-share/doc/ntp/kern.htm
-share/doc/ntp/kernpps.htm
-share/doc/ntp/ldisc.htm
-share/doc/ntp/measure.htm
-share/doc/ntp/miscopt.htm
-share/doc/ntp/monopt.htm
-share/doc/ntp/mx4200data.htm
-share/doc/ntp/notes.htm
-share/doc/ntp/ntpd.htm
-share/doc/ntp/ntpdate.htm
-share/doc/ntp/ntpdc.htm
-share/doc/ntp/ntpq.htm
-share/doc/ntp/ntptime.htm
-share/doc/ntp/ntptrace.htm
-share/doc/ntp/parsedata.htm
-share/doc/ntp/parsenew.htm
-share/doc/ntp/patches.htm
-share/doc/ntp/pic/9400n.jpg
-share/doc/ntp/pic/alautun4a.gif
-share/doc/ntp/pic/alice11.gif
-share/doc/ntp/pic/alice12.gif
-share/doc/ntp/pic/alice13.gif
-share/doc/ntp/pic/alice15.gif
-share/doc/ntp/pic/alice15b.gif
-share/doc/ntp/pic/alice23.gif
-share/doc/ntp/pic/alice31.gif
-share/doc/ntp/pic/alice32.gif
-share/doc/ntp/pic/alice35.gif
-share/doc/ntp/pic/alice38.gif
-share/doc/ntp/pic/alice44.gif
-share/doc/ntp/pic/alice47.gif
-share/doc/ntp/pic/alice51.gif
-share/doc/ntp/pic/alice61.gif
-share/doc/ntp/pic/appletree.gif
-share/doc/ntp/pic/barnstable.gif
-share/doc/ntp/pic/beaver.gif
-share/doc/ntp/pic/c51.jpg
-share/doc/ntp/pic/driver29.gif
-share/doc/ntp/pic/fg6021.gif
-share/doc/ntp/pic/flatheads.gif
-share/doc/ntp/pic/gadget.jpg
-share/doc/ntp/pic/gps167.jpg
-share/doc/ntp/pic/home.gif
-share/doc/ntp/pic/hornraba.gif
-share/doc/ntp/pic/igclock.gif
-share/doc/ntp/pic/oncore_evalbig.gif
-share/doc/ntp/pic/oncore_remoteant.jpg
-share/doc/ntp/pic/oncore_utplusbig.gif
-share/doc/ntp/pic/panda.gif
-share/doc/ntp/pic/pd_om006.gif
-share/doc/ntp/pic/pd_om011.gif
-share/doc/ntp/pic/pogo.gif
-share/doc/ntp/pic/pogo1.gif
-share/doc/ntp/pic/pogo1a.gif
-share/doc/ntp/pic/pogo3.gif
-share/doc/ntp/pic/pogo3a.gif
-share/doc/ntp/pic/pogo3b.gif
-share/doc/ntp/pic/pogoa.gif
-share/doc/ntp/pic/pzf509.jpg
-share/doc/ntp/pic/rabbit.gif
-share/doc/ntp/pic/sheepb.jpg
-share/doc/ntp/pic/tardisa.gif
-share/doc/ntp/pic/tonea.gif
-share/doc/ntp/porting.htm
-share/doc/ntp/pps.htm
-share/doc/ntp/prefer.htm
-share/doc/ntp/qth.htm
-share/doc/ntp/quick.htm
-share/doc/ntp/rdebug.htm
-share/doc/ntp/refclock.htm
-share/doc/ntp/release.htm
-share/doc/ntp/tickadj.htm
-share/doc/ntp/vxworks.htm
-share/doc/ntp/y2k.htm
-@dirrm share/doc/ntp/pic
-@dirrm share/doc/ntp/hints
-@dirrm share/doc/ntp
diff --git a/net/ntp-stable/Makefile b/net/ntp-stable/Makefile
deleted file mode 100644
index 23165eabca30..000000000000
--- a/net/ntp-stable/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	ntp
-# Date created:		Di   5 Mai 1998 21:31:03 CEST
-# Whom:			andreas
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ntp
-PORTVERSION=	4.0.99i
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/
-
-MAINTAINER=	ports@FreeBSD.org
-
-# ntp's configure script created by autoconf 2.14.1 doesn't work
-# if GNU_CONFIGURE is defined
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/ntp
-	${TAR} -C ${WRKSRC}/html --exclude '.*' -cf - . | \
-		${TAR} -C ${PREFIX}/share/doc/ntp --unlink -xf -
-	find ${PREFIX}/share/doc/ntp | xargs ${CHOWN} ${SHAREOWN}:${SHAREGRP}
-	find ${PREFIX}/share/doc/ntp -type f | xargs ${CHMOD} ${SHAREMODE}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/ntp-stable/distinfo b/net/ntp-stable/distinfo
deleted file mode 100644
index 69604a29077b..000000000000
--- a/net/ntp-stable/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ntp-4.0.99i.tar.gz) = e663ad2ff13d3f8fe7f9b280e8750fdc
diff --git a/net/ntp-stable/files/patch-ad b/net/ntp-stable/files/patch-ad
deleted file mode 100644
index d6885c485f08..000000000000
--- a/net/ntp-stable/files/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.orig	Sun Feb 27 17:01:04 2000
-+++ configure	Tue Mar  7 05:53:20 2000
-@@ -8273,19 +8273,19 @@
- # there is NO way that I can tell to tell if a given OS is using timespec or
- # timeval so just set it here for the one case that is KNOWN to use timespec.
- 
--case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in
-- *yes*)
--    cat >>confdefs.h <<\EOF
--#define HAVE_PPSAPI 1
--EOF
--
--    ac_cv_var_oncore_ok=yes
--    cat >>confdefs.h <<\EOF
--#define HAVE_TIMESPEC 1
--EOF
--
--    ;;
--esac
-+#case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in
-+# *yes*)
-+#    cat >>confdefs.h <<\EOF
-+##define HAVE_PPSAPI 1
-+#EOF
-+#
-+#    ac_cv_var_oncore_ok=yes
-+#    cat >>confdefs.h <<\EOF
-+##define HAVE_TIMESPEC 1
-+#EOF
-+#
-+#    ;;
-+#esac
- 
- # Check for ioctls TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG
- echo $ac_n "checking for linux/serial.h... $ac_c" 1>&6
diff --git a/net/ntp-stable/pkg-comment b/net/ntp-stable/pkg-comment
deleted file mode 100644
index 28e419a84d98..000000000000
--- a/net/ntp-stable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Network Time Protocol Distribution
diff --git a/net/ntp-stable/pkg-descr b/net/ntp-stable/pkg-descr
deleted file mode 100644
index 2603446f9d32..000000000000
--- a/net/ntp-stable/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-The Network Time Protocol (NTP) is used to synchronize the time of a
-computer client or server to another server or reference time source,
-such as a radio or satellite receiver or modem.
-
-It provides client accuracies typically within a millisecond on LANs
-and up to a few tens of milliseconds on WANs relative to a primary
-server synchronized to Coordinated Universal Time (UTC) via a Global
-Positioning Service (GPS) receiver, for example.
-
-Typical NTP configurations utilize multiple redundant servers and diverse
-network paths, in order to achieve high accuracy and reliability.
-
-Some configurations include cryptographic authentication to prevent
-accidental or malicious protocol attacks.
-
-See homepage for more infos:
-
-WWW: http://www.eecis.udel.edu/~ntp/
diff --git a/net/ntp-stable/pkg-plist b/net/ntp-stable/pkg-plist
deleted file mode 100644
index d0291d3b8543..000000000000
--- a/net/ntp-stable/pkg-plist
+++ /dev/null
@@ -1,162 +0,0 @@
-bin/ntpd
-bin/ntpdate
-bin/ntpdc
-bin/ntpq
-bin/ntptime
-bin/ntptimeset
-bin/ntptrace
-bin/tickadj
-share/doc/ntp/Oncore-SHMEM.htm
-share/doc/ntp/accopt.htm
-share/doc/ntp/assoc.htm
-share/doc/ntp/audio.htm
-share/doc/ntp/authopt.htm
-share/doc/ntp/biblio.htm
-share/doc/ntp/build.htm
-share/doc/ntp/clockopt.htm
-share/doc/ntp/config.htm
-share/doc/ntp/confopt.htm
-share/doc/ntp/copyright.htm
-share/doc/ntp/debug.htm
-share/doc/ntp/driver1.htm
-share/doc/ntp/driver10.htm
-share/doc/ntp/driver11.htm
-share/doc/ntp/driver12.htm
-share/doc/ntp/driver16.htm
-share/doc/ntp/driver18.htm
-share/doc/ntp/driver19.htm
-share/doc/ntp/driver2.htm
-share/doc/ntp/driver20.htm
-share/doc/ntp/driver22.htm
-share/doc/ntp/driver23.htm
-share/doc/ntp/driver24.htm
-share/doc/ntp/driver26.htm
-share/doc/ntp/driver27.htm
-share/doc/ntp/driver28.htm
-share/doc/ntp/driver29.htm
-share/doc/ntp/driver3.htm
-share/doc/ntp/driver30.htm
-share/doc/ntp/driver32.htm
-share/doc/ntp/driver33.htm
-share/doc/ntp/driver34.htm
-share/doc/ntp/driver35.htm
-share/doc/ntp/driver36.htm
-share/doc/ntp/driver37.htm
-share/doc/ntp/driver4.htm
-share/doc/ntp/driver5.htm
-share/doc/ntp/driver6.htm
-share/doc/ntp/driver7.htm
-share/doc/ntp/driver8.htm
-share/doc/ntp/driver9.htm
-share/doc/ntp/exec.htm
-share/doc/ntp/extern.htm
-share/doc/ntp/gadget.htm
-share/doc/ntp/genkeys.htm
-share/doc/ntp/hints/a-ux
-share/doc/ntp/hints/aix
-share/doc/ntp/hints/bsdi
-share/doc/ntp/hints/changes
-share/doc/ntp/hints/decosf1
-share/doc/ntp/hints/decosf2
-share/doc/ntp/hints/freebsd
-share/doc/ntp/hints/hpux
-share/doc/ntp/hints/linux
-share/doc/ntp/hints/notes-xntp-v3
-share/doc/ntp/hints/parse
-share/doc/ntp/hints/refclocks
-share/doc/ntp/hints/rs6000
-share/doc/ntp/hints/sco.htm
-share/doc/ntp/hints/sgi
-share/doc/ntp/hints/solaris-dosynctodr.html
-share/doc/ntp/hints/solaris.html
-share/doc/ntp/hints/solaris.xtra.4023118
-share/doc/ntp/hints/solaris.xtra.4095849
-share/doc/ntp/hints/solaris.xtra.S99ntpd
-share/doc/ntp/hints/solaris.xtra.patchfreq
-share/doc/ntp/hints/sun4
-share/doc/ntp/hints/svr4-dell
-share/doc/ntp/hints/svr4_package
-share/doc/ntp/hints/todo
-share/doc/ntp/hints/vxworks.html
-share/doc/ntp/hints/winnt.htm
-share/doc/ntp/hints.htm
-share/doc/ntp/howto.htm
-share/doc/ntp/htmlprimer.htm
-share/doc/ntp/index.htm
-share/doc/ntp/kern.htm
-share/doc/ntp/kernpps.htm
-share/doc/ntp/ldisc.htm
-share/doc/ntp/measure.htm
-share/doc/ntp/miscopt.htm
-share/doc/ntp/monopt.htm
-share/doc/ntp/mx4200data.htm
-share/doc/ntp/notes.htm
-share/doc/ntp/ntpd.htm
-share/doc/ntp/ntpdate.htm
-share/doc/ntp/ntpdc.htm
-share/doc/ntp/ntpq.htm
-share/doc/ntp/ntptime.htm
-share/doc/ntp/ntptrace.htm
-share/doc/ntp/parsedata.htm
-share/doc/ntp/parsenew.htm
-share/doc/ntp/patches.htm
-share/doc/ntp/pic/9400n.jpg
-share/doc/ntp/pic/alautun4a.gif
-share/doc/ntp/pic/alice11.gif
-share/doc/ntp/pic/alice12.gif
-share/doc/ntp/pic/alice13.gif
-share/doc/ntp/pic/alice15.gif
-share/doc/ntp/pic/alice15b.gif
-share/doc/ntp/pic/alice23.gif
-share/doc/ntp/pic/alice31.gif
-share/doc/ntp/pic/alice32.gif
-share/doc/ntp/pic/alice35.gif
-share/doc/ntp/pic/alice38.gif
-share/doc/ntp/pic/alice44.gif
-share/doc/ntp/pic/alice47.gif
-share/doc/ntp/pic/alice51.gif
-share/doc/ntp/pic/alice61.gif
-share/doc/ntp/pic/appletree.gif
-share/doc/ntp/pic/barnstable.gif
-share/doc/ntp/pic/beaver.gif
-share/doc/ntp/pic/c51.jpg
-share/doc/ntp/pic/driver29.gif
-share/doc/ntp/pic/fg6021.gif
-share/doc/ntp/pic/flatheads.gif
-share/doc/ntp/pic/gadget.jpg
-share/doc/ntp/pic/gps167.jpg
-share/doc/ntp/pic/home.gif
-share/doc/ntp/pic/hornraba.gif
-share/doc/ntp/pic/igclock.gif
-share/doc/ntp/pic/oncore_evalbig.gif
-share/doc/ntp/pic/oncore_remoteant.jpg
-share/doc/ntp/pic/oncore_utplusbig.gif
-share/doc/ntp/pic/panda.gif
-share/doc/ntp/pic/pd_om006.gif
-share/doc/ntp/pic/pd_om011.gif
-share/doc/ntp/pic/pogo.gif
-share/doc/ntp/pic/pogo1.gif
-share/doc/ntp/pic/pogo1a.gif
-share/doc/ntp/pic/pogo3.gif
-share/doc/ntp/pic/pogo3a.gif
-share/doc/ntp/pic/pogo3b.gif
-share/doc/ntp/pic/pogoa.gif
-share/doc/ntp/pic/pzf509.jpg
-share/doc/ntp/pic/rabbit.gif
-share/doc/ntp/pic/sheepb.jpg
-share/doc/ntp/pic/tardisa.gif
-share/doc/ntp/pic/tonea.gif
-share/doc/ntp/porting.htm
-share/doc/ntp/pps.htm
-share/doc/ntp/prefer.htm
-share/doc/ntp/qth.htm
-share/doc/ntp/quick.htm
-share/doc/ntp/rdebug.htm
-share/doc/ntp/refclock.htm
-share/doc/ntp/release.htm
-share/doc/ntp/tickadj.htm
-share/doc/ntp/vxworks.htm
-share/doc/ntp/y2k.htm
-@dirrm share/doc/ntp/pic
-@dirrm share/doc/ntp/hints
-@dirrm share/doc/ntp
diff --git a/net/opal/Makefile b/net/opal/Makefile
deleted file mode 100644
index 0c98ff52fe45..000000000000
--- a/net/opal/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	openh323
-# Date created:		Thu Feb 17 15:00:48 GMT 2000
-# Whom:			Roger Hardiman <roger@freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openh323
-PORTVERSION=	1.1
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.1.tar.gz \
-		pwlib_min_1.1pl18.tar.gz
-
-MAINTAINER=	roger@freebsd.org
-
-WRKSRC=         ${WRKDIR}/${PORTNAME}
-
-USE_NEWGCC=	yes
-USE_BISON=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-ALL_TARGET=	opt
-MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib \
-		OPENH323DIR=${WRKDIR}/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/net/opal/distinfo b/net/opal/distinfo
deleted file mode 100644
index 7a6a56e421d9..000000000000
--- a/net/opal/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openh323_1.1.tar.gz) = 51fe78bc7a0da3422479263106b4d95a
-MD5 (pwlib_min_1.1pl18.tar.gz) = c4c88ce65cca72ce5d9cfea36205e7a4
diff --git a/net/opal/files/patch-aa b/net/opal/files/patch-aa
deleted file mode 100644
index cf262107575c..000000000000
--- a/net/opal/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-*** ../pwlib/src/ptlib/unix/tlibthrd.cxx.orig	Thu Nov 16 11:14:48 2000
---- ../pwlib/src/ptlib/unix/tlibthrd.cxx	Thu Nov 16 11:15:21 2000
-*************** void PThread::PX_NewThread(BOOL startSus
-*** 386,391 ****
---- 386,409 ----
-  //  pthread_attr_t threadAttr;
-  //  pthread_attr_init(&threadAttr);
-    PAssertOS(pthread_create(&PX_threadId, NULL, PX_ThreadStart, this) == 0);
-+ 
-+ #if defined(P_FREEBSD)
-+   // There is a potential race condition here which shows up with FreeBSD 4.2
-+   // and later, but really applies to all pthread libraries.
-+   // If a thread is started in suspend mode, we need to make sure
-+   // the thread (PX_ThreadStart) has had a chance to execute and block on the
-+   // sigwait() (blocking on the Resume Signal) before this function returns.
-+   // Otherwise the main program may issue a Resume Signal on the thread
-+   // by calling PThread::Resume() before the thread is ready for it.
-+   // If that happens the program will abort with an unhandled signal error.
-+   // A workaround (not 100% guaranteed) is to yield here, which gives
-+   // the newly created thread (PX_ThreadStart) a chance to execute.
-+  
-+   if (startSuspended) {
-+     sched_yield();
-+   }
-+ #endif
-+ 
-  }
-  
-  
diff --git a/net/opal/pkg-comment b/net/opal/pkg-comment
deleted file mode 100644
index cef461a24fb2..000000000000
--- a/net/opal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A H323 Video Conferencing library, used with OhPhone
diff --git a/net/opal/pkg-descr b/net/opal/pkg-descr
deleted file mode 100644
index 6a835b6f0f33..000000000000
--- a/net/opal/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-OpenH323 is a multi-platform H323 Video Conferencing library.
-
-This can be used to make H323 Video Conferencing applications
-and the port produces a sample application called simph323.
-
-However, a fully featured H323 client, including Video
-as well as Audio can be found in the OhPhone Port.
-
-Simph323 and OhPhone can exchange full duplex audio with other H323
-compliant video conferencing programs including Microsoft NetMeeting.
-OhPhone adds full Video support.
-
-The OpenH323 library makes use of PWLib. http://www.equival.com
-PWLib is a multi-platform code library that can be used to write
-applications that will compile and run on the BSD Unixes, Windows, Linux
-and a few other Unix variants. It was developed by Equivalence Ltd Pty.
-
-WWW: http://www.openh323.org
diff --git a/net/opal/pkg-plist b/net/opal/pkg-plist
deleted file mode 100644
index 910567db261b..000000000000
--- a/net/opal/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/simph323
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
deleted file mode 100644
index 0c98ff52fe45..000000000000
--- a/net/opal3/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	openh323
-# Date created:		Thu Feb 17 15:00:48 GMT 2000
-# Whom:			Roger Hardiman <roger@freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openh323
-PORTVERSION=	1.1
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.1.tar.gz \
-		pwlib_min_1.1pl18.tar.gz
-
-MAINTAINER=	roger@freebsd.org
-
-WRKSRC=         ${WRKDIR}/${PORTNAME}
-
-USE_NEWGCC=	yes
-USE_BISON=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-ALL_TARGET=	opt
-MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib \
-		OPENH323DIR=${WRKDIR}/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/net/opal3/distinfo b/net/opal3/distinfo
deleted file mode 100644
index 7a6a56e421d9..000000000000
--- a/net/opal3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openh323_1.1.tar.gz) = 51fe78bc7a0da3422479263106b4d95a
-MD5 (pwlib_min_1.1pl18.tar.gz) = c4c88ce65cca72ce5d9cfea36205e7a4
diff --git a/net/opal3/files/patch-aa b/net/opal3/files/patch-aa
deleted file mode 100644
index cf262107575c..000000000000
--- a/net/opal3/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-*** ../pwlib/src/ptlib/unix/tlibthrd.cxx.orig	Thu Nov 16 11:14:48 2000
---- ../pwlib/src/ptlib/unix/tlibthrd.cxx	Thu Nov 16 11:15:21 2000
-*************** void PThread::PX_NewThread(BOOL startSus
-*** 386,391 ****
---- 386,409 ----
-  //  pthread_attr_t threadAttr;
-  //  pthread_attr_init(&threadAttr);
-    PAssertOS(pthread_create(&PX_threadId, NULL, PX_ThreadStart, this) == 0);
-+ 
-+ #if defined(P_FREEBSD)
-+   // There is a potential race condition here which shows up with FreeBSD 4.2
-+   // and later, but really applies to all pthread libraries.
-+   // If a thread is started in suspend mode, we need to make sure
-+   // the thread (PX_ThreadStart) has had a chance to execute and block on the
-+   // sigwait() (blocking on the Resume Signal) before this function returns.
-+   // Otherwise the main program may issue a Resume Signal on the thread
-+   // by calling PThread::Resume() before the thread is ready for it.
-+   // If that happens the program will abort with an unhandled signal error.
-+   // A workaround (not 100% guaranteed) is to yield here, which gives
-+   // the newly created thread (PX_ThreadStart) a chance to execute.
-+  
-+   if (startSuspended) {
-+     sched_yield();
-+   }
-+ #endif
-+ 
-  }
-  
-  
diff --git a/net/opal3/pkg-comment b/net/opal3/pkg-comment
deleted file mode 100644
index cef461a24fb2..000000000000
--- a/net/opal3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A H323 Video Conferencing library, used with OhPhone
diff --git a/net/opal3/pkg-descr b/net/opal3/pkg-descr
deleted file mode 100644
index 6a835b6f0f33..000000000000
--- a/net/opal3/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-OpenH323 is a multi-platform H323 Video Conferencing library.
-
-This can be used to make H323 Video Conferencing applications
-and the port produces a sample application called simph323.
-
-However, a fully featured H323 client, including Video
-as well as Audio can be found in the OhPhone Port.
-
-Simph323 and OhPhone can exchange full duplex audio with other H323
-compliant video conferencing programs including Microsoft NetMeeting.
-OhPhone adds full Video support.
-
-The OpenH323 library makes use of PWLib. http://www.equival.com
-PWLib is a multi-platform code library that can be used to write
-applications that will compile and run on the BSD Unixes, Windows, Linux
-and a few other Unix variants. It was developed by Equivalence Ltd Pty.
-
-WWW: http://www.openh323.org
diff --git a/net/opal3/pkg-plist b/net/opal3/pkg-plist
deleted file mode 100644
index 910567db261b..000000000000
--- a/net/opal3/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/simph323
diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile
deleted file mode 100644
index 0c98ff52fe45..000000000000
--- a/net/openh323-112/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	openh323
-# Date created:		Thu Feb 17 15:00:48 GMT 2000
-# Whom:			Roger Hardiman <roger@freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openh323
-PORTVERSION=	1.1
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.1.tar.gz \
-		pwlib_min_1.1pl18.tar.gz
-
-MAINTAINER=	roger@freebsd.org
-
-WRKSRC=         ${WRKDIR}/${PORTNAME}
-
-USE_NEWGCC=	yes
-USE_BISON=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-ALL_TARGET=	opt
-MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib \
-		OPENH323DIR=${WRKDIR}/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/net/openh323-112/distinfo b/net/openh323-112/distinfo
deleted file mode 100644
index 7a6a56e421d9..000000000000
--- a/net/openh323-112/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openh323_1.1.tar.gz) = 51fe78bc7a0da3422479263106b4d95a
-MD5 (pwlib_min_1.1pl18.tar.gz) = c4c88ce65cca72ce5d9cfea36205e7a4
diff --git a/net/openh323-112/files/patch-aa b/net/openh323-112/files/patch-aa
deleted file mode 100644
index cf262107575c..000000000000
--- a/net/openh323-112/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-*** ../pwlib/src/ptlib/unix/tlibthrd.cxx.orig	Thu Nov 16 11:14:48 2000
---- ../pwlib/src/ptlib/unix/tlibthrd.cxx	Thu Nov 16 11:15:21 2000
-*************** void PThread::PX_NewThread(BOOL startSus
-*** 386,391 ****
---- 386,409 ----
-  //  pthread_attr_t threadAttr;
-  //  pthread_attr_init(&threadAttr);
-    PAssertOS(pthread_create(&PX_threadId, NULL, PX_ThreadStart, this) == 0);
-+ 
-+ #if defined(P_FREEBSD)
-+   // There is a potential race condition here which shows up with FreeBSD 4.2
-+   // and later, but really applies to all pthread libraries.
-+   // If a thread is started in suspend mode, we need to make sure
-+   // the thread (PX_ThreadStart) has had a chance to execute and block on the
-+   // sigwait() (blocking on the Resume Signal) before this function returns.
-+   // Otherwise the main program may issue a Resume Signal on the thread
-+   // by calling PThread::Resume() before the thread is ready for it.
-+   // If that happens the program will abort with an unhandled signal error.
-+   // A workaround (not 100% guaranteed) is to yield here, which gives
-+   // the newly created thread (PX_ThreadStart) a chance to execute.
-+  
-+   if (startSuspended) {
-+     sched_yield();
-+   }
-+ #endif
-+ 
-  }
-  
-  
diff --git a/net/openh323-112/pkg-comment b/net/openh323-112/pkg-comment
deleted file mode 100644
index cef461a24fb2..000000000000
--- a/net/openh323-112/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A H323 Video Conferencing library, used with OhPhone
diff --git a/net/openh323-112/pkg-descr b/net/openh323-112/pkg-descr
deleted file mode 100644
index 6a835b6f0f33..000000000000
--- a/net/openh323-112/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-OpenH323 is a multi-platform H323 Video Conferencing library.
-
-This can be used to make H323 Video Conferencing applications
-and the port produces a sample application called simph323.
-
-However, a fully featured H323 client, including Video
-as well as Audio can be found in the OhPhone Port.
-
-Simph323 and OhPhone can exchange full duplex audio with other H323
-compliant video conferencing programs including Microsoft NetMeeting.
-OhPhone adds full Video support.
-
-The OpenH323 library makes use of PWLib. http://www.equival.com
-PWLib is a multi-platform code library that can be used to write
-applications that will compile and run on the BSD Unixes, Windows, Linux
-and a few other Unix variants. It was developed by Equivalence Ltd Pty.
-
-WWW: http://www.openh323.org
diff --git a/net/openh323-112/pkg-plist b/net/openh323-112/pkg-plist
deleted file mode 100644
index 910567db261b..000000000000
--- a/net/openh323-112/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/simph323
diff --git a/net/openldap12/Makefile b/net/openldap12/Makefile
deleted file mode 100644
index 5cdce9acb1a8..000000000000
--- a/net/openldap12/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 1.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	1.2.11
-PORTREVISION=	1
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	lodea@vet.com.au
-
-USE_LIBTOOL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/run \
-		--enable-shared \
-		--enable-dns
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db/
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 -D_THREAD_SAFE" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd \
-		sbin/centipede \
-		sbin/ldbmcat \
-		sbin/ldbmtest \
-		sbin/ldif \
-		sbin/ldif2id2children \
-		sbin/ldif2id2entry \
-		sbin/ldif2index \
-		sbin/ldif2ldbm
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-pre-build:
-	cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	strip ${PREFIX}/${f}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap12/distinfo b/net/openldap12/distinfo
deleted file mode 100644
index bb58893239f9..000000000000
--- a/net/openldap12/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-1.2.11.tgz) = ac469c0fe66ece3893e96182f14b7886
diff --git a/net/openldap12/files/manpages b/net/openldap12/files/manpages
deleted file mode 100644
index f36399dbc70a..000000000000
--- a/net/openldap12/files/manpages
+++ /dev/null
@@ -1,165 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	cldap_close.3
-MAN3+=	cldap_open.3
-MAN3+=	cldap_search_s.3
-MAN3+=	cldap_setretryinfo.3
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_charset.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	centipede.8
-MAN8+=	chlog2replog.8
-MAN8+=	edb2ldif.8
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	ldapd.8
-MAN8+=	ldbmcat.8
-MAN8+=	ldif.8
-MAN8+=	ldif2ldbm.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapd.8
-MAN8+=	slurpd.8
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap12/files/patch-aa b/net/openldap12/files/patch-aa
deleted file mode 100644
index 22b7d8d94a70..000000000000
--- a/net/openldap12/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/lib-shared.mk~	Thu May 25 22:46:57 2000
-+++ build/lib-shared.mk	Thu May 25 22:50:24 2000
-@@ -20,5 +20,9 @@
- 	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
- 	$(RM) ../`$(BASENAME) $@ .la`.a;	\
- 	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.a; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
-+	# If we want our binaries to link dynamically with libldap{,_r} liblber...
-+	# We also symlink the .so.# so we can run the tests without installing
-+	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.so; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
-+	(d=`$(PWD)`; b=`$(BASENAME) $@ .la`; t=`ls $$d/.libs/$$b.so.?`; $(LN_S) `$(BASENAME) $$d`/.libs/`$(BASENAME) $$t` ../`$(BASENAME) $$t`)
- 
- Makefile: $(top_srcdir)/build/lib-shared.mk
diff --git a/net/openldap12/files/patch-ab b/net/openldap12/files/patch-ab
deleted file mode 100644
index 0e6d89b746e0..000000000000
--- a/net/openldap12/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- tests/scripts/defines.sh~	Wed May 26 02:06:42 1999
-+++ tests/scripts/defines.sh	Thu May 25 22:53:23 2000
-@@ -53,3 +53,5 @@
- ACLOUTMASTER=$DATADIR/acl.out.master
- REPLOUTMASTER=$DATADIR/repl.out.master
- MODSRCHFILTERS=$DATADIR/modify.search.filters
-+# Just in case we linked the binaries dynamically
-+export LD_LIBRARY_PATH=`pwd`/../libraries
diff --git a/net/openldap12/files/patch-ac b/net/openldap12/files/patch-ac
deleted file mode 100644
index e491cbc8c38d..000000000000
--- a/net/openldap12/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/lib.mk~	Thu Jan  7 18:36:30 1999
-+++ build/lib.mk	Thu May 25 22:58:26 2000
-@@ -27,7 +27,8 @@
- clean-common: 	FORCE
- 	$(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \
- 		$(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \
--		*.o *.lo a.out core version.c .libs/*
-+		*.o *.lo a.out core version.c .libs/* \
-+		../`$(BASENAME) $(LIBRARY) .la`.so*
- 
- depend-common: FORCE
- 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS)
diff --git a/net/openldap12/files/patch-ae b/net/openldap12/files/patch-ae
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap12/files/patch-ae
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap12/files/patch-db b/net/openldap12/files/patch-db
deleted file mode 100644
index 9acf8388246d..000000000000
--- a/net/openldap12/files/patch-db
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Fri Jun  9 13:16:04 2000
-+++ configure	Tue Jul  4 15:59:42 2000
-@@ -6170,14 +6170,14 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   	ol_LIBS="$LIBS"
--	echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6
--echo "configure:6175: checking for db_open in -ldb" >&5
-+	echo $ac_n "checking for db_open in -ldb2""... $ac_c" 1>&6
-+echo "configure:6175: checking for db_open in -ldb2" >&5
- ac_lib_var=`echo db'_'db_open | sed 'y%./+-:%__p__%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb2  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6183 "configure"
- #include "confdefs.h"
-@@ -6205,7 +6205,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ol_cv_lib_db2=-ldb
-+  ol_cv_lib_db2=-ldb2
- else
-   echo "$ac_t""no" 1>&6
- ol_cv_lib_db2=no
diff --git a/net/openldap12/files/slapd.sh b/net/openldap12/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap12/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap12/pkg-comment b/net/openldap12/pkg-comment
deleted file mode 100644
index 8c499c3923cf..000000000000
--- a/net/openldap12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open source LDAP client and server software
diff --git a/net/openldap12/pkg-descr b/net/openldap12/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap12/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap12/pkg-plist b/net/openldap12/pkg-plist
deleted file mode 100644
index 692835f547df..000000000000
--- a/net/openldap12/pkg-plist
+++ /dev/null
@@ -1,63 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
-etc/openldap/slapd.at.conf.default
-@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
-@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
-@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
-@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
-etc/openldap/slapd.oc.conf.default
-@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/ldap.h
-include/ldap_cdefs.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.1
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.1
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/centipede
-sbin/ldbmcat
-sbin/ldbmtest
-sbin/ldif
-sbin/ldif2id2children
-sbin/ldif2id2entry
-sbin/ldif2index
-sbin/ldif2ldbm
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
deleted file mode 100644
index 984b1a7d60fb..000000000000
--- a/net/openldap20-server/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 2.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	2.0.6
-PORTREVISION=	2
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-USE_OPENSSL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/run \
-		--with-threads \
-		--enable-shared \
-		--enable-dnssrv \
-		--with-tls=openssl
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
-.endif
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/maildap \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-post-configure:
-	cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff
-
-pre-build:
-	cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	strip ${PREFIX}/${f}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap20-server/distinfo b/net/openldap20-server/distinfo
deleted file mode 100644
index 8a9668d4e077..000000000000
--- a/net/openldap20-server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-2.0.6.tgz) = 6df0ebc7da308999146102f950ecdaed
diff --git a/net/openldap20-server/files/libtool.diff b/net/openldap20-server/files/libtool.diff
deleted file mode 100644
index 0cf57bbee7ea..000000000000
--- a/net/openldap20-server/files/libtool.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libtool.orig	Tue Oct 31 01:43:06 2000
-+++ libtool	Tue Oct 31 01:44:42 2000
-@@ -448,6 +448,16 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --only-shared)
-+    build_libtool_libs=yes
-+    build_old_libs=no
-+    ;;
-+
-+  --only-static)
-+    build_libtool_libs=no
-+    build_old_libs=yes
-+    ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
diff --git a/net/openldap20-server/files/manpages b/net/openldap20-server/files/manpages
deleted file mode 100644
index 1c39b81911fc..000000000000
--- a/net/openldap20-server/files/manpages
+++ /dev/null
@@ -1,219 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	lber-memory.3
-MAN3+=	lber-types.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_schema.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapadd.8
-MAN8+=	slapcat.8
-MAN8+=	slapd.8
-MAN8+=	slapindex.8
-MAN8+=	slappasswd.8
-MAN8+=	slurpd.8
-MLINKS+=	lber-decode.3 ber_first_element.3
-MLINKS+=	lber-decode.3 ber_get_bitstring.3
-MLINKS+=	lber-decode.3 ber_get_boolean.3
-MLINKS+=	lber-decode.3 ber_get_enum.3
-MLINKS+=	lber-decode.3 ber_get_int.3
-MLINKS+=	lber-decode.3 ber_get_next.3
-MLINKS+=	lber-decode.3 ber_get_null.3
-MLINKS+=	lber-decode.3 ber_get_stringa.3
-MLINKS+=	lber-decode.3 ber_get_stringb.3
-MLINKS+=	lber-decode.3 ber_next_element.3
-MLINKS+=	lber-decode.3 ber_peek_tag.3
-MLINKS+=	lber-decode.3 ber_scanf.3
-MLINKS+=	lber-decode.3 ber_skip_tag.3
-MLINKS+=	lber-encode.3 ber_alloc_t.3
-MLINKS+=	lber-encode.3 ber_flush.3
-MLINKS+=	lber-encode.3 ber_printf.3
-MLINKS+=	lber-encode.3 ber_put_enum.3
-MLINKS+=	lber-encode.3 ber_put_int.3
-MLINKS+=	lber-encode.3 ber_put_null.3
-MLINKS+=	lber-encode.3 ber_put_ostring.3
-MLINKS+=	lber-encode.3 ber_put_seq.3
-MLINKS+=	lber-encode.3 ber_put_set.3
-MLINKS+=	lber-encode.3 ber_put_string.3
-MLINKS+=	lber-decode.3 ber_start_set.3
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_abandon_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext_s.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_rdn.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext_s.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_result.3 ldap_msgid.3
-MLINKS+=	ldap_result.3 ldap_msgtype.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2name.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2str.3
-MLINKS+=	ldap_schema.3 ldap_attributetype_free.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2name.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2str.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule_free.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2name.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2str.3
-MLINKS+=	ldap_schema.3 ldap_objectclass_free.3
-MLINKS+=	ldap_schema.3 ldap_scherr2str.3
-MLINKS+=	ldap_schema.3 ldap_str2attributetype.3
-MLINKS+=	ldap_schema.3 ldap_str2matchingrule.3
-MLINKS+=	ldap_schema.3 ldap_str2objectclass.3
-MLINKS+=	ldap_schema.3 ldap_str2syntax.3
-MLINKS+=	ldap_schema.3 ldap_syntax2name.3
-MLINKS+=	ldap_schema.3 ldap_syntax2str.3
-MLINKS+=	ldap_schema.3 ldap_syntax_free.3
-MLINKS+=	ldap_search.3 ldap_search_ext.3
-MLINKS+=	ldap_search.3 ldap_search_ext_s.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap20-server/files/patch-clients_ud_Makefile.in b/net/openldap20-server/files/patch-clients_ud_Makefile.in
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap20-server/files/patch-clients_ud_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap20-server/files/patch-servers_slapd_daemon.c b/net/openldap20-server/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 44baead6a6b7..000000000000
--- a/net/openldap20-server/files/patch-servers_slapd_daemon.c
+++ /dev/null
@@ -1,828 +0,0 @@
---- servers/slapd/daemon.c.orig	Sat Sep 30 11:24:28 2000
-+++ servers/slapd/daemon.c	Tue Oct 31 10:54:09 2000
-@@ -1,4 +1,4 @@
--/* $OpenLDAP: pkg/ldap/servers/slapd/daemon.c,v 1.99.2.12 2000/09/30 16:24:28 kurt Exp $ */
-+/* $OpenLDAP: servers/slapd/daemon.c,v 1.99.2.13 2000/10/30 18:14:51 kurt Exp $ */
- /*
-  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-@@ -59,6 +59,8 @@
- 
- Listener **slap_listeners = NULL;
- 
-+#define SLAPD_LISTEN 10
-+
- static ber_socket_t wake_sds[2];
- 
- #ifdef NO_THREADS
-@@ -81,8 +83,6 @@
- #endif
- volatile sig_atomic_t slapd_shutdown = 0;
- 
--static ldap_pvt_thread_t	listener_tid;
--
- static struct slap_daemon {
- 	ldap_pvt_thread_mutex_t	sd_mutex;
- 
-@@ -193,20 +193,207 @@
- 	tcp_close(s);
- }
- 
-+static void slap_free_listener_addresses(struct sockaddr **sal)
-+{
-+	struct sockaddr **sap;
-+
-+	if (sal == NULL) {
-+		return;
-+	}
-+
-+	for (sap = sal; *sap != NULL; sap++) {
-+		ch_free(*sap);
-+	}
-+
-+	ch_free(sal);
-+}
-+
-+/* port = 0 indicates AF_LOCAL */
-+static int slap_get_listener_addresses(
-+	const char *host,
-+	unsigned short port,
-+	struct sockaddr ***sal)
-+{
-+	struct sockaddr **sap;
-+#ifdef HAVE_GETADDRINFO
-+	struct addrinfo hints, *res, *sai;
-+	int n, err;
-+	
-+	memset( &hints, '\0', sizeof(hints) );
-+	hints.ai_flags = AI_PASSIVE;
-+	hints.ai_socktype = SOCK_STREAM;
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		hints.ai_family = AF_LOCAL;
-+		/* host specifies a service in this case */
-+		if (err = getaddrinfo(NULL, host, &hints, &res)) {
-+			if (err == EAI_FAMILY) {
-+				/* XXX Fake it */
-+				struct sockaddr_un *sun = calloc(1, sizeof(struct sockaddr_un));
-+				err = 0;
-+				res = calloc(1, sizeof(*res));
-+				assert(sun != NULL);
-+				assert(res != NULL);
-+				res->ai_flags = hints.ai_flags;
-+				res->ai_family = AF_LOCAL;
-+				res->ai_socktype = hints.ai_socktype;
-+				res->ai_addr = (struct sockaddr *)sun;
-+				res->ai_addrlen = sizeof(*sun);
-+				sun->sun_len = strlen(LDAPI_SOCK) + 1;
-+				sun->sun_family = AF_LOCAL;
-+				strcpy(sun->sun_path, LDAPI_SOCK);
-+			} else {
-+				Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				    gai_strerror(err), 0, 0);
-+				return -1;
-+			}
-+		}
-+	} else
-+#  endif
-+	{		
-+		char serv[7];
-+	
-+		snprintf(serv, sizeof serv, "%d", port);
-+		hints.ai_family = AF_UNSPEC;
-+		if (err = getaddrinfo(host, serv, &hints, &res)) {
-+			Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				gai_strerror(err), 0, 0);
-+			return -1;
-+		}
-+	}
-+
-+	sai = res;
-+	for (n=2; (sai = sai->ai_next) != NULL; n++) {
-+		/* EMPTY */ ;
-+	}
-+	*sal = ch_malloc(n * sizeof(*sal));
-+	if (*sal == NULL) {
-+		return -1;
-+	}
-+
-+	sai = res;
-+	sap = *sal;
-+	do {
-+		switch (sai->ai_family) {
-+#  ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_un));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_un *)*sap =
-+				*((struct sockaddr_un *)sai->ai_addr);
-+		} break;
-+#  endif
-+#  ifdef LDAP_PF_INET6			
-+		case AF_INET6: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in6));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in6 *)*sap =
-+				*((struct sockaddr_in6 *)sai->ai_addr);
-+		} break;
-+#  endif
-+		case AF_INET: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in *)*sap =
-+				*((struct sockaddr_in *)sai->ai_addr);
-+		} break;
-+		default: 
-+			*sap = NULL;
-+			break;
-+		}
-+		if (*sap != NULL) {
-+			(*sap)->sa_family = sai->ai_family;
-+			sap++;
-+		}
-+	} while ((sai = sai->ai_next) != NULL);
-+
-+	freeaddrinfo(res);
-+
-+#else
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_un));
-+		if (*sap == NULL)
-+			goto errexit;
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
-+		(*sap)->sa_family = AF_LOCAL;
-+		if ( strlen(host) >
-+		     (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: domain socket path (%s) too long in URL",
-+			       host, 0, 0);
-+			goto errexit;
-+		}
-+		strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
-+	} else
-+#  endif		
-+	{
-+		struct in_addr in;
-+
-+		if ( host == NULL ) {
-+			in.s_addr = htonl(INADDR_ANY);
-+
-+		} else if ( !inet_aton( host, &in ) ) {
-+			struct hostent *he = gethostbyname( host );
-+			if( he == NULL ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "daemon: invalid host %s", host, 0, 0);
-+				return -1;
-+			}
-+			AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
-+		}
-+
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_in));
-+		if (*sap == NULL) {
-+			goto errexit;
-+		}
-+
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
-+		(*sap)->sa_family = AF_INET;
-+		((struct sockaddr_in *)*sap)->sin_port = htons(port);
-+		((struct sockaddr_in *)*sap)->sin_addr = in;
-+	}
-+	sap++;
-+#endif
-+
-+	*sap = NULL;
-+	return 0;
-+
-+errexit:
-+	slap_free_listener_addresses(*sal);
-+	return -1;
-+}
- 
--static Listener * open_listener( const char* url )
-+static Listener * slap_open_listener(
-+	const char* url )
- {
- 	int	tmp, rc;
- 	Listener l;
- 	Listener *li;
- 	LDAPURLDesc *lud;
--	char *s;
--	int port;
--#ifdef HAVE_GETADDRINFO
--	char serv[7];
--	struct addrinfo hints, *res, *sai;
--	int err;
--#endif
-+	unsigned short port;
-+	int err, addrlen;
-+	struct sockaddr **sal, **psal;
- 
- 	rc = ldap_url_parse( url, &lud );
- 
-@@ -238,291 +425,171 @@
- 	}
- #endif
- 
--#ifdef HAVE_GETADDRINFO
--	memset( &hints, '\0', sizeof(hints) );
--	hints.ai_flags = AI_PASSIVE;
--	hints.ai_family = AF_UNSPEC;
--	hints.ai_socktype = SOCK_STREAM;
--
--#  ifdef LDAP_PF_LOCAL
-+	port = (unsigned short) lud->lud_port;
-+	
- 	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifdef LDAP_PF_LOCAL
- 		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			err = getaddrinfo(NULL, LDAPI_SOCK, &hints, &res);
--			if (!err)
--				unlink( LDAPI_SOCK );
-+			err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
- 		} else {
--			err = getaddrinfo(NULL, lud->lud_host, &hints, &res);
--			if (!err)
--				unlink( lud->lud_host );
-+			err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
- 		}
--	} else
--#  endif /* LDAP_PF_LOCAL */
--	{
--		snprintf(serv, sizeof serv, "%d", lud->lud_port);
-+#else
-+		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
-+			url, 0, 0);
-+		ldap_free_urldesc( lud );
-+		return NULL;
-+#endif
-+	} else {
- 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
- 			|| strcmp(lud->lud_host, "*") == 0 )
- 		{
--			err = getaddrinfo(NULL, serv, &hints, &res);
-+			err = slap_get_listener_addresses(NULL, port, &sal);
- 		} else {
--			err = getaddrinfo(lud->lud_host, serv, &hints, &res);
-+			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
- 		}
- 	}
- 
-+	ldap_free_urldesc( lud );
- 	if ( err ) {
--		Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed\n", 0, 0, 0);
--		ldap_free_urldesc( lud );
- 		return NULL;
- 	}
- 
--	ldap_free_urldesc( lud );
--	sai = res;
--	do {
--		if ( (sai->ai_family != AF_INET)
--#  ifdef LDAP_PF_INET6
--		     && (sai->ai_family != AF_INET6)
--#  endif
--#  ifdef LDAP_PF_LOCAL
--		     && (sai->ai_family != AF_LOCAL)
--#  endif
--		     )
-+	psal = sal;
-+	while ( *sal != NULL ) {
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+#endif
-+#ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL:
-+#endif
-+			break;
-+		default:
-+			sal++;
- 			continue;
--		l.sl_sd = socket( sai->ai_family, sai->ai_socktype, sai->ai_protocol);
-+		}
-+		l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
- 		if ( l.sl_sd == AC_SOCKET_INVALID ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: socket() failed errno=%d (%s)\n", err,
- 				sock_errstr(err), 0 );
-+			sal++;
- 			continue;
- 		}
--
--		if ( sai->ai_family != AF_LOCAL ) {
--#else
--
--	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifndef HAVE_WINSOCK
-+		if ( l.sl_sd >= dtblsize ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: listener descriptor %ld is too great %ld\n",
-+			       (long) l.sl_sd, (long) dtblsize, 0 );
-+			tcp_close( l.sl_sd );
-+			sal++;
-+			continue;
-+		}
-+#endif
- #ifdef LDAP_PF_LOCAL
--		port = 0;
--		(void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );
--
--		l.sl_sa.sa_un_addr.sun_family = AF_LOCAL;
--
--		/* hack: overload the host to be the path */
--		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			strcpy( l.sl_sa.sa_un_addr.sun_path, LDAPI_SOCK );
--		} else {
--			if ( strlen(lud->lud_host) > (sizeof(l.sl_sa.sa_un_addr.sun_path) - 1) ) {
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: domain socket path (%s) too long in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
--			}
--			strcpy( l.sl_sa.sa_un_addr.sun_path, lud->lud_host );
--		}
--		unlink( l.sl_sa.sa_un_addr.sun_path ); 
--#if 0
--		/* I don't think we need to set this. */
--		l.sl_sa.sa_un_addr.sun_len = sizeof( l.sl_sa.sa_un_addr.sun_len ) +
--			sizeof( l.sl_sa.sa_un_addr.sun_family ) +
--			strlen( l.sl_sa.sa_un_addr.sun_path ) + 1;
-+		if ( (*sal)->sa_family == AF_LOCAL ) {
-+			unlink ( ((struct sockaddr_un *)*sal)->sun_path );
-+		} else
- #endif
--#else
--		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
--			url, 0, 0);
--		ldap_free_urldesc( lud );
--		return NULL;
--#endif /* LDAP_PF_LOCAL */
--	} else {
--
--	port = lud->lud_port;
--
--	(void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
--
--	l.sl_addr.sin_family = AF_INET;
--	l.sl_addr.sin_port = htons( (unsigned short) lud->lud_port );
--
--	if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
--		|| strcmp(lud->lud_host, "*") == 0 )
--	{
--		l.sl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
--
--	} else {
--		/* host or address was specified */
--		if( !inet_aton( lud->lud_host, &l.sl_addr.sin_addr ) ) {
--			struct hostent *he = gethostbyname( lud->lud_host );
--			if( he == NULL ) {
-+		{
-+#ifdef SO_REUSEADDR
-+			/* enable address reuse */
-+			tmp = 1;
-+			rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
-+					 (char *) &tmp, sizeof(tmp) );
-+			if ( rc == AC_SOCKET_ERROR ) {
-+				int err = sock_errno();
- 				Debug( LDAP_DEBUG_ANY,
--					"daemon: invalid host (%s) in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
-+				       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
-+				       (long) l.sl_sd, err, sock_errstr(err) );
- 			}
--
--			AC_MEMCPY( &l.sl_addr.sin_addr, he->h_addr,
--			       sizeof( l.sl_addr.sin_addr ) );
-+#endif
- 		}
--	}
--	}
--
--	ldap_free_urldesc( lud );
--
--	l.sl_sd = socket( l.sl_sa.sa_addr.sa_family, SOCK_STREAM, 0 );
--	if ( l.sl_sd == AC_SOCKET_INVALID ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: socket() failed errno=%d (%s)\n", err,
--			sock_errstr(err), 0 );
--		return NULL;
--	}
--
--#ifndef HAVE_WINSOCK
--	if ( l.sl_sd >= dtblsize ) {
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: listener descriptor %ld is too great %ld\n",
--			(long) l.sl_sd, (long) dtblsize, 0 );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
-+	
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+			addrlen = sizeof(struct sockaddr_in);
-+			break;
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+			addrlen = sizeof(struct sockaddr_in6);
-+			break;
- #endif
--
- #ifdef LDAP_PF_LOCAL
--	/* for IPv4 and IPv6 sockets only */
--	if ( l.sl_sa.sa_addr.sa_family != AF_LOCAL ) {
--#endif /* LDAP_PF_LOCAL */
--#endif /* HAVE_GETADDRINFO */
--
--#ifdef SO_REUSEADDR
--	/* enable address reuse */
--	tmp = 1;
--	rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
--		(char *) &tmp, sizeof(tmp) );
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--	       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--	}
-+		case AF_LOCAL:
-+			addrlen = sizeof(struct sockaddr_un);
-+			break;
- #endif
--
--#ifdef HAVE_GETADDRINFO
--		} /* sai->ai_family != AF_LOCAL */
--		if (!bind(l.sl_sd, sai->ai_addr, sai->ai_addrlen))
-+		}
-+	
-+		if (!bind(l.sl_sd, *sal, addrlen))
- 			break;
- 		err = sock_errno();
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--			(long) l.sl_sd, err, sock_errstr(err) );
-+		       (long) l.sl_sd, err, sock_errstr(err) );
- 		tcp_close( l.sl_sd );
--	} while ((sai = sai->ai_next) != NULL);
-+		sal++;
-+	} /* while ( *sal != NULL ) */
- 
--	if (!sai) {
-+	if ( *sal == NULL ) {
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
- 			(long) l.sl_sd, 0, 0 );
-+		slap_free_listener_addresses(psal);
- 		return NULL;
- 	}
- 
--	switch ( sai->ai_family ) {
--#  ifdef LDAP_PF_LOCAL
--	case AF_LOCAL:
--		if ( chmod( (char *)sai->ai_addr, S_IRWXU ) < 0 ) {
-+	switch ( (*sal)->sa_family ) {
-+#ifdef LDAP_PF_LOCAL
-+	case AF_LOCAL: {
-+		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-+		if ( chmod( addr, S_IRWXU ) < 0 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
--				(long) l.sl_sd, err, sock_errstr(err) );
-+			       (long) l.sl_sd, err, sock_errstr(err) );
- 			tcp_close( l.sl_sd );
-+			slap_free_listener_addresses(psal);
- 			return NULL;
- 		}
--		l.sl_name = ch_malloc( strlen((char *)sai->ai_addr) + sizeof("PATH=") );
--		sprintf( l.sl_name, "PATH=%s", sai->ai_addr );
--		break;
--#  endif /* LDAP_PF_LOCAL */
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
-+		sprintf( l.sl_name, "PATH=%s", addr );
-+	} break;
-+#endif /* LDAP_PF_LOCAL */
- 
- 	case AF_INET: {
-+		char *s;
-+#ifdef HAVE_GETADDRINFO		
- 		char addr[INET_ADDRSTRLEN];
--		inet_ntop( AF_INET,
--			&((struct sockaddr_in *)sai->ai_addr)->sin_addr,
--			addr, sizeof(addr) );
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP=:") );
--		sprintf( l.sl_name, "IP=%s:%s", addr, serv );
-+		inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
-+			   addr, sizeof(addr) );
-+		s = addr;
-+#else
-+		s = inet_ntoa( l.sl_addr.sin_addr );
-+#endif		
-+		l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
-+		sprintf( l.sl_name, "IP=%s:%d",
-+			 s != NULL ? s : "unknown" , port );
- 	} break;
- 
--#  ifdef LDAP_PF_INET6
-+#ifdef LDAP_PF_INET6
- 	case AF_INET6: {
- 		char addr[INET6_ADDRSTRLEN];
--		inet_ntop( AF_INET6,
--			&((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr,
--			addr, sizeof addr);
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP= ") );
--		sprintf( l.sl_name, "IP=%s %s", addr, serv );
-+		inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
-+			   addr, sizeof addr);
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
-+		sprintf( l.sl_name, "IP=%s %d", addr, port );
- 	} break;
--#  endif /* LDAP_PF_INET6 */
-+#endif /* LDAP_PF_INET6 */
- 
- 	default:
- 		Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
--			(int) sai->ai_family, 0, 0 );
-+			(int) (*sal)->sa_family, 0, 0 );
- 		break;
- 	}
--#else
--#ifdef LDAP_PF_LOCAL
--	/* close conditional */
--	}
--#endif /* LDAP_PF_LOCAL */
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_un_addr) );
--			break;
--#endif
--
--		case AF_INET:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_in_addr) );
--			break;
- 
--		default:
--			rc = AC_SOCKET_ERROR;
--			errno = EINVAL;
--			break;
--	}
--
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			if ( chmod( l.sl_sa.sa_un_addr.sun_path, S_IRWXU ) < 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: chmod(%ld) failed errno=%d (%s)",
--					(long) l.sl_sd, err, sock_errstr(err) );
--				tcp_close( l.sl_sd );
--				return NULL;
--			}
--
--			l.sl_name = ch_malloc( strlen(l.sl_sa.sa_un_addr.sun_path)
--				+ sizeof("PATH=") );
--			sprintf( l.sl_name, "PATH=%s", l.sl_sa.sa_un_addr.sun_path );
--			break;
--#endif /* LDAP_PF_LOCAL */
--
--		case AF_INET:
--			l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
--			s = inet_ntoa( l.sl_addr.sin_addr );
--			sprintf( l.sl_name, "IP=%s:%d",
--				s != NULL ? s : "unknown" , port );
--			break;
--
--		default:
--			l.sl_name = ch_strdup( "UNKNOWN" );
--			break;
--	}
--
--#endif /* HAVE_GETADDRINFO */
-+	slap_free_listener_addresses(psal);
- 
- 	l.sl_url = ch_strdup( url );
- 	li = ch_malloc( sizeof( Listener ) );
-@@ -608,7 +675,7 @@
- 	slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
- 
- 	for(i = 0; u[i] != NULL; i++ ) {
--		slap_listeners[i] = open_listener( u[i] );
-+		slap_listeners[i] = slap_open_listener( u[i] );
- 
- 		if( slap_listeners[i] == NULL ) {
- 			charray_free( u );
-@@ -642,7 +709,6 @@
- 	void *ptr
- )
- {
--	int rc, tmp;
- 	int l;
- 	time_t	last_idle_check = slap_get_time();
- 	time( &starttime );
-@@ -651,7 +717,7 @@
- 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
- 			continue;
- 
--		if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
-+		if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: listen(%s, 5) failed errno=%d (%s)\n",
-@@ -814,7 +880,7 @@
- 		}
- 
- 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
--			ber_int_t s;
-+			ber_socket_t s;
- 			socklen_t len = sizeof(from);
- 			long id;
- 			slap_ssf_t ssf = 0;
-@@ -860,31 +926,6 @@
- 			}
- #endif
- 
--#ifdef SO_KEEPALIVE
--			/* enable keep alives */
--			rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
--				(char *) &tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--#ifdef TCP_NODELAY
--			/* enable no delay */
--			tmp = 1;
--			rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
--				(char *)&tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(TCP_NODELAY) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--
--
- #ifdef LDAP_DEBUG
- 			ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- 
-@@ -896,20 +937,44 @@
- 			ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
- #endif
- 
-+#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY )
-+#ifdef LDAP_PF_LOCAL
-+			/* for IPv4 and IPv6 sockets only */
-+			if ( from.sa_addr.sa_family != AF_LOCAL )
-+#endif /* LDAP_PF_LOCAL */
-+			{
-+				int rc;
-+				int tmp;
-+#ifdef SO_KEEPALIVE
-+				/* enable keep alives */
-+				tmp = 1;
-+				rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
-+					(char *) &tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+#ifdef TCP_NODELAY
-+				/* enable no delay */
-+				tmp = 1;
-+				rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
-+					(char *)&tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(TCP_NODELAY) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+			}
-+#endif
-+
- 			Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
- 				(long) s, 0, 0 );
- 
--			len = sizeof(from);
--
--			if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
--					(long) s, err, sock_errstr(err) );
--				slapd_close(s);
--				continue;
--			}
--
- 			switch ( from.sa_addr.sa_family ) {
- #  ifdef LDAP_PF_LOCAL
- 			case AF_LOCAL:
-@@ -948,6 +1013,7 @@
- 				slapd_close(s);
- 				continue;
- 			}
-+
- 			if ( ( from.sa_addr.sa_family == AF_INET ) 
- #ifdef LDAP_PF_INET6
- 				|| ( from.sa_addr.sa_family == AF_INET6 )
-@@ -961,7 +1027,7 @@
- 						sizeof(from.sa_in6_addr.sin6_addr),
- 						AF_INET6 );
- 				else
--#  endif LDAP_PF_INET6
-+#  endif /* LDAP_PF_INET6 */
- 				hp = gethostbyaddr(
- 					(char *) &(from.sa_in_addr.sin_addr),
- 					sizeof(from.sa_in_addr.sin_addr),
-@@ -1202,23 +1268,25 @@
- 	connections_init();
- 
- #define SLAPD_LISTENER_THREAD 1
--#if defined( SLAPD_LISTENER_THREAD ) || !defined(HAVE_PTHREADS)
-+#if defined( SLAPD_LISTENER_THREAD )
-+	{
-+		ldap_pvt_thread_t	listener_tid;
- 
--	/* listener as a separate THREAD */
--	rc = ldap_pvt_thread_create( &listener_tid,
--		0, slapd_daemon_task, NULL );
-+		/* listener as a separate THREAD */
-+		rc = ldap_pvt_thread_create( &listener_tid,
-+			0, slapd_daemon_task, NULL );
- 
--	if ( rc != 0 ) {
--		Debug( LDAP_DEBUG_ANY,
--		    "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
--		return rc;
--	}
-+		if ( rc != 0 ) {
-+			Debug( LDAP_DEBUG_ANY,
-+		    	"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-+			return rc;
-+		}
- 
--	/* wait for the listener thread to complete */
--	ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+		/* wait for the listener thread to complete */
-+		ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+ 	}
- #else
--	/* expermimental code */
--	listener_tid = pthread_self();
-+	/* experimental code */
- 	slapd_daemon_task( NULL );
- #endif
- 
-@@ -1307,4 +1375,9 @@
- 
- 	/* reinstall self */
- 	(void) SIGNAL_REINSTALL( sig, slap_sig_wake );
-+}
-+
-+
-+void slapd_add_internal(ber_socket_t s) {
-+	slapd_add(s);
- }
diff --git a/net/openldap20-server/files/patch-servers_slapd_schema b/net/openldap20-server/files/patch-servers_slapd_schema
deleted file mode 100644
index 31969e8bb621..000000000000
--- a/net/openldap20-server/files/patch-servers_slapd_schema
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/schema/krb5-kdc.schema.orig	Tue Sep  5 13:28:34 2000
-+++ servers/slapd/schema/krb5-kdc.schema	Mon Oct 30 13:09:19 2000
-@@ -96,7 +96,7 @@
- attributetype ( 1.3.6.1.4.1.5322.10.1.10
- 	NAME 'krb5Key'
- 	DESC 'Encoded ASN1 Key as an octet string'
--	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
- 
- attributetype ( 1.3.6.1.4.1.5322.10.1.11
- 	NAME 'krb5PrincipalRealm'
-@@ -112,7 +112,7 @@
- 
- objectclass ( 1.3.6.1.4.1.5322.10.2.1
- 	NAME 'krb5Principal'
--	SUP top
-+	SUP person
- 	AUXILIARY
- 	MUST ( krb5PrincipalName )
- 	MAY ( cn $ krb5PrincipalRealm ) )
diff --git a/net/openldap20-server/files/slapd.sh b/net/openldap20-server/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap20-server/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap20-server/pkg-comment b/net/openldap20-server/pkg-comment
deleted file mode 100644
index 8c499c3923cf..000000000000
--- a/net/openldap20-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open source LDAP client and server software
diff --git a/net/openldap20-server/pkg-descr b/net/openldap20-server/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap20-server/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap20-server/pkg-plist b/net/openldap20-server/pkg-plist
deleted file mode 100644
index 764525594e11..000000000000
--- a/net/openldap20-server/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
-@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ ! -f %B/schema/corba.schema ] && cp %B/%f %B/schema/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ ! -f %B/schema/core.schema ] && cp %B/%f %B/schema/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ ! -f %B/schema/cosine.schema ] && cp %B/%f %B/schema/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ ! -f %B/schema/inetorgperson.schema ] && cp %B/%f %B/schema/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ ! -f %B/schema/java.schema ] && cp %B/%f %B/schema/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ ! -f %B/schema/krb5-kdc.schema ] && cp %B/%f %B/schema/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ ! -f %B/schema/misc.schema ] && cp %B/%f %B/schema/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nadf.schema %D/etc/openldap/schema/nadf.schema.default; then rm -f %D/etc/openldap/schema/nadf.schema; fi
-etc/openldap/schema/nadf.schema.default
-@exec [ ! -f %B/schema/nadf.schema ] && cp %B/%f %B/schema/nadf.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ ! -f %B/schema/nis.schema ] && cp %B/%f %B/schema/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ ! -f %B/schema/openldap.schema ] && cp %B/%f %B/schema/openldap.schema
-@dirrm etc/openldap/schema
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.2
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile
deleted file mode 100644
index 984b1a7d60fb..000000000000
--- a/net/openldap20/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 2.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	2.0.6
-PORTREVISION=	2
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-USE_OPENSSL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/run \
-		--with-threads \
-		--enable-shared \
-		--enable-dnssrv \
-		--with-tls=openssl
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
-.endif
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/maildap \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-post-configure:
-	cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff
-
-pre-build:
-	cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	strip ${PREFIX}/${f}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap20/distinfo b/net/openldap20/distinfo
deleted file mode 100644
index 8a9668d4e077..000000000000
--- a/net/openldap20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-2.0.6.tgz) = 6df0ebc7da308999146102f950ecdaed
diff --git a/net/openldap20/files/libtool.diff b/net/openldap20/files/libtool.diff
deleted file mode 100644
index 0cf57bbee7ea..000000000000
--- a/net/openldap20/files/libtool.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libtool.orig	Tue Oct 31 01:43:06 2000
-+++ libtool	Tue Oct 31 01:44:42 2000
-@@ -448,6 +448,16 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --only-shared)
-+    build_libtool_libs=yes
-+    build_old_libs=no
-+    ;;
-+
-+  --only-static)
-+    build_libtool_libs=no
-+    build_old_libs=yes
-+    ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
diff --git a/net/openldap20/files/manpages b/net/openldap20/files/manpages
deleted file mode 100644
index 1c39b81911fc..000000000000
--- a/net/openldap20/files/manpages
+++ /dev/null
@@ -1,219 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	lber-memory.3
-MAN3+=	lber-types.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_schema.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapadd.8
-MAN8+=	slapcat.8
-MAN8+=	slapd.8
-MAN8+=	slapindex.8
-MAN8+=	slappasswd.8
-MAN8+=	slurpd.8
-MLINKS+=	lber-decode.3 ber_first_element.3
-MLINKS+=	lber-decode.3 ber_get_bitstring.3
-MLINKS+=	lber-decode.3 ber_get_boolean.3
-MLINKS+=	lber-decode.3 ber_get_enum.3
-MLINKS+=	lber-decode.3 ber_get_int.3
-MLINKS+=	lber-decode.3 ber_get_next.3
-MLINKS+=	lber-decode.3 ber_get_null.3
-MLINKS+=	lber-decode.3 ber_get_stringa.3
-MLINKS+=	lber-decode.3 ber_get_stringb.3
-MLINKS+=	lber-decode.3 ber_next_element.3
-MLINKS+=	lber-decode.3 ber_peek_tag.3
-MLINKS+=	lber-decode.3 ber_scanf.3
-MLINKS+=	lber-decode.3 ber_skip_tag.3
-MLINKS+=	lber-encode.3 ber_alloc_t.3
-MLINKS+=	lber-encode.3 ber_flush.3
-MLINKS+=	lber-encode.3 ber_printf.3
-MLINKS+=	lber-encode.3 ber_put_enum.3
-MLINKS+=	lber-encode.3 ber_put_int.3
-MLINKS+=	lber-encode.3 ber_put_null.3
-MLINKS+=	lber-encode.3 ber_put_ostring.3
-MLINKS+=	lber-encode.3 ber_put_seq.3
-MLINKS+=	lber-encode.3 ber_put_set.3
-MLINKS+=	lber-encode.3 ber_put_string.3
-MLINKS+=	lber-decode.3 ber_start_set.3
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_abandon_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext_s.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_rdn.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext_s.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_result.3 ldap_msgid.3
-MLINKS+=	ldap_result.3 ldap_msgtype.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2name.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2str.3
-MLINKS+=	ldap_schema.3 ldap_attributetype_free.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2name.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2str.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule_free.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2name.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2str.3
-MLINKS+=	ldap_schema.3 ldap_objectclass_free.3
-MLINKS+=	ldap_schema.3 ldap_scherr2str.3
-MLINKS+=	ldap_schema.3 ldap_str2attributetype.3
-MLINKS+=	ldap_schema.3 ldap_str2matchingrule.3
-MLINKS+=	ldap_schema.3 ldap_str2objectclass.3
-MLINKS+=	ldap_schema.3 ldap_str2syntax.3
-MLINKS+=	ldap_schema.3 ldap_syntax2name.3
-MLINKS+=	ldap_schema.3 ldap_syntax2str.3
-MLINKS+=	ldap_schema.3 ldap_syntax_free.3
-MLINKS+=	ldap_search.3 ldap_search_ext.3
-MLINKS+=	ldap_search.3 ldap_search_ext_s.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap20/files/patch-clients_ud_Makefile.in b/net/openldap20/files/patch-clients_ud_Makefile.in
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap20/files/patch-clients_ud_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap20/files/patch-servers_slapd_daemon.c b/net/openldap20/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 44baead6a6b7..000000000000
--- a/net/openldap20/files/patch-servers_slapd_daemon.c
+++ /dev/null
@@ -1,828 +0,0 @@
---- servers/slapd/daemon.c.orig	Sat Sep 30 11:24:28 2000
-+++ servers/slapd/daemon.c	Tue Oct 31 10:54:09 2000
-@@ -1,4 +1,4 @@
--/* $OpenLDAP: pkg/ldap/servers/slapd/daemon.c,v 1.99.2.12 2000/09/30 16:24:28 kurt Exp $ */
-+/* $OpenLDAP: servers/slapd/daemon.c,v 1.99.2.13 2000/10/30 18:14:51 kurt Exp $ */
- /*
-  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-@@ -59,6 +59,8 @@
- 
- Listener **slap_listeners = NULL;
- 
-+#define SLAPD_LISTEN 10
-+
- static ber_socket_t wake_sds[2];
- 
- #ifdef NO_THREADS
-@@ -81,8 +83,6 @@
- #endif
- volatile sig_atomic_t slapd_shutdown = 0;
- 
--static ldap_pvt_thread_t	listener_tid;
--
- static struct slap_daemon {
- 	ldap_pvt_thread_mutex_t	sd_mutex;
- 
-@@ -193,20 +193,207 @@
- 	tcp_close(s);
- }
- 
-+static void slap_free_listener_addresses(struct sockaddr **sal)
-+{
-+	struct sockaddr **sap;
-+
-+	if (sal == NULL) {
-+		return;
-+	}
-+
-+	for (sap = sal; *sap != NULL; sap++) {
-+		ch_free(*sap);
-+	}
-+
-+	ch_free(sal);
-+}
-+
-+/* port = 0 indicates AF_LOCAL */
-+static int slap_get_listener_addresses(
-+	const char *host,
-+	unsigned short port,
-+	struct sockaddr ***sal)
-+{
-+	struct sockaddr **sap;
-+#ifdef HAVE_GETADDRINFO
-+	struct addrinfo hints, *res, *sai;
-+	int n, err;
-+	
-+	memset( &hints, '\0', sizeof(hints) );
-+	hints.ai_flags = AI_PASSIVE;
-+	hints.ai_socktype = SOCK_STREAM;
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		hints.ai_family = AF_LOCAL;
-+		/* host specifies a service in this case */
-+		if (err = getaddrinfo(NULL, host, &hints, &res)) {
-+			if (err == EAI_FAMILY) {
-+				/* XXX Fake it */
-+				struct sockaddr_un *sun = calloc(1, sizeof(struct sockaddr_un));
-+				err = 0;
-+				res = calloc(1, sizeof(*res));
-+				assert(sun != NULL);
-+				assert(res != NULL);
-+				res->ai_flags = hints.ai_flags;
-+				res->ai_family = AF_LOCAL;
-+				res->ai_socktype = hints.ai_socktype;
-+				res->ai_addr = (struct sockaddr *)sun;
-+				res->ai_addrlen = sizeof(*sun);
-+				sun->sun_len = strlen(LDAPI_SOCK) + 1;
-+				sun->sun_family = AF_LOCAL;
-+				strcpy(sun->sun_path, LDAPI_SOCK);
-+			} else {
-+				Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				    gai_strerror(err), 0, 0);
-+				return -1;
-+			}
-+		}
-+	} else
-+#  endif
-+	{		
-+		char serv[7];
-+	
-+		snprintf(serv, sizeof serv, "%d", port);
-+		hints.ai_family = AF_UNSPEC;
-+		if (err = getaddrinfo(host, serv, &hints, &res)) {
-+			Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				gai_strerror(err), 0, 0);
-+			return -1;
-+		}
-+	}
-+
-+	sai = res;
-+	for (n=2; (sai = sai->ai_next) != NULL; n++) {
-+		/* EMPTY */ ;
-+	}
-+	*sal = ch_malloc(n * sizeof(*sal));
-+	if (*sal == NULL) {
-+		return -1;
-+	}
-+
-+	sai = res;
-+	sap = *sal;
-+	do {
-+		switch (sai->ai_family) {
-+#  ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_un));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_un *)*sap =
-+				*((struct sockaddr_un *)sai->ai_addr);
-+		} break;
-+#  endif
-+#  ifdef LDAP_PF_INET6			
-+		case AF_INET6: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in6));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in6 *)*sap =
-+				*((struct sockaddr_in6 *)sai->ai_addr);
-+		} break;
-+#  endif
-+		case AF_INET: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in *)*sap =
-+				*((struct sockaddr_in *)sai->ai_addr);
-+		} break;
-+		default: 
-+			*sap = NULL;
-+			break;
-+		}
-+		if (*sap != NULL) {
-+			(*sap)->sa_family = sai->ai_family;
-+			sap++;
-+		}
-+	} while ((sai = sai->ai_next) != NULL);
-+
-+	freeaddrinfo(res);
-+
-+#else
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_un));
-+		if (*sap == NULL)
-+			goto errexit;
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
-+		(*sap)->sa_family = AF_LOCAL;
-+		if ( strlen(host) >
-+		     (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: domain socket path (%s) too long in URL",
-+			       host, 0, 0);
-+			goto errexit;
-+		}
-+		strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
-+	} else
-+#  endif		
-+	{
-+		struct in_addr in;
-+
-+		if ( host == NULL ) {
-+			in.s_addr = htonl(INADDR_ANY);
-+
-+		} else if ( !inet_aton( host, &in ) ) {
-+			struct hostent *he = gethostbyname( host );
-+			if( he == NULL ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "daemon: invalid host %s", host, 0, 0);
-+				return -1;
-+			}
-+			AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
-+		}
-+
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_in));
-+		if (*sap == NULL) {
-+			goto errexit;
-+		}
-+
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
-+		(*sap)->sa_family = AF_INET;
-+		((struct sockaddr_in *)*sap)->sin_port = htons(port);
-+		((struct sockaddr_in *)*sap)->sin_addr = in;
-+	}
-+	sap++;
-+#endif
-+
-+	*sap = NULL;
-+	return 0;
-+
-+errexit:
-+	slap_free_listener_addresses(*sal);
-+	return -1;
-+}
- 
--static Listener * open_listener( const char* url )
-+static Listener * slap_open_listener(
-+	const char* url )
- {
- 	int	tmp, rc;
- 	Listener l;
- 	Listener *li;
- 	LDAPURLDesc *lud;
--	char *s;
--	int port;
--#ifdef HAVE_GETADDRINFO
--	char serv[7];
--	struct addrinfo hints, *res, *sai;
--	int err;
--#endif
-+	unsigned short port;
-+	int err, addrlen;
-+	struct sockaddr **sal, **psal;
- 
- 	rc = ldap_url_parse( url, &lud );
- 
-@@ -238,291 +425,171 @@
- 	}
- #endif
- 
--#ifdef HAVE_GETADDRINFO
--	memset( &hints, '\0', sizeof(hints) );
--	hints.ai_flags = AI_PASSIVE;
--	hints.ai_family = AF_UNSPEC;
--	hints.ai_socktype = SOCK_STREAM;
--
--#  ifdef LDAP_PF_LOCAL
-+	port = (unsigned short) lud->lud_port;
-+	
- 	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifdef LDAP_PF_LOCAL
- 		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			err = getaddrinfo(NULL, LDAPI_SOCK, &hints, &res);
--			if (!err)
--				unlink( LDAPI_SOCK );
-+			err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
- 		} else {
--			err = getaddrinfo(NULL, lud->lud_host, &hints, &res);
--			if (!err)
--				unlink( lud->lud_host );
-+			err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
- 		}
--	} else
--#  endif /* LDAP_PF_LOCAL */
--	{
--		snprintf(serv, sizeof serv, "%d", lud->lud_port);
-+#else
-+		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
-+			url, 0, 0);
-+		ldap_free_urldesc( lud );
-+		return NULL;
-+#endif
-+	} else {
- 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
- 			|| strcmp(lud->lud_host, "*") == 0 )
- 		{
--			err = getaddrinfo(NULL, serv, &hints, &res);
-+			err = slap_get_listener_addresses(NULL, port, &sal);
- 		} else {
--			err = getaddrinfo(lud->lud_host, serv, &hints, &res);
-+			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
- 		}
- 	}
- 
-+	ldap_free_urldesc( lud );
- 	if ( err ) {
--		Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed\n", 0, 0, 0);
--		ldap_free_urldesc( lud );
- 		return NULL;
- 	}
- 
--	ldap_free_urldesc( lud );
--	sai = res;
--	do {
--		if ( (sai->ai_family != AF_INET)
--#  ifdef LDAP_PF_INET6
--		     && (sai->ai_family != AF_INET6)
--#  endif
--#  ifdef LDAP_PF_LOCAL
--		     && (sai->ai_family != AF_LOCAL)
--#  endif
--		     )
-+	psal = sal;
-+	while ( *sal != NULL ) {
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+#endif
-+#ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL:
-+#endif
-+			break;
-+		default:
-+			sal++;
- 			continue;
--		l.sl_sd = socket( sai->ai_family, sai->ai_socktype, sai->ai_protocol);
-+		}
-+		l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
- 		if ( l.sl_sd == AC_SOCKET_INVALID ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: socket() failed errno=%d (%s)\n", err,
- 				sock_errstr(err), 0 );
-+			sal++;
- 			continue;
- 		}
--
--		if ( sai->ai_family != AF_LOCAL ) {
--#else
--
--	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifndef HAVE_WINSOCK
-+		if ( l.sl_sd >= dtblsize ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: listener descriptor %ld is too great %ld\n",
-+			       (long) l.sl_sd, (long) dtblsize, 0 );
-+			tcp_close( l.sl_sd );
-+			sal++;
-+			continue;
-+		}
-+#endif
- #ifdef LDAP_PF_LOCAL
--		port = 0;
--		(void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );
--
--		l.sl_sa.sa_un_addr.sun_family = AF_LOCAL;
--
--		/* hack: overload the host to be the path */
--		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			strcpy( l.sl_sa.sa_un_addr.sun_path, LDAPI_SOCK );
--		} else {
--			if ( strlen(lud->lud_host) > (sizeof(l.sl_sa.sa_un_addr.sun_path) - 1) ) {
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: domain socket path (%s) too long in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
--			}
--			strcpy( l.sl_sa.sa_un_addr.sun_path, lud->lud_host );
--		}
--		unlink( l.sl_sa.sa_un_addr.sun_path ); 
--#if 0
--		/* I don't think we need to set this. */
--		l.sl_sa.sa_un_addr.sun_len = sizeof( l.sl_sa.sa_un_addr.sun_len ) +
--			sizeof( l.sl_sa.sa_un_addr.sun_family ) +
--			strlen( l.sl_sa.sa_un_addr.sun_path ) + 1;
-+		if ( (*sal)->sa_family == AF_LOCAL ) {
-+			unlink ( ((struct sockaddr_un *)*sal)->sun_path );
-+		} else
- #endif
--#else
--		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
--			url, 0, 0);
--		ldap_free_urldesc( lud );
--		return NULL;
--#endif /* LDAP_PF_LOCAL */
--	} else {
--
--	port = lud->lud_port;
--
--	(void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
--
--	l.sl_addr.sin_family = AF_INET;
--	l.sl_addr.sin_port = htons( (unsigned short) lud->lud_port );
--
--	if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
--		|| strcmp(lud->lud_host, "*") == 0 )
--	{
--		l.sl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
--
--	} else {
--		/* host or address was specified */
--		if( !inet_aton( lud->lud_host, &l.sl_addr.sin_addr ) ) {
--			struct hostent *he = gethostbyname( lud->lud_host );
--			if( he == NULL ) {
-+		{
-+#ifdef SO_REUSEADDR
-+			/* enable address reuse */
-+			tmp = 1;
-+			rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
-+					 (char *) &tmp, sizeof(tmp) );
-+			if ( rc == AC_SOCKET_ERROR ) {
-+				int err = sock_errno();
- 				Debug( LDAP_DEBUG_ANY,
--					"daemon: invalid host (%s) in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
-+				       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
-+				       (long) l.sl_sd, err, sock_errstr(err) );
- 			}
--
--			AC_MEMCPY( &l.sl_addr.sin_addr, he->h_addr,
--			       sizeof( l.sl_addr.sin_addr ) );
-+#endif
- 		}
--	}
--	}
--
--	ldap_free_urldesc( lud );
--
--	l.sl_sd = socket( l.sl_sa.sa_addr.sa_family, SOCK_STREAM, 0 );
--	if ( l.sl_sd == AC_SOCKET_INVALID ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: socket() failed errno=%d (%s)\n", err,
--			sock_errstr(err), 0 );
--		return NULL;
--	}
--
--#ifndef HAVE_WINSOCK
--	if ( l.sl_sd >= dtblsize ) {
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: listener descriptor %ld is too great %ld\n",
--			(long) l.sl_sd, (long) dtblsize, 0 );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
-+	
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+			addrlen = sizeof(struct sockaddr_in);
-+			break;
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+			addrlen = sizeof(struct sockaddr_in6);
-+			break;
- #endif
--
- #ifdef LDAP_PF_LOCAL
--	/* for IPv4 and IPv6 sockets only */
--	if ( l.sl_sa.sa_addr.sa_family != AF_LOCAL ) {
--#endif /* LDAP_PF_LOCAL */
--#endif /* HAVE_GETADDRINFO */
--
--#ifdef SO_REUSEADDR
--	/* enable address reuse */
--	tmp = 1;
--	rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
--		(char *) &tmp, sizeof(tmp) );
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--	       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--	}
-+		case AF_LOCAL:
-+			addrlen = sizeof(struct sockaddr_un);
-+			break;
- #endif
--
--#ifdef HAVE_GETADDRINFO
--		} /* sai->ai_family != AF_LOCAL */
--		if (!bind(l.sl_sd, sai->ai_addr, sai->ai_addrlen))
-+		}
-+	
-+		if (!bind(l.sl_sd, *sal, addrlen))
- 			break;
- 		err = sock_errno();
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--			(long) l.sl_sd, err, sock_errstr(err) );
-+		       (long) l.sl_sd, err, sock_errstr(err) );
- 		tcp_close( l.sl_sd );
--	} while ((sai = sai->ai_next) != NULL);
-+		sal++;
-+	} /* while ( *sal != NULL ) */
- 
--	if (!sai) {
-+	if ( *sal == NULL ) {
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
- 			(long) l.sl_sd, 0, 0 );
-+		slap_free_listener_addresses(psal);
- 		return NULL;
- 	}
- 
--	switch ( sai->ai_family ) {
--#  ifdef LDAP_PF_LOCAL
--	case AF_LOCAL:
--		if ( chmod( (char *)sai->ai_addr, S_IRWXU ) < 0 ) {
-+	switch ( (*sal)->sa_family ) {
-+#ifdef LDAP_PF_LOCAL
-+	case AF_LOCAL: {
-+		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-+		if ( chmod( addr, S_IRWXU ) < 0 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
--				(long) l.sl_sd, err, sock_errstr(err) );
-+			       (long) l.sl_sd, err, sock_errstr(err) );
- 			tcp_close( l.sl_sd );
-+			slap_free_listener_addresses(psal);
- 			return NULL;
- 		}
--		l.sl_name = ch_malloc( strlen((char *)sai->ai_addr) + sizeof("PATH=") );
--		sprintf( l.sl_name, "PATH=%s", sai->ai_addr );
--		break;
--#  endif /* LDAP_PF_LOCAL */
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
-+		sprintf( l.sl_name, "PATH=%s", addr );
-+	} break;
-+#endif /* LDAP_PF_LOCAL */
- 
- 	case AF_INET: {
-+		char *s;
-+#ifdef HAVE_GETADDRINFO		
- 		char addr[INET_ADDRSTRLEN];
--		inet_ntop( AF_INET,
--			&((struct sockaddr_in *)sai->ai_addr)->sin_addr,
--			addr, sizeof(addr) );
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP=:") );
--		sprintf( l.sl_name, "IP=%s:%s", addr, serv );
-+		inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
-+			   addr, sizeof(addr) );
-+		s = addr;
-+#else
-+		s = inet_ntoa( l.sl_addr.sin_addr );
-+#endif		
-+		l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
-+		sprintf( l.sl_name, "IP=%s:%d",
-+			 s != NULL ? s : "unknown" , port );
- 	} break;
- 
--#  ifdef LDAP_PF_INET6
-+#ifdef LDAP_PF_INET6
- 	case AF_INET6: {
- 		char addr[INET6_ADDRSTRLEN];
--		inet_ntop( AF_INET6,
--			&((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr,
--			addr, sizeof addr);
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP= ") );
--		sprintf( l.sl_name, "IP=%s %s", addr, serv );
-+		inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
-+			   addr, sizeof addr);
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
-+		sprintf( l.sl_name, "IP=%s %d", addr, port );
- 	} break;
--#  endif /* LDAP_PF_INET6 */
-+#endif /* LDAP_PF_INET6 */
- 
- 	default:
- 		Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
--			(int) sai->ai_family, 0, 0 );
-+			(int) (*sal)->sa_family, 0, 0 );
- 		break;
- 	}
--#else
--#ifdef LDAP_PF_LOCAL
--	/* close conditional */
--	}
--#endif /* LDAP_PF_LOCAL */
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_un_addr) );
--			break;
--#endif
--
--		case AF_INET:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_in_addr) );
--			break;
- 
--		default:
--			rc = AC_SOCKET_ERROR;
--			errno = EINVAL;
--			break;
--	}
--
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			if ( chmod( l.sl_sa.sa_un_addr.sun_path, S_IRWXU ) < 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: chmod(%ld) failed errno=%d (%s)",
--					(long) l.sl_sd, err, sock_errstr(err) );
--				tcp_close( l.sl_sd );
--				return NULL;
--			}
--
--			l.sl_name = ch_malloc( strlen(l.sl_sa.sa_un_addr.sun_path)
--				+ sizeof("PATH=") );
--			sprintf( l.sl_name, "PATH=%s", l.sl_sa.sa_un_addr.sun_path );
--			break;
--#endif /* LDAP_PF_LOCAL */
--
--		case AF_INET:
--			l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
--			s = inet_ntoa( l.sl_addr.sin_addr );
--			sprintf( l.sl_name, "IP=%s:%d",
--				s != NULL ? s : "unknown" , port );
--			break;
--
--		default:
--			l.sl_name = ch_strdup( "UNKNOWN" );
--			break;
--	}
--
--#endif /* HAVE_GETADDRINFO */
-+	slap_free_listener_addresses(psal);
- 
- 	l.sl_url = ch_strdup( url );
- 	li = ch_malloc( sizeof( Listener ) );
-@@ -608,7 +675,7 @@
- 	slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
- 
- 	for(i = 0; u[i] != NULL; i++ ) {
--		slap_listeners[i] = open_listener( u[i] );
-+		slap_listeners[i] = slap_open_listener( u[i] );
- 
- 		if( slap_listeners[i] == NULL ) {
- 			charray_free( u );
-@@ -642,7 +709,6 @@
- 	void *ptr
- )
- {
--	int rc, tmp;
- 	int l;
- 	time_t	last_idle_check = slap_get_time();
- 	time( &starttime );
-@@ -651,7 +717,7 @@
- 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
- 			continue;
- 
--		if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
-+		if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: listen(%s, 5) failed errno=%d (%s)\n",
-@@ -814,7 +880,7 @@
- 		}
- 
- 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
--			ber_int_t s;
-+			ber_socket_t s;
- 			socklen_t len = sizeof(from);
- 			long id;
- 			slap_ssf_t ssf = 0;
-@@ -860,31 +926,6 @@
- 			}
- #endif
- 
--#ifdef SO_KEEPALIVE
--			/* enable keep alives */
--			rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
--				(char *) &tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--#ifdef TCP_NODELAY
--			/* enable no delay */
--			tmp = 1;
--			rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
--				(char *)&tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(TCP_NODELAY) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--
--
- #ifdef LDAP_DEBUG
- 			ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- 
-@@ -896,20 +937,44 @@
- 			ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
- #endif
- 
-+#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY )
-+#ifdef LDAP_PF_LOCAL
-+			/* for IPv4 and IPv6 sockets only */
-+			if ( from.sa_addr.sa_family != AF_LOCAL )
-+#endif /* LDAP_PF_LOCAL */
-+			{
-+				int rc;
-+				int tmp;
-+#ifdef SO_KEEPALIVE
-+				/* enable keep alives */
-+				tmp = 1;
-+				rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
-+					(char *) &tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+#ifdef TCP_NODELAY
-+				/* enable no delay */
-+				tmp = 1;
-+				rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
-+					(char *)&tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(TCP_NODELAY) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+			}
-+#endif
-+
- 			Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
- 				(long) s, 0, 0 );
- 
--			len = sizeof(from);
--
--			if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
--					(long) s, err, sock_errstr(err) );
--				slapd_close(s);
--				continue;
--			}
--
- 			switch ( from.sa_addr.sa_family ) {
- #  ifdef LDAP_PF_LOCAL
- 			case AF_LOCAL:
-@@ -948,6 +1013,7 @@
- 				slapd_close(s);
- 				continue;
- 			}
-+
- 			if ( ( from.sa_addr.sa_family == AF_INET ) 
- #ifdef LDAP_PF_INET6
- 				|| ( from.sa_addr.sa_family == AF_INET6 )
-@@ -961,7 +1027,7 @@
- 						sizeof(from.sa_in6_addr.sin6_addr),
- 						AF_INET6 );
- 				else
--#  endif LDAP_PF_INET6
-+#  endif /* LDAP_PF_INET6 */
- 				hp = gethostbyaddr(
- 					(char *) &(from.sa_in_addr.sin_addr),
- 					sizeof(from.sa_in_addr.sin_addr),
-@@ -1202,23 +1268,25 @@
- 	connections_init();
- 
- #define SLAPD_LISTENER_THREAD 1
--#if defined( SLAPD_LISTENER_THREAD ) || !defined(HAVE_PTHREADS)
-+#if defined( SLAPD_LISTENER_THREAD )
-+	{
-+		ldap_pvt_thread_t	listener_tid;
- 
--	/* listener as a separate THREAD */
--	rc = ldap_pvt_thread_create( &listener_tid,
--		0, slapd_daemon_task, NULL );
-+		/* listener as a separate THREAD */
-+		rc = ldap_pvt_thread_create( &listener_tid,
-+			0, slapd_daemon_task, NULL );
- 
--	if ( rc != 0 ) {
--		Debug( LDAP_DEBUG_ANY,
--		    "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
--		return rc;
--	}
-+		if ( rc != 0 ) {
-+			Debug( LDAP_DEBUG_ANY,
-+		    	"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-+			return rc;
-+		}
- 
--	/* wait for the listener thread to complete */
--	ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+		/* wait for the listener thread to complete */
-+		ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+ 	}
- #else
--	/* expermimental code */
--	listener_tid = pthread_self();
-+	/* experimental code */
- 	slapd_daemon_task( NULL );
- #endif
- 
-@@ -1307,4 +1375,9 @@
- 
- 	/* reinstall self */
- 	(void) SIGNAL_REINSTALL( sig, slap_sig_wake );
-+}
-+
-+
-+void slapd_add_internal(ber_socket_t s) {
-+	slapd_add(s);
- }
diff --git a/net/openldap20/files/patch-servers_slapd_schema b/net/openldap20/files/patch-servers_slapd_schema
deleted file mode 100644
index 31969e8bb621..000000000000
--- a/net/openldap20/files/patch-servers_slapd_schema
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/schema/krb5-kdc.schema.orig	Tue Sep  5 13:28:34 2000
-+++ servers/slapd/schema/krb5-kdc.schema	Mon Oct 30 13:09:19 2000
-@@ -96,7 +96,7 @@
- attributetype ( 1.3.6.1.4.1.5322.10.1.10
- 	NAME 'krb5Key'
- 	DESC 'Encoded ASN1 Key as an octet string'
--	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
- 
- attributetype ( 1.3.6.1.4.1.5322.10.1.11
- 	NAME 'krb5PrincipalRealm'
-@@ -112,7 +112,7 @@
- 
- objectclass ( 1.3.6.1.4.1.5322.10.2.1
- 	NAME 'krb5Principal'
--	SUP top
-+	SUP person
- 	AUXILIARY
- 	MUST ( krb5PrincipalName )
- 	MAY ( cn $ krb5PrincipalRealm ) )
diff --git a/net/openldap20/files/slapd.sh b/net/openldap20/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap20/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap20/pkg-comment b/net/openldap20/pkg-comment
deleted file mode 100644
index 8c499c3923cf..000000000000
--- a/net/openldap20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open source LDAP client and server software
diff --git a/net/openldap20/pkg-descr b/net/openldap20/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap20/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap20/pkg-plist b/net/openldap20/pkg-plist
deleted file mode 100644
index 764525594e11..000000000000
--- a/net/openldap20/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
-@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ ! -f %B/schema/corba.schema ] && cp %B/%f %B/schema/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ ! -f %B/schema/core.schema ] && cp %B/%f %B/schema/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ ! -f %B/schema/cosine.schema ] && cp %B/%f %B/schema/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ ! -f %B/schema/inetorgperson.schema ] && cp %B/%f %B/schema/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ ! -f %B/schema/java.schema ] && cp %B/%f %B/schema/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ ! -f %B/schema/krb5-kdc.schema ] && cp %B/%f %B/schema/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ ! -f %B/schema/misc.schema ] && cp %B/%f %B/schema/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nadf.schema %D/etc/openldap/schema/nadf.schema.default; then rm -f %D/etc/openldap/schema/nadf.schema; fi
-etc/openldap/schema/nadf.schema.default
-@exec [ ! -f %B/schema/nadf.schema ] && cp %B/%f %B/schema/nadf.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ ! -f %B/schema/nis.schema ] && cp %B/%f %B/schema/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ ! -f %B/schema/openldap.schema ] && cp %B/%f %B/schema/openldap.schema
-@dirrm etc/openldap/schema
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.2
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
deleted file mode 100644
index 984b1a7d60fb..000000000000
--- a/net/openldap21-server/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 2.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	2.0.6
-PORTREVISION=	2
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-USE_OPENSSL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/run \
-		--with-threads \
-		--enable-shared \
-		--enable-dnssrv \
-		--with-tls=openssl
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
-.endif
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/maildap \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-post-configure:
-	cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff
-
-pre-build:
-	cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	strip ${PREFIX}/${f}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap21-server/distinfo b/net/openldap21-server/distinfo
deleted file mode 100644
index 8a9668d4e077..000000000000
--- a/net/openldap21-server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-2.0.6.tgz) = 6df0ebc7da308999146102f950ecdaed
diff --git a/net/openldap21-server/files/libtool.diff b/net/openldap21-server/files/libtool.diff
deleted file mode 100644
index 0cf57bbee7ea..000000000000
--- a/net/openldap21-server/files/libtool.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libtool.orig	Tue Oct 31 01:43:06 2000
-+++ libtool	Tue Oct 31 01:44:42 2000
-@@ -448,6 +448,16 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --only-shared)
-+    build_libtool_libs=yes
-+    build_old_libs=no
-+    ;;
-+
-+  --only-static)
-+    build_libtool_libs=no
-+    build_old_libs=yes
-+    ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
diff --git a/net/openldap21-server/files/manpages b/net/openldap21-server/files/manpages
deleted file mode 100644
index 1c39b81911fc..000000000000
--- a/net/openldap21-server/files/manpages
+++ /dev/null
@@ -1,219 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	lber-memory.3
-MAN3+=	lber-types.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_schema.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapadd.8
-MAN8+=	slapcat.8
-MAN8+=	slapd.8
-MAN8+=	slapindex.8
-MAN8+=	slappasswd.8
-MAN8+=	slurpd.8
-MLINKS+=	lber-decode.3 ber_first_element.3
-MLINKS+=	lber-decode.3 ber_get_bitstring.3
-MLINKS+=	lber-decode.3 ber_get_boolean.3
-MLINKS+=	lber-decode.3 ber_get_enum.3
-MLINKS+=	lber-decode.3 ber_get_int.3
-MLINKS+=	lber-decode.3 ber_get_next.3
-MLINKS+=	lber-decode.3 ber_get_null.3
-MLINKS+=	lber-decode.3 ber_get_stringa.3
-MLINKS+=	lber-decode.3 ber_get_stringb.3
-MLINKS+=	lber-decode.3 ber_next_element.3
-MLINKS+=	lber-decode.3 ber_peek_tag.3
-MLINKS+=	lber-decode.3 ber_scanf.3
-MLINKS+=	lber-decode.3 ber_skip_tag.3
-MLINKS+=	lber-encode.3 ber_alloc_t.3
-MLINKS+=	lber-encode.3 ber_flush.3
-MLINKS+=	lber-encode.3 ber_printf.3
-MLINKS+=	lber-encode.3 ber_put_enum.3
-MLINKS+=	lber-encode.3 ber_put_int.3
-MLINKS+=	lber-encode.3 ber_put_null.3
-MLINKS+=	lber-encode.3 ber_put_ostring.3
-MLINKS+=	lber-encode.3 ber_put_seq.3
-MLINKS+=	lber-encode.3 ber_put_set.3
-MLINKS+=	lber-encode.3 ber_put_string.3
-MLINKS+=	lber-decode.3 ber_start_set.3
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_abandon_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext_s.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_rdn.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext_s.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_result.3 ldap_msgid.3
-MLINKS+=	ldap_result.3 ldap_msgtype.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2name.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2str.3
-MLINKS+=	ldap_schema.3 ldap_attributetype_free.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2name.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2str.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule_free.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2name.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2str.3
-MLINKS+=	ldap_schema.3 ldap_objectclass_free.3
-MLINKS+=	ldap_schema.3 ldap_scherr2str.3
-MLINKS+=	ldap_schema.3 ldap_str2attributetype.3
-MLINKS+=	ldap_schema.3 ldap_str2matchingrule.3
-MLINKS+=	ldap_schema.3 ldap_str2objectclass.3
-MLINKS+=	ldap_schema.3 ldap_str2syntax.3
-MLINKS+=	ldap_schema.3 ldap_syntax2name.3
-MLINKS+=	ldap_schema.3 ldap_syntax2str.3
-MLINKS+=	ldap_schema.3 ldap_syntax_free.3
-MLINKS+=	ldap_search.3 ldap_search_ext.3
-MLINKS+=	ldap_search.3 ldap_search_ext_s.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap21-server/files/patch-clients_ud_Makefile.in b/net/openldap21-server/files/patch-clients_ud_Makefile.in
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap21-server/files/patch-clients_ud_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap21-server/files/patch-servers_slapd_daemon.c b/net/openldap21-server/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 44baead6a6b7..000000000000
--- a/net/openldap21-server/files/patch-servers_slapd_daemon.c
+++ /dev/null
@@ -1,828 +0,0 @@
---- servers/slapd/daemon.c.orig	Sat Sep 30 11:24:28 2000
-+++ servers/slapd/daemon.c	Tue Oct 31 10:54:09 2000
-@@ -1,4 +1,4 @@
--/* $OpenLDAP: pkg/ldap/servers/slapd/daemon.c,v 1.99.2.12 2000/09/30 16:24:28 kurt Exp $ */
-+/* $OpenLDAP: servers/slapd/daemon.c,v 1.99.2.13 2000/10/30 18:14:51 kurt Exp $ */
- /*
-  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-@@ -59,6 +59,8 @@
- 
- Listener **slap_listeners = NULL;
- 
-+#define SLAPD_LISTEN 10
-+
- static ber_socket_t wake_sds[2];
- 
- #ifdef NO_THREADS
-@@ -81,8 +83,6 @@
- #endif
- volatile sig_atomic_t slapd_shutdown = 0;
- 
--static ldap_pvt_thread_t	listener_tid;
--
- static struct slap_daemon {
- 	ldap_pvt_thread_mutex_t	sd_mutex;
- 
-@@ -193,20 +193,207 @@
- 	tcp_close(s);
- }
- 
-+static void slap_free_listener_addresses(struct sockaddr **sal)
-+{
-+	struct sockaddr **sap;
-+
-+	if (sal == NULL) {
-+		return;
-+	}
-+
-+	for (sap = sal; *sap != NULL; sap++) {
-+		ch_free(*sap);
-+	}
-+
-+	ch_free(sal);
-+}
-+
-+/* port = 0 indicates AF_LOCAL */
-+static int slap_get_listener_addresses(
-+	const char *host,
-+	unsigned short port,
-+	struct sockaddr ***sal)
-+{
-+	struct sockaddr **sap;
-+#ifdef HAVE_GETADDRINFO
-+	struct addrinfo hints, *res, *sai;
-+	int n, err;
-+	
-+	memset( &hints, '\0', sizeof(hints) );
-+	hints.ai_flags = AI_PASSIVE;
-+	hints.ai_socktype = SOCK_STREAM;
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		hints.ai_family = AF_LOCAL;
-+		/* host specifies a service in this case */
-+		if (err = getaddrinfo(NULL, host, &hints, &res)) {
-+			if (err == EAI_FAMILY) {
-+				/* XXX Fake it */
-+				struct sockaddr_un *sun = calloc(1, sizeof(struct sockaddr_un));
-+				err = 0;
-+				res = calloc(1, sizeof(*res));
-+				assert(sun != NULL);
-+				assert(res != NULL);
-+				res->ai_flags = hints.ai_flags;
-+				res->ai_family = AF_LOCAL;
-+				res->ai_socktype = hints.ai_socktype;
-+				res->ai_addr = (struct sockaddr *)sun;
-+				res->ai_addrlen = sizeof(*sun);
-+				sun->sun_len = strlen(LDAPI_SOCK) + 1;
-+				sun->sun_family = AF_LOCAL;
-+				strcpy(sun->sun_path, LDAPI_SOCK);
-+			} else {
-+				Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				    gai_strerror(err), 0, 0);
-+				return -1;
-+			}
-+		}
-+	} else
-+#  endif
-+	{		
-+		char serv[7];
-+	
-+		snprintf(serv, sizeof serv, "%d", port);
-+		hints.ai_family = AF_UNSPEC;
-+		if (err = getaddrinfo(host, serv, &hints, &res)) {
-+			Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				gai_strerror(err), 0, 0);
-+			return -1;
-+		}
-+	}
-+
-+	sai = res;
-+	for (n=2; (sai = sai->ai_next) != NULL; n++) {
-+		/* EMPTY */ ;
-+	}
-+	*sal = ch_malloc(n * sizeof(*sal));
-+	if (*sal == NULL) {
-+		return -1;
-+	}
-+
-+	sai = res;
-+	sap = *sal;
-+	do {
-+		switch (sai->ai_family) {
-+#  ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_un));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_un *)*sap =
-+				*((struct sockaddr_un *)sai->ai_addr);
-+		} break;
-+#  endif
-+#  ifdef LDAP_PF_INET6			
-+		case AF_INET6: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in6));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in6 *)*sap =
-+				*((struct sockaddr_in6 *)sai->ai_addr);
-+		} break;
-+#  endif
-+		case AF_INET: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in *)*sap =
-+				*((struct sockaddr_in *)sai->ai_addr);
-+		} break;
-+		default: 
-+			*sap = NULL;
-+			break;
-+		}
-+		if (*sap != NULL) {
-+			(*sap)->sa_family = sai->ai_family;
-+			sap++;
-+		}
-+	} while ((sai = sai->ai_next) != NULL);
-+
-+	freeaddrinfo(res);
-+
-+#else
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_un));
-+		if (*sap == NULL)
-+			goto errexit;
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
-+		(*sap)->sa_family = AF_LOCAL;
-+		if ( strlen(host) >
-+		     (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: domain socket path (%s) too long in URL",
-+			       host, 0, 0);
-+			goto errexit;
-+		}
-+		strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
-+	} else
-+#  endif		
-+	{
-+		struct in_addr in;
-+
-+		if ( host == NULL ) {
-+			in.s_addr = htonl(INADDR_ANY);
-+
-+		} else if ( !inet_aton( host, &in ) ) {
-+			struct hostent *he = gethostbyname( host );
-+			if( he == NULL ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "daemon: invalid host %s", host, 0, 0);
-+				return -1;
-+			}
-+			AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
-+		}
-+
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_in));
-+		if (*sap == NULL) {
-+			goto errexit;
-+		}
-+
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
-+		(*sap)->sa_family = AF_INET;
-+		((struct sockaddr_in *)*sap)->sin_port = htons(port);
-+		((struct sockaddr_in *)*sap)->sin_addr = in;
-+	}
-+	sap++;
-+#endif
-+
-+	*sap = NULL;
-+	return 0;
-+
-+errexit:
-+	slap_free_listener_addresses(*sal);
-+	return -1;
-+}
- 
--static Listener * open_listener( const char* url )
-+static Listener * slap_open_listener(
-+	const char* url )
- {
- 	int	tmp, rc;
- 	Listener l;
- 	Listener *li;
- 	LDAPURLDesc *lud;
--	char *s;
--	int port;
--#ifdef HAVE_GETADDRINFO
--	char serv[7];
--	struct addrinfo hints, *res, *sai;
--	int err;
--#endif
-+	unsigned short port;
-+	int err, addrlen;
-+	struct sockaddr **sal, **psal;
- 
- 	rc = ldap_url_parse( url, &lud );
- 
-@@ -238,291 +425,171 @@
- 	}
- #endif
- 
--#ifdef HAVE_GETADDRINFO
--	memset( &hints, '\0', sizeof(hints) );
--	hints.ai_flags = AI_PASSIVE;
--	hints.ai_family = AF_UNSPEC;
--	hints.ai_socktype = SOCK_STREAM;
--
--#  ifdef LDAP_PF_LOCAL
-+	port = (unsigned short) lud->lud_port;
-+	
- 	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifdef LDAP_PF_LOCAL
- 		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			err = getaddrinfo(NULL, LDAPI_SOCK, &hints, &res);
--			if (!err)
--				unlink( LDAPI_SOCK );
-+			err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
- 		} else {
--			err = getaddrinfo(NULL, lud->lud_host, &hints, &res);
--			if (!err)
--				unlink( lud->lud_host );
-+			err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
- 		}
--	} else
--#  endif /* LDAP_PF_LOCAL */
--	{
--		snprintf(serv, sizeof serv, "%d", lud->lud_port);
-+#else
-+		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
-+			url, 0, 0);
-+		ldap_free_urldesc( lud );
-+		return NULL;
-+#endif
-+	} else {
- 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
- 			|| strcmp(lud->lud_host, "*") == 0 )
- 		{
--			err = getaddrinfo(NULL, serv, &hints, &res);
-+			err = slap_get_listener_addresses(NULL, port, &sal);
- 		} else {
--			err = getaddrinfo(lud->lud_host, serv, &hints, &res);
-+			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
- 		}
- 	}
- 
-+	ldap_free_urldesc( lud );
- 	if ( err ) {
--		Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed\n", 0, 0, 0);
--		ldap_free_urldesc( lud );
- 		return NULL;
- 	}
- 
--	ldap_free_urldesc( lud );
--	sai = res;
--	do {
--		if ( (sai->ai_family != AF_INET)
--#  ifdef LDAP_PF_INET6
--		     && (sai->ai_family != AF_INET6)
--#  endif
--#  ifdef LDAP_PF_LOCAL
--		     && (sai->ai_family != AF_LOCAL)
--#  endif
--		     )
-+	psal = sal;
-+	while ( *sal != NULL ) {
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+#endif
-+#ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL:
-+#endif
-+			break;
-+		default:
-+			sal++;
- 			continue;
--		l.sl_sd = socket( sai->ai_family, sai->ai_socktype, sai->ai_protocol);
-+		}
-+		l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
- 		if ( l.sl_sd == AC_SOCKET_INVALID ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: socket() failed errno=%d (%s)\n", err,
- 				sock_errstr(err), 0 );
-+			sal++;
- 			continue;
- 		}
--
--		if ( sai->ai_family != AF_LOCAL ) {
--#else
--
--	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifndef HAVE_WINSOCK
-+		if ( l.sl_sd >= dtblsize ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: listener descriptor %ld is too great %ld\n",
-+			       (long) l.sl_sd, (long) dtblsize, 0 );
-+			tcp_close( l.sl_sd );
-+			sal++;
-+			continue;
-+		}
-+#endif
- #ifdef LDAP_PF_LOCAL
--		port = 0;
--		(void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );
--
--		l.sl_sa.sa_un_addr.sun_family = AF_LOCAL;
--
--		/* hack: overload the host to be the path */
--		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			strcpy( l.sl_sa.sa_un_addr.sun_path, LDAPI_SOCK );
--		} else {
--			if ( strlen(lud->lud_host) > (sizeof(l.sl_sa.sa_un_addr.sun_path) - 1) ) {
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: domain socket path (%s) too long in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
--			}
--			strcpy( l.sl_sa.sa_un_addr.sun_path, lud->lud_host );
--		}
--		unlink( l.sl_sa.sa_un_addr.sun_path ); 
--#if 0
--		/* I don't think we need to set this. */
--		l.sl_sa.sa_un_addr.sun_len = sizeof( l.sl_sa.sa_un_addr.sun_len ) +
--			sizeof( l.sl_sa.sa_un_addr.sun_family ) +
--			strlen( l.sl_sa.sa_un_addr.sun_path ) + 1;
-+		if ( (*sal)->sa_family == AF_LOCAL ) {
-+			unlink ( ((struct sockaddr_un *)*sal)->sun_path );
-+		} else
- #endif
--#else
--		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
--			url, 0, 0);
--		ldap_free_urldesc( lud );
--		return NULL;
--#endif /* LDAP_PF_LOCAL */
--	} else {
--
--	port = lud->lud_port;
--
--	(void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
--
--	l.sl_addr.sin_family = AF_INET;
--	l.sl_addr.sin_port = htons( (unsigned short) lud->lud_port );
--
--	if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
--		|| strcmp(lud->lud_host, "*") == 0 )
--	{
--		l.sl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
--
--	} else {
--		/* host or address was specified */
--		if( !inet_aton( lud->lud_host, &l.sl_addr.sin_addr ) ) {
--			struct hostent *he = gethostbyname( lud->lud_host );
--			if( he == NULL ) {
-+		{
-+#ifdef SO_REUSEADDR
-+			/* enable address reuse */
-+			tmp = 1;
-+			rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
-+					 (char *) &tmp, sizeof(tmp) );
-+			if ( rc == AC_SOCKET_ERROR ) {
-+				int err = sock_errno();
- 				Debug( LDAP_DEBUG_ANY,
--					"daemon: invalid host (%s) in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
-+				       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
-+				       (long) l.sl_sd, err, sock_errstr(err) );
- 			}
--
--			AC_MEMCPY( &l.sl_addr.sin_addr, he->h_addr,
--			       sizeof( l.sl_addr.sin_addr ) );
-+#endif
- 		}
--	}
--	}
--
--	ldap_free_urldesc( lud );
--
--	l.sl_sd = socket( l.sl_sa.sa_addr.sa_family, SOCK_STREAM, 0 );
--	if ( l.sl_sd == AC_SOCKET_INVALID ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: socket() failed errno=%d (%s)\n", err,
--			sock_errstr(err), 0 );
--		return NULL;
--	}
--
--#ifndef HAVE_WINSOCK
--	if ( l.sl_sd >= dtblsize ) {
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: listener descriptor %ld is too great %ld\n",
--			(long) l.sl_sd, (long) dtblsize, 0 );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
-+	
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+			addrlen = sizeof(struct sockaddr_in);
-+			break;
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+			addrlen = sizeof(struct sockaddr_in6);
-+			break;
- #endif
--
- #ifdef LDAP_PF_LOCAL
--	/* for IPv4 and IPv6 sockets only */
--	if ( l.sl_sa.sa_addr.sa_family != AF_LOCAL ) {
--#endif /* LDAP_PF_LOCAL */
--#endif /* HAVE_GETADDRINFO */
--
--#ifdef SO_REUSEADDR
--	/* enable address reuse */
--	tmp = 1;
--	rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
--		(char *) &tmp, sizeof(tmp) );
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--	       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--	}
-+		case AF_LOCAL:
-+			addrlen = sizeof(struct sockaddr_un);
-+			break;
- #endif
--
--#ifdef HAVE_GETADDRINFO
--		} /* sai->ai_family != AF_LOCAL */
--		if (!bind(l.sl_sd, sai->ai_addr, sai->ai_addrlen))
-+		}
-+	
-+		if (!bind(l.sl_sd, *sal, addrlen))
- 			break;
- 		err = sock_errno();
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--			(long) l.sl_sd, err, sock_errstr(err) );
-+		       (long) l.sl_sd, err, sock_errstr(err) );
- 		tcp_close( l.sl_sd );
--	} while ((sai = sai->ai_next) != NULL);
-+		sal++;
-+	} /* while ( *sal != NULL ) */
- 
--	if (!sai) {
-+	if ( *sal == NULL ) {
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
- 			(long) l.sl_sd, 0, 0 );
-+		slap_free_listener_addresses(psal);
- 		return NULL;
- 	}
- 
--	switch ( sai->ai_family ) {
--#  ifdef LDAP_PF_LOCAL
--	case AF_LOCAL:
--		if ( chmod( (char *)sai->ai_addr, S_IRWXU ) < 0 ) {
-+	switch ( (*sal)->sa_family ) {
-+#ifdef LDAP_PF_LOCAL
-+	case AF_LOCAL: {
-+		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-+		if ( chmod( addr, S_IRWXU ) < 0 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
--				(long) l.sl_sd, err, sock_errstr(err) );
-+			       (long) l.sl_sd, err, sock_errstr(err) );
- 			tcp_close( l.sl_sd );
-+			slap_free_listener_addresses(psal);
- 			return NULL;
- 		}
--		l.sl_name = ch_malloc( strlen((char *)sai->ai_addr) + sizeof("PATH=") );
--		sprintf( l.sl_name, "PATH=%s", sai->ai_addr );
--		break;
--#  endif /* LDAP_PF_LOCAL */
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
-+		sprintf( l.sl_name, "PATH=%s", addr );
-+	} break;
-+#endif /* LDAP_PF_LOCAL */
- 
- 	case AF_INET: {
-+		char *s;
-+#ifdef HAVE_GETADDRINFO		
- 		char addr[INET_ADDRSTRLEN];
--		inet_ntop( AF_INET,
--			&((struct sockaddr_in *)sai->ai_addr)->sin_addr,
--			addr, sizeof(addr) );
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP=:") );
--		sprintf( l.sl_name, "IP=%s:%s", addr, serv );
-+		inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
-+			   addr, sizeof(addr) );
-+		s = addr;
-+#else
-+		s = inet_ntoa( l.sl_addr.sin_addr );
-+#endif		
-+		l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
-+		sprintf( l.sl_name, "IP=%s:%d",
-+			 s != NULL ? s : "unknown" , port );
- 	} break;
- 
--#  ifdef LDAP_PF_INET6
-+#ifdef LDAP_PF_INET6
- 	case AF_INET6: {
- 		char addr[INET6_ADDRSTRLEN];
--		inet_ntop( AF_INET6,
--			&((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr,
--			addr, sizeof addr);
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP= ") );
--		sprintf( l.sl_name, "IP=%s %s", addr, serv );
-+		inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
-+			   addr, sizeof addr);
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
-+		sprintf( l.sl_name, "IP=%s %d", addr, port );
- 	} break;
--#  endif /* LDAP_PF_INET6 */
-+#endif /* LDAP_PF_INET6 */
- 
- 	default:
- 		Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
--			(int) sai->ai_family, 0, 0 );
-+			(int) (*sal)->sa_family, 0, 0 );
- 		break;
- 	}
--#else
--#ifdef LDAP_PF_LOCAL
--	/* close conditional */
--	}
--#endif /* LDAP_PF_LOCAL */
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_un_addr) );
--			break;
--#endif
--
--		case AF_INET:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_in_addr) );
--			break;
- 
--		default:
--			rc = AC_SOCKET_ERROR;
--			errno = EINVAL;
--			break;
--	}
--
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			if ( chmod( l.sl_sa.sa_un_addr.sun_path, S_IRWXU ) < 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: chmod(%ld) failed errno=%d (%s)",
--					(long) l.sl_sd, err, sock_errstr(err) );
--				tcp_close( l.sl_sd );
--				return NULL;
--			}
--
--			l.sl_name = ch_malloc( strlen(l.sl_sa.sa_un_addr.sun_path)
--				+ sizeof("PATH=") );
--			sprintf( l.sl_name, "PATH=%s", l.sl_sa.sa_un_addr.sun_path );
--			break;
--#endif /* LDAP_PF_LOCAL */
--
--		case AF_INET:
--			l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
--			s = inet_ntoa( l.sl_addr.sin_addr );
--			sprintf( l.sl_name, "IP=%s:%d",
--				s != NULL ? s : "unknown" , port );
--			break;
--
--		default:
--			l.sl_name = ch_strdup( "UNKNOWN" );
--			break;
--	}
--
--#endif /* HAVE_GETADDRINFO */
-+	slap_free_listener_addresses(psal);
- 
- 	l.sl_url = ch_strdup( url );
- 	li = ch_malloc( sizeof( Listener ) );
-@@ -608,7 +675,7 @@
- 	slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
- 
- 	for(i = 0; u[i] != NULL; i++ ) {
--		slap_listeners[i] = open_listener( u[i] );
-+		slap_listeners[i] = slap_open_listener( u[i] );
- 
- 		if( slap_listeners[i] == NULL ) {
- 			charray_free( u );
-@@ -642,7 +709,6 @@
- 	void *ptr
- )
- {
--	int rc, tmp;
- 	int l;
- 	time_t	last_idle_check = slap_get_time();
- 	time( &starttime );
-@@ -651,7 +717,7 @@
- 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
- 			continue;
- 
--		if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
-+		if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: listen(%s, 5) failed errno=%d (%s)\n",
-@@ -814,7 +880,7 @@
- 		}
- 
- 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
--			ber_int_t s;
-+			ber_socket_t s;
- 			socklen_t len = sizeof(from);
- 			long id;
- 			slap_ssf_t ssf = 0;
-@@ -860,31 +926,6 @@
- 			}
- #endif
- 
--#ifdef SO_KEEPALIVE
--			/* enable keep alives */
--			rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
--				(char *) &tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--#ifdef TCP_NODELAY
--			/* enable no delay */
--			tmp = 1;
--			rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
--				(char *)&tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(TCP_NODELAY) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--
--
- #ifdef LDAP_DEBUG
- 			ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- 
-@@ -896,20 +937,44 @@
- 			ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
- #endif
- 
-+#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY )
-+#ifdef LDAP_PF_LOCAL
-+			/* for IPv4 and IPv6 sockets only */
-+			if ( from.sa_addr.sa_family != AF_LOCAL )
-+#endif /* LDAP_PF_LOCAL */
-+			{
-+				int rc;
-+				int tmp;
-+#ifdef SO_KEEPALIVE
-+				/* enable keep alives */
-+				tmp = 1;
-+				rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
-+					(char *) &tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+#ifdef TCP_NODELAY
-+				/* enable no delay */
-+				tmp = 1;
-+				rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
-+					(char *)&tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(TCP_NODELAY) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+			}
-+#endif
-+
- 			Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
- 				(long) s, 0, 0 );
- 
--			len = sizeof(from);
--
--			if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
--					(long) s, err, sock_errstr(err) );
--				slapd_close(s);
--				continue;
--			}
--
- 			switch ( from.sa_addr.sa_family ) {
- #  ifdef LDAP_PF_LOCAL
- 			case AF_LOCAL:
-@@ -948,6 +1013,7 @@
- 				slapd_close(s);
- 				continue;
- 			}
-+
- 			if ( ( from.sa_addr.sa_family == AF_INET ) 
- #ifdef LDAP_PF_INET6
- 				|| ( from.sa_addr.sa_family == AF_INET6 )
-@@ -961,7 +1027,7 @@
- 						sizeof(from.sa_in6_addr.sin6_addr),
- 						AF_INET6 );
- 				else
--#  endif LDAP_PF_INET6
-+#  endif /* LDAP_PF_INET6 */
- 				hp = gethostbyaddr(
- 					(char *) &(from.sa_in_addr.sin_addr),
- 					sizeof(from.sa_in_addr.sin_addr),
-@@ -1202,23 +1268,25 @@
- 	connections_init();
- 
- #define SLAPD_LISTENER_THREAD 1
--#if defined( SLAPD_LISTENER_THREAD ) || !defined(HAVE_PTHREADS)
-+#if defined( SLAPD_LISTENER_THREAD )
-+	{
-+		ldap_pvt_thread_t	listener_tid;
- 
--	/* listener as a separate THREAD */
--	rc = ldap_pvt_thread_create( &listener_tid,
--		0, slapd_daemon_task, NULL );
-+		/* listener as a separate THREAD */
-+		rc = ldap_pvt_thread_create( &listener_tid,
-+			0, slapd_daemon_task, NULL );
- 
--	if ( rc != 0 ) {
--		Debug( LDAP_DEBUG_ANY,
--		    "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
--		return rc;
--	}
-+		if ( rc != 0 ) {
-+			Debug( LDAP_DEBUG_ANY,
-+		    	"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-+			return rc;
-+		}
- 
--	/* wait for the listener thread to complete */
--	ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+		/* wait for the listener thread to complete */
-+		ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+ 	}
- #else
--	/* expermimental code */
--	listener_tid = pthread_self();
-+	/* experimental code */
- 	slapd_daemon_task( NULL );
- #endif
- 
-@@ -1307,4 +1375,9 @@
- 
- 	/* reinstall self */
- 	(void) SIGNAL_REINSTALL( sig, slap_sig_wake );
-+}
-+
-+
-+void slapd_add_internal(ber_socket_t s) {
-+	slapd_add(s);
- }
diff --git a/net/openldap21-server/files/patch-servers_slapd_schema b/net/openldap21-server/files/patch-servers_slapd_schema
deleted file mode 100644
index 31969e8bb621..000000000000
--- a/net/openldap21-server/files/patch-servers_slapd_schema
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/schema/krb5-kdc.schema.orig	Tue Sep  5 13:28:34 2000
-+++ servers/slapd/schema/krb5-kdc.schema	Mon Oct 30 13:09:19 2000
-@@ -96,7 +96,7 @@
- attributetype ( 1.3.6.1.4.1.5322.10.1.10
- 	NAME 'krb5Key'
- 	DESC 'Encoded ASN1 Key as an octet string'
--	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
- 
- attributetype ( 1.3.6.1.4.1.5322.10.1.11
- 	NAME 'krb5PrincipalRealm'
-@@ -112,7 +112,7 @@
- 
- objectclass ( 1.3.6.1.4.1.5322.10.2.1
- 	NAME 'krb5Principal'
--	SUP top
-+	SUP person
- 	AUXILIARY
- 	MUST ( krb5PrincipalName )
- 	MAY ( cn $ krb5PrincipalRealm ) )
diff --git a/net/openldap21-server/files/slapd.sh b/net/openldap21-server/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap21-server/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap21-server/pkg-comment b/net/openldap21-server/pkg-comment
deleted file mode 100644
index 8c499c3923cf..000000000000
--- a/net/openldap21-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open source LDAP client and server software
diff --git a/net/openldap21-server/pkg-descr b/net/openldap21-server/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap21-server/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap21-server/pkg-plist b/net/openldap21-server/pkg-plist
deleted file mode 100644
index 764525594e11..000000000000
--- a/net/openldap21-server/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
-@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ ! -f %B/schema/corba.schema ] && cp %B/%f %B/schema/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ ! -f %B/schema/core.schema ] && cp %B/%f %B/schema/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ ! -f %B/schema/cosine.schema ] && cp %B/%f %B/schema/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ ! -f %B/schema/inetorgperson.schema ] && cp %B/%f %B/schema/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ ! -f %B/schema/java.schema ] && cp %B/%f %B/schema/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ ! -f %B/schema/krb5-kdc.schema ] && cp %B/%f %B/schema/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ ! -f %B/schema/misc.schema ] && cp %B/%f %B/schema/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nadf.schema %D/etc/openldap/schema/nadf.schema.default; then rm -f %D/etc/openldap/schema/nadf.schema; fi
-etc/openldap/schema/nadf.schema.default
-@exec [ ! -f %B/schema/nadf.schema ] && cp %B/%f %B/schema/nadf.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ ! -f %B/schema/nis.schema ] && cp %B/%f %B/schema/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ ! -f %B/schema/openldap.schema ] && cp %B/%f %B/schema/openldap.schema
-@dirrm etc/openldap/schema
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.2
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
deleted file mode 100644
index 984b1a7d60fb..000000000000
--- a/net/openldap21/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 2.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	2.0.6
-PORTREVISION=	2
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-USE_OPENSSL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/run \
-		--with-threads \
-		--enable-shared \
-		--enable-dnssrv \
-		--with-tls=openssl
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
-.endif
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/maildap \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-post-configure:
-	cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff
-
-pre-build:
-	cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	strip ${PREFIX}/${f}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap21/distinfo b/net/openldap21/distinfo
deleted file mode 100644
index 8a9668d4e077..000000000000
--- a/net/openldap21/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-2.0.6.tgz) = 6df0ebc7da308999146102f950ecdaed
diff --git a/net/openldap21/files/libtool.diff b/net/openldap21/files/libtool.diff
deleted file mode 100644
index 0cf57bbee7ea..000000000000
--- a/net/openldap21/files/libtool.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libtool.orig	Tue Oct 31 01:43:06 2000
-+++ libtool	Tue Oct 31 01:44:42 2000
-@@ -448,6 +448,16 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --only-shared)
-+    build_libtool_libs=yes
-+    build_old_libs=no
-+    ;;
-+
-+  --only-static)
-+    build_libtool_libs=no
-+    build_old_libs=yes
-+    ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
diff --git a/net/openldap21/files/manpages b/net/openldap21/files/manpages
deleted file mode 100644
index 1c39b81911fc..000000000000
--- a/net/openldap21/files/manpages
+++ /dev/null
@@ -1,219 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	lber-memory.3
-MAN3+=	lber-types.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_schema.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapadd.8
-MAN8+=	slapcat.8
-MAN8+=	slapd.8
-MAN8+=	slapindex.8
-MAN8+=	slappasswd.8
-MAN8+=	slurpd.8
-MLINKS+=	lber-decode.3 ber_first_element.3
-MLINKS+=	lber-decode.3 ber_get_bitstring.3
-MLINKS+=	lber-decode.3 ber_get_boolean.3
-MLINKS+=	lber-decode.3 ber_get_enum.3
-MLINKS+=	lber-decode.3 ber_get_int.3
-MLINKS+=	lber-decode.3 ber_get_next.3
-MLINKS+=	lber-decode.3 ber_get_null.3
-MLINKS+=	lber-decode.3 ber_get_stringa.3
-MLINKS+=	lber-decode.3 ber_get_stringb.3
-MLINKS+=	lber-decode.3 ber_next_element.3
-MLINKS+=	lber-decode.3 ber_peek_tag.3
-MLINKS+=	lber-decode.3 ber_scanf.3
-MLINKS+=	lber-decode.3 ber_skip_tag.3
-MLINKS+=	lber-encode.3 ber_alloc_t.3
-MLINKS+=	lber-encode.3 ber_flush.3
-MLINKS+=	lber-encode.3 ber_printf.3
-MLINKS+=	lber-encode.3 ber_put_enum.3
-MLINKS+=	lber-encode.3 ber_put_int.3
-MLINKS+=	lber-encode.3 ber_put_null.3
-MLINKS+=	lber-encode.3 ber_put_ostring.3
-MLINKS+=	lber-encode.3 ber_put_seq.3
-MLINKS+=	lber-encode.3 ber_put_set.3
-MLINKS+=	lber-encode.3 ber_put_string.3
-MLINKS+=	lber-decode.3 ber_start_set.3
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_abandon_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext_s.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_rdn.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext_s.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_result.3 ldap_msgid.3
-MLINKS+=	ldap_result.3 ldap_msgtype.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2name.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2str.3
-MLINKS+=	ldap_schema.3 ldap_attributetype_free.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2name.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2str.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule_free.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2name.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2str.3
-MLINKS+=	ldap_schema.3 ldap_objectclass_free.3
-MLINKS+=	ldap_schema.3 ldap_scherr2str.3
-MLINKS+=	ldap_schema.3 ldap_str2attributetype.3
-MLINKS+=	ldap_schema.3 ldap_str2matchingrule.3
-MLINKS+=	ldap_schema.3 ldap_str2objectclass.3
-MLINKS+=	ldap_schema.3 ldap_str2syntax.3
-MLINKS+=	ldap_schema.3 ldap_syntax2name.3
-MLINKS+=	ldap_schema.3 ldap_syntax2str.3
-MLINKS+=	ldap_schema.3 ldap_syntax_free.3
-MLINKS+=	ldap_search.3 ldap_search_ext.3
-MLINKS+=	ldap_search.3 ldap_search_ext_s.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap21/files/patch-clients_ud_Makefile.in b/net/openldap21/files/patch-clients_ud_Makefile.in
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap21/files/patch-clients_ud_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap21/files/patch-servers_slapd_daemon.c b/net/openldap21/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 44baead6a6b7..000000000000
--- a/net/openldap21/files/patch-servers_slapd_daemon.c
+++ /dev/null
@@ -1,828 +0,0 @@
---- servers/slapd/daemon.c.orig	Sat Sep 30 11:24:28 2000
-+++ servers/slapd/daemon.c	Tue Oct 31 10:54:09 2000
-@@ -1,4 +1,4 @@
--/* $OpenLDAP: pkg/ldap/servers/slapd/daemon.c,v 1.99.2.12 2000/09/30 16:24:28 kurt Exp $ */
-+/* $OpenLDAP: servers/slapd/daemon.c,v 1.99.2.13 2000/10/30 18:14:51 kurt Exp $ */
- /*
-  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-@@ -59,6 +59,8 @@
- 
- Listener **slap_listeners = NULL;
- 
-+#define SLAPD_LISTEN 10
-+
- static ber_socket_t wake_sds[2];
- 
- #ifdef NO_THREADS
-@@ -81,8 +83,6 @@
- #endif
- volatile sig_atomic_t slapd_shutdown = 0;
- 
--static ldap_pvt_thread_t	listener_tid;
--
- static struct slap_daemon {
- 	ldap_pvt_thread_mutex_t	sd_mutex;
- 
-@@ -193,20 +193,207 @@
- 	tcp_close(s);
- }
- 
-+static void slap_free_listener_addresses(struct sockaddr **sal)
-+{
-+	struct sockaddr **sap;
-+
-+	if (sal == NULL) {
-+		return;
-+	}
-+
-+	for (sap = sal; *sap != NULL; sap++) {
-+		ch_free(*sap);
-+	}
-+
-+	ch_free(sal);
-+}
-+
-+/* port = 0 indicates AF_LOCAL */
-+static int slap_get_listener_addresses(
-+	const char *host,
-+	unsigned short port,
-+	struct sockaddr ***sal)
-+{
-+	struct sockaddr **sap;
-+#ifdef HAVE_GETADDRINFO
-+	struct addrinfo hints, *res, *sai;
-+	int n, err;
-+	
-+	memset( &hints, '\0', sizeof(hints) );
-+	hints.ai_flags = AI_PASSIVE;
-+	hints.ai_socktype = SOCK_STREAM;
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		hints.ai_family = AF_LOCAL;
-+		/* host specifies a service in this case */
-+		if (err = getaddrinfo(NULL, host, &hints, &res)) {
-+			if (err == EAI_FAMILY) {
-+				/* XXX Fake it */
-+				struct sockaddr_un *sun = calloc(1, sizeof(struct sockaddr_un));
-+				err = 0;
-+				res = calloc(1, sizeof(*res));
-+				assert(sun != NULL);
-+				assert(res != NULL);
-+				res->ai_flags = hints.ai_flags;
-+				res->ai_family = AF_LOCAL;
-+				res->ai_socktype = hints.ai_socktype;
-+				res->ai_addr = (struct sockaddr *)sun;
-+				res->ai_addrlen = sizeof(*sun);
-+				sun->sun_len = strlen(LDAPI_SOCK) + 1;
-+				sun->sun_family = AF_LOCAL;
-+				strcpy(sun->sun_path, LDAPI_SOCK);
-+			} else {
-+				Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				    gai_strerror(err), 0, 0);
-+				return -1;
-+			}
-+		}
-+	} else
-+#  endif
-+	{		
-+		char serv[7];
-+	
-+		snprintf(serv, sizeof serv, "%d", port);
-+		hints.ai_family = AF_UNSPEC;
-+		if (err = getaddrinfo(host, serv, &hints, &res)) {
-+			Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				gai_strerror(err), 0, 0);
-+			return -1;
-+		}
-+	}
-+
-+	sai = res;
-+	for (n=2; (sai = sai->ai_next) != NULL; n++) {
-+		/* EMPTY */ ;
-+	}
-+	*sal = ch_malloc(n * sizeof(*sal));
-+	if (*sal == NULL) {
-+		return -1;
-+	}
-+
-+	sai = res;
-+	sap = *sal;
-+	do {
-+		switch (sai->ai_family) {
-+#  ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_un));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_un *)*sap =
-+				*((struct sockaddr_un *)sai->ai_addr);
-+		} break;
-+#  endif
-+#  ifdef LDAP_PF_INET6			
-+		case AF_INET6: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in6));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in6 *)*sap =
-+				*((struct sockaddr_in6 *)sai->ai_addr);
-+		} break;
-+#  endif
-+		case AF_INET: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in *)*sap =
-+				*((struct sockaddr_in *)sai->ai_addr);
-+		} break;
-+		default: 
-+			*sap = NULL;
-+			break;
-+		}
-+		if (*sap != NULL) {
-+			(*sap)->sa_family = sai->ai_family;
-+			sap++;
-+		}
-+	} while ((sai = sai->ai_next) != NULL);
-+
-+	freeaddrinfo(res);
-+
-+#else
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_un));
-+		if (*sap == NULL)
-+			goto errexit;
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
-+		(*sap)->sa_family = AF_LOCAL;
-+		if ( strlen(host) >
-+		     (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: domain socket path (%s) too long in URL",
-+			       host, 0, 0);
-+			goto errexit;
-+		}
-+		strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
-+	} else
-+#  endif		
-+	{
-+		struct in_addr in;
-+
-+		if ( host == NULL ) {
-+			in.s_addr = htonl(INADDR_ANY);
-+
-+		} else if ( !inet_aton( host, &in ) ) {
-+			struct hostent *he = gethostbyname( host );
-+			if( he == NULL ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "daemon: invalid host %s", host, 0, 0);
-+				return -1;
-+			}
-+			AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
-+		}
-+
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_in));
-+		if (*sap == NULL) {
-+			goto errexit;
-+		}
-+
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
-+		(*sap)->sa_family = AF_INET;
-+		((struct sockaddr_in *)*sap)->sin_port = htons(port);
-+		((struct sockaddr_in *)*sap)->sin_addr = in;
-+	}
-+	sap++;
-+#endif
-+
-+	*sap = NULL;
-+	return 0;
-+
-+errexit:
-+	slap_free_listener_addresses(*sal);
-+	return -1;
-+}
- 
--static Listener * open_listener( const char* url )
-+static Listener * slap_open_listener(
-+	const char* url )
- {
- 	int	tmp, rc;
- 	Listener l;
- 	Listener *li;
- 	LDAPURLDesc *lud;
--	char *s;
--	int port;
--#ifdef HAVE_GETADDRINFO
--	char serv[7];
--	struct addrinfo hints, *res, *sai;
--	int err;
--#endif
-+	unsigned short port;
-+	int err, addrlen;
-+	struct sockaddr **sal, **psal;
- 
- 	rc = ldap_url_parse( url, &lud );
- 
-@@ -238,291 +425,171 @@
- 	}
- #endif
- 
--#ifdef HAVE_GETADDRINFO
--	memset( &hints, '\0', sizeof(hints) );
--	hints.ai_flags = AI_PASSIVE;
--	hints.ai_family = AF_UNSPEC;
--	hints.ai_socktype = SOCK_STREAM;
--
--#  ifdef LDAP_PF_LOCAL
-+	port = (unsigned short) lud->lud_port;
-+	
- 	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifdef LDAP_PF_LOCAL
- 		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			err = getaddrinfo(NULL, LDAPI_SOCK, &hints, &res);
--			if (!err)
--				unlink( LDAPI_SOCK );
-+			err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
- 		} else {
--			err = getaddrinfo(NULL, lud->lud_host, &hints, &res);
--			if (!err)
--				unlink( lud->lud_host );
-+			err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
- 		}
--	} else
--#  endif /* LDAP_PF_LOCAL */
--	{
--		snprintf(serv, sizeof serv, "%d", lud->lud_port);
-+#else
-+		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
-+			url, 0, 0);
-+		ldap_free_urldesc( lud );
-+		return NULL;
-+#endif
-+	} else {
- 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
- 			|| strcmp(lud->lud_host, "*") == 0 )
- 		{
--			err = getaddrinfo(NULL, serv, &hints, &res);
-+			err = slap_get_listener_addresses(NULL, port, &sal);
- 		} else {
--			err = getaddrinfo(lud->lud_host, serv, &hints, &res);
-+			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
- 		}
- 	}
- 
-+	ldap_free_urldesc( lud );
- 	if ( err ) {
--		Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed\n", 0, 0, 0);
--		ldap_free_urldesc( lud );
- 		return NULL;
- 	}
- 
--	ldap_free_urldesc( lud );
--	sai = res;
--	do {
--		if ( (sai->ai_family != AF_INET)
--#  ifdef LDAP_PF_INET6
--		     && (sai->ai_family != AF_INET6)
--#  endif
--#  ifdef LDAP_PF_LOCAL
--		     && (sai->ai_family != AF_LOCAL)
--#  endif
--		     )
-+	psal = sal;
-+	while ( *sal != NULL ) {
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+#endif
-+#ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL:
-+#endif
-+			break;
-+		default:
-+			sal++;
- 			continue;
--		l.sl_sd = socket( sai->ai_family, sai->ai_socktype, sai->ai_protocol);
-+		}
-+		l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
- 		if ( l.sl_sd == AC_SOCKET_INVALID ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: socket() failed errno=%d (%s)\n", err,
- 				sock_errstr(err), 0 );
-+			sal++;
- 			continue;
- 		}
--
--		if ( sai->ai_family != AF_LOCAL ) {
--#else
--
--	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifndef HAVE_WINSOCK
-+		if ( l.sl_sd >= dtblsize ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: listener descriptor %ld is too great %ld\n",
-+			       (long) l.sl_sd, (long) dtblsize, 0 );
-+			tcp_close( l.sl_sd );
-+			sal++;
-+			continue;
-+		}
-+#endif
- #ifdef LDAP_PF_LOCAL
--		port = 0;
--		(void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );
--
--		l.sl_sa.sa_un_addr.sun_family = AF_LOCAL;
--
--		/* hack: overload the host to be the path */
--		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			strcpy( l.sl_sa.sa_un_addr.sun_path, LDAPI_SOCK );
--		} else {
--			if ( strlen(lud->lud_host) > (sizeof(l.sl_sa.sa_un_addr.sun_path) - 1) ) {
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: domain socket path (%s) too long in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
--			}
--			strcpy( l.sl_sa.sa_un_addr.sun_path, lud->lud_host );
--		}
--		unlink( l.sl_sa.sa_un_addr.sun_path ); 
--#if 0
--		/* I don't think we need to set this. */
--		l.sl_sa.sa_un_addr.sun_len = sizeof( l.sl_sa.sa_un_addr.sun_len ) +
--			sizeof( l.sl_sa.sa_un_addr.sun_family ) +
--			strlen( l.sl_sa.sa_un_addr.sun_path ) + 1;
-+		if ( (*sal)->sa_family == AF_LOCAL ) {
-+			unlink ( ((struct sockaddr_un *)*sal)->sun_path );
-+		} else
- #endif
--#else
--		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
--			url, 0, 0);
--		ldap_free_urldesc( lud );
--		return NULL;
--#endif /* LDAP_PF_LOCAL */
--	} else {
--
--	port = lud->lud_port;
--
--	(void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
--
--	l.sl_addr.sin_family = AF_INET;
--	l.sl_addr.sin_port = htons( (unsigned short) lud->lud_port );
--
--	if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
--		|| strcmp(lud->lud_host, "*") == 0 )
--	{
--		l.sl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
--
--	} else {
--		/* host or address was specified */
--		if( !inet_aton( lud->lud_host, &l.sl_addr.sin_addr ) ) {
--			struct hostent *he = gethostbyname( lud->lud_host );
--			if( he == NULL ) {
-+		{
-+#ifdef SO_REUSEADDR
-+			/* enable address reuse */
-+			tmp = 1;
-+			rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
-+					 (char *) &tmp, sizeof(tmp) );
-+			if ( rc == AC_SOCKET_ERROR ) {
-+				int err = sock_errno();
- 				Debug( LDAP_DEBUG_ANY,
--					"daemon: invalid host (%s) in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
-+				       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
-+				       (long) l.sl_sd, err, sock_errstr(err) );
- 			}
--
--			AC_MEMCPY( &l.sl_addr.sin_addr, he->h_addr,
--			       sizeof( l.sl_addr.sin_addr ) );
-+#endif
- 		}
--	}
--	}
--
--	ldap_free_urldesc( lud );
--
--	l.sl_sd = socket( l.sl_sa.sa_addr.sa_family, SOCK_STREAM, 0 );
--	if ( l.sl_sd == AC_SOCKET_INVALID ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: socket() failed errno=%d (%s)\n", err,
--			sock_errstr(err), 0 );
--		return NULL;
--	}
--
--#ifndef HAVE_WINSOCK
--	if ( l.sl_sd >= dtblsize ) {
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: listener descriptor %ld is too great %ld\n",
--			(long) l.sl_sd, (long) dtblsize, 0 );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
-+	
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+			addrlen = sizeof(struct sockaddr_in);
-+			break;
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+			addrlen = sizeof(struct sockaddr_in6);
-+			break;
- #endif
--
- #ifdef LDAP_PF_LOCAL
--	/* for IPv4 and IPv6 sockets only */
--	if ( l.sl_sa.sa_addr.sa_family != AF_LOCAL ) {
--#endif /* LDAP_PF_LOCAL */
--#endif /* HAVE_GETADDRINFO */
--
--#ifdef SO_REUSEADDR
--	/* enable address reuse */
--	tmp = 1;
--	rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
--		(char *) &tmp, sizeof(tmp) );
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--	       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--	}
-+		case AF_LOCAL:
-+			addrlen = sizeof(struct sockaddr_un);
-+			break;
- #endif
--
--#ifdef HAVE_GETADDRINFO
--		} /* sai->ai_family != AF_LOCAL */
--		if (!bind(l.sl_sd, sai->ai_addr, sai->ai_addrlen))
-+		}
-+	
-+		if (!bind(l.sl_sd, *sal, addrlen))
- 			break;
- 		err = sock_errno();
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--			(long) l.sl_sd, err, sock_errstr(err) );
-+		       (long) l.sl_sd, err, sock_errstr(err) );
- 		tcp_close( l.sl_sd );
--	} while ((sai = sai->ai_next) != NULL);
-+		sal++;
-+	} /* while ( *sal != NULL ) */
- 
--	if (!sai) {
-+	if ( *sal == NULL ) {
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
- 			(long) l.sl_sd, 0, 0 );
-+		slap_free_listener_addresses(psal);
- 		return NULL;
- 	}
- 
--	switch ( sai->ai_family ) {
--#  ifdef LDAP_PF_LOCAL
--	case AF_LOCAL:
--		if ( chmod( (char *)sai->ai_addr, S_IRWXU ) < 0 ) {
-+	switch ( (*sal)->sa_family ) {
-+#ifdef LDAP_PF_LOCAL
-+	case AF_LOCAL: {
-+		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-+		if ( chmod( addr, S_IRWXU ) < 0 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
--				(long) l.sl_sd, err, sock_errstr(err) );
-+			       (long) l.sl_sd, err, sock_errstr(err) );
- 			tcp_close( l.sl_sd );
-+			slap_free_listener_addresses(psal);
- 			return NULL;
- 		}
--		l.sl_name = ch_malloc( strlen((char *)sai->ai_addr) + sizeof("PATH=") );
--		sprintf( l.sl_name, "PATH=%s", sai->ai_addr );
--		break;
--#  endif /* LDAP_PF_LOCAL */
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
-+		sprintf( l.sl_name, "PATH=%s", addr );
-+	} break;
-+#endif /* LDAP_PF_LOCAL */
- 
- 	case AF_INET: {
-+		char *s;
-+#ifdef HAVE_GETADDRINFO		
- 		char addr[INET_ADDRSTRLEN];
--		inet_ntop( AF_INET,
--			&((struct sockaddr_in *)sai->ai_addr)->sin_addr,
--			addr, sizeof(addr) );
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP=:") );
--		sprintf( l.sl_name, "IP=%s:%s", addr, serv );
-+		inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
-+			   addr, sizeof(addr) );
-+		s = addr;
-+#else
-+		s = inet_ntoa( l.sl_addr.sin_addr );
-+#endif		
-+		l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
-+		sprintf( l.sl_name, "IP=%s:%d",
-+			 s != NULL ? s : "unknown" , port );
- 	} break;
- 
--#  ifdef LDAP_PF_INET6
-+#ifdef LDAP_PF_INET6
- 	case AF_INET6: {
- 		char addr[INET6_ADDRSTRLEN];
--		inet_ntop( AF_INET6,
--			&((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr,
--			addr, sizeof addr);
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP= ") );
--		sprintf( l.sl_name, "IP=%s %s", addr, serv );
-+		inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
-+			   addr, sizeof addr);
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
-+		sprintf( l.sl_name, "IP=%s %d", addr, port );
- 	} break;
--#  endif /* LDAP_PF_INET6 */
-+#endif /* LDAP_PF_INET6 */
- 
- 	default:
- 		Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
--			(int) sai->ai_family, 0, 0 );
-+			(int) (*sal)->sa_family, 0, 0 );
- 		break;
- 	}
--#else
--#ifdef LDAP_PF_LOCAL
--	/* close conditional */
--	}
--#endif /* LDAP_PF_LOCAL */
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_un_addr) );
--			break;
--#endif
--
--		case AF_INET:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_in_addr) );
--			break;
- 
--		default:
--			rc = AC_SOCKET_ERROR;
--			errno = EINVAL;
--			break;
--	}
--
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			if ( chmod( l.sl_sa.sa_un_addr.sun_path, S_IRWXU ) < 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: chmod(%ld) failed errno=%d (%s)",
--					(long) l.sl_sd, err, sock_errstr(err) );
--				tcp_close( l.sl_sd );
--				return NULL;
--			}
--
--			l.sl_name = ch_malloc( strlen(l.sl_sa.sa_un_addr.sun_path)
--				+ sizeof("PATH=") );
--			sprintf( l.sl_name, "PATH=%s", l.sl_sa.sa_un_addr.sun_path );
--			break;
--#endif /* LDAP_PF_LOCAL */
--
--		case AF_INET:
--			l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
--			s = inet_ntoa( l.sl_addr.sin_addr );
--			sprintf( l.sl_name, "IP=%s:%d",
--				s != NULL ? s : "unknown" , port );
--			break;
--
--		default:
--			l.sl_name = ch_strdup( "UNKNOWN" );
--			break;
--	}
--
--#endif /* HAVE_GETADDRINFO */
-+	slap_free_listener_addresses(psal);
- 
- 	l.sl_url = ch_strdup( url );
- 	li = ch_malloc( sizeof( Listener ) );
-@@ -608,7 +675,7 @@
- 	slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
- 
- 	for(i = 0; u[i] != NULL; i++ ) {
--		slap_listeners[i] = open_listener( u[i] );
-+		slap_listeners[i] = slap_open_listener( u[i] );
- 
- 		if( slap_listeners[i] == NULL ) {
- 			charray_free( u );
-@@ -642,7 +709,6 @@
- 	void *ptr
- )
- {
--	int rc, tmp;
- 	int l;
- 	time_t	last_idle_check = slap_get_time();
- 	time( &starttime );
-@@ -651,7 +717,7 @@
- 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
- 			continue;
- 
--		if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
-+		if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: listen(%s, 5) failed errno=%d (%s)\n",
-@@ -814,7 +880,7 @@
- 		}
- 
- 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
--			ber_int_t s;
-+			ber_socket_t s;
- 			socklen_t len = sizeof(from);
- 			long id;
- 			slap_ssf_t ssf = 0;
-@@ -860,31 +926,6 @@
- 			}
- #endif
- 
--#ifdef SO_KEEPALIVE
--			/* enable keep alives */
--			rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
--				(char *) &tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--#ifdef TCP_NODELAY
--			/* enable no delay */
--			tmp = 1;
--			rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
--				(char *)&tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(TCP_NODELAY) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--
--
- #ifdef LDAP_DEBUG
- 			ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- 
-@@ -896,20 +937,44 @@
- 			ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
- #endif
- 
-+#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY )
-+#ifdef LDAP_PF_LOCAL
-+			/* for IPv4 and IPv6 sockets only */
-+			if ( from.sa_addr.sa_family != AF_LOCAL )
-+#endif /* LDAP_PF_LOCAL */
-+			{
-+				int rc;
-+				int tmp;
-+#ifdef SO_KEEPALIVE
-+				/* enable keep alives */
-+				tmp = 1;
-+				rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
-+					(char *) &tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+#ifdef TCP_NODELAY
-+				/* enable no delay */
-+				tmp = 1;
-+				rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
-+					(char *)&tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(TCP_NODELAY) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+			}
-+#endif
-+
- 			Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
- 				(long) s, 0, 0 );
- 
--			len = sizeof(from);
--
--			if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
--					(long) s, err, sock_errstr(err) );
--				slapd_close(s);
--				continue;
--			}
--
- 			switch ( from.sa_addr.sa_family ) {
- #  ifdef LDAP_PF_LOCAL
- 			case AF_LOCAL:
-@@ -948,6 +1013,7 @@
- 				slapd_close(s);
- 				continue;
- 			}
-+
- 			if ( ( from.sa_addr.sa_family == AF_INET ) 
- #ifdef LDAP_PF_INET6
- 				|| ( from.sa_addr.sa_family == AF_INET6 )
-@@ -961,7 +1027,7 @@
- 						sizeof(from.sa_in6_addr.sin6_addr),
- 						AF_INET6 );
- 				else
--#  endif LDAP_PF_INET6
-+#  endif /* LDAP_PF_INET6 */
- 				hp = gethostbyaddr(
- 					(char *) &(from.sa_in_addr.sin_addr),
- 					sizeof(from.sa_in_addr.sin_addr),
-@@ -1202,23 +1268,25 @@
- 	connections_init();
- 
- #define SLAPD_LISTENER_THREAD 1
--#if defined( SLAPD_LISTENER_THREAD ) || !defined(HAVE_PTHREADS)
-+#if defined( SLAPD_LISTENER_THREAD )
-+	{
-+		ldap_pvt_thread_t	listener_tid;
- 
--	/* listener as a separate THREAD */
--	rc = ldap_pvt_thread_create( &listener_tid,
--		0, slapd_daemon_task, NULL );
-+		/* listener as a separate THREAD */
-+		rc = ldap_pvt_thread_create( &listener_tid,
-+			0, slapd_daemon_task, NULL );
- 
--	if ( rc != 0 ) {
--		Debug( LDAP_DEBUG_ANY,
--		    "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
--		return rc;
--	}
-+		if ( rc != 0 ) {
-+			Debug( LDAP_DEBUG_ANY,
-+		    	"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-+			return rc;
-+		}
- 
--	/* wait for the listener thread to complete */
--	ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+		/* wait for the listener thread to complete */
-+		ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+ 	}
- #else
--	/* expermimental code */
--	listener_tid = pthread_self();
-+	/* experimental code */
- 	slapd_daemon_task( NULL );
- #endif
- 
-@@ -1307,4 +1375,9 @@
- 
- 	/* reinstall self */
- 	(void) SIGNAL_REINSTALL( sig, slap_sig_wake );
-+}
-+
-+
-+void slapd_add_internal(ber_socket_t s) {
-+	slapd_add(s);
- }
diff --git a/net/openldap21/files/patch-servers_slapd_schema b/net/openldap21/files/patch-servers_slapd_schema
deleted file mode 100644
index 31969e8bb621..000000000000
--- a/net/openldap21/files/patch-servers_slapd_schema
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/schema/krb5-kdc.schema.orig	Tue Sep  5 13:28:34 2000
-+++ servers/slapd/schema/krb5-kdc.schema	Mon Oct 30 13:09:19 2000
-@@ -96,7 +96,7 @@
- attributetype ( 1.3.6.1.4.1.5322.10.1.10
- 	NAME 'krb5Key'
- 	DESC 'Encoded ASN1 Key as an octet string'
--	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
- 
- attributetype ( 1.3.6.1.4.1.5322.10.1.11
- 	NAME 'krb5PrincipalRealm'
-@@ -112,7 +112,7 @@
- 
- objectclass ( 1.3.6.1.4.1.5322.10.2.1
- 	NAME 'krb5Principal'
--	SUP top
-+	SUP person
- 	AUXILIARY
- 	MUST ( krb5PrincipalName )
- 	MAY ( cn $ krb5PrincipalRealm ) )
diff --git a/net/openldap21/files/slapd.sh b/net/openldap21/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap21/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap21/pkg-comment b/net/openldap21/pkg-comment
deleted file mode 100644
index 8c499c3923cf..000000000000
--- a/net/openldap21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open source LDAP client and server software
diff --git a/net/openldap21/pkg-descr b/net/openldap21/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap21/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap21/pkg-plist b/net/openldap21/pkg-plist
deleted file mode 100644
index 764525594e11..000000000000
--- a/net/openldap21/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
-@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ ! -f %B/schema/corba.schema ] && cp %B/%f %B/schema/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ ! -f %B/schema/core.schema ] && cp %B/%f %B/schema/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ ! -f %B/schema/cosine.schema ] && cp %B/%f %B/schema/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ ! -f %B/schema/inetorgperson.schema ] && cp %B/%f %B/schema/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ ! -f %B/schema/java.schema ] && cp %B/%f %B/schema/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ ! -f %B/schema/krb5-kdc.schema ] && cp %B/%f %B/schema/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ ! -f %B/schema/misc.schema ] && cp %B/%f %B/schema/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nadf.schema %D/etc/openldap/schema/nadf.schema.default; then rm -f %D/etc/openldap/schema/nadf.schema; fi
-etc/openldap/schema/nadf.schema.default
-@exec [ ! -f %B/schema/nadf.schema ] && cp %B/%f %B/schema/nadf.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ ! -f %B/schema/nis.schema ] && cp %B/%f %B/schema/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ ! -f %B/schema/openldap.schema ] && cp %B/%f %B/schema/openldap.schema
-@dirrm etc/openldap/schema
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.2
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
deleted file mode 100644
index 984b1a7d60fb..000000000000
--- a/net/openldap22-server/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 2.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	2.0.6
-PORTREVISION=	2
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-USE_OPENSSL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/run \
-		--with-threads \
-		--enable-shared \
-		--enable-dnssrv \
-		--with-tls=openssl
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
-.endif
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/maildap \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-post-configure:
-	cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff
-
-pre-build:
-	cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	strip ${PREFIX}/${f}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap22-server/distinfo b/net/openldap22-server/distinfo
deleted file mode 100644
index 8a9668d4e077..000000000000
--- a/net/openldap22-server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-2.0.6.tgz) = 6df0ebc7da308999146102f950ecdaed
diff --git a/net/openldap22-server/files/libtool.diff b/net/openldap22-server/files/libtool.diff
deleted file mode 100644
index 0cf57bbee7ea..000000000000
--- a/net/openldap22-server/files/libtool.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libtool.orig	Tue Oct 31 01:43:06 2000
-+++ libtool	Tue Oct 31 01:44:42 2000
-@@ -448,6 +448,16 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --only-shared)
-+    build_libtool_libs=yes
-+    build_old_libs=no
-+    ;;
-+
-+  --only-static)
-+    build_libtool_libs=no
-+    build_old_libs=yes
-+    ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
diff --git a/net/openldap22-server/files/manpages b/net/openldap22-server/files/manpages
deleted file mode 100644
index 1c39b81911fc..000000000000
--- a/net/openldap22-server/files/manpages
+++ /dev/null
@@ -1,219 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	lber-memory.3
-MAN3+=	lber-types.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_schema.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapadd.8
-MAN8+=	slapcat.8
-MAN8+=	slapd.8
-MAN8+=	slapindex.8
-MAN8+=	slappasswd.8
-MAN8+=	slurpd.8
-MLINKS+=	lber-decode.3 ber_first_element.3
-MLINKS+=	lber-decode.3 ber_get_bitstring.3
-MLINKS+=	lber-decode.3 ber_get_boolean.3
-MLINKS+=	lber-decode.3 ber_get_enum.3
-MLINKS+=	lber-decode.3 ber_get_int.3
-MLINKS+=	lber-decode.3 ber_get_next.3
-MLINKS+=	lber-decode.3 ber_get_null.3
-MLINKS+=	lber-decode.3 ber_get_stringa.3
-MLINKS+=	lber-decode.3 ber_get_stringb.3
-MLINKS+=	lber-decode.3 ber_next_element.3
-MLINKS+=	lber-decode.3 ber_peek_tag.3
-MLINKS+=	lber-decode.3 ber_scanf.3
-MLINKS+=	lber-decode.3 ber_skip_tag.3
-MLINKS+=	lber-encode.3 ber_alloc_t.3
-MLINKS+=	lber-encode.3 ber_flush.3
-MLINKS+=	lber-encode.3 ber_printf.3
-MLINKS+=	lber-encode.3 ber_put_enum.3
-MLINKS+=	lber-encode.3 ber_put_int.3
-MLINKS+=	lber-encode.3 ber_put_null.3
-MLINKS+=	lber-encode.3 ber_put_ostring.3
-MLINKS+=	lber-encode.3 ber_put_seq.3
-MLINKS+=	lber-encode.3 ber_put_set.3
-MLINKS+=	lber-encode.3 ber_put_string.3
-MLINKS+=	lber-decode.3 ber_start_set.3
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_abandon_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext_s.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_rdn.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext_s.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_result.3 ldap_msgid.3
-MLINKS+=	ldap_result.3 ldap_msgtype.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2name.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2str.3
-MLINKS+=	ldap_schema.3 ldap_attributetype_free.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2name.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2str.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule_free.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2name.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2str.3
-MLINKS+=	ldap_schema.3 ldap_objectclass_free.3
-MLINKS+=	ldap_schema.3 ldap_scherr2str.3
-MLINKS+=	ldap_schema.3 ldap_str2attributetype.3
-MLINKS+=	ldap_schema.3 ldap_str2matchingrule.3
-MLINKS+=	ldap_schema.3 ldap_str2objectclass.3
-MLINKS+=	ldap_schema.3 ldap_str2syntax.3
-MLINKS+=	ldap_schema.3 ldap_syntax2name.3
-MLINKS+=	ldap_schema.3 ldap_syntax2str.3
-MLINKS+=	ldap_schema.3 ldap_syntax_free.3
-MLINKS+=	ldap_search.3 ldap_search_ext.3
-MLINKS+=	ldap_search.3 ldap_search_ext_s.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap22-server/files/patch-clients_ud_Makefile.in b/net/openldap22-server/files/patch-clients_ud_Makefile.in
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap22-server/files/patch-clients_ud_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap22-server/files/patch-servers_slapd_daemon.c b/net/openldap22-server/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 44baead6a6b7..000000000000
--- a/net/openldap22-server/files/patch-servers_slapd_daemon.c
+++ /dev/null
@@ -1,828 +0,0 @@
---- servers/slapd/daemon.c.orig	Sat Sep 30 11:24:28 2000
-+++ servers/slapd/daemon.c	Tue Oct 31 10:54:09 2000
-@@ -1,4 +1,4 @@
--/* $OpenLDAP: pkg/ldap/servers/slapd/daemon.c,v 1.99.2.12 2000/09/30 16:24:28 kurt Exp $ */
-+/* $OpenLDAP: servers/slapd/daemon.c,v 1.99.2.13 2000/10/30 18:14:51 kurt Exp $ */
- /*
-  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-@@ -59,6 +59,8 @@
- 
- Listener **slap_listeners = NULL;
- 
-+#define SLAPD_LISTEN 10
-+
- static ber_socket_t wake_sds[2];
- 
- #ifdef NO_THREADS
-@@ -81,8 +83,6 @@
- #endif
- volatile sig_atomic_t slapd_shutdown = 0;
- 
--static ldap_pvt_thread_t	listener_tid;
--
- static struct slap_daemon {
- 	ldap_pvt_thread_mutex_t	sd_mutex;
- 
-@@ -193,20 +193,207 @@
- 	tcp_close(s);
- }
- 
-+static void slap_free_listener_addresses(struct sockaddr **sal)
-+{
-+	struct sockaddr **sap;
-+
-+	if (sal == NULL) {
-+		return;
-+	}
-+
-+	for (sap = sal; *sap != NULL; sap++) {
-+		ch_free(*sap);
-+	}
-+
-+	ch_free(sal);
-+}
-+
-+/* port = 0 indicates AF_LOCAL */
-+static int slap_get_listener_addresses(
-+	const char *host,
-+	unsigned short port,
-+	struct sockaddr ***sal)
-+{
-+	struct sockaddr **sap;
-+#ifdef HAVE_GETADDRINFO
-+	struct addrinfo hints, *res, *sai;
-+	int n, err;
-+	
-+	memset( &hints, '\0', sizeof(hints) );
-+	hints.ai_flags = AI_PASSIVE;
-+	hints.ai_socktype = SOCK_STREAM;
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		hints.ai_family = AF_LOCAL;
-+		/* host specifies a service in this case */
-+		if (err = getaddrinfo(NULL, host, &hints, &res)) {
-+			if (err == EAI_FAMILY) {
-+				/* XXX Fake it */
-+				struct sockaddr_un *sun = calloc(1, sizeof(struct sockaddr_un));
-+				err = 0;
-+				res = calloc(1, sizeof(*res));
-+				assert(sun != NULL);
-+				assert(res != NULL);
-+				res->ai_flags = hints.ai_flags;
-+				res->ai_family = AF_LOCAL;
-+				res->ai_socktype = hints.ai_socktype;
-+				res->ai_addr = (struct sockaddr *)sun;
-+				res->ai_addrlen = sizeof(*sun);
-+				sun->sun_len = strlen(LDAPI_SOCK) + 1;
-+				sun->sun_family = AF_LOCAL;
-+				strcpy(sun->sun_path, LDAPI_SOCK);
-+			} else {
-+				Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				    gai_strerror(err), 0, 0);
-+				return -1;
-+			}
-+		}
-+	} else
-+#  endif
-+	{		
-+		char serv[7];
-+	
-+		snprintf(serv, sizeof serv, "%d", port);
-+		hints.ai_family = AF_UNSPEC;
-+		if (err = getaddrinfo(host, serv, &hints, &res)) {
-+			Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				gai_strerror(err), 0, 0);
-+			return -1;
-+		}
-+	}
-+
-+	sai = res;
-+	for (n=2; (sai = sai->ai_next) != NULL; n++) {
-+		/* EMPTY */ ;
-+	}
-+	*sal = ch_malloc(n * sizeof(*sal));
-+	if (*sal == NULL) {
-+		return -1;
-+	}
-+
-+	sai = res;
-+	sap = *sal;
-+	do {
-+		switch (sai->ai_family) {
-+#  ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_un));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_un *)*sap =
-+				*((struct sockaddr_un *)sai->ai_addr);
-+		} break;
-+#  endif
-+#  ifdef LDAP_PF_INET6			
-+		case AF_INET6: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in6));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in6 *)*sap =
-+				*((struct sockaddr_in6 *)sai->ai_addr);
-+		} break;
-+#  endif
-+		case AF_INET: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in *)*sap =
-+				*((struct sockaddr_in *)sai->ai_addr);
-+		} break;
-+		default: 
-+			*sap = NULL;
-+			break;
-+		}
-+		if (*sap != NULL) {
-+			(*sap)->sa_family = sai->ai_family;
-+			sap++;
-+		}
-+	} while ((sai = sai->ai_next) != NULL);
-+
-+	freeaddrinfo(res);
-+
-+#else
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_un));
-+		if (*sap == NULL)
-+			goto errexit;
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
-+		(*sap)->sa_family = AF_LOCAL;
-+		if ( strlen(host) >
-+		     (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: domain socket path (%s) too long in URL",
-+			       host, 0, 0);
-+			goto errexit;
-+		}
-+		strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
-+	} else
-+#  endif		
-+	{
-+		struct in_addr in;
-+
-+		if ( host == NULL ) {
-+			in.s_addr = htonl(INADDR_ANY);
-+
-+		} else if ( !inet_aton( host, &in ) ) {
-+			struct hostent *he = gethostbyname( host );
-+			if( he == NULL ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "daemon: invalid host %s", host, 0, 0);
-+				return -1;
-+			}
-+			AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
-+		}
-+
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_in));
-+		if (*sap == NULL) {
-+			goto errexit;
-+		}
-+
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
-+		(*sap)->sa_family = AF_INET;
-+		((struct sockaddr_in *)*sap)->sin_port = htons(port);
-+		((struct sockaddr_in *)*sap)->sin_addr = in;
-+	}
-+	sap++;
-+#endif
-+
-+	*sap = NULL;
-+	return 0;
-+
-+errexit:
-+	slap_free_listener_addresses(*sal);
-+	return -1;
-+}
- 
--static Listener * open_listener( const char* url )
-+static Listener * slap_open_listener(
-+	const char* url )
- {
- 	int	tmp, rc;
- 	Listener l;
- 	Listener *li;
- 	LDAPURLDesc *lud;
--	char *s;
--	int port;
--#ifdef HAVE_GETADDRINFO
--	char serv[7];
--	struct addrinfo hints, *res, *sai;
--	int err;
--#endif
-+	unsigned short port;
-+	int err, addrlen;
-+	struct sockaddr **sal, **psal;
- 
- 	rc = ldap_url_parse( url, &lud );
- 
-@@ -238,291 +425,171 @@
- 	}
- #endif
- 
--#ifdef HAVE_GETADDRINFO
--	memset( &hints, '\0', sizeof(hints) );
--	hints.ai_flags = AI_PASSIVE;
--	hints.ai_family = AF_UNSPEC;
--	hints.ai_socktype = SOCK_STREAM;
--
--#  ifdef LDAP_PF_LOCAL
-+	port = (unsigned short) lud->lud_port;
-+	
- 	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifdef LDAP_PF_LOCAL
- 		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			err = getaddrinfo(NULL, LDAPI_SOCK, &hints, &res);
--			if (!err)
--				unlink( LDAPI_SOCK );
-+			err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
- 		} else {
--			err = getaddrinfo(NULL, lud->lud_host, &hints, &res);
--			if (!err)
--				unlink( lud->lud_host );
-+			err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
- 		}
--	} else
--#  endif /* LDAP_PF_LOCAL */
--	{
--		snprintf(serv, sizeof serv, "%d", lud->lud_port);
-+#else
-+		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
-+			url, 0, 0);
-+		ldap_free_urldesc( lud );
-+		return NULL;
-+#endif
-+	} else {
- 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
- 			|| strcmp(lud->lud_host, "*") == 0 )
- 		{
--			err = getaddrinfo(NULL, serv, &hints, &res);
-+			err = slap_get_listener_addresses(NULL, port, &sal);
- 		} else {
--			err = getaddrinfo(lud->lud_host, serv, &hints, &res);
-+			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
- 		}
- 	}
- 
-+	ldap_free_urldesc( lud );
- 	if ( err ) {
--		Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed\n", 0, 0, 0);
--		ldap_free_urldesc( lud );
- 		return NULL;
- 	}
- 
--	ldap_free_urldesc( lud );
--	sai = res;
--	do {
--		if ( (sai->ai_family != AF_INET)
--#  ifdef LDAP_PF_INET6
--		     && (sai->ai_family != AF_INET6)
--#  endif
--#  ifdef LDAP_PF_LOCAL
--		     && (sai->ai_family != AF_LOCAL)
--#  endif
--		     )
-+	psal = sal;
-+	while ( *sal != NULL ) {
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+#endif
-+#ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL:
-+#endif
-+			break;
-+		default:
-+			sal++;
- 			continue;
--		l.sl_sd = socket( sai->ai_family, sai->ai_socktype, sai->ai_protocol);
-+		}
-+		l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
- 		if ( l.sl_sd == AC_SOCKET_INVALID ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: socket() failed errno=%d (%s)\n", err,
- 				sock_errstr(err), 0 );
-+			sal++;
- 			continue;
- 		}
--
--		if ( sai->ai_family != AF_LOCAL ) {
--#else
--
--	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifndef HAVE_WINSOCK
-+		if ( l.sl_sd >= dtblsize ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: listener descriptor %ld is too great %ld\n",
-+			       (long) l.sl_sd, (long) dtblsize, 0 );
-+			tcp_close( l.sl_sd );
-+			sal++;
-+			continue;
-+		}
-+#endif
- #ifdef LDAP_PF_LOCAL
--		port = 0;
--		(void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );
--
--		l.sl_sa.sa_un_addr.sun_family = AF_LOCAL;
--
--		/* hack: overload the host to be the path */
--		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			strcpy( l.sl_sa.sa_un_addr.sun_path, LDAPI_SOCK );
--		} else {
--			if ( strlen(lud->lud_host) > (sizeof(l.sl_sa.sa_un_addr.sun_path) - 1) ) {
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: domain socket path (%s) too long in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
--			}
--			strcpy( l.sl_sa.sa_un_addr.sun_path, lud->lud_host );
--		}
--		unlink( l.sl_sa.sa_un_addr.sun_path ); 
--#if 0
--		/* I don't think we need to set this. */
--		l.sl_sa.sa_un_addr.sun_len = sizeof( l.sl_sa.sa_un_addr.sun_len ) +
--			sizeof( l.sl_sa.sa_un_addr.sun_family ) +
--			strlen( l.sl_sa.sa_un_addr.sun_path ) + 1;
-+		if ( (*sal)->sa_family == AF_LOCAL ) {
-+			unlink ( ((struct sockaddr_un *)*sal)->sun_path );
-+		} else
- #endif
--#else
--		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
--			url, 0, 0);
--		ldap_free_urldesc( lud );
--		return NULL;
--#endif /* LDAP_PF_LOCAL */
--	} else {
--
--	port = lud->lud_port;
--
--	(void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
--
--	l.sl_addr.sin_family = AF_INET;
--	l.sl_addr.sin_port = htons( (unsigned short) lud->lud_port );
--
--	if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
--		|| strcmp(lud->lud_host, "*") == 0 )
--	{
--		l.sl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
--
--	} else {
--		/* host or address was specified */
--		if( !inet_aton( lud->lud_host, &l.sl_addr.sin_addr ) ) {
--			struct hostent *he = gethostbyname( lud->lud_host );
--			if( he == NULL ) {
-+		{
-+#ifdef SO_REUSEADDR
-+			/* enable address reuse */
-+			tmp = 1;
-+			rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
-+					 (char *) &tmp, sizeof(tmp) );
-+			if ( rc == AC_SOCKET_ERROR ) {
-+				int err = sock_errno();
- 				Debug( LDAP_DEBUG_ANY,
--					"daemon: invalid host (%s) in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
-+				       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
-+				       (long) l.sl_sd, err, sock_errstr(err) );
- 			}
--
--			AC_MEMCPY( &l.sl_addr.sin_addr, he->h_addr,
--			       sizeof( l.sl_addr.sin_addr ) );
-+#endif
- 		}
--	}
--	}
--
--	ldap_free_urldesc( lud );
--
--	l.sl_sd = socket( l.sl_sa.sa_addr.sa_family, SOCK_STREAM, 0 );
--	if ( l.sl_sd == AC_SOCKET_INVALID ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: socket() failed errno=%d (%s)\n", err,
--			sock_errstr(err), 0 );
--		return NULL;
--	}
--
--#ifndef HAVE_WINSOCK
--	if ( l.sl_sd >= dtblsize ) {
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: listener descriptor %ld is too great %ld\n",
--			(long) l.sl_sd, (long) dtblsize, 0 );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
-+	
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+			addrlen = sizeof(struct sockaddr_in);
-+			break;
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+			addrlen = sizeof(struct sockaddr_in6);
-+			break;
- #endif
--
- #ifdef LDAP_PF_LOCAL
--	/* for IPv4 and IPv6 sockets only */
--	if ( l.sl_sa.sa_addr.sa_family != AF_LOCAL ) {
--#endif /* LDAP_PF_LOCAL */
--#endif /* HAVE_GETADDRINFO */
--
--#ifdef SO_REUSEADDR
--	/* enable address reuse */
--	tmp = 1;
--	rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
--		(char *) &tmp, sizeof(tmp) );
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--	       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--	}
-+		case AF_LOCAL:
-+			addrlen = sizeof(struct sockaddr_un);
-+			break;
- #endif
--
--#ifdef HAVE_GETADDRINFO
--		} /* sai->ai_family != AF_LOCAL */
--		if (!bind(l.sl_sd, sai->ai_addr, sai->ai_addrlen))
-+		}
-+	
-+		if (!bind(l.sl_sd, *sal, addrlen))
- 			break;
- 		err = sock_errno();
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--			(long) l.sl_sd, err, sock_errstr(err) );
-+		       (long) l.sl_sd, err, sock_errstr(err) );
- 		tcp_close( l.sl_sd );
--	} while ((sai = sai->ai_next) != NULL);
-+		sal++;
-+	} /* while ( *sal != NULL ) */
- 
--	if (!sai) {
-+	if ( *sal == NULL ) {
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
- 			(long) l.sl_sd, 0, 0 );
-+		slap_free_listener_addresses(psal);
- 		return NULL;
- 	}
- 
--	switch ( sai->ai_family ) {
--#  ifdef LDAP_PF_LOCAL
--	case AF_LOCAL:
--		if ( chmod( (char *)sai->ai_addr, S_IRWXU ) < 0 ) {
-+	switch ( (*sal)->sa_family ) {
-+#ifdef LDAP_PF_LOCAL
-+	case AF_LOCAL: {
-+		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-+		if ( chmod( addr, S_IRWXU ) < 0 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
--				(long) l.sl_sd, err, sock_errstr(err) );
-+			       (long) l.sl_sd, err, sock_errstr(err) );
- 			tcp_close( l.sl_sd );
-+			slap_free_listener_addresses(psal);
- 			return NULL;
- 		}
--		l.sl_name = ch_malloc( strlen((char *)sai->ai_addr) + sizeof("PATH=") );
--		sprintf( l.sl_name, "PATH=%s", sai->ai_addr );
--		break;
--#  endif /* LDAP_PF_LOCAL */
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
-+		sprintf( l.sl_name, "PATH=%s", addr );
-+	} break;
-+#endif /* LDAP_PF_LOCAL */
- 
- 	case AF_INET: {
-+		char *s;
-+#ifdef HAVE_GETADDRINFO		
- 		char addr[INET_ADDRSTRLEN];
--		inet_ntop( AF_INET,
--			&((struct sockaddr_in *)sai->ai_addr)->sin_addr,
--			addr, sizeof(addr) );
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP=:") );
--		sprintf( l.sl_name, "IP=%s:%s", addr, serv );
-+		inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
-+			   addr, sizeof(addr) );
-+		s = addr;
-+#else
-+		s = inet_ntoa( l.sl_addr.sin_addr );
-+#endif		
-+		l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
-+		sprintf( l.sl_name, "IP=%s:%d",
-+			 s != NULL ? s : "unknown" , port );
- 	} break;
- 
--#  ifdef LDAP_PF_INET6
-+#ifdef LDAP_PF_INET6
- 	case AF_INET6: {
- 		char addr[INET6_ADDRSTRLEN];
--		inet_ntop( AF_INET6,
--			&((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr,
--			addr, sizeof addr);
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP= ") );
--		sprintf( l.sl_name, "IP=%s %s", addr, serv );
-+		inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
-+			   addr, sizeof addr);
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
-+		sprintf( l.sl_name, "IP=%s %d", addr, port );
- 	} break;
--#  endif /* LDAP_PF_INET6 */
-+#endif /* LDAP_PF_INET6 */
- 
- 	default:
- 		Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
--			(int) sai->ai_family, 0, 0 );
-+			(int) (*sal)->sa_family, 0, 0 );
- 		break;
- 	}
--#else
--#ifdef LDAP_PF_LOCAL
--	/* close conditional */
--	}
--#endif /* LDAP_PF_LOCAL */
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_un_addr) );
--			break;
--#endif
--
--		case AF_INET:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_in_addr) );
--			break;
- 
--		default:
--			rc = AC_SOCKET_ERROR;
--			errno = EINVAL;
--			break;
--	}
--
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			if ( chmod( l.sl_sa.sa_un_addr.sun_path, S_IRWXU ) < 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: chmod(%ld) failed errno=%d (%s)",
--					(long) l.sl_sd, err, sock_errstr(err) );
--				tcp_close( l.sl_sd );
--				return NULL;
--			}
--
--			l.sl_name = ch_malloc( strlen(l.sl_sa.sa_un_addr.sun_path)
--				+ sizeof("PATH=") );
--			sprintf( l.sl_name, "PATH=%s", l.sl_sa.sa_un_addr.sun_path );
--			break;
--#endif /* LDAP_PF_LOCAL */
--
--		case AF_INET:
--			l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
--			s = inet_ntoa( l.sl_addr.sin_addr );
--			sprintf( l.sl_name, "IP=%s:%d",
--				s != NULL ? s : "unknown" , port );
--			break;
--
--		default:
--			l.sl_name = ch_strdup( "UNKNOWN" );
--			break;
--	}
--
--#endif /* HAVE_GETADDRINFO */
-+	slap_free_listener_addresses(psal);
- 
- 	l.sl_url = ch_strdup( url );
- 	li = ch_malloc( sizeof( Listener ) );
-@@ -608,7 +675,7 @@
- 	slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
- 
- 	for(i = 0; u[i] != NULL; i++ ) {
--		slap_listeners[i] = open_listener( u[i] );
-+		slap_listeners[i] = slap_open_listener( u[i] );
- 
- 		if( slap_listeners[i] == NULL ) {
- 			charray_free( u );
-@@ -642,7 +709,6 @@
- 	void *ptr
- )
- {
--	int rc, tmp;
- 	int l;
- 	time_t	last_idle_check = slap_get_time();
- 	time( &starttime );
-@@ -651,7 +717,7 @@
- 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
- 			continue;
- 
--		if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
-+		if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: listen(%s, 5) failed errno=%d (%s)\n",
-@@ -814,7 +880,7 @@
- 		}
- 
- 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
--			ber_int_t s;
-+			ber_socket_t s;
- 			socklen_t len = sizeof(from);
- 			long id;
- 			slap_ssf_t ssf = 0;
-@@ -860,31 +926,6 @@
- 			}
- #endif
- 
--#ifdef SO_KEEPALIVE
--			/* enable keep alives */
--			rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
--				(char *) &tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--#ifdef TCP_NODELAY
--			/* enable no delay */
--			tmp = 1;
--			rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
--				(char *)&tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(TCP_NODELAY) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--
--
- #ifdef LDAP_DEBUG
- 			ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- 
-@@ -896,20 +937,44 @@
- 			ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
- #endif
- 
-+#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY )
-+#ifdef LDAP_PF_LOCAL
-+			/* for IPv4 and IPv6 sockets only */
-+			if ( from.sa_addr.sa_family != AF_LOCAL )
-+#endif /* LDAP_PF_LOCAL */
-+			{
-+				int rc;
-+				int tmp;
-+#ifdef SO_KEEPALIVE
-+				/* enable keep alives */
-+				tmp = 1;
-+				rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
-+					(char *) &tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+#ifdef TCP_NODELAY
-+				/* enable no delay */
-+				tmp = 1;
-+				rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
-+					(char *)&tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(TCP_NODELAY) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+			}
-+#endif
-+
- 			Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
- 				(long) s, 0, 0 );
- 
--			len = sizeof(from);
--
--			if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
--					(long) s, err, sock_errstr(err) );
--				slapd_close(s);
--				continue;
--			}
--
- 			switch ( from.sa_addr.sa_family ) {
- #  ifdef LDAP_PF_LOCAL
- 			case AF_LOCAL:
-@@ -948,6 +1013,7 @@
- 				slapd_close(s);
- 				continue;
- 			}
-+
- 			if ( ( from.sa_addr.sa_family == AF_INET ) 
- #ifdef LDAP_PF_INET6
- 				|| ( from.sa_addr.sa_family == AF_INET6 )
-@@ -961,7 +1027,7 @@
- 						sizeof(from.sa_in6_addr.sin6_addr),
- 						AF_INET6 );
- 				else
--#  endif LDAP_PF_INET6
-+#  endif /* LDAP_PF_INET6 */
- 				hp = gethostbyaddr(
- 					(char *) &(from.sa_in_addr.sin_addr),
- 					sizeof(from.sa_in_addr.sin_addr),
-@@ -1202,23 +1268,25 @@
- 	connections_init();
- 
- #define SLAPD_LISTENER_THREAD 1
--#if defined( SLAPD_LISTENER_THREAD ) || !defined(HAVE_PTHREADS)
-+#if defined( SLAPD_LISTENER_THREAD )
-+	{
-+		ldap_pvt_thread_t	listener_tid;
- 
--	/* listener as a separate THREAD */
--	rc = ldap_pvt_thread_create( &listener_tid,
--		0, slapd_daemon_task, NULL );
-+		/* listener as a separate THREAD */
-+		rc = ldap_pvt_thread_create( &listener_tid,
-+			0, slapd_daemon_task, NULL );
- 
--	if ( rc != 0 ) {
--		Debug( LDAP_DEBUG_ANY,
--		    "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
--		return rc;
--	}
-+		if ( rc != 0 ) {
-+			Debug( LDAP_DEBUG_ANY,
-+		    	"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-+			return rc;
-+		}
- 
--	/* wait for the listener thread to complete */
--	ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+		/* wait for the listener thread to complete */
-+		ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+ 	}
- #else
--	/* expermimental code */
--	listener_tid = pthread_self();
-+	/* experimental code */
- 	slapd_daemon_task( NULL );
- #endif
- 
-@@ -1307,4 +1375,9 @@
- 
- 	/* reinstall self */
- 	(void) SIGNAL_REINSTALL( sig, slap_sig_wake );
-+}
-+
-+
-+void slapd_add_internal(ber_socket_t s) {
-+	slapd_add(s);
- }
diff --git a/net/openldap22-server/files/patch-servers_slapd_schema b/net/openldap22-server/files/patch-servers_slapd_schema
deleted file mode 100644
index 31969e8bb621..000000000000
--- a/net/openldap22-server/files/patch-servers_slapd_schema
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/schema/krb5-kdc.schema.orig	Tue Sep  5 13:28:34 2000
-+++ servers/slapd/schema/krb5-kdc.schema	Mon Oct 30 13:09:19 2000
-@@ -96,7 +96,7 @@
- attributetype ( 1.3.6.1.4.1.5322.10.1.10
- 	NAME 'krb5Key'
- 	DESC 'Encoded ASN1 Key as an octet string'
--	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
- 
- attributetype ( 1.3.6.1.4.1.5322.10.1.11
- 	NAME 'krb5PrincipalRealm'
-@@ -112,7 +112,7 @@
- 
- objectclass ( 1.3.6.1.4.1.5322.10.2.1
- 	NAME 'krb5Principal'
--	SUP top
-+	SUP person
- 	AUXILIARY
- 	MUST ( krb5PrincipalName )
- 	MAY ( cn $ krb5PrincipalRealm ) )
diff --git a/net/openldap22-server/files/slapd.sh b/net/openldap22-server/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap22-server/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap22-server/pkg-comment b/net/openldap22-server/pkg-comment
deleted file mode 100644
index 8c499c3923cf..000000000000
--- a/net/openldap22-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open source LDAP client and server software
diff --git a/net/openldap22-server/pkg-descr b/net/openldap22-server/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap22-server/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap22-server/pkg-plist b/net/openldap22-server/pkg-plist
deleted file mode 100644
index 764525594e11..000000000000
--- a/net/openldap22-server/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
-@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ ! -f %B/schema/corba.schema ] && cp %B/%f %B/schema/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ ! -f %B/schema/core.schema ] && cp %B/%f %B/schema/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ ! -f %B/schema/cosine.schema ] && cp %B/%f %B/schema/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ ! -f %B/schema/inetorgperson.schema ] && cp %B/%f %B/schema/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ ! -f %B/schema/java.schema ] && cp %B/%f %B/schema/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ ! -f %B/schema/krb5-kdc.schema ] && cp %B/%f %B/schema/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ ! -f %B/schema/misc.schema ] && cp %B/%f %B/schema/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nadf.schema %D/etc/openldap/schema/nadf.schema.default; then rm -f %D/etc/openldap/schema/nadf.schema; fi
-etc/openldap/schema/nadf.schema.default
-@exec [ ! -f %B/schema/nadf.schema ] && cp %B/%f %B/schema/nadf.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ ! -f %B/schema/nis.schema ] && cp %B/%f %B/schema/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ ! -f %B/schema/openldap.schema ] && cp %B/%f %B/schema/openldap.schema
-@dirrm etc/openldap/schema
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.2
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
deleted file mode 100644
index 984b1a7d60fb..000000000000
--- a/net/openldap22/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 2.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	2.0.6
-PORTREVISION=	2
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-USE_OPENSSL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/run \
-		--with-threads \
-		--enable-shared \
-		--enable-dnssrv \
-		--with-tls=openssl
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
-.endif
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/maildap \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-post-configure:
-	cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff
-
-pre-build:
-	cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	strip ${PREFIX}/${f}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap22/distinfo b/net/openldap22/distinfo
deleted file mode 100644
index 8a9668d4e077..000000000000
--- a/net/openldap22/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-2.0.6.tgz) = 6df0ebc7da308999146102f950ecdaed
diff --git a/net/openldap22/files/libtool.diff b/net/openldap22/files/libtool.diff
deleted file mode 100644
index 0cf57bbee7ea..000000000000
--- a/net/openldap22/files/libtool.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libtool.orig	Tue Oct 31 01:43:06 2000
-+++ libtool	Tue Oct 31 01:44:42 2000
-@@ -448,6 +448,16 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --only-shared)
-+    build_libtool_libs=yes
-+    build_old_libs=no
-+    ;;
-+
-+  --only-static)
-+    build_libtool_libs=no
-+    build_old_libs=yes
-+    ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
diff --git a/net/openldap22/files/manpages b/net/openldap22/files/manpages
deleted file mode 100644
index 1c39b81911fc..000000000000
--- a/net/openldap22/files/manpages
+++ /dev/null
@@ -1,219 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	lber-memory.3
-MAN3+=	lber-types.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_schema.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapadd.8
-MAN8+=	slapcat.8
-MAN8+=	slapd.8
-MAN8+=	slapindex.8
-MAN8+=	slappasswd.8
-MAN8+=	slurpd.8
-MLINKS+=	lber-decode.3 ber_first_element.3
-MLINKS+=	lber-decode.3 ber_get_bitstring.3
-MLINKS+=	lber-decode.3 ber_get_boolean.3
-MLINKS+=	lber-decode.3 ber_get_enum.3
-MLINKS+=	lber-decode.3 ber_get_int.3
-MLINKS+=	lber-decode.3 ber_get_next.3
-MLINKS+=	lber-decode.3 ber_get_null.3
-MLINKS+=	lber-decode.3 ber_get_stringa.3
-MLINKS+=	lber-decode.3 ber_get_stringb.3
-MLINKS+=	lber-decode.3 ber_next_element.3
-MLINKS+=	lber-decode.3 ber_peek_tag.3
-MLINKS+=	lber-decode.3 ber_scanf.3
-MLINKS+=	lber-decode.3 ber_skip_tag.3
-MLINKS+=	lber-encode.3 ber_alloc_t.3
-MLINKS+=	lber-encode.3 ber_flush.3
-MLINKS+=	lber-encode.3 ber_printf.3
-MLINKS+=	lber-encode.3 ber_put_enum.3
-MLINKS+=	lber-encode.3 ber_put_int.3
-MLINKS+=	lber-encode.3 ber_put_null.3
-MLINKS+=	lber-encode.3 ber_put_ostring.3
-MLINKS+=	lber-encode.3 ber_put_seq.3
-MLINKS+=	lber-encode.3 ber_put_set.3
-MLINKS+=	lber-encode.3 ber_put_string.3
-MLINKS+=	lber-decode.3 ber_start_set.3
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_abandon_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext_s.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_rdn.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext_s.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_result.3 ldap_msgid.3
-MLINKS+=	ldap_result.3 ldap_msgtype.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2name.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2str.3
-MLINKS+=	ldap_schema.3 ldap_attributetype_free.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2name.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2str.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule_free.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2name.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2str.3
-MLINKS+=	ldap_schema.3 ldap_objectclass_free.3
-MLINKS+=	ldap_schema.3 ldap_scherr2str.3
-MLINKS+=	ldap_schema.3 ldap_str2attributetype.3
-MLINKS+=	ldap_schema.3 ldap_str2matchingrule.3
-MLINKS+=	ldap_schema.3 ldap_str2objectclass.3
-MLINKS+=	ldap_schema.3 ldap_str2syntax.3
-MLINKS+=	ldap_schema.3 ldap_syntax2name.3
-MLINKS+=	ldap_schema.3 ldap_syntax2str.3
-MLINKS+=	ldap_schema.3 ldap_syntax_free.3
-MLINKS+=	ldap_search.3 ldap_search_ext.3
-MLINKS+=	ldap_search.3 ldap_search_ext_s.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap22/files/patch-clients_ud_Makefile.in b/net/openldap22/files/patch-clients_ud_Makefile.in
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap22/files/patch-clients_ud_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap22/files/patch-servers_slapd_daemon.c b/net/openldap22/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 44baead6a6b7..000000000000
--- a/net/openldap22/files/patch-servers_slapd_daemon.c
+++ /dev/null
@@ -1,828 +0,0 @@
---- servers/slapd/daemon.c.orig	Sat Sep 30 11:24:28 2000
-+++ servers/slapd/daemon.c	Tue Oct 31 10:54:09 2000
-@@ -1,4 +1,4 @@
--/* $OpenLDAP: pkg/ldap/servers/slapd/daemon.c,v 1.99.2.12 2000/09/30 16:24:28 kurt Exp $ */
-+/* $OpenLDAP: servers/slapd/daemon.c,v 1.99.2.13 2000/10/30 18:14:51 kurt Exp $ */
- /*
-  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-@@ -59,6 +59,8 @@
- 
- Listener **slap_listeners = NULL;
- 
-+#define SLAPD_LISTEN 10
-+
- static ber_socket_t wake_sds[2];
- 
- #ifdef NO_THREADS
-@@ -81,8 +83,6 @@
- #endif
- volatile sig_atomic_t slapd_shutdown = 0;
- 
--static ldap_pvt_thread_t	listener_tid;
--
- static struct slap_daemon {
- 	ldap_pvt_thread_mutex_t	sd_mutex;
- 
-@@ -193,20 +193,207 @@
- 	tcp_close(s);
- }
- 
-+static void slap_free_listener_addresses(struct sockaddr **sal)
-+{
-+	struct sockaddr **sap;
-+
-+	if (sal == NULL) {
-+		return;
-+	}
-+
-+	for (sap = sal; *sap != NULL; sap++) {
-+		ch_free(*sap);
-+	}
-+
-+	ch_free(sal);
-+}
-+
-+/* port = 0 indicates AF_LOCAL */
-+static int slap_get_listener_addresses(
-+	const char *host,
-+	unsigned short port,
-+	struct sockaddr ***sal)
-+{
-+	struct sockaddr **sap;
-+#ifdef HAVE_GETADDRINFO
-+	struct addrinfo hints, *res, *sai;
-+	int n, err;
-+	
-+	memset( &hints, '\0', sizeof(hints) );
-+	hints.ai_flags = AI_PASSIVE;
-+	hints.ai_socktype = SOCK_STREAM;
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		hints.ai_family = AF_LOCAL;
-+		/* host specifies a service in this case */
-+		if (err = getaddrinfo(NULL, host, &hints, &res)) {
-+			if (err == EAI_FAMILY) {
-+				/* XXX Fake it */
-+				struct sockaddr_un *sun = calloc(1, sizeof(struct sockaddr_un));
-+				err = 0;
-+				res = calloc(1, sizeof(*res));
-+				assert(sun != NULL);
-+				assert(res != NULL);
-+				res->ai_flags = hints.ai_flags;
-+				res->ai_family = AF_LOCAL;
-+				res->ai_socktype = hints.ai_socktype;
-+				res->ai_addr = (struct sockaddr *)sun;
-+				res->ai_addrlen = sizeof(*sun);
-+				sun->sun_len = strlen(LDAPI_SOCK) + 1;
-+				sun->sun_family = AF_LOCAL;
-+				strcpy(sun->sun_path, LDAPI_SOCK);
-+			} else {
-+				Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				    gai_strerror(err), 0, 0);
-+				return -1;
-+			}
-+		}
-+	} else
-+#  endif
-+	{		
-+		char serv[7];
-+	
-+		snprintf(serv, sizeof serv, "%d", port);
-+		hints.ai_family = AF_UNSPEC;
-+		if (err = getaddrinfo(host, serv, &hints, &res)) {
-+			Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				gai_strerror(err), 0, 0);
-+			return -1;
-+		}
-+	}
-+
-+	sai = res;
-+	for (n=2; (sai = sai->ai_next) != NULL; n++) {
-+		/* EMPTY */ ;
-+	}
-+	*sal = ch_malloc(n * sizeof(*sal));
-+	if (*sal == NULL) {
-+		return -1;
-+	}
-+
-+	sai = res;
-+	sap = *sal;
-+	do {
-+		switch (sai->ai_family) {
-+#  ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_un));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_un *)*sap =
-+				*((struct sockaddr_un *)sai->ai_addr);
-+		} break;
-+#  endif
-+#  ifdef LDAP_PF_INET6			
-+		case AF_INET6: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in6));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in6 *)*sap =
-+				*((struct sockaddr_in6 *)sai->ai_addr);
-+		} break;
-+#  endif
-+		case AF_INET: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in *)*sap =
-+				*((struct sockaddr_in *)sai->ai_addr);
-+		} break;
-+		default: 
-+			*sap = NULL;
-+			break;
-+		}
-+		if (*sap != NULL) {
-+			(*sap)->sa_family = sai->ai_family;
-+			sap++;
-+		}
-+	} while ((sai = sai->ai_next) != NULL);
-+
-+	freeaddrinfo(res);
-+
-+#else
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_un));
-+		if (*sap == NULL)
-+			goto errexit;
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
-+		(*sap)->sa_family = AF_LOCAL;
-+		if ( strlen(host) >
-+		     (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: domain socket path (%s) too long in URL",
-+			       host, 0, 0);
-+			goto errexit;
-+		}
-+		strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
-+	} else
-+#  endif		
-+	{
-+		struct in_addr in;
-+
-+		if ( host == NULL ) {
-+			in.s_addr = htonl(INADDR_ANY);
-+
-+		} else if ( !inet_aton( host, &in ) ) {
-+			struct hostent *he = gethostbyname( host );
-+			if( he == NULL ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "daemon: invalid host %s", host, 0, 0);
-+				return -1;
-+			}
-+			AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
-+		}
-+
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_in));
-+		if (*sap == NULL) {
-+			goto errexit;
-+		}
-+
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
-+		(*sap)->sa_family = AF_INET;
-+		((struct sockaddr_in *)*sap)->sin_port = htons(port);
-+		((struct sockaddr_in *)*sap)->sin_addr = in;
-+	}
-+	sap++;
-+#endif
-+
-+	*sap = NULL;
-+	return 0;
-+
-+errexit:
-+	slap_free_listener_addresses(*sal);
-+	return -1;
-+}
- 
--static Listener * open_listener( const char* url )
-+static Listener * slap_open_listener(
-+	const char* url )
- {
- 	int	tmp, rc;
- 	Listener l;
- 	Listener *li;
- 	LDAPURLDesc *lud;
--	char *s;
--	int port;
--#ifdef HAVE_GETADDRINFO
--	char serv[7];
--	struct addrinfo hints, *res, *sai;
--	int err;
--#endif
-+	unsigned short port;
-+	int err, addrlen;
-+	struct sockaddr **sal, **psal;
- 
- 	rc = ldap_url_parse( url, &lud );
- 
-@@ -238,291 +425,171 @@
- 	}
- #endif
- 
--#ifdef HAVE_GETADDRINFO
--	memset( &hints, '\0', sizeof(hints) );
--	hints.ai_flags = AI_PASSIVE;
--	hints.ai_family = AF_UNSPEC;
--	hints.ai_socktype = SOCK_STREAM;
--
--#  ifdef LDAP_PF_LOCAL
-+	port = (unsigned short) lud->lud_port;
-+	
- 	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifdef LDAP_PF_LOCAL
- 		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			err = getaddrinfo(NULL, LDAPI_SOCK, &hints, &res);
--			if (!err)
--				unlink( LDAPI_SOCK );
-+			err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
- 		} else {
--			err = getaddrinfo(NULL, lud->lud_host, &hints, &res);
--			if (!err)
--				unlink( lud->lud_host );
-+			err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
- 		}
--	} else
--#  endif /* LDAP_PF_LOCAL */
--	{
--		snprintf(serv, sizeof serv, "%d", lud->lud_port);
-+#else
-+		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
-+			url, 0, 0);
-+		ldap_free_urldesc( lud );
-+		return NULL;
-+#endif
-+	} else {
- 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
- 			|| strcmp(lud->lud_host, "*") == 0 )
- 		{
--			err = getaddrinfo(NULL, serv, &hints, &res);
-+			err = slap_get_listener_addresses(NULL, port, &sal);
- 		} else {
--			err = getaddrinfo(lud->lud_host, serv, &hints, &res);
-+			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
- 		}
- 	}
- 
-+	ldap_free_urldesc( lud );
- 	if ( err ) {
--		Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed\n", 0, 0, 0);
--		ldap_free_urldesc( lud );
- 		return NULL;
- 	}
- 
--	ldap_free_urldesc( lud );
--	sai = res;
--	do {
--		if ( (sai->ai_family != AF_INET)
--#  ifdef LDAP_PF_INET6
--		     && (sai->ai_family != AF_INET6)
--#  endif
--#  ifdef LDAP_PF_LOCAL
--		     && (sai->ai_family != AF_LOCAL)
--#  endif
--		     )
-+	psal = sal;
-+	while ( *sal != NULL ) {
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+#endif
-+#ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL:
-+#endif
-+			break;
-+		default:
-+			sal++;
- 			continue;
--		l.sl_sd = socket( sai->ai_family, sai->ai_socktype, sai->ai_protocol);
-+		}
-+		l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
- 		if ( l.sl_sd == AC_SOCKET_INVALID ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: socket() failed errno=%d (%s)\n", err,
- 				sock_errstr(err), 0 );
-+			sal++;
- 			continue;
- 		}
--
--		if ( sai->ai_family != AF_LOCAL ) {
--#else
--
--	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifndef HAVE_WINSOCK
-+		if ( l.sl_sd >= dtblsize ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: listener descriptor %ld is too great %ld\n",
-+			       (long) l.sl_sd, (long) dtblsize, 0 );
-+			tcp_close( l.sl_sd );
-+			sal++;
-+			continue;
-+		}
-+#endif
- #ifdef LDAP_PF_LOCAL
--		port = 0;
--		(void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );
--
--		l.sl_sa.sa_un_addr.sun_family = AF_LOCAL;
--
--		/* hack: overload the host to be the path */
--		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			strcpy( l.sl_sa.sa_un_addr.sun_path, LDAPI_SOCK );
--		} else {
--			if ( strlen(lud->lud_host) > (sizeof(l.sl_sa.sa_un_addr.sun_path) - 1) ) {
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: domain socket path (%s) too long in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
--			}
--			strcpy( l.sl_sa.sa_un_addr.sun_path, lud->lud_host );
--		}
--		unlink( l.sl_sa.sa_un_addr.sun_path ); 
--#if 0
--		/* I don't think we need to set this. */
--		l.sl_sa.sa_un_addr.sun_len = sizeof( l.sl_sa.sa_un_addr.sun_len ) +
--			sizeof( l.sl_sa.sa_un_addr.sun_family ) +
--			strlen( l.sl_sa.sa_un_addr.sun_path ) + 1;
-+		if ( (*sal)->sa_family == AF_LOCAL ) {
-+			unlink ( ((struct sockaddr_un *)*sal)->sun_path );
-+		} else
- #endif
--#else
--		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
--			url, 0, 0);
--		ldap_free_urldesc( lud );
--		return NULL;
--#endif /* LDAP_PF_LOCAL */
--	} else {
--
--	port = lud->lud_port;
--
--	(void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
--
--	l.sl_addr.sin_family = AF_INET;
--	l.sl_addr.sin_port = htons( (unsigned short) lud->lud_port );
--
--	if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
--		|| strcmp(lud->lud_host, "*") == 0 )
--	{
--		l.sl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
--
--	} else {
--		/* host or address was specified */
--		if( !inet_aton( lud->lud_host, &l.sl_addr.sin_addr ) ) {
--			struct hostent *he = gethostbyname( lud->lud_host );
--			if( he == NULL ) {
-+		{
-+#ifdef SO_REUSEADDR
-+			/* enable address reuse */
-+			tmp = 1;
-+			rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
-+					 (char *) &tmp, sizeof(tmp) );
-+			if ( rc == AC_SOCKET_ERROR ) {
-+				int err = sock_errno();
- 				Debug( LDAP_DEBUG_ANY,
--					"daemon: invalid host (%s) in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
-+				       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
-+				       (long) l.sl_sd, err, sock_errstr(err) );
- 			}
--
--			AC_MEMCPY( &l.sl_addr.sin_addr, he->h_addr,
--			       sizeof( l.sl_addr.sin_addr ) );
-+#endif
- 		}
--	}
--	}
--
--	ldap_free_urldesc( lud );
--
--	l.sl_sd = socket( l.sl_sa.sa_addr.sa_family, SOCK_STREAM, 0 );
--	if ( l.sl_sd == AC_SOCKET_INVALID ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: socket() failed errno=%d (%s)\n", err,
--			sock_errstr(err), 0 );
--		return NULL;
--	}
--
--#ifndef HAVE_WINSOCK
--	if ( l.sl_sd >= dtblsize ) {
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: listener descriptor %ld is too great %ld\n",
--			(long) l.sl_sd, (long) dtblsize, 0 );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
-+	
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+			addrlen = sizeof(struct sockaddr_in);
-+			break;
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+			addrlen = sizeof(struct sockaddr_in6);
-+			break;
- #endif
--
- #ifdef LDAP_PF_LOCAL
--	/* for IPv4 and IPv6 sockets only */
--	if ( l.sl_sa.sa_addr.sa_family != AF_LOCAL ) {
--#endif /* LDAP_PF_LOCAL */
--#endif /* HAVE_GETADDRINFO */
--
--#ifdef SO_REUSEADDR
--	/* enable address reuse */
--	tmp = 1;
--	rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
--		(char *) &tmp, sizeof(tmp) );
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--	       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--	}
-+		case AF_LOCAL:
-+			addrlen = sizeof(struct sockaddr_un);
-+			break;
- #endif
--
--#ifdef HAVE_GETADDRINFO
--		} /* sai->ai_family != AF_LOCAL */
--		if (!bind(l.sl_sd, sai->ai_addr, sai->ai_addrlen))
-+		}
-+	
-+		if (!bind(l.sl_sd, *sal, addrlen))
- 			break;
- 		err = sock_errno();
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--			(long) l.sl_sd, err, sock_errstr(err) );
-+		       (long) l.sl_sd, err, sock_errstr(err) );
- 		tcp_close( l.sl_sd );
--	} while ((sai = sai->ai_next) != NULL);
-+		sal++;
-+	} /* while ( *sal != NULL ) */
- 
--	if (!sai) {
-+	if ( *sal == NULL ) {
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
- 			(long) l.sl_sd, 0, 0 );
-+		slap_free_listener_addresses(psal);
- 		return NULL;
- 	}
- 
--	switch ( sai->ai_family ) {
--#  ifdef LDAP_PF_LOCAL
--	case AF_LOCAL:
--		if ( chmod( (char *)sai->ai_addr, S_IRWXU ) < 0 ) {
-+	switch ( (*sal)->sa_family ) {
-+#ifdef LDAP_PF_LOCAL
-+	case AF_LOCAL: {
-+		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-+		if ( chmod( addr, S_IRWXU ) < 0 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
--				(long) l.sl_sd, err, sock_errstr(err) );
-+			       (long) l.sl_sd, err, sock_errstr(err) );
- 			tcp_close( l.sl_sd );
-+			slap_free_listener_addresses(psal);
- 			return NULL;
- 		}
--		l.sl_name = ch_malloc( strlen((char *)sai->ai_addr) + sizeof("PATH=") );
--		sprintf( l.sl_name, "PATH=%s", sai->ai_addr );
--		break;
--#  endif /* LDAP_PF_LOCAL */
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
-+		sprintf( l.sl_name, "PATH=%s", addr );
-+	} break;
-+#endif /* LDAP_PF_LOCAL */
- 
- 	case AF_INET: {
-+		char *s;
-+#ifdef HAVE_GETADDRINFO		
- 		char addr[INET_ADDRSTRLEN];
--		inet_ntop( AF_INET,
--			&((struct sockaddr_in *)sai->ai_addr)->sin_addr,
--			addr, sizeof(addr) );
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP=:") );
--		sprintf( l.sl_name, "IP=%s:%s", addr, serv );
-+		inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
-+			   addr, sizeof(addr) );
-+		s = addr;
-+#else
-+		s = inet_ntoa( l.sl_addr.sin_addr );
-+#endif		
-+		l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
-+		sprintf( l.sl_name, "IP=%s:%d",
-+			 s != NULL ? s : "unknown" , port );
- 	} break;
- 
--#  ifdef LDAP_PF_INET6
-+#ifdef LDAP_PF_INET6
- 	case AF_INET6: {
- 		char addr[INET6_ADDRSTRLEN];
--		inet_ntop( AF_INET6,
--			&((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr,
--			addr, sizeof addr);
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP= ") );
--		sprintf( l.sl_name, "IP=%s %s", addr, serv );
-+		inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
-+			   addr, sizeof addr);
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
-+		sprintf( l.sl_name, "IP=%s %d", addr, port );
- 	} break;
--#  endif /* LDAP_PF_INET6 */
-+#endif /* LDAP_PF_INET6 */
- 
- 	default:
- 		Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
--			(int) sai->ai_family, 0, 0 );
-+			(int) (*sal)->sa_family, 0, 0 );
- 		break;
- 	}
--#else
--#ifdef LDAP_PF_LOCAL
--	/* close conditional */
--	}
--#endif /* LDAP_PF_LOCAL */
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_un_addr) );
--			break;
--#endif
--
--		case AF_INET:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_in_addr) );
--			break;
- 
--		default:
--			rc = AC_SOCKET_ERROR;
--			errno = EINVAL;
--			break;
--	}
--
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			if ( chmod( l.sl_sa.sa_un_addr.sun_path, S_IRWXU ) < 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: chmod(%ld) failed errno=%d (%s)",
--					(long) l.sl_sd, err, sock_errstr(err) );
--				tcp_close( l.sl_sd );
--				return NULL;
--			}
--
--			l.sl_name = ch_malloc( strlen(l.sl_sa.sa_un_addr.sun_path)
--				+ sizeof("PATH=") );
--			sprintf( l.sl_name, "PATH=%s", l.sl_sa.sa_un_addr.sun_path );
--			break;
--#endif /* LDAP_PF_LOCAL */
--
--		case AF_INET:
--			l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
--			s = inet_ntoa( l.sl_addr.sin_addr );
--			sprintf( l.sl_name, "IP=%s:%d",
--				s != NULL ? s : "unknown" , port );
--			break;
--
--		default:
--			l.sl_name = ch_strdup( "UNKNOWN" );
--			break;
--	}
--
--#endif /* HAVE_GETADDRINFO */
-+	slap_free_listener_addresses(psal);
- 
- 	l.sl_url = ch_strdup( url );
- 	li = ch_malloc( sizeof( Listener ) );
-@@ -608,7 +675,7 @@
- 	slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
- 
- 	for(i = 0; u[i] != NULL; i++ ) {
--		slap_listeners[i] = open_listener( u[i] );
-+		slap_listeners[i] = slap_open_listener( u[i] );
- 
- 		if( slap_listeners[i] == NULL ) {
- 			charray_free( u );
-@@ -642,7 +709,6 @@
- 	void *ptr
- )
- {
--	int rc, tmp;
- 	int l;
- 	time_t	last_idle_check = slap_get_time();
- 	time( &starttime );
-@@ -651,7 +717,7 @@
- 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
- 			continue;
- 
--		if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
-+		if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: listen(%s, 5) failed errno=%d (%s)\n",
-@@ -814,7 +880,7 @@
- 		}
- 
- 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
--			ber_int_t s;
-+			ber_socket_t s;
- 			socklen_t len = sizeof(from);
- 			long id;
- 			slap_ssf_t ssf = 0;
-@@ -860,31 +926,6 @@
- 			}
- #endif
- 
--#ifdef SO_KEEPALIVE
--			/* enable keep alives */
--			rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
--				(char *) &tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--#ifdef TCP_NODELAY
--			/* enable no delay */
--			tmp = 1;
--			rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
--				(char *)&tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(TCP_NODELAY) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--
--
- #ifdef LDAP_DEBUG
- 			ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- 
-@@ -896,20 +937,44 @@
- 			ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
- #endif
- 
-+#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY )
-+#ifdef LDAP_PF_LOCAL
-+			/* for IPv4 and IPv6 sockets only */
-+			if ( from.sa_addr.sa_family != AF_LOCAL )
-+#endif /* LDAP_PF_LOCAL */
-+			{
-+				int rc;
-+				int tmp;
-+#ifdef SO_KEEPALIVE
-+				/* enable keep alives */
-+				tmp = 1;
-+				rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
-+					(char *) &tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+#ifdef TCP_NODELAY
-+				/* enable no delay */
-+				tmp = 1;
-+				rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
-+					(char *)&tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(TCP_NODELAY) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+			}
-+#endif
-+
- 			Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
- 				(long) s, 0, 0 );
- 
--			len = sizeof(from);
--
--			if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
--					(long) s, err, sock_errstr(err) );
--				slapd_close(s);
--				continue;
--			}
--
- 			switch ( from.sa_addr.sa_family ) {
- #  ifdef LDAP_PF_LOCAL
- 			case AF_LOCAL:
-@@ -948,6 +1013,7 @@
- 				slapd_close(s);
- 				continue;
- 			}
-+
- 			if ( ( from.sa_addr.sa_family == AF_INET ) 
- #ifdef LDAP_PF_INET6
- 				|| ( from.sa_addr.sa_family == AF_INET6 )
-@@ -961,7 +1027,7 @@
- 						sizeof(from.sa_in6_addr.sin6_addr),
- 						AF_INET6 );
- 				else
--#  endif LDAP_PF_INET6
-+#  endif /* LDAP_PF_INET6 */
- 				hp = gethostbyaddr(
- 					(char *) &(from.sa_in_addr.sin_addr),
- 					sizeof(from.sa_in_addr.sin_addr),
-@@ -1202,23 +1268,25 @@
- 	connections_init();
- 
- #define SLAPD_LISTENER_THREAD 1
--#if defined( SLAPD_LISTENER_THREAD ) || !defined(HAVE_PTHREADS)
-+#if defined( SLAPD_LISTENER_THREAD )
-+	{
-+		ldap_pvt_thread_t	listener_tid;
- 
--	/* listener as a separate THREAD */
--	rc = ldap_pvt_thread_create( &listener_tid,
--		0, slapd_daemon_task, NULL );
-+		/* listener as a separate THREAD */
-+		rc = ldap_pvt_thread_create( &listener_tid,
-+			0, slapd_daemon_task, NULL );
- 
--	if ( rc != 0 ) {
--		Debug( LDAP_DEBUG_ANY,
--		    "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
--		return rc;
--	}
-+		if ( rc != 0 ) {
-+			Debug( LDAP_DEBUG_ANY,
-+		    	"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-+			return rc;
-+		}
- 
--	/* wait for the listener thread to complete */
--	ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+		/* wait for the listener thread to complete */
-+		ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+ 	}
- #else
--	/* expermimental code */
--	listener_tid = pthread_self();
-+	/* experimental code */
- 	slapd_daemon_task( NULL );
- #endif
- 
-@@ -1307,4 +1375,9 @@
- 
- 	/* reinstall self */
- 	(void) SIGNAL_REINSTALL( sig, slap_sig_wake );
-+}
-+
-+
-+void slapd_add_internal(ber_socket_t s) {
-+	slapd_add(s);
- }
diff --git a/net/openldap22/files/patch-servers_slapd_schema b/net/openldap22/files/patch-servers_slapd_schema
deleted file mode 100644
index 31969e8bb621..000000000000
--- a/net/openldap22/files/patch-servers_slapd_schema
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/schema/krb5-kdc.schema.orig	Tue Sep  5 13:28:34 2000
-+++ servers/slapd/schema/krb5-kdc.schema	Mon Oct 30 13:09:19 2000
-@@ -96,7 +96,7 @@
- attributetype ( 1.3.6.1.4.1.5322.10.1.10
- 	NAME 'krb5Key'
- 	DESC 'Encoded ASN1 Key as an octet string'
--	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
- 
- attributetype ( 1.3.6.1.4.1.5322.10.1.11
- 	NAME 'krb5PrincipalRealm'
-@@ -112,7 +112,7 @@
- 
- objectclass ( 1.3.6.1.4.1.5322.10.2.1
- 	NAME 'krb5Principal'
--	SUP top
-+	SUP person
- 	AUXILIARY
- 	MUST ( krb5PrincipalName )
- 	MAY ( cn $ krb5PrincipalRealm ) )
diff --git a/net/openldap22/files/slapd.sh b/net/openldap22/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap22/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap22/pkg-comment b/net/openldap22/pkg-comment
deleted file mode 100644
index 8c499c3923cf..000000000000
--- a/net/openldap22/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open source LDAP client and server software
diff --git a/net/openldap22/pkg-descr b/net/openldap22/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap22/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap22/pkg-plist b/net/openldap22/pkg-plist
deleted file mode 100644
index 764525594e11..000000000000
--- a/net/openldap22/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
-@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ ! -f %B/schema/corba.schema ] && cp %B/%f %B/schema/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ ! -f %B/schema/core.schema ] && cp %B/%f %B/schema/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ ! -f %B/schema/cosine.schema ] && cp %B/%f %B/schema/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ ! -f %B/schema/inetorgperson.schema ] && cp %B/%f %B/schema/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ ! -f %B/schema/java.schema ] && cp %B/%f %B/schema/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ ! -f %B/schema/krb5-kdc.schema ] && cp %B/%f %B/schema/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ ! -f %B/schema/misc.schema ] && cp %B/%f %B/schema/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nadf.schema %D/etc/openldap/schema/nadf.schema.default; then rm -f %D/etc/openldap/schema/nadf.schema; fi
-etc/openldap/schema/nadf.schema.default
-@exec [ ! -f %B/schema/nadf.schema ] && cp %B/%f %B/schema/nadf.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ ! -f %B/schema/nis.schema ] && cp %B/%f %B/schema/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ ! -f %B/schema/openldap.schema ] && cp %B/%f %B/schema/openldap.schema
-@dirrm etc/openldap/schema
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.2
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
deleted file mode 100644
index 984b1a7d60fb..000000000000
--- a/net/openldap23-server/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 2.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	2.0.6
-PORTREVISION=	2
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-USE_OPENSSL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/run \
-		--with-threads \
-		--enable-shared \
-		--enable-dnssrv \
-		--with-tls=openssl
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
-.endif
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/maildap \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-post-configure:
-	cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff
-
-pre-build:
-	cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	strip ${PREFIX}/${f}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap23-server/distinfo b/net/openldap23-server/distinfo
deleted file mode 100644
index 8a9668d4e077..000000000000
--- a/net/openldap23-server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-2.0.6.tgz) = 6df0ebc7da308999146102f950ecdaed
diff --git a/net/openldap23-server/files/libtool.diff b/net/openldap23-server/files/libtool.diff
deleted file mode 100644
index 0cf57bbee7ea..000000000000
--- a/net/openldap23-server/files/libtool.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libtool.orig	Tue Oct 31 01:43:06 2000
-+++ libtool	Tue Oct 31 01:44:42 2000
-@@ -448,6 +448,16 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --only-shared)
-+    build_libtool_libs=yes
-+    build_old_libs=no
-+    ;;
-+
-+  --only-static)
-+    build_libtool_libs=no
-+    build_old_libs=yes
-+    ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
diff --git a/net/openldap23-server/files/manpages b/net/openldap23-server/files/manpages
deleted file mode 100644
index 1c39b81911fc..000000000000
--- a/net/openldap23-server/files/manpages
+++ /dev/null
@@ -1,219 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	lber-memory.3
-MAN3+=	lber-types.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_schema.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapadd.8
-MAN8+=	slapcat.8
-MAN8+=	slapd.8
-MAN8+=	slapindex.8
-MAN8+=	slappasswd.8
-MAN8+=	slurpd.8
-MLINKS+=	lber-decode.3 ber_first_element.3
-MLINKS+=	lber-decode.3 ber_get_bitstring.3
-MLINKS+=	lber-decode.3 ber_get_boolean.3
-MLINKS+=	lber-decode.3 ber_get_enum.3
-MLINKS+=	lber-decode.3 ber_get_int.3
-MLINKS+=	lber-decode.3 ber_get_next.3
-MLINKS+=	lber-decode.3 ber_get_null.3
-MLINKS+=	lber-decode.3 ber_get_stringa.3
-MLINKS+=	lber-decode.3 ber_get_stringb.3
-MLINKS+=	lber-decode.3 ber_next_element.3
-MLINKS+=	lber-decode.3 ber_peek_tag.3
-MLINKS+=	lber-decode.3 ber_scanf.3
-MLINKS+=	lber-decode.3 ber_skip_tag.3
-MLINKS+=	lber-encode.3 ber_alloc_t.3
-MLINKS+=	lber-encode.3 ber_flush.3
-MLINKS+=	lber-encode.3 ber_printf.3
-MLINKS+=	lber-encode.3 ber_put_enum.3
-MLINKS+=	lber-encode.3 ber_put_int.3
-MLINKS+=	lber-encode.3 ber_put_null.3
-MLINKS+=	lber-encode.3 ber_put_ostring.3
-MLINKS+=	lber-encode.3 ber_put_seq.3
-MLINKS+=	lber-encode.3 ber_put_set.3
-MLINKS+=	lber-encode.3 ber_put_string.3
-MLINKS+=	lber-decode.3 ber_start_set.3
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_abandon_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext_s.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_rdn.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext_s.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_result.3 ldap_msgid.3
-MLINKS+=	ldap_result.3 ldap_msgtype.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2name.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2str.3
-MLINKS+=	ldap_schema.3 ldap_attributetype_free.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2name.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2str.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule_free.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2name.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2str.3
-MLINKS+=	ldap_schema.3 ldap_objectclass_free.3
-MLINKS+=	ldap_schema.3 ldap_scherr2str.3
-MLINKS+=	ldap_schema.3 ldap_str2attributetype.3
-MLINKS+=	ldap_schema.3 ldap_str2matchingrule.3
-MLINKS+=	ldap_schema.3 ldap_str2objectclass.3
-MLINKS+=	ldap_schema.3 ldap_str2syntax.3
-MLINKS+=	ldap_schema.3 ldap_syntax2name.3
-MLINKS+=	ldap_schema.3 ldap_syntax2str.3
-MLINKS+=	ldap_schema.3 ldap_syntax_free.3
-MLINKS+=	ldap_search.3 ldap_search_ext.3
-MLINKS+=	ldap_search.3 ldap_search_ext_s.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap23-server/files/patch-clients_ud_Makefile.in b/net/openldap23-server/files/patch-clients_ud_Makefile.in
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap23-server/files/patch-clients_ud_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap23-server/files/patch-servers_slapd_daemon.c b/net/openldap23-server/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 44baead6a6b7..000000000000
--- a/net/openldap23-server/files/patch-servers_slapd_daemon.c
+++ /dev/null
@@ -1,828 +0,0 @@
---- servers/slapd/daemon.c.orig	Sat Sep 30 11:24:28 2000
-+++ servers/slapd/daemon.c	Tue Oct 31 10:54:09 2000
-@@ -1,4 +1,4 @@
--/* $OpenLDAP: pkg/ldap/servers/slapd/daemon.c,v 1.99.2.12 2000/09/30 16:24:28 kurt Exp $ */
-+/* $OpenLDAP: servers/slapd/daemon.c,v 1.99.2.13 2000/10/30 18:14:51 kurt Exp $ */
- /*
-  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-@@ -59,6 +59,8 @@
- 
- Listener **slap_listeners = NULL;
- 
-+#define SLAPD_LISTEN 10
-+
- static ber_socket_t wake_sds[2];
- 
- #ifdef NO_THREADS
-@@ -81,8 +83,6 @@
- #endif
- volatile sig_atomic_t slapd_shutdown = 0;
- 
--static ldap_pvt_thread_t	listener_tid;
--
- static struct slap_daemon {
- 	ldap_pvt_thread_mutex_t	sd_mutex;
- 
-@@ -193,20 +193,207 @@
- 	tcp_close(s);
- }
- 
-+static void slap_free_listener_addresses(struct sockaddr **sal)
-+{
-+	struct sockaddr **sap;
-+
-+	if (sal == NULL) {
-+		return;
-+	}
-+
-+	for (sap = sal; *sap != NULL; sap++) {
-+		ch_free(*sap);
-+	}
-+
-+	ch_free(sal);
-+}
-+
-+/* port = 0 indicates AF_LOCAL */
-+static int slap_get_listener_addresses(
-+	const char *host,
-+	unsigned short port,
-+	struct sockaddr ***sal)
-+{
-+	struct sockaddr **sap;
-+#ifdef HAVE_GETADDRINFO
-+	struct addrinfo hints, *res, *sai;
-+	int n, err;
-+	
-+	memset( &hints, '\0', sizeof(hints) );
-+	hints.ai_flags = AI_PASSIVE;
-+	hints.ai_socktype = SOCK_STREAM;
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		hints.ai_family = AF_LOCAL;
-+		/* host specifies a service in this case */
-+		if (err = getaddrinfo(NULL, host, &hints, &res)) {
-+			if (err == EAI_FAMILY) {
-+				/* XXX Fake it */
-+				struct sockaddr_un *sun = calloc(1, sizeof(struct sockaddr_un));
-+				err = 0;
-+				res = calloc(1, sizeof(*res));
-+				assert(sun != NULL);
-+				assert(res != NULL);
-+				res->ai_flags = hints.ai_flags;
-+				res->ai_family = AF_LOCAL;
-+				res->ai_socktype = hints.ai_socktype;
-+				res->ai_addr = (struct sockaddr *)sun;
-+				res->ai_addrlen = sizeof(*sun);
-+				sun->sun_len = strlen(LDAPI_SOCK) + 1;
-+				sun->sun_family = AF_LOCAL;
-+				strcpy(sun->sun_path, LDAPI_SOCK);
-+			} else {
-+				Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				    gai_strerror(err), 0, 0);
-+				return -1;
-+			}
-+		}
-+	} else
-+#  endif
-+	{		
-+		char serv[7];
-+	
-+		snprintf(serv, sizeof serv, "%d", port);
-+		hints.ai_family = AF_UNSPEC;
-+		if (err = getaddrinfo(host, serv, &hints, &res)) {
-+			Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				gai_strerror(err), 0, 0);
-+			return -1;
-+		}
-+	}
-+
-+	sai = res;
-+	for (n=2; (sai = sai->ai_next) != NULL; n++) {
-+		/* EMPTY */ ;
-+	}
-+	*sal = ch_malloc(n * sizeof(*sal));
-+	if (*sal == NULL) {
-+		return -1;
-+	}
-+
-+	sai = res;
-+	sap = *sal;
-+	do {
-+		switch (sai->ai_family) {
-+#  ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_un));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_un *)*sap =
-+				*((struct sockaddr_un *)sai->ai_addr);
-+		} break;
-+#  endif
-+#  ifdef LDAP_PF_INET6			
-+		case AF_INET6: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in6));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in6 *)*sap =
-+				*((struct sockaddr_in6 *)sai->ai_addr);
-+		} break;
-+#  endif
-+		case AF_INET: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in *)*sap =
-+				*((struct sockaddr_in *)sai->ai_addr);
-+		} break;
-+		default: 
-+			*sap = NULL;
-+			break;
-+		}
-+		if (*sap != NULL) {
-+			(*sap)->sa_family = sai->ai_family;
-+			sap++;
-+		}
-+	} while ((sai = sai->ai_next) != NULL);
-+
-+	freeaddrinfo(res);
-+
-+#else
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_un));
-+		if (*sap == NULL)
-+			goto errexit;
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
-+		(*sap)->sa_family = AF_LOCAL;
-+		if ( strlen(host) >
-+		     (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: domain socket path (%s) too long in URL",
-+			       host, 0, 0);
-+			goto errexit;
-+		}
-+		strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
-+	} else
-+#  endif		
-+	{
-+		struct in_addr in;
-+
-+		if ( host == NULL ) {
-+			in.s_addr = htonl(INADDR_ANY);
-+
-+		} else if ( !inet_aton( host, &in ) ) {
-+			struct hostent *he = gethostbyname( host );
-+			if( he == NULL ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "daemon: invalid host %s", host, 0, 0);
-+				return -1;
-+			}
-+			AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
-+		}
-+
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_in));
-+		if (*sap == NULL) {
-+			goto errexit;
-+		}
-+
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
-+		(*sap)->sa_family = AF_INET;
-+		((struct sockaddr_in *)*sap)->sin_port = htons(port);
-+		((struct sockaddr_in *)*sap)->sin_addr = in;
-+	}
-+	sap++;
-+#endif
-+
-+	*sap = NULL;
-+	return 0;
-+
-+errexit:
-+	slap_free_listener_addresses(*sal);
-+	return -1;
-+}
- 
--static Listener * open_listener( const char* url )
-+static Listener * slap_open_listener(
-+	const char* url )
- {
- 	int	tmp, rc;
- 	Listener l;
- 	Listener *li;
- 	LDAPURLDesc *lud;
--	char *s;
--	int port;
--#ifdef HAVE_GETADDRINFO
--	char serv[7];
--	struct addrinfo hints, *res, *sai;
--	int err;
--#endif
-+	unsigned short port;
-+	int err, addrlen;
-+	struct sockaddr **sal, **psal;
- 
- 	rc = ldap_url_parse( url, &lud );
- 
-@@ -238,291 +425,171 @@
- 	}
- #endif
- 
--#ifdef HAVE_GETADDRINFO
--	memset( &hints, '\0', sizeof(hints) );
--	hints.ai_flags = AI_PASSIVE;
--	hints.ai_family = AF_UNSPEC;
--	hints.ai_socktype = SOCK_STREAM;
--
--#  ifdef LDAP_PF_LOCAL
-+	port = (unsigned short) lud->lud_port;
-+	
- 	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifdef LDAP_PF_LOCAL
- 		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			err = getaddrinfo(NULL, LDAPI_SOCK, &hints, &res);
--			if (!err)
--				unlink( LDAPI_SOCK );
-+			err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
- 		} else {
--			err = getaddrinfo(NULL, lud->lud_host, &hints, &res);
--			if (!err)
--				unlink( lud->lud_host );
-+			err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
- 		}
--	} else
--#  endif /* LDAP_PF_LOCAL */
--	{
--		snprintf(serv, sizeof serv, "%d", lud->lud_port);
-+#else
-+		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
-+			url, 0, 0);
-+		ldap_free_urldesc( lud );
-+		return NULL;
-+#endif
-+	} else {
- 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
- 			|| strcmp(lud->lud_host, "*") == 0 )
- 		{
--			err = getaddrinfo(NULL, serv, &hints, &res);
-+			err = slap_get_listener_addresses(NULL, port, &sal);
- 		} else {
--			err = getaddrinfo(lud->lud_host, serv, &hints, &res);
-+			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
- 		}
- 	}
- 
-+	ldap_free_urldesc( lud );
- 	if ( err ) {
--		Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed\n", 0, 0, 0);
--		ldap_free_urldesc( lud );
- 		return NULL;
- 	}
- 
--	ldap_free_urldesc( lud );
--	sai = res;
--	do {
--		if ( (sai->ai_family != AF_INET)
--#  ifdef LDAP_PF_INET6
--		     && (sai->ai_family != AF_INET6)
--#  endif
--#  ifdef LDAP_PF_LOCAL
--		     && (sai->ai_family != AF_LOCAL)
--#  endif
--		     )
-+	psal = sal;
-+	while ( *sal != NULL ) {
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+#endif
-+#ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL:
-+#endif
-+			break;
-+		default:
-+			sal++;
- 			continue;
--		l.sl_sd = socket( sai->ai_family, sai->ai_socktype, sai->ai_protocol);
-+		}
-+		l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
- 		if ( l.sl_sd == AC_SOCKET_INVALID ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: socket() failed errno=%d (%s)\n", err,
- 				sock_errstr(err), 0 );
-+			sal++;
- 			continue;
- 		}
--
--		if ( sai->ai_family != AF_LOCAL ) {
--#else
--
--	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifndef HAVE_WINSOCK
-+		if ( l.sl_sd >= dtblsize ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: listener descriptor %ld is too great %ld\n",
-+			       (long) l.sl_sd, (long) dtblsize, 0 );
-+			tcp_close( l.sl_sd );
-+			sal++;
-+			continue;
-+		}
-+#endif
- #ifdef LDAP_PF_LOCAL
--		port = 0;
--		(void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );
--
--		l.sl_sa.sa_un_addr.sun_family = AF_LOCAL;
--
--		/* hack: overload the host to be the path */
--		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			strcpy( l.sl_sa.sa_un_addr.sun_path, LDAPI_SOCK );
--		} else {
--			if ( strlen(lud->lud_host) > (sizeof(l.sl_sa.sa_un_addr.sun_path) - 1) ) {
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: domain socket path (%s) too long in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
--			}
--			strcpy( l.sl_sa.sa_un_addr.sun_path, lud->lud_host );
--		}
--		unlink( l.sl_sa.sa_un_addr.sun_path ); 
--#if 0
--		/* I don't think we need to set this. */
--		l.sl_sa.sa_un_addr.sun_len = sizeof( l.sl_sa.sa_un_addr.sun_len ) +
--			sizeof( l.sl_sa.sa_un_addr.sun_family ) +
--			strlen( l.sl_sa.sa_un_addr.sun_path ) + 1;
-+		if ( (*sal)->sa_family == AF_LOCAL ) {
-+			unlink ( ((struct sockaddr_un *)*sal)->sun_path );
-+		} else
- #endif
--#else
--		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
--			url, 0, 0);
--		ldap_free_urldesc( lud );
--		return NULL;
--#endif /* LDAP_PF_LOCAL */
--	} else {
--
--	port = lud->lud_port;
--
--	(void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
--
--	l.sl_addr.sin_family = AF_INET;
--	l.sl_addr.sin_port = htons( (unsigned short) lud->lud_port );
--
--	if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
--		|| strcmp(lud->lud_host, "*") == 0 )
--	{
--		l.sl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
--
--	} else {
--		/* host or address was specified */
--		if( !inet_aton( lud->lud_host, &l.sl_addr.sin_addr ) ) {
--			struct hostent *he = gethostbyname( lud->lud_host );
--			if( he == NULL ) {
-+		{
-+#ifdef SO_REUSEADDR
-+			/* enable address reuse */
-+			tmp = 1;
-+			rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
-+					 (char *) &tmp, sizeof(tmp) );
-+			if ( rc == AC_SOCKET_ERROR ) {
-+				int err = sock_errno();
- 				Debug( LDAP_DEBUG_ANY,
--					"daemon: invalid host (%s) in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
-+				       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
-+				       (long) l.sl_sd, err, sock_errstr(err) );
- 			}
--
--			AC_MEMCPY( &l.sl_addr.sin_addr, he->h_addr,
--			       sizeof( l.sl_addr.sin_addr ) );
-+#endif
- 		}
--	}
--	}
--
--	ldap_free_urldesc( lud );
--
--	l.sl_sd = socket( l.sl_sa.sa_addr.sa_family, SOCK_STREAM, 0 );
--	if ( l.sl_sd == AC_SOCKET_INVALID ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: socket() failed errno=%d (%s)\n", err,
--			sock_errstr(err), 0 );
--		return NULL;
--	}
--
--#ifndef HAVE_WINSOCK
--	if ( l.sl_sd >= dtblsize ) {
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: listener descriptor %ld is too great %ld\n",
--			(long) l.sl_sd, (long) dtblsize, 0 );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
-+	
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+			addrlen = sizeof(struct sockaddr_in);
-+			break;
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+			addrlen = sizeof(struct sockaddr_in6);
-+			break;
- #endif
--
- #ifdef LDAP_PF_LOCAL
--	/* for IPv4 and IPv6 sockets only */
--	if ( l.sl_sa.sa_addr.sa_family != AF_LOCAL ) {
--#endif /* LDAP_PF_LOCAL */
--#endif /* HAVE_GETADDRINFO */
--
--#ifdef SO_REUSEADDR
--	/* enable address reuse */
--	tmp = 1;
--	rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
--		(char *) &tmp, sizeof(tmp) );
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--	       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--	}
-+		case AF_LOCAL:
-+			addrlen = sizeof(struct sockaddr_un);
-+			break;
- #endif
--
--#ifdef HAVE_GETADDRINFO
--		} /* sai->ai_family != AF_LOCAL */
--		if (!bind(l.sl_sd, sai->ai_addr, sai->ai_addrlen))
-+		}
-+	
-+		if (!bind(l.sl_sd, *sal, addrlen))
- 			break;
- 		err = sock_errno();
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--			(long) l.sl_sd, err, sock_errstr(err) );
-+		       (long) l.sl_sd, err, sock_errstr(err) );
- 		tcp_close( l.sl_sd );
--	} while ((sai = sai->ai_next) != NULL);
-+		sal++;
-+	} /* while ( *sal != NULL ) */
- 
--	if (!sai) {
-+	if ( *sal == NULL ) {
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
- 			(long) l.sl_sd, 0, 0 );
-+		slap_free_listener_addresses(psal);
- 		return NULL;
- 	}
- 
--	switch ( sai->ai_family ) {
--#  ifdef LDAP_PF_LOCAL
--	case AF_LOCAL:
--		if ( chmod( (char *)sai->ai_addr, S_IRWXU ) < 0 ) {
-+	switch ( (*sal)->sa_family ) {
-+#ifdef LDAP_PF_LOCAL
-+	case AF_LOCAL: {
-+		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-+		if ( chmod( addr, S_IRWXU ) < 0 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
--				(long) l.sl_sd, err, sock_errstr(err) );
-+			       (long) l.sl_sd, err, sock_errstr(err) );
- 			tcp_close( l.sl_sd );
-+			slap_free_listener_addresses(psal);
- 			return NULL;
- 		}
--		l.sl_name = ch_malloc( strlen((char *)sai->ai_addr) + sizeof("PATH=") );
--		sprintf( l.sl_name, "PATH=%s", sai->ai_addr );
--		break;
--#  endif /* LDAP_PF_LOCAL */
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
-+		sprintf( l.sl_name, "PATH=%s", addr );
-+	} break;
-+#endif /* LDAP_PF_LOCAL */
- 
- 	case AF_INET: {
-+		char *s;
-+#ifdef HAVE_GETADDRINFO		
- 		char addr[INET_ADDRSTRLEN];
--		inet_ntop( AF_INET,
--			&((struct sockaddr_in *)sai->ai_addr)->sin_addr,
--			addr, sizeof(addr) );
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP=:") );
--		sprintf( l.sl_name, "IP=%s:%s", addr, serv );
-+		inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
-+			   addr, sizeof(addr) );
-+		s = addr;
-+#else
-+		s = inet_ntoa( l.sl_addr.sin_addr );
-+#endif		
-+		l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
-+		sprintf( l.sl_name, "IP=%s:%d",
-+			 s != NULL ? s : "unknown" , port );
- 	} break;
- 
--#  ifdef LDAP_PF_INET6
-+#ifdef LDAP_PF_INET6
- 	case AF_INET6: {
- 		char addr[INET6_ADDRSTRLEN];
--		inet_ntop( AF_INET6,
--			&((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr,
--			addr, sizeof addr);
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP= ") );
--		sprintf( l.sl_name, "IP=%s %s", addr, serv );
-+		inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
-+			   addr, sizeof addr);
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
-+		sprintf( l.sl_name, "IP=%s %d", addr, port );
- 	} break;
--#  endif /* LDAP_PF_INET6 */
-+#endif /* LDAP_PF_INET6 */
- 
- 	default:
- 		Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
--			(int) sai->ai_family, 0, 0 );
-+			(int) (*sal)->sa_family, 0, 0 );
- 		break;
- 	}
--#else
--#ifdef LDAP_PF_LOCAL
--	/* close conditional */
--	}
--#endif /* LDAP_PF_LOCAL */
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_un_addr) );
--			break;
--#endif
--
--		case AF_INET:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_in_addr) );
--			break;
- 
--		default:
--			rc = AC_SOCKET_ERROR;
--			errno = EINVAL;
--			break;
--	}
--
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			if ( chmod( l.sl_sa.sa_un_addr.sun_path, S_IRWXU ) < 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: chmod(%ld) failed errno=%d (%s)",
--					(long) l.sl_sd, err, sock_errstr(err) );
--				tcp_close( l.sl_sd );
--				return NULL;
--			}
--
--			l.sl_name = ch_malloc( strlen(l.sl_sa.sa_un_addr.sun_path)
--				+ sizeof("PATH=") );
--			sprintf( l.sl_name, "PATH=%s", l.sl_sa.sa_un_addr.sun_path );
--			break;
--#endif /* LDAP_PF_LOCAL */
--
--		case AF_INET:
--			l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
--			s = inet_ntoa( l.sl_addr.sin_addr );
--			sprintf( l.sl_name, "IP=%s:%d",
--				s != NULL ? s : "unknown" , port );
--			break;
--
--		default:
--			l.sl_name = ch_strdup( "UNKNOWN" );
--			break;
--	}
--
--#endif /* HAVE_GETADDRINFO */
-+	slap_free_listener_addresses(psal);
- 
- 	l.sl_url = ch_strdup( url );
- 	li = ch_malloc( sizeof( Listener ) );
-@@ -608,7 +675,7 @@
- 	slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
- 
- 	for(i = 0; u[i] != NULL; i++ ) {
--		slap_listeners[i] = open_listener( u[i] );
-+		slap_listeners[i] = slap_open_listener( u[i] );
- 
- 		if( slap_listeners[i] == NULL ) {
- 			charray_free( u );
-@@ -642,7 +709,6 @@
- 	void *ptr
- )
- {
--	int rc, tmp;
- 	int l;
- 	time_t	last_idle_check = slap_get_time();
- 	time( &starttime );
-@@ -651,7 +717,7 @@
- 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
- 			continue;
- 
--		if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
-+		if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: listen(%s, 5) failed errno=%d (%s)\n",
-@@ -814,7 +880,7 @@
- 		}
- 
- 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
--			ber_int_t s;
-+			ber_socket_t s;
- 			socklen_t len = sizeof(from);
- 			long id;
- 			slap_ssf_t ssf = 0;
-@@ -860,31 +926,6 @@
- 			}
- #endif
- 
--#ifdef SO_KEEPALIVE
--			/* enable keep alives */
--			rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
--				(char *) &tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--#ifdef TCP_NODELAY
--			/* enable no delay */
--			tmp = 1;
--			rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
--				(char *)&tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(TCP_NODELAY) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--
--
- #ifdef LDAP_DEBUG
- 			ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- 
-@@ -896,20 +937,44 @@
- 			ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
- #endif
- 
-+#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY )
-+#ifdef LDAP_PF_LOCAL
-+			/* for IPv4 and IPv6 sockets only */
-+			if ( from.sa_addr.sa_family != AF_LOCAL )
-+#endif /* LDAP_PF_LOCAL */
-+			{
-+				int rc;
-+				int tmp;
-+#ifdef SO_KEEPALIVE
-+				/* enable keep alives */
-+				tmp = 1;
-+				rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
-+					(char *) &tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+#ifdef TCP_NODELAY
-+				/* enable no delay */
-+				tmp = 1;
-+				rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
-+					(char *)&tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(TCP_NODELAY) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+			}
-+#endif
-+
- 			Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
- 				(long) s, 0, 0 );
- 
--			len = sizeof(from);
--
--			if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
--					(long) s, err, sock_errstr(err) );
--				slapd_close(s);
--				continue;
--			}
--
- 			switch ( from.sa_addr.sa_family ) {
- #  ifdef LDAP_PF_LOCAL
- 			case AF_LOCAL:
-@@ -948,6 +1013,7 @@
- 				slapd_close(s);
- 				continue;
- 			}
-+
- 			if ( ( from.sa_addr.sa_family == AF_INET ) 
- #ifdef LDAP_PF_INET6
- 				|| ( from.sa_addr.sa_family == AF_INET6 )
-@@ -961,7 +1027,7 @@
- 						sizeof(from.sa_in6_addr.sin6_addr),
- 						AF_INET6 );
- 				else
--#  endif LDAP_PF_INET6
-+#  endif /* LDAP_PF_INET6 */
- 				hp = gethostbyaddr(
- 					(char *) &(from.sa_in_addr.sin_addr),
- 					sizeof(from.sa_in_addr.sin_addr),
-@@ -1202,23 +1268,25 @@
- 	connections_init();
- 
- #define SLAPD_LISTENER_THREAD 1
--#if defined( SLAPD_LISTENER_THREAD ) || !defined(HAVE_PTHREADS)
-+#if defined( SLAPD_LISTENER_THREAD )
-+	{
-+		ldap_pvt_thread_t	listener_tid;
- 
--	/* listener as a separate THREAD */
--	rc = ldap_pvt_thread_create( &listener_tid,
--		0, slapd_daemon_task, NULL );
-+		/* listener as a separate THREAD */
-+		rc = ldap_pvt_thread_create( &listener_tid,
-+			0, slapd_daemon_task, NULL );
- 
--	if ( rc != 0 ) {
--		Debug( LDAP_DEBUG_ANY,
--		    "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
--		return rc;
--	}
-+		if ( rc != 0 ) {
-+			Debug( LDAP_DEBUG_ANY,
-+		    	"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-+			return rc;
-+		}
- 
--	/* wait for the listener thread to complete */
--	ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+		/* wait for the listener thread to complete */
-+		ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+ 	}
- #else
--	/* expermimental code */
--	listener_tid = pthread_self();
-+	/* experimental code */
- 	slapd_daemon_task( NULL );
- #endif
- 
-@@ -1307,4 +1375,9 @@
- 
- 	/* reinstall self */
- 	(void) SIGNAL_REINSTALL( sig, slap_sig_wake );
-+}
-+
-+
-+void slapd_add_internal(ber_socket_t s) {
-+	slapd_add(s);
- }
diff --git a/net/openldap23-server/files/patch-servers_slapd_schema b/net/openldap23-server/files/patch-servers_slapd_schema
deleted file mode 100644
index 31969e8bb621..000000000000
--- a/net/openldap23-server/files/patch-servers_slapd_schema
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/schema/krb5-kdc.schema.orig	Tue Sep  5 13:28:34 2000
-+++ servers/slapd/schema/krb5-kdc.schema	Mon Oct 30 13:09:19 2000
-@@ -96,7 +96,7 @@
- attributetype ( 1.3.6.1.4.1.5322.10.1.10
- 	NAME 'krb5Key'
- 	DESC 'Encoded ASN1 Key as an octet string'
--	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
- 
- attributetype ( 1.3.6.1.4.1.5322.10.1.11
- 	NAME 'krb5PrincipalRealm'
-@@ -112,7 +112,7 @@
- 
- objectclass ( 1.3.6.1.4.1.5322.10.2.1
- 	NAME 'krb5Principal'
--	SUP top
-+	SUP person
- 	AUXILIARY
- 	MUST ( krb5PrincipalName )
- 	MAY ( cn $ krb5PrincipalRealm ) )
diff --git a/net/openldap23-server/files/slapd.sh b/net/openldap23-server/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap23-server/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap23-server/pkg-comment b/net/openldap23-server/pkg-comment
deleted file mode 100644
index 8c499c3923cf..000000000000
--- a/net/openldap23-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open source LDAP client and server software
diff --git a/net/openldap23-server/pkg-descr b/net/openldap23-server/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap23-server/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap23-server/pkg-plist b/net/openldap23-server/pkg-plist
deleted file mode 100644
index 764525594e11..000000000000
--- a/net/openldap23-server/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
-@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ ! -f %B/schema/corba.schema ] && cp %B/%f %B/schema/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ ! -f %B/schema/core.schema ] && cp %B/%f %B/schema/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ ! -f %B/schema/cosine.schema ] && cp %B/%f %B/schema/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ ! -f %B/schema/inetorgperson.schema ] && cp %B/%f %B/schema/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ ! -f %B/schema/java.schema ] && cp %B/%f %B/schema/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ ! -f %B/schema/krb5-kdc.schema ] && cp %B/%f %B/schema/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ ! -f %B/schema/misc.schema ] && cp %B/%f %B/schema/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nadf.schema %D/etc/openldap/schema/nadf.schema.default; then rm -f %D/etc/openldap/schema/nadf.schema; fi
-etc/openldap/schema/nadf.schema.default
-@exec [ ! -f %B/schema/nadf.schema ] && cp %B/%f %B/schema/nadf.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ ! -f %B/schema/nis.schema ] && cp %B/%f %B/schema/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ ! -f %B/schema/openldap.schema ] && cp %B/%f %B/schema/openldap.schema
-@dirrm etc/openldap/schema
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.2
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
deleted file mode 100644
index 984b1a7d60fb..000000000000
--- a/net/openldap24-server/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 2.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	2.0.6
-PORTREVISION=	2
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-USE_OPENSSL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/run \
-		--with-threads \
-		--enable-shared \
-		--enable-dnssrv \
-		--with-tls=openssl
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-.if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
-.endif
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/maildap \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-post-configure:
-	cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff
-
-pre-build:
-	cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	strip ${PREFIX}/${f}
-.endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
deleted file mode 100644
index 8a9668d4e077..000000000000
--- a/net/openldap24-server/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-2.0.6.tgz) = 6df0ebc7da308999146102f950ecdaed
diff --git a/net/openldap24-server/files/libtool.diff b/net/openldap24-server/files/libtool.diff
deleted file mode 100644
index 0cf57bbee7ea..000000000000
--- a/net/openldap24-server/files/libtool.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libtool.orig	Tue Oct 31 01:43:06 2000
-+++ libtool	Tue Oct 31 01:44:42 2000
-@@ -448,6 +448,16 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --only-shared)
-+    build_libtool_libs=yes
-+    build_old_libs=no
-+    ;;
-+
-+  --only-static)
-+    build_libtool_libs=no
-+    build_old_libs=yes
-+    ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
deleted file mode 100644
index 1c39b81911fc..000000000000
--- a/net/openldap24-server/files/manpages
+++ /dev/null
@@ -1,219 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	lber-memory.3
-MAN3+=	lber-types.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_schema.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapadd.8
-MAN8+=	slapcat.8
-MAN8+=	slapd.8
-MAN8+=	slapindex.8
-MAN8+=	slappasswd.8
-MAN8+=	slurpd.8
-MLINKS+=	lber-decode.3 ber_first_element.3
-MLINKS+=	lber-decode.3 ber_get_bitstring.3
-MLINKS+=	lber-decode.3 ber_get_boolean.3
-MLINKS+=	lber-decode.3 ber_get_enum.3
-MLINKS+=	lber-decode.3 ber_get_int.3
-MLINKS+=	lber-decode.3 ber_get_next.3
-MLINKS+=	lber-decode.3 ber_get_null.3
-MLINKS+=	lber-decode.3 ber_get_stringa.3
-MLINKS+=	lber-decode.3 ber_get_stringb.3
-MLINKS+=	lber-decode.3 ber_next_element.3
-MLINKS+=	lber-decode.3 ber_peek_tag.3
-MLINKS+=	lber-decode.3 ber_scanf.3
-MLINKS+=	lber-decode.3 ber_skip_tag.3
-MLINKS+=	lber-encode.3 ber_alloc_t.3
-MLINKS+=	lber-encode.3 ber_flush.3
-MLINKS+=	lber-encode.3 ber_printf.3
-MLINKS+=	lber-encode.3 ber_put_enum.3
-MLINKS+=	lber-encode.3 ber_put_int.3
-MLINKS+=	lber-encode.3 ber_put_null.3
-MLINKS+=	lber-encode.3 ber_put_ostring.3
-MLINKS+=	lber-encode.3 ber_put_seq.3
-MLINKS+=	lber-encode.3 ber_put_set.3
-MLINKS+=	lber-encode.3 ber_put_string.3
-MLINKS+=	lber-decode.3 ber_start_set.3
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_abandon_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext_s.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_rdn.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext_s.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_result.3 ldap_msgid.3
-MLINKS+=	ldap_result.3 ldap_msgtype.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2name.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2str.3
-MLINKS+=	ldap_schema.3 ldap_attributetype_free.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2name.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2str.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule_free.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2name.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2str.3
-MLINKS+=	ldap_schema.3 ldap_objectclass_free.3
-MLINKS+=	ldap_schema.3 ldap_scherr2str.3
-MLINKS+=	ldap_schema.3 ldap_str2attributetype.3
-MLINKS+=	ldap_schema.3 ldap_str2matchingrule.3
-MLINKS+=	ldap_schema.3 ldap_str2objectclass.3
-MLINKS+=	ldap_schema.3 ldap_str2syntax.3
-MLINKS+=	ldap_schema.3 ldap_syntax2name.3
-MLINKS+=	ldap_schema.3 ldap_syntax2str.3
-MLINKS+=	ldap_schema.3 ldap_syntax_free.3
-MLINKS+=	ldap_search.3 ldap_search_ext.3
-MLINKS+=	ldap_search.3 ldap_search_ext_s.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap24-server/files/patch-clients_ud_Makefile.in b/net/openldap24-server/files/patch-clients_ud_Makefile.in
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap24-server/files/patch-clients_ud_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap24-server/files/patch-servers_slapd_daemon.c b/net/openldap24-server/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 44baead6a6b7..000000000000
--- a/net/openldap24-server/files/patch-servers_slapd_daemon.c
+++ /dev/null
@@ -1,828 +0,0 @@
---- servers/slapd/daemon.c.orig	Sat Sep 30 11:24:28 2000
-+++ servers/slapd/daemon.c	Tue Oct 31 10:54:09 2000
-@@ -1,4 +1,4 @@
--/* $OpenLDAP: pkg/ldap/servers/slapd/daemon.c,v 1.99.2.12 2000/09/30 16:24:28 kurt Exp $ */
-+/* $OpenLDAP: servers/slapd/daemon.c,v 1.99.2.13 2000/10/30 18:14:51 kurt Exp $ */
- /*
-  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-@@ -59,6 +59,8 @@
- 
- Listener **slap_listeners = NULL;
- 
-+#define SLAPD_LISTEN 10
-+
- static ber_socket_t wake_sds[2];
- 
- #ifdef NO_THREADS
-@@ -81,8 +83,6 @@
- #endif
- volatile sig_atomic_t slapd_shutdown = 0;
- 
--static ldap_pvt_thread_t	listener_tid;
--
- static struct slap_daemon {
- 	ldap_pvt_thread_mutex_t	sd_mutex;
- 
-@@ -193,20 +193,207 @@
- 	tcp_close(s);
- }
- 
-+static void slap_free_listener_addresses(struct sockaddr **sal)
-+{
-+	struct sockaddr **sap;
-+
-+	if (sal == NULL) {
-+		return;
-+	}
-+
-+	for (sap = sal; *sap != NULL; sap++) {
-+		ch_free(*sap);
-+	}
-+
-+	ch_free(sal);
-+}
-+
-+/* port = 0 indicates AF_LOCAL */
-+static int slap_get_listener_addresses(
-+	const char *host,
-+	unsigned short port,
-+	struct sockaddr ***sal)
-+{
-+	struct sockaddr **sap;
-+#ifdef HAVE_GETADDRINFO
-+	struct addrinfo hints, *res, *sai;
-+	int n, err;
-+	
-+	memset( &hints, '\0', sizeof(hints) );
-+	hints.ai_flags = AI_PASSIVE;
-+	hints.ai_socktype = SOCK_STREAM;
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		hints.ai_family = AF_LOCAL;
-+		/* host specifies a service in this case */
-+		if (err = getaddrinfo(NULL, host, &hints, &res)) {
-+			if (err == EAI_FAMILY) {
-+				/* XXX Fake it */
-+				struct sockaddr_un *sun = calloc(1, sizeof(struct sockaddr_un));
-+				err = 0;
-+				res = calloc(1, sizeof(*res));
-+				assert(sun != NULL);
-+				assert(res != NULL);
-+				res->ai_flags = hints.ai_flags;
-+				res->ai_family = AF_LOCAL;
-+				res->ai_socktype = hints.ai_socktype;
-+				res->ai_addr = (struct sockaddr *)sun;
-+				res->ai_addrlen = sizeof(*sun);
-+				sun->sun_len = strlen(LDAPI_SOCK) + 1;
-+				sun->sun_family = AF_LOCAL;
-+				strcpy(sun->sun_path, LDAPI_SOCK);
-+			} else {
-+				Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				    gai_strerror(err), 0, 0);
-+				return -1;
-+			}
-+		}
-+	} else
-+#  endif
-+	{		
-+		char serv[7];
-+	
-+		snprintf(serv, sizeof serv, "%d", port);
-+		hints.ai_family = AF_UNSPEC;
-+		if (err = getaddrinfo(host, serv, &hints, &res)) {
-+			Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-+				gai_strerror(err), 0, 0);
-+			return -1;
-+		}
-+	}
-+
-+	sai = res;
-+	for (n=2; (sai = sai->ai_next) != NULL; n++) {
-+		/* EMPTY */ ;
-+	}
-+	*sal = ch_malloc(n * sizeof(*sal));
-+	if (*sal == NULL) {
-+		return -1;
-+	}
-+
-+	sai = res;
-+	sap = *sal;
-+	do {
-+		switch (sai->ai_family) {
-+#  ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_un));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_un *)*sap =
-+				*((struct sockaddr_un *)sai->ai_addr);
-+		} break;
-+#  endif
-+#  ifdef LDAP_PF_INET6			
-+		case AF_INET6: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in6));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in6 *)*sap =
-+				*((struct sockaddr_in6 *)sai->ai_addr);
-+		} break;
-+#  endif
-+		case AF_INET: {
-+			*sap = ch_malloc(sizeof(struct sockaddr_in));
-+			if (*sap == NULL) {
-+				freeaddrinfo(res);
-+				goto errexit;
-+			}
-+			*(struct sockaddr_in *)*sap =
-+				*((struct sockaddr_in *)sai->ai_addr);
-+		} break;
-+		default: 
-+			*sap = NULL;
-+			break;
-+		}
-+		if (*sap != NULL) {
-+			(*sap)->sa_family = sai->ai_family;
-+			sap++;
-+		}
-+	} while ((sai = sai->ai_next) != NULL);
-+
-+	freeaddrinfo(res);
-+
-+#else
-+#  ifdef LDAP_PF_LOCAL
-+	if ( port == 0 ) {
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_un));
-+		if (*sap == NULL)
-+			goto errexit;
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
-+		(*sap)->sa_family = AF_LOCAL;
-+		if ( strlen(host) >
-+		     (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: domain socket path (%s) too long in URL",
-+			       host, 0, 0);
-+			goto errexit;
-+		}
-+		strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
-+	} else
-+#  endif		
-+	{
-+		struct in_addr in;
-+
-+		if ( host == NULL ) {
-+			in.s_addr = htonl(INADDR_ANY);
-+
-+		} else if ( !inet_aton( host, &in ) ) {
-+			struct hostent *he = gethostbyname( host );
-+			if( he == NULL ) {
-+				Debug( LDAP_DEBUG_ANY,
-+				       "daemon: invalid host %s", host, 0, 0);
-+				return -1;
-+			}
-+			AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
-+		}
-+
-+		*sal = ch_malloc(2 * sizeof(*sal));
-+		if (*sal == NULL) {
-+			return -1;
-+		}
-+
-+		sap = *sal;
-+		*sap = ch_malloc(sizeof(struct sockaddr_in));
-+		if (*sap == NULL) {
-+			goto errexit;
-+		}
-+
-+		(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
-+		(*sap)->sa_family = AF_INET;
-+		((struct sockaddr_in *)*sap)->sin_port = htons(port);
-+		((struct sockaddr_in *)*sap)->sin_addr = in;
-+	}
-+	sap++;
-+#endif
-+
-+	*sap = NULL;
-+	return 0;
-+
-+errexit:
-+	slap_free_listener_addresses(*sal);
-+	return -1;
-+}
- 
--static Listener * open_listener( const char* url )
-+static Listener * slap_open_listener(
-+	const char* url )
- {
- 	int	tmp, rc;
- 	Listener l;
- 	Listener *li;
- 	LDAPURLDesc *lud;
--	char *s;
--	int port;
--#ifdef HAVE_GETADDRINFO
--	char serv[7];
--	struct addrinfo hints, *res, *sai;
--	int err;
--#endif
-+	unsigned short port;
-+	int err, addrlen;
-+	struct sockaddr **sal, **psal;
- 
- 	rc = ldap_url_parse( url, &lud );
- 
-@@ -238,291 +425,171 @@
- 	}
- #endif
- 
--#ifdef HAVE_GETADDRINFO
--	memset( &hints, '\0', sizeof(hints) );
--	hints.ai_flags = AI_PASSIVE;
--	hints.ai_family = AF_UNSPEC;
--	hints.ai_socktype = SOCK_STREAM;
--
--#  ifdef LDAP_PF_LOCAL
-+	port = (unsigned short) lud->lud_port;
-+	
- 	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifdef LDAP_PF_LOCAL
- 		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			err = getaddrinfo(NULL, LDAPI_SOCK, &hints, &res);
--			if (!err)
--				unlink( LDAPI_SOCK );
-+			err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
- 		} else {
--			err = getaddrinfo(NULL, lud->lud_host, &hints, &res);
--			if (!err)
--				unlink( lud->lud_host );
-+			err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
- 		}
--	} else
--#  endif /* LDAP_PF_LOCAL */
--	{
--		snprintf(serv, sizeof serv, "%d", lud->lud_port);
-+#else
-+		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
-+			url, 0, 0);
-+		ldap_free_urldesc( lud );
-+		return NULL;
-+#endif
-+	} else {
- 		if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
- 			|| strcmp(lud->lud_host, "*") == 0 )
- 		{
--			err = getaddrinfo(NULL, serv, &hints, &res);
-+			err = slap_get_listener_addresses(NULL, port, &sal);
- 		} else {
--			err = getaddrinfo(lud->lud_host, serv, &hints, &res);
-+			err = slap_get_listener_addresses(lud->lud_host, port, &sal);
- 		}
- 	}
- 
-+	ldap_free_urldesc( lud );
- 	if ( err ) {
--		Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed\n", 0, 0, 0);
--		ldap_free_urldesc( lud );
- 		return NULL;
- 	}
- 
--	ldap_free_urldesc( lud );
--	sai = res;
--	do {
--		if ( (sai->ai_family != AF_INET)
--#  ifdef LDAP_PF_INET6
--		     && (sai->ai_family != AF_INET6)
--#  endif
--#  ifdef LDAP_PF_LOCAL
--		     && (sai->ai_family != AF_LOCAL)
--#  endif
--		     )
-+	psal = sal;
-+	while ( *sal != NULL ) {
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+#endif
-+#ifdef LDAP_PF_LOCAL
-+		case AF_LOCAL:
-+#endif
-+			break;
-+		default:
-+			sal++;
- 			continue;
--		l.sl_sd = socket( sai->ai_family, sai->ai_socktype, sai->ai_protocol);
-+		}
-+		l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
- 		if ( l.sl_sd == AC_SOCKET_INVALID ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: socket() failed errno=%d (%s)\n", err,
- 				sock_errstr(err), 0 );
-+			sal++;
- 			continue;
- 		}
--
--		if ( sai->ai_family != AF_LOCAL ) {
--#else
--
--	if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
-+#ifndef HAVE_WINSOCK
-+		if ( l.sl_sd >= dtblsize ) {
-+			Debug( LDAP_DEBUG_ANY,
-+			       "daemon: listener descriptor %ld is too great %ld\n",
-+			       (long) l.sl_sd, (long) dtblsize, 0 );
-+			tcp_close( l.sl_sd );
-+			sal++;
-+			continue;
-+		}
-+#endif
- #ifdef LDAP_PF_LOCAL
--		port = 0;
--		(void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );
--
--		l.sl_sa.sa_un_addr.sun_family = AF_LOCAL;
--
--		/* hack: overload the host to be the path */
--		if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
--			strcpy( l.sl_sa.sa_un_addr.sun_path, LDAPI_SOCK );
--		} else {
--			if ( strlen(lud->lud_host) > (sizeof(l.sl_sa.sa_un_addr.sun_path) - 1) ) {
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: domain socket path (%s) too long in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
--			}
--			strcpy( l.sl_sa.sa_un_addr.sun_path, lud->lud_host );
--		}
--		unlink( l.sl_sa.sa_un_addr.sun_path ); 
--#if 0
--		/* I don't think we need to set this. */
--		l.sl_sa.sa_un_addr.sun_len = sizeof( l.sl_sa.sa_un_addr.sun_len ) +
--			sizeof( l.sl_sa.sa_un_addr.sun_family ) +
--			strlen( l.sl_sa.sa_un_addr.sun_path ) + 1;
-+		if ( (*sal)->sa_family == AF_LOCAL ) {
-+			unlink ( ((struct sockaddr_un *)*sal)->sun_path );
-+		} else
- #endif
--#else
--		Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
--			url, 0, 0);
--		ldap_free_urldesc( lud );
--		return NULL;
--#endif /* LDAP_PF_LOCAL */
--	} else {
--
--	port = lud->lud_port;
--
--	(void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
--
--	l.sl_addr.sin_family = AF_INET;
--	l.sl_addr.sin_port = htons( (unsigned short) lud->lud_port );
--
--	if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
--		|| strcmp(lud->lud_host, "*") == 0 )
--	{
--		l.sl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
--
--	} else {
--		/* host or address was specified */
--		if( !inet_aton( lud->lud_host, &l.sl_addr.sin_addr ) ) {
--			struct hostent *he = gethostbyname( lud->lud_host );
--			if( he == NULL ) {
-+		{
-+#ifdef SO_REUSEADDR
-+			/* enable address reuse */
-+			tmp = 1;
-+			rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
-+					 (char *) &tmp, sizeof(tmp) );
-+			if ( rc == AC_SOCKET_ERROR ) {
-+				int err = sock_errno();
- 				Debug( LDAP_DEBUG_ANY,
--					"daemon: invalid host (%s) in URL: %s",
--					lud->lud_host, url, 0);
--				ldap_free_urldesc( lud );
--				return NULL;
-+				       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
-+				       (long) l.sl_sd, err, sock_errstr(err) );
- 			}
--
--			AC_MEMCPY( &l.sl_addr.sin_addr, he->h_addr,
--			       sizeof( l.sl_addr.sin_addr ) );
-+#endif
- 		}
--	}
--	}
--
--	ldap_free_urldesc( lud );
--
--	l.sl_sd = socket( l.sl_sa.sa_addr.sa_family, SOCK_STREAM, 0 );
--	if ( l.sl_sd == AC_SOCKET_INVALID ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: socket() failed errno=%d (%s)\n", err,
--			sock_errstr(err), 0 );
--		return NULL;
--	}
--
--#ifndef HAVE_WINSOCK
--	if ( l.sl_sd >= dtblsize ) {
--		Debug( LDAP_DEBUG_ANY,
--			"daemon: listener descriptor %ld is too great %ld\n",
--			(long) l.sl_sd, (long) dtblsize, 0 );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
-+	
-+		switch( (*sal)->sa_family ) {
-+		case AF_INET:
-+			addrlen = sizeof(struct sockaddr_in);
-+			break;
-+#ifdef LDAP_PF_INET6
-+		case AF_INET6:
-+			addrlen = sizeof(struct sockaddr_in6);
-+			break;
- #endif
--
- #ifdef LDAP_PF_LOCAL
--	/* for IPv4 and IPv6 sockets only */
--	if ( l.sl_sa.sa_addr.sa_family != AF_LOCAL ) {
--#endif /* LDAP_PF_LOCAL */
--#endif /* HAVE_GETADDRINFO */
--
--#ifdef SO_REUSEADDR
--	/* enable address reuse */
--	tmp = 1;
--	rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
--		(char *) &tmp, sizeof(tmp) );
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY,
--	       "slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--	}
-+		case AF_LOCAL:
-+			addrlen = sizeof(struct sockaddr_un);
-+			break;
- #endif
--
--#ifdef HAVE_GETADDRINFO
--		} /* sai->ai_family != AF_LOCAL */
--		if (!bind(l.sl_sd, sai->ai_addr, sai->ai_addrlen))
-+		}
-+	
-+		if (!bind(l.sl_sd, *sal, addrlen))
- 			break;
- 		err = sock_errno();
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--			(long) l.sl_sd, err, sock_errstr(err) );
-+		       (long) l.sl_sd, err, sock_errstr(err) );
- 		tcp_close( l.sl_sd );
--	} while ((sai = sai->ai_next) != NULL);
-+		sal++;
-+	} /* while ( *sal != NULL ) */
- 
--	if (!sai) {
-+	if ( *sal == NULL ) {
- 		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
- 			(long) l.sl_sd, 0, 0 );
-+		slap_free_listener_addresses(psal);
- 		return NULL;
- 	}
- 
--	switch ( sai->ai_family ) {
--#  ifdef LDAP_PF_LOCAL
--	case AF_LOCAL:
--		if ( chmod( (char *)sai->ai_addr, S_IRWXU ) < 0 ) {
-+	switch ( (*sal)->sa_family ) {
-+#ifdef LDAP_PF_LOCAL
-+	case AF_LOCAL: {
-+		char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-+		if ( chmod( addr, S_IRWXU ) < 0 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
--				(long) l.sl_sd, err, sock_errstr(err) );
-+			       (long) l.sl_sd, err, sock_errstr(err) );
- 			tcp_close( l.sl_sd );
-+			slap_free_listener_addresses(psal);
- 			return NULL;
- 		}
--		l.sl_name = ch_malloc( strlen((char *)sai->ai_addr) + sizeof("PATH=") );
--		sprintf( l.sl_name, "PATH=%s", sai->ai_addr );
--		break;
--#  endif /* LDAP_PF_LOCAL */
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") );
-+		sprintf( l.sl_name, "PATH=%s", addr );
-+	} break;
-+#endif /* LDAP_PF_LOCAL */
- 
- 	case AF_INET: {
-+		char *s;
-+#ifdef HAVE_GETADDRINFO		
- 		char addr[INET_ADDRSTRLEN];
--		inet_ntop( AF_INET,
--			&((struct sockaddr_in *)sai->ai_addr)->sin_addr,
--			addr, sizeof(addr) );
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP=:") );
--		sprintf( l.sl_name, "IP=%s:%s", addr, serv );
-+		inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
-+			   addr, sizeof(addr) );
-+		s = addr;
-+#else
-+		s = inet_ntoa( l.sl_addr.sin_addr );
-+#endif		
-+		l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
-+		sprintf( l.sl_name, "IP=%s:%d",
-+			 s != NULL ? s : "unknown" , port );
- 	} break;
- 
--#  ifdef LDAP_PF_INET6
-+#ifdef LDAP_PF_INET6
- 	case AF_INET6: {
- 		char addr[INET6_ADDRSTRLEN];
--		inet_ntop( AF_INET6,
--			&((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr,
--			addr, sizeof addr);
--		l.sl_name = ch_malloc( strlen(addr) + strlen(serv) + sizeof("IP= ") );
--		sprintf( l.sl_name, "IP=%s %s", addr, serv );
-+		inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
-+			   addr, sizeof addr);
-+		l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
-+		sprintf( l.sl_name, "IP=%s %d", addr, port );
- 	} break;
--#  endif /* LDAP_PF_INET6 */
-+#endif /* LDAP_PF_INET6 */
- 
- 	default:
- 		Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
--			(int) sai->ai_family, 0, 0 );
-+			(int) (*sal)->sa_family, 0, 0 );
- 		break;
- 	}
--#else
--#ifdef LDAP_PF_LOCAL
--	/* close conditional */
--	}
--#endif /* LDAP_PF_LOCAL */
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_un_addr) );
--			break;
--#endif
--
--		case AF_INET:
--			rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
--				sizeof(l.sl_sa.sa_in_addr) );
--			break;
- 
--		default:
--			rc = AC_SOCKET_ERROR;
--			errno = EINVAL;
--			break;
--	}
--
--	if ( rc == AC_SOCKET_ERROR ) {
--		int err = sock_errno();
--		Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
--	    	(long) l.sl_sd, err, sock_errstr(err) );
--		tcp_close( l.sl_sd );
--		return NULL;
--	}
--
--	switch ( l.sl_sa.sa_addr.sa_family ) {
--#ifdef LDAP_PF_LOCAL
--		case AF_LOCAL:
--			if ( chmod( l.sl_sa.sa_un_addr.sun_path, S_IRWXU ) < 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: chmod(%ld) failed errno=%d (%s)",
--					(long) l.sl_sd, err, sock_errstr(err) );
--				tcp_close( l.sl_sd );
--				return NULL;
--			}
--
--			l.sl_name = ch_malloc( strlen(l.sl_sa.sa_un_addr.sun_path)
--				+ sizeof("PATH=") );
--			sprintf( l.sl_name, "PATH=%s", l.sl_sa.sa_un_addr.sun_path );
--			break;
--#endif /* LDAP_PF_LOCAL */
--
--		case AF_INET:
--			l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
--			s = inet_ntoa( l.sl_addr.sin_addr );
--			sprintf( l.sl_name, "IP=%s:%d",
--				s != NULL ? s : "unknown" , port );
--			break;
--
--		default:
--			l.sl_name = ch_strdup( "UNKNOWN" );
--			break;
--	}
--
--#endif /* HAVE_GETADDRINFO */
-+	slap_free_listener_addresses(psal);
- 
- 	l.sl_url = ch_strdup( url );
- 	li = ch_malloc( sizeof( Listener ) );
-@@ -608,7 +675,7 @@
- 	slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
- 
- 	for(i = 0; u[i] != NULL; i++ ) {
--		slap_listeners[i] = open_listener( u[i] );
-+		slap_listeners[i] = slap_open_listener( u[i] );
- 
- 		if( slap_listeners[i] == NULL ) {
- 			charray_free( u );
-@@ -642,7 +709,6 @@
- 	void *ptr
- )
- {
--	int rc, tmp;
- 	int l;
- 	time_t	last_idle_check = slap_get_time();
- 	time( &starttime );
-@@ -651,7 +717,7 @@
- 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
- 			continue;
- 
--		if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
-+		if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
- 			int err = sock_errno();
- 			Debug( LDAP_DEBUG_ANY,
- 				"daemon: listen(%s, 5) failed errno=%d (%s)\n",
-@@ -814,7 +880,7 @@
- 		}
- 
- 		for ( l = 0; slap_listeners[l] != NULL; l++ ) {
--			ber_int_t s;
-+			ber_socket_t s;
- 			socklen_t len = sizeof(from);
- 			long id;
- 			slap_ssf_t ssf = 0;
-@@ -860,31 +926,6 @@
- 			}
- #endif
- 
--#ifdef SO_KEEPALIVE
--			/* enable keep alives */
--			rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
--				(char *) &tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--#ifdef TCP_NODELAY
--			/* enable no delay */
--			tmp = 1;
--			rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
--				(char *)&tmp, sizeof(tmp) );
--			if ( rc == AC_SOCKET_ERROR ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"slapd(%ld): setsockopt(TCP_NODELAY) failed "
--					"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
--			}
--#endif
--
--
- #ifdef LDAP_DEBUG
- 			ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- 
-@@ -896,20 +937,44 @@
- 			ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
- #endif
- 
-+#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY )
-+#ifdef LDAP_PF_LOCAL
-+			/* for IPv4 and IPv6 sockets only */
-+			if ( from.sa_addr.sa_family != AF_LOCAL )
-+#endif /* LDAP_PF_LOCAL */
-+			{
-+				int rc;
-+				int tmp;
-+#ifdef SO_KEEPALIVE
-+				/* enable keep alives */
-+				tmp = 1;
-+				rc = setsockopt( s, SOL_SOCKET, SO_KEEPALIVE,
-+					(char *) &tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+#ifdef TCP_NODELAY
-+				/* enable no delay */
-+				tmp = 1;
-+				rc = setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
-+					(char *)&tmp, sizeof(tmp) );
-+				if ( rc == AC_SOCKET_ERROR ) {
-+					int err = sock_errno();
-+					Debug( LDAP_DEBUG_ANY,
-+						"slapd(%ld): setsockopt(TCP_NODELAY) failed "
-+						"errno=%d (%s)\n", (long) s, err, sock_errstr(err) );
-+				}
-+#endif
-+			}
-+#endif
-+
- 			Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
- 				(long) s, 0, 0 );
- 
--			len = sizeof(from);
--
--			if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
--				int err = sock_errno();
--				Debug( LDAP_DEBUG_ANY,
--					"daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
--					(long) s, err, sock_errstr(err) );
--				slapd_close(s);
--				continue;
--			}
--
- 			switch ( from.sa_addr.sa_family ) {
- #  ifdef LDAP_PF_LOCAL
- 			case AF_LOCAL:
-@@ -948,6 +1013,7 @@
- 				slapd_close(s);
- 				continue;
- 			}
-+
- 			if ( ( from.sa_addr.sa_family == AF_INET ) 
- #ifdef LDAP_PF_INET6
- 				|| ( from.sa_addr.sa_family == AF_INET6 )
-@@ -961,7 +1027,7 @@
- 						sizeof(from.sa_in6_addr.sin6_addr),
- 						AF_INET6 );
- 				else
--#  endif LDAP_PF_INET6
-+#  endif /* LDAP_PF_INET6 */
- 				hp = gethostbyaddr(
- 					(char *) &(from.sa_in_addr.sin_addr),
- 					sizeof(from.sa_in_addr.sin_addr),
-@@ -1202,23 +1268,25 @@
- 	connections_init();
- 
- #define SLAPD_LISTENER_THREAD 1
--#if defined( SLAPD_LISTENER_THREAD ) || !defined(HAVE_PTHREADS)
-+#if defined( SLAPD_LISTENER_THREAD )
-+	{
-+		ldap_pvt_thread_t	listener_tid;
- 
--	/* listener as a separate THREAD */
--	rc = ldap_pvt_thread_create( &listener_tid,
--		0, slapd_daemon_task, NULL );
-+		/* listener as a separate THREAD */
-+		rc = ldap_pvt_thread_create( &listener_tid,
-+			0, slapd_daemon_task, NULL );
- 
--	if ( rc != 0 ) {
--		Debug( LDAP_DEBUG_ANY,
--		    "listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
--		return rc;
--	}
-+		if ( rc != 0 ) {
-+			Debug( LDAP_DEBUG_ANY,
-+		    	"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-+			return rc;
-+		}
- 
--	/* wait for the listener thread to complete */
--	ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+		/* wait for the listener thread to complete */
-+		ldap_pvt_thread_join( listener_tid, (void *) NULL );
-+ 	}
- #else
--	/* expermimental code */
--	listener_tid = pthread_self();
-+	/* experimental code */
- 	slapd_daemon_task( NULL );
- #endif
- 
-@@ -1307,4 +1375,9 @@
- 
- 	/* reinstall self */
- 	(void) SIGNAL_REINSTALL( sig, slap_sig_wake );
-+}
-+
-+
-+void slapd_add_internal(ber_socket_t s) {
-+	slapd_add(s);
- }
diff --git a/net/openldap24-server/files/patch-servers_slapd_schema b/net/openldap24-server/files/patch-servers_slapd_schema
deleted file mode 100644
index 31969e8bb621..000000000000
--- a/net/openldap24-server/files/patch-servers_slapd_schema
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/schema/krb5-kdc.schema.orig	Tue Sep  5 13:28:34 2000
-+++ servers/slapd/schema/krb5-kdc.schema	Mon Oct 30 13:09:19 2000
-@@ -96,7 +96,7 @@
- attributetype ( 1.3.6.1.4.1.5322.10.1.10
- 	NAME 'krb5Key'
- 	DESC 'Encoded ASN1 Key as an octet string'
--	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
- 
- attributetype ( 1.3.6.1.4.1.5322.10.1.11
- 	NAME 'krb5PrincipalRealm'
-@@ -112,7 +112,7 @@
- 
- objectclass ( 1.3.6.1.4.1.5322.10.2.1
- 	NAME 'krb5Principal'
--	SUP top
-+	SUP person
- 	AUXILIARY
- 	MUST ( krb5PrincipalName )
- 	MAY ( cn $ krb5PrincipalRealm ) )
diff --git a/net/openldap24-server/files/slapd.sh b/net/openldap24-server/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap24-server/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap24-server/pkg-comment b/net/openldap24-server/pkg-comment
deleted file mode 100644
index 8c499c3923cf..000000000000
--- a/net/openldap24-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open source LDAP client and server software
diff --git a/net/openldap24-server/pkg-descr b/net/openldap24-server/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap24-server/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
deleted file mode 100644
index 764525594e11..000000000000
--- a/net/openldap24-server/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
-@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ ! -f %B/schema/corba.schema ] && cp %B/%f %B/schema/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ ! -f %B/schema/core.schema ] && cp %B/%f %B/schema/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ ! -f %B/schema/cosine.schema ] && cp %B/%f %B/schema/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ ! -f %B/schema/inetorgperson.schema ] && cp %B/%f %B/schema/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ ! -f %B/schema/java.schema ] && cp %B/%f %B/schema/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ ! -f %B/schema/krb5-kdc.schema ] && cp %B/%f %B/schema/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ ! -f %B/schema/misc.schema ] && cp %B/%f %B/schema/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nadf.schema %D/etc/openldap/schema/nadf.schema.default; then rm -f %D/etc/openldap/schema/nadf.schema; fi
-etc/openldap/schema/nadf.schema.default
-@exec [ ! -f %B/schema/nadf.schema ] && cp %B/%f %B/schema/nadf.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ ! -f %B/schema/nis.schema ] && cp %B/%f %B/schema/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ ! -f %B/schema/openldap.schema ] && cp %B/%f %B/schema/openldap.schema
-@dirrm etc/openldap/schema
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.2
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/p5-Net-SNMP3/Makefile b/net/p5-Net-SNMP3/Makefile
deleted file mode 100644
index dc4b4b88fe18..000000000000
--- a/net/p5-Net-SNMP3/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	p5-Net-SNMP
-# Date created:				30 June 2000
-# Whom:					Christopher N. Harrell <cnh@ivmg.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Net-SNMP
-PORTVERSION=	3.50
-CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	ports@FreeBSD.org
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-3.5
-USE_PERL5=	yes
-MAN3=		Net::SNMP.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		CC="${CC}" CCFLAGS="${CFLAGS}"
-
-.include <bsd.port.mk>
diff --git a/net/p5-Net-SNMP3/distinfo b/net/p5-Net-SNMP3/distinfo
deleted file mode 100644
index 94dc59a2b014..000000000000
--- a/net/p5-Net-SNMP3/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Net-SNMP-3.50.tar.gz) = 03b57f94c8d2fc2a37326924a5bb29a2
diff --git a/net/p5-Net-SNMP3/pkg-comment b/net/p5-Net-SNMP3/pkg-comment
deleted file mode 100644
index 23cc30a9b8ef..000000000000
--- a/net/p5-Net-SNMP3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module for SNMP... Net::SNMP
diff --git a/net/p5-Net-SNMP3/pkg-descr b/net/p5-Net-SNMP3/pkg-descr
deleted file mode 100644
index 753a5e759c62..000000000000
--- a/net/p5-Net-SNMP3/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The module Net::SNMP implements an object oriented
-interface to the Simple Network Management Protocol.  Perl
-applications can use the module to retrieve or update
-information on a remote host using the SNMP protocol.
-Net::SNMP is implemented completely in Perl, requires no
-compiling, and uses only standard Perl modules. Both
-SNMPv1 and SNMPv2c (Community-Based SNMPv2) are supported
-by the module.
diff --git a/net/p5-Net-SNMP3/pkg-plist b/net/p5-Net-SNMP3/pkg-plist
deleted file mode 100644
index c50918a689ad..000000000000
--- a/net/p5-Net-SNMP3/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/perl5/site_perl/%%PERL_VER%%/Net/SNMP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SNMP/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SNMP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
diff --git a/net/py-ldap1/Makefile b/net/py-ldap1/Makefile
deleted file mode 100644
index dad08969b6c3..000000000000
--- a/net/py-ldap1/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for:	ldapmodule
-# Date created:		05.Jul 2000
-# Whom:			dirk.meyer@dinoex.sub.org
-#
-# $FreeBSD$
-
-PORTNAME=	ldapmodule
-PORTVERSION=	1.10alpha3
-CATEGORIES=	net
-MASTER_SITES=	ftp://python-ldap.sourceforge.net/pub/python-ldap/
-DISTNAME=	python-ldap-${PORTVERSION}-src
-
-MAINTAINER=	dirk.meyer@dinoex.sub.org
-
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
-BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python15
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-WRKSRC=		${WRKDIR}/${DISTNAME:S=-src==}
-
-.include <bsd.port.mk>
diff --git a/net/py-ldap1/distinfo b/net/py-ldap1/distinfo
deleted file mode 100644
index 07ac0213610a..000000000000
--- a/net/py-ldap1/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (python-ldap-1.10alpha3-src.tar.gz) = a4e95cf9edec1b7952a5decbc8080372
diff --git a/net/py-ldap1/pkg-comment b/net/py-ldap1/pkg-comment
deleted file mode 100644
index 74fb5d0734c8..000000000000
--- a/net/py-ldap1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An LDAP module for python
diff --git a/net/py-ldap1/pkg-descr b/net/py-ldap1/pkg-descr
deleted file mode 100644
index 3b07d96df9fa..000000000000
--- a/net/py-ldap1/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-
-                            LDAP Wrapper for Python
-                                       
-   This module provides an LDAP API to Python in the spirit of RFC1823.
-   
-Some cool things people have done with ldapmodule
-
-     * LANL phone book (source)
-     * Michael Stroeder's web2ldap (previously ldap-client-cgi.py).
-     * LDAP support for Zope (see also Zope)
-
-WWW: http://python-ldap.sourceforge.net/
-FTP: ftp://python-ldap.sourceforge.net/pub/python-ldap/
diff --git a/net/py-ldap1/pkg-plist b/net/py-ldap1/pkg-plist
deleted file mode 100644
index 6a9574e9592b..000000000000
--- a/net/py-ldap1/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-lib/python1.5/site-packages/python-ldap/ldap.py
-lib/python1.5/site-packages/python-ldap/ldap.pyc
-lib/python1.5/site-packages/python-ldap/ldap.pyo
-lib/python1.5/site-packages/python-ldap/ldif.py
-lib/python1.5/site-packages/python-ldap/ldif.pyc
-lib/python1.5/site-packages/python-ldap/ldif.pyo
-lib/python1.5/site-packages/python-ldap/perldap.py
-lib/python1.5/site-packages/python-ldap/perldap.pyc
-lib/python1.5/site-packages/python-ldap/perldap.pyo
-lib/python1.5/site-packages/_ldapmodule.so
-lib/python1.5/site-packages/ldap.pth
-@dirrm lib/python1.5/site-packages/python-ldap
-@dirrm lib/python1.5/site-packages
diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
deleted file mode 100644
index dad08969b6c3..000000000000
--- a/net/py-ldap2/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for:	ldapmodule
-# Date created:		05.Jul 2000
-# Whom:			dirk.meyer@dinoex.sub.org
-#
-# $FreeBSD$
-
-PORTNAME=	ldapmodule
-PORTVERSION=	1.10alpha3
-CATEGORIES=	net
-MASTER_SITES=	ftp://python-ldap.sourceforge.net/pub/python-ldap/
-DISTNAME=	python-ldap-${PORTVERSION}-src
-
-MAINTAINER=	dirk.meyer@dinoex.sub.org
-
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
-BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python15
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-WRKSRC=		${WRKDIR}/${DISTNAME:S=-src==}
-
-.include <bsd.port.mk>
diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo
deleted file mode 100644
index 07ac0213610a..000000000000
--- a/net/py-ldap2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (python-ldap-1.10alpha3-src.tar.gz) = a4e95cf9edec1b7952a5decbc8080372
diff --git a/net/py-ldap2/pkg-comment b/net/py-ldap2/pkg-comment
deleted file mode 100644
index 74fb5d0734c8..000000000000
--- a/net/py-ldap2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An LDAP module for python
diff --git a/net/py-ldap2/pkg-descr b/net/py-ldap2/pkg-descr
deleted file mode 100644
index 3b07d96df9fa..000000000000
--- a/net/py-ldap2/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-
-                            LDAP Wrapper for Python
-                                       
-   This module provides an LDAP API to Python in the spirit of RFC1823.
-   
-Some cool things people have done with ldapmodule
-
-     * LANL phone book (source)
-     * Michael Stroeder's web2ldap (previously ldap-client-cgi.py).
-     * LDAP support for Zope (see also Zope)
-
-WWW: http://python-ldap.sourceforge.net/
-FTP: ftp://python-ldap.sourceforge.net/pub/python-ldap/
diff --git a/net/py-ldap2/pkg-plist b/net/py-ldap2/pkg-plist
deleted file mode 100644
index 6a9574e9592b..000000000000
--- a/net/py-ldap2/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-lib/python1.5/site-packages/python-ldap/ldap.py
-lib/python1.5/site-packages/python-ldap/ldap.pyc
-lib/python1.5/site-packages/python-ldap/ldap.pyo
-lib/python1.5/site-packages/python-ldap/ldif.py
-lib/python1.5/site-packages/python-ldap/ldif.pyc
-lib/python1.5/site-packages/python-ldap/ldif.pyo
-lib/python1.5/site-packages/python-ldap/perldap.py
-lib/python1.5/site-packages/python-ldap/perldap.pyc
-lib/python1.5/site-packages/python-ldap/perldap.pyo
-lib/python1.5/site-packages/_ldapmodule.so
-lib/python1.5/site-packages/ldap.pth
-@dirrm lib/python1.5/site-packages/python-ldap
-@dirrm lib/python1.5/site-packages
diff --git a/net/rqm/Makefile b/net/rqm/Makefile
deleted file mode 100644
index b3bf4bda8cb3..000000000000
--- a/net/rqm/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	rqm
-# Date created:		30 January 2000
-# Whom:			fenner
-#
-# $FreeBSD$
-#
-
-PORTNAME=	rqm
-PORTVERSION=	1.0.0
-CATEGORIES=	mbone
-MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/
-
-MAINTAINER=	fenner@FreeBSD.Org
-
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-BUILD_DEPENDS=	${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
-
-WRKSRC=		${WRKDIR}/rqm/
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	PREFIX=${PREFIX} X11BASE=${X11BASE}
-
-ALL_TARGET=	rqm
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rqm ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/rqm
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rqm
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/rqm/distinfo b/net/rqm/distinfo
deleted file mode 100644
index fafa49256e6a..000000000000
--- a/net/rqm/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (rqm-1.0.0.tar.gz) = 406a9bfe4a3e9ad9f1a981701072f54a
diff --git a/net/rqm/files/patch-aa b/net/rqm/files/patch-aa
deleted file mode 100644
index a12327db8444..000000000000
--- a/net/rqm/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.orig	Sun Oct  3 08:47:46 1999
-+++ configure	Sun Jan 30 16:05:14 2000
-@@ -53,9 +53,9 @@
- 
- echo "Configuring rqm v$VERSION for $OSTYPE"
- 
--GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int -Werror"
--TCL_LIBS="../tk-8.0/unix/libtk8.0.a ../tcl-8.0/unix/libtcl8.0.a"
--TCL_INCL="-I../tk-8.0/generic -I../tcl-8.0/generic"
-+GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int"
-+TCL_LIBS="-L${PREFIX}/lib -ltk82 -ltcl82"
-+TCL_INCL="-I${PREFIX}/include/tk8.2/generic -I${PREFIX}/include/tcl8.2/generic"
- DEFS=""
- 
- AR="ar"
-@@ -103,7 +103,7 @@
-             ;;
-   FreeBSD ) CC="gcc"
-             WFLAGS=$GCCWFLAGS
--	    INCLUDE="-I/usr/local/include"
-+	    INCLUDE="-I${PREFIX}/include -I${X11BASE}/include"
- 	    LDLIBS="-lm"
- 	    DEBUG="-g"
- 	    CHAR="-fsigned-char"
-@@ -172,8 +172,8 @@
- s@__AR__@$AR@
- s@__RANLIB__@$RANLIB@
- s@__WFLAGS__@$WFLAGS@
--s@__INCLUDE__@$TCL_INCL $INCLUDE -I../common@g
--s@__LDLIBS__@$TCL_LIBS -L../common -lcommon $LDLIBS@g
-+s@__INCLUDE__@$TCL_INCL $INCLUDE -I${PREFIX}/include/uclmmbase@g
-+s@__LDLIBS__@$TCL_LIBS -L${PREFIX}/lib -luclmmbase $LDLIBS@g
- s@__CHAR__@$CHAR@
- s@__DEBUG__@$DEBUG2@
- s@__OPTIMIZE__@$OPTIMIZE2@
diff --git a/net/rqm/files/patch-ab b/net/rqm/files/patch-ab
deleted file mode 100644
index 826bea2a47e6..000000000000
--- a/net/rqm/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- main.c.orig	Wed Mar  8 08:32:07 2000
-+++ main.c	Wed Mar  8 08:32:28 2000
-@@ -177,7 +177,7 @@
- 	char		*addr;
- 	char		*port;
- 	char		 cmd[100];
--	u_int32		 curr_rtp_time;
-+	u_int32_t	 curr_rtp_time;
- #ifdef WIN32
- 	WSADATA WSAdata;
- 	if (WSAStartup(WS_VERSION_TWO, &WSAdata) != 0 && WSAStartup(WS_VERSION_ONE, &WSAdata) != 0) {
-@@ -215,7 +215,7 @@
- 	rtp_set_sdes(rtp_session, rtp_my_ssrc(rtp_session), RTCP_SDES_TOOL, VERSION, strlen(VERSION));
- 
- 	gettimeofday(&prev_t, NULL);
--	curr_rtp_time = (u_int32) lrand48();
-+	curr_rtp_time = (u_int32_t) lrand48();
- 	while (Tk_GetNumMainWindows() > 0) {
- 		gettimeofday(&curr_t, NULL);
- 		curr_rtp_time += (int) (tv_diff(curr_t, prev_t) * 8000);
diff --git a/net/rqm/pkg-comment b/net/rqm/pkg-comment
deleted file mode 100644
index e33c64e88137..000000000000
--- a/net/rqm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical RTP quality monitor
diff --git a/net/rqm/pkg-descr b/net/rqm/pkg-descr
deleted file mode 100644
index 0f66e31ecfde..000000000000
--- a/net/rqm/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The Real-time Transport Protocol, RTP [1], provides quality of service
-feedback with reception reports sent alongside the media stream. If the
-media is sent via IP multicast it is possible for a third party to snoop 
-on these reception reports, displaying reception quality for all members
-of a group. The RQM application performs such snooping.
-
-WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/
diff --git a/net/rqm/pkg-plist b/net/rqm/pkg-plist
deleted file mode 100644
index bdf2098794d3..000000000000
--- a/net/rqm/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/rqm
-share/doc/rqm/README
-@dirrm share/doc/rqm
diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
deleted file mode 100644
index 6fba633c54ed..000000000000
--- a/net/rrdtool10/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	rrdtool
-# Date created:				20 July 1999
-# Whom:					Dmitry Sivachenko <dima@Chg.RU>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	rrdtool
-PORTVERSION=	1.0.28
-CATEGORIES=	net
-MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
-
-MAINTAINER=	demon@FreeBSD.org
-
-USE_PERL5=	yes
-MAKE_ENV+=	PERL=${PERL}
-
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-shared=yes
-CONFIGURE_ENV=	PERL=${PERL}
-
-MAN1=		RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
-		rrdfetch.1 rrdgraph.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
-		rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 cdeftutorial.1 \
-		rpntutorial.1 rrdinfo.1
-MAN3=		RRDp.3 RRDs.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-post-install:
-.if !defined(BATCH)
-	@${ECHO} ""
-	@${ECHO} "############################################################################"
-	@${ECHO} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code        #"
-	@${ECHO} "############################################################################"
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/rrdtool10/distinfo b/net/rrdtool10/distinfo
deleted file mode 100644
index ac18d439c7b8..000000000000
--- a/net/rrdtool10/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (rrdtool-1.0.28.tar.gz) = 4db8949675ccb97cd289fae96fb3dbb0
diff --git a/net/rrdtool10/files/patch-aa b/net/rrdtool10/files/patch-aa
deleted file mode 100644
index ebf17ddaf33b..000000000000
--- a/net/rrdtool10/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- perl-shared/Makefile.PL.orig	Tue Jun 13 20:51:17 2000
-+++ perl-shared/Makefile.PL	Tue Jun 13 20:51:19 2000
-@@ -10,7 +10,8 @@
-     'NAME'         => 'RRDs',
-     'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
-     'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
--    'INC'          => '-I../src -I../gd1.3',
-+    'CCFLAGS'	   => "-DHAVE_CONFIG_H",
-+    'INC'          => '-I../config -I../src -I../gd1.3',
-     # where to look for the necessary libraries 
-     # Perl will figure out which one is valid
-     'depend'	   => {'RRDs.c' => "../src/.libs/librrd_private.a"},
diff --git a/net/rrdtool10/files/patch-ab b/net/rrdtool10/files/patch-ab
deleted file mode 100644
index 2513bfe423fb..000000000000
--- a/net/rrdtool10/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/rrd_tool.c.orig	Tue Jun 13 20:56:08 2000
-+++ src/rrd_tool.c	Tue Jun 13 20:56:10 2000
-@@ -317,12 +317,12 @@
- 	    datai=data;
- 	    printf("           ");
- 	    for (i = 0; i<ds_cnt;i++)
--	        printf("%14s",ds_namv[i]);
-+	        printf("%14s ",ds_namv[i]);
- 	    printf ("\n\n");
- 	    for (i = start; i <= end; i += step){
--	        printf("%10lu:", i);
-+	        printf("%10lu: ", i);
- 	        for (ii = 0; ii < ds_cnt; ii++)
--		    printf(" %0.10e", *(datai++));
-+		    printf(" %0.10e ", *(datai++));
- 	        printf("\n");
- 	    }
- 	    for (i=0;i<ds_cnt;i++)
diff --git a/net/rrdtool10/files/patch-ac b/net/rrdtool10/files/patch-ac
deleted file mode 100644
index 26d5410e4faf..000000000000
--- a/net/rrdtool10/files/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig	Wed Oct  4 13:09:37 2000
-+++ Makefile.in	Wed Oct  4 13:10:39 2000
-@@ -383,12 +383,12 @@
- 
- # lets schedule the perl stuff for installation
- # the special call to install-sh is because the -d switch is not portable
--install-data-local:
--	./config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
-+install-data-local: site-perl-inst
-+#	./config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
-+#	$(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
-+#	$(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
-+#	$(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
-+#	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- 
- # rules for building the perl module
- perl_piped: perl-piped/Makefile
diff --git a/net/rrdtool10/files/patch-ae b/net/rrdtool10/files/patch-ae
deleted file mode 100644
index 98feb795d0ff..000000000000
--- a/net/rrdtool10/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.in.orig	Fri Jan  7 20:56:21 2000
-+++ doc/Makefile.in	Fri Jan  7 20:57:05 2000
-@@ -96,9 +96,9 @@
- EXTRA_DIST = $(POD) $(HTML) $(TXT)
- 
- # some install rules
--idocdir = $(prefix)/doc
-+idocdir = $(prefix)/share/doc/rrdtool
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(prefix)/html
-+ihtmldir = $(prefix)/share/doc/rrdtool/html
- ihtml_DATA = $(HTML)
- imandir = $(prefix)/man/man1
- iman_DATA = $(MAN)
diff --git a/net/rrdtool10/files/patch-af b/net/rrdtool10/files/patch-af
deleted file mode 100644
index a109c319e248..000000000000
--- a/net/rrdtool10/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig	Fri Jan  7 20:58:16 2000
-+++ examples/Makefile.in	Fri Jan  7 20:59:13 2000
-@@ -81,7 +81,7 @@
- 
- EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
- 
--examplesdir = $(prefix)/examples
-+examplesdir = $(prefix)/share/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config/config.h
diff --git a/net/rrdtool10/files/patch-ag b/net/rrdtool10/files/patch-ag
deleted file mode 100644
index 1463213ac6f3..000000000000
--- a/net/rrdtool10/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig	Tue Jun 13 21:00:28 2000
-+++ contrib/Makefile.in	Tue Jun 13 21:01:04 2000
-@@ -86,7 +86,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- SUBDIRS = log2rrd rrd-file-icon trytime rrdproc rrdlastds add_ds killspike rrdfetchnames
--contribdir = $(prefix)/contrib
-+contribdir = $(prefix)/share/examples/rrdtool
- contrib_DATA = README
- EXTRA_DIST = clickgraphs php3
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool10/files/patch-ah b/net/rrdtool10/files/patch-ah
deleted file mode 100644
index ba81028f2075..000000000000
--- a/net/rrdtool10/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/log2rrd/Makefile.in.orig	Fri Jan  7 21:07:22 2000
-+++ contrib/log2rrd/Makefile.in	Fri Jan  7 21:07:45 2000
-@@ -77,7 +77,7 @@
- 
- EXTRA_DIST = log2rrd.pl.in
- 
--contribdir = $(prefix)/contrib/log2rrd
-+contribdir = $(prefix)/share/examples/rrdtool/log2rrd
- contrib_DATA = README
- contrib_SCRIPTS = log2rrd.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool10/files/patch-ai b/net/rrdtool10/files/patch-ai
deleted file mode 100644
index 005a791e0dc8..000000000000
--- a/net/rrdtool10/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/rrd-file-icon/Makefile.in.orig	Fri Jan  7 21:08:22 2000
-+++ contrib/rrd-file-icon/Makefile.in	Fri Jan  7 21:08:46 2000
-@@ -76,7 +76,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- EXTRA_DIST = rrd.png
--contribdir = $(prefix)/contrib/rrd-file-icon
-+contribdir = $(prefix)/share/examples/rrdtool/rrd-file-icon
- contrib_DATA = README       rrd.png
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
diff --git a/net/rrdtool10/files/patch-aj b/net/rrdtool10/files/patch-aj
deleted file mode 100644
index 6af2fc2b9ba2..000000000000
--- a/net/rrdtool10/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/rrdproc/Makefile.in.orig	Fri Jan  7 21:09:17 2000
-+++ contrib/rrdproc/Makefile.in	Fri Jan  7 21:09:36 2000
-@@ -76,7 +76,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- EXTRA_DIST = rrdproc.c
--contribdir = $(prefix)/contrib/rrdproc
-+contribdir = $(prefix)/share/examples/rrdtool/rrdproc
- contrib_DATA = README rrdproc.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
diff --git a/net/rrdtool10/files/patch-ak b/net/rrdtool10/files/patch-ak
deleted file mode 100644
index f998e6995400..000000000000
--- a/net/rrdtool10/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/trytime/Makefile.in.orig	Fri Jan  7 21:11:21 2000
-+++ contrib/trytime/Makefile.in	Fri Jan  7 21:11:41 2000
-@@ -76,7 +76,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- EXTRA_DIST = trytime.c
--contribdir = $(prefix)/contrib/trytime
-+contribdir = $(prefix)/share/examples/rrdtool/trytime
- contrib_DATA = README trytime.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
diff --git a/net/rrdtool10/files/patch-al b/net/rrdtool10/files/patch-al
deleted file mode 100644
index c74995d8f0cb..000000000000
--- a/net/rrdtool10/files/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/rrdlastds/Makefile.in.orig Sat Feb 12 18:22:45 2000
-+++ contrib/rrdlastds/Makefile.in      Sat Feb 12 18:23:30 2000
-@@ -77,7 +77,7 @@
-
- EXTRA_DIST = rrdlastds.pl.in
-
--contribdir = $(prefix)/contrib/rrdlastds
-+contribdir = $(prefix)/share/examples/rrdtool/rrdlastds
- contrib_DATA = README
- contrib_SCRIPTS = rrdlastds.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool10/files/patch-am b/net/rrdtool10/files/patch-am
deleted file mode 100644
index c6cae0440881..000000000000
--- a/net/rrdtool10/files/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/add_ds/Makefile.in.orig    Sat Feb 12 18:26:00 2000
-+++ contrib/add_ds/Makefile.in Sat Feb 12 18:26:17 2000
-@@ -77,7 +77,7 @@
-
- EXTRA_DIST = add_ds.pl.in batch.pl.in
-
--contribdir = $(prefix)/contrib/add_ds
-+contribdir = $(prefix)/share/examples/rrdtool/add_ds
- contrib_DATA = README
- contrib_SCRIPTS = add_ds.pl  batch.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool10/files/patch-an b/net/rrdtool10/files/patch-an
deleted file mode 100644
index 6d4b4a9cd45d..000000000000
--- a/net/rrdtool10/files/patch-an
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/killspike/Makefile.in.orig Sat Feb 12 18:27:04 2000
-+++ contrib/killspike/Makefile.in      Sat Feb 12 18:27:19 2000
-@@ -77,7 +77,7 @@
-
- EXTRA_DIST = killspike.pl.in
-
--contribdir = $(prefix)/contrib/killspike
-+contribdir = $(prefix)/share/examples/rrdtool/killspike
- contrib_DATA = README
- contrib_SCRIPTS = killspike.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool10/files/patch-ao b/net/rrdtool10/files/patch-ao
deleted file mode 100644
index 3dc1cc622454..000000000000
--- a/net/rrdtool10/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/rrdfetchnames/Makefile.in.orig	Mon Feb 14 23:27:59 2000
-+++ contrib/rrdfetchnames/Makefile.in	Mon Feb 14 23:28:17 2000
-@@ -77,7 +77,7 @@
- 
- EXTRA_DIST = rrdfetchnames.pl.in
- 
--contribdir = $(prefix)/contrib/rrdfetchnames
-+contribdir = $(prefix)/share/examples/rrdtool/rrdfetchnames
- contrib_DATA = README
- contrib_SCRIPTS = rrdfetchnames.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool10/pkg-comment b/net/rrdtool10/pkg-comment
deleted file mode 100644
index 73242bc78bb6..000000000000
--- a/net/rrdtool10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Round Robin Database Tools
diff --git a/net/rrdtool10/pkg-descr b/net/rrdtool10/pkg-descr
deleted file mode 100644
index ca95d58a230d..000000000000
--- a/net/rrdtool10/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-It is pretty easy to gather status information from all sorts of things,
-ranging from the temperature in your office to the number of octets which
-have passed through the FDDI interface of your router. But it is not so
-trivial to store this data in a efficient and systematic manner. This is
-where RRDtool kicks in. It lets you log and analyze the data you gather from
-all kinds of data-sources (DS). The data analysis part of RRDtool is based
-on the ability to quickly generate graphical representations of the data
-values collected over a definable time period.
-
-WWW: http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/
-
---dima
-dima@Chg.RU
diff --git a/net/rrdtool10/pkg-plist b/net/rrdtool10/pkg-plist
deleted file mode 100644
index 186251ae32bc..000000000000
--- a/net/rrdtool10/pkg-plist
+++ /dev/null
@@ -1,103 +0,0 @@
-bin/rrdtool
-bin/rrdcgi
-bin/trytime
-lib/librrd.a
-lib/librrd.so.0
-lib/librrd.so
-include/rrd.h
-share/examples/rrdtool/cgi-demo.cgi
-share/examples/rrdtool/piped-demo.pl
-share/examples/rrdtool/shared-demo.pl
-share/examples/rrdtool/stripes.pl
-share/examples/rrdtool/bigtops.pl
-share/examples/rrdtool/minmax.pl
-share/examples/rrdtool/log2rrd/log2rrd.pl
-share/examples/rrdtool/log2rrd/README
-share/examples/rrdtool/rrd-file-icon/rrd.png
-share/examples/rrdtool/rrd-file-icon/README
-share/examples/rrdtool/trytime/trytime.c
-share/examples/rrdtool/trytime/README
-share/examples/rrdtool/rrdproc/rrdproc.c
-share/examples/rrdtool/rrdproc/README
-share/examples/rrdtool/rrdlastds/README
-share/examples/rrdtool/rrdlastds/rrdlastds.pl
-share/examples/rrdtool/add_ds/add_ds.pl
-share/examples/rrdtool/add_ds/batch.pl
-share/examples/rrdtool/add_ds/README
-share/examples/rrdtool/killspike/killspike.pl
-share/examples/rrdtool/killspike/README
-share/examples/rrdtool/rrdfetchnames/rrdfetchnames.pl
-share/examples/rrdtool/rrdfetchnames/README
-share/examples/rrdtool/README
-share/doc/rrdtool/rrdtool.pod
-share/doc/rrdtool/rrdinfo.pod
-share/doc/rrdtool/rrdlast.pod
-share/doc/rrdtool/rrdcreate.pod
-share/doc/rrdtool/rrdupdate.pod
-share/doc/rrdtool/cdeftutorial.pod
-share/doc/rrdtool/rpntutorial.pod
-share/doc/rrdtool/rrdgraph.pod
-share/doc/rrdtool/bin_dec_hex.pod
-share/doc/rrdtool/rrdfetch.pod
-share/doc/rrdtool/rrdrestore.pod
-share/doc/rrdtool/rrddump.pod
-share/doc/rrdtool/rrdtune.pod
-share/doc/rrdtool/rrdresize.pod
-share/doc/rrdtool/rrdcgi.pod
-share/doc/rrdtool/rrdtutorial.pod
-share/doc/rrdtool/rrdtool.txt
-share/doc/rrdtool/rrdinfo.txt
-share/doc/rrdtool/rrdlast.txt
-share/doc/rrdtool/rrdcreate.txt
-share/doc/rrdtool/rrdupdate.txt
-share/doc/rrdtool/cdeftutorial.txt
-share/doc/rrdtool/rpntutorial.txt
-share/doc/rrdtool/rrdgraph.txt
-share/doc/rrdtool/bin_dec_hex.txt
-share/doc/rrdtool/rrdfetch.txt
-share/doc/rrdtool/rrdrestore.txt
-share/doc/rrdtool/rrddump.txt
-share/doc/rrdtool/rrdtune.txt
-share/doc/rrdtool/rrdresize.txt
-share/doc/rrdtool/rrdcgi.txt
-share/doc/rrdtool/rrdtutorial.txt
-share/doc/rrdtool/RRDs.txt
-share/doc/rrdtool/RRDp.txt
-share/doc/rrdtool/html/rrdtool.html
-share/doc/rrdtool/html/rrdinfo.html
-share/doc/rrdtool/html/rrdlast.html
-share/doc/rrdtool/html/rrdcreate.html
-share/doc/rrdtool/html/rrdupdate.html
-share/doc/rrdtool/html/cdeftutorial.html
-share/doc/rrdtool/html/rpntutorial.html
-share/doc/rrdtool/html/rrdgraph.html
-share/doc/rrdtool/html/bin_dec_hex.html
-share/doc/rrdtool/html/rrdfetch.html
-share/doc/rrdtool/html/rrdrestore.html
-share/doc/rrdtool/html/rrddump.html
-share/doc/rrdtool/html/rrdtune.html
-share/doc/rrdtool/html/rrdresize.html
-share/doc/rrdtool/html/rrdcgi.html
-share/doc/rrdtool/html/rrdtutorial.html
-share/doc/rrdtool/html/RRDs.html
-share/doc/rrdtool/html/RRDp.html
-lib/perl5/site_perl/%%PERL_VER%%/RRDp.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/RRDs.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ntmake.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-@dirrm share/examples/rrdtool/log2rrd
-@dirrm share/examples/rrdtool/trytime
-@dirrm share/examples/rrdtool/rrdproc
-@dirrm share/examples/rrdtool/rrd-file-icon
-@dirrm share/examples/rrdtool/add_ds
-@dirrm share/examples/rrdtool/killspike
-@dirrm share/examples/rrdtool/rrdfetchnames
-@dirrm share/examples/rrdtool/rrdlastds
-@dirrm share/examples/rrdtool
-@dirrm share/doc/rrdtool/html
-@dirrm share/doc/rrdtool
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile
deleted file mode 100644
index a926a4843282..000000000000
--- a/net/rtptools/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	rtptools
-# Date created:		5 January 1998
-# Whom:			fenner
-#
-# $FreeBSD$
-#
-
-PORTNAME=	rtptools
-PORTVERSION=	1.14
-CATEGORIES=	mbone
-MASTER_SITES=	http://www.cs.columbia.edu/~hgs/rtptools/src/
-
-MAINTAINER=	fenner@FreeBSD.org
-
-GNU_CONFIGURE=	yes
-
-DOCFILES=	README ChangeLog.html rtptools.html
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/rtptools
-.for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/rtptools
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/rtptools/distinfo b/net/rtptools/distinfo
deleted file mode 100644
index 07f0dfd19bb1..000000000000
--- a/net/rtptools/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (rtptools-1.14.tar.gz) = 1b88a89d4fbf32fd54e8508d84ece62e
diff --git a/net/rtptools/files/patch-ab b/net/rtptools/files/patch-ab
deleted file mode 100644
index 90f2b19065a9..000000000000
--- a/net/rtptools/files/patch-ab
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: rtp.h
---- 1.1.1.2	1997/12/17 03:37:05
-+++ rtp.h	1997/12/17 04:26:01
-@@ -94,13 +94,18 @@
- #define RTCP_VALID_MASK (0xc000 | 0x2000 | 0xfe)
- #define RTCP_VALID_VALUE ((RTP_VERSION << 14) | RTCP_SR)
- 
-+#define	RTCP_FRACTION(x)	(((x) >> 24) & 0xFF)
-+#define	RTCP_LOST(x)		((((x) & 0xFFFFFF) < 0x800000) ? \
-+					((x) & 0xFFFFFF) \
-+					: (((x) & 0xFFFFFF) - 0x1000000))
-+
- /*
-  * Reception report block
-  */
- typedef struct {
-     u_int32 ssrc;             /* data source being reported */
--    unsigned int fraction:8;  /* fraction lost since last SR/RR */
--    int lost:24;              /* cumul. no. pkts lost (signed!) */
-+    u_int32 fraclost;	      /* fraction lost since last SR/RR and */
-+			      /* cumul. no. pkts lost (signed!) */
-     u_int32 last_seq;         /* extended last seq. no. received */
-     u_int32 jitter;           /* interarrival jitter */
-     u_int32 lsr;              /* last SR packet from this source */
-===================================================================
-Index: rtpdump.c
---- 1.1.1.2	1997/12/17 03:37:07
-+++ rtpdump.c	1997/12/17 04:26:00
-@@ -400,10 +400,10 @@
-           (unsigned long)ntohl(r->r.sr.psent),
-           (unsigned long)ntohl(r->r.sr.osent));
-         for (i = 0; i < r->common.count; i++) {
--          printf("  (ssrc=%0lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu)\n",
-+          printf("  (ssrc=0x%0lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu)\n",
-            (unsigned long)ntohl(r->r.sr.rr[i].ssrc),
--           r->r.sr.rr[i].fraction / 256.,
--           (unsigned long)ntohl(r->r.sr.rr[i].lost), /* XXX I'm pretty sure this is wrong */
-+           RTCP_FRACTION(ntohl(r->r.sr.rr[i].fraclost)) / 256.,
-+           RTCP_LOST(ntohl(r->r.sr.rr[i].fraclost)),
-            (unsigned long)ntohl(r->r.sr.rr[i].last_seq),
-            (unsigned long)ntohl(r->r.sr.rr[i].jitter),
-            (unsigned long)ntohl(r->r.sr.rr[i].lsr),
-@@ -417,10 +417,10 @@
-           (unsigned long)ntohl(r->r.rr.ssrc), r->common.p, r->common.count,
- 	      ntohs(r->common.length));
-         for (i = 0; i < r->common.count; i++) {
--          printf("(ssrc=%0lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu)\n",
-+          printf("   (ssrc=0x%0lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu)\n",
-             (unsigned long)ntohl(r->r.rr.rr[i].ssrc),
--            r->r.rr.rr[i].fraction / 256.,
--            (unsigned long)ntohl(r->r.rr.rr[i].lost),
-+            RTCP_FRACTION(ntohl(r->r.rr.rr[i].fraclost)) / 256.,
-+            RTCP_LOST(ntohl(r->r.rr.rr[i].fraclost)),
-             (unsigned long)ntohl(r->r.rr.rr[i].last_seq),
-             (unsigned long)ntohl(r->r.rr.rr[i].jitter),
-             (unsigned long)ntohl(r->r.rr.rr[i].lsr),
-===================================================================
-Index: rtpsend.c
---- 1.1.1.2	1997/12/17 03:37:11
-+++ rtpsend.c	1997/12/17 04:25:11
-@@ -601,6 +601,8 @@
- 
-   if (optind < argc) {
-     if (hpt(argv[optind], (struct sockaddr *)&sin, &ttl) < 0) usage(argv[0]);
-+  } else {
-+    usage(argv[0]);
-   }
- 
-   /* create/connect sockets */
diff --git a/net/rtptools/pkg-comment b/net/rtptools/pkg-comment
deleted file mode 100644
index 4e0d5f964364..000000000000
--- a/net/rtptools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of tools to record, playback and monitor RTPv2 data streams
diff --git a/net/rtptools/pkg-descr b/net/rtptools/pkg-descr
deleted file mode 100644
index 4dc99ec5b4af..000000000000
--- a/net/rtptools/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-The rtptools distribution consists of a number of small applications that
-can be used for processing RTP data.
-
-rtpplay
-     play back RTP sessions recorded by rtpdump
-rtpsend
-     generate RTP packets from textual description, generated by hand or
-     rtpdump
-rtpdump
-     parse and print RTP packets, generating output files suitable for
-     rtpplay and rtpsend
-rtptrans
-     RTP translator between unicast and multicast networks
diff --git a/net/rtptools/pkg-plist b/net/rtptools/pkg-plist
deleted file mode 100644
index 8283c955a1fe..000000000000
--- a/net/rtptools/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/rtpdump
-bin/rtpplay
-bin/rtpsend
-bin/rtptrans
-share/doc/rtptools/README
-share/doc/rtptools/ChangeLog.html
-share/doc/rtptools/rtptools.html
-@dirrm share/doc/rtptools
diff --git a/net/rwhoisd/Makefile b/net/rwhoisd/Makefile
deleted file mode 100644
index 13c5dc8c0dfd..000000000000
--- a/net/rwhoisd/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for:	rwhois
-# Date created:				May 9th 1997
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	rwhois
-PORTVERSION=	1.0.b9.2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.rwhois.net/pub/
-DISTNAME=	rwhois-1.0B9.2
-
-MAINTAINER=	ports@FreeBSD.org
-
-.if !exists(/usr/include/tcpd.h)
-LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
-.endif
-
-HAS_CONFIGURE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX}/lib/rwhois
-INSTALL_TARGET=	install install-sample-data install-chroot
-
-MAN8=		rmkdbindex.8 rwhoisd.8
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400011
-LIBCVERSION=	3.1
-.else
-LIBCVERSION=	4
-.endif
-PLIST_SUB=	LIBCVERSION=${LIBCVERSION}
-
-post-install:
-	${MKDIR} -p ${PREFIX}/share/doc/rwhois
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/rwhois
-	${MV} ${PREFIX}/share/doc/rwhois/rmkdbindex.8 ${PREFIX}/man/man8	
-	${MV} ${PREFIX}/share/doc/rwhois/rwhoisd.8 ${PREFIX}/man/man8	
-	@ ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..."
-	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/rwhoisd.sh ${PREFIX}/etc/rc.d/rwhoisd.sh
-
-.include <bsd.port.post.mk>
diff --git a/net/rwhoisd/distinfo b/net/rwhoisd/distinfo
deleted file mode 100644
index 50f829615949..000000000000
--- a/net/rwhoisd/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (rwhois-1.0B9.2.tar.gz) = f444b79637ffd78b92961e63137cc83b
diff --git a/net/rwhoisd/files/patch-aa b/net/rwhoisd/files/patch-aa
deleted file mode 100644
index bcb60067f649..000000000000
--- a/net/rwhoisd/files/patch-aa
+++ /dev/null
@@ -1,78 +0,0 @@
---- Makefile.in.orig	Thu Aug  8 20:37:37 1996
-+++ Makefile.in	Fri May 23 03:06:12 1997
-@@ -2,7 +2,7 @@
- @SET_MAKE@
- 
- # set install program
--INSTALL = @INSTALL@
-+INSTALL = /usr/bin/install -c -s -o bin -g bin
- 
- # set prefix values
- prefix      = @prefix@
-@@ -25,12 +25,12 @@
- PARSER_DIR  = $(TOOLS_DIR)/rwhoisparse
- LIBWRAP_DIR = tools/tcpd_wrapper
- CLIENT_DIR  = client
--SAMPLE_DATA_DIR = @SAMPLE_DATA_DIR@
-+SAMPLE_DATA_DIR = ${RWHOIS_ROOT_DIR}
- LIBRWHOIS   = librwhois.a
- LIBMKDB     = libmkdb.a
- LIBWRAP     = libwrap.a
- 
--all: librwhois libmkdb libwrap make-server indexer parser make-client
-+all: librwhois libmkdb make-server indexer parser make-client
- 
- librwhois:
- 	@echo "Making $(LIBRWHOIS)"
-@@ -77,7 +77,7 @@
- 
- install-chroot:
- 	@echo "Setup chroot stuff"
--	chroot.sh $(RWHOIS_ROOT_DIR)
-+	./chroot.sh $(RWHOIS_ROOT_DIR)
- 
- install-client:
- 	@echo "Installing RWhois Client"
-@@ -86,21 +86,13 @@
- install-sample-data: sample-data-install
- 
- sample-data-install:
--	@echo "Setting up for quickie install with sample data"
--	@echo "This is located in `pwd`/sample.data"
--	@echo "Setting up RWhois default data directory (data will reside here)"
-+	if [ -d ${.CURDIR}/sample.data/bin ]; then rm -r ${.CURDIR}/sample.data/bin; fi 
-+	if [ -d ${.CURDIR}/sample.data/etc ]; then rm -r ${.CURDIR}/sample.data/etc; fi
-+	cp -r ${.CURDIR}/sample.data/ ${SAMPLE_DATA_DIR}
- 	(sh tools/install/setup_rwhois_conf $(SAMPLE_DATA_DIR))
--	@echo "Setting up index scripts"
- 	(sh tools/install/setup_index_scripts $(SAMPLE_DATA_DIR))
--	@echo "Copying the indexer into the sample data area"
--	if [ $(SAMPLE_DATA_DIR) != $(RWHOIS_ROOT_DIR) ]; then \
--		if [ ! -d $(SAMPLE_DATA_DIR)/bin ]; then \
--			mkdir $(SAMPLE_DATA_DIR)/bin; \
--        fi; \
--		cp $(RWHOIS_ROOT_DIR)/bin/rmkdbindex $(SAMPLE_DATA_DIR)/bin; \
--	fi
--	@echo "Running index scripts"
- 	(sh tools/install/run_index_scripts $(SAMPLE_DATA_DIR))
-+	/usr/sbin/chown -R nobody ${SAMPLE_DATA_DIR}/data ${SAMPLE_DATA_DIR}/rwhois.log
- 
- clean:
- 	@echo "Cleaning Server"
-@@ -109,8 +101,6 @@
- 	(cd $(COMMON_DIR); $(MAKE) clean)
- 	@echo "Cleaning MKDB"
- 	(cd $(MKDB_DIR); $(MAKE) clean)
--	@echo "Cleaning TCPD stuff"
--	(cd $(LIBWRAP_DIR); $(MAKE) clean)
- 	@echo "Cleaning RWhois Indexer"
- 	(cd $(INDEXER_DIR); $(MAKE) clean)
- 	@echo "Cleaning RWhois Parser"
-@@ -133,7 +123,6 @@
- 	(cd $(MKDB_DIR); $(MAKE) distclean)
- 	(cd $(INDEXER_DIR); $(MAKE) distclean)
- 	(cd $(PARSER_DIR); $(MAKE) distclean)
--	(cd $(LIBWRAP_DIR); $(MAKE) clean)
- 	(cd $(CLIENT_DIR); $(MAKE) distclean)
- 
- dist:
diff --git a/net/rwhoisd/files/patch-ab b/net/rwhoisd/files/patch-ab
deleted file mode 100644
index 90489b414c71..000000000000
--- a/net/rwhoisd/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
---- client/Makefile.in.orig	Wed Sep 25 18:10:48 1996
-+++ client/Makefile.in	Fri May 23 02:34:00 1997
-@@ -6,7 +6,7 @@
- 
- CC      = @CC@
- RANLIB  = @RANLIB@
--INSTALL = @INSTALL@
-+INSTALL = /usr/bin/install -c -s -o bin -g bin
- 
- 
- #
-@@ -56,6 +56,7 @@
- install:
- 	if [ ! -d $(bindir) ]; then mkdir $(bindir); fi
- 	$(INSTALL) rwhois $(bindir)
-+	/bin/ln -sf ${PREFIX}/lib/rwhois/bin/rwhois ${PREFIX}/bin/rwhois
- 
- clean:
- 	rm -f rwhois *.o *~ librwclient.a
diff --git a/net/rwhoisd/files/patch-ac b/net/rwhoisd/files/patch-ac
deleted file mode 100644
index 7832c52b13c2..000000000000
--- a/net/rwhoisd/files/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
---- server/Makefile.in.orig	Wed Sep 25 13:03:56 1996
-+++ server/Makefile.in	Fri May  9 22:48:56 1997
-@@ -7,14 +7,15 @@
- prefix      = @prefix@
- exec_prefix = @exec_prefix@
- bindir      = $(exec_prefix)/bin
-+sbindir     = $(exec_prefix)/sbin
- etcdir      = $(exec_prefix)/etc
- 
- # local libs/includes 
- COMMON_INC  = -I../common
- COMMON_LIBS = -L../common -lrwhois
- 
--WRAP_INC = -I../tools/tcpd_wrapper
--WRAP_LIBS = -L../tools/tcpd_wrapper -lwrap
-+WRAP_INC = -I${PREFIX}/include
-+WRAP_LIBS = -L${PREFIX}/lib -lwrap
- 
- MKDB_INC = -I../mkdb
- MKDB_LIBS = -L../mkdb -lmkdb
-@@ -77,8 +78,8 @@
- 	$(CC) -c $(CFLAGS) $(LOCAL_INC) $*.c
- 
- install:
--	if [ ! -d $(etcdir) ]; then mkdir $(etcdir); fi
--	$(INSTALL) rwhoisd $(etcdir)
-+	if [ ! -d $(sbindir) ]; then mkdir -p $(sbindir); fi
-+	$(INSTALL) rwhoisd $(sbindir)
- 
- clean:
- 	rm -f *.[oa]
diff --git a/net/rwhoisd/files/patch-ad b/net/rwhoisd/files/patch-ad
deleted file mode 100644
index d72758599cbd..000000000000
--- a/net/rwhoisd/files/patch-ad
+++ /dev/null
@@ -1,54 +0,0 @@
---- chroot.sh.orig	Wed Jul 31 15:34:34 1996
-+++ chroot.sh	Thu Jun  5 09:45:59 1997
-@@ -10,9 +10,15 @@
- #umask 022
- 
- RWHOIS_ROOT_DIR=$1
--COPY="cp"
-+COPY="/bin/cp"
- 
- # check if these directories exist
-+if test ! -d ${RWHOIS_ROOT_DIR}
-+then
-+	echo "make directory  ${RWHOIS_ROOT_DIR}."
-+	mkdir ${RWHOIS_ROOT_DIR}
-+fi
-+
- if test ! -d ${RWHOIS_ROOT_DIR}/etc 
- then
- 	echo "make directory  ${RWHOIS_ROOT_DIR}/etc".
-@@ -35,20 +41,30 @@
- then
- 	echo "make directory  ${RWHOIS_ROOT_DIR}/usr"
- 	mkdir $RWHOIS_ROOT_DIR/usr
--	mkdir $RWHOIS_ROOT_DIR/usr/lib
--elif  test ! -d $RWHOIS_ROOT_DIR/usr/lib 
-+fi
-+
-+if  test ! -d $RWHOIS_ROOT_DIR/usr/lib 
- then
- 	echo "make directory  ${RWHOIS_ROOT_DIR}/usr/lib"
-         mkdir $RWHOIS_ROOT_DIR/usr/lib
- fi
- 
-+if  test ! -d $RWHOIS_ROOT_DIR/usr/libexec
-+then
-+	echo "make directory  ${RWHOIS_ROOT_DIR}/usr/libexec"
-+        mkdir $RWHOIS_ROOT_DIR/usr/libexec
-+fi
-+
- #copy /etc/resolv.conf to (rwhois_root)/etc
- 	$COPY /etc/resolv.conf ${RWHOIS_ROOT_DIR}/etc
- 
- #copy /usr/lib/files to (rwhois_root)/usr/lib
--	$COPY /usr/lib/ld.so /usr/lib/libnsl.so.1 /usr/lib/libsocket.so.1 /usr/lib/libc.so.1 /usr/lib/libdl.so.1 /usr/lib/libintl.so.1 /usr/lib/libmp.so.1 /usr/lib/libw.so.1 /usr/lib/libmapmalloc.so.1 $RWHOIS_ROOT_DIR/usr/lib
-+	$COPY /usr/lib/libc.so.* ${PREFIX}/lib/libwrap.so.* $RWHOIS_ROOT_DIR/usr/lib
-+
-+#copy /usr/lib/files to (rwhois_root)/usr/lib
-+	$COPY /usr/libexec/ld.so $RWHOIS_ROOT_DIR/usr/libexec
- 
- #copy /usr/bin/execut. to (rwhois_root)/bin
--	$COPY /usr/bin/sh /usr/bin/sort $RWHOIS_ROOT_DIR/bin
-+	$COPY /bin/sh /usr/bin/sort /bin/date $RWHOIS_ROOT_DIR/bin
- 
- echo "done"
diff --git a/net/rwhoisd/files/patch-ae b/net/rwhoisd/files/patch-ae
deleted file mode 100644
index 9fcaee9d93a5..000000000000
--- a/net/rwhoisd/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- sample.data/rwhois.conf.orig	Fri May 23 01:59:32 1997
-+++ sample.data/rwhois.conf	Fri May 23 02:00:37 1997
-@@ -10,7 +10,7 @@
- # to. If it is not set, it will default to the current working
- # directory.
- # NOTE:  you want to change this.
--root-dir: /home/devel2/davidb/src/rwhois-dev/sample.data
-+root-dir: /usr/local/lib/rwhois
- 
- # schema-file: The config file that contains the top-level schema
- # information.  This file must exist. The old 'object-file' refers to
-@@ -85,7 +85,7 @@
- # chrooted: NO
- 
- # userid: If run as root, rwhoisd will change to this user
--userid: davidb
-+userid: nobody
- 
- # verbosity: What level of reporting (to the console) do you wish.
- # The default is '1'.  '0' is quiet and numbers greater then '1' are
diff --git a/net/rwhoisd/files/patch-af b/net/rwhoisd/files/patch-af
deleted file mode 100644
index ebb060dd17aa..000000000000
--- a/net/rwhoisd/files/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/misc.c.orig	Tue Oct 13 23:12:30 1998
-+++ common/misc.c	Tue Oct 13 23:12:58 1998
-@@ -380,7 +380,6 @@
-   char *program;
-   char *param;
- {
--  int           errno = 0;
-   extern char   **environ;
-   char          *myenviron[MAX_SET];
-   char          *argv[MAX_SET];
diff --git a/net/rwhoisd/files/rwhoisd.sh b/net/rwhoisd/files/rwhoisd.sh
deleted file mode 100644
index 08c071bd0e42..000000000000
--- a/net/rwhoisd/files/rwhoisd.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	# remove or comment the following line and uncomment the one below it once you have
-	# configured your server's data
-	echo "rwhoisd not started; sample data still in place.   See ${PREFIX}/share/doc/rwhois for details."
-	#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && echo -n ' rwhoisd'
-	;;
-stop)
-	# killall rwhoisd && echo -n ' rwhoisd
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/net/rwhoisd/pkg-comment b/net/rwhoisd/pkg-comment
deleted file mode 100644
index 7cdf3c2a94e7..000000000000
--- a/net/rwhoisd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Internic referral whois server
diff --git a/net/rwhoisd/pkg-descr b/net/rwhoisd/pkg-descr
deleted file mode 100644
index 3d3ad5de360d..000000000000
--- a/net/rwhoisd/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-What is Referral Whois (RWhois)?
-
-With the exponential growth of the Internet, a central Whois database that
-provides host and network information of systems connected to the Internet,
-and electronic mail (email) addresses of the users of those systems has
-proven to be very inefficient. The sheer size and effort needed to maintain
-a centralized database necessitates an alternate, decentralized approach to
-storing and retrieving this information.
-
-RWhois is a Directory Services protocol which extends and enhances the Whois
-concept in a hierarchical and scaleable fashion. It focuses on the
-distribution of "network objects"--the data representing Internet resources
-or people--and uses the inherently hierarchical nature of these network
-objects (domain names, Internet Protocol (IP) networks, email addresses) to
-more accurately discover the requested information.
-
-RWhois synthesizes concepts from other, established Internet protocols to
-create a more useful way to find resources across the Internet. The RWhois
-protocol and architecture derive a great deal of structure from the Domain
-Name System (DNS) [RFC 1034] and borrow directory service concepts from
-other directory service efforts, primarily [X.500]. The protocol is also
-influenced by earlier established Internet protocols, such as the Simple
-Mail Transport Protocol (SMTP) [RFC 821] for response codes.
-
diff --git a/net/rwhoisd/pkg-plist b/net/rwhoisd/pkg-plist
deleted file mode 100644
index 6be26bcab95e..000000000000
--- a/net/rwhoisd/pkg-plist
+++ /dev/null
@@ -1,119 +0,0 @@
-bin/rwhois
-etc/rc.d/rwhoisd.sh
-lib/rwhois/attribute_defs/asn.tmpl
-lib/rwhois/attribute_defs/domain.tmpl
-lib/rwhois/attribute_defs/host.tmpl
-lib/rwhois/attribute_defs/network.tmpl
-lib/rwhois/attribute_defs/nic.tmpl
-lib/rwhois/attribute_defs/org.tmpl
-lib/rwhois/attribute_defs/referral.tmpl
-lib/rwhois/attribute_defs/soa.tmpl
-lib/rwhois/attribute_defs/user.tmpl
-lib/rwhois/bin/date
-lib/rwhois/bin/rmkdbindex
-lib/rwhois/bin/rwhois
-lib/rwhois/bin/rwhoisparse
-lib/rwhois/bin/sh
-lib/rwhois/bin/sort
-lib/rwhois/data/asn/asn.txt
-lib/rwhois/data/asn/local-0.ndx
-lib/rwhois/data/asn/local.db
-lib/rwhois/data/asn/null.ca
-lib/rwhois/data/domain/local-0.ndx
-lib/rwhois/data/domain/local.db
-lib/rwhois/data/domain/null.ca
-lib/rwhois/data/domain/shoe-me.com.txt
-lib/rwhois/data/host/local-0.ndx
-lib/rwhois/data/host/local.db
-lib/rwhois/data/host/null.ca
-lib/rwhois/data/host/shoe_me.txt
-lib/rwhois/data/network/local-0.ndx
-lib/rwhois/data/network/local.db
-lib/rwhois/data/network/null.ca
-lib/rwhois/data/network/shoe-me.net.txt
-lib/rwhois/data/referral/local-0.ndx
-lib/rwhois/data/referral/local.db
-lib/rwhois/data/referral/shoe-me-more.txt
-lib/rwhois/data/soa/internic.txt
-lib/rwhois/data/soa/local-0.ndx
-lib/rwhois/data/soa/local.db
-lib/rwhois/data/soa/null.ca
-lib/rwhois/data/soa/shoe-me.txt
-lib/rwhois/data/user/local-0.ndx
-lib/rwhois/data/user/local.db
-lib/rwhois/data/user/null.ca
-lib/rwhois/data/user/shoe-me.be.txt
-lib/rwhois/data/user/shoe-me.multiple.txt
-lib/rwhois/data/user/shoe.gif
-lib/rwhois/etc/resolv.conf
-lib/rwhois/index_scripts/index_all
-lib/rwhois/index_scripts/index_asn
-lib/rwhois/index_scripts/index_domain
-lib/rwhois/index_scripts/index_host
-lib/rwhois/index_scripts/index_network
-lib/rwhois/index_scripts/index_nic
-lib/rwhois/index_scripts/index_org
-lib/rwhois/index_scripts/index_referral
-lib/rwhois/index_scripts/index_soa
-lib/rwhois/index_scripts/index_user
-lib/rwhois/output_templates/asn.full.output
-lib/rwhois/output_templates/domain.full.output
-lib/rwhois/output_templates/domain.sum.output
-lib/rwhois/output_templates/host.contact.output
-lib/rwhois/output_templates/host.full.output
-lib/rwhois/output_templates/host.sum.output
-lib/rwhois/output_templates/network.full.output
-lib/rwhois/output_templates/network.ripe.output
-lib/rwhois/output_templates/network.sum.output
-lib/rwhois/output_templates/network.swip.output
-lib/rwhois/output_templates/nic.full.output
-lib/rwhois/output_templates/org.full.output
-lib/rwhois/output_templates/referral.full.output
-lib/rwhois/output_templates/soa.full.output
-lib/rwhois/output_templates/user.contact.output
-lib/rwhois/output_templates/user.full.output
-lib/rwhois/output_templates/user.ripe.output
-lib/rwhois/output_templates/user.sum.output
-lib/rwhois/output_templates/user.swip.output
-lib/rwhois/rwhois.allow
-lib/rwhois/rwhois.conf
-lib/rwhois/rwhois.conf.orig
-lib/rwhois/rwhois.define
-lib/rwhois/rwhois.deny
-lib/rwhois/rwhois.directive
-lib/rwhois/rwhois.display
-lib/rwhois/rwhois.help
-lib/rwhois/rwhois.log
-lib/rwhois/rwhois.objects
-lib/rwhois/rwhois.root
-lib/rwhois/sbin/rwhoisd
-lib/rwhois/usr/lib/libc.so.%%LIBCVERSION%%
-lib/rwhois/usr/libexec/ld.so
-share/doc/rwhois/EXAMPLES
-share/doc/rwhois/INSTALLATION
-share/doc/rwhois/NEWS
-share/doc/rwhois/PROBLEMS
-share/doc/rwhois/README
-share/doc/rwhois/TODO
-share/doc/rwhois/operations_guide.txt
-share/doc/rwhois/sample.data.explained
-@dirrm lib/rwhois/attribute_defs/
-@dirrm lib/rwhois/bin/
-@dirrm lib/rwhois/data/asn/
-@dirrm lib/rwhois/data/domain/
-@dirrm lib/rwhois/data/host/
-@dirrm lib/rwhois/data/network/
-@dirrm lib/rwhois/data/referral/
-@dirrm lib/rwhois/data/soa/
-@dirrm lib/rwhois/data/user/
-@dirrm lib/rwhois/data/
-@dirrm lib/rwhois/etc/
-@dirrm lib/rwhois/index_scripts/
-@dirrm lib/rwhois/output_templates/
-@dirrm lib/rwhois/sbin/
-@dirrm lib/rwhois/tmp/
-@dirrm lib/rwhois/usr/lib/
-@dirrm lib/rwhois/usr/libexec/
-@dirrm lib/rwhois/usr/
-@dirrm lib/rwhois/
-@dirrm share/doc/rwhois
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
deleted file mode 100644
index e05234ce55af..000000000000
--- a/net/samba3/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-# New ports collection makefile for:	samba
-# Date created:				11th Feb 1995
-# Whom:					gpalmer
-#
-# $FreeBSD$
-#
-
-PORTNAME=	samba
-PORTVERSION=	2.0.7
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.samba.org/pub/samba/ \
-		ftp://ring.asahi-net.or.jp/pub/net/samba/ \
-		ftp://samba.anu.edu.au/pub/samba/ \
-		ftp://de.samba.org/pub/mirror/samba/ \
-		ftp://se.samba.org/pub/samba/ \
-		ftp://ftp.sunet.se/pub/unix/utilities/samba/
-
-MAINTAINER=	hosokawa@jp.FreeBSD.org
-
-Y2K=		http://us1.samba.org/samba/docs/sambay2k.html
-
-# directories
-VARDIR=		/var
-SAMBA_SPOOL=	${VARDIR}/spool/samba
-SAMBA_LOGDIR=	${VARDIR}/log
-SAMBA_PRIVATE=	${PREFIX}/private
-SAMBA_CONFDIR=	${PREFIX}/etc
-# sample files
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
-SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
-		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
-		--with-sambabook=${PREFIX}/share/swat/using_samba \
-		--with-lockdir=${VARDIR}/spool/lock --with-privatedir=${SAMBA_PRIVATE}
-
-.if defined(KRB5_HOME) && exists(${KRB5_HOME})
-CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
-.endif
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
-
-MAN1=		nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
-		testparm.1 testprns.1 make_smbcodepage.1 smbsh.1 \
-		make_unicodemap.1
-MAN5=		smb.conf.5 smbpasswd.5 lmhosts.5
-MAN7=		samba.7
-MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 smbspool.8 \
-		smbmount.8 smbumount.8 smbmnt.8
-
-post-install:
-	${MKDIR} ${PREFIX}/share/examples/samba
-	${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
-	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ;	\
-		${INSTALL_SCRIPT} ${FILESDIR}/samba.sh.sample 		\
-			${STARTUP_SCRIPT} ;				\
-	fi
-	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 1777 ${SAMBA_SPOOL}
-	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
-		${SED} -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!'		\
-			-e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!'	\
-			-e 's!%%SAMBA_CONFDIR%%!${SAMBA_CONFDIR}!'	\
-			${FILESDIR}/smb.conf.default			\
-			> ${SAMPLE_CONFIG} ;				\
-	fi
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
-	if [ ! -d ${SAMBA_PRIVATE} ] ; then				\
-		${MKDIR} ${SAMBA_PRIVATE} ;				\
-		${CHOWN} root.wheel ${SAMBA_PRIVATE} ;			\
-	fi
-	${CHMOD} 700 ${SAMBA_PRIVATE}
-	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then			\
-		${CAT} /etc/passwd | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd ; \
-		${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd ;			\
-	fi
-	${CHMOD} 500 ${SAMBA_PRIVATE}
-	${CHOWN} root.wheel ${PREFIX}/bin/smbpasswd
-	${CHMOD} 111 ${PREFIX}/bin/smbpasswd
-.if defined(PACKAGE_BUILDING)
-	${ECHO} "private/smbpasswd" >> ${TMPPLIST}
-	${ECHO} "@dirrm private" >> ${TMPPLIST}
-.else
-	${ECHO} "@unexec echo \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
-.endif
-
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/samba
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
-	for i in ${WRKDIR}/${DISTNAME}/README				\
-			${WRKDIR}/${DISTNAME}/COPYING			\
-			${WRKDIR}/${DISTNAME}/Manifest			\
-			${WRKDIR}/${DISTNAME}/Read-Manifest-Now		\
-			${WRKDIR}/${DISTNAME}/Roadmap			\
-			${WRKDIR}/${DISTNAME}/WHATSNEW.txt		\
-			${WRKDIR}/${DISTNAME}/docs/*.reg		\
-			${WRKDIR}/${DISTNAME}/docs/THANKS		\
-			${WRKDIR}/${DISTNAME}/docs/announce		\
-			${WRKDIR}/${DISTNAME}/docs/history ; do		\
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
-	done
-	for i in faq htmldocs textdocs yodldocs ; do			\
-		${MKDIR} ${PREFIX}/share/doc/samba/$$i ;		\
-		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
-			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
-				${INSTALL_DATA} $$j ${PREFIX}/share/doc/samba/$$i ;\
-			fi; \
-		done							\
-	done
-	${MKDIR} ${PREFIX}/share/doc/samba
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
deleted file mode 100644
index 37cb33745240..000000000000
--- a/net/samba3/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (samba-2.0.7.tar.gz) = b5e61ea655d476072fd0365785fea2d0
diff --git a/net/samba3/files/README.FreeBSD b/net/samba3/files/README.FreeBSD
deleted file mode 100644
index 67cc86c58cb2..000000000000
--- a/net/samba3/files/README.FreeBSD
+++ /dev/null
@@ -1,21 +0,0 @@
-If you want to use samba ports,
-
-1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit
-   it.
-2. Copy /usr/local/etc/rc.d/samba.sh.sample to /usr/local/etc/rc.d/samba.sh
-3. Type /usr/local/etc/rc.d/samba.sh or reboot.
-
-See document files in /usr/local/share/doc/samba and example config files in
-/usr/local/share/examples/samba for details.
-
-FreeBSD Samba ports for localization and encrypt passwords support are no
-longer provided because these supports have been integrated into the
-original distribution since 1.9.18.  If you're Western European or Japanese
-Windows users, please set "client code page" parameter in smb.conf (1.9.18
-does not support Chinese Windows. If you want to use Chinese samba, please
-use chinese/samba port).  See smb.conf.sample for details.  If you want to
-use NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
-yes and use smbpasswd [username] to use /usr/local/private/smbpasswd for
-authentication.
-
-FreeBSD SAMBA ports maintainer: Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
deleted file mode 100644
index 3633f55c7b8f..000000000000
--- a/net/samba3/files/patch-aa
+++ /dev/null
@@ -1,47 +0,0 @@
---- Makefile.in.orig	Wed Apr 26 02:06:11 2000
-+++ Makefile.in	Thu Apr 27 11:08:08 2000
-@@ -25,7 +25,7 @@
- BINDIR = @bindir@
- # we don't use sbindir because we want full compatibility with
- # the previous releases of Samba
--SBINDIR = @bindir@
-+SBINDIR = @sbindir@
- LIBDIR = @libdir@
- VARDIR = @localstatedir@
- MANDIR = @mandir@
-@@ -37,12 +37,13 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+LOGDIR=$(VARDIR)/log
-+SMBLOGFILE = $(LOGDIR)/log.smb
-+NMBLOGFILE = $(LOGDIR)/log.nmb
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
--PASSWD_PROGRAM = /bin/passwd
-+PASSWD_PROGRAM = /usr/bin/passwd
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
- 
-@@ -54,6 +55,9 @@
- # the directory where lock files go
- LOCKDIR = @lockdir@
- 
-+# the directory where pid files go
-+PIDFILEDIR = $(VARDIR)/run
-+
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
- 
-@@ -71,7 +75,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
- FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
- FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
--FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
-+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
- FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
- FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba3/files/patch-ab b/net/samba3/files/patch-ab
deleted file mode 100644
index 40158831ba75..000000000000
--- a/net/samba3/files/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
---- param/loadparm.c.orig	Wed Apr 26 02:07:00 2000
-+++ param/loadparm.c	Thu Apr 27 11:12:03 2000
-@@ -105,6 +105,7 @@
- {
-   char *szPrintcapname;
-   char *szLockDir;
-+  char *szPidDir;
-   char *szRootdir;
-   char *szDefaultService;
-   char *szDfree;
-@@ -820,6 +821,8 @@
-   {"preload",          P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
-   {"lock directory",   P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-   {"lock dir",         P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-+  {"pidfile dir",      P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
-+  {"pidfile directory",P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
- #ifdef WITH_UTMP
-   {"utmp directory",   P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-   {"utmp dir",         P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-@@ -911,6 +914,7 @@
-   string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
-   string_set(&Globals.szDriverFile, DRIVERFILE);
-   string_set(&Globals.szLockDir, LOCKDIR);
-+  string_set(&Globals.szPidDir, PIDFILEDIR);
-   string_set(&Globals.szRootdir, "/");
- #ifdef WITH_UTMP
-   string_set(&Globals.szUtmpDir, "");
-@@ -1185,6 +1189,7 @@
- FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
- FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
- FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
-+FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
- #ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
- FN_GLOBAL_STRING(lp_wtmpdir,&Globals.szWtmpDir)
diff --git a/net/samba3/files/patch-ac b/net/samba3/files/patch-ac
deleted file mode 100644
index dd53b8418c1e..000000000000
--- a/net/samba3/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/pidfile.c.orig	Fri Jan 15 22:40:47 1999
-+++ lib/pidfile.c	Fri Jan 15 22:41:05 1999
-@@ -37,7 +37,7 @@
- 	unsigned ret;
- 	pstring pidFile;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644);
- 	if (fd == -1) {
-@@ -78,7 +78,7 @@
- 	pstring pidFile;
- 	int pid;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	pid = pidfile_pid(name);
- 	if (pid != 0) {
diff --git a/net/samba3/files/patch-ae b/net/samba3/files/patch-ae
deleted file mode 100644
index 252ac19c8e63..000000000000
--- a/net/samba3/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- script/convert_smbpasswd.orig	Thu Nov  5 11:50:17 1998
-+++ script/convert_smbpasswd	Wed Feb 10 00:02:01 1999
-@@ -7,7 +7,7 @@
- # with trying to work out how to get the seconds since 1970
- # in awk or the shell. JRA.
- #
--nawk 'BEGIN {FS=":"} 
-+awk 'BEGIN {FS=":"} 
- {
- 	if( $0 ~ "^#" ) {
- 		print $0
diff --git a/net/samba3/files/patch-af b/net/samba3/files/patch-af
deleted file mode 100644
index 4d0b8cd2da0e..000000000000
--- a/net/samba3/files/patch-af
+++ /dev/null
@@ -1,9 +0,0 @@
---- script/updatesmbpasswd.sh.orig	Sat May  4 16:50:45 1996
-+++ script/updatesmbpasswd.sh	Wed Feb 10 01:21:05 1999
-@@ -1,5 +1,5 @@
- #!/bin/sh
--nawk 'BEGIN {FS=":"} 
-+awk 'BEGIN {FS=":"} 
- {
- 	if( $0 ~ "^#" ) {
- 		print $0
diff --git a/net/samba3/files/patch-ag b/net/samba3/files/patch-ag
deleted file mode 100644
index eac80026a659..000000000000
--- a/net/samba3/files/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
---- nmbd/nmbd_winsserver.c.orig	Wed Jul 21 10:25:11 1999
-+++ nmbd/nmbd_winsserver.c	Fri Jul 23 15:14:33 1999
-@@ -152,7 +152,7 @@
-   start_async_dns();
- #endif
- 
--  pstrcpy(fname,lp_lockdir());
-+  pstrcpy(fname,"/var/db");
-   trim_string(fname,NULL,"/");
-   pstrcat(fname,"/");
-   pstrcat(fname,WINS_LIST);
-@@ -1551,7 +1551,7 @@
- 	  }
-   }
- 
--  slprintf(fname,sizeof(fname),"%s/%s", lp_lockdir(), WINS_LIST);
-+  slprintf(fname,sizeof(fname),"%s/%s", "/var/db", WINS_LIST);
-   all_string_sub(fname,"//", "/", 0);
-   slprintf(fnamenew,sizeof(fnamenew),"%s.%u", fname, (unsigned int)getpid());
- 
diff --git a/net/samba3/files/patch-ah b/net/samba3/files/patch-ah
deleted file mode 100644
index 81b1f75158a4..000000000000
--- a/net/samba3/files/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/util_sock.c.orig	Wed Sep 22 10:52:50 1999
-+++ lib/util_sock.c	Wed Sep 22 11:30:18 1999
-@@ -28,6 +28,9 @@
- extern int  sslFd;
- #endif  /* WITH_SSL */
- 
-+#undef MSG_WAITALL
-+#define MSG_WAITALL 0
-+
- extern int DEBUGLEVEL;
- 
- BOOL passive = False;
diff --git a/net/samba3/files/patch-aj b/net/samba3/files/patch-aj
deleted file mode 100644
index 5e31ad8ebaa7..000000000000
--- a/net/samba3/files/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/local.h.orig	Thu Nov 11 03:36:00 1999
-+++ include/local.h	Fri Feb  4 11:33:01 2000
-@@ -178,9 +178,9 @@
-  * Default passwd chat script.
-  */
- 
--#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
-+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
- 
- /* Minimum length of allowed password when changing UNIX password. */
--#define MINPASSWDLENGTH 5
-+#define MINPASSWDLENGTH 6
- 
- #endif
diff --git a/net/samba3/files/patch-ba b/net/samba3/files/patch-ba
deleted file mode 100644
index 7f46ffd7af1e..000000000000
--- a/net/samba3/files/patch-ba
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Mon Oct  4 09:03:55 1999
-+++ configure.in	Mon Oct  4 09:04:00 1999
-@@ -1064,7 +1064,7 @@
-   --whithout-krb5          Don't include Kerbers 5 support (default)],
- [   AC_MSG_RESULT(yes)
-     AC_DEFINE(KRB5_AUTH)
--    LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err"
-+    LIBS="$LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err"
-     CFLAGS="$CFLAGS -I$withval/include"
-     LDFLAGS="$LDFLAGS -L$withval/lib"],
-   AC_MSG_RESULT(no)
diff --git a/net/samba3/files/samba.sh.sample b/net/samba3/files/samba.sh.sample
deleted file mode 100644
index e6807ad6d145..000000000000
--- a/net/samba3/files/samba.sh.sample
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-smbspool=/var/spool/samba
-pidfiledir=/var/run
-smbd=/usr/local/sbin/smbd
-nmbd=/usr/local/sbin/nmbd
-
-# start
-if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
-	if [ -f $smbd ]; then
-		if [ -d $smbspool ]; then
-			rm -f $smbspool/*
-		fi
-		echo -n ' Samba'
-		$smbd -D
-		$nmbd -D
-	fi
-
-# stop
-elif [ "x$1" = "xstop" ]; then
-	kill `cat $pidfiledir/smbd.pid`
-	kill `cat $pidfiledir/nmbd.pid`
-fi
diff --git a/net/samba3/files/smb.conf.default b/net/samba3/files/smb.conf.default
deleted file mode 100644
index ef0d65a03705..000000000000
--- a/net/samba3/files/smb.conf.default
+++ /dev/null
@@ -1,283 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not many any basic syntactic errors. 
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
-   workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
-   server string = Samba Server
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-;   hosts allow = 192.168.1. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-   load printers = yes
-
-# you may wish to override the location of the printcap file
-;   printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-;   printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, sysv, plp, lprng, aix, hpux, qnx
-;   printing = bsd
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-;  guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
-   log file = %%SAMBA_LOGDIR%%/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 50
-
-# Security mode. Most people will want user level security. See
-# security_level.txt for details.
-   security = user
-# Use password server option only with security = server
-;   password server = <NT-Server-Name>
-
-# You may wish to use password encryption. Please read
-# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
-# Do not enable this option unless you have read those documents
-;  encrypt passwords = yes
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
-;   include = %%SAMBA_CONFDIR%%/smb.conf.%m
-
-# Most people will find that this option gives better performance.
-# See speed.txt and the manual pages for details
-   socket options = TCP_NODELAY 
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;   preferred master = yes
-
-# Use only if you have an NT server on your network that has been
-# configured at install time to be a primary domain controller.
-;   domain controller = <NT-Domain-Controller-SMBName>
-
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
-;   domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-;   logon script = %m.bat
-# run a specific logon batch file per username
-;   logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-#        %L substitutes for this servers netbios name, %U is username
-#        You must uncomment the [Profiles] share below
-;   logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one	WINS Server on the network. The default is NO.
-;   wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
-# this has been changed in version 1.9.18 to no.
-   dns proxy = no 
-
-# Client codepage settings
-
-# for Greek users
-; client code page=737
-
-# for European users (Latin 1)
-; client code page=850
-
-# for European users (Latin 2)
-; client code page=852
-
-# for Icelandic users
-; client code page=861
-
-# for Cyrillic users
-; client code page=866
-
-# for Japanese Users
-; client code page=932
-; coding system=cap
-
-# for Simplified Chinese Users
-; client code page=936
-; coding system=cap
-
-# for Korean Users
-; client code page=949
-; coding system=cap
-
-# for Traditional Chinese Users
-; client code page=950
-; coding system=cap
-
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = no
-   writeable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-;   comment = Network Logon Service
-;   path = /usr/local/samba/lib/netlogon
-;   guest ok = yes
-;   writeable = no
-;   share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-;    path = /usr/local/samba/profiles
-;    browseable = no
-;    guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to 
-# specifically define each individual printer
-[printers]
-   comment = All Printers
-   path = %%SAMBA_SPOOL%%
-   browseable = no
-# Set public = yes to allow user 'guest account' to print
-   guest ok = no
-   writeable = no
-   printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-;   comment = Temporary file space
-;   path = /tmp
-;   read only = no
-;   public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-;   comment = Public Stuff
-;   path = /home/samba
-;   public = yes
-;   writeable = yes
-;   printable = no
-;   write list = @staff
-
-# Other examples. 
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-;   comment = Fred's Printer
-;   valid users = fred
-;   path = /homes/fred
-;   printer = freds_printer
-;   public = no
-;   writeable = no
-;   printable = yes
-
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-;   comment = Fred's Service
-;   path = /usr/somewhere/private
-;   valid users = fred
-;   public = no
-;   writeable = yes
-;   printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-;  comment = PC Directories
-;  path = /usr/pc/%m
-;  public = no
-;  writeable = yes
-
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writeable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-;[public]
-;   path = /usr/somewhere/else/public
-;   public = yes
-;   only guest = yes
-;   writeable = yes
-;   printable = no
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writeable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-;   comment = Mary's and Fred's stuff
-;   path = /usr/somewhere/shared
-;   valid users = mary fred
-;   public = no
-;   writeable = yes
-;   printable = no
-;   create mask = 0765
-
-
diff --git a/net/samba3/pkg-comment b/net/samba3/pkg-comment
deleted file mode 100644
index 21f25f97e695..000000000000
--- a/net/samba3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free SMB and CIFS client and server for UNIX
diff --git a/net/samba3/pkg-descr b/net/samba3/pkg-descr
deleted file mode 100644
index df127661ed82..000000000000
--- a/net/samba3/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-The Samba suite is a set of programs which run under the FreeBSD
-operating system. These programs deliver most of the important
-functionality of a Microsoft Lan Manager server. That is, they support
-remote access to FreeBSD filespace and FreeBSD printers from Lan Manager
-compatible clients. In practical terms, this means that such clients
-can connect to and use FreeBSD filespace as if it was a local disk drive,
-or FreeBSD printers as if they were local printers.
-
-Some of the most popular Lan Manager compatible clients include Lan
-Manager itself, Windows for Workgroups, OS/2 and Windows NT.
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
deleted file mode 100644
index 56feadef0d63..000000000000
--- a/net/samba3/pkg-plist
+++ /dev/null
@@ -1,440 +0,0 @@
-bin/smbclient
-bin/smbstatus
-bin/smbpasswd
-bin/nmblookup
-bin/smbtar
-bin/addtosmbpass
-bin/convert_smbpasswd
-bin/testparm
-bin/testprns
-bin/make_smbpasswd
-bin/make_smbcodepage
-bin/make_unicodemap
-bin/make_printerdef
-bin/rpcclient
-bin/smbspool
-sbin/smbd
-sbin/nmbd
-sbin/swat
-share/examples/samba/README
-share/examples/samba/smb.conf.default
-share/examples/samba/autofs/README
-share/examples/samba/autofs/auto.a
-share/examples/samba/dce-dfs/README
-share/examples/samba/dce-dfs/smb.conf
-share/examples/samba/misc/extra_smbstatus
-share/examples/samba/misc/wall.perl
-share/examples/samba/printer-accounting/README
-share/examples/samba/printer-accounting/acct-all
-share/examples/samba/printer-accounting/acct-sum
-share/examples/samba/printer-accounting/hp5-redir
-share/examples/samba/printer-accounting/lp-acct
-share/examples/samba/printer-accounting/printcap
-share/examples/samba/printing/smbprint
-share/examples/samba/printing/smbprint.sysv
-share/examples/samba/simple/README
-share/examples/samba/simple/smb.conf
-share/examples/samba/svr4-startup/README
-share/examples/samba/svr4-startup/samba.server
-share/examples/samba/thoralf/smb.conf
-share/examples/samba/tridge/README
-share/examples/samba/tridge/smb.conf
-share/examples/samba/tridge/smb.conf.WinNT
-share/examples/samba/tridge/smb.conf.fjall
-share/examples/samba/tridge/smb.conf.lapland
-share/examples/samba/tridge/smb.conf.vittjokk
-share/examples/samba/validchars/msdos70.out
-share/examples/samba/validchars/nwdos70.out
-share/examples/samba/validchars/readme
-share/examples/samba/validchars/validchr.c
-share/examples/samba/validchars/validchr.com
-share/examples/samba/wins_hook/README
-share/examples/samba/wins_hook/dns_update
-@dirrm share/examples/samba/autofs
-@dirrm share/examples/samba/dce-dfs
-@dirrm share/examples/samba/misc
-@dirrm share/examples/samba/printing
-@dirrm share/examples/samba/printer-accounting
-@dirrm share/examples/samba/simple
-@dirrm share/examples/samba/svr4-startup
-@dirrm share/examples/samba/thoralf
-@dirrm share/examples/samba/tridge
-@dirrm share/examples/samba/validchars
-@dirrm share/examples/samba/wins_hook
-@dirrm share/examples/samba
-etc/rc.d/samba.sh.sample
-etc/smb.conf.default
-etc/codepages/codepage.437
-etc/codepages/codepage.737
-etc/codepages/codepage.775
-etc/codepages/codepage.850
-etc/codepages/codepage.852
-etc/codepages/codepage.861
-etc/codepages/codepage.866
-etc/codepages/codepage.932
-etc/codepages/codepage.936
-etc/codepages/codepage.949
-etc/codepages/codepage.950
-etc/codepages/codepage.1251
-etc/codepages/unicode_map.437
-etc/codepages/unicode_map.737
-etc/codepages/unicode_map.850
-etc/codepages/unicode_map.852
-etc/codepages/unicode_map.861
-etc/codepages/unicode_map.866
-etc/codepages/unicode_map.932
-etc/codepages/unicode_map.936
-etc/codepages/unicode_map.949
-etc/codepages/unicode_map.950
-etc/codepages/unicode_map.ISO8859-1
-etc/codepages/unicode_map.ISO8859-2
-etc/codepages/unicode_map.ISO8859-5
-etc/codepages/unicode_map.ISO8859-7
-etc/codepages/unicode_map.KOI8-R
-@dirrm etc/codepages
-share/doc/samba/COPYING
-share/doc/samba/Manifest
-share/doc/samba/NT4_PlainPassword.reg
-share/doc/samba/NT4-Locking.reg
-share/doc/samba/README
-share/doc/samba/README.FreeBSD
-share/doc/samba/README.swat
-share/doc/samba/Read-Manifest-Now
-share/doc/samba/Roadmap
-share/doc/samba/THANKS
-share/doc/samba/WHATSNEW.txt
-share/doc/samba/Win2000_PlainPassword.reg
-share/doc/samba/Win95_PlainPassword.reg
-share/doc/samba/Win98_PlainPassword.reg
-share/doc/samba/Win9X-CacheHandling.reg
-share/doc/samba/WindowsTerminalServer.reg
-share/doc/samba/announce
-share/doc/samba/faq/Samba-Server-FAQ-1.html
-share/doc/samba/faq/Samba-Server-FAQ-2.html
-share/doc/samba/faq/Samba-Server-FAQ.html
-share/doc/samba/faq/Samba-Server-FAQ.sgml
-share/doc/samba/faq/Samba-meta-FAQ-1.html
-share/doc/samba/faq/Samba-meta-FAQ-2.html
-share/doc/samba/faq/Samba-meta-FAQ-3.html
-share/doc/samba/faq/Samba-meta-FAQ-4.html
-share/doc/samba/faq/Samba-meta-FAQ-5.html
-share/doc/samba/faq/Samba-meta-FAQ-6.html
-share/doc/samba/faq/Samba-meta-FAQ.html
-share/doc/samba/faq/Samba-meta-FAQ.sgml
-share/doc/samba/faq/Samba-meta-FAQ.txt
-share/doc/samba/faq/sambafaq-1.html
-share/doc/samba/faq/sambafaq-2.html
-share/doc/samba/faq/sambafaq-3.html
-share/doc/samba/faq/sambafaq-4.html
-share/doc/samba/faq/sambafaq-5.html
-share/doc/samba/faq/sambafaq.html
-share/doc/samba/faq/sambafaq.sgml
-share/doc/samba/faq/sambafaq.txt
-share/doc/samba/history
-share/doc/samba/htmldocs/DOMAIN_MEMBER.html
-share/doc/samba/htmldocs/NT_Security.html
-share/doc/samba/htmldocs/lmhosts.5.html
-share/doc/samba/htmldocs/make_smbcodepage.1.html
-share/doc/samba/htmldocs/make_unicodemap.1.html
-share/doc/samba/htmldocs/nmbd.8.html
-share/doc/samba/htmldocs/nmblookup.1.html
-share/doc/samba/htmldocs/samba.7.html
-share/doc/samba/htmldocs/smb.conf.5.html
-share/doc/samba/htmldocs/smbclient.1.html
-share/doc/samba/htmldocs/smbd.8.html
-share/doc/samba/htmldocs/smbmnt.8.html
-share/doc/samba/htmldocs/smbmount.8.html
-share/doc/samba/htmldocs/smbpasswd.5.html
-share/doc/samba/htmldocs/smbpasswd.8.html
-share/doc/samba/htmldocs/smbspool.8.html
-share/doc/samba/htmldocs/smbrun.1.html
-share/doc/samba/htmldocs/smbsh.1.html
-share/doc/samba/htmldocs/smbstatus.1.html
-share/doc/samba/htmldocs/smbtar.1.html
-share/doc/samba/htmldocs/swat.8.html
-share/doc/samba/htmldocs/testparm.1.html
-share/doc/samba/htmldocs/testprns.1.html
-share/doc/samba/htmldocs/wfw_slip.htm
-share/doc/samba/textdocs/smbmount.txt
-share/doc/samba/textdocs/NT-Guest-Access.txt
-share/doc/samba/textdocs/Application_Serving.txt
-share/doc/samba/textdocs/BROWSING-Config.txt
-share/doc/samba/textdocs/BROWSING.txt
-share/doc/samba/textdocs/BUGS.txt
-share/doc/samba/textdocs/CRLF-LF-Conversions.txt
-share/doc/samba/textdocs/CVS_ACCESS.txt
-share/doc/samba/textdocs/DHCP-Server-Configuration.txt
-share/doc/samba/textdocs/DIAGNOSIS.txt
-share/doc/samba/textdocs/DNIX.txt
-share/doc/samba/textdocs/DOMAIN.txt
-share/doc/samba/textdocs/DOMAIN_CONTROL.txt
-share/doc/samba/textdocs/DOMAIN_MEMBER.txt
-share/doc/samba/textdocs/ENCRYPTION.txt
-share/doc/samba/textdocs/Faxing.txt
-share/doc/samba/textdocs/File-Cacheing.txt
-share/doc/samba/textdocs/GOTCHAS.txt
-share/doc/samba/textdocs/HINTS.txt
-share/doc/samba/textdocs/INSTALL.sambatar
-share/doc/samba/textdocs/MIRRORS.txt
-share/doc/samba/textdocs/Macintosh_Clients.txt
-share/doc/samba/textdocs/NTDOMAIN.txt
-share/doc/samba/textdocs/NT_Security.txt
-share/doc/samba/textdocs/NetBIOS.txt
-share/doc/samba/textdocs/OS2-Client-HOWTO.txt
-share/doc/samba/textdocs/PRINTER_DRIVER.txt
-share/doc/samba/textdocs/PROFILES.txt
-share/doc/samba/textdocs/PROJECTS
-share/doc/samba/textdocs/Passwords.txt
-share/doc/samba/textdocs/Printing.txt
-share/doc/samba/textdocs/README.DCEDFS
-share/doc/samba/textdocs/README.jis
-share/doc/samba/textdocs/README.sambatar
-share/doc/samba/textdocs/Recent-FAQs.txt
-share/doc/samba/textdocs/RoutedNetworks.txt
-share/doc/samba/textdocs/SCO.txt
-share/doc/samba/textdocs/SMBTAR.notes
-share/doc/samba/textdocs/SSLeay.txt
-share/doc/samba/textdocs/Speed.txt
-share/doc/samba/textdocs/Speed2.txt
-share/doc/samba/textdocs/Support.txt
-share/doc/samba/textdocs/Tracing.txt
-share/doc/samba/textdocs/UNIX-SMB.txt
-share/doc/samba/textdocs/UNIX_INSTALL.txt
-share/doc/samba/textdocs/UNIX_SECURITY.txt
-share/doc/samba/textdocs/Win95.txt
-share/doc/samba/textdocs/WinNT.txt
-share/doc/samba/textdocs/cifsntdomain.txt
-share/doc/samba/textdocs/security_level.txt
-share/doc/samba/yodldocs/DOMAIN_MEMBER.yo
-share/doc/samba/yodldocs/NT_Security.yo
-share/doc/samba/yodldocs/lmhosts.5.yo
-share/doc/samba/yodldocs/make_smbcodepage.1.yo
-share/doc/samba/yodldocs/make_unicodemap.1.yo
-share/doc/samba/yodldocs/nmbd.8.yo
-share/doc/samba/yodldocs/nmblookup.1.yo
-share/doc/samba/yodldocs/samba.7.yo
-share/doc/samba/yodldocs/smb.conf.5.yo
-share/doc/samba/yodldocs/smbclient.1.yo
-share/doc/samba/yodldocs/smbd.8.yo
-share/doc/samba/yodldocs/smbmnt.8.yo
-share/doc/samba/yodldocs/smbmount.8.yo
-share/doc/samba/yodldocs/smbpasswd.5.yo
-share/doc/samba/yodldocs/smbpasswd.8.yo
-share/doc/samba/yodldocs/smbspool.8.yo
-share/doc/samba/yodldocs/smbrun.1.yo
-share/doc/samba/yodldocs/smbsh.1.yo
-share/doc/samba/yodldocs/smbstatus.1.yo
-share/doc/samba/yodldocs/smbtar.1.yo
-share/doc/samba/yodldocs/swat.8.yo
-share/doc/samba/yodldocs/testparm.1.yo
-share/doc/samba/yodldocs/testprns.1.yo
-@dirrm share/doc/samba/faq
-@dirrm share/doc/samba/htmldocs
-@dirrm share/doc/samba/textdocs
-@dirrm share/doc/samba/yodldocs
-@dirrm share/doc/samba
-share/swat/help/welcome.html
-share/swat/help/DOMAIN_MEMBER.html
-share/swat/help/NT_Security.html
-share/swat/help/lmhosts.5.html
-share/swat/help/make_smbcodepage.1.html
-share/swat/help/make_unicodemap.1.html
-share/swat/help/nmbd.8.html
-share/swat/help/nmblookup.1.html
-share/swat/help/samba.7.html
-share/swat/help/smb.conf.5.html
-share/swat/help/smbclient.1.html
-share/swat/help/smbd.8.html
-share/swat/help/smbmnt.8.html
-share/swat/help/smbmount.8.html
-share/swat/help/smbpasswd.5.html
-share/swat/help/smbpasswd.8.html
-share/swat/help/smbrun.1.html
-share/swat/help/smbsh.1.html
-share/swat/help/smbspool.8.html
-share/swat/help/smbstatus.1.html
-share/swat/help/smbtar.1.html
-share/swat/help/swat.8.html
-share/swat/help/testparm.1.html
-share/swat/help/testprns.1.html
-share/swat/help/welcome.ja_JP.ujis.html
-share/swat/images/globals.gif
-share/swat/images/home.gif
-share/swat/images/passwd.gif
-share/swat/images/printers.gif
-share/swat/images/samba.gif
-share/swat/images/shares.gif
-share/swat/images/status.gif
-share/swat/images/viewconfig.gif
-share/swat/include/footer.html
-share/swat/include/header.html
-share/swat/using_samba/appa_01.html
-share/swat/using_samba/appa_02.html
-share/swat/using_samba/appa_03.html
-share/swat/using_samba/appa_04.html
-share/swat/using_samba/appa_05.html
-share/swat/using_samba/appb_01.html
-share/swat/using_samba/appb_02.html
-share/swat/using_samba/appb_03.html
-share/swat/using_samba/appc_01.html
-share/swat/using_samba/appd_01.html
-share/swat/using_samba/appe_01.html
-share/swat/using_samba/appf_01.html
-share/swat/using_samba/ch01_01.html
-share/swat/using_samba/ch01_02.html
-share/swat/using_samba/ch01_03.html
-share/swat/using_samba/ch01_04.html
-share/swat/using_samba/ch01_05.html
-share/swat/using_samba/ch01_06.html
-share/swat/using_samba/ch01_07.html
-share/swat/using_samba/ch01_08.html
-share/swat/using_samba/ch02_01.html
-share/swat/using_samba/ch02_02.html
-share/swat/using_samba/ch02_03.html
-share/swat/using_samba/ch02_04.html
-share/swat/using_samba/ch02_05.html
-share/swat/using_samba/ch02_06.html
-share/swat/using_samba/ch03_01.html
-share/swat/using_samba/ch03_02.html
-share/swat/using_samba/ch03_03.html
-share/swat/using_samba/ch04_01.html
-share/swat/using_samba/ch04_02.html
-share/swat/using_samba/ch04_03.html
-share/swat/using_samba/ch04_04.html
-share/swat/using_samba/ch04_05.html
-share/swat/using_samba/ch04_06.html
-share/swat/using_samba/ch04_07.html
-share/swat/using_samba/ch04_08.html
-share/swat/using_samba/ch05_01.html
-share/swat/using_samba/ch05_02.html
-share/swat/using_samba/ch05_03.html
-share/swat/using_samba/ch05_04.html
-share/swat/using_samba/ch05_05.html
-share/swat/using_samba/ch06_01.html
-share/swat/using_samba/ch06_02.html
-share/swat/using_samba/ch06_03.html
-share/swat/using_samba/ch06_04.html
-share/swat/using_samba/ch06_05.html
-share/swat/using_samba/ch06_06.html
-share/swat/using_samba/ch07_01.html
-share/swat/using_samba/ch07_02.html
-share/swat/using_samba/ch07_03.html
-share/swat/using_samba/ch08_01.html
-share/swat/using_samba/ch08_02.html
-share/swat/using_samba/ch08_03.html
-share/swat/using_samba/ch08_04.html
-share/swat/using_samba/ch08_05.html
-share/swat/using_samba/ch08_06.html
-share/swat/using_samba/ch08_07.html
-share/swat/using_samba/ch09_01.html
-share/swat/using_samba/ch09_02.html
-share/swat/using_samba/ch09_03.html
-share/swat/using_samba/index.html
-share/swat/using_samba/inx.html
-share/swat/using_samba/licenseinfo.html
-share/swat/using_samba/this_edition.html
-share/swat/using_samba/figs/sam.0101.gif
-share/swat/using_samba/figs/sam.0102.gif
-share/swat/using_samba/figs/sam.0103.gif
-share/swat/using_samba/figs/sam.0104.gif
-share/swat/using_samba/figs/sam.0105.gif
-share/swat/using_samba/figs/sam.0106.gif
-share/swat/using_samba/figs/sam.0107.gif
-share/swat/using_samba/figs/sam.0108.gif
-share/swat/using_samba/figs/sam.0109.gif
-share/swat/using_samba/figs/sam.0110.gif
-share/swat/using_samba/figs/sam.0111.gif
-share/swat/using_samba/figs/sam.0112.gif
-share/swat/using_samba/figs/sam.0113.gif
-share/swat/using_samba/figs/sam.0114.gif
-share/swat/using_samba/figs/sam.0201.gif
-share/swat/using_samba/figs/sam.0202.gif
-share/swat/using_samba/figs/sam.0203.gif
-share/swat/using_samba/figs/sam.0204.gif
-share/swat/using_samba/figs/sam.0301.gif
-share/swat/using_samba/figs/sam.0302.gif
-share/swat/using_samba/figs/sam.0303.gif
-share/swat/using_samba/figs/sam.0304.gif
-share/swat/using_samba/figs/sam.0305.gif
-share/swat/using_samba/figs/sam.0306.gif
-share/swat/using_samba/figs/sam.0307.gif
-share/swat/using_samba/figs/sam.0308.gif
-share/swat/using_samba/figs/sam.0309.gif
-share/swat/using_samba/figs/sam.0310.gif
-share/swat/using_samba/figs/sam.0311.gif
-share/swat/using_samba/figs/sam.0312.gif
-share/swat/using_samba/figs/sam.0313.gif
-share/swat/using_samba/figs/sam.0314.gif
-share/swat/using_samba/figs/sam.0315.gif
-share/swat/using_samba/figs/sam.0316.gif
-share/swat/using_samba/figs/sam.0317.gif
-share/swat/using_samba/figs/sam.0318.gif
-share/swat/using_samba/figs/sam.0319.gif
-share/swat/using_samba/figs/sam.0320.gif
-share/swat/using_samba/figs/sam.0321.gif
-share/swat/using_samba/figs/sam.0322.gif
-share/swat/using_samba/figs/sam.0323.gif
-share/swat/using_samba/figs/sam.0324.gif
-share/swat/using_samba/figs/sam.0325.gif
-share/swat/using_samba/figs/sam.0326.gif
-share/swat/using_samba/figs/sam.0327.gif
-share/swat/using_samba/figs/sam.0328.gif
-share/swat/using_samba/figs/sam.0401.gif
-share/swat/using_samba/figs/sam.0402.gif
-share/swat/using_samba/figs/sam.0403.gif
-share/swat/using_samba/figs/sam.0404.gif
-share/swat/using_samba/figs/sam.0405.gif
-share/swat/using_samba/figs/sam.0406.gif
-share/swat/using_samba/figs/sam.0407.gif
-share/swat/using_samba/figs/sam.0501.gif
-share/swat/using_samba/figs/sam.0502.gif
-share/swat/using_samba/figs/sam.0503.gif
-share/swat/using_samba/figs/sam.0504.gif
-share/swat/using_samba/figs/sam.0505.gif
-share/swat/using_samba/figs/sam.0506.gif
-share/swat/using_samba/figs/sam.0507.gif
-share/swat/using_samba/figs/sam.0508.gif
-share/swat/using_samba/figs/sam.0601.gif
-share/swat/using_samba/figs/sam.0602.gif
-share/swat/using_samba/figs/sam.0603.gif
-share/swat/using_samba/figs/sam.0604.gif
-share/swat/using_samba/figs/sam.0605.gif
-share/swat/using_samba/figs/sam.0606.gif
-share/swat/using_samba/figs/sam.0701.gif
-share/swat/using_samba/figs/sam.0702.gif
-share/swat/using_samba/figs/sam.0703.gif
-share/swat/using_samba/figs/sam.0704.gif
-share/swat/using_samba/figs/sam.0705.gif
-share/swat/using_samba/figs/sam.0706.gif
-share/swat/using_samba/figs/sam.0707.gif
-share/swat/using_samba/figs/sam.0708.gif
-share/swat/using_samba/figs/sam.0709.gif
-share/swat/using_samba/figs/sam.0801.gif
-share/swat/using_samba/figs/sam.0802.gif
-share/swat/using_samba/figs/sam.0803.gif
-share/swat/using_samba/figs/sam.0804.gif
-share/swat/using_samba/figs/sam.0805.gif
-share/swat/using_samba/figs/sam.0901.gif
-share/swat/using_samba/figs/sam.0902.gif
-share/swat/using_samba/figs/sam.0903.gif
-share/swat/using_samba/figs/sam.0904.gif
-share/swat/using_samba/figs/sam.0905.gif
-share/swat/using_samba/figs/sam.aa01.gif
-share/swat/using_samba/figs/sam.ab01.gif
-share/swat/using_samba/figs/sam.ab02.gif
-share/swat/using_samba/gifs/index.gif
-share/swat/using_samba/gifs/samba.s.gif
-share/swat/using_samba/gifs/txthome.gif
-share/swat/using_samba/gifs/txtnexta.gif
-share/swat/using_samba/gifs/txtpreva.gif
-@dirrm share/swat/help
-@dirrm share/swat/images
-@dirrm share/swat/include
-@dirrm share/swat/using_samba/figs
-@dirrm share/swat/using_samba/gifs
-@dirrm share/swat/using_samba
-@dirrm share/swat
-@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ;  cat /etc/passwd | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi
-@exec mkdir -p /var/spool/samba ; chmod 1777 /var/spool/samba
-@exec cat %D/share/doc/samba/README.FreeBSD
-@unexec rm -rf /var/spool/samba
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
deleted file mode 100644
index 9d59b2a9304c..000000000000
--- a/net/sdr/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	sdr
-# Date created:				5 September 1996
-# Whom:	      Bill Fenner <fenner@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sdr
-PORTVERSION=	2.9
-CATEGORIES=	mbone tk82
-MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.9/
-
-MAINTAINER=	fenner@FreeBSD.org
-
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-BUILD_DEPENDS=	${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
-
-WRKSRC=		${WRKDIR}/sdr/freebsd
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-
-RESTRICTED=	"Contains DES cryptography."
-
-post-extract:
-	@${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd
-
-.include <bsd.port.mk>
diff --git a/net/sdr/distinfo b/net/sdr/distinfo
deleted file mode 100644
index 67a5bc2cd609..000000000000
--- a/net/sdr/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sdr-2.9.tar.gz) = ef0a3c8b92f7b3babf42ca5bd561fdd3
diff --git a/net/sdr/files/Makefile.freebsd b/net/sdr/files/Makefile.freebsd
deleted file mode 100644
index e412d81c1f99..000000000000
--- a/net/sdr/files/Makefile.freebsd
+++ /dev/null
@@ -1,8 +0,0 @@
-CC          = gcc -g -O -fwritable-strings
-INCLUDES    = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.2 -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/uclmmbase
-LIBS        = -L${LOCALBASE}/lib -ltk82 -ltcl82 -luclmmbase -L${X11BASE}/lib -lX11 -lz -lm
-CFLAGS      = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD
-
-all::	sdr 
-install:
-	install -s -c -o root -g wheel -m 555 sdr ${PREFIX}/bin
diff --git a/net/sdr/files/patch-ab b/net/sdr/files/patch-ab
deleted file mode 100644
index ca6c5f8fe01f..000000000000
--- a/net/sdr/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../src/Makefile.template.orig	Tue May 25 16:27:44 1999
-+++ ../src/Makefile.template	Thu Nov  4 11:05:39 1999
-@@ -88,7 +88,7 @@
- $(SDR_UI_FILES): tcl2c
- 
- parsed_plugins.tcl: ../src/plugin2tcl.tcl
--	tclsh8.0 ../src/plugin2tcl.tcl
-+	tclsh8.2 ../src/plugin2tcl.tcl
- 
- uweb: $(WWWOBJS)
- 	$(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS)
diff --git a/net/sdr/files/patch-ac b/net/sdr/files/patch-ac
deleted file mode 100644
index 8499cceb284b..000000000000
--- a/net/sdr/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../src/plugin2tcl.tcl.orig	Sun Mar 19 20:33:42 2000
-+++ ../src/plugin2tcl.tcl	Sun Mar 19 20:35:39 2000
-@@ -8,7 +8,7 @@
- puts $file "set createrules \"$createrules\""
- foreach ary {tooldata mediadata fmts protos protonames fmtnames mappings attrs attrnames attrvaluenames attrflags noattrflags noattrlist defattrlist withattrs macros macrokeys fmtlayers} {
-     foreach key [array names $ary] {
--	puts $file "set [set ary]($key) \"[set [set ary]($key)]\""
-+	puts $file [list set [set ary]($key) [set [set ary]($key)]]
-     }
- }
- close $file
diff --git a/net/sdr/pkg-comment b/net/sdr/pkg-comment
deleted file mode 100644
index 9b614924d614..000000000000
--- a/net/sdr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multicast Session Directory
diff --git a/net/sdr/pkg-descr b/net/sdr/pkg-descr
deleted file mode 100644
index 4c6400374ee6..000000000000
--- a/net/sdr/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Sdr is a session directory tool designed to allow the advertisement
-and joining of multicast conferences.  It was originally based on
-sd written by Van Jacobson at LBNL, but implements a later version
-of the session description protocol than sd does.
-
-WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/
diff --git a/net/sdr/pkg-plist b/net/sdr/pkg-plist
deleted file mode 100644
index 3b663de62fc5..000000000000
--- a/net/sdr/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/sdr
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile
deleted file mode 100644
index f55ed7e434ab..000000000000
--- a/net/trafshow3/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	trafshow
-# Date created:         25 September 1996
-# Whom:                 igor@zynaps.ru
-#
-# $FreeBSD$
-#
-
-PORTNAME=	trafshow
-PORTVERSION=	3.1
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.nsk.su/pub/RinetSoftware/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=     jseger@FreeBSD.org
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 400010
-LIB_DEPENDS=	ncurses.5:${PORTSDIR}/devel/ncurses
-.endif
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-ALL_TARGET=	trafshow
-
-MAN1=		trafshow.1
-
-post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/.trafshow ${PREFIX}/etc/trafshow.dist
-	${CP} ${PREFIX}/etc/trafshow.dist ${PREFIX}/etc/trafshow
-
-.include <bsd.port.post.mk>
diff --git a/net/trafshow3/distinfo b/net/trafshow3/distinfo
deleted file mode 100644
index f404b24464cf..000000000000
--- a/net/trafshow3/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (trafshow-3.1.tgz) = 085b99f160002a269b358aab1c5004f0
diff --git a/net/trafshow3/files/patch-ac b/net/trafshow3/files/patch-ac
deleted file mode 100644
index c15ab541f4d8..000000000000
--- a/net/trafshow3/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- color.c.orig	Mon Jan 24 10:59:01 2000
-+++ color.c	Mon Jan 24 10:57:36 2000
-@@ -336,7 +336,7 @@
- 		error(1, "init_color_mask: getpwuid");
- 	(void) sprintf(buf, "%s/.%s", pw->pw_dir, program_name);
- 	if ((fp = fopen(buf, "r")) == NULL) {
--		(void) strcpy(buf, "/etc/");
-+		(void) strcpy(buf, "%%PREFIX%%/etc/");
- 		(void) strcat(buf, program_name);
- 		if ((fp = fopen(buf, "r")) == NULL) return 0;
- 	}
diff --git a/net/trafshow3/files/patch-af b/net/trafshow3/files/patch-af
deleted file mode 100644
index dba73df91ae9..000000000000
--- a/net/trafshow3/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Mon Aug 24 13:54:16 1998
-+++ Makefile.in	Tue May  2 00:51:47 2000
-@@ -28,8 +28,8 @@
- 
- PROG = trafshow
- CC = @CC@
--CCOPT = @V_CCOPT@
--INCLS = -I. @V_INCLS@
-+CCOPT = @CFLAGS@
-+INCLS = -I. @CPPFLAGS@
- DEFS = @DEFS@
- 
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
diff --git a/net/trafshow3/pkg-comment b/net/trafshow3/pkg-comment
deleted file mode 100644
index bef4f1007643..000000000000
--- a/net/trafshow3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Full screen visualization of the network traffic
diff --git a/net/trafshow3/pkg-descr b/net/trafshow3/pkg-descr
deleted file mode 100644
index cd1260b6aaa3..000000000000
--- a/net/trafshow3/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-TrafShow continuously display the information regarding packet
-traffic on the configured network interface that match the boolean
-expression. It periodically sort and updates this information. It
-may be useful for locating suspicious network traffic on the net.
-
-To use TrafShow, your kernel must be rebuilt with the following line
-added to your kernel config file (/sys/i386/conf/<YourMachine>):
-
-pseudo-device   bpfilter        4       # Berkeley packet filter
-
-The number after bpfilter is the number of interfaces that can be
-examined simultaneously. See section 5.8.3 of Handbook for details.
-
-WWW: http://www.rinetsoft.nsk.su/trafshow/index_en.html
-
-- Igor
-igor@zynaps.ru
diff --git a/net/trafshow3/pkg-plist b/net/trafshow3/pkg-plist
deleted file mode 100644
index 00f2059110f7..000000000000
--- a/net/trafshow3/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/trafshow
-@unexec if cmp -s %D/etc/trafshow %D/etc/trafshow.dist; then rm -f %D/etc/trafshow; fi
-etc/trafshow.dist
-@exec if [ ! -f %D/etc/trafshow.dist ]; then cp -p %D/%F %B/trafshow.dist; fi
diff --git a/net/trafshow4/Makefile b/net/trafshow4/Makefile
deleted file mode 100644
index f55ed7e434ab..000000000000
--- a/net/trafshow4/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	trafshow
-# Date created:         25 September 1996
-# Whom:                 igor@zynaps.ru
-#
-# $FreeBSD$
-#
-
-PORTNAME=	trafshow
-PORTVERSION=	3.1
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.nsk.su/pub/RinetSoftware/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=     jseger@FreeBSD.org
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 400010
-LIB_DEPENDS=	ncurses.5:${PORTSDIR}/devel/ncurses
-.endif
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-ALL_TARGET=	trafshow
-
-MAN1=		trafshow.1
-
-post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/.trafshow ${PREFIX}/etc/trafshow.dist
-	${CP} ${PREFIX}/etc/trafshow.dist ${PREFIX}/etc/trafshow
-
-.include <bsd.port.post.mk>
diff --git a/net/trafshow4/distinfo b/net/trafshow4/distinfo
deleted file mode 100644
index f404b24464cf..000000000000
--- a/net/trafshow4/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (trafshow-3.1.tgz) = 085b99f160002a269b358aab1c5004f0
diff --git a/net/trafshow4/files/patch-ac b/net/trafshow4/files/patch-ac
deleted file mode 100644
index c15ab541f4d8..000000000000
--- a/net/trafshow4/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- color.c.orig	Mon Jan 24 10:59:01 2000
-+++ color.c	Mon Jan 24 10:57:36 2000
-@@ -336,7 +336,7 @@
- 		error(1, "init_color_mask: getpwuid");
- 	(void) sprintf(buf, "%s/.%s", pw->pw_dir, program_name);
- 	if ((fp = fopen(buf, "r")) == NULL) {
--		(void) strcpy(buf, "/etc/");
-+		(void) strcpy(buf, "%%PREFIX%%/etc/");
- 		(void) strcat(buf, program_name);
- 		if ((fp = fopen(buf, "r")) == NULL) return 0;
- 	}
diff --git a/net/trafshow4/files/patch-af b/net/trafshow4/files/patch-af
deleted file mode 100644
index dba73df91ae9..000000000000
--- a/net/trafshow4/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Mon Aug 24 13:54:16 1998
-+++ Makefile.in	Tue May  2 00:51:47 2000
-@@ -28,8 +28,8 @@
- 
- PROG = trafshow
- CC = @CC@
--CCOPT = @V_CCOPT@
--INCLS = -I. @V_INCLS@
-+CCOPT = @CFLAGS@
-+INCLS = -I. @CPPFLAGS@
- DEFS = @DEFS@
- 
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
diff --git a/net/trafshow4/pkg-comment b/net/trafshow4/pkg-comment
deleted file mode 100644
index bef4f1007643..000000000000
--- a/net/trafshow4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Full screen visualization of the network traffic
diff --git a/net/trafshow4/pkg-descr b/net/trafshow4/pkg-descr
deleted file mode 100644
index cd1260b6aaa3..000000000000
--- a/net/trafshow4/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-TrafShow continuously display the information regarding packet
-traffic on the configured network interface that match the boolean
-expression. It periodically sort and updates this information. It
-may be useful for locating suspicious network traffic on the net.
-
-To use TrafShow, your kernel must be rebuilt with the following line
-added to your kernel config file (/sys/i386/conf/<YourMachine>):
-
-pseudo-device   bpfilter        4       # Berkeley packet filter
-
-The number after bpfilter is the number of interfaces that can be
-examined simultaneously. See section 5.8.3 of Handbook for details.
-
-WWW: http://www.rinetsoft.nsk.su/trafshow/index_en.html
-
-- Igor
-igor@zynaps.ru
diff --git a/net/trafshow4/pkg-plist b/net/trafshow4/pkg-plist
deleted file mode 100644
index 00f2059110f7..000000000000
--- a/net/trafshow4/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/trafshow
-@unexec if cmp -s %D/etc/trafshow %D/etc/trafshow.dist; then rm -f %D/etc/trafshow; fi
-etc/trafshow.dist
-@exec if [ ! -f %D/etc/trafshow.dist ]; then cp -p %D/%F %B/trafshow.dist; fi
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
deleted file mode 100644
index 256eb12ed317..000000000000
--- a/net/unison-devel/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for: unison
-# Date created:		4 October 2000
-# Whom:			Dan Pelleg <dpelleg+unison@cs.cmu.edu>
-#
-# $FreeBSD$
-#
-
-PORTNAME=		unison
-PORTVERSION= 		2.5.1
-CATEGORIES=		net
-MASTER_SITES=		http://www.cis.upenn.edu/~bcpierce/unison/download/stable/unison-${PORTVERSION}/
-DISTNAME=		src
-DIST_SUBDIR=		unison
-
-MAINTAINER=		Dan Pelleg <dpelleg+unison@cs.cmu.edu>
-
-BUILD_DEPENDS=		ocamlc:${PORTSDIR}/lang/ocaml
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_GMAKE= yes
-MAKE_ARGS= UISTYLE=text CFLAGS=""
-
-post-install:
-	strip ${PREFIX}/bin/unison
-
-.include <bsd.port.mk>
diff --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo
deleted file mode 100644
index 28b5f9fb75bc..000000000000
--- a/net/unison-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (unison/src.tar.gz) = e7e1f701d8d2c22e25380550ca8d60f4
diff --git a/net/unison-devel/files/patch-aa b/net/unison-devel/files/patch-aa
deleted file mode 100644
index 6c45ce1d18b1..000000000000
--- a/net/unison-devel/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	Mon Sep 25 19:04:31 2000
-+++ Makefile	Wed Oct 25 20:48:53 2000
-@@ -62,12 +62,12 @@
- ######################################################################
- # Installation
- 
--INSTALLDIR = $(HOME)/bin/
-+INSTALLDIR = ${PREFIX}/bin/
- 
- install: $(NAME)$(EXEC_EXT)
--	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
-+#	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
- 	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
--	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT)
-+#	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT)
- 
- ######################################################################
- # Demo
-@@ -204,7 +204,7 @@
- tags:
- 	-$(ETAGS) *.ml *.mli
- 
--all:: TAGS
-+# all:: TAGS
- 
- TAGS: 
- 	$(MAKE) tags
diff --git a/net/unison-devel/pkg-comment b/net/unison-devel/pkg-comment
deleted file mode 100644
index 140bbf544904..000000000000
--- a/net/unison-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A user-level file synchronization tool
diff --git a/net/unison-devel/pkg-descr b/net/unison-devel/pkg-descr
deleted file mode 100644
index 5ae58aebb642..000000000000
--- a/net/unison-devel/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Unison is a file-synchronization tool for Unix and Windows. It allows two
-replicas of a collection of files and directories to be stored on different
-hosts (or different disks on the same host), modified separately, and then
-brought up to date by propagating the changes in each replica to the other.
-
-Unison shares a number of features with tools such as configuration
-management packages (CVS, PRCS, etc.) distributed filesystems (Coda, etc.)
-uni-directional mirroring utilities (rsync, etc.) and other synchronizers
-(Intellisync, Reconcile, etc).
-
-WWW: http://www.cis.upenn.edu/~bcpierce/unison/
-
-- Dan Pelleg
-
-dpelleg+unison@cs.cmu.edu
diff --git a/net/unison-devel/pkg-plist b/net/unison-devel/pkg-plist
deleted file mode 100644
index 31b7bedb59e4..000000000000
--- a/net/unison-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/unison
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
deleted file mode 100644
index 256eb12ed317..000000000000
--- a/net/unison232/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for: unison
-# Date created:		4 October 2000
-# Whom:			Dan Pelleg <dpelleg+unison@cs.cmu.edu>
-#
-# $FreeBSD$
-#
-
-PORTNAME=		unison
-PORTVERSION= 		2.5.1
-CATEGORIES=		net
-MASTER_SITES=		http://www.cis.upenn.edu/~bcpierce/unison/download/stable/unison-${PORTVERSION}/
-DISTNAME=		src
-DIST_SUBDIR=		unison
-
-MAINTAINER=		Dan Pelleg <dpelleg+unison@cs.cmu.edu>
-
-BUILD_DEPENDS=		ocamlc:${PORTSDIR}/lang/ocaml
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_GMAKE= yes
-MAKE_ARGS= UISTYLE=text CFLAGS=""
-
-post-install:
-	strip ${PREFIX}/bin/unison
-
-.include <bsd.port.mk>
diff --git a/net/unison232/distinfo b/net/unison232/distinfo
deleted file mode 100644
index 28b5f9fb75bc..000000000000
--- a/net/unison232/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (unison/src.tar.gz) = e7e1f701d8d2c22e25380550ca8d60f4
diff --git a/net/unison232/files/patch-aa b/net/unison232/files/patch-aa
deleted file mode 100644
index 6c45ce1d18b1..000000000000
--- a/net/unison232/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	Mon Sep 25 19:04:31 2000
-+++ Makefile	Wed Oct 25 20:48:53 2000
-@@ -62,12 +62,12 @@
- ######################################################################
- # Installation
- 
--INSTALLDIR = $(HOME)/bin/
-+INSTALLDIR = ${PREFIX}/bin/
- 
- install: $(NAME)$(EXEC_EXT)
--	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
-+#	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
- 	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
--	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT)
-+#	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT)
- 
- ######################################################################
- # Demo
-@@ -204,7 +204,7 @@
- tags:
- 	-$(ETAGS) *.ml *.mli
- 
--all:: TAGS
-+# all:: TAGS
- 
- TAGS: 
- 	$(MAKE) tags
diff --git a/net/unison232/pkg-comment b/net/unison232/pkg-comment
deleted file mode 100644
index 140bbf544904..000000000000
--- a/net/unison232/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A user-level file synchronization tool
diff --git a/net/unison232/pkg-descr b/net/unison232/pkg-descr
deleted file mode 100644
index 5ae58aebb642..000000000000
--- a/net/unison232/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Unison is a file-synchronization tool for Unix and Windows. It allows two
-replicas of a collection of files and directories to be stored on different
-hosts (or different disks on the same host), modified separately, and then
-brought up to date by propagating the changes in each replica to the other.
-
-Unison shares a number of features with tools such as configuration
-management packages (CVS, PRCS, etc.) distributed filesystems (Coda, etc.)
-uni-directional mirroring utilities (rsync, etc.) and other synchronizers
-(Intellisync, Reconcile, etc).
-
-WWW: http://www.cis.upenn.edu/~bcpierce/unison/
-
-- Dan Pelleg
-
-dpelleg+unison@cs.cmu.edu
diff --git a/net/unison232/pkg-plist b/net/unison232/pkg-plist
deleted file mode 100644
index 31b7bedb59e4..000000000000
--- a/net/unison232/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/unison
diff --git a/net/wb/Makefile b/net/wb/Makefile
deleted file mode 100644
index a95e50014aa9..000000000000
--- a/net/wb/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	wb
-# Date created:		2 Novermber 1996
-# Whom:			fenner
-#
-# $FreeBSD$
-#
-
-PORTNAME=       wb
-PORTVERSION=	1.59
-CATEGORIES=	mbone
-MASTER_SITES=   ftp://ftp.ee.lbl.gov/conferencing/wb/
-DISTFILES=      i386-wb-1.59.tar.Z
-
-MAINTAINER=	fenner@FreeBSD.org
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-USE_X_PREFIX=	yes
-
-# XXX ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript5
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wb ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/wb
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wb
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/wb
-	${INSTALL_DATA} ${WRKSRC}/NOTES ${PREFIX}/share/doc/wb
-	${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${PREFIX}/share/doc/wb
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/wb/distinfo b/net/wb/distinfo
deleted file mode 100644
index 40cefca1c0bb..000000000000
--- a/net/wb/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (i386-wb-1.59.tar.Z) = 7601eb1192ee2774940d805500c0a9ce
diff --git a/net/wb/pkg-comment b/net/wb/pkg-comment
deleted file mode 100644
index 8bd2e20b0482..000000000000
--- a/net/wb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A shared drawing (whiteboard) tool using multicast
diff --git a/net/wb/pkg-descr b/net/wb/pkg-descr
deleted file mode 100644
index 9c196397ccc9..000000000000
--- a/net/wb/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a beta-release of the LBL 'whiteboard'.
-
-Before using wb, read the file NOTES from the distribution (note
-especially the .sd.tcl change needed if you are running sd v1.14
-or earlier) and print and read the postscript file lblwb.ps.
-
-If you simply want a shared "whiteboard" drawing surface, you
-don't need to do anything but install wb.  But wb can also be
-used to export, view and annotate arbitrary PostScript files.
-If you want to include PostScript images in your wb conference,
-either your X server has to support Display PostScript (the DEC
-& SGI X servers do) or wb has to be able to exec the public
-domain postscript renderer `GhostScript'.  If you want to
-render postscript with Ghostscript, it has to be installed on
-your machine and has to be in your shell search path with the
-name "gs".
diff --git a/net/wb/pkg-plist b/net/wb/pkg-plist
deleted file mode 100644
index 084fc240b5dd..000000000000
--- a/net/wb/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/wb
-share/doc/wb/README
-share/doc/wb/CHANGES
-share/doc/wb/NOTES
-share/doc/wb/lblwb.ps
-@dirrm share/doc/wb
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
deleted file mode 100644
index 90a9b640d92d..000000000000
--- a/net/wireshark/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:   ethereal
-# Date created:        10 August 1998
-# Whom:                Bill Fumerola <billf@chc-chimes.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ethereal
-PORTVERSION=	0.8.10
-CATEGORIES=	net ipv6
-MASTER_SITES=	http://alpha1.linuxberg.com/files/x11/network/ \
-		http://www.linuxberg.com/files/x11/network/ \
-		http://jefnet.linuxberg.com/files/x11/network/ \
-		http://ethereal.zing.org/distribution/ \
-		http://ethereal.boehm.org/distribution/
-
-MAINTAINER=	billf@FreeBSD.org
-
-USE_X_PREFIX=	yes
-USE_GTK=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-snmp=no
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
-
-MAN1=		ethereal.1 tethereal.1 editcap.1
-
-.include <bsd.port.mk>
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
deleted file mode 100644
index eb99accc2f65..000000000000
--- a/net/wireshark/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ethereal-0.8.10.tar.gz) = 8d3e78d10410d5bc2c2d34bcfd7e5235
diff --git a/net/wireshark/files/patch-aa b/net/wireshark/files/patch-aa
deleted file mode 100644
index 9fc3924a3c78..000000000000
--- a/net/wireshark/files/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
---- gtk/main.c.orig	Wed Apr  5 10:17:53 2000
-+++ gtk/main.c	Sat Apr 22 20:33:00 2000
-@@ -1161,6 +1161,7 @@
- 
-   /* Let GTK get its args */
-   gtk_init (&argc, &argv);
-+  gtk_set_locale ();
-   
-   prefs = read_prefs(&pf_path);
-   if (pf_path != NULL) {
-@@ -1440,12 +1441,12 @@
-   sprintf(rc_file, "%s/%s", get_home_dir(), RC_FILE);
-   gtk_rc_parse(rc_file);
- 
--  if ((m_r_font = gdk_font_load(medium_font)) == NULL) {
-+  if ((m_r_font = gdk_fontset_load(medium_font)) == NULL) {
-     fprintf(stderr, "ethereal: Error font %s not found (use -m option)\n", medium_font);
-     exit(1);
-   }
- 
--  if ((m_b_font = gdk_font_load(bold_font)) == NULL) {
-+  if ((m_b_font = gdk_fontset_load(bold_font)) == NULL) {
-     fprintf(stderr, "ethereal: Error font %s not found (use -b option)\n", bold_font);
-     exit(1);
-   }
diff --git a/net/wireshark/files/patch-ab b/net/wireshark/files/patch-ab
deleted file mode 100644
index a92c130ac9cf..000000000000
--- a/net/wireshark/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- gtk/main.h.orig	Sat Apr 22 20:17:29 2000
-+++ gtk/main.h	Sat Apr 22 20:17:42 2000
-@@ -38,8 +38,8 @@
- #define MONO_MEDIUM_FONT "-*-lucida console-medium-*-*-*-*-100-*-*-*-*-*-*"
- #define MONO_BOLD_FONT "-*-lucida console-bold-*-*-*-*-100-*-*-*-*-*-*"
- #else
--#define MONO_MEDIUM_FONT "-*-lucidatypewriter-medium-r-normal-*-*-120-*-*-*-*-iso8859-1"
--#define MONO_BOLD_FONT "-*-lucidatypewriter-bold-r-normal-*-*-120-*-*-*-*-iso8859-1"
-+#define MONO_MEDIUM_FONT "-*-lucidatypewriter-medium-r-normal-*-*-120-*-*-*-*-iso8859-1,*"
-+#define MONO_BOLD_FONT "-*-lucidatypewriter-bold-r-normal-*-*-120-*-*-*-*-iso8859-1,*"
- #endif
- #define RC_FILE PF_DIR "/gtkrc"
- #define DEF_WIDTH 750
diff --git a/net/wireshark/pkg-comment b/net/wireshark/pkg-comment
deleted file mode 100644
index 798083f0bf7e..000000000000
--- a/net/wireshark/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11/GTK network analyzer/capture tool
diff --git a/net/wireshark/pkg-descr b/net/wireshark/pkg-descr
deleted file mode 100644
index 6954c9cec769..000000000000
--- a/net/wireshark/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-A network analyzer that lets you capture and interactively browse the
-contents of Ethernet frames. Packet data can be read from a file, or
-live from a local network interface. 
-
-WWW: http://ethereal.zing.org
-
-Bill Fumerola <billf@chc-chimes.com>
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
deleted file mode 100644
index 06ddb086d8ae..000000000000
--- a/net/wireshark/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/editcap
-bin/ethereal
-bin/tethereal
-etc/manuf
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.la
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.a
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so
-@dirrm lib/ethereal/plugins/%%PORTVERSION%%
-@dirrm lib/ethereal/plugins
-@dirrm lib/ethereal
diff --git a/net/zebra-devel/Makefile b/net/zebra-devel/Makefile
deleted file mode 100644
index c3aaa4063ddd..000000000000
--- a/net/zebra-devel/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:	zebra
-# Date created:		So  31 Mai 1998 11:00:30 CEST
-# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	zebra
-PORTVERSION=	0.89a
-CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
-# you might need debugging, it's a developer release !
-#CFLAGS+=	-g
-
-MAINTAINER=	andreas@FreeBSD.org
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra
-
-MAN1=		vtysh.1
-MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 400014
-PLIST:=         ${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist.v6 ${PKGDIR}/pkg-plist > ${PLIST}
-.else
-CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd
-.endif
-
-post-install:
-	@${ECHO} "===>     installing zebra startup file..."
-	@${SED} -e "s=!!PREFIX!!=${PREFIX}=" \
-		< ${FILESDIR}/zebractl.sh  \
-		> ${PREFIX}/sbin/zebractl
-	@${CHMOD} 555 ${PREFIX}/sbin/zebractl
-	@${ECHO} "Make these entries in /etc/rc.conf to start zebra:"
-	@${ECHO} "defaultrouter=\"NO\""
-	@${ECHO} "router_enable=\"YES\""
-	@${ECHO} "router=\"${PREFIX}/sbin/zebractl\""
-	@${ECHO} "router_flags=\"start\""
-	@${ECHO} "done."
-
-.include <bsd.port.post.mk>
diff --git a/net/zebra-devel/distinfo b/net/zebra-devel/distinfo
deleted file mode 100644
index 540e979e9ba9..000000000000
--- a/net/zebra-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (zebra-0.89a.tar.gz) = a132708d41c460a8cd54577b3b0cff27
diff --git a/net/zebra-devel/files/zebractl.sh b/net/zebra-devel/files/zebractl.sh
deleted file mode 100644
index f803003408de..000000000000
--- a/net/zebra-devel/files/zebractl.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/zebra-devel/files/Attic/zebractl.sh,v 1.1 1999-12-24 15:56:31 andreas Exp $
-#
-# zebra start/stop script by "Andreas Klemm <andreas@FreeBSD.ORG>"
-#
-
-usage()
-{
-	echo "$0: usage: $0 [ start | stop ]"
-	exit 1
-}
-
-if [ $# -lt 1 ]; then
-	echo "$0: error: one argument needed"; usage
-elif [ $# -gt 1 ]; then
-	echo "$0: error: only one argument needed"; usage
-fi
-
-case $1 in
-	start)
-		[ -f !!PREFIX!!/etc/zebra/zebra.conf ] && ( \
-			!!PREFIX!!/sbin/zebra > /dev/null 2>&1 & \
-			echo -n ' zebra' )
-		[ -f !!PREFIX!!/etc/zebra/ripd.conf ] && ( \
-			!!PREFIX!!/sbin/ripd > /dev/null 2>&1 & \
-			echo -n ' ripd' )
-		[ -f !!PREFIX!!/etc/zebra/ospfd.conf ] && ( \
-			!!PREFIX!!/sbin/ospfd > /dev/null 2>&1 & \
-			echo -n ' ospfd' )
-		[ -f !!PREFIX!!/etc/zebra/bgpd.conf ] && ( \
-			!!PREFIX!!/sbin/bgpd > /dev/null 2>&1 & \
-			echo -n ' bgpd' )
-		;;
-
-	stop)
-		[ -f !!PREFIX!!/etc/zebra/ripd.conf ] && killall ripd
-		[ -f !!PREFIX!!/etc/zebra/ospfd.conf ] && killall ospfd
-		[ -f !!PREFIX!!/etc/zebra/bgpd.conf ] && killall bgpd
-		[ -f !!PREFIX!!/etc/zebra/zebra.conf ] &&  killall zebra
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-
-	*)	echo "$0: error: unknown option $1"
-		usage
-		;;
-esac
-exit 0
diff --git a/net/zebra-devel/pkg-comment b/net/zebra-devel/pkg-comment
deleted file mode 100644
index 2394a0df46d2..000000000000
--- a/net/zebra-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free multithreaded RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
diff --git a/net/zebra-devel/pkg-descr b/net/zebra-devel/pkg-descr
deleted file mode 100644
index 005d35bc4f1b..000000000000
--- a/net/zebra-devel/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-GNU Zebra is a free software (distributed under GNU Generic Public
-License) which manages TCP/IP based routing protocols.
-
-It supports BGP-4 protocol as described in RFC1771 (A Border Gateway
-Protocol 4) and RIPv1, RIPv2 and OSPFv2.
-
-Zebra uses multithread technology under multithread supported UNIX
-kernels.  However it can be run under not-multithread supported
-UNIX kernels.
-
-Zebra is intended to be used as a Route Server and a Route Reflector.
-Zebra is not a toolkit, it provides full routing power under a new
-architecture.
-
-WWW: http://www.zebra.org/
diff --git a/net/zebra-devel/pkg-plist b/net/zebra-devel/pkg-plist
deleted file mode 100644
index ddc59b7219ab..000000000000
--- a/net/zebra-devel/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-sbin/bgpd
-sbin/ospfd
-sbin/ripd
-sbin/ripngd
-sbin/zebra
-sbin/zebractl
-etc/zebra/README.mbgp
-etc/zebra/bgpd.conf.sample
-etc/zebra/bgpd.conf.sample2
-etc/zebra/ospfd.conf.sample
-etc/zebra/ripd.conf.sample
-etc/zebra/ripngd.conf.sample
-etc/zebra/zebra.conf.sample
-@unexec install-info --delete %D/info/zebra.info %D/info/dir
-info/zebra.info
-info/zebra.info-1
-info/zebra.info-2
-info/zebra.info-3
-@exec install-info %D/info/zebra.info %D/info/dir
-@dirrm etc/zebra
diff --git a/net/zebra-devel/pkg-plist.v6 b/net/zebra-devel/pkg-plist.v6
deleted file mode 100644
index a9344d7c2409..000000000000
--- a/net/zebra-devel/pkg-plist.v6
+++ /dev/null
@@ -1,4 +0,0 @@
-sbin/ospf6d
-sbin/ripngd
-etc/zebra/ospf6d.conf.sample
-etc/zebra/ripngd.conf.sample
diff --git a/net/zebra-pj/Makefile b/net/zebra-pj/Makefile
deleted file mode 100644
index c3aaa4063ddd..000000000000
--- a/net/zebra-pj/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:	zebra
-# Date created:		So  31 Mai 1998 11:00:30 CEST
-# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	zebra
-PORTVERSION=	0.89a
-CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
-# you might need debugging, it's a developer release !
-#CFLAGS+=	-g
-
-MAINTAINER=	andreas@FreeBSD.org
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra
-
-MAN1=		vtysh.1
-MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 400014
-PLIST:=         ${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist.v6 ${PKGDIR}/pkg-plist > ${PLIST}
-.else
-CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd
-.endif
-
-post-install:
-	@${ECHO} "===>     installing zebra startup file..."
-	@${SED} -e "s=!!PREFIX!!=${PREFIX}=" \
-		< ${FILESDIR}/zebractl.sh  \
-		> ${PREFIX}/sbin/zebractl
-	@${CHMOD} 555 ${PREFIX}/sbin/zebractl
-	@${ECHO} "Make these entries in /etc/rc.conf to start zebra:"
-	@${ECHO} "defaultrouter=\"NO\""
-	@${ECHO} "router_enable=\"YES\""
-	@${ECHO} "router=\"${PREFIX}/sbin/zebractl\""
-	@${ECHO} "router_flags=\"start\""
-	@${ECHO} "done."
-
-.include <bsd.port.post.mk>
diff --git a/net/zebra-pj/distinfo b/net/zebra-pj/distinfo
deleted file mode 100644
index 540e979e9ba9..000000000000
--- a/net/zebra-pj/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (zebra-0.89a.tar.gz) = a132708d41c460a8cd54577b3b0cff27
diff --git a/net/zebra-pj/files/zebractl.sh b/net/zebra-pj/files/zebractl.sh
deleted file mode 100644
index 7df63067bf3f..000000000000
--- a/net/zebra-pj/files/zebractl.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/zebra-pj/files/Attic/zebractl.sh,v 1.1 1999-12-24 15:56:31 andreas Exp $
-#
-# zebra start/stop script by "Andreas Klemm <andreas@FreeBSD.ORG>"
-#
-
-usage()
-{
-	echo "$0: usage: $0 [ start | stop ]"
-	exit 1
-}
-
-if [ $# -lt 1 ]; then
-	echo "$0: error: one argument needed"; usage
-elif [ $# -gt 1 ]; then
-	echo "$0: error: only one argument needed"; usage
-fi
-
-case $1 in
-	start)
-		[ -f !!PREFIX!!/etc/zebra/zebra.conf ] && ( \
-			!!PREFIX!!/sbin/zebra > /dev/null 2>&1 & \
-			echo -n ' zebra' )
-		[ -f !!PREFIX!!/etc/zebra/ripd.conf ] && ( \
-			!!PREFIX!!/sbin/ripd > /dev/null 2>&1 & \
-			echo -n ' ripd' )
-		[ -f !!PREFIX!!/etc/zebra/ospfd.conf ] && ( \
-			!!PREFIX!!/sbin/ospfd > /dev/null 2>&1 & \
-			echo -n ' ospfd' )
-		[ -f !!PREFIX!!/etc/zebra/bgpd.conf ] && ( \
-			!!PREFIX!!/sbin/bgpd > /dev/null 2>&1 & \
-			echo -n ' bgpd' )
-		;;
-
-	stop)
-		[ -f !!PREFIX!!/etc/zebra/ripd.conf ] && killall ripd
-		[ -f !!PREFIX!!/etc/zebra/ospfd.conf ] && killall ospfd
-		[ -f !!PREFIX!!/etc/zebra/bgpd.conf ] && killall bgpd
-		[ -f !!PREFIX!!/etc/zebra/zebra.conf ] &&  killall zebra
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-
-	*)	echo "$0: error: unknown option $1"
-		usage
-		;;
-esac
-exit 0
diff --git a/net/zebra-pj/pkg-comment b/net/zebra-pj/pkg-comment
deleted file mode 100644
index 2394a0df46d2..000000000000
--- a/net/zebra-pj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free multithreaded RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
diff --git a/net/zebra-pj/pkg-descr b/net/zebra-pj/pkg-descr
deleted file mode 100644
index 005d35bc4f1b..000000000000
--- a/net/zebra-pj/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-GNU Zebra is a free software (distributed under GNU Generic Public
-License) which manages TCP/IP based routing protocols.
-
-It supports BGP-4 protocol as described in RFC1771 (A Border Gateway
-Protocol 4) and RIPv1, RIPv2 and OSPFv2.
-
-Zebra uses multithread technology under multithread supported UNIX
-kernels.  However it can be run under not-multithread supported
-UNIX kernels.
-
-Zebra is intended to be used as a Route Server and a Route Reflector.
-Zebra is not a toolkit, it provides full routing power under a new
-architecture.
-
-WWW: http://www.zebra.org/
diff --git a/net/zebra-pj/pkg-plist b/net/zebra-pj/pkg-plist
deleted file mode 100644
index ddc59b7219ab..000000000000
--- a/net/zebra-pj/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-sbin/bgpd
-sbin/ospfd
-sbin/ripd
-sbin/ripngd
-sbin/zebra
-sbin/zebractl
-etc/zebra/README.mbgp
-etc/zebra/bgpd.conf.sample
-etc/zebra/bgpd.conf.sample2
-etc/zebra/ospfd.conf.sample
-etc/zebra/ripd.conf.sample
-etc/zebra/ripngd.conf.sample
-etc/zebra/zebra.conf.sample
-@unexec install-info --delete %D/info/zebra.info %D/info/dir
-info/zebra.info
-info/zebra.info-1
-info/zebra.info-2
-info/zebra.info-3
-@exec install-info %D/info/zebra.info %D/info/dir
-@dirrm etc/zebra
diff --git a/net/zebra-pj/pkg-plist.v6 b/net/zebra-pj/pkg-plist.v6
deleted file mode 100644
index a9344d7c2409..000000000000
--- a/net/zebra-pj/pkg-plist.v6
+++ /dev/null
@@ -1,4 +0,0 @@
-sbin/ospf6d
-sbin/ripngd
-etc/zebra/ospf6d.conf.sample
-etc/zebra/ripngd.conf.sample
author	cvs2svn <cvs2svn@FreeBSD.org>	2000-11-17 12:19:22 +0000
committer	cvs2svn <cvs2svn@FreeBSD.org>	2000-11-17 12:19:22 +0000
commit	d615f4ca564f838b39bd8b504a3107011d951a03 (patch)
tree	d799b77773a040bd9f634696266507c9072dd071 /net
parent	Remove do-package target that was running "make package" in (diff)